diff --git a/Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj b/Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj
index 92891ca1c2..2a20527d3f 100644
--- a/Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj
+++ b/Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj
@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <EnableDefaultItems>false</EnableDefaultItems>
     <LangVersion>latest</LangVersion>
-    <NoWarn>1071</NoWarn>
+    <NoWarn>1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Data.cs" />
diff --git a/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs b/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs
index 4996a3ff91..35507fb75a 100644
--- a/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs
+++ b/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs
@@ -47,6 +47,7 @@ public class PlayerBuildConfig
         public string ApplicationIdentifier;
         public string Architecture;
         public ScriptingBackend ScriptingBackend;
+        public bool NoGUID;
         public bool InstallIntoBuildsFolder;
         public bool GenerateIdeProject;
         public bool Development;
@@ -60,6 +61,7 @@ public class PlayerBuildConfig
     public class BuiltFilesOutput
     {
         public string[] Files = new string[0];
+        public string BootConfigArtifact;
     }
 
     public class LinkerConfig
@@ -97,6 +99,8 @@ public class Il2CppConfig
         public string SysRootPath;
         public string ToolChainPath;
         public string RelativeDataPath;
+        public bool GenerateUsymFile;
+        public string UsymtoolPath;
     }
 
     public class Services
diff --git a/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/PlayerBuildProgramLibrary.Data.gen.csproj b/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/PlayerBuildProgramLibrary.Data.gen.csproj
index 324c757f81..ca26ba36b7 100644
--- a/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/PlayerBuildProgramLibrary.Data.gen.csproj
+++ b/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/PlayerBuildProgramLibrary.Data.gen.csproj
@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <EnableDefaultItems>false</EnableDefaultItems>
     <LangVersion>latest</LangVersion>
-    <NoWarn>1071</NoWarn>
+    <NoWarn>1701</NoWarn>
     <AssemblyName>PlayerBuildProgramLibrary.Data</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/ScriptCompilationBuildProgram.Data.gen.csproj b/Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/ScriptCompilationBuildProgram.Data.gen.csproj
index 7edeeb057f..010f8a8c43 100644
--- a/Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/ScriptCompilationBuildProgram.Data.gen.csproj
+++ b/Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/ScriptCompilationBuildProgram.Data.gen.csproj
@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <EnableDefaultItems>false</EnableDefaultItems>
     <LangVersion>latest</LangVersion>
-    <NoWarn>1071</NoWarn>
+    <NoWarn>1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Data.cs" />
diff --git a/Editor/Mono/ActiveEditorTracker.bindings.cs b/Editor/Mono/ActiveEditorTracker.bindings.cs
index 631817a74f..e903abcfbd 100644
--- a/Editor/Mono/ActiveEditorTracker.bindings.cs
+++ b/Editor/Mono/ActiveEditorTracker.bindings.cs
@@ -59,7 +59,7 @@ public override int GetHashCode()
         public Editor[] activeEditors { get { return (Editor[])Internal_GetActiveEditors(this); } }
 
         [FreeFunction]
-        internal static extern void Internal_GetActiveEditorsNonAlloc(ActiveEditorTracker self, Editor[] editors);
+        internal static extern void Internal_GetActiveEditorsNonAlloc(ActiveEditorTracker self, [Unmarshalled] Editor[] editors);
 
         // List<T> version
         internal void GetObjectsLockedByThisTracker(List<UnityObject> lockedObjects)
diff --git a/Editor/Mono/Animation/AnimationUtility.bindings.cs b/Editor/Mono/Animation/AnimationUtility.bindings.cs
index 668fd87bb7..f26cf83f7e 100644
--- a/Editor/Mono/Animation/AnimationUtility.bindings.cs
+++ b/Editor/Mono/Animation/AnimationUtility.bindings.cs
@@ -134,7 +134,7 @@ public static AnimationClip[] GetAnimationClips(GameObject gameObject)
         extern internal static AnimationClip[] GetAnimationClipsInAnimationPlayer([NotNull] GameObject gameObject);
 
         // Sets the array of AnimationClips to be referenced in the Animation component
-        extern public static void SetAnimationClips([NotNull] Animation animation, AnimationClip[] clips);
+        extern public static void SetAnimationClips([NotNull] Animation animation, [Unmarshalled] AnimationClip[] clips);
 
         public static EditorCurveBinding[] GetAnimatableBindings(GameObject targetObject, GameObject root)
         {
@@ -201,7 +201,7 @@ public static Type PropertyModificationToEditorCurveBinding(PropertyModification
 
         extern public static ObjectReferenceKeyframe[] GetObjectReferenceCurve([NotNull] AnimationClip clip, EditorCurveBinding binding);
 
-        public static void SetObjectReferenceCurve(AnimationClip clip, EditorCurveBinding binding, ObjectReferenceKeyframe[] keyframes)
+        public static void SetObjectReferenceCurve(AnimationClip clip, EditorCurveBinding binding, [Unmarshalled]ObjectReferenceKeyframe[] keyframes)
         {
             Internal_SetObjectReferenceCurve(clip, binding, keyframes, true);
             Internal_InvokeOnCurveWasModified(clip, binding, keyframes != null ? CurveModifiedType.CurveModified : CurveModifiedType.CurveDeleted);
@@ -232,7 +232,7 @@ internal static void SetObjectReferenceCurveNoSync(AnimationClip clip, EditorCur
         }
 
         [NativeThrows]
-        extern private static void Internal_SetObjectReferenceCurve([NotNull] AnimationClip clip, EditorCurveBinding binding, ObjectReferenceKeyframe[] keyframes, bool updateMuscleClip);
+        extern private static void Internal_SetObjectReferenceCurve([NotNull] AnimationClip clip, EditorCurveBinding binding, [Unmarshalled] ObjectReferenceKeyframe[] keyframes, bool updateMuscleClip);
 
         extern public static AnimationCurve GetEditorCurve([NotNull] AnimationClip clip, EditorCurveBinding binding);
 
@@ -270,6 +270,8 @@ internal static void SetEditorCurveNoSync(AnimationClip clip, EditorCurveBinding
         [NativeThrows]
         extern private static void Internal_SetEditorCurve([NotNull] AnimationClip clip, EditorCurveBinding binding, AnimationCurve curve, bool syncEditorCurves);
 
+        extern internal static bool IsDiscreteIntBinding(EditorCurveBinding binding);
+
         extern internal static void SyncEditorCurves([NotNull] AnimationClip clip);
 
         private static void Internal_InvokeOnCurveWasModified(AnimationClip clip, EditorCurveBinding binding, CurveModifiedType type)
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs
index da5fb4aa72..bbb79c3da4 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs
@@ -920,7 +920,7 @@ private List<AnimationWindowKeyframe> GetKeys(PropertyModification[] modificatio
                     int keyIndex = curve.GetKeyframeIndex(state.time);
                     if (keyIndex >= 0)
                     {
-                        keys.Add(curve.m_Keyframes[keyIndex]);
+                        keys.Add(curve.keyframes[keyIndex]);
                     }
                 }
             }
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowCurve.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowCurve.cs
index 966a51b453..c7d0cf939e 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowCurve.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowCurve.cs
@@ -15,7 +15,7 @@ internal class AnimationWindowCurve : IComparable<AnimationWindowCurve>, IEquata
     {
         public const float timeEpsilon = 0.00001f;
 
-        public List<AnimationWindowKeyframe> m_Keyframes;
+        private List<AnimationWindowKeyframe> m_Keyframes;
 
         private EditorCurveBinding m_Binding;
         private int m_BindingHashCode;
@@ -46,6 +46,8 @@ 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; } }
 
+        public IReadOnlyList<AnimationWindowKeyframe> keyframes => m_Keyframes;
+
         private object defaultValue
         {
             get
@@ -190,17 +192,10 @@ public AnimationCurve ToAnimationCurve()
             AnimationCurve animationCurve = new AnimationCurve();
             List<Keyframe> keys = new List<Keyframe>();
 
-            float lastFrameTime = float.MinValue;
-
             for (int i = 0; i < length; i++)
             {
-                // Make sure we don't get two keyframes in an exactly the same time. We just ignore those.
-                if (Mathf.Abs(m_Keyframes[i].time - lastFrameTime) > AnimationWindowCurve.timeEpsilon)
-                {
-                    Keyframe newKeyframe = m_Keyframes[i].ToKeyframe();
-                    keys.Add(newKeyframe);
-                    lastFrameTime = m_Keyframes[i].time;
-                }
+                Keyframe newKeyframe = m_Keyframes[i].ToKeyframe();
+                keys.Add(newKeyframe);
             }
 
             animationCurve.keys = keys.ToArray();
@@ -212,17 +207,10 @@ public ObjectReferenceKeyframe[] ToObjectCurve()
             int length = m_Keyframes.Count;
             List<ObjectReferenceKeyframe> keys = new List<ObjectReferenceKeyframe>();
 
-            float lastFrameTime = float.MinValue;
-
             for (int i = 0; i < length; i++)
             {
-                // Make sure we don't get two keyframes in an exactly the same time. We just ignore those.
-                if (Mathf.Abs(m_Keyframes[i].time - lastFrameTime) > AnimationWindowCurve.timeEpsilon)
-                {
-                    ObjectReferenceKeyframe newKeyframe = m_Keyframes[i].ToObjectReferenceKeyframe();
-                    lastFrameTime = newKeyframe.time;
-                    keys.Add(newKeyframe);
-                }
+                ObjectReferenceKeyframe newKeyframe = m_Keyframes[i].ToObjectReferenceKeyframe();
+                keys.Add(newKeyframe);
             }
 
             keys.Sort((a, b) => a.time.CompareTo(b.time));
@@ -301,6 +289,11 @@ public void RemoveKeyframe(AnimationKeyTime time)
             }
         }
 
+        public void RemoveKeyframe(AnimationWindowKeyframe keyframe)
+        {
+            m_Keyframes.Remove(keyframe);
+        }
+
         public bool HasKeyframe(AnimationKeyTime time)
         {
             return GetKeyframeIndex(time) != -1;
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowEvent.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowEvent.cs
index 613cfa17ff..4b3cce3606 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowEvent.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowEvent.cs
@@ -13,10 +13,46 @@
 
 namespace UnityEditor
 {
-    internal struct AnimationWindowEventMethod
+    /// <summary>
+    /// Holds the context for AnimationEvent editing.
+    /// </summary>
+    class AnimationEventEditorState
     {
-        public string name;
-        public Type parameterType;
+        static bool s_ShowOverloadedFunctionsDetails = true;
+        static bool s_ShowDuplicatedFunctionsDetails = true;
+
+        bool m_ShowOverloadedFunctionsDetails = s_ShowOverloadedFunctionsDetails;
+        bool m_ShowDuplicatedFunctionsDetails = s_ShowDuplicatedFunctionsDetails;
+
+        /// <summary>
+        /// Used to track whether or not to show extra details about duplicated function names found in among the potential supported functions
+        /// </summary>
+        public bool ShowOverloadedFunctionsDetails
+        {
+            get => m_ShowOverloadedFunctionsDetails;
+            set
+            {
+                m_ShowOverloadedFunctionsDetails = s_ShowOverloadedFunctionsDetails = value;
+            }
+        }
+
+        /// <summary>
+        /// Used to track whether or not to show extra details about overloaded function names found in among the potential supported functions
+        /// </summary>
+        public bool ShowDuplicatedFunctionsDetails
+        {
+            get => m_ShowDuplicatedFunctionsDetails;
+            set
+            {
+                m_ShowDuplicatedFunctionsDetails = s_ShowDuplicatedFunctionsDetails = value;
+            }
+        }
+
+        public AnimationEventEditorState()
+        {
+            m_ShowOverloadedFunctionsDetails = s_ShowOverloadedFunctionsDetails;
+            m_ShowDuplicatedFunctionsDetails = s_ShowDuplicatedFunctionsDetails;
+        }
     }
 
     internal class AnimationWindowEvent : ScriptableObject
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowEventInspector.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowEventInspector.cs
index 126b3879a1..54ad4942ad 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowEventInspector.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowEventInspector.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using UnityEngine;
 using UnityEditor;
-using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using System;
@@ -17,15 +16,18 @@ namespace UnityEditor
     [CanEditMultipleObjects]
     internal class AnimationWindowEventInspector : Editor
     {
+        public static GUIContent s_OverloadWarning = EditorGUIUtility.TrTextContent("Some functions were overloaded in MonoBehaviour components and may not work as intended if used with Animation Events!");
+        public static GUIContent s_DuplicatesWarning = EditorGUIUtility.TrTextContent("Some functions have the same name across several Monobehaviour components and may not work as intended if used with Animation Events!");
+
         const string kNotSupportedPostFix = " (Function Not Supported)";
         const string kNoneSelected = "(No Function Selected)";
 
-        public static GUIContent s_OverloadWarning = EditorGUIUtility.TrTextContent("Some functions were overloaded in MonoBehaviour components and may not work as intended if used with Animation Events!");
+        AnimationEventEditorState m_State = new();
 
         public override void OnInspectorGUI()
         {
             var awes = targets.Select(o => o as AnimationWindowEvent).ToArray();
-            OnEditAnimationEvents(awes);
+            OnEditAnimationEvents(awes, m_State);
         }
 
         protected override void OnHeaderGUI()
@@ -34,12 +36,17 @@ protected override void OnHeaderGUI()
             DrawHeaderGUI(this, targetTitle);
         }
 
-        public static void OnEditAnimationEvent(AnimationWindowEvent awe)
+        public static void OnEditAnimationEvent(AnimationWindowEvent awe, AnimationEventEditorState state)
         {
-            OnEditAnimationEvents(new AnimationWindowEvent[] {awe});
+            OnEditAnimationEvents(new AnimationWindowEvent[] {awe}, state);
         }
 
-        public static void OnEditAnimationEvents(AnimationWindowEvent[] awEvents)
+        // These are used so we don't alloc new lists on every call
+        static List<AnimationMethodMap> supportedMethods;
+        static List<AnimationMethodMap> overloads;
+        static List<AnimationMethodMap> duplicates;
+
+        public static void OnEditAnimationEvents(AnimationWindowEvent[] awEvents, AnimationEventEditorState state)
         {
             AnimationWindowEventData data = GetData(awEvents);
             if (data.events == null || data.selectedEvents == null || data.selectedEvents.Length == 0)
@@ -53,64 +60,60 @@ public static void OnEditAnimationEvents(AnimationWindowEvent[] awEvents)
 
             if (data.root != null)
             {
-                List<AnimationWindowEventMethod> methods = new List<AnimationWindowEventMethod>();
-                HashSet<string> overloads = new HashSet<string>();
-                CollectSupportedMethods(data.root, methods, overloads);
+                supportedMethods ??= new List<AnimationMethodMap>();
+                overloads ??= new List<AnimationMethodMap>();
+                duplicates ??= new List<AnimationMethodMap>();
 
-                var methodsFormatted = new List<string>(methods.Count);
+                supportedMethods.Clear();
+                overloads.Clear();
+                duplicates.Clear();
+                CollectSupportedMethods(data.root, supportedMethods, overloads, duplicates);
 
-                for (int i = 0; i < methods.Count; ++i)
-                {
-                    AnimationWindowEventMethod method = methods[i];
+                int selected = supportedMethods.FindIndex(method => method.Name == firstEvent.functionName);
 
-                    string postFix = " ( )";
-                    if (method.parameterType != null)
-                    {
-                        if (method.parameterType == typeof(float))
-                            postFix = " ( float )";
-                        else if (method.parameterType == typeof(int))
-                            postFix = " ( int )";
-                        else
-                            postFix = string.Format(" ( {0} )", method.parameterType.Name);
-                    }
+                // A non-empty array used for rendering the contents of the popup
+                // It is of size 1 greater than the list of supported methods to account for the "None" option
+                string[] methodsFormatted = new string[supportedMethods.Count + 1];
 
-                    methodsFormatted.Add(method.name + postFix);
+                for (int i = 0; i < supportedMethods.Count; ++i)
+                {
+                    AnimationMethodMap methodMap = supportedMethods[i];
+                    string menuPath = methodMap.methodMenuPath;
+                    methodsFormatted[i] = menuPath;
                 }
 
-                int notSupportedIndex = methods.Count;
-                int selected = methods.FindIndex(method => method.name == firstEvent.functionName);
+                // Add a final option to set the function to no selected function
+                int notSupportedIndex = supportedMethods.Count;
                 if (selected == -1)
                 {
-                    selected = methods.Count;
-
-                    AnimationWindowEventMethod newMethod = new AnimationWindowEventMethod();
-                    newMethod.name = firstEvent.functionName;
-                    newMethod.parameterType = null;
-
-                    methods.Add(newMethod);
+                    selected = notSupportedIndex;
 
+                    // Display that the current function is not supported if applicable
                     if (string.IsNullOrEmpty(firstEvent.functionName))
-                        methodsFormatted.Add(kNoneSelected);
+                        methodsFormatted[notSupportedIndex] = kNoneSelected;
                     else
-                        methodsFormatted.Add(firstEvent.functionName + kNotSupportedPostFix);
+                        methodsFormatted[notSupportedIndex] = firstEvent.functionName + kNotSupportedPostFix;
+
+                    var emptyMethodMap = new AnimationMethodMap();
+                    supportedMethods.Add(emptyMethodMap);
                 }
 
                 EditorGUIUtility.labelWidth = 130;
 
                 EditorGUI.showMixedValue = !singleFunctionName;
                 int wasSelected = singleFunctionName ? selected : -1;
-                selected = EditorGUILayout.Popup("Function: ", selected, methodsFormatted.ToArray());
+                selected = EditorGUILayout.Popup("Function: ", selected, methodsFormatted);
                 if (wasSelected != selected && selected != -1 && selected != notSupportedIndex)
                 {
                     foreach (var evt in data.selectedEvents)
                     {
-                        evt.functionName = methods[selected].name;
+                        evt.functionName = supportedMethods[selected].Name;
                         evt.stringParameter = string.Empty;
                     }
                 }
                 EditorGUI.showMixedValue = false;
 
-                var selectedParameter = methods[selected].parameterType;
+                var selectedParameter = supportedMethods[selected].parameterType;
 
                 if (singleFunctionName && selectedParameter != null)
                 {
@@ -127,6 +130,24 @@ public static void OnEditAnimationEvents(AnimationWindowEvent[] awEvents)
                 {
                     EditorGUILayout.Space();
                     EditorGUILayout.HelpBox(s_OverloadWarning.text, MessageType.Warning, true);
+                    state.ShowOverloadedFunctionsDetails = EditorGUILayout.Foldout(state.ShowOverloadedFunctionsDetails, "Show Details");
+                    if (state.ShowOverloadedFunctionsDetails)
+                    {
+                        string overloadedFunctionDetails = "Overloaded Functions: \n" + GetFormattedMethodsText(overloads);
+                        GUILayout.Label(overloadedFunctionDetails, EditorStyles.helpBox);
+                    }
+                }
+
+                if (duplicates.Count > 0)
+                {
+                    EditorGUILayout.Space();
+                    EditorGUILayout.HelpBox(s_DuplicatesWarning.text, MessageType.Warning, true);
+                    state.ShowDuplicatedFunctionsDetails = EditorGUILayout.Foldout(state.ShowDuplicatedFunctionsDetails, "Show Details");
+                    if (state.ShowDuplicatedFunctionsDetails)
+                    {
+                        string duplicatedFunctionDetails = "Duplicated Functions: \n" + GetFormattedMethodsText(duplicates);
+                        GUILayout.Label(duplicatedFunctionDetails, EditorStyles.helpBox);
+                    }
                 }
             }
             else
@@ -152,7 +173,7 @@ public static void OnEditAnimationEvents(AnimationWindowEvent[] awEvents)
                     using (new EditorGUI.DisabledScope(true))
                     {
                         AnimationEvent dummyEvent = new AnimationEvent();
-                        DoEditRegularParameters(new AnimationEvent[] {dummyEvent}, typeof(AnimationEvent));
+                        DoEditRegularParameters(new AnimationEvent[] { dummyEvent }, typeof(AnimationEvent));
                     }
                 }
             }
@@ -161,6 +182,44 @@ public static void OnEditAnimationEvents(AnimationWindowEvent[] awEvents)
                 SetData(awEvents, data);
         }
 
+        static string GetFormattedMethodsText(List<AnimationMethodMap> methods)
+        {
+            string text = "";
+            foreach (AnimationMethodMap methodMap in methods)
+            {
+                text += string.Format("{0}.{1} ( {2} )\n", methodMap.sourceBehaviour.GetType().Name, methodMap.Name, GetTypeName(methodMap.parameterType));
+            }
+            text = text.Trim();
+            return text;
+        }
+
+        static string GetTypeName(Type t)
+        {
+            if (t == null)
+                return "";
+            if (t == typeof(int))
+                return "int";
+            if (t == typeof(float))
+                return "float";
+            if (t == typeof(string))
+                return "string";
+            if (t == typeof(bool))
+                return "bool";
+            return t.Name;
+        }
+
+        static string GetFormattedMethodName(AnimationMethodMap methodMap)
+        {
+            string targetName = methodMap.sourceBehaviour.GetType().Name;
+            string methodName = methodMap.Name;
+            string args = GetTypeName(methodMap.parameterType);
+
+            if (methodName.StartsWith("set_") || methodName.StartsWith("get_"))
+                return string.Format("{0}/Properties/{1} ( {2} )", targetName, methodName, args);
+            else
+                return string.Format("{0}/Methods/{1} ( {2} )", targetName, methodName, args);
+        }
+
         public static void OnDisabledAnimationEvent()
         {
             AnimationEvent dummyEvent = new AnimationEvent();
@@ -168,11 +227,13 @@ public static void OnDisabledAnimationEvent()
             using (new EditorGUI.DisabledScope(true))
             {
                 dummyEvent.functionName = EditorGUILayout.TextField(EditorGUIUtility.TrTextContent("Function"), dummyEvent.functionName);
-                DoEditRegularParameters(new AnimationEvent[] {dummyEvent}, typeof(AnimationEvent));
+                DoEditRegularParameters(new AnimationEvent[] { dummyEvent }, typeof(AnimationEvent));
             }
         }
 
-        public static void CollectSupportedMethods(GameObject gameObject, List<AnimationWindowEventMethod> supportedMethods, HashSet<string> overloadedMethods)
+        static Dictionary<Type, IReadOnlyList<AnimationMethodMap>> s_TypeAnimationMethodMapCache = new Dictionary<Type, IReadOnlyList<AnimationMethodMap>>();
+
+        static void CollectSupportedMethods(GameObject gameObject, List<AnimationMethodMap> supportedMethods, List<AnimationMethodMap> overloadedMethods, List<AnimationMethodMap> duplicatedMethods)
         {
             if (gameObject == null)
                 return;
@@ -187,59 +248,99 @@ public static void CollectSupportedMethods(GameObject gameObject, List<Animation
                 Type type = behaviour.GetType();
                 while (type != typeof(MonoBehaviour) && type != null)
                 {
-                    MethodInfo[] methods = type.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly);
-                    for (int i = 0; i < methods.Length; i++)
+                    if (!s_TypeAnimationMethodMapCache.TryGetValue(type, out IReadOnlyList<AnimationMethodMap> validMethods))
                     {
-                        MethodInfo method = methods[i];
-                        string name = method.Name;
+                        var pendingValidMethods = new List<AnimationMethodMap>();
+                        MethodInfo[] methods = type.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly );
+                        for (int i = 0; i < methods.Length; i++)
+                        {
+                            MethodInfo method = methods[i];
+                            string name = method.Name;
 
-                        if (!IsSupportedMethodName(name))
-                            continue;
+                            if (!IsSupportedMethodName(name))
+                                continue;
 
-                        ParameterInfo[] parameters = method.GetParameters();
-                        if (parameters.Length > 1)
-                            continue;
+                            ParameterInfo[] parameters = method.GetParameters();
+                            if (parameters.Length > 1)
+                                continue;
 
-                        Type parameterType = null;
+                            Type parameterType = null;
 
-                        if (parameters.Length == 1)
-                        {
-                            parameterType = parameters[0].ParameterType;
-                            if (!(parameterType == typeof(string) ||
-                                  parameterType == typeof(float) ||
-                                  parameterType == typeof(int) ||
-                                  parameterType == typeof(AnimationEvent) ||
-                                  parameterType == typeof(UnityEngine.Object) ||
-                                  parameterType.IsSubclassOf(typeof(UnityEngine.Object)) ||
-                                  parameterType.IsEnum))
-                                continue;
+                            if (parameters.Length == 1)
+                            {
+                                parameterType = parameters[0].ParameterType;
+                                if (!(parameterType == typeof(string) ||
+                                      parameterType == typeof(float) ||
+                                      parameterType == typeof(int) ||
+                                      parameterType == typeof(AnimationEvent) ||
+                                      parameterType == typeof(UnityEngine.Object) ||
+                                      parameterType.IsSubclassOf(typeof(UnityEngine.Object)) ||
+                                      parameterType.IsEnum))
+                                    continue;
+                            }
+
+                            AnimationMethodMap newMethodMap = new AnimationMethodMap
+                            {
+                                sourceBehaviour = behaviour,
+                                methodInfo = method,
+                                parameterType = parameterType
+                            };
+
+                            newMethodMap.methodMenuPath = GetFormattedMethodName(newMethodMap);
+
+                            pendingValidMethods.Add(newMethodMap);
                         }
 
-                        AnimationWindowEventMethod newMethod = new AnimationWindowEventMethod();
-                        newMethod.name = method.Name;
-                        newMethod.parameterType = parameterType;
+                        validMethods = pendingValidMethods.AsReadOnly();
+                        s_TypeAnimationMethodMapCache.Add(type, validMethods);
+                    }
 
+                    foreach (var method in validMethods)
+                    {
                         // Since AnimationEvents only stores method name, it can't handle functions with multiple overloads.
-                        // Only retrieve first found function, but discard overloads.
-                        int existingMethodIndex = supportedMethods.FindIndex(m => m.name == name);
+                        // or functions with the same name across multiple monobehaviours
+                        // Only retrieve first found method, and discard overloads and duplicate names.
+                        int existingMethodIndex = supportedMethods.FindIndex(m => m.Name == method.Name);
                         if (existingMethodIndex != -1)
                         {
                             // The method is only ambiguous if it has a different signature to the one we saw before
-                            if (supportedMethods[existingMethodIndex].parameterType != parameterType)
+                            if (supportedMethods[existingMethodIndex].parameterType != method.parameterType)
+                            {
+                                overloadedMethods.Add(method);
+                            }
+                            // Otherwise, there is another monobehaviour with the same method name.
+                            else
                             {
-                                overloadedMethods.Add(name);
+                                duplicatedMethods.Add(method);
                             }
                         }
                         else
                         {
-                            supportedMethods.Add(newMethod);
+                            supportedMethods.Add(method);
                         }
                     }
+
                     type = type.BaseType;
                 }
             }
         }
 
+        /// <summary>
+        /// Maps the methodInfo and paramter type of a considered animation method to a source monobeheaviour.
+        /// Mimics the structure of <see cref="UnityEditorInternal.UnityEventDrawer.ValidMethodMap"/>
+        /// </summary>
+        struct AnimationMethodMap
+        {
+            public Object sourceBehaviour;
+            public MethodInfo methodInfo;
+            public Type parameterType;
+
+            // Used for caching
+            public string methodMenuPath;
+
+            public string Name => methodInfo?.Name ?? "";
+        }
+
         public static string FormatEvent(GameObject root, AnimationEvent evt)
         {
             if (string.IsNullOrEmpty(evt.functionName))
@@ -272,7 +373,7 @@ public static string FormatEvent(GameObject root, AnimationEvent evt)
                 if (method == null)
                     continue;
 
-                var parameterTypes = method.GetParameters().Select(p => p.ParameterType);
+                var parameterTypes = method.GetParameters();
                 return evt.functionName + FormatEventArguments(parameterTypes, evt);
             }
 
@@ -381,15 +482,15 @@ private static bool IsSupportedMethodName(string name)
             return name != "Main" && name != "Start" && name != "Awake" && name != "Update";
         }
 
-        private static string FormatEventArguments(IEnumerable<Type> paramTypes, AnimationEvent evt)
+        private static string FormatEventArguments(ParameterInfo[] paramTypes, AnimationEvent evt)
         {
-            if (!paramTypes.Any())
+            if (paramTypes.Length == 0)
                 return " ( )";
 
-            if (paramTypes.Count() > 1)
+            if (paramTypes.Length > 1)
                 return kNotSupportedPostFix;
 
-            var paramType = paramTypes.First();
+            var paramType = paramTypes[0].ParameterType;
 
             if (paramType == typeof(string))
                 return " ( \"" + evt.stringParameter + "\" )";
@@ -426,6 +527,9 @@ private struct AnimationWindowEventData
             public AnimationEvent[] selectedEvents;
         }
 
+
+        // this are used so we don't alloc new lists on every call
+        static List<AnimationEvent> getDataSelectedEvents;
         private static AnimationWindowEventData GetData(AnimationWindowEvent[] awEvents)
         {
             var data = new AnimationWindowEventData();
@@ -444,14 +548,15 @@ private static AnimationWindowEventData GetData(AnimationWindowEvent[] awEvents)
 
             if (data.events != null)
             {
-                List<AnimationEvent> selectedEvents = new List<AnimationEvent>();
+                getDataSelectedEvents ??= new List<AnimationEvent>();
+                getDataSelectedEvents.Clear();
                 foreach (var awEvent in awEvents)
                 {
                     if (awEvent.eventIndex >= 0 && awEvent.eventIndex < data.events.Length)
-                        selectedEvents.Add(data.events[awEvent.eventIndex]);
+                        getDataSelectedEvents.Add(data.events[awEvent.eventIndex]);
                 }
 
-                data.selectedEvents = selectedEvents.ToArray();
+                data.selectedEvents = getDataSelectedEvents.ToArray();
             }
 
             return data;
@@ -481,7 +586,7 @@ private static void SetData(AnimationWindowEvent[] awEvents, AnimationWindowEven
         static void ResetValues(MenuCommand command)
         {
             AnimationWindowEvent awEvent = command.context as AnimationWindowEvent;
-            AnimationWindowEvent[] awEvents = new AnimationWindowEvent[] {awEvent};
+            AnimationWindowEvent[] awEvents = new AnimationWindowEvent[] { awEvent };
 
             AnimationWindowEventData data = GetData(awEvents);
             if (data.events == null || data.selectedEvents == null || data.selectedEvents.Length == 0)
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs
index 1d1ae47c7e..1154cf213e 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs
@@ -342,7 +342,7 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
 
                     if (curve.valueType == typeof(bool))
                     {
-                        value = GUI.Toggle(valueFieldRect, m_HierarchyItemValueControlIDs[row], (float)value != 0, GUIContent.none, EditorStyles.toggle) ? 1f : 0f;
+                        value = GUI.Toggle(valueFieldRect, m_HierarchyItemValueControlIDs[row], Convert.ToSingle(value) != 0f, GUIContent.none, EditorStyles.toggle) ? 1f : 0f;
                     }
                     else
                     {
@@ -365,7 +365,7 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
                                 valueFieldRect,
                                 valueFieldDragRect,
                                 id,
-                                (int)value,
+                                Convert.ToInt32(value),
                                 EditorGUI.kIntFieldFormatString,
                                 m_AnimationSelectionTextField,
                                 true,
@@ -382,7 +382,7 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
                                 valueFieldRect,
                                 valueFieldDragRect,
                                 id,
-                                (float)value,
+                                Convert.ToSingle(value),
                                 "g5",
                                 m_AnimationSelectionTextField,
                                 true);
@@ -392,7 +392,8 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
                                 Event.current.Use();
                             }
 
-                            if (float.IsInfinity((float)value) || float.IsNaN((float)value))
+                            var floatValue = Convert.ToSingle(value);
+                            if (float.IsInfinity(floatValue) || float.IsNaN(floatValue))
                                 value = 0f;
                         }
                     }
@@ -491,7 +492,7 @@ private void DoCurveColorIndicator(Rect rect, AnimationWindowHierarchyNode node)
             {
                 foreach (var curve in node.curves)
                 {
-                    if (curve.m_Keyframes.Any(key => state.time.ContainsTime(key.time)))
+                    if (curve.keyframes.Any(key => state.time.ContainsTime(key.time)))
                     {
                         hasKey = true;
                     }
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowKeyframe.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowKeyframe.cs
index cbdfa58b5e..e9fa64f7fa 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowKeyframe.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowKeyframe.cs
@@ -149,9 +149,9 @@ public int GetHash()
 
         public int GetIndex()
         {
-            for (int i = 0; i < curve.m_Keyframes.Count; i++)
+            for (int i = 0; i < curve.keyframes.Count; i++)
             {
-                if (curve.m_Keyframes[i] == this)
+                if (curve.keyframes[i] == this)
                 {
                     return i;
                 }
@@ -167,11 +167,11 @@ public Keyframe ToKeyframe()
                 // 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));
+                floatValue = UnityEngine.Animations.DiscreteEvaluationAttributeUtilities.ConvertDiscreteIntToFloat(Math.Max(Convert.ToInt32(value), 0));
             }
             else
             {
-                floatValue = (float)value;
+                floatValue = Convert.ToSingle(value);
             }
 
             var keyframe = new Keyframe(time, floatValue, inTangent, outTangent);
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs
index c7fc0557f5..d0c4120b18 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs
@@ -514,7 +514,7 @@ private void SaveSelectedKeys(string undoLabel)
                 List<AnimationWindowKeyframe> toBeDeleted = new List<AnimationWindowKeyframe>();
 
                 // If selected keys are dragged over non-selected keyframe at exact same time, then delete the unselected ones underneath
-                foreach (AnimationWindowKeyframe other in snapshot.curve.m_Keyframes)
+                foreach (AnimationWindowKeyframe other in snapshot.curve.keyframes)
                 {
                     // Keyframe is in selection, skip.
                     if (snapshot.selectedKeys.Exists(liveEditKey => liveEditKey.key == other))
@@ -529,7 +529,7 @@ private void SaveSelectedKeys(string undoLabel)
 
                 foreach (AnimationWindowKeyframe deletedKey in toBeDeleted)
                 {
-                    snapshot.curve.m_Keyframes.Remove(deletedKey);
+                    snapshot.curve.RemoveKeyframe(deletedKey);
                 }
             }
 
@@ -984,7 +984,7 @@ public AnimationWindowKeyframe activeKeyframe
                 {
                     foreach (AnimationWindowCurve curve in filteredCurves)
                     {
-                        foreach (AnimationWindowKeyframe keyframe in curve.m_Keyframes)
+                        foreach (AnimationWindowKeyframe keyframe in curve.keyframes)
                         {
                             if (keyframe.GetHash() == m_ActiveKeyframeHash)
                                 m_ActiveKeyframeCache = keyframe;
@@ -1009,7 +1009,7 @@ public List<AnimationWindowKeyframe> selectedKeys
                     m_SelectedKeysCache = new List<AnimationWindowKeyframe>();
                     foreach (AnimationWindowCurve curve in filteredCurves)
                     {
-                        foreach (AnimationWindowKeyframe keyframe in curve.m_Keyframes)
+                        foreach (AnimationWindowKeyframe keyframe in curve.keyframes)
                         {
                             if (KeyIsSelected(keyframe))
                             {
@@ -1139,7 +1139,7 @@ public void DeleteKeys(List<AnimationWindowKeyframe> keys)
                 curves.Add(keyframe.curve);
 
                 UnselectKey(keyframe);
-                keyframe.curve.m_Keyframes.Remove(keyframe);
+                keyframe.curve.RemoveKeyframe(keyframe);
             }
 
             SaveCurves(activeAnimationClip, curves, kEditCurveUndoLabel);
@@ -1162,7 +1162,7 @@ public void StartLiveEdit()
                 {
                     LiveEditCurve snapshot = new LiveEditCurve();
                     snapshot.curve = selectedKey.curve;
-                    foreach (AnimationWindowKeyframe key in selectedKey.curve.m_Keyframes)
+                    foreach (AnimationWindowKeyframe key in selectedKey.curve.keyframes)
                     {
                         LiveEditKeyframe liveEditKey = new LiveEditKeyframe();
                         liveEditKey.keySnapshot = new AnimationWindowKeyframe(key);
@@ -1400,7 +1400,7 @@ public void CopyAllActiveCurves()
         {
             foreach (AnimationWindowCurve curve in activeCurves)
             {
-                foreach (AnimationWindowKeyframe keyframe in curve.m_Keyframes)
+                foreach (AnimationWindowKeyframe keyframe in curve.keyframes)
                 {
                     s_KeyframeClipboard.Add(new AnimationWindowKeyframe(keyframe));
                 }
@@ -1476,14 +1476,16 @@ public void PasteKeys()
                 //  Only allow pasting of key frame from numerical curves to numerical curves or from pptr curves to pptr curves.
                 if ((newKeyframe.time >= 0.0f) && (newKeyframe.curve != null) && (newKeyframe.curve.isPPtrCurve == keyframe.curve.isPPtrCurve))
                 {
-                    if (newKeyframe.curve.HasKeyframe(AnimationKeyTime.Time(newKeyframe.time, newKeyframe.curve.clip.frameRate)))
-                        newKeyframe.curve.RemoveKeyframe(AnimationKeyTime.Time(newKeyframe.time, newKeyframe.curve.clip.frameRate));
+                    var keyTime = AnimationKeyTime.Time(newKeyframe.time, newKeyframe.curve.clip.frameRate);
+
+                    if (newKeyframe.curve.HasKeyframe(keyTime))
+                        newKeyframe.curve.RemoveKeyframe(keyTime);
 
                     // When copy-pasting multiple keyframes (curve), its a continous thing. This is why we delete the existing keyframes in the pasted range.
                     if (lastTargetCurve == newKeyframe.curve)
                         newKeyframe.curve.RemoveKeysAtRange(lastTime, newKeyframe.time);
 
-                    newKeyframe.curve.m_Keyframes.Add(newKeyframe);
+                    newKeyframe.curve.AddKeyframe(newKeyframe, keyTime);
                     SelectKey(newKeyframe);
                     // TODO: Optimize to only save curve once instead once per keyframe
                     SaveCurve(newKeyframe.curve.clip, newKeyframe.curve, kEditCurveUndoLabel);
@@ -1838,7 +1840,7 @@ public float clipFrameRate
                     // Reposition all keyframes to match the new sampling rate
                     foreach (var curve in allCurves)
                     {
-                        foreach (var key in curve.m_Keyframes)
+                        foreach (var key in curve.keyframes)
                         {
                             int frame = AnimationKeyTime.Time(key.time, clipFrameRate).frame;
                             key.time = AnimationKeyTime.Frame(frame, value).time;
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs
index 89ae6d3ddf..09e02c7084 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs
@@ -280,7 +280,7 @@ public static AnimationWindowKeyframe AddKeyframeToCurve(AnimationWindowCurve cu
             }
             else if (type == typeof(bool) || type == typeof(float) || type == typeof(int))
             {
-                Keyframe tempKey = new Keyframe(time.time, (float)value);
+                Keyframe tempKey = new Keyframe(time.time, Convert.ToSingle(value));
                 if (type == typeof(bool))
                 {
                     AnimationUtility.SetKeyLeftTangentMode(ref tempKey, TangentMode.Constant);
@@ -888,7 +888,7 @@ public static float GetNextKeyframeTime(AnimationWindowCurve[] curves, float cur
 
             foreach (AnimationWindowCurve curve in curves)
             {
-                foreach (AnimationWindowKeyframe keyframe in curve.m_Keyframes)
+                foreach (AnimationWindowKeyframe keyframe in curve.keyframes)
                 {
                     AnimationKeyTime keyTime = AnimationKeyTime.Time(keyframe.time, frameRate);
                     if (keyTime.frame <= candidateKeyTime.frame && keyTime.frame >= nextTime.frame)
@@ -914,7 +914,7 @@ public static float GetPreviousKeyframeTime(AnimationWindowCurve[] curves, float
 
             foreach (AnimationWindowCurve curve in curves)
             {
-                foreach (AnimationWindowKeyframe keyframe in curve.m_Keyframes)
+                foreach (AnimationWindowKeyframe keyframe in curve.keyframes)
                 {
                     AnimationKeyTime keyTime = AnimationKeyTime.Time(keyframe.time, frameRate);
                     if (keyTime.frame >= candidateKeyTime.frame && keyTime.frame <= previousTime.frame)
@@ -1299,8 +1299,8 @@ public static AnimationWindowKeyframe CurveSelectionToAnimationWindowKeyframe(Cu
             {
                 int curveID = curve.GetHashCode();
                 if (curveID == curveSelection.curveID)
-                    if (curve.m_Keyframes.Count > curveSelection.key)
-                        return curve.m_Keyframes[curveSelection.key];
+                    if (curve.keyframes.Count > curveSelection.key)
+                        return curve.keyframes[curveSelection.key];
             }
 
             return null;
diff --git a/Editor/Mono/Animation/AnimationWindow/DopeLine.cs b/Editor/Mono/Animation/AnimationWindow/DopeLine.cs
index c576b1cf2c..da6b52f5f0 100644
--- a/Editor/Mono/Animation/AnimationWindow/DopeLine.cs
+++ b/Editor/Mono/Animation/AnimationWindow/DopeLine.cs
@@ -98,7 +98,7 @@ public List<AnimationWindowKeyframe> keys
                 {
                     m_Keys = new List<AnimationWindowKeyframe>();
                     foreach (AnimationWindowCurve curve in m_Curves)
-                        foreach (AnimationWindowKeyframe key in curve.m_Keyframes)
+                        foreach (AnimationWindowKeyframe key in curve.keyframes)
                             m_Keys.Add(key);
 
                     m_Keys.Sort((a, b) => a.time.CompareTo(b.time));
diff --git a/Editor/Mono/Animation/AnimationWindow/DopeSheetEditor.cs b/Editor/Mono/Animation/AnimationWindow/DopeSheetEditor.cs
index eb2bb1b48a..ae4b219977 100644
--- a/Editor/Mono/Animation/AnimationWindow/DopeSheetEditor.cs
+++ b/Editor/Mono/Animation/AnimationWindow/DopeSheetEditor.cs
@@ -806,7 +806,7 @@ private void AssignSpriteToSpriteRenderer(AnimationWindowCurve curve)
             if (rootGameObject == null)
                 return;
 
-            var hasValidCurve = curve.m_Keyframes.Count > 0 && curve.binding.type == typeof(SpriteRenderer);
+            var hasValidCurve = curve.keyframes.Count > 0 && curve.binding.type == typeof(SpriteRenderer);
             if (!hasValidCurve)
                 return;
 
@@ -815,7 +815,7 @@ private void AssignSpriteToSpriteRenderer(AnimationWindowCurve curve)
             if (!hasValidSpriteRenderer)
                 return;
 
-            var keyframe = curve.m_Keyframes[0];
+            var keyframe = curve.keyframes[0];
             var sprite = keyframe.value as Sprite;
             if (sprite != null)
             {
@@ -1126,12 +1126,12 @@ public void FrameSelected()
                 {
                     foreach (AnimationWindowCurve curve in state.activeCurves)
                     {
-                        int keyCount = curve.m_Keyframes.Count;
+                        int keyCount = curve.keyframes.Count;
 
                         if (keyCount > 1)
                         {
-                            Vector2 pt1 = new Vector2(curve.m_Keyframes[0].time, 0.0f);
-                            Vector2 pt2 = new Vector2(curve.m_Keyframes[keyCount - 1].time, 0.0f);
+                            Vector2 pt1 = new Vector2(curve.keyframes[0].time, 0.0f);
+                            Vector2 pt2 = new Vector2(curve.keyframes[keyCount - 1].time, 0.0f);
 
                             if (firstKey)
                             {
diff --git a/Editor/Mono/Animation/EditorCurveBinding.bindings.cs b/Editor/Mono/Animation/EditorCurveBinding.bindings.cs
index b8e5a4bfbb..8c64e62385 100644
--- a/Editor/Mono/Animation/EditorCurveBinding.bindings.cs
+++ b/Editor/Mono/Animation/EditorCurveBinding.bindings.cs
@@ -8,6 +8,7 @@
 using UnityEngine.Playables;
 using UnityEngine.Scripting.APIUpdating;
 using UnityEngine.Internal;
+using UnityEngine;
 
 namespace UnityEditor
 {
@@ -128,6 +129,16 @@ static public EditorCurveBinding DiscreteCurve(string inPath, System.Type inType
             binding.m_isSerializeReferenceCurve = 0;
             binding.m_isUnknownCurve = 0;
 
+            if (!AnimationUtility.IsDiscreteIntBinding(binding))
+            {
+                Debug.LogWarning(
+                    $"Property [" + inPropertyName + "] is not a supported discrete curve binding. " +
+                    "Discrete curves only support [" + typeof(Enum) + "] and [" + typeof(int) + " with the `DiscreteEvaluation` attribute].");
+
+                binding.m_isDiscreteCurve = 0;
+                binding.m_isUnknownCurve = 1;
+            }
+
             return binding;
         }
 
diff --git a/Editor/Mono/Animation/TransitionPreview.cs b/Editor/Mono/Animation/TransitionPreview.cs
index 1c2433fb7a..8a7e0da84f 100644
--- a/Editor/Mono/Animation/TransitionPreview.cs
+++ b/Editor/Mono/Animation/TransitionPreview.cs
@@ -269,7 +269,7 @@ private void ResampleTransition(AnimatorStateTransition transition, AvatarMask l
             AnimatorStateInfo currentState = m_AvatarPreview.Animator.GetCurrentAnimatorStateInfo(m_LayerIndex);
             m_LeftStateWeightA = currentState.normalizedTime;
             m_LeftStateTimeA = currentTime;
-            while (!hasFinished && currentTime < maxDuration)
+            while (!hasFinished)
             {
                 m_AvatarPreview.Animator.Update(stepTime);
 
@@ -284,7 +284,7 @@ private void ResampleTransition(AnimatorStateTransition transition, AvatarMask l
                     hasStarted = true;
                 }
 
-                if (hasTransitioned && currentTime >= maxDuration)
+                if (hasTransitioned || currentTime >= maxDuration)
                 {
                     hasFinished = true;
                 }
@@ -303,7 +303,7 @@ private void ResampleTransition(AnimatorStateTransition transition, AvatarMask l
                     m_LeftStateTimeB = currentTime;
                 }
 
-                if (hasTransitioned)
+                if (hasTransitioned || hasFinished)
                 {
                     m_RightStateWeightB = currentState.normalizedTime;
                     m_RightStateTimeB = currentTime;
@@ -329,6 +329,11 @@ private void ResampleTransition(AnimatorStateTransition transition, AvatarMask l
             float leftDuration =  (m_LeftStateTimeB - m_LeftStateTimeA) / (m_LeftStateWeightB - m_LeftStateWeightA);
             float rightDuration = (m_RightStateTimeB - m_RightStateTimeA) / (m_RightStateWeightB - m_RightStateWeightA);
 
+            // Ensure step times make sense based on these timings
+            // If step time is too small, the samping will take too long
+            currentStateStepTime = Mathf.Max(currentStateStepTime, leftDuration / 600.0f);
+            nextStateStepTime = Mathf.Max(nextStateStepTime, rightDuration / 600.0f);
+
             if (m_MustSampleMotions)
             {
                 // Do this as infrequently as possible
diff --git a/Editor/Mono/AnimatorController.bindings.cs b/Editor/Mono/AnimatorController.bindings.cs
index eee994fcb2..40803d59f3 100644
--- a/Editor/Mono/AnimatorController.bindings.cs
+++ b/Editor/Mono/AnimatorController.bindings.cs
@@ -33,6 +33,7 @@ extern public AnimatorControllerLayer[] layers
             [FreeFunction(Name = "AnimatorControllerBindings::GetLayers", HasExplicitThis = true)]
             get;
             [FreeFunction(Name = "AnimatorControllerBindings::SetLayers", HasExplicitThis = true, ThrowsException = true)]
+            [param: Unmarshalled]
             set;
         }
 
@@ -41,6 +42,7 @@ extern public AnimatorControllerParameter[] parameters
             [FreeFunction(Name = "AnimatorControllerBindings::GetParameters", HasExplicitThis = true)]
             get;
             [FreeFunction(Name = "AnimatorControllerBindings::SetParameters", HasExplicitThis = true, ThrowsException = true)]
+            [param: Unmarshalled]
             set;
         }
 
@@ -133,6 +135,6 @@ internal extern  bool isAssetBundled
         extern internal ScriptableObject[] Internal_GetEffectiveBehaviours([NotNull] AnimatorState state, int layerIndex);
 
         [FreeFunction(Name = "AnimatorControllerBindings::Internal_SetEffectiveBehaviours", HasExplicitThis = true)]
-        extern internal void Internal_SetEffectiveBehaviours([NotNull] AnimatorState state, int layerIndex, ScriptableObject[] behaviours);
+        extern internal void Internal_SetEffectiveBehaviours([NotNull] AnimatorState state, int layerIndex, [Unmarshalled] ScriptableObject[] behaviours);
     }
 }
diff --git a/Editor/Mono/Annotation/SceneFXWindow.cs b/Editor/Mono/Annotation/SceneFXWindow.cs
index 4b7a97b2e6..c8b3b6eb94 100644
--- a/Editor/Mono/Annotation/SceneFXWindow.cs
+++ b/Editor/Mono/Annotation/SceneFXWindow.cs
@@ -4,6 +4,7 @@
 
 using System;
 using UnityEngine;
+using UnityEngine.Rendering;
 
 namespace UnityEditor
 {
@@ -74,6 +75,12 @@ private void Draw(Rect rect)
             DrawListElement(drawPos, "Skybox", state.showSkybox, value => state.showSkybox = value);
             drawPos.y += EditorGUI.kSingleLineHeight;
 
+            if(SupportedRenderingFeatures.active.supportsClouds)
+            {
+                DrawListElement(drawPos, "Clouds", state.showClouds, value => state.showClouds = value);
+                drawPos.y += EditorGUI.kSingleLineHeight;
+            }
+
             DrawListElement(drawPos, "Fog", state.showFog, value => state.showFog = value);
             drawPos.y += EditorGUI.kSingleLineHeight;
 
diff --git a/Editor/Mono/AssemblyHelper.cs b/Editor/Mono/AssemblyHelper.cs
index 73a0f4acab..afd649332e 100644
--- a/Editor/Mono/AssemblyHelper.cs
+++ b/Editor/Mono/AssemblyHelper.cs
@@ -7,14 +7,11 @@
 using System.Linq;
 using System.Reflection;
 using System.Collections.Generic;
-using System.Diagnostics;
 using Mono.Cecil;
-using UnityEditor.Build;
 using UnityEditor.Modules;
 using UnityEditorInternal;
 using UnityEngine;
 using System.Runtime.InteropServices;
-using UnityEditor.VisualStudioIntegration;
 using UnityEngine.Scripting;
 using Debug = UnityEngine.Debug;
 using Unity.Profiling;
@@ -24,181 +21,11 @@
 
 namespace UnityEditor
 {
-    internal partial class AssemblyHelper
+    internal class AssemblyHelper
     {
         static Dictionary<string, bool> managedToDllType = new Dictionary<string, bool>();
         static BuildPlayerDataExtractor m_BuildPlayerDataExtractor = new BuildPlayerDataExtractor();
 
-        static public string[] GetNamesOfAssembliesLoadedInCurrentDomain()
-        {
-            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
-            var locations = new List<string>();
-            foreach (var a in assemblies)
-            {
-                try
-                {
-                    locations.Add(a.Location);
-                }
-                catch (NotSupportedException)
-                {
-                    //we have some "dynamic" assmeblies that do not have a filename
-                }
-            }
-            return locations.ToArray();
-        }
-
-        static public string ExtractInternalAssemblyName(string path)
-        {
-            try
-            {
-                AssemblyDefinition definition = AssemblyDefinition.ReadAssembly(path);
-                return definition.Name.Name;
-            }
-            catch
-            {
-                return "";
-            }
-        }
-
-        static AssemblyDefinition GetAssemblyDefinitionCached(string path, Dictionary<string, AssemblyDefinition> cache)
-        {
-            if (cache.ContainsKey(path))
-                return cache[path];
-
-            AssemblyDefinition definition = AssemblyDefinition.ReadAssembly(path);
-            cache[path] = definition;
-            return definition;
-        }
-
-        static private bool CouldBelongToDotNetOrWindowsRuntime(string assemblyPath)
-        {
-            return assemblyPath.IndexOf("mscorlib.dll") != -1 ||
-                assemblyPath.IndexOf("System.") != -1 ||
-                assemblyPath.IndexOf("Microsoft.") != -1 ||
-                assemblyPath.IndexOf("Windows.") != -1 ||
-                assemblyPath.IndexOf("WinRTLegacy.dll") != -1 ||
-                assemblyPath.IndexOf("platform.dll") != -1;
-        }
-
-        static private bool IgnoreAssembly(string assemblyPath, BuildTarget target, ScriptingImplementation scriptingImplementation)
-        {
-#pragma warning disable 618
-            if (target == BuildTarget.WSAPlayer || scriptingImplementation == ScriptingImplementation.CoreCLR)
-            {
-                if (CouldBelongToDotNetOrWindowsRuntime(assemblyPath))
-                    return true;
-            }
-            else if (target == BuildTarget.XboxOne)
-            {
-                var profile = PlayerSettings.GetApiCompatibilityLevel(NamedBuildTarget.XboxOne);
-                if (profile == ApiCompatibilityLevel.NET_4_6 || profile == ApiCompatibilityLevel.NET_Standard_2_0)
-                {
-                    if (CouldBelongToDotNetOrWindowsRuntime(assemblyPath))
-                        return true;
-                }
-            }
-
-            return IsInternalAssembly(assemblyPath);
-        }
-
-        static private void AddReferencedAssembliesRecurse(string assemblyPath, List<string> alreadyFoundAssemblies, string[] allAssemblyPaths, string[] foldersToSearch, Dictionary<string, AssemblyDefinition> cache, BuildTarget target, ScriptingImplementation scriptingImplementation)
-        {
-            if (IgnoreAssembly(assemblyPath, target, scriptingImplementation))
-                return;
-
-            if (!File.Exists(assemblyPath))
-                return;
-
-            AssemblyDefinition assembly = GetAssemblyDefinitionCached(assemblyPath, cache);
-            if (assembly == null)
-                throw new System.ArgumentException("Referenced Assembly " + Path.GetFileName(assemblyPath) + " could not be found!");
-
-            // Ignore it if we already added the assembly
-            if (alreadyFoundAssemblies.IndexOf(assemblyPath) != -1)
-                return;
-
-            alreadyFoundAssemblies.Add(assemblyPath);
-
-            var architectureSpecificPlugins = PluginImporter.GetImporters(target).Where(i =>
-            {
-                var cpu = i.GetPlatformData(target, "CPU");
-                return !string.IsNullOrEmpty(cpu) && !string.Equals(cpu, "AnyCPU", StringComparison.InvariantCultureIgnoreCase);
-            }).Select(i => Path.GetFileName(i.assetPath)).Distinct();
-
-            // Go through all referenced assemblies
-            foreach (AssemblyNameReference referencedAssembly in assembly.MainModule.AssemblyReferences)
-            {
-                // Special cases for Metro
-                if (referencedAssembly.Name == "BridgeInterface") continue;
-                if (referencedAssembly.Name == "WinRTBridge") continue;
-                if (referencedAssembly.Name == "UnityEngineProxy") continue;
-                if (IgnoreAssembly(referencedAssembly.Name + ".dll", target, scriptingImplementation)) continue;
-
-                string foundPath = FindAssemblyName(referencedAssembly.FullName, referencedAssembly.Name, allAssemblyPaths, foldersToSearch, cache);
-
-                if (foundPath == "")
-                {
-                    // Ignore architecture specific plugin references
-                    var found = false;
-                    foreach (var extension in new[] { ".dll", ".winmd" })
-                    {
-                        if (architectureSpecificPlugins.Any(p => string.Equals(p, referencedAssembly.Name + extension, StringComparison.InvariantCultureIgnoreCase)))
-                        {
-                            found = true;
-                            break;
-                        }
-                    }
-                    if (found)
-                        continue;
-                    throw new System.ArgumentException(string.Format("The Assembly {0} is referenced by {1} ('{2}'). But the dll is not allowed to be included or could not be found.",
-                        referencedAssembly.Name,
-                        assembly.MainModule.Assembly.Name.Name,
-                        assemblyPath));
-                }
-
-                AddReferencedAssembliesRecurse(foundPath, alreadyFoundAssemblies, allAssemblyPaths, foldersToSearch, cache, target, scriptingImplementation);
-            }
-        }
-
-        static string FindAssemblyName(string fullName, string name, string[] allAssemblyPaths, string[] foldersToSearch, Dictionary<string, AssemblyDefinition> cache)
-        {
-            // Search in provided assemblies
-            for (int i = 0; i < allAssemblyPaths.Length; i++)
-            {
-                if (!File.Exists(allAssemblyPaths[i]))
-                    continue;
-
-                AssemblyDefinition definition = GetAssemblyDefinitionCached(allAssemblyPaths[i], cache);
-                if (definition.MainModule.Assembly.Name.Name == name)
-                    return allAssemblyPaths[i];
-            }
-
-            // Search in GAC
-            foreach (string folder in foldersToSearch)
-            {
-                string pathInGacFolder = Path.Combine(folder, name + ".dll");
-                if (File.Exists(pathInGacFolder))
-                    return pathInGacFolder;
-            }
-            return "";
-        }
-
-        [RequiredByNativeCode]
-        static public string[] FindAssembliesReferencedBy(string[] paths, string[] foldersToSearch, BuildTarget target, ScriptingImplementation scriptingImplementation)
-        {
-            List<string> unique = new List<string>();
-            string[] allAssemblyPaths = paths;
-
-            var cache = new Dictionary<string, AssemblyDefinition>();
-            for (int i = 0; i < paths.Length; i++)
-                AddReferencedAssembliesRecurse(paths[i], unique, allAssemblyPaths, foldersToSearch, cache, target, scriptingImplementation);
-
-            for (int i = 0; i < paths.Length; i++)
-                unique.Remove(paths[i]);
-
-            return unique.ToArray();
-        }
-
         static public bool IsUnityEngineModule(AssemblyDefinition assembly)
         {
             return assembly.CustomAttributes.Any(a => a.AttributeType.FullName == typeof(UnityEngineModuleAssembly).FullName);
@@ -209,33 +36,6 @@ static public bool IsUnityEngineModule(Assembly assembly)
             return assembly.GetCustomAttributes(typeof(UnityEngineModuleAssembly), false).Length > 0;
         }
 
-        private static bool IsTypeAUserExtendedScript(TypeReference type)
-        {
-            if (type == null || type.FullName == "System.Object")
-                return false;
-
-            try
-            {
-                var typeDefinition = type.Resolve();
-                var attributes = typeDefinition.CustomAttributes;
-                for (var i = 0; i < attributes.Count; i++)
-                {
-                    if (attributes[i].Constructor.DeclaringType.FullName == "UnityEngine.ExtensionOfNativeClassAttribute")
-                        return true;
-                }
-
-                if (typeDefinition.BaseType != null)
-                    return IsTypeAUserExtendedScript(typeDefinition.BaseType);
-            }
-            catch (AssemblyResolutionException)
-            {
-                // just eat exception if we fail to load assembly here.
-                // failure should be handled better in other places.
-            }
-
-            return false;
-        }
-
         public static string[] GetDefaultAssemblySearchPaths()
         {
             // Add the path to all available precompiled assemblies
@@ -359,36 +159,6 @@ public static bool IsInternalAssembly(string file)
             return ModuleUtils.GetAdditionalReferencesForUserScripts().Any(p => p.Equals(file));
         }
 
-        const int kDefaultDepth = 10;
-        internal static ICollection<string> FindAssemblies(string basePath)
-        {
-            return FindAssemblies(basePath, kDefaultDepth);
-        }
-
-        internal static ICollection<string> FindAssemblies(string basePath, int maxDepth)
-        {
-            var assemblies = new List<string>();
-
-            if (0 == maxDepth)
-                return assemblies;
-
-            try
-            {
-                DirectoryInfo directory = new DirectoryInfo(basePath);
-                assemblies.AddRange(directory.GetFiles()
-                    .Where(file => IsManagedAssembly(file.FullName))
-                    .Select(file => file.FullName));
-                foreach (DirectoryInfo subdirectory in directory.GetDirectories())
-                    assemblies.AddRange(FindAssemblies(subdirectory.FullName, maxDepth - 1));
-            }
-            catch (Exception)
-            {
-                // Return what we have now
-            }
-
-            return assemblies;
-        }
-
         /// <summary>
         /// Performs a depth-first-search topological sort on the input assemblies,
         /// based on the outgoing assembly references from each assembly. The
diff --git a/Editor/Mono/AssemblyInfo/AssemblyInfo.cs b/Editor/Mono/AssemblyInfo/AssemblyInfo.cs
index 2682979939..bae9fb7fec 100644
--- a/Editor/Mono/AssemblyInfo/AssemblyInfo.cs
+++ b/Editor/Mono/AssemblyInfo/AssemblyInfo.cs
@@ -7,6 +7,7 @@
 
 // ADD_NEW_PLATFORM_HERE
 [assembly: InternalsVisibleTo("Unity.LiveNotes")]
+[assembly: InternalsVisibleTo("Unity.Audio.Tests")]
 [assembly: InternalsVisibleTo("Unity.Burst")]
 [assembly: InternalsVisibleTo("Unity.Burst.Editor")]
 [assembly: InternalsVisibleTo("Unity.Cloud.Collaborate.Editor")]
@@ -29,7 +30,6 @@
 [assembly: InternalsVisibleTo("Unity.Timeline.Editor")]
 [assembly: InternalsVisibleTo("Unity.PackageManagerUI.Develop.Editor")]
 [assembly: InternalsVisibleTo("Unity.DeviceSimulator.Editor")]
-
 [assembly: InternalsVisibleTo("Unity.Timeline.EditorTests")]
 [assembly: InternalsVisibleTo("UnityEditor.Graphs")]
 [assembly: InternalsVisibleTo("UnityEditor.UWP.Extensions")]
@@ -50,7 +50,6 @@
 [assembly: InternalsVisibleTo("UnityEditor.WindowsStandalone.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.OSXStandalone.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.Lumin.Extensions")]
-[assembly: InternalsVisibleTo("UnityEditor.Stadia.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.GameCoreScarlett.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.GameCoreXboxOne.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.GameCoreCommon.Extensions")]
@@ -130,6 +129,7 @@
 [assembly: InternalsVisibleTo("UnityEditor.TextCoreTextEngineModule")]
 [assembly: InternalsVisibleTo("Unity.TextMeshPro.Editor")]
 [assembly: InternalsVisibleTo("Unity.Animation.Editor.AnimationWindow")]
+[assembly: InternalsVisibleTo("Unity.RenderPipelines.Multiple_SRP.EditorTests")]
 
 [assembly: InternalsVisibleTo("Unity.SceneTemplate.Editor")]
 [assembly: InternalsVisibleTo("com.unity.purchasing.udp.Editor")]
diff --git a/Editor/Mono/AssemblyValidation.cs b/Editor/Mono/AssemblyValidation.cs
index 16f2d3315e..d6d55f3a55 100644
--- a/Editor/Mono/AssemblyValidation.cs
+++ b/Editor/Mono/AssemblyValidation.cs
@@ -137,6 +137,34 @@ public static Error[] ValidateAssemblies(string[] assemblyPaths, bool enableLogg
             return errors;
         }
 
+        [RequiredByNativeCode]
+        internal static Error[] ValidateRoslynAnalyzers(string[] analyzerPaths)
+        {
+            var readerParameters = new ReaderParameters
+            {
+                ReadingMode = ReadingMode.Deferred
+            };
+            List<Error> errors = new List<Error>();
+            foreach(var analyzer in analyzerPaths)
+            {
+                using (var analyzerDefinition = AssemblyDefinition.ReadAssembly(analyzer, readerParameters))
+                {
+                    var netstandardVersion = analyzerDefinition.MainModule.AssemblyReferences.Where(r => r.Name == "netstandard").FirstOrDefault();
+                    if (netstandardVersion != null && netstandardVersion.Version >= new Version(2, 1))
+                    {
+                        errors.Add(new Error
+                        {
+                            assemblyPath = analyzer,
+                            flags = ErrorFlags.ReferenceHasErrors,
+                            message = $"{analyzerDefinition.Name.Name} references {netstandardVersion}. A roslyn analyzer should reference netstandard version 2.0"
+                        });
+                    }
+
+                }
+            }
+            return errors.ToArray();
+        }
+
         [RequiredByNativeCode]
         public static Error[] ValidateAssemblyDefinitionFiles()
         {
diff --git a/Editor/Mono/AssetDatabase/AssetDatabaseSearching.cs b/Editor/Mono/AssetDatabase/AssetDatabaseSearching.cs
index c3bd1ded72..fedd4d13e0 100644
--- a/Editor/Mono/AssetDatabase/AssetDatabaseSearching.cs
+++ b/Editor/Mono/AssetDatabase/AssetDatabaseSearching.cs
@@ -88,7 +88,7 @@ private static IEnumerator<T> FindInFolders<T>(SearchFilter searchFilter, Func<H
                 {
                     // Set filter after we found the folder
                     if (propertyWithFilter != null)
-                        propertyWithFilter.CopySearchFilterFrom(property);
+                        property.CopySearchFilterFrom(propertyWithFilter);
                     else
                     {
                         property.SetSearchFilter(searchFilter);
diff --git a/Editor/Mono/AssetModificationProcessor.cs b/Editor/Mono/AssetModificationProcessor.cs
index 7a58f06380..00bb9a5d37 100644
--- a/Editor/Mono/AssetModificationProcessor.cs
+++ b/Editor/Mono/AssetModificationProcessor.cs
@@ -390,7 +390,7 @@ static Editability GetPathEditability(string assetPath)
         {
             // read-only asset locations (e.g. shared packages) are considered not editable
             bool rootFolder, readOnly;
-            bool validPath = AssetDatabase.GetAssetFolderInfo(assetPath, out rootFolder, out readOnly);
+            bool validPath = AssetDatabase.TryGetAssetFolderInfo(assetPath, out rootFolder, out readOnly);
             if (validPath && readOnly)
                 return Editability.Never;
 
diff --git a/Editor/Mono/AssetPipeline/SpeedTreeImporter.bindings.cs b/Editor/Mono/AssetPipeline/SpeedTreeImporter.bindings.cs
index 761c59fe1f..7bf01a9117 100644
--- a/Editor/Mono/AssetPipeline/SpeedTreeImporter.bindings.cs
+++ b/Editor/Mono/AssetPipeline/SpeedTreeImporter.bindings.cs
@@ -284,6 +284,8 @@ private static void FixExtraTexture_sRGB(IEnumerable<UnityEngine.Object> subAsse
                                 texImporter.sRGBTexture = false; // extra texture does not contain color data, hence shouldn't be sRGB.
                                 texImporter.SaveAndReimport();
                             }
+
+                            
                         }
                     }
                 }
diff --git a/Editor/Mono/AssetPipeline/TextureImporter.bindings.cs b/Editor/Mono/AssetPipeline/TextureImporter.bindings.cs
index 09252985c2..77c87e4adf 100644
--- a/Editor/Mono/AssetPipeline/TextureImporter.bindings.cs
+++ b/Editor/Mono/AssetPipeline/TextureImporter.bindings.cs
@@ -468,7 +468,6 @@ public void SetTextureSettings(TextureImporterSettings src)
         internal extern bool removeMatte { get; set; }
 
         public extern bool ignorePngGamma { get; set; }
-        internal static readonly int MaxTextureSizeAllowedForReadable = 8192; //keep in sync with TextureImporter.h
 
         // This is for remapping Sprite that are renamed.
         extern internal bool GetNameFromInternalIDMap(long id, ref string name);
diff --git a/Editor/Mono/AssetPreviewUpdater.cs b/Editor/Mono/AssetPreviewUpdater.cs
index bed2f81cdc..d0c3538ae6 100644
--- a/Editor/Mono/AssetPreviewUpdater.cs
+++ b/Editor/Mono/AssetPreviewUpdater.cs
@@ -3,6 +3,8 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.Scripting;
 
 namespace UnityEditor
 {
@@ -16,14 +18,11 @@ public static Texture2D CreatePreviewForAsset(Object obj, Object[] subAssets, st
         // Generate a preview texture for an asset
         public static Texture2D CreatePreview(Object obj, Object[] subAssets, string assetPath, int width, int height)
         {
-            if (obj == null)
-                return null;
-
-            System.Type type = CustomEditorAttributes.FindCustomEditorType(obj, false);
+            var type = CustomEditorAttributes.FindCustomEditorType(obj, false);
             if (type == null)
                 return null;
 
-            System.Reflection.MethodInfo info = type.GetMethod("RenderStaticPreview");
+            var info = type.GetMethod("RenderStaticPreview");
             if (info == null)
             {
                 Debug.LogError("Fail to find RenderStaticPreview base method");
@@ -33,13 +32,20 @@ public static Texture2D CreatePreview(Object obj, Object[] subAssets, string ass
             if (info.DeclaringType == typeof(Editor))
                 return null;
 
-
-            Editor editor = Editor.CreateEditor(obj);
-
+            var editor = Editor.CreateEditor(obj);
             if (editor == null)
                 return null;
 
-            Texture2D tex = editor.RenderStaticPreview(assetPath, subAssets, width, height);
+            //Check that Render Pipeline is ready
+            //Beware: AssetImportWorkers have their own Render Pipeline instance. Render Pipeline will be separately created for each one of them.
+            var pipelineWasNotInitialized = !RenderPipelineManager.pipelineSwitchCompleted;
+
+            //We always keep this call to initialize Render Pipeline when Render Pipeline was not ready
+            var previewTexture = editor.RenderStaticPreview(assetPath, subAssets, width, height);
+
+            //If after render our Render Pipeline is initialized we re-render to have a valid result
+            if (pipelineWasNotInitialized && RenderPipelineManager.pipelineSwitchCompleted)
+                previewTexture = editor.RenderStaticPreview(assetPath, subAssets, width, height);
 
             // For debugging we write the preview to a file (keep)
             //{
@@ -50,8 +56,7 @@ public static Texture2D CreatePreview(Object obj, Object[] subAssets, string ass
             //}
 
             Object.DestroyImmediate(editor);
-
-            return tex;
+            return previewTexture;
         }
     }
 }
diff --git a/Editor/Mono/AssetStore/AssetStoreWindow.cs b/Editor/Mono/AssetStore/AssetStoreWindow.cs
index f0533b3eaa..028877f5ae 100644
--- a/Editor/Mono/AssetStore/AssetStoreWindow.cs
+++ b/Editor/Mono/AssetStore/AssetStoreWindow.cs
@@ -13,9 +13,6 @@ namespace UnityEditor
     [EditorWindowTitle(title = "Asset Store", icon = "Asset Store")]
     internal class AssetStoreWindow : EditorWindow
     {
-        // Use this for initialization
-        // Index at 1499 because "Package Manager" is 1500, pairing tools for user to get external content
-        [MenuItem("Window/Asset Store", false, 1499)]
         public static AssetStoreWindow Init()
         {
             if (EditorPrefs.GetBool("AlwaysOpenAssetStoreInBrowser", false))
@@ -32,14 +29,22 @@ public static AssetStoreWindow Init()
             }
         }
 
-        private static void OpenAssetStoreInBrowser()
+        [MenuItem("Window/Asset Store", false, 1497)]
+        public static void OpenAssetStoreInBrowser()
         {
             string assetStoreUrl = UnityConnect.instance.GetConfigurationURL(CloudConfigUrl.CloudAssetStoreUrl);
-            if (UnityEditor.Connect.UnityConnect.instance.loggedIn)
-                UnityEditor.Connect.UnityConnect.instance.OpenAuthorizedURLInWebBrowser(assetStoreUrl);
+            assetStoreUrl += "?utm_source=unity-editor-window-menu&utm_medium=desktop-app";
+            if (UnityConnect.instance.loggedIn)
+                UnityConnect.instance.OpenAuthorizedURLInWebBrowser(assetStoreUrl);
             else Application.OpenURL(assetStoreUrl);
         }
 
+        [MenuItem("Window/My Assets", false, 1498)]
+        public static void OpenMyAssetsInPackageManager()
+        {
+            PackageManagerWindow.SelectPackageAndFilterStatic(string.Empty, PackageManager.UI.Internal.PackageFilterTab.AssetStore);
+        }
+
         public void OnEnable()
         {
             this.antiAliasing = 4;
diff --git a/Editor/Mono/AttributeHelper.cs b/Editor/Mono/AttributeHelper.cs
index a7aa63dac9..95d72e45d3 100644
--- a/Editor/Mono/AttributeHelper.cs
+++ b/Editor/Mono/AttributeHelper.cs
@@ -145,7 +145,7 @@ struct MonoCreateAssetItem
         }
 
         [RequiredByNativeCode]
-        static MonoCreateAssetItem[] ExtractCreateAssetMenuItems(Assembly assembly)
+        static MonoCreateAssetItem[] ExtractCreateAssetMenuItems()
         {
             var result = new List<MonoCreateAssetItem>();
 
@@ -166,6 +166,11 @@ static MonoCreateAssetItem[] ExtractCreateAssetMenuItems(Assembly assembly)
                 if (!System.IO.Path.HasExtension(fileName))
                     fileName = fileName + ".asset";
 
+                // trim the trailing space from the menu name:
+                // 1. visually it is hard to differentialte menu names with or without spaces.
+                // 2. when asset menu is searched, it will search the trimmed menu name, so it will create a edge case where a menu name with space could not be found after creation.
+                menuItemName = menuItemName.TrimEnd();
+
                 var item = new MonoCreateAssetItem
                 {
                     menuItem = menuItemName,
diff --git a/Editor/Mono/Audio/Mixer/GUI/AudioMixerWindow.cs b/Editor/Mono/Audio/Mixer/GUI/AudioMixerWindow.cs
index 199bacfb82..2975edd030 100644
--- a/Editor/Mono/Audio/Mixer/GUI/AudioMixerWindow.cs
+++ b/Editor/Mono/Audio/Mixer/GUI/AudioMixerWindow.cs
@@ -238,8 +238,14 @@ static List<AudioMixerController> FindAllAudioMixerControllers()
             foreach (var prop in AssetDatabase.FindAllAssets(new SearchFilter() { classNames = new[] { "AudioMixerController" } }))
             {
                 var controller = prop.pptrValue as AudioMixerController;
+
                 if (controller)
-                    result.Add(controller);
+                {
+                    if (controller.HasValidSnapshots())
+                        result.Add(controller);
+                    else
+                        Debug.LogError($"Can not display audio mixer window for '{controller.name}' as it could not be properly initialized. The mixer asset is possibly corrupted.");
+                }
             }
             return result;
         }
@@ -341,6 +347,12 @@ public void UndoRedoPerformed(in UndoRedoInfo info)
 
         void OnMixerControllerChanged()
         {
+            if (m_Controller != null && !m_Controller.HasValidSnapshots())
+            {
+                Debug.LogError($"Can not display audio mixer window for '{m_Controller.name}' as it could not be properly initialized. The mixer asset is possibly corrupted.");
+                return;
+            }
+
             if (m_Controller)
                 m_Controller.ClearEventHandlers();
 
@@ -369,9 +381,15 @@ void DetectControllerChange()
             AudioMixerController oldController = m_Controller;
             if (Selection.activeObject is AudioMixerController)
                 m_Controller = Selection.activeObject as AudioMixerController;
+
             if (m_Controller != oldController)
             {
-                OnMixerControllerChanged();
+                if (m_Controller.HasValidSnapshots())
+                    OnMixerControllerChanged();
+                else
+                {
+                    Debug.LogError($"Can not display audio mixer window for '{m_Controller.name}' as it could not be properly initialized. The mixer asset is possibly corrupted.");
+                }
             }
         }
 
diff --git a/Editor/Mono/BuildPipeline.bindings.cs b/Editor/Mono/BuildPipeline.bindings.cs
index 9d3bc9cd6e..2fe82e481f 100644
--- a/Editor/Mono/BuildPipeline.bindings.cs
+++ b/Editor/Mono/BuildPipeline.bindings.cs
@@ -183,7 +183,10 @@ public enum BuildAssetBundleOptions
         //AssetBundleAllowEditorOnlyScriptableObjects = 1 << 14,
 
         //Removes the Unity Version number in the Archive File & Serialized File headers during the build.
-        AssetBundleStripUnityVersion = 32768 // 1 << 15
+        AssetBundleStripUnityVersion = 32768, // 1 << 15
+
+        // Calculate bundle hash on the bundle content
+        UseContentHash = 65536 // 1 << 16
     }
 
     // Keep in sync with CanAppendBuild in EditorUtility.h
@@ -381,6 +384,11 @@ private static BuildReport BuildPlayer(string[] scenes, string locationPathName,
             {
                 return BuildPlayerInternal(scenes, locationPathName, assetBundleManifestPath, buildTargetGroup, target, subtarget, options, extraScriptingDefines);
             }
+            catch (System.ArgumentException argumentException)
+            {
+                Debug.LogException(argumentException);
+                return null;
+            }
             catch (System.Exception exception)
             {
                 // In some case BuildPlayer might let a null reference exception fall through. Prevent data loss by just exiting.
@@ -498,8 +506,8 @@ public static string BuildStreamedSceneAssetBundle(string[] levels, string locat
 
         private static BuildReport BuildPlayerInternal(string[] levels, string locationPathName, string assetBundleManifestPath, BuildTargetGroup buildTargetGroup, BuildTarget target, int subtarget, BuildOptions options, string[] extraScriptingDefines)
         {
-            if (!BuildPlayerWindow.DefaultBuildMethods.IsBuildPathValid(locationPathName))
-                throw new Exception("Invalid Build Path: " + locationPathName);
+            if (!BuildPlayerWindow.DefaultBuildMethods.IsBuildPathValid(locationPathName, out var msg))
+                throw new ArgumentException($"Invalid build path: '{locationPathName}'. {msg}");
 
             return BuildPlayerInternalNoCheck(levels, locationPathName, assetBundleManifestPath, buildTargetGroup, target, subtarget, options, extraScriptingDefines, false);
         }
@@ -738,6 +746,7 @@ private static bool DoesBuildTargetSupportPlayerConnectionPlayerToEditor(BuildTa
                 targetPlatform == BuildTarget.StandaloneWindows ||
                 targetPlatform == BuildTarget.StandaloneWindows64 ||
                 targetPlatform == BuildTarget.StandaloneLinux64 ||
+                targetPlatform == BuildTarget.iOS ||
                 // 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/BuildPlatform.cs b/Editor/Mono/BuildPipeline/BuildPlatform.cs
index 794017dd2a..08dc117a97 100644
--- a/Editor/Mono/BuildPipeline/BuildPlatform.cs
+++ b/Editor/Mono/BuildPipeline/BuildPlatform.cs
@@ -191,10 +191,5 @@ public List<BuildPlatform> GetValidPlatforms()
         {
             return GetValidPlatforms(false);
         }
-
-        public static string[] GetValidPlatformNames()
-        {
-            return instance.GetValidPlatforms().ConvertAll(platform => platform.name).ToArray();
-        }
     }
 }
diff --git a/Editor/Mono/BuildPipeline/DesktopStandaloneBuildWindowExtension.cs b/Editor/Mono/BuildPipeline/DesktopStandaloneBuildWindowExtension.cs
index 08000cf330..76f9f4afa6 100644
--- a/Editor/Mono/BuildPipeline/DesktopStandaloneBuildWindowExtension.cs
+++ b/Editor/Mono/BuildPipeline/DesktopStandaloneBuildWindowExtension.cs
@@ -19,15 +19,26 @@ internal abstract class DesktopStandaloneBuildWindowExtension : DefaultBuildWind
     protected bool m_HasMonoPlayers;
     protected bool m_HasIl2CppPlayers;
     protected bool m_HasCoreCLRPlayers;
-    protected bool m_HasServerPlayers;
+    protected bool m_HasServerMonoPlayers;
+    protected bool m_HasServerIl2CppPlayers;
     protected bool m_IsRunningOnHostPlatform;
 
+    public bool MonoPlayersInstalled(NamedBuildTarget namedBuildTarget)
+    {
+        return namedBuildTarget == NamedBuildTarget.Server ? m_HasServerMonoPlayers : m_HasMonoPlayers;
+    }
+
+    public bool Il2CppPlayersInstalled(NamedBuildTarget namedBuildTarget)
+    {
+        return namedBuildTarget == NamedBuildTarget.Server ? m_HasServerIl2CppPlayers : m_HasIl2CppPlayers;
+    }
+
     public static void SetArchitectureForPlatform(BuildTarget buildTarget, OSArchitecture architecture)
     {
         EditorUserBuildSettings.SetPlatformSettings(BuildPipeline.GetBuildTargetName(buildTarget), EditorUserBuildSettings.kSettingArchitecture, architecture.ToString().ToLower());
     }
 
-    public DesktopStandaloneBuildWindowExtension(bool hasMonoPlayers, bool hasIl2CppPlayers, bool hasCoreCLRPlayers, bool hasServerPlayers)
+    public DesktopStandaloneBuildWindowExtension(bool hasMonoPlayers, bool hasIl2CppPlayers, bool hasCoreCLRPlayers, bool hasServerMonoPlayers, bool hasServerIl2CppPlayers)
     {
         SetupStandaloneSubtargets();
 
@@ -35,7 +46,8 @@ public DesktopStandaloneBuildWindowExtension(bool hasMonoPlayers, bool hasIl2Cpp
         m_HasIl2CppPlayers = hasIl2CppPlayers;
         m_HasCoreCLRPlayers = hasCoreCLRPlayers;
         m_HasMonoPlayers = hasMonoPlayers;
-        m_HasServerPlayers = hasServerPlayers;
+        m_HasServerMonoPlayers = hasServerMonoPlayers;
+        m_HasServerIl2CppPlayers = hasServerIl2CppPlayers;
     }
 
     private void SetupStandaloneSubtargets()
@@ -84,30 +96,6 @@ struct BuildTargetInfo
         public OSArchitecture architecture;
     }
 
-    private static Dictionary<GUIContent, BuildTargetInfo> GetArchitecturesForPlatform(BuildTarget target)
-    {
-        switch (target)
-        {
-            case BuildTarget.StandaloneWindows:
-            case BuildTarget.StandaloneWindows64:
-                return new Dictionary<GUIContent, BuildTargetInfo>
-                {
-                    { EditorGUIUtility.TrTextContent("Intel 64-bit"), new BuildTargetInfo
-                        {
-                            buildTarget = BuildTarget.StandaloneWindows64,
-                            architecture = OSArchitecture.x64
-                        }},
-                    { EditorGUIUtility.TrTextContent("Intel 32-bit"), new BuildTargetInfo
-                        {
-                            buildTarget = BuildTarget.StandaloneWindows,
-                            architecture = OSArchitecture.x86
-                        }},
-                };
-            default:
-                return null;
-        }
-    }
-
     private static BuildTarget DefaultTargetForPlatform(BuildTarget target)
     {
         switch (target)
@@ -186,30 +174,7 @@ public override void ShowPlatformBuildOptions()
         int selectedIndex = Math.Max(0, Array.IndexOf(m_StandaloneSubtargets, DefaultTargetForPlatform(selectedTarget)));
         int newIndex = EditorGUILayout.Popup(m_StandaloneTarget, selectedIndex, m_StandaloneSubtargetStrings);
 
-        if (newIndex == selectedIndex)
-        {
-            Dictionary<GUIContent, BuildTargetInfo> architectures = GetArchitecturesForPlatform(selectedTarget);
-            if (null != architectures)
-            {
-                // Display architectures for the current target platform
-                GUIContent[] architectureNames = new List<GUIContent>(architectures.Keys).ToArray();
-                int selectedArchitecture = 0;
-
-                // Grab m_Architecture index for currently selected target
-                foreach (var architecture in architectures)
-                {
-                    if (architecture.Value.buildTarget == selectedTarget)
-                    {
-                        selectedArchitecture = System.Math.Max(0, System.Array.IndexOf(architectureNames, architecture.Key));
-                        break;
-                    }
-                }
-
-                selectedArchitecture = EditorGUILayout.Popup(m_Architecture, selectedArchitecture, architectureNames);
-                newTarget = architectures[architectureNames[selectedArchitecture]];
-            }
-        }
-        else
+        if (newIndex != selectedIndex)
         {
             newTarget = DefaultArchitectureForTarget(m_StandaloneSubtargets[newIndex]);
         }
@@ -223,7 +188,6 @@ public override void ShowPlatformBuildOptions()
         }
 
         ShowArchitectureSpecificOptions();
-
         ShowBackendErrorIfNeeded();
     }
 
@@ -248,12 +212,15 @@ protected virtual string GetCannotBuildPlayerInCurrentSetupError()
 
         if (namedBuildTarget == NamedBuildTarget.Server)
         {
-            if(!m_HasServerPlayers)
-                return $"Dedicated Server support for {GetHostPlatformName()} is not installed.";
+            if (scriptingBackend == ScriptingImplementation.Mono2x && !m_HasServerMonoPlayers)
+                return $"Dedicated Server support (Mono) for {GetHostPlatformName()} is not installed.";
 
             if (scriptingBackend == ScriptingImplementation.IL2CPP && !m_IsRunningOnHostPlatform)
                 return string.Format("{0} IL2CPP player can only be built on {0}.", GetHostPlatformName());
 
+            if (scriptingBackend == ScriptingImplementation.IL2CPP && !m_HasServerIl2CppPlayers)
+                return $"Dedicated Server support (IL2CPP) for {GetHostPlatformName()} is not installed.";
+
             return null;
         }
 
@@ -261,7 +228,7 @@ protected virtual string GetCannotBuildPlayerInCurrentSetupError()
         {
             case ScriptingImplementation.Mono2x:
             {
-                if (!m_HasMonoPlayers)
+                if (!MonoPlayersInstalled(namedBuildTarget))
                     return "Currently selected scripting backend (Mono) is not installed.";
                 break;
             }
@@ -276,7 +243,7 @@ protected virtual string GetCannotBuildPlayerInCurrentSetupError()
             {
                 if (!m_IsRunningOnHostPlatform)
                     return string.Format("{0} IL2CPP player can only be built on {0}.", GetHostPlatformName());
-                if (!m_HasIl2CppPlayers)
+                if (!Il2CppPlayersInstalled(namedBuildTarget))
                     return "Currently selected scripting backend (IL2CPP) is not installed.";
                 break;
             }
@@ -286,8 +253,6 @@ protected virtual string GetCannotBuildPlayerInCurrentSetupError()
             }
         }
 
-
-
         return null;
     }
 
diff --git a/Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs b/Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs
index f958200bbb..7daf4ab71d 100644
--- a/Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs
+++ b/Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs
@@ -5,6 +5,7 @@
 using System;
 using UnityEditor;
 using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
 using UnityEditor.Modules;
 using UnityEditorInternal;
 using UnityEngine;
@@ -22,7 +23,7 @@ protected virtual string GetVariationName(BuildPostProcessArgs args)
             GetPlatformString(args),
             GetServer(args) ? "server" : "player",
             GetDevelopment(args) ? "development" : "nondevelopment",
-            GetScriptingBackend(args).ToString().ToLower());
+            GetScriptingBackend(args).ToString().ToLowerInvariant());
     }
 
     protected bool GetServer(BuildPostProcessArgs args) =>
@@ -66,9 +67,9 @@ protected DesktopStandalonePostProcessor(bool hasMonoPlayers, bool hasIl2CppPlay
         m_HasServerCoreCLRPlayers = hasServerCoreCLRPlayers;
     }
 
-    public override string PrepareForBuild(BuildOptions options, BuildTarget target)
+    public override string PrepareForBuild(BuildPlayerOptions buildOptions)
     {
-        var namedBuildTarget = NamedBuildTarget.FromActiveSettings(target);
+        var namedBuildTarget = NamedBuildTarget.FromActiveSettings(buildOptions.target);
         var isServer = namedBuildTarget == NamedBuildTarget.Server;
 
         switch (PlayerSettings.GetScriptingBackend(namedBuildTarget))
@@ -96,7 +97,7 @@ public override string PrepareForBuild(BuildOptions options, BuildTarget target)
                 return $"Unknown scripting backend: {PlayerSettings.GetScriptingBackend(namedBuildTarget)}";
         }
 
-        return base.PrepareForBuild(options, target);
+        return base.PrepareForBuild(buildOptions);
     }
 
     internal class ScriptingImplementations : DefaultScriptingImplementations
diff --git a/Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs b/Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs
index 46b8d4f9e5..a860e27b47 100644
--- a/Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs
+++ b/Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs
@@ -458,6 +458,54 @@ internal static string GetExePath(string toolName)
             return $"{deployDirectory}/{expectedToolExecutableName}";
         }
 
+        internal static string GetLibrarySearchPaths(string name, string tfm, string customRoot = null)
+        {
+            var il2CppFolder = GetIl2CppFolder(out var isDevelopmentLocation);
+            var expectedToolExecutableName = $"{name}.dll";
+
+            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
+
+                var topLevel = il2CppFolder;
+                if (customRoot != null)
+                    topLevel = Path.Combine(topLevel, customRoot);
+
+                var toolBinDirectory = Path.Combine(topLevel, name, "bin").ToNPath();
+                var candidates = toolBinDirectory.Files($"*{expectedToolExecutableName}", recurse: true)
+                    .Where(f => f.Parent.FileName == tfm)
+                    .OrderByDescending(f => f.GetLastWriteTimeUtc())
+                    .ToArray();
+
+                if (candidates.Length == 0)
+                    throw new InvalidOperationException($"{name} does not appear to be built in {il2CppFolder}");
+
+                return candidates[0].Parent.ToString();
+            }
+
+            throw new ArgumentException($"Could not locate assembly for {name}");
+        }
+
+        internal static string ConstructBeeLibrarySearchPath()
+        {
+            var projectBinDirs = new[]
+            {
+                GetLibrarySearchPaths("Unity.Options", "netstandard2.0", "repos/UnityOptions"),
+                GetLibrarySearchPaths("Unity.Linker.Api", "netstandard2.0"),
+                GetLibrarySearchPaths("Unity.IL2CPP.Api", "netstandard2.0"),
+                GetLibrarySearchPaths("Unity.Api.Attributes", "netstandard2.0"),
+                GetLibrarySearchPaths("Unity.IL2CPP.Bee.IL2CPPExeCompileCppBuildProgram.Data", "netstandard2.0"),
+                GetLibrarySearchPaths("Unity.IL2CPP.Bee.BuildLogic", "net6.0"),
+                // Now the quirky part.  We need to locate the platform build logic assemblies.
+                // While il2cpp will have these during some build scenarios (IDE build or build.pl)
+                // the project that will always have all of the is il2cpp-compile
+                GetExePath("il2cpp-compile").ToNPath().Parent
+            };
+
+            return projectBinDirs.Aggregate(string.Empty, (accum, next) => $"{accum}{Path.PathSeparator}{next}");
+        }
+
         internal static string GetAdditionalArguments()
         {
             var arguments = new List<string>();
diff --git a/Editor/Mono/BuildPipeline/NamedBuildTarget.cs b/Editor/Mono/BuildPipeline/NamedBuildTarget.cs
index 85fec0e406..5d6e08be5e 100644
--- a/Editor/Mono/BuildPipeline/NamedBuildTarget.cs
+++ b/Editor/Mono/BuildPipeline/NamedBuildTarget.cs
@@ -41,9 +41,11 @@ namespace UnityEditor.Build
         public static readonly NamedBuildTarget WebGL = new NamedBuildTarget("WebGL");
         public static readonly NamedBuildTarget WindowsStoreApps = new NamedBuildTarget("Windows Store Apps");
         public static readonly NamedBuildTarget PS4 = new NamedBuildTarget("PS4");
+        public static readonly NamedBuildTarget PS5 = new NamedBuildTarget("PS5");
         public static readonly NamedBuildTarget XboxOne = new NamedBuildTarget("XboxOne");
         public static readonly NamedBuildTarget tvOS = new NamedBuildTarget("tvOS");
         public static readonly NamedBuildTarget NintendoSwitch = new NamedBuildTarget("Nintendo Switch");
+        [System.Obsolete("Stadia has been removed in 2023.1")]
         public static readonly NamedBuildTarget Stadia = new NamedBuildTarget("Stadia");
         public static readonly NamedBuildTarget LinuxHeadlessSimulation = new NamedBuildTarget("LinuxHeadlessSimulation");
         [System.Obsolete("CloudRendering is deprecated, please use LinuxHeadlessSimulation (UnityUpgradable) -> LinuxHeadlessSimulation", false)]
@@ -98,8 +100,6 @@ public static NamedBuildTarget FromBuildTargetGroup(BuildTargetGroup buildTarget
                     return NamedBuildTarget.tvOS;
                 case BuildTargetGroup.Switch:
                     return NamedBuildTarget.NintendoSwitch;
-                case BuildTargetGroup.Stadia:
-                    return NamedBuildTarget.Stadia;
                 case BuildTargetGroup.LinuxHeadlessSimulation:
                     return NamedBuildTarget.LinuxHeadlessSimulation;
                 case BuildTargetGroup.EmbeddedLinux:
diff --git a/Editor/Mono/BuildPipeline/PostprocessBuildPlayer.cs b/Editor/Mono/BuildPipeline/PostprocessBuildPlayer.cs
index 697ad5a5f4..f8ce4c306c 100644
--- a/Editor/Mono/BuildPipeline/PostprocessBuildPlayer.cs
+++ b/Editor/Mono/BuildPipeline/PostprocessBuildPlayer.cs
@@ -82,12 +82,12 @@ internal static string GetStreamingAssetsBundleManifestPath()
         }
 
         [RequiredByNativeCode]
-        static public string PrepareForBuild(BuildOptions options, BuildTargetGroup targetGroup, BuildTarget target)
+        static public string PrepareForBuild(BuildPlayerOptions buildOptions)
         {
-            var postprocessor = ModuleManager.GetBuildPostProcessor(targetGroup, target);
+            var postprocessor = ModuleManager.GetBuildPostProcessor(buildOptions.targetGroup, buildOptions.target);
             if (postprocessor == null)
                 return null;
-            return postprocessor.PrepareForBuild(options, target);
+            return postprocessor.PrepareForBuild(buildOptions);
         }
 
         static public string GetExtensionForBuildTarget(BuildTargetGroup targetGroup, BuildTarget target, int subtarget, BuildOptions options)
@@ -284,7 +284,10 @@ static public void Postprocess(BuildTargetGroup targetGroup, BuildTarget target,
                     // Rethrow exceptions during build postprocessing as BuildFailedException, so we don't pretend the build was fine.
                     throw new BuildFailedException(e);
                 }
-                report.AddAppendix(props);
+                if (props != null)
+                {
+                    report.AddAppendix(props);
+                }
 
                 return;
             }
diff --git a/Editor/Mono/BuildPlayerSceneTreeView.cs b/Editor/Mono/BuildPlayerSceneTreeView.cs
index c2aacb8a9c..115c8792d7 100644
--- a/Editor/Mono/BuildPlayerSceneTreeView.cs
+++ b/Editor/Mono/BuildPlayerSceneTreeView.cs
@@ -13,21 +13,22 @@ internal class BuildPlayerSceneTreeViewItem : TreeViewItem
     {
         private const string kAssetsFolder = "Assets/";
         private const string kSceneExtension = ".unity";
-
         public static int kInvalidCounter = -1;
 
+        private string m_FullName;
+
         public bool active;
         public int counter;
-        public string fullName;
-        public GUID guid;
-        public void UpdateName()
+        public string fullName
         {
-            var name = AssetDatabase.GUIDToAssetPath(guid.ToString());
-            if (name != fullName)
+            get => m_FullName;
+            set
             {
-                fullName = name;
+                if (m_FullName == value)
+                    return;
 
-                displayName = fullName;
+                m_FullName = value;
+                displayName = m_FullName;
                 if (displayName.StartsWith(kAssetsFolder))
                     displayName = displayName.Remove(0, kAssetsFolder.Length);
                 var ext = displayName.LastIndexOf(kSceneExtension);
@@ -35,13 +36,21 @@ public void UpdateName()
                     displayName = displayName.Substring(0, ext);
             }
         }
+        public GUID guid;
+
+        public void UpdateName()
+        {
+            var name = AssetDatabase.GUIDToAssetPath(guid.ToString());
+            if (!string.IsNullOrEmpty(name) && name != fullName)
+                fullName = name;
+        }
 
-        public BuildPlayerSceneTreeViewItem(int id, int depth, GUID g, bool state) : base(id, depth)
+        public BuildPlayerSceneTreeViewItem(EditorBuildSettingsScene scene) : base(scene.guid.GetHashCode(), 0)
         {
-            active = state;
+            active = scene.enabled;
             counter = kInvalidCounter;
-            guid = g;
-            fullName = "";
+            guid = scene.guid;
+            fullName = scene.path;
             UpdateName();
         }
     }
@@ -71,7 +80,7 @@ protected override TreeViewItem BuildRoot()
             List<EditorBuildSettingsScene> scenes = new List<EditorBuildSettingsScene>(EditorBuildSettings.scenes);
             foreach (var sc in scenes)
             {
-                var item = new BuildPlayerSceneTreeViewItem(sc.guid.GetHashCode(), 0, sc.guid, sc.enabled);
+                var item = new BuildPlayerSceneTreeViewItem(sc);
                 root.AddChild(item);
             }
             return root;
@@ -314,6 +323,11 @@ public EditorBuildSettingsScene[] GetSceneList()
             {
                 var sceneItem = rootItem.children[index] as BuildPlayerSceneTreeViewItem;
                 sceneList[index] = new EditorBuildSettingsScene(sceneItem.fullName, sceneItem.active);
+
+                // If the scene was deleted AssetPathToGUID may not work and the guid will be lost
+                // In that case restore it to the previous value
+                if (sceneList[index].guid.Empty() && !sceneItem.guid.Empty())
+                    sceneList[index].guid = sceneItem.guid;
             }
             return sceneList;
         }
diff --git a/Editor/Mono/BuildPlayerWindow.cs b/Editor/Mono/BuildPlayerWindow.cs
index 49a8f1b160..4788522ffa 100644
--- a/Editor/Mono/BuildPlayerWindow.cs
+++ b/Editor/Mono/BuildPlayerWindow.cs
@@ -47,6 +47,7 @@ class Styles
             public string noModuleLoaded = L10n.Tr("No {0} module loaded.");
             public GUIContent openDownloadPage = EditorGUIUtility.TrTextContent("Open Download Page");
             public GUIContent installModuleWithHub = EditorGUIUtility.TrTextContent("Install with Unity Hub");
+            public string EditorWillNeedToBeReloaded = L10n.Tr("Note: Editor will need to be restarted to load any newly installed modules");
             public string infoText = L10n.Tr("{0} is not included in your Unity Pro license. Your {0} build will include a Unity Personal Edition splash screen.\n\nYou must be eligible to use Unity Personal Edition to use this build option. Please refer to our EULA for further information.");
             public GUIContent eula = EditorGUIUtility.TrTextContent("Eula");
             public string addToYourPro = L10n.Tr("Add {0} to your Unity Pro license");
@@ -76,7 +77,7 @@ public GUIContent GetDownloadErrorForTarget(BuildTarget target)
             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");
-            public GUIContent learnAboutUnityCloudBuild = EditorGUIUtility.TrTextContent("Learn about Unity Cloud Build");
+            public GUIContent learnAboutUnityCloudBuild = EditorGUIUtility.TrTextContent("Learn about Unity Build Automation");
             public GUIContent compressionMethod = EditorGUIUtility.TrTextContent("Compression Method", "Compression applied to Player data (scenes and resources).\nDefault - none or default platform compression.\nLZ4 - fast compression suitable for Development Builds.\nLZ4HC - higher compression rate variance of LZ4, causes longer build times. Works best for Release Builds.");
 
             public readonly GUIContent assetImportOverrides = EditorGUIUtility.TrTextContent("Asset Import Overrides", "Asset import overrides for local development. Reducing maximum texture size or compression settings can speed up asset imports and platform switches.");
@@ -239,6 +240,10 @@ void AddOpenScenes()
             for (int i = 0; i < SceneManager.sceneCount; i++)
             {
                 Scene scene = SceneManager.GetSceneAt(i);
+
+                if (EditorSceneManager.IsAuthoringScene(scene))
+                    continue;
+
                 if (scene.path.Length == 0 && !EditorSceneManager.SaveScene(scene, "", false))
                     continue;
 
@@ -542,73 +547,6 @@ static bool IsAnyStandaloneModuleLoaded()
                 ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneWindows);
         }
 
-        static bool IsColorSpaceValid(BuildPlatform platform)
-        {
-            if (PlayerSettings.colorSpace == ColorSpace.Linear)
-            {
-                var hasMinGraphicsAPI = true;
-
-                var apis = PlayerSettings.GetGraphicsAPIs(platform.defaultTarget);
-                if (platform.namedBuildTarget == NamedBuildTarget.Android)
-                {
-                    hasMinGraphicsAPI = (apis.Contains(GraphicsDeviceType.Vulkan) || apis.Contains(GraphicsDeviceType.OpenGLES3)) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
-                }
-                else if (platform.namedBuildTarget == NamedBuildTarget.iOS || platform.namedBuildTarget == NamedBuildTarget.tvOS)
-                {
-                    hasMinGraphicsAPI = !apis.Contains(GraphicsDeviceType.OpenGLES3) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
-                }
-                else if (platform.namedBuildTarget == NamedBuildTarget.WebGL)
-                {
-                    // must have OpenGLES3-only
-                    hasMinGraphicsAPI = apis.Contains(GraphicsDeviceType.OpenGLES3) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
-                }
-
-                return hasMinGraphicsAPI;
-            }
-            else
-            {
-                return true;
-            }
-        }
-
-        static bool IsHDRCubemapEncodingValid(BuildPlatform platform)
-        {
-            var encoding = PlayerSettings.GetHDRCubemapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup());
-            return IsGITextureEncodingValid(platform, encoding == HDRCubemapEncodingQuality.Low);
-        }
-
-        static bool IsLightmapEncodingValid(BuildPlatform platform)
-        {
-            var encoding = PlayerSettings.GetLightmapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup());
-            return IsGITextureEncodingValid(platform, encoding == LightmapEncodingQuality.Low);
-        }
-
-        static bool IsGITextureEncodingValid(BuildPlatform platform, bool isLowQuality)
-        {
-            if (isLowQuality)
-                return true;
-
-            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 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);
-            }
-
-            return hasMinGraphicsAPI;
-        }
-
         static bool IsVirtualTexturingSettingsValid(BuildPlatform platform)
         {
             if (!PlayerSettings.GetVirtualTexturingSupportEnabled())
@@ -798,6 +736,7 @@ void ShowBuildTargetSettings()
                         Help.BrowseURL(url);
                     }
                 }
+                GUILayout.Label(styles.EditorWillNeedToBeReloaded, EditorStyles.wordWrappedMiniLabel);
                 GUIBuildButtons(false, false, false, platform, postprocessor);
                 return;
             }
@@ -1070,25 +1009,7 @@ private static void GUIBuildButtons(IBuildWindowExtension buildWindowExtension,
             // Disable the 'Build' and 'Build And Run' buttons when the project setup doesn't satisfy the platform requirements
             if (enableBuildButton && enableBuildAndRunButton)
             {
-                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))
+                if (!IsVirtualTexturingSettingsValid(platform))
                 {
                     enableBuildAndRunButton = false;
                     enableBuildButton = false;
diff --git a/Editor/Mono/BuildPlayerWindowBuildMethods.cs b/Editor/Mono/BuildPlayerWindowBuildMethods.cs
index 3c93a95af5..7f78736505 100644
--- a/Editor/Mono/BuildPlayerWindowBuildMethods.cs
+++ b/Editor/Mono/BuildPlayerWindowBuildMethods.cs
@@ -9,6 +9,7 @@
 using System.Collections;
 using System.IO;
 using System;
+using System.Linq;
 using UnityEditor.Build.Reporting;
 using UnityEditor.Connect;
 using UnityEditor.Profiling;
@@ -313,7 +314,7 @@ internal static BuildPlayerOptions GetBuildPlayerOptionsInternal(bool askForBuil
                 EditorBuildSettingsScene[] editorScenes = EditorBuildSettings.scenes;
                 foreach (EditorBuildSettingsScene scene in editorScenes)
                 {
-                    if (scene.enabled)
+                    if (scene.enabled && !string.IsNullOrEmpty(scene.path))
                         scenesList.Add(scene.path);
                 }
 
@@ -359,10 +360,26 @@ private static bool PickBuildLocation(BuildTargetGroup targetGroup, BuildTarget
                 }
 
                 string title = "Build " + BuildPlatforms.instance.GetBuildTargetDisplayName(targetGroup, target, subtarget);
-                string path = EditorUtility.SaveBuildPanel(target, title, defaultFolder, defaultName, extension, out updateExistingBuild);
 
-                if (path == string.Empty)
-                    return false;
+                string path;
+                bool isValidPath = false;
+                do
+                {
+                    path = EditorUtility.SaveBuildPanel(target, title, defaultFolder, defaultName, extension, out updateExistingBuild);
+                    if (path == string.Empty)
+                        return false;
+
+                    if (IsBuildPathValid(path, out var msg))
+                    {
+                        isValidPath = true;
+                    }
+                    else if (!EditorUtility.DisplayDialog("Invalid build path", msg, "Ok", "Cancel"))
+                    {
+                        Debug.LogError($"Invalid build path: '{path}'. {msg}");
+                        return false;
+                    }
+
+                } while (!isValidPath);
 
                 if (isWindowsStandalone)
                 {
@@ -370,9 +387,6 @@ private static bool PickBuildLocation(BuildTargetGroup targetGroup, BuildTarget
                     path = Path.Combine(path, Paths.MakeValidFileName(PlayerSettings.productName) + '.' + extension);
                 }
 
-                if (!IsBuildPathValid(path))
-                    return false;
-
                 // Enforce extension if needed
                 if (extension != string.Empty && FileUtil.GetPathExtension(path).ToLower() != extension)
                     path += '.' + extension;
@@ -413,14 +427,14 @@ private static string NormalizePath(string path)
 
                 fullPath = string.IsNullOrEmpty(fullPath) ? string.Empty : Path.GetFullPath(fullPath);
 
-                fullPath = fullPath.ToLower();
                 if (Path.DirectorySeparatorChar == '/')
                     return fullPath;
                 return fullPath.Replace(Path.DirectorySeparatorChar, '/');
             }
 
-            internal static bool IsBuildPathValid(string path)
+            internal static bool IsBuildPathValid(string path, out string errorMessage)
             {
+                errorMessage = default;
                 var cleanedPath = NormalizePath(path);
                 if (cleanedPath.Equals(string.Empty) &&
                     IsInstallInBuildFolderOption())
@@ -428,22 +442,37 @@ internal static bool IsBuildPathValid(string path)
 
                 var basePath = NormalizePath(Application.dataPath + "/../");
 
-                var assetsPath = NormalizePath(basePath + "/Assets");
-                var settingsPath = NormalizePath(basePath + "/ProjectSettings");
-                var tempPath = NormalizePath(basePath + "/Temp");
-                var libraryPath = NormalizePath(basePath + "/Library");
-                var userSettingsPath = NormalizePath(basePath + "/UserSettings");
-                var userDesktopPath = NormalizePath(Environment.GetFolderPath(Environment.SpecialFolder.Desktop));
+                // Allow build into the Temp folder (used by Unity TestRunner)
+                var invalidPaths = new[]
+                {
+                    NormalizePath(basePath + "/Assets"),
+                    NormalizePath(basePath + "/ProjectSettings"),
+                    NormalizePath(basePath + "/Library"),
+                    NormalizePath(basePath + "/Packages"),
+                    NormalizePath(basePath + "/UserSettings")
+                };
+
+                var invalidPath = invalidPaths.FirstOrDefault(p => cleanedPath.Contains(p, StringComparison.OrdinalIgnoreCase));
+                if (!string.IsNullOrEmpty(invalidPath))
+                {
+                    var dirName = Path.GetFileName(invalidPath);
+                    errorMessage = $"The '{dirName}' directory is an internal work directory of Unity and " +
+                                    "projects should not be built inside it. Please choose another directory for the build output.";
+                    return false;
+                }
 
-                if (basePath.Contains(cleanedPath) ||
-                    cleanedPath == assetsPath ||
-                    cleanedPath == settingsPath ||
-                    cleanedPath == tempPath ||
-                    cleanedPath == libraryPath ||
-                    cleanedPath == userSettingsPath ||
-                    cleanedPath == userDesktopPath)
+                if (cleanedPath.Equals(basePath, StringComparison.OrdinalIgnoreCase))
+                {
+                    errorMessage = "The project root directory should not be used as a build output directory. " +
+                                   "Please create a subdirectory for the build output.";
+                    return false;
+                }
+
+                var userDesktopPath = NormalizePath(Environment.GetFolderPath(Environment.SpecialFolder.Desktop));
+                if (cleanedPath.Equals(userDesktopPath, StringComparison.OrdinalIgnoreCase))
                 {
-                    Debug.LogError("Invalid build path: " + cleanedPath);
+                    errorMessage = "The desktop directory should not be used as a build output directory. " +
+                                   "Please create a subdirectory for the build output.";
                     return false;
                 }
 
diff --git a/Editor/Mono/BuildTarget.cs b/Editor/Mono/BuildTarget.cs
index c54218c403..eed1434c7e 100644
--- a/Editor/Mono/BuildTarget.cs
+++ b/Editor/Mono/BuildTarget.cs
@@ -121,6 +121,7 @@ public enum BuildTarget
         [System.Obsolete("Lumin has been removed in 2022.2")]
         Lumin = 39,
 
+        [System.Obsolete("Stadia has been removed in 2023.1")]
         Stadia = 40,
 
         [System.Obsolete("CloudRendering is deprecated, please use LinuxHeadlessSimulation (UnityUpgradable) -> LinuxHeadlessSimulation", false)]
diff --git a/Editor/Mono/BuildTargetConverter.cs b/Editor/Mono/BuildTargetConverter.cs
index 1b71ce181e..7f32bd4a99 100644
--- a/Editor/Mono/BuildTargetConverter.cs
+++ b/Editor/Mono/BuildTargetConverter.cs
@@ -46,8 +46,6 @@ internal static class BuildTargetConverter
                     return RuntimePlatform.GameCoreXboxSeries;
                 case BuildTarget.GameCoreXboxOne:
                     return RuntimePlatform.GameCoreXboxOne;
-                case BuildTarget.Stadia:
-                    return RuntimePlatform.Stadia;
                 case BuildTarget.EmbeddedLinux:
                     return RuntimePlatform.EmbeddedLinuxArm64;
                 case BuildTarget.QNX:
diff --git a/Editor/Mono/BuildTargetGroup.cs b/Editor/Mono/BuildTargetGroup.cs
index ccd4e6699c..6466bd45f0 100644
--- a/Editor/Mono/BuildTargetGroup.cs
+++ b/Editor/Mono/BuildTargetGroup.cs
@@ -98,6 +98,7 @@ public enum BuildTargetGroup
         [Obsolete("Lumin has been removed in 2022.2")]
         Lumin = 28,
 
+        [Obsolete("Stadia has been removed in 2023.1")]
         Stadia = 29,
 
         [System.Obsolete("CloudRendering is deprecated, please use LinuxHeadlessSimulation (UnityUpgradable) -> LinuxHeadlessSimulation", false)]
diff --git a/Editor/Mono/Clipboard/Clipboard.cs b/Editor/Mono/Clipboard/Clipboard.cs
index 85cd6d777a..7d9a17970f 100644
--- a/Editor/Mono/Clipboard/Clipboard.cs
+++ b/Editor/Mono/Clipboard/Clipboard.cs
@@ -18,6 +18,72 @@ internal static class Clipboard
     {
         static ClipboardState m_State = new ClipboardState();
 
+        public static bool hasLong
+        {
+            get
+            {
+                FetchState();
+                m_State.FetchLong();
+                return m_State.m_HasLong.Value;
+            }
+        }
+
+        public static long longValue
+        {
+            get
+            {
+                FetchState();
+                m_State.FetchLong();
+                return m_State.m_ValueLong;
+            }
+
+            set => EditorGUIUtility.systemCopyBuffer = value.ToString();
+        }
+
+        public static bool hasUlong
+        {
+            get
+            {
+                FetchState();
+                m_State.FetchUlong();
+                return m_State.m_HasUlong.Value;
+            }
+        }
+
+        public static ulong uLongValue
+        {
+            get
+            {
+                FetchState();
+                m_State.FetchUlong();
+                return m_State.m_ValueUlong;
+            }
+
+            set => EditorGUIUtility.systemCopyBuffer = value.ToString();
+        }
+
+        public static bool hasUint
+        {
+            get
+            {
+                FetchState();
+                m_State.FetchUint();
+                return m_State.m_HasUint.Value;
+            }
+        }
+
+        public static uint uIntValue
+        {
+            get
+            {
+                FetchState();
+                m_State.FetchUint();
+                return m_State.m_ValueUint;
+            }
+
+            set => EditorGUIUtility.systemCopyBuffer = value.ToString();
+        }
+
         public static bool hasInteger
         {
             get
diff --git a/Editor/Mono/Clipboard/ClipboardContextMenu.cs b/Editor/Mono/Clipboard/ClipboardContextMenu.cs
index b0d30b69e5..649a46d0cb 100644
--- a/Editor/Mono/Clipboard/ClipboardContextMenu.cs
+++ b/Editor/Mono/Clipboard/ClipboardContextMenu.cs
@@ -164,10 +164,64 @@ internal static void SetupPropertyCopyPaste(SerializedProperty property, Generic
                     }
                     break;
                 case SerializedPropertyType.Integer:
-                    SetupAction(property, menu, evt,
-                        p => Clipboard.integerValue = p.intValue,
-                        p => Clipboard.hasInteger,
-                        p => p.intValue = Clipboard.integerValue);
+                    {
+                        switch (property.numericType)
+                        {
+                            case SerializedPropertyNumericType.Int64:
+                                SetupAction(property, menu, evt,
+                                            p => Clipboard.longValue = p.longValue,
+                                            p => Clipboard.hasLong,
+                                            p => p.longValue = Clipboard.longValue);
+                                break;
+
+                            case SerializedPropertyNumericType.UInt64:
+                                SetupAction(property, menu, evt,
+                                            p => Clipboard.uLongValue = p.ulongValue,
+                                            p => Clipboard.hasUlong,
+                                            p => p.ulongValue = Clipboard.uLongValue);
+                                break;
+
+                            case SerializedPropertyNumericType.UInt32:
+                                SetupAction(property, menu, evt,
+                                            p => Clipboard.uIntValue = p.uintValue,
+                                            p => Clipboard.hasUint,
+                                            p => p.uintValue = Clipboard.uIntValue);
+                                break;
+
+                            case SerializedPropertyNumericType.UInt16:
+                                SetupAction(property, menu, evt,
+                                            p => Clipboard.uIntValue = (System.UInt16)p.uintValue,
+                                            p => Clipboard.hasUint,
+                                            p => p.uintValue = (System.UInt16)Clipboard.uIntValue);
+                                break;
+
+                            case SerializedPropertyNumericType.Int16:
+                                SetupAction(property, menu, evt,
+                                            p => Clipboard.integerValue = (System.Int16)p.intValue,
+                                            p => Clipboard.hasInteger,
+                                            p => p.intValue = (System.UInt16)Clipboard.integerValue);
+                                break;
+                            case SerializedPropertyNumericType.UInt8:
+                                SetupAction(property, menu, evt,
+                                            p => Clipboard.uIntValue = (System.Byte)p.uintValue,
+                                            p => Clipboard.hasUint,
+                                            p => p.uintValue = (System.Byte)Clipboard.uIntValue);
+                                break;
+                            case SerializedPropertyNumericType.Int8:
+                                SetupAction(property, menu, evt,
+                                            p => Clipboard.integerValue = (System.Byte)p.intValue,
+                                            p => Clipboard.hasInteger,
+                                            p => p.intValue = (System.Byte)Clipboard.integerValue);
+                                break;
+
+                            default:
+                                SetupAction(property, menu, evt,
+                                    p => Clipboard.integerValue = p.intValue,
+                                    p => Clipboard.hasInteger,
+                                    p => p.intValue = Clipboard.integerValue);
+                                break;
+                        }                        
+                    }
                     break;
                 case SerializedPropertyType.Float:
                     SetupAction(property, menu, evt,
diff --git a/Editor/Mono/Clipboard/ClipboardParser.cs b/Editor/Mono/Clipboard/ClipboardParser.cs
index e3c9134e83..56ca046e64 100644
--- a/Editor/Mono/Clipboard/ClipboardParser.cs
+++ b/Editor/Mono/Clipboard/ClipboardParser.cs
@@ -187,6 +187,30 @@ public static bool ParseQuaternion(string text, out Quaternion res)
             return int.TryParse(text, out res);
         }
 
+        internal static bool? ParseLong(string text, out long res)
+        {
+            res = 0;
+            if (string.IsNullOrEmpty(text))
+                return false;
+            return long.TryParse(text, out res);
+        }
+
+        internal static bool? ParseUlong(string text, out ulong res)
+        {
+            res = 0;
+            if (string.IsNullOrEmpty(text))
+                return false;
+            return ulong.TryParse(text, out res);
+        }
+
+        internal static bool? ParseUint(string text, out uint res)
+        {
+            res = 0;
+            if(string.IsNullOrEmpty(text))
+                return false;
+            return uint.TryParse(text, out res);
+        }
+
         internal static bool? ParseFloat(string text, out float res)
         {
             res = 0;
diff --git a/Editor/Mono/Clipboard/ClipboardState.cs b/Editor/Mono/Clipboard/ClipboardState.cs
index b55d4cd7a0..45d13f5463 100644
--- a/Editor/Mono/Clipboard/ClipboardState.cs
+++ b/Editor/Mono/Clipboard/ClipboardState.cs
@@ -167,6 +167,33 @@ internal void FetchInteger()
                 m_HasInteger = ClipboardParser.ParseInteger(m_RawContents, out m_ValueInteger);
         }
 
+        internal bool? m_HasLong;
+        internal long m_ValueLong;
+
+        internal void FetchLong()
+        {
+            if (!m_HasLong.HasValue)
+                m_HasLong = ClipboardParser.ParseLong(m_RawContents, out m_ValueLong);
+        }
+
+        internal bool? m_HasUlong;
+        internal ulong m_ValueUlong;
+
+        internal void FetchUlong()
+        {
+            if (!m_HasUlong.HasValue)
+                m_HasUlong = ClipboardParser.ParseUlong(m_RawContents, out m_ValueUlong);
+        }
+
+        internal bool? m_HasUint;
+        internal uint m_ValueUint;
+
+        internal void FetchUint()
+        {
+            if (!m_HasUint.HasValue)
+                m_HasUint = ClipboardParser.ParseUint(m_RawContents, out m_ValueUint);
+        }
+
         internal bool? m_HasFloat;
         internal float m_ValueFloat;
         internal void FetchFloat()
diff --git a/Editor/Mono/Collab/CloudBuildStatus.cs b/Editor/Mono/Collab/CloudBuildStatus.cs
deleted file mode 100644
index 6a88be7158..0000000000
--- a/Editor/Mono/Collab/CloudBuildStatus.cs
+++ /dev/null
@@ -1,33 +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 UnityEngine.Scripting;
-
-namespace UnityEditor.Collaboration
-{
-    // Keep internal and undocumented until we expose more functionality
-    //*undocumented
-    [StructLayout(LayoutKind.Sequential)]
-    [UsedByNativeCode]
-    internal struct CloudBuildStatus
-    {
-        private string m_Platform;
-        private bool m_Complete;
-        private bool m_Successful;
-
-        internal CloudBuildStatus(string platform = "", bool complete = false, bool success = false)
-        {
-            m_Platform = platform;
-            m_Complete = complete;
-            m_Successful = success;
-        }
-
-        public string platform { get { return m_Platform; } }
-        public bool complete { get { return m_Complete; } }
-        public bool success { get { return m_Successful; } }
-    }
-}
diff --git a/Editor/Mono/Collab/Collab.bindings.cs b/Editor/Mono/Collab/Collab.bindings.cs
deleted file mode 100644
index be25871f3b..0000000000
--- a/Editor/Mono/Collab/Collab.bindings.cs
+++ /dev/null
@@ -1,290 +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.Runtime.InteropServices;
-using UnityEditor.Connect;
-using UnityEngine;
-using UnityEngine.Bindings;
-using UnityEngine.Scripting;
-
-namespace UnityEditor.Collaboration
-{
-    [NativeHeader("Editor/Src/Collab/CollabInfo.h")]
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct CollabInfo
-    {
-        public bool ready { get { return m_Ready; } }
-        public bool update { get { return m_Update; } }
-        public bool publish { get { return m_Publish; } }
-        public bool inProgress { get { return m_InProgress; } }
-        public bool maintenance { get { return m_Maintenance; } }
-        public bool conflict { get { return m_Conflict; } }
-        public bool refresh { get { return m_Refresh; } }
-        public bool seat { get { return m_HasSeat; } }
-        public string tip { get { return m_Tip; } }
-
-        public bool Equals(CollabInfo other)
-        {
-            return m_Update == other.m_Update &&
-                m_Publish == other.m_Publish &&
-                m_InProgress == other.m_InProgress &&
-                m_Maintenance == other.m_Maintenance &&
-                m_Conflict == other.m_Conflict &&
-                m_Refresh == other.m_Refresh &&
-                m_HasSeat == other.m_HasSeat &&
-                m_Ready == other.m_Ready &&
-                string.Equals(m_Tip, other.m_Tip);
-        }
-
-        bool m_Update;
-        bool m_Publish;
-        bool m_InProgress;
-        bool m_Maintenance;
-        bool m_Conflict;
-        bool m_Refresh;
-        bool m_HasSeat;
-        bool m_Ready;
-        string m_Tip;
-    }
-
-    [NativeHeader("Editor/Src/Collab/Collab.h")]
-    [NativeHeader("Editor/Src/Collab/Collab.bindings.h")]
-    [StructLayout(LayoutKind.Sequential)]
-    [StaticAccessor("Collab::Get()", StaticAccessorType.Arrow)]
-    partial class Collab
-    {
-        [NativeMethod("Get")]
-        static extern IntPtr GetNativeCollab();
-
-        public extern CollabInfo collabInfo { get; }
-
-        public static extern int GetRevisionsData(
-            bool withChanges, int startIndex, int numRevisions);
-
-        public static extern int GetSingleRevisionData(bool withChanges, string id);
-
-        public static extern RevisionsData PopulateRevisionsData(IntPtr nativeData);
-        public static extern Revision PopulateSingleRevisionData(IntPtr nativeData);
-
-        public extern void SetSeat(bool value);
-
-        public extern void RefreshSeatAvailabilityAsync();
-
-        public extern string GetProjectGUID();
-
-        public extern bool ShouldDoInitialCommit();
-
-        [NativeMethod("DiffFileWithBaseAsync")]
-        public extern void ShowDifferences(string path);
-
-        public extern void SendNotification();
-
-        public extern void SetError(int errorCode);
-
-        public extern void ClearError(int errorCode);
-
-        public extern void ClearErrors();
-
-        public extern void ForceRefresh(bool refreshAssetDatabase);
-
-        public extern void SetCollabEnabledForCurrentProject(bool enabled);
-
-        public extern bool IsCollabEnabledForCurrentProject();
-
-        public extern bool IsAssetIgnored(string path);
-
-        public extern bool ShouldTrackAsset(string path);
-
-        [ThreadAndSerializationSafe]
-        public extern string GetProjectPath();
-
-        [ThreadAndSerializationSafe]
-        public extern bool IsConnected();
-
-        [ThreadAndSerializationSafe]
-        public extern bool AnyJobRunning();
-
-        [ThreadAndSerializationSafe]
-        public extern bool JobRunning(int a_jobID);
-
-        public extern CollabStates GetAssetState(string guid);
-        public extern CollabStates GetSelectedAssetState();
-        public extern CollabStateID GetCollabState();
-
-        [FreeFunction(HasExplicitThis = true)]
-        public extern bool ValidateSelectiveCommit();
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void Disconnect();
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void CancelJobByType(int jobType, bool forceCancel);
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void DoInitialCommit();
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void Update(string revisionID, bool updateToRevision);
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void RevertFile(string path, bool forceOverwrite);
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void RevertFiles(ChangeItem[] changeItems, bool forceOverwrite);
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void LaunchConflictExternalMerge(string path);
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void ShowConflictDifferences(string path);
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void ResyncSnapshot();
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void GoBackToRevision(string revisionID, bool updateToRevision);
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void ResyncToRevision(string revisionID);
-
-        [NativeMethod("GetConflictsManager().GetAllConflicts")]
-        public extern Change[] GetCollabConflicts();
-
-        // Conflict Management
-        [NativeMethod("GetConflictsManager().CheckConflictsResolvedExternal")]
-        public extern void CheckConflictsResolvedExternal();
-
-        [NativeMethod("GetTestHelper().AreTestsRunning")]
-        public extern bool AreTestsRunning();
-
-        [NativeMethod("GetTestHelper().SetTestsRunning")]
-        public extern void SetTestsRunning(bool running);
-
-        [NativeMethod("GetTestHelper().ClearOperationsFailure")]
-        public extern void ClearAllFailures();
-
-        [NativeMethod("GetTestHelper().UnmarkOperationFailure")]
-        public extern void ClearNextOperationFailure();
-
-        [NativeMethod("GetTestHelper().UnmarkOperationFailureForFile")]
-        public extern void ClearNextOperationFailureForFile(string path);
-
-        [NativeMethod("GetTestHelper().GetGUIDForTests")]
-        public extern string GetGUIDForTests();
-
-        [NativeMethod("GetTestHelper().NewGUIDForTests")]
-        public extern void NewGUIDForTests();
-
-        [NativeMethod("GetTestHelper().MarkOperationFailure")]
-        public extern void FailNextOperation(Collab.Operation operation, int code);
-
-        [NativeMethod("GetTestHelper().MarkOperationTimeOut")]
-        public extern void TimeOutNextOperation(Collab.Operation operation, int timeOutSec);
-
-        [NativeMethod("GetTestHelper().MarkOperationFailureForFile")]
-        public extern void FailNextOperationForFile(string path, Collab.Operation operation, int code);
-
-        [NativeMethod("GetTestHelper().MarkOperationTimeOutForFile")]
-        public extern void TimeOutNextOperationForFile(string path, Collab.Operation operation, int timeOutSec);
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void TestPostSoftLockAsCollaborator(string projectGuid, string projectPath, string machineGuid,
-            string assetGuid);
-
-        [FreeFunction(HasExplicitThis = true, ThrowsException = true)]
-        public extern void TestClearSoftLockAsCollaborator(string projectGuid, string projectPath, string machineGuid,
-            string softLockHash);
-
-        // Private helper methods for bindings
-        [NativeMethod("GetConflictsManager().SetConflictsState")]
-        extern bool SetConflictsResolved(string[] paths, CollabStates state);
-
-        [NativeMethod("OnAssetBundleNameChanged")]
-        extern void OnPostprocessAssetbundleNameChanged(string assetPath, string previousAssetBundleName, string newAssetBundleName);
-
-        [NativeMethod("GetError")]
-        internal extern bool GetErrorInternal(int errorFilter, out UnityErrorInfo info);
-
-        [NativeMethod(HasExplicitThis = true, ThrowsException = true)]
-        extern Change[] GetChangesToPublishInternal();
-
-        [NativeMethod(HasExplicitThis = true, ThrowsException = true)]
-        extern ChangeItem[] GetChangeItemsToPublishInternal_V2();
-
-        [NativeMethod(HasExplicitThis = true, ThrowsException = true, IsThreadSafe = true)]
-        extern void SetChangesToPublishInternal(ChangeItem[] changes);
-
-        [NativeMethod(HasExplicitThis = true, ThrowsException = true, IsThreadSafe = true)]
-        extern Change[] GetSelectedChangesInternal();
-
-        [NativeMethod(HasExplicitThis = true, ThrowsException = true, IsThreadSafe = true)]
-        extern ChangeItem[] GetSelectedChangeItemsInternal_V2();
-
-        [NativeMethod(HasExplicitThis = true, ThrowsException = true, IsThreadSafe = true)]
-        extern void UpdateChangesToPublish();
-
-        [NativeMethod(Name = "GetJobProgress", HasExplicitThis = true, ThrowsException = true)]
-        extern bool GetJobProgressInternal([Out] ProgressInfo info, int jobId);
-
-        [NativeMethod(HasExplicitThis = true, ThrowsException = true)]
-        public extern void Publish(string comment, bool useSelectedAssets, bool confirmMatchesPrevious);
-
-        [NativeMethod(HasExplicitThis = true, ThrowsException = true)]
-        public extern void PublishAssetsAsync(string comment, ChangeItem[] changes);
-
-        [NativeMethod(HasExplicitThis = true, ThrowsException = true, IsThreadSafe = true)]
-        public extern void ClearSelectedChangesToPublish();
-
-        [NativeMethod(HasExplicitThis = true, ThrowsException = true, IsThreadSafe = true)]
-        public extern void SendCollabInfoNotification();
-
-        [NativeMethod(HasExplicitThis = true, ThrowsException = true)]
-        public extern SoftLock[] GetSoftLocks(string assetGuid);
-    }
-
-    // keep in sync with CollabSettingType in C++
-    internal enum CollabSettingType
-    {
-        InProgressEnabled = 0,
-        InProgressProjectEnabled = 1,
-        InProgressGlobalEnabled = 2
-    }
-
-    // keep in sync with CollabSettingStatus in C++
-    internal enum CollabSettingStatus
-    {
-        None = 0,
-        Available = 1
-    }
-
-    [NativeHeader("Editor/Src/Collab/CollabSettingsManager.h")]
-    [StaticAccessor("GetCollabSettingsManager()", StaticAccessorType.Dot)]
-    internal class CollabSettingsManager
-    {
-        [RequiredByNativeCode]
-        static void NotifyStatusListeners(CollabSettingType type, CollabSettingStatus status)
-        {
-            if (statusNotifier[type] != null)
-                statusNotifier[type](type, status);
-        }
-
-        public delegate void SettingStatusChanged(CollabSettingType type, CollabSettingStatus status);
-        public static Dictionary<CollabSettingType, SettingStatusChanged> statusNotifier = new Dictionary<CollabSettingType, SettingStatusChanged>();
-
-        static CollabSettingsManager()
-        {
-            foreach (CollabSettingType type in Enum.GetValues(typeof(CollabSettingType)))
-                statusNotifier[type] = null;
-        }
-
-        public static extern bool IsAvailable(CollabSettingType type);
-
-        public static extern bool inProgressEnabled
-        {
-            get;
-        }
-    }
-}
diff --git a/Editor/Mono/Collab/Collab.cs b/Editor/Mono/Collab/Collab.cs
deleted file mode 100644
index 0056fbac88..0000000000
--- a/Editor/Mono/Collab/Collab.cs
+++ /dev/null
@@ -1,620 +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.IO;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.Scripting;
-using UnityEditor.Web;
-using UnityEditorInternal;
-using UnityEditor.Connect;
-using UnityEditor.SceneManagement;
-
-namespace UnityEditor.Collaboration
-{
-    internal delegate void StateChangedDelegate(CollabInfo info);
-    internal delegate void RevisionChangedDelegate(CollabInfo info, string rev, string action);
-    internal delegate void SetErrorDelegate(UnityErrorInfo error);
-    internal delegate void ErrorDelegate();
-    internal delegate bool ShowToolbarAtPositionDelegate(Rect screenRect);
-    internal delegate bool IsToolbarVisibleDelegate();
-    internal delegate void ShowHistoryWindowDelegate();
-    internal delegate void ShowChangesWindowDelegate();
-    internal delegate void CloseToolbarDelegate();
-    internal delegate void ChangesChangedDelegate(Change[] changes, bool isFiltered);
-    internal delegate void ChangeItemsChangedDelegate(ChangeItem[] changes, bool isFiltered);
-
-    //*undocumented
-    // We want to raise this exception from Cpp code but it fails
-    //public class CollabException: Exception
-    //{
-    //  public CollabException(string message) : base(message)
-    //  {
-    //  }
-    //}
-
-    [InitializeOnLoad]
-    internal partial class Collab
-    {
-        // Pointer to native Collab object used by automatic bindings system.
-#pragma warning disable 414            // The private field is assigned but its value is never used
-        IntPtr m_nativeCollab = IntPtr.Zero;
-
-        public event StateChangedDelegate StateChanged;
-
-        public event StateChangedDelegate RevisionUpdated;
-        public event RevisionChangedDelegate RevisionUpdated_V2;
-
-        public event StateChangedDelegate JobsCompleted;
-
-        public event ErrorDelegate ErrorOccurred;
-        public event SetErrorDelegate ErrorOccurred_V2;
-
-        public event ErrorDelegate ErrorCleared;
-
-        public event ChangeItemsChangedDelegate ChangeItemsChanged;
-        public event ChangeItemsChangedDelegate SelectedChangeItemsChanged;
-        public event StateChangedDelegate CollabInfoChanged;
-
-        // Toolbar delegates
-        public static ShowToolbarAtPositionDelegate ShowToolbarAtPosition = null;
-        public static IsToolbarVisibleDelegate IsToolbarVisible = null;
-        public static CloseToolbarDelegate CloseToolbar = null;
-
-        // Preferences link delegates
-        public static ShowHistoryWindowDelegate ShowHistoryWindow = null;
-        public static ShowChangesWindowDelegate ShowChangesWindow = null;
-
-        private static Collab s_Instance;
-        private static bool s_IsFirstStateChange = true;
-
-        [SerializeField]
-        public CollabFilters collabFilters = new CollabFilters();
-
-        public String projectBrowserSingleSelectionPath { get; set; }
-
-        public String projectBrowserSingleMetaSelectionPath { get; set; }
-
-        public string[] currentProjectBrowserSelection;
-
-        // Must keep in sync with C++ in CollabCommon.h
-        [Flags]
-        public enum Operation
-        {
-            Noop = 0,
-            Publish = 1 << 0,
-            Update = 1 << 1,
-            Revert = 1 << 2,
-            GoBack = 1 << 3,
-            Restore = 1 << 4,
-            Diff = 1 << 5,
-            ConflictDiff = 1 << 6,
-            Exclude = 1 << 7,
-            Include = 1 << 8,
-            ChooseMine = 1 << 9,
-            ChooseTheirs = 1 << 10,
-            ExternalMerge = 1 << 11,
-        }
-
-        // Must keep in sync with C++ in CollabCommon.h
-        // Explicit uint so "Any" state works with C++
-        [Flags]
-        public enum CollabStates : uint
-        {
-            kCollabNone = 0,
-            kCollabLocal = 1,
-
-            kCollabSynced = 1 << 1,
-            kCollabOutOfSync = 1 << 2,
-            kCollabIgnored = 1 << 3,
-            kCollabCheckedOutLocal = 1 << 4,
-            kCollabCheckedOutRemote = 1 << 5,
-            kCollabDeletedLocal = 1 << 6,
-            kCollabDeletedRemote = 1 << 7,
-            kCollabAddedLocal = 1 << 8,
-            kCollabAddedRemote = 1 << 9,
-            kCollabConflicted = 1 << 10,
-            kCollabMovedLocal = 1 << 11,
-            kCollabMovedRemote = 1 << 12,
-            kCollabUpdating = 1 << 13,
-            kCollabReadOnly = 1 << 14,
-            kCollabMetaFile = 1 << 15,
-            kCollabUseMine = 1 << 16,
-            kCollabUseTheir = 1 << 17,
-            kCollabMerged = 1 << 18,
-            kCollabPendingMerge = 1 << 19,
-            kCollabFolderMetaFile = 1 << 20,
-            KCollabContentChanged = 1 << 21,
-            KCollabContentConflicted = 1 << 22,
-            KCollabContentDeleted = 1 << 23,
-
-            // always keep most significant
-            kCollabInvalidState = 1 << 30,
-
-            kAnyLocalChanged = (kCollabAddedLocal | kCollabCheckedOutLocal | kCollabDeletedLocal | kCollabMovedLocal),
-            kAnyLocalEdited = (kCollabAddedLocal | kCollabCheckedOutLocal | kCollabMovedLocal),
-            kCollabAny = 0xFFFFFFFF
-        }
-
-        internal enum CollabStateID { None, Uninitialized, Initialized }
-
-        public static string[] clientType =
-        {
-            "Cloud Server",
-            "Mock Server"
-        };
-
-        internal static string editorPrefCollabClientType = "CollabConfig_Client";
-
-        public static string GetProjectClientType()
-        {
-            var cvalue = EditorUserSettings.GetConfigValue(editorPrefCollabClientType);
-            return string.IsNullOrEmpty(cvalue) ? clientType[0] : cvalue;
-        }
-
-        public static Collab instance
-        {
-            get
-            {
-                return s_Instance;
-            }
-        }
-
-        // Instance of VersionControl interface implementation
-        private static IVersionControl s_VersionControlInstance;
-
-        public static void SetVersionControl(IVersionControl instance)
-        {
-            s_VersionControlInstance = instance;
-            // Initialize version control based on whether collab is enabled
-            if (s_Instance != null)
-            {
-                if (s_Instance.IsCollabEnabledForCurrentProject())
-                {
-                    instance.OnEnableVersionControl();
-                }
-                else
-                {
-                    instance.OnDisableVersionControl();
-                }
-            }
-        }
-
-        [UsedByNativeCode]
-        internal static bool HasVersionControl()
-        {
-            return s_VersionControlInstance != null;
-        }
-
-        [UsedByNativeCode]
-        internal static void ShowChangesWindowView()
-        {
-            if (ShowChangesWindow != null)
-            {
-                ShowChangesWindow();
-            }
-        }
-
-        [UsedByNativeCode]
-        static bool SupportsDownloads()
-        {
-            if (s_VersionControlInstance != null)
-            {
-                return s_VersionControlInstance.SupportsDownloads();
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        [UsedByNativeCode]
-        static bool OnEnableVersionControl()
-        {
-            if (s_VersionControlInstance != null)
-            {
-                return s_VersionControlInstance.OnEnableVersionControl();
-            }
-            else
-            {
-                return true;
-            }
-        }
-
-        [UsedByNativeCode]
-        static void OnDisableVersionControl()
-        {
-            if (s_VersionControlInstance != null)
-            {
-                s_VersionControlInstance.OnDisableVersionControl();
-            }
-        }
-
-        [UsedByNativeCode]
-        static ChangeItem[] GetChanges()
-        {
-            if (s_VersionControlInstance != null)
-            {
-                return s_VersionControlInstance.GetChanges();
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        [UsedByNativeCode]
-        static void MergeDownloadedFiles(bool isFullDownload)
-        {
-            if (s_VersionControlInstance != null)
-            {
-                s_VersionControlInstance.MergeDownloadedFiles(isFullDownload);
-            }
-        }
-
-        [UsedByNativeCode]
-        static bool SupportsAsyncChanges()
-        {
-            if (s_VersionControlInstance != null)
-            {
-                return s_VersionControlInstance.SupportsAsyncChanges();
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        internal static CollabStates GetAssetState(string assetGuid, string assetPath)
-        {
-            if (s_VersionControlInstance != null)
-            {
-                return s_VersionControlInstance.GetAssetState(assetGuid, assetPath);
-            }
-            else
-            {
-                return instance.GetAssetState(assetGuid);
-            }
-        }
-
-        public void RefreshAvailableLocalChangesSynchronous()
-        {
-            IVersionControl_V2 vc_v2 = s_VersionControlInstance as IVersionControl_V2;
-
-            // If our VersionControlInstance isn't v2, this whole method is a no-op
-            if (vc_v2 != null)
-            {
-                vc_v2.RefreshAvailableLocalChangesSynchronous();
-                UpdateChangesToPublish();
-            }
-        }
-
-        // Static constructor for Collab
-        static Collab()
-        {
-            s_Instance = new Collab();
-            s_Instance.projectBrowserSingleSelectionPath = string.Empty;
-            s_Instance.projectBrowserSingleMetaSelectionPath = string.Empty;
-            s_Instance.m_nativeCollab = GetNativeCollab();
-            ObjectListArea.postAssetIconDrawCallback += CollabProjectHook.OnProjectWindowIconOverlay;
-            AssetsTreeViewGUI.postAssetIconDrawCallback += CollabProjectHook.OnProjectBrowserNavPanelIconOverlay;
-            InitializeSoftlocksViewController();
-            CollabSettingsManager.statusNotifier[CollabSettingType.InProgressEnabled] += OnSettingStatusChanged;
-            CollabSettingsManager.statusNotifier[CollabSettingType.InProgressEnabled] += SoftlockViewController.Instance.softLockFilters.OnSettingStatusChanged;
-        }
-
-        public static void OnSettingStatusChanged(CollabSettingType type, CollabSettingStatus status)
-        {
-            InitializeSoftlocksViewController();
-        }
-
-        public static bool InitializeSoftlocksViewController()
-        {
-            if (!CollabSettingsManager.IsAvailable(CollabSettingType.InProgressEnabled))
-                return false;
-
-            if (CollabSettingsManager.inProgressEnabled)
-                SoftlockViewController.Instance.TurnOn();
-            else
-                SoftlockViewController.Instance.TurnOff();
-            return true;
-        }
-
-
-        public bool GetError(UnityConnect.UnityErrorFilter errorFilter, out UnityErrorInfo info)
-        {
-            return GetErrorInternal((int)errorFilter, out info) && info.code > 0;
-        }
-
-        public void CancelJob(int jobType)
-        {
-            try
-            {
-                CancelJobByType(jobType, false);
-            }
-            catch (Exception ex)
-            {
-                UnityEngine.Debug.Log("Cannot cancel job, reason:" + ex.Message);
-            }
-        }
-
-        public void UpdateEditorSelectionCache()
-        {
-            var result = new List<string>();
-
-            foreach (var elem in Selection.assetGUIDsDeepSelection)
-            {
-                var path = AssetDatabase.GUIDToAssetPath(elem);
-                result.Add(path);
-
-                var meta = path + ".meta";
-                if (File.Exists(meta))
-                {
-                    result.Add(meta);
-                }
-            }
-            currentProjectBrowserSelection = result.ToArray();
-        }
-
-        public CollabInfo GetCollabInfo()
-        {
-            return collabInfo;
-        }
-
-        public static bool IsDiffToolsAvailable()
-        {
-            return InternalEditorUtility.GetAvailableDiffTools().Length > 0;
-        }
-
-        public void SaveAssets()
-        {
-            AssetDatabase.SaveAssets();
-        }
-
-        public static void SwitchToDefaultMode()
-        {
-            bool in2D = EditorSettings.defaultBehaviorMode == EditorBehaviorMode.Mode2D;
-            var sv = SceneView.lastActiveSceneView;
-            if (sv != null && sv.in2DMode != in2D)
-            {
-                sv.in2DMode = in2D;
-            }
-        }
-
-        public void ShowInProjectBrowser(string filterString)
-        {
-            collabFilters.ShowInProjectBrowser(filterString);
-        }
-
-        public bool SetConflictsResolvedMine(string[] paths)
-        {
-            return SetConflictsResolved(paths, CollabStates.kCollabUseMine);
-        }
-
-        public bool SetConflictsResolvedTheirs(string[] paths)
-        {
-            return SetConflictsResolved(paths, CollabStates.kCollabUseTheir);
-        }
-
-        public PublishInfo GetChangesToPublish()
-        {
-            Change[] changes = GetChangesToPublishInternal();
-            bool isFiltered = false;
-
-            if (SupportsAsyncChanges())
-            {
-                changes = GetSelectedChangesInternal();
-                if (Toolbar.isLastShowRequestPartial)
-                {
-                    isFiltered = true;
-                }
-            }
-
-            return new PublishInfo()
-            {
-                changes = changes,
-                filter = isFiltered
-            };
-        }
-
-        public PublishInfo_V2 GetChangesToPublish_V2()
-        {
-            ChangeItem[] changes = GetChangeItemsToPublishInternal_V2();
-
-            return new PublishInfo_V2()
-            {
-                changes = changes,
-                filter = false
-            };
-        }
-
-        public void SetChangesToPublish(ChangeItem[] changes)
-        {
-            SetChangesToPublishInternal(changes);
-        }
-
-        public ProgressInfo GetJobProgress(int jobId)
-        {
-            ProgressInfo info = new ProgressInfo();
-            if (GetJobProgressInternal(info, jobId))
-                return info;
-
-            return null;
-        }
-
-        private static void OnStateChanged()
-        {
-            // register only once
-            if (s_IsFirstStateChange)
-            {
-                s_IsFirstStateChange = false;
-                UnityConnect.instance.StateChanged += OnUnityConnectStateChanged;
-            }
-            var handler = instance.StateChanged;
-            if (handler != null)
-            {
-                handler(instance.collabInfo);
-            }
-        }
-
-        [RequiredByNativeCode]
-        private static void OnRevisionUpdated(string revisionId, string action)
-        {
-            var handler = instance.RevisionUpdated;
-            if (handler != null)
-            {
-                handler(instance.collabInfo);
-            }
-
-            var handler_v2 = instance.RevisionUpdated_V2;
-            if (handler_v2 != null)
-            {
-                handler_v2(instance.collabInfo, revisionId, action);
-            }
-        }
-
-        [RequiredByNativeCode]
-        private static void OnChangeItemsChanged(ChangeItem[] changes, bool isFiltered)
-        {
-            var handler = instance.ChangeItemsChanged;
-            if (handler != null)
-            {
-                handler(changes, isFiltered);
-            }
-        }
-
-        [RequiredByNativeCode]
-        private static void OnSelectedChangeItemsChanged(ChangeItem[] changeItems, bool isFiltered)
-        {
-            var handler = instance.SelectedChangeItemsChanged;
-            if (handler != null)
-            {
-                handler(changeItems, isFiltered);
-            }
-        }
-
-        [RequiredByNativeCode]
-        private static void OnCollabInfoChanged()
-        {
-            var handler = instance.CollabInfoChanged;
-            if (handler != null)
-            {
-                handler(instance.collabInfo);
-            }
-        }
-
-        [RequiredByNativeCode]
-        private static void SetCollabError(int code, int priority, int behavior, string msg, string shortmsg, string codeStr)
-        {
-            var handler = instance.ErrorOccurred;
-
-            if (handler != null)
-            {
-                handler();
-            }
-            var handler_v2 = instance.ErrorOccurred_V2;
-
-            if (handler_v2 != null)
-            {
-                handler_v2(new UnityErrorInfo() { code = code, priority = priority, behaviour = behavior, msg = msg, shortMsg = shortmsg, codeStr = codeStr });
-            }
-        }
-
-        [RequiredByNativeCode]
-        private static void ClearCollabError()
-        {
-            var handler = instance.ErrorCleared;
-            if (handler != null)
-                handler();
-        }
-
-        private static void OnJobsCompleted()
-        {
-            var handler = instance.JobsCompleted;
-            if (handler != null)
-            {
-                handler(instance.collabInfo);
-            }
-            CollabTesting.OnJobsCompleted();
-        }
-
-        private static void PublishDialog(string changelist)
-        {
-            if (!EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
-            {
-                return;
-            }
-
-            var dialog = CollabPublishDialog.ShowCollabWindow(changelist);
-
-            if (dialog.Options.DoPublish)
-                Collab.instance.Publish(dialog.Options.Comments, true, false);
-        }
-
-        private static void CannotPublishDialog(string infoMessage)
-        {
-            CollabCannotPublishDialog.ShowCollabWindow(infoMessage);
-        }
-
-        private static void OnUnityConnectStateChanged(ConnectInfo state)
-        {
-            instance.SendNotification();
-        }
-
-        public static void OnProgressEnabledSettingStatusChanged(CollabSettingType type, CollabSettingStatus status)
-        {
-            if (type == CollabSettingType.InProgressEnabled && status == CollabSettingStatus.Available)
-            {
-                if (CollabSettingsManager.inProgressEnabled)
-                {
-                    SoftlockViewController.Instance.softLockFilters.ShowInFavoriteSearchFilters();
-                }
-
-                CollabSettingsManager.statusNotifier[CollabSettingType.InProgressEnabled] -= OnProgressEnabledSettingStatusChanged;
-            }
-        }
-
-
-        [RequiredByNativeCode]
-        static void OnCollabEnabledForCurrentProject(bool enabled)
-        {
-            if (enabled)
-            {
-                instance.StateChanged += instance.collabFilters.OnCollabStateChanged;
-                instance.collabFilters.ShowInFavoriteSearchFilters();
-                if (CollabSettingsManager.IsAvailable(CollabSettingType.InProgressEnabled))
-                {
-                    if (CollabSettingsManager.inProgressEnabled)
-                    {
-                        SoftlockViewController.Instance.softLockFilters.ShowInFavoriteSearchFilters();
-                    }
-                }
-                else
-                {
-                    CollabSettingsManager.statusNotifier[CollabSettingType.InProgressEnabled] -= OnProgressEnabledSettingStatusChanged;
-                    CollabSettingsManager.statusNotifier[CollabSettingType.InProgressEnabled] += OnProgressEnabledSettingStatusChanged;
-                }
-            }
-            else
-            {
-                instance.StateChanged -= instance.collabFilters.OnCollabStateChanged;
-                instance.collabFilters.HideFromFavoriteSearchFilters();
-                SoftlockViewController.Instance.softLockFilters.HideFromFavoriteSearchFilters();
-                CollabSettingsManager.statusNotifier[CollabSettingType.InProgressEnabled] -= OnProgressEnabledSettingStatusChanged;
-
-                if (ProjectBrowser.s_LastInteractedProjectBrowser != null)
-                {
-                    if (ProjectBrowser.s_LastInteractedProjectBrowser.Initialized() && ProjectBrowser.s_LastInteractedProjectBrowser.IsTwoColumns())
-                    {
-                        int instanceID = AssetDatabase.GetMainAssetInstanceID("assets");
-                        ProjectBrowser.s_LastInteractedProjectBrowser.SetFolderSelection(new int[] { instanceID }, true);
-                    }
-                    ProjectBrowser.s_LastInteractedProjectBrowser.SetSearch("");
-                    ProjectBrowser.s_LastInteractedProjectBrowser.Repaint();
-                }
-            }
-        }
-    }
-}
diff --git a/Editor/Mono/Collab/CollabChange.cs b/Editor/Mono/Collab/CollabChange.cs
deleted file mode 100644
index 1297fdb044..0000000000
--- a/Editor/Mono/Collab/CollabChange.cs
+++ /dev/null
@@ -1,82 +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 UnityEngine.Bindings;
-
-namespace UnityEditor.Collaboration
-{
-    // Keep internal and undocumented until we expose more functionality
-    //*undocumented
-    [StructLayout(LayoutKind.Sequential)]
-    [NativeType(CodegenOptions = CodegenOptions.Custom, Header = "Editor/Src/Collab/CollabChange.h",
-        IntermediateScriptingStructName = "ScriptingCollabChange")]
-    [NativeHeader("Editor/Src/Collab/Collab.bindings.h")]
-    [NativeAsStruct]
-    internal class Change
-    {
-        [Flags]
-        public enum RevertableStates : uint
-        {
-            Revertable                         = 1 << 0,
-            NotRevertable                      = 1 << 1,
-
-            Revertable_File                    = 1 << 2,
-            Revertable_Folder                  = 1 << 3,
-            Revertable_EmptyFolder             = 1 << 4,
-
-            NotRevertable_File                 = 1 << 5,
-            NotRevertable_Folder               = 1 << 6,
-            NotRevertable_FileAdded            = 1 << 7,
-            NotRevertable_FolderAdded          = 1 << 8,
-            NotRevertable_FolderContainsAdd    = 1 << 9,
-
-            // do not exceed Javascript Number range
-            InvalidRevertableState             = (uint)1 << 31
-        }
-
-        string m_Path;
-        Collab.CollabStates m_State;
-        RevertableStates m_RevertableState;
-        string m_RelatedTo;
-        string m_LocalStatus;
-        string m_RemoteStatus;
-        string m_ResolveStatus;
-
-        Change() {}
-
-        public string path { get { return m_Path; } }
-        public Collab.CollabStates state { get { return m_State; } }
-        public bool isRevertable { get { return HasRevertableState(RevertableStates.Revertable); } }
-        public RevertableStates revertableState { get { return m_RevertableState; } }
-        public string relatedTo { get { return m_RelatedTo; } }
-
-        public bool isMeta { get { return HasState(Collab.CollabStates.kCollabMetaFile); } }
-        public bool isConflict { get { return HasState(Collab.CollabStates.kCollabConflicted) || HasState(Collab.CollabStates.kCollabPendingMerge); } }
-        public bool isFolderMeta { get { return HasState(Collab.CollabStates.kCollabFolderMetaFile); } }
-        public bool isResolved { get { return HasState(Collab.CollabStates.kCollabUseMine) || HasState(Collab.CollabStates.kCollabUseTheir) || HasState(Collab.CollabStates.kCollabMerged); } }
-
-        public string localStatus { get { return m_LocalStatus; } }
-        public string remoteStatus { get { return m_RemoteStatus; } }
-        public string resolveStatus { get { return m_ResolveStatus; } }
-
-        internal bool HasState(Collab.CollabStates states)
-        {
-            return (m_State & states) != 0;
-        }
-
-        internal bool HasRevertableState(RevertableStates revertableStates)
-        {
-            return (m_RevertableState & revertableStates) != 0;
-        }
-    }
-
-    internal class PublishInfo
-    {
-        public Change[] changes;
-        public bool filter;
-    }
-}
diff --git a/Editor/Mono/Collab/CollabChangeAction.cs b/Editor/Mono/Collab/CollabChangeAction.cs
deleted file mode 100644
index 8d65911b51..0000000000
--- a/Editor/Mono/Collab/CollabChangeAction.cs
+++ /dev/null
@@ -1,30 +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 UnityEngine.Scripting;
-
-namespace UnityEditor.Collaboration
-{
-    // Keep internal and undocumented until we expose more functionality
-    //*undocumented
-    [StructLayout(LayoutKind.Sequential)]
-    [UsedByNativeCode]
-    internal struct ChangeAction
-    {
-        private string m_Path;
-        private string m_Action;
-
-        public ChangeAction(string path = "", string action = "")
-        {
-            m_Path = path;
-            m_Action = action;
-        }
-
-        public string path { get { return m_Path; } }
-        public string action { get { return m_Action; } }
-    }
-}
diff --git a/Editor/Mono/Collab/CollabChangeItem.cs b/Editor/Mono/Collab/CollabChangeItem.cs
index cfca4a5ab9..ad380552c0 100644
--- a/Editor/Mono/Collab/CollabChangeItem.cs
+++ b/Editor/Mono/Collab/CollabChangeItem.cs
@@ -6,29 +6,3 @@
 using System.Runtime.InteropServices;
 using UnityEngine.Bindings;
 
-namespace UnityEditor.Collaboration
-{
-    [StructLayout(LayoutKind.Sequential)]
-    [NativeType(CodegenOptions = CodegenOptions.Custom, Header = "Editor/Src/Collab/CollabClient.h",
-        IntermediateScriptingStructName = "ScriptingCollabChangeItem")]
-    [NativeHeader("Editor/Src/Collab/Collab.bindings.h")]
-    [NativeAsStruct]
-    internal class ChangeItem
-    {
-        public string Path { get; set; }
-        public Change.RevertableStates RevertableState { get; set; }
-        public string RelatedTo { get; set; }
-        public string RevisionId { get; set; }
-        public string Hash { get; set; }
-        public Collab.CollabStates State { get; set; }
-        public long Size { get; set; }
-        public string DownloadPath { get; set; }
-        public string FromPath { get; set; }
-    }
-
-    internal class PublishInfo_V2
-    {
-        public ChangeItem[] changes;
-        public bool filter;
-    }
-}
diff --git a/Editor/Mono/Collab/CollabDialogs.cs b/Editor/Mono/Collab/CollabDialogs.cs
deleted file mode 100644
index 155f8766e1..0000000000
--- a/Editor/Mono/Collab/CollabDialogs.cs
+++ /dev/null
@@ -1,146 +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.IO;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor;
-using UnityEditor.Web;
-using UnityEditorInternal;
-using UnityEditor.Connect;
-
-namespace UnityEditor.Collaboration
-{
-    internal struct PublishDialogOptions
-    {
-        public string   Comments;
-        public bool     DoPublish;
-    }
-
-    internal class CollabPublishDialog : EditorWindow
-    {
-        public static CollabPublishDialog ShowCollabWindow(string changelist)
-        {
-            CollabPublishDialog dialog = ScriptableObject.CreateInstance<CollabPublishDialog>();
-            dialog.Changelist = changelist;
-
-            var rect = new Rect(100, 100, 600, 225);
-            dialog.minSize = new Vector2(rect.width, rect.height);
-            dialog.maxSize = new Vector2(rect.width, rect.height);
-            dialog.position = rect;
-            dialog.ShowModal();
-
-            dialog.m_Parent.window.m_DontSaveToLayout = true;
-
-            return dialog;
-        }
-
-        static GUIContent DescribeChangesText = EditorGUIUtility.TrTextContent("Describe your changes here");
-        static GUIContent ChangeAssetsText = EditorGUIUtility.TrTextContent("Changed assets:");
-        static GUIContent PublishText = EditorGUIUtility.TrTextContent("Publish");
-        static GUIContent CancelText = EditorGUIUtility.TrTextContent("Cancel");
-
-        public Vector2 scrollView;
-        public string Changelist;
-
-        public CollabPublishDialog()
-        {
-            Options.Comments = "";
-        }
-
-        public void OnGUI()
-        {
-            GUILayout.BeginVertical();
-            GUILayout.Label(DescribeChangesText);
-            Options.Comments = GUILayout.TextArea(Options.Comments, 1000, GUILayout.MinHeight(80));
-
-
-            GUILayout.Label(ChangeAssetsText);
-            scrollView = EditorGUILayout.BeginScrollView(scrollView, false, false);
-            GUIStyle style = new GUIStyle();
-            Vector2 textSize = style.CalcSize(new GUIContent(Changelist));
-            EditorGUILayout.SelectableLabel(Changelist, EditorStyles.textField, GUILayout.ExpandHeight(true), GUILayout.MinHeight(textSize.y));
-            EditorGUILayout.EndScrollView();
-
-            GUILayout.FlexibleSpace();
-
-            GUILayout.BeginHorizontal();
-            GUILayout.FlexibleSpace();
-
-            if (GUILayout.Button(CancelText))
-            {
-                Options.DoPublish = false;
-                Close();
-            }
-
-            if (GUILayout.Button(PublishText))
-            {
-                Options.DoPublish = true;
-                Close();
-            }
-
-            GUILayout.EndHorizontal();
-            GUILayout.EndVertical();
-        }
-
-        public PublishDialogOptions Options;
-    }
-
-    internal class CollabCannotPublishDialog : EditorWindow
-    {
-        public static CollabCannotPublishDialog ShowCollabWindow(string infoMessage)
-        {
-            CollabCannotPublishDialog dialog = ScriptableObject.CreateInstance<CollabCannotPublishDialog>();
-            dialog.InfoMessage = infoMessage;
-
-            var rect = new Rect(100, 100, 600, 150);
-            dialog.minSize = new Vector2(rect.width, rect.height);
-            dialog.maxSize = new Vector2(rect.width, rect.height);
-            dialog.position = rect;
-            dialog.ShowModal();
-
-            dialog.m_Parent.window.m_DontSaveToLayout = true;
-
-            return dialog;
-        }
-
-        static GUIContent WarningText = EditorGUIUtility.TextContent(string.Format(
-            "Files that have been moved or in a changed folder cannot be selectively published, " +
-            "please use the Publish option in the collab window to publish all your changes."));
-        static GUIContent IssuesText = EditorGUIUtility.TrTextContent("Issues:");
-        static GUIContent AcceptText = EditorGUIUtility.TrTextContent("Accept");
-
-        public Vector2 scrollPosition;
-        public string InfoMessage;
-
-        public void OnGUI()
-        {
-            GUILayout.BeginVertical();
-            GUI.skin.label.wordWrap = true;
-
-            GUILayout.BeginVertical();
-            GUILayout.Label(WarningText);
-
-            GUILayout.Label(IssuesText);
-
-            scrollPosition = EditorGUILayout.BeginScrollView(scrollPosition);
-            GUIStyle warnStyle = new GUIStyle();
-            warnStyle.normal.textColor = new Color(1f, 0.28f, 0f);
-            GUILayout.Label(string.Format(InfoMessage), warnStyle);
-            GUILayout.EndScrollView();
-
-            GUILayout.EndVertical();
-
-            GUILayout.BeginHorizontal();
-            GUILayout.FlexibleSpace();
-
-            if (GUILayout.Button(AcceptText))
-                Close();
-            GUILayout.EndHorizontal();
-
-            GUILayout.EndVertical();
-        }
-    }
-}
diff --git a/Editor/Mono/Collab/CollabEditorHooks.cs b/Editor/Mono/Collab/CollabEditorHooks.cs
deleted file mode 100644
index 89965e7b3f..0000000000
--- a/Editor/Mono/Collab/CollabEditorHooks.cs
+++ /dev/null
@@ -1,196 +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.IO;
-using UnityEngine;
-using UnityEditor.Web;
-using UnityEditor.Connect;
-
-namespace UnityEditor.Collaboration
-{
-    // Display hooks for the main project window.  Icons are overlayed to show the version control state.
-    internal class CollabProjectHook
-    {
-        // GUI callback for each item visible in the project window/object list area
-        public static void OnProjectWindowIconOverlay(Rect iconRect, string guid, bool isListMode)
-        {
-            DrawProjectBrowserIconOverlay(iconRect, guid, isListMode);
-        }
-
-        // Draw icons in the Favorites/Asset Folder area of the project browser
-        public static void OnProjectBrowserNavPanelIconOverlay(Rect iconRect, string guid)
-        {
-            DrawProjectBrowserIconOverlay(iconRect, guid, true);
-        }
-
-        private static void DrawProjectBrowserIconOverlay(Rect iconRect, string guid, bool isListMode)
-        {
-            if (Collab.instance.IsCollabEnabledForCurrentProject())
-            {
-                Collab.CollabStates assetState = GetAssetState(guid);
-                Overlay.DrawOverlays(assetState, iconRect, isListMode);
-            }
-        }
-
-        public static Collab.CollabStates GetAssetState(String assetGuid)
-        {
-            if (!Collab.instance.IsCollabEnabledForCurrentProject())
-            {
-                return Collab.CollabStates.kCollabNone;
-            }
-
-            Collab.CollabStates assetState = Collab.GetAssetState(assetGuid, AssetDatabase.GUIDToAssetPath(assetGuid));
-            return assetState;
-        }
-    }
-
-    internal class Overlay
-    {
-        public const double k_OverlaySizeOnSmallIcon = 0.6;
-        public const double k_OverlaySizeOnLargeIcon = 0.35;
-
-        private static readonly Dictionary<Collab.CollabStates, GUIContent> s_Overlays = new Dictionary<Collab.CollabStates, GUIContent>();
-
-        protected static void LoadOverlays()
-        {
-            // Order of priority must match GetLocalStatus (CollabClient.h)
-            s_Overlays.Clear();
-            s_Overlays.Add(Collab.CollabStates.kCollabIgnored, EditorGUIUtility.IconContent("CollabExclude Icon"));
-            s_Overlays.Add(Collab.CollabStates.kCollabConflicted, EditorGUIUtility.IconContent("CollabConflict Icon"));
-            s_Overlays.Add(Collab.CollabStates.kCollabPendingMerge, EditorGUIUtility.IconContent("CollabConflict Icon"));
-            s_Overlays.Add(Collab.CollabStates.kCollabMovedLocal, EditorGUIUtility.IconContent("CollabMoved Icon"));
-            s_Overlays.Add(Collab.CollabStates.kCollabCheckedOutLocal | Collab.CollabStates.kCollabMovedLocal, EditorGUIUtility.IconContent("CollabMoved Icon"));
-            s_Overlays.Add(Collab.CollabStates.kCollabCheckedOutLocal, EditorGUIUtility.IconContent("CollabEdit Icon"));
-            s_Overlays.Add(Collab.CollabStates.kCollabAddedLocal, EditorGUIUtility.IconContent("CollabCreate Icon"));
-            s_Overlays.Add(Collab.CollabStates.kCollabDeletedLocal, EditorGUIUtility.IconContent("CollabDeleted Icon"));
-
-            // The folder overlay should take precedence on the folder content's status.
-            s_Overlays.Add(Collab.CollabStates.KCollabContentConflicted, EditorGUIUtility.IconContent("CollabChangesConflict Icon"));
-            s_Overlays.Add(Collab.CollabStates.KCollabContentChanged, EditorGUIUtility.IconContent("CollabChanges Icon"));
-            s_Overlays.Add(Collab.CollabStates.KCollabContentDeleted, EditorGUIUtility.IconContent("CollabChangesDeleted Icon"));
-        }
-
-        protected static bool AreOverlaysLoaded()
-        {
-            if (s_Overlays.Count == 0)
-                return false;
-
-            foreach (var icon in s_Overlays.Values)
-            {
-                if (icon == null)
-                    return false;
-            }
-
-            return true;
-        }
-
-        protected static Collab.CollabStates GetOverlayStateForAsset(Collab.CollabStates assetStates)
-        {
-            foreach (var state in s_Overlays.Keys)
-            {
-                if (HasState(assetStates, state))
-                    return state;
-            }
-
-            return Collab.CollabStates.kCollabNone;
-        }
-
-        protected static void DrawOverlayElement(Collab.CollabStates singleState, Rect itemRect)
-        {
-            GUIContent content;
-            if (s_Overlays.TryGetValue(singleState, out content))
-            {
-                Texture overlay = content.image;
-                if (overlay != null)
-                {
-                    GUI.DrawTexture(itemRect, overlay, ScaleMode.ScaleToFit);
-                }
-            }
-        }
-
-        protected static bool HasState(Collab.CollabStates assetStates, Collab.CollabStates includesState)
-        {
-            return ((assetStates & includesState) == includesState);
-        }
-
-        public static void DrawOverlays(Collab.CollabStates assetState, Rect itemRect, bool isListMode)
-        {
-            if (assetState == Collab.CollabStates.kCollabInvalidState || assetState == Collab.CollabStates.kCollabNone)
-                return;
-
-            if (Event.current.type != EventType.Repaint)
-                return;
-
-            if (!AreOverlaysLoaded())
-                LoadOverlays();
-
-            var state = GetOverlayStateForAsset(assetState);
-            DrawOverlayElement(state, GetRectForTopRight(itemRect, GetScale(itemRect, isListMode)));
-        }
-
-        // Return a new Rect with its width and height scaled, and converted to the ceiling.
-        public static Rect ScaleRect(Rect rect, double scale)
-        {
-            Rect scaledRect = new Rect(rect);
-            scaledRect.width = Convert.ToInt32(Math.Ceiling(rect.width * scale));
-            scaledRect.height = Convert.ToInt32(Math.Ceiling(rect.height * scale));
-            return scaledRect;
-        }
-
-        public static double GetScale(Rect rect, bool isListMode)
-        {
-            double scale = k_OverlaySizeOnLargeIcon;
-            if (isListMode)
-            {
-                scale = k_OverlaySizeOnSmallIcon;
-            }
-            return scale;
-        }
-
-        public static Rect GetRectForTopRight(Rect projectBrowserDrawRect, double scale)
-        {
-            Rect scaledRect = ScaleRect(projectBrowserDrawRect, scale);
-            scaledRect.x += (projectBrowserDrawRect.width - scaledRect.width);
-            return scaledRect;
-        }
-
-        public static Rect GetRectForBottomRight(Rect projectBrowserDrawRect, double scale)
-        {
-            Rect scaledRect = ScaleRect(projectBrowserDrawRect, scale);
-            scaledRect.x += (projectBrowserDrawRect.width - scaledRect.width);
-            scaledRect.y += (projectBrowserDrawRect.height - scaledRect.height);
-            return scaledRect;
-        }
-    }
-
-    internal static class TextureUtility
-    {
-        public static Texture2D LoadTextureFromApplicationContents(string path)
-        {
-            var tex = new Texture2D(2, 2);
-
-            string resourcesPath = Path.Combine(Path.Combine(Path.Combine(EditorApplication.applicationContentsPath, "Resources"), "Collab"), "overlays");
-            path = Path.Combine(resourcesPath, path);
-
-            try
-            {
-                using (var fs = File.OpenRead(path))
-                {
-                    var bytes = new byte[fs.Length];
-                    fs.Read(bytes, 0, (int)fs.Length);
-                    if (!tex.LoadImage(bytes)) return null;
-                }
-            }
-            catch (Exception)
-            {
-                Debug.LogWarning("Collab Overlay Texture load fail, path: " + path);
-                return null;
-            }
-
-            return tex;
-        }
-    }
-}
diff --git a/Editor/Mono/Collab/CollabFilters.cs b/Editor/Mono/Collab/CollabFilters.cs
deleted file mode 100644
index 9a2373fc4a..0000000000
--- a/Editor/Mono/Collab/CollabFilters.cs
+++ /dev/null
@@ -1,169 +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;
-using UnityEngine;
-
-namespace UnityEditor.Collaboration
-{
-    internal abstract class AbstractFilters
-    {
-        [SerializeField]
-        private List<string[]> m_Filters;
-
-        public List<string[]> filters { get { return m_Filters; } set { m_Filters = value; } }
-
-        public abstract void InitializeFilters();
-
-        public bool ContainsSearchFilter(string name, string searchString)
-        {
-            foreach (var filter in filters)
-            {
-                if (filter[0] == name && filter[1] == searchString)
-                    return true;
-            }
-            return false;
-        }
-
-        public void ShowInFavoriteSearchFilters()
-        {
-            if (SavedSearchFilters.GetRootInstanceID() == 0)
-            {
-                SavedSearchFilters.AddInitializedListener(ShowInFavoriteSearchFilters);
-                return;
-            }
-
-            SavedSearchFilters.RemoveInitializedListener(ShowInFavoriteSearchFilters);
-            int prevInstanceID = 0;
-            foreach (var filter in filters)
-            {
-                int instanceID = SavedSearchFilters.GetFilterInstanceID(filter[0], filter[1]);
-                if (instanceID == 0)
-                {
-                    SearchFilter searchFilter = SearchFilter.CreateSearchFilterFromString(filter[1]);
-                    if (prevInstanceID == 0)
-                        prevInstanceID = SavedSearchFilters.AddSavedFilter(filter[0], searchFilter, 64);
-                    else
-                        prevInstanceID = SavedSearchFilters.AddSavedFilterAfterInstanceID(filter[0], searchFilter, 64, prevInstanceID, false);
-                }
-            }
-
-            SavedSearchFilters.RefreshSavedFilters();
-
-            foreach (ProjectBrowser pb in ProjectBrowser.GetAllProjectBrowsers())
-            {
-                pb.Repaint();
-            }
-        }
-
-        public void HideFromFavoriteSearchFilters()
-        {
-            SavedSearchFilters.RefreshSavedFilters();
-
-            foreach (ProjectBrowser pb in ProjectBrowser.GetAllProjectBrowsers())
-            {
-                pb.Repaint();
-            }
-        }
-    }
-
-    internal class CollabFilters : AbstractFilters
-    {
-        [SerializeField]
-        private bool m_SearchFilterWasSet = false;
-
-        public override void InitializeFilters()
-        {
-            filters = new List<string[]>()
-            {
-                new string[] { "All Modified", "v:any" },
-                new string[] { "All Conflicts", "v:conflicted" },
-                new string[] { "All Excluded" , "v:ignored"},
-            };
-        }
-
-        public CollabFilters()
-        {
-            InitializeFilters();
-        }
-
-        public void ShowInProjectBrowser(string filterString)
-        {
-            ProjectBrowser browser = ProjectBrowser.s_LastInteractedProjectBrowser;
-            if (browser == null)
-            {
-                List<ProjectBrowser> browsers = ProjectBrowser.GetAllProjectBrowsers();
-                if (browsers != null && browsers.Count > 0)
-                {
-                    browser = browsers.First();
-                }
-            }
-
-            if (!string.IsNullOrEmpty(filterString))
-            {
-                if (browser == null)
-                {
-                    browser = EditorWindow.GetWindow<ProjectBrowser>();
-                    ShowInFavoriteSearchFilters();
-                    browser.RepaintImmediately();
-                }
-
-                m_SearchFilterWasSet = true;
-
-                string filterSearchString = "v:" + filterString;
-                if (browser.IsTwoColumns())
-                {
-                    foreach (var filter in filters)
-                    {
-                        if (filterSearchString == filter[1])
-                        {
-                            int instanceID = SavedSearchFilters.GetFilterInstanceID(filter[0], filterSearchString);
-                            if (instanceID > ProjectWindowUtil.k_FavoritesStartInstanceID)
-                            {
-                                browser.SetFolderSelection(new int[] { instanceID }, true);
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                browser.SetSearch(filterSearchString);
-                browser.Repaint();
-                browser.Focus();
-            }
-            else
-            {
-                if (m_SearchFilterWasSet)
-                {
-                    if (browser != null)
-                    {
-                        if (browser.IsTwoColumns())
-                        {
-                            int instanceID = AssetDatabase.GetMainAssetInstanceID("assets");
-                            browser.SetFolderSelection(new int[] { instanceID }, true);
-                        }
-                        browser.SetSearch("");
-                        browser.Repaint();
-                    }
-                }
-                m_SearchFilterWasSet = false;
-            }
-        }
-
-        public void OnCollabStateChanged(CollabInfo info)
-        {
-            if (!info.ready || info.inProgress || info.maintenance)
-                return;
-
-            foreach (ProjectBrowser pb in ProjectBrowser.GetAllProjectBrowsers())
-            {
-                pb.RefreshSearchIfFilterContains("v:");
-            }
-        }
-    }
-}
diff --git a/Editor/Mono/Collab/CollabProgressInfo.cs b/Editor/Mono/Collab/CollabProgressInfo.cs
deleted file mode 100644
index 5727a41a7d..0000000000
--- a/Editor/Mono/Collab/CollabProgressInfo.cs
+++ /dev/null
@@ -1,73 +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.Runtime.InteropServices;
-using UnityEngine.Bindings;
-
-namespace UnityEditor.Collaboration
-{
-    // Keep internal and undocumented until we expose more functionality
-    //*undocumented
-    [StructLayout(LayoutKind.Sequential)]
-    [NativeType(CodegenOptions = CodegenOptions.Custom, Header = "Editor/Src/Collab/CollabProgressInfo.h",
-        IntermediateScriptingStructName = "ScriptingCollabProgressInfo")]
-    [NativeHeader("Editor/Src/Collab/Collab.bindings.h")]
-    [NativeAsStruct]
-    internal class ProgressInfo
-    {
-        public enum ProgressType : uint
-        {
-            None = 0,
-            Count = 1,
-            Percent = 2,
-            Both = 3
-        }
-
-        int m_JobId;
-        string m_Title;
-        string m_ExtraInfo;
-        ProgressType m_ProgressType;
-        int m_Percentage;
-        int m_CurrentCount;
-        int m_TotalCount;
-        bool m_Completed;
-        bool m_Cancelled;
-        bool m_CanCancel;
-        string m_LastErrorString;
-        ulong m_LastError;
-
-        public int jobId { get { return m_JobId; } }
-        public string title { get { return m_Title; } }
-        public string extraInfo { get { return m_ExtraInfo; } }
-        public int currentCount { get { return m_CurrentCount; } }
-        public int totalCount { get { return m_TotalCount; } }
-        public bool completed { get { return m_Completed; } }
-        public bool cancelled { get { return m_Cancelled; } }
-        public bool canCancel { get { return m_CanCancel; } }
-        public string lastErrorString { get { return m_LastErrorString; } }
-        public ulong lastError { get { return m_LastError; } }
-
-        public int percentComplete
-        {
-            get
-            {
-                if (m_ProgressType == ProgressType.Percent || m_ProgressType == ProgressType.Both)
-                {
-                    return m_Percentage;
-                }
-
-                if (m_ProgressType == ProgressType.Count)
-                {
-                    if (m_TotalCount == 0) return 0;
-                    return (m_CurrentCount * 100) / m_TotalCount;
-                }
-                return 0;
-            }
-        }
-
-        public bool isProgressTypeCount { get { return (m_ProgressType == ProgressType.Count || m_ProgressType == ProgressType.Both); } }
-        public bool isProgressTypePercent { get { return (m_ProgressType == ProgressType.Percent || m_ProgressType == ProgressType.Both); } }
-        public bool errorOccured { get { return (m_LastError != 0); } }
-    }
-}
diff --git a/Editor/Mono/Collab/CollabRevision.cs b/Editor/Mono/Collab/CollabRevision.cs
deleted file mode 100644
index d00b479d95..0000000000
--- a/Editor/Mono/Collab/CollabRevision.cs
+++ /dev/null
@@ -1,56 +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.Runtime.InteropServices;
-using UnityEngine.Bindings;
-using UnityEngine.Scripting;
-
-namespace UnityEditor.Collaboration
-{
-    // Keep internal and undocumented until we expose more functionality
-    //*undocumented
-    [StructLayout(LayoutKind.Sequential)]
-    [UsedByNativeCode]
-    internal struct Revision
-    {
-        [NativeName("m_CommitterName")]
-        private string m_AuthorName;
-        [NativeName("m_CommitterEmail")]
-        private string m_Author;
-        private string m_Comment;
-        private string m_RevisionID;
-        private string m_Reference;
-        private ulong m_TimeStamp;
-        // Whether this revision has been obtained by the client
-        private bool m_IsObtained;
-        private ChangeAction[] m_Entries;
-        private CloudBuildStatus[] m_BuildStatuses;
-
-        internal Revision(string revisionID = "", string authorName = "", string author = "",
-                          string comment = "", string reference = "", ulong timeStamp = 0,
-                          bool isObtained = false, ChangeAction[] entries = null,
-                          CloudBuildStatus[] buildStatuses = null)
-        {
-            m_AuthorName = authorName;
-            m_Author = author;
-            m_Comment = comment;
-            m_RevisionID = revisionID;
-            m_Reference = reference;
-            m_TimeStamp = timeStamp;
-            m_IsObtained = isObtained;
-            m_Entries = entries ?? new ChangeAction[0];
-            m_BuildStatuses = buildStatuses ?? new CloudBuildStatus[0];
-        }
-
-        public string authorName { get { return m_AuthorName;  } }
-        public string author { get { return m_Author;  } }
-        public string comment { get { return m_Comment;  } }
-        public string revisionID { get { return m_RevisionID;  } }
-        public string reference { get { return m_Reference;  } }
-        public ulong timeStamp { get { return m_TimeStamp;  } }
-        public bool isObtained { get { return m_IsObtained;  } }
-        public ChangeAction[] entries { get { return m_Entries;  } }
-        public CloudBuildStatus[] buildStatuses { get { return m_BuildStatuses;  } }
-    }
-}
diff --git a/Editor/Mono/Collab/CollabRevisionsData.cs b/Editor/Mono/Collab/CollabRevisionsData.cs
deleted file mode 100644
index 0c13f70010..0000000000
--- a/Editor/Mono/Collab/CollabRevisionsData.cs
+++ /dev/null
@@ -1,27 +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.Runtime.InteropServices;
-using UnityEngine.Bindings;
-using UnityEngine.Scripting;
-
-namespace UnityEditor.Collaboration
-{
-    // Keep internal and undocumented until we expose more functionality
-    //*undocumented
-    [StructLayout(LayoutKind.Sequential)]
-    [UsedByNativeCode]
-    internal struct RevisionsData
-    {
-        private int m_RevisionsInRepo;
-        private int m_RevisionOffset;
-        private int m_ReturnedRevisions;
-        private Revision[] m_Revisions;
-
-        public int RevisionsInRepo {get { return m_RevisionsInRepo; }}
-        public int RevisionOffset {get { return m_RevisionOffset; }}
-        public int ReturnedRevisions {get { return m_ReturnedRevisions; }}
-        public Revision[] Revisions {get { return m_Revisions; }}
-    }
-}
diff --git a/Editor/Mono/Collab/CollabTesting.cs b/Editor/Mono/Collab/CollabTesting.cs
index 38b0e268a3..06c451a530 100644
--- a/Editor/Mono/Collab/CollabTesting.cs
+++ b/Editor/Mono/Collab/CollabTesting.cs
@@ -64,8 +64,6 @@ public static void Execute()
             if (_enumerator == null)
                 return;
 
-            if (Collab.instance.AnyJobRunning())
-                return;
 
             try
             {
diff --git a/Editor/Mono/Collab/CollabToUVCSBridge.cs b/Editor/Mono/Collab/CollabToUVCSBridge.cs
new file mode 100644
index 0000000000..2291d35ca6
--- /dev/null
+++ b/Editor/Mono/Collab/CollabToUVCSBridge.cs
@@ -0,0 +1,530 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+// This file was introduced as part of the collab removal, it supports any versions of com.unity.collab-proxy under 1.17.7
+// It allows for an error free upgrade by provinding mock classes for the removed ones.
+
+using System;
+using System.Diagnostics;
+using System.Collections.Generic;
+
+using UnityEditor.Connect;
+using UnityEditor.PackageManager;
+using UnityEngine;
+
+#pragma warning disable 0067
+#pragma warning disable 0618
+namespace UnityEditor.Collaboration
+{
+    internal static class LogObsolete
+    {
+        static bool s_Initialized;
+        static bool s_NeedsLogging;
+        static Stopwatch s_Stopwatch = Stopwatch.StartNew();
+
+        internal static void Log()
+        {
+            if (!s_Initialized)
+                s_NeedsLogging = IsObsolete("com.unity.collab-proxy", "1.1");
+
+            s_Initialized = true;
+
+            if (!s_NeedsLogging)
+                return;
+
+            if (s_Stopwatch.ElapsedMilliseconds < 1000)
+                return;
+
+            UnityEngine.Debug.unityLogger.LogWarning(
+                "com.unity.collab-proxy",
+                "This version of the package is not supported, please upgrade to the latest version. https://unity.com/solutions/version-control");
+
+            s_Stopwatch.Restart();
+        }
+
+        internal static bool IsObsolete(string packageName, string version)
+        {
+            UnityEditor.PackageManager.PackageInfo package = null;
+            try
+            {
+                package = UnityEditor.PackageManager.PackageInfo.FindForPackageName(packageName);
+            }
+            catch
+            {
+                return false;
+            }
+
+            if (package == null)
+                return false;
+
+            if (package.version == null)
+                return false;
+
+            return package.version.StartsWith(version);
+        }
+    }
+
+    internal class Collab
+    {
+        static Collab s_instance = null;
+        public static Collab instance {
+            get
+            {
+                if (s_instance == null)
+                    s_instance = new Collab();
+
+                LogObsolete.Log();
+                return s_instance;
+            }
+        }
+
+        Collab()
+        {
+        }
+
+        [Flags]
+        public enum Operation
+        {
+            Noop = 0,
+            Publish = 1 << 0,
+            Update = 1 << 1,
+            Revert = 1 << 2,
+            GoBack = 1 << 3,
+            Restore = 1 << 4,
+            Diff = 1 << 5,
+            ConflictDiff = 1 << 6,
+            Exclude = 1 << 7,
+            Include = 1 << 8,
+            ChooseMine = 1 << 9,
+            ChooseTheirs = 1 << 10,
+            ExternalMerge = 1 << 11,
+        }
+
+        [Flags]
+        public enum CollabStates : uint
+        {
+            kCollabNone = 0,
+            kCollabLocal = 1,
+            kCollabSynced = 1 << 1,
+            kCollabOutOfSync = 1 << 2,
+            kCollabIgnored = 1 << 3,
+            kCollabCheckedOutLocal = 1 << 4,
+            kCollabCheckedOutRemote = 1 << 5,
+            kCollabDeletedLocal = 1 << 6,
+            kCollabDeletedRemote = 1 << 7,
+            kCollabAddedLocal = 1 << 8,
+            kCollabAddedRemote = 1 << 9,
+            kCollabConflicted = 1 << 10,
+            kCollabMovedLocal = 1 << 11,
+            kCollabMovedRemote = 1 << 12,
+            kCollabUpdating = 1 << 13,
+            kCollabReadOnly = 1 << 14,
+            kCollabMetaFile = 1 << 15,
+            kCollabUseMine = 1 << 16,
+            kCollabUseTheir = 1 << 17,
+            kCollabMerged = 1 << 18,
+            kCollabPendingMerge = 1 << 19,
+            kCollabFolderMetaFile = 1 << 20,
+            KCollabContentChanged = 1 << 21,
+            KCollabContentConflicted = 1 << 22,
+            KCollabContentDeleted = 1 << 23,
+            kCollabInvalidState = 1 << 30,
+            kAnyLocalChanged = (kCollabAddedLocal | kCollabCheckedOutLocal | kCollabDeletedLocal | kCollabMovedLocal),
+            kAnyLocalEdited = (kCollabAddedLocal | kCollabCheckedOutLocal | kCollabMovedLocal),
+            kCollabAny = 0xFFFFFFFF
+        }
+
+        internal enum CollabStateID { None, Uninitialized, Initialized }
+
+        internal static class BindingsMarshaller
+        {
+            public static IntPtr ConvertToNative(Collab collab){ return IntPtr.Zero; }
+        }
+
+        public event StateChangedDelegate StateChanged;
+        public event StateChangedDelegate RevisionUpdated;
+        public event RevisionChangedDelegate RevisionUpdated_V2;
+        public event StateChangedDelegate JobsCompleted;
+        public event ErrorDelegate ErrorOccurred;
+        public event SetErrorDelegate ErrorOccurred_V2;
+        public event ErrorDelegate ErrorCleared;
+        public event ChangeItemsChangedDelegate ChangeItemsChanged;
+        public event ChangeItemsChangedDelegate SelectedChangeItemsChanged;
+        public event StateChangedDelegate CollabInfoChanged;
+        public static int GetRevisionsData(bool withChanges, int startIndex, int numRevisions){ return 0; }
+        public static int GetSingleRevisionData(bool withChanges, string id){ return 0; }
+        public static RevisionsData PopulateRevisionsData(IntPtr nativeData){ return new RevisionsData(); }
+        public static Revision PopulateSingleRevisionData(IntPtr nativeData){ return new Revision(); }
+        public static ShowToolbarAtPositionDelegate ShowToolbarAtPosition = null;
+        public static IsToolbarVisibleDelegate IsToolbarVisible = null;
+        public static CloseToolbarDelegate CloseToolbar = null;
+        public static ShowHistoryWindowDelegate ShowHistoryWindow = null;
+        public static ShowChangesWindowDelegate ShowChangesWindow = null;
+        public static string[] clientType = Array.Empty<string>();
+        internal static string editorPrefCollabClientType = string.Empty;
+        public static string GetProjectClientType() { return string.Empty; }
+        public static void SetVersionControl(IVersionControl instance){}
+        internal static bool HasVersionControl(){ return false; }
+        internal static void ShowChangesWindowView(){}
+        internal static CollabStates GetAssetState(string assetGuid, string assetPath){ return (CollabStates)0; }
+        public static void OnSettingStatusChanged(CollabSettingType type, CollabSettingStatus status){}
+        public static bool InitializeSoftlocksViewController(){ return false; }
+        public static bool IsDiffToolsAvailable(){ return false; }
+        public static void SwitchToDefaultMode(){}
+        public static void OnProgressEnabledSettingStatusChanged(CollabSettingType type, CollabSettingStatus status){}
+
+        public CollabInfo collabInfo { get; }
+        public void SetSeat(bool value){}
+        public void RefreshSeatAvailabilityAsync(){}
+        public string GetProjectGUID(){ return string.Empty; }
+        public bool ShouldDoInitialCommit(){ return false; }
+        public void ShowDifferences(string path){}
+        public void SendNotification(){}
+        public void SetError(int errorCode){}
+        public void ClearError(int errorCode){}
+        public void ClearErrors(){}
+        public void ForceRefresh(bool refreshAssetDatabase){}
+        public void SetCollabEnabledForCurrentProject(bool enabled){}
+        public bool IsCollabEnabledForCurrentProject(){ return false; }
+        public bool IsAssetIgnored(string path){ return false; }
+        public bool ShouldTrackAsset(string path){ return false; }
+        public string GetProjectPath(){ return string.Empty; }
+        public bool IsConnected(){ return false; }
+        public bool AnyJobRunning(){ return false; }
+        public bool JobRunning(int a_jobID){ return false; }
+        public CollabStates GetAssetState(string guid){ return (CollabStates)0; }
+        public CollabStates GetSelectedAssetState(){ return (CollabStates)0; }
+        public CollabStateID GetCollabState(){ return (CollabStateID)0; }
+        public bool ValidateSelectiveCommit(){ return false; }
+        public void Disconnect(){}
+        public void CancelJobByType(int jobType, bool forceCancel){}
+        public void DoInitialCommit(){}
+        public void Update(string revisionID, bool updateToRevision){}
+        public void RevertFile(string path, bool forceOverwrite){}
+        public void RevertFiles(ChangeItem[] changeItems, bool forceOverwrite){}
+        public void LaunchConflictExternalMerge(string path){}
+        public void ShowConflictDifferences(string path){}
+        public void ResyncSnapshot(){}
+        public void GoBackToRevision(string revisionID, bool updateToRevision){}
+        public void ResyncToRevision(string revisionID){}
+        public Change[] GetCollabConflicts(){ return Array.Empty<Change>(); }
+        public void CheckConflictsResolvedExternal(){}
+        public bool AreTestsRunning(){ return false; }
+        public void SetTestsRunning(bool running){}
+        public void ClearAllFailures(){}
+        public void ClearNextOperationFailure(){}
+        public void ClearNextOperationFailureForFile(string path){}
+        public string GetGUIDForTests(){ return string.Empty; }
+        public void NewGUIDForTests(){}
+        public void FailNextOperation(Collab.Operation operation, int code){}
+        public void TimeOutNextOperation(Collab.Operation operation, int timeOutSec){}
+        public void FailNextOperationForFile(string path, Collab.Operation operation, int code){}
+        public void TimeOutNextOperationForFile(string path, Collab.Operation operation, int timeOutSec){}
+        public void TestPostSoftLockAsCollaborator(string projectGuid, string projectPath, string machineGuid, string assetGuid){}
+        public void TestClearSoftLockAsCollaborator(string projectGuid, string projectPath, string machineGuid, string softLockHash){}
+        internal bool GetErrorInternal(int errorFilter, out UnityErrorInfo info){ info = new UnityErrorInfo(); return false; }
+        public void Publish(string comment, bool useSelectedAssets, bool confirmMatchesPrevious){}
+        public void PublishAssetsAsync(string comment, ChangeItem[] changes){}
+        public void ClearSelectedChangesToPublish(){}
+        public void SendCollabInfoNotification(){}
+        public CollabFilters collabFilters = new CollabFilters();
+        public String projectBrowserSingleSelectionPath { get; set; }
+        public String projectBrowserSingleMetaSelectionPath { get; set; }
+        public string[] currentProjectBrowserSelection;
+        public void RefreshAvailableLocalChangesSynchronous(){}
+        public bool GetError(UnityConnect.UnityErrorFilter errorFilter, out UnityErrorInfo info){ info = new UnityErrorInfo(); return false; }
+        public void CancelJob(int jobType){}
+        public void UpdateEditorSelectionCache(){}
+        public CollabInfo GetCollabInfo(){ return new CollabInfo(); }
+        public void SaveAssets(){}
+        public void ShowInProjectBrowser(string filterString){}
+        public bool SetConflictsResolvedMine(string[] paths){ return false; }
+        public bool SetConflictsResolvedTheirs(string[] paths){ return false; }
+        public PublishInfo GetChangesToPublish() { return new PublishInfo(); }
+        public PublishInfo_V2 GetChangesToPublish_V2() { return new PublishInfo_V2(); }
+        public void SetChangesToPublish(ChangeItem[] changes){}
+        public ProgressInfo GetJobProgress(int jobId){ return new ProgressInfo(); }
+    }
+
+    internal enum CollabSettingType
+    {
+        InProgressEnabled = 0,
+        InProgressProjectEnabled = 1,
+        InProgressGlobalEnabled = 2
+    }
+
+    internal enum CollabSettingStatus
+    {
+        None = 0,
+        Available = 1
+    }
+
+    internal class CollabSettingsManager
+    {
+        public delegate void SettingStatusChanged(CollabSettingType type, CollabSettingStatus status);
+        public static Dictionary<CollabSettingType, SettingStatusChanged> statusNotifier = new Dictionary<CollabSettingType, SettingStatusChanged>();
+
+        static CollabSettingsManager(){}
+
+        public static bool IsAvailable(CollabSettingType type)
+        {
+            return false;
+        }
+
+        public static bool inProgressEnabled { get; }
+    }
+
+    internal class ProgressInfo
+    {
+        public enum ProgressType : uint
+        {
+            None = 0,
+            Count = 1,
+            Percent = 2,
+            Both = 3
+        }
+
+        public int jobId { get { return 0; } }
+        public string title { get { return string.Empty; } }
+        public string extraInfo { get { return string.Empty; } }
+        public int currentCount { get { return 0; } }
+        public int totalCount { get { return 0; } }
+        public bool completed { get { return true; } }
+        public bool cancelled { get { return false; } }
+        public bool canCancel { get { return false; } }
+        public string lastErrorString { get { return string.Empty; } }
+        public ulong lastError { get { return 0; } }
+        public int percentComplete { get{ return 0; } }
+        public bool isProgressTypeCount { get { return false; } }
+        public bool isProgressTypePercent { get { return false; } }
+        public bool errorOccured { get { return false; } }
+    }
+
+    internal class ChangeItem
+    {
+        public string Path { get; set; }
+        public Change.RevertableStates RevertableState { get; set; }
+        public string RelatedTo { get; set; }
+        public string RevisionId { get; set; }
+        public string Hash { get; set; }
+        public Collab.CollabStates State { get; set; }
+        public long Size { get; set; }
+        public string DownloadPath { get; set; }
+        public string FromPath { get; set; }
+    }
+
+    internal class PublishInfo
+    {
+        public Change[] changes;
+        public bool filter;
+    }
+
+    internal class PublishInfo_V2
+    {
+        public ChangeItem[] changes;
+        public bool filter;
+    }
+
+    internal class RevisionsResult
+    {
+        public List<Revision> Revisions = new List<Revision>();
+        public int RevisionsInRepo = -1;
+        public int Count { get { return 0; } }
+
+        public void Clear(){}
+    }
+
+    internal interface IRevisionsService
+    {
+        event RevisionsDelegate FetchRevisionsCallback;
+        void GetRevisions(int offset, int count);
+        string tipRevision { get; }
+        string currentUser { get; }
+    }
+
+    internal class RevisionsService : IRevisionsService
+    {
+        public event RevisionsDelegate FetchRevisionsCallback;
+        public event SingleRevisionDelegate FetchSingleRevisionCallback;
+
+        public string tipRevision { get { return string.Empty; } }
+        public string currentUser { get { return string.Empty; } }
+
+        public RevisionsService(Collab collabInstance, UnityConnect connectInstance)
+        {
+        }
+
+        public void GetRevisions(int offset, int count){}
+
+        public void GetRevision(string revId){}
+    }
+
+    internal class Change
+    {
+        public enum RevertableStates : uint
+        {
+            Revertable                         = 1 << 0,
+            NotRevertable                      = 1 << 1,
+            Revertable_File                    = 1 << 2,
+            Revertable_Folder                  = 1 << 3,
+            Revertable_EmptyFolder             = 1 << 4,
+            NotRevertable_File                 = 1 << 5,
+            NotRevertable_Folder               = 1 << 6,
+            NotRevertable_FileAdded            = 1 << 7,
+            NotRevertable_FolderAdded          = 1 << 8,
+            NotRevertable_FolderContainsAdd    = 1 << 9,
+            InvalidRevertableState             = (uint)1 << 31
+        }
+
+        public string path { get { return string.Empty; } }
+        public Collab.CollabStates state { get { return (Collab.CollabStates)0; } }
+        public bool isRevertable { get { return false; } }
+        public RevertableStates revertableState { get { return (RevertableStates)0; } }
+        public string relatedTo { get { return string.Empty; } }
+        public bool isMeta { get { return false; } }
+        public bool isConflict { get { return false; } }
+        public bool isFolderMeta { get { return false; } }
+        public bool isResolved { get { return false; } }
+        public string localStatus { get { return string.Empty; } }
+        public string remoteStatus { get { return string.Empty; } }
+        public string resolveStatus { get { return string.Empty; } }
+
+        internal bool HasState(Collab.CollabStates states)
+        {
+            return false;
+        }
+
+        internal bool HasRevertableState(RevertableStates revertableStates)
+        {
+            return false;
+        }
+    }
+
+    internal abstract class AbstractFilters
+    {
+        public List<string[]> filters { get; set;}
+        public abstract void InitializeFilters();
+        public bool ContainsSearchFilter(string name, string searchString){ return false; }
+        public void ShowInFavoriteSearchFilters(){}
+        public void HideFromFavoriteSearchFilters(){}
+    }
+
+    internal class CollabFilters : AbstractFilters
+    {
+        public override void InitializeFilters(){}
+        public void ShowInProjectBrowser(string filterString){}
+        public void OnCollabStateChanged(CollabInfo info){}
+    }
+
+
+    internal delegate void StateChangedDelegate(CollabInfo info);
+    internal delegate void RevisionChangedDelegate(CollabInfo info, string rev, string action);
+    internal delegate void SetErrorDelegate(UnityErrorInfo error);
+    internal delegate void ErrorDelegate();
+    internal delegate bool ShowToolbarAtPositionDelegate(Rect screenRect);
+    internal delegate bool IsToolbarVisibleDelegate();
+    internal delegate void ShowHistoryWindowDelegate();
+    internal delegate void ShowChangesWindowDelegate();
+    internal delegate void CloseToolbarDelegate();
+    internal delegate void ChangesChangedDelegate(Change[] changes, bool isFiltered);
+    internal delegate void ChangeItemsChangedDelegate(ChangeItem[] changes, bool isFiltered);
+    delegate void RevisionsDelegate(RevisionsResult revisionsResult);
+    delegate void SingleRevisionDelegate(Revision? revision);
+
+    internal struct CollabInfo
+    {
+        public bool ready { get { return true; } }
+        public bool update { get { return false; } }
+        public bool publish { get { return false; } }
+        public bool inProgress { get { return false; } }
+        public bool maintenance { get { return false; } }
+        public bool conflict { get { return false; } }
+        public bool refresh { get { return false; } }
+        public bool seat { get { return false; } }
+        public string tip { get { return string.Empty; } }
+        public bool Equals(CollabInfo other){ return false; }
+    }
+
+    internal struct ChangeAction
+    {
+        public ChangeAction(string path = "", string action = ""){}
+        public string path { get { return string.Empty; } }
+        public string action { get { return string.Empty; } }
+    }
+
+    internal struct Revision
+    {
+        internal Revision(string revisionID = "", string authorName = "", string author = "", string comment = "", string reference = "", ulong timeStamp = 0, bool isObtained = false, ChangeAction[] entries = null, CloudBuildStatus[] buildStatuses = null){}
+        public string authorName { get { return string.Empty;  } }
+        public string author { get { return string.Empty;  } }
+        public string comment { get { return string.Empty;  } }
+        public string revisionID { get { return string.Empty;  } }
+        public string reference { get { return string.Empty;  } }
+        public ulong timeStamp { get { return 0;  } }
+        public bool isObtained { get { return false;  } }
+        public ChangeAction[] entries { get { return Array.Empty<ChangeAction>();  } }
+        public CloudBuildStatus[] buildStatuses { get { return Array.Empty<CloudBuildStatus>();  } }
+    }
+
+    internal struct CloudBuildStatus
+    {
+        internal CloudBuildStatus(string platform = "", bool complete = false, bool success = false){}
+        public string platform { get { return string.Empty; } }
+        public bool complete { get { return false; } }
+        public bool success { get { return false; } }
+    }
+
+    internal struct RevisionData
+    {
+        public string id;
+        public int index;
+        public DateTime timeStamp;
+        public string authorName;
+        public string comment;
+        public bool obtained;
+        public bool current;
+        public bool inProgress;
+        public bool enabled;
+        public BuildState buildState;
+        public int buildFailures;
+        public ICollection<ChangeData> changes;
+        public int changesTotal;
+        public bool changesTruncated;
+    }
+
+    internal struct RevisionsData
+    {
+        public int RevisionsInRepo {get { return 0; }}
+        public int RevisionOffset {get { return 0; }}
+        public int ReturnedRevisions {get { return 0; }}
+        public Revision[] Revisions {get { return Array.Empty<Revision>(); }}
+    }
+
+    internal enum HistoryState
+    {
+        Error,
+        Offline,
+        Maintenance,
+        LoggedOut,
+        NoSeat,
+        Disabled,
+        Waiting,
+        Ready,
+    }
+
+    internal enum BuildState
+    {
+        None,
+        Configure,
+        Success,
+        Failed,
+        InProgress,
+    }
+
+    internal struct ChangeData
+    {
+        public string path;
+        public string action;
+    }
+}
diff --git a/Editor/Mono/Collab/IVersionControl.cs b/Editor/Mono/Collab/IVersionControl.cs
index e636800498..14a9ad00bd 100644
--- a/Editor/Mono/Collab/IVersionControl.cs
+++ b/Editor/Mono/Collab/IVersionControl.cs
@@ -10,9 +10,7 @@ internal interface IVersionControl
         bool SupportsAsyncChanges();
         bool OnEnableVersionControl();
         void OnDisableVersionControl();
-        ChangeItem[] GetChanges();
         void MergeDownloadedFiles(bool isFullDownload);
-        Collab.CollabStates GetAssetState(string assetGuid, string assetPath);
     }
 
     internal interface IVersionControl_V2 : IVersionControl
diff --git a/Editor/Mono/Collab/RevisionsService.cs b/Editor/Mono/Collab/RevisionsService.cs
deleted file mode 100644
index 56bea66492..0000000000
--- a/Editor/Mono/Collab/RevisionsService.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 System;
-using System.Collections.Generic;
-using UnityEditor.Collaboration;
-using UnityEditor.Connect;
-using UnityEngine;
-using UnityEngine.Scripting;
-
-namespace UnityEditor.Collaboration
-{
-    delegate void RevisionsDelegate(RevisionsResult revisionsResult);
-    delegate void SingleRevisionDelegate(Revision? revision);
-    internal class RevisionsResult
-    {
-        public List<Revision> Revisions = new List<Revision>();
-        public int RevisionsInRepo = -1;
-
-        public int Count { get { return Revisions.Count; } }
-
-        public void Clear()
-        {
-            Revisions.Clear();
-            RevisionsInRepo = -1;
-        }
-    }
-
-    internal interface IRevisionsService
-    {
-        event RevisionsDelegate FetchRevisionsCallback;
-        void GetRevisions(int offset, int count);
-        string tipRevision { get; }
-        string currentUser { get; }
-    }
-
-    internal class RevisionsService : IRevisionsService
-    {
-        public event RevisionsDelegate FetchRevisionsCallback;
-        public event SingleRevisionDelegate FetchSingleRevisionCallback;
-
-        protected Collab collab;
-        protected UnityConnect connect;
-        private static RevisionsService instance;
-
-        public string tipRevision { get { return collab.collabInfo.tip; } }
-        public string currentUser { get { return connect.GetUserInfo().userName; } }
-
-        public RevisionsService(Collab collabInstance, UnityConnect connectInstance)
-        {
-            collab = collabInstance;
-            connect = connectInstance;
-            instance = this;
-        }
-
-        public void GetRevisions(int offset, int count)
-        {
-            // Only send down request for the desired data.
-            Collab.GetRevisionsData(true, offset, count);
-        }
-
-        public void GetRevision(string revId)
-        {
-            Collab.GetSingleRevisionData(true, revId);
-        }
-
-        [RequiredByNativeCode]
-        private static void onFetchSingleRevision(IntPtr ptr)
-        {
-            Revision? ret = null;
-            if (instance.FetchSingleRevisionCallback != null && ptr != IntPtr.Zero)
-            {
-                Revision nativeStruct = Collab.PopulateSingleRevisionData(ptr);
-                // this copies the content as it's a struct not a class.
-                ret = nativeStruct;
-            }
-
-            instance.FetchSingleRevisionCallback(ret);
-        }
-
-        [RequiredByNativeCode]
-        private static void OnFetchRevisions(IntPtr nativeData)
-        {
-            RevisionsService service = instance;
-            if (service == null || service.FetchRevisionsCallback == null)
-                return;
-
-            RevisionsResult history = null;
-            if (nativeData != IntPtr.Zero)
-            {
-                RevisionsData data = Collab.PopulateRevisionsData(nativeData);
-                history = new RevisionsResult();
-                history.Revisions.AddRange(data.Revisions);
-                history.RevisionsInRepo = data.RevisionsInRepo;
-            }
-
-            service.FetchRevisionsCallback(history);
-        }
-    }
-}
diff --git a/Editor/Mono/Collab/Softlocks/CollabSoftLocks.cs b/Editor/Mono/Collab/Softlocks/CollabSoftLocks.cs
deleted file mode 100644
index 44574720dc..0000000000
--- a/Editor/Mono/Collab/Softlocks/CollabSoftLocks.cs
+++ /dev/null
@@ -1,36 +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.Runtime.InteropServices;
-using UnityEngine.Bindings;
-using UnityEngine.Scripting;
-
-namespace UnityEditor.Collaboration
-{
-    // Keep internal and undocumented until we expose more functionality
-    //*undocumented
-    [StructLayout(LayoutKind.Sequential)]
-    [NativeType(CodegenOptions = CodegenOptions.Custom, Header = "Editor/Src/Collab/Softlocks/CollabSoftLock.h",
-        IntermediateScriptingStructName = "ScriptingSoftLock")]
-    [NativeHeader("Editor/Src/Collab/Collab.bindings.h")]
-    [NativeAsStruct]
-    internal class SoftLock
-    {
-        string m_UserID;
-        string m_MachineID;
-        string m_DisplayName;
-        ulong m_TimeStamp;
-        string m_Hash;
-
-        SoftLock() {}
-
-        public string userID { get { return m_UserID;  } }
-        public string machineID { get { return m_MachineID;  } }
-        public string displayName { get { return m_DisplayName;  } }
-        public ulong timeStamp { get { return m_TimeStamp;  } }
-        public string hash { get { return m_Hash;  } }
-    }
-}
-
diff --git a/Editor/Mono/Collab/Softlocks/SoftlockData.cs b/Editor/Mono/Collab/Softlocks/SoftlockData.cs
deleted file mode 100644
index 759a931cd0..0000000000
--- a/Editor/Mono/Collab/Softlocks/SoftlockData.cs
+++ /dev/null
@@ -1,166 +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.SceneManagement;
-using UnityEngine.Scripting;
-
-namespace UnityEditor.Collaboration
-{
-    // Access and query the current set of softlock data.
-    internal static class SoftLockData
-    {
-        internal delegate void OnSoftlockUpdate(string[] assetGUIDs);
-        internal static OnSoftlockUpdate SoftlockSubscriber = null;
-
-        // Invoked from C++
-        [RequiredByNativeCode]
-        public static void SetSoftlockChanges(string[] assetGUIDs)
-        {
-            if (null != SoftlockSubscriber)
-            {
-                SoftlockSubscriber(assetGUIDs);
-            }
-        }
-
-        // Returns whether the given object has soft lock support
-        // (i.e. is tracked in the back-end for simultaneous changes).
-        // Note: Scene is supported, but isn't a Unity Object.
-        public static bool AllowsSoftLocks(UnityEngine.Object unityObject)
-        {
-            if (unityObject == null)
-            {
-                throw new ArgumentNullException("unityObject");
-            }
-
-            bool supportsSoftLocks = false;
-            if (unityObject.GetType().Equals(typeof(SceneAsset)))
-            {
-                supportsSoftLocks = true;
-            }
-            else
-            {
-                supportsSoftLocks = IsPrefab(unityObject);
-            }
-            return supportsSoftLocks;
-        }
-
-        public static bool IsPrefab(UnityEngine.Object unityObject)
-        {
-            return PrefabUtility.IsPartOfAnyPrefab(unityObject);
-        }
-
-        public static bool IsPrefab(string assetGUID)
-        {
-            bool isPrefab = false;
-            UnityEngine.Object unityObject;
-            if (AssetAccess.TryGetAssetFromGUID(assetGUID, out unityObject))
-            {
-                isPrefab = IsPrefab(unityObject);
-            }
-            return isPrefab;
-        }
-
-        // Soft locks are present when collab is enabled and other users are
-        // editing the given object.
-        // Failure: assigns false to 'hasSoftLocks', returns false.
-        // Success: assigns true or false to 'hasSoftLocks', returns true.
-        public static bool TryHasSoftLocks(UnityEngine.Object objectWithGUID, out bool hasSoftLocks)
-        {
-            string assetGuid = null;
-            AssetAccess.TryGetAssetGUIDFromObject(objectWithGUID, out assetGuid);
-            bool success = TryHasSoftLocks(assetGuid, out hasSoftLocks);
-            return success;
-        }
-
-        public static bool TryHasSoftLocks(string assetGuid, out bool hasSoftLocks)
-        {
-            hasSoftLocks = false;
-            bool success = false;
-            int count = 0;
-
-            if (TryGetSoftlockCount(assetGuid, out count))
-            {
-                success = true;
-                hasSoftLocks = (count > 0);
-            }
-            return success;
-        }
-
-        // Provides the number of additional users editing the given scene.
-        // Failure: assigns 0 to count, return false.
-        // Success: assigns a value in [0, n] to count, returns true.
-        public static bool TryGetSoftlockCount(Scene scene, out int count)
-        {
-            bool success = false;
-            count = 0;
-
-            if (!scene.IsValid())
-            {
-                return false;
-            }
-            string assetGUID = AssetDatabase.AssetPathToGUID(scene.path);
-            success = TryGetSoftlockCount(assetGUID, out count);
-            return success;
-        }
-
-        // Provides the number of additional users editing the given object.
-        // Failure: assigns 0 to count, return false.
-        // Success: assigns a value in [0, n] to count, returns true.
-        public static bool TryGetSoftlockCount(UnityEngine.Object objectWithGUID, out int count)
-        {
-            string assetGUID = null;
-            AssetAccess.TryGetAssetGUIDFromObject(objectWithGUID, out assetGUID);
-            bool success = TryGetSoftlockCount(assetGUID, out count);
-            return success;
-        }
-
-        // Provides the number of additional users editing the given 'assetGUID'.
-        // Failure: assigns 0 to count, return false.
-        // Success: assigns a value in [0, n] to count, returns true.
-        public static bool TryGetSoftlockCount(string assetGuid, out int count)
-        {
-            bool success = false;
-            count = 0;
-            List<SoftLock> softLocks = null;
-
-            if (TryGetLocksOnAssetGUID(assetGuid, out softLocks))
-            {
-                count = softLocks.Count;
-                success = true;
-            }
-            return success;
-        }
-
-        // Provides a list of 'SoftLock' items, representing
-        // the additional users editing the given assetGUID.
-        // Failure: assigns empty list to 'softLocks', return false.
-        // Success: assigns the retrieved list to 'softLocks', return true. (May be empty).
-        public static bool TryGetLocksOnAssetGUID(string assetGuid, out List<SoftLock> softLocks)
-        {
-            if (assetGuid == null)
-            {
-                throw new ArgumentNullException("assetGuid");
-            }
-
-            if (!Collab.instance.IsCollabEnabledForCurrentProject() || assetGuid.Length == 0)
-            {
-                softLocks = new List<SoftLock>();
-                return false;
-            }
-
-            SoftLock[] _softlocks = Collab.instance.GetSoftLocks(assetGuid);
-            softLocks = new List<SoftLock>();
-
-            for (int index = 0; index < _softlocks.Length; index++)
-            {
-                softLocks.Add(_softlocks[index]);
-            }
-            return true;
-        }
-    }
-}
-
diff --git a/Editor/Mono/Collab/Softlocks/SoftlockFilter.cs b/Editor/Mono/Collab/Softlocks/SoftlockFilter.cs
deleted file mode 100644
index a1a56d4571..0000000000
--- a/Editor/Mono/Collab/Softlocks/SoftlockFilter.cs
+++ /dev/null
@@ -1,39 +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;
-
-namespace UnityEditor.Collaboration
-{
-    internal class SoftLockFilters : AbstractFilters
-    {
-        public override void InitializeFilters()
-        {
-            filters = new List<string[]>()
-            {
-                new string[] { "All In Progress" , "s:inprogress"},
-            };
-        }
-
-        public SoftLockFilters()
-        {
-            InitializeFilters();
-        }
-
-        public void OnSettingStatusChanged(CollabSettingType type, CollabSettingStatus status)
-        {
-            if (type == CollabSettingType.InProgressEnabled && (status == CollabSettingStatus.Available))
-            {
-                if (Collab.instance.IsCollabEnabledForCurrentProject() && CollabSettingsManager.inProgressEnabled)
-                    ShowInFavoriteSearchFilters();
-                else
-                    HideFromFavoriteSearchFilters();
-            }
-        }
-    }
-}
diff --git a/Editor/Mono/Collab/Softlocks/SoftlockUIData.cs b/Editor/Mono/Collab/Softlocks/SoftlockUIData.cs
deleted file mode 100644
index e0d8c1df20..0000000000
--- a/Editor/Mono/Collab/Softlocks/SoftlockUIData.cs
+++ /dev/null
@@ -1,207 +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.SceneManagement;
-using UnityEditor.SceneManagement;
-using UnityEditor.Web;
-
-namespace UnityEditor.Collaboration
-{
-    // Composes Softlock data into structures used by the UI.
-    internal static class SoftLockUIData
-    {
-        private static Dictionary<string, Texture> s_ImageCache = new Dictionary<string, Texture>();
-        private static Dictionary<SectionEnum, string> s_ImageNameCache = new Dictionary<SectionEnum, string>();
-        private const string kIconMipSuffix = " Icon";
-
-        public enum SectionEnum
-        {
-            None,
-            Inspector,
-            Scene,
-            ProjectBrowser
-        }
-
-        #region General
-
-        // Provides the names of all additional users editing the asset
-        // with the given 'assetGuid'.
-        // Defaults to an empty list.
-        public static List<string> GetLocksNamesOnAsset(string assetGuid)
-        {
-            List<SoftLock> softLocks = null;
-            List<string> names = new List<string>();
-
-            if (SoftLockData.TryGetLocksOnAssetGUID(assetGuid, out softLocks))
-            {
-                foreach (SoftLock softLock in softLocks)
-                {
-                    names.Add(softLock.displayName);
-                }
-            }
-            return names;
-        }
-
-        #endregion
-        #region Scene
-
-        // Provides the names of all additional users editing the scene.
-        // Defaults to an empty list.
-        public static List<string> GetLocksNamesOnScene(Scene scene)
-        {
-            List<string> names = GetLockNamesOnScenePath(scene.path);
-            return names;
-        }
-
-        public static List<string> GetLockNamesOnScenePath(string scenePath)
-        {
-            string assetGuid = AssetDatabase.AssetPathToGUID(scenePath);
-            List<string> names = GetLocksNamesOnAsset(assetGuid);
-            return names;
-        }
-
-        public static string GetSceneNameFromPath(string scenePath)
-        {
-            string name = "";
-            if (null != scenePath)
-            {
-                name = scenePath;
-            }
-            return name;
-        }
-
-        // Provides the names of all additional users editing each scene.
-        // Defaults to an empty list, and may contain empty sub-lists.
-        public static List<List<string>> GetLockNamesOnScenes(List<Scene> scenes)
-        {
-            List<List<string>> namesByScene = new List<List<string>>();
-
-            if (scenes == null)
-            {
-                return namesByScene;
-            }
-
-            foreach (Scene scene in scenes)
-            {
-                List<string> names = GetLocksNamesOnScene(scene);
-                namesByScene.Add(names);
-            }
-            return namesByScene;
-        }
-
-        // For each iteration, returns the pair (scene name : list of other users' names).
-        public static IEnumerable<KeyValuePair<string, List<string>>> GetLockNamesOnOpenScenes()
-        {
-            if (Collab.instance.IsCollabEnabledForCurrentProject())
-            {
-                for (int sceneIndex = 0; sceneIndex < EditorSceneManager.sceneCount; sceneIndex++)
-                {
-                    Scene scene = SceneManager.GetSceneAt(sceneIndex);
-                    List<string> names = GetLocksNamesOnScene(scene);
-                    string sceneName = scene.name;
-                    if (String.IsNullOrEmpty(sceneName))
-                    {
-                        // Default for unnamed scenes.
-                        sceneName = "Untitled";
-                    }
-                    KeyValuePair<string, List<string>> sceneData = new KeyValuePair<string, List<string>>(sceneName, names);
-                    yield return sceneData;
-                }
-            }
-        }
-
-        public static int CountOfLocksOnOpenScenes()
-        {
-            int count = 0;
-
-            foreach (KeyValuePair<string, List<string>> sceneData in GetLockNamesOnOpenScenes())
-            {
-                count += sceneData.Value.Count;
-            }
-            return count;
-        }
-
-        #endregion
-        #region Game Object
-
-        // The usernames of additional people editing the given 'objectWithGUID'.
-        // Defaults to an empty list.
-        public static List<string> GetLockNamesOnObject(UnityEngine.Object objectWithGUID)
-        {
-            string assetGUID = null;
-            AssetAccess.TryGetAssetGUIDFromObject(objectWithGUID, out assetGUID);
-            List<string> names = GetLocksNamesOnAsset(assetGUID);
-            return names;
-        }
-
-        #endregion
-        #region Icons
-
-        // The icon for the particular section in the editor.
-        // Defaults to null.
-        public static Texture GetIconForSection(SectionEnum section)
-        {
-            string iconName = IconNameForSection(section);
-            Texture texture = GetIconForName(iconName);
-            return texture;
-        }
-
-        private static string IconNameForSection(SectionEnum section)
-        {
-            string iconName;
-            if (!s_ImageNameCache.TryGetValue(section, out iconName))
-            {
-                switch (section)
-                {
-                    case SectionEnum.Inspector:
-                    case SectionEnum.Scene:
-                        iconName = "SoftlockInline.png";
-                        break;
-
-                    case SectionEnum.ProjectBrowser:
-                        iconName = String.Format("SoftlockProjectBrowser{0}", kIconMipSuffix);
-                        break;
-
-                    default:
-                        return null;
-                }
-                s_ImageNameCache.Add(section, iconName);
-            }
-            return iconName;
-        }
-
-        private static Texture GetIconForName(string fileName)
-        {
-            if (String.IsNullOrEmpty(fileName))
-            {
-                return null;
-            }
-
-            Texture texture;
-            // Note: a previous texture may have been destroyed
-            // by the system on the c++ side.
-            if (!s_ImageCache.TryGetValue(fileName, out texture) || texture == null)
-            {
-                if (fileName.EndsWith(kIconMipSuffix))
-                {
-                    texture = EditorGUIUtility.FindTexture(fileName) as Texture;
-                }
-                else
-                {
-                    texture = EditorGUIUtility.LoadIconRequired(fileName) as Texture;
-                }
-                s_ImageCache.Remove(fileName);
-                s_ImageCache.Add(fileName, texture);
-            }
-            return texture;
-        }
-
-        #endregion
-    }
-}
-
diff --git a/Editor/Mono/Collab/Softlocks/SoftlockViewController.cs b/Editor/Mono/Collab/Softlocks/SoftlockViewController.cs
deleted file mode 100644
index e4de3221f8..0000000000
--- a/Editor/Mono/Collab/Softlocks/SoftlockViewController.cs
+++ /dev/null
@@ -1,533 +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 System.Collections.Generic;
-using UnityEditor.Collaboration;
-using UnityEngine.SceneManagement;
-using UnityEditor.SceneManagement;
-using System;
-using UnityEditor.Web;
-
-namespace UnityEditor
-{
-    // Displays the Softlocks UI in the various areas of the Editor.
-    internal class SoftlockViewController
-    {
-        private static SoftlockViewController s_Instance;
-        public GUIStyle k_Style = null;
-        public GUIStyle k_StyleEmpty = GUIStyle.none; // For tooltips only.
-        public GUIContent k_Content = null;
-
-        // Stores UI strings for reuse and Editor (inspector) references to trigger
-        // a repaint when softlock data changes.
-        private SoftlockViewController.Cache m_Cache = null;
-
-        private const string k_TooltipHeader = "Unpublished changes by:";
-        private const string k_TooltipPrefabHeader = "Unpublished Prefab changes by:";
-        private const string k_TooltipNamePrefix = " \n \u2022  "; // u2022 displays a • (bullet point)
-
-        private SoftlockViewController() {}
-        ~SoftlockViewController() {}
-
-        [SerializeField]
-        private SoftLockFilters m_SoftLockFilters = new SoftLockFilters();
-
-        public SoftLockFilters softLockFilters { get { return m_SoftLockFilters; } }
-
-        public static SoftlockViewController Instance
-        {
-            get
-            {
-                if (s_Instance == null)
-                {
-                    s_Instance = new SoftlockViewController();
-                    s_Instance.m_Cache = new Cache();
-                }
-                return s_Instance;
-            }
-        }
-
-        // Initialises dependencies.
-        public void TurnOn()
-        {
-            RegisterDataDelegate();
-            RegisterDrawDelegates();
-            Repaint();
-        }
-
-        public void TurnOff()
-        {
-            UnregisterDataDelegate();
-            UnregisterDrawDelegates();
-        }
-
-        private void UnregisterDataDelegate()
-        {
-            SoftLockData.SoftlockSubscriber -= Instance.OnSoftlockUpdate;
-        }
-
-        private void RegisterDataDelegate()
-        {
-            UnregisterDataDelegate();
-            SoftLockData.SoftlockSubscriber += Instance.OnSoftlockUpdate;
-        }
-
-        private void UnregisterDrawDelegates()
-        {
-            ObjectListArea.postAssetIconDrawCallback -= Instance.DrawProjectBrowserGridUI;
-            ObjectListArea.postAssetLabelDrawCallback -= Instance.DrawProjectBrowserListUI;
-            Editor.OnPostIconGUI -= Instance.DrawInspectorUI;
-            GameObjectTreeViewGUI.OnPostHeaderGUI -= Instance.DrawSceneUI;
-        }
-
-        // Connects to the areas of the Editor that display softlocks.
-        private void RegisterDrawDelegates()
-        {
-            UnregisterDrawDelegates();
-            ObjectListArea.postAssetIconDrawCallback += Instance.DrawProjectBrowserGridUI;
-            ObjectListArea.postAssetLabelDrawCallback += Instance.DrawProjectBrowserListUI;
-            AssetsTreeViewGUI.postAssetLabelDrawCallback += Instance.DrawSingleColumnProjectBrowserUI;
-            Editor.OnPostIconGUI += Instance.DrawInspectorUI;
-            GameObjectTreeViewGUI.OnPostHeaderGUI += Instance.DrawSceneUI;
-        }
-
-        // Returns true when the 'editor' supports Softlock UI and the
-        // user has Collaborate permissions.
-        private bool HasSoftlockSupport(Editor editor)
-        {
-            if (!Collab.instance.IsCollabEnabledForCurrentProject() || editor == null || editor.targets.Length > 1)
-            {
-                return false;
-            }
-
-            if (editor.target == null || !SoftLockData.AllowsSoftLocks(editor.target))
-            {
-                return false;
-            }
-
-            // Support Scene and Game object Inspector headers, not others like MaterialEditor.
-            bool hasSupport = true;
-            Type editorType = editor.GetType();
-
-            if (editorType != typeof(GameObjectInspector) && editorType != typeof(GenericInspector))
-            {
-                hasSupport = false;
-            }
-
-            return hasSupport;
-        }
-
-        private bool HasSoftlocks(string assetGUID)
-        {
-            if (!Collab.instance.IsCollabEnabledForCurrentProject())
-            {
-                return false;
-            }
-
-            bool hasSoftLocks;
-            bool isValid = (SoftLockData.TryHasSoftLocks(assetGUID, out hasSoftLocks) && hasSoftLocks);
-            return isValid;
-        }
-
-        // Redraws softlock UI associated with the given list of 'assetGUIDs'.
-        public void OnSoftlockUpdate(string[] assetGUIDs)
-        {
-            // Remove cached UI for the assetGUIDs before triggered a redraw.
-            m_Cache.InvalidateAssetGUIDs(assetGUIDs);
-            Repaint();
-        }
-
-        // Repaints all the areas where softlocks are displayed.
-        public void Repaint()
-        {
-            RepaintInspectors();
-            RepaintSceneHierarchy();
-            RepaintProjectBrowsers();
-        }
-
-        private void RepaintSceneHierarchy()
-        {
-            List<SceneHierarchyWindow> sceneUIs = SceneHierarchyWindow.GetAllSceneHierarchyWindows();
-            foreach (SceneHierarchyWindow sceneUI in sceneUIs)
-            {
-                sceneUI.Repaint();
-            }
-        }
-
-        private void RepaintInspectors()
-        {
-            foreach (Editor editor in m_Cache.GetEditors())
-            {
-                // Does not repaint when editor is not visible, but the editor's
-                // "DockArea" tab will redraw either way.
-                editor.Repaint();
-            }
-        }
-
-        private void RepaintProjectBrowsers()
-        {
-            foreach (ProjectBrowser pb in ProjectBrowser.GetAllProjectBrowsers())
-            {
-                pb.RefreshSearchIfFilterContains("s:");
-                pb.Repaint();
-            }
-        }
-
-        // Draws in the Hierarchy header, left of the context menu.
-        public float DrawSceneUI(Rect availableRect, string scenePath)
-        {
-            string assetGUID = AssetDatabase.AssetPathToGUID(scenePath);
-            if (!HasSoftlocks(assetGUID))
-            {
-                return availableRect.xMax;
-            }
-
-            int lockCount;
-            SoftLockData.TryGetSoftlockCount(assetGUID, out lockCount);
-
-            GUIContent content = GetGUIContent();
-            content.image = SoftLockUIData.GetIconForSection(SoftLockUIData.SectionEnum.Scene);
-            content.text = GetDisplayCount(lockCount);
-            content.tooltip = Instance.GetTooltip(assetGUID);
-
-            Vector2 contentSize = GetStyle().CalcSize(content);
-            Rect drawRect = new Rect(availableRect.position, contentSize);
-            const int kRightMargin = 4;
-            drawRect.x = (availableRect.width - drawRect.width) - kRightMargin;
-            EditorGUI.LabelField(drawRect, content);
-
-            return drawRect.xMin;
-        }
-
-        // Assigned as a callback to Editor.OnPostHeaderGUI
-        // Draws the Scene Inspector (Editor.cs) as well as the Game Object Inspector (GameObjectInspector.cs)
-        private void DrawInspectorUI(Editor editor, Rect drawRect)
-        {
-            if (!HasSoftlockSupport(editor))
-            {
-                return;
-            }
-
-            m_Cache.StoreEditor(editor);
-            string assetGUID = null;
-            AssetAccess.TryGetAssetGUIDFromObject(editor.target, out assetGUID);
-
-            if (!HasSoftlocks(assetGUID))
-            {
-                return;
-            }
-
-            Texture icon = SoftLockUIData.GetIconForSection(SoftLockUIData.SectionEnum.ProjectBrowser);
-            if (icon != null)
-            {
-                DrawIconWithTooltips(drawRect, icon, assetGUID);
-            }
-        }
-
-        // Assigned callback to ObjectListArea.OnPostAssetDrawDelegate.
-        // Draws either overtop of the project browser asset (when in grid view).
-        private void DrawProjectBrowserGridUI(Rect iconRect, string assetGUID, bool isListMode)
-        {
-            if (isListMode || !HasSoftlocks(assetGUID))
-            {
-                return;
-            }
-
-            Rect drawRect = Rect.zero;
-            Texture icon = SoftLockUIData.GetIconForSection(SoftLockUIData.SectionEnum.ProjectBrowser);
-            if (icon != null)
-            {
-                drawRect = Overlay.GetRectForBottomRight(iconRect, Overlay.k_OverlaySizeOnLargeIcon);
-                DrawIconWithTooltips(drawRect, icon, assetGUID);
-            }
-        }
-
-        // Should draw only in listMode and expects 'drawRect' to be the designed space for the icon,
-        // and not the entire row.
-        private bool DrawProjectBrowserListUI(Rect drawRect, string assetGUID, bool isListMode)
-        {
-            if (!isListMode || !HasSoftlocks(assetGUID))
-            {
-                return false;
-            }
-
-            // center icon.
-            Rect iconRect = drawRect;
-            iconRect.width = drawRect.height;
-            iconRect.x = (float)Math.Round(drawRect.center.x - (iconRect.width / 2F));
-            return DrawInProjectBrowserListMode(iconRect, assetGUID);
-        }
-
-        // Expects 'drawRect' to be the available width of the row.
-        private bool DrawSingleColumnProjectBrowserUI(Rect drawRect, string assetGUID)
-        {
-            if (ProjectBrowser.s_LastInteractedProjectBrowser.IsTwoColumns() || !HasSoftlocks(assetGUID))
-            {
-                return false;
-            }
-
-            Rect iconRect = drawRect;
-            iconRect.width = drawRect.height;
-            float spacingFromEnd = (iconRect.width / 2F);
-            iconRect.x = (float)Math.Round(drawRect.xMax - iconRect.width - spacingFromEnd);
-            return DrawInProjectBrowserListMode(iconRect, assetGUID);
-        }
-
-        private bool DrawInProjectBrowserListMode(Rect iconRect, string assetGUID)
-        {
-            Texture icon = SoftLockUIData.GetIconForSection(SoftLockUIData.SectionEnum.ProjectBrowser);
-            bool didDraw = false;
-            if (icon != null)
-            {
-                DrawIconWithTooltips(iconRect, icon, assetGUID);
-                didDraw = true;
-            }
-            return didDraw;
-        }
-
-        private void DrawIconWithTooltips(Rect iconRect, Texture icon, string assetGUID)
-        {
-            GUI.DrawTexture(iconRect, icon, ScaleMode.ScaleToFit);
-            DrawTooltip(iconRect, GetTooltip(assetGUID));
-        }
-
-        private void DrawTooltip(Rect frame, string tooltip)
-        {
-            GUIContent content = GetGUIContent();
-            content.tooltip = tooltip;
-            GUI.Label(frame, content, k_StyleEmpty);
-        }
-
-        #region String Helpers
-
-        // Returns a string formatted as a vertical list of names with a heading.
-        private string GetTooltip(string assetGUID)
-        {
-            string formattedText;
-            if (!m_Cache.TryGetTooltipForGUID(assetGUID, out formattedText))
-            {
-                List<string> softLockNames = SoftLockUIData.GetLocksNamesOnAsset(assetGUID);
-                string tooltipHeaderText = (SoftLockData.IsPrefab(assetGUID) ? k_TooltipPrefabHeader : k_TooltipHeader);
-                formattedText = tooltipHeaderText;
-
-                foreach (string name in softLockNames)
-                {
-                    formattedText += k_TooltipNamePrefix + name + " ";
-                }
-                m_Cache.StoreTooltipForGUID(assetGUID, formattedText);
-            }
-            return formattedText;
-        }
-
-        // Retrieves a previously generated string from cache
-        // or creates a string displaying the given 'count' surrounded by brackets.
-        // e.g. "(0)"
-        private static string GetDisplayCount(int count)
-        {
-            string totalLocksText;
-            if (!Instance.m_Cache.TryGetDisplayCount(count, out totalLocksText))
-            {
-                totalLocksText = count.ToString();
-                Instance.m_Cache.StoreDisplayCount(count, totalLocksText);
-            }
-            return totalLocksText;
-        }
-
-        // When the given 'text' exceeds the given 'width', out-of-bound characters
-        // are removed as well as a few more to display a trailing ellipsis.
-        // If 'text' does not exceed width, text is returned.
-        private string FitTextToWidth(string text, float width, GUIStyle style)
-        {
-            int characterCountVisible = style.GetNumCharactersThatFitWithinWidth(text, width);
-            if (characterCountVisible > 1 && characterCountVisible != text.Length)
-            {
-                string ellipsedText;
-                int characterLength = (characterCountVisible - 1);
-                if (!Instance.m_Cache.TryGetEllipsedNames(text, characterLength, out ellipsedText))
-                {
-                    ellipsedText = text.Substring(0, characterLength) + (" \u2026");    // 'horizontal ellipsis' (U+2026) is: ...
-                    Instance.m_Cache.StoreEllipsedNames(text, ellipsedText, characterLength);
-                }
-                return ellipsedText;
-            }
-            return text;
-        }
-
-        #endregion
-        #region GUI Content
-
-        public GUIContent GetGUIContent()
-        {
-            if (k_Content == null)
-            {
-                k_Content = new GUIContent();
-            }
-
-            k_Content.tooltip = string.Empty;
-            k_Content.text = null;
-            k_Content.image = null;
-
-            return k_Content;
-        }
-
-        public GUIStyle GetStyle()
-        {
-            if (k_Style == null)
-            {
-                k_Style = new GUIStyle(EditorStyles.label);
-                k_Style.normal.background = null;
-            }
-            return k_Style;
-        }
-
-        #endregion
-
-        // Stores UI strings for reuse and Editors as WeakReferences.
-        private class Cache
-        {
-            private List<WeakReference> m_EditorReferences = new List<WeakReference>();
-            private List<WeakReference> m_CachedWeakReferences = new List<WeakReference>();
-            private static Dictionary<int, string> s_CachedStringCount = new Dictionary<int, string>();
-            private Dictionary<string, string> m_AssetGUIDToTooltip = new Dictionary<string, string>();
-            private Dictionary<string, Dictionary<int, string>> m_NamesListToEllipsedNames = new Dictionary<string, Dictionary<int, string>>();
-
-            public Cache() {}
-
-            // Removes cached strings references by the given 'assetGUIDs'.
-            public void InvalidateAssetGUIDs(string[] assetGUIDs)
-            {
-                for (int index = 0; index < assetGUIDs.Length; index++)
-                {
-                    string assetGUID = assetGUIDs[index];
-                    m_AssetGUIDToTooltip.Remove(assetGUID);
-                }
-            }
-
-            // Failure: assigns empty string ("") to 'ellipsedNames', returns false.
-            // Success: assigns the cached string to 'ellipsedNames', returns true.
-            public bool TryGetEllipsedNames(string allNames, int characterLength, out string ellipsedNames)
-            {
-                Dictionary<int, string> ellipsedVersions;
-                if (m_NamesListToEllipsedNames.TryGetValue(allNames, out ellipsedVersions))
-                {
-                    return ellipsedVersions.TryGetValue(characterLength, out ellipsedNames);
-                }
-                ellipsedNames = "";
-                return false;
-            }
-
-            // 'allNames' and 'characterLength' will be the keys to access the cached 'ellipsedNames'
-            // see TryGetEllipsedNames() for retrieval.
-            public void StoreEllipsedNames(string allNames, string ellipsedNames, int characterLength)
-            {
-                Dictionary<int, string> ellipsedVersions;
-                if (!m_NamesListToEllipsedNames.TryGetValue(allNames, out ellipsedVersions))
-                {
-                    ellipsedVersions = new Dictionary<int, string>();
-                }
-                ellipsedVersions[characterLength] = ellipsedNames;
-                m_NamesListToEllipsedNames[allNames] = ellipsedVersions;
-            }
-
-            // Failure: assigns empty string ("") to 'tooltipText', returns false.
-            // Success: assigns the cached string to 'tooltipText', returns true.
-            public bool TryGetTooltipForGUID(string assetGUID, out string tooltipText)
-            {
-                return m_AssetGUIDToTooltip.TryGetValue(assetGUID, out tooltipText);
-            }
-
-            // 'assetGUID' will be the key to access the cached 'tooltipText'
-            // see TryGetTooltipForGUID() for retrieval.
-            public void StoreTooltipForGUID(string assetGUID, string tooltipText)
-            {
-                m_AssetGUIDToTooltip[assetGUID] = tooltipText;
-            }
-
-            // Failure: assigns empty string ("") to 'displayText', returns false.
-            // Success: assigns the cached string to 'displayText', returns true.
-            public bool TryGetDisplayCount(int count, out string displayText)
-            {
-                return s_CachedStringCount.TryGetValue(count, out displayText);
-            }
-
-            // 'count' will be the key to access the cached 'displayText'
-            // see TryGetDisplayCount() for retrieval.
-            public void StoreDisplayCount(int count, string displayText)
-            {
-                s_CachedStringCount.Add(count, displayText);
-            }
-
-            // Contains at most the list of all previously given Editors
-            // via StoreEditor(). Garbage collected Editor(s) will be missing.
-            public List<Editor> GetEditors()
-            {
-                List<Editor> editors = new List<Editor>();
-
-                for (int index = 0; index < m_EditorReferences.Count; index++)
-                {
-                    WeakReference reference = m_EditorReferences[index];
-                    Editor editor = reference.Target as Editor;
-
-                    if (editor == null)
-                    {
-                        m_EditorReferences.RemoveAt(index);
-                        m_CachedWeakReferences.Add(reference);
-                        index--;
-                    }
-                    else
-                    {
-                        editors.Add(editor);
-                    }
-                }
-                return editors;
-            }
-
-            // Stores the Editor in a WeakReference.
-            public void StoreEditor(Editor editor)
-            {
-                bool canAdd = true;
-
-                // Check for duplicates and purge any null targets.
-                for (int index = 0; canAdd && (index < m_EditorReferences.Count); index++)
-                {
-                    WeakReference reference = m_EditorReferences[index];
-                    Editor storedEditor = reference.Target as Editor;
-
-                    if (storedEditor == null)
-                    {
-                        m_EditorReferences.RemoveAt(index);
-                        m_CachedWeakReferences.Add(reference);
-                        index--;
-                    }
-                    else if (storedEditor == editor)
-                    {
-                        canAdd = false;
-                        break;
-                    }
-                }
-
-                if (canAdd)
-                {
-                    WeakReference editorReference;
-
-                    // Reuse any old WeakReference if available.
-                    if (m_CachedWeakReferences.Count > 0)
-                    {
-                        editorReference = m_CachedWeakReferences[0];
-                        m_CachedWeakReferences.RemoveAt(0);
-                    }
-                    else
-                    {
-                        editorReference = new WeakReference(null);
-                    }
-                    editorReference.Target = editor;
-                    m_EditorReferences.Add(editorReference);
-                }
-            }
-        }
-    }
-}
-
diff --git a/Editor/Mono/Collab/Views/ICollabHistoryWindow.cs b/Editor/Mono/Collab/Views/ICollabHistoryWindow.cs
deleted file mode 100644
index ab312c85a4..0000000000
--- a/Editor/Mono/Collab/Views/ICollabHistoryWindow.cs
+++ /dev/null
@@ -1,78 +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;
-
-namespace UnityEditor.Collaboration
-{
-    internal delegate void PageChangeAction(int page);
-    internal delegate void RevisionAction(string revisionId, bool updateToRevision);
-    internal delegate void ShowBuildAction(string revisionId);
-
-    internal enum HistoryState
-    {
-        Error,
-        Offline,
-        Maintenance,
-        LoggedOut,
-        NoSeat,
-        Disabled,
-        Waiting,
-        Ready,
-    }
-
-    internal enum BuildState
-    {
-        None,
-        Configure,
-        Success,
-        Failed,
-        InProgress,
-    }
-
-    internal struct RevisionData
-    {
-        public string id;
-        public int index;
-        public DateTime timeStamp;
-        public string authorName;
-        public string comment;
-
-        // Whether this revision is on the client
-        public bool obtained;
-        public bool current;
-        public bool inProgress;
-        public bool enabled;
-
-        public BuildState buildState;
-        public int buildFailures;
-
-        public ICollection<ChangeData> changes;
-        public int changesTotal;
-        public bool changesTruncated;
-    }
-
-    internal struct ChangeData
-    {
-        public string path;
-        public string action;
-    }
-
-    internal interface ICollabHistoryWindow
-    {
-        void UpdateState(HistoryState state, bool force);
-        void UpdateRevisions(IEnumerable<RevisionData> items, string tip, int totalRevisions, int currentPage);
-
-        bool revisionActionsEnabled { get; set; }
-        int itemsPerPage { set; }
-        string inProgressRevision { get; set; }
-        PageChangeAction OnPageChangeAction { set; }
-        RevisionAction OnGoBackAction { set; }
-        RevisionAction OnUpdateAction { set; }
-        RevisionAction OnRestoreAction { set; }
-        ShowBuildAction OnShowBuildAction { set; }
-        Action OnShowServicesAction { set; }
-    }
-}
diff --git a/Editor/Mono/Commands/CommandService.cs b/Editor/Mono/Commands/CommandService.cs
index a78ca32515..10f56233d8 100644
--- a/Editor/Mono/Commands/CommandService.cs
+++ b/Editor/Mono/Commands/CommandService.cs
@@ -152,8 +152,16 @@ private static IEnumerable<Command> ScanAttributes()
             var commands = new List<Command>();
             foreach (var mi in TypeCache.GetMethodsWithAttribute<CommandHandlerAttribute>())
             {
-                if (!(Delegate.CreateDelegate(typeof(CommandHandler), mi) is CommandHandler callback))
+                CommandHandler callback = null;
+                try
+                {
+                    callback = (CommandHandler)Delegate.CreateDelegate(typeof(CommandHandler), mi);
+                }
+                catch(Exception e)
+                {
+                    Debug.LogError($"Cannot create CommandHandler from Attribute: {mi.Name} {e.Message}");
                     continue;
+                }
 
                 foreach (var attr in mi.GetCustomAttributes<CommandHandlerAttribute>())
                 {
diff --git a/Editor/Mono/Commands/GOCreationCommands.cs b/Editor/Mono/Commands/GOCreationCommands.cs
index 6caef996d3..4f7aed86df 100644
--- a/Editor/Mono/Commands/GOCreationCommands.cs
+++ b/Editor/Mono/Commands/GOCreationCommands.cs
@@ -196,6 +196,12 @@ internal static void CreateEmptyParent()
                 }
 
                 SceneHierarchyWindow.lastInteractedHierarchyWindow.SetExpanded(go.GetInstanceID(), true);
+
+                // Ensure empty parent after reparenting jumps into rename mode if needed UUM-15042
+                if (SceneHierarchyWindow.s_EnterRenameModeForNewGO)
+                {
+                    SceneHierarchyWindow.FrameAndRenameNewGameObject();
+                }
             }
 
             // Set back default parent object if we have one
diff --git a/Editor/Mono/ConsoleWindow.cs b/Editor/Mono/ConsoleWindow.cs
index 2c3bc2ad0b..b151101d0a 100644
--- a/Editor/Mono/ConsoleWindow.cs
+++ b/Editor/Mono/ConsoleWindow.cs
@@ -156,7 +156,7 @@ internal static void UpdateLogStyleFixedHeights()
         ListViewState m_ListView;
         string m_ActiveText = "";
         StringBuilder m_CopyString;
-        private int m_LastPingedEntry = -1;
+        private int m_LastPingedEntryRow = -1;
         bool m_DevBuild;
         int m_CallstackTextStart = 0;
         private Mode m_ActiveMode = Mode.None;
@@ -453,18 +453,19 @@ void SetActiveEntry(LogEntry entry)
                 m_ActiveMode = (Mode)entry.mode;
                 entry.callstackTextStartUTF8 = entry.message.Length;
                 m_CallstackTextStart = entry.callstackTextStartUTF16;
+                var entryRow = LogEntries.GetEntryRowIndex(entry.globalLineIndex);
                 // ping object referred by the log entry
-                if (entry.instanceID != 0 && m_LastPingedEntry != entry.globalLineIndex)
+                if (entry.instanceID != 0 && m_LastPingedEntryRow != entryRow)
                 {
                     EditorGUIUtility.PingObject(entry.instanceID);
-                    m_LastPingedEntry = entry.globalLineIndex;
+                    m_LastPingedEntryRow = entryRow;
                 }
             }
             else
             {
                 m_CallstackTextStart = 0;
                 m_ActiveText = string.Empty;
-                m_LastPingedEntry = -1;
+                m_LastPingedEntryRow = -1;
                 m_ListView.row = -1;
                 m_CopyString.Clear();
                 m_ActiveMode = Mode.None;
@@ -882,10 +883,7 @@ internal static string StacktraceWithHyperlinks(string stacktraceText, int calls
                                     filePathPart.Substring(lineIndex + 1, (endLineIndex) - (lineIndex + 1));
                                 string filePath = filePathPart.Substring(0, lineIndex);
 
-                                textWithHyperlinks.Append(lines[i].Substring(0, filePathIndex));
-                                textWithHyperlinks.Append("<a href=\"" + filePath + "\"" + " line=\"" + lineString + "\">");
-                                textWithHyperlinks.Append(filePath + ":" + lineString);
-                                textWithHyperlinks.Append("</a>)\n");
+                                textWithHyperlinks.Append($"{lines[i].Substring(0, filePathIndex)}<color=#40a0ff><link=\"href='{filePath}' line='{lineString}'\">{filePath}:{lineString}</link></color>)\n");
 
                                 continue; // continue to evade the default case
                             }
diff --git a/Editor/Mono/ContainerWindow.bindings.cs b/Editor/Mono/ContainerWindow.bindings.cs
index 43c3163335..86e3df08c1 100644
--- a/Editor/Mono/ContainerWindow.bindings.cs
+++ b/Editor/Mono/ContainerWindow.bindings.cs
@@ -26,8 +26,6 @@ internal enum ShowMode
         Tooltip = 6,
         // Modal Utility window
         ModalUtility = 7,
-        // Show as fullscreen window
-        Fullscreen = 8
     }
 
     //[StaticAccessor("ContainerWindowBindings", StaticAccessorType.DoubleColon)]
@@ -44,6 +42,8 @@ public extern Rect position
             [FreeFunction(k_ScriptingPrefix + "SetPosition", HasExplicitThis = true)] set;
         }
 
+        [FreeFunction(k_ScriptingPrefix + "SetFreeze", HasExplicitThis = true)]
+        public extern void SetFreeze(bool freeze);
         public extern bool maximized {[FreeFunction(k_ScriptingPrefix + "IsWindowMaximized", HasExplicitThis = true)] get; }
 
         [FreeFunction(k_ScriptingPrefix + "SetAlpha", HasExplicitThis = true)]
@@ -65,12 +65,6 @@ public extern Rect position
         [FreeFunction(k_ScriptingPrefix + "ToggleMaximize", HasExplicitThis = true)]
         public extern void ToggleMaximize();
 
-        [FreeFunction(k_ScriptingPrefix + "ToggleFullscreen", HasExplicitThis = true)]
-        internal extern void ToggleFullscreen(int displayIndex = 0);
-
-        [FreeFunction(k_ScriptingPrefix + "IsFullscreen", HasExplicitThis = true)]
-        internal extern bool IsFullscreen();
-
         [FreeFunction(k_ScriptingPrefix + "MoveInFrontOf", HasExplicitThis = true)]
         public extern void MoveInFrontOf(ContainerWindow other);
 
@@ -84,9 +78,6 @@ public extern Rect position
         [FreeFunction(k_ScriptingPrefix + "SendCaptionEvent", HasExplicitThis = true)]
         public extern void SendCaptionEvent(bool mouseDown);
 
-        [FreeFunction(k_ScriptingPrefix + "GetDisplayId", HasExplicitThis = true)]
-        internal extern int GetDisplayId();
-
         // Close the editor window.
         [FreeFunction(k_ScriptingPrefix + "InternalClose", HasExplicitThis = true)]
         public extern void InternalClose();
@@ -95,7 +86,7 @@ public extern Rect position
         private extern void Internal_SetMinMaxSizes(Vector2 minSize, Vector2 maxSize);
 
         [FreeFunction(k_ScriptingPrefix + "Internal_Show", HasExplicitThis = true, ThrowsException = true)]
-        private extern void Internal_Show(Rect r, int showMode, Vector2 minSize, Vector2 maxSize, int displayIndex = 0);
+        private extern void Internal_Show(Rect r, int showMode, Vector2 minSize, Vector2 maxSize);
 
         [FreeFunction(k_ScriptingPrefix + "Internal_BringLiveAfterCreation", HasExplicitThis = true)]
         private extern void Internal_BringLiveAfterCreation(bool displayImmediately, bool setFocus, bool showMaximized);
diff --git a/Editor/Mono/ContainerWindow.cs b/Editor/Mono/ContainerWindow.cs
index f35f18db94..5aa556b559 100644
--- a/Editor/Mono/ContainerWindow.cs
+++ b/Editor/Mono/ContainerWindow.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System;
 using System.Linq;
+using UnityEngine.Scripting;
 
 namespace UnityEditor
 {
@@ -24,9 +25,7 @@ internal partial class ContainerWindow : ScriptableObject
         [SerializeField] Vector2 m_MaxSize = new Vector2(8192, 8192);
         [SerializeField] bool m_Maximized;
 
-        internal int m_DisplayIndex;
-        internal bool m_IsFullscreenContainer;
-        internal bool m_IsForceTitleBar;
+        internal bool m_IsMppmCloneWindow;
 
         internal bool m_DontSaveToLayout = false;
         private bool m_HasUnsavedChanges = false;
@@ -39,7 +38,6 @@ internal partial class ContainerWindow : ScriptableObject
         internal const float kButtonWidth = 16f, kButtonHeight = 16f;
 
         static internal bool macEditor => Application.platform == RuntimePlatform.OSXEditor;
-        static internal bool linuxEditor => Application.platform == RuntimePlatform.LinuxEditor;
 
         static internal bool s_Modal = false;
         private static ContainerWindow s_MainWindow;
@@ -47,28 +45,16 @@ internal partial class ContainerWindow : ScriptableObject
 
         private static class Styles
         {
-            // Title Bar Buttons (Non)
-            public static GUIStyle buttonMin = "WinBtnMinMac";
-            public static GUIStyle buttonClose = macEditor ? "WinBtnCloseMac" : "WinBtnClose";
-            public static GUIStyle buttonMax = macEditor ? "WinBtnMaxMac" : "WinBtnMax";
-            public static GUIStyle buttonRestore = macEditor ? "WinBtnRestoreMac" : "WinBtnRestore";
-
             public static float borderSize => macEditor ? osxBorderSize : winBorderSize;
             public static float buttonMargin => macEditor ? osxBorderMargin : winBorderMargin;
 
-            public static SVC<float> buttonTop = new SVC<float>("--container-window-button-top-margin");
-
             private static SVC<float> winBorderSize = new SVC<float>("--container-window-buttons-right-margin-win");
             private static SVC<float> osxBorderSize = new SVC<float>("--container-window-buttons-right-margin-osx");
             private static SVC<float> winBorderMargin = new SVC<float>("--container-window-button-left-right-margin-win");
             private static SVC<float> osxBorderMargin = new SVC<float>("--container-window-button-left-right-margin-osx");
         }
-
-        private const float kButtonCountOSX = 0;
-        private const float kButtonCountWin = 2;
         static internal float buttonHorizontalSpace => (kButtonWidth + Styles.buttonMargin * 2f);
-        static internal float buttonStackWidth => buttonHorizontalSpace * (macEditor || linuxEditor ? kButtonCountOSX : kButtonCountWin) + Styles.borderSize;
-
+        static internal float buttonStackWidth => Styles.borderSize;
         public ContainerWindow()
         {
             m_PixelRect = new Rect(0, 0, 400, 300);
@@ -148,21 +134,20 @@ internal void ShowPopupWithMode(ShowMode mode, bool giveFocus)
         static Color skinBackgroundColor => EditorGUIUtility.isProSkin ? darkSkinColor : lightSkinColor;
 
         // Show the editor window.
-        public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately, bool setFocus, int displayIndex = 0)
+        public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately, bool setFocus)
         {
             try
             {
                 if (showMode == ShowMode.MainWindow && s_MainWindow && s_MainWindow != this)
                     throw new InvalidOperationException("Trying to create a second main window from layout when one already exists.");
 
-                bool useMousePos = showMode == ShowMode.AuxWindow || showMode == ShowMode.Fullscreen;
+                bool useMousePos = showMode == ShowMode.AuxWindow;
                 if (showMode == ShowMode.AuxWindow)
                     showMode = ShowMode.Utility;
 
                 if (showMode == ShowMode.Utility
                     || showMode == ShowMode.ModalUtility
                     || showMode == ShowMode.AuxWindow
-                    || showMode == ShowMode.Fullscreen
                     || IsPopup(showMode))
                     m_DontSaveToLayout = true;
 
@@ -176,7 +161,7 @@ public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately,
 
                 var initialMaximizedState = m_Maximized;
 
-                Internal_Show(m_PixelRect, m_ShowMode, m_MinSize, m_MaxSize, displayIndex);
+                Internal_Show(m_PixelRect, m_ShowMode, m_MinSize, m_MaxSize);
 
                 // Tell the main view its now in this window (quick hack to get platform-specific code to move its views to the right window)
                 if (m_RootView)
@@ -371,11 +356,13 @@ internal void InternalCloseWindow()
             }
 
             DestroyImmediate(this, true);
+            EditorWindow.UpdateWindowMenuListing();
         }
 
-        internal bool InternalIsForceTitleBar()
+        [RequiredByNativeCode]
+        internal bool IsMultiplayerClone()
         {
-            return m_IsForceTitleBar;
+            return m_IsMppmCloneWindow;
         }
 
         private static List<EditorWindow> FindUnsavedChanges(View view)
@@ -657,142 +644,5 @@ internal Rect GetDropDownRect(Rect buttonRect, Vector2 minSize, Vector2 maxSize)
             return PopupLocationHelper.GetDropDownRect(buttonRect, minSize, maxSize, this);
         }
 
-        public void HandleWindowDecorationEnd(Rect windowPosition)
-        {
-            // No Op
-        }
-
-        public void HandleWindowDecorationStart(Rect windowPosition)
-        {
-            if (!macEditor && !linuxEditor)
-            {
-                bool hasTitleBar = (windowPosition.y == 0 && (showMode != ShowMode.Utility && showMode != ShowMode.MainWindow) && !isPopup);
-
-                if (!hasTitleBar)
-                    return;
-
-                bool hasWindowButtons = Mathf.Abs(windowPosition.xMax - position.width) < 2;
-                if (hasWindowButtons)
-                {
-                    GUIStyle min = Styles.buttonMin;
-                    GUIStyle close = Styles.buttonClose;
-                    GUIStyle maxOrRestore = maximized ? Styles.buttonRestore : Styles.buttonMax;
-
-                    BeginTitleBarButtons(windowPosition);
-                    if (TitleBarButton(close))
-                    {
-                        if (InternalRequestClose())
-                        {
-                            Close();
-                            GUIUtility.ExitGUI();
-                        }
-                    }
-
-                    var canMaximize = m_MaxSize.x == 0 || m_MaxSize.y == 0 || m_MaxSize.x >= Screen.currentResolution.width || m_MaxSize.y >= Screen.currentResolution.height;
-                    EditorGUI.BeginDisabled(!canMaximize);
-                    if (TitleBarButton(maxOrRestore))
-                        ToggleMaximize();
-                    EditorGUI.EndDisabled();
-                }
-
-                DragTitleBar(new Rect(0, 0, position.width, kTitleHeight));
-            }
-        }
-
-        private void BeginTitleBarButtons(Rect windowPosition)
-        {
-            m_ButtonCount = 0;
-            m_TitleBarWidth = windowPosition.width;
-        }
-
-        private bool TitleBarButton(GUIStyle style)
-        {
-            var buttonRect = new Rect(m_TitleBarWidth - Styles.borderSize - (buttonHorizontalSpace * ++m_ButtonCount), Styles.buttonTop, kButtonWidth, kButtonHeight);
-            var guiView = rootView as GUIView;
-            if (guiView == null)
-            {
-                var splitView = rootView as SplitView;
-                if (splitView != null)
-                    guiView = splitView.children.Length > 0 ? splitView.children[0] as GUIView : null;
-            }
-            if (guiView != null)
-                guiView.MarkHotRegion(GUIClip.UnclipToWindow(buttonRect));
-
-            return GUI.Button(buttonRect, GUIContent.none, style);
-        }
-
-        // Snapping windows
-        private static Vector2 s_LastDragMousePos;
-        private float startDragDpi;
-
-        // Indicates that we are using the native title bar caption dragging.
-        private bool m_DraggingNativeTitleBarCaption = false;
-
-        private void DragTitleBar(Rect titleBarRect)
-        {
-            int id = GUIUtility.GetControlID(FocusType.Passive);
-            Event evt = Event.current;
-
-            switch (evt.GetTypeForControl(id))
-            {
-                case EventType.Repaint:
-                    if (m_DraggingNativeTitleBarCaption)
-                        m_DraggingNativeTitleBarCaption = false;
-                    EditorGUIUtility.AddCursorRect(titleBarRect, MouseCursor.Arrow);
-                    break;
-                case EventType.MouseDown:
-                    // If the mouse is inside the title bar rect, we say that we're the hot control
-                    if (titleBarRect.Contains(evt.mousePosition) && GUIUtility.hotControl == 0 && evt.button == 0)
-                    {
-                        Event.current.Use();
-                        m_DraggingNativeTitleBarCaption = true;
-                        SendCaptionEvent(m_DraggingNativeTitleBarCaption);
-                    }
-                    break;
-                case EventType.MouseUp:
-                    if (m_DraggingNativeTitleBarCaption)
-                        break;
-
-                    if (GUIUtility.hotControl == id)
-                    {
-                        GUIUtility.hotControl = 0;
-                        Event.current.Use();
-                        Unsupported.SetAllowCursorLock(true, Unsupported.DisallowCursorLockReasons.SizeMove);
-                    }
-                    break;
-                case EventType.MouseDrag:
-                    if (m_DraggingNativeTitleBarCaption)
-                        break;
-
-                    if (GUIUtility.hotControl == id)
-                    {
-                        Vector2 mousePos = evt.mousePosition;
-                        if (startDragDpi != GUIUtility.pixelsPerPoint)
-                        {
-                            // We ignore this mouse event when changing screens in multi monitor setups with
-                            // different dpi scalings as funky things might/will happen
-                            startDragDpi = GUIUtility.pixelsPerPoint;
-                            s_LastDragMousePos = mousePos;
-                        }
-                        else
-                        {
-                            Vector2 movement = mousePos - s_LastDragMousePos;
-
-                            float minimumDelta = 1.0f / GUIUtility.pixelsPerPoint;
-
-                            if (Mathf.Abs(movement.x) >= minimumDelta || Mathf.Abs(movement.y) >= minimumDelta)
-                            {
-                                Rect dragPosition = position;
-                                dragPosition.x += movement.x;
-                                dragPosition.y += movement.y;
-                                position = dragPosition;
-
-                                GUI.changed = true;
-                            }
-                        }
-                    }
-                    break;
-            }
-        }
     }
 } //namespace
diff --git a/Editor/Mono/CustomEditorAttributes.bindings.cs b/Editor/Mono/CustomEditorAttributes.bindings.cs
index 7dfb49fbf6..7387e02d03 100644
--- a/Editor/Mono/CustomEditorAttributes.bindings.cs
+++ b/Editor/Mono/CustomEditorAttributes.bindings.cs
@@ -10,9 +10,9 @@ namespace UnityEditor;
 internal partial class CustomEditorAttributes
 {
     [RequiredByNativeCode]
-    internal static Type FindCustomEditorType(Object o, bool multiEdit)
+    internal static Type FindCustomEditorType(Object obj, bool multiEdit)
     {
-        return FindCustomEditorTypeByType(o.GetType(), multiEdit);
+        return obj == null ? null : FindCustomEditorTypeByType(obj.GetType(), multiEdit);
     }
 
     [RequiredByNativeCode]
diff --git a/Editor/Mono/CustomEditorAttributes.cs b/Editor/Mono/CustomEditorAttributes.cs
index b866edb95d..73e46af47e 100644
--- a/Editor/Mono/CustomEditorAttributes.cs
+++ b/Editor/Mono/CustomEditorAttributes.cs
@@ -212,11 +212,13 @@ static bool TryGatherRenderPipelineTypes([DisallowNull] Type type, [DisallowNull
                 }
             }
 
+#pragma warning disable CS0618
             if (inspectAttr is CustomEditorForRenderPipelineAttribute attr)
             {
                 results = new[] { attr.renderPipelineType };
                 return true;
             }
+#pragma warning restore CS0618
 
             results = null;
             return true;
diff --git a/Editor/Mono/CustomInspectorStubs.cs b/Editor/Mono/CustomInspectorStubs.cs
index 0793e52640..0a54fe5bed 100644
--- a/Editor/Mono/CustomInspectorStubs.cs
+++ b/Editor/Mono/CustomInspectorStubs.cs
@@ -68,10 +68,18 @@ private InputManager() {}
         [SettingsProvider]
         internal static SettingsProvider CreateProjectSettingsProvider()
         {
-            var provider = AssetSettingsProvider.CreateProviderFromAssetPath(
-                "Project/Input Manager", "ProjectSettings/InputManager.asset",
-                SettingsProvider.GetSearchKeywordsFromPath("ProjectSettings/InputManager.asset"));
-            return provider;
+            // The new input system adds objects to InputManager.asset. This means we can't use AssetSettingsProvider.CreateProviderFromAssetPath
+            // as it will load *all* objects at that path and try to create an editor for it.
+            // NOTE: When the input system package is uninstalled, InputManager.asset will contain serialized MonoBehaviour objects for which
+            //       the C# classes are no longer available. They will thus not load correctly and appear as null entries.
+            var obj = AssetDatabase.LoadAssetAtPath<InputManager>("ProjectSettings/InputManager.asset");
+            if (obj != null && obj.name == "InputManager")
+            {
+                var provider = AssetSettingsProvider.CreateProviderFromObject("Project/Input Manager", obj,
+                    SettingsProvider.GetSearchKeywordsFromPath("ProjectSettings/InputManager.asset"));
+                return provider;
+            }
+            return null;
         }
     }
 
diff --git a/Editor/Mono/DataMode.cs b/Editor/Mono/DataMode.cs
index fb934d692c..4ce5f777c4 100644
--- a/Editor/Mono/DataMode.cs
+++ b/Editor/Mono/DataMode.cs
@@ -4,15 +4,15 @@
 
 using System;
 using System.Collections.Generic;
-
+using System.Linq;
+using UnityEngine;
 using UnityObject = UnityEngine.Object;
 using DataModeSupportHandler = UnityEditor.DeclareDataModeSupportAttribute.DataModeSupportHandler;
 
 namespace UnityEditor
 {
     /// <summary>
-    /// Options for the different modes of an <see cref="EditorWindow"/> that implements
-    /// <see cref="IDataModeHandler"/> or <see cref="IDataModeHandlerAndDispatcher"/>.
+    /// Options for the different modes of an <see cref="EditorWindow"/>.
     /// </summary>
     //
     // Dev note:
@@ -26,150 +26,260 @@ namespace UnityEditor
     // Sincerely,
     // The #dots-editor team
     //
+    [Serializable]
     public enum DataMode // Values must be kept in sync with `DataMode.h`
     {
         /// <summary>
-        /// Represents a situation or context in which the usage of data modes is not applicable.
+        /// Represents a situation or context in which the usage of <see cref="DataMode"/> is not applicable.
         /// </summary>
         /// <remarks> <para>
-        /// This mode informs the docking area that the data modes switch should now be displayed.
+        /// This mode disables the DataMode switch in the docking area.
         /// </para> </remarks>
         Disabled = 0,
         /// <summary>
-        /// Uses a mode where only authoring data is available.
+        /// Uses this 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 = 1,
         /// <summary>
-        /// Uses a mode where a mix of authoring and runtime data is available.
+        /// Uses this 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.
+        /// In this mode, a mixture of authoring and runtime data is available.
+        /// When exiting Play mode, Unity loses runtime data. However, it retains any authoring data.
         /// </para> </remarks>
         Mixed = 2,
         /// <summary>
-        /// Uses a mode where only runtime data is available.
+        /// Uses this 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.
+        /// In this mode, only runtime data is available. When exiting Play mode, Unity loses runtime data.
         /// </para> </remarks>
         Runtime = 3
     }
 
     /// <summary>
-    /// Implement this interface to allow an <see cref="EditorWindow"/> to handle <see cref="DataMode"/> changes.
+    /// Container for the different parameters of the <see cref="IDataModeController.dataModeChanged"/> event.
+    /// </summary>
+    /// <param name="nextDataMode"> DataMode to which the <see cref="EditorWindow"/> should change.</param>
+    /// <param name="changedThroughUI"> Whether the change was initiated by the DataMode switcher UI
+    /// at the top-right of the Editor window.</param>
+    public readonly struct DataModeChangeEventArgs
+    {
+        public readonly DataMode nextDataMode;
+        public readonly bool changedThroughUI;
+
+        public DataModeChangeEventArgs(DataMode nextDataMode, bool changedThroughUI)
+        {
+            this.nextDataMode = nextDataMode;
+            this.changedThroughUI = changedThroughUI;
+        }
+    }
+
+    /// <summary>
+    /// Interface with which any <see cref="EditorWindow"/> can interact with <see cref="DataMode"/> functionalities.
+    /// To obtain an instance, use <see cref="EditorWindow.dataModeController"/>>
     /// </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.
+    /// This interface displays a switch in the docking area when the window is visible and has
+    /// more than one supported DataModes.
     /// </para> </remarks>
-    public interface IDataModeHandler
+    public interface IDataModeController
     {
         /// <summary>
-        /// Returns the <see cref="DataMode"/> currently active for the implementor <see cref="EditorWindow"/>.
+        /// Returns the <see cref="DataMode"/> currently active for the <see cref="EditorWindow"/> that
+        /// owns this instance of IDataModeController.
+        /// </summary>
+        DataMode dataMode { get; }
+
+        /// <summary>
+        /// Event for subscribing to <see cref="DataMode"/> changes.
         /// </summary>
         /// <remarks> <para>
-        /// Unity does not serialize or store this value. It is the window's responsibility to do so.
+        /// This method accepts <see cref="DataModeChangeEventArgs"/>>.
+        /// For example, you can register to this method to update the contents of the window for the given data mode.
         /// </para> </remarks>
-        DataMode dataMode { get; }
+        event Action<DataModeChangeEventArgs> dataModeChanged;
 
         /// <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.
+        /// Updates the list of <see cref="DataMode"/>s that the <see cref="EditorWindow"/> supports,
+        /// and sets the preferred DataMode to be used when the DataMode switcher UI is set to Automatic.
+        /// </summary>
+        /// <remarks> <para>
+        /// That list of the DataModes the Editor window supports varies based on a number of factors,
+        /// so it should only contain the DataModes 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 name="supportedDataMode"> A list of the supported DataModes. </param>
+        /// <param name="preferredDataMode">
+        /// Preferred DataMode to use given the current context when the DataMode switcher UI is set to Automatic.
         /// </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();
+        void UpdateSupportedDataModes(IList<DataMode> supportedDataMode, DataMode preferredDataMode);
 
         /// <summary>
-        /// Unity calls this method automatically whenever the Editor wants an <see cref="EditorWindow"/> to be in a
-        /// specific <see cref="DataMode"/>.
+        /// Requests a <see cref="DataMode"/> change for the <see cref="EditorWindow"/>.
         /// </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.
+        /// If the DataMode switcher UI is currently set to Automatic, the Editor window also
+        /// changes to that preferred DataMode.
+        /// <seealso cref="IDataModeController.UpdateSupportedDataModes"/>>
         /// </para> </remarks>
-        /// <param name="mode">
-        /// The explicit data mode to which the Editor window should change.
+        /// <param name="newDataMode">
+        /// The DataMode to which the Editor window should change.
         /// </param>
-        void SwitchToDataMode(DataMode mode);
+        /// <returns>
+        /// Whether the Editor window has accepted the requested DataMode change.
+        /// </returns>>
+        bool TryChangeDataMode(DataMode newDataMode);
+    }
 
-        /// <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"/>
+    // DataModeController handles DataMode related actions internally.
+    // Each Editor window has a DataModeController instance.
+    [Serializable]
+    internal sealed class DataModeController : IDataModeController
+    {
+        static readonly DataMode[] k_DefaultModes = Array.Empty<DataMode>();
+
+        public event Action<DataModeChangeEventArgs> dataModeChanged;
+
+        [SerializeField] DataMode m_DataMode = DataMode.Disabled;
+        public DataMode dataMode
+        {
+            get => m_DataMode;
+            private set => m_DataMode = value;
+        }
+
+        [SerializeField] DataMode m_PreferredDataMode = DataMode.Disabled;
+        public DataMode preferredDataMode
+        {
+            get => m_PreferredDataMode;
+            private set => m_PreferredDataMode = value;
+        }
+
+        [SerializeField] DataMode[] m_SupportedDataModes = k_DefaultModes;
+        public IList<DataMode> supportedDataModes
+        {
+            get => m_SupportedDataModes;
+            private set => m_SupportedDataModes = value.ToArray();
+        }
+
+        [SerializeField] internal bool isAutomatic = true;
+
+        readonly List<DataMode> m_DataModeSanitizationCache = new List<DataMode>(3); // Number of modes, minus `Disabled`
+
+        public void UpdateSupportedDataModes(IList<DataMode> supported, DataMode preferred)
+        {
+            SanitizeSupportedDataModesList(supported.ToList(), m_DataModeSanitizationCache);
+
+            supportedDataModes = m_DataModeSanitizationCache.Count != 0 ? m_DataModeSanitizationCache : k_DefaultModes;
+
+            preferredDataMode = supportedDataModes.Count switch
+            {
+                0 => DataMode.Disabled,
+                1 => supportedDataModes[0],
+                _ => supportedDataModes.Contains(preferred) ? preferred : supportedDataModes[0]
+            };
+
+            if (!isAutomatic || dataMode == preferredDataMode)
+                return;
+
+            // Recover if automatic
+            dataMode = preferredDataMode;
+            dataModeChanged?.Invoke(new DataModeChangeEventArgs(dataMode, false));
+        }
+
+        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();
+        }
+
+        public bool ShouldDrawDataModesSwitch()
+        {
+            return dataMode != DataMode.Disabled
+                   // We don't want to show DataMode switch if there are not
+                   // at least 2 modes supported at the current moment.
+                   && supportedDataModes.Count > 1;
+        }
+
+        public bool TryChangeDataMode(DataMode newDataMode)
+        {
+            // Only change if currently in automatic mode
+            if (!isAutomatic || dataMode == newDataMode || !supportedDataModes.Contains(newDataMode))
+                return false;
+
+            dataMode = newDataMode;
+            dataModeChanged?.Invoke(new DataModeChangeEventArgs(newDataMode, false));
+            return true;
+        }
+
+        // Invoked when user interacts with the DataMode dropdown menu, for internal use only.
+        internal void SwitchToAutomatic()
+        {
+            if (isAutomatic)
+                return;
+
+            isAutomatic = true;
+
+            if (dataMode == preferredDataMode)
+                return;
+
+            // If the DataMode is not supported in current context, we fall back to default one.
+            dataMode = preferredDataMode;
+            dataModeChanged?.Invoke(new DataModeChangeEventArgs(dataMode, true));
+        }
+
+        // Invoked when user interacts with the DataMode dropdown men, for internal use only.
+        internal void SwitchToStickyDataMode(DataMode stickyDataMode)
+        {
+            isAutomatic = false;
+
+            if (dataMode == stickyDataMode)
+                return;
+
+            dataMode = supportedDataModes.Contains(stickyDataMode)
+                ? stickyDataMode
+                : preferredDataMode;
+
+            dataModeChanged?.Invoke(new DataModeChangeEventArgs(dataMode, true));
+        }
+    }
+
+    [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+    [Obsolete("IDataModeHandler has been deprecated, please use EditorWindow.dataModeController instead.", false)]
+    public interface IDataModeHandler
+    {
+        DataMode dataMode { get; }
+        IReadOnlyList<DataMode> supportedDataModes { get; }
+        bool IsDataModeSupported(DataMode mode);
+        void SwitchToNextDataMode();
+        void SwitchToDataMode(DataMode mode);
         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>
+    [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+    [Obsolete("IDataModeHandlerAndDispatcher has been deprecated, please use EditorWindow.dataModeController instead.", false)]
     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/Delayer.cs b/Editor/Mono/Delayer.cs
index df2fd4910d..342d242cd4 100644
--- a/Editor/Mono/Delayer.cs
+++ b/Editor/Mono/Delayer.cs
@@ -10,7 +10,7 @@ class Delayer
     {
         private long m_LastExecutionTime;
         private Action<object> m_Action;
-        private readonly double m_DebounceDelay;
+        private readonly long m_DebounceDelay;
         private object m_Context;
         private readonly bool m_IsThrottle;
         private readonly bool m_FirstExecuteImmediate;
@@ -63,7 +63,7 @@ public void Execute(object context = null)
         private Delayer(Action<object> action, double delay, bool isThrottle, bool firstExecuteImmediate)
         {
             m_Action = action;
-            m_DebounceDelay = delay;
+            m_DebounceDelay = TimeSpan.FromSeconds(delay).Ticks;
             m_IsThrottle = isThrottle;
             m_FirstExecuteImmediate = firstExecuteImmediate;
         }
@@ -74,41 +74,44 @@ public void Dispose()
             EditorApplication.tick -= Throttle;
             m_Context = null;
             m_Action = null;
+            m_DelayInProgress = false;
         }
 
         private void Debounce()
         {
-            m_DelayInProgress = false;
-            EditorApplication.tick -= Debounce;
             var currentTime = DateTime.UtcNow.Ticks;
             if (m_LastExecutionTime != 0 && DelayHasPassed(currentTime))
             {
+                m_DelayInProgress = false;
+                EditorApplication.tick -= Debounce;
                 m_Action?.Invoke(m_Context);
                 m_LastExecutionTime = 0;
             }
             else
             {
-                EditorApplication.tick += Debounce;
+                if (!m_DelayInProgress)
+                    EditorApplication.tick += Debounce;
                 m_DelayInProgress = true;
             }
         }
 
         private void Throttle()
         {
-            m_DelayInProgress = false;
-            EditorApplication.tick -= Throttle;
             var currentTime = DateTime.UtcNow.Ticks;
 
             if (m_FirstExecuteImmediate)
             {
                 if (m_LastExecutionTime == 0 || DelayHasPassed(currentTime))
                 {
+                    m_DelayInProgress = false;
+                    EditorApplication.tick -= Throttle;
                     m_Action?.Invoke(m_Context);
                     m_LastExecutionTime = currentTime;
                 }
                 else
                 {
-                    EditorApplication.tick += Throttle;
+                    if (!m_DelayInProgress)
+                        EditorApplication.tick += Throttle;
                     m_DelayInProgress = true;
                 }
             }
@@ -116,6 +119,8 @@ private void Throttle()
             {
                 if (m_LastExecutionTime != 0 && DelayHasPassed(currentTime))
                 {
+                    m_DelayInProgress = false;
+                    EditorApplication.tick -= Throttle;
                     m_Action?.Invoke(m_Context);
                     m_LastExecutionTime = 0;
                 }
@@ -123,7 +128,8 @@ private void Throttle()
                 {
                     if (m_LastExecutionTime == 0)
                         m_LastExecutionTime = currentTime;
-                    EditorApplication.tick += Throttle;
+                    if (!m_DelayInProgress)
+                        EditorApplication.tick += Throttle;
                     m_DelayInProgress = true;
                 }
             }
@@ -132,7 +138,7 @@ private void Throttle()
         private bool DelayHasPassed(long currentTime)
         {
             var timeSpan = new TimeSpan(currentTime - m_LastExecutionTime);
-            return timeSpan.TotalSeconds >= m_DebounceDelay;
+            return timeSpan.Ticks >= m_DebounceDelay;
         }
     }
 }
diff --git a/Editor/Mono/Display/EditorDisplayFullscreenSetting.cs b/Editor/Mono/Display/EditorDisplayFullscreenSetting.cs
deleted file mode 100644
index 040b762cbc..0000000000
--- a/Editor/Mono/Display/EditorDisplayFullscreenSetting.cs
+++ /dev/null
@@ -1,42 +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 UnityEngine;
-
-namespace UnityEditor
-{
-    [Serializable]
-    internal class EditorDisplayFullscreenSetting
-    {
-        public enum Mode
-        {
-            DoNothing,
-            FullscreenOnPlaymode,
-            AlwaysFullscreen
-        }
-
-        public EditorDisplayFullscreenSetting(int id, string name)
-        {
-            displayId = id;
-            displayName = name;
-            mode = Mode.DoNothing;
-            enabled = false;
-            viewWindowTitle = string.Empty;
-            playModeViewSettings = null;
-        }
-
-        public string displayName;
-        public int displayId;
-
-        public bool enabled;
-
-        public Mode mode;
-
-        public string viewWindowTitle;
-
-        [SerializeReference]
-        public IPlayModeViewFullscreenSettings playModeViewSettings;
-    }
-}
diff --git a/Editor/Mono/Display/EditorDisplayManager.cs b/Editor/Mono/Display/EditorDisplayManager.cs
deleted file mode 100644
index 36064520ae..0000000000
--- a/Editor/Mono/Display/EditorDisplayManager.cs
+++ /dev/null
@@ -1,267 +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 UnityEngine;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEditor.Modules;
-
-namespace UnityEditor
-{
-    internal enum DisplayAPIControlMode
-    {
-        FromEditor,
-        FromRuntime
-    }
-
-    [InitializeOnLoad]
-    internal class EditorDisplayManager : ScriptableSingleton<EditorDisplayManager>
-    {
-        private PlayModeView[] m_views;
-        private int m_displayCount;
-        private DisplayAPIControlMode m_mode;
-        private int m_maxDisplays;
-        private BuildTarget m_currentBuildTarget;
-
-        static EditorDisplayManager()
-        {
-            UnsubscribeEditorDisplayCallback();
-            SubscribeEditorDisplayCallback();
-        }
-
-        private static void SubscribeEditorDisplayCallback()
-        {
-            Display.onGetSystemExt += GetSystemExtImpl;
-            Display.onGetRenderingExt += GetRenderingExtImpl;
-            Display.onGetRenderingBuffers += GetRenderingBuffersImpl;
-            Display.onSetRenderingResolution += SetRenderingResolutionImpl;
-            Display.onActivateDisplay += ActivateDisplayImpl;
-            Display.onSetParams += SetParamsImpl;
-            Display.onRelativeMouseAt += RelativeMouseAtImpl;
-            Display.onGetActive += GetActiveImpl;
-            Display.onRequiresBlitToBackbuffer += RequiresBlitToBackbufferImpl;
-            Display.onRequiresSrgbBlitToBackbuffer += RequiresSrgbBlitToBackbufferImpl;
-        }
-
-        private static void UnsubscribeEditorDisplayCallback()
-        {
-            Display.onGetSystemExt -= GetSystemExtImpl;
-            Display.onGetRenderingExt -= GetRenderingExtImpl;
-            Display.onGetRenderingBuffers -= GetRenderingBuffersImpl;
-            Display.onSetRenderingResolution -= SetRenderingResolutionImpl;
-            Display.onActivateDisplay -= ActivateDisplayImpl;
-            Display.onSetParams -= SetParamsImpl;
-            Display.onRelativeMouseAt -= RelativeMouseAtImpl;
-            Display.onGetActive -= GetActiveImpl;
-            Display.onRequiresBlitToBackbuffer -= RequiresBlitToBackbufferImpl;
-            Display.onRequiresSrgbBlitToBackbuffer -= RequiresSrgbBlitToBackbufferImpl;
-        }
-
-        private void OnEnable()
-        {
-            Initialize();
-            EditorApplication.update += OnUpdate;
-        }
-
-        private void OnDisable()
-        {
-            EditorApplication.update -= OnUpdate;
-        }
-
-        public void Initialize()
-        {
-            m_currentBuildTarget = EditorUserBuildSettings.activeBuildTarget;
-            m_displayCount = 0;
-
-            m_maxDisplays = ModuleManager.ShouldShowMultiDisplayOption() ?
-                GetDisplayNamesForBuildTarget(EditorUserBuildSettings.activeBuildTarget).Length : 1;
-
-            m_views = new PlayModeView[m_maxDisplays];
-            UpdateAssociatedPlayModeView();
-        }
-
-        private void OnUpdate()
-        {
-            if (m_currentBuildTarget != EditorUserBuildSettings.activeBuildTarget)
-            {
-                Initialize();
-            }
-        }
-
-        private void UpdateAssociatedPlayModeView()
-        {
-            for (var i = 0; i < m_maxDisplays; ++i)
-            {
-                var view = PlayModeView.GetAssociatedViewForTargetDisplay(i);
-                if (m_views[i] == view)
-                {
-                    continue;
-                }
-
-                m_views[i] = view;
-                if (view != null)
-                {
-                    EditorDisplayUtility.AddVirtualDisplay(i, Mathf.RoundToInt(view.targetSize.x), Mathf.RoundToInt(view.targetSize.y));
-                }
-                else
-                {
-                    EditorDisplayUtility.RemoveVirtualDisplay(i);
-                }
-            }
-
-            UpdateDisplayList(false);
-        }
-
-        private void UpdateDisplayList(bool recreate)
-        {
-            recreate |= m_mode != EditorFullscreenController.DisplayAPIMode;
-            m_mode = EditorFullscreenController.DisplayAPIMode;
-
-            if (EditorFullscreenController.DisplayAPIMode == DisplayAPIControlMode.FromEditor)
-            {
-                var previousDisplayCount = m_displayCount;
-                for (var i = m_maxDisplays - 1; i >= 0; --i)
-                {
-                    if (m_views[i] != null)
-                    {
-                        m_displayCount = i + 1;
-                        recreate |= m_displayCount != previousDisplayCount;
-                        break;
-                    }
-                }
-            }
-            else
-            {
-                var nDisplays = EditorDisplayUtility.GetNumberOfConnectedDisplays();
-                recreate |= m_displayCount != nDisplays;
-                m_displayCount = nDisplays;
-            }
-
-            if (recreate)
-            {
-                var displayList = new IntPtr[m_displayCount];
-                for (var i = 0; i < m_displayCount; ++i)
-                {
-                    displayList[i] = new IntPtr(i);
-                }
-
-                Display.RecreateDisplayList(displayList);
-            }
-        }
-
-        internal static GUIContent[] GetDisplayNamesForBuildTarget(BuildTarget buildTarget)
-        {
-            var platformDisplayNames = Modules.ModuleManager.GetDisplayNames(buildTarget.ToString());
-            return platformDisplayNames ?? DisplayUtility.GetGenericDisplayNames();
-        }
-
-        private static void GetSystemExtImpl(IntPtr nativeDisplay, out int w, out int h)
-        {
-            var manager = instance;
-            if (manager.m_mode == DisplayAPIControlMode.FromEditor)
-            {
-                var view = manager.m_views[(int)nativeDisplay];
-
-                if (view == null)
-                {
-                    w = 0;
-                    h = 0;
-                }
-                else
-                {
-                    w = (int)view.position.width;
-                    h = (int)view.position.height;
-                }
-            }
-            else
-            {
-                w = (int)EditorDisplayUtility.GetDisplayWidth((int)nativeDisplay);
-                h = (int)EditorDisplayUtility.GetDisplayHeight((int)nativeDisplay);
-            }
-        }
-
-        private static void GetRenderingExtImpl(IntPtr nativeDisplay, out int w, out int h)
-        {
-            var manager = instance;
-            if (manager.m_mode == DisplayAPIControlMode.FromEditor)
-            {
-                var view = manager.m_views[(int)nativeDisplay];
-
-                if (view == null)
-                {
-                    w = 0;
-                    h = 0;
-                }
-                else
-                {
-                    w = (int)view.targetSize.x;
-                    h = (int)view.targetSize.y;
-                }
-            }
-            else
-            {
-                w = (int)EditorDisplayUtility.GetDisplayWidth((int)nativeDisplay);
-                h = (int)EditorDisplayUtility.GetDisplayHeight((int)nativeDisplay);
-            }
-        }
-
-        private static void GetRenderingBuffersImpl(IntPtr nativeDisplay, out RenderBuffer color,
-            out RenderBuffer depth)
-        {
-            color = new RenderBuffer();
-            depth = new RenderBuffer();
-        }
-
-        private static void SetRenderingResolutionImpl(IntPtr nativeDisplay, int w, int h)
-        {
-            var manager = instance;
-            if (manager.m_mode == DisplayAPIControlMode.FromEditor)
-            {
-                var view = manager.m_views[(int)nativeDisplay];
-                if (view != null) {
-                    view.SetPlayModeViewSize(new Vector2(w, h));
-                }
-            }
-        }
-
-        private static void ActivateDisplayImpl(IntPtr nativeDisplay, int width, int height, RefreshRate refreshRate)
-        {
-            var manager = instance;
-            if (manager.m_mode == DisplayAPIControlMode.FromRuntime)
-            {
-                EditorFullscreenController.BeginFullscreen((int)nativeDisplay, width, height);
-            }
-        }
-
-        private static void SetParamsImpl(IntPtr nativeDisplay, int width, int height, int x, int y)
-        {
-            // do nothing.
-        }
-
-        private static int RelativeMouseAtImpl(int x, int y, out int rx, out int ry)
-        {
-            // TODO, unused?
-            rx = 0;
-            ry = 0;
-            return 0;
-        }
-
-        private static bool GetActiveImpl(IntPtr nativeDisplay)
-        {
-            var view = instance.m_views[(int)nativeDisplay];
-            return view != null;
-        }
-
-        private static bool RequiresBlitToBackbufferImpl(IntPtr nativeDisplay)
-        {
-            return false;
-        }
-
-        private static bool RequiresSrgbBlitToBackbufferImpl(IntPtr nativeDisplay)
-        {
-            return false;
-        }
-    }
-} // namespace
diff --git a/Editor/Mono/Display/EditorDisplaySettingsProfile.cs b/Editor/Mono/Display/EditorDisplaySettingsProfile.cs
deleted file mode 100644
index 3cb40c15c5..0000000000
--- a/Editor/Mono/Display/EditorDisplaySettingsProfile.cs
+++ /dev/null
@@ -1,79 +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 UnityEngine;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace UnityEditor
-{
-    [Serializable]
-    internal class EditorDisplaySettingsProfile
-    {
-        [SerializeField] private string m_name;
-        [SerializeField] private List<EditorDisplayFullscreenSetting> m_settings;
-        [SerializeField] private BuildTarget m_buildTarget;
-        [SerializeField] private DisplayAPIControlMode displayAPIMode;
-        [SerializeField] private bool m_displayAPIUseSystemConfiguration;
-
-        public string Name
-        {
-            get => m_name;
-            set => m_name = value;
-        }
-
-        public BuildTarget Target
-        {
-            get => m_buildTarget;
-            set => m_buildTarget = value;
-        }
-
-        public DisplayAPIControlMode DisplayAPIMode
-        {
-            get => displayAPIMode;
-            set => displayAPIMode = value;
-        }
-
-        public bool DisplayAPIUseSystemConfiguration
-        {
-            get => m_displayAPIUseSystemConfiguration;
-            set => m_displayAPIUseSystemConfiguration = value;
-        }
-
-        public List<EditorDisplayFullscreenSetting> Settings => m_settings;
-
-        public EditorDisplaySettingsProfile(string name)
-        {
-            m_name = name;
-            m_buildTarget = EditorUserBuildSettings.activeBuildTarget;
-            displayAPIMode = DisplayAPIControlMode.FromEditor;
-        }
-
-        public EditorDisplayFullscreenSetting GetEditorDisplayFullscreenSetting(int displayId)
-        {
-            if (m_settings == null)
-            {
-                m_settings = new List<EditorDisplayFullscreenSetting>();
-            }
-
-            return m_settings.FirstOrDefault(setting => setting.displayId == displayId);
-        }
-
-        public void AddEditorDisplayFullscreenSetting(EditorDisplayFullscreenSetting setting)
-        {
-            if (m_settings == null)
-            {
-                m_settings = new List<EditorDisplayFullscreenSetting>();
-            }
-
-            m_settings.Add(setting);
-        }
-
-        public void RemoveEditorDisplayFullscreenSetting(EditorDisplayFullscreenSetting setting)
-        {
-            m_settings.Remove(setting);
-        }
-    }
-} // namespace
diff --git a/Editor/Mono/Display/EditorDisplayUtility.bindings.cs b/Editor/Mono/Display/EditorDisplayUtility.bindings.cs
deleted file mode 100644
index 5119008563..0000000000
--- a/Editor/Mono/Display/EditorDisplayUtility.bindings.cs
+++ /dev/null
@@ -1,41 +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.Bindings;
-
-namespace UnityEditor
-{
-    [NativeHeader("Editor/Platform/Interface/GUIView.h")]
-    [NativeHeader("Runtime/Graphics/EditorDisplayManager.h")]
-    internal static partial class EditorDisplayUtility
-    {
-        [FreeFunction]
-        public static extern int GetNumberOfConnectedDisplays();
-
-        [FreeFunction]
-        public static extern void AddVirtualDisplay(int index, int width, int height);
-
-        [FreeFunction]
-        public static extern void RemoveVirtualDisplay(int index);
-
-        [FreeFunction]
-        public static extern void SetSortDisplayOrder(bool enabled);
-
-        [FreeFunction]
-        public static extern string GetDisplayName(int index);
-
-        [FreeFunction]
-        public static extern int GetDisplayId(int index);
-
-        [FreeFunction]
-        public static extern int GetDisplayWidth(int index);
-
-        [FreeFunction]
-        public static extern int GetDisplayHeight(int index);
-
-        [FreeFunction]
-        public static extern int GetMainDisplayId();
-    }
-}
diff --git a/Editor/Mono/Display/EditorFullscreenController.cs b/Editor/Mono/Display/EditorFullscreenController.cs
deleted file mode 100644
index 07e6aa8612..0000000000
--- a/Editor/Mono/Display/EditorFullscreenController.cs
+++ /dev/null
@@ -1,1237 +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 UnityEngine;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using UnityEditor.Modules;
-using UnityEditor.ShortcutManagement;
-using UnityEditorInternal;
-using UnityEngine.Bindings;
-using UnityEngine.Scripting;
-
-namespace UnityEditor
-{
-    [InitializeOnLoad]
-    [FilePathAttribute("Library/EditorDisplaySettings.asset", FilePathAttribute.Location.ProjectFolder)]
-    internal class EditorFullscreenController : ScriptableSingleton<EditorFullscreenController>
-    {
-        private const float kDisplayCheckIntervalSec = 1.0f;
-
-        [SerializeField] private List<EditorDisplaySettingsProfile> m_profiles = null;
-        [SerializeField] private bool m_isSortDisplayOrder = true;
-        [SerializeField] private bool m_showNotificationOnFullscreen = true;
-        [SerializeField] private bool m_showToolbarOnFullscreen = false;
-        [SerializeField] private int m_selectedProfileIndex;
-        [SerializeField] private EditorDisplayFullscreenSetting m_mainDisplaySetting;
-
-        private PlayModeStateChange m_state;
-        private EditorDisplayFullscreenSetting m_defaultSetting;
-
-        internal bool isPlaying => m_state == PlayModeStateChange.ExitingEditMode;
-
-        private float m_tLastTimeChecked;
-        private int m_numberOfConnectedDisplays;
-
-        private string[] m_displayNames;
-        private int[] m_displayIds;
-        private int m_mainDisplayId;
-
-        private EnumData m_buildTargetData;
-        private bool m_buildTargetDataInitialized;
-
-        private Dictionary<Type, string> m_AvailableWindowTypes;
-        private Dictionary<int, EditorDisplayFullscreenSetting> m_DisplaySettings;
-        private List<ContainerWindow> m_FullscreenContainerWindows;
-
-        // This is a stub for selecting the fullscreen option via the game view toolbar GUI.
-        // Instead of having configurable profiles, we'll use the main display setting that is
-        // created by default and modify which display we want to see it on via the toolbar GUI
-        // dropdown. In the future we may want to hook it up to the currently active display profile.
-
-        // This is a stub. in the future references to this should be replaced with the currently active profile.
-
-        internal static void SetSettingsForCurrentDisplay(int display)
-        {
-            var c = instance;
-
-            if (c.m_DisplaySettings == null)
-            {
-                c.m_DisplaySettings = new Dictionary<int, EditorDisplayFullscreenSetting>();
-            }
-
-            if (c.m_DisplaySettings.ContainsKey(display))
-            {
-                c.m_mainDisplaySetting = c.m_DisplaySettings[display];
-                return;
-            }
-
-            var newDisplay = new EditorDisplayFullscreenSetting(c.m_DisplaySettings.Count + 1, "Main Display");
-            newDisplay.enabled = true;
-            newDisplay.playModeViewSettings = new GameViewFullscreenSettings();
-            newDisplay.viewWindowTitle = GetWindowTitle(typeof(GameView));
-
-            c.m_DisplaySettings.Add(display, newDisplay);
-            c.m_mainDisplaySetting = c.m_DisplaySettings[display];
-        }
-
-        internal static bool isFullscreenOnPlay
-        {
-            get => instance.m_mainDisplaySetting.mode == EditorDisplayFullscreenSetting.Mode.FullscreenOnPlaymode;
-            set => instance.SetFullscreenMainDisplay(value);
-        }
-
-        // This is a stub. Future references to this should be replaced with the currently active profile.
-        internal static bool isToolbarEnabledOnFullscreen
-        {
-            get
-            {
-                return (instance.m_mainDisplaySetting.playModeViewSettings is GameViewFullscreenSettings settings)
-                    ? settings.ShowToolbar
-                    : false;
-            }
-            set
-            {
-                instance.SetShowToolbarOnMainDisplay(value);
-            }
-        }
-
-        // This is a stub. Future references to this should be replaced with the currently active profile.
-        internal static int fullscreenDisplayId
-        {
-            get => instance.m_mainDisplaySetting.displayId;
-            set => instance.SetFullscreenDisplayId(value);
-        }
-
-        internal static int targetDisplayID
-        {
-            get
-            {
-                return (instance.m_mainDisplaySetting.playModeViewSettings is GameViewFullscreenSettings settings)
-                        ? settings.DisplayNumber
-                        : 0;
-            }
-            set
-            {
-                if (instance.m_mainDisplaySetting.playModeViewSettings is GameViewFullscreenSettings settings)
-                {
-                    settings.DisplayNumber = value;
-                }
-            }
-        }
-
-        internal static bool enableVSync
-        {
-            get
-            {
-                return (instance.m_mainDisplaySetting.playModeViewSettings is GameViewFullscreenSettings settings)
-                    ? settings.VsyncEnabled
-                    : false;
-            }
-            set
-            {
-                if (instance.m_mainDisplaySetting.playModeViewSettings is GameViewFullscreenSettings settings)
-                {
-                    settings.VsyncEnabled = value;
-                }
-            }
-        }
-
-        internal static int selectedSizeIndex
-        {
-            get
-            {
-                return (instance.m_mainDisplaySetting.playModeViewSettings is GameViewFullscreenSettings settings)
-                        ? settings.SelectedSizeIndex
-                        : 0;
-            }
-            set
-            {
-                if (instance.m_mainDisplaySetting.playModeViewSettings is GameViewFullscreenSettings settings)
-                {
-                    settings.SelectedSizeIndex = value;
-                }
-            }
-        }
-
-        // This is a stub. Future references to this should be replaced with the currently active profile.
-        internal static Vector2 fullscreenDisplayRenderSize
-        {
-            get => instance.GetDisplayRenderSizeFromId(fullscreenDisplayId);
-        }
-
-        internal static DisplayAPIControlMode DisplayAPIMode
-        {
-            get
-            {
-                var c = instance;
-                if (c.m_profiles == null || c.m_profiles.Count <= 0)
-                {
-                    c.InitializeProfile();
-                }
-
-                if (c.m_profiles == null || c.m_profiles.Count <= c.m_selectedProfileIndex)
-                    return DisplayAPIControlMode.FromEditor;
-
-                return c.m_profiles[c.m_selectedProfileIndex].DisplayAPIMode;
-            }
-        }
-
-        internal static void OnEnterPlaymode()
-        {
-            var c = instance;
-            c.m_state = PlayModeStateChange.ExitingEditMode;
-            c.RefreshDisplayStateWithCurrentProfile();
-        }
-
-        internal static void OnExitPlaymode()
-        {
-            var c = instance;
-            c.m_state = PlayModeStateChange.ExitingPlayMode;
-            c.RefreshDisplayStateWithCurrentProfile();
-        }
-
-        internal static void SetMainDisplayPlayModeViewType(Type playModeViewType)
-        {
-            SetDisplayPlayModeViewType(instance.m_mainDisplaySetting, playModeViewType);
-        }
-
-        internal static int[] GetConnectedDisplayIds()
-        {
-            return instance.m_displayIds;
-        }
-
-        internal static string[] GetConnectedDisplayNames()
-        {
-            return instance.m_displayNames;
-        }
-
-        internal static string[] GetConnectedDisplayIdsAndNames()
-        {
-            int displayCount = instance.m_displayNames.Length;
-            string[] displayList = new string[displayCount];
-
-            for (int i = 0; i < displayCount; i++)
-            {
-                displayList[i] = i + ": " + instance.m_displayNames[i];
-            }
-            return displayList;
-        }
-
-        private void InitializeProfile()
-        {
-            if (m_profiles != null)
-            {
-                return;
-            }
-
-            m_mainDisplaySetting = new EditorDisplayFullscreenSetting(0, "Main Display");
-            m_mainDisplaySetting.enabled = true;
-            m_mainDisplaySetting.playModeViewSettings = new GameViewFullscreenSettings();
-            m_mainDisplaySetting.viewWindowTitle = GetWindowTitle(typeof(GameView));
-
-            m_profiles = new List<EditorDisplaySettingsProfile>();
-            var defaultProfile = new EditorDisplaySettingsProfile("Default");
-            defaultProfile.AddEditorDisplayFullscreenSetting(m_defaultSetting);
-
-            var displayAPIProfile = new EditorDisplaySettingsProfile("Simulate Standalone")
-            {
-                DisplayAPIMode = DisplayAPIControlMode.FromRuntime
-            };
-
-            for (var i = 0; i < m_displayNames.Length; ++i)
-            {
-                displayAPIProfile.AddEditorDisplayFullscreenSetting(CreateDefaultEditorDisplayFullscreenSetting(i));
-            }
-
-            m_profiles.Add(defaultProfile);
-            m_profiles.Add(displayAPIProfile);
-            m_selectedProfileIndex = 0;
-        }
-
-        private EditorDisplayFullscreenSetting CreateDefaultEditorDisplayFullscreenSetting(int displayNumber)
-        {
-            var setting = new EditorDisplayFullscreenSetting(m_displayIds[displayNumber], m_displayNames[displayNumber]) {enabled = true};
-            var gvSetting = new GameViewFullscreenSettings {DisplayNumber = displayNumber};
-            setting.playModeViewSettings = gvSetting;
-            setting.viewWindowTitle = GetWindowTitle(typeof(GameView));
-
-            return setting;
-        }
-
-        private void OnEnable()
-        {
-            EditorApplication.globalEventHandler += HandleToggleFullscreenKeyShortcut;
-
-            UpdateDisplayNamesAndIds();
-            m_buildTargetDataInitialized = false;
-
-            if (m_profiles == null)
-            {
-                InitializeProfile();
-            }
-
-            m_FullscreenContainerWindows = new List<ContainerWindow>();
-            m_defaultSetting = new EditorDisplayFullscreenSetting(0, string.Empty);
-            m_defaultSetting.enabled = true;
-            m_defaultSetting.playModeViewSettings = new GameViewFullscreenSettings();
-            m_defaultSetting.viewWindowTitle = GetWindowTitle(typeof(GameView));
-
-            EditorDisplayUtility.SetSortDisplayOrder(m_isSortDisplayOrder);
-            RefreshDisplayStateWithCurrentProfile();
-
-            EditorApplication.update += CheckDisplayNumberChanged;
-        }
-
-        private void OnDisable()
-        {
-            EditorApplication.update -= CheckDisplayNumberChanged;
-            EditorApplication.globalEventHandler -= HandleToggleFullscreenKeyShortcut;
-        }
-
-        public void CheckDisplayNumberChanged()
-        {
-            var tNow = Time.realtimeSinceStartup;
-            if (tNow - m_tLastTimeChecked < kDisplayCheckIntervalSec)
-                return;
-
-            var ncDisplays = EditorDisplayUtility.GetNumberOfConnectedDisplays();
-            if (ncDisplays != m_numberOfConnectedDisplays)
-            {
-                UpdateDisplayNamesAndIds();
-                HandleDisplayProfileChange();
-            }
-
-            m_tLastTimeChecked = tNow;
-        }
-
-        private static void SetDisplayPlayModeViewType(EditorDisplayFullscreenSetting setting, Type playModeViewType)
-        {
-            setting.playModeViewSettings = CreatePlayModeViewSettingsForType(playModeViewType);
-            setting.viewWindowTitle = GetWindowTitle(playModeViewType);
-        }
-
-        private void HandleDisplayProfileChange()
-        {
-            // When hardware display configuration changes,
-            // always go back to default profile.
-            SetCurrentProfile(0);
-            RefreshDisplayStateWithCurrentProfile();
-        }
-
-        private void UpdateDisplayNamesAndIds()
-        {
-            m_numberOfConnectedDisplays = EditorDisplayUtility.GetNumberOfConnectedDisplays();
-            m_displayNames = new string[m_numberOfConnectedDisplays];
-            m_displayIds = new int[m_numberOfConnectedDisplays];
-            m_mainDisplayId = EditorDisplayUtility.GetMainDisplayId();
-
-            for (var i = 0; i < m_numberOfConnectedDisplays; ++i)
-            {
-                m_displayIds[i] = EditorDisplayUtility.GetDisplayId(i);
-                m_displayNames[i] = EditorDisplayUtility.GetDisplayName(i);
-            }
-
-            if (m_profiles != null && m_profiles.Count > 1)
-            {
-                var displayAPIProfile = m_profiles[1];
-
-                for (var i = 0; i < m_numberOfConnectedDisplays; ++i)
-                {
-                    if (displayAPIProfile.Settings.Count <= i)
-                    {
-                        displayAPIProfile.AddEditorDisplayFullscreenSetting(CreateDefaultEditorDisplayFullscreenSetting(i));
-                    }
-                    else
-                    {
-                        displayAPIProfile.Settings[i].displayId = m_displayIds[i];
-                    }
-                }
-            }
-        }
-
-        private void GetInstalledBuildTargetData()
-        {
-            if (m_buildTargetDataInitialized)
-                return;
-
-            var buildTargetData = EnumDataUtility.GetCachedEnumData(typeof(BuildTarget));
-            var installedBuildTargetCount =
-                (from BuildTarget target in buildTargetData.values
-                    let @group = BuildPipeline.GetBuildTargetGroup(target)
-                    where BuildPipeline.IsBuildTargetSupported(@group, target) select target).Count();
-
-            m_buildTargetData = new EnumData
-            {
-                values = new Enum[installedBuildTargetCount],
-                displayNames = new string[installedBuildTargetCount],
-                tooltip = new string[installedBuildTargetCount],
-                flagValues = new int[installedBuildTargetCount],
-                flags = buildTargetData.flags,
-                serializable = buildTargetData.serializable,
-                underlyingType = buildTargetData.underlyingType,
-                unsigned = buildTargetData.unsigned
-            };
-
-            for (int i = 0, j = 0; i < buildTargetData.values.Length; ++i)
-            {
-                var target = (BuildTarget) buildTargetData.values[i];
-                var group = BuildPipeline.GetBuildTargetGroup(target);
-                if (BuildPipeline.IsBuildTargetSupported(group, target))
-                {
-                    m_buildTargetData.values[j] = buildTargetData.values[i];
-                    m_buildTargetData.displayNames[j] = buildTargetData.displayNames[i];
-                    m_buildTargetData.tooltip[j] = buildTargetData.tooltip[i];
-                    m_buildTargetData.flagValues[j] = buildTargetData.flagValues[i];
-                    ++j;
-                }
-            }
-
-            m_buildTargetDataInitialized = true;
-        }
-
-        private EditorDisplayFullscreenSetting GetSettingForDisplay(int displayIndex)
-        {
-            if (m_profiles == null)
-            {
-                InitializeProfile();
-            }
-
-            var displayId = EditorDisplayUtility.GetDisplayId(displayIndex);
-            if (DisplayAPIMode == DisplayAPIControlMode.FromEditor &&
-                displayId == EditorDisplayUtility.GetMainDisplayId())
-            {
-                return m_mainDisplaySetting;
-            }
-
-            var s = m_profiles[m_selectedProfileIndex].GetEditorDisplayFullscreenSetting(displayId);
-            if (s == null || !s.enabled)
-            {
-                return m_defaultSetting;
-            }
-
-            return s;
-        }
-
-        private EditorDisplayFullscreenSetting GetSettingForDisplayById(int displayId)
-        {
-            return GetSettingForDisplay(GetDisplayIndexFromId(displayId));
-        }
-
-        private int GetDisplayIndexFromId(int displayId)
-        {
-            var nDisplays = EditorDisplayUtility.GetNumberOfConnectedDisplays();
-            for (var i = 0; i < nDisplays; ++i)
-            {
-                if (displayId == EditorDisplayUtility.GetDisplayId(i))
-                {
-                    return i;
-                }
-            }
-            return 0;
-        }
-
-        private Vector2 GetDisplayRenderSizeFromId(int displayId)
-        {
-            int idx = GetDisplayIndexFromId(displayId);
-            int width = EditorDisplayUtility.GetDisplayWidth(idx);
-            int height = EditorDisplayUtility.GetDisplayHeight(idx);
-            Vector2 size = new Vector2(width, height);
-            return size;
-        }
-
-        private void RefreshDisplayStateWithCurrentProfile()
-        {
-            ApplySettings(m_mainDisplaySetting.displayId, m_mainDisplaySetting);
-        }
-
-        private static ContainerWindow FindContainerWindow(int displayIndex)
-        {
-            var windows = ContainerWindow.windows;
-
-            return windows.FirstOrDefault(w =>
-                w.m_IsFullscreenContainer &&
-                w.m_DisplayIndex == displayIndex);
-        }
-
-        internal static void ClearAllFullscreenWindows()
-        {
-            var windows = ContainerWindow.windows;
-            foreach (var w in windows)
-            {
-                if (w.m_IsFullscreenContainer)
-                {
-                    w.Close();
-                }
-            }
-        }
-
-        internal static void BeginFullscreen(int displayIndex, int targetWidth, int targetHeight)
-        {
-            var containerWindow = FindContainerWindow(displayIndex);
-            if (containerWindow == null)
-            {
-                instance.BeginFullScreen(displayIndex, instance.GetSettingForDisplay(displayIndex), targetWidth, targetHeight);
-            }
-        }
-
-        [RequiredByNativeCode]
-        internal static void EndFullscreen(int displayIndex, bool closeWindow)
-        {
-            ContainerWindow containerWindow = null;
-            if (closeWindow)
-            {
-                containerWindow = FindContainerWindow(displayIndex);
-            }
-            instance.EndFullScreen(displayIndex, containerWindow);
-
-            if (displayIndex == 0)
-            {
-                instance.SetFullscreenMainDisplay(false, false);
-            }
-        }
-
-        private void ApplySettings(int displayIndex, EditorDisplayFullscreenSetting setting)
-        {
-            var containerWindow = FindContainerWindow(displayIndex);
-
-            if (containerWindow == null &&
-                (setting.mode == EditorDisplayFullscreenSetting.Mode.AlwaysFullscreen ||
-                (setting.mode == EditorDisplayFullscreenSetting.Mode.FullscreenOnPlaymode && instance.isPlaying)))
-            {
-                BeginFullScreen(displayIndex, setting);
-                return;
-            }
-
-            if (setting.mode == EditorDisplayFullscreenSetting.Mode.DoNothing ||
-                (setting.mode == EditorDisplayFullscreenSetting.Mode.FullscreenOnPlaymode && !instance.isPlaying))
-            {
-                EndFullScreen(displayIndex, containerWindow);
-                return;
-            }
-
-            if (containerWindow != null)
-            {
-                var hostView = (HostView)containerWindow.rootView;
-                var playModeView = (PlayModeView)hostView.actualView;
-
-                if (playModeView != null)
-                {
-                    playModeView.ApplyEditorDisplayFullscreenSetting(setting.playModeViewSettings);
-                }
-            }
-        }
-
-        private void BeginFullScreen(int displayIndex, EditorDisplayFullscreenSetting setting, int targetWidth = 0, int targetHeight = 0)
-        {
-            var viewType = typeof(GameView);
-            if (setting.playModeViewSettings == null)
-            {
-                SetDisplayPlayModeViewType(setting, typeof(GameView));
-            }
-
-            var attributes = setting.playModeViewSettings.GetType().GetCustomAttributes(typeof(FullscreenSettingsForAttribute), false);
-            if (attributes.Length > 0)
-            {
-                var proposedType = ((FullscreenSettingsForAttribute) attributes[0]).AssignedType;
-                if (typeof(PlayModeView).IsAssignableFrom(proposedType))
-                {
-                    viewType = proposedType;
-                }
-                else
-                {
-                    Debug.LogError($"Type assigned for FullscreenSettingsFor is not a subclass of PlayModeView. PlayModeViewSettings={setting.playModeViewSettings.GetType()}, AssignedType{proposedType}");
-                }
-            }
-
-            var playModeView = ScriptableObject.CreateInstance(viewType) as PlayModeView;
-
-            // Now create a new hostView and container window (popup style -> no borders) and maximize it
-            var hostView = ScriptableObject.CreateInstance<HostView>();
-            hostView.name = $"HostView {setting.displayName}";
-            hostView.actualView = playModeView;
-            playModeView.m_Parent = hostView;
-            playModeView.isFullscreen = true;
-
-            var containerWindow = ScriptableObject.CreateInstance<ContainerWindow>();
-            containerWindow.name = $"Unity Fullscreen Window {setting.displayName}";
-            containerWindow.m_DontSaveToLayout = true;
-            containerWindow.m_IsFullscreenContainer = true;
-            containerWindow.m_DisplayIndex = displayIndex;
-
-            // this ensures the fullscreen game view is shown on the same screen has the normal GameView is currently on
-            containerWindow.rootView = hostView;
-
-            playModeView.wantsMouseMove = true;
-            playModeView.MakeParentsSettingsMatchMe();
-
-            playModeView.ApplyEditorDisplayFullscreenSetting(setting.playModeViewSettings);
-            if (targetWidth != 0 && targetHeight != 0)
-            {
-                playModeView.targetSize = new Vector2(targetWidth, targetHeight);
-            }
-            containerWindow.Show(ShowMode.Fullscreen, false, true, true, displayIndex);
-            containerWindow.ToggleFullscreen(displayIndex);
-            hostView.Focus();
-
-            playModeView.m_Parent.SetAsStartView();
-            playModeView.m_Parent.SetAsLastPlayModeView();
-            SuppressViewsFromRendering(containerWindow.GetDisplayId(), true);
-
-            if (instance.m_showNotificationOnFullscreen && setting == instance.m_mainDisplaySetting)
-            {
-                ShowFullscreenNotification(playModeView);
-            }
-            if (instance.m_showToolbarOnFullscreen && setting == instance.m_mainDisplaySetting)
-            {
-                SetShowToolbarOnMainDisplay(true);
-            }
-            m_FullscreenContainerWindows.Add(containerWindow);
-        }
-
-        private void EndFullScreen(int displayIndex, ContainerWindow w)
-        {
-            SuppressViewsFromRendering(EditorDisplayUtility.GetDisplayId(displayIndex), false);
-
-            if (w != null)
-            {
-                w.Close();
-                m_FullscreenContainerWindows.Remove(w);
-            }
-
-            // Refocus main window after ending fullscreen.
-            var mainWindow = WindowLayout.FindMainWindow();
-            if (mainWindow != null && mainWindow.rootView != null) {
-                var hostView = mainWindow.rootView as HostView;
-                if (hostView != null)
-                    hostView.Focus();
-            }
-        }
-
-        internal static List<ContainerWindow> GetFullscreenContainersForDisplayIndex(int displayIndex)
-        {
-            List<ContainerWindow> containers = new List<ContainerWindow>();
-            foreach (var cw in instance.m_FullscreenContainerWindows)
-            {
-                if (cw.m_DisplayIndex == displayIndex)
-                {
-                    containers.Add(cw);
-                }
-            }
-
-            return containers;
-        }
-
-        private bool IsGoingFullscreenOnPlaymode(int displayId)
-        {
-            var setting = GetSettingForDisplayById(displayId);
-            return setting.mode != EditorDisplayFullscreenSetting.Mode.DoNothing;
-        }
-
-        private static void ShowFullscreenNotification(PlayModeView playView)
-        {
-            var binding = ShortcutManager.instance.GetShortcutBinding(kFullscreenToggle);
-
-            playView.ShowNotification(EditorGUIUtility.TextContentWithIcon(string.Format(Styles.disableFullscreenMainDisplayFormatContent.text, binding), "FullscreenNotification"));
-            playView.Repaint();
-        }
-
-        private void SuppressViewsFromRendering(int displayId, bool suppress)
-        {
-            var playModeViews = Resources.FindObjectsOfTypeAll(typeof(PlayModeView));
-            foreach (PlayModeView playModeView in playModeViews)
-            {
-                if (playModeView.m_Parent == null ||
-                    playModeView.m_Parent.window == null ||
-                    playModeView.m_Parent.window.m_IsFullscreenContainer)
-                {
-                    // The fullscreen window should never suppress rendering.
-                    playModeView.suppressRenderingForFullscreen = false;
-                    playModeView.SetPlayModeView(true);
-                    continue;
-                }
-
-                var windowDisplayId = playModeView.m_Parent.window.GetDisplayId();
-                if (windowDisplayId == displayId)
-                {
-                    // This play mode view is rendering on the same display we're going to fullscreen on. Always suppress.
-                    playModeView.suppressRenderingForFullscreen = suppress;
-                    playModeView.SetPlayModeView(!suppress);
-                    continue;
-                }
-
-                if (playModeView.enterPlayModeBehavior == PlayModeView.EnterPlayModeBehavior.PlayFullscreen)
-                {
-                    // This play mode view is going to spawn another fullscreen view. We should suppress rendering
-                    // from this game view so as to not duplicate/double our number of rendered views.
-                    playModeView.suppressRenderingForFullscreen = suppress;
-                    playModeView.SetPlayModeView(!suppress);
-                    continue;
-                }
-            }
-        }
-
-        private static void Save()
-        {
-            instance.Save(true);
-        }
-
-        private const string kBaseMenuPath = "Window/Displays";
-        private const string kFullscreenOnPlayMenu = kBaseMenuPath + "/Toggle Fullscreen";
-        private const string kShowToolbarOnFullscreenMenu = kBaseMenuPath + "/Show Toolbar on Fullscreen";
-        private const string kProfilePath = kBaseMenuPath + "/Profiles/";
-        public const string kFullscreenToggle = "Window/Fullscreen Game View";
-        private static float sLastToggleShortcutTriggerTime = 0f;
-        private static float kToggleShortcutTriggerTimeoutInSeconds = 1f;
-
-        void ToggleFullscreen()
-        {
-            var playModeViews = Resources.FindObjectsOfTypeAll(typeof(PlayModeView));
-            foreach (PlayModeView playModeView in playModeViews)
-            {
-                if (playModeView.m_Parent == null || playModeView.m_Parent.window == null)
-                    continue;
-
-                if (playModeView.enterPlayModeBehavior != PlayModeView.EnterPlayModeBehavior.PlayFullscreen)
-                    continue; // Do nothing with non-fullscreen game views.
-
-                int displayIdx = playModeView.fullscreenMonitorIdx;
-                if (m_DisplaySettings.ContainsKey(displayIdx))
-                {
-                    var displaySetting = m_DisplaySettings[displayIdx];
-
-                    if (displaySetting.mode == EditorDisplayFullscreenSetting.Mode.AlwaysFullscreen ||
-                        displaySetting.mode == EditorDisplayFullscreenSetting.Mode.FullscreenOnPlaymode)
-                    {
-                        displaySetting.mode = EditorDisplayFullscreenSetting.Mode.DoNothing;
-                    }
-                    else
-                    {
-                        displaySetting.mode = EditorDisplayFullscreenSetting.Mode.AlwaysFullscreen;
-                    }
-                    instance.ApplySettings(displayIdx, displaySetting);
-                }
-            }
-        }
-
-        void HandleToggleFullscreenKeyShortcut()
-        {
-            if (!Application.isPlaying || m_DisplaySettings == null)
-                return;
-
-            var evt = Event.current;
-            var binding = ShortcutManager.instance.GetShortcutBinding("Window/Fullscreen Game View");
-            var keys = binding.keyCombinationSequence;
-
-            if (evt.type != EventType.KeyUp)
-                return;
-
-            if (keys.Where(x => x.keyCode == evt.keyCode).Count() <= 0)
-                return;
-
-            // Detect if the right key combinaison is active or not.
-            var shiftNecessary = keys.Where(x => (x.modifiers & ShortcutModifiers.Shift) == ShortcutModifiers.Shift).Count() > 0;
-            var containShift = (evt.modifiers & EventModifiers.Shift) == EventModifiers.Shift;
-
-            if (shiftNecessary && !containShift)
-                return;
-
-            var altNecessary = keys.Where(x => (x.modifiers & ShortcutModifiers.Alt) == ShortcutModifiers.Alt).Count() > 0;
-            var containAlt = (evt.modifiers & EventModifiers.Alt) == EventModifiers.Alt;
-
-            if (altNecessary && !containAlt)
-                return;
-
-            var ctrlNecessary = keys.Where(x => (x.modifiers & ShortcutModifiers.Control) == ShortcutModifiers.Control).Count() > 0;
-            var containCtrl = (evt.modifiers & EventModifiers.Control) == EventModifiers.Control;
-
-            if (ctrlNecessary && !containCtrl)
-                return;
-
-            // OSX will animate windows moving to fullscreen and toggling fullscreen again during this animation will
-            // cause a slew of bugs. Rather than lock this shortcut until the op is completed, instead provide a reasonable
-            // timeout for triggering this shortcut again.
-            if (sLastToggleShortcutTriggerTime + kToggleShortcutTriggerTimeoutInSeconds < Time.realtimeSinceStartup)
-            {
-                sLastToggleShortcutTriggerTime = Time.realtimeSinceStartup;
-                ToggleFullscreen();
-                evt.Use();
-            }
-        }
-
-        [ClutchShortcutAttribute(kFullscreenToggle, KeyCode.F7, ShortcutModifiers.Shift | ShortcutModifiers.Control)]
-        internal static void FullscreenKeyHandler(ShortcutArguments args)
-        {
-            // The CTRL + SHIFT + F7 event doesn't work when a Game View is focused.
-            // It's a current limitation by the Shortcut Manager. Instead the kFullscreenToggle
-            // shortcut is handled by HandleToggleFullscreenKeyShortcut function which is a global
-            // event handler.
-        }
-
-        static EditorFullscreenController()
-        {
-            EditorApplication.update -= DelayReloadWindowDisplayMenu;
-            EditorApplication.update += DelayReloadWindowDisplayMenu;
-        }
-
-        private static void DelayReloadWindowDisplayMenu()
-        {
-            EditorApplication.update -= DelayReloadWindowDisplayMenu;
-            instance.ReloadWindowDisplayMenu();
-            EditorUtility.Internal_UpdateAllMenus();
-        }
-
-        internal void ReloadWindowDisplayMenu()
-        {
-            Menu.RemoveMenuItem(kBaseMenuPath);
-
-            var displayMenuItemPriority = 200;
-
-            Menu.AddMenuItem(kFullscreenOnPlayMenu, "", isFullscreenOnPlay, displayMenuItemPriority++, ToggleFullscreenMainDisplay, null);
-            Menu.AddMenuItem(kShowToolbarOnFullscreenMenu, "", isToolbarEnabledOnFullscreen, displayMenuItemPriority++, ToggleShowToolbarOnMainDisplay, null);
-
-            Menu.AddSeparator(kBaseMenuPath, displayMenuItemPriority++);
-
-            displayMenuItemPriority += 500;
-
-            for (var i = 0; i < m_profiles.Count; ++i)
-            {
-                var index = i;
-                var profile = m_profiles[i];
-
-                if (i == 0 || profile.Target == EditorUserBuildSettings.activeBuildTarget)
-                {
-                    Menu.AddMenuItem(kProfilePath + profile.Name, "", m_selectedProfileIndex == i, displayMenuItemPriority++,
-                        () => { SetCurrentProfile(index); }, () => !EditorApplication.isPlaying);
-                }
-            }
-        }
-
-        private static void SetCurrentProfile(int index)
-        {
-            if (instance.m_profiles.Count <= index)
-            {
-                return;
-            }
-
-            if (instance.m_selectedProfileIndex != index)
-            {
-                var previousMenuPath = kProfilePath + instance.m_profiles[instance.m_selectedProfileIndex].Name;
-                var currentMenuPath = kProfilePath + instance.m_profiles[index].Name;
-                Menu.SetChecked(previousMenuPath, false);
-                Menu.SetChecked(currentMenuPath, true);
-
-                instance.m_selectedProfileIndex = index;
-            }
-
-            instance.RefreshDisplayStateWithCurrentProfile();
-        }
-
-        private void ToggleFullscreenMainDisplay()
-        {
-            SetFullscreenMainDisplay(!isFullscreenOnPlay);
-        }
-
-        private void SetFullscreenMainDisplay(bool enabled, bool refresh = true)
-        {
-            if (isFullscreenOnPlay == enabled)
-                return;
-
-            m_mainDisplaySetting.mode = enabled
-                ? EditorDisplayFullscreenSetting.Mode.FullscreenOnPlaymode
-                : EditorDisplayFullscreenSetting.Mode.DoNothing;
-
-            Menu.SetChecked(kFullscreenOnPlayMenu, enabled);
-            if (refresh)
-            {
-                //RefreshDisplayStateWithCurrentProfile();
-            }
-            Save();
-        }
-
-        private void SetFullscreenDisplayId(int displayId)
-        {
-            m_mainDisplaySetting.displayId = displayId;
-        }
-
-        private void ToggleShowToolbarOnMainDisplay()
-        {
-            SetShowToolbarOnMainDisplay(!isToolbarEnabledOnFullscreen);
-        }
-
-        private void SetShowToolbarOnMainDisplay(bool enabled)
-        {
-            if (!(m_mainDisplaySetting.playModeViewSettings is GameViewFullscreenSettings gameViewSetting) ||
-                gameViewSetting.ShowToolbar == enabled)
-            {
-                return;
-            }
-
-            gameViewSetting.ShowToolbar = enabled;
-            Menu.SetChecked(kShowToolbarOnFullscreenMenu, enabled);
-            RefreshDisplayStateWithCurrentProfile();
-            Save();
-        }
-
-        private static string GetWindowTitle(Type type)
-        {
-            var attributes = type.GetCustomAttributes(typeof(EditorWindowTitleAttribute), true);
-            return attributes.Length > 0 ? ((EditorWindowTitleAttribute)attributes[0]).title : type.Name;
-        }
-
-        private Dictionary<Type, string> GetAvailableWindowTypes()
-        {
-            return m_AvailableWindowTypes ?? (m_AvailableWindowTypes = TypeCache.GetTypesDerivedFrom(typeof(PlayModeView)).OrderBy(GetWindowTitle).ToDictionary(t => t, GetWindowTitle));
-        }
-
-        private class Styles
-        {
-            public static readonly GUIContent sortDisplayOrderContent = EditorGUIUtility.TrTextContent("Sort Display Order (*Windows Only)");
-            public static readonly GUIContent showNotificationContent = EditorGUIUtility.TrTextContent("Show notification when entering fullscreen");
-            public static readonly GUIContent showToolbarOnFullscreenContent = EditorGUIUtility.TrTextContent("Show game view toolbar on fullscreen");
-
-            public static readonly GUIContent[] modePopupDisplayTexts =
-            {
-                EditorGUIUtility.TrTextContent("Do nothing"),
-                EditorGUIUtility.TrTextContent("Fullscreen on Playmode"),
-                EditorGUIUtility.TrTextContent("Always Fullscreen"),
-            };
-            public static readonly GUIContent addProfileContent = EditorGUIUtility.TrTextContent("Add Profile");
-            public static readonly GUIContent nameContent = EditorGUIUtility.TrTextContent("Name");
-            public static readonly GUIContent platformContent = EditorGUIUtility.TrTextContent("Platform");
-            public static readonly GUIContent disconnectedDisplaysContent = EditorGUIUtility.TrTextContent("Disconnected Displays");
-
-
-            public static readonly GUIContent mainDisplaySettingHelpTextContent = EditorGUIUtility.TrTextContent("Settings for main display is done from GameView.");
-            public static readonly GUIContent viewTypeContent = EditorGUIUtility.TrTextContent("View Type");
-            public static readonly GUIContent vsyncContent = EditorGUIUtility.TrTextContent("VSync");
-            public static readonly GUIContent gizmosContent = EditorGUIUtility.TrTextContent("Gizmos");
-            public static readonly GUIContent toolbarContent = EditorGUIUtility.TrTextContent("Toolbar");
-            public static readonly GUIContent statsContent = EditorGUIUtility.TrTextContent("Stats");
-            public static readonly GUIContent displaySettingsLabelContent = EditorGUIUtility.TrTextContent("Display Settings");
-
-            public static readonly GUIContent mainDisplayFormatContent = EditorGUIUtility.TrTextContent("{0} (Main Display)");
-            public static readonly GUIContent disconnectedDisplayFormatContent = EditorGUIUtility.TrTextContent("{0} (Disconnected)");
-            public static readonly GUIContent disableFullscreenMainDisplayFormatContent = EditorGUIUtility.TrTextContent("Press {0} to exit fullscreen.");
-
-            public static readonly GUIContent displayAPIMappingContent = EditorGUIUtility.TrTextContent("Standalone simulation monitor mapping");
-        }
-
-        private static void DrawPreferenceGUI(string searchContext)
-        {
-            if (instance.m_profiles == null)
-            {
-                instance.InitializeProfile();
-            }
-            GUILayout.Space(12);
-
-            EditorGUI.BeginChangeCheck();
-            instance.m_isSortDisplayOrder = EditorGUILayout.ToggleLeft(Styles.sortDisplayOrderContent, instance.m_isSortDisplayOrder);
-            if (EditorGUI.EndChangeCheck())
-            {
-                EditorDisplayUtility.SetSortDisplayOrder(instance.m_isSortDisplayOrder);
-                Save();
-            }
-
-            EditorGUI.BeginChangeCheck();
-            instance.m_showNotificationOnFullscreen = EditorGUILayout.ToggleLeft(Styles.showNotificationContent, instance.m_showNotificationOnFullscreen);
-            instance.m_showToolbarOnFullscreen = EditorGUILayout.ToggleLeft(Styles.showToolbarOnFullscreenContent, instance.m_showToolbarOnFullscreen);
-            if (EditorGUI.EndChangeCheck())
-            {
-                Save();
-            }
-
-            GUILayout.Space(12);
-
-
-            DrawDisplayAPIProfile();
-            //DrawProfilePreferencesGUI(); //TODO Enables GUI for display profiles.
-        }
-
-        private static void DrawProfilePreferencesGUI()
-        {
-            EditorDisplaySettingsProfile removingProfile = null;
-            EditorGUI.BeginChangeCheck();
-
-            // m_profiles[0] is always Default Profile.
-            // m_profiles[1] is always DisplayAPI Profile.
-            for(var i = 2; i < instance.m_profiles.Count; ++i)
-            {
-                if (!DrawPreferenceProfileGUI(instance.m_profiles[i]))
-                {
-                    removingProfile = instance.m_profiles[i];
-                    break;
-                }
-                GUILayout.Space(12);
-            }
-
-            if (removingProfile != null)
-            {
-                instance.m_profiles.Remove(removingProfile);
-            }
-
-            GUILayout.Space(12);
-
-            if (GUILayout.Button(Styles.addProfileContent, GUILayout.Width(150)))
-            {
-                var newProfile = new EditorDisplaySettingsProfile(instance.GetAppropriateNewProfileName());
-                instance.m_profiles.Add(newProfile);
-            }
-
-            GUILayout.Space(12);
-
-            if (EditorGUI.EndChangeCheck())
-            {
-                Save();
-            }
-        }
-
-        private string GetAppropriateNewProfileName()
-        {
-            const string kDefaultNewProfileName = "New Profile";
-            if (m_profiles.Find(p => p.Name == kDefaultNewProfileName) == null)
-            {
-                return kDefaultNewProfileName;
-            }
-
-            for (var i = 1;; ++i)
-            {
-                var name = $"New Profile ({i})";
-                if (m_profiles.Find(p => p.Name == name) == null)
-                {
-                    return name;
-                }
-            }
-        }
-
-        private static void DrawDisplayAPIProfile()
-        {
-            if (!ModuleManager.ShouldShowMultiDisplayOption())
-            {
-                return;
-            }
-
-            using (new GUILayout.VerticalScope(EditorStyles.frameBox))
-            {
-                GUILayout.Label(Styles.displayAPIMappingContent, EditorStyles.boldLabel);
-                GUILayout.Space(12);
-
-                var displayNames = GetDisplayNamesForBuildTarget(EditorUserBuildSettings.activeBuildTarget);
-
-                for (var i = 0; i < instance.m_numberOfConnectedDisplays; ++i)
-                {
-                    EditorGUILayout.LabelField(displayNames[i], GUIContent.Temp(instance.m_displayNames[i]));
-                }
-            }
-            GUILayout.Space(12);
-        }
-
-        private static bool DrawPreferenceProfileGUI(EditorDisplaySettingsProfile profile)
-        {
-            using (new GUILayout.VerticalScope(EditorStyles.frameBox))
-            {
-                using (new GUILayout.HorizontalScope())
-                {
-                    GUILayout.Label(profile.Name, EditorStyles.boldLabel);
-                    if (GUILayout.Button("-", GUILayout.Width(20)))
-                    {
-                        return false;
-                    }
-                }
-
-                GUILayout.Space(8);
-
-                var newName = EditorGUILayout.TextField(Styles.nameContent, profile.Name, GUILayout.Width(400));
-                if (newName != profile.Name)
-                {
-                    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)
-                {
-                    profile.Target = (BuildTarget) instance.m_buildTargetData.values[newSelectedIndex];
-                }
-
-                // if selecting unsupported build target, then do not let settings to edit
-                if (selectedIndex < 0)
-                {
-                    return true;
-                }
-
-                GUILayout.Space(8);
-
-                for (var i = 0; i < instance.m_displayIds.Length; ++i)
-                {
-                    var id = instance.m_displayIds[i];
-                    var isMainScreen = id == instance.m_mainDisplayId;
-
-                    var setting = profile.GetEditorDisplayFullscreenSetting(id);
-                    if (setting == null)
-                    {
-                        setting = new EditorDisplayFullscreenSetting(id, instance.m_displayNames[i]);
-                        profile.AddEditorDisplayFullscreenSetting(setting);
-                    }
-
-                    DrawPlayModeViewSettingsGUI(profile.Target, setting, isMainScreen, false);
-                    GUILayout.Space(8);
-                }
-
-                bool drawDisconnectedSettingsHeader = false;
-                // For Display Settings which is currently disconnected
-                EditorDisplayFullscreenSetting removingSetting = null;
-
-                foreach (var setting in profile.Settings)
-                {
-                    if (instance.m_displayIds.Contains(setting.displayId))
-                    {
-                        continue;
-                    }
-
-                    if (!drawDisconnectedSettingsHeader)
-                    {
-                        GUILayout.Space(12);
-                        GUILayout.Label(Styles.disconnectedDisplaysContent);
-                        drawDisconnectedSettingsHeader = true;
-                    }
-
-                    if (!DrawPlayModeViewSettingsGUI(profile.Target, setting, false, true))
-                    {
-                        removingSetting = setting;
-                    }
-                    GUILayout.Space(8);
-                }
-
-                if (removingSetting != null)
-                {
-                    profile.RemoveEditorDisplayFullscreenSetting(removingSetting);
-                }
-
-                GUILayout.Space(12);
-            }
-
-            return true;
-        }
-
-        private static bool DrawPlayModeViewSettingsGUI(BuildTarget target, EditorDisplayFullscreenSetting setting, bool isMainScreen, bool isDisconnected)
-        {
-            if (isMainScreen)
-            {
-                GUILayout.Label(string.Format(Styles.mainDisplayFormatContent.text, setting.displayName));
-                EditorGUILayout.HelpBox(Styles.mainDisplaySettingHelpTextContent);
-                return true;
-            }
-
-            var label = isDisconnected ? string.Format(Styles.disconnectedDisplayFormatContent.text, setting.displayName) :  setting.displayName;
-
-            using (new GUILayout.HorizontalScope())
-            {
-                setting.enabled = EditorGUILayout.ToggleLeft(label, setting.enabled);
-                if (isDisconnected)
-                {
-                    if (GUILayout.Button("-", GUILayout.Width(20)))
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            if (!setting.enabled)
-            {
-                return true;
-            }
-
-            using (new GUILayout.VerticalScope(EditorStyles.frameBox))
-            {
-                var availableTypes = instance.GetAvailableWindowTypes();
-                if (availableTypes.Count > 1)
-                {
-                    var viewTitleNames = availableTypes.Values.ToList();
-                    var viewIndex = viewTitleNames.IndexOf(setting.viewWindowTitle);
-                    var newViewIndex = EditorGUILayout.Popup(
-                        Styles.viewTypeContent, viewTitleNames.IndexOf(setting.viewWindowTitle),
-                        viewTitleNames.ToArray(), GUILayout.Width(400));
-                    if (newViewIndex != viewIndex)
-                    {
-                        setting.viewWindowTitle = viewTitleNames[newViewIndex];
-                        setting.playModeViewSettings =
-                            CreatePlayModeViewSettingsForType(availableTypes.Keys.ToList()[newViewIndex]);
-                    }
-                }
-                else {
-                    if (string.IsNullOrEmpty(setting.viewWindowTitle))
-                    {
-                        var typeNames = availableTypes.Values.ToList();
-                        setting.viewWindowTitle = typeNames[0];
-                        setting.playModeViewSettings =
-                            CreatePlayModeViewSettingsForType(availableTypes.Keys.ToList()[0]);
-                    }
-                    EditorGUILayout.LabelField(Styles.viewTypeContent, new GUIContent(setting.viewWindowTitle), GUILayout.Width(300));
-                }
-                EditorGUILayout.Space();
-
-                setting.mode = (EditorDisplayFullscreenSetting.Mode)EditorGUILayout.Popup((int)setting.mode, Styles.modePopupDisplayTexts, GUILayout.Width(200));
-                if (setting.playModeViewSettings != null)
-                {
-                    GUILayout.Space(4);
-                    setting.playModeViewSettings.OnPreferenceGUI(target);
-                }
-            }
-
-            return true;
-        }
-
-        private static IPlayModeViewFullscreenSettings CreatePlayModeViewSettingsForType(Type playModeViewType)
-        {
-            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) {
-                var settingsTypes = assembly.GetTypes()
-                    .Where(t => !t.IsInterface)
-                    .Where(t => typeof(IPlayModeViewFullscreenSettings).IsAssignableFrom(t));
-
-                foreach (var settingsType in settingsTypes)
-                {
-                    var attributes = settingsType.GetCustomAttributes(typeof(FullscreenSettingsForAttribute), false);
-                    if (attributes.Length > 0 && ((FullscreenSettingsForAttribute)attributes[0]).AssignedType == playModeViewType)
-                    {
-                        return (IPlayModeViewFullscreenSettings) settingsType.Assembly.CreateInstance(settingsType.FullName);
-                    }
-                }
-            }
-            return null;
-        }
-
-        internal static GUIContent[] GetDisplayNamesForBuildTarget(BuildTarget buildTarget)
-        {
-            var platformDisplayNames = Modules.ModuleManager.GetDisplayNames(buildTarget.ToString());
-            return platformDisplayNames ?? DisplayUtility.GetGenericDisplayNames();
-        }
-
-
-        [SettingsProvider]
-        internal static SettingsProvider CreateEditorDisplaySettingUserPreference()
-        {
-            var provider = new SettingsProvider("Preferences/Display Settings", SettingsScope.User)
-            {
-                label = Styles.displaySettingsLabelContent.text,
-                guiHandler = DrawPreferenceGUI,
-                activateHandler = (s, element) =>
-                {
-                    instance.UpdateDisplayNamesAndIds();
-                },
-                deactivateHandler = () =>
-                {
-                    instance.RefreshDisplayStateWithCurrentProfile();
-                    instance.ReloadWindowDisplayMenu();
-                },
-                keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties<Styles>()
-            };
-            return provider;
-        }
-    }
-} // namespace
diff --git a/Editor/Mono/Display/FullscreenSettingsForAttribute.cs b/Editor/Mono/Display/FullscreenSettingsForAttribute.cs
deleted file mode 100644
index 0672466a95..0000000000
--- a/Editor/Mono/Display/FullscreenSettingsForAttribute.cs
+++ /dev/null
@@ -1,21 +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 UnityEngine.Bindings;
-
-namespace UnityEditor
-{
-    [AttributeUsage(AttributeTargets.Class, Inherited = false)]
-    [VisibleToOtherModules]
-    internal class FullscreenSettingsForAttribute : Attribute
-    {
-        public FullscreenSettingsForAttribute(Type assignedType)
-        {
-            AssignedType = assignedType;
-        }
-
-        public Type AssignedType { get; set; }
-    }
-}
diff --git a/Editor/Mono/Display/GameViewFullscreenSettings.cs b/Editor/Mono/Display/GameViewFullscreenSettings.cs
deleted file mode 100644
index 5998df7044..0000000000
--- a/Editor/Mono/Display/GameViewFullscreenSettings.cs
+++ /dev/null
@@ -1,81 +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 UnityEngine;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEditor.ShortcutManagement;
-
-namespace UnityEditor
-{
-    [Serializable]
-    [FullscreenSettingsFor(typeof(GameView))]
-    internal class GameViewFullscreenSettings : IPlayModeViewFullscreenSettings
-    {
-        [SerializeField] private int m_displayNumber;
-        [SerializeField] private bool m_showToolbar;
-        [SerializeField] private bool m_vsyncEnabled;
-        [SerializeField] private bool m_showStats;
-        [SerializeField] private bool m_showGizmos;
-        [SerializeField] private int m_selectedSizeIndex;
-
-        public int DisplayNumber
-        {
-            get => m_displayNumber;
-            set => m_displayNumber = value;
-        }
-
-        public bool ShowToolbar
-        {
-            get => m_showToolbar;
-            set => m_showToolbar = value;
-        }
-
-        public bool VsyncEnabled
-        {
-            get => m_vsyncEnabled;
-            set => m_vsyncEnabled = value;
-        }
-
-        public bool ShowStats
-        {
-            get => m_showStats;
-            set => m_showStats = value;
-        }
-
-        public bool ShowGizmos
-        {
-            get => m_showGizmos;
-            set => m_showGizmos = value;
-        }
-
-        public int SelectedSizeIndex
-        {
-            get => m_selectedSizeIndex;
-            set => m_selectedSizeIndex = value;
-        }
-
-        private class Styles
-        {
-            public static readonly GUIContent vsyncContent = EditorGUIUtility.TrTextContent("VSync");
-            public static readonly GUIContent gizmosContent = EditorGUIUtility.TrTextContent("Gizmos");
-            public static readonly GUIContent toolbarContent = EditorGUIUtility.TrTextContent("Toolbar");
-            public static readonly GUIContent statsContent = EditorGUIUtility.TrTextContent("Stats");
-        }
-
-        public void OnPreferenceGUI(BuildTarget target)
-        {
-            using (new GUILayout.HorizontalScope())
-            {
-                m_displayNumber = EditorGUILayout.Popup(m_displayNumber, EditorFullscreenController.GetDisplayNamesForBuildTarget(target), GUILayout.Width(80));
-                GUILayout.Space(12);
-                m_vsyncEnabled = EditorGUILayout.ToggleLeft(Styles.vsyncContent, m_vsyncEnabled, GUILayout.Width(60));
-                m_showToolbar = EditorGUILayout.ToggleLeft(Styles.toolbarContent, m_showToolbar, GUILayout.Width(70));
-                m_showGizmos = EditorGUILayout.ToggleLeft(Styles.gizmosContent, m_showGizmos, GUILayout.Width(60));
-                m_showStats = EditorGUILayout.ToggleLeft(Styles.statsContent, m_showStats, GUILayout.Width(60));
-            }
-        }
-    }
-} // namespace
diff --git a/Editor/Mono/Display/IPlayModeViewFullscreenSettings.cs b/Editor/Mono/Display/IPlayModeViewFullscreenSettings.cs
deleted file mode 100644
index bd7c04cd5b..0000000000
--- a/Editor/Mono/Display/IPlayModeViewFullscreenSettings.cs
+++ /dev/null
@@ -1,21 +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 UnityEngine;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEditor.ShortcutManagement;
-
-namespace UnityEditor
-{
-    internal interface IPlayModeViewFullscreenSettings
-    {
-        int DisplayNumber { get; }
-
-        bool VsyncEnabled { get; }
-
-        void OnPreferenceGUI(BuildTarget target);
-    }
-} // namespace
diff --git a/Editor/Mono/EditorApplication.cs b/Editor/Mono/EditorApplication.cs
index a7592073b0..d58fb26130 100644
--- a/Editor/Mono/EditorApplication.cs
+++ b/Editor/Mono/EditorApplication.cs
@@ -244,6 +244,8 @@ public static event Action projectChanged
 
         internal static CallbackFunction assetBundleNameChanged;
 
+        internal static CallbackFunction fileMenuSaved;
+
         // Delegate for changed keyboard modifier keys.
         public static CallbackFunction modifierKeysChanged;
 
@@ -270,7 +272,8 @@ public static event Action<PlayModeStateChange> playModeStateChanged
         // Returns true when the pressed keys are defined in the Trigger
         internal static Func<bool> doPressedKeysTriggerAnyShortcut;
 
-        internal static event Action<bool> focusChanged;
+        public static event Action<bool> focusChanged;
+        public static bool isFocused { get; private set; }
 
         // Windows were reordered
         internal static CallbackFunction windowsReordered;
@@ -342,7 +345,7 @@ internal static ApplicationTitleDescriptor GetApplicationTitleDescriptor()
 
             var desc = new ApplicationTitleDescriptor(
                 isTemporaryProject ? PlayerSettings.productName : Path.GetFileName(Path.GetDirectoryName(Application.dataPath)),
-                InternalEditorUtility.GetUnityDisplayVersion(),
+                (Unsupported.IsSourceBuild() || Unsupported.IsDeveloperMode()) ? InternalEditorUtility.GetUnityDisplayVersion() : Application.unityVersion,
                 activeSceneName,
                 BuildPipeline.GetBuildTargetGroupDisplayName(BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget)),
                 Coverage.enabled
@@ -389,6 +392,15 @@ internal static void RequestRepaintAllViews()
                 view.Repaint();
         }
 
+        internal static void RequestRepaintAllTexts()
+        {
+            foreach (GUIView view in Resources.FindObjectsOfTypeAll(typeof(GUIView)))
+            {
+                view.Repaint();
+                view.RepaintUITKText();
+            }
+        }
+
         static void Internal_CallHierarchyHasChanged()
         {
             #pragma warning disable 618
@@ -445,6 +457,12 @@ static void Internal_PlayModeStateChanged(PlayModeStateChange state)
                 evt(state);
         }
 
+        [RequiredByNativeCode]
+        internal static void Internal_FileMenuSaved()
+        {
+            fileMenuSaved?.Invoke();
+        }
+
         static void Internal_CallKeyboardModifiersChanged()
         {
             modifierKeysChanged?.Invoke();
@@ -475,9 +493,10 @@ static void Internal_CallGlobalEventHandler()
         }
 
         [RequiredByNativeCode]
-        static void Internal_FocusChanged(bool isFocused)
+        static void Internal_FocusChanged(bool hasFocus)
         {
-            focusChanged?.Invoke(isFocused);
+            isFocused = hasFocus;
+            focusChanged?.Invoke(hasFocus);
         }
 
         [MenuItem("File/New Scene %n", priority = 150)]
diff --git a/Editor/Mono/EditorAssemblies.cs b/Editor/Mono/EditorAssemblies.cs
index 3eae35f854..a8c2d5fae7 100644
--- a/Editor/Mono/EditorAssemblies.cs
+++ b/Editor/Mono/EditorAssemblies.cs
@@ -115,7 +115,6 @@ private static void ProcessInitializeOnLoadAttributes(Type[] types)
 
             foreach (Type type in sortedTypes)
             {
-                using (new EditorPerformanceMarker($"InitializeOnLoad {type.Name}", type).Auto())
                 using (_profilerMarkerProcessInitializeOnLoadAttributes.Auto(reportTimes, () => type.AssemblyQualifiedName))
                 {
                     try
@@ -136,7 +135,6 @@ private static void ProcessInitializeOnLoadMethodAttributes()
             bool reportTimes = (bool)Debug.GetDiagnosticSwitch("EnableDomainReloadTimings").value;
             foreach (var method in TypeCache.GetMethodsWithAttribute<InitializeOnLoadMethodAttribute>())
             {
-                using (new EditorPerformanceMarker($"InitializeOnLoad {method.DeclaringType?.Name}.{method.Name}", method.DeclaringType).Auto())
                 using (_profilerMarkerProcessInitializeOnLoadMethodAttributes.Auto(reportTimes, () => $"{method.DeclaringType?.FullName}::{method.Name}"))
                 {
                     try
diff --git a/Editor/Mono/EditorBuildSettings.bindings.cs b/Editor/Mono/EditorBuildSettings.bindings.cs
index 82f99a4035..9993a1e82b 100644
--- a/Editor/Mono/EditorBuildSettings.bindings.cs
+++ b/Editor/Mono/EditorBuildSettings.bindings.cs
@@ -45,7 +45,7 @@ public EditorBuildSettingsScene(GUID guid, bool enabled)
         public GUID guid { get { return m_guid; } set { m_guid = value; } }
         public static string[] GetActiveSceneList(EditorBuildSettingsScene[] scenes)
         {
-            return scenes.Where(scene => scene.enabled).Select(scene => scene.path).ToArray();
+            return scenes.Where(scene => scene.enabled && !string.IsNullOrEmpty(scene.path)).Select(scene => scene.path).ToArray();
         }
 
         public int CompareTo(object obj)
@@ -74,27 +74,10 @@ private static void SceneListChanged()
 
         public static EditorBuildSettingsScene[] scenes
         {
-            get
-            {
-                var result = GetEditorBuildSettingsScenes();
-                foreach (var scene in result)
-                {
-                    if (scene.guid.Empty())
-                    {
-                        scene.guid = new GUID(AssetDatabase.AssetPathToGUID(scene.path));
-                    }
-                    else
-                    {
-                        scene.path = AssetDatabase.GUIDToAssetPath(scene.guid.ToString());
-                    }
-                }
-                return result;
-            }
-            set
-            {
-                SetEditorBuildSettingsScenes(value);
-            }
+            get => GetEditorBuildSettingsScenes();
+            set => SetEditorBuildSettingsScenes(value);
         }
+
         static extern EditorBuildSettingsScene[] GetEditorBuildSettingsScenes();
         static extern void SetEditorBuildSettingsScenes(EditorBuildSettingsScene[] scenes);
 
diff --git a/Editor/Mono/EditorGUI.cs b/Editor/Mono/EditorGUI.cs
index 9aa30d07a8..efeb8774c5 100644
--- a/Editor/Mono/EditorGUI.cs
+++ b/Editor/Mono/EditorGUI.cs
@@ -15,7 +15,6 @@
 using UnityEditor.Scripting.ScriptCompilation;
 using Object = UnityEngine.Object;
 using Event = UnityEngine.Event;
-using UnityEditor.Build;
 using UnityEditor.StyleSheets;
 using UnityEditor.VersionControl;
 using UnityEngine.Internal;
@@ -25,6 +24,7 @@
 using System.Reflection;
 using Unity.Profiling;
 using UnityEngine.Experimental.Rendering;
+using UnityEngine.UIElements;
 
 namespace UnityEditor
 {
@@ -155,7 +155,6 @@ private enum DragCandidateState
         private static readonly GUIContent s_PositionLabel = EditorGUIUtility.TrTextContent("Position");
         private static readonly GUIContent s_SizeLabel = EditorGUIUtility.TrTextContent("Size");
         internal static GUIContent s_PleasePressAKey = EditorGUIUtility.TrTextContent("[Please press a key]");
-        private static string s_PrefabInContextPreviewValuesTooltip = L10n.Tr("This property is previewing the overridden value on the Prefab instance.\n\nTo edit this property, open this Prefab Asset in isolation by pressing the modifier key [Alt] while you open it.");
 
         internal static readonly GUIContent s_ClipingPlanesLabel = EditorGUIUtility.TrTextContent("Clipping Planes", "The distances from the Camera where rendering starts and stops.");
         internal static readonly GUIContent[] s_NearAndFarLabels = { EditorGUIUtility.TrTextContent("Near", "The closest point to the Camera where drawing occurs."), EditorGUIUtility.TrTextContent("Far", "The furthest point from the Camera that drawing occurs.") };
@@ -208,6 +207,9 @@ private enum DragCandidateState
 
         internal static SavedBool s_ShowRepaintDots = new SavedBool("ShowRepaintDots", true);
 
+        internal static readonly Regex s_ATagRegex = new Regex(@"(?<=\b="")[^""]*");
+        internal static readonly Regex s_LinkTagRegex = new Regex(@"(?<=\b=')[^']*");
+
         static class Styles
         {
             public static Texture2D prefabOverlayAddedIcon = EditorGUIUtility.LoadIcon("PrefabOverlayAdded Icon");
@@ -520,7 +522,7 @@ internal bool IsEditingControl(int id)
                 return GUIUtility.keyboardControl == id && controlID == id && s_ActuallyEditing && GUIView.current.hasFocus;
             }
 
-            public virtual void BeginEditing(int id, string newText, Rect _position, GUIStyle _style, bool _multiline, bool passwordField)
+            public virtual void BeginEditing(int id, string newText, Rect position, GUIStyle style, bool multiline, bool passwordField)
             {
                 if (IsEditingControl(id))
                 {
@@ -532,9 +534,9 @@ public virtual void BeginEditing(int id, string newText, Rect _position, GUIStyl
                 activeEditor = this;
                 controlID = id;
                 text = s_OriginalText = newText;
-                multiline = _multiline;
-                style = _style;
-                position = _position;
+                isMultiline = multiline;
+                this.position = position;
+                this.style = style;
                 isPasswordField = passwordField;
                 s_ActuallyEditing = true;
                 scrollOffset = Vector2.zero;
@@ -982,12 +984,18 @@ internal static string DoTextField(RecycledTextEditor editor, int id, Rect posit
                 // If the editor is already set up, we just need to sync position, etc...
                 if (editor.IsEditingControl(id))
                 {
+                    // Fast path flag to ensure that we only update the scroll offset if the text area grew (dynamic height)
+                    bool requireUpdateScrollOffset = editor.position.height != position.height;
                     editor.position = position;
                     editor.style = style;
                     editor.controlID = id;
-                    editor.multiline = multiline;
+                    editor.isMultiline = multiline;
                     editor.isPasswordField = passwordField;
                     editor.DetectFocusChange();
+                    editor.UpdateTextHandle();
+
+                    if (requireUpdateScrollOffset)
+                        editor.UpdateScrollOffset();
                 }
                 else if (EditorGUIUtility.editingTextField || (evt.GetTypeForControl(id) == EventType.ExecuteCommand && evt.commandName == EventCommandNames.NewKeyboardFocus))
                 {
@@ -1119,7 +1127,12 @@ internal static string DoTextField(RecycledTextEditor editor, int id, Rect posit
                         {
                             // Extract hyperlink info
                             Dictionary<string, string> hyperLinkData;
-                            if (HasClickedOnHyperlink(text, editor.cursorIndex, editor, out hyperLinkData)) // Check if the cursor is between hyperlink tags and store the hyperlink info (tag arguments in a dictionary)
+
+                            if (editor.HasClickedOnHREF(Event.current.mousePosition, out string href))
+                            {
+                                Application.OpenURL(href);
+                            }
+                            else if (HasClickedOnHyperlink(editor, out hyperLinkData)) // Check if the cursor is between hyperlink tags and store the hyperlink info (tag arguments in a dictionary)
                             {
                                 // Raise event with the info
                                 var window = GUIView.current is HostView hostView ? hostView.actualView : null;
@@ -1240,7 +1253,7 @@ internal static string DoTextField(RecycledTextEditor editor, int id, Rect posit
                         {
                             if (editor.IsEditingControl(id))
                             {
-                                if (style == EditorStyles.toolbarSearchField || style == EditorStyles.searchField)
+                                if (style == EditorStyles.toolbarSearchField || style == EditorStyles.searchField || style.name.Contains("SearchText"))
                                 {
                                     s_OriginalText = "";
                                 }
@@ -1358,7 +1371,6 @@ internal static string DoTextField(RecycledTextEditor editor, int id, Rect posit
                         drawText = passwordField ? "".PadRight(text.Length, '*') : text;
                     }
 
-
                     if (!string.IsNullOrEmpty(s_UnitString) && !passwordField)
                         drawText += " " + s_UnitString;
 
@@ -1392,6 +1404,10 @@ internal static string DoTextField(RecycledTextEditor editor, int id, Rect posit
                             EditorGUIUtility.AddCursorRect(cursorRect, MouseCursor.Text);
                     }
 
+                    break;
+                case EventType.ScrollWheel:
+                    // Scroll offset might need to be updated
+                    editor.UpdateScrollOffset();
                     break;
             }
 
@@ -1401,9 +1417,6 @@ internal static string DoTextField(RecycledTextEditor editor, int id, Rect posit
                 GUIUtility.textFieldInput = EditorGUIUtility.editingTextField;
             }
 
-            // Scroll offset might need to be updated
-            editor.UpdateScrollOffsetIfNeeded(evt);
-
             changed = false;
             if (mayHaveChanged)
             {
@@ -1441,58 +1454,33 @@ internal static string DoTextField(RecycledTextEditor editor, int id, Rect posit
             return origText;
         }
 
-        private static bool HasClickedOnHyperlink(string text, int cursorIndex, RecycledTextEditor editor, out Dictionary<string, string> hyperLinkData)
+        private static bool HasClickedOnHyperlink(RecycledTextEditor editor, out Dictionary<string, string> hyperLinkData)
         {
-            Vector2 mousePosition = Event.current.mousePosition;
             hyperLinkData = new Dictionary<string, string>();
-            if (cursorIndex > 0)
-            {
-                bool hitHyperlink = false;
-                foreach (var rect in editor.GetHyperlinksRect())
-                {
-                    if (rect.Contains(mousePosition))
-                    {
-                        hitHyperlink = true;
-                        break;
-                    }
-                }
-
-                if (hitHyperlink)
-                {
-                    int indexBeginTag = text.Substring(0, editor.cursorIndex)
-                        .LastIndexOf("<a ", StringComparison.Ordinal);
-                    // We should always have the cursor index in the tag but it might not be the case for the first pixels of the hyperlink rect
-                    // Validity check for that case
-                    if (indexBeginTag >= 0)
-                    {
-                        int indexBeginTagClose =
-                            text.Substring(indexBeginTag, cursorIndex - indexBeginTag).IndexOf('>');
+            Vector2 mousePosition = Event.current.mousePosition;
+            if (!editor.HasClickedOnLink(mousePosition, out string link))
+                return false;
 
-                        string beginTag = text.Substring(indexBeginTag, indexBeginTagClose);
-                        // Regex to find the attribute value
-                        Regex regex = new Regex(@"(?<=\b="")[^""]*");
-                        MatchCollection matches = regex.Matches(beginTag);
+            MatchCollection matches = s_ATagRegex.Matches(link);
+            if (matches.Count == 0)
+                matches = s_LinkTagRegex.Matches(link);
 
-                        int endPreviousAttributeIndex = 0;
-                        // for each attribute we need to find the attribute name
-                        foreach (Match match in matches)
-                        {
-                            // We are only working on the text between the previous attribute and the current
-                            string namePart = beginTag.Substring(endPreviousAttributeIndex,
-                                (match.Index - 2) - endPreviousAttributeIndex); // -2 is the character before ="
-                            int indexName = namePart.LastIndexOf(' ') + 1;
-                            string name = namePart.Substring(indexName);
-                            // Add the name of the attribute and its value in the dictionary
-                            hyperLinkData.Add(name, match.Value);
-
-                            endPreviousAttributeIndex = match.Index + match.Value.Length + 1;
-                        }
+            int endPreviousAttributeIndex = 0;
+            // for each attribute we need to find the attribute name
+            foreach (Match match in matches)
+            {
+                // We are only working on the text between the previous attribute and the current
+                string namePart = link.Substring(endPreviousAttributeIndex,
+                    (match.Index - 2) - endPreviousAttributeIndex); // -2 is the character before ="
+                int indexName = namePart.LastIndexOf(' ') + 1;
+                string name = namePart.Substring(indexName);
+                // Add the name of the attribute and its value in the dictionary
+                hyperLinkData.Add(name, match.Value);
 
-                        return true;
-                    }
-                }
+                endPreviousAttributeIndex = match.Index + match.Value.Length + 1;
             }
-            return false;
+
+            return true;
         }
 
         public static event Action<EditorWindow, UnityEditor.HyperLinkClickedEventArgs> hyperLinkClicked;
@@ -2054,7 +2042,7 @@ internal static string ScrollableTextAreaInternal(Rect position, string text, re
                 else
                 {
                     //Move the Editor offset to match our scrollbar
-                    s_RecycledEditor.scrollOffset.y = scrollPosition.y;
+                    s_RecycledEditor.scrollOffset = scrollPosition;
                 }
             }
             bool dummy;
@@ -2433,7 +2421,7 @@ internal static void GetInitialValue(ref NumberFieldValue value)
             if (value.isDouble)
             {
                 double oldValue = default;
-                if (UINumericFieldsUtils.StringToDouble(s_OriginalText, out oldValue) && oldValue != value.doubleVal)
+                if (UINumericFieldsUtils.TryConvertStringToDouble(s_OriginalText, out oldValue) && oldValue != value.doubleVal)
                 {
                     value.doubleVal = oldValue;
                     return;
@@ -2442,7 +2430,7 @@ internal static void GetInitialValue(ref NumberFieldValue value)
             else
             {
                 long oldValue = default;
-                if (UINumericFieldsUtils.StringToLong(s_OriginalText, out oldValue) && oldValue != value.longVal)
+                if (UINumericFieldsUtils.TryConvertStringToLong(s_OriginalText, out oldValue) && oldValue != value.longVal)
                 {
                     value.longVal = oldValue;
                     return;
@@ -2520,7 +2508,7 @@ internal static bool StringToDouble(string str, out double value)
 
         static void StringToDouble(string str, ref NumberFieldValue value)
         {
-            value.success = UINumericFieldsUtils.StringToDouble(str, out value.doubleVal, out value.expression);
+            value.success = UINumericFieldsUtils.TryConvertStringToDouble(str, out value.doubleVal, out value.expression);
         }
 
         internal static bool StringToLong(string str, out long value)
@@ -2534,7 +2522,7 @@ internal static bool StringToLong(string str, out long value)
         static void StringToLong(string str, ref NumberFieldValue value)
         {
             value.expression = null;
-            value.success = UINumericFieldsUtils.StringToLong(str, out value.longVal, out value.expression);
+            value.success = UINumericFieldsUtils.TryConvertStringToLong(str, out value.longVal, out value.expression);
         }
 
         internal static int ArraySizeField(Rect position, GUIContent label, int value, GUIStyle style)
@@ -2915,7 +2903,7 @@ internal static float Slider(Rect position, GUIContent label, float value, float
             var id = GUIUtility.GetControlID(s_SliderHash, FocusType.Keyboard, position);
             var controlRect = PrefixLabel(position, id, label);
             var dragZone = LabelHasContent(label) ? EditorGUIUtility.DragZoneRect(position) : new Rect(); // Ensure dragzone is empty when we have no label
-            return DoSlider(controlRect, dragZone, id, value, sliderMin, sliderMax, kFloatFieldFormatString, textFieldMin, textFieldMax, 1f,
+            return DoSlider(controlRect, dragZone, id, value, sliderMin, sliderMax, kFloatFieldFormatString, textFieldMin, textFieldMax, 1f, 1f,
                 textfieldStyle, sliderStyle, thumbStyle, sliderBackground, thumbStyleExtent);
         }
 
@@ -2939,13 +2927,31 @@ internal static float PowerSlider(Rect position, GUIContent label, float sliderV
             return DoSlider(controlRect, dragZone, id, sliderValue, leftValue, rightValue, kFloatFieldFormatString, textfieldStyle, power);
         }
 
+        internal static int LogarithmicIntSlider(Rect position, string label, int sliderValue, int leftValue, int rightValue, int logbase, int textFieldMin, int textFieldMax)
+        {
+            return LogarithmicIntSlider(position, EditorGUIUtility.TempContent(label), sliderValue, leftValue, rightValue, logbase, textFieldMin, textFieldMax);
+        }
+
+        internal static int LogarithmicIntSlider(Rect position, GUIContent label, int sliderValue, int leftValue, int rightValue, int logbase, int textFieldMin, int textFieldMax)
+        {
+            return LogarithmicIntSlider(position, label, sliderValue, leftValue, rightValue, EditorStyles.numberField, logbase, textFieldMin, textFieldMax);
+        }
+
+        internal static int LogarithmicIntSlider(Rect position, GUIContent label, int sliderValue, int leftValue, int rightValue, GUIStyle textfieldStyle, int logbase, int textFieldMin, int textFieldMax)
+        {
+            int id = GUIUtility.GetControlID(s_SliderHash, FocusType.Keyboard, position);
+            Rect controlRect = PrefixLabel(position, id, label);
+            Rect dragZone = LabelHasContent(label) ? EditorGUIUtility.DragZoneRect(position) : new Rect(); // Ensure dragzone is empty when we have no label
+            return Mathf.RoundToInt(DoSlider(controlRect, dragZone, id, (float) sliderValue, (float) leftValue, (float) rightValue, kIntFieldFormatString, power:1, logbase: logbase, textFieldMin: textFieldMin, textFieldMax: textFieldMax));
+        }
+
         private static float PowPreserveSign(float f, float p)
         {
             var result = Mathf.Pow(Mathf.Abs(f), p);
             return f < 0.0f ? -result : result;
         }
 
-        internal static GenericMenu FillPropertyContextMenu(SerializedProperty property, SerializedProperty linkedProperty = null, GenericMenu menu = null)
+        internal static GenericMenu FillPropertyContextMenu(SerializedProperty property, SerializedProperty linkedProperty = null, GenericMenu menu = null, VisualElement element = null)
         {
             if (property == null)
                 return null;
@@ -3054,7 +3060,9 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
                                 info.properties = properties;
                                 info.assetPath = AssetDatabase.GetAssetPath(sourceObject);
                                 GameObject rootObject = PrefabUtility.GetRootGameObject(sourceObject);
-                                if (!PrefabUtility.IsPartOfPrefabThatCanBeAppliedTo(rootObject) || !PrefabUtility.CanPropertyBeAppliedToTarget(property, rootObject))
+                                if (EditorUtility.IsPersistent(targetObject)
+                                    || !PrefabUtility.IsPartOfPrefabThatCanBeAppliedTo(rootObject)
+                                    || !PrefabUtility.CanPropertyBeAppliedToTarget(property, rootObject))
                                     pm.AddDisabledItem(menuItemContent);
                                 else
                                     pm.AddItem(menuItemContent, false, TargetChoiceHandler.ApplyPrefabPropertyOverride, info);
@@ -3120,6 +3128,7 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
                         pm.AddItem(EditorGUIUtility.TrTextContent("Duplicate Array Element"), false, (a) =>
                         {
                             var list = ReorderableList.GetReorderableListFromSerializedProperty(parentArrayProperty);
+                            var listView = element?.GetFirstAncestorOfType<ListView>();
 
                             // 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
@@ -3147,6 +3156,10 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
 
                                 ReorderableList.InvalidateExistingListCaches();
                             }
+                            else if (listView != null && listView.selectedIndices.Any())
+                            {
+                                DuplicateListViewItems(listView, parentArrayProperty);
+                            }
                             else // Non reorderable
                             {
                                 if (parentArrayIndex >= 0 && parentArrayIndex < parentArrayProperty.arraySize)
@@ -3173,6 +3186,7 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
                         pm.AddItem(EditorGUIUtility.TrTextContent("Delete Array Element"), false, (a) =>
                         {
                             var list = ReorderableList.GetReorderableListFromSerializedProperty(parentArrayProperty);
+                            var listView = element?.GetFirstAncestorOfType<ListView>();
 
                             // 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
@@ -3196,6 +3210,10 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
                                     list.onChangedCallback(list);
                                 ReorderableList.InvalidateExistingListCaches();
                             }
+                            else if (listView != null && listView.selectedIndices.Any())
+                            {
+                                DeleteListViewItems(listView, parentArrayProperty);
+                            }
                             else // Non reorderable
                             {
                                 if (parentArrayIndex >= 0 && parentArrayIndex < parentArrayProperty.arraySize)
@@ -3269,6 +3287,60 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
             return pm;
         }
 
+        internal static void DeleteListViewItems(ListView listView, SerializedProperty parentArrayProperty)
+        {
+            var previousSelectedIndices = new List<int>(listView.selectedIndices);
+            previousSelectedIndices.Sort();
+            listView.ClearSelection();
+
+            for (int i = previousSelectedIndices.Count - 1; i >= 0; i--)
+            {
+                var index = previousSelectedIndices.ElementAt(i);
+                if (index >= listView.itemsSource.Count) continue;
+
+                SerializedProperty resolvedProperty = parentArrayProperty.GetArrayElementAtIndex(index);
+                if (resolvedProperty != null)
+                {
+                    if (!TargetChoiceHandler.DeleteArrayElement(resolvedProperty)) continue;
+                }
+            }
+        }
+
+        internal static void DuplicateListViewItems(ListView listView, SerializedProperty parentArrayProperty)
+        {
+            var previousSelectedIndices = new List<int>(listView.selectedIndices);
+            previousSelectedIndices.Sort();
+            var newSelectedIndices = new List<int>();
+            listView.ClearSelection();
+
+            for (int i = previousSelectedIndices.Count - 1; i >= 0; i--)
+            {
+                var index = previousSelectedIndices.ElementAt(i);
+                if (index >= listView.itemsSource.Count) continue;
+
+                SerializedProperty resolvedProperty = parentArrayProperty.GetArrayElementAtIndex(index);
+                if (resolvedProperty != null)
+                {
+                    if (!TargetChoiceHandler.DuplicateArrayElement(resolvedProperty)) continue;
+                }
+
+                // need to update the rest of the selected indices as an element was added
+                for (int j = i + 1; j < previousSelectedIndices.Count; j++)
+                {
+                    previousSelectedIndices[j]++;
+                }
+
+                for (int j = 0; j < newSelectedIndices.Count; j++)
+                {
+                    newSelectedIndices[j]++;
+                }
+
+                newSelectedIndices.Add(previousSelectedIndices[i] + 1);
+            }
+
+            listView.SetSelection(newSelectedIndices);
+        }
+
         internal static void GoToPrefab(string assetPath, GameObject openedFromInstance)
         {
             // When this function is called from a Property Context Menu on the Overrides pop-up window, we need to make ensure that the correct GameObject
@@ -3333,11 +3405,11 @@ internal static void Slider(Rect position, SerializedProperty property, float sl
             EndProperty();
         }
 
-        internal static int IntSlider(Rect position, int value, int leftValue, int rightValue, float power = -1,
+        internal static int IntSlider(Rect position, int value, int leftValue, int rightValue, float power = -1, float logbase = 1,
             GUIStyle textfieldStyle = null, GUIStyle sliderStyle = null, GUIStyle thumbStyle = null, Texture2D sliderBackground = null, GUIStyle thumbStyleExtent = null)
         {
             int id = GUIUtility.GetControlID(s_SliderHash, FocusType.Keyboard, position);
-            return Mathf.RoundToInt(DoSlider(IndentedRect(position), EditorGUIUtility.DragZoneRect(position), id, value, leftValue, rightValue, kIntFieldFormatString, power,
+            return Mathf.RoundToInt(DoSlider(IndentedRect(position), EditorGUIUtility.DragZoneRect(position), id, value, leftValue, rightValue, kIntFieldFormatString, power, logbase,
                 textfieldStyle ?? EditorStyles.numberField,
                 sliderStyle ?? GUI.skin.horizontalSlider,
                 thumbStyle ?? GUI.skin.horizontalSliderThumb,
@@ -3406,24 +3478,29 @@ internal static void DoTwoLabels(Rect rect, GUIContent leftLabel, GUIContent rig
             labelStyle.alignment = oldAlignment;
         }
 
-        internal static float DoSlider(Rect position, Rect dragZonePosition, int id, float value, float left, float right, string formatString, float power = 1f)
+        internal static float DoSlider(Rect position, Rect dragZonePosition, int id, float value, float left, float right, string formatString, float power = 1f, float logbase = 1f)
+        {
+            return DoSlider(position, dragZonePosition, id, value, left, right, formatString, power, logbase, EditorStyles.numberField, GUI.skin.horizontalSlider, GUI.skin.horizontalSliderThumb, null, GUI.skin.horizontalSliderThumbExtent);
+        }
+
+        internal static float DoSlider(Rect position, Rect dragZonePosition, int id, float value, float left, float right, string formatString, float textFieldMin, float textFieldMax, float power = 1f, float logbase = 1f)
         {
-            return DoSlider(position, dragZonePosition, id, value, left, right, formatString, power, EditorStyles.numberField, GUI.skin.horizontalSlider, GUI.skin.horizontalSliderThumb, null, GUI.skin.horizontalSliderThumbExtent);
+            return DoSlider(position, dragZonePosition, id, value, left, right, formatString, textFieldMin, textFieldMax, power, logbase, EditorStyles.numberField, GUI.skin.horizontalSlider, GUI.skin.horizontalSliderThumb, null, GUI.skin.horizontalSliderThumbExtent);
         }
 
-        internal static float DoSlider(Rect position, Rect dragZonePosition, int id, float value, float left, float right, string formatString, GUIStyle textfieldStyle, float power = 1f)
+        internal static float DoSlider(Rect position, Rect dragZonePosition, int id, float value, float left, float right, string formatString, GUIStyle textfieldStyle, float power = 1f, float logbase = 1f)
         {
-            return DoSlider(position, dragZonePosition, id, value, left, right, formatString, power, textfieldStyle, GUI.skin.horizontalSlider, GUI.skin.horizontalSliderThumb, null, GUI.skin.horizontalSliderThumbExtent);
+            return DoSlider(position, dragZonePosition, id, value, left, right, formatString, power, logbase, textfieldStyle, GUI.skin.horizontalSlider, GUI.skin.horizontalSliderThumb, null, GUI.skin.horizontalSliderThumbExtent);
         }
 
-        private static float DoSlider(Rect position, Rect dragZonePosition, int id, float value, float left, float right, string formatString, float power, GUIStyle textfieldStyle, GUIStyle sliderStyle, GUIStyle thumbStyle, Texture2D sliderBackground, GUIStyle thumbStyleExtent)
+        private static float DoSlider(Rect position, Rect dragZonePosition, int id, float value, float left, float right, string formatString, float power, float logbase, GUIStyle textfieldStyle, GUIStyle sliderStyle, GUIStyle thumbStyle, Texture2D sliderBackground, GUIStyle thumbStyleExtent)
         {
-            return DoSlider(position, dragZonePosition, id, value, left, right, formatString, left, right, power, textfieldStyle, sliderStyle, thumbStyle, sliderBackground, thumbStyleExtent);
+            return DoSlider(position, dragZonePosition, id, value, left, right, formatString, left, right, power, logbase, textfieldStyle, sliderStyle, thumbStyle, sliderBackground, thumbStyleExtent);
         }
 
         private static float DoSlider(
             Rect position, Rect dragZonePosition, int id, float value, float sliderMin, float sliderMax, string formatString, float textFieldMin
-            , float textFieldMax, float power, GUIStyle textfieldStyle, GUIStyle sliderStyle, GUIStyle thumbStyle, Texture2D sliderBackground, GUIStyle thumbStyleExtent
+            , float textFieldMax, float power, float logbase, GUIStyle textfieldStyle, GUIStyle sliderStyle, GUIStyle thumbStyle, Texture2D sliderBackground, GUIStyle thumbStyleExtent
         )
         {
             int sliderId = GUIUtility.GetControlID(s_SliderKnobHash, FocusType.Passive, position);
@@ -3454,6 +3531,12 @@ private static float DoSlider(
                     remapRight = PowPreserveSign(sliderMax, 1f / power);
                     newSliderValue = PowPreserveSign(value, 1f / power);
                 }
+                else if (logbase != 1f)
+                {
+                    remapLeft = Mathf.Log(sliderMin, logbase);
+                    remapRight = Mathf.Log(sliderMax, logbase);
+                    newSliderValue = Mathf.Log(value, logbase);
+                }
 
                 Rect sliderRect = new Rect(position.x, position.y, sWidth, position.height);
 
@@ -3469,6 +3552,11 @@ private static float DoSlider(
                     newSliderValue = PowPreserveSign(newSliderValue, power);
                     newSliderValue = Mathf.Clamp(newSliderValue, Mathf.Min(sliderMin, sliderMax), Mathf.Max(sliderMin, sliderMax));
                 }
+                else if (logbase != 1f)
+                {
+                    newSliderValue = Mathf.Pow(logbase, newSliderValue);
+                }
+
 
                 // Do slider labels if present
                 if (EditorGUIUtility.sliderLabels.HasLabels())
@@ -3867,7 +3955,7 @@ public static int GetSelectedValueForControl(int controlID, int selected)
                     }
                     if (instance.m_ControlID == controlID)
                     {
-                        GUI.changed = selected != instance.m_SelectedIndex;
+                        GUI.changed = showMixedValue || selected != instance.m_SelectedIndex;
                         selected = instance.m_SelectedIndex;
                         instance = null;
                         evt.Use();
@@ -3886,15 +3974,8 @@ internal void SetEnumValueDelegate(object userData, string[] options, int select
             }
         }
 
-        internal static int DoPopup(Rect position, int controlID, int selected, GUIContent[] popupValues, GUIStyle style)
-        {
-            return DoPopup(position, controlID, selected, popupValues, null, style);
-        }
-
-        internal static int DoPopup(Rect position, int controlID, int selected, GUIContent[] popupValues, Func<int, bool> checkEnabled, GUIStyle style)
+        internal static GUIContent GetPopupButtonContent(int selected, GUIContent[] popupValues)
         {
-            selected = PopupCallbackInfo.GetSelectedValueForControl(controlID, selected);
-
             GUIContent buttonContent;
             if (showMixedValue)
             {
@@ -3907,8 +3988,21 @@ internal static int DoPopup(Rect position, int controlID, int selected, GUIConte
             else
             {
                 buttonContent = popupValues[selected];
+                buttonContent.text = EditorUtility.ParseMenuName(popupValues[selected].text);
             }
 
+            return buttonContent;
+        }
+
+        internal static int DoPopup(Rect position, int controlID, int selected, GUIContent[] popupValues, GUIStyle style)
+        {
+            return DoPopup(position, controlID, selected, popupValues, null, style);
+        }
+
+        internal static int DoPopup(Rect position, int controlID, int selected, GUIContent[] popupValues, Func<int, bool> checkEnabled, GUIStyle style)
+        {
+            selected = PopupCallbackInfo.GetSelectedValueForControl(controlID, selected);
+
             Event evt = Event.current;
             switch (evt.type)
             {
@@ -3921,7 +4015,7 @@ internal static int DoPopup(Rect position, int controlID, int selected, GUIConte
                     }
 
                     BeginHandleMixedValueContentColor();
-                    style.Draw(position, buttonContent, controlID, false, position.Contains(Event.current.mousePosition));
+                    style.Draw(position, GetPopupButtonContent(selected, popupValues), controlID, false, position.Contains(Event.current.mousePosition));
                     EndHandleMixedValueContentColor();
 
                     style.font = originalFont;
@@ -4176,9 +4270,7 @@ public static Enum EnumFlagsField(Rect position, GUIContent label, Enum enumValu
 
         public static Enum EnumFlagsField(Rect position, GUIContent label, Enum enumValue, [DefaultValue("false")] bool includeObsolete, [DefaultValue("null")] GUIStyle style = null)
         {
-            int changedFlags;
-            bool changedToValue;
-            return EnumFlagsField(position, label, enumValue, includeObsolete, out changedFlags, out changedToValue, style ?? EditorStyles.popup);
+            return EnumFlagsField(position, label, enumValue, includeObsolete, out _, out _, style ?? EditorStyles.popup);
         }
 
         // Internal version that also gives you back which flags were changed and what they were changed to.
@@ -4572,11 +4664,19 @@ internal static Vector3 LinkedVector3Field(Rect position, GUIContent label,  GUI
             GUIContent copy = label;
             Rect fullLabelRect = position;
 
-            if(proportionalScaleProperty != null)
+            BeginChangeCheck();
+
+            if (proportionalScaleProperty != null)
+            {
                 BeginPropertyInternal(fullLabelRect, label, proportionalScaleProperty);
+            }
 
+            var scalePropertyId = -1;
             if (property != null)
+            {
                 label = BeginPropertyInternal(position, label, property);
+                scalePropertyId = GUIUtility.keyboardControl;
+            }
 
             SerializedProperty copiedProperty = property == null ? property : property.Copy();
             var toggle = EditorStyles.toggle.CalcSize(GUIContent.none);
@@ -4605,13 +4705,26 @@ internal static Vector3 LinkedVector3Field(Rect position, GUIContent label,  GUI
             position.width -= toggle.x + kDefaultSpacing;
             position.height = kSingleLineHeight;
 
-            var newValue = LinkedVector3Field(position, value, proportionalScale, mixedValues, initialScale, ref axisModified, copiedProperty);
+            if (proportionalScaleProperty != null)
+            {
+                EndProperty();
+            }
 
             if (property != null)
-                EndProperty();
+            {
+                // Note: due to how both the scale + constrainScale property drawn and handled in a custom fashion, the lastcontrolId never correspond
+                // to the scaleProperty. Also s_PendingPropertyKeyboardHandling is nullifed by the constrainScale property.
+                // Make it work for now but I feel this whole system is super brittle.
+                // This will be hopefully fixed up when we use uitk to create these editors.
 
-            if(proportionalScaleProperty != null)
+                var lastId = EditorGUIUtility.s_LastControlID;
+                EditorGUIUtility.s_LastControlID = scalePropertyId;
+                s_PendingPropertyKeyboardHandling = property;
                 EndProperty();
+                EditorGUIUtility.s_LastControlID = lastId;
+            }
+
+            var newValue = LinkedVector3Field(position, value, proportionalScale, mixedValues, initialScale, ref axisModified, copiedProperty);
 
             return newValue;
         }
@@ -4630,8 +4743,8 @@ static Vector3 LinkedVector3Field(Rect position, Vector3 value, bool proportiona
             s_Vector3Floats[1] = value.y;
             s_Vector3Floats[2] = value.z;
             position.height = kSingleLineHeight;
-            BeginChangeCheck();
-            LockingMultiFloatFieldInternal(position, proportionalScale, mixedValues, s_XYZLabels, s_Vector3Floats, new float[] {initialScale.x, initialScale.y, initialScale.z}, property, EditorGUI.CalcPrefixLabelWidth(s_XYZLabels[0]) + 3);
+            const float kPrefixWidthOffset = 3.65f;
+            LockingMultiFloatFieldInternal(position, proportionalScale, mixedValues, s_XYZLabels, s_Vector3Floats, new float[] {initialScale.x, initialScale.y, initialScale.z}, property, EditorGUI.CalcPrefixLabelWidth(s_XYZLabels[0]) + kPrefixWidthOffset);
             if (EndChangeCheck())
             {
                 valueAfterChangeCheck.x = s_Vector3Floats[0];
@@ -6043,7 +6156,7 @@ internal static void DoInspectorTitlebar(Rect position, int id, bool foldout, Ob
                     }
                     break;
                 case EventType.Repaint:
-                    textStyle.Draw(textRect, EditorGUIUtility.TempContent(ObjectNames.GetInspectorTitle(targetObjs[0])), hovered, pressed, foldout, hasFocus);
+                    textStyle.Draw(textRect, EditorGUIUtility.TempContent(ObjectNames.GetInspectorTitle(targetObjs[0], targetObjs.Length > 1)), hovered, pressed, foldout, hasFocus);
                     if (EditorGUIUtility.comparisonViewMode == EditorGUIUtility.ComparisonViewMode.None)
                     {
                         EditorStyles.optionsButtonStyle.Draw(settingsRect, GUIContent.none, id, foldout, settingsRect.Contains(Event.current.mousePosition));
@@ -6277,7 +6390,7 @@ internal static bool HelpIconButton(Rect position, Object[] objs)
                     }
                     else
                     {
-                        content.tooltip = string.Format("Open Reference for {0}.", helpTopic);
+                        content.tooltip = string.Format("Open Reference for {0}.", ObjectNames.NicifyVariableName(helpTopic));
                     }
                 }
 
@@ -6818,28 +6931,11 @@ internal static GUIContent BeginPropertyInternal(Rect totalPosition, GUIContent
                 animatedColor.a *= GUI.backgroundColor.a;
                 GUI.backgroundColor = animatedColor;
             }
-            else
+            else if (PrefabUtility.IsPropertyBeingDrivenByPrefabStage(property))
             {
-                Object target = property.serializedObject.targetObject;
-                GameObject go = PrefabUtility.GetGameObject(target);
-                if (go != null && go.scene.IsValid() && EditorSceneManager.IsPreviewScene(go.scene))
-                {
-                    var prefabStage = SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
-                    if (prefabStage != null && prefabStage.mode == SceneManagement.PrefabStage.Mode.InContext)
-                    {
-                        var propertyPath = property.propertyPath;
-                        ScriptableObject driver = prefabStage;
-                        if (
-                            (DrivenPropertyManagerInternal.IsDriving(driver, target, propertyPath))
-                            ||
-                            ((target is Transform || target is ParticleSystem || property.propertyType == SerializedPropertyType.Color) && DrivenPropertyManagerInternal.IsDrivingPartial(driver, target, propertyPath)))
-                        {
-                            GUI.enabled = false;
-                            if (isCollectingTooltips)
-                                s_PropertyFieldTempContent.tooltip = s_PrefabInContextPreviewValuesTooltip;
-                        }
-                    }
-                }
+                GUI.enabled = false;
+                if (isCollectingTooltips)
+                    s_PropertyFieldTempContent.tooltip = PrefabStage.s_PrefabInContextPreviewValuesTooltip;
             }
 
             GUI.enabled &= property.editable;
@@ -6988,6 +7084,8 @@ private static void DoPropertyFieldKeyboardHandling(SerializedProperty property)
             // Copy & Paste
             if (evt.commandName == EventCommandNames.Copy || evt.commandName == EventCommandNames.Paste)
             {
+                if (evt.commandName == EventCommandNames.Paste)
+                    GUI.changed = true;
                 ClipboardContextMenu.SetupPropertyCopyPaste(property, menu: null, evt: evt);
             }
         }
@@ -9048,2517 +9146,4 @@ internal static bool IsObjectPartOfTargetAssemblies(Object obj)
             }
         }
     }
-
-    // Auto-layouted version of [[EditorGUI]]
-    sealed partial class EditorGUILayout
-    {
-        // @TODO: Make private (and rename to not claim it's a constant). Shouldn't really be used outside of EditorGUI.
-        // Places that use this directly should likely use GetControlRect instead.
-        internal static float kLabelFloatMinW => EditorGUIUtility.labelWidth + EditorGUIUtility.fieldWidth + EditorGUI.kSpacing;
-
-        internal static float kLabelFloatMaxW => EditorGUIUtility.labelWidth + EditorGUIUtility.fieldWidth + EditorGUI.kSpacing;
-
-        internal static Rect s_LastRect;
-
-        internal const float kPlatformTabWidth = 30;
-
-        internal static SavedBool s_SelectedDefault = new SavedBool("Platform.ShownDefaultTab", true);
-
-        static GUIStyle s_TabOnlyOne;
-        static GUIStyle s_TabFirst;
-        static GUIStyle s_TabMiddle;
-        static GUIStyle s_TabLast;
-
-        [ExcludeFromDocs]
-        public static bool Foldout(bool foldout, string content)
-        {
-            return Foldout(foldout, content, EditorStyles.foldout);
-        }
-
-        public static bool Foldout(bool foldout, string content, [DefaultValue("EditorStyles.foldout")] GUIStyle style)
-        {
-            return Foldout(foldout, EditorGUIUtility.TempContent(content), false, style);
-        }
-
-        [ExcludeFromDocs]
-        public static bool Foldout(bool foldout, GUIContent content)
-        {
-            return Foldout(foldout, content, EditorStyles.foldout);
-        }
-
-        public static bool Foldout(bool foldout, GUIContent content, [DefaultValue("EditorStyles.foldout")] GUIStyle style)
-        {
-            return Foldout(foldout, content, false, style);
-        }
-
-        [ExcludeFromDocs]
-        public static bool Foldout(bool foldout, string content, bool toggleOnLabelClick)
-        {
-            return Foldout(foldout, content, toggleOnLabelClick, EditorStyles.foldout);
-        }
-
-        public static bool Foldout(bool foldout, string content, bool toggleOnLabelClick, [DefaultValue("EditorStyles.foldout")] GUIStyle style)
-        {
-            return Foldout(foldout, EditorGUIUtility.TempContent(content), toggleOnLabelClick, style);
-        }
-
-        [ExcludeFromDocs]
-        public static bool Foldout(bool foldout, GUIContent content, bool toggleOnLabelClick)
-        {
-            return Foldout(foldout, content, toggleOnLabelClick, EditorStyles.foldout);
-        }
-
-        public static bool Foldout(bool foldout, GUIContent content, bool toggleOnLabelClick, [DefaultValue("EditorStyles.foldout")] GUIStyle style)
-        {
-            return FoldoutInternal(foldout, content, toggleOnLabelClick, style);
-        }
-
-        [ExcludeFromDocs]
-        public static void PrefixLabel(string label)
-        {
-            GUIStyle followingStyle = "Button";
-            PrefixLabel(label, followingStyle);
-        }
-
-        public static void PrefixLabel(string label, [DefaultValue("\"Button\"")] GUIStyle followingStyle)
-        {
-            PrefixLabel(EditorGUIUtility.TempContent(label), followingStyle, EditorStyles.label);
-        }
-
-        public static void PrefixLabel(string label, GUIStyle followingStyle, GUIStyle labelStyle)
-        {
-            PrefixLabel(EditorGUIUtility.TempContent(label), followingStyle, labelStyle);
-        }
-
-        [ExcludeFromDocs]
-        public static void PrefixLabel(GUIContent label)
-        {
-            GUIStyle followingStyle = "Button";
-            PrefixLabel(label, followingStyle);
-        }
-
-        public static void PrefixLabel(GUIContent label, [DefaultValue("\"Button\"")] GUIStyle followingStyle)
-        {
-            PrefixLabel(label, followingStyle, EditorStyles.label);
-        }
-
-        // Make a label in front of some control.
-        public static void PrefixLabel(GUIContent label, GUIStyle followingStyle, GUIStyle labelStyle)
-        {
-            PrefixLabelInternal(label, followingStyle, labelStyle);
-        }
-
-        public static void LabelField(string label, params GUILayoutOption[] options)
-        {
-            LabelField(GUIContent.none, EditorGUIUtility.TempContent(label), EditorStyles.label, options);
-        }
-
-        public static void LabelField(string label, GUIStyle style, params GUILayoutOption[] options)
-        {
-            LabelField(GUIContent.none, EditorGUIUtility.TempContent(label), style, options);
-        }
-
-        public static void LabelField(GUIContent label, params GUILayoutOption[] options)
-        {
-            LabelField(GUIContent.none, label, EditorStyles.label, options);
-        }
-
-        public static void LabelField(GUIContent label, GUIStyle style, params GUILayoutOption[] options)
-        {
-            LabelField(GUIContent.none, label, style, options);
-        }
-
-        public static void LabelField(string label, string label2, params GUILayoutOption[] options)
-        {
-            LabelField(new GUIContent(label), EditorGUIUtility.TempContent(label2), EditorStyles.label, options);
-        }
-
-        public static void LabelField(string label, string label2, GUIStyle style, params GUILayoutOption[] options)
-        {
-            LabelField(new GUIContent(label), EditorGUIUtility.TempContent(label2), style, options);
-        }
-
-        public static void LabelField(GUIContent label, GUIContent label2, params GUILayoutOption[] options)
-        {
-            LabelField(label, label2, EditorStyles.label, options);
-        }
-
-        // Make a label field. (Useful for showing read-only info.)
-        public static void LabelField(GUIContent label, GUIContent label2, GUIStyle style, params GUILayoutOption[] options)
-        {
-            if (!style.wordWrap)
-            {
-                // If we don't need word wrapping, just allocate the standard space to avoid corner case layout issues
-                Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, options);
-                EditorGUI.LabelField(r, label, label2, style);
-            }
-            else
-            {
-                BeginHorizontal();
-                PrefixLabel(label, style);
-                Rect r = GUILayoutUtility.GetRect(label2, style, options);
-                int oldIndent = EditorGUI.indentLevel;
-                EditorGUI.indentLevel = 0;
-                EditorGUI.LabelField(r, label2, style);
-                EditorGUI.indentLevel = oldIndent;
-                EndHorizontal();
-            }
-        }
-
-        public static bool LinkButton(string label, params GUILayoutOption[] options)
-        {
-            return LinkButton(EditorGUIUtility.TempContent(label), options);
-        }
-
-        public static bool LinkButton(GUIContent label, params GUILayoutOption[] options)
-        {
-            var position = s_LastRect = GUILayoutUtility.GetRect(label, EditorStyles.linkLabel, options);
-
-            Handles.color = EditorStyles.linkLabel.normal.textColor;
-            Handles.DrawLine(new Vector3(position.xMin + EditorStyles.linkLabel.padding.left, position.yMax), new Vector3(position.xMax - EditorStyles.linkLabel.padding.right, position.yMax));
-            Handles.color = Color.white;
-
-            EditorGUIUtility.AddCursorRect(position, MouseCursor.Link);
-
-            return GUI.Button(position, label, EditorStyles.linkLabel);
-        }
-
-        public static bool Toggle(bool value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetToggleRect(false, options);
-            return EditorGUI.Toggle(r, value);
-        }
-
-        public static bool Toggle(string label, bool value, params GUILayoutOption[] options)
-        {
-            return Toggle(EditorGUIUtility.TempContent(label), value, options);
-        }
-
-        public static bool Toggle(GUIContent label, bool value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetToggleRect(true, options);
-            return EditorGUI.Toggle(r, label, value);
-        }
-
-        public static bool Toggle(bool value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetToggleRect(false, options);
-            return EditorGUI.Toggle(r, value, style);
-        }
-
-        public static bool Toggle(string label, bool value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            return Toggle(EditorGUIUtility.TempContent(label), value, style, options);
-        }
-
-        // Make a toggle.
-        public static bool Toggle(GUIContent label, bool value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetToggleRect(true, options);
-            return EditorGUI.Toggle(r, label, value, style);
-        }
-
-        public static bool ToggleLeft(string label, bool value, params GUILayoutOption[] options)
-        {
-            return ToggleLeft(EditorGUIUtility.TempContent(label), value, options);
-        }
-
-        public static bool ToggleLeft(GUIContent label, bool value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, options);
-            return EditorGUI.ToggleLeft(r, label, value);
-        }
-
-        public static bool ToggleLeft(string label, bool value, GUIStyle labelStyle, params GUILayoutOption[] options)
-        {
-            return ToggleLeft(EditorGUIUtility.TempContent(label), value, labelStyle, options);
-        }
-
-        // Make a toggle with the label on the right.
-        public static bool ToggleLeft(GUIContent label, bool value, GUIStyle labelStyle, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, options);
-            return EditorGUI.ToggleLeft(r, label, value, labelStyle);
-        }
-
-        public static string TextField(string text, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
-            return EditorGUI.TextField(r, text);
-        }
-
-        public static string TextField(string text, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.TextField(r, text, style);
-        }
-
-        public static string TextField(string label, string text, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
-            return EditorGUI.TextField(r, label, text);
-        }
-
-        public static string TextField(string label, string text, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.TextField(r, label, text, style);
-        }
-
-        public static string TextField(GUIContent label, string text, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
-            return EditorGUI.TextField(r, label, text);
-        }
-
-        // Make a text field.
-        public static string TextField(GUIContent label, string text, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.TextField(r, label, text, style);
-        }
-
-        public static string DelayedTextField(string text, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
-            return EditorGUI.DelayedTextField(r, text);
-        }
-
-        public static string DelayedTextField(string text, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedTextField(r, text, style);
-        }
-
-        public static string DelayedTextField(string label, string text, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
-            return EditorGUI.DelayedTextField(r, label, text);
-        }
-
-        public static string DelayedTextField(string label, string text, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedTextField(r, label, text, style);
-        }
-
-        public static string DelayedTextField(GUIContent label, string text, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
-            return EditorGUI.DelayedTextField(r, label, text);
-        }
-
-        // Make a delayed text field.
-        public static string DelayedTextField(GUIContent label, string text, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedTextField(r, label, text, style);
-        }
-
-        public static void DelayedTextField(SerializedProperty property, params GUILayoutOption[] options)
-        {
-            DelayedTextField(property, null, options);
-        }
-
-        // Make a delayed text field.
-        internal static void DelayedTextField(SerializedProperty property, GUIContent label, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(EditorGUI.LabelHasContent(label), EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
-            EditorGUI.DelayedTextFieldHelper(r, property, label, style);
-        }
-
-        public static void DelayedTextField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
-        {
-            DelayedTextField(property, label, EditorStyles.textField, options);
-        }
-
-        internal static string ToolbarSearchField(string text, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GUILayoutUtility.GetRect(0, kLabelFloatMaxW * 1.5f, EditorGUI.kSingleLineHeight, EditorGUI.kSingleLineHeight, EditorStyles.toolbarSearchField, options);
-            int i = 0;
-            return EditorGUI.ToolbarSearchField(r, null, ref i, text);
-        }
-
-        internal static string ToolbarSearchField(string text, string[] searchModes, ref int searchMode, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GUILayoutUtility.GetRect(0, kLabelFloatMaxW * 1.5f, EditorGUI.kSingleLineHeight, EditorGUI.kSingleLineHeight, EditorStyles.toolbarSearchField, options);
-            return EditorGUI.ToolbarSearchField(r, searchModes, ref searchMode, text);
-        }
-
-        public static string TextArea(string text, params GUILayoutOption[] options)
-        { return TextArea(text, EditorStyles.textField, options); }
-        // Make a text area.
-        public static string TextArea(string text, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GUILayoutUtility.GetRect(EditorGUIUtility.TempContent(text), style, options);
-            return EditorGUI.TextArea(r, text, style);
-        }
-
-        public static void SelectableLabel(string text, params GUILayoutOption[] options)
-        {
-            SelectableLabel(text, EditorStyles.label, options);
-        }
-
-        // Make a selectable label field. (Useful for showing read-only info that can be copy-pasted.)
-        public static void SelectableLabel(string text, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight * 2, style, options);
-            EditorGUI.SelectableLabel(r, text, style);
-        }
-
-        internal static Event KeyEventField(Event e, params GUILayoutOption[] options)
-        {
-            Rect r = GUILayoutUtility.GetRect(EditorGUI.s_PleasePressAKey, GUI.skin.textField, options);
-            return EditorGUI.KeyEventField(r, e);
-        }
-
-        public static string PasswordField(string password, params GUILayoutOption[] options)
-        {
-            return PasswordField(password, EditorStyles.textField, options);
-        }
-
-        public static string PasswordField(string password, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.PasswordField(r, password, style);
-        }
-
-        public static string PasswordField(string label, string password, params GUILayoutOption[] options)
-        {
-            return PasswordField(EditorGUIUtility.TempContent(label), password, EditorStyles.textField, options);
-        }
-
-        public static string PasswordField(string label, string password, GUIStyle style, params GUILayoutOption[] options)
-        {
-            return PasswordField(EditorGUIUtility.TempContent(label), password, style, options);
-        }
-
-        public static string PasswordField(GUIContent label, string password, params GUILayoutOption[] options)
-        {
-            return PasswordField(label, password, EditorStyles.textField, options);
-        }
-
-        // Make a text field where the user can enter a password.
-        public static string PasswordField(GUIContent label, string password, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.PasswordField(r, label, password, style);
-        }
-
-        // Peak smoothing should be handled by client. Input: value and peak is normalized values (0 - 1).
-        internal static void VUMeterHorizontal(float value, float peak, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            EditorGUI.VUMeter.HorizontalMeter(r, value, peak, EditorGUI.VUMeter.horizontalVUTexture, Color.grey);
-        }
-
-        // Auto-smoothing of peak
-        internal static void VUMeterHorizontal(float value, ref EditorGUI.VUMeter.SmoothingData data, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            EditorGUI.VUMeter.HorizontalMeter(r, value, ref data, EditorGUI.VUMeter.horizontalVUTexture, Color.grey);
-        }
-
-        public static float FloatField(float value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.FloatField(r, value);
-        }
-
-        public static float FloatField(float value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.FloatField(r, value, style);
-        }
-
-        public static float FloatField(string label, float value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.FloatField(r, label, value);
-        }
-
-        public static float FloatField(string label, float value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.FloatField(r, label, value, style);
-        }
-
-        public static float FloatField(GUIContent label, float value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.FloatField(r, label, value);
-        }
-
-        // Make a text field for entering float values.
-        public static float FloatField(GUIContent label, float value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.FloatField(r, label, value, style);
-        }
-
-        public static float DelayedFloatField(float value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.DelayedFloatField(r, value);
-        }
-
-        public static float DelayedFloatField(float value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedFloatField(r, value, style);
-        }
-
-        public static float DelayedFloatField(string label, float value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.DelayedFloatField(r, label, value);
-        }
-
-        public static float DelayedFloatField(string label, float value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedFloatField(r, label, value, style);
-        }
-
-        public static float DelayedFloatField(GUIContent label, float value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.DelayedFloatField(r, label, value);
-        }
-
-        // Make a delayed text field for entering float values.
-        public static float DelayedFloatField(GUIContent label, float value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedFloatField(r, label, value, style);
-        }
-
-        public static void DelayedFloatField(SerializedProperty property, params GUILayoutOption[] options)
-        {
-            DelayedFloatField(property, null, options);
-        }
-
-        // Make a delayed text field for entering float values.
-        public static void DelayedFloatField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(EditorGUI.LabelHasContent(label), EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            EditorGUI.DelayedFloatField(r, property, label);
-        }
-
-        public static double DoubleField(double value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.DoubleField(r, value);
-        }
-
-        public static double DoubleField(double value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DoubleField(r, value, style);
-        }
-
-        public static double DoubleField(string label, double value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.DoubleField(r, label, value);
-        }
-
-        public static double DoubleField(string label, double value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DoubleField(r, label, value, style);
-        }
-
-        public static double DoubleField(GUIContent label, double value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.DoubleField(r, label, value);
-        }
-
-        // Make a text field for entering double values.
-        public static double DoubleField(GUIContent label, double value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DoubleField(r, label, value, style);
-        }
-
-        public static double DelayedDoubleField(double value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.DelayedDoubleField(r, value);
-        }
-
-        public static double DelayedDoubleField(double value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedDoubleField(r, value, style);
-        }
-
-        public static double DelayedDoubleField(string label, double value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.DelayedDoubleField(r, label, value);
-        }
-
-        public static double DelayedDoubleField(string label, double value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedDoubleField(r, label, value, style);
-        }
-
-        public static double DelayedDoubleField(GUIContent label, double value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            return EditorGUI.DelayedDoubleField(r, label, value);
-        }
-
-        // Make a delayed text field for entering double values.
-        public static double DelayedDoubleField(GUIContent label, double value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedDoubleField(r, label, value, style);
-        }
-
-        public static int IntField(int value, params GUILayoutOption[] options)
-        {
-            return IntField(value, EditorStyles.numberField, options);
-        }
-
-        public static int IntField(int value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.IntField(r, value, style);
-        }
-
-        public static int IntField(string label, int value, params GUILayoutOption[] options)
-        {
-            return IntField(label, value, EditorStyles.numberField, options);
-        }
-
-        public static int IntField(string label, int value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.IntField(r, label, value, style);
-        }
-
-        public static int IntField(GUIContent label, int value, params GUILayoutOption[] options)
-        {
-            return IntField(label, value, EditorStyles.numberField, options);
-        }
-
-        // Make a text field for entering integers.
-        public static int IntField(GUIContent label, int value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.IntField(r, label, value, style);
-        }
-
-        public static int DelayedIntField(int value, params GUILayoutOption[] options)
-        {
-            return DelayedIntField(value, EditorStyles.numberField, options);
-        }
-
-        public static int DelayedIntField(int value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedIntField(r, value, style);
-        }
-
-        public static int DelayedIntField(string label, int value, params GUILayoutOption[] options)
-        {
-            return DelayedIntField(label, value, EditorStyles.numberField, options);
-        }
-
-        public static int DelayedIntField(string label, int value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedIntField(r, label, value, style);
-        }
-
-        public static int DelayedIntField(GUIContent label, int value, params GUILayoutOption[] options)
-        {
-            return DelayedIntField(label, value, EditorStyles.numberField, options);
-        }
-
-        // Make a text field for entering integers.
-        public static int DelayedIntField(GUIContent label, int value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.DelayedIntField(r, label, value, style);
-        }
-
-        public static void DelayedIntField(SerializedProperty property, params GUILayoutOption[] options)
-        {
-            DelayedIntField(property, null, options);
-        }
-
-        // Make a text field for entering integers.
-        public static void DelayedIntField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(EditorGUI.LabelHasContent(label), EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-            EditorGUI.DelayedIntField(r, property, label);
-        }
-
-        public static long LongField(long value, params GUILayoutOption[] options)
-        {
-            return LongField(value, EditorStyles.numberField, options);
-        }
-
-        public static long LongField(long value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.LongField(r, value, style);
-        }
-
-        public static long LongField(string label, long value, params GUILayoutOption[] options)
-        {
-            return LongField(label, value, EditorStyles.numberField, options);
-        }
-
-        public static long LongField(string label, long value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.LongField(r, label, value, style);
-        }
-
-        public static long LongField(GUIContent label, long value, params GUILayoutOption[] options)
-        {
-            return LongField(label, value, EditorStyles.numberField, options);
-        }
-
-        // Make a text field for entering integers.
-        public static long LongField(GUIContent label, long value, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.LongField(r, label, value, style);
-        }
-
-        public static float Slider(float value, float leftValue, float rightValue, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(false, options);
-            return EditorGUI.Slider(r, value, leftValue, rightValue);
-        }
-
-        public static float Slider(string label, float value, float leftValue, float rightValue, params GUILayoutOption[] options)
-        {
-            return Slider(EditorGUIUtility.TempContent(label), value, leftValue, rightValue, options);
-        }
-
-        // Make a slider the user can drag to change a value between a min and a max.
-        public static float Slider(GUIContent label, float value, float leftValue, float rightValue, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(true, options);
-            return EditorGUI.Slider(r, label, value, leftValue, rightValue);
-        }
-
-        internal static float Slider(GUIContent label, float value, float sliderLeftValue, float sliderRightValue, float textLeftValue, float textRightValue, params GUILayoutOption[] options)
-        {
-            return Slider(label, value, sliderLeftValue, sliderRightValue, textLeftValue, textRightValue, EditorStyles.numberField,
-                GUI.skin.horizontalSlider, GUI.skin.horizontalSliderThumb, null, GUI.skin.horizontalSliderThumbExtent, options);
-        }
-
-        static void GetSliderParts(GUIStyle baseStyle, ref GUIStyle textFieldStyle, ref GUIStyle thumbStyle, ref GUIStyle thumbExtentStyle)
-        {
-            string baseName = baseStyle.name;
-            thumbStyle = GUI.skin.FindStyle(baseName + "Thumb") ?? thumbStyle;
-            thumbExtentStyle = GUI.skin.FindStyle(baseName + "ThumbExtent") ?? thumbExtentStyle;
-            textFieldStyle = GUI.skin.FindStyle(baseName + "TextField") ?? textFieldStyle;
-        }
-
-        static void GetHorizontalSliderParts(GUIStyle baseStyle, out GUIStyle textFieldStyle, out GUIStyle thumbStyle, out GUIStyle thumbExtentStyle)
-        {
-            thumbStyle = GUI.skin.horizontalSliderThumb;
-            thumbExtentStyle = GUI.skin.horizontalSliderThumbExtent;
-            textFieldStyle = EditorStyles.numberField;
-
-            GetSliderParts(baseStyle, ref textFieldStyle, ref thumbStyle, ref thumbExtentStyle);
-        }
-
-        static void GetVerticalSliderParts(GUIStyle baseStyle, out GUIStyle textFieldStyle, out GUIStyle thumbStyle, out GUIStyle thumbExtentStyle)
-        {
-            thumbStyle = GUI.skin.verticalSliderThumb;
-            thumbExtentStyle = GUI.skin.verticalSliderThumbExtent;
-            textFieldStyle = EditorStyles.numberField;
-
-            GetSliderParts(baseStyle, ref textFieldStyle, ref thumbStyle, ref thumbExtentStyle);
-        }
-
-        internal static float Slider(GUIContent label, float value, float sliderLeftValue, float sliderRightValue, float textLeftValue, float textRightValue, GUIStyle sliderStyle, params GUILayoutOption[] options)
-        {
-            GUIStyle sliderThumbStyle, sliderThumbStyleExtent, sliderTextFieldStyle;
-
-            GetHorizontalSliderParts(sliderStyle, out sliderTextFieldStyle, out sliderThumbStyle, out sliderThumbStyleExtent);
-
-            return Slider(label, value, sliderLeftValue, sliderRightValue, textLeftValue, textRightValue, sliderTextFieldStyle, sliderStyle
-                , sliderThumbStyle, null, sliderThumbStyleExtent);
-        }
-
-        internal static float Slider(GUIContent label, float value, float sliderLeftValue, float sliderRightValue, float textLeftValue, float textRightValue
-            , GUIStyle sliderTextField, GUIStyle sliderStyle, GUIStyle sliderThumbStyle, Texture2D sliderBackground, GUIStyle sliderThumbStyleExtent, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(true, sliderStyle, options);
-            return EditorGUI.Slider(r, label, value, sliderLeftValue, sliderRightValue, textLeftValue, textRightValue, sliderTextField, sliderStyle, sliderThumbStyle, sliderBackground, sliderThumbStyleExtent);
-        }
-
-        public static void Slider(SerializedProperty property, float leftValue, float rightValue, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(false, options);
-            EditorGUI.Slider(r, property, leftValue, rightValue);
-        }
-
-        public static void Slider(SerializedProperty property, float leftValue, float rightValue, string label, params GUILayoutOption[] options)
-        {
-            Slider(property, leftValue, rightValue, EditorGUIUtility.TempContent(label), options);
-        }
-
-        // Make a slider the user can drag to change a value between a min and a max.
-        public static void Slider(SerializedProperty property, float leftValue, float rightValue, GUIContent label, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(true, options);
-            EditorGUI.Slider(r, property, leftValue, rightValue, label);
-        }
-
-        internal static void Slider(SerializedProperty property, float sliderLeftValue, float sliderRightValue, float textLeftValue, float textRightValue, GUIContent label, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(true, options);
-            EditorGUI.Slider(r, property, sliderLeftValue, sliderRightValue, textLeftValue, textRightValue, label);
-        }
-
-        internal static float PowerSlider(string label, float value, float leftValue, float rightValue, float power, params GUILayoutOption[] options)
-        {
-            return PowerSlider(EditorGUIUtility.TempContent(label), value, leftValue, rightValue, power, options);
-        }
-
-        // Make a power slider the user can drag to change a value between a min and a max.
-        internal static float PowerSlider(GUIContent label, float value, float leftValue, float rightValue, float power, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(true, options);
-            return EditorGUI.PowerSlider(r, label, value, leftValue, rightValue, power);
-        }
-
-        public static int IntSlider(int value, int leftValue, int rightValue, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(false, options);
-            return EditorGUI.IntSlider(r, value, leftValue, rightValue);
-        }
-
-        internal static int IntSlider(int value, int leftValue, int rightValue, float power, GUIStyle sliderStyle, params GUILayoutOption[] options)
-        {
-            GUIStyle sliderThumbStyle, sliderThumbStyleExtent, sliderTextFieldStyle;
-
-            GetHorizontalSliderParts(sliderStyle, out sliderTextFieldStyle, out sliderThumbStyle, out sliderThumbStyleExtent);
-
-            return IntSlider(value, leftValue, rightValue, power, sliderTextFieldStyle, sliderStyle, sliderThumbStyle, null, sliderThumbStyleExtent, options);
-        }
-
-        internal static int IntSlider(int value, int leftValue, int rightValue, float power,
-            GUIStyle textfieldStyle, GUIStyle sliderStyle, GUIStyle thumbStyle, Texture2D sliderBackground, GUIStyle thumbStyleExtent, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(false, sliderStyle, options);
-            return EditorGUI.IntSlider(r, value, leftValue, rightValue, power, textfieldStyle, sliderStyle, thumbStyle, sliderBackground, thumbStyleExtent);
-        }
-
-        public static int IntSlider(string label, int value, int leftValue, int rightValue, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(true, options);
-            return EditorGUI.IntSlider(r, label, value, leftValue, rightValue);
-        }
-
-        // Make a slider the user can drag to change an integer value between a min and a max.
-        public static int IntSlider(GUIContent label, int value, int leftValue, int rightValue, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(true, options);
-            return EditorGUI.IntSlider(r, label, value, leftValue, rightValue);
-        }
-
-        public static void IntSlider(SerializedProperty property, int leftValue, int rightValue, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(false, options);
-            EditorGUI.IntSlider(r, property, leftValue, rightValue, property.displayName);
-        }
-
-        public static void IntSlider(SerializedProperty property, int leftValue, int rightValue, string label, params GUILayoutOption[] options)
-        {
-            IntSlider(property, leftValue, rightValue, EditorGUIUtility.TempContent(label), options);
-        }
-
-        // Make a slider the user can drag to change an integer value between a min and a max.
-        public static void IntSlider(SerializedProperty property, int leftValue, int rightValue, GUIContent label, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(true, options);
-            EditorGUI.IntSlider(r, property, leftValue, rightValue, label);
-        }
-
-        public static void MinMaxSlider(ref float minValue, ref float maxValue, float minLimit, float maxLimit, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(false, options);
-            EditorGUI.MinMaxSlider(r, ref minValue, ref maxValue, minLimit, maxLimit);
-        }
-
-        public static void MinMaxSlider(string label, ref float minValue, ref float maxValue, float minLimit, float maxLimit, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(true, options);
-            EditorGUI.MinMaxSlider(r, label, ref minValue, ref maxValue, minLimit, maxLimit);
-        }
-
-        // Make a special slider the user can use to specify a range between a min and a max.
-        public static void MinMaxSlider(GUIContent label, ref float minValue, ref float maxValue, float minLimit, float maxLimit, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetSliderRect(true, options);
-            EditorGUI.MinMaxSlider(r, label, ref minValue, ref maxValue, minLimit, maxLimit);
-        }
-
-        public static int Popup(int selectedIndex, string[] displayedOptions, params GUILayoutOption[] options)
-        {
-            return Popup(selectedIndex, displayedOptions, EditorStyles.popup, options);
-        }
-
-        public static int Popup(int selectedIndex, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.Popup(r, selectedIndex, displayedOptions, style);
-        }
-
-        public static int Popup(int selectedIndex, GUIContent[] displayedOptions, params GUILayoutOption[] options)
-        {
-            return Popup(selectedIndex, displayedOptions, EditorStyles.popup, options);
-        }
-
-        public static int Popup(int selectedIndex, GUIContent[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.Popup(r, selectedIndex, displayedOptions, style);
-        }
-
-        public static int Popup(string label, int selectedIndex, string[] displayedOptions, params GUILayoutOption[] options)
-        {
-            return Popup(label, selectedIndex, displayedOptions, EditorStyles.popup, options);
-        }
-
-        public static int Popup(GUIContent label, int selectedIndex, string[] displayedOptions, params GUILayoutOption[] options)
-        {
-            return Popup(label, selectedIndex, displayedOptions, EditorStyles.popup, options);
-        }
-
-        public static int Popup(string label, int selectedIndex, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.Popup(r, label, selectedIndex, displayedOptions, style);
-        }
-
-        public static int Popup(GUIContent label, int selectedIndex, GUIContent[] displayedOptions, params GUILayoutOption[] options)
-        {
-            return Popup(label, selectedIndex, displayedOptions, EditorStyles.popup, options);
-        }
-
-        // Make a generic popup selection field.
-        public static int Popup(GUIContent label, int selectedIndex, GUIContent[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.Popup(r, label, selectedIndex, displayedOptions, style);
-        }
-
-        internal static int Popup(GUIContent label, int selectedIndex, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.Popup(r, label, selectedIndex, displayedOptions, style);
-        }
-
-        internal static void Popup(SerializedProperty property, GUIContent[] displayedOptions, params GUILayoutOption[] options)
-        {
-            Popup(property, displayedOptions, null, options);
-        }
-
-        internal static void Popup(SerializedProperty property, GUIContent[] displayedOptions, GUIContent label, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup, options);
-            EditorGUI.Popup(r, property, displayedOptions, label);
-        }
-
-        public static Enum EnumPopup(Enum selected, params GUILayoutOption[] options)
-        {
-            return EnumPopup(selected, EditorStyles.popup, options);
-        }
-
-        public static Enum EnumPopup(Enum selected, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.EnumPopup(r, selected, style);
-        }
-
-        public static Enum EnumPopup(string label, Enum selected, params GUILayoutOption[] options)
-        {
-            return EnumPopup(label, selected, EditorStyles.popup, options);
-        }
-
-        public static Enum EnumPopup(string label, Enum selected, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.EnumPopup(r, GUIContent.Temp(label), selected, null, false, style);
-        }
-
-        public static Enum EnumPopup(GUIContent label, Enum selected, params GUILayoutOption[] options)
-        {
-            return EnumPopup(label, selected, EditorStyles.popup, options);
-        }
-
-        // Make an enum popup selection field.
-        public static Enum EnumPopup(GUIContent label, Enum selected, GUIStyle style, params GUILayoutOption[] options)
-        {
-            return EnumPopup(label, selected, null, false, style, options);
-        }
-
-        public static Enum EnumPopup(GUIContent label, Enum selected, Func<Enum, bool> checkEnabled, bool includeObsolete, params GUILayoutOption[] options)
-        {
-            return EnumPopup(label, selected, checkEnabled, includeObsolete, EditorStyles.popup, options);
-        }
-
-        public static Enum EnumPopup(GUIContent label, Enum selected, Func<Enum, bool> checkEnabled, bool includeObsolete, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.EnumPopup(r, label, selected, checkEnabled, includeObsolete, style);
-        }
-
-        public static int IntPopup(int selectedValue, string[] displayedOptions, int[] optionValues, params GUILayoutOption[] options)
-        {
-            return IntPopup(selectedValue, displayedOptions, optionValues, EditorStyles.popup, options);
-        }
-
-        public static int IntPopup(int selectedValue, string[] displayedOptions, int[] optionValues, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.IntPopup(r,  selectedValue, displayedOptions, optionValues, style);
-        }
-
-        public static int IntPopup(int selectedValue, GUIContent[] displayedOptions, int[] optionValues, params GUILayoutOption[] options)
-        {
-            return IntPopup(selectedValue, displayedOptions, optionValues, EditorStyles.popup, options);
-        }
-
-        public static int IntPopup(int selectedValue, GUIContent[] displayedOptions, int[] optionValues, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.IntPopup(r,  GUIContent.none, selectedValue, displayedOptions, optionValues, style);
-        }
-
-        public static int IntPopup(string label, int selectedValue, string[] displayedOptions, int[] optionValues, params GUILayoutOption[] options)
-        {
-            return IntPopup(label, selectedValue, displayedOptions, optionValues, EditorStyles.popup, options);
-        }
-
-        public static int IntPopup(string label, int selectedValue, string[] displayedOptions, int[] optionValues, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.IntPopup(r, label, selectedValue, displayedOptions, optionValues, style);
-        }
-
-        public static int IntPopup(GUIContent label, int selectedValue, GUIContent[] displayedOptions, int[] optionValues, params GUILayoutOption[] options)
-        {
-            return IntPopup(label, selectedValue, displayedOptions, optionValues, EditorStyles.popup, options);
-        }
-
-        // Make an integer popup selection field.
-        public static int IntPopup(GUIContent label, int selectedValue, GUIContent[] displayedOptions, int[] optionValues, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.IntPopup(r, label, selectedValue, displayedOptions, optionValues, style);
-        }
-
-        public static void IntPopup(SerializedProperty property, GUIContent[] displayedOptions, int[] optionValues, params GUILayoutOption[] options)
-        {
-            IntPopup(property, displayedOptions, optionValues, null, options);
-        }
-
-        // Make an integer popup selection field.
-        public static void IntPopup(SerializedProperty property, GUIContent[] displayedOptions, int[] optionValues, GUIContent label, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup, options);
-            EditorGUI.IntPopup(r, property, displayedOptions, optionValues, label);
-        }
-
-        [Obsolete("This function is obsolete and the style is not used.")]
-        public static void IntPopup(SerializedProperty property, GUIContent[] displayedOptions, int[] optionValues, GUIContent label, GUIStyle style, params GUILayoutOption[] options)
-        {
-            IntPopup(property, displayedOptions, optionValues, label, options);
-        }
-
-        public static string TagField(string tag, params GUILayoutOption[] options)
-        {
-            return TagField(tag, EditorStyles.popup, options);
-        }
-
-        public static string TagField(string tag, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.TagField(r, tag, style);
-        }
-
-        public static string TagField(string label, string tag, params GUILayoutOption[] options)
-        {
-            return TagField(EditorGUIUtility.TempContent(label), tag, EditorStyles.popup, options);
-        }
-
-        public static string TagField(string label, string tag, GUIStyle style, params GUILayoutOption[] options)
-        {
-            return TagField(EditorGUIUtility.TempContent(label), tag, style, options);
-        }
-
-        public static string TagField(GUIContent label, string tag, params GUILayoutOption[] options)
-        {
-            return TagField(label, tag, EditorStyles.popup, options);
-        }
-
-        // Make a tag selection field.
-        public static string TagField(GUIContent label, string tag, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.TagField(r, label, tag, style);
-        }
-
-        public static int LayerField(int layer, params GUILayoutOption[] options)
-        {
-            return LayerField(layer, EditorStyles.popup, options);
-        }
-
-        public static int LayerField(int layer, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.LayerField(r, layer, style);
-        }
-
-        public static int LayerField(string label, int layer, params GUILayoutOption[] options)
-        {
-            return LayerField(EditorGUIUtility.TempContent(label), layer, EditorStyles.popup, options);
-        }
-
-        public static int LayerField(string label, int layer, GUIStyle style, params GUILayoutOption[] options)
-        {
-            return LayerField(EditorGUIUtility.TempContent(label), layer, style, options);
-        }
-
-        public static int LayerField(GUIContent label, int layer, params GUILayoutOption[] options)
-        {
-            return LayerField(label, layer, EditorStyles.popup, options);
-        }
-
-        // Make a layer selection field.
-        public static int LayerField(GUIContent label, int layer, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.LayerField(r, label, layer, style);
-        }
-
-        public static int MaskField(GUIContent label, int mask, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
-        {
-            var r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.MaskField(r, label, mask, displayedOptions, style);
-        }
-
-        public static int MaskField(string label, int mask, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
-        {
-            var r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.MaskField(r, label, mask, displayedOptions, style);
-        }
-
-        public static int MaskField(GUIContent label, int mask, string[] displayedOptions, params GUILayoutOption[] options)
-        {
-            var r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup, options);
-            return EditorGUI.MaskField(r, label, mask, displayedOptions, EditorStyles.popup);
-        }
-
-        public static int MaskField(string label, int mask, string[] displayedOptions, params GUILayoutOption[] options)
-        {
-            var r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup, options);
-            return EditorGUI.MaskField(r, label, mask, displayedOptions, EditorStyles.popup);
-        }
-
-        public static int MaskField(int mask, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
-        {
-            var r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.MaskField(r, mask, displayedOptions, style);
-        }
-
-        // Make a field for masks.
-        public static int MaskField(int mask, string[] displayedOptions, params GUILayoutOption[] options)
-        {
-            var r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.popup, options);
-            return EditorGUI.MaskField(r, mask, displayedOptions, EditorStyles.popup);
-        }
-
-        public static Enum EnumFlagsField(Enum enumValue, params GUILayoutOption[] options)
-        {
-            return EnumFlagsField(enumValue, EditorStyles.popup, options);
-        }
-
-        public static Enum EnumFlagsField(Enum enumValue, GUIStyle style, params GUILayoutOption[] options)
-        {
-            var position = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.EnumFlagsField(position, enumValue, style);
-        }
-
-        public static Enum EnumFlagsField(string label, Enum enumValue, params GUILayoutOption[] options)
-        {
-            return EnumFlagsField(label, enumValue, EditorStyles.popup, options);
-        }
-
-        public static Enum EnumFlagsField(string label, Enum enumValue, GUIStyle style, params GUILayoutOption[] options)
-        {
-            return EnumFlagsField(EditorGUIUtility.TempContent(label), enumValue, style, options);
-        }
-
-        public static Enum EnumFlagsField(GUIContent label, Enum enumValue, params GUILayoutOption[] options)
-        {
-            return EnumFlagsField(label, enumValue, EditorStyles.popup, options);
-        }
-
-        public static Enum EnumFlagsField(GUIContent label, Enum enumValue, GUIStyle style, params GUILayoutOption[] options)
-        {
-            var position = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.EnumFlagsField(position, label, enumValue, style);
-        }
-
-        public static Enum EnumFlagsField(GUIContent label, Enum enumValue, bool includeObsolete, params GUILayoutOption[] options)
-        {
-            return EnumFlagsField(label, enumValue, includeObsolete, EditorStyles.popup, options);
-        }
-
-        public static Enum EnumFlagsField(GUIContent label, Enum enumValue, bool includeObsolete, GUIStyle style, params GUILayoutOption[] options)
-        {
-            var position = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.EnumFlagsField(position, label, enumValue, includeObsolete, style);
-        }
-
-        [Obsolete("Check the docs for the usage of the new parameter 'allowSceneObjects'.")]
-        public static Object ObjectField(Object obj, Type objType, params GUILayoutOption[] options)
-        {
-            return ObjectField(obj, objType, true, options);
-        }
-
-        public static Object ObjectField(Object obj, Type objType, Object targetBeingEdited, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, options);
-            return EditorGUI.ObjectField(r, obj, objType, targetBeingEdited);
-        }
-
-        public static Object ObjectField(Object obj, Type objType, bool allowSceneObjects, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, options);
-            return EditorGUI.ObjectField(r, obj, objType, allowSceneObjects);
-        }
-
-        [Obsolete("Check the docs for the usage of the new parameter 'allowSceneObjects'.")]
-        public static Object ObjectField(string label, Object obj, Type objType, params GUILayoutOption[] options)
-        {
-            return ObjectField(label, obj, objType, true, options);
-        }
-
-        public static Object ObjectField(string label, Object obj, Type objType, Object targetBeingEdited, params GUILayoutOption[] options)
-        {
-            return ObjectField(EditorGUIUtility.TempContent(label), obj, objType, targetBeingEdited, options);
-        }
-
-        public static Object ObjectField(string label, Object obj, Type objType, bool allowSceneObjects, params GUILayoutOption[] options)
-        {
-            return ObjectField(EditorGUIUtility.TempContent(label), obj, objType, allowSceneObjects, options);
-        }
-
-        [Obsolete("Check the docs for the usage of the new parameter 'allowSceneObjects'.")]
-        public static Object ObjectField(GUIContent label, Object obj, Type objType, params GUILayoutOption[] options)
-        {
-            return ObjectField(label, obj, objType, true, options);
-        }
-
-        // Make an object field. You can assign objects either by drag'n drop objects or by selecting an object using the Object Picker.
-        public static Object ObjectField(GUIContent label, Object obj, Type objType, Object targetBeingEdited, params GUILayoutOption[] options)
-        {
-            var height = EditorGUIUtility.HasObjectThumbnail(objType) ? EditorGUI.kObjectFieldThumbnailHeight : EditorGUI.kSingleLineHeight;
-            Rect r = s_LastRect = GetControlRect(true, height, options);
-            return EditorGUI.ObjectField(r, label, obj, objType, targetBeingEdited);
-        }
-
-        // Make an object field. You can assign objects either by drag'n drop objects or by selecting an object using the Object Picker.
-        public static Object ObjectField(GUIContent label, Object obj, Type objType, bool allowSceneObjects, params GUILayoutOption[] options)
-        {
-            var height = EditorGUIUtility.HasObjectThumbnail(objType) ? EditorGUI.kObjectFieldThumbnailHeight : EditorGUI.kSingleLineHeight;
-            Rect r = s_LastRect = GetControlRect(true, height, options);
-            return EditorGUI.ObjectField(r, label, obj, objType, allowSceneObjects);
-        }
-
-        public static void ObjectField(SerializedProperty property, params GUILayoutOption[] options)
-        {
-            ObjectField(property, (GUIContent)null, options);
-        }
-
-        public static void ObjectField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.objectField, options);
-            EditorGUI.ObjectField(r, property, label);
-        }
-
-        public static void ObjectField(SerializedProperty property, Type objType, params GUILayoutOption[] options)
-        {
-            ObjectField(property, objType, null, options);
-        }
-
-        // Make an object field. You can assign objects either by drag'n drop objects or by selecting an object using the Object Picker.
-        public static void ObjectField(SerializedProperty property, Type objType, GUIContent label, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.objectField, options);
-            EditorGUI.ObjectField(r, property, objType, label);
-        }
-
-        internal static void ObjectField(SerializedProperty property, Type objType, GUIContent label, EditorGUI.ObjectFieldValidator validator, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.objectField, options);
-            EditorGUI.ObjectField(r, property, objType, label, EditorStyles.objectField, validator);
-        }
-
-        internal static Object MiniThumbnailObjectField(GUIContent label, Object obj, Type objType, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, options);
-            return EditorGUI.MiniThumbnailObjectField(r, label, obj, objType);
-        }
-
-        public static Vector2 Vector2Field(string label, Vector2 value, params GUILayoutOption[] options)
-        {
-            return Vector2Field(EditorGUIUtility.TempContent(label), value, options);
-        }
-
-        // Make an X & Y field for entering a [[Vector2]].
-        public static Vector2 Vector2Field(GUIContent label, Vector2 value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector2, label), EditorStyles.numberField, options);
-            return EditorGUI.Vector2Field(r, label, value);
-        }
-
-        public static Vector3 Vector3Field(string label, Vector3 value, params GUILayoutOption[] options)
-        {
-            return Vector3Field(EditorGUIUtility.TempContent(label), value, options);
-        }
-
-        // Make an X, Y & Z field for entering a [[Vector3]].
-        public static Vector3 Vector3Field(GUIContent label, Vector3 value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector3, label), EditorStyles.numberField, options);
-            return EditorGUI.Vector3Field(r, label, value);
-        }
-
-        // Make an X, Y & Z field for entering a [[Vector3]], with a "lock"
-        internal static Vector3 LinkedVector3Field(GUIContent label, Vector3 value, ref bool proportionalScale, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector3, label), EditorStyles.numberField, options);
-            return EditorGUI.LinkedVector3Field(r, label, value, ref proportionalScale);
-        }
-
-        // Make an X, Y & Z field for entering a [[Vector3]], with a "lock"
-        internal static Vector3 LinkedVector3Field(GUIContent label, Vector3 value, Vector3 initialValue, ref bool proportionalScale, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector3, label), EditorStyles.numberField, options);
-            int axisModified = 0;// Use X as default modified axis
-            return EditorGUI.LinkedVector3Field(r, label, GUIContent.none, value, ref proportionalScale, initialValue, 0, ref axisModified, null);
-        }
-
-        // Make an X, Y, Z & W field for entering a [[Vector4]].
-        public static Vector4 Vector4Field(string label, Vector4 value, params GUILayoutOption[] options)
-        {
-            return Vector4Field(EditorGUIUtility.TempContent(label), value, options);
-        }
-
-        // Make an X, Y, Z & W field for entering a [[Vector4]].
-        public static Vector4 Vector4Field(GUIContent label, Vector4 value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector4, label), EditorStyles.numberField, options);
-            return EditorGUI.Vector4Field(r, label, value);
-        }
-
-        public static Vector2Int Vector2IntField(string label, Vector2Int value, params GUILayoutOption[] options)
-        {
-            return Vector2IntField(EditorGUIUtility.TempContent(label), value, options);
-        }
-
-        // Make an X & Y field for entering a [[Vector2Int]].
-        public static Vector2Int Vector2IntField(GUIContent label, Vector2Int value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector2Int, label), EditorStyles.numberField, options);
-            return EditorGUI.Vector2IntField(r, label, value);
-        }
-
-        public static Vector3Int Vector3IntField(string label, Vector3Int value, params GUILayoutOption[] options)
-        {
-            return Vector3IntField(EditorGUIUtility.TempContent(label), value, options);
-        }
-
-        // Make an X, Y & Z field for entering a [[Vector3Int]].
-        public static Vector3Int Vector3IntField(GUIContent label, Vector3Int value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector3Int, label), EditorStyles.numberField, options);
-            return EditorGUI.Vector3IntField(r, label, value);
-        }
-
-        public static Rect RectField(Rect value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.GetPropertyHeight(SerializedPropertyType.Rect, GUIContent.none), EditorStyles.numberField, options);
-            return EditorGUI.RectField(r, value);
-        }
-
-        public static Rect RectField(string label, Rect value, params GUILayoutOption[] options)
-        {
-            return RectField(EditorGUIUtility.TempContent(label), value, options);
-        }
-
-        // Make an X, Y, W & H field for entering a [[Rect]].
-        public static Rect RectField(GUIContent label, Rect value, params GUILayoutOption[] options)
-        {
-            bool hasLabel = EditorGUI.LabelHasContent(label);
-            float height = EditorGUI.GetPropertyHeight(SerializedPropertyType.Rect, label);
-            Rect r = s_LastRect = GetControlRect(hasLabel, height, EditorStyles.numberField, options);
-            return EditorGUI.RectField(r, label, value);
-        }
-
-        public static RectInt RectIntField(RectInt value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.GetPropertyHeight(SerializedPropertyType.RectInt, GUIContent.none), EditorStyles.numberField, options);
-            return EditorGUI.RectIntField(r, value);
-        }
-
-        public static RectInt RectIntField(string label, RectInt value, params GUILayoutOption[] options)
-        {
-            return RectIntField(EditorGUIUtility.TempContent(label), value, options);
-        }
-
-        // Make an X, Y, W & H field for entering a [[RectInt]].
-        public static RectInt RectIntField(GUIContent label, RectInt value, params GUILayoutOption[] options)
-        {
-            bool hasLabel = EditorGUI.LabelHasContent(label);
-            float height = EditorGUI.GetPropertyHeight(SerializedPropertyType.RectInt, label);
-            Rect r = s_LastRect = GetControlRect(hasLabel, height, EditorStyles.numberField, options);
-            return EditorGUI.RectIntField(r, label, value);
-        }
-
-        public static Bounds BoundsField(Bounds value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.GetPropertyHeight(SerializedPropertyType.Bounds, GUIContent.none), EditorStyles.numberField, options);
-            return EditorGUI.BoundsField(r, value);
-        }
-
-        public static Bounds BoundsField(string label, Bounds value, params GUILayoutOption[] options)
-        {
-            return BoundsField(EditorGUIUtility.TempContent(label), value, options);
-        }
-
-        // Make Center & Extents field for entering a [[Bounds]].
-        public static Bounds BoundsField(GUIContent label, Bounds value, params GUILayoutOption[] options)
-        {
-            bool hasLabel = EditorGUI.LabelHasContent(label);
-            float height = EditorGUI.GetPropertyHeight(SerializedPropertyType.Bounds, label);
-            Rect r = s_LastRect = GetControlRect(hasLabel, height, EditorStyles.numberField, options);
-            return EditorGUI.BoundsField(r, label, value);
-        }
-
-        public static BoundsInt BoundsIntField(BoundsInt value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.GetPropertyHeight(SerializedPropertyType.BoundsInt, GUIContent.none), EditorStyles.numberField, options);
-            return EditorGUI.BoundsIntField(r, value);
-        }
-
-        public static BoundsInt BoundsIntField(string label, BoundsInt value, params GUILayoutOption[] options)
-        {
-            return BoundsIntField(EditorGUIUtility.TempContent(label), value, options);
-        }
-
-        // Make Center & Extents field for entering a [[BoundsInt]].
-        public static BoundsInt BoundsIntField(GUIContent label, BoundsInt value, params GUILayoutOption[] options)
-        {
-            bool hasLabel = EditorGUI.LabelHasContent(label);
-            float height = EditorGUI.GetPropertyHeight(SerializedPropertyType.BoundsInt, label);
-            Rect r = s_LastRect = GetControlRect(hasLabel, height, EditorStyles.numberField, options);
-            return EditorGUI.BoundsIntField(r, label, value);
-        }
-
-        // Make a property field that look like a multi property field (but is made up of individual properties)
-        internal static void PropertiesField(GUIContent label, SerializedProperty[] properties, GUIContent[] propertyLabels, float propertyLabelsWidth, params GUILayoutOption[] options)
-        {
-            bool hasLabel = EditorGUI.LabelHasContent(label);
-            float height = EditorGUI.kSingleLineHeight * properties.Length + EditorGUI.kVerticalSpacingMultiField * (properties.Length - 1);
-            Rect r = s_LastRect = GetControlRect(hasLabel, height, EditorStyles.numberField, options);
-            EditorGUI.PropertiesField(r, label, properties, propertyLabels, propertyLabelsWidth);
-        }
-
-        internal static int CycleButton(int selected, GUIContent[] contents, GUIStyle style, params GUILayoutOption[] options)
-        {
-            if (GUILayout.Button(contents[selected], style, options))
-            {
-                selected++;
-                if (selected >= contents.Length)
-                    selected = 0;
-            }
-            return selected;
-        }
-
-        public static Color ColorField(Color value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
-            return EditorGUI.ColorField(r, value);
-        }
-
-        public static Color ColorField(string label, Color value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
-            return EditorGUI.ColorField(r, label, value);
-        }
-
-        // Make a field for selecting a [[Color]].
-        public static Color ColorField(GUIContent label, Color value, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
-            return EditorGUI.ColorField(r, label, value);
-        }
-
-#pragma warning disable 612
-        [Obsolete("Use EditorGUILayout.ColorField(GUIContent label, Color value, bool showEyedropper, bool showAlpha, bool hdr, params GUILayoutOption[] options)")]
-        public static Color ColorField(
-            GUIContent label, Color value, bool showEyedropper, bool showAlpha, bool hdr, ColorPickerHDRConfig hdrConfig, params GUILayoutOption[] options
-        )
-        {
-            return ColorField(label, value, showEyedropper, showAlpha, hdr);
-        }
-
-#pragma warning restore 612
-
-        public static Color ColorField(GUIContent label, Color value, bool showEyedropper, bool showAlpha, bool hdr, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
-            return EditorGUI.ColorField(r, label, value, showEyedropper, showAlpha, hdr);
-        }
-
-        public static AnimationCurve CurveField(AnimationCurve value, params GUILayoutOption[] options)
-        {
-            // TODO Change style
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
-            return EditorGUI.CurveField(r, value);
-        }
-
-        public static AnimationCurve CurveField(string label, AnimationCurve value, params GUILayoutOption[] options)
-        {
-            // TODO Change style
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
-            return EditorGUI.CurveField(r, label, value);
-        }
-
-        public static AnimationCurve CurveField(GUIContent label, AnimationCurve value, params GUILayoutOption[] options)
-        {
-            // TODO Change style
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
-            return EditorGUI.CurveField(r, label, value);
-        }
-
-        // Variants with settings
-        public static AnimationCurve CurveField(AnimationCurve value, Color color, Rect ranges, params GUILayoutOption[] options)
-        {
-            // TODO Change style
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
-            return EditorGUI.CurveField(r, value, color, ranges);
-        }
-
-        public static AnimationCurve CurveField(string label, AnimationCurve value, Color color, Rect ranges, params GUILayoutOption[] options)
-        {
-            // TODO Change style
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
-            return EditorGUI.CurveField(r, label, value, color, ranges);
-        }
-
-        // Make a field for editing an [[AnimationCurve]].
-        public static AnimationCurve CurveField(GUIContent label, AnimationCurve value, Color color, Rect ranges, params GUILayoutOption[] options)
-        {
-            // TODO Change style
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
-            return EditorGUI.CurveField(r, label, value, color, ranges);
-        }
-
-        public static void CurveField(SerializedProperty property, Color color, Rect ranges, params GUILayoutOption[] options)
-        {
-            CurveField(property, color, ranges, null, options);
-        }
-
-        // Make a field for editing an [[AnimationCurve]].
-        public static void CurveField(SerializedProperty property, Color color, Rect ranges, GUIContent label, params GUILayoutOption[] options)
-        {
-            // TODO Change style
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
-            EditorGUI.CurveField(r, property, color, ranges, label);
-        }
-
-        public static bool InspectorTitlebar(bool foldout, Object targetObj)
-        {
-            return InspectorTitlebar(foldout, targetObj, true);
-        }
-
-        public static bool InspectorTitlebar(bool foldout, Object targetObj, bool expandable)
-        {
-            return EditorGUI.InspectorTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), foldout,
-                targetObj, expandable);
-        }
-
-        // Make an inspector-window-like titlebar.
-        public static bool InspectorTitlebar(bool foldout, Object[] targetObjs)
-        {
-            return InspectorTitlebar(foldout, targetObjs, true);
-        }
-
-        public static bool InspectorTitlebar(bool foldout, Object[] targetObjs, bool expandable)
-        {
-            return EditorGUI.InspectorTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), foldout,
-                targetObjs, expandable);
-        }
-
-        public static bool InspectorTitlebar(bool foldout, Editor editor)
-        {
-            return EditorGUI.InspectorTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), foldout,
-                editor);
-        }
-
-        public static void InspectorTitlebar(Object[] targetObjs)
-        {
-            EditorGUI.InspectorTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), targetObjs);
-        }
-
-        // Make a foldout with a toggle and title
-        internal static bool ToggleTitlebar(bool foldout, GUIContent label, ref bool toggleValue)
-        {
-            return EditorGUI.ToggleTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), label, foldout, ref toggleValue);
-        }
-
-        internal static bool ToggleTitlebar(bool foldout, GUIContent label, SerializedProperty property)
-        {
-            bool toggleValue = property.boolValue;
-            EditorGUI.BeginChangeCheck();
-            foldout = EditorGUI.ToggleTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), label, foldout, ref toggleValue);
-            if (EditorGUI.EndChangeCheck())
-                property.boolValue = toggleValue;
-
-            return foldout;
-        }
-
-        internal static bool FoldoutTitlebar(bool foldout, GUIContent label, bool skipIconSpacing)
-        {
-            return FoldoutTitlebar(foldout, label, skipIconSpacing, EditorStyles.inspectorTitlebar, EditorStyles.inspectorTitlebarText);
-        }
-
-        internal static bool FoldoutTitlebar(bool foldout, GUIContent label, bool skipIconSpacing, GUIStyle baseStyle, GUIStyle textStyle)
-        {
-            return EditorGUI.FoldoutTitlebar(GUILayoutUtility.GetRect(GUIContent.none, baseStyle, GUILayout.ExpandWidth(true)), label, foldout, skipIconSpacing, baseStyle, textStyle);
-        }
-
-        // Make a label with a foldout arrow to the left of it.
-        internal static bool FoldoutInternal(bool foldout, GUIContent content, bool toggleOnLabelClick, GUIStyle style)
-        {
-            Rect r = s_LastRect = GUILayoutUtility.GetRect(EditorGUIUtility.fieldWidth, EditorGUIUtility.fieldWidth, EditorGUI.kSingleLineHeight, EditorGUI.kSingleLineHeight, style);
-            return EditorGUI.Foldout(r, foldout, content, toggleOnLabelClick, style);
-        }
-
-        internal static uint LayerMaskField(UInt32 layers, GUIContent label, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, options);
-            return EditorGUI.LayerMaskField(r, layers, label);
-        }
-
-        internal static LayerMask LayerMaskField(LayerMask layers, GUIContent label, params GUILayoutOption[] options)
-        {
-            var rect = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, options);
-            return EditorGUI.LayerMaskField(rect, layers, label);
-        }
-
-        internal static void LayerMaskField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, options);
-            EditorGUI.LayerMaskField(r, property, label);
-        }
-
-        public static void HelpBox(string message, MessageType type)
-        {
-            LabelField(GUIContent.none, EditorGUIUtility.TempContent(message, EditorGUIUtility.GetHelpIcon(type)), EditorStyles.helpBox);
-        }
-
-        // Make a help box with a message to the user.
-        public static void HelpBox(string message, MessageType type, bool wide)
-        {
-            LabelField(wide ? GUIContent.none : EditorGUIUtility.blankContent,
-                EditorGUIUtility.TempContent(message, EditorGUIUtility.GetHelpIcon(type)),
-                EditorStyles.helpBox);
-        }
-
-        // Make a help box with a message to the user.
-        public static void HelpBox(GUIContent content, bool wide = true)
-        {
-            LabelField(wide ? GUIContent.none : EditorGUIUtility.blankContent,
-                content,
-                EditorStyles.helpBox);
-        }
-
-        // Make a label in front of some control.
-        internal static void PrefixLabelInternal(GUIContent label, GUIStyle followingStyle, GUIStyle labelStyle)
-        {
-            float p = followingStyle.margin.left;
-            if (!EditorGUI.LabelHasContent(label))
-            {
-                GUILayoutUtility.GetRect(EditorGUI.indent - p, EditorGUI.kSingleLineHeight, followingStyle, GUILayout.ExpandWidth(false));
-                return;
-            }
-
-            Rect r = GUILayoutUtility.GetRect(EditorGUIUtility.labelWidth - p, EditorGUI.kSingleLineHeight, followingStyle, GUILayout.ExpandWidth(false));
-            r.xMin += EditorGUI.indent;
-            EditorGUI.HandlePrefixLabel(r, r, label, 0, labelStyle);
-        }
-
-        // Make a small space between the previous control and the following.
-        public static void Space()
-        {
-            Space(EditorGUI.kDefaultSpacing, true);
-        }
-
-        public static void Space(float width)
-        {
-            Space(width, true);
-        }
-
-        public static void Space(float width, bool expand)
-        {
-            GUILayoutUtility.GetRect(width, width, GUILayout.ExpandWidth(expand));
-        }
-
-        //[System.Obsolete ("Use Space() instead")]
-        // Make this function Obsolete when someone has time to _rename_ all
-        // the Standard Packages to Space(), as currently it shows tons of
-        // warnings.
-        // Same for the graphic tests.
-        // *undoc*
-        public static void Separator()
-        {
-            Space();
-        }
-
-        public class ToggleGroupScope : GUI.Scope
-        {
-            public bool enabled { get; protected set; }
-
-            public ToggleGroupScope(string label, bool toggle)
-            {
-                enabled = BeginToggleGroup(label, toggle);
-            }
-
-            public ToggleGroupScope(GUIContent label, bool toggle)
-            {
-                enabled = BeginToggleGroup(label, toggle);
-            }
-
-            protected override void CloseScope()
-            {
-                EndToggleGroup();
-            }
-        }
-
-        public static bool BeginToggleGroup(string label, bool toggle)
-        {
-            return BeginToggleGroup(EditorGUIUtility.TempContent(label), toggle);
-        }
-
-        // Begin a vertical group with a toggle to enable or disable all the controls within at once.
-        public static bool BeginToggleGroup(GUIContent label, bool toggle)
-        {
-            toggle = ToggleLeft(label, toggle, EditorStyles.boldLabel);
-            EditorGUI.BeginDisabled(!toggle);
-            GUILayout.BeginVertical();
-
-            return toggle;
-        }
-
-        // Close a group started with ::ref::BeginToggleGroup
-        public static void EndToggleGroup()
-        {
-            GUILayout.EndVertical();
-            EditorGUI.EndDisabled();
-        }
-
-        public class HorizontalScope : GUI.Scope
-        {
-            public Rect rect { get; protected set; }
-
-            public HorizontalScope(params GUILayoutOption[] options)
-            {
-                rect = BeginHorizontal(options);
-            }
-
-            public HorizontalScope(GUIStyle style, params GUILayoutOption[] options)
-            {
-                rect = BeginHorizontal(style, options);
-            }
-
-            internal HorizontalScope(GUIContent content, GUIStyle style, params GUILayoutOption[] options)
-            {
-                rect = BeginHorizontal(content, style, options);
-            }
-
-            protected override void CloseScope()
-            {
-                EndHorizontal();
-            }
-        }
-
-        public static Rect BeginHorizontal(params GUILayoutOption[] options)
-        {
-            return BeginHorizontal(GUIContent.none, GUIStyle.none, options);
-        }
-
-        // Begin a horizontal group and get its rect back.
-        public static Rect BeginHorizontal(GUIStyle style, params GUILayoutOption[] options)
-        {
-            return BeginHorizontal(GUIContent.none, style, options);
-        }
-
-        // public static Rect BeginHorizontal (string text, params GUILayoutOption[] options)                       { return BeginHorizontal (EditorGUIUtility.TempContent (text), GUIStyle.none, options); }
-        // public static Rect BeginHorizontal (Texture image, params GUILayoutOption[] options)                 { return BeginHorizontal (EditorGUIUtility.TempContent (image), GUIStyle.none, options); }
-        // public static Rect BeginHorizontal (GUIContent content, params GUILayoutOption[] options)                { return BeginHorizontal (content, GUIStyle.none, options); }
-        // public static Rect BeginHorizontal (string text, GUIStyle style, params GUILayoutOption[] options)           { return BeginHorizontal (EditorGUIUtility.TempContent (text), style, options); }
-        // public static Rect BeginHorizontal (Texture image, GUIStyle style, params GUILayoutOption[] options)     { return BeginHorizontal (EditorGUIUtility.TempContent (image), style, options); }
-        internal static Rect BeginHorizontal(GUIContent content, GUIStyle style, params GUILayoutOption[] options)
-        {
-            GUILayoutGroup g = GUILayoutUtility.BeginLayoutGroup(style, options, typeof(GUILayoutGroup));
-            g.isVertical = false;
-            if (style != GUIStyle.none || content != GUIContent.none)
-            {
-                GUI.Box(g.rect, GUIContent.none, style);
-            }
-            return g.rect;
-        }
-
-        // Close a group started with BeginHorizontal
-        public static void EndHorizontal()
-        {
-            GUILayout.EndHorizontal();
-        }
-
-        public class VerticalScope : GUI.Scope
-        {
-            public Rect rect { get; protected set; }
-
-            public VerticalScope(params GUILayoutOption[] options)
-            {
-                rect = BeginVertical(options);
-            }
-
-            public VerticalScope(GUIStyle style, params GUILayoutOption[] options)
-            {
-                rect = BeginVertical(style, options);
-            }
-
-            internal VerticalScope(GUIContent content, GUIStyle style, params GUILayoutOption[] options)
-            {
-                rect = BeginVertical(content, style, options);
-            }
-
-            protected override void CloseScope()
-            {
-                EndVertical();
-            }
-        }
-
-        public static Rect BeginVertical(params GUILayoutOption[] options)
-        {
-            return BeginVertical(GUIContent.none, GUIStyle.none, options);
-        }
-
-        // Begin a vertical group and get its rect back.
-        public static Rect BeginVertical(GUIStyle style, params GUILayoutOption[] options)
-        {
-            return BeginVertical(GUIContent.none, style, options);
-        }
-
-        // public static Rect BeginVertical (string text, params GUILayoutOption[] options)                     { return BeginVertical (EditorGUIUtility.TempContent (text), GUIStyle.none, options); }
-        // public static Rect BeginVertical (Texture image, params GUILayoutOption[] options)                   { return BeginVertical (EditorGUIUtility.TempContent (image), GUIStyle.none, options); }
-        // public static Rect BeginVertical (GUIContent content, params GUILayoutOption[] options)              { return BeginVertical (content, GUIStyle.none, options); }
-        // public static Rect BeginVertical (string text, GUIStyle style, params GUILayoutOption[] options)         { return BeginVertical (EditorGUIUtility.TempContent (text), style, options); }
-        // public static Rect BeginVertical (Texture image, GUIStyle style, params GUILayoutOption[] options)       { return BeginVertical (EditorGUIUtility.TempContent (image), style, options); }
-        internal static Rect BeginVertical(GUIContent content, GUIStyle style, params GUILayoutOption[] options)
-        {
-            GUILayoutGroup g = GUILayoutUtility.BeginLayoutGroup(style, options, typeof(GUILayoutGroup));
-            g.isVertical = true;
-            if (style != GUIStyle.none || content != GUIContent.none)
-            {
-                GUI.Box(g.rect, GUIContent.none, style);
-            }
-            return g.rect;
-        }
-
-        // Close a group started with BeginVertical
-        public static void EndVertical()
-        {
-            GUILayout.EndVertical();
-        }
-
-        public class ScrollViewScope : GUI.Scope
-        {
-            public Vector2 scrollPosition { get; protected set; }
-            public bool handleScrollWheel { get; set; }
-
-            public ScrollViewScope(Vector2 scrollPosition, params GUILayoutOption[] options)
-            {
-                handleScrollWheel = true;
-                this.scrollPosition = BeginScrollView(scrollPosition, options);
-            }
-
-            public ScrollViewScope(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, params GUILayoutOption[] options)
-            {
-                handleScrollWheel = true;
-                this.scrollPosition = BeginScrollView(scrollPosition, alwaysShowHorizontal, alwaysShowVertical, options);
-            }
-
-            public ScrollViewScope(Vector2 scrollPosition, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, params GUILayoutOption[] options)
-            {
-                handleScrollWheel = true;
-                this.scrollPosition = BeginScrollView(scrollPosition, horizontalScrollbar, verticalScrollbar, options);
-            }
-
-            public ScrollViewScope(Vector2 scrollPosition, GUIStyle style, params GUILayoutOption[] options)
-            {
-                handleScrollWheel = true;
-                this.scrollPosition = BeginScrollView(scrollPosition, style, options);
-            }
-
-            public ScrollViewScope(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
-            {
-                handleScrollWheel = true;
-                this.scrollPosition = BeginScrollView(scrollPosition, alwaysShowHorizontal, alwaysShowVertical, horizontalScrollbar, verticalScrollbar, background, options);
-            }
-
-            internal ScrollViewScope(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, params GUILayoutOption[] options)
-            {
-                handleScrollWheel = true;
-                this.scrollPosition = BeginScrollView(scrollPosition, alwaysShowHorizontal, alwaysShowVertical, horizontalScrollbar, verticalScrollbar, options);
-            }
-
-            protected override void CloseScope()
-            {
-                EndScrollView(handleScrollWheel);
-            }
-        }
-
-        public static Vector2 BeginScrollView(Vector2 scrollPosition, params GUILayoutOption[] options)
-        {
-            return BeginScrollView(scrollPosition, false, false, GUI.skin.horizontalScrollbar, GUI.skin.verticalScrollbar, GUI.skin.scrollView, options);
-        }
-
-        public static Vector2 BeginScrollView(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, params GUILayoutOption[] options)
-        {
-            return BeginScrollView(scrollPosition, alwaysShowHorizontal, alwaysShowVertical, GUI.skin.horizontalScrollbar, GUI.skin.verticalScrollbar, GUI.skin.scrollView, options);
-        }
-
-        public static Vector2 BeginScrollView(Vector2 scrollPosition, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, params GUILayoutOption[] options)
-        {
-            return BeginScrollView(scrollPosition, false, false, horizontalScrollbar, verticalScrollbar, GUI.skin.scrollView, options);
-        }
-
-        public static Vector2 BeginScrollView(Vector2 scrollPosition, GUIStyle style, params GUILayoutOption[] options)
-        {
-            string name = style.name;
-
-            GUIStyle vertical = GUI.skin.FindStyle(name + "VerticalScrollbar") ?? GUI.skin.verticalScrollbar;
-            GUIStyle horizontal = GUI.skin.FindStyle(name + "HorizontalScrollbar") ?? GUI.skin.horizontalScrollbar;
-            return BeginScrollView(scrollPosition, false, false, horizontal, vertical, style, options);
-        }
-
-        internal static Vector2 BeginScrollView(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, params GUILayoutOption[] options)
-        {
-            return BeginScrollView(scrollPosition, alwaysShowHorizontal, alwaysShowVertical, horizontalScrollbar, verticalScrollbar, GUI.skin.scrollView, options);
-        }
-
-        // Begin an automatically layouted scrollview.
-        public static Vector2 BeginScrollView(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
-        {
-            GUIScrollGroup g = (GUIScrollGroup)GUILayoutUtility.BeginLayoutGroup(background, null, typeof(GUIScrollGroup));
-            if (Event.current.type == EventType.Layout)
-            {
-                g.resetCoords = true;
-                g.isVertical = true;
-                g.stretchWidth = 1;
-                g.stretchHeight = 1;
-                g.verticalScrollbar = verticalScrollbar;
-                g.horizontalScrollbar = horizontalScrollbar;
-                g.ApplyOptions(options);
-            }
-            return EditorGUIInternal.DoBeginScrollViewForward(g.rect, scrollPosition, new Rect(0, 0, g.clientWidth, g.clientHeight), alwaysShowHorizontal, alwaysShowVertical, horizontalScrollbar, verticalScrollbar, background);
-        }
-
-        internal class VerticalScrollViewScope : GUI.Scope
-        {
-            public Vector2 scrollPosition { get; protected set; }
-            public bool handleScrollWheel { get; set; }
-
-            public VerticalScrollViewScope(Vector2 scrollPosition, params GUILayoutOption[] options)
-            {
-                handleScrollWheel = true;
-                this.scrollPosition = BeginVerticalScrollView(scrollPosition, options);
-            }
-
-            public VerticalScrollViewScope(Vector2 scrollPosition, bool alwaysShowVertical, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
-            {
-                handleScrollWheel = true;
-                this.scrollPosition = BeginVerticalScrollView(scrollPosition, alwaysShowVertical, verticalScrollbar, background, options);
-            }
-
-            protected override void CloseScope()
-            {
-                EndScrollView(handleScrollWheel);
-            }
-        }
-
-        internal static Vector2 BeginVerticalScrollView(Vector2 scrollPosition, params GUILayoutOption[] options)
-        {
-            return BeginVerticalScrollView(scrollPosition, false, GUI.skin.verticalScrollbar, GUI.skin.scrollView, options);
-        }
-
-        // Begin an automatically layouted scrollview.
-        internal static Vector2 BeginVerticalScrollView(Vector2 scrollPosition, bool alwaysShowVertical, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
-        {
-            GUIScrollGroup g = (GUIScrollGroup)GUILayoutUtility.BeginLayoutGroup(background, null, typeof(GUIScrollGroup));
-            if (Event.current.type == EventType.Layout)
-            {
-                g.resetCoords = true;
-                g.isVertical = true;
-                g.stretchWidth = 1;
-                g.stretchHeight = 1;
-                g.verticalScrollbar = verticalScrollbar;
-                g.horizontalScrollbar = GUIStyle.none;
-                g.allowHorizontalScroll = false;
-                g.ApplyOptions(options);
-            }
-            return EditorGUIInternal.DoBeginScrollViewForward(g.rect, scrollPosition, new Rect(0, 0, g.clientWidth, g.clientHeight), false, alwaysShowVertical, GUI.skin.horizontalScrollbar, verticalScrollbar, background);
-        }
-
-        internal class HorizontalScrollViewScope : GUI.Scope
-        {
-            public Vector2 scrollPosition { get; protected set; }
-            public bool handleScrollWheel { get; set; }
-
-            public HorizontalScrollViewScope(Vector2 scrollPosition, params GUILayoutOption[] options)
-            {
-                handleScrollWheel = true;
-                this.scrollPosition = BeginHorizontalScrollView(scrollPosition, options);
-            }
-
-            public HorizontalScrollViewScope(Vector2 scrollPosition, bool alwaysShowHorizontal, GUIStyle horizontalScrollbar, GUIStyle background, params GUILayoutOption[] options)
-            {
-                handleScrollWheel = true;
-                this.scrollPosition = BeginHorizontalScrollView(scrollPosition, alwaysShowHorizontal, horizontalScrollbar, background, options);
-            }
-
-            protected override void CloseScope()
-            {
-                EndScrollView(handleScrollWheel);
-            }
-        }
-
-        internal static Vector2 BeginHorizontalScrollView(Vector2 scrollPosition, params GUILayoutOption[] options)
-        {
-            return BeginHorizontalScrollView(scrollPosition, false, GUI.skin.horizontalScrollbar, GUI.skin.scrollView, options);
-        }
-
-        // Begin an automatically layouted scrollview.
-
-        internal static Vector2 BeginHorizontalScrollView(Vector2 scrollPosition, bool alwaysShowHorizontal, GUIStyle horizontalScrollbar, GUIStyle background, params GUILayoutOption[] options)
-        {
-            GUIScrollGroup g = (GUIScrollGroup)GUILayoutUtility.BeginLayoutGroup(background, null, typeof(GUIScrollGroup));
-            if (Event.current.type == EventType.Layout)
-            {
-                g.resetCoords = true;
-                g.isVertical = true;
-                g.stretchWidth = 1;
-                g.stretchHeight = 1;
-                g.verticalScrollbar = GUIStyle.none;
-                g.horizontalScrollbar = horizontalScrollbar;
-                g.allowHorizontalScroll = true;
-                g.allowVerticalScroll = false;
-                g.ApplyOptions(options);
-            }
-            return EditorGUIInternal.DoBeginScrollViewForward(g.rect, scrollPosition, new Rect(0, 0, g.clientWidth, g.clientHeight), alwaysShowHorizontal, false, horizontalScrollbar, GUI.skin.verticalScrollbar, background);
-        }
-
-        // Ends a scrollview started with a call to BeginScrollView.
-        public static void EndScrollView()
-        {
-            GUILayout.EndScrollView(true);
-        }
-
-        internal static void EndScrollView(bool handleScrollWheel)
-        {
-            GUILayout.EndScrollView(handleScrollWheel);
-        }
-
-        public static bool PropertyField(SerializedProperty property, params GUILayoutOption[] options)
-        {
-            return PropertyField(property, null, IsChildrenIncluded(property), options);
-        }
-
-        public static bool PropertyField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
-        {
-            return PropertyField(property, label, IsChildrenIncluded(property), options);
-        }
-
-        public static bool PropertyField(SerializedProperty property, bool includeChildren, params GUILayoutOption[] options)
-        {
-            return PropertyField(property, null, includeChildren, options);
-        }
-
-        // Make a field for [[SerializedProperty]].
-        public static bool PropertyField(SerializedProperty property, GUIContent label, bool includeChildren, params GUILayoutOption[] options)
-        {
-            return ScriptAttributeUtility.GetHandler(property).OnGUILayout(property, label, includeChildren, options);
-        }
-
-        private static bool IsChildrenIncluded(SerializedProperty prop)
-        {
-            switch (prop.propertyType)
-            {
-                case SerializedPropertyType.Generic:
-                case SerializedPropertyType.Vector4:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
-        public static Rect GetControlRect(params GUILayoutOption[] options)
-        {
-            return GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.layerMaskField, options);
-        }
-
-        public static Rect GetControlRect(bool hasLabel, params GUILayoutOption[] options)
-        {
-            return GetControlRect(hasLabel, EditorGUI.kSingleLineHeight, EditorStyles.layerMaskField, options);
-        }
-
-        public static Rect GetControlRect(bool hasLabel, float height, params GUILayoutOption[] options)
-        {
-            return GetControlRect(hasLabel, height, EditorStyles.layerMaskField, options);
-        }
-
-        public static Rect GetControlRect(bool hasLabel, float height, GUIStyle style, params GUILayoutOption[] options)
-        {
-            return GUILayoutUtility.GetRect(
-                hasLabel ? kLabelFloatMinW : EditorGUIUtility.fieldWidth,
-                kLabelFloatMaxW,
-                height, height, style, options);
-        }
-
-        internal static Rect GetSliderRect(bool hasLabel, params GUILayoutOption[] options)
-        {
-            return GetSliderRect(hasLabel, GUI.skin.horizontalSlider, options);
-        }
-
-        internal static Rect GetSliderRect(bool hasLabel, GUIStyle sliderStyle, params GUILayoutOption[] options)
-        {
-            return GUILayoutUtility.GetRect(
-                hasLabel ? kLabelFloatMinW : EditorGUIUtility.fieldWidth,
-                kLabelFloatMaxW + EditorGUI.kSpacing + EditorGUI.kSliderMaxW,
-                EditorGUI.kSingleLineHeight, EditorGUI.kSingleLineHeight, sliderStyle, options);
-        }
-
-        internal static Rect GetToggleRect(bool hasLabel, params GUILayoutOption[] options)
-        {
-            // Toggle is 14 pixels wide while float fields are EditorGUIUtility.fieldWidth pixels wide.
-            // Store difference in variable and add to min and max width values used for float fields.
-            float toggleAdjust = (14 - EditorGUIUtility.fieldWidth);
-            return GUILayoutUtility.GetRect(
-                hasLabel ? kLabelFloatMinW + toggleAdjust : EditorGUIUtility.fieldWidth + toggleAdjust,
-                kLabelFloatMaxW + toggleAdjust,
-                EditorGUI.kSingleLineHeight, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
-        }
-
-        public class FadeGroupScope : GUI.Scope
-        {
-            // when using the FadeGroupScope, make sure to only show the content when 'visible' is set to true,
-            // otherwise only the hide animation will run, and then the content will be visible again.
-            public bool visible { get; protected set; }
-
-            public FadeGroupScope(float value)
-            {
-                visible = BeginFadeGroup(value);
-            }
-
-            protected override void CloseScope()
-            {
-                EndFadeGroup();
-            }
-        }
-
-        public static bool BeginFadeGroup(float value)
-        {
-            GUILayoutFadeGroup g = (GUILayoutFadeGroup)GUILayoutUtility.BeginLayoutGroup(GUIStyle.none, null, typeof(GUILayoutFadeGroup));
-            g.isVertical = true;
-            g.resetCoords = false;
-            g.fadeValue = value;
-            g.wasGUIEnabled = GUI.enabled;
-            g.guiColor = GUI.color;
-            g.consideredForMargin = value > 0;
-
-            // We don't want the fade group gui clip to be used for calculating the label width of controls in this fade group, so we lock the context width.
-            EditorGUIUtility.LockContextWidth();
-
-            if (value != 0.0f && value != 1.0f)
-            {
-                g.resetCoords = true;
-                GUI.BeginGroup(g.rect);
-
-                if (Event.current.type == EventType.MouseDown)
-                {
-                    Event.current.Use();
-                }
-            }
-
-            return value != 0;
-        }
-
-        public static void EndFadeGroup()
-        {
-            // If we're inside a fade group, end it here.
-            GUILayoutFadeGroup g = EditorGUILayoutUtilityInternal.topLevel as GUILayoutFadeGroup;
-
-            // If there are no more FadeGroups to end, display a warning.
-            if (g == null)
-            {
-                Debug.LogWarning("Unexpected call to EndFadeGroup! Make sure to call EndFadeGroup the same number of times as BeginFadeGroup.");
-                return;
-            }
-
-            if (g.fadeValue != 0.0f && g.fadeValue != 1.0f)
-            {
-                GUI.EndGroup();
-            }
-
-            EditorGUIUtility.UnlockContextWidth();
-            GUI.enabled = g.wasGUIEnabled;
-            GUI.color = g.guiColor;
-            GUILayoutUtility.EndLayoutGroup();
-        }
-
-        public static BuildTargetGroup BeginBuildTargetSelectionGrouping()
-        {
-            BuildPlatform[] validPlatforms = BuildPlatforms.instance.GetValidPlatforms().ToArray();
-            int selected = BeginPlatformGrouping(validPlatforms, null);
-            return validPlatforms[selected].namedBuildTarget.ToBuildTargetGroup();
-        }
-
-        public static void EndBuildTargetSelectionGrouping()
-        {
-            EndPlatformGrouping();
-        }
-
-        internal static int BeginPlatformGrouping(BuildPlatform[] platforms, GUIContent defaultTab)
-        {
-            return BeginPlatformGrouping(platforms, defaultTab, EditorStyles.frameBox);
-        }
-
-        static Rect GetTabRect(Rect rect, int tabIndex, int tabCount, out GUIStyle tabStyle)
-        {
-            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";
-                s_TabLast = "Tab last";
-            }
-
-            tabStyle = s_TabMiddle;
-
-            if (tabCount == 1)
-            {
-                tabStyle = s_TabOnlyOne;
-            }
-            else if (tabIndex == 0)
-            {
-                tabStyle = s_TabFirst;
-            }
-            else if (tabIndex == (tabCount - 1))
-            {
-                tabStyle = s_TabLast;
-            }
-
-            float tabWidth = rect.width / tabCount;
-            int left = Mathf.RoundToInt(tabIndex * tabWidth);
-            int right = Mathf.RoundToInt((tabIndex + 1) * tabWidth);
-            return new Rect(rect.x + left, rect.y, right - left, EditorGUI.kTabButtonHeight);
-        }
-
-        internal static int BeginPlatformGrouping(BuildPlatform[] platforms, GUIContent defaultTab, GUIStyle style)
-        {
-            return BeginPlatformGrouping(platforms, defaultTab, style, null);
-        }
-
-        internal static int BeginPlatformGrouping(BuildPlatform[] platforms, GUIContent defaultTab, GUIStyle style, Func<int, bool> showOverrideForPlatform)
-        {
-            int selectedPlatform = -1;
-            for (int i = 0; i < platforms.Length; i++)
-            {
-                if (platforms[i].IsSelected())
-                {
-                    selectedPlatform = i;
-                    break;
-                }
-            }
-            if (selectedPlatform == -1)
-            {
-                s_SelectedDefault.value = true;
-                selectedPlatform = 0;
-            }
-
-            int selected = defaultTab == null ? selectedPlatform : (s_SelectedDefault.value ? -1 : selectedPlatform);
-
-            bool tempEnabled = GUI.enabled;
-            GUI.enabled = true;
-            EditorGUI.BeginChangeCheck();
-            Rect r = BeginVertical(style);
-            int platformCount = platforms.Length;
-            int buttonCount = platformCount;
-            int startIndex = 0;
-
-            if (defaultTab != null)
-            {
-                buttonCount++;
-                startIndex = -1;
-            }
-
-            int buttonIndex = 0;
-            for (int i = startIndex; i < platformCount; i++, buttonIndex++)
-            {
-                GUIContent content = GUIContent.none;
-
-                if (i == -1)
-                {
-                    content = defaultTab;
-                }
-                else
-                {
-                    content = new GUIContent(platforms[i].smallIcon, platforms[i].tooltip);
-                }
-
-                GUIStyle buttonStyle = null;
-                Rect buttonRect = GetTabRect(r, buttonIndex, buttonCount, out buttonStyle);
-
-                if (GUI.Toggle(buttonRect, selected == i, content, buttonStyle))
-                    selected = i;
-                if (showOverrideForPlatform != null)
-                {
-                    if (showOverrideForPlatform(i))
-                    {
-                        var prevMargin = EditorGUIUtility.leftMarginCoord;
-                        var overrideRect = buttonRect;
-                        const int margin = 3;
-                        overrideRect.y += margin;
-                        overrideRect.height -= margin * 2;
-                        EditorGUIUtility.leftMarginCoord = overrideRect.x + margin;
-                        EditorGUI.DrawOverrideBackgroundApplicable(overrideRect);
-                        EditorGUIUtility.leftMarginCoord = prevMargin;
-                    }
-                }
-            }
-
-            // GUILayout.Space doesn't expand to available width, so use GetRect instead
-            GUILayoutUtility.GetRect(10, EditorGUI.kTabButtonHeight);
-
-            GUI.enabled = tempEnabled;
-
-            // Important that we only actually set the selectedBuildTargetGroup if the user clicked the button.
-            // If the current selectedBuildTargetGroup is one that is not among the tabs (because the build target
-            // is not supported), then this should not be changed unless the user explicitly does so.
-            // Otherwise, if the build window is open at the same time, the unsupported build target groups will
-            // not be selectable in the build window.
-            if (EditorGUI.EndChangeCheck())
-            {
-                if (defaultTab == null)
-                {
-                    platforms[selected].Select();
-                }
-                else
-                {
-                    if (selected < 0)
-                    {
-                        s_SelectedDefault.value = true;
-                    }
-                    else
-                    {
-                        platforms[selected].Select();
-                        s_SelectedDefault.value = false;
-                    }
-                }
-
-                // Repaint build window, if open.
-                Object[] buildWindows = Resources.FindObjectsOfTypeAll(typeof(BuildPlayerWindow));
-                foreach (Object t in buildWindows)
-                {
-                    BuildPlayerWindow buildWindow = t as BuildPlayerWindow;
-                    if (buildWindow != null)
-                        buildWindow.Repaint();
-                }
-            }
-
-            return selected;
-        }
-
-        internal static void EndPlatformGrouping()
-        {
-            EndVertical();
-        }
-
-        internal static void MultiSelectionObjectTitleBar(Object[] objects)
-        {
-            string text = objects[0].name + " (" + ObjectNames.NicifyVariableName(ObjectNames.GetTypeName(objects[0])) + ")";
-            if (objects.Length > 1)
-            {
-                text += " and " + (objects.Length - 1) + " other" + (objects.Length > 2 ? "s" : "");
-            }
-            GUILayoutOption[] options = {  GUILayout.Height(16f) };
-            GUILayout.Label(EditorGUIUtility.TempContent(text, AssetPreview.GetMiniThumbnail(objects[0])), EditorStyles.boldLabel, options);
-        }
-
-        // Returns true if specified bit is true for all targets
-        internal static bool BitToggleField(string label, SerializedProperty bitFieldProperty, int flag)
-        {
-            bool toggle = (bitFieldProperty.intValue & flag) != 0;
-            bool different = (bitFieldProperty.hasMultipleDifferentValuesBitwise & flag) != 0;
-            EditorGUI.showMixedValue = different;
-            EditorGUI.BeginChangeCheck();
-            toggle = Toggle(label, toggle);
-            if (EditorGUI.EndChangeCheck())
-            {
-                // If toggle has mixed values, always set all to true when clicking it
-                if (different)
-                {
-                    toggle = true;
-                }
-                different = false;
-                int bitIndex = -1;
-                for (int i = 0; i < 32; i++)
-                {
-                    if (((1 << i) & flag) != 0)
-                    {
-                        bitIndex = i;
-                        break;
-                    }
-                }
-                bitFieldProperty.SetBitAtIndexForAllTargetsImmediate(bitIndex, toggle);
-            }
-            EditorGUI.showMixedValue = false;
-            return toggle && !different;
-        }
-
-        internal static void SortingLayerField(GUIContent label, SerializedProperty layerID, GUIStyle style)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style);
-            EditorGUI.SortingLayerField(r, label, layerID, style, EditorStyles.label);
-        }
-
-        internal static string TextFieldDropDown(string text, string[] dropDownElement)
-        {
-            return TextFieldDropDown(GUIContent.none, text, dropDownElement);
-        }
-
-        internal static string TextFieldDropDown(GUIContent label, string text, string[] dropDownElement)
-        {
-            Rect rect = GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.textField);
-            return EditorGUI.TextFieldDropDown(rect, label, text, dropDownElement);
-        }
-
-        internal static string DelayedTextFieldDropDown(string text, string[] dropDownElement)
-        {
-            return DelayedTextFieldDropDown(GUIContent.none, text, dropDownElement);
-        }
-
-        internal static string DelayedTextFieldDropDown(GUIContent label, string text, string[] dropDownElement)
-        {
-            Rect rect = GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.textFieldDropDownText);
-            return EditorGUI.DelayedTextFieldDropDown(rect, label, text, dropDownElement);
-        }
-
-        // A button that returns true on mouse down - like a popup button
-        public static bool DropdownButton(GUIContent content, FocusType focusType, params GUILayoutOption[] options)
-        {
-            return DropdownButton(content, focusType, "MiniPullDown", options);
-        }
-
-        // A button that returns true on mouse down - like a popup button
-        public static bool DropdownButton(GUIContent content, FocusType focusType, GUIStyle style, params GUILayoutOption[] options)
-        {
-            s_LastRect = GUILayoutUtility.GetRect(content, style, options);
-            return EditorGUI.DropdownButton(s_LastRect, content, focusType, style);
-        }
-
-        // A toggle that returns true on mouse down - like a popup button and returns true if checked
-        internal static bool DropDownToggle(ref bool toggled, GUIContent content, GUIStyle toggleStyle)
-        {
-            GUIStyle buttonStyle = GUIStyle.none;
-
-            // This is to be compatible with existing code
-            if (toggleStyle == EditorStyles.toolbarDropDownToggle || toggleStyle == EditorStyles.toolbarDropDownToggleRight)
-                buttonStyle = EditorStyles.toolbarDropDownToggleButton;
-
-            return DropDownToggle(ref toggled, content, toggleStyle, buttonStyle);
-        }
-
-        internal static bool DropDownToggle(ref bool toggled, GUIContent content, GUIStyle toggleStyle, GUIStyle toggleDropdownButtonStyle)
-        {
-            Rect toggleRect = GUILayoutUtility.GetRect(content, toggleStyle);
-            Rect arrowRightRect = Rect.zero;
-
-            if (toggleDropdownButtonStyle != null)
-            {
-                arrowRightRect = new Rect(toggleRect.xMax - toggleDropdownButtonStyle.fixedWidth - toggleDropdownButtonStyle.margin.right, toggleRect.y, toggleDropdownButtonStyle.fixedWidth, toggleRect.height);
-            }
-            else
-            {
-                arrowRightRect = new Rect(toggleRect.xMax - toggleStyle.padding.right, toggleRect.y, toggleStyle.padding.right, toggleRect.height);
-            }
-
-
-            int dropdownButtonId = GUIUtility.GetControlID(EditorGUI.s_DropdownButtonHash, FocusType.Passive, arrowRightRect);
-            bool clicked = EditorGUI.DropdownButton(dropdownButtonId, arrowRightRect, GUIContent.none, GUIStyle.none);
-
-            if (!clicked)
-            {
-                toggled = GUI.Toggle(toggleRect, toggled, content, toggleStyle);
-            }
-
-            // Ensure that the dropdown button is rendered on top of the toggle
-            if (Event.current.type == EventType.Repaint && toggleDropdownButtonStyle != null && toggleDropdownButtonStyle != GUIStyle.none)
-            {
-                EditorGUI.DropdownButton(dropdownButtonId, arrowRightRect, GUIContent.none, toggleDropdownButtonStyle);
-            }
-
-            return clicked;
-        }
-
-        internal static int AdvancedPopup(int selectedIndex, string[] displayedOptions, params GUILayoutOption[] options)
-        {
-            return AdvancedPopup(selectedIndex, displayedOptions, "MiniPullDown", options);
-        }
-
-        internal static int AdvancedPopup(int selectedIndex, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.AdvancedPopup(r, selectedIndex, displayedOptions, style);
-        }
-
-        internal static int AdvancedLazyPopup(string displayedOption, int selectedIndex, Func<Tuple<int, string[]>> displayedOptionsFunc, GUIStyle style, params GUILayoutOption[] options)
-        {
-            Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            return EditorGUI.AdvancedLazyPopup(r, displayedOption, selectedIndex, displayedOptionsFunc, style);
-        }
-
-        [Obsolete("(UnityUpgradable) -> UnityEditor.HyperLinkClickedEventArgs", true)]
-        internal class HyperLinkClickedEventArgs
-        {
-            [Obsolete("(UnityUpgradable) -> UnityEditor.HyperLinkClickedEventArgs.hyperLinkData", true)]
-            public Dictionary<string, string> hyperlinkInfos { get; private set; }
-            internal HyperLinkClickedEventArgs(Dictionary<string, string> hyperLinkData) {}
-        }
-    }
 }
diff --git a/Editor/Mono/EditorGUILayout.cs b/Editor/Mono/EditorGUILayout.cs
new file mode 100644
index 0000000000..af8bc5e18e
--- /dev/null
+++ b/Editor/Mono/EditorGUILayout.cs
@@ -0,0 +1,2536 @@
+// 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 UnityEditor.Build;
+using UnityEngine;
+using UnityEngine.Internal;
+using Object = UnityEngine.Object;
+
+namespace UnityEditor;
+
+// Auto-layouted version of [[EditorGUI]]
+sealed partial class EditorGUILayout
+{
+    // @TODO: Make private (and rename to not claim it's a constant). Shouldn't really be used outside of EditorGUI.
+    // Places that use this directly should likely use GetControlRect instead.
+    internal static float kLabelFloatMinW => EditorGUIUtility.labelWidth + EditorGUIUtility.fieldWidth + EditorGUI.kSpacing;
+
+    internal static float kLabelFloatMaxW => EditorGUIUtility.labelWidth + EditorGUIUtility.fieldWidth + EditorGUI.kSpacing;
+
+    internal static Rect s_LastRect;
+
+    internal const float kPlatformTabWidth = 30;
+
+    internal static SavedBool s_SelectedDefault = new SavedBool("Platform.ShownDefaultTab", true);
+
+    static GUIStyle s_TabOnlyOne;
+    static GUIStyle s_TabFirst;
+    static GUIStyle s_TabMiddle;
+    static GUIStyle s_TabLast;
+
+    [ExcludeFromDocs]
+    public static bool Foldout(bool foldout, string content)
+    {
+        return Foldout(foldout, content, EditorStyles.foldout);
+    }
+
+    public static bool Foldout(bool foldout, string content, [DefaultValue("EditorStyles.foldout")] GUIStyle style)
+    {
+        return Foldout(foldout, EditorGUIUtility.TempContent(content), false, style);
+    }
+
+    [ExcludeFromDocs]
+    public static bool Foldout(bool foldout, GUIContent content)
+    {
+        return Foldout(foldout, content, EditorStyles.foldout);
+    }
+
+    public static bool Foldout(bool foldout, GUIContent content, [DefaultValue("EditorStyles.foldout")] GUIStyle style)
+    {
+        return Foldout(foldout, content, false, style);
+    }
+
+    [ExcludeFromDocs]
+    public static bool Foldout(bool foldout, string content, bool toggleOnLabelClick)
+    {
+        return Foldout(foldout, content, toggleOnLabelClick, EditorStyles.foldout);
+    }
+
+    public static bool Foldout(bool foldout, string content, bool toggleOnLabelClick, [DefaultValue("EditorStyles.foldout")] GUIStyle style)
+    {
+        return Foldout(foldout, EditorGUIUtility.TempContent(content), toggleOnLabelClick, style);
+    }
+
+    [ExcludeFromDocs]
+    public static bool Foldout(bool foldout, GUIContent content, bool toggleOnLabelClick)
+    {
+        return Foldout(foldout, content, toggleOnLabelClick, EditorStyles.foldout);
+    }
+
+    public static bool Foldout(bool foldout, GUIContent content, bool toggleOnLabelClick, [DefaultValue("EditorStyles.foldout")] GUIStyle style)
+    {
+        return FoldoutInternal(foldout, content, toggleOnLabelClick, style);
+    }
+
+    [ExcludeFromDocs]
+    public static void PrefixLabel(string label)
+    {
+        GUIStyle followingStyle = "Button";
+        PrefixLabel(label, followingStyle);
+    }
+
+    public static void PrefixLabel(string label, [DefaultValue("\"Button\"")] GUIStyle followingStyle)
+    {
+        PrefixLabel(EditorGUIUtility.TempContent(label), followingStyle, EditorStyles.label);
+    }
+
+    public static void PrefixLabel(string label, GUIStyle followingStyle, GUIStyle labelStyle)
+    {
+        PrefixLabel(EditorGUIUtility.TempContent(label), followingStyle, labelStyle);
+    }
+
+    [ExcludeFromDocs]
+    public static void PrefixLabel(GUIContent label)
+    {
+        GUIStyle followingStyle = "Button";
+        PrefixLabel(label, followingStyle);
+    }
+
+    public static void PrefixLabel(GUIContent label, [DefaultValue("\"Button\"")] GUIStyle followingStyle)
+    {
+        PrefixLabel(label, followingStyle, EditorStyles.label);
+    }
+
+    // Make a label in front of some control.
+    public static void PrefixLabel(GUIContent label, GUIStyle followingStyle, GUIStyle labelStyle)
+    {
+        PrefixLabelInternal(label, followingStyle, labelStyle);
+    }
+
+    public static void LabelField(string label, params GUILayoutOption[] options)
+    {
+        LabelField(GUIContent.none, EditorGUIUtility.TempContent(label), EditorStyles.label, options);
+    }
+
+    public static void LabelField(string label, GUIStyle style, params GUILayoutOption[] options)
+    {
+        LabelField(GUIContent.none, EditorGUIUtility.TempContent(label), style, options);
+    }
+
+    public static void LabelField(GUIContent label, params GUILayoutOption[] options)
+    {
+        LabelField(GUIContent.none, label, EditorStyles.label, options);
+    }
+
+    public static void LabelField(GUIContent label, GUIStyle style, params GUILayoutOption[] options)
+    {
+        LabelField(GUIContent.none, label, style, options);
+    }
+
+    public static void LabelField(string label, string label2, params GUILayoutOption[] options)
+    {
+        LabelField(new GUIContent(label), EditorGUIUtility.TempContent(label2), EditorStyles.label, options);
+    }
+
+    public static void LabelField(string label, string label2, GUIStyle style, params GUILayoutOption[] options)
+    {
+        LabelField(new GUIContent(label), EditorGUIUtility.TempContent(label2), style, options);
+    }
+
+    public static void LabelField(GUIContent label, GUIContent label2, params GUILayoutOption[] options)
+    {
+        LabelField(label, label2, EditorStyles.label, options);
+    }
+
+    // Make a label field. (Useful for showing read-only info.)
+    public static void LabelField(GUIContent label, GUIContent label2, GUIStyle style, params GUILayoutOption[] options)
+    {
+        if (!style.wordWrap)
+        {
+            // If we don't need word wrapping, just allocate the standard space to avoid corner case layout issues
+            Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, options);
+            EditorGUI.LabelField(r, label, label2, style);
+        }
+        else
+        {
+            BeginHorizontal();
+            PrefixLabel(label, style);
+            Rect r = GUILayoutUtility.GetRect(label2, style, options);
+            int oldIndent = EditorGUI.indentLevel;
+            EditorGUI.indentLevel = 0;
+            EditorGUI.LabelField(r, label2, style);
+            EditorGUI.indentLevel = oldIndent;
+            EndHorizontal();
+        }
+    }
+
+    public static bool LinkButton(string label, params GUILayoutOption[] options)
+    {
+        return LinkButton(EditorGUIUtility.TempContent(label), options);
+    }
+
+    public static bool LinkButton(GUIContent label, params GUILayoutOption[] options)
+    {
+        var position = s_LastRect = GUILayoutUtility.GetRect(label, EditorStyles.linkLabel, options);
+
+        Handles.color = EditorStyles.linkLabel.normal.textColor;
+        Handles.DrawLine(new Vector3(position.xMin + EditorStyles.linkLabel.padding.left, position.yMax), new Vector3(position.xMax - EditorStyles.linkLabel.padding.right, position.yMax));
+        Handles.color = Color.white;
+
+        EditorGUIUtility.AddCursorRect(position, MouseCursor.Link);
+
+        return GUI.Button(position, label, EditorStyles.linkLabel);
+    }
+
+    public static bool Toggle(bool value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetToggleRect(false, options);
+        return EditorGUI.Toggle(r, value);
+    }
+
+    public static bool Toggle(string label, bool value, params GUILayoutOption[] options)
+    {
+        return Toggle(EditorGUIUtility.TempContent(label), value, options);
+    }
+
+    public static bool Toggle(GUIContent label, bool value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetToggleRect(true, options);
+        return EditorGUI.Toggle(r, label, value);
+    }
+
+    public static bool Toggle(bool value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetToggleRect(false, options);
+        return EditorGUI.Toggle(r, value, style);
+    }
+
+    public static bool Toggle(string label, bool value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        return Toggle(EditorGUIUtility.TempContent(label), value, style, options);
+    }
+
+    // Make a toggle.
+    public static bool Toggle(GUIContent label, bool value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetToggleRect(true, options);
+        return EditorGUI.Toggle(r, label, value, style);
+    }
+
+    public static bool ToggleLeft(string label, bool value, params GUILayoutOption[] options)
+    {
+        return ToggleLeft(EditorGUIUtility.TempContent(label), value, options);
+    }
+
+    public static bool ToggleLeft(GUIContent label, bool value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, options);
+        return EditorGUI.ToggleLeft(r, label, value);
+    }
+
+    public static bool ToggleLeft(string label, bool value, GUIStyle labelStyle, params GUILayoutOption[] options)
+    {
+        return ToggleLeft(EditorGUIUtility.TempContent(label), value, labelStyle, options);
+    }
+
+    // Make a toggle with the label on the right.
+    public static bool ToggleLeft(GUIContent label, bool value, GUIStyle labelStyle, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, options);
+        return EditorGUI.ToggleLeft(r, label, value, labelStyle);
+    }
+
+    public static string TextField(string text, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
+        return EditorGUI.TextField(r, text);
+    }
+
+    public static string TextField(string text, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.TextField(r, text, style);
+    }
+
+    public static string TextField(string label, string text, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
+        return EditorGUI.TextField(r, label, text);
+    }
+
+    public static string TextField(string label, string text, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.TextField(r, label, text, style);
+    }
+
+    public static string TextField(GUIContent label, string text, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
+        return EditorGUI.TextField(r, label, text);
+    }
+
+    // Make a text field.
+    public static string TextField(GUIContent label, string text, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.TextField(r, label, text, style);
+    }
+
+    public static string DelayedTextField(string text, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
+        return EditorGUI.DelayedTextField(r, text);
+    }
+
+    public static string DelayedTextField(string text, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedTextField(r, text, style);
+    }
+
+    public static string DelayedTextField(string label, string text, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
+        return EditorGUI.DelayedTextField(r, label, text);
+    }
+
+    public static string DelayedTextField(string label, string text, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedTextField(r, label, text, style);
+    }
+
+    public static string DelayedTextField(GUIContent label, string text, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
+        return EditorGUI.DelayedTextField(r, label, text);
+    }
+
+    // Make a delayed text field.
+    public static string DelayedTextField(GUIContent label, string text, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedTextField(r, label, text, style);
+    }
+
+    public static void DelayedTextField(SerializedProperty property, params GUILayoutOption[] options)
+    {
+        DelayedTextField(property, null, options);
+    }
+
+    // Make a delayed text field.
+    internal static void DelayedTextField(SerializedProperty property, GUIContent label, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(EditorGUI.LabelHasContent(label), EditorGUI.kSingleLineHeight, EditorStyles.textField, options);
+        EditorGUI.DelayedTextFieldHelper(r, property, label, style);
+    }
+
+    public static void DelayedTextField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
+    {
+        DelayedTextField(property, label, EditorStyles.textField, options);
+    }
+
+    internal static string ToolbarSearchField(string text, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GUILayoutUtility.GetRect(0, kLabelFloatMaxW * 1.5f, EditorGUI.kSingleLineHeight, EditorGUI.kSingleLineHeight, EditorStyles.toolbarSearchField, options);
+        int i = 0;
+        return EditorGUI.ToolbarSearchField(r, null, ref i, text);
+    }
+
+    internal static string ToolbarSearchField(string text, string[] searchModes, ref int searchMode, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GUILayoutUtility.GetRect(0, kLabelFloatMaxW * 1.5f, EditorGUI.kSingleLineHeight, EditorGUI.kSingleLineHeight, EditorStyles.toolbarSearchField, options);
+        return EditorGUI.ToolbarSearchField(r, searchModes, ref searchMode, text);
+    }
+
+    public static string TextArea(string text, params GUILayoutOption[] options)
+    { return TextArea(text, EditorStyles.textField, options); }
+    // Make a text area.
+    public static string TextArea(string text, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GUILayoutUtility.GetRect(EditorGUIUtility.TempContent(text), style, options);
+        return EditorGUI.TextArea(r, text, style);
+    }
+
+    public static void SelectableLabel(string text, params GUILayoutOption[] options)
+    {
+        SelectableLabel(text, EditorStyles.label, options);
+    }
+
+    // Make a selectable label field. (Useful for showing read-only info that can be copy-pasted.)
+    public static void SelectableLabel(string text, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight * 2, style, options);
+        EditorGUI.SelectableLabel(r, text, style);
+    }
+
+    internal static Event KeyEventField(Event e, params GUILayoutOption[] options)
+    {
+        Rect r = GUILayoutUtility.GetRect(EditorGUI.s_PleasePressAKey, GUI.skin.textField, options);
+        return EditorGUI.KeyEventField(r, e);
+    }
+
+    public static string PasswordField(string password, params GUILayoutOption[] options)
+    {
+        return PasswordField(password, EditorStyles.textField, options);
+    }
+
+    public static string PasswordField(string password, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.PasswordField(r, password, style);
+    }
+
+    public static string PasswordField(string label, string password, params GUILayoutOption[] options)
+    {
+        return PasswordField(EditorGUIUtility.TempContent(label), password, EditorStyles.textField, options);
+    }
+
+    public static string PasswordField(string label, string password, GUIStyle style, params GUILayoutOption[] options)
+    {
+        return PasswordField(EditorGUIUtility.TempContent(label), password, style, options);
+    }
+
+    public static string PasswordField(GUIContent label, string password, params GUILayoutOption[] options)
+    {
+        return PasswordField(label, password, EditorStyles.textField, options);
+    }
+
+    // Make a text field where the user can enter a password.
+    public static string PasswordField(GUIContent label, string password, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.PasswordField(r, label, password, style);
+    }
+
+    // Peak smoothing should be handled by client. Input: value and peak is normalized values (0 - 1).
+    internal static void VUMeterHorizontal(float value, float peak, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        EditorGUI.VUMeter.HorizontalMeter(r, value, peak, EditorGUI.VUMeter.horizontalVUTexture, Color.grey);
+    }
+
+    // Auto-smoothing of peak
+    internal static void VUMeterHorizontal(float value, ref EditorGUI.VUMeter.SmoothingData data, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        EditorGUI.VUMeter.HorizontalMeter(r, value, ref data, EditorGUI.VUMeter.horizontalVUTexture, Color.grey);
+    }
+
+    public static float FloatField(float value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.FloatField(r, value);
+    }
+
+    public static float FloatField(float value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.FloatField(r, value, style);
+    }
+
+    public static float FloatField(string label, float value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.FloatField(r, label, value);
+    }
+
+    public static float FloatField(string label, float value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.FloatField(r, label, value, style);
+    }
+
+    public static float FloatField(GUIContent label, float value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.FloatField(r, label, value);
+    }
+
+    // Make a text field for entering float values.
+    public static float FloatField(GUIContent label, float value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.FloatField(r, label, value, style);
+    }
+
+    public static float DelayedFloatField(float value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.DelayedFloatField(r, value);
+    }
+
+    public static float DelayedFloatField(float value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedFloatField(r, value, style);
+    }
+
+    public static float DelayedFloatField(string label, float value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.DelayedFloatField(r, label, value);
+    }
+
+    public static float DelayedFloatField(string label, float value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedFloatField(r, label, value, style);
+    }
+
+    public static float DelayedFloatField(GUIContent label, float value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.DelayedFloatField(r, label, value);
+    }
+
+    // Make a delayed text field for entering float values.
+    public static float DelayedFloatField(GUIContent label, float value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedFloatField(r, label, value, style);
+    }
+
+    public static void DelayedFloatField(SerializedProperty property, params GUILayoutOption[] options)
+    {
+        DelayedFloatField(property, null, options);
+    }
+
+    // Make a delayed text field for entering float values.
+    public static void DelayedFloatField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(EditorGUI.LabelHasContent(label), EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        EditorGUI.DelayedFloatField(r, property, label);
+    }
+
+    public static double DoubleField(double value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.DoubleField(r, value);
+    }
+
+    public static double DoubleField(double value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DoubleField(r, value, style);
+    }
+
+    public static double DoubleField(string label, double value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.DoubleField(r, label, value);
+    }
+
+    public static double DoubleField(string label, double value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DoubleField(r, label, value, style);
+    }
+
+    public static double DoubleField(GUIContent label, double value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.DoubleField(r, label, value);
+    }
+
+    // Make a text field for entering double values.
+    public static double DoubleField(GUIContent label, double value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DoubleField(r, label, value, style);
+    }
+
+    public static double DelayedDoubleField(double value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.DelayedDoubleField(r, value);
+    }
+
+    public static double DelayedDoubleField(double value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedDoubleField(r, value, style);
+    }
+
+    public static double DelayedDoubleField(string label, double value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.DelayedDoubleField(r, label, value);
+    }
+
+    public static double DelayedDoubleField(string label, double value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedDoubleField(r, label, value, style);
+    }
+
+    public static double DelayedDoubleField(GUIContent label, double value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        return EditorGUI.DelayedDoubleField(r, label, value);
+    }
+
+    // Make a delayed text field for entering double values.
+    public static double DelayedDoubleField(GUIContent label, double value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedDoubleField(r, label, value, style);
+    }
+
+    public static int IntField(int value, params GUILayoutOption[] options)
+    {
+        return IntField(value, EditorStyles.numberField, options);
+    }
+
+    public static int IntField(int value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.IntField(r, value, style);
+    }
+
+    public static int IntField(string label, int value, params GUILayoutOption[] options)
+    {
+        return IntField(label, value, EditorStyles.numberField, options);
+    }
+
+    public static int IntField(string label, int value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.IntField(r, label, value, style);
+    }
+
+    public static int IntField(GUIContent label, int value, params GUILayoutOption[] options)
+    {
+        return IntField(label, value, EditorStyles.numberField, options);
+    }
+
+    // Make a text field for entering integers.
+    public static int IntField(GUIContent label, int value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.IntField(r, label, value, style);
+    }
+
+    public static int DelayedIntField(int value, params GUILayoutOption[] options)
+    {
+        return DelayedIntField(value, EditorStyles.numberField, options);
+    }
+
+    public static int DelayedIntField(int value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedIntField(r, value, style);
+    }
+
+    public static int DelayedIntField(string label, int value, params GUILayoutOption[] options)
+    {
+        return DelayedIntField(label, value, EditorStyles.numberField, options);
+    }
+
+    public static int DelayedIntField(string label, int value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedIntField(r, label, value, style);
+    }
+
+    public static int DelayedIntField(GUIContent label, int value, params GUILayoutOption[] options)
+    {
+        return DelayedIntField(label, value, EditorStyles.numberField, options);
+    }
+
+    // Make a text field for entering integers.
+    public static int DelayedIntField(GUIContent label, int value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.DelayedIntField(r, label, value, style);
+    }
+
+    public static void DelayedIntField(SerializedProperty property, params GUILayoutOption[] options)
+    {
+        DelayedIntField(property, null, options);
+    }
+
+    // Make a text field for entering integers.
+    public static void DelayedIntField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(EditorGUI.LabelHasContent(label), EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+        EditorGUI.DelayedIntField(r, property, label);
+    }
+
+    public static long LongField(long value, params GUILayoutOption[] options)
+    {
+        return LongField(value, EditorStyles.numberField, options);
+    }
+
+    public static long LongField(long value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.LongField(r, value, style);
+    }
+
+    public static long LongField(string label, long value, params GUILayoutOption[] options)
+    {
+        return LongField(label, value, EditorStyles.numberField, options);
+    }
+
+    public static long LongField(string label, long value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.LongField(r, label, value, style);
+    }
+
+    public static long LongField(GUIContent label, long value, params GUILayoutOption[] options)
+    {
+        return LongField(label, value, EditorStyles.numberField, options);
+    }
+
+    // Make a text field for entering integers.
+    public static long LongField(GUIContent label, long value, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.LongField(r, label, value, style);
+    }
+
+    public static float Slider(float value, float leftValue, float rightValue, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(false, options);
+        return EditorGUI.Slider(r, value, leftValue, rightValue);
+    }
+
+    public static float Slider(string label, float value, float leftValue, float rightValue, params GUILayoutOption[] options)
+    {
+        return Slider(EditorGUIUtility.TempContent(label), value, leftValue, rightValue, options);
+    }
+
+    // Make a slider the user can drag to change a value between a min and a max.
+    public static float Slider(GUIContent label, float value, float leftValue, float rightValue, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(true, options);
+        return EditorGUI.Slider(r, label, value, leftValue, rightValue);
+    }
+
+    internal static float Slider(GUIContent label, float value, float sliderLeftValue, float sliderRightValue, float textLeftValue, float textRightValue, params GUILayoutOption[] options)
+    {
+        return Slider(label, value, sliderLeftValue, sliderRightValue, textLeftValue, textRightValue, EditorStyles.numberField,
+            GUI.skin.horizontalSlider, GUI.skin.horizontalSliderThumb, null, GUI.skin.horizontalSliderThumbExtent, options);
+    }
+
+    static void GetSliderParts(GUIStyle baseStyle, ref GUIStyle textFieldStyle, ref GUIStyle thumbStyle, ref GUIStyle thumbExtentStyle)
+    {
+        string baseName = baseStyle.name;
+        thumbStyle = GUI.skin.FindStyle(baseName + "Thumb") ?? thumbStyle;
+        thumbExtentStyle = GUI.skin.FindStyle(baseName + "ThumbExtent") ?? thumbExtentStyle;
+        textFieldStyle = GUI.skin.FindStyle(baseName + "TextField") ?? textFieldStyle;
+    }
+
+    static void GetHorizontalSliderParts(GUIStyle baseStyle, out GUIStyle textFieldStyle, out GUIStyle thumbStyle, out GUIStyle thumbExtentStyle)
+    {
+        thumbStyle = GUI.skin.horizontalSliderThumb;
+        thumbExtentStyle = GUI.skin.horizontalSliderThumbExtent;
+        textFieldStyle = EditorStyles.numberField;
+
+        GetSliderParts(baseStyle, ref textFieldStyle, ref thumbStyle, ref thumbExtentStyle);
+    }
+
+    static void GetVerticalSliderParts(GUIStyle baseStyle, out GUIStyle textFieldStyle, out GUIStyle thumbStyle, out GUIStyle thumbExtentStyle)
+    {
+        thumbStyle = GUI.skin.verticalSliderThumb;
+        thumbExtentStyle = GUI.skin.verticalSliderThumbExtent;
+        textFieldStyle = EditorStyles.numberField;
+
+        GetSliderParts(baseStyle, ref textFieldStyle, ref thumbStyle, ref thumbExtentStyle);
+    }
+
+    internal static float Slider(GUIContent label, float value, float sliderLeftValue, float sliderRightValue, float textLeftValue, float textRightValue, GUIStyle sliderStyle, params GUILayoutOption[] options)
+    {
+        GUIStyle sliderThumbStyle, sliderThumbStyleExtent, sliderTextFieldStyle;
+
+        GetHorizontalSliderParts(sliderStyle, out sliderTextFieldStyle, out sliderThumbStyle, out sliderThumbStyleExtent);
+
+        return Slider(label, value, sliderLeftValue, sliderRightValue, textLeftValue, textRightValue, sliderTextFieldStyle, sliderStyle
+            , sliderThumbStyle, null, sliderThumbStyleExtent);
+    }
+
+    internal static float Slider(GUIContent label, float value, float sliderLeftValue, float sliderRightValue, float textLeftValue, float textRightValue
+        , GUIStyle sliderTextField, GUIStyle sliderStyle, GUIStyle sliderThumbStyle, Texture2D sliderBackground, GUIStyle sliderThumbStyleExtent, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(true, sliderStyle, options);
+        return EditorGUI.Slider(r, label, value, sliderLeftValue, sliderRightValue, textLeftValue, textRightValue, sliderTextField, sliderStyle, sliderThumbStyle, sliderBackground, sliderThumbStyleExtent);
+    }
+
+    public static void Slider(SerializedProperty property, float leftValue, float rightValue, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(false, options);
+        EditorGUI.Slider(r, property, leftValue, rightValue);
+    }
+
+    public static void Slider(SerializedProperty property, float leftValue, float rightValue, string label, params GUILayoutOption[] options)
+    {
+        Slider(property, leftValue, rightValue, EditorGUIUtility.TempContent(label), options);
+    }
+
+    // Make a slider the user can drag to change a value between a min and a max.
+    public static void Slider(SerializedProperty property, float leftValue, float rightValue, GUIContent label, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(true, options);
+        EditorGUI.Slider(r, property, leftValue, rightValue, label);
+    }
+
+    internal static void Slider(SerializedProperty property, float sliderLeftValue, float sliderRightValue, float textLeftValue, float textRightValue, GUIContent label, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(true, options);
+        EditorGUI.Slider(r, property, sliderLeftValue, sliderRightValue, textLeftValue, textRightValue, label);
+    }
+
+    internal static float PowerSlider(string label, float value, float leftValue, float rightValue, float power, params GUILayoutOption[] options)
+    {
+        return PowerSlider(EditorGUIUtility.TempContent(label), value, leftValue, rightValue, power, options);
+    }
+
+    // Make a power slider the user can drag to change a value between a min and a max.
+    internal static float PowerSlider(GUIContent label, float value, float leftValue, float rightValue, float power, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(true, options);
+        return EditorGUI.PowerSlider(r, label, value, leftValue, rightValue, power);
+    }
+
+    internal static int LogarithmicIntSlider(string label, int value, int leftValue, int rightValue, int logbase, int textFieldMin, int textFieldMax, params GUILayoutOption[] options)
+    {
+        return LogarithmicIntSlider(EditorGUIUtility.TempContent(label), value, leftValue, rightValue, logbase, textFieldMin, textFieldMax, options);
+    }
+
+    internal static int LogarithmicIntSlider(GUIContent label, int value, int leftValue, int rightValue, int logbase, int textFieldMin, int textFieldMax, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(true, options);
+        return EditorGUI.LogarithmicIntSlider(r, label, value, leftValue, rightValue, logbase, textFieldMin, textFieldMax);
+    }
+
+    public static int IntSlider(int value, int leftValue, int rightValue, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(false, options);
+        return EditorGUI.IntSlider(r, value, leftValue, rightValue);
+    }
+
+    internal static int IntSlider(int value, int leftValue, int rightValue, float power, GUIStyle sliderStyle, params GUILayoutOption[] options)
+    {
+        GUIStyle sliderThumbStyle, sliderThumbStyleExtent, sliderTextFieldStyle;
+
+        GetHorizontalSliderParts(sliderStyle, out sliderTextFieldStyle, out sliderThumbStyle, out sliderThumbStyleExtent);
+
+        return IntSlider(value, leftValue, rightValue, power, sliderTextFieldStyle, sliderStyle, sliderThumbStyle, null, sliderThumbStyleExtent, options);
+    }
+
+    internal static int IntSlider(int value, int leftValue, int rightValue, float power,
+        GUIStyle textfieldStyle, GUIStyle sliderStyle, GUIStyle thumbStyle, Texture2D sliderBackground, GUIStyle thumbStyleExtent, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(false, sliderStyle, options);
+        return EditorGUI.IntSlider(r, value, leftValue, rightValue, power, logbase: 1, textfieldStyle, sliderStyle, thumbStyle, sliderBackground, thumbStyleExtent);
+    }
+
+    public static int IntSlider(string label, int value, int leftValue, int rightValue, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(true, options);
+        return EditorGUI.IntSlider(r, label, value, leftValue, rightValue);
+    }
+
+    // Make a slider the user can drag to change an integer value between a min and a max.
+    public static int IntSlider(GUIContent label, int value, int leftValue, int rightValue, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(true, options);
+        return EditorGUI.IntSlider(r, label, value, leftValue, rightValue);
+    }
+
+    public static void IntSlider(SerializedProperty property, int leftValue, int rightValue, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(false, options);
+        EditorGUI.IntSlider(r, property, leftValue, rightValue, property.displayName);
+    }
+
+    public static void IntSlider(SerializedProperty property, int leftValue, int rightValue, string label, params GUILayoutOption[] options)
+    {
+        IntSlider(property, leftValue, rightValue, EditorGUIUtility.TempContent(label), options);
+    }
+
+    // Make a slider the user can drag to change an integer value between a min and a max.
+    public static void IntSlider(SerializedProperty property, int leftValue, int rightValue, GUIContent label, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(true, options);
+        EditorGUI.IntSlider(r, property, leftValue, rightValue, label);
+    }
+
+    public static void MinMaxSlider(ref float minValue, ref float maxValue, float minLimit, float maxLimit, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(false, options);
+        EditorGUI.MinMaxSlider(r, ref minValue, ref maxValue, minLimit, maxLimit);
+    }
+
+    public static void MinMaxSlider(string label, ref float minValue, ref float maxValue, float minLimit, float maxLimit, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(true, options);
+        EditorGUI.MinMaxSlider(r, label, ref minValue, ref maxValue, minLimit, maxLimit);
+    }
+
+    // Make a special slider the user can use to specify a range between a min and a max.
+    public static void MinMaxSlider(GUIContent label, ref float minValue, ref float maxValue, float minLimit, float maxLimit, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetSliderRect(true, options);
+        EditorGUI.MinMaxSlider(r, label, ref minValue, ref maxValue, minLimit, maxLimit);
+    }
+
+    public static int Popup(int selectedIndex, string[] displayedOptions, params GUILayoutOption[] options)
+    {
+        return Popup(selectedIndex, displayedOptions, EditorStyles.popup, options);
+    }
+
+    public static int Popup(int selectedIndex, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.Popup(r, selectedIndex, displayedOptions, style);
+    }
+
+    public static int Popup(int selectedIndex, GUIContent[] displayedOptions, params GUILayoutOption[] options)
+    {
+        return Popup(selectedIndex, displayedOptions, EditorStyles.popup, options);
+    }
+
+    public static int Popup(int selectedIndex, GUIContent[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.Popup(r, selectedIndex, displayedOptions, style);
+    }
+
+    public static int Popup(string label, int selectedIndex, string[] displayedOptions, params GUILayoutOption[] options)
+    {
+        return Popup(label, selectedIndex, displayedOptions, EditorStyles.popup, options);
+    }
+
+    public static int Popup(GUIContent label, int selectedIndex, string[] displayedOptions, params GUILayoutOption[] options)
+    {
+        return Popup(label, selectedIndex, displayedOptions, EditorStyles.popup, options);
+    }
+
+    public static int Popup(string label, int selectedIndex, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.Popup(r, label, selectedIndex, displayedOptions, style);
+    }
+
+    public static int Popup(GUIContent label, int selectedIndex, GUIContent[] displayedOptions, params GUILayoutOption[] options)
+    {
+        return Popup(label, selectedIndex, displayedOptions, EditorStyles.popup, options);
+    }
+
+    // Make a generic popup selection field.
+    public static int Popup(GUIContent label, int selectedIndex, GUIContent[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.Popup(r, label, selectedIndex, displayedOptions, style);
+    }
+
+    internal static int Popup(GUIContent label, int selectedIndex, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.Popup(r, label, selectedIndex, displayedOptions, style);
+    }
+
+    internal static void Popup(SerializedProperty property, GUIContent[] displayedOptions, params GUILayoutOption[] options)
+    {
+        Popup(property, displayedOptions, null, options);
+    }
+
+    internal static void Popup(SerializedProperty property, GUIContent[] displayedOptions, GUIContent label, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup, options);
+        EditorGUI.Popup(r, property, displayedOptions, label);
+    }
+
+    public static Enum EnumPopup(Enum selected, params GUILayoutOption[] options)
+    {
+        return EnumPopup(selected, EditorStyles.popup, options);
+    }
+
+    public static Enum EnumPopup(Enum selected, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.EnumPopup(r, selected, style);
+    }
+
+    public static Enum EnumPopup(string label, Enum selected, params GUILayoutOption[] options)
+    {
+        return EnumPopup(label, selected, EditorStyles.popup, options);
+    }
+
+    public static Enum EnumPopup(string label, Enum selected, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.EnumPopup(r, GUIContent.Temp(label), selected, null, false, style);
+    }
+
+    public static Enum EnumPopup(GUIContent label, Enum selected, params GUILayoutOption[] options)
+    {
+        return EnumPopup(label, selected, EditorStyles.popup, options);
+    }
+
+    // Make an enum popup selection field.
+    public static Enum EnumPopup(GUIContent label, Enum selected, GUIStyle style, params GUILayoutOption[] options)
+    {
+        return EnumPopup(label, selected, null, false, style, options);
+    }
+
+    public static Enum EnumPopup(GUIContent label, Enum selected, Func<Enum, bool> checkEnabled, bool includeObsolete, params GUILayoutOption[] options)
+    {
+        return EnumPopup(label, selected, checkEnabled, includeObsolete, EditorStyles.popup, options);
+    }
+
+    public static Enum EnumPopup(GUIContent label, Enum selected, Func<Enum, bool> checkEnabled, bool includeObsolete, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.EnumPopup(r, label, selected, checkEnabled, includeObsolete, style);
+    }
+
+    public static int IntPopup(int selectedValue, string[] displayedOptions, int[] optionValues, params GUILayoutOption[] options)
+    {
+        return IntPopup(selectedValue, displayedOptions, optionValues, EditorStyles.popup, options);
+    }
+
+    public static int IntPopup(int selectedValue, string[] displayedOptions, int[] optionValues, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.IntPopup(r,  selectedValue, displayedOptions, optionValues, style);
+    }
+
+    public static int IntPopup(int selectedValue, GUIContent[] displayedOptions, int[] optionValues, params GUILayoutOption[] options)
+    {
+        return IntPopup(selectedValue, displayedOptions, optionValues, EditorStyles.popup, options);
+    }
+
+    public static int IntPopup(int selectedValue, GUIContent[] displayedOptions, int[] optionValues, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.IntPopup(r,  GUIContent.none, selectedValue, displayedOptions, optionValues, style);
+    }
+
+    public static int IntPopup(string label, int selectedValue, string[] displayedOptions, int[] optionValues, params GUILayoutOption[] options)
+    {
+        return IntPopup(label, selectedValue, displayedOptions, optionValues, EditorStyles.popup, options);
+    }
+
+    public static int IntPopup(string label, int selectedValue, string[] displayedOptions, int[] optionValues, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.IntPopup(r, label, selectedValue, displayedOptions, optionValues, style);
+    }
+
+    public static int IntPopup(GUIContent label, int selectedValue, GUIContent[] displayedOptions, int[] optionValues, params GUILayoutOption[] options)
+    {
+        return IntPopup(label, selectedValue, displayedOptions, optionValues, EditorStyles.popup, options);
+    }
+
+    // Make an integer popup selection field.
+    public static int IntPopup(GUIContent label, int selectedValue, GUIContent[] displayedOptions, int[] optionValues, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.IntPopup(r, label, selectedValue, displayedOptions, optionValues, style);
+    }
+
+    public static void IntPopup(SerializedProperty property, GUIContent[] displayedOptions, int[] optionValues, params GUILayoutOption[] options)
+    {
+        IntPopup(property, displayedOptions, optionValues, null, options);
+    }
+
+    // Make an integer popup selection field.
+    public static void IntPopup(SerializedProperty property, GUIContent[] displayedOptions, int[] optionValues, GUIContent label, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup, options);
+        EditorGUI.IntPopup(r, property, displayedOptions, optionValues, label);
+    }
+
+    [Obsolete("This function is obsolete and the style is not used.")]
+    public static void IntPopup(SerializedProperty property, GUIContent[] displayedOptions, int[] optionValues, GUIContent label, GUIStyle style, params GUILayoutOption[] options)
+    {
+        IntPopup(property, displayedOptions, optionValues, label, options);
+    }
+
+    public static string TagField(string tag, params GUILayoutOption[] options)
+    {
+        return TagField(tag, EditorStyles.popup, options);
+    }
+
+    public static string TagField(string tag, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.TagField(r, tag, style);
+    }
+
+    public static string TagField(string label, string tag, params GUILayoutOption[] options)
+    {
+        return TagField(EditorGUIUtility.TempContent(label), tag, EditorStyles.popup, options);
+    }
+
+    public static string TagField(string label, string tag, GUIStyle style, params GUILayoutOption[] options)
+    {
+        return TagField(EditorGUIUtility.TempContent(label), tag, style, options);
+    }
+
+    public static string TagField(GUIContent label, string tag, params GUILayoutOption[] options)
+    {
+        return TagField(label, tag, EditorStyles.popup, options);
+    }
+
+    // Make a tag selection field.
+    public static string TagField(GUIContent label, string tag, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.TagField(r, label, tag, style);
+    }
+
+    public static int LayerField(int layer, params GUILayoutOption[] options)
+    {
+        return LayerField(layer, EditorStyles.popup, options);
+    }
+
+    public static int LayerField(int layer, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.LayerField(r, layer, style);
+    }
+
+    public static int LayerField(string label, int layer, params GUILayoutOption[] options)
+    {
+        return LayerField(EditorGUIUtility.TempContent(label), layer, EditorStyles.popup, options);
+    }
+
+    public static int LayerField(string label, int layer, GUIStyle style, params GUILayoutOption[] options)
+    {
+        return LayerField(EditorGUIUtility.TempContent(label), layer, style, options);
+    }
+
+    public static int LayerField(GUIContent label, int layer, params GUILayoutOption[] options)
+    {
+        return LayerField(label, layer, EditorStyles.popup, options);
+    }
+
+    // Make a layer selection field.
+    public static int LayerField(GUIContent label, int layer, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.LayerField(r, label, layer, style);
+    }
+
+    public static int MaskField(GUIContent label, int mask, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
+    {
+        var r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.MaskField(r, label, mask, displayedOptions, style);
+    }
+
+    public static int MaskField(string label, int mask, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
+    {
+        var r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.MaskField(r, label, mask, displayedOptions, style);
+    }
+
+    public static int MaskField(GUIContent label, int mask, string[] displayedOptions, params GUILayoutOption[] options)
+    {
+        var r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup, options);
+        return EditorGUI.MaskField(r, label, mask, displayedOptions, EditorStyles.popup);
+    }
+
+    public static int MaskField(string label, int mask, string[] displayedOptions, params GUILayoutOption[] options)
+    {
+        var r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup, options);
+        return EditorGUI.MaskField(r, label, mask, displayedOptions, EditorStyles.popup);
+    }
+
+    public static int MaskField(int mask, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
+    {
+        var r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.MaskField(r, mask, displayedOptions, style);
+    }
+
+    // Make a field for masks.
+    public static int MaskField(int mask, string[] displayedOptions, params GUILayoutOption[] options)
+    {
+        var r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.popup, options);
+        return EditorGUI.MaskField(r, mask, displayedOptions, EditorStyles.popup);
+    }
+
+    public static Enum EnumFlagsField(Enum enumValue, params GUILayoutOption[] options)
+    {
+        return EnumFlagsField(enumValue, EditorStyles.popup, options);
+    }
+
+    public static Enum EnumFlagsField(Enum enumValue, GUIStyle style, params GUILayoutOption[] options)
+    {
+        var position = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.EnumFlagsField(position, enumValue, style);
+    }
+
+    public static Enum EnumFlagsField(string label, Enum enumValue, params GUILayoutOption[] options)
+    {
+        return EnumFlagsField(label, enumValue, EditorStyles.popup, options);
+    }
+
+    public static Enum EnumFlagsField(string label, Enum enumValue, GUIStyle style, params GUILayoutOption[] options)
+    {
+        return EnumFlagsField(EditorGUIUtility.TempContent(label), enumValue, style, options);
+    }
+
+    public static Enum EnumFlagsField(GUIContent label, Enum enumValue, params GUILayoutOption[] options)
+    {
+        return EnumFlagsField(label, enumValue, EditorStyles.popup, options);
+    }
+
+    public static Enum EnumFlagsField(GUIContent label, Enum enumValue, GUIStyle style, params GUILayoutOption[] options)
+    {
+        var position = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.EnumFlagsField(position, label, enumValue, style);
+    }
+
+    public static Enum EnumFlagsField(GUIContent label, Enum enumValue, bool includeObsolete, params GUILayoutOption[] options)
+    {
+        return EnumFlagsField(label, enumValue, includeObsolete, EditorStyles.popup, options);
+    }
+
+    public static Enum EnumFlagsField(GUIContent label, Enum enumValue, bool includeObsolete, GUIStyle style, params GUILayoutOption[] options)
+    {
+        var position = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.EnumFlagsField(position, label, enumValue, includeObsolete, style);
+    }
+
+    [Obsolete("Check the docs for the usage of the new parameter 'allowSceneObjects'.")]
+    public static Object ObjectField(Object obj, Type objType, params GUILayoutOption[] options)
+    {
+        return ObjectField(obj, objType, true, options);
+    }
+
+    public static Object ObjectField(Object obj, Type objType, Object targetBeingEdited, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, options);
+        return EditorGUI.ObjectField(r, obj, objType, targetBeingEdited);
+    }
+
+    public static Object ObjectField(Object obj, Type objType, bool allowSceneObjects, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, options);
+        return EditorGUI.ObjectField(r, obj, objType, allowSceneObjects);
+    }
+
+    [Obsolete("Check the docs for the usage of the new parameter 'allowSceneObjects'.")]
+    public static Object ObjectField(string label, Object obj, Type objType, params GUILayoutOption[] options)
+    {
+        return ObjectField(label, obj, objType, true, options);
+    }
+
+    public static Object ObjectField(string label, Object obj, Type objType, Object targetBeingEdited, params GUILayoutOption[] options)
+    {
+        return ObjectField(EditorGUIUtility.TempContent(label), obj, objType, targetBeingEdited, options);
+    }
+
+    public static Object ObjectField(string label, Object obj, Type objType, bool allowSceneObjects, params GUILayoutOption[] options)
+    {
+        return ObjectField(EditorGUIUtility.TempContent(label), obj, objType, allowSceneObjects, options);
+    }
+
+    [Obsolete("Check the docs for the usage of the new parameter 'allowSceneObjects'.")]
+    public static Object ObjectField(GUIContent label, Object obj, Type objType, params GUILayoutOption[] options)
+    {
+        return ObjectField(label, obj, objType, true, options);
+    }
+
+    // Make an object field. You can assign objects either by drag'n drop objects or by selecting an object using the Object Picker.
+    public static Object ObjectField(GUIContent label, Object obj, Type objType, Object targetBeingEdited, params GUILayoutOption[] options)
+    {
+        var height = EditorGUIUtility.HasObjectThumbnail(objType) ? EditorGUI.kObjectFieldThumbnailHeight : EditorGUI.kSingleLineHeight;
+        Rect r = s_LastRect = GetControlRect(true, height, options);
+        return EditorGUI.ObjectField(r, label, obj, objType, targetBeingEdited);
+    }
+
+    // Make an object field. You can assign objects either by drag'n drop objects or by selecting an object using the Object Picker.
+    public static Object ObjectField(GUIContent label, Object obj, Type objType, bool allowSceneObjects, params GUILayoutOption[] options)
+    {
+        var height = EditorGUIUtility.HasObjectThumbnail(objType) ? EditorGUI.kObjectFieldThumbnailHeight : EditorGUI.kSingleLineHeight;
+        Rect r = s_LastRect = GetControlRect(true, height, options);
+        return EditorGUI.ObjectField(r, label, obj, objType, allowSceneObjects);
+    }
+
+    public static void ObjectField(SerializedProperty property, params GUILayoutOption[] options)
+    {
+        ObjectField(property, (GUIContent)null, options);
+    }
+
+    public static void ObjectField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.objectField, options);
+        EditorGUI.ObjectField(r, property, label);
+    }
+
+    public static void ObjectField(SerializedProperty property, Type objType, params GUILayoutOption[] options)
+    {
+        ObjectField(property, objType, null, options);
+    }
+
+    // Make an object field. You can assign objects either by drag'n drop objects or by selecting an object using the Object Picker.
+    public static void ObjectField(SerializedProperty property, Type objType, GUIContent label, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.objectField, options);
+        EditorGUI.ObjectField(r, property, objType, label);
+    }
+
+    internal static void ObjectField(SerializedProperty property, Type objType, GUIContent label, EditorGUI.ObjectFieldValidator validator, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.objectField, options);
+        EditorGUI.ObjectField(r, property, objType, label, EditorStyles.objectField, validator);
+    }
+
+    internal static Object MiniThumbnailObjectField(GUIContent label, Object obj, Type objType, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, options);
+        return EditorGUI.MiniThumbnailObjectField(r, label, obj, objType);
+    }
+
+    public static Vector2 Vector2Field(string label, Vector2 value, params GUILayoutOption[] options)
+    {
+        return Vector2Field(EditorGUIUtility.TempContent(label), value, options);
+    }
+
+    // Make an X & Y field for entering a [[Vector2]].
+    public static Vector2 Vector2Field(GUIContent label, Vector2 value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector2, label), EditorStyles.numberField, options);
+        return EditorGUI.Vector2Field(r, label, value);
+    }
+
+    public static Vector3 Vector3Field(string label, Vector3 value, params GUILayoutOption[] options)
+    {
+        return Vector3Field(EditorGUIUtility.TempContent(label), value, options);
+    }
+
+    // Make an X, Y & Z field for entering a [[Vector3]].
+    public static Vector3 Vector3Field(GUIContent label, Vector3 value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector3, label), EditorStyles.numberField, options);
+        return EditorGUI.Vector3Field(r, label, value);
+    }
+
+    // Make an X, Y & Z field for entering a [[Vector3]], with a "lock"
+    internal static Vector3 LinkedVector3Field(GUIContent label, Vector3 value, ref bool proportionalScale, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector3, label), EditorStyles.numberField, options);
+        return EditorGUI.LinkedVector3Field(r, label, value, ref proportionalScale);
+    }
+
+    // Make an X, Y & Z field for entering a [[Vector3]], with a "lock"
+    internal static Vector3 LinkedVector3Field(GUIContent label, Vector3 value, Vector3 initialValue, ref bool proportionalScale, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector3, label), EditorStyles.numberField, options);
+        int axisModified = 0;// Use X as default modified axis
+        return EditorGUI.LinkedVector3Field(r, label, GUIContent.none, value, ref proportionalScale, initialValue, 0, ref axisModified, null);
+    }
+
+    // Make an X, Y, Z & W field for entering a [[Vector4]].
+    public static Vector4 Vector4Field(string label, Vector4 value, params GUILayoutOption[] options)
+    {
+        return Vector4Field(EditorGUIUtility.TempContent(label), value, options);
+    }
+
+    // Make an X, Y, Z & W field for entering a [[Vector4]].
+    public static Vector4 Vector4Field(GUIContent label, Vector4 value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector4, label), EditorStyles.numberField, options);
+        return EditorGUI.Vector4Field(r, label, value);
+    }
+
+    public static Vector2Int Vector2IntField(string label, Vector2Int value, params GUILayoutOption[] options)
+    {
+        return Vector2IntField(EditorGUIUtility.TempContent(label), value, options);
+    }
+
+    // Make an X & Y field for entering a [[Vector2Int]].
+    public static Vector2Int Vector2IntField(GUIContent label, Vector2Int value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector2Int, label), EditorStyles.numberField, options);
+        return EditorGUI.Vector2IntField(r, label, value);
+    }
+
+    public static Vector3Int Vector3IntField(string label, Vector3Int value, params GUILayoutOption[] options)
+    {
+        return Vector3IntField(EditorGUIUtility.TempContent(label), value, options);
+    }
+
+    // Make an X, Y & Z field for entering a [[Vector3Int]].
+    public static Vector3Int Vector3IntField(GUIContent label, Vector3Int value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector3Int, label), EditorStyles.numberField, options);
+        return EditorGUI.Vector3IntField(r, label, value);
+    }
+
+    public static Rect RectField(Rect value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.GetPropertyHeight(SerializedPropertyType.Rect, GUIContent.none), EditorStyles.numberField, options);
+        return EditorGUI.RectField(r, value);
+    }
+
+    public static Rect RectField(string label, Rect value, params GUILayoutOption[] options)
+    {
+        return RectField(EditorGUIUtility.TempContent(label), value, options);
+    }
+
+    // Make an X, Y, W & H field for entering a [[Rect]].
+    public static Rect RectField(GUIContent label, Rect value, params GUILayoutOption[] options)
+    {
+        bool hasLabel = EditorGUI.LabelHasContent(label);
+        float height = EditorGUI.GetPropertyHeight(SerializedPropertyType.Rect, label);
+        Rect r = s_LastRect = GetControlRect(hasLabel, height, EditorStyles.numberField, options);
+        return EditorGUI.RectField(r, label, value);
+    }
+
+    public static RectInt RectIntField(RectInt value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.GetPropertyHeight(SerializedPropertyType.RectInt, GUIContent.none), EditorStyles.numberField, options);
+        return EditorGUI.RectIntField(r, value);
+    }
+
+    public static RectInt RectIntField(string label, RectInt value, params GUILayoutOption[] options)
+    {
+        return RectIntField(EditorGUIUtility.TempContent(label), value, options);
+    }
+
+    // Make an X, Y, W & H field for entering a [[RectInt]].
+    public static RectInt RectIntField(GUIContent label, RectInt value, params GUILayoutOption[] options)
+    {
+        bool hasLabel = EditorGUI.LabelHasContent(label);
+        float height = EditorGUI.GetPropertyHeight(SerializedPropertyType.RectInt, label);
+        Rect r = s_LastRect = GetControlRect(hasLabel, height, EditorStyles.numberField, options);
+        return EditorGUI.RectIntField(r, label, value);
+    }
+
+    public static Bounds BoundsField(Bounds value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.GetPropertyHeight(SerializedPropertyType.Bounds, GUIContent.none), EditorStyles.numberField, options);
+        return EditorGUI.BoundsField(r, value);
+    }
+
+    public static Bounds BoundsField(string label, Bounds value, params GUILayoutOption[] options)
+    {
+        return BoundsField(EditorGUIUtility.TempContent(label), value, options);
+    }
+
+    // Make Center & Extents field for entering a [[Bounds]].
+    public static Bounds BoundsField(GUIContent label, Bounds value, params GUILayoutOption[] options)
+    {
+        bool hasLabel = EditorGUI.LabelHasContent(label);
+        float height = EditorGUI.GetPropertyHeight(SerializedPropertyType.Bounds, label);
+        Rect r = s_LastRect = GetControlRect(hasLabel, height, EditorStyles.numberField, options);
+        return EditorGUI.BoundsField(r, label, value);
+    }
+
+    public static BoundsInt BoundsIntField(BoundsInt value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.GetPropertyHeight(SerializedPropertyType.BoundsInt, GUIContent.none), EditorStyles.numberField, options);
+        return EditorGUI.BoundsIntField(r, value);
+    }
+
+    public static BoundsInt BoundsIntField(string label, BoundsInt value, params GUILayoutOption[] options)
+    {
+        return BoundsIntField(EditorGUIUtility.TempContent(label), value, options);
+    }
+
+    // Make Center & Extents field for entering a [[BoundsInt]].
+    public static BoundsInt BoundsIntField(GUIContent label, BoundsInt value, params GUILayoutOption[] options)
+    {
+        bool hasLabel = EditorGUI.LabelHasContent(label);
+        float height = EditorGUI.GetPropertyHeight(SerializedPropertyType.BoundsInt, label);
+        Rect r = s_LastRect = GetControlRect(hasLabel, height, EditorStyles.numberField, options);
+        return EditorGUI.BoundsIntField(r, label, value);
+    }
+
+    // Make a property field that look like a multi property field (but is made up of individual properties)
+    internal static void PropertiesField(GUIContent label, SerializedProperty[] properties, GUIContent[] propertyLabels, float propertyLabelsWidth, params GUILayoutOption[] options)
+    {
+        bool hasLabel = EditorGUI.LabelHasContent(label);
+        float height = EditorGUI.kSingleLineHeight * properties.Length + EditorGUI.kVerticalSpacingMultiField * (properties.Length - 1);
+        Rect r = s_LastRect = GetControlRect(hasLabel, height, EditorStyles.numberField, options);
+        EditorGUI.PropertiesField(r, label, properties, propertyLabels, propertyLabelsWidth);
+    }
+
+    internal static int CycleButton(int selected, GUIContent[] contents, GUIStyle style, params GUILayoutOption[] options)
+    {
+        if (GUILayout.Button(contents[selected], style, options))
+        {
+            selected++;
+            if (selected >= contents.Length)
+                selected = 0;
+        }
+        return selected;
+    }
+
+    public static Color ColorField(Color value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
+        return EditorGUI.ColorField(r, value);
+    }
+
+    public static Color ColorField(string label, Color value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
+        return EditorGUI.ColorField(r, label, value);
+    }
+
+    // Make a field for selecting a [[Color]].
+    public static Color ColorField(GUIContent label, Color value, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
+        return EditorGUI.ColorField(r, label, value);
+    }
+
+#pragma warning disable 612
+    [Obsolete("Use EditorGUILayout.ColorField(GUIContent label, Color value, bool showEyedropper, bool showAlpha, bool hdr, params GUILayoutOption[] options)")]
+    public static Color ColorField(
+        GUIContent label, Color value, bool showEyedropper, bool showAlpha, bool hdr, ColorPickerHDRConfig hdrConfig, params GUILayoutOption[] options
+    )
+    {
+        return ColorField(label, value, showEyedropper, showAlpha, hdr);
+    }
+
+#pragma warning restore 612
+
+    public static Color ColorField(GUIContent label, Color value, bool showEyedropper, bool showAlpha, bool hdr, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
+        return EditorGUI.ColorField(r, label, value, showEyedropper, showAlpha, hdr);
+    }
+
+    public static AnimationCurve CurveField(AnimationCurve value, params GUILayoutOption[] options)
+    {
+        // TODO Change style
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
+        return EditorGUI.CurveField(r, value);
+    }
+
+    public static AnimationCurve CurveField(string label, AnimationCurve value, params GUILayoutOption[] options)
+    {
+        // TODO Change style
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
+        return EditorGUI.CurveField(r, label, value);
+    }
+
+    public static AnimationCurve CurveField(GUIContent label, AnimationCurve value, params GUILayoutOption[] options)
+    {
+        // TODO Change style
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
+        return EditorGUI.CurveField(r, label, value);
+    }
+
+    // Variants with settings
+    public static AnimationCurve CurveField(AnimationCurve value, Color color, Rect ranges, params GUILayoutOption[] options)
+    {
+        // TODO Change style
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
+        return EditorGUI.CurveField(r, value, color, ranges);
+    }
+
+    public static AnimationCurve CurveField(string label, AnimationCurve value, Color color, Rect ranges, params GUILayoutOption[] options)
+    {
+        // TODO Change style
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
+        return EditorGUI.CurveField(r, label, value, color, ranges);
+    }
+
+    // Make a field for editing an [[AnimationCurve]].
+    public static AnimationCurve CurveField(GUIContent label, AnimationCurve value, Color color, Rect ranges, params GUILayoutOption[] options)
+    {
+        // TODO Change style
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
+        return EditorGUI.CurveField(r, label, value, color, ranges);
+    }
+
+    public static void CurveField(SerializedProperty property, Color color, Rect ranges, params GUILayoutOption[] options)
+    {
+        CurveField(property, color, ranges, null, options);
+    }
+
+    // Make a field for editing an [[AnimationCurve]].
+    public static void CurveField(SerializedProperty property, Color color, Rect ranges, GUIContent label, params GUILayoutOption[] options)
+    {
+        // TODO Change style
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, EditorStyles.colorField, options);
+        EditorGUI.CurveField(r, property, color, ranges, label);
+    }
+
+    public static bool InspectorTitlebar(bool foldout, Object targetObj)
+    {
+        return InspectorTitlebar(foldout, targetObj, true);
+    }
+
+    public static bool InspectorTitlebar(bool foldout, Object targetObj, bool expandable)
+    {
+        return EditorGUI.InspectorTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), foldout,
+            targetObj, expandable);
+    }
+
+    // Make an inspector-window-like titlebar.
+    public static bool InspectorTitlebar(bool foldout, Object[] targetObjs)
+    {
+        return InspectorTitlebar(foldout, targetObjs, true);
+    }
+
+    public static bool InspectorTitlebar(bool foldout, Object[] targetObjs, bool expandable)
+    {
+        return EditorGUI.InspectorTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), foldout,
+            targetObjs, expandable);
+    }
+
+    public static bool InspectorTitlebar(bool foldout, Editor editor)
+    {
+        return EditorGUI.InspectorTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), foldout,
+            editor);
+    }
+
+    public static void InspectorTitlebar(Object[] targetObjs)
+    {
+        EditorGUI.InspectorTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), targetObjs);
+    }
+
+    // Make a foldout with a toggle and title
+    internal static bool ToggleTitlebar(bool foldout, GUIContent label, ref bool toggleValue)
+    {
+        return EditorGUI.ToggleTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), label, foldout, ref toggleValue);
+    }
+
+    internal static bool ToggleTitlebar(bool foldout, GUIContent label, SerializedProperty property)
+    {
+        bool toggleValue = property.boolValue;
+        EditorGUI.BeginChangeCheck();
+        foldout = EditorGUI.ToggleTitlebar(GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.inspectorTitlebar), label, foldout, ref toggleValue);
+        if (EditorGUI.EndChangeCheck())
+            property.boolValue = toggleValue;
+
+        return foldout;
+    }
+
+    internal static bool FoldoutTitlebar(bool foldout, GUIContent label, bool skipIconSpacing)
+    {
+        return FoldoutTitlebar(foldout, label, skipIconSpacing, EditorStyles.inspectorTitlebar, EditorStyles.inspectorTitlebarText);
+    }
+
+    internal static bool FoldoutTitlebar(bool foldout, GUIContent label, bool skipIconSpacing, GUIStyle baseStyle, GUIStyle textStyle)
+    {
+        return EditorGUI.FoldoutTitlebar(GUILayoutUtility.GetRect(GUIContent.none, baseStyle, GUILayout.ExpandWidth(true)), label, foldout, skipIconSpacing, baseStyle, textStyle);
+    }
+
+    // Make a label with a foldout arrow to the left of it.
+    internal static bool FoldoutInternal(bool foldout, GUIContent content, bool toggleOnLabelClick, GUIStyle style)
+    {
+        Rect r = s_LastRect = GUILayoutUtility.GetRect(EditorGUIUtility.fieldWidth, EditorGUIUtility.fieldWidth, EditorGUI.kSingleLineHeight, EditorGUI.kSingleLineHeight, style);
+        return EditorGUI.Foldout(r, foldout, content, toggleOnLabelClick, style);
+    }
+
+    internal static uint LayerMaskField(UInt32 layers, GUIContent label, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, options);
+        return EditorGUI.LayerMaskField(r, layers, label);
+    }
+
+    internal static LayerMask LayerMaskField(LayerMask layers, GUIContent label, params GUILayoutOption[] options)
+    {
+        var rect = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, options);
+        return EditorGUI.LayerMaskField(rect, layers, label);
+    }
+
+    internal static void LayerMaskField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(true, EditorGUI.kSingleLineHeight, options);
+        EditorGUI.LayerMaskField(r, property, label);
+    }
+
+    public static void HelpBox(string message, MessageType type)
+    {
+        LabelField(GUIContent.none, EditorGUIUtility.TempContent(message, EditorGUIUtility.GetHelpIcon(type)), EditorStyles.helpBox);
+    }
+
+    // Make a help box with a message to the user.
+    public static void HelpBox(string message, MessageType type, bool wide)
+    {
+        LabelField(wide ? GUIContent.none : EditorGUIUtility.blankContent,
+            EditorGUIUtility.TempContent(message, EditorGUIUtility.GetHelpIcon(type)),
+            EditorStyles.helpBox);
+    }
+
+    // Make a help box with a message to the user.
+    public static void HelpBox(GUIContent content, bool wide = true)
+    {
+        LabelField(wide ? GUIContent.none : EditorGUIUtility.blankContent,
+            content,
+            EditorStyles.helpBox);
+    }
+
+    // Make a label in front of some control.
+    internal static void PrefixLabelInternal(GUIContent label, GUIStyle followingStyle, GUIStyle labelStyle)
+    {
+        float p = followingStyle.margin.left;
+        if (!EditorGUI.LabelHasContent(label))
+        {
+            GUILayoutUtility.GetRect(EditorGUI.indent - p, EditorGUI.kSingleLineHeight, followingStyle, GUILayout.ExpandWidth(false));
+            return;
+        }
+
+        Rect r = GUILayoutUtility.GetRect(EditorGUIUtility.labelWidth - p, EditorGUI.kSingleLineHeight, followingStyle, GUILayout.ExpandWidth(false));
+        r.xMin += EditorGUI.indent;
+        EditorGUI.HandlePrefixLabel(r, r, label, 0, labelStyle);
+    }
+
+    // Make a small space between the previous control and the following.
+    public static void Space()
+    {
+        Space(EditorGUI.kDefaultSpacing, true);
+    }
+
+    public static void Space(float width)
+    {
+        Space(width, true);
+    }
+
+    public static void Space(float width, bool expand)
+    {
+        GUILayoutUtility.GetRect(width, width, GUILayout.ExpandWidth(expand));
+    }
+
+    //[System.Obsolete ("Use Space() instead")]
+    // Make this function Obsolete when someone has time to _rename_ all
+    // the Standard Packages to Space(), as currently it shows tons of
+    // warnings.
+    // Same for the graphic tests.
+    // *undoc*
+    public static void Separator()
+    {
+        Space();
+    }
+
+    public class ToggleGroupScope : GUI.Scope
+    {
+        public bool enabled { get; protected set; }
+
+        public ToggleGroupScope(string label, bool toggle)
+        {
+            enabled = BeginToggleGroup(label, toggle);
+        }
+
+        public ToggleGroupScope(GUIContent label, bool toggle)
+        {
+            enabled = BeginToggleGroup(label, toggle);
+        }
+
+        protected override void CloseScope()
+        {
+            EndToggleGroup();
+        }
+    }
+
+    public static bool BeginToggleGroup(string label, bool toggle)
+    {
+        return BeginToggleGroup(EditorGUIUtility.TempContent(label), toggle);
+    }
+
+    // Begin a vertical group with a toggle to enable or disable all the controls within at once.
+    public static bool BeginToggleGroup(GUIContent label, bool toggle)
+    {
+        toggle = ToggleLeft(label, toggle, EditorStyles.boldLabel);
+        EditorGUI.BeginDisabled(!toggle);
+        GUILayout.BeginVertical();
+
+        return toggle;
+    }
+
+    // Close a group started with ::ref::BeginToggleGroup
+    public static void EndToggleGroup()
+    {
+        GUILayout.EndVertical();
+        EditorGUI.EndDisabled();
+    }
+
+    public class HorizontalScope : GUI.Scope
+    {
+        public Rect rect { get; protected set; }
+
+        public HorizontalScope(params GUILayoutOption[] options)
+        {
+            rect = BeginHorizontal(options);
+        }
+
+        public HorizontalScope(GUIStyle style, params GUILayoutOption[] options)
+        {
+            rect = BeginHorizontal(style, options);
+        }
+
+        internal HorizontalScope(GUIContent content, GUIStyle style, params GUILayoutOption[] options)
+        {
+            rect = BeginHorizontal(content, style, options);
+        }
+
+        protected override void CloseScope()
+        {
+            EndHorizontal();
+        }
+    }
+
+    public static Rect BeginHorizontal(params GUILayoutOption[] options)
+    {
+        return BeginHorizontal(GUIContent.none, GUIStyle.none, options);
+    }
+
+    // Begin a horizontal group and get its rect back.
+    public static Rect BeginHorizontal(GUIStyle style, params GUILayoutOption[] options)
+    {
+        return BeginHorizontal(GUIContent.none, style, options);
+    }
+
+    // public static Rect BeginHorizontal (string text, params GUILayoutOption[] options)                       { return BeginHorizontal (EditorGUIUtility.TempContent (text), GUIStyle.none, options); }
+    // public static Rect BeginHorizontal (Texture image, params GUILayoutOption[] options)                 { return BeginHorizontal (EditorGUIUtility.TempContent (image), GUIStyle.none, options); }
+    // public static Rect BeginHorizontal (GUIContent content, params GUILayoutOption[] options)                { return BeginHorizontal (content, GUIStyle.none, options); }
+    // public static Rect BeginHorizontal (string text, GUIStyle style, params GUILayoutOption[] options)           { return BeginHorizontal (EditorGUIUtility.TempContent (text), style, options); }
+    // public static Rect BeginHorizontal (Texture image, GUIStyle style, params GUILayoutOption[] options)     { return BeginHorizontal (EditorGUIUtility.TempContent (image), style, options); }
+    internal static Rect BeginHorizontal(GUIContent content, GUIStyle style, params GUILayoutOption[] options)
+    {
+        GUILayoutGroup g = GUILayoutUtility.BeginLayoutGroup(style, options, typeof(GUILayoutGroup));
+        g.isVertical = false;
+        if (style != GUIStyle.none || content != GUIContent.none)
+        {
+            GUI.Box(g.rect, GUIContent.none, style);
+        }
+        return g.rect;
+    }
+
+    // Close a group started with BeginHorizontal
+    public static void EndHorizontal()
+    {
+        GUILayout.EndHorizontal();
+    }
+
+    public class VerticalScope : GUI.Scope
+    {
+        public Rect rect { get; protected set; }
+
+        public VerticalScope(params GUILayoutOption[] options)
+        {
+            rect = BeginVertical(options);
+        }
+
+        public VerticalScope(GUIStyle style, params GUILayoutOption[] options)
+        {
+            rect = BeginVertical(style, options);
+        }
+
+        internal VerticalScope(GUIContent content, GUIStyle style, params GUILayoutOption[] options)
+        {
+            rect = BeginVertical(content, style, options);
+        }
+
+        protected override void CloseScope()
+        {
+            EndVertical();
+        }
+    }
+
+    public static Rect BeginVertical(params GUILayoutOption[] options)
+    {
+        return BeginVertical(GUIContent.none, GUIStyle.none, options);
+    }
+
+    // Begin a vertical group and get its rect back.
+    public static Rect BeginVertical(GUIStyle style, params GUILayoutOption[] options)
+    {
+        return BeginVertical(GUIContent.none, style, options);
+    }
+
+    // public static Rect BeginVertical (string text, params GUILayoutOption[] options)                     { return BeginVertical (EditorGUIUtility.TempContent (text), GUIStyle.none, options); }
+    // public static Rect BeginVertical (Texture image, params GUILayoutOption[] options)                   { return BeginVertical (EditorGUIUtility.TempContent (image), GUIStyle.none, options); }
+    // public static Rect BeginVertical (GUIContent content, params GUILayoutOption[] options)              { return BeginVertical (content, GUIStyle.none, options); }
+    // public static Rect BeginVertical (string text, GUIStyle style, params GUILayoutOption[] options)         { return BeginVertical (EditorGUIUtility.TempContent (text), style, options); }
+    // public static Rect BeginVertical (Texture image, GUIStyle style, params GUILayoutOption[] options)       { return BeginVertical (EditorGUIUtility.TempContent (image), style, options); }
+    internal static Rect BeginVertical(GUIContent content, GUIStyle style, params GUILayoutOption[] options)
+    {
+        GUILayoutGroup g = GUILayoutUtility.BeginLayoutGroup(style, options, typeof(GUILayoutGroup));
+        g.isVertical = true;
+        if (style != GUIStyle.none || content != GUIContent.none)
+        {
+            GUI.Box(g.rect, GUIContent.none, style);
+        }
+        return g.rect;
+    }
+
+    // Close a group started with BeginVertical
+    public static void EndVertical()
+    {
+        GUILayout.EndVertical();
+    }
+
+    public class ScrollViewScope : GUI.Scope
+    {
+        public Vector2 scrollPosition { get; protected set; }
+        public bool handleScrollWheel { get; set; }
+
+        public ScrollViewScope(Vector2 scrollPosition, params GUILayoutOption[] options)
+        {
+            handleScrollWheel = true;
+            this.scrollPosition = BeginScrollView(scrollPosition, options);
+        }
+
+        public ScrollViewScope(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, params GUILayoutOption[] options)
+        {
+            handleScrollWheel = true;
+            this.scrollPosition = BeginScrollView(scrollPosition, alwaysShowHorizontal, alwaysShowVertical, options);
+        }
+
+        public ScrollViewScope(Vector2 scrollPosition, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, params GUILayoutOption[] options)
+        {
+            handleScrollWheel = true;
+            this.scrollPosition = BeginScrollView(scrollPosition, horizontalScrollbar, verticalScrollbar, options);
+        }
+
+        public ScrollViewScope(Vector2 scrollPosition, GUIStyle style, params GUILayoutOption[] options)
+        {
+            handleScrollWheel = true;
+            this.scrollPosition = BeginScrollView(scrollPosition, style, options);
+        }
+
+        public ScrollViewScope(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
+        {
+            handleScrollWheel = true;
+            this.scrollPosition = BeginScrollView(scrollPosition, alwaysShowHorizontal, alwaysShowVertical, horizontalScrollbar, verticalScrollbar, background, options);
+        }
+
+        internal ScrollViewScope(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, params GUILayoutOption[] options)
+        {
+            handleScrollWheel = true;
+            this.scrollPosition = BeginScrollView(scrollPosition, alwaysShowHorizontal, alwaysShowVertical, horizontalScrollbar, verticalScrollbar, options);
+        }
+
+        protected override void CloseScope()
+        {
+            EndScrollView(handleScrollWheel);
+        }
+    }
+
+    public static Vector2 BeginScrollView(Vector2 scrollPosition, params GUILayoutOption[] options)
+    {
+        return BeginScrollView(scrollPosition, false, false, GUI.skin.horizontalScrollbar, GUI.skin.verticalScrollbar, GUI.skin.scrollView, options);
+    }
+
+    public static Vector2 BeginScrollView(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, params GUILayoutOption[] options)
+    {
+        return BeginScrollView(scrollPosition, alwaysShowHorizontal, alwaysShowVertical, GUI.skin.horizontalScrollbar, GUI.skin.verticalScrollbar, GUI.skin.scrollView, options);
+    }
+
+    public static Vector2 BeginScrollView(Vector2 scrollPosition, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, params GUILayoutOption[] options)
+    {
+        return BeginScrollView(scrollPosition, false, false, horizontalScrollbar, verticalScrollbar, GUI.skin.scrollView, options);
+    }
+
+    public static Vector2 BeginScrollView(Vector2 scrollPosition, GUIStyle style, params GUILayoutOption[] options)
+    {
+        string name = style.name;
+
+        GUIStyle vertical = GUI.skin.FindStyle(name + "VerticalScrollbar") ?? GUI.skin.verticalScrollbar;
+        GUIStyle horizontal = GUI.skin.FindStyle(name + "HorizontalScrollbar") ?? GUI.skin.horizontalScrollbar;
+        return BeginScrollView(scrollPosition, false, false, horizontal, vertical, style, options);
+    }
+
+    internal static Vector2 BeginScrollView(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, params GUILayoutOption[] options)
+    {
+        return BeginScrollView(scrollPosition, alwaysShowHorizontal, alwaysShowVertical, horizontalScrollbar, verticalScrollbar, GUI.skin.scrollView, options);
+    }
+
+    // Begin an automatically layouted scrollview.
+    public static Vector2 BeginScrollView(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
+    {
+        GUIScrollGroup g = (GUIScrollGroup)GUILayoutUtility.BeginLayoutGroup(background, null, typeof(GUIScrollGroup));
+        if (Event.current.type == EventType.Layout)
+        {
+            g.resetCoords = true;
+            g.isVertical = true;
+            g.stretchWidth = 1;
+            g.stretchHeight = 1;
+            g.verticalScrollbar = verticalScrollbar;
+            g.horizontalScrollbar = horizontalScrollbar;
+            g.ApplyOptions(options);
+        }
+        return EditorGUIInternal.DoBeginScrollViewForward(g.rect, scrollPosition, new Rect(0, 0, g.clientWidth, g.clientHeight), alwaysShowHorizontal, alwaysShowVertical, horizontalScrollbar, verticalScrollbar, background);
+    }
+
+    internal class VerticalScrollViewScope : GUI.Scope
+    {
+        public Vector2 scrollPosition { get; protected set; }
+        public bool handleScrollWheel { get; set; }
+
+        public VerticalScrollViewScope(Vector2 scrollPosition, params GUILayoutOption[] options)
+        {
+            handleScrollWheel = true;
+            this.scrollPosition = BeginVerticalScrollView(scrollPosition, options);
+        }
+
+        public VerticalScrollViewScope(Vector2 scrollPosition, bool alwaysShowVertical, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
+        {
+            handleScrollWheel = true;
+            this.scrollPosition = BeginVerticalScrollView(scrollPosition, alwaysShowVertical, verticalScrollbar, background, options);
+        }
+
+        protected override void CloseScope()
+        {
+            EndScrollView(handleScrollWheel);
+        }
+    }
+
+    internal static Vector2 BeginVerticalScrollView(Vector2 scrollPosition, params GUILayoutOption[] options)
+    {
+        return BeginVerticalScrollView(scrollPosition, false, GUI.skin.verticalScrollbar, GUI.skin.scrollView, options);
+    }
+
+    // Begin an automatically layouted scrollview.
+    internal static Vector2 BeginVerticalScrollView(Vector2 scrollPosition, bool alwaysShowVertical, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
+    {
+        GUIScrollGroup g = (GUIScrollGroup)GUILayoutUtility.BeginLayoutGroup(background, null, typeof(GUIScrollGroup));
+        if (Event.current.type == EventType.Layout)
+        {
+            g.resetCoords = true;
+            g.isVertical = true;
+            g.stretchWidth = 1;
+            g.stretchHeight = 1;
+            g.verticalScrollbar = verticalScrollbar;
+            g.horizontalScrollbar = GUIStyle.none;
+            g.allowHorizontalScroll = false;
+            g.ApplyOptions(options);
+        }
+        return EditorGUIInternal.DoBeginScrollViewForward(g.rect, scrollPosition, new Rect(0, 0, g.clientWidth, g.clientHeight), false, alwaysShowVertical, GUI.skin.horizontalScrollbar, verticalScrollbar, background);
+    }
+
+    internal class HorizontalScrollViewScope : GUI.Scope
+    {
+        public Vector2 scrollPosition { get; protected set; }
+        public bool handleScrollWheel { get; set; }
+
+        public HorizontalScrollViewScope(Vector2 scrollPosition, params GUILayoutOption[] options)
+        {
+            handleScrollWheel = true;
+            this.scrollPosition = BeginHorizontalScrollView(scrollPosition, options);
+        }
+
+        public HorizontalScrollViewScope(Vector2 scrollPosition, bool alwaysShowHorizontal, GUIStyle horizontalScrollbar, GUIStyle background, params GUILayoutOption[] options)
+        {
+            handleScrollWheel = true;
+            this.scrollPosition = BeginHorizontalScrollView(scrollPosition, alwaysShowHorizontal, horizontalScrollbar, background, options);
+        }
+
+        protected override void CloseScope()
+        {
+            EndScrollView(handleScrollWheel);
+        }
+    }
+
+    internal static Vector2 BeginHorizontalScrollView(Vector2 scrollPosition, params GUILayoutOption[] options)
+    {
+        return BeginHorizontalScrollView(scrollPosition, false, GUI.skin.horizontalScrollbar, GUI.skin.scrollView, options);
+    }
+
+    // Begin an automatically layouted scrollview.
+
+    internal static Vector2 BeginHorizontalScrollView(Vector2 scrollPosition, bool alwaysShowHorizontal, GUIStyle horizontalScrollbar, GUIStyle background, params GUILayoutOption[] options)
+    {
+        GUIScrollGroup g = (GUIScrollGroup)GUILayoutUtility.BeginLayoutGroup(background, null, typeof(GUIScrollGroup));
+        if (Event.current.type == EventType.Layout)
+        {
+            g.resetCoords = true;
+            g.isVertical = true;
+            g.stretchWidth = 1;
+            g.stretchHeight = 1;
+            g.verticalScrollbar = GUIStyle.none;
+            g.horizontalScrollbar = horizontalScrollbar;
+            g.allowHorizontalScroll = true;
+            g.allowVerticalScroll = false;
+            g.ApplyOptions(options);
+        }
+        return EditorGUIInternal.DoBeginScrollViewForward(g.rect, scrollPosition, new Rect(0, 0, g.clientWidth, g.clientHeight), alwaysShowHorizontal, false, horizontalScrollbar, GUI.skin.verticalScrollbar, background);
+    }
+
+    // Ends a scrollview started with a call to BeginScrollView.
+    public static void EndScrollView()
+    {
+        GUILayout.EndScrollView(true);
+    }
+
+    internal static void EndScrollView(bool handleScrollWheel)
+    {
+        GUILayout.EndScrollView(handleScrollWheel);
+    }
+
+    public static bool PropertyField(SerializedProperty property, params GUILayoutOption[] options)
+    {
+        return PropertyField(property, null, IsChildrenIncluded(property), options);
+    }
+
+    public static bool PropertyField(SerializedProperty property, GUIContent label, params GUILayoutOption[] options)
+    {
+        return PropertyField(property, label, IsChildrenIncluded(property), options);
+    }
+
+    public static bool PropertyField(SerializedProperty property, bool includeChildren, params GUILayoutOption[] options)
+    {
+        return PropertyField(property, null, includeChildren, options);
+    }
+
+    // Make a field for [[SerializedProperty]].
+    public static bool PropertyField(SerializedProperty property, GUIContent label, bool includeChildren, params GUILayoutOption[] options)
+    {
+        return ScriptAttributeUtility.GetHandler(property).OnGUILayout(property, label, includeChildren, options);
+    }
+
+    private static bool IsChildrenIncluded(SerializedProperty prop)
+    {
+        switch (prop.propertyType)
+        {
+            case SerializedPropertyType.Generic:
+            case SerializedPropertyType.Vector4:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public static Rect GetControlRect(params GUILayoutOption[] options)
+    {
+        return GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.layerMaskField, options);
+    }
+
+    public static Rect GetControlRect(bool hasLabel, params GUILayoutOption[] options)
+    {
+        return GetControlRect(hasLabel, EditorGUI.kSingleLineHeight, EditorStyles.layerMaskField, options);
+    }
+
+    public static Rect GetControlRect(bool hasLabel, float height, params GUILayoutOption[] options)
+    {
+        return GetControlRect(hasLabel, height, EditorStyles.layerMaskField, options);
+    }
+
+    public static Rect GetControlRect(bool hasLabel, float height, GUIStyle style, params GUILayoutOption[] options)
+    {
+        return GUILayoutUtility.GetRect(
+            hasLabel ? kLabelFloatMinW : EditorGUIUtility.fieldWidth,
+            kLabelFloatMaxW,
+            height, height, style, options);
+    }
+
+    internal static Rect GetSliderRect(bool hasLabel, params GUILayoutOption[] options)
+    {
+        return GetSliderRect(hasLabel, GUI.skin.horizontalSlider, options);
+    }
+
+    internal static Rect GetSliderRect(bool hasLabel, GUIStyle sliderStyle, params GUILayoutOption[] options)
+    {
+        return GUILayoutUtility.GetRect(
+            hasLabel ? kLabelFloatMinW : EditorGUIUtility.fieldWidth,
+            kLabelFloatMaxW + EditorGUI.kSpacing + EditorGUI.kSliderMaxW,
+            EditorGUI.kSingleLineHeight, EditorGUI.kSingleLineHeight, sliderStyle, options);
+    }
+
+    internal static Rect GetToggleRect(bool hasLabel, params GUILayoutOption[] options)
+    {
+        // Toggle is 14 pixels wide while float fields are EditorGUIUtility.fieldWidth pixels wide.
+        // Store difference in variable and add to min and max width values used for float fields.
+        float toggleAdjust = (14 - EditorGUIUtility.fieldWidth);
+        return GUILayoutUtility.GetRect(
+            hasLabel ? kLabelFloatMinW + toggleAdjust : EditorGUIUtility.fieldWidth + toggleAdjust,
+            kLabelFloatMaxW + toggleAdjust,
+            EditorGUI.kSingleLineHeight, EditorGUI.kSingleLineHeight, EditorStyles.numberField, options);
+    }
+
+    public class FadeGroupScope : GUI.Scope
+    {
+        // when using the FadeGroupScope, make sure to only show the content when 'visible' is set to true,
+        // otherwise only the hide animation will run, and then the content will be visible again.
+        public bool visible { get; protected set; }
+
+        public FadeGroupScope(float value)
+        {
+            visible = BeginFadeGroup(value);
+        }
+
+        protected override void CloseScope()
+        {
+            EndFadeGroup();
+        }
+    }
+
+    public static bool BeginFadeGroup(float value)
+    {
+        GUILayoutFadeGroup g = (GUILayoutFadeGroup)GUILayoutUtility.BeginLayoutGroup(GUIStyle.none, null, typeof(GUILayoutFadeGroup));
+        g.isVertical = true;
+        g.resetCoords = false;
+        g.fadeValue = value;
+        g.wasGUIEnabled = GUI.enabled;
+        g.guiColor = GUI.color;
+        g.consideredForMargin = value > 0;
+
+        // We don't want the fade group gui clip to be used for calculating the label width of controls in this fade group, so we lock the context width.
+        EditorGUIUtility.LockContextWidth();
+
+        if (value != 0.0f && value != 1.0f)
+        {
+            g.resetCoords = true;
+            GUI.BeginGroup(g.rect);
+
+            if (Event.current.type == EventType.MouseDown)
+            {
+                Event.current.Use();
+            }
+        }
+
+        return value != 0;
+    }
+
+    public static void EndFadeGroup()
+    {
+        // If we're inside a fade group, end it here.
+        GUILayoutFadeGroup g = EditorGUILayoutUtilityInternal.topLevel as GUILayoutFadeGroup;
+
+        // If there are no more FadeGroups to end, display a warning.
+        if (g == null)
+        {
+            Debug.LogWarning("Unexpected call to EndFadeGroup! Make sure to call EndFadeGroup the same number of times as BeginFadeGroup.");
+            return;
+        }
+
+        if (g.fadeValue != 0.0f && g.fadeValue != 1.0f)
+        {
+            GUI.EndGroup();
+        }
+
+        EditorGUIUtility.UnlockContextWidth();
+        GUI.enabled = g.wasGUIEnabled;
+        GUI.color = g.guiColor;
+        GUILayoutUtility.EndLayoutGroup();
+    }
+
+    public static BuildTargetGroup BeginBuildTargetSelectionGrouping()
+    {
+        BuildPlatform[] validPlatforms = BuildPlatforms.instance.GetValidPlatforms().ToArray();
+        int selected = BeginPlatformGrouping(validPlatforms, null);
+        return validPlatforms[selected].namedBuildTarget.ToBuildTargetGroup();
+    }
+
+    public static void EndBuildTargetSelectionGrouping()
+    {
+        EndPlatformGrouping();
+    }
+
+    internal static int BeginPlatformGrouping(BuildPlatform[] platforms, GUIContent defaultTab)
+    {
+        return BeginPlatformGrouping(platforms, defaultTab, EditorStyles.frameBox);
+    }
+
+    static Rect GetTabRect(Rect rect, int tabIndex, int tabCount, out GUIStyle tabStyle)
+    {
+        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";
+            s_TabLast = "Tab last";
+        }
+
+        tabStyle = s_TabMiddle;
+
+        if (tabCount == 1)
+        {
+            tabStyle = s_TabOnlyOne;
+        }
+        else if (tabIndex == 0)
+        {
+            tabStyle = s_TabFirst;
+        }
+        else if (tabIndex == (tabCount - 1))
+        {
+            tabStyle = s_TabLast;
+        }
+
+        float tabWidth = rect.width / tabCount;
+        int left = Mathf.RoundToInt(tabIndex * tabWidth);
+        int right = Mathf.RoundToInt((tabIndex + 1) * tabWidth);
+        return new Rect(rect.x + left, rect.y, right - left, EditorGUI.kTabButtonHeight);
+    }
+
+    internal static int BeginPlatformGrouping(BuildPlatform[] platforms, GUIContent defaultTab, GUIStyle style)
+    {
+        return BeginPlatformGrouping(platforms, defaultTab, style, null);
+    }
+
+    internal static int BeginPlatformGrouping(BuildPlatform[] platforms, GUIContent defaultTab, GUIStyle style, Func<int, bool> showOverrideForPlatform)
+    {
+        int selectedPlatform = -1;
+        for (int i = 0; i < platforms.Length; i++)
+        {
+            if (platforms[i].IsSelected())
+            {
+                selectedPlatform = i;
+                break;
+            }
+        }
+        if (selectedPlatform == -1)
+        {
+            s_SelectedDefault.value = true;
+            selectedPlatform = 0;
+        }
+
+        int selected = defaultTab == null ? selectedPlatform : (s_SelectedDefault.value ? -1 : selectedPlatform);
+
+        bool tempEnabled = GUI.enabled;
+        GUI.enabled = true;
+        EditorGUI.BeginChangeCheck();
+        Rect r = BeginVertical(style);
+        int platformCount = platforms.Length;
+        int buttonCount = platformCount;
+        int startIndex = 0;
+
+        if (defaultTab != null)
+        {
+            buttonCount++;
+            startIndex = -1;
+        }
+
+        int buttonIndex = 0;
+        for (int i = startIndex; i < platformCount; i++, buttonIndex++)
+        {
+            GUIContent content = GUIContent.none;
+
+            if (i == -1)
+            {
+                content = defaultTab;
+            }
+            else
+            {
+                content = new GUIContent(platforms[i].smallIcon, platforms[i].tooltip);
+            }
+
+            GUIStyle buttonStyle = null;
+            Rect buttonRect = GetTabRect(r, buttonIndex, buttonCount, out buttonStyle);
+
+            if (GUI.Toggle(buttonRect, selected == i, content, buttonStyle))
+                selected = i;
+            if (showOverrideForPlatform != null)
+            {
+                if (showOverrideForPlatform(i))
+                {
+                    var prevMargin = EditorGUIUtility.leftMarginCoord;
+                    var overrideRect = buttonRect;
+                    const int margin = 3;
+                    overrideRect.y += margin;
+                    overrideRect.height -= margin * 2;
+                    EditorGUIUtility.leftMarginCoord = overrideRect.x + margin;
+                    EditorGUI.DrawOverrideBackgroundApplicable(overrideRect);
+                    EditorGUIUtility.leftMarginCoord = prevMargin;
+                }
+            }
+        }
+
+        // GUILayout.Space doesn't expand to available width, so use GetRect instead
+        GUILayoutUtility.GetRect(10, EditorGUI.kTabButtonHeight);
+
+        GUI.enabled = tempEnabled;
+
+        // Important that we only actually set the selectedBuildTargetGroup if the user clicked the button.
+        // If the current selectedBuildTargetGroup is one that is not among the tabs (because the build target
+        // is not supported), then this should not be changed unless the user explicitly does so.
+        // Otherwise, if the build window is open at the same time, the unsupported build target groups will
+        // not be selectable in the build window.
+        if (EditorGUI.EndChangeCheck())
+        {
+            if (defaultTab == null)
+            {
+                platforms[selected].Select();
+            }
+            else
+            {
+                if (selected < 0)
+                {
+                    s_SelectedDefault.value = true;
+                }
+                else
+                {
+                    platforms[selected].Select();
+                    s_SelectedDefault.value = false;
+                }
+            }
+
+            // Repaint build window, if open.
+            Object[] buildWindows = Resources.FindObjectsOfTypeAll(typeof(BuildPlayerWindow));
+            foreach (Object t in buildWindows)
+            {
+                BuildPlayerWindow buildWindow = t as BuildPlayerWindow;
+                if (buildWindow != null)
+                    buildWindow.Repaint();
+            }
+        }
+
+        return selected;
+    }
+
+    internal static void EndPlatformGrouping()
+    {
+        EndVertical();
+    }
+
+    internal static void MultiSelectionObjectTitleBar(Object[] objects)
+    {
+        string text = objects[0].name + " (" + ObjectNames.NicifyVariableName(ObjectNames.GetTypeName(objects[0])) + ")";
+        if (objects.Length > 1)
+        {
+            text += " and " + (objects.Length - 1) + " other" + (objects.Length > 2 ? "s" : "");
+        }
+        GUILayoutOption[] options = {  GUILayout.Height(16f) };
+        GUILayout.Label(EditorGUIUtility.TempContent(text, AssetPreview.GetMiniThumbnail(objects[0])), EditorStyles.boldLabel, options);
+    }
+
+    // Returns true if specified bit is true for all targets
+    internal static bool BitToggleField(string label, SerializedProperty bitFieldProperty, int flag)
+    {
+        bool toggle = (bitFieldProperty.intValue & flag) != 0;
+        bool different = (bitFieldProperty.hasMultipleDifferentValuesBitwise & flag) != 0;
+        EditorGUI.showMixedValue = different;
+        EditorGUI.BeginChangeCheck();
+        toggle = Toggle(label, toggle);
+        if (EditorGUI.EndChangeCheck())
+        {
+            // If toggle has mixed values, always set all to true when clicking it
+            if (different)
+            {
+                toggle = true;
+            }
+            different = false;
+            int bitIndex = -1;
+            for (int i = 0; i < 32; i++)
+            {
+                if (((1 << i) & flag) != 0)
+                {
+                    bitIndex = i;
+                    break;
+                }
+            }
+            bitFieldProperty.SetBitAtIndexForAllTargetsImmediate(bitIndex, toggle);
+        }
+        EditorGUI.showMixedValue = false;
+        return toggle && !different;
+    }
+
+    internal static void SortingLayerField(GUIContent label, SerializedProperty layerID, GUIStyle style)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style);
+        EditorGUI.SortingLayerField(r, label, layerID, style, EditorStyles.label);
+    }
+
+    internal static string TextFieldDropDown(string text, string[] dropDownElement)
+    {
+        return TextFieldDropDown(GUIContent.none, text, dropDownElement);
+    }
+
+    internal static string TextFieldDropDown(GUIContent label, string text, string[] dropDownElement)
+    {
+        Rect rect = GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.textField);
+        return EditorGUI.TextFieldDropDown(rect, label, text, dropDownElement);
+    }
+
+    internal static string DelayedTextFieldDropDown(string text, string[] dropDownElement)
+    {
+        return DelayedTextFieldDropDown(GUIContent.none, text, dropDownElement);
+    }
+
+    internal static string DelayedTextFieldDropDown(GUIContent label, string text, string[] dropDownElement)
+    {
+        Rect rect = GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.textFieldDropDownText);
+        return EditorGUI.DelayedTextFieldDropDown(rect, label, text, dropDownElement);
+    }
+
+    // A button that returns true on mouse down - like a popup button
+    public static bool DropdownButton(GUIContent content, FocusType focusType, params GUILayoutOption[] options)
+    {
+        return DropdownButton(content, focusType, "MiniPullDown", options);
+    }
+
+    // A button that returns true on mouse down - like a popup button
+    public static bool DropdownButton(GUIContent content, FocusType focusType, GUIStyle style, params GUILayoutOption[] options)
+    {
+        s_LastRect = GUILayoutUtility.GetRect(content, style, options);
+        return EditorGUI.DropdownButton(s_LastRect, content, focusType, style);
+    }
+
+    // A toggle that returns true on mouse down - like a popup button and returns true if checked
+    internal static bool DropDownToggle(ref bool toggled, GUIContent content, GUIStyle toggleStyle)
+    {
+        GUIStyle buttonStyle = GUIStyle.none;
+
+        // This is to be compatible with existing code
+        if (toggleStyle == EditorStyles.toolbarDropDownToggle || toggleStyle == EditorStyles.toolbarDropDownToggleRight)
+            buttonStyle = EditorStyles.toolbarDropDownToggleButton;
+
+        return DropDownToggle(ref toggled, content, toggleStyle, buttonStyle);
+    }
+
+    internal static bool DropDownToggle(ref bool toggled, GUIContent content, GUIStyle toggleStyle, GUIStyle toggleDropdownButtonStyle)
+    {
+        Rect toggleRect = GUILayoutUtility.GetRect(content, toggleStyle);
+        Rect arrowRightRect = Rect.zero;
+
+        if (toggleDropdownButtonStyle != null)
+        {
+            arrowRightRect = new Rect(toggleRect.xMax - toggleDropdownButtonStyle.fixedWidth - toggleDropdownButtonStyle.margin.right, toggleRect.y, toggleDropdownButtonStyle.fixedWidth, toggleRect.height);
+        }
+        else
+        {
+            arrowRightRect = new Rect(toggleRect.xMax - toggleStyle.padding.right, toggleRect.y, toggleStyle.padding.right, toggleRect.height);
+        }
+
+
+        int dropdownButtonId = GUIUtility.GetControlID(EditorGUI.s_DropdownButtonHash, FocusType.Passive, arrowRightRect);
+        bool clicked = EditorGUI.DropdownButton(dropdownButtonId, arrowRightRect, GUIContent.none, GUIStyle.none);
+
+        if (!clicked)
+        {
+            toggled = GUI.Toggle(toggleRect, toggled, content, toggleStyle);
+        }
+
+        // Ensure that the dropdown button is rendered on top of the toggle
+        if (Event.current.type == EventType.Repaint && toggleDropdownButtonStyle != null && toggleDropdownButtonStyle != GUIStyle.none)
+        {
+            EditorGUI.DropdownButton(dropdownButtonId, arrowRightRect, GUIContent.none, toggleDropdownButtonStyle);
+        }
+
+        return clicked;
+    }
+
+    internal static int AdvancedPopup(int selectedIndex, string[] displayedOptions, params GUILayoutOption[] options)
+    {
+        return AdvancedPopup(selectedIndex, displayedOptions, "MiniPullDown", options);
+    }
+
+    internal static int AdvancedPopup(int selectedIndex, string[] displayedOptions, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.AdvancedPopup(r, selectedIndex, displayedOptions, style);
+    }
+
+    internal static int AdvancedLazyPopup(string displayedOption, int selectedIndex, Func<Tuple<int, string[]>> displayedOptionsFunc, GUIStyle style, params GUILayoutOption[] options)
+    {
+        Rect r = s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
+        return EditorGUI.AdvancedLazyPopup(r, displayedOption, selectedIndex, displayedOptionsFunc, style);
+    }
+
+    [Obsolete("(UnityUpgradable) -> UnityEditor.HyperLinkClickedEventArgs", true)]
+    internal class HyperLinkClickedEventArgs
+    {
+        [Obsolete("(UnityUpgradable) -> UnityEditor.HyperLinkClickedEventArgs.hyperLinkData", true)]
+        public Dictionary<string, string> hyperlinkInfos { get; private set; }
+        internal HyperLinkClickedEventArgs(Dictionary<string, string> hyperLinkData) {}
+    }
+}
diff --git a/Editor/Mono/EditorGUIUtility.bindings.cs b/Editor/Mono/EditorGUIUtility.bindings.cs
index b1ba7ef79e..3abf7aaba6 100644
--- a/Editor/Mono/EditorGUIUtility.bindings.cs
+++ b/Editor/Mono/EditorGUIUtility.bindings.cs
@@ -151,6 +151,10 @@ public static void RenderGameViewCameras(RenderTexture target, int targetDisplay
         internal static extern void RenderPlayModeViewCamerasInternal(RenderTexture target, int targetDisplay, Vector2 mousePosition, bool gizmos, bool renderIMGUI);
         internal static extern void SetupWindowSpaceAndVSyncInternal(Rect screenRect);
 
+        internal static extern void PerformTonemappingForGameView();
+        internal static extern void DrawTextureHdrSupport(Rect screenRect, Texture texture, Rect sourceRect, int leftBorder,
+            int rightBorder, int topBorder, int bottomBorder, Color color, Material mat, int pass, bool resetLinearToSrgbIfHdrActive);
+
         private static extern Texture2D FindTextureByName(string name);
         private static extern Texture2D FindTextureByType([NotNull] Type type);
         internal static extern string GetObjectNameWithInfo(Object obj);
diff --git a/Editor/Mono/EditorGUIUtility.cs b/Editor/Mono/EditorGUIUtility.cs
index 20f324158e..5e40cc2538 100644
--- a/Editor/Mono/EditorGUIUtility.cs
+++ b/Editor/Mono/EditorGUIUtility.cs
@@ -1162,7 +1162,7 @@ internal static void NotifyLanguageChanged(SystemLanguage newLanguage)
             L10n.ClearCache();
             EditorUtility.Internal_UpdateMenuTitleForLanguage(newLanguage);
             LocalizationDatabase.currentEditorLanguage = newLanguage;
-            PanelTextSettings.UpdateLocalizationFontAsset();
+            EditorTextSettings.UpdateLocalizationFontAsset();
             EditorApplication.RequestRepaintAllViews();
         }
 
diff --git a/Editor/Mono/EditorMode/ModeService.cs b/Editor/Mono/EditorMode/ModeService.cs
index 58e027ef86..6312982172 100644
--- a/Editor/Mono/EditorMode/ModeService.cs
+++ b/Editor/Mono/EditorMode/ModeService.cs
@@ -99,6 +99,7 @@ public struct ModeChangedArgs
             public int nextIndex;
         }
 
+        internal const string k_ModePathsCache = "mode-paths-cache";
         internal const string k_DefaultModeId = "default";
         internal const string k_ModeCurrentIdKeyName = "mode-current-id";
         internal const string k_MenuKeyChecked = "checked";
@@ -139,6 +140,7 @@ static ModeService()
 
             modeChanged += OnModeChangeMenus;
             modeChanged += OnModeChangeLayouts;
+            UnityEditor.PackageManager.Events.registeredPackages += OnRegisteredPackages;
 
             ModeDescriptorImporter.allowExplicitModeRefresh = true;
         }
@@ -351,6 +353,12 @@ internal static bool HasStartupMode()
             return Application.HasARGV("editor-mode");
         }
 
+        private static void OnRegisteredPackages(PackageManager.PackageRegistrationEventArgs evt)
+        {
+            SessionState.EraseString(k_ModePathsCache);
+            LoadModes();
+        }
+
         private static void LoadModes(bool checkStartupMode = false)
         {
             Log("LoadModes");
@@ -420,21 +428,38 @@ internal static void ScanModes()
             var builtinModeFile = Path.Combine(EditorApplication.applicationContentsPath, "Resources/default.mode");
             FillModeData(builtinModeFile, modesData);
 
-            var modeDescriptors = AssetDatabase.EnumerateAllAssets(new SearchFilter
+            var modeFilePathCache = SessionState.GetString(k_ModePathsCache, "");
+            
+            if (modeFilePathCache == "")
             {
-                searchArea = SearchFilter.SearchArea.InPackagesOnly,
-                classNames = new[] { nameof(ModeDescriptor) },
-                showAllHits = true
-            });
+                var modeDescriptors = AssetDatabase.EnumerateAllAssets(new SearchFilter
+                {
+                    searchArea = SearchFilter.SearchArea.InPackagesOnly,
+                    classNames = new[] { nameof(ModeDescriptor) },
+                    showAllHits = true
+                });
 
-            while (modeDescriptors.MoveNext())
+                while (modeDescriptors.MoveNext())
+                {
+                    var md = modeDescriptors.Current.pptrValue as ModeDescriptor;
+                    if (md == null)
+                        continue;
+                    FillModeData(md.path, modesData);
+                    modeFilePathCache += md.path + ";";
+                }
+                SessionState.SetString(k_ModePathsCache, modeFilePathCache);
+            }
+            else
             {
-                var md = modeDescriptors.Current.pptrValue as ModeDescriptor;
-                if (md == null)
-                    continue;
-                FillModeData(md.path, modesData);
+                var paths = modeFilePathCache.Split(";");
+                foreach(var path in paths)
+                {
+                    if (!File.Exists(path))
+                        continue;
+                    FillModeData(path, modesData);
+                }
             }
-
+            
             modes = new ModeEntry[modesData.Keys.Count];
             modes[0] = CreateEntry(k_DefaultModeId, (JSONObject)modesData[k_DefaultModeId]);
             var modeIndex = 1;
diff --git a/Editor/Mono/EditorSceneManager.bindings.cs b/Editor/Mono/EditorSceneManager.bindings.cs
index bed62ddfbc..a8757b60c9 100644
--- a/Editor/Mono/EditorSceneManager.bindings.cs
+++ b/Editor/Mono/EditorSceneManager.bindings.cs
@@ -141,6 +141,9 @@ internal static void RemapAssetReferencesInScene(UnityEngine.SceneManagement.Sce
         [NativeMethod("GetPreviewScenesVisibleInHierarchy")]
         internal extern static bool GetPreviewScenesVisibleInHierarchy();
 
+        [StaticAccessor("EditorSceneManagerBindings", StaticAccessorType.DoubleColon)]
+        internal extern static Scene GetDontDestroyOnLoadScene();
+
         [StaticAccessor("EditorSceneManagerBindings", StaticAccessorType.DoubleColon)]
         [NativeMethod("IsPreviewSceneObject")]
         public extern static bool IsPreviewSceneObject(UnityEngine.Object obj);
@@ -241,7 +244,7 @@ internal static void RemapAssetReferencesInScene(UnityEngine.SceneManagement.Sce
         [NativeThrows]
         [StaticAccessor("EditorSceneManagerBindings", StaticAccessorType.DoubleColon)]
         [NativeMethod("RestoreSceneManagerSetup")]
-        public extern static void RestoreSceneManagerSetup(SceneSetup[] value);
+        public extern static void RestoreSceneManagerSetup([Unmarshalled] SceneSetup[] value);
 
         [StaticAccessor("EditorSceneManagerBindings", StaticAccessorType.DoubleColon)]
         [NativeMethod("LoadSceneManagerSetup")]
diff --git a/Editor/Mono/EditorSettings.bindings.cs b/Editor/Mono/EditorSettings.bindings.cs
index 2140f5e5f0..e5ba1d9a2e 100644
--- a/Editor/Mono/EditorSettings.bindings.cs
+++ b/Editor/Mono/EditorSettings.bindings.cs
@@ -69,6 +69,7 @@ public enum EnterPlayModeOptions
         None = 0,
         DisableDomainReload = 1 << 0,
         DisableSceneReload = 1 << 1,
+        [Obsolete("Option has no effect and is deprecated.")]
         DisableSceneBackupUnlessDirty = 1 << 2
     }
 
@@ -238,6 +239,7 @@ internal static extern string Internal_ProjectGenerationUserExtensions
         [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
         internal static extern void SetEtcTextureCompressorDefaultBehavior();
 
+        [Obsolete("EditorSettings.useLegacyProbeSampleCount is deprecated. The legacy method of selecting probe sample counts will be removed in a future release.", false)]
         [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
         public static extern bool useLegacyProbeSampleCount { get; set; }
 
diff --git a/Editor/Mono/EditorTextSettings.cs b/Editor/Mono/EditorTextSettings.cs
new file mode 100644
index 0000000000..3b613a4f5e
--- /dev/null
+++ b/Editor/Mono/EditorTextSettings.cs
@@ -0,0 +1,95 @@
+// 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.TextCore.Text;
+using UnityEditor.Experimental;
+
+namespace UnityEditor
+{
+
+    /// <summary>
+    /// Represents text rendering settings for the editor
+    /// </summary>
+    [InitializeOnLoad]
+    internal class EditorTextSettings : TextSettings
+    {
+        private static EditorTextSettings s_DefaultTextSettings;
+        private static float s_CurrentEditorSharpness;
+        private static bool s_CurrentEditorSharpnessLoadedOrSet = false;
+
+        const string k_Platform =
+                            " - Linux";
+
+        static EditorTextSettings()
+        {
+            IMGUITextHandle.GetEditorTextSettings = () => defaultTextSettings;
+        }
+
+        internal static void SetCurrentEditorSharpness(float sharpness)
+        {
+            s_CurrentEditorSharpness = sharpness;
+            s_CurrentEditorSharpnessLoadedOrSet = true;
+        }
+
+        internal override float GetEditorTextSharpness()
+        {
+            if (!s_CurrentEditorSharpnessLoadedOrSet)
+            {
+                SetCurrentEditorSharpness(EditorPrefs.GetFloat($"EditorTextSharpness_{EditorResources.GetFont(FontDef.Style.Normal).name}", 0.0f));
+            }
+            return s_CurrentEditorSharpness;
+        }
+
+        internal override Font GetEditorFont()
+        {
+            return EditorResources.GetFont(FontDef.Style.Normal);
+        }
+
+        internal static EditorTextSettings defaultTextSettings
+        {
+            get
+            {
+                if (s_DefaultTextSettings == null)
+                {
+                    s_DefaultTextSettings = EditorGUIUtility.Load(s_DefaultEditorTextSettingPath) as EditorTextSettings;
+                    if (s_DefaultTextSettings)
+                        UpdateLocalizationFontAsset();
+                }
+
+                return s_DefaultTextSettings;
+            }
+        }
+
+        internal static void UpdateLocalizationFontAsset()
+        {
+            var localizationAssetPathPerSystemLanguage = new Dictionary<SystemLanguage, string>()
+                    {
+                        { SystemLanguage.English, $"UIPackageResources/FontAssets/DynamicOSFontAssets/Localization/English{k_Platform}.asset" },
+                        { SystemLanguage.Japanese, $"UIPackageResources/FontAssets/DynamicOSFontAssets/Localization/Japanese{k_Platform}.asset" },
+                        { SystemLanguage.ChineseSimplified, $"UIPackageResources/FontAssets/DynamicOSFontAssets/Localization/ChineseSimplified{k_Platform}.asset" },
+                        { SystemLanguage.ChineseTraditional, $"UIPackageResources/FontAssets/DynamicOSFontAssets/Localization/ChineseTraditional{k_Platform}.asset" },
+                        { SystemLanguage.Korean, $"UIPackageResources/FontAssets/DynamicOSFontAssets/Localization/Korean{k_Platform}.asset" }
+                    };
+
+            var globalFallbackAssetPath = $"UIPackageResources/FontAssets/DynamicOSFontAssets/GlobalFallback/GlobalFallback{k_Platform}.asset";
+
+            FontAsset localizationAsset = null;
+
+            if (localizationAssetPathPerSystemLanguage.ContainsKey(LocalizationDatabase.currentEditorLanguage))
+            {
+                localizationAsset = EditorGUIUtility.Load(localizationAssetPathPerSystemLanguage[LocalizationDatabase.currentEditorLanguage]) as FontAsset;
+            }
+
+            var globalFallbackAsset = EditorGUIUtility.Load(globalFallbackAssetPath) as FontAsset;
+
+            defaultTextSettings.fallbackFontAssets[0] = localizationAsset;
+            defaultTextSettings.fallbackFontAssets[defaultTextSettings.fallbackFontAssets.Count - 1] = globalFallbackAsset;
+        }
+
+        internal static readonly string s_DefaultEditorTextSettingPath = "UIPackageResources/Editor Text Settings.asset";
+    }
+}
diff --git a/Editor/Mono/EditorUserBuildSettings.bindings.cs b/Editor/Mono/EditorUserBuildSettings.bindings.cs
index b7188b4de2..85e628724a 100644
--- a/Editor/Mono/EditorUserBuildSettings.bindings.cs
+++ b/Editor/Mono/EditorUserBuildSettings.bindings.cs
@@ -231,6 +231,13 @@ public enum WSABuildAndRunDeployTarget
         DevicePortal = 2
     }
 
+    [NativeType(Header = "Editor/Src/EditorUserBuildSettings.h")]
+    public enum WindowsBuildAndRunDeployTarget
+    {
+        LocalMachine = 0,
+        DevicePortal = 2
+    }
+
     [NativeType(Header = "Editor/Src/EditorUserBuildSettings.h")]
     public enum WSABuildType
     {
@@ -386,9 +393,6 @@ private EditorUserBuildSettings() {}
         [NativeMethod("GetActiveSubTargetFor")]
         internal static extern int GetActiveSubtargetFor(BuildTarget target);
 
-        [NativeMethod("SetActiveSubTargetFor")]
-        internal static extern void SetActiveSubtargetFor(BuildTarget target, int subtarget);
-
         // QNX OS Version
         public static extern QNXOsVersion selectedQnxOsVersion
         {
@@ -423,8 +427,30 @@ public static extern EmbeddedLinuxArchitecture selectedEmbeddedLinuxArchitecture
         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
+        public static BuildTarget selectedStandaloneTarget
+        {
+            get { return internal_SelectedStandaloneTarget; }
+            set
+            {
+                string platformName = BuildPipeline.GetBuildTargetName(value);
+                var architecture = GetPlatformSettings(platformName, kSettingArchitecture).ToLower();
+                switch (value)
+                {
+                    case BuildTarget.StandaloneWindows:
+                        if (architecture != "x86")
+                            SetPlatformSettings(platformName, kSettingArchitecture, OSArchitecture.x86.ToString());
+                        break;
+                    case BuildTarget.StandaloneWindows64:
+                        if (architecture != "x64" && architecture != "arm64")
+                            SetPlatformSettings(platformName, kSettingArchitecture, OSArchitecture.x64.ToString());
+                        break;
+                }
+
+                internal_SelectedStandaloneTarget = value;
+            }
+        }
+
+        private static extern BuildTarget internal_SelectedStandaloneTarget
         {
             [NativeMethod("GetSelectedStandaloneTarget")]
             get;
@@ -709,6 +735,13 @@ public static extern WSABuildAndRunDeployTarget wsaBuildAndRunDeployTarget
             set;
         }
 
+        public static extern WindowsBuildAndRunDeployTarget windowsBuildAndRunDeployTarget
+        {
+            [NativeMethod("GetSelectedWindowsBuildAndRunDeployTarget")]
+            get;
+            [NativeMethod("SetSelectedWindowsBuildAndRunDeployTarget")]
+            set;
+        }
         public static extern int overrideMaxTextureSize { get; set; }
         public static extern Build.OverrideTextureCompression overrideTextureCompression { get; set; }
 
@@ -720,9 +753,14 @@ public static extern WSABuildAndRunDeployTarget wsaBuildAndRunDeployTarget
         internal static extern BuildTargetGroup activeBuildTargetGroup { get; }
 
         [NativeMethod("SwitchActiveBuildTargetSync")]
-        public static extern bool SwitchActiveBuildTarget(BuildTargetGroup targetGroup, BuildTarget target);
+        internal static extern bool SwitchActiveBuildTargetAndSubtarget(BuildTargetGroup targetGroup, BuildTarget target, int subtarget);
+        public static bool SwitchActiveBuildTarget(BuildTargetGroup targetGroup, BuildTarget target)
+            => SwitchActiveBuildTargetAndSubtarget(targetGroup, target, EditorUserBuildSettings.GetActiveSubtargetFor(target));
+
         [NativeMethod("SwitchActiveBuildTargetAsync")]
-        public static extern bool SwitchActiveBuildTargetAsync(BuildTargetGroup targetGroup, BuildTarget target);
+        internal static extern bool SwitchActiveBuildTargetAndSubtargetAsync(BuildTargetGroup targetGroup, BuildTarget target, int subtarget);
+        public static bool SwitchActiveBuildTargetAsync(BuildTargetGroup targetGroup, BuildTarget target)
+            => SwitchActiveBuildTargetAndSubtargetAsync(targetGroup, target, EditorUserBuildSettings.GetActiveSubtargetFor(target));
 
         public static bool SwitchActiveBuildTarget(NamedBuildTarget namedBuildTarget, BuildTarget target) =>
             BuildPlatforms.instance.BuildPlatformFromNamedBuildTarget(namedBuildTarget).SetActive(target);
@@ -731,7 +769,9 @@ public static bool SwitchActiveBuildTarget(NamedBuildTarget namedBuildTarget, Bu
         // validating if support for it is installed. However it does not do things like script recompile
         // or domain reload -- generally only useful for asset import testing.
         [NativeMethod("SwitchActiveBuildTargetSyncNoCheck")]
-        internal static extern bool SwitchActiveBuildTargetNoCheck(BuildTargetGroup targetGroup, BuildTarget target);
+        internal static extern bool SwitchActiveBuildTargetAndSubtargetNoCheck(BuildTargetGroup targetGroup, BuildTarget target, int subtarget);
+        internal static bool SwitchActiveBuildTargetNoCheck(BuildTargetGroup targetGroup, BuildTarget target)
+            => SwitchActiveBuildTargetAndSubtargetNoCheck(targetGroup, target, EditorUserBuildSettings.GetActiveSubtargetFor(target));
 
         // DEFINE directives for the compiler.
         public static extern string[] activeScriptCompilationDefines
@@ -931,12 +971,21 @@ public static extern bool switchNVNDrawValidation_Heavy
             set;
         }
 
-        // Enable linkage of the Heap inspector tool for Nintendo Switch.
-        public static extern bool switchEnableHeapInspector
+        // Enable linkage of the Memory Tracker tool for Nintendo Switch.
+        public static extern bool switchEnableMemoryTracker
+        {
+            [NativeMethod("GetEnableMemoryTrackerForSwitch")]
+            get;
+            [NativeMethod("SetEnableMemoryTrackerForSwitch")]
+            set;
+        }
+
+        // On startup the application waits for Memory Tracker to connect.
+        public static extern bool switchWaitForMemoryTrackerOnStartup
         {
-            [NativeMethod("GetEnableHeapInspectorForSwitch")]
+            [NativeMethod("GetWaitForSwitchMemoryTrackerOnStartup")]
             get;
-            [NativeMethod("SetEnableHeapInspectorForSwitch")]
+            [NativeMethod("SetWaitForSwitchMemoryTrackerOnStartup")]
             set;
         }
 
diff --git a/Editor/Mono/EditorUserBuildSettingsUtils.cs b/Editor/Mono/EditorUserBuildSettingsUtils.cs
index 16f66b64e6..3c493bc56b 100644
--- a/Editor/Mono/EditorUserBuildSettingsUtils.cs
+++ b/Editor/Mono/EditorUserBuildSettingsUtils.cs
@@ -108,7 +108,7 @@ public static bool SetActive(this BuildPlatform buildPlatform, BuildTarget targe
             }
 
             if (buildPlatform is BuildPlatformWithSubtarget)
-                EditorUserBuildSettings.SetActiveSubtargetFor(target, ((BuildPlatformWithSubtarget)buildPlatform).subtarget);
+                return EditorUserBuildSettings.SwitchActiveBuildTargetAndSubtarget(buildPlatform.namedBuildTarget.ToBuildTargetGroup(), target, ((BuildPlatformWithSubtarget)buildPlatform).subtarget);
 
             return EditorUserBuildSettings.SwitchActiveBuildTarget(buildPlatform.namedBuildTarget.ToBuildTargetGroup(), target);
         }
diff --git a/Editor/Mono/EditorUtility.bindings.cs b/Editor/Mono/EditorUtility.bindings.cs
index 600db06697..875df1d6c0 100644
--- a/Editor/Mono/EditorUtility.bindings.cs
+++ b/Editor/Mono/EditorUtility.bindings.cs
@@ -34,19 +34,26 @@ public static string OpenFilePanelWithFilters(string title, string directory, st
         public static extern void RevealInFinder(string path);
 
         [FreeFunction("DisplayDialog")]
-        static extern bool DoDisplayDialog(string title, string message, string ok, [DefaultValue("\"\"")] string cancel);
+        static extern bool DisplayDialogImpl(string title, string message, string ok, string cancel);
 
         public static bool DisplayDialog(string title, string message, string ok, [DefaultValue("\"\"")] string cancel)
         {
+            // i am not sure how picky should we be about the params
+            // for example, for the buttons we have code that ignores empty strings,
+            //   to allow having "ok"-only dialogs (information panels, so to say)
+            // same with title+message: it sounds like we should allow skipping one of those
+            // hence we make sure that at least one button is present, and some message
+            // we can go more picky if we want in the future
+            if(string.IsNullOrEmpty(ok) && string.IsNullOrEmpty(cancel))
+                throw new ArgumentException("Both 'ok' and 'cancel' strings are null or empty");
+            if(string.IsNullOrEmpty(title) && string.IsNullOrEmpty(message))
+                throw new ArgumentException("Both 'title' and 'message' strings are null or empty");
+
             using (new DisabledGuiViewInputScope(GUIView.current, true))
             {
-                return DoDisplayDialog(title, message, ok, cancel);
+                return DisplayDialogImpl(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)
         {
@@ -54,9 +61,22 @@ 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);
+        static extern int DisplayDialogComplexImpl(string title, string message, string ok, string cancel, string alt);
+
+        public static int DisplayDialogComplex(string title, string message, string ok, string cancel, string alt)
+        {
+            // see the comment above in DisplayDialog
+            // our implementation allows setting some strings empty (the button will be skipped then)
+            // but we should totally ensure some buttons are set
+
+            if(string.IsNullOrEmpty(ok) && string.IsNullOrEmpty(cancel) && string.IsNullOrEmpty(alt))
+                throw new ArgumentException("All three 'ok', 'cancel' and 'alt' strings are null or empty");
+            if(string.IsNullOrEmpty(title) && string.IsNullOrEmpty(message))
+                throw new ArgumentException("Both 'title' and 'message' strings are null or empty");
+
+            return DisplayDialogComplexImpl(title, message, ok, cancel, alt);
+        }
+
 
 
         [FreeFunction("RunOpenFolderPanel")]
@@ -75,6 +95,7 @@ public static bool DisplayDialog(string title, string message, string ok)
         public static extern bool IsPersistent(Object target);
         public static extern bool IsValidUnityYAML(string yaml);
         public static extern string SaveFilePanel(string title, string directory, string defaultName, string extension);
+        [ThreadSafe]
         public static extern int NaturalCompare(string a, string b);
         public static extern Object InstanceIDToObject(int instanceID);
         public static extern void CompressTexture([NotNull] Texture2D texture, TextureFormat format, int quality);
@@ -115,8 +136,8 @@ internal static void RemapAssetReferences(UnityEngine.Object[] objects, Dictiona
         private static extern void InternalCopySerializedIfDifferent([NotNull("NullExceptionObject")] Object source, [NotNull("NullExceptionObject")] Object dest);
 
         [NativeThrows]
-        public static extern Object[] CollectDependencies(Object[] roots);
-        public static extern Object[] CollectDeepHierarchy(Object[] roots);
+        public static extern Object[] CollectDependencies([Unmarshalled] Object[] roots);
+        public static extern Object[] CollectDeepHierarchy([Unmarshalled] Object[] roots);
 
         [FreeFunction("InstantiateObjectRemoveAllNonAnimationComponents")]
         private static extern Object Internal_InstantiateRemoveAllNonAnimationComponentsSingle([NotNull("NullExceptionObject")] Object data, Vector3 pos, Quaternion rot);
diff --git a/Editor/Mono/EditorUtility.cs b/Editor/Mono/EditorUtility.cs
index e95e677ccf..1d51348070 100644
--- a/Editor/Mono/EditorUtility.cs
+++ b/Editor/Mono/EditorUtility.cs
@@ -80,7 +80,7 @@ public static string GetDialogOptOutMessage(DialogOptOutDecisionType dialogOptOu
 
         public static bool LoadWindowLayout(string path)
         {
-            return WindowLayout.LoadWindowLayout(path, false);
+            return WindowLayout.TryLoadWindowLayout(path, false);
         }
 
         public static void CompressTexture(Texture2D texture, TextureFormat format, TextureCompressionQuality quality)
@@ -506,10 +506,17 @@ internal static void DisplayObjectContextMenu(Rect position, Object[] context, i
                             info.instanceObject = targetComponent;
                             info.assetPath = AssetDatabase.GetAssetPath(sourceGo);
                             GameObject rootObject = PrefabUtility.GetRootGameObject(sourceGo);
-                            if (!PrefabUtility.IsPartOfPrefabThatCanBeAppliedTo(rootObject) || EditorUtility.IsPersistent(instanceGo))
+
+                            if (targetComponent.hideFlags.HasFlag(HideFlags.DontSaveInEditor) 
+                                || !PrefabUtility.IsPartOfPrefabThatCanBeAppliedTo(rootObject) 
+                                || EditorUtility.IsPersistent(instanceGo))
+                            {
                                 pm.AddDisabledItem(menuItemContent);
+                            }
                             else
+                            {
                                 pm.AddItem(menuItemContent, false, TargetChoiceHandler.ApplyPrefabAddedComponent, info);
+                            }
                         },
                         (menuItemContent) =>
                         {
@@ -567,7 +574,7 @@ internal static void DisplayObjectContextMenu(Rect position, Object[] context, i
                                 GameObject rootObject = PrefabUtility.GetRootGameObject(sourceObject);
                                 bool isPersistent = EditorUtility.IsPersistent(instanceOrAssetObject);
 
-                                if (!PrefabUtility.IsPartOfPrefabThatCanBeAppliedTo(rootObject) || (!isPersistent && !PrefabUtility.HasApplicableObjectOverridesForTarget(instanceOrAssetObject, rootObject, false)))
+                                if (isPersistent || !PrefabUtility.IsPartOfPrefabThatCanBeAppliedTo(rootObject) || !PrefabUtility.HasApplicableObjectOverridesForTarget(instanceOrAssetObject, rootObject, false))
                                     pm.AddDisabledItem(menuItemContent);
                                 else
                                     pm.AddItem(menuItemContent, false, TargetChoiceHandler.ApplyPrefabObjectOverride, info);
diff --git a/Editor/Mono/EditorWindow.cs b/Editor/Mono/EditorWindow.cs
index 4abbd65027..a51a57896a 100644
--- a/Editor/Mono/EditorWindow.cs
+++ b/Editor/Mono/EditorWindow.cs
@@ -44,6 +44,12 @@ public partial class EditorWindow : ScriptableObject
         [HideInInspector]
         internal Rect m_Pos = new Rect(0, 0, 320, 550);
 
+        [SerializeField]
+        internal DataModeController m_SerializedDataModeController;
+        public IDataModeController dataModeController => GetDataModeController_Internal(); // For each editor window.
+        internal DataModeController GetDataModeController_Internal()  // For HostView to use internally.
+            => m_SerializedDataModeController ??= new DataModeController();
+
         private VisualElement m_UIRootElement;
 
         internal VisualElement baseRootVisualElement => m_UIRootElement == null
@@ -106,6 +112,8 @@ internal SerializableJsonDictionary viewDataDictionary
             }
         }
 
+        internal static List<EditorWindow> activeEditorWindows { get; } = new List<EditorWindow>();
+
         internal void SaveViewData()
         {
             m_RequestedViewDataSave = true;
@@ -249,7 +257,7 @@ internal static GUIContent GetLocalizedTitleContentFromType(Type t)
                 else if (attr.useTypeNameAsIconName)
                     iconName = t.ToString();
 
-                if (!string.IsNullOrEmpty(iconName))
+                if (!string.IsNullOrEmpty(iconName) && EditorGUIUtility.LoadIcon(iconName))
                 {
                     // This should error msg if icon is not found since icon has been explicitly requested by the user
                     return EditorGUIUtility.TrTextContentWithIcon(attr.title, iconName);
@@ -697,6 +705,26 @@ public void ShowModal()
             }
         }
 
+        static void AssignTitle(EditorWindow win, string title)
+        {
+            if (title != null)
+            {
+                win.titleContent = new GUIContent(title);
+                return;
+            }
+
+            // Do not assign anything new if the user has defined its own title.
+            var titleContent = GetLocalizedTitleContentFromType(win.GetType());
+            if (win.titleContent.text == win.GetType().ToString())
+            {
+                win.titleContent.text = titleContent.text;
+            }
+            if (win.titleContent.image == null)
+            {
+                win.titleContent.image = titleContent.image;
+            }
+        }
+
         // Returns the first EditorWindow of type /t/ which is currently on the screen.
         static EditorWindow GetWindowPrivate(System.Type t, bool utility, string title, bool focus)
         {
@@ -708,8 +736,7 @@ static EditorWindow GetWindowPrivate(System.Type t, bool utility, string title,
                 try
                 {
                     win = ScriptableObject.CreateInstance(t) as EditorWindow;
-                    if (title != null)
-                        win.titleContent = new GUIContent(title);
+                    AssignTitle(win, title);
                     if (utility)
                         win.ShowUtility();
                     else
@@ -731,44 +758,44 @@ static EditorWindow GetWindowPrivate(System.Type t, bool utility, string title,
             return win;
         }
 
-        public static EditorWindow GetWindow(System.Type t, [DefaultValue("false")] bool utility, [DefaultValue("null")] string title, [DefaultValue("true")] bool focus)
+        public static EditorWindow GetWindow(System.Type windowType, [DefaultValue("false")] bool utility, [DefaultValue("null")] string title, [DefaultValue("true")] bool focus)
         {
-            return GetWindowPrivate(t, utility, title, focus);
+            return GetWindowPrivate(windowType, utility, title, focus);
         }
 
         [ExcludeFromDocs]
-        public static EditorWindow GetWindow(System.Type t, bool utility, string title)
+        public static EditorWindow GetWindow(System.Type windowType, bool utility, string title)
         {
-            return GetWindowPrivate(t, utility, title, true);
+            return GetWindowPrivate(windowType, utility, title, true);
         }
 
         [ExcludeFromDocs]
-        public static EditorWindow GetWindow(System.Type t, bool utility)
+        public static EditorWindow GetWindow(System.Type windowType, bool utility)
         {
-            return GetWindowPrivate(t, utility, null, true);
+            return GetWindowPrivate(windowType, utility, null, true);
         }
 
         [ExcludeFromDocs]
-        public static EditorWindow GetWindow(System.Type t)
+        public static EditorWindow GetWindow(System.Type windowType)
         {
-            return GetWindowPrivate(t, false, null, true);
+            return GetWindowPrivate(windowType, false, null, true);
         }
 
-        public static EditorWindow GetWindowWithRect(System.Type t, Rect rect, [DefaultValue("false")] bool utility, [DefaultValue("null")] string title)
+        public static EditorWindow GetWindowWithRect(System.Type windowType, Rect rect, [DefaultValue("false")] bool utility, [DefaultValue("null")] string title)
         {
-            return GetWindowWithRectPrivate(t, rect, utility, title);
+            return GetWindowWithRectPrivate(windowType, rect, utility, title);
         }
 
         [ExcludeFromDocs]
-        public static EditorWindow GetWindowWithRect(System.Type t, Rect rect, bool utility)
+        public static EditorWindow GetWindowWithRect(System.Type windowType, Rect rect, bool utility)
         {
-            return GetWindowWithRectPrivate(t, rect, utility, null);
+            return GetWindowWithRectPrivate(windowType, rect, utility, null);
         }
 
         [ExcludeFromDocs]
-        public static EditorWindow GetWindowWithRect(System.Type t, Rect rect)
+        public static EditorWindow GetWindowWithRect(System.Type windowType, Rect rect)
         {
-            return GetWindowWithRectPrivate(t, rect, false, null);
+            return GetWindowWithRectPrivate(windowType, rect, false, null);
         }
 
         public static T GetWindow<T>() where T : EditorWindow
@@ -838,8 +865,7 @@ public static T CreateWindow<T>(string title, params System.Type[] desiredDockNe
         {
             T win = CreateInstance<T>();
 
-            if (title != null)
-                win.titleContent =  new GUIContent(title);
+            AssignTitle(win, title);
 
             //Iterate the desired dock next to types...
             foreach (var desired in desiredDockNextTo)
@@ -906,8 +932,7 @@ static EditorWindow GetWindowWithRectPrivate(System.Type t, Rect rect, bool util
                 win.minSize = new Vector2(rect.width, rect.height);
                 win.maxSize = new Vector2(rect.width, rect.height);
                 win.position = rect;
-                if (title != null)
-                    win.titleContent = new GUIContent(title);
+                AssignTitle(win, title);
                 if (utility)
                     win.ShowUtility();
                 else
@@ -952,8 +977,7 @@ public static T GetWindowWithRect<T>(Rect rect, bool utility, string title, bool
                 window.minSize = new Vector2(rect.width, rect.height);
                 window.maxSize = new Vector2(rect.width, rect.height);
                 window.position = rect;
-                if (title != null)
-                    window.titleContent = new GUIContent(title);
+                AssignTitle(window, title);
                 if (utility)
                     window.ShowUtility();
                 else
@@ -1220,10 +1244,16 @@ static void Initialize()
             EditorApplication.delayCall += () => ShortcutIntegration.instance.contextManager.RegisterToolContext(s_ShortcutContext);
         }
 
-        private void OnDisableINTERNAL()
+        void OnEnableINTERNAL()
+        {
+            activeEditorWindows.Add(this);
+        }
+
+        void OnDisableINTERNAL()
         {
             m_OverlayCanvas.OnContainerWindowDisabled();
             SaveViewDataToDisk();
+            activeEditorWindows.Remove(this);
         }
 
         internal void ReleaseViewData()
diff --git a/Editor/Mono/EnumDataUtility.cs b/Editor/Mono/EnumDataUtility.cs
index 1f0f5aa6a8..54864a2b07 100644
--- a/Editor/Mono/EnumDataUtility.cs
+++ b/Editor/Mono/EnumDataUtility.cs
@@ -4,6 +4,7 @@
 
 using System;
 using UnityEngine;
+using static UnityEngine.EnumDataUtility;
 
 namespace UnityEditor
 {
@@ -11,7 +12,12 @@ internal static class EnumDataUtility
     {
         internal static EnumData GetCachedEnumData(Type enumType, bool excludeObsolete = true)
         {
-            return UnityEngine.EnumDataUtility.GetCachedEnumData(enumType, excludeObsolete, ObjectNames.NicifyVariableName);
+            return UnityEngine.EnumDataUtility.GetCachedEnumData(enumType, excludeObsolete ? CachedType.ExcludeObsolete : CachedType.IncludeObsoleteExceptErrors, ObjectNames.NicifyVariableName);
+        }
+
+        internal static EnumData GetCachedEnumData(Type enumType, CachedType cachedType)
+        {
+            return UnityEngine.EnumDataUtility.GetCachedEnumData(enumType, cachedType, ObjectNames.NicifyVariableName);
         }
 
         internal static int EnumFlagsToInt(EnumData enumData, Enum enumValue)
diff --git a/Editor/Mono/GI/InputExtraction.bindings.cs b/Editor/Mono/GI/InputExtraction.bindings.cs
new file mode 100644
index 0000000000..4292ab37af
--- /dev/null
+++ b/Editor/Mono/GI/InputExtraction.bindings.cs
@@ -0,0 +1,260 @@
+// 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 UnityEngine.Bindings;
+
+namespace UnityEditor.LightBaking
+{
+    [NativeHeader("Editor/Src/GI/InputExtraction/InputExtraction.Bindings.h")]
+    [StaticAccessor("InputExtractionBindings", StaticAccessorType.DoubleColon)]
+    internal static class InputExtraction
+    {
+        [StructLayout(LayoutKind.Sequential)]
+        public class SourceMap : IDisposable
+        {
+            internal IntPtr m_Ptr;
+            internal bool m_OwnsPtr;
+
+            public SourceMap()
+            {
+                m_Ptr = Internal_Create();
+                m_OwnsPtr = true;
+            }
+            public SourceMap(IntPtr ptr)
+            {
+                m_Ptr = ptr;
+                m_OwnsPtr = false;
+            }
+            ~SourceMap()
+            {
+                Destroy();
+            }
+
+            public void Dispose()
+            {
+                Destroy();
+                GC.SuppressFinalize(this);
+            }
+
+            void Destroy()
+            {
+                if (m_OwnsPtr && m_Ptr != IntPtr.Zero)
+                {
+                    Internal_Destroy(m_Ptr);
+                    m_Ptr = IntPtr.Zero;
+                }
+            }
+
+            public extern int GetInstanceIndex(int instanceID);
+            public extern int GetInstanceInstanceID(int instanceIndex);
+
+            public extern int GetTreeCount();
+            public extern int GetTreeInstanceIndex(int treeIndex);
+
+            public extern int GetLightIndex(int instanceID);
+            public extern int GetLightInstanceID(int lightIndex);
+
+            static extern IntPtr Internal_Create();
+            static extern void Internal_Destroy(IntPtr ptr);
+        }
+
+        public static extern bool ExtractFromScene(string outputFolderPath, LightBaker.BakeInput input, SourceMap map);
+
+        private static string LookupGameObjectName(SourceMap map, int instanceIndex)
+        {
+            if (map == null)
+                return "";
+            int instanceID = map.GetInstanceInstanceID(instanceIndex);
+            if (instanceID == 0)
+                return "";
+            Object obj = EditorUtility.InstanceIDToObject(instanceID);
+            if (obj == null)
+                return "";
+            else if (obj is UnityEngine.GameObject go)
+            {
+                return go.name;
+            }
+            else if (obj is UnityEngine.Component component)
+            {
+                return component.gameObject.name;
+            }
+            return "";
+        }
+
+        public static string LogInstances(LightBaker.BakeInput bakeInput, SourceMap map)
+        {
+            if (bakeInput is null)
+                return string.Empty;
+            string message = string.Empty;
+            message += $"      instance count\t: {bakeInput.instanceCount}\n";
+            for (int i = 0; i < bakeInput.instanceCount; ++i)
+            {
+                message += $"         Instance [{i}] [{LookupGameObjectName(map, i)}]:\n";
+                LightBaker.Instance instance = bakeInput.instance((uint)i);
+                message += $"            mesh type\t\t: {instance.meshType}\n";
+                if (instance.meshType == LightBaker.MeshType.MeshRenderer)
+                    message += $"            mesh index\t: {instance.meshIndex}\n";
+                else if (instance.meshType == LightBaker.MeshType.Terrain)
+                    message += $"            terrain index\t: {instance.terrainIndex}\n";
+                message += $"            transform\t\t: {instance.transform.GetRow(0)}\n";
+                message += $"                     \t\t: {instance.transform.GetRow(1)}\n";
+                message += $"                     \t\t: {instance.transform.GetRow(2)}\n";
+                message += $"                     \t\t: {instance.transform.GetRow(3)}\n";
+                message += $"            cast shadows\t: {instance.castShadows}\n";
+                message += $"            receive shadows\t: {instance.receiveShadows}\n";
+                if (instance.meshType == LightBaker.MeshType.MeshRenderer)
+                {
+                    message += $"            odd negative scale\t: {instance.oddNegativeScale}\n";
+                    message += $"            lod group\t\t: {instance.lodGroup}\n";
+                    message += $"            lod mask\t\t: {instance.lodMask}\n";
+                }
+                message += $"            submesh count\t: {instance.submeshMaterialIndices.Length}\n";
+                string indices = string.Empty;
+                for (int j = 0; j < instance.submeshMaterialIndices.Length; ++j)
+                    indices += instance.submeshMaterialIndices[j] + (j < (instance.submeshMaterialIndices.Length - 1) ? ", " : "");
+                message += $"            submesh mat idxs\t: {{{indices}}}\n";
+            }
+            return message;
+        }
+
+        public static string LogSceneMaterials(LightBaker.BakeInput bakeInput)
+        {
+            if (bakeInput is null)
+                return string.Empty;
+            string message = string.Empty;
+            message += $"      material count\t: {bakeInput.materialCount}\n";
+            for (int i = 0; i < bakeInput.materialCount; ++i)
+            {
+                message += $"         Material [{i}]:\n";
+                message += $"            doubleSidedGI\t: {bakeInput.GetMaterial((uint)i).doubleSidedGI}\n";
+                message += $"            transmissionChannels\t: {bakeInput.GetMaterial((uint)i).transmissionChannels}\n";
+                message += $"            transmissionType\t: {bakeInput.GetMaterial((uint)i).transmissionType}\n";
+            }
+            return message;
+        }
+
+        public static string LogSceneCookies(LightBaker.BakeInput bakeInput)
+        {
+            if (bakeInput is null)
+                return string.Empty;
+            string message = string.Empty;
+
+            message += $"      cookie tex count\t: {bakeInput.GetCookieCount()}\n";
+            for (int i = 0; i < bakeInput.GetCookieCount(); ++i)
+            {
+                LightBaker.CookieData cookie = bakeInput.GetCookieData((uint)i);
+                message += $"         CookieTexture [{i}]:\n";
+                message += $"            resolution\t\t: {cookie.resolution.width} x {cookie.resolution.height}\n";
+                message += $"            pixelStride\t\t: {cookie.pixelStride}\n";
+                message += $"            slices\t\t: {cookie.slices}\n";
+                message += $"            repeat\t\t: {cookie.repeat}\n";
+            }
+            return message;
+        }
+
+        public static string LogSceneLights(LightBaker.BakeInput bakeInput)
+        {
+            if (bakeInput is null)
+                return string.Empty;
+            string message = string.Empty;
+            message += $"      light count\t\t: {bakeInput.GetLightCount()}\n";
+            for (int i = 0; i < bakeInput.GetLightCount(); ++i)
+            {
+                LightBaker.Light light = bakeInput.GetLight((uint)i);
+                message += $"         Light [{i}]:\n";
+                message += $"            color\t\t: {light.color}\n";
+                message += $"            indirect color\t: {light.indirectColor}\n";
+                message += $"            orientation\t: {light.orientation}\n";
+                message += $"            position\t\t: {light.position}\n";
+                message += $"            range\t\t: {light.range}\n";
+                message += $"            cookie index\t: {light.cookieTextureIndex}\n";
+                message += $"            cookie scale\t: {light.cookieScale}\n";
+                message += $"            cone angle\t: {light.coneAngle}\n";
+                message += $"            inner cone angle\t: {light.innerConeAngle}\n";
+                message += $"            shape0\t\t: {light.shape0}\n";
+                message += $"            shape1\t\t: {light.shape1}\n";
+                message += $"            type\t\t: {light.type}\n";
+                message += $"            mode\t\t: {light.mode}\n";
+                message += $"            falloff\t\t: {light.falloff}\n";
+                message += $"            angular falloff\t: {light.angularFalloff}\n";
+                message += $"            casts shadows\t: {light.castsShadows}\n";
+                message += $"            shadowmask chnl\t: {light.shadowMaskChannel}\n";
+            }
+            return message;
+        }
+
+        public static string LogSampleCounts(LightBaker.SampleCount sampleCount)
+        {
+            string message = string.Empty;
+            message += $"            direct\t\t: {sampleCount.directSampleCount}\n";
+            message += $"            indirect\t\t: {sampleCount.indirectSampleCount}\n";
+            message += $"            environment\t: {sampleCount.environmentSampleCount}\n";
+            return message;
+        }
+
+        public static string LogSceneSettings(LightBaker.BakeInput bakeInput)
+        {
+            if (bakeInput is null)
+                return string.Empty;
+            var lightingSettings = bakeInput.GetLightingSettings();
+            string message = string.Empty;
+            message += $"      lighting settings\t:\n";
+            message += $"         lightmap sample counts:\n";
+            message += LogSampleCounts(lightingSettings.lightmapSampleCounts);
+            message += $"         lightprobe sample counts:\n";
+            message += LogSampleCounts(lightingSettings.probeSampleCounts);
+            message += $"         min bounces\t: {lightingSettings.minBounces}\n";
+            message += $"         max bounces\t: {lightingSettings.maxBounces}\n";
+            message += $"         lightmap bake mode\t: {lightingSettings.lightmapBakeMode}\n";
+            message += $"         mixed lighting mode\t: {lightingSettings.mixedLightingMode}\n";
+            message += $"         ao enabled\t\t: {lightingSettings.aoEnabled}\n";
+            message += $"         ao distance\t\t: {lightingSettings.aoDistance}\n";
+            return message;
+        }
+
+        public static string LogScene(LightBaker.BakeInput bakeInput, SourceMap map)
+        {
+            if (bakeInput is null)
+                return string.Empty;
+            string message = string.Empty;
+            message += LogSceneSettings(bakeInput);
+            message += LogInstances(bakeInput, map);
+            message += $"      mesh count\t\t: {bakeInput.meshCount}\n";
+            message += $"      terrain count\t\t: {bakeInput.terrainCount}\n";
+            message += $"      heightmap count\t: {bakeInput.heightmapCount}\n";
+            message += $"      holemap count\t: {bakeInput.holemapCount}\n";
+            message += LogSceneMaterials(bakeInput);
+            message += $"      albedo tex count\t: {bakeInput.albedoTextureCount}\n";
+            for (int i = 0; i < bakeInput.albedoTextureCount; ++i)
+            {
+                message += $"         AlbedoTexture [{i}]:\n";
+                message += $"            resolution\t\t: {bakeInput.GetAlbedoTextureData((uint)i).resolution.width} x {bakeInput.GetAlbedoTextureData((uint)i).resolution.height}\n";
+            }
+            message += $"      emissive tex count\t: {bakeInput.emissiveTextureCount}\n";
+            for (int i = 0; i < bakeInput.emissiveTextureCount; ++i)
+            {
+                message += $"         EmissiveTexture [{i}]:\n";
+                message += $"            resolution\t\t: {bakeInput.GetEmissiveTextureData((uint)i).resolution.width} x {bakeInput.GetEmissiveTextureData((uint)i).resolution.height}\n";
+            }
+            message += $"      transmissive tex count\t: {bakeInput.transmissiveTextureCount}\n";
+            for (int i = 0; i < bakeInput.transmissiveTextureCount; ++i)
+            {
+                message += $"         TransmissiveTexture [{i}]:\n";
+                message += $"            resolution\t\t: {bakeInput.GetTransmissiveTextureData((uint)i).resolution.width} x {bakeInput.GetTransmissiveTextureData((uint)i).resolution.height}\n";
+            }
+            message += LogSceneCookies(bakeInput);
+            message += LogSceneLights(bakeInput);
+            message += $"      lightmap count\t: {bakeInput.lightmapCount}\n";
+            for (int i = 0; i < bakeInput.lightmapCount; ++i)
+            {
+                message += $"         Lightmap [{i}]:\n";
+                message += $"            resolution\t\t: {bakeInput.lightmapResolution((uint)i).width} x {bakeInput.lightmapResolution((uint)i).height}\n";
+                message += $"            instance count\t: {bakeInput.lightmapInstanceCount((uint)i)}\n";
+            }
+            return message;
+        }
+    }
+}
diff --git a/Editor/Mono/GI/LightBaker.bindings.cs b/Editor/Mono/GI/LightBaker.bindings.cs
new file mode 100644
index 0000000000..d5f19601a6
--- /dev/null
+++ b/Editor/Mono/GI/LightBaker.bindings.cs
@@ -0,0 +1,599 @@
+// 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 UnityEngine;
+using UnityEngine.Bindings;
+
+namespace UnityEditor.LightBaking
+{
+    [NativeHeader("Editor/Src/GI/LightBaker/LightBaker.Bindings.h")]
+    [StaticAccessor("LightBakerBindings", StaticAccessorType.DoubleColon)]
+    internal static class LightBaker
+    {
+        public enum ResultType : UInt32
+        {
+            Success = 0,
+            Cancelled,
+            JobFailed,
+            OutOfMemory,
+            InvalidInput,
+            LowLevelAPIFailure,
+            IOFailed,
+            Undefined
+        }
+
+        public struct Result
+        {
+            public ResultType type;
+            public String message;
+            public override string ToString()
+            {
+                if (message.Length == 0)
+                    return $"Result type: '{type}'";
+                else
+                    return $"Result type: '{type}', message: '{message}'";
+
+            }
+        }
+
+
+        public enum Backend
+        {
+            CPU = 0,
+            GPU = 1
+        }
+        public enum TransmissionChannels
+        {
+            Red = 0,
+            Alpha = 1,
+            AlphaCutout = 2,
+            RGB = 3,
+            None = 4
+        }
+        public enum TransmissionType
+        {
+            Opacity = 0,
+            Transparency = 1,
+            None = 2
+        }
+        public enum MeshType
+        {
+            Terrain = 0,
+            MeshRenderer = 1
+        }
+        public enum MixedLightingMode
+        {
+            IndirectOnly = 0,
+            Subtractive = 1,
+            Shadowmask = 2,
+        };
+        public enum LightmapBakeMode
+        {
+            NonDirectional = 0,
+            CombinedDirectional = 1
+        };
+        [Flags]
+        public enum ProbeRequestOutputType : UInt32
+        {
+            RadianceDirect = 1 << 0,
+            RadianceIndirect = 1 << 1,
+            Validity = 1 << 2,
+            MixedLightOcclusion = 1 << 3,
+            LightProbeOcclusion = 1 << 4,
+            EnvironmentOcclusion = 1 << 5,
+            Depth = 1 << 6,
+            All = 0xFFFFFFFF
+        };
+        public struct ProbeRequest
+        {
+            public ProbeRequestOutputType outputTypeMask;
+            public UInt64 positionOffset;
+            public UInt64 positionLength;
+            public float pushoff;
+            public string outputFolderPath;
+        };
+        [Flags]
+        public enum LightmapRequestOutputType : UInt32
+        {
+            IrradianceIndirect = 1 << 0,
+            IrradianceDirect = 1 << 1,
+            IrradianceEnvironment = 1 << 2,
+            Occupancy = 1 << 3,
+            Validity = 1 << 4,
+            DirectionalityIndirect = 1 << 5,
+            DirectionalityDirect = 1 << 6,
+            AmbientOcclusion = 1 << 7,
+            Shadowmask = 1 << 8,
+            Normal = 1 << 9,
+            ChartIndex = 1 << 10,
+            OverlapPixelIndex = 1 << 11,
+            All = 0xFFFFFFFF
+        };
+        public enum TilingMode
+        {   // Assuming a 4k lightmap (16M texels), the tiling will yield the following chunk sizes:
+            None = 0,                 // 4k * 4k =    16M texels
+            Quarter = 1,              // 2k * 2k =     4M texels
+            Sixteenth = 2,            // 1k * 1k =     1M texels
+            Sixtyfourth = 3,          // 512 * 512 = 262k texels
+            TwoHundredFiftySixth = 4, // 256 * 256 =  65k texels
+            Max = TwoHundredFiftySixth,
+            Error = 5                 // Error. We don't want to go lower (GPU occupancy will start to be a problem for smaller atlas sizes).
+        };
+        public struct LightmapRequest
+        {
+            public LightmapRequestOutputType outputTypeMask;
+            public UInt32 lightmapOffset;
+            public UInt32 lightmapCount;
+            public TilingMode tilingMode;
+            public string outputFolderPath;
+        };
+        public struct Resolution
+        {
+            public Resolution(UInt32 widthIn, UInt32 heightIn)
+            {
+                width = widthIn;
+                height = heightIn;
+            }
+            public UInt32 width;
+            public UInt32 height;
+        }
+
+        public struct TextureData
+        {
+            public TextureData(Resolution resolutionIn)
+            {
+                resolution = resolutionIn;
+                data = new Vector4[resolution.width * resolution.height];
+            }
+            public Resolution resolution;
+            public Vector4[] data;
+        }
+
+        public struct CookieData
+        {
+            public CookieData(Resolution resolutionIn, UInt32 pixelStrideIn, UInt32 slicesIn, bool repeatIn)
+            {
+                resolution = resolutionIn;
+                pixelStride = pixelStrideIn;
+                slices = slicesIn;
+                repeat = repeatIn;
+                data = new byte[resolution.width * resolution.height * slices* pixelStride];
+            }
+            public Resolution resolution;
+            public UInt32 pixelStride;
+            public UInt32 slices;
+            public bool repeat;
+            public byte[] data;
+        }
+
+        public struct Instance
+        {
+            public MeshType meshType;
+            public int meshIndex; // index into BakeInput::m_MeshData, -1 for Terrain
+            public int terrainIndex; // index into BakeInput::m_TerrainData, -1 for MeshRenderer
+            public Matrix4x4 transform;
+            public bool castShadows;
+            public bool receiveShadows;
+            public bool oddNegativeScale;
+            public int lodGroup;
+            public byte lodMask;
+            public int[] submeshMaterialIndices;
+        }
+
+        public struct Terrain
+        {
+            public UInt32 heightMapIndex; // index into BakeInput::m_HeightmapData
+            public int terrainHoleIndex; // index into BakeInput::m_TerrainHoleData -1 means no hole data
+            public float outputResolution;
+            public Vector3 heightmapScale;
+            public Vector4 uvBounds;
+        }
+
+        public struct Material
+        {
+            public bool doubleSidedGI;
+            public TransmissionChannels transmissionChannels;
+            public TransmissionType transmissionType;
+        }
+
+        public enum LightType : byte
+        {
+            Directional = 0,
+            Point = 1,
+            Spot = 2,
+            Rectangle = 3,
+            Disc = 4,
+            SpotPyramidShape = 5,
+            SpotBoxShape = 6
+        };
+
+        public enum FalloffType : byte
+        {
+            InverseSquared = 0,
+            InverseSquaredNoRangeAttenuation = 1,
+            Linear = 2,
+            Legacy = 3
+        };
+
+        public enum AngularFalloffType : byte
+        {
+            LUT = 0,
+            AnalyticAndInnerAngle = 1
+        };
+
+        public enum LightMode : byte
+        {
+            Realtime = 0,
+            Mixed = 1,
+            Baked = 2
+        };
+
+        public struct Light
+        {
+            public Vector3 color;
+            public Vector3 indirectColor;
+            public Quaternion orientation;
+            public Vector3 position;
+            public float range;
+            public Int32 cookieTextureIndex;
+            public float cookieScale;
+            public float coneAngle;
+            public float innerConeAngle;
+            public float shape0;
+            public float shape1;
+            public LightType type;
+            public LightMode mode;
+            public FalloffType falloff;
+            public AngularFalloffType angularFalloff;
+            public bool castsShadows;
+            public Int32 shadowMaskChannel;
+        }
+
+        public struct SampleCount
+        {
+            public UInt32 directSampleCount;
+            public UInt32 indirectSampleCount;
+            public UInt32 environmentSampleCount;
+        };
+
+        public struct LightingSettings
+        {
+            public SampleCount lightmapSampleCounts;
+            public SampleCount probeSampleCounts;
+            public UInt32 minBounces;
+            public UInt32 maxBounces;
+            public LightmapBakeMode lightmapBakeMode;
+            public MixedLightingMode mixedLightingMode;
+            public bool aoEnabled;
+            public float aoDistance;
+        };
+
+        [StructLayout(LayoutKind.Sequential)]
+        public class BakeInput : IDisposable
+        {
+            internal IntPtr m_Ptr;
+            internal bool m_OwnsPtr;
+
+            public BakeInput()
+            {
+                m_Ptr = Internal_Create();
+                m_OwnsPtr = true;
+            }
+            public BakeInput(IntPtr ptr)
+            {
+                m_Ptr = ptr;
+                m_OwnsPtr = false;
+            }
+            ~BakeInput()
+            {
+                Destroy();
+            }
+
+            public void Dispose()
+            {
+                Destroy();
+                GC.SuppressFinalize(this);
+            }
+
+            void Destroy()
+            {
+                if (m_OwnsPtr && m_Ptr != IntPtr.Zero)
+                {
+                    Internal_Destroy(m_Ptr);
+                    m_Ptr = IntPtr.Zero;
+                }
+            }
+
+            extern public UInt64 GetByteSize();
+
+            public Texture2D GetAlbedoTexture(UInt32 index)
+            {
+                if (index >= albedoTextureCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (albedoTextureCount - 1) + ", but was {0}", index));
+                TextureData textureData = GetAlbedoTextureData(index);
+                var tex = new Texture2D((int)textureData.resolution.width, (int)textureData.resolution.height, TextureFormat.RGBAFloat, false);
+                tex.SetPixelData(textureData.data, 0);
+                tex.filterMode = FilterMode.Point;
+                tex.Apply();
+                return tex;
+            }
+
+            public Texture2D GetEmissiveTexture(UInt32 index)
+            {
+                if (index >= emissiveTextureCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (emissiveTextureCount - 1) + ", but was {0}", index));
+                TextureData textureData = GetEmissiveTextureData(index);
+                var tex = new Texture2D((int)textureData.resolution.width, (int)textureData.resolution.height, TextureFormat.RGBAFloat, false);
+                tex.SetPixelData(textureData.data, 0);
+                tex.filterMode = FilterMode.Point;
+                tex.Apply();
+                return tex;
+            }
+
+            static extern IntPtr Internal_Create();
+            [NativeMethod(IsThreadSafe = true)]
+            static extern void Internal_Destroy(IntPtr ptr);
+
+            extern LightingSettings Internal_GetLightingSettings();
+            public LightingSettings GetLightingSettings()
+            {
+                return Internal_GetLightingSettings();
+            }
+            extern void Internal_SetLightingSettings(LightingSettings lightingSettings);
+            public void SetLightingSettings(LightingSettings lightingSettings)
+            {
+                Internal_SetLightingSettings(lightingSettings);
+            }
+
+            extern UInt32 Internal_LightmapWidth(UInt32 index);
+            extern UInt32 Internal_LightmapHeight(UInt32 index);
+            extern UInt32 Internal_InstanceCount(UInt32 lightmapIndex);
+
+            extern public UInt32 instanceCount { get; }
+            extern Instance Internal_Instance(UInt32 index);
+            public Instance instance(UInt32 index)
+            {
+                if (index >= instanceCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (instanceCount - 1) + ", but was {0}", index));
+                Instance instance = Internal_Instance(index);
+                return instance;
+            }
+
+            extern public UInt32 terrainCount { get; }
+            extern Terrain Internal_GetTerrain(UInt32 index);
+            public Terrain GetTerrain(UInt32 index)
+            {
+                if (index >= terrainCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (terrainCount - 1) + ", but was {0}", index));
+                Terrain terrain = Internal_GetTerrain(index);
+                return terrain;
+            }
+
+            public UInt32 lightmapInstanceCount(UInt32 index)
+            {
+                if (index >= lightmapCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (lightmapCount - 1) + ", but was {0}", index));
+                return Internal_InstanceCount(index);
+            }
+
+            extern public UInt32 meshCount { get; }
+            extern public UInt32 heightmapCount { get; }
+            extern public UInt32 holemapCount { get; }
+            extern public UInt32 materialCount { get; }
+            extern Material Internal_GetMaterial(UInt32 index);
+            extern void Internal_SetMaterial(UInt32 index, Material material);
+            public Material GetMaterial(UInt32 index)
+            {
+                if (index >= materialCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (materialCount - 1) + ", but was {0}", index));
+                Material material = Internal_GetMaterial(index);
+                return material;
+            }
+            public void SetMaterial(UInt32 index, Material material)
+            {
+                if (index >= materialCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (materialCount - 1) + ", but was {0}", index));
+                Internal_SetMaterial(index, material);
+            }
+            public int GetMaterialIndex(UInt32 instanceIndex, UInt32 submeshIndex)
+            {
+                if (instanceIndex >= instanceCount)
+                    throw new ArgumentException(string.Format("instanceIndex must be between 0 and " + (instanceCount - 1) + ", but was {0}", instanceIndex));
+                Instance theInstance = instance(instanceIndex);
+                if (theInstance.submeshMaterialIndices.Length == 0)
+                    throw new ArgumentException(string.Format("instance {0} has not materials", instanceIndex));
+                if (submeshIndex >= theInstance.submeshMaterialIndices.Length)
+                    throw new ArgumentException(string.Format("submeshIndex must be between 0 and " + (theInstance.submeshMaterialIndices.Length - 1) + ", but was {0}", submeshIndex));
+                return theInstance.submeshMaterialIndices[submeshIndex];
+            }
+            extern UInt32 Internal_GetLightCount();
+            public UInt32 GetLightCount()
+            {
+                return Internal_GetLightCount();
+            }
+            extern Light Internal_GetLight(UInt32 index);
+            extern void Internal_SetLight(UInt32 index, Light light);
+            public Light GetLight(UInt32 index)
+            {
+                if (index >= GetLightCount())
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (GetLightCount() - 1) + ", but was {0}", index));
+                return Internal_GetLight(index);
+            }
+            public void SetLight(UInt32 index, Light light)
+            {
+                if (index >= GetLightCount())
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (GetLightCount() - 1) + ", but was {0}", index));
+                Internal_SetLight(index, light);
+            }
+
+            extern Int32 Internal_instanceAlbedoEmissiveIndex(UInt32 instanceIndex);
+            extern Int32 Internal_instanceTransmissiveIndex(UInt32 instanceIndex, UInt32 submeshIndex);
+            public Int32 instanceToAlbedoIndex(UInt32 instanceIndex)
+            {
+                if (instanceIndex >= instanceCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (instanceCount - 1) + ", but was {0}", instanceIndex));
+                return Internal_instanceAlbedoEmissiveIndex(instanceIndex);
+            }
+            public Int32 instanceToEmissiveIndex(UInt32 instanceIndex)
+            {
+                if (instanceIndex >= instanceCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (instanceCount - 1) + ", but was {0}", instanceIndex));
+                return Internal_instanceAlbedoEmissiveIndex(instanceIndex);
+            }
+            public Int32 instanceToTransmissiveIndex(UInt32 instanceIndex, UInt32 submeshIndex)
+            {
+                if (instanceIndex >= instanceCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (instanceCount - 1) + ", but was {0}", instanceIndex));
+                Instance inst = instance(instanceIndex);
+                int submeshCount = inst.submeshMaterialIndices.Length;
+                if (submeshIndex >= submeshCount)
+                    throw new ArgumentException(string.Format("submeshIndex must be between 0 and " + (submeshCount - 1) + ", but was {0}", submeshIndex));
+                int materialIndex = inst.submeshMaterialIndices[submeshIndex];
+                if (materialIndex == -1)
+                    throw new ArgumentException(string.Format("material for submesh {0} did not exist.", submeshIndex));
+
+                return Internal_instanceTransmissiveIndex(instanceIndex, submeshIndex);
+            }
+
+            extern public UInt32 albedoTextureCount { get; }
+            extern TextureData Internal_GetAlbedoTextureData(UInt32 index);
+            extern void Internal_SetAlbedoTextureData(UInt32 index, TextureData textureData);
+
+            public TextureData GetAlbedoTextureData(UInt32 index)
+            {
+                if (index >= albedoTextureCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (albedoTextureCount - 1) + ", but was {0}", index));
+                return Internal_GetAlbedoTextureData(index);
+            }
+            public void SetAlbedoTextureData(UInt32 index, TextureData textureData)
+            {
+                if (index >= albedoTextureCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (albedoTextureCount - 1) + ", but was {0}", index));
+                Internal_SetAlbedoTextureData(index, textureData);
+            }
+
+            extern public UInt32 emissiveTextureCount { get; }
+            extern public UInt32 transmissiveTextureCount { get; }
+            extern TextureData Internal_GetEmissiveTextureData(UInt32 index);
+            extern void Internal_SetEmissiveTextureData(UInt32 index, TextureData textureData);
+            public TextureData GetEmissiveTextureData(UInt32 index)
+            {
+                if (index >= emissiveTextureCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (emissiveTextureCount - 1) + ", but was {0}", index));
+                return Internal_GetEmissiveTextureData(index);
+            }
+            public void SetEmissiveTextureData(UInt32 index, TextureData textureData)
+            {
+                if (index >= emissiveTextureCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (emissiveTextureCount - 1) + ", but was {0}", index));
+                Internal_SetEmissiveTextureData(index, textureData);
+            }
+
+            extern TextureData Internal_GetTransmissiveTextureData(UInt32 index);
+            extern void Internal_SetTransmissiveTextureData(UInt32 index, TextureData textureData);
+            public TextureData GetTransmissiveTextureData(UInt32 index)
+            {
+                if (index >= transmissiveTextureCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (transmissiveTextureCount - 1) + ", but was {0}", index));
+                return Internal_GetTransmissiveTextureData(index);
+            }
+            public void SetTransmissiveTextureData(UInt32 index, TextureData textureData)
+            {
+                if (index >= emissiveTextureCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (transmissiveTextureCount - 1) + ", but was {0}", index));
+                Internal_SetTransmissiveTextureData(index, textureData);
+            }
+
+            extern public UInt32 GetCookieCount();
+            extern CookieData Internal_GetCookieData(UInt32 index);
+            extern void Internal_SetCookieData(UInt32 index, CookieData cookieData);
+            public CookieData GetCookieData(UInt32 index)
+            {
+                if (index >= GetCookieCount())
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (GetCookieCount() - 1) + ", but was {0}", index));
+                return Internal_GetCookieData(index);
+            }
+            public void SetCookieData(UInt32 index, CookieData cookieData)
+            {
+                if (index >= GetCookieCount())
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (GetCookieCount() - 1) + ", but was {0}", index));
+                Internal_SetCookieData(index, cookieData);
+            }
+
+            extern public UInt32 lightmapCount { get; }
+            public Resolution lightmapResolution(UInt32 index)
+            {
+                if (index >= lightmapCount)
+                    throw new ArgumentException(string.Format("index must be between 0 and " + (lightmapCount - 1) + ", but was {0}", index));
+                Resolution resolution;
+                resolution.width = Internal_LightmapWidth(index);
+                resolution.height = Internal_LightmapHeight(index);
+                return resolution;
+            }
+            extern public UInt32 lightProbeCount { get; }
+
+            extern public void SetLightmapResolution(Resolution resolution);
+            extern public void SetEnvironment(Vector4 color);
+
+            public extern ProbeRequest[] GetProbeRequests();
+            public extern void SetLightProbeRequests(ProbeRequest[] requests);
+            public extern LightmapRequest[] GetLightmapRequests();
+            public extern void SetLightmapRequests(LightmapRequest[] requests);
+
+            public void SetProbePositions(Vector3[] positions)
+            {
+                SetProbePositions(positions.AsSpan());
+            }
+            public extern void SetProbePositions(ReadOnlySpan<Vector3> positions);
+
+            public extern Vector3[] GetProbePositions();
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public class DeviceSettings : IDisposable
+        {
+            static extern IntPtr Internal_Create();
+            [NativeMethod(IsThreadSafe = true)]
+
+            public extern bool Initialize(Backend backend);
+            static extern void Internal_Destroy(IntPtr ptr);
+
+            internal IntPtr m_Ptr;
+            internal bool m_OwnsPtr;
+
+            public DeviceSettings()
+            {
+                m_Ptr = Internal_Create();
+                m_OwnsPtr = true;
+            }
+            public DeviceSettings(IntPtr ptr)
+            {
+                m_Ptr = ptr;
+                m_OwnsPtr = false;
+            }
+            ~DeviceSettings()
+            {
+                Destroy();
+            }
+
+            public void Dispose()
+            {
+                Destroy();
+                GC.SuppressFinalize(this);
+            }
+
+            void Destroy()
+            {
+                if (m_OwnsPtr && m_Ptr != IntPtr.Zero)
+                {
+                    Internal_Destroy(m_Ptr);
+                    m_Ptr = IntPtr.Zero;
+                }
+            }
+        }
+        extern static public Result Bake(BakeInput input, DeviceSettings deviceSettings);
+    }
+}
diff --git a/Editor/Mono/GI/LightmapParameters.bindings.cs b/Editor/Mono/GI/LightmapParameters.bindings.cs
index 70638fec6f..5a2abfe8db 100644
--- a/Editor/Mono/GI/LightmapParameters.bindings.cs
+++ b/Editor/Mono/GI/LightmapParameters.bindings.cs
@@ -61,5 +61,13 @@ public float edgeStitching
             get { return stitchEdges ? 1.0f : 0.0f; }
             set { stitchEdges = (value != 0.0f); }
         }
+
+        [NativeHeader("Runtime/Graphics/LightmapEnums.h")]
+        public enum AntiAliasingSamples
+        {
+            SSAA1 = 1,
+            SSAA4 = 2,
+            SSAA16 = 4,
+        }
     }
 }
diff --git a/Editor/Mono/GI/Lightmapping.bindings.cs b/Editor/Mono/GI/Lightmapping.bindings.cs
index 2cd59f54c3..55621c0296 100644
--- a/Editor/Mono/GI/Lightmapping.bindings.cs
+++ b/Editor/Mono/GI/Lightmapping.bindings.cs
@@ -12,6 +12,7 @@
 using Scene = UnityEngine.SceneManagement.Scene;
 using NativeArrayUnsafeUtility = Unity.Collections.LowLevel.Unsafe.NativeArrayUnsafeUtility;
 using Unity.Collections;
+using UnityEditor.LightBaking;
 using UnityEngine.Rendering;
 
 namespace UnityEditor
@@ -68,6 +69,22 @@ internal struct LightProbesConvergence
         [NativeName("m_ConvergedProbeSetCount")]    public int  convergedProbeSetCount;
     }
 
+    [UsedByNativeCode]
+    [NativeHeader("Editor/Src/GI/Progressive/PVRData.h")]
+    internal struct LightmapSize
+    {
+        [NativeName("m_Width")]  public int width;
+        [NativeName("m_Height")] public int height;
+    }
+
+    [UsedByNativeCode]
+    [NativeHeader("Editor/Src/GI/Progressive/PVRData.h")]
+    internal struct RunningBakeInfo
+    {
+        [NativeName("m_LightmapSizes")]  public LightmapSize[] lightmapSizes;
+        [NativeName("m_ProbePositions")] public UInt64 probePositions;
+    }
+
     [UsedByNativeCode]
     [NativeHeader("Editor/Src/GI/Progressive/PVRData.h")]
     internal struct LightmapMemory
@@ -217,40 +234,26 @@ internal static FilterMode filterMode
             set { GetOrCreateLightingsSettings().lightmapFilterMode = value; }
         }
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        internal static extern bool isProgressiveLightmapperDone {[NativeName("IsDone")] get; }
-
-        // Returns true when the bake job is baking, false otherwise.
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        internal static extern bool isBaking { [NativeName("IsBaking")] get; }
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
+        internal static extern bool isProgressiveLightmapperDone {[NativeName("IsBakedGIDone")] get; }
 
-        // Returns true when the bake job is preparing, false otherwise.
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        internal static extern bool isPreparing { [NativeName("IsPreparing")] get; }
-
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern ulong occupiedTexelCount { get; }
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern ulong GetVisibleTexelCount(int lightmapIndex);
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern int atlasCount { [NativeName("GetAtlasCount")] get; }
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern LightmapConvergence GetLightmapConvergence(int lightmapIndex);
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        internal static extern LightProbesConvergence GetLightProbesConvergence();
-
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        internal static extern LightmapMemory GetLightmapMemory(int lightmapIndex);
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
+        internal static extern RunningBakeInfo GetRunningBakeInfo();
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        internal static extern bool GetGBufferHash(int lightmapIndex, out Hash128 gbufferHash);
-
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        internal static extern float GetGBufferMemory(ref Hash128 gbufferHash);
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
+        internal static extern LightProbesConvergence GetLightProbesConvergence();
 
         [FreeFunction]
         internal static extern MemLabels GetLightProbeMemLabels();
@@ -261,9 +264,6 @@ internal static FilterMode filterMode
         [FreeFunction]
         internal static extern MemLabels GetMaterialTexturesMemLabels();
 
-        [FreeFunction]
-        internal static extern MemLabels GetNotShownMemLabels();
-
         [StaticAccessor("PVRMemoryLabelTracker::Get()", StaticAccessorType.Arrow)]
         internal static extern void ResetExplicitlyShownMemLabels();
 
@@ -271,36 +271,30 @@ internal static FilterMode filterMode
         [NativeName("GetGeometryMemory")]
         internal static extern GeoMemLabels GetGeometryMemory();
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern float ComputeTotalCPUMemoryUsageInBytes();
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern float ComputeTotalGPUMemoryUsageInBytes();
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern void LogGPUMemoryStatistics();
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        internal static extern float GetLightmapBakeTimeRaw();
-
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern float GetLightmapBakeTimeTotal();
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         [NativeName("GetLightmapBakePerformance")]
         internal static extern float GetLightmapBakePerformanceTotal();
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        internal static extern float GetLightmapBakePerformance(int lightmapIndex);
-
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern string GetLightmapBakeGPUDeviceName();
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern int GetLightmapBakeGPUDeviceIndex();
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        extern internal static DeviceAndPlatform[] GetLightmappingGpuDevices();
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
+        internal static extern DeviceAndPlatform[] GetLightmappingGpuDevices();
 
         // Exports the current state of the scene to the dynamic GI workflow.
         [FreeFunction]
@@ -320,6 +314,7 @@ internal static FilterMode filterMode
 
         // Stops the current bake at the state it has reached so far.
         [FreeFunction]
+        [System.Obsolete("ForceStop is no longer available, use Cancel instead to stop a bake.", false)]
         public static extern void ForceStop();
 
         // Returns true when the bake job is running, false otherwise (RO).
@@ -411,6 +406,20 @@ internal static void Internal_CallOnWroteLightingDataAsset()
                 wroteLightingDataAsset();
         }
 
+        // This event is fired when BakeInput has been populated, but before passing it to Bake().
+        // Do not store and access BakeInput beyond the call-back.
+        internal static event Action<LightBaker.BakeInput, InputExtraction.SourceMap> createdBakeInput;
+
+        internal static void Internal_CallOnCreatedBakeInput(IntPtr p_BakeInput, IntPtr p_SourceMap)
+        {
+            if (createdBakeInput != null)
+            {
+                using var bakeInput = new LightBaker.BakeInput(p_BakeInput);
+                using var sourceMap = new InputExtraction.SourceMap(p_SourceMap);
+                createdBakeInput(bakeInput, sourceMap);
+            }
+        }
+
         [System.Obsolete("OnCompletedFunction.completed is obsolete, please use event bakeCompleted instead. ", false)]
         public static OnCompletedFunction completed;
 
@@ -458,17 +467,6 @@ public static void Tetrahedralize(Vector3[] positions, out int[] outIndices, out
         [FreeFunction]
         private static extern TetrahedralizationData TetrahedralizeInternal(Vector3[] positions);
 
-        internal static void GetEnvironmentSamples(out Vector4[] outDirections, out Vector4[] outIntensities)
-        {
-            EnvironmentSamplesData data = GetEnvironmentSamplesInternal();
-            outDirections = data.directions;
-            outIntensities = data.intensities;
-        }
-
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        [NativeName("GetEnvironmentSamples")]
-        private static extern EnvironmentSamplesData GetEnvironmentSamplesInternal();
-
         [FreeFunction]
         public static extern bool BakeReflectionProbe(ReflectionProbe probe, string path);
 
@@ -680,18 +678,6 @@ public static void BakeMultipleScenes(string[] paths)
         [NativeHeader("Editor/Src/GI/EditorHelpers.h")]
         extern static internal bool GetInstanceHash([NotNull("NullExceptionObject")] Renderer renderer, out Hash128 instanceHash);
 
-        [FreeFunction]
-        [NativeHeader("Editor/Src/GI/EditorHelpers.h")]
-        extern static internal bool GetPVRInstanceHash(int instanceID, out Hash128 instanceHash);
-
-        [FreeFunction]
-        [NativeHeader("Editor/Src/GI/EditorHelpers.h")]
-        extern static internal bool GetPVRAtlasHash(int instanceID, out Hash128 atlasHash);
-
-        [FreeFunction]
-        [NativeHeader("Editor/Src/GI/EditorHelpers.h")]
-        extern static internal bool GetPVRAtlasInstanceOffset(int instanceID, out int atlasInstanceOffset);
-
         [FreeFunction]
         [NativeHeader("Editor/Src/GI/EditorHelpers.h")]
         extern static internal bool GetGeometryHash([NotNull("NullExceptionObject")] Renderer renderer, out Hash128 geometryHash);
@@ -706,39 +692,28 @@ namespace UnityEditor.Experimental
 {
     public sealed partial class Lightmapping
     {
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         public static extern bool probesIgnoreDirectEnvironment { get; set; }
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        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("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
+        public static extern void SetCustomBakeInputs(ReadOnlySpan<Vector4> inputData, int 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)
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
+        private static extern unsafe bool GetCustomBakeResultsCopy(Span<Vector4> results);
+        public static bool GetCustomBakeResults(Span<Vector4> results)
         {
-            fixed (Vector4* resultsPtr = results) {
-                return GetCustomBakeResultsCopy(resultsPtr, results.Length);
-            }
+            return GetCustomBakeResultsCopy(results);
         }
         public static bool GetCustomBakeResults([Out] Vector4[] results)
         {
             return GetCustomBakeResults(results.AsSpan());
         }
 
-        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         public static extern ReadOnlySpan<Vector4> GetCustomBakeResultsNoCopy();
 
         [Obsolete("UnityEditor.Experimental.Lightmapping.extractAmbientOcclusion is obsolete, use LightingSettings.extractAO instead. ", false)]
@@ -833,9 +808,6 @@ public unsafe static bool GetAdditionalBakedProbes(int id, NativeArray<Spherical
             return GetAdditionalBakedProbes(id, shPtr, validityPtr, octahedralDepthPtr, outBakedProbeSH.Length);
         }
 
-        [FreeFunction]
-        private static extern unsafe void SetAdditionalBakedProbes(int id, [Span("positionsLength", isReadOnly:true)]Vector3 * positions, int positionsLength, bool dering);
-
         public static void SetAdditionalBakedProbes(int id, Vector3[] positions)
         {
             SetAdditionalBakedProbes(id, positions.AsSpan(), true);
@@ -844,13 +816,8 @@ public static void SetAdditionalBakedProbes(int id, ReadOnlySpan<Vector3> positi
         {
             SetAdditionalBakedProbes(id, positions, true);
         }
-        public static unsafe void SetAdditionalBakedProbes(int id, ReadOnlySpan<Vector3> positions, bool dering)
-        {
-            fixed(Vector3* positionsPtr = positions)
-            {
-                SetAdditionalBakedProbes(id, positionsPtr, positions.Length, dering);
-            }
-        }
+        [FreeFunction]
+        public static extern void SetAdditionalBakedProbes(int id, ReadOnlySpan<Vector3> positions, bool dering);
 
         [FreeFunction]
         public static extern void SetLightDirty(Light light);
diff --git a/Editor/Mono/GUI/AppStatusBar.cs b/Editor/Mono/GUI/AppStatusBar.cs
index 2e425affc3..e2cee3898e 100644
--- a/Editor/Mono/GUI/AppStatusBar.cs
+++ b/Editor/Mono/GUI/AppStatusBar.cs
@@ -61,11 +61,15 @@ static Styles()
         const double k_CheckUnresponsiveFrequencyInSecond = 0.5;
         const float k_ShowProgressThreshold = 0.5f;
         private double m_LastUpdate;
+        private bool m_IsQuitting;
 
         private bool showBakeMode
         {
             get
             {
+                if (m_IsQuitting)
+                    return false;
+
                 var settings = Lightmapping.GetLightingSettingsOrDefaultsFallback();
                 return settings.bakedGI || settings.realtimeGI;
             }
@@ -93,6 +97,8 @@ protected override void OnEnable()
             Progress.added += RefreshProgressBar;
             Progress.removed += RefreshProgressBar;
             Progress.updated += RefreshProgressBar;
+
+            EditorApplication.editorApplicationQuit += OnQuit;
         }
 
         protected override void OnDisable()
@@ -100,6 +106,7 @@ protected override void OnDisable()
             Progress.added -= RefreshProgressBar;
             Progress.removed -= RefreshProgressBar;
             Progress.updated -= RefreshProgressBar;
+            EditorApplication.editorApplicationQuit -= OnQuit;
             EditorApplication.delayCall -= DelayRepaint;
             base.OnDisable();
         }
@@ -185,7 +192,6 @@ protected override void OldOnGUI()
             }
             GUILayout.EndHorizontal();
 
-            DoWindowDecorationEnd();
             EditorGUI.ShowRepaints();
         }
 
@@ -475,6 +481,8 @@ private GUIContent GetBakeModeIcon(bool? bakeMode)
 
             return Lightmapping.GetLightingSettingsOrDefaultsFallback().autoGenerate;
         }
+        private void OnQuit()
+            => m_IsQuitting = true;
 
         [RequiredByNativeCode]
         public static void StatusChanged()
diff --git a/Editor/Mono/GUI/CacheServerWindow.cs b/Editor/Mono/GUI/CacheServerWindow.cs
index ccde9e28b2..c9f0063a30 100644
--- a/Editor/Mono/GUI/CacheServerWindow.cs
+++ b/Editor/Mono/GUI/CacheServerWindow.cs
@@ -15,9 +15,16 @@ internal class CacheServerWindow : PopupWindowContent
         private readonly GUIContent m_StatusMessageConnected;
         private readonly GUIContent m_StatusMessageError;
         private readonly GUIContent m_OpenProjectSettings;
-
+        private readonly GUIContent m_UploadArtifacts;
+        private readonly GUIContent m_UploadShaderCache;
+        private readonly GUIContent m_UploadAllRevisions;
         private readonly GUIContent m_RefreshIcon;
 
+        readonly string m_UploadArtifactsDefaultToolip = "Queues the upload of the current revision of all Artifacts present in the project. Only revisions not found on the Accelerator are uploaded.";
+        readonly string m_UploadShaderCacheDefaultToolip = "Queues the upload of all Shaders, and their variants, from the Unity Shader Cache. Only shaders and/or variants not found on the Accelerator are uploaded.";
+        readonly string m_UploadAllRevisionsDefaultToolip = "Queues upload of all revisions of every Artifact in the project. Only revisions not found on the Accelerator are uploaded.";
+        readonly string m_DisabledSettingPrefix = "Uploading is currently disabled in Project Settings.";
+
         private readonly GUIStyle m_WindowStyle;
 
         public CacheServerWindow()
@@ -26,7 +33,9 @@ public CacheServerWindow()
             m_StatusMessageConnected = EditorGUIUtility.TrTextContent("Connected");
             m_StatusMessageError = EditorGUIUtility.TrTextContent("Attempting to reconnect");
             m_OpenProjectSettings = EditorGUIUtility.TrTextContent("Open Project Settings...");
-
+            m_UploadArtifacts = EditorGUIUtility.TrTextContent("Upload Artifacts", m_UploadArtifactsDefaultToolip);
+            m_UploadShaderCache = EditorGUIUtility.TrTextContent("Upload Shader Cache", m_UploadShaderCacheDefaultToolip);
+            m_UploadAllRevisions = EditorGUIUtility.TrTextContent("Upload All Revisions", m_UploadAllRevisionsDefaultToolip);
             m_RefreshIcon = EditorGUIUtility.TrIconContent("Refresh", "Refresh connection");
 
             m_WindowStyle = new GUIStyle { padding = new RectOffset(6, 6, 6, 6) };
@@ -36,9 +45,14 @@ public override void OnGUI(Rect rect)
         {
             var exit = false;
 
+            bool isCacheConnected = AssetDatabase.IsConnectedToCacheServer();
+
+            bool isCacheEnabled = AssetDatabase.IsCacheServerEnabled();
+            bool isUploadEnabled = AssetDatabase.GetCacheServerEnableUpload();
+
             GUILayout.BeginArea(rect, m_WindowStyle);
             // Cache server connection url
-            if (AssetDatabase.IsCacheServerEnabled())
+            if (isCacheEnabled)
             {
                 var iconPosition = new Rect();
                 iconPosition.x = rect.width - (m_RefreshIcon.image.width / (Screen.dpi > 160 ? 2 : 1)) - m_WindowStyle.padding.right;
@@ -55,7 +69,7 @@ public override void OnGUI(Rect rect)
                 var style = new GUIStyle();
                 style.fontStyle = FontStyle.Bold;
                 style.normal.textColor = EditorStyles.boldLabel.normal.textColor;
-                if (!AssetDatabase.IsConnectedToCacheServer())
+                if (!isCacheConnected)
                 {
                     style.normal.textColor = new Color(0.97f, 0.32f, 0.31f);
                 }
@@ -78,6 +92,40 @@ public override void OnGUI(Rect rect)
             EditorGUILayout.LabelField(ConnectionStatusText(), statusTextStyle);
             GUILayout.EndHorizontal();
 
+            if(isCacheConnected && isCacheEnabled)
+            {
+                // Divider line
+                var actionButtonLine = EditorGUILayout.GetControlRect(GUILayout.Height(1));
+                actionButtonLine.x -= 6;
+                actionButtonLine.width += 12;
+                EditorGUI.DrawRect(actionButtonLine, new Color(0.387f, 0.387f, 0.387f));
+
+                GUILayout.BeginHorizontal();
+                using (new EditorGUI.DisabledScope(!isUploadEnabled || !isCacheEnabled))
+                {
+                    // change tooltip based on Project Settings
+                    m_UploadArtifacts.tooltip = isUploadEnabled ? m_UploadArtifactsDefaultToolip : $"{m_DisabledSettingPrefix} {m_UploadArtifactsDefaultToolip}";
+                    m_UploadShaderCache.tooltip = isUploadEnabled ? m_UploadShaderCacheDefaultToolip : $"{m_DisabledSettingPrefix} {m_UploadShaderCacheDefaultToolip}";
+                    m_UploadAllRevisions.tooltip = isUploadEnabled ? m_UploadAllRevisionsDefaultToolip : $"{m_DisabledSettingPrefix} {m_UploadAllRevisionsDefaultToolip}";
+
+                    if (GUILayout.Button(m_UploadArtifacts, GUILayout.Width(110)))
+                    {
+                        CacheServer.UploadArtifacts();
+                    }
+
+                    if (GUILayout.Button(m_UploadShaderCache, GUILayout.Width(140)))
+                    {
+                        CacheServer.UploadShaderCache();
+                    }
+
+                    if (GUILayout.Button(m_UploadAllRevisions, GUILayout.Width(130)))
+                    {
+                        CacheServer.UploadArtifacts(uploadAllRevisions:true);
+                    }
+                }
+                GUILayout.EndHorizontal();
+            }
+
             // Divider line
             var lineRect = EditorGUILayout.GetControlRect(GUILayout.Height(1));
             lineRect.x -= 6;
@@ -136,10 +184,22 @@ private void OpenPreferences()
         public override Vector2 GetWindowSize()
         {
             int lines = AssetDatabase.IsCacheServerEnabled() ? 3 : 2;
+            bool isConnected = AssetDatabase.IsConnectedToCacheServer();
+            if (isConnected)
+                lines++;
+
             int heightOfLines = (int)Math.Ceiling(EditorGUI.kSingleLineHeight * lines);
             int heightOfWindowPadding = m_WindowStyle.padding.top + m_WindowStyle.padding.bottom;
             int dividerLine = 2;
-            return new Vector2(250, heightOfLines + heightOfWindowPadding + dividerLine);
+
+            if (isConnected)
+                dividerLine += 2;
+
+            int width = 250;
+            if (isConnected)
+                width = 390;
+
+            return new Vector2(width, heightOfLines + heightOfWindowPadding + dividerLine);
         }
     }
 }
diff --git a/Editor/Mono/GUI/ColorMutator.cs b/Editor/Mono/GUI/ColorMutator.cs
index 8ddf00633e..c335e38cd4 100644
--- a/Editor/Mono/GUI/ColorMutator.cs
+++ b/Editor/Mono/GUI/ColorMutator.cs
@@ -18,7 +18,7 @@ internal class ColorMutator
     {
         // specifies the max byte value to use when decomposing a float color into bytes with exposure
         // this is the value used by Photoshop
-        private const byte k_MaxByteForOverexposedColor = 191;
+        const byte k_MaxByteForOverexposedColor = 191;
 
         internal static void DecomposeHdrColor(Color linearColorHdr, out Color32 baseLinearColor, out float exposure)
         {
@@ -46,23 +46,33 @@ internal static void DecomposeHdrColor(Color linearColorHdr, out Color32 baseLin
             }
         }
 
-        public Color originalColor => m_OriginalColor;
         [SerializeField] private Color m_OriginalColor;
         [SerializeField] private Color m_HDRBaseColor;
+        [SerializeField] private byte[] m_Color = new byte[4];
+        [SerializeField] private float[] m_ColorHdr = new float[4];
+        [SerializeField] private float[] m_Hsv = new float[3];
+        [SerializeField] private float m_ExposureValue;
+        [SerializeField] private float m_BaseExposureValue;
+
+        public Color originalColor => m_OriginalColor;
+        public Color32 color => new(m_Color[(int)RgbaChannel.R], m_Color[(int)RgbaChannel.G], m_Color[(int)RgbaChannel.B], m_Color[(int)RgbaChannel.A]);
+        public Vector3 colorHsv => new(m_Hsv[(int)HsvChannel.H], m_Hsv[(int)HsvChannel.S], m_Hsv[(int)HsvChannel.V]);
+        public Color exposureAdjustedColor => new(m_ColorHdr[(int)RgbaChannel.R], m_ColorHdr[(int)RgbaChannel.G], m_ColorHdr[(int)RgbaChannel.B], m_ColorHdr[(int)RgbaChannel.A]);
 
-        public Color32 color
+        public float exposureValue
         {
-            get
+            get => m_ExposureValue;
+            set
             {
-                return new Color32(
-                    m_Color[(int)RgbaChannel.R],
-                    m_Color[(int)RgbaChannel.G],
-                    m_Color[(int)RgbaChannel.B],
-                    m_Color[(int)RgbaChannel.A]
-                );
+                if (Mathf.Approximately(m_ExposureValue, value))
+                    return;
+                m_ExposureValue = value;
+                var newRgbFloat = m_HDRBaseColor * Mathf.Pow(2f, m_ExposureValue - m_BaseExposureValue);
+                m_ColorHdr[(int)RgbaChannel.R] = newRgbFloat.r;
+                m_ColorHdr[(int)RgbaChannel.G] = newRgbFloat.g;
+                m_ColorHdr[(int)RgbaChannel.B] = newRgbFloat.b;
             }
         }
-        [SerializeField] private byte[] m_Color = new byte[4];
 
         public byte GetColorChannel(RgbaChannel channel)
         {
@@ -76,18 +86,14 @@ public float GetColorChannelNormalized(RgbaChannel channel)
 
         public void SetColorChannel(RgbaChannel channel, byte value)
         {
-            if (m_Color[(int)channel] == value)
+            var channelIndex = (int)channel;
+            if (m_Color[channelIndex] == value)
                 return;
-            m_Color[(int)channel] = value;
-            m_ColorHdr[(int)channel] = (value / 255f);
+            m_Color[channelIndex] = value;
+            m_ColorHdr[channelIndex] = value / 255f;
             if (channel != RgbaChannel.A)
-                m_ColorHdr[(int)channel] *= Mathf.Pow(2f, m_ExposureValue);
-            Color.RGBToHSV(
-                color,
-                out m_Hsv[(int)HsvChannel.H],
-                out m_Hsv[(int)HsvChannel.S],
-                out m_Hsv[(int)HsvChannel.V]
-            );
+                m_ColorHdr[channelIndex] *= Mathf.Pow(2f, m_ExposureValue);
+            Color.RGBToHSV(color, out m_Hsv[(int)HsvChannel.H], out m_Hsv[(int)HsvChannel.S], out m_Hsv[(int)HsvChannel.V]);
         }
 
         public void SetColorChannel(RgbaChannel channel, float normalizedValue)
@@ -95,20 +101,6 @@ public void SetColorChannel(RgbaChannel channel, float normalizedValue)
             SetColorChannel(channel, (byte)Mathf.RoundToInt(Mathf.Clamp01(normalizedValue) * 255f));
         }
 
-        public Color exposureAdjustedColor
-        {
-            get
-            {
-                return new Color(
-                    m_ColorHdr[(int)RgbaChannel.R],
-                    m_ColorHdr[(int)RgbaChannel.G],
-                    m_ColorHdr[(int)RgbaChannel.B],
-                    m_ColorHdr[(int)RgbaChannel.A]
-                );
-            }
-        }
-        [SerializeField] private float[] m_ColorHdr = new float[4];
-
         public float GetColorChannelHdr(RgbaChannel channel)
         {
             return m_ColorHdr[(int)channel];
@@ -116,38 +108,21 @@ public float GetColorChannelHdr(RgbaChannel channel)
 
         public void SetColorChannelHdr(RgbaChannel channel, float value)
         {
-            if (m_ColorHdr[(int)channel] == value)
+            if (Mathf.Approximately(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);
+            m_BaseExposureValue = m_ExposureValue;
         }
 
-        public Vector3 colorHsv
-        {
-            get
-            {
-                return new Vector3(
-                    m_Hsv[(int)HsvChannel.H],
-                    m_Hsv[(int)HsvChannel.S],
-                    m_Hsv[(int)HsvChannel.V]
-                );
-            }
-        }
-        [SerializeField] private float[] m_Hsv = new float[3];
-
-        public float GetColorChannel(HsvChannel channel)
-        {
-            return m_Hsv[(int)channel];
-        }
+        public float GetColorChannel(HsvChannel channel) => m_Hsv[(int)channel];
 
         public void SetColorChannel(HsvChannel channel, float value)
         {
             m_Hsv[(int)channel] = Mathf.Clamp01(value);
 
-            var newColor = Color.HSVToRGB(
-                m_Hsv[(int)HsvChannel.H], m_Hsv[(int)HsvChannel.S], m_Hsv[(int)HsvChannel.V]
-            );
+            var newColor = Color.HSVToRGB(m_Hsv[(int)HsvChannel.H], m_Hsv[(int)HsvChannel.S], m_Hsv[(int)HsvChannel.V]);
             m_Color[(int)RgbaChannel.R] = (byte)Mathf.CeilToInt(newColor.r * 255f);
             m_Color[(int)RgbaChannel.G] = (byte)Mathf.CeilToInt(newColor.g * 255f);
             m_Color[(int)RgbaChannel.B] = (byte)Mathf.CeilToInt(newColor.b * 255f);
@@ -159,33 +134,18 @@ public void SetColorChannel(HsvChannel channel, float value)
             m_HDRBaseColor = new Color(m_ColorHdr[0], m_ColorHdr[1], m_ColorHdr[2], m_ColorHdr[3]);
         }
 
-        public float exposureValue
-        {
-            get { return m_ExposureValue; }
-            set
-            {
-                if (m_ExposureValue == value)
-                    return;
-                m_ExposureValue = value;
-                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;
-            }
-        }
-        [SerializeField] private float m_ExposureValue;
-
         public ColorMutator(Color originalColor)
         {
             m_OriginalColor = originalColor;
-            m_HDRBaseColor = originalColor;
             Reset();
         }
 
         public void Reset()
         {
-            if (m_ColorHdr == null || m_ColorHdr.Length != 4)
+            if (m_ColorHdr is not { Length: 4 })
                 m_ColorHdr = new float[4];
+            if (m_Color is not { Length: 4 })
+                m_Color = new byte[4];
 
             m_ColorHdr[(int)RgbaChannel.R] = m_OriginalColor.r;
             m_ColorHdr[(int)RgbaChannel.G] = m_OriginalColor.g;
@@ -193,10 +153,8 @@ public void Reset()
             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];
-
             OnRgbaHdrChannelChanged(-1);
+            m_BaseExposureValue = m_ExposureValue;
         }
 
         void OnRgbaHdrChannelChanged(int channel)
@@ -205,17 +163,12 @@ void OnRgbaHdrChannelChanged(int channel)
             if (channel == (int)RgbaChannel.A)
                 return;
 
-            Color32 baseColor;
-            DecomposeHdrColor(exposureAdjustedColor, out baseColor, out m_ExposureValue);
+            DecomposeHdrColor(exposureAdjustedColor, out var baseColor, out m_ExposureValue);
+
             m_Color[(int)RgbaChannel.R] = baseColor.r;
             m_Color[(int)RgbaChannel.G] = baseColor.g;
             m_Color[(int)RgbaChannel.B] = baseColor.b;
-            Color.RGBToHSV(
-                color,
-                out m_Hsv[(int)HsvChannel.H],
-                out m_Hsv[(int)HsvChannel.S],
-                out m_Hsv[(int)HsvChannel.V]
-            );
+            Color.RGBToHSV(color, out m_Hsv[(int)HsvChannel.H], out m_Hsv[(int)HsvChannel.S], out m_Hsv[(int)HsvChannel.V]);
         }
     }
 }
diff --git a/Editor/Mono/GUI/ColorPicker.cs b/Editor/Mono/GUI/ColorPicker.cs
index 350cc124bf..006b6724a4 100644
--- a/Editor/Mono/GUI/ColorPicker.cs
+++ b/Editor/Mono/GUI/ColorPicker.cs
@@ -479,7 +479,7 @@ static class Styles
             public static readonly GUIStyle selectedExposureSwatchStroke = "ColorPickerCurrentExposureSwatchBorder";
 
             public static readonly GUIContent eyeDropper = EditorGUIUtility.TrIconContent("EyeDropper.Large", "Pick a color from the screen.");
-            public static readonly GUIContent exposureValue = EditorGUIUtility.TrTextContent("Intensity", "Number of stops to over- or under-expose the color.");
+            public static readonly GUIContent exposureValue = EditorGUIUtility.TrTextContent("Intensity", "Number of stops to over- or under-expose the color. The intensity calculates each time based on the predefined max color component of 191 (0.749) when Color Picker opens.");
             public static readonly GUIContent hexLabel = EditorGUIUtility.TrTextContent("Hexadecimal");
             public static readonly GUIContent presetsToggle = EditorGUIUtility.TrTextContent("Swatches");
 
@@ -493,11 +493,23 @@ static class Styles
             public static readonly Texture2D alphaSliderCheckerBackground =
                 EditorGUIUtility.LoadRequired("Previews/Textures/textureChecker.png") as Texture2D;
 
-            public static readonly GUIContent[] sliderModeLabels = new[]
+            public static readonly GUIContent RGB0_255Mode = EditorGUIUtility.TrTextContent("RGB 0-255");
+            public static readonly GUIContent RGB0_1Mode = EditorGUIUtility.TrTextContent("RGB 0-1.0");
+            public static readonly GUIContent RGB0_InfMode = EditorGUIUtility.TrTextContent("RGB 0-Inf");
+            public static readonly GUIContent RGBHSVMode = EditorGUIUtility.TrTextContent("HSV");
+
+            public static readonly GUIContent[] sliderLDRModeLabels = new[]
+            {
+                RGB0_255Mode,
+                RGB0_1Mode,
+                RGBHSVMode
+            };
+
+            public static readonly GUIContent[] sliderHDRModeLabels = new[]
             {
-                EditorGUIUtility.TrTextContent("RGB 0-255"),
-                EditorGUIUtility.TrTextContent("RGB 0-1.0"),
-                EditorGUIUtility.TrTextContent("HSV")
+                RGB0_255Mode,
+                RGB0_InfMode,
+                RGBHSVMode
             };
 
             public static readonly int[] sliderModeValues = new[] { 0, 1, 2 };
@@ -699,9 +711,10 @@ void DoColorSliders(float availableWidth)
             float oldFieldWidth = EditorGUIUtility.fieldWidth;
             EditorGUIUtility.labelWidth = availableWidth - Styles.sliderModeFieldWidth;
             EditorGUIUtility.fieldWidth = Styles.sliderModeFieldWidth;
-            m_SliderMode = (SliderMode)EditorGUILayout.IntPopup(
-                GUIContent.Temp(" "), (int)m_SliderMode, Styles.sliderModeLabels, Styles.sliderModeValues
-            );
+            if(m_HDR && m_Color.exposureAdjustedColor.maxColorComponent > 1f)
+                m_SliderMode = (SliderMode)EditorGUILayout.IntPopup(GUIContent.Temp(" "), (int)m_SliderMode, Styles.sliderHDRModeLabels, Styles.sliderModeValues);
+            else
+                m_SliderMode = (SliderMode)EditorGUILayout.IntPopup(GUIContent.Temp(" "), (int)m_SliderMode, Styles.sliderLDRModeLabels, Styles.sliderModeValues);
 
             GUILayout.Space(Styles.extraVerticalSpacing);
 
@@ -1236,6 +1249,9 @@ public static void Start(Action<Color> colorPickedCallback)
 
         static void Start(GUIView viewToUpdate, Action<Color> colorPickedCallback)
         {
+            if(!InternalEditorUtility.IsAllowedToReadPixelOutsideUnity(out var errorMessage))
+                Debug.LogWarning(errorMessage);
+
             instance.m_DelegateView = viewToUpdate;
             instance.m_ColorPickedCallback = colorPickedCallback;
             ContainerWindow win = CreateInstance<ContainerWindow>();
@@ -1250,6 +1266,7 @@ static void Start(GUIView viewToUpdate, Action<Color> colorPickedCallback)
             Vector2 p = GUIUtility.GUIToScreenPoint(Event.current != null ? Event.current.mousePosition : Vector2.zero);
             win.position = new Rect(p.x - kDummyWindowSize / 2, p.y - kDummyWindowSize / 2, kDummyWindowSize, kDummyWindowSize);
             instance.wantsMouseMove = true;
+            instance.Focus();
             instance.SetEyeDropperOpen(true);
             instance.StealMouseCapture();
             instance.m_IsOpened = true;
diff --git a/Editor/Mono/GUI/DockArea.cs b/Editor/Mono/GUI/DockArea.cs
index 65bea38bfc..df12f81bfd 100644
--- a/Editor/Mono/GUI/DockArea.cs
+++ b/Editor/Mono/GUI/DockArea.cs
@@ -74,6 +74,22 @@ private static class Styles
         private static DropInfo s_DropInfo = null;
         private static Dictionary<GUIContentKey, GUIContent> s_GUIContents = new Dictionary<GUIContentKey, GUIContent>();
 
+        private static bool s_IsCapabilitySet;
+        private static bool s_HasCapabilityCached;
+        private static bool s_HasCapability
+        {
+            get
+            {
+                if (s_IsCapabilitySet)
+                    return s_HasCapabilityCached;
+
+                s_IsCapabilitySet = true;
+                s_HasCapabilityCached = ModeService.HasCapability(ModeCapability.StaticTabs, false);
+                ModeService.modeChanged += (_) => s_HasCapabilityCached = ModeService.HasCapability(ModeCapability.StaticTabs, false);
+                return s_HasCapabilityCached;
+            }
+        }
+
         [SerializeField] internal List<EditorWindow> m_Panes = new List<EditorWindow>();
         [SerializeField] internal int m_Selected;
         [SerializeField] internal int m_LastSelected;
@@ -118,27 +134,13 @@ private void RemoveNullWindows()
             s_GUIContents.Clear();
         }
 
-        internal override void DoWindowDecorationStart()
-        {
-            // On windows, we want both close window and side resizes.
-            // Titlebar dragging is done at the end, so we can drag next to tabs.
-            if (window != null)
-                window.HandleWindowDecorationStart(windowPosition);
-        }
-
-        internal override void DoWindowDecorationEnd()
-        {
-            if (window != null)
-                window.HandleWindowDecorationEnd(windowPosition);
-        }
-
         protected override void OnDestroy()
         {
             // Prevents double-destroy that may be indirectly caused if Close() is called by OnLostFocus()
             m_IsBeingDestroyed = true;
 
             if (hasFocus)
-                m_OnLostFocus?.Invoke();
+                OnLostFocus();
 
             actualView = null;
 
@@ -152,7 +154,6 @@ protected override void OnDestroy()
                     continue;
 
                 UnityEngine.Object.DestroyImmediate(w, true);
-                EditorWindow.UpdateWindowMenuListing();
             }
 
             m_Panes.Clear();
@@ -248,8 +249,14 @@ public void RemoveTab(EditorWindow pane, bool killIfEmpty, bool sendEvents = tru
 
         private static void UpdateWindowTitle(EditorWindow w)
         {
-            if (w && w.m_Parent && w.m_Parent.window && w.titleContent != null)
+            if (w &&
+                w.m_Parent &&
+                w.m_Parent.window &&
+                !w.m_Parent.window.m_IsMppmCloneWindow &&
+                w.titleContent != null)
+            {
                 w.m_Parent.window.title = w.titleContent.text;
+            }
         }
 
         private static void UpdateWindowHasUnsavedChanges(EditorWindow w)
@@ -408,7 +415,7 @@ private void DrawTabs(Rect tabAreaRect)
                     tabStyle = Styles.dragTab;
 
                 var firstTabStyle = Styles.dragTabFirst;
-                if (ModeService.HasCapability(ModeCapability.StaticTabs, false))
+                if (s_HasCapability)
                 {
                     firstTabStyle = Styles.tabLabel;
                 }
@@ -804,7 +811,7 @@ private float DragTab(Rect tabAreaRect, float scrollOffset, GUIStyle tabStyle, G
             {
                 case EventType.TouchDown:
                 case EventType.MouseDown:
-                    if (ModeService.HasCapability(ModeCapability.StaticTabs, false))
+                    if (s_HasCapability)
                     {
                         break;
                     }
@@ -836,7 +843,7 @@ private float DragTab(Rect tabAreaRect, float scrollOffset, GUIStyle tabStyle, G
                     }
                     break;
                 case EventType.ContextClick:
-                    if (ModeService.HasCapability(ModeCapability.StaticTabs, false))
+                    if (s_HasCapability)
                     {
                         break;
                     }
@@ -853,10 +860,10 @@ private float DragTab(Rect tabAreaRect, float scrollOffset, GUIStyle tabStyle, G
                 case EventType.TouchMove:
                 case EventType.MouseDrag:
 
-                    if (ModeService.HasCapability(ModeCapability.StaticTabs, false))
+                    if (s_HasCapability)
                     {
-						break;
-					}
+                        break;
+                    }
                     if (evt.pointerType == PointerType.Pen && !evt.penStatus.HasFlag(PenStatus.Contact))
                         break;
 
@@ -961,7 +968,7 @@ private float DragTab(Rect tabAreaRect, float scrollOffset, GUIStyle tabStyle, G
                     break;
                 case EventType.TouchUp:
                 case EventType.MouseUp:
-                    if (ModeService.HasCapability(ModeCapability.StaticTabs, false))
+                    if (s_HasCapability)
                     {
                         break;
                     }
diff --git a/Editor/Mono/GUI/EditorApplicationLayout.cs b/Editor/Mono/GUI/EditorApplicationLayout.cs
index d893abcd75..f125a3fc99 100644
--- a/Editor/Mono/GUI/EditorApplicationLayout.cs
+++ b/Editor/Mono/GUI/EditorApplicationLayout.cs
@@ -23,12 +23,13 @@ namespace UnityEditor
 {
     internal class EditorApplicationLayout
     {
+        static private PlayModeView m_PlayModeView = null;
         static private bool m_MaximizePending = false;
-        static List<PlayModeView> m_PlayModeViewList = null;
+
 
         static internal bool IsInitializingPlaymodeLayout()
         {
-            return m_PlayModeViewList != null && m_PlayModeViewList.Count > 0;
+            return m_PlayModeView != null;
         }
 
         static internal void SetPlaymodeLayout()
@@ -39,22 +40,6 @@ static internal void SetPlaymodeLayout()
 
         static internal void SetStopmodeLayout()
         {
-            if (m_PlayModeViewList != null && m_PlayModeViewList.Count > 0)
-            {
-                var monitorNames = EditorFullscreenController.GetConnectedDisplayNames();
-                foreach (var playModeView in m_PlayModeViewList)
-                {
-                    if (playModeView.fullscreenMonitorIdx >= monitorNames.Length)
-                        continue;
-
-                    EditorFullscreenController.SetSettingsForCurrentDisplay(playModeView.fullscreenMonitorIdx);
-                    EditorFullscreenController.OnExitPlaymode();
-                }
-
-                m_PlayModeViewList.Clear();
-                m_PlayModeViewList = null;
-            }
-
             WindowLayout.ShowAppropriateViewOnEnterExitPlaymode(false);
             Toolbar.RepaintToolbar();
         }
@@ -65,101 +50,53 @@ static internal void SetPausemodeLayout()
             SetStopmodeLayout();
         }
 
-        static internal void InitializePlaymodeViewList()
-        {
-            if (m_PlayModeViewList == null)
-            {
-                m_PlayModeViewList = new List<PlayModeView>();
-            }
-            else
-            {
-                m_PlayModeViewList.Clear();
-            }
-        }
-
         static internal void InitPlaymodeLayout()
         {
-            InitializePlaymodeViewList();
-            WindowLayout.ShowAppropriateViewOnEnterExitPlaymodeList(true, out m_PlayModeViewList);
+            m_PlayModeView = WindowLayout.ShowAppropriateViewOnEnterExitPlaymode(true) as PlayModeView;
+            if (m_PlayModeView == null)
+                return;
 
-            var fullscreenDetected = false;
-            var monitorNames = EditorFullscreenController.GetConnectedDisplayNames();
-
-            foreach (var playModeView in m_PlayModeViewList)
+            if (m_PlayModeView.enterPlayModeBehavior == PlayModeView.EnterPlayModeBehavior.PlayMaximized)
             {
-                if (playModeView == null)
-                    continue;
-
-                if (playModeView.fullscreenMonitorIdx >= monitorNames.Length)
-                    continue;
-
-                if (playModeView.enterPlayModeBehavior == PlayModeView.EnterPlayModeBehavior.PlayFullscreen)
-                {
-                    EditorFullscreenController.SetSettingsForCurrentDisplay(playModeView.fullscreenMonitorIdx);
-                    EditorFullscreenController.isFullscreenOnPlay = true;
-                    EditorFullscreenController.fullscreenDisplayId = playModeView.fullscreenMonitorIdx;
-                    EditorFullscreenController.isToolbarEnabledOnFullscreen = false;
-                    EditorFullscreenController.targetDisplayID = playModeView.targetDisplay;
-
-                    if (playModeView.m_Parent is DockArea dockArea && dockArea.actualView is GameView gv)
-                    {
-                        playModeView.m_Parent.EnableVSync(gv.vSyncEnabled);
-                        EditorFullscreenController.enableVSync = gv.vSyncEnabled;
-                        EditorFullscreenController.selectedSizeIndex = gv.selectedSizeIndex;
-                    }
-                    fullscreenDetected = true;
-                }
-                else if (!fullscreenDetected)
+                if (m_PlayModeView.m_Parent is DockArea dockArea)
                 {
-                    EditorFullscreenController.isFullscreenOnPlay = false;
-                }
+                    m_MaximizePending = WindowLayout.MaximizePrepare(dockArea.actualView);
 
-                if (playModeView.enterPlayModeBehavior == PlayModeView.EnterPlayModeBehavior.PlayMaximized)
-                {
-                    if (playModeView.m_Parent is DockArea dockArea)
-                    {
-                        m_MaximizePending = WindowLayout.MaximizePrepare(dockArea.actualView);
-                        var gv = dockArea.actualView as GameView;
-                        if (gv != null)
-                        {
-                            playModeView.m_Parent.EnableVSync(gv.vSyncEnabled);
-                        }
-                    }
+                    var gameView = dockArea.actualView as GameView;
+                    if (gameView != null)
+                        m_PlayModeView.m_Parent.EnableVSync(gameView.vSyncEnabled);
                 }
+            }
 
-                EditorFullscreenController.OnEnterPlaymode();
+            // Mark this PlayModeView window as the start view so the backend
+            // can set size and mouseoffset properly for this view
+            m_PlayModeView.m_Parent.SetAsStartView();
+            m_PlayModeView.m_Parent.SetAsLastPlayModeView();
 
-                if (!EditorFullscreenController.isFullscreenOnPlay)
-                {
-                    playModeView.m_Parent.SetAsStartView();
-                    playModeView.m_Parent.SetAsLastPlayModeView();
-
-                    if (playModeView is IGameViewOnPlayMenuUser)
-                    {
-                        if (((IGameViewOnPlayMenuUser)playModeView).playFocused)
-                        {
-                            playModeView.Focus();
-                        }
-                    }
-                }
-                Toolbar.RepaintToolbar();
-            }
+            //GameView should be actively focussed If Playmode is entered in maximized state - case 1252097
+            if (m_PlayModeView.maximized)
+                m_PlayModeView.m_Parent.Focus();
+
+            Toolbar.RepaintToolbar();
         }
 
         static internal void FinalizePlaymodeLayout()
         {
-            foreach (var playModeView in m_PlayModeViewList)
+            if (m_PlayModeView != null)
             {
-                if (playModeView != null)
-                {
-                    if (m_MaximizePending)
-                        WindowLayout.MaximizePresent(playModeView);
+                if (m_MaximizePending)
+                    WindowLayout.MaximizePresent(m_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();
-                }
+                m_PlayModeView.m_Parent.ClearStartView();
             }
+
+            Clear();
+        }
+
+        static private void Clear()
+        {
+            m_MaximizePending = false;
+            m_PlayModeView = null;
         }
     }
 } // namespace
diff --git a/Editor/Mono/GUI/EditorCache.cs b/Editor/Mono/GUI/EditorCache.cs
index 03ffb9404a..7a94acc92e 100644
--- a/Editor/Mono/GUI/EditorCache.cs
+++ b/Editor/Mono/GUI/EditorCache.cs
@@ -67,10 +67,17 @@ private bool Init(Object obj, EditorFeatures requirements)
                 // Are we dealing with a Root Editor?
                 if (editor.GetType() != nonRootEditor.GetType())
                 {
-                    // Try again, with a normal editor
+                    // Destroy previous editor
+                    UnityEngine.Object.DestroyImmediate(editor);
+                    // Try again, with a non Root editor
                     editor = nonRootEditor;
                     onSceneDragMethodInfo = editor.GetType().GetMethod("OnSceneDrag", sceneDragReflectionFlags);
                 }
+                else
+                {
+                    // Destroy unused non Root editor
+                    UnityEngine.Object.DestroyImmediate(nonRootEditor);
+                }
             }
 
             if (onSceneDragMethodInfo != null)
diff --git a/Editor/Mono/GUI/EditorStyles.cs b/Editor/Mono/GUI/EditorStyles.cs
index a07eb373b5..b2cce459ba 100644
--- a/Editor/Mono/GUI/EditorStyles.cs
+++ b/Editor/Mono/GUI/EditorStyles.cs
@@ -475,13 +475,13 @@ private void InitSharedStyles()
             m_ToolbarCreateAddNewDropDown = GetStyle("ToolbarCreateAddNewDropDown");
             m_ToolbarTextField = GetStyle("toolbarTextField");
             m_ToolbarLabel = GetStyle("ToolbarLabel");
-            m_ToolbarSearchField = GetStyle("ToolbarSeachTextField");
-            m_ToolbarSearchFieldPopup = GetStyle("ToolbarSeachTextFieldPopup");
+            m_ToolbarSearchField = GetStyle("ToolbarSearchTextField");
+            m_ToolbarSearchFieldPopup = GetStyle("ToolbarSearchTextFieldPopup");
             m_ToolbarSearchFieldWithJump = GetStyle("ToolbarSearchTextFieldWithJump");
             m_ToolbarSearchFieldWithJumpPopup = GetStyle("ToolbarSearchTextFieldWithJumpPopup");
             m_ToolbarSearchFieldJumpButton = GetStyle("ToolbarSearchTextFieldJumpButton");
-            m_ToolbarSearchFieldCancelButton = GetStyle("ToolbarSeachCancelButton");
-            m_ToolbarSearchFieldCancelButtonEmpty = GetStyle("ToolbarSeachCancelButtonEmpty");
+            m_ToolbarSearchFieldCancelButton = GetStyle("ToolbarSearchCancelButton");
+            m_ToolbarSearchFieldCancelButtonEmpty = GetStyle("ToolbarSearchCancelButtonEmpty");
             m_ToolbarSearchFieldCancelButtonWithJump = GetStyle("ToolbarSearchCancelButtonWithJump");
             m_ToolbarSearchFieldCancelButtonWithJumpEmpty = GetStyle("ToolbarSearchCancelButtonWithJumpEmpty");
             m_ToolbarSearchFieldWithJumpSynced = GetStyle("ToolbarSearchTextFieldWithJumpSynced");
diff --git a/Editor/Mono/GUI/InternalEditorGUI.cs b/Editor/Mono/GUI/InternalEditorGUI.cs
index 1dfc7f46b3..c495c3210f 100644
--- a/Editor/Mono/GUI/InternalEditorGUI.cs
+++ b/Editor/Mono/GUI/InternalEditorGUI.cs
@@ -243,18 +243,6 @@ internal static void GameViewSizePopup(Rect buttonRect, GameViewSizeGroupType gr
             }
         }
 
-        internal static void GameViewOnPlayPopup(Rect buttonRect, int selectedIndex, IGameViewOnPlayMenuUser gameView, GUIStyle guiStyle)
-        {
-            var text = GameViewOnPlayMenu.GetOnPlayBehaviorName(selectedIndex);
-
-            if (EditorGUI.DropdownButton(buttonRect, GUIContent.Temp(text), FocusType.Passive, guiStyle))
-            {
-                var menuData = new GameViewOnPlayMenuItemProvider();
-                var flexibleMenu = new GameViewOnPlayMenu(menuData, selectedIndex, null, gameView);
-                PopupWindow.Show(buttonRect, flexibleMenu);
-            }
-        }
-
         public static void DrawRect(Rect rect, Color color)
         {
             if (Event.current.type != EventType.Repaint)
diff --git a/Editor/Mono/GUI/InternalEditorGUILayout.cs b/Editor/Mono/GUI/InternalEditorGUILayout.cs
index db0e20fb68..dba74acbd3 100644
--- a/Editor/Mono/GUI/InternalEditorGUILayout.cs
+++ b/Editor/Mono/GUI/InternalEditorGUILayout.cs
@@ -25,12 +25,6 @@ internal static void GameViewSizePopup(GameViewSizeGroupType groupType, int sele
             EditorGUI.GameViewSizePopup(s_LastRect, groupType, selectedIndex, gameView, style);
         }
 
-        internal static void GameViewOnPlayPopup(int selectedIndex, IGameViewOnPlayMenuUser gameView, GUIStyle style, params GUILayoutOption[] options)
-        {
-            s_LastRect = GetControlRect(false, EditorGUI.kSingleLineHeight, style, options);
-            EditorGUI.GameViewOnPlayPopup(s_LastRect, selectedIndex, gameView, style);
-        }
-
         internal static void SortingLayerField(GUIContent label, SerializedProperty layerID, GUIStyle style, GUIStyle labelStyle)
         {
             s_LastRect = EditorGUILayout.GetControlRect(false, EditorGUI.kSingleLineHeight, style);
diff --git a/Editor/Mono/GUI/LazyLoadReferenceField.cs b/Editor/Mono/GUI/LazyLoadReferenceField.cs
index 31fed6affb..abb202fea9 100644
--- a/Editor/Mono/GUI/LazyLoadReferenceField.cs
+++ b/Editor/Mono/GUI/LazyLoadReferenceField.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -35,12 +36,14 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
         {
             ScriptAttributeUtility.GetFieldInfoFromProperty(property, out var fieldType);
 
-            var objectField = new UnityEditor.UIElements.ObjectField(property.displayName);
+            var objectField = new ObjectField(preferredLabel);
             var genericType = fieldType.GetGenericArguments()[0];
             objectField.objectType = genericType;
             objectField.value = property.objectReferenceValue;
             objectField.bindingPath = property.propertyPath;
 
+            PropertyField.ConfigureFieldStyles<ObjectField, Object>(objectField);
+
             return objectField;
         }
     }
diff --git a/Editor/Mono/GUI/MaskFieldGUI.cs b/Editor/Mono/GUI/MaskFieldGUI.cs
index 0c4ca9c1e8..7570a3c20b 100644
--- a/Editor/Mono/GUI/MaskFieldGUI.cs
+++ b/Editor/Mono/GUI/MaskFieldGUI.cs
@@ -33,6 +33,12 @@ private class MaskCallbackInfo
             // Which view should we send it to.
             private readonly GUIView m_SourceView;
 
+            // Current drop-down reference 
+            public MaskFieldDropDown m_DropDown;
+
+            // validation flag for masks that are changed externally
+            private bool m_Validate = false;
+
             public MaskCallbackInfo(int controlID)
             {
                 m_ControlID = controlID;
@@ -77,6 +83,31 @@ internal void SetMaskValueDelegate(object userData, string[] options, int select
                 if (m_SourceView)
                     m_SourceView.SendEvent(EditorGUIUtility.CommandEvent(kMaskMenuChangedMessage));
             }
+
+            public void UpdateFlagChanges(int mask, int[] optionMaskValues)
+            {
+                var evt = Event.current;
+
+                if (evt.type == EventType.ExecuteCommand)
+                {
+                    m_Validate = true;
+                }
+                // This code  is responsible for verifying whether the incoming mask value differs from the one that is currently selected in the dropdown menu.
+                // When these values do not match, it serves as confirmation that the incoming value has been modified.
+                // Subsequently, we proceed to update the dropdown menu to reflect these changes.
+                else if (evt.type == EventType.Repaint && m_Validate)
+                {
+                    if (m_DropDown == null)
+                    {
+                        return;
+                    }
+
+                    if (mask != m_NewMask)
+                        m_DropDown.UpdateMaskValues(mask, optionMaskValues);
+
+                    m_Validate = false;
+                }
+            }
         }
 
         /// Make a field for a generic mask.
@@ -117,6 +148,10 @@ internal static int DoMaskField(Rect position, int controlID, int mask, string[]
 
             GetMenuOptions(mask, flagNames, flagValues, out var buttonText, out var buttonTextMixed, out var optionNames, out var optionMaskValues, out _, enumType);
 
+            // This checks and update flags changes that are modified out of dropdown menu
+            if (MaskCallbackInfo.m_Instance != null)
+                MaskCallbackInfo.m_Instance.UpdateFlagChanges(mask, optionMaskValues);
+
             Event evt = Event.current;
             if (evt.type == EventType.Repaint)
             {
@@ -126,7 +161,8 @@ internal static int DoMaskField(Rect position, int controlID, int mask, string[]
             else if ((evt.type == EventType.MouseDown && position.Contains(evt.mousePosition)) || evt.MainActionKeyForControl(controlID))
             {
                 MaskCallbackInfo.m_Instance = new MaskCallbackInfo(controlID);
-                PopupWindowWithoutFocus.Show(position, new MaskFieldDropDown(optionNames, flagValues, optionMaskValues, mask, MaskCallbackInfo.m_Instance.SetMaskValueDelegate));
+                MaskCallbackInfo.m_Instance.m_DropDown = new MaskFieldDropDown(optionNames, flagValues, optionMaskValues, mask, MaskCallbackInfo.m_Instance.SetMaskValueDelegate);
+                PopupWindowWithoutFocus.Show(position, MaskCallbackInfo.m_Instance.m_DropDown);
             }
 
             return mask;
@@ -234,6 +270,38 @@ internal static GUIContent DoMixedLabel(string label, string mixedLabel, Rect re
 
             return content;
         }
+        internal static void CalculateMaskValues(int mask, int[] flagValues, ref int[] optionMaskValues)
+        {
+            uint selectedValue = (uint)mask;
+
+            var flagStartIndex = 0;
+            if (flagValues[0] == 0)
+                flagStartIndex++;
+            if (flagValues.Length > 1 && flagValues[1] == -1)
+                flagStartIndex++;
+
+            if (mask == ~0)
+            {
+                uint allLayersMask = 0;
+                for (var flagIndex = flagStartIndex; flagIndex < flagValues.Length; flagIndex++)
+                {
+                    allLayersMask |= (uint)flagValues[flagIndex];
+                }
+
+                selectedValue = allLayersMask;
+            }
+
+            var flagEndIndex = flagStartIndex + optionMaskValues.Length - 2;
+
+            for (var flagIndex = flagStartIndex; flagIndex < flagEndIndex; flagIndex++)
+            {
+                uint flagValue = (uint)flagValues[flagIndex];
+
+                bool flagSet = ((selectedValue & flagValue) == flagValue);
+
+                optionMaskValues[flagIndex-flagStartIndex+2] = (int)(flagSet ? selectedValue & ~flagValue : selectedValue | flagValue);
+            }
+        }
 
         internal static void GetMenuOptions(int mask, string[] flagNames, int[] flagValues,
             out string buttonText, out string buttonMixedValuesText, out string[] optionNames, out int[] optionMaskValues, out int[] selectedOptions, Type enumType = null)
@@ -342,15 +410,8 @@ internal static void GetMenuOptions(int mask, string[] flagNames, int[] flagValu
             optionMaskValues[1] = everythingValue;
             if (EditorGUI.showMixedValue)
                 intermediateMask = 0;
-            for (var flagIndex = flagStartIndex; flagIndex < flagEndIndex; flagIndex++)
-            {
-                var optionIndex = flagIndex - flagStartIndex + 2;
-                var flagValue = flagValues[flagIndex];
-                var flagSet = ((intermediateMask & flagValue) == flagValue);
-                var newMask = (flagSet ? intermediateMask & ~flagValue : intermediateMask | flagValue);
 
-                optionMaskValues[optionIndex] = newMask;
-            }
+            CalculateMaskValues(intermediateMask, flagValues, ref optionMaskValues);
         }
     }
 }
diff --git a/Editor/Mono/GUI/PackageImport.cs b/Editor/Mono/GUI/PackageImport.cs
index b37824d595..22c79558a4 100644
--- a/Editor/Mono/GUI/PackageImport.cs
+++ b/Editor/Mono/GUI/PackageImport.cs
@@ -244,12 +244,14 @@ void BottomArea()
             {
                 PackageImportWizard.instance.CancelImport();
             }
-            if (PackageImportWizard.instance.IsProjectSettingStep && GUILayout.Button(EditorGUIUtility.TrTextContent("Back")))
+
+            var isSecondStep = PackageImportWizard.instance.IsMultiStepWizard &&
+                               PackageImportWizard.instance.IsProjectSettingStep;
+            if (isSecondStep && GUILayout.Button(EditorGUIUtility.TrTextContent("Back")))
             {
                 PackageImportWizard.instance.DoPreviousStep(m_ImportPackageItems);
             }
-            var buttonText = PackageImportWizard.instance.IsMultiStepWizard
-                && !PackageImportWizard.instance.IsProjectSettingStep ? "Next" : "Import";
+            var buttonText = isSecondStep || !PackageImportWizard.instance.IsMultiStepWizard ? "Import" : "Next";
             if (GUILayout.Button(EditorGUIUtility.TrTextContent(buttonText)))
             {
                 if (m_ImportPackageItems != null)
@@ -440,8 +442,14 @@ public void StartImport(string packagePath, ImportPackageItem[] items, string pa
                     m_AssetContentItems.Add(item);
             }
 
-            m_IsMultiStepWizard = m_ProjectSettingItems.Any();
-            ShowImportWindow(m_AssetContentItems.ToArray());
+            m_IsMultiStepWizard = m_AssetContentItems.Any() && m_ProjectSettingItems.Any();
+            if (m_AssetContentItems.Any())
+                ShowImportWindow(m_AssetContentItems.ToArray());
+            else if (m_ProjectSettingItems.Any())
+            {
+                m_IsProjectSettingStep = true;
+                ShowImportWindow(m_ProjectSettingItems.ToArray());
+            }
         }
 
         public void DoNextStep(ImportPackageItem[] importPackageItems)
@@ -463,12 +471,12 @@ public void DoNextStep(ImportPackageItem[] importPackageItems)
 
         public void DoPreviousStep(ImportPackageItem[] importPackageItems)
         {
-            if (IsProjectSettingStep)
-            {
-                m_ProjectSettingItems = new List<ImportPackageItem>(importPackageItems);
-                m_IsProjectSettingStep = false;
-                ShowImportWindow(m_AssetContentItems.ToArray());
-            }
+            if (!IsProjectSettingStep || !IsMultiStepWizard)
+                return;
+
+            m_ProjectSettingItems = new List<ImportPackageItem>(importPackageItems);
+            m_IsProjectSettingStep = false;
+            ShowImportWindow(m_AssetContentItems.ToArray());
         }
 
         public void CancelImport()
@@ -495,8 +503,7 @@ private void ShowImportWindow(ImportPackageItem[] items)
 
         private void FinishImport()
         {
-            var completeItemList = IsMultiStepWizard ? m_AssetContentItems.Concat(m_ProjectSettingItems) : m_AssetContentItems;
-            PackageUtility.ImportPackageAssetsWithOrigin(m_AssetOrigin, completeItemList.ToArray());
+            PackageUtility.ImportPackageAssetsWithOrigin(m_AssetOrigin, m_AssetContentItems.Concat(m_ProjectSettingItems).ToArray());
             CloseImportWindow();
         }
 
diff --git a/Editor/Mono/GUI/PingData.cs b/Editor/Mono/GUI/PingData.cs
index 0a584af0b2..22a2e297f9 100644
--- a/Editor/Mono/GUI/PingData.cs
+++ b/Editor/Mono/GUI/PingData.cs
@@ -68,8 +68,8 @@ public void HandlePing()
                     if (m_ContentDraw != null && Event.current.type == EventType.Repaint)
                     {
                         Rect backRect = m_ContentRect;
-                        backRect.x -= m_PingStyle.padding.left;
-                        backRect.y -= m_PingStyle.padding.top;
+                        backRect.x -= m_PingStyle.padding.left / 2f;
+                        backRect.y -= m_PingStyle.padding.top / 2f;
                         m_PingStyle.Draw(backRect, GUIContent.none, false, false, false, false);
                         m_ContentDraw(m_ContentRect);
                     }
diff --git a/Editor/Mono/GUI/ReorderableList.cs b/Editor/Mono/GUI/ReorderableList.cs
index f5fe9ac05a..ae01c675cd 100644
--- a/Editor/Mono/GUI/ReorderableList.cs
+++ b/Editor/Mono/GUI/ReorderableList.cs
@@ -538,6 +538,8 @@ public int index
         private float listElementTopPadding => headerHeight > 5 ? 4 : 1; // headerHeight is usually set to 3px when there is no header content. Therefore, we add a 1px top margin to match the 4px bottom margin
         private const float kListElementBottomPadding = 4;
 
+        bool useCulling => GUI.matrix.rotation == Quaternion.identity && GUI.matrix.lossyScale == Vector3.one;
+
         // draggable accessor
         public bool draggable
         {
@@ -874,8 +876,11 @@ private void DoListElements(Rect listRect, Rect visibleRect)
                         var next = Mathf.Min(i + 1, m_Count - 1);
                         var previous = Mathf.Max(i - 1, 0);
 
-                        if (visibleRect.y > GetElementYOffset(next) + GetElementHeight(next)) continue;
-                        if (visibleRect.y + visibleRect.height < GetElementYOffset(previous)) break;
+                        if (useCulling)
+                        {
+                            if (visibleRect.y > GetElementYOffset(next) + GetElementHeight(next)) continue;
+                            if (visibleRect.y + visibleRect.height < GetElementYOffset(previous)) break;
+                        }
 
                         var nonDragTargetIndex = m_NonDragTargetIndices[i];
                         if (nonDragTargetIndex != -1)
@@ -953,8 +958,11 @@ private void DoListElements(Rect listRect, Rect visibleRect)
                     // if we aren't dragging, we just draw all of the elements in order
                     for (int i = 0; i < m_Count; i++)
                     {
-                        if (visibleRect.y > GetElementYOffset(i) + GetElementHeight(i)) continue;
-                        if (visibleRect.y + visibleRect.height < GetElementYOffset(i > 0 ? i - 1 : i)) break;
+                        if (useCulling)
+                        {
+                            if (visibleRect.y > GetElementYOffset(i) + GetElementHeight(i)) continue;
+                            if (visibleRect.y + visibleRect.height < GetElementYOffset(i > 0 ? i - 1 : i)) break;
+                        }
 
                         bool activeElement = m_Selection.Any(id => id == i);
                         bool focusedElement = (activeElement && HasKeyboardControl());
diff --git a/Editor/Mono/GUI/SliderWithTexture.cs b/Editor/Mono/GUI/SliderWithTexture.cs
index 129ccdf2e5..e5e754040e 100644
--- a/Editor/Mono/GUI/SliderWithTexture.cs
+++ b/Editor/Mono/GUI/SliderWithTexture.cs
@@ -106,7 +106,7 @@ Texture2D sliderBackground
                 ? EditorGUIUtility.DragZoneRect(position)
                 : default(Rect);         // Ensure dragzone is empty when we have no label
             return DoSlider(
-                controlRect, dragZone, id, sliderValue, sliderMin, sliderMax, formatString, textFieldMin, textFieldMax, power,
+                controlRect, dragZone, id, sliderValue, sliderMin, sliderMax, formatString, textFieldMin, textFieldMax, power, 1f,
                 EditorStyles.numberField, "ColorPickerSliderBackground", "ColorPickerHorizThumb", sliderBackground, null
             );
         }
diff --git a/Editor/Mono/GUI/Toolbar.cs b/Editor/Mono/GUI/Toolbar.cs
index 1df88833c6..f960fddecd 100644
--- a/Editor/Mono/GUI/Toolbar.cs
+++ b/Editor/Mono/GUI/Toolbar.cs
@@ -100,6 +100,7 @@ void CreateContents()
 
         protected override void OnDisable()
         {
+            m_Root?.RemoveFromHierarchy();
             base.OnDisable();
             EditorApplication.modifierKeysChanged -= Repaint;
         }
@@ -113,9 +114,6 @@ protected override void OldOnGUI()
         {
             if (Event.current.type == EventType.Repaint)
                 Styles.appToolbar.Draw(new Rect(0, 0, position.width, position.height), false, false, false, false);
-
-            BeginOffsetArea(GetToolbarPosition(), GUIContent.none, GUIStyle.none);
-            EndOffsetArea();
         }
 
         static VisualElement CreateRoot()
diff --git a/Editor/Mono/GUI/Toolbars/Core/EditorToolbar.cs b/Editor/Mono/GUI/Toolbars/Core/EditorToolbar.cs
index 88b56addcc..adb1ff5976 100644
--- a/Editor/Mono/GUI/Toolbars/Core/EditorToolbar.cs
+++ b/Editor/Mono/GUI/Toolbars/Core/EditorToolbar.cs
@@ -16,6 +16,7 @@ sealed class EditorToolbar
         public const string elementClassName = "unity-editor-toolbar-element";
         public const string elementIconClassName = elementClassName + "__icon";
         public const string elementLabelClassName = elementClassName + "__label";
+        public const string elementTextIconClassName = elementClassName + "__text-icon";
 
         string[] m_ToolbarElements;
         readonly EditorWindow m_Context;
diff --git a/Editor/Mono/GUI/Tools/BuiltinTools.cs b/Editor/Mono/GUI/Tools/BuiltinTools.cs
index 8b29d4ff5f..f4ee42bc3b 100644
--- a/Editor/Mono/GUI/Tools/BuiltinTools.cs
+++ b/Editor/Mono/GUI/Tools/BuiltinTools.cs
@@ -44,7 +44,7 @@ public override void OnToolGUI(EditorWindow window)
             if (!view || !Selection.activeTransform || Tools.s_Hidden)
                 return;
 
-            if (!StageUtility.IsGameObjectRenderedByCameraAndPartOfEditableScene(Selection.activeTransform.gameObject, Camera.current))
+            if (StageUtility.IsGizmoCulledBySceneCullingMasksOrFocusedScene(Selection.activeTransform.gameObject, Camera.current))
                 return;
 
             GUIContent disabledLabel;
@@ -591,7 +591,7 @@ protected override void ToolGUI(SceneView view, Vector3 handlePosition, bool isS
             TransformManipulator.BeginManipulationHandling(false);
             // Move handle
             EditorGUI.BeginChangeCheck();
-            Vector3 newPos = MoveHandlesGUI(rect, handlePosition, rectRotation);
+            Vector3 newPos = MoveHandlesGUI(rect, rectRotation * rect.center + handlePosition, rectRotation);
             if (EditorGUI.EndChangeCheck() && !isStatic)
             {
                 if (GridSnapping.active)
diff --git a/Editor/Mono/GUI/Tools/EditorToolCache.cs b/Editor/Mono/GUI/Tools/EditorToolCache.cs
index c185bcaf86..a455381dd8 100644
--- a/Editor/Mono/GUI/Tools/EditorToolCache.cs
+++ b/Editor/Mono/GUI/Tools/EditorToolCache.cs
@@ -303,15 +303,22 @@ public void InstantiateEditors(EditorToolContext ctx, List<ComponentEditor> edit
             // represented. Addresses case where a single locked inspector is open.
             var shared = ActiveEditorTracker.sharedTracker;
             var activeTracker = shared.isLocked ? sharedTracker : shared;
-            var inspectors = InspectorWindow.GetInspectors();
+            var propertyEditors = PropertyEditor.GetPropertyEditors();
 
-            // Collect editor tools for the shared tracker first, then any locked inspectors
+            // Collect editor tools for the shared tracker first, then any locked inspectors or open properties editors
             CollectEditorsForTracker(ctx, activeTracker, editors);
 
-            foreach (var inspector in inspectors)
+            foreach (var propertyEditor in propertyEditors)
             {
-                if (inspector.isLocked)
-                    CollectEditorsForTracker(ctx, inspector.tracker, editors);
+                if (propertyEditor is InspectorWindow)
+                {
+                    if ((propertyEditor as InspectorWindow).isLocked)
+                        CollectEditorsForTracker(ctx, propertyEditor.tracker, editors);
+                }
+                else
+                {
+                    CollectEditorsForTracker(ctx, propertyEditor.tracker, editors);
+                }
             }
 
             foreach (var editor in editors)
diff --git a/Editor/Mono/GUI/Tools/EditorToolGUI.cs b/Editor/Mono/GUI/Tools/EditorToolGUI.cs
index 9907f9315e..4a64680cdf 100644
--- a/Editor/Mono/GUI/Tools/EditorToolGUI.cs
+++ b/Editor/Mono/GUI/Tools/EditorToolGUI.cs
@@ -24,6 +24,40 @@ public sealed partial class EditorGUILayout
         static class Styles
         {
             public static GUIStyle command = "AppCommand";
+            public static GUIStyle commandLeft;
+            public static GUIStyle commandMid;
+            public static GUIStyle commandRight;
+
+            static Styles()
+            {
+                GUI.FindStyles(ref command, out commandLeft, out commandMid, out commandRight, "left", "mid", "right");
+
+                var normalColor = command.normal.textColor;
+
+                command.imagePosition = ImagePosition.ImageAbove;
+                command.active.textColor = normalColor;
+                command.onActive.textColor = normalColor;
+                command.onNormal.textColor = normalColor;
+                command.fontStyle = FontStyle.Bold;
+
+                commandLeft.imagePosition = ImagePosition.ImageAbove;
+                commandLeft.active.textColor = normalColor;
+                commandLeft.onActive.textColor = normalColor;
+                commandLeft.onNormal.textColor = normalColor;
+                commandLeft.fontStyle = FontStyle.Bold;
+
+                commandMid.imagePosition = ImagePosition.ImageAbove;
+                commandMid.active.textColor = normalColor;
+                commandMid.onActive.textColor = normalColor;
+                commandMid.onNormal.textColor = normalColor;
+                commandMid.fontStyle = FontStyle.Bold;
+
+                commandRight.imagePosition = ImagePosition.ImageAbove;
+                commandRight.active.textColor = normalColor;
+                commandRight.onActive.textColor = normalColor;
+                commandRight.onNormal.textColor = normalColor;
+                commandRight.fontStyle = FontStyle.Bold;
+            }
         }
 
         public static void EditorToolbarForTarget(UObject target)
@@ -138,7 +172,7 @@ internal static bool EditorToolbar<T>(GUIContent content, T selected, IList<T> t
 
                 EditorGUI.BeginChangeCheck();
 
-                index = GUILayout.Toolbar(index, buttons, enabled, Styles.command);
+                index = GUILayout.Toolbar(index, buttons, enabled, Styles.command, Styles.commandLeft, Styles.commandMid, Styles.commandRight);
 
                 if (EditorGUI.EndChangeCheck())
                 {
diff --git a/Editor/Mono/GUI/Tools/EditorToolManager.cs b/Editor/Mono/GUI/Tools/EditorToolManager.cs
index 96c732591e..e2f8125831 100644
--- a/Editor/Mono/GUI/Tools/EditorToolManager.cs
+++ b/Editor/Mono/GUI/Tools/EditorToolManager.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityObject = UnityEngine.Object;
 
@@ -497,14 +498,26 @@ internal static bool TryPopToolState()
             return false;
         }
 
+        static bool IsGizmoCulledBySceneCullingMasksOrFocusedScene(UnityObject uobject)
+        {
+            var cmp = uobject as UnityEngine.Component;
+            if (cmp == null)
+                return false;
+
+            return StageUtility.IsGizmoCulledBySceneCullingMasksOrFocusedScene(cmp.gameObject, Camera.current);
+        }
+
         internal static void OnToolGUI(EditorWindow window)
         {
-            activeToolContext.OnToolGUI(window);
+            if (!IsGizmoCulledBySceneCullingMasksOrFocusedScene(activeToolContext.target))
+                activeToolContext.OnToolGUI(window);
 
             if (Tools.s_Hidden || instance.m_ActiveTool == null)
                 return;
 
             var current = instance.m_ActiveTool;
+            if (IsGizmoCulledBySceneCullingMasksOrFocusedScene(current.target))
+                return;
 
             using (new EditorGUI.DisabledScope(!current.IsAvailable()))
             {
@@ -699,6 +712,9 @@ internal static void InvokeOnSceneGUICustomEditorTools()
         {
             foreach (var context in instance.m_ComponentContexts)
             {
+                if (IsGizmoCulledBySceneCullingMasksOrFocusedScene(context.target))
+                    continue;
+
                 // ReSharper disable once SuspiciousTypeConversion.Global
                 if (context.editor is IDrawSelectedHandles handle)
                     handle.OnDrawHandles();
@@ -706,6 +722,9 @@ internal static void InvokeOnSceneGUICustomEditorTools()
 
             foreach (var tool in instance.m_ComponentTools)
             {
+                if (IsGizmoCulledBySceneCullingMasksOrFocusedScene(tool.target))
+                    continue;
+
                 // ReSharper disable once SuspiciousTypeConversion.Global
                 if (tool.editor is IDrawSelectedHandles handle)
                     handle.OnDrawHandles();
diff --git a/Editor/Mono/GUI/Tools/EditorToolUtility.cs b/Editor/Mono/GUI/Tools/EditorToolUtility.cs
index b9b1a131e6..a925faac8c 100644
--- a/Editor/Mono/GUI/Tools/EditorToolUtility.cs
+++ b/Editor/Mono/GUI/Tools/EditorToolUtility.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using UnityEditor.Overlays;
 using UnityEngine;
 using UObject = UnityEngine.Object;
 
@@ -212,8 +213,10 @@ internal static bool IsGlobalTool(EditorTool tool)
             if(GetEnumWithEditorTool(tool) == Tool.Custom)
             {
                 var type = tool.GetType();
-                return !IsComponentTool(type)
-                    && EditorToolManager.additionalContextToolTypesCache.All(t => t != type);
+                return !IsComponentTool(type)   // Component tool?
+                    && !IsManipulationTool(GetEnumWithEditorTool(tool, EditorToolManager.GetSingleton<GameObjectToolContext>())) // Built-in tool?
+                    && !IsBuiltinOverride(tool) // Built-in tool override?
+                    && EditorToolManager.additionalContextToolTypesCache.Any(t => t == type); // Additional/Extra tool?
             }
 
             return false;
@@ -249,13 +252,8 @@ internal static GUIContent GetIcon(Type editorToolType, bool forceReload = false
             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)
-                goto ReturnToolbarIcon;
-
-            // And finally fall back to the default Custom Tool icon
-            res.image = EditorGUIUtility.IconContent("CustomTool").image;
+            // And finally fall back to the significant letters of the tool's typename
+            res.text = OverlayUtilities.GetSignificantLettersForIcon(editorToolType.Name);
 
         ReturnToolbarIcon:
             if (string.IsNullOrEmpty(res.tooltip))
diff --git a/Editor/Mono/GUI/Tools/GameObjectToolContext.cs b/Editor/Mono/GUI/Tools/GameObjectToolContext.cs
index e30582f40a..d9b9822896 100644
--- a/Editor/Mono/GUI/Tools/GameObjectToolContext.cs
+++ b/Editor/Mono/GUI/Tools/GameObjectToolContext.cs
@@ -9,7 +9,7 @@ namespace UnityEditor.EditorTools
     [EditorToolContext, Icon(k_IconPath)]
     public sealed class GameObjectToolContext : EditorToolContext
     {
-        const string k_IconPath = "Toolbars/ObjectMode";
+        const string k_IconPath = "GameObject Icon";
         GameObjectToolContext() {}
     }
 }
diff --git a/Editor/Mono/GUI/TreeView/AssetOrGameObjectTreeViewDragging.cs b/Editor/Mono/GUI/TreeView/AssetOrGameObjectTreeViewDragging.cs
index 8c7c1bdafe..040e596a46 100644
--- a/Editor/Mono/GUI/TreeView/AssetOrGameObjectTreeViewDragging.cs
+++ b/Editor/Mono/GUI/TreeView/AssetOrGameObjectTreeViewDragging.cs
@@ -30,7 +30,7 @@ public override bool CanStartDrag(TreeViewItem targetItem, List<int> draggedItem
             foreach (var draggedItemID in draggedItemIDs)
             {
                 var path = AssetDatabase.GetAssetPath(draggedItemID);
-                if (AssetDatabase.IsValidFolder(path) && !AssetDatabase.GetAssetFolderInfo(path, out _, out _))
+                if (AssetDatabase.IsValidFolder(path) && !AssetDatabase.TryGetAssetFolderInfo(path, out _, out _))
                     return false;
 
             }
diff --git a/Editor/Mono/GUI/TreeView/GameObjectTreeViewGUI.cs b/Editor/Mono/GUI/TreeView/GameObjectTreeViewGUI.cs
index 194e82dac3..c84038c285 100644
--- a/Editor/Mono/GUI/TreeView/GameObjectTreeViewGUI.cs
+++ b/Editor/Mono/GUI/TreeView/GameObjectTreeViewGUI.cs
@@ -413,7 +413,7 @@ override protected void DoItemGUI(Rect rect, int row, TreeViewItem item, bool se
             if (goItem == null)
                 return;
 
-            EnsureLazyInitialization(goItem);
+            EnsureLazyInitialization(goItem); // Needed to ensure item is ready for all ui controls
 
             if (goItem.isSceneHeader)
             {
@@ -679,13 +679,15 @@ void SetPrefabModeButtonVisibility(GameObjectTreeViewItem item)
         protected override void OnContentGUI(Rect rect, int row, TreeViewItem item, string label, bool selected, bool focused,
             bool useBoldFont, bool isPinging)
         {
-            if (Event.current.type != EventType.Repaint)
-                return;
-
             GameObjectTreeViewItem goItem = item as GameObjectTreeViewItem;
             if (goItem == null)
                 return;
 
+            if (Event.current.type != EventType.Repaint)
+                return;
+
+            EnsureLazyInitialization(goItem); // Needed to ensure icon is initialized if reload happens during DoItemGUI
+
             rect.xMax = m_ContentRectRight;
 
             if (goItem.isSceneHeader)
diff --git a/Editor/Mono/GUI/TypeSelectionList.cs b/Editor/Mono/GUI/TypeSelectionList.cs
index d02cec9b74..6971ac0480 100644
--- a/Editor/Mono/GUI/TypeSelectionList.cs
+++ b/Editor/Mono/GUI/TypeSelectionList.cs
@@ -3,8 +3,6 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using UnityEngine;
-using UnityEditor;
-using UnityEditorInternal;
 using System;
 using System.Collections.Generic;
 using Object = UnityEngine.Object;
@@ -19,12 +17,20 @@ class TypeSelectionList
         public TypeSelectionList(Object[] objects)
         {
             // Create dictionary of lists of objects indexed by their type.
-            Dictionary<string, List<Object>> types = new Dictionary<string, List<Object>>();
+            var types = new Dictionary<string, List<Object>>();
             foreach (Object o in objects)
             {
-                string typeName = ObjectNames.GetTypeName(o);
-                if (o is GameObject && EditorUtility.IsPersistent(o))
-                    typeName = "Prefab";
+                var typeName = ObjectNames.GetTypeName(o) + "{0}";
+
+                if (EditorUtility.IsPersistent(o))
+                {
+                    if (o is GameObject)
+                        typeName = "Prefab{0}";
+
+                    var importerType = AssetImporter.GetAtPath(AssetDatabase.GetAssetPath(o))?.GetType();
+                    if (importerType is not null && importerType != typeof(AssetImporter))
+                        typeName = $"{typeName} ({importerType.Name})";
+                }
 
                 if (!types.ContainsKey(typeName))
                     types[typeName] = new List<Object>();
@@ -33,7 +39,7 @@ public TypeSelectionList(Object[] objects)
 
             // Create and store a TypeSelection per type.
             m_TypeSelections = new List<TypeSelection>();
-            foreach (KeyValuePair<string, List<Object>> kvp in types)
+            foreach (var kvp in types)
                 m_TypeSelections.Add(new TypeSelection(kvp.Key, kvp.Value.ToArray()));
 
             // Sort the TypeSelections
@@ -50,7 +56,11 @@ public TypeSelection(string typeName, Object[] objects)
         {
             System.Diagnostics.Debug.Assert(objects != null && objects.Length >= 1);
             this.objects = objects;
-            label = new GUIContent(objects.Length + " " + ObjectNames.NicifyVariableName(typeName) + (objects.Length > 1 ? "s" : ""));
+
+            label = new GUIContent(
+                $"{objects.Length} " +
+                $"{ObjectNames.NicifyVariableName(string.Format(typeName, objects.Length > 1 ? "s" : ""))}");
+
             if (objects[0] is GameObject)
                 label.image = EditorUtility.IsPersistent(objects[0]) ? PrefabUtility.GameObjectStyles.prefabIcon : PrefabUtility.GameObjectStyles.gameObjectIcon;
             else
diff --git a/Editor/Mono/GUI/WindowLayout.cs b/Editor/Mono/GUI/WindowLayout.cs
index 9e1967aa73..3d4abc50bd 100644
--- a/Editor/Mono/GUI/WindowLayout.cs
+++ b/Editor/Mono/GUI/WindowLayout.cs
@@ -82,8 +82,10 @@ public float size
         internal static string layoutsPreferencesPath => FileUtil.CombinePaths(InternalEditorUtility.unityPreferencesFolder, "Layouts");
         internal static string layoutsModePreferencesPath => FileUtil.CombinePaths(layoutsPreferencesPath, ModeService.currentId);
         internal static string layoutsDefaultModePreferencesPath => FileUtil.CombinePaths(layoutsPreferencesPath, "default");
+        internal static string layoutsCurrentModePreferencesPath => FileUtil.CombinePaths(layoutsPreferencesPath, "current");
         internal static string layoutsProjectPath => FileUtil.CombinePaths("UserSettings", "Layouts");
         internal static string ProjectLayoutPath => GetProjectLayoutPerMode(ModeService.currentId);
+        internal static string currentLayoutName => GetLayoutFileName(ModeService.currentId, Application.unityVersionVer);
 
         [UsedImplicitly, RequiredByNativeCode]
         public static void LoadDefaultWindowPreferences()
@@ -97,14 +99,13 @@ public static void LoadCurrentModeLayout(bool keepMainWindow)
             InitializeLayoutPreferencesFolder();
             var dynamicLayout = ModeService.GetDynamicLayout();
             if (dynamicLayout == null)
-                LoadProjectLayout(keepMainWindow);
+                LoadLastUsedLayoutForCurrentMode(keepMainWindow);
             else
             {
-
                 var projectLayoutExists = File.Exists(ProjectLayoutPath);
                 if ((projectLayoutExists && Convert.ToBoolean(dynamicLayout["restore_saved_layout"]))
                     || !LoadModeDynamicLayout(keepMainWindow, dynamicLayout))
-                    LoadProjectLayout(keepMainWindow);
+                    LoadLastUsedLayoutForCurrentMode(keepMainWindow);
             }
         }
 
@@ -210,7 +211,7 @@ internal static void InitContainerWindow(ref ContainerWindow window, string wind
         {
             if (window == null)
             {
-                
+
                 window = ScriptableObject.CreateInstance<ContainerWindow>();
 
                 var windowMinSize = new Vector2(120, 80);
@@ -283,7 +284,7 @@ internal static ContainerWindow ShowWindowWithDynamicLayout(string windowId, str
 
                 var window = Resources.FindObjectsOfTypeAll<ContainerWindow>().FirstOrDefault(w => w.windowID == windowId);
                 InitContainerWindow(ref window, windowId, layoutData);
-
+                window.m_IsMppmCloneWindow = true;
                 GenerateLayout(window, ShowMode.Utility, availableEditorWindowTypes, centerViewInfo, topViewInfo, bottomViewInfo, layoutData);
                 return window;
             }
@@ -413,23 +414,73 @@ private static bool ParseViewData(Type[] availableEditorWindowTypes, object view
             return true;
         }
 
-        private static void LoadProjectLayout(bool keepMainWindow)
+        // Used by tests
+        internal static string GetLayoutFileName(string mode, int version) => $"{mode}-{version}.dwlt";
+
+        static IEnumerable<string> GetCurrentModeLayouts()
         {
-            var projectLayoutExists = File.Exists(ProjectLayoutPath);
-            if (!projectLayoutExists)
+            var layouts = ModeService.GetModeDataSection(ModeService.currentIndex, ModeDescriptor.LayoutsKey);
+
+            if (layouts is IList<object> modeLayoutPaths)
             {
-                var currentLayoutPath = GetCurrentLayoutPath();
-                if (EnsureDirectoryCreated(ProjectLayoutPath))
+                foreach (var layoutPath in modeLayoutPaths.Cast<string>())
                 {
-                    Console.WriteLine($"[LAYOUT] LoadProjectLayout: Copying Project Current Layout: {ProjectLayoutPath} from {currentLayoutPath}");
-                    FileUtil.CopyFileOrDirectory(currentLayoutPath, ProjectLayoutPath);
+                    if (!File.Exists(layoutPath))
+                        continue;
+                    yield return layoutPath;
                 }
             }
+        }
 
-            Debug.Assert(File.Exists(ProjectLayoutPath));
+        // Iterate through potential layouts in descending order of precedence.
+        // 1. Last loaded layout in project for matching Unity version
+        // 2. Last loaded layout in project for any Unity version, in descending alphabetical order
+        // 3. Last loaded layout in global preferences for matching Unity version
+        // 4. Last loaded layout in global preferences for any Unity version, in descending alphabetical order
+        // 5. Any available layouts specified by the EditorMode, if EditorMode supplies layouts
+        // 6. The factory default layout
+        private static void LoadLastUsedLayoutForCurrentMode(bool keepMainWindow)
+        {
+            // steps 1-4
+            foreach (var layout in GetLastLayout())
+                if (LoadWindowLayout(layout, layout != ProjectLayoutPath, false, keepMainWindow, false))
+                    return;
+
+            // step 5
+            foreach (var layout in GetCurrentModeLayouts())
+                if (LoadWindowLayout(layout, layout != ProjectLayoutPath, false, keepMainWindow, false))
+                    return;
+
+            // step 6
+            var defaultLayout = Path.Combine(layoutsDefaultModePreferencesPath, kDefaultLayoutName);
+
+            // If all else fails, load the default layout that ships with the editor. If that fails, prompt the user to
+            // restore the default layouts.
+            if (!LoadWindowLayout(defaultLayout, true, false, keepMainWindow, false))
+            {
+                int option = 0;
 
-            // Load the current project layout
-            LoadWindowLayout(ProjectLayoutPath, !projectLayoutExists, false, keepMainWindow);
+                if (!Application.isTestRun && Application.isHumanControllingUs)
+                {
+                    option = EditorUtility.DisplayDialogComplex("Missing Default Layout", "No valid user created or " +
+                        "default window layout found. Please revert factory settings to restore the default layouts.",
+                        "Quit", "Revert Factory Settings", "");
+                }
+                else
+                {
+                    ResetUserLayouts();
+                }
+
+                switch (option)
+                {
+                    case 0:
+                        EditorApplication.Exit(0);
+                        break;
+                    case 1:
+                        ResetFactorySettings();
+                        break;
+                }
+            }
         }
 
         [UsedImplicitly, RequiredByNativeCode]
@@ -444,8 +495,49 @@ public static void SaveDefaultWindowPreferences()
 
         internal static void SaveCurrentLayoutPerMode(string modeId)
         {
-            // Save Project Current Layout
+            // Save the layout in two places. Once in the Project/UserSettings directory, then again the global
+            // preferences. The latter is used when opening a new project (or any case where UserSettings/Layouts/ does
+            // not exist).
             SaveWindowLayout(FileUtil.CombinePaths(Directory.GetCurrentDirectory(), GetProjectLayoutPerMode(modeId)));
+            SaveWindowLayout(Path.Combine(layoutsCurrentModePreferencesPath, GetLayoutFileName(modeId, Application.unityVersionVer)));
+        }
+
+        // Iterate through potential layout files, prioritizing exact match followed by descending unity version.
+        // IMPORTANT: This function is "dumb" in that it does not do any kind of sophisticated version comparison. If the
+        // naming scheme for current layouts is changed, or this function is called on to sort user saved layouts, you will
+        // need to add more sophisticated filtering.
+        public static IEnumerable<string> GetLastLayout(string directory, string mode, int version)
+        {
+            var currentModeAndVersionLayout = GetLayoutFileName(mode, version);
+            string layoutSearchPattern = $"{mode}-*.*wlt";
+
+            // first try the exact match
+            var preferred = Path.Combine(directory, currentModeAndVersionLayout);
+
+            if(File.Exists(preferred))
+                yield return preferred;
+
+            // if that fails, fall back to layouts for this mode from other unity versions in descending order
+            if (Directory.Exists(directory))
+            {
+                var paths = Directory.GetFiles(directory, layoutSearchPattern)
+                                     .Where(p => string.Compare(p, preferred, StringComparison.OrdinalIgnoreCase) != 0)
+                                     .OrderByDescending(p => p, StringComparer.OrdinalIgnoreCase);
+
+                foreach (var path in paths)
+                    yield return path;
+            }
+        }
+
+        // used by Tests/EditModeAndPlayModeTests/EditorModes
+        internal static IEnumerable<string> GetLastLayout()
+        {
+            var mode = ModeService.currentId;
+            var version = Application.unityVersionVer;
+            foreach (var layout in GetLastLayout(layoutsProjectPath, mode, version))
+                yield return layout;
+            foreach (var layout in GetLastLayout(layoutsCurrentModePreferencesPath, mode, version))
+                yield return layout;
         }
 
         internal static string GetCurrentLayoutPath()
@@ -466,7 +558,7 @@ internal static string GetDefaultLayoutPath()
 
         internal static string GetProjectLayoutPerMode(string modeId)
         {
-            return FileUtil.CombinePaths(layoutsProjectPath, $"{modeId}-{Application.unityVersionVer}.dwlt");
+            return FileUtil.CombinePaths(layoutsProjectPath, GetLayoutFileName(modeId, Application.unityVersionVer));
         }
 
         private static void InitializeLayoutPreferencesFolder()
@@ -545,7 +637,7 @@ internal static void ReloadWindowLayoutMenu()
                 foreach (var layoutPath in layoutPaths)
                 {
                     var name = Path.GetFileNameWithoutExtension(layoutPath);
-                    Menu.AddMenuItem("Window/Layouts/" + name, "", false, layoutMenuItemPriority++, () => LoadWindowLayout(layoutPath, false, true, true), null);
+                    Menu.AddMenuItem("Window/Layouts/" + name, "", false, layoutMenuItemPriority++, () => LoadWindowLayout(layoutPath, false, true, true, true), null);
                 }
 
                 layoutMenuItemPriority += 500;
@@ -563,7 +655,7 @@ internal static void ReloadWindowLayoutMenu()
                     if (!File.Exists(layoutPath))
                         continue;
                     var name = Path.GetFileNameWithoutExtension(layoutPath);
-                    Menu.AddMenuItem("Window/Layouts/" + name, "", Toolbar.lastLoadedLayoutName == name, layoutMenuItemPriority++, () => LoadWindowLayout(layoutPath, false), null);
+                    Menu.AddMenuItem("Window/Layouts/" + name, "", Toolbar.lastLoadedLayoutName == name, layoutMenuItemPriority++, () => TryLoadWindowLayout(layoutPath, false), null);
                 }
             }
 
@@ -586,7 +678,7 @@ private static void AddLegacyLayoutMenuItems(ref int layoutMenuItemPriority)
             const string legacyRootMenu = "Window/Layouts/Other Versions";
             const string legacyCurrentLayoutPath = "Library/CurrentLayout-default.dwlt";
             if (File.Exists(legacyCurrentLayoutPath))
-                Menu.AddMenuItem($"{legacyRootMenu}/Default (2020)", "", false, layoutMenuItemPriority++, () => LoadWindowLayout(legacyCurrentLayoutPath, false, true, false), null);
+                Menu.AddMenuItem($"{legacyRootMenu}/Default (2020)", "", false, layoutMenuItemPriority++, () => LoadWindowLayout(legacyCurrentLayoutPath, false, true, false, true), null);
 
             if (!Directory.Exists(layoutsProjectPath))
                 return;
@@ -603,7 +695,7 @@ private static void AddLegacyLayoutMenuItems(ref int layoutMenuItemPriority)
                     name = ObjectNames.NicifyVariableName(names[0]);
                     menuName = $"{legacyRootMenu}/{name} ({names[1]})";
                 }
-                Menu.AddMenuItem(menuName, "", false, layoutMenuItemPriority++, () => LoadWindowLayout(layoutPath, false, true, false), null);
+                Menu.AddMenuItem(menuName, "", false, layoutMenuItemPriority++, () => LoadWindowLayout(layoutPath, false, true, false, true), null);
             }
         }
 
@@ -731,97 +823,6 @@ internal static EditorWindow GetMaximizedWindow()
             return null;
         }
 
-        internal static EditorWindow ShowAppropriateViewOnEnterExitPlaymodeList(bool entering, out List<PlayModeView> allWindows)
-        {
-            allWindows = new List<PlayModeView>();
-
-            int[] map = new[] { 4, 3, 1, 2 };
-            var allWindowsBase = PlayModeView.GetAllPlayModeViewWindows()
-                .OrderBy(c => map[(int)(c.enterPlayModeBehavior)]).ToList();
-
-            foreach (var w in allWindowsBase)
-            {
-                allWindows.Add(w);
-            }
-
-            // Prevent trying to go into the same state as we're already in, as it will break things
-            if (WindowFocusState.instance.m_CurrentlyInPlayMode == entering)
-                return null;
-
-            WindowFocusState.instance.m_CurrentlyInPlayMode = entering;
-
-            EditorWindow window = null;
-            EditorWindow maximized = GetMaximizedWindow();
-
-            if (entering)
-            {
-                if (!GameView.openWindowOnEnteringPlayMode && !(PlayModeView.GetCorrectPlayModeViewToFocus() is PlayModeView))
-                    return null;
-
-                WindowFocusState.instance.m_WasMaximizedBeforePlay = (maximized != null);
-
-                // If a view is already maximized before entering play mode,
-                // just keep that maximized view, no matter if it's the game view or some other.
-                // Trust that user has a good reason (desire by Ethan etc.)
-                if (maximized != null)
-                {
-                    return maximized;
-                }
-            }
-            else
-            {
-                // If a view was already maximized before entering play mode,
-                // then it was kept when switching to play mode, and can simply still be kept when exiting
-                if (WindowFocusState.instance.m_WasMaximizedBeforePlay)
-                {
-                    return maximized;
-                }
-            }
-
-            // Unmaximize if maximized
-            if (maximized)
-                Unmaximize(maximized);
-
-            // Try finding and focusing appropriate window/tab
-            window = TryFocusAppropriateWindow(entering);
-            if (window)
-            {
-                return window;
-            }
-
-            // If we are entering Play more and no Game View was found, create one
-            if (entering && PlayModeView.openWindowOnEnteringPlayMode)
-            {
-
-                // Try to create and focus a Game View tab docked together with the Scene View tab
-                EditorWindow sceneView = FindEditorWindowOfType(typeof(SceneView));
-                GameView gameView;
-                if (sceneView && sceneView.m_Parent is DockArea)
-                {
-                    DockArea dock = sceneView.m_Parent as DockArea;
-                    if (dock)
-                    {
-                        WindowFocusState.instance.m_LastWindowTypeInSameDock = sceneView.GetType().ToString();
-                        gameView = ScriptableObject.CreateInstance<GameView>();
-                        dock.AddTab(gameView);
-
-                        allWindows.Add(gameView);
-                        return gameView;
-                    }
-                }
-
-                // If no Scene View was found at all, just create a floating Game View
-                gameView = ScriptableObject.CreateInstance<GameView>();
-                gameView.Show(true);
-                gameView.Focus();
-
-                allWindows.Add(gameView);
-                return gameView;
-            }
-
-            return window;
-        }
-
         internal static EditorWindow ShowAppropriateViewOnEnterExitPlaymode(bool entering)
         {
             // Prevent trying to go into the same state as we're already in, as it will break things
@@ -1208,12 +1209,17 @@ static void DeleteWindowLayoutImpl(string name, string path)
             ShortcutIntegration.instance.RebuildShortcuts();
         }
 
-        public static bool LoadWindowLayout(string path, bool newProjectLayoutWasCreated)
+        // Attempts to load a layout. If unsuccessful, restores the previous layout.
+        public static bool TryLoadWindowLayout(string path, bool newProjectLayoutWasCreated)
         {
-            return LoadWindowLayout(path, newProjectLayoutWasCreated, true, false);
+            SaveDefaultWindowPreferences();
+            if (LoadWindowLayout(path, newProjectLayoutWasCreated, true, false, true))
+                return true;
+            LoadCurrentModeLayout(FindMainWindow());
+            return false;
         }
 
-        public static bool LoadWindowLayout(string path, bool newProjectLayoutWasCreated, bool setLastLoadedLayoutName, bool keepMainWindow)
+        public static bool LoadWindowLayout(string path, bool newProjectLayoutWasCreated, bool setLastLoadedLayoutName, bool keepMainWindow, bool logErrorsToConsole)
         {
             Console.WriteLine($"[LAYOUT] About to load {path}, keepMainWindow={keepMainWindow}");
 
@@ -1223,8 +1229,6 @@ public static bool LoadWindowLayout(string path, bool newProjectLayoutWasCreated
             bool mainWindowMaximized = ContainerWindow.mainWindow?.maximized ?? false;
             Rect mainWindowPosition = ContainerWindow.mainWindow?.position ?? new Rect();
 
-            bool layoutLoadingIssue = false;
-
             // Load new windows and show them
             try
             {
@@ -1248,7 +1252,7 @@ public static bool LoadWindowLayout(string path, bool newProjectLayoutWasCreated
                 UnityObject[] loadedWindows = InternalEditorUtility.LoadSerializedFileAndForget(path);
 
                 if (loadedWindows == null || loadedWindows.Length == 0)
-                    throw new LayoutException($"Window layout at {path} could not be loaded.");
+                    throw new LayoutException("No windows found in layout.");
 
                 List<UnityObject> newWindows = new List<UnityObject>();
 
@@ -1264,10 +1268,9 @@ public static bool LoadWindowLayout(string path, bool newProjectLayoutWasCreated
                     {
                         if (!editorWin || !editorWin.m_Parent || !editorWin.m_Parent.window)
                         {
-                            Console.WriteLine("[LAYOUT] Removed unparented EditorWindow while reading window layout: window #" + i + ", type=" +
-                                o.GetType() + ", instanceID=" + o.GetInstanceID());
+                            Console.WriteLine($"[LAYOUT] Removed un-parented EditorWindow while reading window layout" +
+                                              $" window #{i}, type={o.GetType()} instanceID={o.GetInstanceID()}");
                             UnityObject.DestroyImmediate(editorWin, true);
-                            layoutLoadingIssue = true;
                             continue;
                         }
                     }
@@ -1315,6 +1318,8 @@ public static bool LoadWindowLayout(string path, bool newProjectLayoutWasCreated
                         if (mainWindowPosition.width != 0.0)
                         {
                             mainWindowToSetSize = cur;
+                            // This is the same reference as the mainwindow, so need to freeze it too on for Linux during reload.
+                            mainWindowToSetSize.SetFreeze(true);
                             mainWindowToSetSize.position = mainWindowPosition;
                         }
 
@@ -1336,16 +1341,23 @@ public static bool LoadWindowLayout(string path, bool newProjectLayoutWasCreated
                 }
 
                 if (mainWindowToSetSize)
+                {
+                    mainWindowToSetSize.SetFreeze(true);
                     mainWindowToSetSize.position = mainWindowPosition;
+                }
 
                 // Always show main window before other windows. So that other windows can
                 // get their parent/owner.
                 if (!mainWindow)
                     throw new LayoutException("Error while reading window layout: no main window found");
 
+                // Don't adjust height to prevent main window shrink during layout on Linux.
+                mainWindow.SetFreeze(true);
                 mainWindow.Show(mainWindow.showMode, loadPosition: true, displayImmediately: true, setFocus: true);
                 if (mainWindowToSetSize && mainWindow.maximized != mainWindowMaximized)
                     mainWindow.ToggleMaximize();
+                // Unfreeze to make sure resize work properly.
+                mainWindow.SetFreeze(false);
 
                 // Make sure to restore the save to layout flag when loading a layout from a file.
                 if (keepMainWindow)
@@ -1366,40 +1378,23 @@ public static bool LoadWindowLayout(string path, bool newProjectLayoutWasCreated
                         containerWindow.Show(containerWindow.showMode, loadPosition: false, displayImmediately: true, setFocus: true);
                 }
 
-                // Unmaximize maximized PlayModeView window if maximize on play is enabled
+                // Un-maximize maximized PlayModeView window if maximize on play is enabled
                 PlayModeView playModeView = GetMaximizedWindow() as PlayModeView;
                 if (playModeView != null && playModeView.enterPlayModeBehavior == PlayModeView.EnterPlayModeBehavior.PlayMaximized)
                     Unmaximize(playModeView);
             }
             catch (Exception ex)
             {
-                Debug.LogError("Failed to load window layout: " + ex);
-
-                int option = 0;
-                if (!Application.isTestRun && Application.isHumanControllingUs)
-                {
-                    option = EditorUtility.DisplayDialogComplex("Failed to load window layout",
-                        $"This can happen if layout contains custom windows and there are compile errors in the project.\r\n\r\n{ex.Message}",
-                        "Load Default Layout", "Quit", "Revert Factory Settings");
-                }
+                // When loading a new project we don't want to log an error if one of the last saved layouts throws.
+                // There isn't anything useful a user can do about it, and we can gracefully recover. However when a
+                // layout is loaded from the menu or a mode change, we do want to let the user know about layout loading
+                // problems because they can act on it by either deleting the layout or importing whatever asset is
+                // missing.
+                var error = $"Failed to load window layout \"{path}\": {ex}";
+                if(logErrorsToConsole)
+                    Debug.LogError(error);
                 else
-                {
-                    ResetUserLayouts();
-                }
-
-                switch (option)
-                {
-                    case 0:
-                        LoadDefaultLayout();
-                        break;
-                    case 1:
-                        EditorApplication.Exit(0);
-                        break;
-                    case 2:
-                        ResetFactorySettings();
-                        break;
-                }
-
+                    Console.WriteLine($"[LAYOUT] {error}");
                 return false;
             }
             finally
@@ -1412,9 +1407,6 @@ public static bool LoadWindowLayout(string path, bool newProjectLayoutWasCreated
                     Toolbar.lastLoadedLayoutName = null;
             }
 
-            if (layoutLoadingIssue)
-                Debug.Log("The editor layout could not be fully loaded, this can happen when the layout contains EditorWindows not available in this project");
-
             return true;
         }
 
@@ -1431,7 +1423,7 @@ internal static void LoadDefaultLayout()
             }
             Debug.Assert(File.Exists(ProjectLayoutPath));
 
-            LoadWindowLayout(ProjectLayoutPath, true);
+            LoadWindowLayout(ProjectLayoutPath, true, true, false, false);
         }
 
         public static void CloseWindows()
@@ -1553,11 +1545,9 @@ internal static void SaveGUI()
         public static void LoadFromFile()
         {
             var layoutFilePath = EditorUtility.OpenFilePanelWithFilters("Load layout from disk...", "", new[] {"Layout", "wlt"});
-            if (String.IsNullOrEmpty(layoutFilePath))
+            if (string.IsNullOrEmpty(layoutFilePath))
                 return;
-
-            if (LoadWindowLayout(layoutFilePath, false))
-                Debug.LogFormat(LogType.Log, LogOption.NoStacktrace, null, "Loaded layout from " + layoutFilePath);
+            TryLoadWindowLayout(layoutFilePath, false);
         }
 
         public static void SaveToFile()
@@ -1622,6 +1612,7 @@ internal class SaveWindowLayout : EditorWindow
         const int k_Width = 200;
         const int k_Height = 48;
         const int k_HelpBoxHeight = 40;
+        const int k_MaxLayoutNameLength = 128;
 
         static readonly string k_InvalidChars = EditorUtility.GetInvalidFilenameChars();
         static readonly string s_InvalidCharsFormatString = L10n.Tr("Invalid characters: {0}");
@@ -1632,6 +1623,7 @@ internal static SaveWindowLayout ShowWindow()
         {
             SaveWindowLayout w = GetWindowDontShow<SaveWindowLayout>();
             w.minSize = w.maxSize = new Vector2(k_Width, k_Height);
+            w.m_Pos = new Rect(0, 0,k_Width, k_Height);
             w.ShowAuxWindow();
             return w;
         }
@@ -1659,10 +1651,14 @@ void OnGUI()
             }
             GUI.SetNextControlName("m_PreferencesName");
             EditorGUI.BeginChangeCheck();
-            m_LayoutName = EditorGUILayout.TextField(m_LayoutName);
-            m_LayoutName = m_LayoutName.TrimEnd();
+            m_LayoutName = EditorGUILayout.TextField(m_LayoutName);            
             if (EditorGUI.EndChangeCheck())
             {
+                if (m_LayoutName.Length > k_MaxLayoutNameLength)
+                {                    
+                    m_LayoutName = m_LayoutName.Substring(0, k_MaxLayoutNameLength);
+                }
+                m_LayoutName = m_LayoutName.TrimEnd();
                 UpdateCurrentInvalidChars();
             }
 
@@ -1788,7 +1784,7 @@ internal static WindowFocusState instance
             get
             {
                 if (m_Instance == null)
-                    m_Instance = FindObjectOfType(typeof(WindowFocusState)) as WindowFocusState;
+                    m_Instance = FindFirstObjectByType(typeof(WindowFocusState)) as WindowFocusState;
                 if (m_Instance == null)
                     m_Instance = CreateInstance<WindowFocusState>();
                 return m_Instance;
diff --git a/Editor/Mono/GUIView.cs b/Editor/Mono/GUIView.cs
index a1c000a816..e4f8dde6c7 100644
--- a/Editor/Mono/GUIView.cs
+++ b/Editor/Mono/GUIView.cs
@@ -222,15 +222,6 @@ protected override void OnDestroy()
             base.OnDestroy();
         }
 
-        // Draw resize handles, etc.
-        internal virtual void DoWindowDecorationStart()
-        {
-        }
-
-        internal virtual void DoWindowDecorationEnd()
-        {
-        }
-
         [RequiredByNativeCode]
         internal string GetViewName()
         {
@@ -272,8 +263,6 @@ public static void BeginOffsetArea(Rect screenRect, GUIContent content, GUIStyle
 
         public static void EndOffsetArea()
         {
-            if (Event.current.type == EventType.Used)
-                return;
             GUILayoutUtility.EndLayoutGroup();
             GUI.EndGroup();
         }
@@ -302,5 +291,17 @@ internal void CaptureMetalScene()
                 System.Diagnostics.Process.Start(System.IO.Path.GetDirectoryName(path));
             }
         }
+
+        static readonly Action<TextElement> k_QueryMarkDirty = MarkDirtyRepaint;
+
+        static void MarkDirtyRepaint(TextElement v)
+        {
+            v.MarkDirtyRepaint();
+        }
+
+        internal void RepaintUITKText()
+        {
+            visualTree.Query<TextElement>().ForEach(k_QueryMarkDirty);
+        }
     }
 } //namespace
diff --git a/Editor/Mono/GameView/GameView.cs b/Editor/Mono/GameView/GameView.cs
index 6472f31aa3..1114656c02 100644
--- a/Editor/Mono/GameView/GameView.cs
+++ b/Editor/Mono/GameView/GameView.cs
@@ -38,7 +38,7 @@ Floating GameView in separate window
 namespace UnityEditor
 {
     [EditorWindowTitle(title = "Game", useTypeNameAsIconName = true)]
-    internal class GameView : PlayModeView, IHasCustomMenu, IGameViewSizeMenuUser, IGameViewOnPlayMenuUser
+    internal class GameView : PlayModeView, IHasCustomMenu, IGameViewSizeMenuUser
     {
         const int kScaleSliderMinWidth = 30;
         const int kScaleSliderMaxWidth = 150;
@@ -68,7 +68,6 @@ float maxScale
         }
 
         [SerializeField] bool m_VSyncEnabled;
-        [SerializeField] bool m_PlayFocused;
         [SerializeField] bool m_Gizmos;
         [SerializeField] bool m_Stats;
         [SerializeField] int[] m_SelectedSizes = new int[0]; // We have a selection for each game view size group (e.g standalone, android etc)
@@ -84,8 +83,6 @@ float maxScale
         [SerializeField] bool[] m_LowResolutionForAspectRatios = new bool[0];
         [SerializeField] int m_XRRenderMode = 0;
         [SerializeField] RenderTexture m_RenderTexture;
-        [SerializeField] bool m_showToolbar = true;
-        [SerializeField] bool m_showToolbarOnFullscreen = false;
 
         int m_SizeChangeID = int.MinValue;
 
@@ -110,8 +107,6 @@ internal static class Styles
             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.");
 
             public const string k_StatsShortcutID = "Game View/Toggle Stats";
             public const string k_StatsTooltip = "View general rendering information";
@@ -127,35 +122,10 @@ static Styles()
                 gameViewBackgroundStyle = "GameViewBackground";
                 renderdocContent = EditorGUIUtility.TrIconContent("FrameCapture", RenderDocUtil.openInRenderDocTooltip);
             }
-
-            public static readonly GUIStyle largeCenteredText = new GUIStyle(EditorStyles.label)
-            {
-                name = "large-centered-text",
-                richText = true,
-                wordWrap = true,
-                alignment = TextAnchor.MiddleCenter,
-                margin = new RectOffset(4, 4, 1, 4),
-                padding = new RectOffset(4, 4, 4, 4),
-                fontSize = 42
-            };
-            public static readonly GUIStyle smallCenteredText = new GUIStyle(EditorStyles.label)
-            {
-                name = "small-centered-text",
-                richText = true,
-                wordWrap = true,
-                alignment = TextAnchor.MiddleCenter,
-                margin = new RectOffset(4, 4, 1, 4),
-                padding = new RectOffset(4, 4, 4, 4),
-                fontSize = 12
-            };
         }
 
-
         static double s_LastScrollTime;
 
-        [FreeFunction]
-        extern private static bool NeedToPerformRendering();
-
         public GameView()
         {
             autoRepaintOnSceneChange = true;
@@ -169,81 +139,6 @@ public GameView()
             textureHideFlags = HideFlags.HideAndDontSave;
         }
 
-        internal override void ApplyEditorDisplayFullscreenSetting(IPlayModeViewFullscreenSettings settings)
-        {
-            var gameviewSetting = settings as GameViewFullscreenSettings;
-            if (gameviewSetting == null)
-            {
-                return;
-            }
-
-            isFullscreen = true;
-
-            var changed = false;
-
-            if (ModuleManager.ShouldShowMultiDisplayOption())
-            {
-                if (targetDisplay != gameviewSetting.DisplayNumber)
-                {
-                    targetDisplay = gameviewSetting.DisplayNumber;
-                    changed = true;
-                }
-            }
-
-            if (m_showToolbarOnFullscreen != gameviewSetting.ShowToolbar)
-            {
-                m_showToolbarOnFullscreen = gameviewSetting.ShowToolbar;
-                changed = true;
-            }
-
-            if (m_Stats != gameviewSetting.ShowStats)
-            {
-                m_Stats = gameviewSetting.ShowStats;
-                changed = true;
-            }
-
-            if (m_Gizmos != gameviewSetting.ShowGizmos)
-            {
-                m_Gizmos = gameviewSetting.ShowGizmos;
-                changed = true;
-            }
-
-            if (canVSync)
-            {
-                if (m_VSyncEnabled != gameviewSetting.VsyncEnabled)
-                {
-                    m_VSyncEnabled = gameviewSetting.VsyncEnabled;
-                    SetVSync(m_VSyncEnabled);
-                    changed = true;
-                }
-            }
-
-            if (selectedSizeIndex != gameviewSetting.SelectedSizeIndex)
-            {
-                selectedSizeIndex = gameviewSetting.SelectedSizeIndex;
-                changed = true;
-            }
-
-            if (changed)
-            {
-                UpdateZoomAreaAndParent();
-            }
-        }
-
-        private bool canVSync
-        {
-            get
-            {
-                var gfxDeviceType = SystemInfo.graphicsDeviceType;
-                return
-                    gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Metal ||
-                    gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Vulkan ||
-                    gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Direct3D11 ||
-                    gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Direct3D12 ||
-                    gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.OpenGLCore;
-            }
-        }
-
         public bool lowResolutionForAspectRatios
         {
             get
@@ -277,12 +172,6 @@ public bool vSyncEnabled
             }
         }
 
-        public bool playFocused
-        {
-            get { return m_PlayFocused; }
-            set { m_PlayFocused = value; }
-        }
-
         public int selectedSizeIndex
         {
             get
@@ -312,9 +201,7 @@ internal void SetTargetDisplay(int id)
 
         Rect GetViewInWindow(Rect pos)
         {
-            if (showToolbar)
-                return new Rect(0, EditorGUI.kWindowToolbarHeight, pos.width, pos.height - EditorGUI.kWindowToolbarHeight);
-            return new Rect(0, 0, pos.width, pos.height);
+            return new Rect(0, EditorGUI.kWindowToolbarHeight, pos.width, pos.height - EditorGUI.kWindowToolbarHeight);
         }
 
         Rect GetViewPixelRect(Rect viewRectInWindow)
@@ -410,12 +297,6 @@ Rect targetInParent // Area of the render target in parent view space
 
         float gameMouseScale { get { return EditorGUIUtility.pixelsPerPoint / m_ZoomArea.scale.y; } }
 
-        private bool showToolbar
-        {
-            get => isFullscreen ? m_showToolbarOnFullscreen : m_showToolbar;
-            set => m_showToolbar = value;
-        }
-
         internal bool drawGizmos
         {
             get => m_Gizmos;
@@ -438,15 +319,12 @@ public void OnEnable()
             prevSizeGroupType = (int)currentSizeGroupType;
             titleContent = GetLocalizedTitleContent();
             UpdateZoomAreaAndParent();
-            showToolbar = ModeService.HasCapability(ModeCapability.GameViewToolbar, true);
 
             ModeService.modeChanged += OnEditorModeChanged;
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
             Undo.undoRedoEvent += UndoRedoPerformed;
 
-            if (!suppressRenderingForFullscreen)
-                targetSize = targetRenderSize;
-
+            targetSize = targetRenderSize;
             PlayModeAnalytics.GameViewEnableEvent();
         }
 
@@ -472,9 +350,6 @@ internal static Vector2 GetSizeOfMainGameView()
 
         private void UpdateZoomAreaAndParent()
         {
-            if (suppressRenderingForFullscreen)
-                return;
-
             // Configure ZoomableArea for new resolution so that old resolution doesn't restrict scale
             bool oldScaleWasDefault = Mathf.Approximately(m_ZoomArea.scale.y, m_defaultScale);
             ConfigureZoomArea();
@@ -501,8 +376,7 @@ protected void AllowCursorLockAndHide(bool enable)
         private void OnFocus()
         {
             SetFocus(true);
-            if (!suppressRenderingForFullscreen)
-                targetSize = targetRenderSize;
+            targetSize = targetRenderSize;
         }
 
         private void OnLostFocus()
@@ -520,18 +394,21 @@ private void OnLostFocus()
 
         internal override void OnResized()
         {
-            if (!suppressRenderingForFullscreen)
-                targetSize = targetRenderSize;
+            targetSize = targetRenderSize;
         }
 
         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
-
-            if (suppressRenderingForFullscreen)
+            // If we are switching from GameView to Simulator, this call will overwrite the value already written
+            //   by the SimulatorView since both tabs exist for a brief period of time. Don't do anything here
+            //   if this view is the one being switched out.
+            if (m_SwitchingPlayModeViewType)
+            {
                 return;
+            }
 
+            // 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);
             var newTargetSize =
@@ -671,31 +548,6 @@ private bool ShouldShowMetalFrameCaptureGUI()
                 || FrameCapture.IsDestinationSupported(FrameCaptureDestination.GPUTraceDocument);
         }
 
-        private void MirrorFullscreenToolbarSettings()
-        {
-            if (enterPlayModeBehavior != EnterPlayModeBehavior.PlayFullscreen)
-                return;
-
-            // Even though there is a 1:1 relationship between a fullscreen game view, and the "suppressed" game view that
-            // spawned it, it's not easy to distingush which game view controls which sub game view. Rather than brutally
-            // enforce the 1:1 relationship allow any game view with the selected fullscreen idx, to control the settings
-            // on that fullscreen container window.
-            int displayIdx = fullscreenMonitorIdx;
-            List<ContainerWindow> fullscreenContainers = EditorFullscreenController.GetFullscreenContainersForDisplayIndex(displayIdx);
-            foreach (var cw in fullscreenContainers)
-            {
-                var fullscreenGameView = (cw.rootView as HostView).actualView as GameView;
-
-                fullscreenGameView.targetDisplay = this.targetDisplay;
-                fullscreenGameView.m_ZoomArea = this.m_ZoomArea;
-                fullscreenGameView.UpdateZoomAreaAndParent();
-                fullscreenGameView.m_Stats = this.m_Stats;
-                fullscreenGameView.m_Gizmos = this.m_Gizmos;
-
-            }
-
-        }
-
         private void DoToolbarGUI()
         {
             if (Event.current.isKey || Event.current.type == EventType.Used)
@@ -705,28 +557,22 @@ private void DoToolbarGUI()
 
             GUILayout.BeginHorizontal(EditorStyles.toolbar);
             {
-                if (!isFullscreen)
+                var availableTypes = GetAvailableWindowTypes();
+                if (availableTypes.Count > 1)
                 {
-                    EditorGUI.BeginDisabled(enterPlayModeBehavior == EnterPlayModeBehavior.PlayFullscreen);
-                    var availableTypes = GetAvailableWindowTypes();
-                    if (availableTypes.Count > 1)
+                    var typeNames = availableTypes.Values.ToList();
+                    var types = availableTypes.Keys.ToList();
+                    int viewIndex = EditorGUILayout.Popup(typeNames.IndexOf(titleContent.text), typeNames.ToArray(),
+                        EditorStyles.toolbarPopup,
+                        GUILayout.Width(90));
+                    if (viewIndex == -1)
+                        viewIndex = 0;
+
+                    EditorGUILayout.Space();
+                    if (types[viewIndex] != typeof(GameView))
                     {
-                        var typeNames = availableTypes.Values.ToList();
-                        var types = availableTypes.Keys.ToList();
-                        var viewIndex = types.IndexOf(typeof(GameView));
-                        if (viewIndex == -1)
-                            viewIndex = 0;
-
-                        viewIndex = EditorGUILayout.Popup(viewIndex, typeNames.ToArray(),
-                            EditorStyles.toolbarPopup,
-                            GUILayout.Width(90));
-                        EditorGUILayout.Space();
-                        if (types[viewIndex] != typeof(GameView))
-                        {
-                            SwapMainWindow(types[viewIndex]);
-                        }
+                        SwapMainWindow(types[viewIndex]);
                     }
-                    EditorGUI.EndDisabled();
                 }
 
                 if (ModuleManager.ShouldShowMultiDisplayOption())
@@ -766,6 +612,10 @@ private void DoToolbarGUI()
                 }
 
                 GUILayout.FlexibleSpace();
+                using (new EditorGUI.DisabledScope(EditorApplication.isPlaying && !EditorApplication.isPaused))
+                {
+                    enterPlayModeBehavior = (EnterPlayModeBehavior)EditorGUILayout.EnumPopup(enterPlayModeBehavior, EditorStyles.toolbarDropDown, GUILayout.Width(110));
+                }
 
                 if (ShouldShowMetalFrameCaptureGUI())
                 {
@@ -781,7 +631,10 @@ private void DoToolbarGUI()
                     using (new EditorGUI.DisabledScope(!RenderDoc.IsSupported()))
                     {
                         if (GUILayout.Button(Styles.renderdocContent, EditorStyles.toolbarButton))
+                        {
                             RenderDoc.CaptureRenderDoc();
+                            GUIUtility.ExitGUI();
+                        }
                     }
                 }
 
@@ -816,14 +669,6 @@ private void DoToolbarGUI()
                 }
                 GUILayout.FlexibleSpace();
 
-                // Don't display the fullscreen selection dropdown on gameview toolbars that are already fullscreen.
-                if (!isFullscreen)
-                {
-                    EditorGUI.BeginDisabled(EditorApplication.isPlaying && !EditorApplication.isPaused);
-                    EditorGUILayout.GameViewOnPlayPopup(playModeBehaviorIdx, this, EditorStyles.toolbarDropDown);
-                    EditorGUI.EndDisabled();
-                }
-
                 EditorUtility.audioMasterMute = GUILayout.Toggle(EditorUtility.audioMasterMute,
                     EditorUtility.audioMasterMute ? Styles.muteOnContent : Styles.muteOffContent, EditorStyles.toolbarButton);
 
@@ -847,7 +692,6 @@ private void DoToolbarGUI()
                 }
             }
             GUILayout.EndHorizontal();
-            MirrorFullscreenToolbarSettings();
         }
 
         [GameViewShortcut(Styles.k_StatsShortcutID)]
@@ -1025,8 +869,6 @@ void RepaintIfNeeded()
 
         private void OnEditorModeChanged(ModeService.ModeChangedArgs args)
         {
-            showToolbar = ModeService.HasCapability(ModeCapability.GameViewToolbar, true);
-
             Repaint();
         }
 
@@ -1060,19 +902,12 @@ private void OnGUI()
             if (HandleCommand(evt))
                 return;
 
-            if (suppressRenderingForFullscreen && latestState == PlayModeStateChange.EnteredPlayMode)
-            {
-                DrawDuringFullscreenBackground();
-                return;
-            }
-
             if (position.size * EditorGUIUtility.pixelsPerPoint != m_LastWindowPixelSize) // pixelsPerPoint only reliable in OnGUI()
             {
                 UpdateZoomAreaAndParent();
             }
 
-            if (showToolbar)
-                DoToolbarGUI();
+            DoToolbarGUI();
 
             if (type == EventType.MouseDown || type == EventType.MouseUp)
                 EditorApplication.globalEventHandler?.Invoke();
@@ -1114,7 +949,7 @@ private void OnGUI()
             m_ZoomArea.BeginViewGUI();
 
             // Window size might change on Layout event
-            if (type == EventType.Layout && !suppressRenderingForFullscreen)
+            if (type == EventType.Layout)
                 targetSize = targetRenderSize;
 
             // Setup game view dimensions, so that player loop can use it for input
@@ -1122,23 +957,19 @@ private void OnGUI()
             if (m_Parent)
             {
                 var zoomedTarget = new Rect(targetInView.position + gameViewTarget.position, targetInView.size);
-                if (!isFullscreen)
-                {
-                    SetParentGameViewDimensions(zoomedTarget, gameViewTarget, targetRenderSize);
-                }
-                else
-                {
-                    SetParentGameViewDimensions(zoomedTarget, gameViewTarget, EditorFullscreenController.fullscreenDisplayRenderSize);
-                }
+                SetParentGameViewDimensions(zoomedTarget, gameViewTarget, targetRenderSize);
             }
 
             var editorMousePosition = Event.current.mousePosition;
             var gameMousePosition = (editorMousePosition + gameMouseOffset) * gameMouseScale;
 
-            if (type == EventType.Repaint && !suppressRenderingForFullscreen)
+            if (type == EventType.Repaint)
             {
                 GUI.Box(m_ZoomArea.drawRect, GUIContent.none, Styles.gameViewBackgroundStyle);
 
+                // Tonemapping for HDR targets
+                EditorGUIUtility.PerformTonemappingForGameView();
+
                 Vector2 oldOffset = GUIUtility.s_EditorScreenPointOffset;
                 GUIUtility.s_EditorScreenPointOffset = Vector2.zero;
                 SavedGUIState oldState = SavedGUIState.Create();
@@ -1161,8 +992,7 @@ private void OnGUI()
                 viewPadding = targetInParent.position;
                 viewMouseScale = gameMouseScale;
 
-                if (!EditorApplication.isPlaying ||
-                    (EditorApplication.isPlaying && NeedToPerformRendering() && !Unsupported.IsEditorPlayerLoopWaiting()))
+                if (renderViewCallNeededInOnGUI)
                     m_RenderTexture = RenderView(gameMousePosition, clearTexture);
 
                 if (m_TargetClamped)
@@ -1179,7 +1009,7 @@ private void OnGUI()
                     Rect drawRect = deviceFlippedTargetInView;
                     drawRect.x = Mathf.Round(drawRect.x);
                     drawRect.y = Mathf.Round(drawRect.y);
-                    Graphics.DrawTexture(drawRect, m_RenderTexture, new Rect(0, 0, 1, 1), 0, 0, 0, 0, GUI.color, GUI.blitMaterial);
+                    EditorGUIUtility.DrawTextureHdrSupport(drawRect, m_RenderTexture, new Rect(0, 0, 1, 1), 0, 0, 0, 0, GUI.color, GUI.blitMaterial, -1, true);
                     GUI.EndGroup();
                 }
             }
@@ -1188,13 +1018,6 @@ private void OnGUI()
                 if (Event.current.isKey && (!EditorApplication.isPlaying || EditorApplication.isPaused))
                     return;
 
-                if (isFullscreen)
-                {
-                    // Let the global eventhandler handle toggling fullscreen after this event (do not use the current event)
-                    // We support fullscreen in both edit mode and play mode
-                    return;
-                }
-
                 bool mousePosInGameViewRect = viewInWindow.Contains(Event.current.mousePosition);
 
                 // MouseDown events outside game view rect are not send to scripts but MouseUp events are (see below)
@@ -1262,15 +1085,6 @@ private void OnGUI()
                 GameViewGUI.GameViewStatsGUI();
         }
 
-        private void DrawDuringFullscreenBackground()
-        {
-            DoToolbarGUI();
-            EditorGUILayout.LabelField(Styles.suppressMessage, Styles.largeCenteredText);
-            var binding = ShortcutManager.instance.GetShortcutBinding(EditorFullscreenController.kFullscreenToggle);
-            string content = string.Format(Styles.disableFullscreenMainDisplayFormatContent.text, binding);
-            EditorGUILayout.LabelField(content, Styles.smallCenteredText);
-        }
-
         internal void SetCustomResolution(Vector2 res, string baseName)
         {
             GameViewSize customSize = null;
@@ -1303,34 +1117,5 @@ internal void SetCustomResolution(Vector2 res, string baseName)
             targetSize = targetRenderSize;
             SceneView.RepaintAll();
         }
-
-        void IGameViewOnPlayMenuUser.OnPlayPopupSelection(int indexClicked, object objectSelected)
-        {
-            playModeBehaviorIdx = indexClicked;
-            if (playModeBehaviorIdx == 0)
-            {
-                if (playFocused)
-                    enterPlayModeBehavior = EnterPlayModeBehavior.PlayFocused;
-                else
-                    enterPlayModeBehavior = EnterPlayModeBehavior.PlayUnfocused;
-                fullscreenMonitorIdx = PlayModeView.kFullscreenNone;
-            }
-            else if (playModeBehaviorIdx == 1)
-            {
-                enterPlayModeBehavior = EnterPlayModeBehavior.PlayMaximized;
-                fullscreenMonitorIdx = PlayModeView.kFullscreenNone;
-                GameViewOnPlayMenu.SetFocusedToggle(this, true);
-            }
-            else
-            {
-                enterPlayModeBehavior = EnterPlayModeBehavior.PlayFullscreen;
-                fullscreenMonitorIdx = GameViewOnPlayMenu.SelectedIndexToDisplayIndex(indexClicked);
-                if (fullscreenMonitorIdx == PlayModeView.kFullscreenInvalidIdx)
-                {
-                    Debug.LogError("Invalid display index(" + fullscreenMonitorIdx + ") for selected index(" + indexClicked + ")");
-                    fullscreenMonitorIdx = PlayModeView.kFullscreenNone;
-                }
-            }
-        }
     }
 }
diff --git a/Editor/Mono/GameView/GameViewOnPlayMenu.cs b/Editor/Mono/GameView/GameViewOnPlayMenu.cs
deleted file mode 100644
index 281ae52fa1..0000000000
--- a/Editor/Mono/GameView/GameViewOnPlayMenu.cs
+++ /dev/null
@@ -1,164 +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 System;
-using System.Collections.Generic;
-
-namespace UnityEditor
-{
-    internal class GameViewOnPlayMenu : FlexibleMenu
-    {
-        private static class Styles
-        {
-            public static readonly GUIContent gamePlayNormalContent = EditorGUIUtility.TrTextContent("Play in Window", "Play inside a game view docked inside unity");
-            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", "Forcibly 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:");
-
-            public const float kMargin = 9f;
-            public const float kTopMargin = 7f;
-            public const int kNumberOfTogglesOnTop = 2;
-            public static float frameHeight => (kTopMargin * kNumberOfTogglesOnTop) + EditorGUI.kSingleLineHeight;
-            public static float contentOffset => frameHeight + EditorGUI.kControlVerticalSpacing;
-        }
-
-        // Number of on play behaviors that should always be visible. Fullscreen may or may not be supported and there may be multiple monitors.
-        // The base is 2, "Play Normally" (with focus as a checkbox) and "Play Maximized"
-        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()
-        {
-            var playFocusedToggleSize = EditorStyles.toggle.CalcSize(Styles.playFocusedToggleContent);
-            var size = CalcSize();
-
-            size.x = Mathf.Max(size.x, playFocusedToggleSize.x + Styles.kMargin * 2);
-            size.y += Styles.frameHeight + EditorGUI.kControlVerticalSpacing + EditorGUI.kSingleLineHeight;
-            return size;
-        }
-
-        private bool IsVSyncToggleVisible()
-        {
-            // Only show the vsync toggle for editor supported gfx device backend.
-            var gfxDeviceType = SystemInfo.graphicsDeviceType;
-            return gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Metal ||
-                gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Vulkan ||
-                gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Direct3D11 ||
-                gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Direct3D12 ||
-                gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.OpenGLCore;
-        }
-
-        private void DoVSyncToggle(Rect rect)
-        {
-            if (IsVSyncToggleVisible())
-            {
-                m_GameView.vSyncEnabled = GUI.Toggle(rect, m_GameView.vSyncEnabled, Styles.vSyncToggleContent);
-            }
-            else
-            {
-                m_GameView.vSyncEnabled = false;
-                GUI.Label(rect, Styles.vSyncUnsupportedContent, EditorStyles.miniLabel);
-            }
-        }
-
-        private static void UncheckFocusToggleOnAllViews()
-        {
-            List<PlayModeView> playViewList;
-            WindowLayout.ShowAppropriateViewOnEnterExitPlaymodeList(true, out playViewList);
-            foreach (PlayModeView playView in playViewList)
-            {
-                if (playView is IGameViewOnPlayMenuUser)
-                {
-                    ((IGameViewOnPlayMenuUser)playView).playFocused = false;
-                }
-            }
-        }
-
-        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)
-        {
-            var frameRect = new Rect(rect.x, rect.y, rect.width, rect.height);
-            GUI.Label(frameRect, "", EditorStyles.viewBackground);
-
-            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)
-            {
-                SetFocusedToggle(m_GameView, playFocusedToggle);
-            }
-            var vsyncToggleRect = new Rect(focusTextSize.x + Styles.kMargin*2, Styles.kTopMargin, rect.width, EditorGUI.kSingleLineHeight);
-            DoVSyncToggle(vsyncToggleRect);
-
-            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.y = rect.y + Styles.contentOffset + EditorGUI.kSingleLineHeight;
-
-            base.OnGUI(rect);
-        }
-
-        public static string GetOnPlayBehaviorName(int selectedIndex)
-        {
-            if (selectedIndex == 0)
-                return Styles.gamePlayNormalContent.text;
-            if (selectedIndex == 1)
-                return Styles.gamePlayMaximizedContent.text;
-
-            int displayIdx = SelectedIndexToDisplayIndex(selectedIndex);
-            var connectedDisplay = EditorFullscreenController.GetConnectedDisplayNames();
-
-            var displayName = (displayIdx >= connectedDisplay.Length)
-                ? "Invalid monitor"
-                : connectedDisplay[displayIdx];
-
-            return Styles.gamePlayFullscreenContent.text + displayIdx + ":" + displayName;
-        }
-
-        public static int SelectedIndexToDisplayIndex(int selectedIndex)
-        {
-            if (selectedIndex <= 1)
-                return -1; //Invalid fullscreen selection
-            return selectedIndex - kPlayModeBaseOptionCount;
-        }
-    }
-}
diff --git a/Editor/Mono/GameView/GameViewOnPlayMenuItemProvider.cs b/Editor/Mono/GameView/GameViewOnPlayMenuItemProvider.cs
deleted file mode 100644
index 40102b6cac..0000000000
--- a/Editor/Mono/GameView/GameViewOnPlayMenuItemProvider.cs
+++ /dev/null
@@ -1,122 +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 UnityEngine;
-
-namespace UnityEditor
-{
-    internal class SimulationOnPlayMenuItemProvider : IFlexibleMenuItemProvider
-    {
-        public int Count()
-        {
-            // The simulator window only supports "play normally (focuced/unfocused) and play maximized
-            // fullscreen support may be added in the future.
-            int optionCount = GameViewOnPlayMenu.kPlayModeBaseOptionCount;
-            return optionCount;
-        }
-
-        public object GetItem(int index)
-        {
-            return null;
-        }
-
-        public int Add(object obj)
-        {
-            throw new NotImplementedException("Operation not supported");
-        }
-
-        public void Replace(int index, object obj)
-        {
-            throw new NotImplementedException("Operation not supported");
-        }
-
-        public void Remove(int index)
-        {
-            throw new NotImplementedException("Operation not supported");
-        }
-
-        public object Create()
-        {
-            throw new NotImplementedException("Operation not supported");
-        }
-
-        public void Move(int index, int destIndex, bool insertAfterDestIndex)
-        {
-            throw new NotImplementedException("Operation not supported");
-        }
-
-        public string GetName(int index)
-        {
-            return GameViewOnPlayMenu.GetOnPlayBehaviorName(index);
-        }
-
-        public bool IsModificationAllowed(int index)
-        {
-            return false;
-        }
-
-        public int[] GetSeperatorIndices()
-        {
-            return null;
-        }
-    }
-
-    internal class GameViewOnPlayMenuItemProvider : IFlexibleMenuItemProvider
-    {
-        public int Count()
-        {
-            // "Play Normal" and "Play Maximized" should always be options.
-            // The play fullscreen option will be added per-display.
-            int optionCount = GameViewOnPlayMenu.kPlayModeBaseOptionCount;
-            optionCount += EditorFullscreenController.GetConnectedDisplayNames().Length;
-            return optionCount;
-        }
-
-        public object GetItem(int index)
-        {
-            return null;
-        }
-
-        public int Add(object obj)
-        {
-            throw new NotImplementedException("Operation not supported");
-        }
-
-        public void Replace(int index, object obj)
-        {
-            throw new NotImplementedException("Operation not supported");
-        }
-
-        public void Remove(int index)
-        {
-            throw new NotImplementedException("Operation not supported");
-        }
-
-        public object Create()
-        {
-            throw new NotImplementedException("Operation not supported");
-        }
-
-        public void Move(int index, int destIndex, bool insertAfterDestIndex)
-        {
-            throw new NotImplementedException("Operation not supported");
-        }
-
-        public string GetName(int index)
-        {
-            return GameViewOnPlayMenu.GetOnPlayBehaviorName(index);
-        }
-
-        public bool IsModificationAllowed(int index)
-        {
-            return false;
-        }
-
-        public int[] GetSeperatorIndices()
-        {
-            return null;
-        }
-    }
-}
diff --git a/Editor/Mono/GameView/GameViewSizeMenu.cs b/Editor/Mono/GameView/GameViewSizeMenu.cs
index b518ce473d..588b92fdae 100644
--- a/Editor/Mono/GameView/GameViewSizeMenu.cs
+++ b/Editor/Mono/GameView/GameViewSizeMenu.cs
@@ -10,11 +10,15 @@ namespace UnityEditor
     // Resolution/Aspect ratio menu for the GameView, with an optional toggle for low-resolution aspect ratios
     internal class GameViewSizeMenu : FlexibleMenu
     {
+        static class Styles
+        {
+            public static GUIContent vSyncToggleContent = EditorGUIUtility.TrTextContent("VSync (Game view only)", "Enable VSync only for the game view while in playmode.");
+        }
         const float kTopMargin = 7f;
         const float kMargin = 9f;
         IGameViewSizeMenuUser m_GameView;
 
-        float frameHeight { get { return kTopMargin * 2 + EditorGUI.kSingleLineHeight; } }
+        float frameHeight { get { return kTopMargin * 2 + EditorGUI.kSingleLineHeight * (IsVSyncToggleVisible() ? 2 : 1);}}
         float contentOffset { get { return frameHeight + EditorGUI.kControlVerticalSpacing; } }
 
         public GameViewSizeMenu(IFlexibleMenuItemProvider itemProvider, int selectionIndex, FlexibleMenuModifyItemUI modifyItemUi, IGameViewSizeMenuUser gameView)
@@ -32,6 +36,26 @@ public override Vector2 GetWindowSize()
             return size;
         }
 
+        private bool IsVSyncToggleVisible()
+        {
+            // Only show the vsync toggle for editor supported gfx device backend.
+            var gfxDeviceType = SystemInfo.graphicsDeviceType;
+            return gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Metal ||
+                gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Vulkan ||
+                gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Direct3D11 ||
+                gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.Direct3D12 ||
+                gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.OpenGLCore;
+        }
+
+ 
+        private void DoVSyncToggle(Rect rect)
+        {
+            if (!IsVSyncToggleVisible())
+                return;
+            var toggleRect = new Rect(rect.xMin, rect.yMax + 2, rect.width, EditorGUI.kSingleLineHeight);
+            m_GameView.vSyncEnabled = GUI.Toggle(toggleRect, m_GameView.vSyncEnabled, Styles.vSyncToggleContent);
+        }
+
         public override void OnGUI(Rect rect)
         {
             var frameRect = new Rect(rect.x, rect.y, rect.width, frameHeight);
@@ -43,7 +67,7 @@ public override void OnGUI(Rect rect)
             m_GameView.lowResolutionForAspectRatios = GUI.Toggle(toggleRect, m_GameView.forceLowResolutionAspectRatios || m_GameView.lowResolutionForAspectRatios, GameView.Styles.lowResAspectRatiosContextMenuContent);
 
             GUI.enabled = true;
-
+            DoVSyncToggle(toggleRect);
 
             rect.height = rect.height - contentOffset;
             rect.y = rect.y + contentOffset;
diff --git a/Editor/Mono/GameView/GameViewSizesMenuModifyItemUI.cs b/Editor/Mono/GameView/GameViewSizesMenuModifyItemUI.cs
index 2ac7b2877a..8ffdf97ae7 100644
--- a/Editor/Mono/GameView/GameViewSizesMenuModifyItemUI.cs
+++ b/Editor/Mono/GameView/GameViewSizesMenuModifyItemUI.cs
@@ -99,9 +99,11 @@ override public void OnGUI(Rect rect)
             {
                 if (string.IsNullOrEmpty(displayText))
                     displayText = "Result";
-                else
-                    displayText = GetCroppedText(displayText, cropWidth, EditorStyles.label);
-                GUILayout.Label(GUIContent.Temp(displayText), EditorStyles.label);
+
+                var clipping = EditorStyles.label.clipping;
+                EditorStyles.label.clipping = TextClipping.Ellipsis;
+                GUILayout.Label(GUIContent.Temp(displayText), EditorStyles.label, GUILayout.MaxWidth(cropWidth));
+                EditorStyles.label.clipping = clipping;
             }
             GUILayout.FlexibleSpace();
             GUILayout.Space(margin);
@@ -133,21 +135,6 @@ override public void OnGUI(Rect rect)
 
             GUILayout.Space(Styles.windowBottomPadding);
         }
-
-        string GetCroppedText(string fullText, float cropWidth, GUIStyle style)
-        {
-            // Check if we need to crop
-            int characterCountVisible = style.GetNumCharactersThatFitWithinWidth(fullText, cropWidth);
-            if (characterCountVisible == -1)
-            {
-                return fullText;
-            }
-
-            if (characterCountVisible > 1 && characterCountVisible != fullText.Length)
-                return fullText.Substring(0, characterCountVisible - 1) + ("\u2026"); // 'horizontal ellipsis' (U+2026) is: ...
-            else
-                return fullText;
-        }
     }
 }
 
diff --git a/Editor/Mono/GameView/IGameViewSizeMenuUser.cs b/Editor/Mono/GameView/IGameViewSizeMenuUser.cs
index d2ed188a87..ff43698b8a 100644
--- a/Editor/Mono/GameView/IGameViewSizeMenuUser.cs
+++ b/Editor/Mono/GameView/IGameViewSizeMenuUser.cs
@@ -9,5 +9,6 @@ internal interface IGameViewSizeMenuUser
         void SizeSelectionCallback(int indexClicked, object objectSelected);
         bool lowResolutionForAspectRatios { get; set; }
         bool forceLowResolutionAspectRatios { get; }
+        bool vSyncEnabled { get; set; }
     }
 }
diff --git a/Editor/Mono/Graphics/ShaderCompilerData.cs b/Editor/Mono/Graphics/ShaderCompilerData.cs
index d31085e31e..29ff1a1873 100644
--- a/Editor/Mono/Graphics/ShaderCompilerData.cs
+++ b/Editor/Mono/Graphics/ShaderCompilerData.cs
@@ -69,6 +69,7 @@ public enum ShaderCompilerPlatform
     {
         None            = 0, // For non initialized variable.
         D3D             = 4, // Direct3D 11 (FL10.0 and up) and Direct3D 12, compiled with MS D3DCompiler
+        [System.Obsolete(@"OpenGL ES 2.0 is no longer supported since Unity 2023.1")]
         GLES20          = 5, // OpenGL ES 2.0 / WebGL 1.0, compiled with MS D3DCompiler + HLSLcc
         GLES3x          = 9, // OpenGL ES 3.0+ / WebGL 2.0, compiled with MS D3DCompiler + HLSLcc
         PS4             = 11, // Sony PS4
diff --git a/Editor/Mono/Handles.cs b/Editor/Mono/Handles.cs
index 1fdd7bf8ea..ca6ee0c7e7 100644
--- a/Editor/Mono/Handles.cs
+++ b/Editor/Mono/Handles.cs
@@ -1146,15 +1146,6 @@ static void DoDrawAAPolyLine(Color[] colors, Vector3[] points, int actualNumberO
             HandleUtility.ApplyWireMaterial(zTest);
 
             Color defaultColor = new Color(1, 1, 1, alpha);
-
-            if (colors != null)
-            {
-                for (int i = 0; i < colors.Length; i++)
-                    colors[i] *= defaultColor;
-            }
-            else
-                defaultColor *= color;
-
             Internal_DrawAAPolyLine(colors, points, defaultColor, actualNumberOfPoints, lineTex, width, matrix);
         }
 
diff --git a/Editor/Mono/Help.cs b/Editor/Mono/Help.cs
index 93036121ed..8490eb6cc9 100644
--- a/Editor/Mono/Help.cs
+++ b/Editor/Mono/Help.cs
@@ -211,7 +211,11 @@ internal static string GetHelpURLForObject(Object obj, bool defaultToMonoBehavio
                     }
                 }
 
-                return url;
+                if (IsURL(url))
+                    return url;
+
+                // Assume url is a topic that needs to be properly formatted: 
+                return FindHelpNamed(url);
             }
 
             var topicForObject = HelpFileNameForObject(obj);
@@ -355,6 +359,11 @@ internal static string HelpFileNameForObject(Object obj)
                 return "LightmapSnapshot";
             }
 
+            if (obj is PrefabImporter)
+            {
+                return "-Prefab Asset";
+            }
+
             if (obj is DefaultAsset)
                 return "";
 
@@ -429,6 +438,11 @@ private static void InitDocumentation()
             }
         }
 
+        private static bool IsURL(string path)
+        {
+            return path.StartsWith("http://") || path.StartsWith("https://") || path.StartsWith(k_AbsoluteFileRef);
+        }
+
         private static bool IsLocalPath(string path)
         {
             return !path.StartsWith("http://") && !path.StartsWith("https://");
diff --git a/Editor/Mono/HierarchyProperty.bindings.cs b/Editor/Mono/HierarchyProperty.bindings.cs
index 8f1295023f..0efef4a481 100644
--- a/Editor/Mono/HierarchyProperty.bindings.cs
+++ b/Editor/Mono/HierarchyProperty.bindings.cs
@@ -210,7 +210,7 @@ public void SetSearchFilter(string searchString, int mode)
         // 4.0 interface (made internal for now)
         internal void SetSearchFilter(SearchFilter filter)
         {
-            SetSearchFilterImpl(SearchFilter.Split(filter.nameFilter), filter.classNames, filter.assetLabels, filter.assetBundleNames, filter.versionControlStates, filter.softLockControlStates, filter.referencingInstanceIDs, filter.sceneHandles, filter.GlobToRegex().ToArray(), filter.productIds, filter.anyWithAssetOrigin, filter.showAllHits, filter.importLogFlags);
+            SetSearchFilterImpl(SearchFilter.Split(filter.nameFilter), filter.classNames, filter.assetLabels, filter.assetBundleNames, new string[0], new string[0], filter.referencingInstanceIDs, filter.sceneHandles, filter.GlobToRegex().ToArray(), filter.productIds, filter.anyWithAssetOrigin, filter.showAllHits, filter.importLogFlags, filter.filterByTypeIntersection);
         }
 
         internal void CopySearchFilterFrom(HierarchyProperty other)
@@ -221,7 +221,7 @@ internal void CopySearchFilterFrom(HierarchyProperty other)
         }
 
         [FreeFunction("HierarchyPropertyBindings::SetSearchFilterImpl", HasExplicitThis = true)]
-        extern void SetSearchFilterImpl(string[] nameFilters, string[] classNames, string[] assetLabels, string[] assetBundleNames, string[] versionControlStates, string[] softLockControlStates, int[] referencingInstanceIDs, int[] sceneHandles, string[] regex, int[] productIds, bool anyWithAssetOrigin, bool showAllHits, ImportLogFlags importLogFlags);
+        extern void SetSearchFilterImpl(string[] nameFilters, string[] classNames, string[] assetLabels, string[] assetBundleNames, string[] versionControlStates, string[] softLockControlStates, int[] referencingInstanceIDs, int[] sceneHandles, string[] regex, int[] productIds, bool anyWithAssetOrigin, bool showAllHits, ImportLogFlags importLogFlags, bool filterByTypeIntersection);
 
         [FreeFunction("HierarchyPropertyBindings::CopySearchFilterImpl", HasExplicitThis = true)]
         extern void CopySearchFilterImpl(HierarchyProperty other);
diff --git a/Editor/Mono/HostView.cs b/Editor/Mono/HostView.cs
index 88baaf4e69..63ad4b4397 100644
--- a/Editor/Mono/HostView.cs
+++ b/Editor/Mono/HostView.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data.Common;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -31,13 +32,31 @@ public static class DataModes
             {
                 public const float switchButtonWidth = 16.0f;
 
+                static readonly string k_AutomaticAuthoringString = L10n.Tr("Automatic (Authoring)");
+                static readonly string k_AutomaticMixedString = L10n.Tr("Automatic (Mixed)");
+                static readonly string k_AutomaticRuntimeString = L10n.Tr("Automatic (Runtime)");
+                static readonly string k_AuthoringString = L10n.Tr("Authoring");
+                static readonly string k_MixedString = L10n.Tr("Mixed");
+                static readonly string k_RuntimeString = L10n.Tr("Runtime");
+                static readonly string k_DisabledString = L10n.Tr("Disabled");
+
+                // Auto data mode icons
                 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");
+                public static readonly GUIContent authoringModeContent = EditorGUIUtility.TrIconContent(k_AuthoringModeIcon, k_AutomaticAuthoringString);
+                public static readonly GUIContent mixedModeContent = EditorGUIUtility.TrIconContent(k_MixedModeIcon, k_AutomaticMixedString);
+                public static readonly GUIContent runtimeModeContent = EditorGUIUtility.TrIconContent(k_RuntimeModeIcon, k_AutomaticRuntimeString);
+
+                // Sticky data mode icons
+                static readonly Texture2D k_StickyAuthoringModeIcon = EditorGUIUtility.LoadIcon("DataMode.Authoring.Sticky");
+                static readonly Texture2D k_StickyMixedModeIcon = EditorGUIUtility.LoadIcon("DataMode.Mixed.Sticky");
+                static readonly Texture2D k_StickyRuntimeModeIcon = EditorGUIUtility.LoadIcon("DataMode.Runtime.Sticky");
+
+                public static readonly GUIContent stickyAuthoringModeContent = EditorGUIUtility.TrIconContent(k_StickyAuthoringModeIcon, k_AuthoringString);
+                public static readonly GUIContent stickyMixedModeContent = EditorGUIUtility.TrIconContent(k_StickyMixedModeIcon, k_MixedString);
+                public static readonly GUIContent stickyRuntimeModeContent = EditorGUIUtility.TrIconContent(k_StickyRuntimeModeIcon, k_RuntimeString);
 
                 // Use an empty style to avoid the hover effect of normal buttons
                 public static readonly GUIStyle switchStyle = new GUIStyle();
@@ -45,10 +64,10 @@ public static class DataModes
                 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")   }
+                        { DataMode.Disabled,  EditorGUIUtility.TextContent(k_DisabledString)  },
+                        { DataMode.Authoring, EditorGUIUtility.TextContent(k_AuthoringString) },
+                        { DataMode.Mixed,     EditorGUIUtility.TextContent(k_MixedString)     },
+                        { DataMode.Runtime,   EditorGUIUtility.TextContent(k_RuntimeString)   }
                     };
             }
 
@@ -85,6 +104,8 @@ static Styles()
         protected EditorWindowDelegate m_ModifierKeysChanged;
         protected EditorWindowShowButtonDelegate m_ShowButton;
 
+        private bool m_IsLosingFocus = false;
+
         internal EditorWindow actualView
         {
             get { return m_ActualView; }
@@ -282,7 +303,6 @@ protected override void OldOnGUI()
         {
             // Call reset GUI state as first thing so GUI.color is correct when drawing window decoration.
             EditorGUIUtility.ResetGUIState();
-            DoWindowDecorationStart();
 
             using (new GUILayout.VerticalScope(Styles.background))
             {
@@ -298,7 +318,6 @@ protected override void OldOnGUI()
                 {
                     CheckNotificationStatus();
 
-                    DoWindowDecorationEnd();
                     EditorGUI.ShowRepaints();
                 }
             }
@@ -321,8 +340,22 @@ protected override bool OnFocus()
 
         internal void OnLostFocus()
         {
+            // Avoid calling OnLostFocus script callback if we are already processing the focus lost.
+            // This can happen when user scripts call Close() in OnLostFocus() callback.
+            if (m_IsLosingFocus)
+                return;
+
             EditorGUI.EndEditingActiveTextField();
-            m_OnLostFocus?.Invoke();
+
+            try
+            {
+                m_IsLosingFocus = true;
+                m_OnLostFocus?.Invoke();
+            }
+            finally
+            {
+                m_IsLosingFocus = false;
+            }
 
             // Callback could have killed us
             if (!this)
@@ -466,7 +499,10 @@ public void InvokeOnGUI(Rect onGUIPosition)
             if (!this)
                 return;
 
-            DoWindowDecorationStart();
+            //We backup and restore the group count to properly identify the ongui method where the unbalance occurs.
+            int backup = GUILayoutUtility.unbalancedgroupscount;
+
+            GUILayoutUtility.unbalancedgroupscount = 0;
             BeginOffsetArea(m_ActualView.rootVisualElement.worldBound, GUIContent.none, Styles.tabWindowBackground);
 
             EditorGUIUtility.ResetGUIState();
@@ -474,36 +510,43 @@ public void InvokeOnGUI(Rect onGUIPosition)
             bool isExitGUIException = false;
             try
             {
-                GUILayoutUtility.unbalancedgroupscount = 0;
                 m_OnGUI?.Invoke();
-                if (GUILayoutUtility.unbalancedgroupscount > 0)
-                {
-                    Debug.LogError("GUI Error: Invalid GUILayout state in " + GetActualViewName() + " view. Verify that all layout Begin/End calls match");
-                    GUILayoutUtility.unbalancedgroupscount = 0;
-                }
             }
             catch (TargetInvocationException e)
             {
-                if (e.InnerException is ExitGUIException)
-                    isExitGUIException = true;
+                Exception exception = e;
+                while (exception is TargetInvocationException && exception.InnerException != null)
+                    exception = exception.InnerException;
+
+                isExitGUIException = exception is ExitGUIException;
+
+                throw;
+            }
+            catch(ExitGUIException)
+            {
+                isExitGUIException = true;
                 throw;
             }
             finally
             {
                 // We can't reset gui state after ExitGUI we just want to bail completely
-                if (!isExitGUIException)
+                if (!(isExitGUIException || GUIUtility.guiIsExiting))
                 {
                     CheckNotificationStatus();
 
                     EndOffsetArea();
+                    if (GUILayoutUtility.unbalancedgroupscount != 0)
+                    {
+                        Debug.LogError("GUI Error: Invalid GUILayout state in " + GetActualViewName() + " view. Verify that all layout Begin/End calls match");
+                    }
 
                     EditorGUIUtility.ResetGUIState();
 
-                    DoWindowDecorationEnd();
-
                     if (Event.current != null && Event.current.type == EventType.Repaint)
                         Styles.overlay.Draw(onGUIPosition, GUIContent.none, 0);
                 }
+
+                GUILayoutUtility.unbalancedgroupscount = backup;
             }
         }
 
@@ -527,9 +570,6 @@ public IEditorWindowBackend editorWindowBackend
             set { windowBackend = value; }
         }
 
-        DataMode m_CachedDataMode;
-        bool m_ShouldDrawDataModeSwitch;
-
         protected void RegisterSelectedPane(bool sendEvents)
         {
             if (!m_ActualView)
@@ -561,19 +601,6 @@ protected void RegisterSelectedPane(bool sendEvents)
                 EditorApplication.update += m_ActualView.CheckForWindowRepaint;
             }
 
-            if (m_ActualView is IDataModeHandler dataModeHandler)
-            {
-                UpdateDataMode(dataModeHandler.dataMode, false);
-
-                if (m_ActualView is IDataModeHandlerAndDispatcher dataModesDispatcher)
-                    dataModesDispatcher.dataModeChanged += OnViewDataModeChanged;
-            }
-            else
-            {
-                m_CachedDataMode = DataMode.Disabled;
-                m_ShouldDrawDataModeSwitch = false;
-            }
-
             if (sendEvents)
             {
                 try
@@ -611,19 +638,15 @@ 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;
                 var onBecameInvisible = m_OnBecameInvisible;
 
                 m_ActualView = null;
 
                 if (sendEvents)
                 {
-                    onLostFocus?.Invoke();
+                    OnLostFocus();
                     onBecameInvisible?.Invoke();
                 }
                 ClearDelegates();
@@ -696,7 +719,7 @@ internal float GetExtraButtonsWidth()
             if (m_ShowButton != null)
                 extraWidth += ContainerWindow.kButtonWidth;
 
-            if (m_ShouldDrawDataModeSwitch)
+            if (m_ActualView.GetDataModeController_Internal().ShouldDrawDataModesSwitch())
                 extraWidth += Styles.DataModes.switchButtonWidth + Styles.iconMargin;
 
             foreach (var item in windowActions)
@@ -723,13 +746,15 @@ protected void ShowGenericMenu(float leftOffset, float topOffset)
             if (m_ShowButton != null)
                 m_ShowButton.Invoke(new Rect(leftOffset, topOffset, ContainerWindow.kButtonWidth, ContainerWindow.kButtonHeight));
 
-            if (m_ShouldDrawDataModeSwitch)
+            var dataModeControllerInternal = m_ActualView.GetDataModeController_Internal();
+            if (dataModeControllerInternal.ShouldDrawDataModesSwitch())
             {
-                var switchContent = m_CachedDataMode switch
+                var isClientInAutomaticDataMode = dataModeControllerInternal.isAutomatic;
+                var switchContent = dataModeControllerInternal.dataMode switch
                 {
-                    DataMode.Authoring => Styles.DataModes.authoringModeContent,
-                    DataMode.Mixed => Styles.DataModes.mixedModeContent,
-                    DataMode.Runtime => Styles.DataModes.runtimeModeContent,
+                    DataMode.Authoring => isClientInAutomaticDataMode? Styles.DataModes.authoringModeContent : Styles.DataModes.stickyAuthoringModeContent,
+                    DataMode.Mixed => isClientInAutomaticDataMode? Styles.DataModes.mixedModeContent : Styles.DataModes.stickyMixedModeContent,
+                    DataMode.Runtime => isClientInAutomaticDataMode? Styles.DataModes.runtimeModeContent : Styles.DataModes.stickyRuntimeModeContent,
                     _ => default
                 };
 
@@ -741,11 +766,14 @@ protected void ShowGenericMenu(float leftOffset, float topOffset)
 
                     if (EditorGUI.Button(switchRect, switchContent, Styles.DataModes.switchStyle))
                     {
-                        // This cast is guaranteed to work by m_ShouldDrawDataModeSwitch
-                        var dataModesClient = (IDataModeHandler) m_ActualView;
+                        var evt = Event.current;
 
-                        dataModesClient.SwitchToNextDataMode();
-                        UpdateDataMode(dataModesClient.dataMode, true);
+                        if (evt.button == 0 || evt.button == 1) // left click or right click
+                        {
+                            var menu = new GenericMenu();
+                            PopulateDataModeDropdown(dataModeControllerInternal, menu);
+                            menu.DropDown(switchRect);
+                        }
                     }
                 }
             }
@@ -770,39 +798,23 @@ 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)
+        void PopulateDataModeDropdown(DataModeController clientDataModeController, GenericMenu menu)
         {
-            if (m_ActualView is not IDataModeHandler dataModeHandler)
-                return; // Something very weird has happened...
+            var autoLabel = !clientDataModeController.isAutomatic
+                ? L10n.Tr($"Automatic ({clientDataModeController.preferredDataMode})")
+                : L10n.Tr($"Automatic ({clientDataModeController.dataMode})");
 
-            if (dataMode is DataMode mode && dataModeHandler.IsDataModeSupported(mode))
-                dataModeHandler.SwitchToDataMode(mode);
-            else
-                dataModeHandler.SwitchToDefaultDataMode();
-
-            UpdateDataMode(dataModeHandler.dataMode, true);
-        }
-
-        void OnViewDataModeChanged(DataMode newDataMode) => UpdateDataMode(newDataMode, true);
+            menu.AddItem(new GUIContent(autoLabel),
+                clientDataModeController.isAutomatic,
+                () => clientDataModeController.SwitchToAutomatic());
 
-        void UpdateDataMode(DataMode newDataMode, bool needsRepaint)
-        {
-            m_CachedDataMode = newDataMode;
-            m_ShouldDrawDataModeSwitch = ShouldDrawDataModesSwitch();
+            menu.AddSeparator("");
 
-            if (needsRepaint)
+            foreach (var mode in clientDataModeController.supportedDataModes)
             {
-                m_ActualView.Repaint();
-                RepaintImmediately();
+                menu.AddItem(Styles.DataModes.dataModeNameLabels[mode],
+                    !clientDataModeController.isAutomatic && clientDataModeController.dataMode == mode,
+                    () => clientDataModeController.SwitchToStickyDataMode(mode));
             }
         }
 
@@ -920,54 +932,12 @@ internal void Reload(object userData)
             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)
         {
             if (menu.GetItemCount() != 0)
                 menu.AddSeparator("");
 
-            if (m_ShouldDrawDataModeSwitch)
-            {
-                // This cast is guaranteed to work by m_ShouldDrawDataModeSwitch
-                var dataModesHandler = (IDataModeHandler) window;
-                SanitizeSupportedDataModesList(dataModesHandler.supportedDataModes, m_DataModeSanitizationCache);
-
-                // Don't show anything if only one mode is supported
-                if (m_DataModeSanitizationCache.Count > 1)
-                {
-                    foreach (var mode in m_DataModeSanitizationCache)
-                    {
-                        menu.AddItem(Styles.DataModes.dataModeNameLabels[mode],
-                            m_CachedDataMode == mode,
-                            SelectDataMode,
-                            mode);
-                    }
-
-                    menu.AddSeparator("");
-                }
-            }
-
             if(window is ISupportsOverlays)
             {
                 var binding = ShortcutManager.instance.GetShortcutBinding("Overlays/Show Overlay Menu");
diff --git a/Editor/Mono/ImportSettings/DesktopPluginImporterExtension.cs b/Editor/Mono/ImportSettings/DesktopPluginImporterExtension.cs
index d8fe397fbb..6f7e8e71e5 100644
--- a/Editor/Mono/ImportSettings/DesktopPluginImporterExtension.cs
+++ b/Editor/Mono/ImportSettings/DesktopPluginImporterExtension.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using System.IO;
 using System.Linq;
 using UnityEditor.Modules;
@@ -25,7 +26,12 @@ internal enum DesktopPluginCPUArchitecture
         internal class DesktopSingleCPUProperty : Property
         {
             public DesktopSingleCPUProperty(BuildTarget buildTarget, DesktopPluginCPUArchitecture architecture)
-                : base(EditorGUIUtility.TrTextContent(GetArchitectureNameInGUI(buildTarget, architecture)), "CPU", architecture, BuildPipeline.GetBuildTargetName(buildTarget))
+                : base(EditorGUIUtility.TrTextContent(GetArchitectureNameInGUI(buildTarget, architecture)), cpuKey, architecture, BuildPipeline.GetBuildTargetName(buildTarget))
+            {
+            }
+
+            public DesktopSingleCPUProperty(GUIContent name, BuildTarget buildTarget)
+                : base(name, cpuKey, DesktopPluginCPUArchitecture.AnyCPU, BuildPipeline.GetBuildTargetName(buildTarget))
             {
             }
 
@@ -66,7 +72,7 @@ class DesktopMultiCPUProperty : Property
             private readonly GUIContent[] m_SupportedArchitectureNames;
 
             public DesktopMultiCPUProperty(BuildTarget buildTarget, params DesktopPluginCPUArchitecture[] supportedArchitectures) :
-                base("CPU", "CPU", DesktopPluginCPUArchitecture.None, BuildPipeline.GetBuildTargetName(buildTarget))
+                base(cpuKey, cpuKey, DesktopPluginCPUArchitecture.None, BuildPipeline.GetBuildTargetName(buildTarget))
             {
                 // Add "None" and "AnyCPU" architectures to the supported architecture list
                 m_SupportedArchitectures = new DesktopPluginCPUArchitecture[supportedArchitectures.Length + 2];
@@ -131,9 +137,9 @@ internal override void OnGUI(PluginImporterInspector inspector)
             }
         }
 
-        // Windows has 1 build target per CPU architecture
-        private readonly DesktopSingleCPUProperty m_WindowsX86;
-        private readonly DesktopSingleCPUProperty m_WindowsX86_X64;
+        // Windows has 2 build targets. One build target for 32bit that supports 1 CPU architectue. The other for 64 bit that supports multiple 64 bit architectures (x64 and ARM64).
+        private readonly DesktopSingleCPUProperty m_Windows32;
+        private readonly DesktopMultiCPUProperty m_Windows64;
 
         // Linux has 1 build target and 1 supported CPU architecture
         private readonly DesktopSingleCPUProperty m_Linux;
@@ -141,21 +147,38 @@ internal override void OnGUI(PluginImporterInspector inspector)
         // macOS has multiple architectures, but one target.
         private readonly DesktopMultiCPUProperty m_MacOS;
 
+        // For Managed plugins the only options for CPU architecture should be "None" or "AnyCPU", so it can be DesktopSingleCPUProperty
+        private readonly DesktopSingleCPUProperty m_Windows32Managed;
+        private readonly DesktopSingleCPUProperty m_Windows64Managed;
+        private readonly DesktopSingleCPUProperty m_LinuxManaged;
+        private readonly DesktopSingleCPUProperty m_MacOSManaged;
 
         public DesktopPluginImporterExtension()
             : base(null)
         {
-            m_WindowsX86 = new DesktopSingleCPUProperty(BuildTarget.StandaloneWindows, DesktopPluginCPUArchitecture.x86);
-            m_WindowsX86_X64 = new DesktopSingleCPUProperty(BuildTarget.StandaloneWindows64, DesktopPluginCPUArchitecture.x86_64);
+            m_Windows32 = new DesktopSingleCPUProperty(BuildTarget.StandaloneWindows, DesktopPluginCPUArchitecture.x86);
+            m_Windows64 = new DesktopMultiCPUProperty(BuildTarget.StandaloneWindows64, DesktopPluginCPUArchitecture.x86_64, DesktopPluginCPUArchitecture.ARM64);
+
             m_Linux = new DesktopSingleCPUProperty(BuildTarget.StandaloneLinux64, DesktopPluginCPUArchitecture.x86_64);
             m_MacOS = new DesktopMultiCPUProperty(BuildTarget.StandaloneOSX, DesktopPluginCPUArchitecture.x86_64, DesktopPluginCPUArchitecture.ARM64);
 
+            // Windows 32-bit (x86) and Windows 64-bit (ARM64/x86_64) are separate targets, so they have separate checkboxes
+            // Linux only has x64 architecture and Mac has a single target for both 64-bit architectures (ARM64/Intel-64bit)
+            m_Windows32Managed = new DesktopSingleCPUProperty(EditorGUIUtility.TrTextContent("Windows x86"), BuildTarget.StandaloneWindows);
+            m_Windows64Managed = new DesktopSingleCPUProperty(EditorGUIUtility.TrTextContent("Windows 64-bit"), BuildTarget.StandaloneWindows64);
+            m_LinuxManaged = new DesktopSingleCPUProperty(EditorGUIUtility.TrTextContent("Linux x64"),BuildTarget.StandaloneLinux64);
+            m_MacOSManaged = new DesktopSingleCPUProperty(EditorGUIUtility.TrTextContent("macOS 64-bit"),BuildTarget.StandaloneOSX);
+
             properties = new Property[]
             {
-                m_WindowsX86,
-                m_WindowsX86_X64,
+                m_Windows32,
+                m_Windows64,
                 m_Linux,
-                m_MacOS
+                m_MacOS,
+                m_Windows32Managed,
+                m_Windows64Managed,
+                m_LinuxManaged,
+                m_MacOSManaged
             };
         }
 
@@ -174,7 +197,7 @@ private bool IsUsableOnOSX(PluginImporter imp)
                 return true;
 
             string ext = FileUtil.GetPathExtension(imp.assetPath).ToLower();
-            return ext == "so" || ext == "bundle" || ext == "dylib" || IsCppPluginFile(imp.assetPath);
+            return ext == "bundle" || ext == "dylib" || IsLinuxLibrary(imp.assetPath) || IsCppPluginFile(imp.assetPath);
         }
 
         private bool IsUsableOnLinux(PluginImporter imp)
@@ -182,33 +205,49 @@ private bool IsUsableOnLinux(PluginImporter imp)
             if (!imp.isNativePlugin)
                 return true;
 
-            string ext = FileUtil.GetPathExtension(imp.assetPath).ToLower();
-            return ext == "so" || IsCppPluginFile(imp.assetPath);
+            return IsLinuxLibrary(imp.assetPath) || IsCppPluginFile(imp.assetPath);
         }
 
         public override void OnPlatformSettingsGUI(PluginImporterInspector inspector)
         {
             PluginImporter imp = inspector.importer;
             EditorGUI.BeginChangeCheck();
-            if (IsUsableOnWindows(imp))
+            // skip CPU property for things that aren't native libs
+            if (imp.isNativePlugin)
             {
-                EditorGUILayout.LabelField(EditorGUIUtility.TrTextContent("Windows"), EditorStyles.boldLabel);
-                m_WindowsX86.OnGUI(inspector);
-                m_WindowsX86_X64.OnGUI(inspector);
-                EditorGUILayout.Space();
-            }
+                if (IsUsableOnWindows(imp))
+                {
+                    EditorGUILayout.LabelField(EditorGUIUtility.TrTextContent("Windows"), EditorStyles.boldLabel);
+                    m_Windows32.OnGUI(inspector);
+                    m_Windows64.OnGUI(inspector);
+                    EditorGUILayout.Space();
+                }
+
+                if (IsUsableOnLinux(imp))
+                {
+                    EditorGUILayout.LabelField(EditorGUIUtility.TrTextContent("Linux"), EditorStyles.boldLabel);
+                    m_Linux.OnGUI(inspector);
+                    EditorGUILayout.Space();
+                }
 
-            if (IsUsableOnLinux(imp))
+                if (IsUsableOnOSX(imp))
+                {
+                    EditorGUILayout.LabelField(EditorGUIUtility.TrTextContent("macOS"), EditorStyles.boldLabel);
+                    m_MacOS.OnGUI(inspector);
+                    EditorGUILayout.Space();
+                }
+            }
+            else
             {
-                EditorGUILayout.LabelField(EditorGUIUtility.TrTextContent("Linux"), EditorStyles.boldLabel);
-                m_Linux.OnGUI(inspector);
+                // Managed plugins are usable on all platforms
+                m_Windows32Managed.OnGUI(inspector);
+                m_Windows64Managed.OnGUI(inspector);
                 EditorGUILayout.Space();
-            }
 
-            if (IsUsableOnOSX(imp))
-            {
-                EditorGUILayout.LabelField(EditorGUIUtility.TrTextContent("macOS"), EditorStyles.boldLabel);
-                m_MacOS.OnGUI(inspector);
+                m_LinuxManaged.OnGUI(inspector);
+                EditorGUILayout.Space();
+
+                m_MacOSManaged.OnGUI(inspector);
                 EditorGUILayout.Space();
             }
 
@@ -226,7 +265,7 @@ public void ValidateSingleCPUTargets(PluginImporterInspector inspector)
 
                 foreach (var importer in inspector.importers)
                 {
-                    importer.SetPlatformData(target.platformName, "CPU", target.value.ToString());
+                    importer.SetPlatformData(target.platformName, cpuKey, target.value.ToString());
                 }
             }
         }
@@ -251,13 +290,18 @@ public override string CalculateFinalPluginPath(string platformName, PluginImpor
             if (pluginForLinux && !IsUsableOnLinux(imp))
                 return string.Empty;
 
-            string cpu = imp.GetPlatformData(platformName, "CPU");
+            string cpu = imp.GetPlatformData(platformName, cpuKey);
 
             if (string.Compare(cpu, "None", true) == 0)
                 return string.Empty;
 
             if (pluginForWindows)
             {
+                if (string.Compare(cpu, nameof(DesktopPluginCPUArchitecture.ARM64), true) == 0)
+                {
+                    return Path.Combine(cpu, Path.GetFileName(imp.assetPath));
+                }
+
                 // Fix case 1185926: plugins for x86_64 are supposed to be copied to Plugins/x86_64
                 // Plugins for x86 are supposed to be copied to Plugins/x86
                 var cpuName = target == BuildTarget.StandaloneWindows ? nameof(DesktopPluginCPUArchitecture.x86) : nameof(DesktopPluginCPUArchitecture.x86_64);
@@ -274,6 +318,13 @@ public override string CalculateFinalPluginPath(string platformName, PluginImpor
             return Path.GetFileName(imp.assetPath);
         }
 
+        // Regex that matchers strings ending in ".so" or ".so.12" or ".so.4.7" and so on.
+        private static Regex LinuxLibraryRegex = new Regex(@"\.so(\.[0-9]+)*$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        internal static bool IsLinuxLibrary(string assetPath)
+        {
+            return LinuxLibraryRegex.IsMatch(assetPath);
+        }
+
         internal static bool IsCppPluginFile(string assetPath)
         {
             var extension = Path.GetExtension(assetPath).ToLower();
diff --git a/Editor/Mono/ImportSettings/SpeedTreeImporterInspector.cs b/Editor/Mono/ImportSettings/SpeedTreeImporterInspector.cs
index ad1aa221cb..624383e3f0 100644
--- a/Editor/Mono/ImportSettings/SpeedTreeImporterInspector.cs
+++ b/Editor/Mono/ImportSettings/SpeedTreeImporterInspector.cs
@@ -97,6 +97,14 @@ protected override bool OnApplyRevertGUI()
         {
             bool applied = base.OnApplyRevertGUI();
 
+            bool hasModified = HasModified();
+            if (tabs == null) // Hitting apply, we lose the tabs object within base.OnApplyRevertGUI()
+            {
+                if(hasModified)
+                    Apply();
+                return applied;
+            }
+
             bool doMatsHaveDifferentShaders = (tabs[0] as SpeedTreeImporterModelEditor).doMaterialsHaveDifferentShader;
 
             if (HasRemappedMaterials() || doMatsHaveDifferentShaders)
@@ -104,7 +112,6 @@ protected override bool OnApplyRevertGUI()
                 // Force material upgrade when a custom render pipeline is active so that render pipeline-specific material
                 // modifications may be applied.
                 bool upgrade = upgradeMaterials || (UnityEngine.Rendering.GraphicsSettings.currentRenderPipeline != null);
-                bool hasModified = HasModified();
                 if (GUILayout.Button(GetGenButtonText(hasModified, upgrade)))
                 {
                     // Apply the changes and generate the materials before importing so that asset previews are up-to-date.
diff --git a/Editor/Mono/ImportSettings/SpeedTreeImporterModelEditor.cs b/Editor/Mono/ImportSettings/SpeedTreeImporterModelEditor.cs
index 498a23c31e..420614ee83 100644
--- a/Editor/Mono/ImportSettings/SpeedTreeImporterModelEditor.cs
+++ b/Editor/Mono/ImportSettings/SpeedTreeImporterModelEditor.cs
@@ -35,7 +35,7 @@ private class Styles
             public static GUIContent UseReflectionProbes = EditorGUIUtility.TrTextContent("Reflection Probes", "The tree uses reflection probe for rendering"); // TODO: update help text
 
             public static GUIContent AdditionalSettingsHeader = EditorGUIUtility.TrTextContent("Additional Settings");
-            // TODO: motion vector settings?
+            public static GUIContent MotionVectorMode = EditorGUIUtility.TrTextContent("Motion Vectors", "Motion vector mode to set for the mesh renderer of each LOD object");
 
             public static GUIContent WindHeader = EditorGUIUtility.TrTextContent("Wind");
             public static GUIContent WindQuality = EditorGUIUtility.TrTextContent("Wind Quality", "Controls the wind effect's quality.");
@@ -63,6 +63,12 @@ private class Styles
                 , new GUIContent("inch to m")
                 , new GUIContent("Custom")
             };
+            public static GUIContent[] MotionVectorModeNames =  // Match SharedRendererDataTypes.h / enum MotionVectorGenerationMode
+            {
+                  new GUIContent("Camera Motion Only")  // kMotionVectorCamera = 0,    // Use camera motion for motion vectors
+                , new GUIContent("Per Object Motion")   // kMotionVectorObject,        // Use a per object motion vector pass for this object
+                , new GUIContent("Force No Motion")     // kMotionVectorForceNoMotion, // Force no motion for this object (0 into motion buffer)
+            };
         }
 
         //--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -72,6 +78,7 @@ private class Styles
         // mesh 
         private SerializedProperty m_ScaleFactor;
         private SerializedProperty m_UnitConversionEnumValue;
+        private SerializedProperty m_MotionVectorModeEnumValue;
 
         // material
         private SerializedProperty m_MainColor;
@@ -123,6 +130,7 @@ internal override void OnEnable()
         {
             m_ScaleFactor = serializedObject.FindProperty("m_ScaleFactor");
             m_UnitConversionEnumValue = serializedObject.FindProperty("m_UnitConversionEnumValue");
+            m_MotionVectorModeEnumValue = serializedObject.FindProperty("m_MotionVectorModeEnumValue");
 
             m_MainColor = serializedObject.FindProperty("m_MainColor");
             m_EnableHueVariation = serializedObject.FindProperty("m_EnableHueVariation");
@@ -256,7 +264,7 @@ private bool DoMaterialsHaveDifferentShader()
                 {
                     foreach (var mat in mr.sharedMaterials)
                     {
-                        if (mat.shader != defaultShader)
+                        if (mat?.shader != defaultShader)
                             return true;
                     }
                 }
@@ -265,7 +273,7 @@ private bool DoMaterialsHaveDifferentShader()
                 {
                     foreach (var br in prefabs[i].transform.GetComponentsInChildren<BillboardRenderer>())
                     {
-                        if (br.billboard.material.shader != defaultBillboardShader)
+                        if (br.billboard.material?.shader != defaultBillboardShader)
                             return true;
                     }
                 }
@@ -274,6 +282,14 @@ private bool DoMaterialsHaveDifferentShader()
             return false;
         }
 
+        private void ShowAdditionalSettingsGUI()
+        {
+            // motion vectors
+            GUILayout.Label(Styles.AdditionalSettingsHeader, EditorStyles.boldLabel);
+            EditorGUILayout.Popup(m_MotionVectorModeEnumValue, Styles.MotionVectorModeNames, Styles.MotionVectorMode);
+
+            EditorGUILayout.Space();
+        }
 
         public override void OnInspectorGUI()
         {
@@ -281,6 +297,7 @@ public override void OnInspectorGUI()
             ShowMeshGUI();
             ShowMaterialGUI();
             ShowLightingGUI();
+            ShowAdditionalSettingsGUI();
             ShowWindGUI();
             ShowLODGUI();
 
@@ -323,13 +340,36 @@ private void ShowMeshGUI()
 
             EditorGUILayout.Space();
         }
+
+        bool ShouldRenderHueVariationDropdown()
+        {
+            SpeedTreeImporter importer = importers.First();
+
+            if (importer.enableHueByDefault)
+            {
+                return true;
+            }
+
+            for (int i = 0; i < importer.enableHue.Length; ++i)
+            {
+                if (importer.enableSettingOverride[i] && importer.enableHue[i])
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         public void ShowMaterialGUI()
         {
             EditorGUILayout.LabelField("Material", EditorStyles.boldLabel);
 
             EditorGUILayout.PropertyField(m_MainColor, Styles.MainColor);
             EditorGUILayout.PropertyField(m_EnableHueVariation, Styles.EnableColorVariation);
-            if (importers.First().enableHueByDefault)
+
+            
+            if (ShouldRenderHueVariationDropdown())
             {
                 EditorGUILayout.PropertyField(m_HueVariation, Styles.HueVariation);
             }
diff --git a/Editor/Mono/ImportSettings/TextureImportPlatformSettings.cs b/Editor/Mono/ImportSettings/TextureImportPlatformSettings.cs
index c04ac0b6a4..647382bae2 100644
--- a/Editor/Mono/ImportSettings/TextureImportPlatformSettings.cs
+++ b/Editor/Mono/ImportSettings/TextureImportPlatformSettings.cs
@@ -142,6 +142,15 @@ public void Apply()
         public static BuildPlatform[] GetBuildPlayerValidPlatforms()
         {
             List<BuildPlatform> validPlatforms = BuildPlatforms.instance.GetValidPlatforms();
+
+            // The Dedicated Server is a subtarget of Standalone, textures are generally stripped from server builds,
+            // so overriding the texture settings for the Dedicated Server is a rare case that doesn't add much value.
+            // Supporting texture overrides for Dedicated Server is possible, but as importer dependencies cannot distinguish
+            // today between Standalone-Server and Standalone-Non-Server, such support means that textures would reimport on
+            // switching, for instance, between Standalone-Win and Standalon-OSX. That would represent a performance regression
+            // and so, we have opted to not support texture overrides for Dedicated Server.
+            validPlatforms.Remove(BuildPlatforms.instance.BuildPlatformFromNamedBuildTarget(NamedBuildTarget.Server));
+
             return validPlatforms.ToArray();
         }
 
@@ -163,7 +172,11 @@ internal static void ShowPlatformSpecificSettings(List<BaseTextureImportPlatform
                 BuildPlatform[] validPlatforms = GetBuildPlayerValidPlatforms();
                 string title = string.Format(Styles.overrideFor.text, validPlatforms[selected].title.text);
                 Rect controlRect = EditorGUILayout.GetControlRect(true);
-                GUIContent label = EditorGUI.BeginProperty(controlRect, GUIContent.Temp(title), realPS.model.overriddenProperty);
+                GUIContent label = GUIContent.Temp(title);
+                if (realPS.model.overriddenProperty != null)
+                {
+                    label = EditorGUI.BeginProperty(controlRect, label, realPS.model.overriddenProperty);
+                }
 
                 EditorGUI.BeginChangeCheck();
                 EditorGUI.showMixedValue = realPS.model.overriddenIsDifferent;
@@ -173,7 +186,10 @@ internal static void ShowPlatformSpecificSettings(List<BaseTextureImportPlatform
                     realPS.model.SetOverriddenForAll(newOverride);
                     SyncPlatformSettings(platformSettings);
                 }
-                EditorGUI.EndProperty();
+                if (realPS.model.overriddenProperty != null)
+                {
+                    EditorGUI.EndProperty();
+                }
             }
 
             // Disable size and format GUI if not overwritten for all objects
@@ -544,8 +560,32 @@ public TextureImportPlatformSettings(string name, BuildTarget target, TextureImp
             Init();
         }
 
+        public void ResetSerializedProperties()
+        {
+            model.platformTextureSettingsProp = null;
+            model.alphaSplitProperty = null;
+            model.androidETC2FallbackOverrideProperty = null;
+            model.compressionQualityProperty = null;
+            model.crunchedCompressionProperty = null;
+            model.maxTextureSizeProperty = null;
+            model.overriddenProperty = null;
+            model.resizeAlgorithmProperty = null;
+            model.textureCompressionProperty = null;
+            model.textureFormatProperty = null;
+        }
+
         public void CacheSerializedProperties(SerializedProperty platformSettingsArray)
         {
+            // When multi-selecting texture importers, depending on the number of stored platform settings + their order,
+            // we may end up in a situation where it is impossible to find the correct platform settings property.
+            // This is because the SerializedProperty system can only get elements that are found in all selected objects.
+            // Until a better solution comes around, keep this locked off.
+            if (platformSettingsArray.hasMultipleDifferentValues)
+            {
+                ResetSerializedProperties();
+                return;
+            }
+
             if (model.platformTextureSettingsProp != null && model.platformTextureSettingsProp.isValid &&
                 model.platformTextureSettingsProp.FindPropertyRelative("m_BuildTarget").stringValue == model.platformTextureSettings.name)
             {
@@ -557,7 +597,7 @@ public void CacheSerializedProperties(SerializedProperty platformSettingsArray)
             {
                 // This should not happen, all known valid platforms should have
                 // been created in advance, including the Default Platform.
-                model.platformTextureSettingsProp = null;
+                ResetSerializedProperties();
                 throw new UnityException("Cannot find any Platform Settings, including the Default Platform. This is incorrect, did initialization fail?");
             }
             else
@@ -578,6 +618,7 @@ public void CacheSerializedProperties(SerializedProperty platformSettingsArray)
                 // we should be able to find the currently selected platform. If not, fail.
                 if (model.platformTextureSettingsProp is null)
                 {
+                    ResetSerializedProperties();
                     throw new UnityException("Could not find the requested Platform Texture Settings. This is incorrect, did initialization fail?");
                 }
             }
diff --git a/Editor/Mono/ImportSettings/TextureImporterInspector.cs b/Editor/Mono/ImportSettings/TextureImporterInspector.cs
index ade1eb2683..8ec931c8c8 100644
--- a/Editor/Mono/ImportSettings/TextureImporterInspector.cs
+++ b/Editor/Mono/ImportSettings/TextureImporterInspector.cs
@@ -364,7 +364,7 @@ internal class Styles
             public readonly GUIContent psdRemoveMatte = EditorGUIUtility.TrTextContent("Remove PSD Matte", "Enable special processing for PSD that has transparency, as color pixels will be tweaked (blended with white color).");
 
             public readonly GUIContent ignorePngGamma = EditorGUIUtility.TrTextContent("Ignore PNG Gamma", "Ignore the Gamma attribute value in PNG files.");
-            public readonly GUIContent readWriteWarning = EditorGUIUtility.TrTextContent("Textures larger than 8192 can not be Read/Write enabled. Value will be ignored.");
+            public readonly GUIContent readWriteWarning = EditorGUIUtility.TrTextContent("When you enable Read/Write, Unity stores an additional copy of your textures in CPU-addressable memory. One or more of the textures you have selected use a considerable amount of memory (more than 512MB).");
 
             public readonly GUIContent flipbookColumns = EditorGUIUtility.TrTextContent("Columns", "Source image is divided into this amount of columns.");
             public readonly GUIContent flipbookRows = EditorGUIUtility.TrTextContent("Rows", "Source image is divided into this amount of rows.");
@@ -892,36 +892,33 @@ void CubemapMappingGUI(TextureInspectorGUIElement guiElements)
             {
                 if ((TextureImporterShape)m_TextureShape.intValue == TextureImporterShape.TextureCube)
                 {
-                    using (new EditorGUI.DisabledScope(!m_IsPOT && m_NPOTScale.intValue == (int)TextureImporterNPOTScale.None))
-                    {
-                        Rect controlRect = EditorGUILayout.GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup);
-                        GUIContent label = EditorGUI.BeginProperty(controlRect, s_Styles.cubemap, m_GenerateCubemap);
+                    Rect controlRect = EditorGUILayout.GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup);
+                    GUIContent label = EditorGUI.BeginProperty(controlRect, s_Styles.cubemap, m_GenerateCubemap);
 
-                        EditorGUI.showMixedValue = m_GenerateCubemap.hasMultipleDifferentValues || m_SeamlessCubemap.hasMultipleDifferentValues;
+                    EditorGUI.showMixedValue = m_GenerateCubemap.hasMultipleDifferentValues || m_SeamlessCubemap.hasMultipleDifferentValues;
 
-                        EditorGUI.BeginChangeCheck();
+                    EditorGUI.BeginChangeCheck();
 
-                        int value = EditorGUI.IntPopup(controlRect, label, m_GenerateCubemap.intValue, s_Styles.cubemapOptions, s_Styles.cubemapValues2);
-                        if (EditorGUI.EndChangeCheck())
-                            m_GenerateCubemap.intValue = value;
+                    int value = EditorGUI.IntPopup(controlRect, label, m_GenerateCubemap.intValue, s_Styles.cubemapOptions, s_Styles.cubemapValues2);
+                    if (EditorGUI.EndChangeCheck())
+                        m_GenerateCubemap.intValue = value;
 
-                        EditorGUI.EndProperty();
-                        EditorGUI.indentLevel++;
+                    EditorGUI.EndProperty();
+                    EditorGUI.indentLevel++;
 
-                        // Convolution
-                        if (ShouldDisplayGUIElement(guiElements, TextureInspectorGUIElement.CubeMapConvolution))
-                        {
-                            EditorGUILayout.IntPopup(m_CubemapConvolution,
-                                s_Styles.cubemapConvolutionOptions,
-                                s_Styles.cubemapConvolutionValues,
-                                s_Styles.cubemapConvolution);
-                        }
+                    // Convolution
+                    if (ShouldDisplayGUIElement(guiElements, TextureInspectorGUIElement.CubeMapConvolution))
+                    {
+                        EditorGUILayout.IntPopup(m_CubemapConvolution,
+                            s_Styles.cubemapConvolutionOptions,
+                            s_Styles.cubemapConvolutionValues,
+                            s_Styles.cubemapConvolution);
+                    }
 
-                        ToggleFromInt(m_SeamlessCubemap, s_Styles.seamlessCubemap);
+                    ToggleFromInt(m_SeamlessCubemap, s_Styles.seamlessCubemap);
 
-                        EditorGUI.indentLevel--;
-                        EditorGUILayout.Space();
-                    }
+                    EditorGUI.indentLevel--;
+                    EditorGUILayout.Space();
                 }
             }
             EditorGUILayout.EndFadeGroup();
@@ -971,6 +968,13 @@ void ColorSpaceGUI(TextureInspectorGUIElement guiElements)
 
         void POTScaleGUI(TextureInspectorGUIElement guiElements)
         {
+            // Cubemap face sizes are calculated using the original file's width/height + the cubemap generation mode.
+            // Currently, the calculation always outputs POT face sizes: displaying this control is thus unnecessary.
+            if ((TextureImporterShape)m_TextureShape.intValue == TextureImporterShape.TextureCube)
+            {
+                return;
+            }
+
             using (new EditorGUI.DisabledScope(m_IsPOT))
             {
                 EnumPopup(m_NPOTScale, typeof(TextureImporterNPOTScale), s_Styles.npot);
@@ -979,14 +983,11 @@ void POTScaleGUI(TextureInspectorGUIElement guiElements)
 
         void ReadableGUI(TextureInspectorGUIElement guiElements)
         {
-            bool enabled = CanReadWrite();
-            using (new EditorGUI.DisabledScope(!enabled))
+            ToggleFromInt(m_IsReadable, s_Styles.readWrite);
+
+            if (m_IsReadable.intValue > 0 && !m_IsReadable.hasMultipleDifferentValues && ShouldShowWarningForReadWrite())
             {
-                ToggleFromInt(m_IsReadable, s_Styles.readWrite);
-                if (!enabled && m_IsReadable.intValue > 0)
-                {
-                    EditorGUILayout.HelpBox(s_Styles.readWriteWarning.text, MessageType.Warning, true);
-                }
+                EditorGUILayout.HelpBox(s_Styles.readWriteWarning.text, MessageType.Info, true);
             }
         }
 
@@ -1443,6 +1444,7 @@ public override void OnInspectorGUI()
                 // NB we do these weird things partly because ApplyTextureType has early out
                 // NB hence we want settings to have *old* textureType when calling it
                 TextureImporterSettings settings = GetSerializedPropertySettings();
+                settings.textureType = (TextureImporterType)oldTextureType;
                 settings.ApplyTextureType((TextureImporterType)newTextureType);
                 settings.textureType = (TextureImporterType)newTextureType;
 
@@ -1548,31 +1550,6 @@ public override void OnInspectorGUI()
             if (!string.IsNullOrEmpty(m_ImportWarning))
                 EditorGUILayout.HelpBox(m_ImportWarning, MessageType.Warning);
 
-            if (!m_TextureShape.hasMultipleDifferentValues && !m_EnableMipMap.hasMultipleDifferentValues && !m_NPOTScale.hasMultipleDifferentValues)
-            {
-                // To avoid complexity of combinations of settings (e.g., tex1 is rescaled to POT with mipmap enabled, tex2 is NPOT with mipmap disabled, then all is fine but we would still get warnings)
-                // we only show the warnings for a single texture (or a group with the same values)
-
-                if (m_TextureShape.intValue == (int)TextureImporterShape.Texture2D && m_EnableMipMap.boolValue && m_NPOTScale.intValue == (int)TextureImporterNPOTScale.None && TargetsHaveNPOTTextures())
-                {
-                    BuildTarget buildTarget = EditorUserBuildSettings.activeBuildTarget;
-                    UnityEngine.Rendering.GraphicsDeviceType[] activeTargetGraphicsAPIs = PlayerSettings.GetGraphicsAPIs(buildTarget);
-                    if (Array.Exists(activeTargetGraphicsAPIs, api => api == UnityEngine.Rendering.GraphicsDeviceType.OpenGLES2))
-                    {
-                        GUIContent c;
-                        if (buildTarget == BuildTarget.WebGL)
-                            c = EditorGUIUtility.TrTextContent("NPOT textures are not fully supported on WebGL1. On these devices, mipmapping will be disabled.");
-                        else if (buildTarget == BuildTarget.Android)
-                            c = EditorGUIUtility.TrTextContent("Some Android devices running on OpenGLES2 may not support NPOT textures. If this is the case, mipmapping will be disabled.");
-                        else
-                            c = EditorGUIUtility.TrTextContent("Some devices running on OpenGLES2 may not support NPOT textures. If this is the case, mipmapping will be disabled.");
-
-                        EditorGUILayout.HelpBox(c.text, MessageType.Warning, true);
-                    }
-                }
-            }
-
-
             GUI.enabled = wasEnabled;
         }
 
@@ -1678,14 +1655,24 @@ private static bool IsPowerOfTwo(int f)
             return ((f & (f - 1)) == 0);
         }
 
-        bool CanReadWrite()
+        bool ShouldShowWarningForReadWrite()
         {
-            foreach (TextureImportPlatformSettings ps in m_PlatformSettings)
+            const int maxRecommendedSize = 536870912; // 512 MB
+
+            if (textureInspector && textureInspector.targets != null)
             {
-                if (ps.model.platformTextureSettings.maxTextureSize > TextureImporter.MaxTextureSizeAllowedForReadable)
-                    return false;
+                foreach (Texture texture in textureInspector.targets)
+                {
+                    if (texture)
+                    {
+                        if (TextureUtil.GetStorageMemorySizeLong(texture) > maxRecommendedSize)
+                        {
+                            return true;
+                        }
+                    }
+                }
             }
-            return true;
+            return false;
         }
 
         public virtual void BuildTargetList()
diff --git a/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownDataSource.cs b/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownDataSource.cs
index a0e5cf80d6..df35ec80ee 100644
--- a/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownDataSource.cs
+++ b/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownDataSource.cs
@@ -13,11 +13,13 @@ internal abstract class AdvancedDropdownDataSource
 
         private AdvancedDropdownItem m_MainTree;
         private AdvancedDropdownItem m_SearchTree;
+        private AdvancedDropdownItem m_CurrentContextTree;
         private List<int> m_SelectedIDs = new List<int>();
 
         public AdvancedDropdownItem mainTree { get { return m_MainTree; }}
         public AdvancedDropdownItem searchTree { get { return m_SearchTree; }}
         public List<int> selectedIDs { get { return m_SelectedIDs; }}
+        public bool CurrentFolderContextualSearch { get; set; }
 
         protected AdvancedDropdownItem root { get { return m_MainTree; }}
         protected List<AdvancedDropdownItem> m_SearchableElements;
@@ -34,8 +36,13 @@ public void ReloadData()
 
         protected abstract AdvancedDropdownItem FetchData();
 
-        public void RebuildSearch(string search)
+        public void RebuildSearch(string search, AdvancedDropdownItem currentTree)
         {
+            if (CurrentFolderContextualSearch && m_CurrentContextTree != currentTree && currentTree != searchTree)
+            {
+                m_SearchableElements = null;
+            }
+            m_CurrentContextTree = currentTree;
             m_SearchTree = Search(search);
         }
 
@@ -126,7 +133,7 @@ protected virtual AdvancedDropdownItem Search(string searchString)
         void BuildSearchableElements()
         {
             m_SearchableElements = new List<AdvancedDropdownItem>();
-            BuildSearchableElements(root);
+            BuildSearchableElements(CurrentFolderContextualSearch && m_CurrentContextTree != null ? m_CurrentContextTree : root);
         }
 
         void BuildSearchableElements(AdvancedDropdownItem item)
diff --git a/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownGUI.cs b/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownGUI.cs
index 860a7b0db3..ca26e20101 100644
--- a/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownGUI.cs
+++ b/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownGUI.cs
@@ -34,6 +34,8 @@ internal static void LoadStyles()
             Debug.Assert(Event.current.type == EventType.Repaint && Styles.itemStyle != null);
         }
 
+        public static string k_SearchFieldName = "ComponentSearch";
+
         //This should ideally match line height
         private Vector2 s_IconSize = new Vector2(13, 13);
         private AdvancedDropdownDataSource m_DataSource;
@@ -153,7 +155,7 @@ internal void DrawSearchField(bool isSearchFieldDisabled, string searchString, A
 
             using (new EditorGUI.DisabledScope(isSearchFieldDisabled))
             {
-                GUI.SetNextControlName("ComponentSearch");
+                GUI.SetNextControlName(k_SearchFieldName);
 
                 var newSearch = DrawSearchFieldControl(searchString);
 
diff --git a/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownWindow.cs b/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownWindow.cs
index 6fdf2c9ca8..69749d861d 100644
--- a/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownWindow.cs
+++ b/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownWindow.cs
@@ -56,7 +56,7 @@ protected internal string searchString
             set
             {
                 m_Search = value;
-                m_DataSource.RebuildSearch(m_Search);
+                m_DataSource.RebuildSearch(m_Search, m_CurrentlyRenderedTree);
                 m_CurrentlyRenderedTree = m_DataSource.mainTree;
                 if (hasSearch)
                 {
@@ -273,7 +273,7 @@ private void OnDirtyList()
             m_DataSource.ReloadData();
             if (hasSearch)
             {
-                m_DataSource.RebuildSearch(searchString);
+                m_DataSource.RebuildSearch(searchString, m_CurrentlyRenderedTree);
                 if (state.GetSelectedIndex(m_CurrentlyRenderedTree) < 0)
                 {
                     state.SetSelectedIndex(m_CurrentlyRenderedTree, 0);
@@ -338,14 +338,15 @@ private void HandleKeyboard()
                 }
 
                 // Do these if we're not in search mode
-                if (!hasSearch)
+                if (!hasSearch &&
+                    (string.IsNullOrEmpty(GUI.GetNameOfFocusedControl()) || GUI.GetNameOfFocusedControl() == AdvancedDropdownGUI.k_SearchFieldName))
                 {
                     if (evt.keyCode == KeyCode.LeftArrow || evt.keyCode == KeyCode.Backspace)
                     {
                         GoToParent();
                         evt.Use();
                     }
-                    if (evt.keyCode == KeyCode.RightArrow)
+                    else if (evt.keyCode == KeyCode.RightArrow)
                     {
                         var idx = m_State.GetSelectedIndex(m_CurrentlyRenderedTree);
                         if (idx > -1 && m_CurrentlyRenderedTree.children.ElementAt(idx).children.Any())
@@ -354,7 +355,7 @@ private void HandleKeyboard()
                         }
                         evt.Use();
                     }
-                    if (evt.keyCode == KeyCode.Escape)
+                    else if (evt.keyCode == KeyCode.Escape)
                     {
                         Close();
                         evt.Use();
@@ -494,6 +495,7 @@ private void DrawList(AdvancedDropdownItem item)
 
         protected void GoToParent()
         {
+            GUI.FocusControl("");
             if (m_ViewsStack.Count == 0)
                 return;
             m_LastTime = DateTime.Now.Ticks;
@@ -507,6 +509,7 @@ protected void GoToParent()
 
         private void GoToChild()
         {
+            GUI.FocusControl("");
             m_ViewsStack.Push(m_CurrentlyRenderedTree);
             m_LastTime = DateTime.Now.Ticks;
             if (m_NewAnimTarget < 0)
diff --git a/Editor/Mono/Inspector/AdvancedDropdown/EditorGUI/StatelessAdvancedDropdown.cs b/Editor/Mono/Inspector/AdvancedDropdown/EditorGUI/StatelessAdvancedDropdown.cs
index 25031500d4..e62c5d9312 100644
--- a/Editor/Mono/Inspector/AdvancedDropdown/EditorGUI/StatelessAdvancedDropdown.cs
+++ b/Editor/Mono/Inspector/AdvancedDropdown/EditorGUI/StatelessAdvancedDropdown.cs
@@ -181,7 +181,7 @@ public static Enum DoEnumMaskPopup(Rect rect, Enum options, GUIStyle style)
         {
             var enumData = EnumDataUtility.GetCachedEnumData(options.GetType());
             var optionValue = EnumDataUtility.EnumFlagsToInt(enumData, options);
-            MaskFieldGUI.GetMenuOptions(optionValue, enumData.displayNames, enumData.flagValues, out var buttonText, out var buttonTextMixed, out var optionNames, out var optionMaskValues, out var selectedOptions);
+            MaskFieldGUI.GetMenuOptions(optionValue, enumData.displayNames, enumData.flagValues, out var buttonText, out var buttonTextMixed, out _, out _, out _);
 
             var id = EditorGUIUtility.GetControlID("AdvancedDropdown".GetHashCode(), FocusType.Keyboard, rect);
 
@@ -244,7 +244,7 @@ static int DoMaskField(Rect rect, int mask, string[] displayedOptions, GUIStyle
             for (int i = 0; i < flagValues.Length; ++i)
                 flagValues[i] = (1 << i);
 
-            MaskFieldGUI.GetMenuOptions(mask, displayedOptions, flagValues, out var buttonText, out var buttonTextMixed, out var optionNames, out var optionMaskValues, out var selectedOptions);
+            MaskFieldGUI.GetMenuOptions(mask, displayedOptions, flagValues, out var buttonText, out var buttonTextMixed, out _, out _, out _);
 
             var id = EditorGUIUtility.GetControlID("AdvancedDropdown".GetHashCode(), FocusType.Keyboard, rect);
 
diff --git a/Editor/Mono/Inspector/AnimationClipEditor.cs b/Editor/Mono/Inspector/AnimationClipEditor.cs
index 09dd5b3a6b..4f3a18fc81 100644
--- a/Editor/Mono/Inspector/AnimationClipEditor.cs
+++ b/Editor/Mono/Inspector/AnimationClipEditor.cs
@@ -1780,6 +1780,7 @@ internal class EventManipulationHandler
         private AnimationWindowEvent[] m_Events;
 
         private TimeArea m_Timeline;
+        private AnimationEventEditorState m_EventEditorState = new();
 
         public EventManipulationHandler(TimeArea timeArea)
         {
@@ -1828,11 +1829,17 @@ public bool HandleEventManipulation(Rect rect, ref AnimationEvent[] events, Anim
                     sharedOffset = Mathf.FloorToInt(Mathf.Max(0, spread - (eventMarker.width - 1) * (sharedLeft)));
                 }
 
+                // UUM-49717
+                // Depending on the resolution and the scale of the display, the icon size could be greater than the visible height of the timeline.
+                // We divide it so that it fits.
+                float absRectHeight = Mathf.Abs(rect.height);
+                int divider = absRectHeight > 0 && absRectHeight < eventMarker.height ? Mathf.CeilToInt(eventMarker.height / absRectHeight) : 1;
+
                 Rect r = new Rect(
-                    keypos + sharedOffset - eventMarker.width / 2,
+                    keypos + sharedOffset - eventMarker.width / (2 * divider),
                     (rect.height - 10) * (float)(sharedLeft - shared + 1) / Mathf.Max(1, shared - 1),
-                    eventMarker.width,
-                    eventMarker.height);
+                    eventMarker.width / divider,
+                    eventMarker.height / divider);
 
                 hitRects[i] = r;
                 drawRects[i] = r;
@@ -2062,7 +2069,7 @@ public void Draw(Rect window)
         {
             EditorGUI.indentLevel++;
             if (m_Events != null && m_Events.Length > 0)
-                AnimationWindowEventInspector.OnEditAnimationEvents(m_Events);
+                AnimationWindowEventInspector.OnEditAnimationEvents(m_Events, m_EventEditorState);
             else
                 AnimationWindowEventInspector.OnDisabledAnimationEvent();
 
diff --git a/Editor/Mono/Inspector/AssemblyDefinitionImporterInspector.cs b/Editor/Mono/Inspector/AssemblyDefinitionImporterInspector.cs
index 27719993f8..157d384600 100644
--- a/Editor/Mono/Inspector/AssemblyDefinitionImporterInspector.cs
+++ b/Editor/Mono/Inspector/AssemblyDefinitionImporterInspector.cs
@@ -24,11 +24,15 @@ internal class Styles
         {
             public static readonly GUIContent name = EditorGUIUtility.TrTextContent("Name", "The assembly name is used to generate a <name>.dll file on you disk.");
             public static readonly GUIContent rootNamespace = EditorGUIUtility.TrTextContent("Root Namespace", "Specify the root namespace of the assembly.");
-            public static readonly GUIContent defineConstraints = EditorGUIUtility.TrTextContent("Define Constraints", "Specify a constraint in the assembly definition. The assembly definition only builds if this constraint returns True.");
-            public static readonly GUIContent versionDefines = EditorGUIUtility.TrTextContent("Version Defines", "Specify which versions of a packages and modules to include in compilations.");
+            public static readonly GUIContent defineConstraints = EditorGUIUtility.TrTextContent("Define Constraints", "Specify constraints which determine if the assembly will be compiled or not. The assembly will compile whenever all constraints are met.");
+            public static readonly GUIContent versionDefines = EditorGUIUtility.TrTextContent("Version Defines", "Specify preprocessor symbols to define based on package, module or Unity versions.");
+            public static readonly GUIContent resource = EditorGUIUtility.TrTextContent("If resource", "Select 'Unity' or the package or module that you want to set a define for.");
+            public static readonly GUIContent version = EditorGUIUtility.TrTextContent("version is", "Specify the semantic version of your chosen module, package or Unity Version. You must use mathematical interval notation.");
+            public static readonly GUIContent define = EditorGUIUtility.TrTextContent("set define", "Specify the name you want this define to have. This define is only set if the expression's condition is satisfied.");
+            public static readonly GUIContent expressionOutcome = EditorGUIUtility.TrTextContent("Version expression outcome", "Shows the mathematical equation applied to the version number used determine if the symbol should be defined.");
             public static readonly GUIContent references = EditorGUIUtility.TrTextContent("Assembly Definition References", "The list of assembly files that this assembly definition should reference.");
             public static readonly GUIContent precompiledReferences = EditorGUIUtility.TrTextContent("Assembly References", "The list of Precompiled assemblies that this assembly definition should reference.");
-            public static readonly GUIContent generalOptions = EditorGUIUtility.TrTextContent("General");
+            public static readonly GUIContent generalOptions = EditorGUIUtility.TrTextContent("General Options");
             public static readonly GUIContent allowUnsafeCode = EditorGUIUtility.TrTextContent("Allow 'unsafe' Code", "When enabled, the C# compiler for this assembly includes types or members that have the `unsafe` keyword.");
             public static readonly GUIContent overrideReferences = EditorGUIUtility.TrTextContent("Override References", "When enabled, you can select which specific precompiled assemblies to refer to via a drop-down list that appears. When not enabled, this assembly definition refers to all auto-referenced precompiled assemblies.");
             public static readonly GUIContent autoReferenced = EditorGUIUtility.TrTextContent("Auto Referenced", "When enabled, this assembly definition is automatically referenced in predefined assemblies.");
@@ -40,7 +44,6 @@ internal class Styles
             public static readonly GUIContent selectAll = EditorGUIUtility.TrTextContent("Select all");
             public static readonly GUIContent deselectAll = EditorGUIUtility.TrTextContent("Deselect all");
             public static readonly GUIContent loadError = EditorGUIUtility.TrTextContent("Load error");
-            public static readonly GUIContent expressionOutcome = EditorGUIUtility.TrTextContent("Expression outcome", "Shows the mathematical equation that your Expression represents.");
             public static readonly GUIContent noEngineReferences = EditorGUIUtility.TrTextContent("No Engine References", "When enabled, references to UnityEngine/UnityEditor will not be added when compiling this assembly.");
 
             // This is used to make everything in reorderable list elements centered vertically.
@@ -56,16 +59,16 @@ internal class Styles
             public static Texture2D validDefineConstraint => EditorGUIUtility.pixelsPerPoint > 1 ? kValidDefineConstraintHighDpi : kValidDefineConstraint;
             public static Texture2D invalidDefineConstraint => EditorGUIUtility.pixelsPerPoint > 1 ? kInvalidDefineConstraintHighDpi : kInvalidDefineConstraint;
 
-            static string kCompatibleTextTitle = L10n.Tr("Define constraints are compatible.");
-            static string kIncompatibleTextTitle = L10n.Tr("One or more define constraints are invalid or incompatible.");
+            static string kCompatibleTextTitle = L10n.Tr("Define constraints are met.");
+            static string kIncompatibleTextTitle = L10n.Tr("One or more define constraints are invalid or not met.");
 
             public static string GetTitleTooltipFromDefineConstraintCompatibility(bool compatible)
             {
                 return compatible ? kCompatibleTextTitle : kIncompatibleTextTitle;
             }
 
-            static string kCompatibleTextIndividual = L10n.Tr("Define constraint is compatible.");
-            static string kIncompatibleTextIndividual = L10n.Tr("Define constraint is incompatible.");
+            static string kCompatibleTextIndividual = L10n.Tr("Define constraint is met.");
+            static string kIncompatibleTextIndividual = L10n.Tr("Define constraint is not met.");
             static string kInvalidTextIndividual = L10n.Tr("Define constraint is invalid.");
 
             public static string GetIndividualTooltipFromDefineConstraintStatus(DefineConstraintsHelper.DefineConstraintStatus status)
@@ -195,7 +198,7 @@ public override void OnEnable()
             {
                 try
                 {
-                    using (var fs = File.Open(assetPath, FileMode.Open, FileAccess.Write)) {}
+                    using (var fs = File.Open(assetPath, FileMode.Open, FileAccess.Write)) { }
                 }
                 catch
                 {
@@ -255,54 +258,22 @@ public override void OnInspectorGUI()
                     EditorGUILayout.PropertyField(m_AssemblyName, Styles.name);
                 }
 
+                GUILayout.Space(6f);
+
+                // General Options
                 GUILayout.Label(Styles.generalOptions, EditorStyles.boldLabel);
+
                 EditorGUILayout.BeginVertical(GUI.skin.box);
                 EditorGUILayout.PropertyField(m_AllowUnsafeCode, Styles.allowUnsafeCode);
                 EditorGUILayout.PropertyField(m_AutoReferenced, Styles.autoReferenced);
                 EditorGUILayout.PropertyField(m_NoEngineReferences, Styles.noEngineReferences);
                 EditorGUILayout.PropertyField(m_OverrideReferences, Styles.overrideReferences);
                 EditorGUILayout.PropertyField(m_RootNamespace, Styles.rootNamespace);
-
                 EditorGUILayout.EndVertical();
-                GUILayout.Space(10f);
-
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.Label(Styles.defineConstraints, EditorStyles.boldLabel);
-                GUILayout.FlexibleSpace();
-                EditorGUILayout.EndHorizontal();
-
-                if (m_DefineConstraints.serializedProperty.arraySize > 0)
-                {
-                    var defineConstraintsCompatible = true;
-
-                    var defines = GetDefines();
-
-                    if (defines != null)
-                    {
-                        for (var i = 0; i < m_DefineConstraints.serializedProperty.arraySize && defineConstraintsCompatible; ++i)
-                        {
-                            var defineConstraint = m_DefineConstraints.serializedProperty.GetArrayElementAtIndex(i).FindPropertyRelative("name").stringValue;
-
-                            if (DefineConstraintsHelper.GetDefineConstraintCompatibility(defines, defineConstraint) != DefineConstraintsHelper.DefineConstraintStatus.Compatible)
-                            {
-                                defineConstraintsCompatible = false;
-                            }
-                        }
-
-                        var constraintValidityRect = new Rect(GUILayoutUtility.GetLastRect());
-                        constraintValidityRect.x = constraintValidityRect.width - Styles.kValidityIconWidth / 4;
-                        var image = defineConstraintsCompatible ? Styles.validDefineConstraint : Styles.invalidDefineConstraint;
-                        var tooltip = Styles.GetTitleTooltipFromDefineConstraintCompatibility(defineConstraintsCompatible);
-                        var content = new GUIContent(image, tooltip);
-
-                        constraintValidityRect.width = Styles.kValidityIconWidth;
-                        constraintValidityRect.height = Styles.kValidityIconHeight;
-                        EditorGUI.LabelField(constraintValidityRect, content);
-                    }
-                }
 
-                m_DefineConstraints.DoLayoutList();
+                GUILayout.Space(6f);
 
+                // ASMDEF References
                 GUILayout.Label(Styles.references, EditorStyles.boldLabel);
 
                 EditorGUILayout.BeginVertical(GUI.skin.box);
@@ -331,6 +302,9 @@ public override void OnInspectorGUI()
                     }
                 }
 
+                GUILayout.Space(6f);
+
+                // Platforms
                 GUILayout.Label(Styles.platforms, EditorStyles.boldLabel);
                 EditorGUILayout.BeginVertical(GUI.skin.box);
 
@@ -403,10 +377,51 @@ public override void OnInspectorGUI()
                     GUILayout.FlexibleSpace();
                     GUILayout.EndHorizontal();
                 }
-
                 EditorGUILayout.EndVertical();
-                GUILayout.Space(10f);
 
+                GUILayout.Space(6f);
+
+                // Define Constraints
+                EditorGUILayout.BeginHorizontal();
+                GUILayout.Label(Styles.defineConstraints, EditorStyles.boldLabel);
+                GUILayout.FlexibleSpace();
+                EditorGUILayout.EndHorizontal();
+
+                if (m_DefineConstraints.serializedProperty.arraySize > 0)
+                {
+                    var defineConstraintsCompatible = true;
+
+                    var defines = GetDefines();
+
+                    if (defines != null)
+                    {
+                        for (var i = 0; i < m_DefineConstraints.serializedProperty.arraySize && defineConstraintsCompatible; ++i)
+                        {
+                            var defineConstraint = m_DefineConstraints.serializedProperty.GetArrayElementAtIndex(i).FindPropertyRelative("name").stringValue;
+
+                            if (DefineConstraintsHelper.GetDefineConstraintCompatibility(defines, defineConstraint) != DefineConstraintsHelper.DefineConstraintStatus.Compatible)
+                            {
+                                defineConstraintsCompatible = false;
+                            }
+                        }
+
+                        var constraintValidityRect = new Rect(GUILayoutUtility.GetLastRect());
+                        constraintValidityRect.x = constraintValidityRect.width - Styles.kValidityIconWidth / 4;
+                        var image = defineConstraintsCompatible ? Styles.validDefineConstraint : Styles.invalidDefineConstraint;
+                        var tooltip = Styles.GetTitleTooltipFromDefineConstraintCompatibility(defineConstraintsCompatible);
+                        var content = new GUIContent(image, tooltip);
+
+                        constraintValidityRect.width = Styles.kValidityIconWidth;
+                        constraintValidityRect.height = Styles.kValidityIconHeight;
+                        EditorGUI.LabelField(constraintValidityRect, content);
+                    }
+                }
+
+                m_DefineConstraints.DoLayoutList();
+
+                GUILayout.Space(6f);
+
+                // Version Defines
                 EditorGUILayout.BeginVertical(GUI.skin.box);
                 GUILayout.Label(Styles.versionDefines, EditorStyles.boldLabel);
                 m_VersionDefineList.DoLayoutList();
@@ -534,20 +549,28 @@ private string[] GetDefines()
             return defines.Distinct().ToArray();
         }
 
-        private List<string> BuildListOfVersionDefineResourceOptions(string preselectedResourceName)
+        private List<VersionMetaData> BuildListOfVersionDefineResourceOptions(string preselectedResourceName)
         {
-            var versionDefineResourceOptions = EditorCompilationInterface.Instance.GetVersionMetaDatas().Keys.ToList();
+            var versionDefineResourceOptions = EditorCompilationInterface.Instance.GetVersionMetaDatas().Values.ToList();
 
-            if (!string.IsNullOrEmpty(preselectedResourceName) && !versionDefineResourceOptions.Contains(preselectedResourceName))
+            if (!string.IsNullOrEmpty(preselectedResourceName) && !versionDefineResourceOptions.Where(x => x.Name == preselectedResourceName).Any())
             {
-                versionDefineResourceOptions.Add(preselectedResourceName);
+                versionDefineResourceOptions.Add(new VersionMetaData(preselectedResourceName));
             }
 
-            versionDefineResourceOptions.Insert(0, "Select...");
+            versionDefineResourceOptions.Insert(0, new VersionMetaData("Select..."));
 
-            bool optionUnityIsInTheList = versionDefineResourceOptions.Remove(UnityVersionTypeName);
-            if (optionUnityIsInTheList)
-                versionDefineResourceOptions.Insert(1, UnityVersionTypeName);
+            // Make sure Unity is always second option (index 1).
+            for (int i = versionDefineResourceOptions.Count - 1; i >= 2; --i)
+            {
+                if (versionDefineResourceOptions[i].Name == UnityVersionTypeName)
+                {
+                    var tmp = versionDefineResourceOptions[i];
+                    versionDefineResourceOptions.RemoveAt(i);
+                    versionDefineResourceOptions.Insert(1, tmp);
+                    break;
+                }
+            }
 
             return versionDefineResourceOptions;
         }
@@ -567,22 +590,41 @@ private void DrawVersionDefineListElement(Rect rect, int index, bool isactive, b
             int indexOfSelected = 0;
             if (!string.IsNullOrEmpty(nameProp.stringValue))
             {
-                indexOfSelected = versionedResourceOptions.IndexOf(nameProp.stringValue);
+                indexOfSelected = versionedResourceOptions.IndexOf(versionedResourceOptions.Where(x => x.Name == nameProp.stringValue).First());
             }
 
             bool mixed = versionDefineProp.hasMultipleDifferentValues;
             EditorGUI.showMixedValue = mixed;
 
+            string[] versionedResourceOptionsStrings = new string[versionedResourceOptions.Count];
+
+            for (int i = 0; i < versionedResourceOptions.Count; ++i)
+            {
+                if (string.IsNullOrEmpty(versionedResourceOptions[i].Version))
+                {
+                    versionedResourceOptionsStrings[i] = versionedResourceOptions[i].Name;
+                }
+                else
+                {
+                    versionedResourceOptionsStrings[i] = $"{versionedResourceOptions[i].Name} ({versionedResourceOptions[i].Version})";
+                }
+            }
+
             var elementRect = new Rect(rect);
             elementRect.height = EditorGUIUtility.singleLineHeight;
-            int popupIndex = EditorGUI.Popup(elementRect, GUIContent.Temp("Resource", "Select 'Unity' or the package or module that you want to set a define for."), indexOfSelected, versionedResourceOptions.ToArray());
-            nameProp.stringValue = versionedResourceOptions[popupIndex];
+            elementRect.y += 1;
+
+            var prefixLabel = EditorGUI.PrefixLabel(elementRect, Styles.resource);
+
+            int popupIndex = EditorGUI.AdvancedPopup(prefixLabel, indexOfSelected, versionedResourceOptionsStrings);
+
+            nameProp.stringValue = versionedResourceOptions[popupIndex].Name;
 
             elementRect.y += EditorGUIUtility.singleLineHeight;
-            defineProp.stringValue = EditorGUI.TextField(elementRect, GUIContent.Temp("Define", "Specify the name you want this define to have. This define is only set if the expression below returns true."), defineProp.stringValue);
+            expressionProp.stringValue = EditorGUI.TextField(elementRect, Styles.version, expressionProp.stringValue);
 
             elementRect.y += EditorGUIUtility.singleLineHeight;
-            expressionProp.stringValue = EditorGUI.TextField(elementRect, GUIContent.Temp("Expression", "Specify the Unity version or the semantic version of your chosen module or package. You must use mathematical interval notation."), expressionProp.stringValue);
+            defineProp.stringValue = EditorGUI.TextField(elementRect, Styles.define, defineProp.stringValue);
 
             string expressionOutcome = null;
             if (!string.IsNullOrEmpty(expressionProp.stringValue))
diff --git a/Editor/Mono/Inspector/AudioClipInspector.cs b/Editor/Mono/Inspector/AudioClipInspector.cs
index 9d469b68c6..530acbac69 100644
--- a/Editor/Mono/Inspector/AudioClipInspector.cs
+++ b/Editor/Mono/Inspector/AudioClipInspector.cs
@@ -28,6 +28,9 @@ internal class AudioClipInspector : Editor
         static GUIContent s_AutoPlayIcon;
         static GUIContent s_LoopIcon;
 
+        static private string s_PreviewDisabledMessage = "AudioClip preview not available when Unity Audio is disabled in Project Settings";
+        static private string s_TrPreviewDisabledMessage = L10n.Tr(s_PreviewDisabledMessage);
+
         static Texture2D s_DefaultIcon;
 
         private Material m_HandleLinesMaterial;
@@ -48,9 +51,11 @@ static void Init()
             s_AutoPlay = EditorPrefs.GetBool("AutoPlayAudio", false);
             s_Loop = false;
 
-            s_AutoPlayIcon = EditorGUIUtility.TrIconContent("preAudioAutoPlayOff", "Turn Auto Play on/off");
-            s_PlayIcon = EditorGUIUtility.TrIconContent("PlayButton", "Play");
-            s_LoopIcon = EditorGUIUtility.TrIconContent("preAudioLoopOff", "Loop on/off");
+            var unityAudioDisabled = AudioSettings.unityAudioDisabled;
+
+            s_AutoPlayIcon = EditorGUIUtility.TrIconContent("preAudioAutoPlayOff", unityAudioDisabled ? s_PreviewDisabledMessage : "Turn Auto Play on/off");
+            s_PlayIcon = EditorGUIUtility.TrIconContent("PlayButton", unityAudioDisabled ? s_PreviewDisabledMessage : "Play");
+            s_LoopIcon = EditorGUIUtility.TrIconContent("preAudioLoopOff", unityAudioDisabled ? s_PreviewDisabledMessage : "Loop on/off");
 
             s_DefaultIcon = EditorGUIUtility.LoadIcon("Profiler.Audio");
         }
@@ -118,6 +123,7 @@ public override void OnPreviewSettings()
             AudioClip clip = target as AudioClip;
             m_MultiEditing = targets.Length > 1;
 
+            using (new EditorGUI.DisabledScope(AudioSettings.unityAudioDisabled))
             {
                 using (new EditorGUI.DisabledScope(m_MultiEditing && !playing))
                 {
@@ -297,6 +303,11 @@ public override void OnPreviewGUI(Rect r, GUIStyle background)
                 s_PlayFirst = false;
             }
 
+            if (AudioSettings.unityAudioDisabled)
+            {
+                EditorGUILayout.HelpBox(s_TrPreviewDisabledMessage, MessageType.Info);
+            }
+
             // force update GUI
             if (playing)
                 GUIView.current.Repaint();
diff --git a/Editor/Mono/Inspector/AudioSourceInspector.cs b/Editor/Mono/Inspector/AudioSourceInspector.cs
index 27514408e5..1679eebe99 100644
--- a/Editor/Mono/Inspector/AudioSourceInspector.cs
+++ b/Editor/Mono/Inspector/AudioSourceInspector.cs
@@ -494,7 +494,7 @@ private void Audio3DGUI()
             if (targets.Length == 1)
             {
                 AudioSource t = (AudioSource)target;
-                AudioListener audioListener = (AudioListener)FindObjectOfType(typeof(AudioListener));
+                AudioListener audioListener = (AudioListener)FindFirstObjectByType(typeof(AudioListener));
                 if (audioListener != null)
                 {
                     float distToListener = (AudioUtil.GetListenerPos() - t.transform.position).magnitude;
diff --git a/Editor/Mono/Inspector/CameraEditor.cs b/Editor/Mono/Inspector/CameraEditor.cs
index f019b0651f..b70d8cbde1 100644
--- a/Editor/Mono/Inspector/CameraEditor.cs
+++ b/Editor/Mono/Inspector/CameraEditor.cs
@@ -552,8 +552,6 @@ int targetEyeValue
             get { return settings.targetEye.intValue; }
         }
 
-        Overlay m_PreviewOverlay;
-
         static List<XRDisplaySubsystemDescriptor> displayDescriptors = new List<XRDisplaySubsystemDescriptor>();
 
         static void OnReloadSubsystemsComplete()
@@ -578,7 +576,7 @@ public void OnEnable()
             SubsystemManager.afterReloadSubsystems += OnReloadSubsystemsComplete;
 
             if(!SceneViewCameraOverlay.forceDisable)
-                SceneView.AddOverlayToActiveView(m_PreviewOverlay = CreatePreviewOverlay(c));
+                CreatePreviewOverlay(c);
         }
 
         public void OnDestroy()
@@ -589,7 +587,7 @@ public void OnDestroy()
 
         public void OnDisable()
         {
-            SceneView.RemoveOverlayFromActiveView(m_PreviewOverlay);
+            SceneViewCameraOverlay.DisableCameraOverlay((Camera)target);
             m_ShowBGColorOptions.valueChanged.RemoveListener(Repaint);
             m_ShowOrthoOptions.valueChanged.RemoveListener(Repaint);
             m_ShowTargetEyeOption.valueChanged.RemoveListener(Repaint);
@@ -774,7 +772,7 @@ public virtual void OnOverlayGUI(Object target, SceneView sceneView)
         {
         }
 
-        public virtual Overlay CreatePreviewOverlay(Camera cam) => new SceneViewCameraOverlay(cam);
+        public virtual Overlay CreatePreviewOverlay(Camera cam) => SceneViewCameraOverlay.GetOrCreateCameraOverlay(cam);
 
         [RequiredByNativeCode]
         internal static float GetGameViewAspectRatio()
diff --git a/Editor/Mono/Inspector/CameraEditorUtils.cs b/Editor/Mono/Inspector/CameraEditorUtils.cs
index d1430a24b5..bf8b8b7768 100644
--- a/Editor/Mono/Inspector/CameraEditorUtils.cs
+++ b/Editor/Mono/Inspector/CameraEditorUtils.cs
@@ -183,7 +183,7 @@ public static bool TryGetSensorGateFrustum(Camera camera, Vector3[] near, Vector
             if (near != null)
             {
                 Vector2 planeSize;
-                planeSize.y = 2.0f * camera.nearClipPlane * Mathf.Tan(Mathf.Deg2Rad * camera.fieldOfView * 0.5f);
+                planeSize.y = camera.nearClipPlane * Mathf.Tan(Mathf.Deg2Rad * camera.fieldOfView * 0.5f);
                 planeSize.x = planeSize.y * camera.sensorSize.x / camera.sensorSize.y;
 
                 Vector3 rightOffset = camera.gameObject.transform.right * planeSize.x;
diff --git a/Editor/Mono/Inspector/CameraOverlay.cs b/Editor/Mono/Inspector/CameraOverlay.cs
index 6b546205fa..bc8732d195 100644
--- a/Editor/Mono/Inspector/CameraOverlay.cs
+++ b/Editor/Mono/Inspector/CameraOverlay.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.Collections.Generic;
 using UnityEditor.Overlays;
 using UnityEngine;
 using UnityEngine.Experimental.Rendering;
@@ -10,7 +11,7 @@
 
 namespace UnityEditor
 {
-    [Overlay(id = k_OverlayID, displayName = k_DisplayName)]
+    [Overlay(id = k_OverlayID, displayName = k_DisplayName, defaultDisplay = true)]
     [Icon("Icons/Overlays/CameraPreview.png")]
     class SceneViewCameraOverlay : IMGUIOverlay
     {
@@ -28,9 +29,10 @@ class SceneViewCameraOverlay : IMGUIOverlay
         Camera previewCamera => m_PreviewCamera;
 
         RenderTexture m_PreviewTexture;
-        int m_QualitySettingsAntiAliasing = -1;
 
-        public SceneViewCameraOverlay(Camera camera)
+        static Dictionary<Camera, (SceneViewCameraOverlay overlay, int count)> s_CameraOverlays = new Dictionary<Camera, (SceneViewCameraOverlay, int)>();
+
+        SceneViewCameraOverlay(Camera camera)
         {
             minSize = new Vector2(40, 40);
             maxSize = new Vector2(4000, 4000);
@@ -39,6 +41,8 @@ public SceneViewCameraOverlay(Camera camera)
             displayName = selectedCamera == null || string.IsNullOrEmpty(selectedCamera.name)
                 ? "Camera Preview"
                 : selectedCamera.name;
+
+            s_CameraOverlays.Add(camera, (this ,1));
         }
 
         public override void OnCreated()
@@ -55,6 +59,37 @@ public override void OnWillBeDestroyed()
             UnityObject.DestroyImmediate(m_PreviewCamera.gameObject, true);
         }
 
+        public static SceneViewCameraOverlay GetOrCreateCameraOverlay(Camera camera)
+        {
+            if (s_CameraOverlays.ContainsKey(camera))
+            {
+                var value = s_CameraOverlays[camera];
+                value.count += 1;
+                s_CameraOverlays[camera] = value;
+                return value.overlay;
+            }
+
+            var overlay = new SceneViewCameraOverlay(camera);
+            SceneView.AddOverlayToActiveView(overlay);
+            return overlay;
+        }
+
+        public static void DisableCameraOverlay(Camera cam)
+        {
+            if (s_CameraOverlays.ContainsKey(cam))
+            {
+                var value = s_CameraOverlays[cam];
+                value.count -= 1;
+                if (value.count == 0)
+                {
+                    s_CameraOverlays.Remove(cam);
+                    SceneView.RemoveOverlayFromActiveView(value.overlay);
+                }
+                else
+                    s_CameraOverlays[cam] = value;
+            }
+        }
+
         RenderTexture GetPreviewTextureWithSizeAndAA(int width, int height)
         {
             int antiAliasing = Mathf.Max(1, QualitySettings.antiAliasing);
@@ -64,7 +99,6 @@ RenderTexture GetPreviewTextureWithSizeAndAA(int width, int height)
                     m_PreviewTexture.Release();
 
                 m_PreviewTexture = new RenderTexture(width, height, 24, SystemInfo.GetGraphicsFormat(DefaultFormat.LDR));
-                m_QualitySettingsAntiAliasing = QualitySettings.antiAliasing;
                 m_PreviewTexture.antiAliasing = antiAliasing;
             }
             return m_PreviewTexture;
@@ -82,8 +116,9 @@ public override void OnGUI()
 
             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;
+
+            imguiContainer.style.flexGrow = collapsed ? 0 : 1;
+            imguiContainer.parent.style.flexGrow = collapsed ? 0 : 1;
 
             if (selectedCamera == null)
             {
@@ -104,7 +139,7 @@ public override void OnGUI()
             var cameraRect = imguiContainer.rect;
             cameraRect.width = Mathf.Floor(cameraRect.width);
 
-            if (cameraRect.width < 1 || cameraRect.height < 1)
+            if (cameraRect.width < 1 || cameraRect.height < 1 || float.IsNaN(cameraRect.width) || float.IsNaN(cameraRect.height))
                 return;
 
             if (Event.current.type == EventType.Repaint)
@@ -176,6 +211,7 @@ public override void OnGUI()
                     RenderTexture.active = rt;
                 }
 
+                previewCamera.cameraType = CameraType.Preview;
                 previewCamera.Render();
 
                 Graphics.DrawTexture(previewRect, previewTexture, new Rect(0, 0, 1, 1), 0, 0, 0, 0, GUI.color, EditorGUIUtility.GUITextureBlit2SRGBMaterial);
diff --git a/Editor/Mono/Inspector/CanvasEditor.cs b/Editor/Mono/Inspector/CanvasEditor.cs
index 796d8602cc..a61867dcbf 100644
--- a/Editor/Mono/Inspector/CanvasEditor.cs
+++ b/Editor/Mono/Inspector/CanvasEditor.cs
@@ -28,6 +28,7 @@ internal class CanvasEditor : Editor
         SerializedProperty m_OverrideSorting;
         SerializedProperty m_ShaderChannels;
         SerializedProperty m_UpdateRectTransformForStandalone;
+        SerializedProperty m_VertexColorAlwaysGammaSpace;
 
         AnimBool m_OverlayMode;
         AnimBool m_CameraMode;
@@ -47,6 +48,7 @@ private static class Styles
             public static GUIContent m_ShaderChannel = EditorGUIUtility.TrTextContent("Additional Shader Channels");
             public static GUIContent pixelPerfectContent = EditorGUIUtility.TrTextContent("Pixel Perfect");
             public static GUIContent standaloneRenderResize = EditorGUIUtility.TrTextContent("Resize Canvas", "For manual Camera.Render calls should the canvas resize to match the destination target.");
+            public static GUIContent vertexColorAlwaysGammaSpace = EditorGUIUtility.TrTextContent("Vertex Color Always In Gamma Color Space", "UI vertex colors are always in gamma color space disregard of the player settings");
         }
 
         private bool m_AllNested = false;
@@ -81,6 +83,7 @@ void OnEnable()
             m_PixelPerfectOverride = serializedObject.FindProperty("m_OverridePixelPerfect");
             m_ShaderChannels = serializedObject.FindProperty("m_AdditionalShaderChannelsFlag");
             m_UpdateRectTransformForStandalone = serializedObject.FindProperty("m_UpdateRectTransformForStandalone");
+            m_VertexColorAlwaysGammaSpace = serializedObject.FindProperty("m_VertexColorAlwaysGammaSpace");
 
             m_OverlayMode = new AnimBool(m_RenderMode.intValue == 0);
             m_OverlayMode.valueChanged.AddListener(Repaint);
@@ -311,7 +314,19 @@ public override void OnInspectorGUI()
                 if (m_RenderMode.intValue == 0) // Overlay canvas
                 {
                     if (((newShaderChannelValue & (int)AdditionalCanvasShaderChannels.Normal) | (newShaderChannelValue & (int)AdditionalCanvasShaderChannels.Tangent)) != 0)
-                        EditorGUILayout.HelpBox("Shader channels Normal and Tangent are most often used with lighting, which an Overlay canvas does not support. Its likely these channels are not needed.", MessageType.Warning);
+                    {
+                        var helpMessage = "Shader channels Normal and Tangent are most often used with lighting, which an Overlay canvas does not support. Its likely these channels are not needed.";
+                        rect = GUILayoutUtility.GetRect(EditorGUIUtility.TempContent(helpMessage, EditorGUIUtility.GetHelpIcon(MessageType.Warning)), EditorStyles.helpBox);
+                        EditorGUI.HelpBox(rect, helpMessage, MessageType.Warning);
+                    }
+                }
+
+                EditorGUILayout.PropertyField(m_VertexColorAlwaysGammaSpace, Styles.vertexColorAlwaysGammaSpace);
+
+                if (PlayerSettings.colorSpace == ColorSpace.Linear)
+                {
+                    if (!m_VertexColorAlwaysGammaSpace.boolValue)
+                        EditorGUILayout.HelpBox( "Keep vertex color in Gamma space to allow gamma to linear color space conversion to happen in UI shaders. This will enhance UI color precision in linear color space.", MessageType.Warning);
                 }
             }
             else
diff --git a/Editor/Mono/Inspector/CubemapInspector.cs b/Editor/Mono/Inspector/CubemapInspector.cs
index bedd050c54..ec70c78f7e 100644
--- a/Editor/Mono/Inspector/CubemapInspector.cs
+++ b/Editor/Mono/Inspector/CubemapInspector.cs
@@ -4,7 +4,8 @@
 
 using System.Globalization;
 using UnityEngine;
-
+using UnityEngine.Rendering;
+using UnityEngine.Experimental.Rendering;
 
 namespace UnityEditor
 {
@@ -15,13 +16,9 @@ internal class CubemapInspector : TextureInspector
         static private readonly int[] kSizesValues = { 16, 32, 64, 128, 256, 512, 1024, 2048 };
         const int kTextureSize = 64;
 
-        private Texture2D[] m_Images;
+        private static readonly string kNativeTextureNotice = L10n.Tr("External texture: Unity cannot make changes to this Cubemap.");
 
-        protected override void OnEnable()
-        {
-            base.OnEnable();
-            InitTexturesFromCubemap();
-        }
+        private Texture2D[] m_Images;
 
         protected override void OnDisable()
         {
@@ -41,18 +38,34 @@ protected override void OnDisable()
         private void InitTexturesFromCubemap()
         {
             var c = target as Cubemap;
-            if (c != null)
+            if (c is null || c.isNativeTexture)
             {
-                if (m_Images == null)
-                    m_Images = new Texture2D[6];
-                for (int i = 0; i < m_Images.Length; ++i)
-                {
-                    if (m_Images[i] && !EditorUtility.IsPersistent(m_Images[i]))
-                        DestroyImmediate(m_Images[i]);
+                return;
+            }
 
-                    if (TextureUtil.GetSourceTexture(c, (CubemapFace)i))
+            if (m_Images == null)
+                m_Images = new Texture2D[6];
+            for (int i = 0; i < m_Images.Length; ++i)
+            {
+                if (m_Images[i] && !EditorUtility.IsPersistent(m_Images[i]))
+                    DestroyImmediate(m_Images[i]);
+
+                if (TextureUtil.GetSourceTexture(c, (CubemapFace)i))
+                {
+                    m_Images[i] = TextureUtil.GetSourceTexture(c, (CubemapFace)i);
+                }
+                else
+                {
+                    // When the Cubemap is compressed, avoid "CopyCubemapFaceIntoTexture" due to potentially very high decompression cost. (example: Cubemap with no mipmaps)
+                    // Note: the CopyTexture approach may produce results that look slightly different if "CopyCubemapFaceIntoTexture" would have downscaled to kTextureSize.
+                    if (GraphicsFormatUtility.IsCompressedFormat(c.format) && SystemInfo.copyTextureSupport.HasFlag(CopyTextureSupport.DifferentTypes))
                     {
-                        m_Images[i] = TextureUtil.GetSourceTexture(c, (CubemapFace)i);
+                        int previewSize = System.Math.Clamp(kTextureSize, c.width >> (c.mipmapCount - 1), c.width);
+                        m_Images[i] = new Texture2D(previewSize, previewSize, c.format, false);
+                        m_Images[i].hideFlags = HideFlags.HideAndDontSave;
+
+                        int mipToCopy = (int)(System.Math.Log(c.width, 2) - System.Math.Log(previewSize, 2));
+                        Graphics.CopyTexture(c, i, mipToCopy, m_Images[i], 0, 0);
                     }
                     else
                     {
@@ -66,13 +79,20 @@ private void InitTexturesFromCubemap()
 
         public override void OnInspectorGUI()
         {
+            var c = target as Cubemap;
+            if (c == null)
+                return;
+
+            if (c.isNativeTexture)
+            {
+                EditorGUILayout.HelpBox(kNativeTextureNotice, MessageType.Info);
+                return;
+            }
+
             if (m_Images == null)
                 InitTexturesFromCubemap();
 
             EditorGUIUtility.labelWidth = 50;
-            var c = target as Cubemap;
-            if (c == null)
-                return;
 
             GUILayout.BeginVertical();
 
diff --git a/Editor/Mono/Inspector/Editor.cs b/Editor/Mono/Inspector/Editor.cs
index 6c02192e2a..57ca2a5fbf 100644
--- a/Editor/Mono/Inspector/Editor.cs
+++ b/Editor/Mono/Inspector/Editor.cs
@@ -306,6 +306,7 @@ internal interface IToolModeOwner
         bool ModeSurvivesSelectionChange(int toolMode);
     }
 
+    [Obsolete(@"CustomEditorForRenderPipelineAttribute is deprecated. Use CustomEditor with SupportedOnCurrentPipeline instead. #from(2023.1)", false)]
     [AttributeUsage(AttributeTargets.Class)]
     public class CustomEditorForRenderPipelineAttribute : CustomEditor
     {
@@ -390,6 +391,11 @@ internal InspectorMode inspectorMode
             }
         }
 
+        internal DataMode dataMode =>
+            propertyViewer is EditorWindow editorWindow
+                ? editorWindow.dataModeController.dataMode
+                : DataMode.Disabled;
+
         internal static float kLineHeight = EditorGUI.kSingleLineHeight;
 
         internal bool hideInspector = false;
@@ -445,7 +451,33 @@ public virtual void DiscardChanges()
         // used internally to know if this the first editor in the inspector window
         internal bool firstInspectedEditor { get; set; }
 
-        internal IPropertyView propertyViewer { get; set; }
+        IPropertyView m_PropertyViewer;
+
+        internal IPropertyView propertyViewer
+        {
+            get
+            {
+                return m_PropertyViewer;
+            }
+            set
+            {
+                if (m_PropertyViewer != value)
+                {
+                    m_PropertyViewer = value;
+
+                    // We are being assigned a new property view with different inspector mode to what our serialized object was built with.
+                    if (null != m_PropertyViewer && m_PropertyViewer.inspectorMode != m_InspectorMode)
+                    {
+                        // Keep the local inspector mode in sync.
+                        m_InspectorMode = m_PropertyViewer.inspectorMode;
+
+                        // Trash the local serialized object and property cache to force a rebuild.
+                        m_SerializedObject = null;
+                        m_EnabledProperty = null;
+                    }
+                }
+            }
+        }
 
         internal virtual bool HasLargeHeader()
         {
@@ -659,6 +691,9 @@ private void CreateSerializedObject()
             {
                 m_SerializedObject = new SerializedObject(targets, m_Context);
                 m_SerializedObject.inspectorMode = inspectorMode;
+                if (m_SerializedObject.inspectorDataMode != dataMode)
+                    m_SerializedObject.inspectorDataMode = dataMode;
+
                 AssignCachedProperties(this, m_SerializedObject.GetIterator());
                 m_EnabledProperty = m_SerializedObject.FindProperty("m_Enabled");
             }
@@ -917,6 +952,9 @@ public void DrawHeader()
                     EditorGUILayout.BeginVertical(UseDefaultMargins() ? EditorStyles.inspectorDefaultMargins : GUIStyle.none);
                 }
             }
+
+            // Restore previous hierarchy mode
+            EditorGUIUtility.hierarchyMode = hierarchyMode;
         }
 
         // This is the method to override to create custom header GUI.
@@ -1325,10 +1363,14 @@ internal bool CanBeExpandedViaAFoldout()
                 return true;
 
             if (m_SerializedObject == null)
+            {
                 CreateSerializedObject();
+            }
             else
                 m_SerializedObject.Update();
             m_SerializedObject.inspectorMode = inspectorMode;
+            if (m_SerializedObject.inspectorDataMode != dataMode)
+                m_SerializedObject.inspectorDataMode = dataMode;
 
             return CanBeExpandedViaAFoldoutWithoutUpdate();
         }
@@ -1339,7 +1381,9 @@ internal bool CanBeExpandedViaAFoldoutWithoutUpdate()
                 return true;
 
             if (m_SerializedObject == null)
+            {
                 CreateSerializedObject();
+            }
             SerializedProperty property = m_SerializedObject.GetIterator();
 
             bool analyzePropertyChildren = true;
diff --git a/Editor/Mono/Inspector/EditorDragging.cs b/Editor/Mono/Inspector/EditorDragging.cs
index 31a7b8d442..7cc50be9ce 100644
--- a/Editor/Mono/Inspector/EditorDragging.cs
+++ b/Editor/Mono/Inspector/EditorDragging.cs
@@ -101,9 +101,16 @@ void HandleNativeDragDropInBottomArea(Editor[] editors, Rect rect)
 
             if (Event.current.type == EventType.DragPerform)
             {
-                DragAndDrop.AcceptDrag();
-                m_TargetIndex = -1;
-                GUIUtility.ExitGUI();
+                // Determine if any object references are component, which would mean we are reordering components in the inspector
+                var anyComponent = DragAndDrop.objectReferences != null && DragAndDrop.objectReferences.Any(o => o is Component);
+
+                // None of the object references are component, cancel further processing to avoid adding component twice
+                if (!anyComponent)
+                {
+                    DragAndDrop.AcceptDrag();
+                    m_TargetIndex = -1;
+                    GUIUtility.ExitGUI();
+                }
             }
         }
 
diff --git a/Editor/Mono/Inspector/EditorElementUpdater.cs b/Editor/Mono/Inspector/EditorElementUpdater.cs
index 488371110c..950857780b 100644
--- a/Editor/Mono/Inspector/EditorElementUpdater.cs
+++ b/Editor/Mono/Inspector/EditorElementUpdater.cs
@@ -34,12 +34,27 @@ public EditorElementUpdater(PropertyEditor propertyEditor)
         /// <summary>
         /// Adds the specified <see cref="IEditorElement"/> to the updater.
         /// </summary>
-        /// <param name="element"></param>
+        /// <param name="element">The editor element to add.</param>
         public void Add(IEditorElement element)
         {
             m_EditorElements.Add(element);
         }
 
+        /// <summary>
+        /// Removes the specified <see cref="IEditorElement"/> from the updater.
+        /// </summary>
+        /// <param name="element">The editor element to remove.</param>
+        public void Remove(IEditorElement element)
+        {
+            var index = m_EditorElements.IndexOf(element);
+
+            if (index == -1)
+                return;
+
+            if (m_Index > index)
+                m_Index--;
+        }
+
         /// <summary>
         /// Clears the internal state and resets the enumerator.
         /// </summary>
diff --git a/Editor/Mono/Inspector/EditorSettingsInspector.cs b/Editor/Mono/Inspector/EditorSettingsInspector.cs
index 70cb76e10a..2676fbc4b7 100644
--- a/Editor/Mono/Inspector/EditorSettingsInspector.cs
+++ b/Editor/Mono/Inspector/EditorSettingsInspector.cs
@@ -7,7 +7,6 @@
 using UnityEditorInternal;
 using UnityEngine;
 using UnityEditor.Hardware;
-using UnityEditor.Collaboration;
 using UnityEngine.Assertions;
 
 namespace UnityEditor
@@ -93,7 +92,6 @@ class Content
             public static readonly GUIContent enterPlayModeOptionsEnabled = EditorGUIUtility.TrTextContent("Enter Play Mode Options", "Enables options when Entering Play Mode");
             public static readonly GUIContent enterPlayModeOptionsEnableDomainReload = EditorGUIUtility.TrTextContent("Reload Domain", "Enables Domain Reload when Entering Play Mode. Domain reload reinitializes game completely making loading behavior very close to the Player");
             public static readonly GUIContent enterPlayModeOptionsEnableSceneReload = EditorGUIUtility.TrTextContent("Reload Scene", "Enables Scene Reload when Entering Play Mode. Scene reload makes loading behavior and performance characteristics very close to the Player");
-            public static readonly GUIContent enterPlayModeOptionsDisableSceneBackup = EditorGUIUtility.TrTextContent("Disable Scene Backup", "Conditionally skips writing a backup of the open scenes to disk. Only scenes that are modified in-memory need to be backed up, but making modifications from script may change the scene without setting the scene's dirty flag.");
 
             public static readonly GUIContent numberingScheme = EditorGUIUtility.TrTextContent("Numbering Scheme");
 
@@ -427,21 +425,14 @@ public override void OnInspectorGUI()
             if (m_IsGlobalSettings)
                 ShowUnityRemoteGUI(editorEnabled);
 
-            bool collabEnabled = Collab.instance.IsCollabEnabledForCurrentProject();
             GUILayout.Space(10);
 
+            GUI.enabled = true;
+            GUILayout.Label(Content.assetSerialization, EditorStyles.boldLabel);
+            GUI.enabled = editorEnabled;
+
             int index = m_SerializationMode.intValue;
-            using (new EditorGUI.DisabledScope(!collabEnabled))
-            {
-                GUI.enabled = !collabEnabled;
-                GUILayout.Label(Content.assetSerialization, EditorStyles.boldLabel);
-                GUI.enabled = editorEnabled && !collabEnabled;
-                CreatePopupMenu("Mode", serializationPopupList, index, SetAssetSerializationMode);
-            }
-            if (collabEnabled)
-            {
-                EditorGUILayout.HelpBox("Asset Serialization is forced to Text when using Collaboration feature.", MessageType.Warning);
-            }
+            CreatePopupMenu("Mode", serializationPopupList, index, SetAssetSerializationMode);
 
             if (m_SerializationMode.intValue != (int)SerializationMode.ForceBinary)
             {
@@ -461,7 +452,7 @@ public override void OnInspectorGUI()
             GUI.enabled = editorEnabled;
             if (GUILayout.Button(Content.ucbpLearnMore, EditorStyles.linkLabel))
             {
-                var help = Help.FindHelpNamed("AssetBundles-Building");
+                var help = Help.FindHelpNamed("Build-MultiProcess");
                 Application.OpenURL(help);
             }
             GUILayout.EndHorizontal();
@@ -561,8 +552,11 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(m_UseLegacyProbeSampleCount, Content.useLegacyProbeSampleCount);
             if (EditorGUI.EndChangeCheck())
             {
+
                 if (m_IsGlobalSettings)
+#pragma warning disable 618
                     EditorSettings.useLegacyProbeSampleCount = m_UseLegacyProbeSampleCount.boolValue;
+#pragma warning restore 618
 
                 EditorApplication.RequestRepaintAllViews();
             }
@@ -821,10 +815,21 @@ private void DoCacheServerSettings()
                         if (address.Length == 2)
                             port = Convert.ToUInt16(address[1]);
 
-                        if (AssetDatabase.CanConnectToCacheServer(ip, port))
+                        bool canConnect = AssetDatabase.CanConnectToCacheServer(ip, port);
+                        bool isConnected = AssetDatabase.IsConnectedToCacheServer();
+                        if (canConnect)
                             m_CacheServerConnectionState = CacheServerConnectionState.Success;
                         else
                             m_CacheServerConnectionState = CacheServerConnectionState.Failure;
+
+                        //We have to check if we're out of sync. here.
+                        //If we can connect, but we're not connected, we need to update some UI
+                        //If we CANNOT connect, but we are connected, we are out of sync. too and
+                        //need to update some UI.
+                        //Calling RefreshSettings here fixes that, and this check encapsulates the
+                        //above 2 conditions.
+                        if (canConnect != isConnected)
+                            AssetDatabase.RefreshSettings();
                     }
 
                     GUILayout.Space(25);
@@ -991,7 +996,6 @@ private void DoEnterPlayModeSettings()
                 EnterPlayModeOptions options = (EnterPlayModeOptions)m_EnterPlayModeOptions.intValue;
                 options = ToggleEnterPlayModeOptions(options, EnterPlayModeOptions.DisableDomainReload, Content.enterPlayModeOptionsEnableDomainReload);
                 options = ToggleEnterPlayModeOptions(options, EnterPlayModeOptions.DisableSceneReload, Content.enterPlayModeOptionsEnableSceneReload);
-                options = ToggleEnterPlayModeOptions(options, EnterPlayModeOptions.DisableSceneBackupUnlessDirty, Content.enterPlayModeOptionsDisableSceneBackup);
 
                 if (m_EnterPlayModeOptions.intValue != (int)options)
                 {
@@ -1013,23 +1017,10 @@ private void DoEnterInspectorSettings()
             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;
+                PropertyEditor.ClearAndRebuildAll();
             }
         }
 
-        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++)
diff --git a/Editor/Mono/Inspector/Enlighten/LightmapParameters.cs b/Editor/Mono/Inspector/Enlighten/LightmapParameters.cs
index 731ff30454..4a9308bde5 100644
--- a/Editor/Mono/Inspector/Enlighten/LightmapParameters.cs
+++ b/Editor/Mono/Inspector/Enlighten/LightmapParameters.cs
@@ -5,6 +5,7 @@
 using UnityEngine;
 using UnityEditor;
 using UnityEngine.Rendering;
+using System;
 
 namespace UnityEditor
 {
@@ -72,14 +73,22 @@ public override void OnInspectorGUI()
                 {
                     ++EditorGUI.indentLevel;
 
-                    EditorGUILayout.LabelField(Styles.enlightenLabel, EditorStyles.boldLabel);
-
-                    ++EditorGUI.indentLevel;
-
                     EditorGUILayout.PropertyField(m_Resolution, Styles.resolutionContent);
                     EditorGUILayout.Slider(m_ClusterResolution, 0.1F, 1.0F, Styles.clusterResolutionContent);
                     EditorGUILayout.IntSlider(m_IrradianceBudget, 32, 2048, Styles.irradianceBudgetContent);
-                    EditorGUILayout.IntSlider(m_IrradianceQuality, 512, 131072, Styles.irradianceQualityContent);
+                    if (m_IrradianceQuality.hasMultipleDifferentValues)
+                    {
+                        EditorGUI.BeginChangeCheck();
+                        EditorGUI.showMixedValue = true;
+
+                        int newValue = (int) EditorGUILayout.LogarithmicIntSlider(Styles.irradianceQualityContent, value: m_IrradianceQuality.intValue, leftValue: 512, rightValue: 131072, logbase: 2, 512, 131072);
+                        if (EditorGUI.EndChangeCheck())
+                            m_IrradianceQuality.intValue = newValue;
+                        
+                        EditorGUI.showMixedValue = false;
+                    }
+                    else
+                        m_IrradianceQuality.intValue = EditorGUILayout.LogarithmicIntSlider(Styles.irradianceQualityContent, value: m_IrradianceQuality.intValue, leftValue: 512, rightValue: 131072, logbase: 2, 512, 131072);
                     EditorGUILayout.Slider(m_ModellingTolerance, 0.0f, 1.0f, Styles.modellingToleranceContent);
                     EditorGUILayout.PropertyField(m_EdgeStitching, Styles.edgeStitchingContent);
                     EditorGUILayout.PropertyField(m_IsTransparent, Styles.isTransparent);
@@ -87,27 +96,53 @@ public override void OnInspectorGUI()
                     EditorGUILayout.Space();
 
                     --EditorGUI.indentLevel;
-                    --EditorGUI.indentLevel;
                 }
             }
 
-            GUILayout.Label(Styles.bakedGIContent, EditorStyles.boldLabel);
+            m_BakedGISettings.value = EditorGUILayout.FoldoutTitlebar(m_BakedGISettings.value, Styles.bakedGIContent, true);
 
-            EditorGUILayout.PropertyField(m_AntiAliasingSamples, Styles.antiAliasingSamplesContent);
-            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);
-            m_LimitLightmapCount.boolValue = EditorGUILayout.Toggle(Styles.limitLightmapCount, m_LimitLightmapCount.boolValue);
-            if (m_LimitLightmapCount.boolValue)
+            if (m_BakedGISettings.value)
             {
                 EditorGUI.indentLevel++;
-                EditorGUILayout.PropertyField(m_LightmapMaxCount, Styles.lightmapMaxCount);
+                if (m_AntiAliasingSamples.hasMultipleDifferentValues)
+                {
+                    EditorGUI.BeginChangeCheck();
+                    EditorGUI.showMixedValue = true;
+
+                    int fieldValue = EditorGUILayout.IntPopup(Styles.antiAliasingSamplesContent, m_AntiAliasingSamples.intValue, Styles.antiAliasingSamplesStrings, Styles.antiAliasingSampleValues);
+
+                    if (EditorGUI.EndChangeCheck())
+                        m_AntiAliasingSamples.intValue = fieldValue;
+                    
+                    EditorGUI.showMixedValue = false;
+                }
+
+                else
+                {
+                    int fieldValue = EditorGUILayout.IntPopup(Styles.antiAliasingSamplesContent, m_AntiAliasingSamples.intValue, Styles.antiAliasingSamplesStrings, Styles.antiAliasingSampleValues);
+                    m_AntiAliasingSamples.intValue = fieldValue;
+                }
+                
+                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);
+                m_LimitLightmapCount.boolValue = EditorGUILayout.Toggle(Styles.limitLightmapCount, m_LimitLightmapCount.boolValue);
+                if (m_LimitLightmapCount.boolValue)
+                {
+                    EditorGUI.indentLevel++;
+                    EditorGUILayout.PropertyField(m_LightmapMaxCount, Styles.lightmapMaxCount);
+                    EditorGUI.indentLevel--;
+                }
                 EditorGUI.indentLevel--;
             }
-            EditorGUILayout.Space();
-
-            GUILayout.Label(Styles.generalGIContent, EditorStyles.boldLabel);
-            EditorGUILayout.Slider(m_BackFaceTolerance, 0.0f, 1.0f, Styles.backFaceToleranceContent);
+            
+            m_GeneralParametersSettings.value = EditorGUILayout.FoldoutTitlebar(m_GeneralParametersSettings.value, Styles.generalGIContent, true);
+            if (m_GeneralParametersSettings.value)
+            {
+                ++EditorGUI.indentLevel;
+                EditorGUILayout.Slider(m_BackFaceTolerance, 0.0f, 1.0f, Styles.backFaceToleranceContent);
+                --EditorGUI.indentLevel;
+            }
 
             serializedObject.ApplyModifiedProperties();
         }
@@ -120,27 +155,31 @@ internal override void OnHeaderControlsGUI()
 
         private class Styles
         {
+            public static readonly int[] antiAliasingSampleValues = (int[]) Enum.GetValues(typeof(LightmapParameters.AntiAliasingSamples));
+            public static readonly GUIContent[] antiAliasingSamplesStrings =
+            {
+                EditorGUIUtility.TrTextContent("1"),
+                EditorGUIUtility.TrTextContent("4"),
+                EditorGUIUtility.TrTextContent("16")
+            };
+
             public static readonly GUIContent generalGIContent = EditorGUIUtility.TrTextContent("General Parameters", "Settings used in both Precomputed Realtime Global Illumination and Baked Global Illumination.");
             public static readonly GUIContent precomputedRealtimeGIContent = EditorGUIUtility.TrTextContent("Realtime Global Illumination", "Settings used in Precomputed Realtime Global Illumination where it is precomputed how indirect light can bounce between static objects, but the final lighting is done at runtime. Lights, ambient lighting in addition to the materials and emission of static objects can still be changed at runtime. Only static objects can affect GI by blocking and bouncing light, but non-static objects can receive bounced light via light probes.");  // Reuse the label from the Lighting window
             public static readonly GUIContent resolutionContent = EditorGUIUtility.TrTextContent("Resolution", "Realtime lightmap resolution in texels per world unit. This value is multiplied by the realtime resolution in the Lighting window to give the output lightmap resolution. This should generally be an order of magnitude less than what is common for baked lightmaps to keep the precompute time manageable and the performance at runtime acceptable. Note that if this is made more fine-grained, then the Irradiance Budget will often need to be increased too, to fully take advantage of this increased detail.");
             public static readonly GUIContent clusterResolutionContent = EditorGUIUtility.TrTextContent("Cluster Resolution", "The ratio between the resolution of the clusters with which light bounce is calculated and the resolution of the output lightmaps that sample from these.");
             public static readonly GUIContent irradianceBudgetContent = EditorGUIUtility.TrTextContent("Irradiance Budget", "The amount of data used by each texel in the output lightmap. Specifies how fine-grained a view of the scene an output texel has. Small values mean more averaged out lighting, since the light contributions from more clusters are treated as one. Affects runtime memory usage and to a lesser degree runtime CPU usage.");
             public static readonly GUIContent irradianceQualityContent = EditorGUIUtility.TrTextContent("Irradiance Quality", "The number of rays to cast to compute which clusters affect a given output lightmap texel - the granularity of how this is saved is defined by the Irradiance Budget. Affects the speed of the precomputation but has no influence on runtime performance.");
-            public static readonly GUIContent backFaceToleranceContent = EditorGUIUtility.TrTextContent("Backface Tolerance", "The percentage of rays shot from an output texel that must hit front faces to be considered usable. Allows a texel to be invalidated if too many of the rays cast from it hit back faces (the texel is inside some geometry). In that case artefacts are avoided by cloning valid values from surrounding texels. For example, if backface tolerance is 0.0, the texel is rejected only if it sees nothing but backfaces. If it is 1.0, the ray origin is rejected if it has even one ray that hits a backface.");
+            public static readonly GUIContent backFaceToleranceContent = EditorGUIUtility.TrTextContent("Backface Tolerance", "Defines the percentage of rays which must hit front-facing geometry for the lightmapper to consider a texel valid. Increasing this number increases the likelihood that texels will be invalidated when backfaces can be seen. Invalid texels will then receive dilation.");
             public static readonly GUIContent modellingToleranceContent = EditorGUIUtility.TrTextContent("Modelling Tolerance", "Maximum size of gaps that can be ignored for GI.");
             public static readonly GUIContent edgeStitchingContent = EditorGUIUtility.TrTextContent("Edge Stitching", "If enabled, ensures that UV charts (aka UV islands) in the generated lightmaps blend together where they meet so there is no visible seam between them.");
             public static readonly GUIContent systemTagContent = EditorGUIUtility.TrTextContent("System Tag", "Systems are groups of objects whose lightmaps are in the same atlas. It is also the granularity at which dependencies are calculated. Multiple systems are created automatically if the scene is big enough, but it can be helpful to be able to split them up manually for e.g. streaming in sections of a level. The system tag lets you force an object into a different realtime system even though all the other parameters are the same.");
             public static readonly GUIContent bakedGIContent = EditorGUIUtility.TrTextContent("Baked Global Illumination", "Settings used in Baked Global Illumination where direct and indirect lighting for static objects is precalculated and saved (baked) into lightmaps for use at runtime. This is useful when lights are known to be static, for mobile, for low end devices and other situations where there is not enough processing power to use Precomputed Realtime GI. You can toggle on each light whether it should be included in the bake.");  // Reuse the label from the Lighting window
-            public static readonly GUIContent antiAliasingSamplesContent = EditorGUIUtility.TrTextContent("Anti-aliasing Samples", "The maximum number of times to supersample a texel to reduce aliasing. Progressive lightmapper supersamples the positions and normals buffers (part of the G-buffer) and hence the sample count is a multiplier on the amount of memory used for those buffers. Progressive lightmapper clamps the value to the [1;16] range.");
+            public static readonly GUIContent antiAliasingSamplesContent = EditorGUIUtility.TrTextContent("Anti-aliasing Samples", "How many samples to use when antialiasing lightmap texels. Ray positions and normals buffers are also increased in size by this value. Higher values improve lightmap quality but also multiply memory usage when baking. A value of 1 disables supersampling.");
             public static readonly GUIContent isTransparent = EditorGUIUtility.TrTextContent("Is Transparent", "If enabled, the object appears transparent during GlobalIllumination lighting calculations. Backfaces are not contributing to and light travels through the surface. This is useful for emissive invisible surfaces.");
             public static readonly GUIContent pushoffContent = EditorGUIUtility.TrTextContent("Pushoff", "The amount to push off geometry for ray tracing, in modelling units. It is applied to all baked light maps, so it will affect direct light, indirect light and AO. Useful for getting rid of unwanted AO or shadowing.");
             public static readonly GUIContent bakedLightmapTagContent = EditorGUIUtility.TrTextContent("Baked Tag", "An integer that lets you force an object into a different baked lightmap even though all the other parameters are the same. This can be useful e.g. when streaming in sections of a level.");
             public static readonly GUIContent limitLightmapCount = EditorGUIUtility.TrTextContent("Limit Lightmap Count", "If enabled, objects with the same baked GI settings will be packed into a specified number of lightmaps. This may reduce the objects' lightmap resolution.");
             public static readonly GUIContent lightmapMaxCount = EditorGUIUtility.TrTextContent("Max Lightmaps", "The maximum number of lightmaps into which objects will be packed.");
-
-            public static readonly GUIContent generalLabel = EditorGUIUtility.TrTextContent("General");
-            public static readonly GUIContent progressiveLabel = EditorGUIUtility.TrTextContent("Progressive Lightmapper");
-            public static readonly GUIContent enlightenLabel = EditorGUIUtility.TrTextContent("Enlighten");
         }
     }
 }
diff --git a/Editor/Mono/Inspector/GameObjectInspector.cs b/Editor/Mono/Inspector/GameObjectInspector.cs
index ebc604cda1..d812786e48 100644
--- a/Editor/Mono/Inspector/GameObjectInspector.cs
+++ b/Editor/Mono/Inspector/GameObjectInspector.cs
@@ -35,7 +35,7 @@ static class Styles
             public static GUIContent layerContent = EditorGUIUtility.TrTextContent("Layer", "The layer that this GameObject is in.\n\nChoose Add Layer... to edit the list of available layers.");
             public static GUIContent tagContent = EditorGUIUtility.TrTextContent("Tag", "The tag that this GameObject has.\n\nChoose Untagged to remove the current tag.\n\nChoose Add Tag... to edit the list of available tags.");
             public static GUIContent staticPreviewContent = EditorGUIUtility.TrTextContent("Static Preview", "This asset is greater than 8MB so, by default, the Asset Preview displays a static preview.\nTo view the asset interactively, click the Asset Preview.");
-
+            
             public static float tagFieldWidth = EditorGUI.CalcPrefixLabelWidth(Styles.tagContent, EditorStyles.boldLabel);
             public static float layerFieldWidth = EditorGUI.CalcPrefixLabelWidth(Styles.layerContent, EditorStyles.boldLabel);
 
@@ -1400,15 +1400,24 @@ internal void OnSceneDragInternal(SceneView sceneView, int index, EventType type
 
         internal static void DragPerform(SceneView sceneView, GameObject draggedObject, GameObject go)
         {
-            var defaultParentObject = SceneView.GetDefaultParentObjectIfSet();
+            Transform defaultParentObject = SceneView.GetDefaultParentObjectIfSet();
             var parent = defaultParentObject != null ? defaultParentObject : sceneView.customParentForDraggedObjects;
-
             string uniqueName = GameObjectUtility.GetUniqueNameForSibling(parent, draggedObject.name);
+
             if (parent != null)
-                draggedObject.transform.parent = parent;
+            {
+                draggedObject.transform.SetParent(parent, true);
+            }
+
+            if (defaultParentObject == null && sceneView.customParentForDraggedObjects == null)
+            {
+                draggedObject.transform.SetAsLastSibling();
+            }
+
             draggedObject.hideFlags = 0;
             Undo.RegisterCreatedObjectUndo(draggedObject, "Place " + draggedObject.name);
             DragAndDrop.AcceptDrag();
+
             if (s_ShouldClearSelection)
             {
                 Selection.objects = new[] { draggedObject };
@@ -1420,11 +1429,15 @@ internal static void DragPerform(SceneView sceneView, GameObject draggedObject,
                 // selection to all of them by joining them to the previous selection list
                 Selection.objects = Selection.gameObjects.Union(new[] { draggedObject }).ToArray();
             }
+
             HandleUtility.ignoreRaySnapObjects = null;
+
             if (SceneView.mouseOverWindow != null)
                 SceneView.mouseOverWindow.Focus();
+
             if (!Application.IsPlaying(draggedObject))
                 draggedObject.name = uniqueName;
+
             s_CyclicNestingDetected = false;
         }
 
diff --git a/Editor/Mono/Inspector/GenericInspector.cs b/Editor/Mono/Inspector/GenericInspector.cs
index 1f3dac789e..e7a3b19e7f 100644
--- a/Editor/Mono/Inspector/GenericInspector.cs
+++ b/Editor/Mono/Inspector/GenericInspector.cs
@@ -4,6 +4,7 @@
 
 using System.Linq;
 using UnityEngine;
+using UnityEngine.UIElements;
 
 namespace UnityEditor
 {
@@ -68,11 +69,19 @@ internal override bool GetOptimizedGUIBlock(bool isDirty, bool isVisible, out fl
 
             // Update serialized object representation
             if (m_SerializedObject == null)
-                m_SerializedObject = new SerializedObject(targets, m_Context) { inspectorMode = inspectorMode };
+            {
+                m_SerializedObject = new SerializedObject(targets, m_Context)
+                {
+                    inspectorMode = inspectorMode,
+                    inspectorDataMode = dataMode
+                };
+            }
             else
             {
                 m_SerializedObject.Update();
                 m_SerializedObject.inspectorMode = inspectorMode;
+                if (m_SerializedObject.inspectorDataMode != dataMode)
+                    m_SerializedObject.inspectorDataMode = dataMode;
             }
 
             height = 0;
@@ -373,5 +382,22 @@ public override void OnInspectorGUI()
 
             base.OnInspectorGUI();
         }
+
+        public override VisualElement CreateInspectorGUI()
+        {
+            if (serializedObject == null)
+                return null;
+
+            var root = new VisualElement();
+
+            if (MissingSerializeReference(target))
+            {
+                root.Add(new HelpBox(GetMissingSerializeRefererenceMessageContainer(), HelpBoxMessageType.Warning));
+            }
+
+            UIElements.InspectorElement.FillDefaultInspector(root, serializedObject, this);
+
+            return root;
+        }
     }
 }
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspector.cs b/Editor/Mono/Inspector/GraphicsSettingsInspector.cs
index a00d445e82..7ae5a88729 100644
--- a/Editor/Mono/Inspector/GraphicsSettingsInspector.cs
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspector.cs
@@ -2,231 +2,209 @@
 // 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 System.Reflection;
 using UnityEditorInternal;
-using UnityEngine;
-using UnityEngine.Events;
 using UnityEngine.Rendering;
-using AlwaysIncludedShadersEditor = UnityEditor.GraphicsSettingsWindow.AlwaysIncludedShadersEditor;
-using BuiltinShadersEditor = UnityEditor.GraphicsSettingsWindow.BuiltinShadersEditor;
-using Object = UnityEngine.Object;
-using ShaderPreloadEditor = UnityEditor.GraphicsSettingsWindow.ShaderPreloadEditor;
-using ShaderStrippingEditor = UnityEditor.GraphicsSettingsWindow.ShaderStrippingEditor;
-using TierSettingsEditor = UnityEditor.GraphicsSettingsWindow.TierSettingsEditor;
-using VideoShadersEditor = UnityEditor.GraphicsSettingsWindow.VideoShadersEditor;
+using UnityEngine.UIElements;
 
 namespace UnityEditor
 {
-    [CustomEditor(typeof(UnityEngine.Rendering.GraphicsSettings))]
+    [CustomEditor(typeof(GraphicsSettings))]
     internal class GraphicsSettingsInspector : ProjectSettingsBaseEditor
     {
-        internal class Styles
-        {
-            public static readonly GUIContent showEditorWindow = EditorGUIUtility.TrTextContent("Open Editor...");
-            public static readonly GUIContent closeEditorWindow = EditorGUIUtility.TrTextContent("Close Editor");
-            public static readonly GUIContent tierSettings = EditorGUIUtility.TrTextContent("Tier Settings");
-            public static readonly GUIContent builtinSettings = EditorGUIUtility.TrTextContent("Built-in Shader Settings");
-            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");
+        internal class ResourcesPaths
+        {
+            internal const string graphicsSettings = "StyleSheets/ProjectSettings/GraphicsSettings.uss";
+            internal const string bodyTemplate = "UXML/ProjectSettings/GraphicsSettingsEditor.uxml";
         }
 
-        Editor m_TierSettingsEditor;
-        Editor m_BuiltinShadersEditor;
-        Editor m_VideoShadersEditor;
-        Editor m_AlwaysIncludedShadersEditor;
-        Editor m_ShaderStrippingEditor;
-        Editor m_ShaderPreloadEditor;
-        SerializedProperty m_TransparencySortMode;
-        SerializedProperty m_TransparencySortAxis;
-        SerializedProperty m_ScriptableRenderLoop;
-        SerializedProperty m_LogWhenShaderIsCompiled;
-        SerializedProperty m_LightProbeOutsideHullStrategy;
+        readonly VisibilityControllerBasedOnRenderPipeline m_VisibilityController = new();
 
-        Object graphicsSettings
+        internal void CreateInspectorUI(VisualElement root)
         {
-            get { return UnityEngine.Rendering.GraphicsSettings.GetGraphicsSettings(); }
+            root.Add(ObjectUpdater());
+            root.Add(CreateGUI());
         }
 
-        Editor tierSettingsEditor
+        // As we use multiple IMGUI container while porting everything to UITK we will call serializedObject.Update in first separate IMGUI container.
+        // This way we don't need to do it in each following containers.
+        VisualElement ObjectUpdater()
         {
-            get
+            return new IMGUIContainer(() =>
             {
-                Editor.CreateCachedEditor(graphicsSettings, typeof(TierSettingsEditor), ref m_TierSettingsEditor);
-                ((TierSettingsEditor)m_TierSettingsEditor).verticalLayout = true;
-                return m_TierSettingsEditor;
-            }
-        }
-        Editor builtinShadersEditor
-        {
-            get { Editor.CreateCachedEditor(graphicsSettings, typeof(BuiltinShadersEditor), ref m_BuiltinShadersEditor); return m_BuiltinShadersEditor; }
-        }
-        Editor videoShadersEditor
-        {
-            get { Editor.CreateCachedEditor(graphicsSettings, typeof(VideoShadersEditor), ref m_VideoShadersEditor); return m_VideoShadersEditor; }
+                m_VisibilityController.Update();
+                serializedObject.Update();
+            });
         }
-        Editor alwaysIncludedShadersEditor
-        {
-            get { Editor.CreateCachedEditor(graphicsSettings, typeof(AlwaysIncludedShadersEditor), ref m_AlwaysIncludedShadersEditor); return m_AlwaysIncludedShadersEditor; }
-        }
-        Editor shaderStrippingEditor
+
+        VisualElement CreateGUI()
         {
-            get { Editor.CreateCachedEditor(graphicsSettings, typeof(ShaderStrippingEditor), ref m_ShaderStrippingEditor); return m_ShaderStrippingEditor; }
+            var visualTreeAsset = EditorGUIUtility.Load(ResourcesPaths.bodyTemplate) as VisualTreeAsset;
+            var template = visualTreeAsset.Instantiate();
+            template
+                .Query<GraphicsSettingsElement>()
+                .ForEach(d => d.Initialize(serializedObject));
+
+            m_VisibilityController.RegisterVisualElementTree(template);
+            return template;
         }
-        Editor shaderPreloadEditor
+
+        void OnEnable()
         {
-            get { Editor.CreateCachedEditor(graphicsSettings, typeof(ShaderPreloadEditor), ref m_ShaderPreloadEditor); return m_ShaderPreloadEditor; }
+            m_VisibilityController.Initialize();
         }
 
-        public void OnEnable()
+        void OnDisable()
         {
-            m_TransparencySortMode = serializedObject.FindProperty("m_TransparencySortMode");
-            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);
+            m_VisibilityController.Clear();
+            m_VisibilityController.Dispose();
         }
+    }
+
+    /// <summary>
+    /// Control visibility of UI elements depends on active Render Pipeline.
+    /// For one it stays specific for GraphicsSettings as it requires a way to determine BuiltinOnly elements and there is no generic way to do it.
+    /// </summary>
+    internal class VisibilityControllerBasedOnRenderPipeline : IDisposable
+    {
+        readonly List<ValueTuple<GraphicsSettingsElement, SupportedOnRenderPipelineAttribute>> m_TrackedElements = new();
+
+        RenderPipelineAsset m_PreviousAsset;
 
-        private void HandleEditorWindowButton()
+        public void Initialize()
         {
-            TierSettingsWindow window = TierSettingsWindow.GetInstance();
-            GUIContent text = window == null ? Styles.showEditorWindow : Styles.closeEditorWindow;
-            if (GUILayout.Button(text, EditorStyles.miniButton, GUILayout.Width(110)))
-            {
-                if (window)
-                {
-                    window.Close();
-                }
-                else
-                {
-                    TierSettingsWindow.CreateWindow();
-                    TierSettingsWindow.GetInstance().Show();
-                }
-            }
+            RenderPipelineManager.activeRenderPipelineAssetChanged += RenderPipelineAssetChanged;
         }
 
-        // this is category animation is blatantly copied from PlayerSettingsEditor.cs
-        private bool showTierSettingsUI = true; // show by default, as otherwise users are confused
-        private UnityEditor.AnimatedValues.AnimBool tierSettingsAnimator = null;
-
-        private void TierSettingsGUI()
+        public bool RegisterVisualElement(GraphicsSettingsElement element)
         {
-            bool enabled = GUI.enabled;
-            GUI.enabled = true; // we don't want to disable the expand behavior
-            EditorGUILayout.BeginVertical(EditorStyles.helpBox, GUILayout.Height(20));
+            if (m_TrackedElements.Any(t => t.Item1 == element))
+                return false;
 
-            EditorGUILayout.BeginHorizontal();
-            Rect r = GUILayoutUtility.GetRect(20, 21); r.x += 3; r.width += 6;
-            showTierSettingsUI = EditorGUI.FoldoutTitlebar(r, Styles.tierSettings, showTierSettingsUI, true, EditorStyles.inspectorTitlebarFlat, EditorStyles.inspectorTitlebarText);
-            HandleEditorWindowButton();
-            EditorGUILayout.EndHorizontal();
+            var type = element.GetType();
+            var attribute = type.GetCustomAttribute<SupportedOnRenderPipelineAttribute>(false);
 
-            tierSettingsAnimator.target = showTierSettingsUI;
-            GUI.enabled = enabled;
+            UpdateElementVisibility (element, attribute);
+            m_TrackedElements.Add(new ValueTuple<GraphicsSettingsElement, SupportedOnRenderPipelineAttribute>(element, attribute));
 
-            if (EditorGUILayout.BeginFadeGroup(tierSettingsAnimator.faded) && TierSettingsWindow.GetInstance() == null)
-                tierSettingsEditor.OnInspectorGUI();
-            EditorGUILayout.EndFadeGroup();
-            EditorGUILayout.EndVertical();
+            return true;
         }
 
-        public override void OnInspectorGUI()
+        public void RegisterVisualElementTree(VisualElement element)
         {
-            serializedObject.Update();
-
-            GUILayout.Label(Styles.renderPipeSettings, EditorStyles.boldLabel);
-            EditorGUI.RenderPipelineAssetField(serializedObject, m_ScriptableRenderLoop);
-            EditorGUILayout.Space();
+            element.Query<GraphicsSettingsElement>().ForEach(RegisterVisualElement);
+        }
 
-            bool usingSRP = GraphicsSettings.currentRenderPipeline != null;
-            if (usingSRP)
-                EditorGUILayout.HelpBox("A Scriptable Render Pipeline is in use, some settings will not be used and are hidden", MessageType.Info);
+        public bool UnregisterVisualElement(GraphicsSettingsElement element)
+        {
+            var type = element.GetType();
+            var attribute = type.GetCustomAttribute<SupportedOnRenderPipelineAttribute>(false);
+            if (attribute == null)
+                return false;
 
-            if (!usingSRP)
-            {
-                GUILayout.Label(Styles.cameraSettings, EditorStyles.boldLabel);
-                EditorGUILayout.PropertyField(m_TransparencySortMode);
-                if ((TransparencySortMode) m_TransparencySortMode.intValue == TransparencySortMode.CustomAxis)
-                    EditorGUILayout.PropertyField(m_TransparencySortAxis);
+            var index = m_TrackedElements.FindIndex(t => element == t.Item1);
+            if (index < 0)
+                return false;
 
-                EditorGUILayout.Space();
-            }
+            m_TrackedElements.RemoveAt(index);
+            return true;
+        }
 
-            float labelWidth = EditorGUIUtility.labelWidth;
+        public void Update()
+        {
+            if (GraphicsSettings.currentRenderPipeline == m_PreviousAsset)
+                return;
 
-            // Hide tier settings for SRPs and close tier settings window if open
-            if (usingSRP)
-            {
-                TierSettingsWindow window = TierSettingsWindow.GetInstance();
-                if (window != null)
-                    window.Close();
-            }
-            else
+            for (var i = 0; i < m_TrackedElements.Count; i++)
             {
-                TierSettingsGUI();
+                var trackedElement = m_TrackedElements[i];
+                UpdateElementVisibility(trackedElement.Item1, trackedElement.Item2);
             }
 
-            EditorGUIUtility.labelWidth = labelWidth;
+            m_PreviousAsset = GraphicsSettings.currentRenderPipeline;
+        }
 
-            GUILayout.Label(Styles.builtinSettings, EditorStyles.boldLabel);
-            if (!usingSRP)
-                builtinShadersEditor.OnInspectorGUI();
-            videoShadersEditor.OnInspectorGUI();
-            alwaysIncludedShadersEditor.OnInspectorGUI();
+        void RenderPipelineAssetChanged(RenderPipelineAsset previous, RenderPipelineAsset next)
+        {
+            Update();
+        }
 
-            EditorGUILayout.Space();
-            GUILayout.Label(Styles.shaderStrippingSettings, EditorStyles.boldLabel);
-            shaderStrippingEditor.OnInspectorGUI();
+        bool ShouldDisplayElement(GraphicsSettingsElement element, SupportedOnRenderPipelineAttribute attribute)
+        {
+            if (attribute is { isSupportedOnCurrentPipeline: true })
+                return true;
+            return element.BuiltinOnly && !GraphicsSettings.isScriptableRenderPipelineEnabled || !element.BuiltinOnly;
+        }
+
+        void UpdateElementVisibility(GraphicsSettingsElement element, SupportedOnRenderPipelineAttribute attribute)
+        {
+            if (ShouldDisplayElement(element, attribute))
+                Show(element);
+            else
+                Hide(element);
+        }
 
-            EditorGUILayout.Space();
-            GUILayout.Label(Styles.shaderPreloadSettings, EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(m_LogWhenShaderIsCompiled, Styles.logWhenShaderIsCompiled);
-            EditorGUILayout.IntPopup(m_LightProbeOutsideHullStrategy, Styles.lightProbeOutsideHullStrategyStrings, Styles.lightProbeOutsideHullStrategyValues, Styles.lightProbeOutsideHullStrategy);
+        void Show(GraphicsSettingsElement element)
+        {
+            element.style.display = DisplayStyle.Flex;
+        }
 
-            shaderPreloadEditor.OnInspectorGUI();
+        void Hide(GraphicsSettingsElement element)
+        {
+            element.style.display = DisplayStyle.None;
+        }
 
-            serializedObject.ApplyModifiedProperties();
+        public void Clear()
+        {
+            m_TrackedElements.Clear();
         }
 
-        public void SetSectionOpenListener(UnityAction action)
+        public void Dispose()
         {
-            tierSettingsAnimator.valueChanged.RemoveAllListeners();
-            tierSettingsAnimator.valueChanged.AddListener(action);
+            RenderPipelineManager.activeRenderPipelineAssetChanged -= RenderPipelineAssetChanged;
         }
+    }
 
+    internal class GraphicsSettingsProvider : SettingsProvider
+    {
         [SettingsProvider]
-        static SettingsProvider CreateProjectSettingsProvider()
+        public static SettingsProvider CreateUserSettingsProvider()
         {
-            var provider = AssetSettingsProvider.CreateProviderFromAssetPath("Project/Graphics", "ProjectSettings/GraphicsSettings.asset");
-            provider.keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties<Styles>()
-                .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties<TierSettingsEditor.Styles>())
-                .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties<BuiltinShadersEditor.Styles>())
-                .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties<ShaderStrippingEditor.Styles>())
-                .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties<ShaderPreloadEditor.Styles>())
-                .Concat(SettingsProvider.GetSearchKeywordsFromPath("ProjectSettings/GraphicsSettings.asset"));
-
-            provider.activateHandler = (searchContext, rootElement) =>
+            var graphicsSettingsProvider = new GraphicsSettingsProvider("Project/Graphics", SettingsScope.Project)
             {
-                (provider.settingsEditor as GraphicsSettingsInspector)?.SetSectionOpenListener(provider.Repaint);
+                keywords = GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorTitleBar.Styles>()
+                    .Concat(GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorBuiltinShaders.Styles>())
+                    .Concat(GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorCameraSettings.Styles>())
+                    .Concat(GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorLightProbe.Styles>())
+                    .Concat(GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorRenderPipelineAsset.Styles>())
+                    .Concat(GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorShaderLog.Styles>())
+                    .Concat(GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorCullingSettings.Styles>())
+                    .Concat(GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorTierSettings.Styles>())
+                    .Concat(GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorBuiltinShaders.Styles>())
+                    .Concat(GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorShaderStripping.Styles>())
+                    .Concat(GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorVideoShader.Styles>())
+                    .Concat(GetSearchKeywordsFromGUIContentProperties<GraphicsSettingsInspectorShaderPreload.Styles>())
+                    .Concat(GetSearchKeywordsFromPath("ProjectSettings/GraphicsSettings.asset")),
+                icon = EditorGUIUtility.FindTexture("UnityEngine/UI/GraphicRaycaster Icon")
             };
+            return graphicsSettingsProvider;
+        }
+
+        internal GraphicsSettingsProvider(string path, SettingsScope scopes, IEnumerable<string> keywords = null) : base(path, scopes, keywords)
+        {
+            activateHandler = (text, element) =>
+            {
+                var settingsObj = AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/GraphicsSettings.asset");
+                if (settingsObj == null)
+                    return;
 
-            provider.icon = EditorGUIUtility.FindTexture("UnityEngine/UI/GraphicRaycaster Icon");
-            return provider;
+                var editor = Editor.CreateEditor(settingsObj) as GraphicsSettingsInspector;
+                element.styleSheets.Add(EditorGUIUtility.Load(GraphicsSettingsInspector.ResourcesPaths.graphicsSettings) as StyleSheet);
+                editor.CreateInspectorUI(element);
+            };
         }
     }
 }
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsElement.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsElement.cs
new file mode 100644
index 0000000000..221322c722
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsElement.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 UnityEditor.Experimental;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor
+{
+    internal abstract class GraphicsSettingsElement : VisualElement
+    {
+        protected SerializedObject m_SerializedObject;
+        protected SettingsWindow m_SettingsWindow;
+
+        protected Color HighlightSelectionColor = EditorResources.GetStyle("sb-settings-panel-client-area").GetColor("-unity-search-highlight-selection-color");
+        protected Color HighlightColor = EditorResources.GetStyle("sb-settings-panel-client-area").GetColor("-unity-search-highlight-color");
+
+        //We rely on SupportedOn attribute for the cases when we need to show element for SRP.
+        //Here is a way to specify when we want to have element visible for BuiltinOnly.
+        //Important notice: we check first for SupportedOn first, then for this backup field.
+        public virtual bool BuiltinOnly => false;
+
+        internal void Initialize(SerializedObject serializedObject)
+        {
+            m_SerializedObject = serializedObject;
+
+            m_SettingsWindow = EditorWindow.GetWindow<SettingsWindow>();
+
+            Initialize();
+        }
+
+        protected abstract void Initialize();
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorAlwaysIncludedShader.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorAlwaysIncludedShader.cs
new file mode 100644
index 0000000000..fb79baf390
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorAlwaysIncludedShader.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 UnityEngine.UIElements;
+
+namespace UnityEditor
+{
+    internal class GraphicsSettingsInspectorAlwaysIncludedShader : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorAlwaysIncludedShader, UxmlTraits> { }
+
+        SerializedProperty m_AlwaysIncludedShaders;
+
+        protected override void Initialize()
+        {
+            m_AlwaysIncludedShaders = m_SerializedObject.FindProperty("m_AlwaysIncludedShaders");
+            m_AlwaysIncludedShaders.isExpanded = true;
+
+            Add(new IMGUIContainer(Draw));
+        }
+
+        void Draw()
+        {
+            using var highlightScope = new EditorGUI.LabelHighlightScope(m_SettingsWindow.GetSearchText(), HighlightSelectionColor, HighlightColor);
+            using var check = new EditorGUI.ChangeCheckScope();
+            using var settingsScope = new LabelWidthScope();
+            using var wideScreenScope = new WideScreenScope(this);
+            EditorGUILayout.PropertyField(m_AlwaysIncludedShaders, true);
+            if (check.changed)
+                m_SerializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorBuiltinShaderLabel.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorBuiltinShaderLabel.cs
new file mode 100644
index 0000000000..e106e8b1a6
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorBuiltinShaderLabel.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;
+using UnityEngine.UIElements;
+
+namespace UnityEditor;
+
+internal class GraphicsSettingsInspectorBuiltinShaderLabel : GraphicsSettingsElement
+{
+    public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorBuiltinShaderLabel, UxmlTraits> { }
+
+    internal class Styles
+    {
+        public static readonly GUIContent builtinSettings = EditorGUIUtility.TrTextContent("Built-in Shader Settings");
+    }
+
+    protected override void Initialize()
+    {
+        Add(new Label(Styles.builtinSettings.text));
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorBuiltinShaders.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorBuiltinShaders.cs
new file mode 100644
index 0000000000..16130f2300
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorBuiltinShaders.cs
@@ -0,0 +1,106 @@
+// 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.Rendering;
+using UnityEngine.UIElements;
+
+namespace UnityEditor
+{
+    internal class GraphicsSettingsInspectorBuiltinShaders : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorBuiltinShaders, UxmlTraits> { }
+        internal class Styles
+        {
+            public static readonly GUIContent deferredString = EditorGUIUtility.TrTextContent("Deferred", "Shader used for Deferred Shading.");
+            public static readonly GUIContent deferredReflString = EditorGUIUtility.TrTextContent("Deferred Reflections", "Shader used for Deferred reflection probes.");
+            public static readonly GUIContent screenShadowsString = EditorGUIUtility.TrTextContent("Screen Space Shadows", "Shader used for screen-space cascaded shadows.");
+            public static readonly GUIContent depthNormalsString = EditorGUIUtility.TrTextContent("Depth Normals", "Shader used for depth and normals texture when enabled on a Camera.");
+
+            public static readonly GUIContent motionVectorsString =
+                EditorGUIUtility.TrTextContent("Motion Vectors", "Shader for generation of Motion Vectors when the rendering camera has renderMotionVectors set to true.");
+
+            public static readonly GUIContent lightHaloString = EditorGUIUtility.TrTextContent("Light Halo", "Default Shader used for light halos.");
+            public static readonly GUIContent lensFlareString = EditorGUIUtility.TrTextContent("Lens Flare", "Default Shader used for lens flares.");
+        }
+
+        public override bool BuiltinOnly => true;
+
+        BuiltinShaderSettings m_Deferred;
+         BuiltinShaderSettings m_DeferredReflections;
+         BuiltinShaderSettings m_ScreenSpaceShadows;
+         BuiltinShaderSettings m_DepthNormals;
+         BuiltinShaderSettings m_MotionVectors;
+         BuiltinShaderSettings m_LightHalo;
+         BuiltinShaderSettings m_LensFlare;
+
+        protected override void Initialize()
+        {
+            m_Deferred = new BuiltinShaderSettings(Styles.deferredString, "m_Deferred", m_SerializedObject);
+            m_DeferredReflections = new BuiltinShaderSettings(Styles.deferredReflString, "m_DeferredReflections", m_SerializedObject);
+            m_ScreenSpaceShadows = new BuiltinShaderSettings(Styles.screenShadowsString, "m_ScreenSpaceShadows", m_SerializedObject);
+            m_DepthNormals = new BuiltinShaderSettings(Styles.depthNormalsString, "m_DepthNormals", m_SerializedObject);
+            m_MotionVectors = new BuiltinShaderSettings(Styles.motionVectorsString, "m_MotionVectors", m_SerializedObject);
+            m_LightHalo = new BuiltinShaderSettings(Styles.lightHaloString, "m_LightHalo", m_SerializedObject);
+            m_LensFlare = new BuiltinShaderSettings(Styles.lensFlareString, "m_LensFlare", m_SerializedObject);
+
+            Add(new IMGUIContainer(Draw));
+        }
+
+        void Draw()
+        {
+            using var highlightScope = new EditorGUI.LabelHighlightScope(m_SettingsWindow.GetSearchText(), HighlightSelectionColor, HighlightColor);
+            using var check = new EditorGUI.ChangeCheckScope();
+            using var settingsScope = new LabelWidthScope();
+            using var wideScreenScope = new WideScreenScope(this);
+            m_Deferred.DoGUI();
+
+            // deferred reflections being off affects forward vs deferred style probe rendering;
+            // need to reload shaders for new platform macro to live update
+            using (var internalCheck = new EditorGUI.ChangeCheckScope())
+            {
+                m_DeferredReflections.DoGUI();
+                if (internalCheck.changed)
+                    ShaderUtil.ReloadAllShaders();
+            }
+
+            m_ScreenSpaceShadows.DoGUI();
+            m_DepthNormals.DoGUI();
+            m_MotionVectors.DoGUI();
+            m_LightHalo.DoGUI();
+            m_LensFlare.DoGUI();
+
+            if (check.changed)
+                m_SerializedObject.ApplyModifiedProperties();
+        }
+
+        internal readonly struct BuiltinShaderSettings
+        {
+            internal enum BuiltinShaderMode
+            {
+                None = 0,
+                Builtin,
+                Custom
+            }
+
+            readonly SerializedProperty m_Mode;
+            readonly SerializedProperty m_Shader;
+            readonly GUIContent m_Label;
+
+            internal BuiltinShaderSettings(GUIContent label, string name, SerializedObject serializedObject)
+            {
+                m_Mode = serializedObject.FindProperty(name + ".m_Mode");
+                m_Shader = serializedObject.FindProperty(name + ".m_Shader");
+                m_Label = label;
+            }
+
+            internal void DoGUI()
+            {
+                EditorGUILayout.PropertyField(m_Mode, m_Label);
+                if (m_Mode.intValue == (int)BuiltinShaderMode.Custom)
+                    EditorGUILayout.PropertyField(m_Shader);
+            }
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorCameraSettings.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorCameraSettings.cs
new file mode 100644
index 0000000000..01d0e38c89
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorCameraSettings.cs
@@ -0,0 +1,48 @@
+// 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.Rendering;
+using UnityEngine.UIElements;
+
+namespace UnityEditor
+{
+    internal class GraphicsSettingsInspectorCameraSettings : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorCameraSettings, UxmlTraits> { }
+
+        internal class Styles
+        {
+            public static readonly GUIContent cameraSettings = EditorGUIUtility.TrTextContent("Camera Settings");
+        }
+
+        public override bool BuiltinOnly => true;
+
+        SerializedProperty m_TransparencySortMode;
+        SerializedProperty m_TransparencySortAxis;
+
+        protected override void Initialize()
+        {
+            m_TransparencySortMode = m_SerializedObject.FindProperty("m_TransparencySortMode");
+            m_TransparencySortAxis = m_SerializedObject.FindProperty("m_TransparencySortAxis");
+
+            Add(new IMGUIContainer(Draw));
+        }
+
+        void Draw()
+        {
+            using var highlightScope = new EditorGUI.LabelHighlightScope(m_SettingsWindow.GetSearchText(), HighlightSelectionColor, HighlightColor);
+            using var settingsScope = new LabelWidthScope();
+            using var wideScreenScope = new WideScreenScope(this);
+            GUILayout.Label(Styles.cameraSettings, EditorStyles.boldLabel);
+
+            using var changeScope = new EditorGUI.ChangeCheckScope();
+            EditorGUILayout.PropertyField(m_TransparencySortMode);
+            if ((TransparencySortMode)m_TransparencySortMode.intValue == TransparencySortMode.CustomAxis)
+                EditorGUILayout.PropertyField(m_TransparencySortAxis);
+            if (changeScope.changed)
+                m_SerializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorCullingSettings.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorCullingSettings.cs
new file mode 100644
index 0000000000..640507d05a
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorCullingSettings.cs
@@ -0,0 +1,56 @@
+// 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;
+
+namespace UnityEditor
+{
+    internal class GraphicsSettingsInspectorCullingSettings : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorCullingSettings, UxmlTraits>
+        {
+        }
+
+        internal class Styles
+        {
+            public static readonly GUIContent cullingSettings = EditorGUIUtility.TrTextContent("Culling Settings");
+            public static readonly GUIContent cameraRelativeSettings = EditorGUIUtility.TrTextContent("Camera-Relative Culling");
+
+            public static readonly GUIContent cameraRelativeLightCulling = EditorGUIUtility.TrTextContent("Lights",
+                "When enabled, Unity uses the camera position as the reference point for culling lights instead of the world space origin.");
+
+            public static readonly GUIContent cameraRelativeShadowCulling = EditorGUIUtility.TrTextContent("Shadows",
+                "When enabled, Unity uses the camera position as the reference point for culling shadows instead of the world space origin.");
+
+        }
+
+        SerializedProperty m_CameraRelativeLightCulling;
+        SerializedProperty m_CameraRelativeShadowCulling;
+
+        protected override void Initialize()
+        {
+            m_CameraRelativeLightCulling = m_SerializedObject.FindProperty("m_CameraRelativeLightCulling");
+            m_CameraRelativeShadowCulling = m_SerializedObject.FindProperty("m_CameraRelativeShadowCulling");
+
+            Add(new IMGUIContainer(Draw));
+        }
+
+        void Draw()
+        {
+            using var highlightScope = new EditorGUI.LabelHighlightScope(m_SettingsWindow.GetSearchText(), HighlightSelectionColor, HighlightColor);
+            using var check = new EditorGUI.ChangeCheckScope();
+            using var settingsScope = new LabelWidthScope();
+            using var wideScreenScope = new WideScreenScope(this);
+            GUILayout.Label(Styles.cullingSettings, EditorStyles.boldLabel);
+            EditorGUILayout.LabelField(Styles.cameraRelativeSettings, EditorStyles.label);
+            EditorGUI.indentLevel++;
+            EditorGUILayout.PropertyField(m_CameraRelativeLightCulling, Styles.cameraRelativeLightCulling);
+            EditorGUILayout.PropertyField(m_CameraRelativeShadowCulling, Styles.cameraRelativeShadowCulling);
+            EditorGUI.indentLevel--;
+            if (check.changed)
+                m_SerializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorLightProbe.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorLightProbe.cs
new file mode 100644
index 0000000000..d684fad906
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorLightProbe.cs
@@ -0,0 +1,53 @@
+// 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.Rendering;
+using UnityEngine.UIElements;
+
+namespace UnityEditor
+{
+    internal class GraphicsSettingsInspectorLightProbe : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorLightProbe, UxmlTraits> { }
+
+        internal class Styles
+        {
+            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"),
+            };
+        }
+
+        SerializedProperty m_LightProbeOutsideHullStrategy;
+
+        protected override void Initialize()
+        {
+            m_LightProbeOutsideHullStrategy = m_SerializedObject.FindProperty("m_LightProbeOutsideHullStrategy");
+
+            Add(new IMGUIContainer(Draw));
+        }
+
+        void Draw()
+        {
+            using var highlightScope = new EditorGUI.LabelHighlightScope(m_SettingsWindow.GetSearchText(), HighlightSelectionColor, HighlightColor);
+            using var changeScope = new EditorGUI.ChangeCheckScope();
+            using var settingsScope = new LabelWidthScope();
+            using var wideScreenScope = new WideScreenScope(this);
+            EditorGUILayout.IntPopup(m_LightProbeOutsideHullStrategy, Styles.lightProbeOutsideHullStrategyStrings, Styles.lightProbeOutsideHullStrategyValues, Styles.lightProbeOutsideHullStrategy);
+            if (changeScope.changed)
+                m_SerializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorRenderPipelineAsset.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorRenderPipelineAsset.cs
new file mode 100644
index 0000000000..9e8c6a2365
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorRenderPipelineAsset.cs
@@ -0,0 +1,43 @@
+// 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.Rendering;
+using UnityEngine.UIElements;
+
+namespace UnityEditor
+{
+    internal class GraphicsSettingsInspectorRenderPipelineAsset : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorRenderPipelineAsset, UxmlTraits> { }
+
+        internal class Styles
+        {
+            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 renderPipelineMessage = EditorGUIUtility.TrTextContent("A Scriptable Render Pipeline is in use, some settings will not be used and are hidden");
+        }
+
+        SerializedProperty m_ScriptableRenderLoop;
+
+        protected override void Initialize()
+        {
+            m_ScriptableRenderLoop = m_SerializedObject.FindProperty("m_CustomRenderPipeline");
+
+            Add(new IMGUIContainer(Draw));
+        }
+
+        void Draw()
+        {
+            using var settingsScope = new LabelWidthScope();
+            using var wideScreenScope = new WideScreenScope(this);
+            GUILayout.Label(Styles.renderPipeSettings, EditorStyles.boldLabel);
+            EditorGUI.RenderPipelineAssetField(m_SerializedObject, m_ScriptableRenderLoop);
+
+            if (GraphicsSettings.isScriptableRenderPipelineEnabled)
+                EditorGUILayout.HelpBox(Styles.renderPipelineMessage.text, MessageType.Info);
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorShaderLog.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorShaderLog.cs
new file mode 100644
index 0000000000..801bcaabf4
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorShaderLog.cs
@@ -0,0 +1,43 @@
+// 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;
+
+namespace UnityEditor
+{
+    internal class GraphicsSettingsInspectorShaderLog : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorShaderLog, UxmlTraits> { }
+
+        internal class Styles
+        {
+            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).");
+        }
+
+        SerializedProperty m_LogWhenShaderIsCompiled;
+
+        protected override void Initialize()
+        {
+            m_LogWhenShaderIsCompiled = m_SerializedObject.FindProperty("m_LogWhenShaderIsCompiled");
+
+            Add(new IMGUIContainer(Draw));
+        }
+
+        void Draw()
+        {
+            using var highlightScope = new EditorGUI.LabelHighlightScope(m_SettingsWindow.GetSearchText(), HighlightSelectionColor, HighlightColor);
+            using var settingsScope = new LabelWidthScope();
+            using var wideScreenScope = new WideScreenScope(this);
+            GUILayout.Label(Styles.shaderPreloadSettings, EditorStyles.boldLabel);
+
+            using var changeScope = new EditorGUI.ChangeCheckScope();
+            EditorGUILayout.PropertyField(m_LogWhenShaderIsCompiled, Styles.logWhenShaderIsCompiled);
+            if (changeScope.changed)
+                m_SerializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorShaderPreload.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorShaderPreload.cs
new file mode 100644
index 0000000000..04eefa5e4f
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorShaderPreload.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 UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor
+{
+    internal class GraphicsSettingsInspectorShaderPreload : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorShaderPreload, UxmlTraits> { }
+        internal class Styles
+        {
+            public static readonly GUIContent shaderPreloadSave = EditorGUIUtility.TrTextContent("Save to asset...", "Save currently tracked shaders into a Shader Variant Manifest asset.");
+            public static readonly GUIContent shaderPreloadClear = EditorGUIUtility.TrTextContent("Clear", "Clear currently tracked shader variant information.");
+            public static readonly GUIContent delayShaderPreload = EditorGUIUtility.TrTextContent("Preload shaders after showing first scene");
+            public static readonly GUIContent preloadShadersTimeLimit = EditorGUIUtility.TrTextContent("Preload time limit per frame (ms)");
+            public static readonly GUIContent saveShaderVariantCollectionMessage = EditorGUIUtility.TrTextContent("Save shader variant collection");
+            public static readonly GUIContent saveShaderVariantCollectionTitle = EditorGUIUtility.TrTextContent("Save Shader Variant Collection");
+        }
+
+        SerializedProperty m_PreloadedShaders;
+        SerializedProperty m_PreloadShadersBatchTimeLimit;
+        bool m_DelayShaderPreload;
+        int m_PreloadShadersTimeLimit;
+
+        protected override void Initialize()
+        {
+            m_PreloadedShaders = m_SerializedObject.FindProperty("m_PreloadedShaders");
+            m_PreloadedShaders.isExpanded = true;
+            m_PreloadShadersBatchTimeLimit = m_SerializedObject.FindProperty("m_PreloadShadersBatchTimeLimit");
+            LoadShaderPreloadingDelay();
+
+            Add(new IMGUIContainer(Draw));
+        }
+
+        void Draw()
+        {
+            using var highlightScope = new EditorGUI.LabelHighlightScope(m_SettingsWindow.GetSearchText(), HighlightSelectionColor, HighlightColor);
+            using var check = new EditorGUI.ChangeCheckScope();
+            using var settingsScope = new LabelWidthScope();
+            using var wideScreenScope = new WideScreenScope(this);
+            EditorGUILayout.PropertyField(m_PreloadedShaders, true);
+
+            m_DelayShaderPreload = EditorGUILayout.Toggle(Styles.delayShaderPreload, m_DelayShaderPreload);
+            if (m_DelayShaderPreload)
+                m_PreloadShadersTimeLimit = EditorGUILayout.IntField(Styles.preloadShadersTimeLimit, m_PreloadShadersTimeLimit);
+            SaveShaderPreloadingDelay();
+
+            EditorGUILayout.Space();
+            GUILayout.Label($"Currently tracked: {ShaderUtil.GetCurrentShaderVariantCollectionShaderCount()} shaders {ShaderUtil.GetCurrentShaderVariantCollectionVariantCount()} total variants");
+
+            EditorGUILayout.BeginHorizontal();
+            GUILayout.FlexibleSpace();
+            if (GUILayout.Button(Styles.shaderPreloadSave, EditorStyles.miniButton))
+            {
+                var assetPath = EditorUtility.SaveFilePanelInProject(
+                    Styles.saveShaderVariantCollectionTitle.text,
+                    "NewShaderVariants",
+                    "shadervariants",
+                    Styles.saveShaderVariantCollectionMessage.text,
+                    ProjectWindowUtil.GetActiveFolderPath());
+                if (!string.IsNullOrEmpty(assetPath))
+                    ShaderUtil.SaveCurrentShaderVariantCollection(assetPath);
+                GUIUtility.ExitGUI();
+            }
+
+            if (GUILayout.Button(Styles.shaderPreloadClear, EditorStyles.miniButton))
+                ShaderUtil.ClearCurrentShaderVariantCollection();
+            EditorGUILayout.EndHorizontal();
+
+            if (check.changed)
+                m_SerializedObject.ApplyModifiedProperties();
+        }
+
+        void LoadShaderPreloadingDelay()
+        {
+            m_PreloadShadersTimeLimit = m_PreloadShadersBatchTimeLimit.intValue;
+            m_DelayShaderPreload = m_PreloadShadersTimeLimit >= 0;
+            if (!m_DelayShaderPreload)
+                m_PreloadShadersTimeLimit = 0;
+        }
+
+        void SaveShaderPreloadingDelay()
+        {
+            var newVal = m_DelayShaderPreload ? m_PreloadShadersTimeLimit : -1;
+            if (m_PreloadShadersBatchTimeLimit.intValue != newVal)
+                m_PreloadShadersBatchTimeLimit.intValue = newVal;
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorShaderStripping.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorShaderStripping.cs
new file mode 100644
index 0000000000..5eecc851fd
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorShaderStripping.cs
@@ -0,0 +1,138 @@
+// 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;
+
+namespace UnityEditor
+{
+    internal class GraphicsSettingsInspectorShaderStripping : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorShaderStripping, UxmlTraits> { }
+
+        internal class Styles
+        {
+            public static readonly GUIContent shaderStrippingSettings = EditorGUIUtility.TrTextContent("Shader Stripping");
+
+            public static readonly GUIContent lightmapModes = EditorGUIUtility.TrTextContent("Lightmap Modes");
+            public static readonly GUIContent lightmapPlain = EditorGUIUtility.TrTextContent("Baked Non-Directional", "Include support for baked non-directional lightmaps.");
+            public static readonly GUIContent lightmapDirCombined = EditorGUIUtility.TrTextContent("Baked Directional", "Include support for baked directional lightmaps.");
+            public static readonly GUIContent lightmapKeepShadowMask = EditorGUIUtility.TrTextContent("Baked Shadowmask", "Include support for baked shadow occlusion.");
+            public static readonly GUIContent lightmapKeepSubtractive = EditorGUIUtility.TrTextContent("Baked Subtractive", "Include support for baked subtractive lightmaps.");
+            public static readonly GUIContent lightmapDynamicPlain = EditorGUIUtility.TrTextContent("Realtime Non-Directional", "Include support for realtime non-directional lightmaps.");
+            public static readonly GUIContent lightmapDynamicDirCombined = EditorGUIUtility.TrTextContent("Realtime Directional", "Include support for realtime directional lightmaps.");
+            public static readonly GUIContent lightmapFromScene = EditorGUIUtility.TrTextContent("Import From Current Scene", "Calculate lightmap modes used by the current scene.");
+
+            public static readonly GUIContent fogModes = EditorGUIUtility.TrTextContent("Fog Modes");
+            public static readonly GUIContent fogLinear = EditorGUIUtility.TrTextContent("Linear", "Include support for Linear fog.");
+            public static readonly GUIContent fogExp = EditorGUIUtility.TrTextContent("Exponential", "Include support for Exponential fog.");
+            public static readonly GUIContent fogExp2 = EditorGUIUtility.TrTextContent("Exponential Squared", "Include support for Exponential Squared fog.");
+            public static readonly GUIContent fogFromScene = EditorGUIUtility.TrTextContent("Import From Current Scene", "Calculate fog modes used by the current scene.");
+
+            public static readonly GUIContent instancingVariants = EditorGUIUtility.TrTextContent("Instancing Variants");
+            public static readonly GUIContent brgVariants = EditorGUIUtility.TrTextContent("BatchRendererGroup Variants");
+        }
+
+        SerializedProperty m_LightmapStripping;
+        SerializedProperty m_LightmapKeepPlain;
+        SerializedProperty m_LightmapKeepDirCombined;
+        SerializedProperty m_LightmapKeepDynamicPlain;
+        SerializedProperty m_LightmapKeepDynamicDirCombined;
+        SerializedProperty m_LightmapKeepShadowMask;
+        SerializedProperty m_LightmapKeepSubtractive;
+        SerializedProperty m_FogStripping;
+        SerializedProperty m_FogKeepLinear;
+        SerializedProperty m_FogKeepExp;
+        SerializedProperty m_FogKeepExp2;
+        SerializedProperty m_InstancingStripping;
+        SerializedProperty m_BrgStripping;
+
+        protected override void Initialize()
+        {
+            m_LightmapStripping = m_SerializedObject.FindProperty("m_LightmapStripping");
+            m_LightmapKeepPlain = m_SerializedObject.FindProperty("m_LightmapKeepPlain");
+            m_LightmapKeepDirCombined = m_SerializedObject.FindProperty("m_LightmapKeepDirCombined");
+            m_LightmapKeepDynamicPlain = m_SerializedObject.FindProperty("m_LightmapKeepDynamicPlain");
+            m_LightmapKeepDynamicDirCombined = m_SerializedObject.FindProperty("m_LightmapKeepDynamicDirCombined");
+            m_LightmapKeepShadowMask = m_SerializedObject.FindProperty("m_LightmapKeepShadowMask");
+            m_LightmapKeepSubtractive = m_SerializedObject.FindProperty("m_LightmapKeepSubtractive");
+            m_FogStripping = m_SerializedObject.FindProperty("m_FogStripping");
+            m_FogKeepLinear = m_SerializedObject.FindProperty("m_FogKeepLinear");
+            m_FogKeepExp = m_SerializedObject.FindProperty("m_FogKeepExp");
+            m_FogKeepExp2 = m_SerializedObject.FindProperty("m_FogKeepExp2");
+            m_InstancingStripping = m_SerializedObject.FindProperty("m_InstancingStripping");
+            m_BrgStripping = m_SerializedObject.FindProperty("m_BrgStripping");
+
+            Add(new IMGUIContainer(Draw));
+        }
+
+        void Draw()
+        {
+            using var highlightScope = new EditorGUI.LabelHighlightScope(m_SettingsWindow.GetSearchText(), HighlightSelectionColor, HighlightColor);
+            using var check = new EditorGUI.ChangeCheckScope();
+            using var settingsScope = new LabelWidthScope();
+            using var wideScreenScope = new WideScreenScope(this);
+
+            EditorGUILayout.LabelField(Styles.shaderStrippingSettings, EditorStyles.boldLabel);
+
+            bool calcLightmapStripping = false, calcFogStripping = false;
+
+            EditorGUILayout.PropertyField(m_LightmapStripping, Styles.lightmapModes);
+
+            if (m_LightmapStripping.intValue != 0)
+            {
+                EditorGUI.indentLevel++;
+                EditorGUILayout.PropertyField(m_LightmapKeepPlain, Styles.lightmapPlain);
+                EditorGUILayout.PropertyField(m_LightmapKeepDirCombined, Styles.lightmapDirCombined);
+                EditorGUILayout.PropertyField(m_LightmapKeepDynamicPlain, Styles.lightmapDynamicPlain);
+                EditorGUILayout.PropertyField(m_LightmapKeepDynamicDirCombined, Styles.lightmapDynamicDirCombined);
+                EditorGUILayout.PropertyField(m_LightmapKeepShadowMask, Styles.lightmapKeepShadowMask);
+                EditorGUILayout.PropertyField(m_LightmapKeepSubtractive, Styles.lightmapKeepSubtractive);
+                EditorGUILayout.Space();
+
+                EditorGUILayout.BeginHorizontal();
+                EditorGUILayout.PrefixLabel(GUIContent.Temp(" "), EditorStyles.miniButton);
+
+                if (GUILayout.Button(Styles.lightmapFromScene, EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
+                    calcLightmapStripping = true;
+
+                EditorGUILayout.EndHorizontal();
+                EditorGUI.indentLevel--;
+                EditorGUILayout.Space();
+            }
+
+            EditorGUILayout.PropertyField(m_FogStripping, Styles.fogModes);
+            if (m_FogStripping.intValue != 0)
+            {
+                EditorGUI.indentLevel++;
+                EditorGUILayout.PropertyField(m_FogKeepLinear, Styles.fogLinear);
+                EditorGUILayout.PropertyField(m_FogKeepExp, Styles.fogExp);
+                EditorGUILayout.PropertyField(m_FogKeepExp2, Styles.fogExp2);
+                EditorGUILayout.Space();
+
+                EditorGUILayout.BeginHorizontal();
+                EditorGUILayout.PrefixLabel(GUIContent.Temp(" "), EditorStyles.miniButton);
+
+                if (GUILayout.Button(Styles.fogFromScene, EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
+                    calcFogStripping = true;
+
+                EditorGUILayout.EndHorizontal();
+                EditorGUI.indentLevel--;
+                EditorGUILayout.Space();
+            }
+
+            EditorGUILayout.PropertyField(m_InstancingStripping, Styles.instancingVariants);
+            EditorGUILayout.PropertyField(m_BrgStripping, Styles.brgVariants);
+
+            if (check.changed)
+                m_SerializedObject.ApplyModifiedProperties();
+
+            // need to do these after ApplyModifiedProperties, since it changes their values from native code
+            if (calcLightmapStripping)
+                ShaderUtil.CalculateLightmapStrippingFromCurrentScene();
+            if (calcFogStripping)
+                ShaderUtil.CalculateFogStrippingFromCurrentScene();
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorTierSettings.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorTierSettings.cs
new file mode 100644
index 0000000000..d6be01ae0f
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorTierSettings.cs
@@ -0,0 +1,427 @@
+// 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.AnimatedValues;
+using UnityEditor.Build;
+using UnityEditor.Rendering;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.UIElements;
+
+namespace UnityEditor
+{
+    internal class TierSettingsWindow : EditorWindow
+    {
+        static TierSettingsWindow s_Instance;
+
+        public static void CreateWindow()
+        {
+            s_Instance = GetWindow<TierSettingsWindow>();
+            s_Instance.minSize = new Vector2(600, 300);
+            s_Instance.titleContent = GraphicsSettingsInspectorTierSettings.Styles.tierSettings;
+        }
+
+        internal static TierSettingsWindow GetInstance()
+        {
+            return s_Instance;
+        }
+
+        SerializedObject m_SerializedObject;
+
+        void OnEnable()
+        {
+            s_Instance = this;
+            m_SerializedObject = new SerializedObject(GraphicsSettings.GetGraphicsSettings());
+            var graphicsSettingsInspectorTierSettings = new GraphicsSettingsInspectorTierSettings()
+            {
+                style =
+                {
+                    marginTop = 5,
+                    marginBottom = 5,
+                    marginLeft = 5,
+                    marginRight = 5
+                },
+                UseAnimation = false
+            };
+            graphicsSettingsInspectorTierSettings.Initialize(m_SerializedObject);
+            rootVisualElement.Add(graphicsSettingsInspectorTierSettings);
+            RenderPipelineManager.activeRenderPipelineAssetChanged += RenderPipelineAssetChanged;
+        }
+
+        void RenderPipelineAssetChanged(RenderPipelineAsset previous, RenderPipelineAsset next)
+        {
+            if (next != null)
+                Close();
+        }
+
+        void OnDisable()
+        {
+            RenderPipelineManager.activeRenderPipelineAssetChanged -= RenderPipelineAssetChanged;
+            rootVisualElement.Clear();
+
+            if (s_Instance == this)
+                s_Instance = null;
+        }
+    }
+
+    internal class GraphicsSettingsInspectorTierSettings : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorTierSettings, UxmlTraits>
+        {
+        }
+
+        internal class Styles
+        {
+            public static readonly GUIContent[] shaderQualityName =
+                { EditorGUIUtility.TrTextContent("Low"), EditorGUIUtility.TrTextContent("Medium"), EditorGUIUtility.TrTextContent("High") };
+
+            public static readonly int[] shaderQualityValue =
+                { (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") };
+
+            public static readonly int[] renderingPathValue =
+                { (int)RenderingPath.Forward, (int)RenderingPath.DeferredShading, (int)RenderingPath.VertexLit };
+
+            public static readonly GUIContent[] hdrModeName =
+                { EditorGUIUtility.TrTextContent("FP16"), EditorGUIUtility.TrTextContent("R11G11B10") };
+
+            public static readonly int[] hdrModeValue =
+                { (int)CameraHDRMode.FP16, (int)CameraHDRMode.R11G11B10 };
+
+            public static readonly GUIContent[] realtimeGICPUUsageName =
+                { EditorGUIUtility.TrTextContent("Low"), EditorGUIUtility.TrTextContent("Medium"), EditorGUIUtility.TrTextContent("High"), EditorGUIUtility.TrTextContent("Unlimited") };
+
+            public static readonly int[] realtimeGICPUUsageValue =
+                { (int)RealtimeGICPUUsage.Low, (int)RealtimeGICPUUsage.Medium, (int)RealtimeGICPUUsage.High, (int)RealtimeGICPUUsage.Unlimited };
+
+            public static readonly GUIContent showEditorWindow = EditorGUIUtility.TrTextContent("Open Editor...");
+            public static readonly GUIContent closeEditorWindow = EditorGUIUtility.TrTextContent("Close Editor");
+            public static readonly GUIContent tierSettings = EditorGUIUtility.TrTextContent("Tier Settings");
+
+            public static readonly GUIContent[] tierName =
+            {
+                EditorGUIUtility.TrTextContent("Low (Tier 1)"), EditorGUIUtility.TrTextContent("Medium (Tier 2)"), EditorGUIUtility.TrTextContent("High (Tier 3)")
+            };
+
+            public static readonly GUIContent empty = EditorGUIUtility.TextContent("");
+            public static readonly GUIContent autoSettingsLabel = EditorGUIUtility.TrTextContent("Use Defaults");
+
+            public static readonly GUIContent standardShaderSettings = EditorGUIUtility.TrTextContent("Standard Shader");
+            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", "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", "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", "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.");
+        }
+
+        public override bool BuiltinOnly => true;
+        public bool UseAnimation { get; set; } = true;
+
+        bool verticalLayout = true;
+
+        // this is category animation is blatantly copied from PlayerSettingsEditor.cs
+        bool m_ShowTierSettingsUI = true; // show by default, as otherwise users are confused
+        AnimBool m_TierSettingsAnimator;
+
+        protected override void Initialize()
+        {
+            var container = new IMGUIContainer(Draw);
+            Add(container);
+
+            if (UseAnimation)
+                m_TierSettingsAnimator = new AnimBool(m_ShowTierSettingsUI, container.MarkDirtyRepaint);
+        }
+
+        void Draw()
+        {
+            if (GraphicsSettings.isScriptableRenderPipelineEnabled)
+            {
+                var window = TierSettingsWindow.GetInstance();
+                if (window != null)
+                    window.Close();
+            }
+            else
+            {
+                using var settingsScope = new LabelWidthScope();
+                using var wideScreenScope = new WideScreenScope(this);
+                if (m_TierSettingsAnimator == null)
+                    OnInspectorGUI();
+                else
+                    TierSettingsGUI();
+            }
+        }
+
+        void HandleEditorWindowButton()
+        {
+            var window = TierSettingsWindow.GetInstance();
+            var text = window == null ? Styles.showEditorWindow : Styles.closeEditorWindow;
+            if (!GUILayout.Button(text, EditorStyles.miniButton, GUILayout.Width(110)))
+                return;
+
+            if (window)
+            {
+                window.Close();
+            }
+            else
+            {
+                TierSettingsWindow.CreateWindow();
+                TierSettingsWindow.GetInstance().Show();
+            }
+        }
+
+        void TierSettingsGUI()
+        {
+            var enabled = GUI.enabled;
+            GUI.enabled = true; // we don't want to disable the expand behavior
+            EditorGUILayout.BeginVertical(EditorStyles.helpBox, GUILayout.Height(20));
+
+            EditorGUILayout.BeginHorizontal();
+            var r = GUILayoutUtility.GetRect(20, 21);
+            r.x += 3;
+            r.width += 6;
+            m_ShowTierSettingsUI = EditorGUI.FoldoutTitlebar(r, Styles.tierSettings, m_ShowTierSettingsUI, true, EditorStyles.inspectorTitlebarFlat, EditorStyles.inspectorTitlebarText);
+            HandleEditorWindowButton();
+            EditorGUILayout.EndHorizontal();
+
+            m_TierSettingsAnimator.target = m_ShowTierSettingsUI;
+            GUI.enabled = enabled;
+
+            if (EditorGUILayout.BeginFadeGroup(m_TierSettingsAnimator.faded) && TierSettingsWindow.GetInstance() == null)
+                OnInspectorGUI();
+            EditorGUILayout.EndFadeGroup();
+            EditorGUILayout.EndVertical();
+        }
+
+        void OnInspectorGUI()
+        {
+            using var highlightScope = new EditorGUI.LabelHighlightScope(m_SettingsWindow.GetSearchText(), HighlightSelectionColor, HighlightColor);
+            var validPlatforms = BuildPlatforms.instance.GetValidPlatforms().ToArray();
+            var platform = validPlatforms[EditorGUILayout.BeginPlatformGrouping(validPlatforms, null, EditorStyles.frameBox)];
+
+            if (verticalLayout) OnGuiVertical(platform);
+            else OnGuiHorizontal(platform);
+
+            EditorGUILayout.EndPlatformGrouping();
+        }
+
+        void OnFieldLabelsGUI(bool vertical)
+        {
+            var usingSRP = GraphicsSettings.currentRenderPipeline != null;
+            if (!vertical)
+                EditorGUILayout.LabelField(Styles.standardShaderSettings, EditorStyles.boldLabel);
+
+            if (!usingSRP)
+            {
+                EditorGUILayout.LabelField(Styles.standardShaderQuality);
+                EditorGUILayout.LabelField(Styles.reflectionProbeBoxProjection);
+                EditorGUILayout.LabelField(Styles.reflectionProbeBlending);
+                EditorGUILayout.LabelField(Styles.detailNormalMap);
+                EditorGUILayout.LabelField(Styles.semitransparentShadows);
+            }
+
+            if (SupportedRenderingFeatures.active.lightProbeProxyVolumes)
+                EditorGUILayout.LabelField(Styles.enableLPPV);
+
+            if (!vertical)
+            {
+                EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
+                EditorGUILayout.LabelField(Styles.renderingSettings, EditorStyles.boldLabel);
+            }
+
+            if (!usingSRP)
+            {
+                EditorGUILayout.LabelField(Styles.cascadedShadowMaps);
+                EditorGUILayout.LabelField(Styles.prefer32BitShadowMaps);
+                EditorGUILayout.LabelField(Styles.useHDR);
+                EditorGUILayout.LabelField(Styles.hdrMode);
+                EditorGUILayout.LabelField(Styles.renderingPath);
+            }
+
+            if (SupportedRenderingFeatures.IsLightmapBakeTypeSupported(LightmapBakeType.Realtime))
+                EditorGUILayout.LabelField(Styles.realtimeGICPUUsage);
+        }
+
+
+        // custom enum handling
+        ShaderQuality ShaderQualityPopup(ShaderQuality sq) =>
+            (ShaderQuality)EditorGUILayout.IntPopup((int)sq, Styles.shaderQualityName, Styles.shaderQualityValue);
+
+        RenderingPath RenderingPathPopup(RenderingPath rp) =>
+            (RenderingPath)EditorGUILayout.IntPopup((int)rp, Styles.renderingPathName, Styles.renderingPathValue);
+
+        CameraHDRMode HDRModePopup(CameraHDRMode mode) =>
+            (CameraHDRMode)EditorGUILayout.IntPopup((int)mode, Styles.hdrModeName, Styles.hdrModeValue);
+
+        RealtimeGICPUUsage RealtimeGICPUUsagePopup(RealtimeGICPUUsage usage) =>
+            (RealtimeGICPUUsage)EditorGUILayout.IntPopup((int)usage, Styles.realtimeGICPUUsageName, Styles.realtimeGICPUUsageValue);
+
+
+        void OnTierGUI(BuildPlatform platform, GraphicsTier tier, bool vertical)
+        {
+            var ts = EditorGraphicsSettings.GetTierSettings(platform.namedBuildTarget, tier);
+
+            EditorGUI.BeginChangeCheck();
+
+
+            if (!vertical)
+                EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
+
+            var usingSRP = GraphicsSettings.currentRenderPipeline != null;
+            if (!usingSRP)
+            {
+                ts.standardShaderQuality = ShaderQualityPopup(ts.standardShaderQuality);
+                ts.reflectionProbeBoxProjection = EditorGUILayout.Toggle(ts.reflectionProbeBoxProjection);
+                ts.reflectionProbeBlending = EditorGUILayout.Toggle(ts.reflectionProbeBlending);
+                ts.detailNormalMap = EditorGUILayout.Toggle(ts.detailNormalMap);
+                ts.semitransparentShadows = EditorGUILayout.Toggle(ts.semitransparentShadows);
+            }
+
+            if (SupportedRenderingFeatures.active.lightProbeProxyVolumes)
+                ts.enableLPPV = EditorGUILayout.Toggle(ts.enableLPPV);
+
+            if (!vertical)
+            {
+                EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
+                EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
+            }
+
+            if (!usingSRP)
+            {
+                ts.cascadedShadowMaps = EditorGUILayout.Toggle(ts.cascadedShadowMaps);
+                ts.prefer32BitShadowMaps = EditorGUILayout.Toggle(ts.prefer32BitShadowMaps);
+                ts.hdr = EditorGUILayout.Toggle(ts.hdr);
+                ts.hdrMode = HDRModePopup(ts.hdrMode);
+                ts.renderingPath = RenderingPathPopup(ts.renderingPath);
+            }
+
+            if (!usingSRP)
+                if (SupportedRenderingFeatures.IsLightmapBakeTypeSupported(LightmapBakeType.Realtime))
+                    ts.realtimeGICPUUsage = RealtimeGICPUUsagePopup(ts.realtimeGICPUUsage);
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                // TODO: it should be doable in c# now as we "expose" GraphicsSettings anyway
+                EditorGraphicsSettings.RegisterUndo();
+                EditorGraphicsSettings.SetTierSettings(platform.namedBuildTarget, tier, ts);
+            }
+        }
+
+        void OnGuiHorizontal(BuildPlatform platform)
+        {
+            EditorGUILayout.BeginHorizontal();
+
+            EditorGUILayout.BeginVertical();
+            EditorGUIUtility.labelWidth = 140;
+            EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
+            OnFieldLabelsGUI(false);
+            EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
+            EditorGUILayout.LabelField(Styles.autoSettingsLabel, EditorStyles.boldLabel);
+            EditorGUILayout.EndVertical();
+
+            EditorGUIUtility.labelWidth = 50;
+            foreach (GraphicsTier tier in Enum.GetValues(typeof(GraphicsTier)))
+            {
+                bool autoSettings = EditorGraphicsSettings.AreTierSettingsAutomatic(platform.namedBuildTarget.ToBuildTargetGroup(), tier);
+
+                EditorGUILayout.BeginVertical();
+                EditorGUILayout.LabelField(Styles.tierName[(int)tier], EditorStyles.boldLabel);
+                using (new EditorGUI.DisabledScope(autoSettings))
+                    OnTierGUI(platform, tier, false);
+
+                EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
+                EditorGUI.BeginChangeCheck();
+                autoSettings = EditorGUILayout.Toggle(autoSettings);
+                if (EditorGUI.EndChangeCheck())
+                {
+                    EditorGraphicsSettings.RegisterUndo();
+                    EditorGraphicsSettings.MakeTierSettingsAutomatic(platform.namedBuildTarget.ToBuildTargetGroup(), tier, autoSettings);
+                    EditorGraphicsSettings.OnUpdateTierSettings(platform.namedBuildTarget.ToBuildTargetGroup(), true);
+                }
+
+                EditorGUILayout.EndVertical();
+            }
+
+            EditorGUIUtility.labelWidth = 0;
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void OnGuiVertical(BuildPlatform platform)
+        {
+            EditorGUILayout.BeginVertical();
+            foreach (GraphicsTier tier in Enum.GetValues(typeof(GraphicsTier)))
+            {
+                var autoSettings = EditorGraphicsSettings.AreTierSettingsAutomatic(platform.namedBuildTarget.ToBuildTargetGroup(), tier);
+                EditorGUI.BeginChangeCheck();
+                {
+                    GUILayout.BeginHorizontal();
+                    EditorGUIUtility.labelWidth = 80;
+                    EditorGUILayout.LabelField(Styles.tierName[(int)tier], EditorStyles.boldLabel);
+                    GUILayout.FlexibleSpace();
+                    EditorGUIUtility.labelWidth = 80;
+                    autoSettings = EditorGUILayout.Toggle(Styles.autoSettingsLabel, autoSettings);
+                    GUILayout.EndHorizontal();
+                }
+
+                if (EditorGUI.EndChangeCheck())
+                {
+                    EditorGraphicsSettings.RegisterUndo();
+                    EditorGraphicsSettings.MakeTierSettingsAutomatic(platform.namedBuildTarget.ToBuildTargetGroup(), tier, autoSettings);
+                    EditorGraphicsSettings.OnUpdateTierSettings(platform.namedBuildTarget.ToBuildTargetGroup(), true);
+                }
+
+                using (new EditorGUI.DisabledScope(autoSettings))
+                {
+                    EditorGUI.indentLevel++;
+                    EditorGUILayout.BeginHorizontal();
+
+                    EditorGUILayout.BeginVertical();
+                    EditorGUIUtility.labelWidth = 140;
+                    OnFieldLabelsGUI(true);
+                    EditorGUILayout.EndVertical();
+
+                    EditorGUILayout.BeginVertical();
+                    EditorGUIUtility.labelWidth = 50;
+                    OnTierGUI(platform, tier, true);
+                    EditorGUILayout.EndVertical();
+
+                    GUILayout.EndHorizontal();
+                    EditorGUI.indentLevel--;
+                }
+            }
+
+            GUILayout.EndVertical();
+            EditorGUIUtility.labelWidth = 0;
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorTitleBar.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorTitleBar.cs
new file mode 100644
index 0000000000..473f2f085f
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorTitleBar.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;
+using UnityEditor.Experimental;
+using UnityEditor.StyleSheets;
+using UnityEngine;
+using UnityEngine.UIElements;
+using Object = UnityEngine.Object;
+
+namespace UnityEditor
+{
+    internal class GraphicsSettingsInspectorTitleBar : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorTitleBar, UxmlTraits> { }
+
+        internal class Styles
+        {
+            public static Lazy<GUIStyle> ImguiStylesHeader = new(() => "SettingsHeader");
+            public static StyleBlock settingsPanel { get; } = EditorResources.GetStyle("sb-settings-panel-client-area");
+
+            public static StyleBlock header { get; } =  EditorResources.GetStyle("sb-settings-header");
+
+            public static StyleBlock settingsBtn { get; } =  EditorResources.GetStyle("sb-settings-icon-btn");
+
+            public static readonly GUIContent mainHeader =  EditorGUIUtility.TrTextContent("Graphics");
+        }
+
+        Object[] m_TargetObjects;
+
+        protected override void Initialize()
+        {
+            m_TargetObjects = m_SerializedObject.targetObjects;
+            Add(new IMGUIContainer(Draw));
+        }
+
+        void Draw()
+        {
+            using var highlightScope = new EditorGUI.LabelHighlightScope(m_SettingsWindow.GetSearchText(), HighlightSelectionColor, HighlightColor);
+            GUILayout.BeginHorizontal();
+            GUILayout.Space(Styles.settingsPanel.GetFloat(StyleCatalogKeyword.marginLeft));
+            GUILayout.Label(Styles.mainHeader, Styles.ImguiStylesHeader.Value, GUILayout.MaxHeight(Styles.header.GetFloat("max-height")),
+                GUILayout.MinWidth(160));
+            GUILayout.FlexibleSpace();
+
+            var btnWidth = Styles.settingsBtn.GetFloat(StyleCatalogKeyword.width);
+            var btnHeight = Styles.settingsBtn.GetFloat(StyleCatalogKeyword.height);
+            var btnMargin = Styles.settingsBtn.GetFloat(StyleCatalogKeyword.marginTop);
+
+            var currentRect = GUILayoutUtility.GetRect(btnWidth, btnHeight);
+            currentRect.y = btnMargin;
+            EditorGUIUtility.DrawEditorHeaderItems(currentRect, m_TargetObjects);
+            var settingsRect = GUILayoutUtility.GetRect(btnWidth, btnHeight);
+            settingsRect.y = currentRect.y;
+
+            // Settings; process event even for disabled UI
+            var wasEnabled = GUI.enabled;
+            GUI.enabled = true;
+            var showMenu = EditorGUI.DropdownButton(settingsRect, GUIContent.none, FocusType.Passive, EditorStyles.optionsButtonStyle);
+            GUI.enabled = wasEnabled;
+            if (showMenu)
+                EditorUtility.DisplayObjectContextMenu(settingsRect, m_TargetObjects, 0);
+            GUILayout.EndHorizontal();
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorVideoShader.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorVideoShader.cs
new file mode 100644
index 0000000000..1ea9985c95
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsInspectorVideoShader.cs
@@ -0,0 +1,38 @@
+// 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;
+
+namespace UnityEditor
+{
+    internal class GraphicsSettingsInspectorVideoShader : GraphicsSettingsElement
+    {
+        public new class UxmlFactory : UxmlFactory<GraphicsSettingsInspectorVideoShader, UxmlTraits> { }
+        internal class Styles
+        {
+            public static readonly GUIContent modeString = EditorGUIUtility.TrTextContent("Video", "Shaders used by the VideoPlayer decoding and compositing.");
+        }
+
+        SerializedProperty m_VideoShadersIncludeMode;
+
+        protected override void Initialize()
+        {
+            m_VideoShadersIncludeMode = m_SerializedObject.FindProperty("m_VideoShadersIncludeMode");
+
+            Add(new IMGUIContainer(Draw));
+        }
+
+        void Draw()
+        {
+            using var highlightScope = new EditorGUI.LabelHighlightScope(m_SettingsWindow.GetSearchText(), HighlightSelectionColor, HighlightColor);
+            using var check = new EditorGUI.ChangeCheckScope();
+            using var settingsScope = new LabelWidthScope();
+            using var wideScreenScope = new WideScreenScope(this);
+            EditorGUILayout.PropertyField(m_VideoShadersIncludeMode, Styles.modeString);
+            if(check.changed)
+                m_SerializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsScopes.cs b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsScopes.cs
new file mode 100644
index 0000000000..6f91317bca
--- /dev/null
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspectors/GraphicsSettingsScopes.cs
@@ -0,0 +1,53 @@
+// 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 UnityEditor.StyleSheets;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor
+{
+    internal class LabelWidthScope : GUI.Scope
+    {
+        static StyleBlock window => EditorResources.GetStyle("sb-settings-window");
+        static float s_DefaultLabelWidth => window.GetFloat("-unity-label-width");
+
+        readonly float m_LabelWidth;
+        public LabelWidthScope(float layoutMaxWidth)
+        {
+            m_LabelWidth = EditorGUIUtility.labelWidth;
+            EditorGUIUtility.labelWidth = s_DefaultLabelWidth;
+        }
+
+        public LabelWidthScope() : this(s_DefaultLabelWidth)
+        {
+        }
+
+        protected override void CloseScope()
+        {
+            EditorGUIUtility.labelWidth = m_LabelWidth;
+        }
+    }
+
+    internal class WideScreenScope : GUI.Scope
+    {
+        readonly bool m_CurrentWideMode;
+
+        public WideScreenScope(VisualElement currentElement)
+        {
+            m_CurrentWideMode = EditorGUIUtility.wideMode;
+            
+            // the inspector's width can be NaN if this is our first layout check.
+            // If that's the case we'll set wideMode to true to avoid computing too tall an inspector on the first layout calculation
+            var inspectorWidth = currentElement.layout.width;
+            EditorGUIUtility.wideMode = float.IsNaN(inspectorWidth) || inspectorWidth > Editor.k_WideModeMinWidth;
+        }
+
+        protected override void CloseScope()
+        {
+            EditorGUIUtility.wideMode = m_CurrentWideMode;
+        }
+    }
+}
diff --git a/Editor/Mono/Inspector/InspectorWindow.cs b/Editor/Mono/Inspector/InspectorWindow.cs
index 79ac72112a..23a2ea09bc 100644
--- a/Editor/Mono/Inspector/InspectorWindow.cs
+++ b/Editor/Mono/Inspector/InspectorWindow.cs
@@ -92,12 +92,11 @@ protected override void OnEnable()
 
             m_LockTracker.tracker = tracker;
             m_LockTracker.lockStateChanged.AddListener(LockStateChanged);
+            m_Tracker.dataMode = GetDataModeController_Internal().dataMode;
 
             EditorApplication.projectWasLoaded += OnProjectWasLoaded;
             Selection.selectionChanged += OnSelectionChanged;
             AssemblyReloadEvents.afterAssemblyReload += OnAfterAssemblyReload;
-
-            UpdateDataMode();
         }
 
         private void OnAfterAssemblyReload()
@@ -158,32 +157,22 @@ private void OnSelectionChanged()
                 m_MultiEditLabel.RemoveFromHierarchy();
             }
 
-            UpdateDataMode();
-        }
-
-        private void UpdateDataMode()
-        {
-            UpdateSupportedDataModes();
+            if (isLocked)
+                return;
 
-            // Try to respect the DataMode hint provided by the selection.
-            // If impossible, try to retain the current DataMode if supported.
-            if (IsDataModeSupported(Selection.dataModeHint))
-                SwitchToDataMode(Selection.dataModeHint);
-            else if (!IsDataModeSupported(dataMode))
-                SwitchToDefaultDataMode();
+            UpdateSupportedDataModesList();
         }
 
         // Note: supportedModes is cleared before and sorted after this method is called
         protected override void OnUpdateSupportedDataModes(List<DataMode> supportedModes)
         {
-            m_UserSupportedDataModes.Clear();
-
             // Not showing data modes in debug
-            if (m_InspectorMode == InspectorMode.Normal)
-            {
-                DataModeSupportUtils.GetDataModeSupport(Selection.activeObject, Selection.activeContext, m_UserSupportedDataModes);
-                supportedModes.AddRange(m_UserSupportedDataModes);
-            }
+            if (m_InspectorMode != InspectorMode.Normal)
+                return;
+
+            m_UserSupportedDataModes.Clear();
+            DataModeSupportUtils.GetDataModeSupport(Selection.activeObject, Selection.activeContext, m_UserSupportedDataModes);
+            supportedModes.AddRange(m_UserSupportedDataModes);
         }
 
         protected override void OnDisable()
@@ -490,6 +479,9 @@ internal static void RefreshInspectors()
 
         internal override Object GetInspectedObject()
         {
+            if (tracker.hasComponentsWhichCannotBeMultiEdited && !tracker.isLocked)
+                return Selection.activeObject;
+
             Editor editor = InspectorWindowUtils.GetFirstNonImportInspectorEditor(tracker.activeEditors);
             if (editor == null)
                 return null;
@@ -498,6 +490,9 @@ internal override Object GetInspectedObject()
 
         internal Object[] GetInspectedObjects()
         {
+            if (tracker.hasComponentsWhichCannotBeMultiEdited && !tracker.isLocked)
+                return Selection.objects;
+
             Editor editor = InspectorWindowUtils.GetFirstNonImportInspectorEditor(tracker.activeEditors);
             if (editor == null)
                 return null;
diff --git a/Editor/Mono/Inspector/InspectorWindowUtils.cs b/Editor/Mono/Inspector/InspectorWindowUtils.cs
index 375159071c..5c7e1d405c 100644
--- a/Editor/Mono/Inspector/InspectorWindowUtils.cs
+++ b/Editor/Mono/Inspector/InspectorWindowUtils.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -76,15 +77,15 @@ public static void GetPreviewableTypes(out Dictionary<Type, List<Type>> previewa
                         continue;
                     }
 
-                    List<Type> types;
-
-                    if (!previewableTypes.TryGetValue(previewAttr.m_Type, out types))
+                    foreach (var customPreviewType in new[] { previewAttr.m_Type }.Concat(TypeCache.GetTypesDerivedFrom(previewAttr.m_Type)))
                     {
-                        types = new List<Type>();
-                        previewableTypes.Add(previewAttr.m_Type, types);
+                        if (!previewableTypes.TryGetValue(customPreviewType, out var types))
+                        {
+                            types = new List<Type>();
+                            previewableTypes.Add(customPreviewType, types);
+                        }
+                        types.Add(type);
                     }
-
-                    types.Add(type);
                 }
             }
         }
diff --git a/Editor/Mono/Inspector/LightProbeGroupInspector.cs b/Editor/Mono/Inspector/LightProbeGroupInspector.cs
index 6cf61c3cd9..fe911a3255 100644
--- a/Editor/Mono/Inspector/LightProbeGroupInspector.cs
+++ b/Editor/Mono/Inspector/LightProbeGroupInspector.cs
@@ -255,7 +255,7 @@ public void HandleEditMenuHotKeyCommands()
 
         public static void TetrahedralizeSceneProbes(out Vector3[] positions, out int[] indices)
         {
-            var probeGroups = Object.FindObjectsOfType(typeof(LightProbeGroup)) as LightProbeGroup[];
+            var probeGroups = Object.FindObjectsByType<LightProbeGroup>(FindObjectsSortMode.None);
 
             if (probeGroups == null)
             {
@@ -621,7 +621,7 @@ public override void OnInspectorGUI()
             bool srpHasAlternativeToLegacyProbes = UnityEngine.Rendering.SupportedRenderingFeatures.active.overridesLightProbeSystem;
             if (srpHasAlternativeToLegacyProbes)
             {
-                EditorGUILayout.HelpBox(UnityEngine.Rendering.SupportedRenderingFeatures.active.overridesLightProbeSystemWarningMessage, MessageType.Warning, wide: true);
+                EditorGUILayout.HelpBox(SupportedRenderingFeatures.active.overridesLightProbeSystemWarningMessage, MessageType.Warning, true);
             }
 
             using (new EditorGUI.DisabledScope(srpHasAlternativeToLegacyProbes))
diff --git a/Editor/Mono/Inspector/LightingSettingsEditor.cs b/Editor/Mono/Inspector/LightingSettingsEditor.cs
index fcb0f2a06b..1cf2800c3a 100644
--- a/Editor/Mono/Inspector/LightingSettingsEditor.cs
+++ b/Editor/Mono/Inspector/LightingSettingsEditor.cs
@@ -22,6 +22,7 @@ public void OnEnable()
             m_Editor = new SharedLightingSettingsEditor();
             m_Editor.OnEnable();
             m_Editor.UpdateSettings(serializedObject);
+            m_Editor.ClampMaxRanges();
         }
 
         internal override void OnHeaderControlsGUI()
@@ -38,6 +39,11 @@ public override void OnInspectorGUI()
 
             serializedObject.ApplyModifiedProperties();
         }
+
+        private void OnFocus() 
+        {
+            m_Editor.ClampMaxRanges();
+        }
     }
 
     internal class SharedLightingSettingsEditor
@@ -69,6 +75,7 @@ internal class SharedLightingSettingsEditor
         SerializedProperty m_CompAOExponentDirect;
         SerializedProperty m_LightmapCompression;
         SerializedProperty m_LightmapMaxSize;
+        SerializedProperty m_LightmapSizeFixed;
         SerializedProperty m_BakeBackend;
         // pvr
         SerializedProperty m_PVRSampleCount;
@@ -99,8 +106,6 @@ internal class SharedLightingSettingsEditor
         SerializedProperty m_ForceWhiteAlbedo;
         SerializedProperty m_ForceUpdates;
         SerializedProperty m_FilterMode;
-        SerializedProperty m_TiledBaking;
-        SerializedProperty m_NumRaysToShootPerTexel;
         SerializedProperty m_RespectSceneVisibilityWhenBakingGI;
 
         enum DenoiserTarget
@@ -195,7 +200,6 @@ static class Styles
             public static readonly GUIContent mixedLightsLabel = EditorGUIUtility.TrTextContent("Mixed Lighting", "Bake Global Illumination for mixed lights and static objects. May bake both direct and/or indirect lighting based on settings. Only static objects are blocking and bouncing light, dynamic objects receive baked lighting via light probes.");
             public static readonly GUIContent generalLightmapLabel = EditorGUIUtility.TrTextContent("Lightmapping Settings", "Settings that apply to both Global Illumination modes (Precomputed Realtime and Baked).");
             public static readonly GUIContent internalLabel = EditorGUIUtility.TrTextContent("Internal Settings", "Internal only settings. ");
-            public static readonly GUIContent noRealtimeGIInSM2AndGLES2 = EditorGUIUtility.TrTextContent("Realtime Global Illumination is not supported on SM2.0 hardware nor when using GLES2.0.");
             public static readonly GUIContent forceWhiteAlbedo = EditorGUIUtility.TrTextContent("Force White Albedo", "Force white albedo during lighting calculations.");
             public static readonly GUIContent forceUpdates = EditorGUIUtility.TrTextContent("Force Updates", "Force continuous updates of runtime indirect lighting calculations.");
             public static readonly GUIContent filterMode = EditorGUIUtility.TrTextContent("Filter Mode");
@@ -205,6 +209,7 @@ static class Styles
             public static readonly GUIContent lightmapResolution = EditorGUIUtility.TrTextContent("Lightmap Resolution", "Sets the resolution in texels used per unit for objects lit by baked global illumination. The higher this value is, the more time the Editor needs to bake lighting.");
             public static readonly GUIContent padding = EditorGUIUtility.TrTextContent("Lightmap Padding", "Sets the separation in texels between shapes in the baked lightmap.");
             public static readonly GUIContent lightmapMaxSize = EditorGUIUtility.TrTextContent("Max Lightmap Size", "Sets the max size of the full lightmap Texture in pixels. Values are squared, so a setting of 1024 can produce a 1024x1024 pixel sized lightmap.");
+            public static readonly GUIContent lightmapSizeFixed = EditorGUIUtility.TrTextContent("Fixed Lightmap Size", "Forces all lightmap textures to use the same size. These can be no larger than Max Lightmap Size.");
             public static readonly GUIContent lightmapCompression = EditorGUIUtility.TrTextContent("Lightmap Compression", "Compresses baked lightmaps created using this Lighting Settings Asset. Lower quality compression reduces memory and storage requirements, at the cost of more visual artifacts. Higher quality compression requires more memory and storage, but provides better visual results.");
             public static readonly GUIContent tiledBaking = EditorGUIUtility.TrTextContent("Tiled baking", "Determines the tiled baking mode. Auto: Memory status triggers tiling. If Auto is not enabled, bakes may fail. Disabled: Never use tiling.");
             public static readonly GUIContent ambientOcclusion = EditorGUIUtility.TrTextContent("Ambient Occlusion", "Specifies whether to include ambient occlusion or not in the baked lightmap result. Enabling this results in simulating the soft shadows that occur in cracks and crevices of objects when light is reflected onto them.");
@@ -245,6 +250,11 @@ static class Styles
             public static readonly GUIStyle labelStyle = EditorStyles.wordWrappedMiniLabel;
         }
 
+        private int maxDirectSamples = 1024;
+        private int maxIndirectSamples = 8192;
+        private int maxEnvironmentSamples = 2048;
+        private SerializedObject currentLSO;
+
         public void OnEnable()
         {
             m_ShowRealtimeLightsSettings = new SavedBool("LightingSettings.ShowRealtimeLightsSettings", false);
@@ -274,73 +284,78 @@ public void OnGUI(bool compact, bool drawAutoGenerate)
                 EditorGUILayout.Space();
             }
 
+            if (currentLSO == null || currentLSO != m_GIWorkflowMode.serializedObject)
+            {
+                currentLSO = m_GIWorkflowMode.serializedObject;
+                ClampMaxRanges();
+            }
+
             RealtimeLightingGUI(compact);
             MixedLightingGUI(compact);
             GeneralLightmapSettingsGUI(compact);
             InternalSettingsGUI(compact);
         }
 
-        public void UpdateSettings(SerializedObject lso)
+        public void UpdateSettings(SerializedObject lightingSettingsObject)
         {
-            if (lso != null)
-            {
-                m_GIWorkflowMode = lso.FindProperty("m_GIWorkflowMode");
-
-                //realtime GI
-                m_RealtimeResolution = lso.FindProperty("m_RealtimeResolution");
-                m_EnableRealtimeGI = lso.FindProperty("m_EnableRealtimeLightmaps");
-                m_RealtimeEnvironmentLighting = lso.FindProperty("m_RealtimeEnvironmentLighting");
-
-                //baked
-                m_EnabledBakedGI = lso.FindProperty("m_EnableBakedLightmaps");
-                m_BakeBackend = lso.FindProperty("m_BakeBackend");
-                m_MixedBakeMode = lso.FindProperty("m_MixedBakeMode");
-                m_AlbedoBoost = lso.FindProperty("m_AlbedoBoost");
-                m_IndirectOutputScale = lso.FindProperty("m_IndirectOutputScale");
-                m_LightmapMaxSize = lso.FindProperty("m_LightmapMaxSize");
-                m_LightmapParameters = lso.FindProperty("m_LightmapParameters");
-                m_LightmapDirectionalMode = lso.FindProperty("m_LightmapsBakeMode");
-                m_BakeResolution = lso.FindProperty("m_BakeResolution");
-                m_Padding = lso.FindProperty("m_Padding");
-                m_AmbientOcclusion = lso.FindProperty("m_AO");
-                m_AOMaxDistance = lso.FindProperty("m_AOMaxDistance");
-                m_CompAOExponent = lso.FindProperty("m_CompAOExponent");
-                m_CompAOExponentDirect = lso.FindProperty("m_CompAOExponentDirect");
-                m_LightmapCompression = lso.FindProperty("m_LightmapCompression");
-
-                // pvr
-                m_PVRSampleCount = lso.FindProperty("m_PVRSampleCount");
-                m_PVRDirectSampleCount = lso.FindProperty("m_PVRDirectSampleCount");
-                m_PVRBounces = lso.FindProperty("m_PVRBounces");
-                m_PVRCulling = lso.FindProperty("m_PVRCulling");
-                m_PVRFilteringMode = lso.FindProperty("m_PVRFilteringMode");
-                m_PVRFilterTypeDirect = lso.FindProperty("m_PVRFilterTypeDirect");
-                m_PVRFilterTypeIndirect = lso.FindProperty("m_PVRFilterTypeIndirect");
-                m_PVRFilterTypeAO = lso.FindProperty("m_PVRFilterTypeAO");
-                m_PVRDenoiserTypeDirect = lso.FindProperty("m_PVRDenoiserTypeDirect");
-                m_PVRDenoiserTypeIndirect = lso.FindProperty("m_PVRDenoiserTypeIndirect");
-                m_PVRDenoiserTypeAO = lso.FindProperty("m_PVRDenoiserTypeAO");
-                m_PVRFilteringGaussRadiusDirect = lso.FindProperty("m_PVRFilteringGaussRadiusDirect");
-                m_PVRFilteringGaussRadiusIndirect = lso.FindProperty("m_PVRFilteringGaussRadiusIndirect");
-                m_PVRFilteringGaussRadiusAO = lso.FindProperty("m_PVRFilteringGaussRadiusAO");
-                m_PVRFilteringAtrousPositionSigmaDirect = lso.FindProperty("m_PVRFilteringAtrousPositionSigmaDirect");
-                m_PVRFilteringAtrousPositionSigmaIndirect = lso.FindProperty("m_PVRFilteringAtrousPositionSigmaIndirect");
-                m_PVRFilteringAtrousPositionSigmaAO = lso.FindProperty("m_PVRFilteringAtrousPositionSigmaAO");
-                m_PVREnvironmentIS = lso.FindProperty("m_PVREnvironmentImportanceSampling");
-                m_PVREnvironmentSampleCount = lso.FindProperty("m_PVREnvironmentSampleCount");
-                m_LightProbeSampleCountMultiplier = lso.FindProperty("m_LightProbeSampleCountMultiplier");
-
-                //dev debug properties
-                m_ExportTrainingData = lso.FindProperty("m_ExportTrainingData");
-                m_TrainingDataDestination = lso.FindProperty("m_TrainingDataDestination");
-                m_ForceWhiteAlbedo = lso.FindProperty("m_ForceWhiteAlbedo");
-                m_ForceUpdates = lso.FindProperty("m_ForceUpdates");
-                m_FilterMode = lso.FindProperty("m_FilterMode");
-                m_BounceScale = lso.FindProperty("m_BounceScale");
-                m_TiledBaking = lso.FindProperty("m_PVRTiledBaking");
-                m_NumRaysToShootPerTexel = lso.FindProperty("m_NumRaysToShootPerTexel");
-                m_RespectSceneVisibilityWhenBakingGI = lso.FindProperty("m_RespectSceneVisibilityWhenBakingGI");
-            }
+            if (lightingSettingsObject == null)
+                return;
+            
+            m_GIWorkflowMode = lightingSettingsObject.FindProperty("m_GIWorkflowMode");
+
+            //realtime GI
+            m_RealtimeResolution = lightingSettingsObject.FindProperty("m_RealtimeResolution");
+            m_EnableRealtimeGI = lightingSettingsObject.FindProperty("m_EnableRealtimeLightmaps");
+            m_RealtimeEnvironmentLighting = lightingSettingsObject.FindProperty("m_RealtimeEnvironmentLighting");
+
+            //baked
+            m_EnabledBakedGI = lightingSettingsObject.FindProperty("m_EnableBakedLightmaps");
+            m_BakeBackend = lightingSettingsObject.FindProperty("m_BakeBackend");
+            m_MixedBakeMode = lightingSettingsObject.FindProperty("m_MixedBakeMode");
+            m_AlbedoBoost = lightingSettingsObject.FindProperty("m_AlbedoBoost");
+            m_IndirectOutputScale = lightingSettingsObject.FindProperty("m_IndirectOutputScale");
+            m_LightmapMaxSize = lightingSettingsObject.FindProperty("m_LightmapMaxSize");
+            m_LightmapSizeFixed = lightingSettingsObject.FindProperty("m_LightmapSizeFixed");
+            m_LightmapParameters = lightingSettingsObject.FindProperty("m_LightmapParameters");
+            m_LightmapDirectionalMode = lightingSettingsObject.FindProperty("m_LightmapsBakeMode");
+            m_BakeResolution = lightingSettingsObject.FindProperty("m_BakeResolution");
+            m_Padding = lightingSettingsObject.FindProperty("m_Padding");
+            m_AmbientOcclusion = lightingSettingsObject.FindProperty("m_AO");
+            m_AOMaxDistance = lightingSettingsObject.FindProperty("m_AOMaxDistance");
+            m_CompAOExponent = lightingSettingsObject.FindProperty("m_CompAOExponent");
+            m_CompAOExponentDirect = lightingSettingsObject.FindProperty("m_CompAOExponentDirect");
+            m_LightmapCompression = lightingSettingsObject.FindProperty("m_LightmapCompression");
+
+            // pvr
+            m_PVRSampleCount = lightingSettingsObject.FindProperty("m_PVRSampleCount");
+            m_PVRDirectSampleCount = lightingSettingsObject.FindProperty("m_PVRDirectSampleCount");
+            m_PVRBounces = lightingSettingsObject.FindProperty("m_PVRBounces");
+            m_PVRCulling = lightingSettingsObject.FindProperty("m_PVRCulling");
+            m_PVRFilteringMode = lightingSettingsObject.FindProperty("m_PVRFilteringMode");
+            m_PVRFilterTypeDirect = lightingSettingsObject.FindProperty("m_PVRFilterTypeDirect");
+            m_PVRFilterTypeIndirect = lightingSettingsObject.FindProperty("m_PVRFilterTypeIndirect");
+            m_PVRFilterTypeAO = lightingSettingsObject.FindProperty("m_PVRFilterTypeAO");
+            m_PVRDenoiserTypeDirect = lightingSettingsObject.FindProperty("m_PVRDenoiserTypeDirect");
+            m_PVRDenoiserTypeIndirect = lightingSettingsObject.FindProperty("m_PVRDenoiserTypeIndirect");
+            m_PVRDenoiserTypeAO = lightingSettingsObject.FindProperty("m_PVRDenoiserTypeAO");
+            m_PVRFilteringGaussRadiusDirect = lightingSettingsObject.FindProperty("m_PVRFilteringGaussRadiusDirect");
+            m_PVRFilteringGaussRadiusIndirect = lightingSettingsObject.FindProperty("m_PVRFilteringGaussRadiusIndirect");
+            m_PVRFilteringGaussRadiusAO = lightingSettingsObject.FindProperty("m_PVRFilteringGaussRadiusAO");
+            m_PVRFilteringAtrousPositionSigmaDirect = lightingSettingsObject.FindProperty("m_PVRFilteringAtrousPositionSigmaDirect");
+            m_PVRFilteringAtrousPositionSigmaIndirect = lightingSettingsObject.FindProperty("m_PVRFilteringAtrousPositionSigmaIndirect");
+            m_PVRFilteringAtrousPositionSigmaAO = lightingSettingsObject.FindProperty("m_PVRFilteringAtrousPositionSigmaAO");
+            m_PVREnvironmentIS = lightingSettingsObject.FindProperty("m_PVREnvironmentImportanceSampling");
+            m_PVREnvironmentSampleCount = lightingSettingsObject.FindProperty("m_PVREnvironmentSampleCount");
+            m_LightProbeSampleCountMultiplier = lightingSettingsObject.FindProperty("m_LightProbeSampleCountMultiplier");
+
+            //dev debug properties
+            m_ExportTrainingData = lightingSettingsObject.FindProperty("m_ExportTrainingData");
+            m_TrainingDataDestination = lightingSettingsObject.FindProperty("m_TrainingDataDestination");
+            m_ForceWhiteAlbedo = lightingSettingsObject.FindProperty("m_ForceWhiteAlbedo");
+            m_ForceUpdates = lightingSettingsObject.FindProperty("m_ForceUpdates");
+            m_FilterMode = lightingSettingsObject.FindProperty("m_FilterMode");
+            m_BounceScale = lightingSettingsObject.FindProperty("m_BounceScale");
+            m_RespectSceneVisibilityWhenBakingGI = lightingSettingsObject.FindProperty("m_RespectSceneVisibilityWhenBakingGI");
         }
 
         // Private methods
@@ -364,11 +379,6 @@ void RealtimeLightingGUI(bool compact)
 
                 EditorGUILayout.PropertyField(m_EnableRealtimeGI, Styles.useRealtimeGI);
 
-                if (m_EnableRealtimeGI.boolValue && PlayerHasSM20Support())
-                {
-                    EditorGUILayout.HelpBox(Styles.noRealtimeGIInSM2AndGLES2.text, MessageType.Warning);
-                }
-
                 EditorGUI.indentLevel++;
 
                 bool bakedGISupported = SupportedRenderingFeatures.IsLightmapBakeTypeSupported(LightmapBakeType.Baked);
@@ -507,21 +517,27 @@ void GeneralLightmapSettingsGUI(bool compact)
                         {
                             BakeBackendGUI();
 
-                            if (lightmapperSupported && !m_BakeBackend.hasMultipleDifferentValues)
+                            if (lightmapperSupported)
                             {
                                 EditorGUI.indentLevel++;
 
-                                EditorGUILayout.PropertyField(m_PVRCulling, Styles.culling);
+                                bool iterative = m_GIWorkflowMode.intValue == (int)Lightmapping.GIWorkflowMode.Iterative;
+                                if (iterative)
+                                {
+                                    EditorGUILayout.PropertyField(m_PVRCulling, Styles.culling);
+                                }
                                 EditorGUILayout.PropertyField(m_PVREnvironmentIS, Styles.environmentImportanceSampling);
 
-                                int sampleCount = EditorGUILayout.DelayedIntField(Styles.directSampleCount, m_PVRDirectSampleCount.intValue);
-                                m_PVRDirectSampleCount.intValue = sampleCount;
-                                sampleCount = EditorGUILayout.DelayedIntField(Styles.indirectSampleCount, m_PVRSampleCount.intValue);
-                                m_PVRSampleCount.intValue = sampleCount;
-                                sampleCount = EditorGUILayout.DelayedIntField(Styles.environmentSampleCount, m_PVREnvironmentSampleCount.intValue);
-                                m_PVREnvironmentSampleCount.intValue = sampleCount;
+                                MultiEditableLogarithmicIntSlider(m_PVRDirectSampleCount, Styles.directSampleCount, 1, maxDirectSamples, 1, 1 << 30);
+                                MultiEditableLogarithmicIntSlider(m_PVRSampleCount, Styles.indirectSampleCount, 1, maxIndirectSamples, 1, 1 << 30);
+                                MultiEditableLogarithmicIntSlider(m_PVREnvironmentSampleCount, Styles.environmentSampleCount, 1, maxEnvironmentSamples, 1, 1 << 30);
 
+                                maxDirectSamples = (int)Mathf.ClosestPowerOfTwo(Math.Max(maxDirectSamples, m_PVRDirectSampleCount.intValue));
+                                maxIndirectSamples = (int)Mathf.ClosestPowerOfTwo(Math.Max(maxIndirectSamples, m_PVRSampleCount.intValue));
+
+#pragma warning disable 618
                                 using (new EditorGUI.DisabledScope(EditorSettings.useLegacyProbeSampleCount))
+#pragma warning restore 618
                                 {
                                     EditorGUILayout.PropertyField(m_LightProbeSampleCountMultiplier, Styles.probeSampleCountMultiplier);
                                 }
@@ -628,6 +644,8 @@ void GeneralLightmapSettingsGUI(bool compact)
 
                             EditorGUILayout.IntPopup(m_LightmapMaxSize, Styles.lightmapMaxSizeStrings, Styles.lightmapMaxSizeValues, Styles.lightmapMaxSize);
 
+                            EditorGUILayout.PropertyField(m_LightmapSizeFixed, Styles.lightmapSizeFixed);
+
                             EditorGUILayout.IntPopup(m_LightmapCompression, Styles.lightmapCompressionStrings, Styles.lightmapCompressionValues, Styles.lightmapCompression);
 
                             EditorGUILayout.PropertyField(m_AmbientOcclusion, Styles.ambientOcclusion);
@@ -689,10 +707,13 @@ void InternalSettingsGUI(bool compact)
 
             if (m_ShowInternalSettings.value)
             {
+                bool enableRealtimeGI = (m_EnableRealtimeGI.boolValue && !m_EnableRealtimeGI.hasMultipleDifferentValues);
                 EditorGUI.indentLevel++;
-
-                EditorGUILayout.PropertyField(m_ForceWhiteAlbedo, Styles.forceWhiteAlbedo);
-                EditorGUILayout.PropertyField(m_ForceUpdates, Styles.forceUpdates);
+                if (enableRealtimeGI)
+                {
+                    EditorGUILayout.PropertyField(m_ForceWhiteAlbedo, Styles.forceWhiteAlbedo);
+                    EditorGUILayout.PropertyField(m_ForceUpdates, Styles.forceUpdates);
+                }
 
                 EditorGUILayout.PropertyField(m_ExportTrainingData, Styles.exportTrainingData);
 
@@ -704,10 +725,10 @@ void InternalSettingsGUI(bool compact)
                 }
 
                 EditorGUILayout.PropertyField(m_FilterMode, Styles.filterMode);
-                EditorGUILayout.Slider(m_BounceScale, 0.0f, 10.0f, Styles.bounceScale);
-                if (m_BakeBackend.intValue == (int)LightingSettings.Lightmapper.ProgressiveGPU)
-                    EditorGUILayout.IntPopup(m_TiledBaking, Styles.tiledBakingStrings, Styles.tiledBakingValues, Styles.tiledBaking);
-
+                if (enableRealtimeGI)
+                {
+                    EditorGUILayout.Slider(m_BounceScale, 0.0f, 10.0f, Styles.bounceScale);
+                }
                 EditorGUI.indentLevel--;
                 EditorGUILayout.Space();
             }
@@ -718,38 +739,17 @@ void InternalSettingsGUI(bool compact)
 
         // Helper methods
 
-        static bool PlayerHasSM20Support()
-        {
-            var apis = PlayerSettings.GetGraphicsAPIs(EditorUserBuildSettings.activeBuildTarget);
-            bool hasSM20Api = apis.Contains(UnityEngine.Rendering.GraphicsDeviceType.OpenGLES2);
-            return hasSM20Api;
-        }
-
         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;
-            }
+            DrawFieldWithPostfixLabel(
+                (Rect propertyRect) => { EditorGUI.PropertyField(propertyRect, property, label); },
+                postfixLabel,
+                EditorStyles.numberField,
+                minimumWidth,
+                postfixLabelWidth);
         }
 
         static void DrawFilterSettingField(SerializedProperty gaussSetting,
@@ -965,5 +965,31 @@ void DrawDenoiserTypeDropdown(SerializedProperty prop, GUIContent label, Denoise
             }
             EditorGUI.EndProperty();
         }
+
+        int MultiEditableLogarithmicIntSlider(SerializedProperty property, GUIContent style, int min, int max, int textFieldMin, int textFieldMax)
+        {
+            if (property.hasMultipleDifferentValues)
+            {
+                EditorGUI.BeginChangeCheck();
+                EditorGUI.showMixedValue = true;
+
+                int newValue = EditorGUILayout.LogarithmicIntSlider(style, property.intValue, min, max, 2, textFieldMin, textFieldMax);
+                if (EditorGUI.EndChangeCheck())
+                    property.intValue = newValue;
+                
+                EditorGUI.showMixedValue = false;
+            } 
+            else
+                property.intValue = EditorGUILayout.LogarithmicIntSlider(style, property.intValue, min, max, 2, textFieldMin, textFieldMax);
+
+            return property.intValue;
+        }
+
+        internal void ClampMaxRanges()
+        {
+            maxDirectSamples = Mathf.Max(m_PVRDirectSampleCount.intValue, 1024);
+            maxIndirectSamples = Mathf.Max(m_PVRSampleCount.intValue, 8192);
+            maxEnvironmentSamples = Mathf.Max(m_PVREnvironmentSampleCount.intValue, 2048);
+        }
     }
 }
diff --git a/Editor/Mono/Inspector/MaskFieldDropdown.cs b/Editor/Mono/Inspector/MaskFieldDropdown.cs
index 92abeb52f9..9806ae1361 100644
--- a/Editor/Mono/Inspector/MaskFieldDropdown.cs
+++ b/Editor/Mono/Inspector/MaskFieldDropdown.cs
@@ -21,8 +21,8 @@ internal class MaskFieldDropDown : PopupWindowContent
         SelectionModes[] m_SelectionMatch;
         string[] m_OptionNames;
         int[] m_flagValues;
-        uint[] m_OptionMaskValues;
-        uint[] m_SelectionMaskValues;
+        int[] m_OptionMaskValues;
+        int[] m_SelectionMaskValues;
 
          int m_AllLayersMask = 0;
 
@@ -46,15 +46,12 @@ public MaskFieldDropDown(string[] optionNames, int[] flagValues, int[] optionMas
             // these are not flag values, i.e. 1, 2, 4...
             // but the mask & flagValue[0..n] for each possible flag value
             // this is to ensure backwards compatibility with everything that uses MaskFieldGUI.GetSelectedValueForControl
-            m_OptionMaskValues = Array.ConvertAll(optionMaskValues, x=>(uint)x);
+            m_OptionMaskValues = (int[])optionMaskValues.Clone();
             m_OptionNames = (string[])optionNames.Clone();
 
             m_flagValues = new int[optionNames.Length];
-            if (flagValues == null || flagValues.Length == optionNames.Length - 2)
-            {
-                m_flagValues[0] = 0;
-                m_flagValues[1] = -1;
-            }
+            m_flagValues[0] = 0;
+            m_flagValues[1] = -1;
 
             if (flagValues == null)
             {
@@ -63,11 +60,23 @@ public MaskFieldDropDown(string[] optionNames, int[] flagValues, int[] optionMas
             }
             else
             {
-                Array.Copy(flagValues, 0, m_flagValues, optionNames.Length - flagValues.Length, flagValues.Length);
+                int index = 0;
+                int length = flagValues.Length;
+
+                if (flagValues[0] == 0)
+                {
+                    index = 1;
+                    length--;
+                }
+
+                if (flagValues[flagValues.Length - 1] == ~0)
+                    length--;
+
+                Array.Copy(flagValues, index, m_flagValues, 2, length);
             }
 
             m_SelectionMatch = new SelectionModes[] { SelectionModes.All };
-            m_SelectionMaskValues = new uint[] { (uint)mask };
+            m_SelectionMaskValues = new int[] { mask };
 
             m_SingleSelection = true;
             m_MaskChangeCallback = maskChangeCallback;
@@ -78,6 +87,12 @@ public MaskFieldDropDown(string[] optionNames, int[] flagValues, int[] optionMas
                     m_AllLayersMask |= val;
         }
 
+        public void UpdateMaskValues(int mask, int[] optionMaskValues)
+        {
+            m_OptionMaskValues = (int[])optionMaskValues.Clone();
+            m_SelectionMaskValues = new int[] { mask };
+        }
+
         public override Vector2 GetWindowSize()
         {
             var rowCount = m_OptionNames[0] == "Nothing" ? m_OptionNames.Length : m_OptionNames.Length + 2;
@@ -116,9 +131,10 @@ void DrawGUIForArrays()
             for (int i = 0; i < m_OptionNames.Length; i++)
             {
                 bool toggleVal = (m_SelectionMaskValues[0] & m_OptionMaskValues[i]) == m_OptionMaskValues[i];
-                if (m_SelectionMaskValues[0] != 0 && i == 0)
+                if ((m_SelectionMaskValues[0] != 0 && i == 0) || m_SelectionMaskValues[0] != -1 && i == 1)
                     toggleVal = false;
-                if ((m_SelectionMaskValues[0] == int.MaxValue || m_SelectionMaskValues[0] == m_AllLayersMask) && i == 1)
+
+               if((m_SelectionMaskValues[0] == m_AllLayersMask) && i == 1)
                     toggleVal = true;
 
                 var guiRect = EditorGUILayout.GetControlRect(false, EditorGUI.kSingleLineHeight);
@@ -132,7 +148,7 @@ void DrawGUIForArrays()
                 {
                     m_SelectionMaskValues[0] = m_OptionMaskValues[i];
                     var oldMaskValues = (uint[])m_OptionMaskValues.Clone();
-                    RecalculateMasks();
+                    MaskFieldGUI.CalculateMaskValues(m_SelectionMaskValues[0], m_flagValues, ref m_OptionMaskValues);
 
                     // If all flag options are selected the mask becomes everythingValue to be consistent with the "Everything" option
                     if (oldMaskValues[i] == (uint)m_AllLayersMask)
@@ -143,14 +159,6 @@ void DrawGUIForArrays()
             }
         }
 
-        void RecalculateMasks()
-        {
-            uint selectedValue = m_SelectionMaskValues[0] == ~0u ? (uint)m_AllLayersMask : m_SelectionMaskValues[0];
-
-            for (var flagIndex = 2; flagIndex < m_flagValues.Length; flagIndex++)
-                m_OptionMaskValues[flagIndex] = selectedValue ^ (uint)m_flagValues[flagIndex];
-        }
-
         public override void OnGUI(Rect rect)
         {
             if (Event.current.type == EventType.MouseMove)
@@ -172,14 +180,14 @@ public override void OnGUI(Rect rect)
                 return;
 
             var isNothing = m_SerializedProperty.intValue == 0;
-            var isEverything = m_SerializedProperty.intValue == int.MaxValue;
+            var isEverything = m_SerializedProperty.intValue == -1;
 
             GUILayout.Space(2);
 
             var toggleStyle = m_SerializedProperty.hasMultipleDifferentValues && isNothing ? Styles.menuItemMixed : Styles.menuItem;
             DrawEverythingOrNothingSelectedToggle(isNothing, "Nothing", toggleStyle, 0);
             toggleStyle = m_SerializedProperty.hasMultipleDifferentValues && isEverything ? Styles.menuItemMixed : Styles.menuItem;
-            DrawEverythingOrNothingSelectedToggle(isEverything, "Everything", toggleStyle, int.MaxValue);
+            DrawEverythingOrNothingSelectedToggle(isEverything, "Everything", toggleStyle, -1);
 
             for (int i = 0; i < m_OptionNames.Length; i++)
             {
@@ -206,7 +214,7 @@ void ChangeMaskValues(int maskIndex, bool add)
         {
             var selectionCount = m_SerializedProperty.serializedObject.targetObjects.Length;
 
-            m_SelectionMaskValues = new uint[selectionCount];
+            m_SelectionMaskValues = new int[selectionCount];
             for (int i = 0; i < selectionCount; i++)
             {
                 var serializedObject = new SerializedObject(m_SerializedProperty.serializedObject.targetObjects[i]);
@@ -232,9 +240,9 @@ void ChangeMaskValues(int maskIndex, bool add)
                 }
 
                 if (property.intValue == m_AllLayersMask)
-                    property.intValue = int.MaxValue;
+                    property.intValue = -1;
 
-                m_SelectionMaskValues[i] = (uint)property.intValue;
+                m_SelectionMaskValues[i] = property.intValue;
                 serializedObject.ApplyModifiedProperties();
             }
 
@@ -248,11 +256,10 @@ public override void OnOpen()
             {
                 m_SelectionMatch = new SelectionModes[m_LayerCount];
                 GetMultiSelectionValues(m_SerializedProperty, out m_SelectionMaskValues, out m_SelectionMatch, m_LayerCount);
-                int[] definedLayers = new int[m_SelectionMaskValues.Length];
-                TagManager.GetDefinedLayers(ref m_OptionNames, ref definedLayers);
-                m_OptionMaskValues = definedLayers.Select(v => (uint)v).ToArray();
+                m_OptionMaskValues = new int[m_SelectionMaskValues.Length];
+                TagManager.GetDefinedLayers(ref m_OptionNames, ref m_OptionMaskValues);
                 for (int i = 0; i < m_OptionMaskValues.Length; i++)
-                    m_AllLayersMask |= (int)m_OptionMaskValues[i];
+                    m_AllLayersMask |= m_OptionMaskValues[i];
             }
 
             for (int i = 0; i < m_OptionNames.Length; i++)
@@ -286,7 +293,7 @@ internal class StaticFieldDropdown : PopupWindowContent
 
         SelectionModes[] m_SelectionMatch;
         string[] m_OptionNames;
-        uint[] m_SelectionMaskValues;
+        int[] m_SelectionMaskValues;
         int m_OptionCount;
         int m_AllLayersMask;
         List<int> m_FunctioningOptions = new List<int>();
@@ -365,12 +372,12 @@ public override void OnGUI(Rect rect)
         void ChangeMaskValues(int maskIndex, bool add)
         {
             var selectionCount = m_SerializedProperty.serializedObject.targetObjects.Length;
-            m_SelectionMaskValues = new uint[selectionCount];
+            m_SelectionMaskValues = new int[selectionCount];
 
             SceneModeUtility.SetStaticFlags(m_SerializedProperty.serializedObject.targetObjects, maskIndex, add);
 
             for (int i = 0; i < selectionCount; i++)
-                m_SelectionMaskValues[i] = (uint)m_SerializedProperty.intValue;
+                m_SelectionMaskValues[i] = m_SerializedProperty.intValue;
 
             m_SerializedProperty.serializedObject.ApplyModifiedProperties();
             m_SerializedProperty.serializedObject.SetIsDifferentCacheDirty();
@@ -490,32 +497,32 @@ internal static void GetSingleSelectionValues(int maskValue, out SelectionModes[
             }
         }
 
-        internal static void GetMultiSelectionValues(SerializedProperty serializedProperty, out uint[] selectionMaskValues, out SelectionModes[] selectionMatch, int layerCount)
+        internal static void GetMultiSelectionValues(SerializedProperty serializedProperty, out int[] selectionMaskValues, out SelectionModes[] selectionMatch, int layerCount)
         {
             var selectionCount = serializedProperty.serializedObject.targetObjects.Length;
-            selectionMaskValues = new uint[selectionCount];
+            selectionMaskValues = new int[selectionCount];
             selectionMatch = new SelectionModes[layerCount];
 
             for (int i = 0; i < selectionCount; i++)
             {
                 var serializedObject = new SerializedObject(serializedProperty.serializedObject.targetObjects[i]);
                 var property = serializedObject.FindProperty(serializedProperty.propertyPath);
-                selectionMaskValues[i] = (uint)property.intValue;
+                selectionMaskValues[i] = property.intValue;
             }
 
             if (selectionCount == 1)
             {
-                GetSingleSelectionValues((int)selectionMaskValues[0], out selectionMatch, layerCount);
+                GetSingleSelectionValues(selectionMaskValues[0], out selectionMatch, layerCount);
                 return;
             }
 
             uint[] firstSelected;
-            GetSelected((int)selectionMaskValues[0], out firstSelected, layerCount);
+            GetSelected(selectionMaskValues[0], out firstSelected, layerCount);
 
             for (int i = 1; i < selectionCount; i++)
             {
                 uint[] secondSelected;
-                GetSelected((int)selectionMaskValues[i], out secondSelected, layerCount);
+                GetSelected(selectionMaskValues[i], out secondSelected, layerCount);
 
                 for (int j = 0; j < layerCount; j++)
                 {
diff --git a/Editor/Mono/Inspector/MaterialEditor.cs b/Editor/Mono/Inspector/MaterialEditor.cs
index 3c5f7b4ea6..43056cd1b9 100644
--- a/Editor/Mono/Inspector/MaterialEditor.cs
+++ b/Editor/Mono/Inspector/MaterialEditor.cs
@@ -1385,17 +1385,27 @@ internal static Color ColorPropertyInternal(Rect position, MaterialProperty prop
         }
 
         public Vector4 VectorProperty(MaterialProperty prop, string label)
+        {
+            return VectorProperty(prop, new GUIContent(label));
+        }
+        
+        public Vector4 VectorProperty(MaterialProperty prop, GUIContent label)
         {
             Rect r = GetPropertyRect(prop, label, true);
             return VectorProperty(r, prop, label);
         }
-
+        
         public Vector4 VectorProperty(Rect position, MaterialProperty prop, string label)
+        {
+            return VectorPropertyInternal(position, prop, new GUIContent(label));
+        }
+        
+        public Vector4 VectorProperty(Rect position, MaterialProperty prop, GUIContent label)
         {
             return VectorPropertyInternal(position, prop, label);
         }
 
-        internal static Vector4 VectorPropertyInternal(in Rect position, in MaterialProperty prop, in string label)
+        internal static Vector4 VectorPropertyInternal(in Rect position, in MaterialProperty prop, in GUIContent label)
         {
             BeginProperty(position, prop);
 
@@ -1563,6 +1573,11 @@ public Rect GetTexturePropertyCustomArea(Rect position)
         }
 
         public Texture TextureProperty(Rect position, MaterialProperty prop, string label)
+        {
+            return TextureProperty(position, prop, new GUIContent(label, string.Empty));
+        }
+        
+        public Texture TextureProperty(Rect position, MaterialProperty prop, GUIContent label)
         {
             bool scaleOffset = ((prop.flags & MaterialProperty.PropFlags.NoScaleOffset) == 0);
             return TextureProperty(position, prop, label, scaleOffset);
@@ -1572,14 +1587,19 @@ public Texture TextureProperty(Rect position, MaterialProperty prop, string labe
         {
             return TextureProperty(position, prop, label, string.Empty, scaleOffset);
         }
-
+        
         public Texture TextureProperty(Rect position, MaterialProperty prop, string label, string tooltip, bool scaleOffset)
+        {
+            return TextureProperty(position, prop, new GUIContent(label, tooltip), scaleOffset);
+        }
+
+        public Texture TextureProperty(Rect position, MaterialProperty prop, GUIContent label, 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));
+            EditorGUI.PrefixLabel(position, label);
 
             // Texture slot
             position.height = GetTextureFieldHeight();
@@ -2030,10 +2050,10 @@ internal void DefaultShaderPropertyInternal(Rect position, MaterialProperty prop
                     ColorPropertyInternal(position, prop, label);
                     break;
                 case MaterialProperty.PropType.Texture: // textures
-                    TextureProperty(position, prop, label.text);
+                    TextureProperty(position, prop, label);
                     break;
                 case MaterialProperty.PropType.Vector: // vectors
-                    VectorProperty(position, prop, label.text);
+                    VectorProperty(position, prop, label);
                     break;
                 default:
                     GUI.Label(position, "Unknown property type: " + prop.name + ": " + (int)prop.type);
@@ -2535,12 +2555,12 @@ private bool DoReflectionProbePicker(out Rect buttonRect)
 
         public void DefaultPreviewSettingsGUI()
         {
-            if (!ShaderUtil.hardwareSupportsRectRenderTexture)
+            var mat = target as Material;
+            if (!SupportsRenderingPreview(mat))
                 return;
 
             Init();
 
-            var mat = target as Material;
             var viewType = GetPreviewType(mat);
             if (targets.Length > 1 || viewType == PreviewType.Mesh)
             {
@@ -2561,12 +2581,12 @@ public void DefaultPreviewSettingsGUI()
 
         public sealed override Texture2D RenderStaticPreview(string assetPath, Object[] subAssets, int width, int height)
         {
-            if (!ShaderUtil.hardwareSupportsRectRenderTexture)
+            var mat = target as Material;
+            if (!SupportsRenderingPreview(mat))
                 return null;
 
             Init();
 
-
             var previewRenderUtility = GetPreviewRendererUtility();
             EditorUtility.SetCameraAnimateMaterials(previewRenderUtility.camera, true);
 
@@ -2743,9 +2763,25 @@ public override void OnPreviewGUI(Rect r, GUIStyle background)
                 DefaultPreviewGUI(r, background);
         }
 
-        public void DefaultPreviewGUI(Rect r, GUIStyle background)
+        private static bool SupportsRenderingPreview(Material material)
         {
             if (!ShaderUtil.hardwareSupportsRectRenderTexture)
+                return false;
+
+            if (material == null)
+                return false;
+
+            var assetPath = AssetDatabase.GetAssetPath(material);
+            if (assetPath.EndsWith(".vfx", StringComparison.InvariantCultureIgnoreCase))
+                return false;
+
+            return true;
+        }
+
+        public void DefaultPreviewGUI(Rect r, GUIStyle background)
+        {
+            var mat = target as Material;
+            if (!SupportsRenderingPreview(mat))
             {
                 if (Event.current.type == EventType.Repaint)
                     EditorGUI.DropShadowLabel(new Rect(r.x, r.y, r.width, 40), "Material preview \nnot available");
@@ -2754,7 +2790,6 @@ public void DefaultPreviewGUI(Rect r, GUIStyle background)
 
             Init();
 
-            var mat = target as Material;
             var viewType = GetPreviewType(mat);
 
             if (DoesPreviewAllowRotation(viewType))
@@ -2903,6 +2938,7 @@ internal void HandleSkybox(GameObject go, Event evt)
                 evt.Use();
             }
             else
+            {
                 switch (evt.type)
                 {
                     case EventType.DragUpdated:
@@ -2915,14 +2951,13 @@ internal void HandleSkybox(GameObject go, Event evt)
                         applyAndConsumeEvent = true;
                         break;
                 }
+            }
 
             if (applyAndConsumeEvent)
             {
-                if (s_OriginalMaterial == null)
-                {
-                    Undo.RecordObject(FindObjectOfType<RenderSettings>(), Styles.undoAssignSkyboxMaterial);
-                    s_OriginalMaterial = RenderSettings.skybox;
-                }
+                Undo.RecordObject(RenderSettings.GetRenderSettings(), Styles.undoAssignSkyboxMaterial);
+                if (s_OriginalMaterial == null) s_OriginalMaterial = RenderSettings.skybox;
+
                 RenderSettings.skybox = target as Material;
                 if (evt.type == EventType.DragPerform) s_OriginalMaterial = null;
 
@@ -3045,6 +3080,7 @@ internal static void AddAdditionalMaterialMenuItems(GenericMenu menu)
             menu.AddItem(new GUIContent("Create Variant for Renderer"), false, () => {
 
                 var directory = "Assets/Materials";
+                Directory.CreateDirectory(directory);
                 var assetPath = AssetDatabase.GetAssetPath(material);
                 var assetName = Path.GetFileNameWithoutExtension(assetPath) + " Variant";
                 var package = PackageManager.PackageInfo.FindForAssetPath(assetPath);
@@ -3053,7 +3089,6 @@ internal static void AddAdditionalMaterialMenuItems(GenericMenu menu)
 
                 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)
diff --git a/Editor/Mono/Inspector/MaterialPropertyDrawer.cs b/Editor/Mono/Inspector/MaterialPropertyDrawer.cs
index e0d336a28e..b2e8c8f3dc 100644
--- a/Editor/Mono/Inspector/MaterialPropertyDrawer.cs
+++ b/Editor/Mono/Inspector/MaterialPropertyDrawer.cs
@@ -84,7 +84,7 @@ internal static void InvalidatePropertyCache(Shader shader)
             var toDelete = new List<string>();
             foreach (string key in s_PropertyHandlers.Keys)
             {
-                if (key.StartsWith(keyStart))
+                if (key.StartsWith(keyStart, StringComparison.Ordinal))
                     toDelete.Add(key);
             }
             foreach (string key in toDelete)
diff --git a/Editor/Mono/Inspector/MeshRendererEditor.cs b/Editor/Mono/Inspector/MeshRendererEditor.cs
index bbbdd77f84..a9af8cea0d 100644
--- a/Editor/Mono/Inspector/MeshRendererEditor.cs
+++ b/Editor/Mono/Inspector/MeshRendererEditor.cs
@@ -5,6 +5,7 @@
 using UnityEngine;
 using System.Linq;
 using UnityEngine.Rendering;
+using System.Collections.Generic;
 
 namespace UnityEditor
 {
@@ -47,7 +48,6 @@ private void LightingDataUpdatedRepaint()
                 Repaint();
             }
         }
-
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
@@ -61,7 +61,11 @@ public override void OnInspectorGUI()
                 displayMaterialWarning = mf != null && mf.sharedMesh != null && m_Materials.arraySize > mf.sharedMesh.subMeshCount;
             }
 
-            using (new EditorGUI.DisabledScope(((MeshRenderer)serializedObject.targetObject).GetComponent<Tree>() != null))
+            // Disable Materials menu for the legacy Tree objects, see Fogbugz case: 1283092
+            Tree treeComponent = ((MeshRenderer)serializedObject.targetObject).GetComponent<Tree>();
+            bool hasTreeComponent = treeComponent != null;
+            bool isSpeedTree = hasTreeComponent && treeComponent.data == null; // SpeedTrees always have the Tree component, but have null 'data' property
+            using (new EditorGUI.DisabledScope(hasTreeComponent && !isSpeedTree))
             {
                 DrawMaterials();
             }
diff --git a/Editor/Mono/Inspector/MinMaxCurvePropertyDrawer.cs b/Editor/Mono/Inspector/MinMaxCurvePropertyDrawer.cs
index be443ca486..f28402c69e 100644
--- a/Editor/Mono/Inspector/MinMaxCurvePropertyDrawer.cs
+++ b/Editor/Mono/Inspector/MinMaxCurvePropertyDrawer.cs
@@ -262,7 +262,7 @@ PropertyField PrepareProperty(SerializedProperty prop, string label, VisualEleme
 
             var region = new IMGUIContainer(() =>
             {
-                var label = new GUIContent(property.name);
+                var label = new GUIContent(preferredLabel);
                 var rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight);
                 EditorGUI.LabelField(rect, label);
                 rect = EditorGUI.PrefixLabel(rect, label);
@@ -296,7 +296,7 @@ PropertyField PrepareProperty(SerializedProperty prop, string label, VisualEleme
                     if (state == MinMaxCurveState.k_Scalar)
                     {
                         label.ResetPositionProperties();
-                        label.text = property.name;
+                        label.text = preferredLabel;
                     }
                     else
                     {
diff --git a/Editor/Mono/Inspector/MinMaxGradientPropertyDrawer.cs b/Editor/Mono/Inspector/MinMaxGradientPropertyDrawer.cs
index 91f46dade6..a1512e55e8 100644
--- a/Editor/Mono/Inspector/MinMaxGradientPropertyDrawer.cs
+++ b/Editor/Mono/Inspector/MinMaxGradientPropertyDrawer.cs
@@ -135,7 +135,9 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
         {
             Init(property);
 
-            return new MinMaxGradientField(m_Property, property.localizedDisplayName);
+            var field = new MinMaxGradientField(m_Property, preferredLabel);
+            PropertyField.ConfigureFieldStyles<MinMaxGradientField, ParticleSystem.MinMaxGradient>(field);
+            return field;
         }
     }
 }
diff --git a/Editor/Mono/Inspector/MonoScriptInspector.cs b/Editor/Mono/Inspector/MonoScriptInspector.cs
index 557cde58be..d3709e92ac 100644
--- a/Editor/Mono/Inspector/MonoScriptInspector.cs
+++ b/Editor/Mono/Inspector/MonoScriptInspector.cs
@@ -223,7 +223,8 @@ public override void OnInspectorGUI()
                 rect.x = 0;
                 rect.y -= 3;
                 rect.width = GUIClip.visibleRect.width + 1;
-                GUI.Box(rect, m_CachedPreview, m_TextStyle);
+                GUI.Box(rect, "");
+                EditorGUI.SelectableLabel(rect, m_CachedPreview.text, m_TextStyle);
             }
             GUI.enabled = enabledTemp;
         }
diff --git a/Editor/Mono/Inspector/NotSupportedOnRenderPipelineInspector.cs b/Editor/Mono/Inspector/NotSupportedOnRenderPipelineInspector.cs
index 27bce1200f..6426e2f3cb 100644
--- a/Editor/Mono/Inspector/NotSupportedOnRenderPipelineInspector.cs
+++ b/Editor/Mono/Inspector/NotSupportedOnRenderPipelineInspector.cs
@@ -12,5 +12,10 @@ public override VisualElement CreateInspectorGUI()
         {
             return new HelpBox("This component is not supported on the currently active render pipeline.", HelpBoxMessageType.Warning);
         }
+
+        public override void OnInspectorGUI()
+        {
+            EditorGUILayout.HelpBox("This component is not supported on the currently active render pipeline.", MessageType.Warning);
+        }
     }
 }
diff --git a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs
index fe04dd224a..62215268f6 100644
--- a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs
+++ b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs
@@ -50,9 +50,6 @@ 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 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.");
@@ -96,6 +93,7 @@ class SettingsContent
             public static readonly GUIContent platformShaderChunkCount = EditorGUIUtility.TrTextContent("Chunk count", "Use this setting to control how much memory is used when loading shader variants.");
 
             public static readonly GUIContent bakeCollisionMeshes = EditorGUIUtility.TrTextContent("Prebake Collision Meshes*", "Bake collision data into the meshes on build time");
+            public static readonly GUIContent dedicatedServerOptimizations = EditorGUIUtility.TrTextContent("Enable Dedicated Server optimizations", "Performs additional optimizations on Dedicated Server builds.");
             public static readonly GUIContent keepLoadedShadersAlive = EditorGUIUtility.TrTextContent("Keep Loaded Shaders Alive*", "Prevents shaders from being unloaded");
             public static readonly GUIContent preloadedAssets = EditorGUIUtility.TrTextContent("Preloaded Assets*", "Assets to load at start up in the player and kept alive until the player terminates");
             public static readonly GUIContent stripEngineCode = EditorGUIUtility.TrTextContent("Strip Engine Code*", "Strip Unused Engine Code - Note that byte code stripping of managed assemblies is always enabled for the IL2CPP scripting backend.");
@@ -146,6 +144,7 @@ class SettingsContent
             public static readonly GUIContent logObjCUncaughtExceptions = EditorGUIUtility.TrTextContent("Log Obj-C Uncaught Exceptions*");
             public static readonly GUIContent enableCrashReportAPI = EditorGUIUtility.TrTextContent("Enable CrashReport API*");
             public static readonly GUIContent activeColorSpace = EditorGUIUtility.TrTextContent("Color Space*");
+            public static readonly GUIContent unsupportedMSAAFallback = EditorGUIUtility.TrTextContent("MSAA Fallback");
             public static readonly GUIContent colorGamut = EditorGUIUtility.TrTextContent("Color Gamut*");
             public static readonly GUIContent colorGamutForMac = EditorGUIUtility.TrTextContent("Color Gamut For Mac*");
             public static readonly GUIContent metalForceHardShadows = EditorGUIUtility.TrTextContent("Force hard shadows on Metal*");
@@ -189,12 +188,13 @@ class SettingsContent
                 EditorGUIUtility.TrTextContent("Always allowed"),
             };
             public static readonly GUIContent iOSURLSchemes = EditorGUIUtility.TrTextContent("Supported URL schemes*");
-            public static readonly GUIContent iOSExternalAudioInputNotSupported = EditorGUIUtility.TrTextContent("Audio input from Bluetooth microphones is not supported when Mute Other Audio Sources is off.");
+            public static readonly GUIContent iOSExternalAudioInputNotSupported = EditorGUIUtility.TrTextContent("Audio input from Bluetooth microphones is not supported when Mute Other Audio Sources and Prepare iOS for Recording are both off.");
             public static readonly GUIContent aotOptions = EditorGUIUtility.TrTextContent("AOT Compilation Options*");
             public static readonly GUIContent require31 = EditorGUIUtility.TrTextContent("Require ES3.1");
             public static readonly GUIContent requireAEP = EditorGUIUtility.TrTextContent("Require ES3.1+AEP");
             public static readonly GUIContent require32 = EditorGUIUtility.TrTextContent("Require ES3.2");
             public static readonly GUIContent skinOnGPU = EditorGUIUtility.TrTextContent("GPU Skinning*", "Calculate mesh skinning and blend shapes on the GPU via shaders");
+            public static readonly GUIContent[] meshDeformations = { EditorGUIUtility.TrTextContent("CPU"), EditorGUIUtility.TrTextContent("GPU"), EditorGUIUtility.TrTextContent("GPU (Batched)") };
             public static readonly GUIContent scriptingDefineSymbols = EditorGUIUtility.TrTextContent("Scripting Define Symbols", "Preprocessor defines passed to the C# script compiler.");
             public static readonly GUIContent additionalCompilerArguments = EditorGUIUtility.TrTextContent("Additional Compiler Arguments", "Additional arguments passed to the C# script compiler.");
             public static readonly GUIContent scriptingDefineSymbolsApply = EditorGUIUtility.TrTextContent("Apply");
@@ -205,7 +205,8 @@ class SettingsContent
             public static readonly GUIContent managedStrippingLevel = EditorGUIUtility.TrTextContent("Managed Stripping Level", "If scripting backend is IL2CPP, managed stripping can't be disabled.");
             public static readonly GUIContent il2cppCompilerConfiguration = EditorGUIUtility.TrTextContent("C++ Compiler Configuration");
             public static readonly GUIContent il2cppCodeGeneration = EditorGUIUtility.TrTextContent("IL2CPP Code Generation", "Determines whether IL2CPP should generate code optimized for runtime performance or build size/iteration.");
-            public static readonly GUIContent[] il2cppCodeGenerationNames = new GUIContent[] { EditorGUIUtility.TrTextContent("Faster runtime"), EditorGUIUtility.TrTextContent("Faster (smaller) builds") };
+            public static readonly GUIContent[] il2cppCodeGenerationNames =  new GUIContent[] { EditorGUIUtility.TrTextContent("Faster runtime"), EditorGUIUtility.TrTextContent("Faster (smaller) builds") };
+            public static readonly GUIContent il2cppStacktraceInformation = EditorGUIUtility.TrTextContent("IL2CPP Stacktrace Information", "Which information to include in stack traces. Including the file name and line number may increase build size.");
             public static readonly GUIContent scriptingMono2x = EditorGUIUtility.TrTextContent("Mono");
             public static readonly GUIContent scriptingIL2CPP = EditorGUIUtility.TrTextContent("IL2CPP");
             public static readonly GUIContent scriptingCoreCLR = EditorGUIUtility.TrTextContent("CoreCLR");
@@ -239,8 +240,6 @@ class SettingsContent
             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 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 (Experimental)*", "Enable Virtual Texturing. This feature is experimental and not ready for production use. 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.");
@@ -255,29 +254,34 @@ class SettingsContent
             public static readonly GUIContent notApplicableInfo = EditorGUIUtility.TrTextContent("Not applicable for this platform.");
             public static readonly GUIContent loadStoreDebugModeCheckbox = EditorGUIUtility.TrTextContent("Load/Store Action Debug Mode", "Initializes Framebuffer such that errors in the load/store actions will be visually apparent. (Removed in Release Builds)");
             public static readonly GUIContent loadStoreDebugModeEditorOnlyCheckbox = EditorGUIUtility.TrTextContent("Editor Only", "Load/Store Action Debug Mode will only affect the Editor");
-
-            public static string undoChangedBatchingString { get { return LocalizationDatabase.GetLocalizedString("Changed Batching Settings"); } }
-            public static string undoChangedGraphicsAPIString { get { return LocalizationDatabase.GetLocalizedString("Changed Graphics API Settings"); } }
-            public static string undoChangedScriptingDefineString { get { return LocalizationDatabase.GetLocalizedString("Changed Scripting Define Settings"); } }
-            public static string undoChangedGraphicsJobsString { get { return LocalizationDatabase.GetLocalizedString("Changed Graphics Jobs Setting"); } }
-            public static string undoChangedGraphicsJobModeString { get { return LocalizationDatabase.GetLocalizedString("Changed Graphics Job Mode Setting"); } }
-            public static string changeColorSpaceString { get { return LocalizationDatabase.GetLocalizedString("Changing the color space may take a significant amount of time."); } }
-            public static string undoChangedPlatformShaderChunkSizeString { get { return LocalizationDatabase.GetLocalizedString("Changed Shader Chunk Size Platform Setting"); } }
-            public static string undoChangedPlatformShaderChunkCountString { get { return LocalizationDatabase.GetLocalizedString("Changed Shader Chunk Count Platform Setting"); } }
-            public static string undoChangedDefaultShaderChunkSizeString { get { return LocalizationDatabase.GetLocalizedString("Changed Shader Chunk Size Default Setting"); } }
-            public static string undoChangedDefaultShaderChunkCountString { get { return LocalizationDatabase.GetLocalizedString("Changed Shader Chunk Count Default Setting"); } }
+            public static readonly GUIContent allowHDRDisplay = EditorGUIUtility.TrTextContent("Allow HDR Display Output*", "Enable the use of HDR displays and include all the resources required for them to function correctly.");
+            public static readonly GUIContent useHDRDisplay = EditorGUIUtility.TrTextContent("Use HDR Display Output*", "Checks if the main display supports HDR and if it does, switches to HDR output at the start of the application.");
+            public static readonly GUIContent hdrOutputRequireHDRRenderingWarning = EditorGUIUtility.TrTextContent("The active Render Pipeline does not have HDR enabled. Enable HDR in the Render Pipeline Asset to see the changes.");
+
+            public static readonly string undoChangedBatchingString                 = L10n.Tr("Changed Batching Settings");
+            public static readonly string undoChangedGraphicsAPIString              = L10n.Tr("Changed Graphics API Settings");
+            public static readonly string undoChangedScriptingDefineString          = L10n.Tr("Changed Scripting Define Settings");
+            public static readonly string undoChangedGraphicsJobsString             = L10n.Tr("Changed Graphics Jobs Setting");
+            public static readonly string undoChangedGraphicsJobModeString          = L10n.Tr("Changed Graphics Job Mode Setting");
+            public static readonly string changeColorSpaceString                    = L10n.Tr("Changing the color space may take a significant amount of time.");
+            public static readonly string undoChangedPlatformShaderChunkSizeString  = L10n.Tr("Changed Shader Chunk Size Platform Setting");
+            public static readonly string undoChangedPlatformShaderChunkCountString = L10n.Tr("Changed Shader Chunk Count Platform Setting");
+            public static readonly string undoChangedDefaultShaderChunkSizeString   = L10n.Tr("Changed Shader Chunk Size Default Setting");
+            public static readonly string undoChangedDefaultShaderChunkCountString  = L10n.Tr("Changed Shader Chunk Count Default Setting");
         }
 
         class RecompileReason
         {
-            public static readonly string scriptingDefineSymbolsModified = "Scripting define symbols setting modified";
-            public static readonly string suppressCommonWarningsModified = "Suppress common warnings setting modified";
-            public static readonly string allowUnsafeCodeModified = "Allow 'unsafe' code setting modified";
-            public static readonly string apiCompatibilityLevelModified = "API Compatibility level modified";
-            public static readonly string editorAssembliesCompatibilityLevelModified = "Editor Assemblies Compatibility level modified";
-            public static readonly string useDeterministicCompilationModified = "Use deterministic compilation modified";
-            public static readonly string additionalCompilerArgumentsModified = "Additional compiler arguments modified";
-            public static readonly string activeBuildTargetGroupModified = "Active build target group modified";
+            public static readonly string scriptingDefineSymbolsModified             = L10n.Tr("Scripting define symbols setting modified");
+            public static readonly string suppressCommonWarningsModified             = L10n.Tr("Suppress common warnings setting modified");
+            public static readonly string allowUnsafeCodeModified                    = L10n.Tr("Allow 'unsafe' code setting modified");
+            public static readonly string apiCompatibilityLevelModified              = L10n.Tr("API Compatibility level modified");
+            public static readonly string editorAssembliesCompatibilityLevelModified = L10n.Tr("Editor Assemblies Compatibility level modified");
+            public static readonly string useDeterministicCompilationModified        = L10n.Tr("Use deterministic compilation modified");
+            public static readonly string additionalCompilerArgumentsModified        = L10n.Tr("Additional compiler arguments modified");
+            public static readonly string activeBuildTargetGroupModified             = L10n.Tr("Active build target group modified");
+
+            public static readonly string presetChanged = L10n.Tr("Preset changed");
         }
 
         PlayerSettingsSplashScreenEditor m_SplashScreenEditor;
@@ -302,8 +306,9 @@ PlayerSettingsIconsEditor iconsEditor
             }
         }
 
-        private static GraphicsJobMode[] m_GfxJobModeValues = new GraphicsJobMode[] { GraphicsJobMode.Native, GraphicsJobMode.Legacy };
-        private static GUIContent[] m_GfxJobModeNames = new GUIContent[] { EditorGUIUtility.TrTextContent("Native"), EditorGUIUtility.TrTextContent("Legacy") };
+        private static GraphicsJobMode[] m_GfxJobModeValues = new GraphicsJobMode[] { GraphicsJobMode.Native, GraphicsJobMode.Legacy, GraphicsJobMode.Split };
+        private static GUIContent[] m_GfxJobModeNames = new GUIContent[] { EditorGUIUtility.TrTextContent("Native"), EditorGUIUtility.TrTextContent("Legacy"), EditorGUIUtility.TrTextContent("Split") };
+        private static MeshDeformation[] m_MeshDeformations = { MeshDeformation.CPU, MeshDeformation.GPU, MeshDeformation.GPUBatched };
 
         // Section and tab selection state
 
@@ -394,6 +399,7 @@ PlayerSettingsIconsEditor iconsEditor
         SerializedProperty m_DefaultScreenHeight;
 
         SerializedProperty m_ActiveColorSpace;
+        SerializedProperty m_UnsupportedMSAAFallback;
         SerializedProperty m_StripUnusedMeshComponents;
         SerializedProperty m_StrictShaderVariantMatching;
         SerializedProperty m_MipStripping;
@@ -410,6 +416,7 @@ PlayerSettingsIconsEditor iconsEditor
         SerializedProperty m_KeepLoadedShadersAlive;
         SerializedProperty m_PreloadedAssets;
         SerializedProperty m_BakeCollisionMeshes;
+        SerializedProperty m_DedicatedServerOptimizations;
         SerializedProperty m_ResizableWindow;
         SerializedProperty m_FullscreenMode;
         SerializedProperty m_VisibleInBackground;
@@ -421,6 +428,7 @@ PlayerSettingsIconsEditor iconsEditor
         SerializedProperty m_CaptureSingleScreen;
 
         SerializedProperty m_SkinOnGPU;
+        SerializedProperty m_MeshDeformation;
 
         SerializedProperty m_EnableLoadStoreDebugMode;
 
@@ -452,12 +460,12 @@ PlayerSettingsIconsEditor iconsEditor
         SerializedProperty m_EditorAssembliesCompatibilityLevel;
         SerializedProperty m_Il2CppCompilerConfiguration;
         SerializedProperty m_Il2CppCodeGeneration;
+        SerializedProperty m_Il2CppStacktraceInformation;
         SerializedProperty m_ScriptingDefines;
         SerializedProperty m_AdditionalCompilerArguments;
         SerializedProperty m_StackTraceTypes;
         SerializedProperty m_ManagedStrippingLevel;
         SerializedProperty m_ActiveInputHandler;
-        SerializedProperty m_SelectedPlatform;
 
         // Embedded Linux specific
         SerializedProperty m_ForceSRGBBlit;
@@ -515,6 +523,8 @@ public static void SyncColorGamuts()
         bool isPresetWindowOpen = false;
         bool hasPresetWindowClosed = false;
 
+        const string kSelectedPlatform = "PlayerSettings.SelectedPlatform";
+
         public SerializedProperty FindPropertyAssert(string name)
         {
             SerializedProperty property = serializedObject.FindProperty(name);
@@ -545,6 +555,7 @@ void OnEnable()
             m_UIStatusBarHidden             = FindPropertyAssert("uIStatusBarHidden");
             m_UIStatusBarStyle              = FindPropertyAssert("uIStatusBarStyle");
             m_ActiveColorSpace              = FindPropertyAssert("m_ActiveColorSpace");
+            m_UnsupportedMSAAFallback       = FindPropertyAssert("unsupportedMSAAFallback");
             m_StripUnusedMeshComponents     = FindPropertyAssert("StripUnusedMeshComponents");
             m_StrictShaderVariantMatching   = FindPropertyAssert("strictShaderVariantMatching");
             m_MipStripping                  = FindPropertyAssert("mipStripping");
@@ -596,12 +607,12 @@ void OnEnable()
             m_EditorAssembliesCompatibilityLevel = FindPropertyAssert("editorAssembliesCompatibilityLevel");
             m_Il2CppCompilerConfiguration   = FindPropertyAssert("il2cppCompilerConfiguration");
             m_Il2CppCodeGeneration          = FindPropertyAssert("il2cppCodeGeneration");
+            m_Il2CppStacktraceInformation   = FindPropertyAssert("il2cppStacktraceInformation");
             m_ScriptingDefines              = FindPropertyAssert("scriptingDefineSymbols");
             m_StackTraceTypes               = FindPropertyAssert("m_StackTraceTypes");
             m_ManagedStrippingLevel         = FindPropertyAssert("managedStrippingLevel");
             m_ActiveInputHandler            = FindPropertyAssert("activeInputHandler");
             m_AdditionalCompilerArguments   = FindPropertyAssert("additionalCompilerArguments");
-            m_SelectedPlatform              = FindPropertyAssert("selectedPlatform");
 
             m_DefaultScreenWidth            = FindPropertyAssert("defaultScreenWidth");
             m_DefaultScreenHeight           = FindPropertyAssert("defaultScreenHeight");
@@ -627,6 +638,7 @@ void OnEnable()
             m_KeepLoadedShadersAlive           = FindPropertyAssert("keepLoadedShadersAlive");
             m_PreloadedAssets                  = FindPropertyAssert("preloadedAssets");
             m_BakeCollisionMeshes              = FindPropertyAssert("bakeCollisionMeshes");
+            m_DedicatedServerOptimizations     = FindPropertyAssert("dedicatedServerOptimizations");
             m_ResizableWindow                  = FindPropertyAssert("resizableWindow");
             m_UseMacAppStoreValidation         = FindPropertyAssert("useMacAppStoreValidation");
             m_MacAppStoreCategory              = FindPropertyAssert("macAppStoreCategory");
@@ -638,6 +650,7 @@ void OnEnable()
             m_VisibleInBackground              = FindPropertyAssert("visibleInBackground");
             m_AllowFullscreenSwitch            = FindPropertyAssert("allowFullscreenSwitch");
             m_SkinOnGPU                        = FindPropertyAssert("gpuSkinning");
+            m_MeshDeformation                  = FindPropertyAssert("meshDeformation");
             m_ForceSingleInstance              = FindPropertyAssert("forceSingleInstance");
             m_UseFlipModelSwapchain            = FindPropertyAssert("useFlipModelSwapchain");
 
@@ -659,12 +672,15 @@ void OnEnable()
 
             var validPlatformsLength = validPlatforms.Length;
             m_SettingsExtensions = new ISettingEditorExtension[validPlatformsLength];
+            var currentPlatform = 0;
             for (int i = 0; i < validPlatformsLength; i++)
             {
                 string module = ModuleManager.GetTargetStringFromBuildTargetGroup(validPlatforms[i].namedBuildTarget.ToBuildTargetGroup());
                 m_SettingsExtensions[i] = ModuleManager.GetEditorSettingsExtension(module);
                 if (m_SettingsExtensions[i] != null)
                     m_SettingsExtensions[i].OnEnable(this);
+                if (validPlatforms[i].IsActive())
+                    currentPlatform = i;
             }
 
             for (int i = 0; i < m_SectionAnimators.Length; i++)
@@ -678,7 +694,7 @@ void OnEnable()
             // we access this cache both from player settings editor and script side when changing api
             s_GraphicsDeviceLists.Clear();
 
-            var selectedPlatform = m_SelectedPlatform.intValue;
+            var selectedPlatform = SessionState.GetInt(kSelectedPlatform, currentPlatform);
             if (selectedPlatform < 0)
                 selectedPlatform = 0;
 
@@ -864,9 +880,12 @@ public override void OnInspectorGUI()
             EditorGUILayout.Space();
 
             EditorGUI.BeginChangeCheck();
-            int oldPlatform = m_SelectedPlatform.intValue;
-            m_SelectedPlatform.intValue = EditorGUILayout.BeginPlatformGrouping(validPlatforms, null);
-            int selectedPlatformValue = m_SelectedPlatform.intValue;
+            int oldPlatform = SessionState.GetInt(kSelectedPlatform, 0);
+            int selectedPlatformValue = EditorGUILayout.BeginPlatformGrouping(validPlatforms, null);
+            if (selectedPlatformValue != oldPlatform)
+            {
+                SessionState.SetInt(kSelectedPlatform, selectedPlatformValue);
+            }
 
             if (EditorGUI.EndChangeCheck())
             {
@@ -925,6 +944,11 @@ public override void OnInspectorGUI()
 
             if (hasPresetWindowClosed)
             {
+                // We recompile after the window is closed just to make sure all the values are set/shown correctly.
+                // There might be a smarter idea where you detect the values that have changed and only do it if it's required,
+                // but the way the Preset window applies those changes as well as the way IMGUI works makes it difficult to track.
+                SetReason(RecompileReason.presetChanged);
+
                 OnPresetSelectorClosed();
             }
             else if (HasReasonToCompile())
@@ -1176,19 +1200,9 @@ static private string GraphicsDeviceTypeToString(BuildTarget target, GraphicsDev
         {
             if (target == BuildTarget.WebGL)
             {
-                if (graphicsDeviceType == GraphicsDeviceType.OpenGLES2) return "WebGL 1 (Deprecated)";
                 if (graphicsDeviceType == GraphicsDeviceType.OpenGLES3) return "WebGL 2";
             }
             string name = graphicsDeviceType.ToString();
-            if (target == BuildTarget.iOS || target == BuildTarget.tvOS)
-            {
-                if (name.Contains("OpenGLES"))
-                    name += " (Deprecated)";
-            }
-            else if (graphicsDeviceType == GraphicsDeviceType.OpenGLES2)
-            {
-                name += " (Deprecated)";
-            }
             return name;
         }
 
@@ -1197,7 +1211,6 @@ static private GraphicsDeviceType GraphicsDeviceTypeFromString(string graphicsDe
         {
             graphicsDeviceType = graphicsDeviceType.Replace(" (Deprecated)", "");
             graphicsDeviceType = graphicsDeviceType.Replace(" (Experimental)", "");
-            if (graphicsDeviceType == "WebGL 1") return GraphicsDeviceType.OpenGLES2;
             if (graphicsDeviceType == "WebGL 2") return GraphicsDeviceType.OpenGLES3;
             return (GraphicsDeviceType)Enum.Parse(typeof(GraphicsDeviceType), graphicsDeviceType, true);
         }
@@ -1222,6 +1235,14 @@ private void AddGraphicsDeviceElement(BuildTarget target, Rect rect, Reorderable
             if (availableDevices == null || availableDevices.Length == 0)
                 return;
 
+            //As part of OpenGL deprection from MacOS, hide the option of adding OpenGL
+            if (target == BuildTarget.StandaloneOSX)
+            {
+                var availableDeviceList = availableDevices.ToList();
+                availableDeviceList.Remove(GraphicsDeviceType.OpenGLCore);
+                availableDevices = availableDeviceList.ToArray();
+            }
+
             var names = new string[availableDevices.Length];
             var enabled = new bool[availableDevices.Length];
             for (int i = 0; i < availableDevices.Length; ++i)
@@ -1378,8 +1399,8 @@ void OpenGLES31OptionsGUI(BuildTargetGroup targetGroup, BuildTarget targetPlatfo
                 return;
 
             var apis = PlayerSettings.GetGraphicsAPIs(targetPlatform);
-            // only available if we include ES3, and not ES2
-            var hasMinES3 = apis.Contains(GraphicsDeviceType.OpenGLES3) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
+            // only available if we include ES3
+            var hasMinES3 = apis.Contains(GraphicsDeviceType.OpenGLES3);
             if (!hasMinES3)
                 return;
 
@@ -1714,6 +1735,19 @@ public static T BuildEnumPopup<T>(GUIContent uiString, T selected, T[] options,
             return options[newIdx];
         }
 
+        public static void EnumPropertyField<T>(SerializedProperty property, GUIContent name) where T : Enum
+        {
+            using (var horizontal = new EditorGUILayout.HorizontalScope())
+            {
+                using (new EditorGUI.PropertyScope(horizontal.rect, GUIContent.none, property))
+                {
+                    var values = (T[])Enum.GetValues(typeof(T));
+                    var valueNames = Enum.GetNames(typeof(T)).Select(e => new GUIContent(e)).ToArray();
+                    PlayerSettingsEditor.BuildEnumPopup(property, name, values, valueNames);
+                }
+            }
+        }
+
         public void OtherSectionGUI(BuildPlatform platform, ISettingEditorExtension settingsExtension, int sectionIndex = 4)
         {
             if (BeginSettingsBox(sectionIndex, SettingsContent.otherSettingsTitle))
@@ -1828,39 +1862,33 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                 }
             }
 
-            // Display a warning for platforms that some devices don't support linear rendering if the settings are not fine for linear colorspace
-            if (PlayerSettings.colorSpace == ColorSpace.Linear)
+            using (new EditorGUI.DisabledScope(EditorApplication.isPlaying))
             {
-                bool showWarning = false;
-                GUIContent warningMessage = null;
-                var apis = PlayerSettings.GetGraphicsAPIs(platform.defaultTarget);
-
-                if (platform.namedBuildTarget == NamedBuildTarget.Android)
-                {
-                    // SRP should handle blits internally
-                    bool hasBlitDisabled = (PlayerSettings.Android.blitType == AndroidBlitType.Never) && (GraphicsSettings.currentRenderPipeline == null);
-                    showWarning = hasBlitDisabled || apis.Contains(GraphicsDeviceType.OpenGLES2);
-                    warningMessage = SettingsContent.colorSpaceAndroidWarning;
-                }
-                else if (platform.namedBuildTarget == NamedBuildTarget.iOS || platform.namedBuildTarget == NamedBuildTarget.tvOS)
-                {
-                    showWarning = apis.Contains(GraphicsDeviceType.OpenGLES3) || apis.Contains(GraphicsDeviceType.OpenGLES2);
-                    warningMessage = SettingsContent.colorSpaceIOSWarning;
-                }
-                else if ((platform.namedBuildTarget == NamedBuildTarget.WebGL))
+                switch (platform.defaultTarget)
                 {
-                    showWarning = apis.Contains(GraphicsDeviceType.OpenGLES2);
-                    warningMessage = SettingsContent.colorSpaceWebGLWarning;
+                    case BuildTarget.StandaloneOSX:
+                    case BuildTarget.StandaloneWindows:
+                    case BuildTarget.iOS:
+                    case BuildTarget.Android:
+                    case BuildTarget.StandaloneWindows64:
+                    case BuildTarget.WebGL:
+                    case BuildTarget.WSAPlayer:
+                    case BuildTarget.StandaloneLinux64:
+                    case BuildTarget.tvOS:
+                        EditorGUILayout.PropertyField(m_UnsupportedMSAAFallback, SettingsContent.unsupportedMSAAFallback);
+                        break;
+                    default:
+                        break;
                 }
-                else if ((platform.namedBuildTarget == NamedBuildTarget.EmbeddedLinux))
+            }
+
+            // Special cases for some platform with limitations regarding linear colorspace
+            if (PlayerSettings.colorSpace == ColorSpace.Linear)
+            {
+                if (platform.namedBuildTarget == NamedBuildTarget.EmbeddedLinux)
                 {
-                    showWarning = apis.Contains(GraphicsDeviceType.OpenGLES2);
-                    warningMessage = SettingsContent.colorSpaceEmbeddedLinuxWarning;
                     EditorGUILayout.PropertyField(m_ForceSRGBBlit, SettingsContent.forceSRGBBlit);
                 }
-
-                if (showWarning)
-                    EditorGUILayout.HelpBox(warningMessage.text, MessageType.Warning);
             }
 
             // Graphics APIs
@@ -1971,14 +1999,52 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                 }
             }
 
+            if (platform.namedBuildTarget.ToBuildTargetGroup() == BuildTargetGroup.Standalone)
+            {
+                GraphicsDeviceType[] gfxAPIs = PlayerSettings.GetGraphicsAPIs(platform.defaultTarget);
+                gfxJobModesSupported = (gfxAPIs[0] == GraphicsDeviceType.Direct3D12) || (gfxAPIs[0] == GraphicsDeviceType.Vulkan);
+            }
+
             // GPU Skinning toggle (only show on relevant platforms)
             if (!BuildTargetDiscovery.PlatformHasFlag(platform.defaultTarget, TargetAttributes.GPUSkinningNotSupported))
             {
-                EditorGUI.BeginChangeCheck();
-                EditorGUILayout.PropertyField(m_SkinOnGPU, SettingsContent.skinOnGPU);
-                if (EditorGUI.EndChangeCheck())
+                /// Adding support to other platforms in progress...
+                bool platformSupportsBatching =
+                    platform.namedBuildTarget == NamedBuildTarget.NintendoSwitch ||
+                    platform.namedBuildTarget == NamedBuildTarget.PS5;
+
+                if (platformSupportsBatching)
                 {
-                    ShaderUtil.RecreateSkinnedMeshResources();
+                    MeshDeformation currentDeformation = (MeshDeformation)m_MeshDeformation.intValue;
+
+                    EditorGUI.BeginChangeCheck();
+                    MeshDeformation newDeformation = BuildEnumPopup(SettingsContent.skinOnGPU, currentDeformation, m_MeshDeformations, SettingsContent.meshDeformations);
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        m_SkinOnGPU.boolValue = newDeformation != MeshDeformation.CPU;
+                        m_MeshDeformation.intValue = (int)newDeformation;
+                        serializedObject.ApplyModifiedProperties();
+                        ShaderUtil.RecreateSkinnedMeshResources();
+                    }
+                }
+                else
+                {
+                    // Use the original checkbox UI but preserve underlying batching mode whenever possible.
+                    // We need to do this because gpuSkinning/meshDeformation are properties which are shared between all platforms
+                    // and if the user sets gpuSkinning mode to "enabled", we actually want to preserve "batchEnabled" if it was set for other platforms.
+                    // Platforms that do not support batching but have meshDeformation == GPUBatched just silently use original non-batched code.
+                    EditorGUI.BeginChangeCheck();
+                    EditorGUILayout.PropertyField(m_SkinOnGPU, SettingsContent.skinOnGPU);
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        // Preserve the value of m_MeshDeformation when possible.
+                        if (!m_SkinOnGPU.boolValue)
+                            m_MeshDeformation.intValue = (int)MeshDeformation.CPU;
+                        else
+                            m_MeshDeformation.intValue = m_MeshDeformation.intValue != (int)MeshDeformation.CPU ? m_MeshDeformation.intValue : (int)MeshDeformation.GPUBatched;
+                        serializedObject.ApplyModifiedProperties();
+                        ShaderUtil.RecreateSkinnedMeshResources();
+                    }
                 }
             }
 
@@ -1996,8 +2062,7 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                 GraphicsJobMode newGfxJobMode = GraphicsJobMode.Legacy;
                 if (gfxAPIs[0] == GraphicsDeviceType.XboxOneD3D12)
                 {
-                    newGfxJobMode = GraphicsJobMode.Native;
-                    graphicsJobsOptionEnabled = false;
+                    newGfxJobMode = GraphicsJobMode.Split;
                     if (graphicsJobs == false)
                     {
                         PlayerSettings.SetGraphicsJobsForPlatform(platform.defaultTarget, true);
@@ -2006,9 +2071,9 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                     }
                 }
                 PlayerSettings.SetGraphicsJobModeForPlatform(platform.defaultTarget, newGfxJobMode);
-                graphicsJobsModeOptionEnabled = false;
+                PlayerSettings.SetGraphicsThreadingModeForPlatform(platform.defaultTarget, GfxThreadingMode.SplitJobs);
             }
-            else if (platform.namedBuildTarget == new NamedBuildTarget("PS5"))
+            else if (platform.namedBuildTarget == NamedBuildTarget.PS5)
             {
                 // On PS5NGGC, we only have kGfxJobModeNative so we disable the options in that case
                 GraphicsDeviceType[] gfxAPIs = PlayerSettings.GetGraphicsAPIs(platform.defaultTarget);
@@ -2023,6 +2088,7 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                     }
 
                     PlayerSettings.SetGraphicsJobModeForPlatform(platform.defaultTarget, GraphicsJobMode.Native);
+                    PlayerSettings.SetGraphicsThreadingModeForPlatform(platform.defaultTarget, GfxThreadingMode.ClientWorkerNativeJobs);
                     graphicsJobsModeOptionEnabled = false;
                 }
             }
@@ -2071,6 +2137,13 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                     {
                         Undo.RecordObject(target, SettingsContent.undoChangedGraphicsJobModeString);
                         PlayerSettings.SetGraphicsJobModeForPlatform(platform.defaultTarget, newGfxJobMode);
+
+                        if(newGfxJobMode == GraphicsJobMode.Native)
+                            PlayerSettings.SetGraphicsThreadingModeForPlatform(platform.defaultTarget, GfxThreadingMode.ClientWorkerNativeJobs);
+                        else if (newGfxJobMode == GraphicsJobMode.Legacy)
+                            PlayerSettings.SetGraphicsThreadingModeForPlatform(platform.defaultTarget, GfxThreadingMode.ClientWorkerJobs);
+                        else if (newGfxJobMode == GraphicsJobMode.Split)
+                            PlayerSettings.SetGraphicsThreadingModeForPlatform(platform.defaultTarget, GfxThreadingMode.SplitJobs);
                     }
                 }
             }
@@ -2120,21 +2193,6 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
 
                             GUIUtility.ExitGUI();
                         }
-
-                        if (encodingQuality == LightmapEncodingQuality.High &&
-                            platform.namedBuildTarget == NamedBuildTarget.WebGL &&
-                            PlayerSettings.GetGraphicsAPIs(BuildTarget.WebGL).Contains(GraphicsDeviceType.OpenGLES2))
-                        {
-                            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);
-                        }
                     }
 
                     {
@@ -2152,21 +2210,6 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
 
                             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.hdrCubemapQualityAndroidWarning.text, MessageType.Warning);
-                        }
                     }
                 }
             }
@@ -2205,14 +2248,6 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                 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);
-                    if (PlayerSettings.enableFrameTimingStats && platform.namedBuildTarget == NamedBuildTarget.WebGL)
-                    {
-                        var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.WebGL);
-                        if (apis.Contains(GraphicsDeviceType.OpenGLES2))
-                        {
-                            EditorGUILayout.HelpBox(SettingsContent.frameTimingStatsWebGLWarning.text, MessageType.Warning);
-                        }
-                    }
                     if (PlayerSettings.enableFrameTimingStats)
                     {
                         EditorGUILayout.HelpBox(SettingsContent.openGLFrameTimingStatsOnGPURecordersOffInfo.text, MessageType.Info);
@@ -2220,7 +2255,7 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                 }
 
                 // Tickbox for OpenGL-only option to toggle Profiler GPU Recorders.
-                if (platform.namedBuildTarget == NamedBuildTarget.Standalone || platform.namedBuildTarget == NamedBuildTarget.Android)
+                if (platform.namedBuildTarget == NamedBuildTarget.Standalone || platform.namedBuildTarget == NamedBuildTarget.Android || platform.namedBuildTarget == NamedBuildTarget.EmbeddedLinux  || platform.namedBuildTarget == NamedBuildTarget.QNX)
                 {
                     PlayerSettings.enableOpenGLProfilerGPURecorders = EditorGUILayout.Toggle(SettingsContent.enableOpenGLProfilerGPURecorders, PlayerSettings.enableOpenGLProfilerGPURecorders);
 
@@ -2235,38 +2270,52 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
 
                 if (hdrDisplaySupported)
                 {
-                    string label = "Use display in HDR mode";
-                    string tooltip = "Switch the display to HDR output (on supported displays)" + ((platform.namedBuildTarget == NamedBuildTarget.XboxOne) ? " at start of application." : ".");
-                    bool oldUseHDRDisplay = PlayerSettings.useHDRDisplay;
-                    PlayerSettings.useHDRDisplay = EditorGUILayout.Toggle(EditorGUIUtility.TrTextContent(label, tooltip), oldUseHDRDisplay);
                     bool requestRepaint = false;
-
-                    if (oldUseHDRDisplay != PlayerSettings.useHDRDisplay)
+                    bool oldAllowHDRDisplaySupport = PlayerSettings.allowHDRDisplaySupport;
+                    PlayerSettings.allowHDRDisplaySupport = EditorGUILayout.Toggle(SettingsContent.allowHDRDisplay, oldAllowHDRDisplaySupport);
+                    if (oldAllowHDRDisplaySupport != PlayerSettings.allowHDRDisplaySupport)
                         requestRepaint = true;
 
-                    if (platform.namedBuildTarget.ToBuildTargetGroup() == BuildTargetGroup.Standalone || platform.namedBuildTarget == NamedBuildTarget.WindowsStoreApps)
+                    using (new EditorGUI.DisabledScope(!PlayerSettings.allowHDRDisplaySupport))
                     {
-                        using (new EditorGUI.DisabledScope(!PlayerSettings.useHDRDisplay))
+                        using (new EditorGUI.IndentLevelScope())
                         {
-                            using (new EditorGUI.IndentLevelScope())
-                            {
-                                EditorGUI.BeginChangeCheck();
-                                D3DHDRDisplayBitDepth oldBitDepth = PlayerSettings.D3DHDRBitDepth;
-                                D3DHDRDisplayBitDepth[] bitDepthValues = { D3DHDRDisplayBitDepth.D3DHDRDisplayBitDepth10, D3DHDRDisplayBitDepth.D3DHDRDisplayBitDepth16 };
-                                GUIContent HDRBitDepthLabel = EditorGUIUtility.TrTextContent("Swap Chain Bit Depth", "Affects the bit depth of the final swap chain format and color space.");
-                                GUIContent[] HDRBitDepthNames = { EditorGUIUtility.TrTextContent("Bit Depth 10"), EditorGUIUtility.TrTextContent("Bit Depth 16") };
+                            bool oldUseHDRDisplay = PlayerSettings.useHDRDisplay;
+                            PlayerSettings.useHDRDisplay = EditorGUILayout.Toggle(SettingsContent.useHDRDisplay, oldUseHDRDisplay);
+
+                            if (oldUseHDRDisplay != PlayerSettings.useHDRDisplay)
+                                requestRepaint = true;
 
-                                D3DHDRDisplayBitDepth bitDepth = BuildEnumPopup(HDRBitDepthLabel, oldBitDepth, bitDepthValues, HDRBitDepthNames);
-                                if (EditorGUI.EndChangeCheck())
+                            if (platform.namedBuildTarget.ToBuildTargetGroup() == BuildTargetGroup.Standalone || platform.namedBuildTarget == NamedBuildTarget.WindowsStoreApps)
+                            {
+                                using (new EditorGUI.DisabledScope(!PlayerSettings.useHDRDisplay))
                                 {
-                                    PlayerSettings.D3DHDRBitDepth = bitDepth;
-                                    if (oldBitDepth != bitDepth)
-                                        requestRepaint = true;
+                                    using (new EditorGUI.IndentLevelScope())
+                                    {
+                                        EditorGUI.BeginChangeCheck();
+                                        HDRDisplayBitDepth oldBitDepth = PlayerSettings.hdrBitDepth;
+                                        HDRDisplayBitDepth[] bitDepthValues = { HDRDisplayBitDepth.BitDepth10, HDRDisplayBitDepth.BitDepth16 };
+                                        GUIContent hdrBitDepthLabel = EditorGUIUtility.TrTextContent("Swap Chain Bit Depth", "Affects the bit depth of the final swap chain format and color space.");
+                                        GUIContent[] hdrBitDepthNames = { EditorGUIUtility.TrTextContent("Bit Depth 10"), EditorGUIUtility.TrTextContent("Bit Depth 16") };
+
+                                        HDRDisplayBitDepth bitDepth = BuildEnumPopup(hdrBitDepthLabel, oldBitDepth, bitDepthValues, hdrBitDepthNames);
+                                        if (EditorGUI.EndChangeCheck())
+                                        {
+                                            PlayerSettings.hdrBitDepth = bitDepth;
+                                            if (oldBitDepth != bitDepth)
+                                                requestRepaint = true;
+                                        }
+                                    }
                                 }
                             }
                         }
                     }
 
+                    if (PlayerSettings.allowHDRDisplaySupport && GraphicsSettings.currentRenderPipeline != null && !SupportedRenderingFeatures.active.supportsHDR)
+                    {
+                        EditorGUILayout.HelpBox(SettingsContent.hdrOutputRequireHDRRenderingWarning.text, MessageType.Info);
+                    }
+
                     if (requestRepaint)
                         EditorApplication.RequestRepaintAllViews();
                 }
@@ -2556,6 +2605,14 @@ private Il2CppCodeGeneration GetCurrentIl2CppCodeGenerationForTarget(NamedBuildT
                 return Il2CppCodeGeneration.OptimizeSpeed;
         }
 
+        private Il2CppStacktraceInformation GetCurrentIl2CppStacktraceInformationOptionForTarget(NamedBuildTarget namedBuildTarget)
+        {
+            if (m_Il2CppStacktraceInformation.TryGetMapEntry(namedBuildTarget.TargetName, out var entry))
+                return (Il2CppStacktraceInformation)entry.FindPropertyRelative("second").intValue;
+            else
+                return Il2CppStacktraceInformation.MethodOnly;
+        }
+
         private ManagedStrippingLevel GetCurrentManagedStrippingLevelForTarget(NamedBuildTarget namedBuildTarget, ScriptingImplementation backend)
         {
             if (m_ManagedStrippingLevel.TryGetMapEntry(namedBuildTarget.TargetName, out var entry))
@@ -2761,6 +2818,18 @@ private void OtherSectionConfigurationGUI(BuildPlatform platform, ISettingEditor
                     }
                 }
 
+                // Il2Cpp Stacktrace Configuration
+                using (new EditorGUI.DisabledScope(currentBackend != ScriptingImplementation.IL2CPP))
+                {
+                    Il2CppStacktraceInformation config = GetCurrentIl2CppStacktraceInformationOptionForTarget(platform.namedBuildTarget);
+
+                    var newConfiguration = BuildEnumPopup(SettingsContent.il2cppStacktraceInformation, config,
+                        GetIl2CppStacktraceOptions(), GetIl2CppStacktraceOptionNames());
+
+                    if (config != newConfiguration)
+                        m_Il2CppStacktraceInformation.SetMapValue(platform.namedBuildTarget.TargetName, (int)newConfiguration);
+                }
+
                 bool gcIncrementalEnabled = BuildPipeline.IsFeatureSupported("ENABLE_SCRIPTING_GC_WBARRIERS", platform.defaultTarget);
                 if (platform.namedBuildTarget == NamedBuildTarget.iOS)
                     gcIncrementalEnabled = gcIncrementalEnabled && currentBackend == ScriptingImplementation.IL2CPP;
@@ -2820,19 +2889,18 @@ private void OtherSectionConfigurationGUI(BuildPlatform platform, ISettingEditor
                     EditorGUILayout.PropertyField(m_AccelerometerFrequency, SettingsContent.accelerometerFrequency);
 
                 if (platform.namedBuildTarget == NamedBuildTarget.iOS || platform.namedBuildTarget == NamedBuildTarget.tvOS || platform.namedBuildTarget == NamedBuildTarget.Android)
-                {
                     EditorGUILayout.PropertyField(m_MuteOtherAudioSources, SettingsContent.muteOtherAudioSources);
 
-                    if (m_MuteOtherAudioSources.boolValue == false && platform.namedBuildTarget == NamedBuildTarget.iOS)
-                        EditorGUILayout.HelpBox(SettingsContent.iOSExternalAudioInputNotSupported.text, MessageType.Warning);
-                }
-
                 // TVOS TODO: check what should stay or go
                 if (platform.namedBuildTarget == NamedBuildTarget.iOS || platform.namedBuildTarget == NamedBuildTarget.tvOS)
                 {
                     if (platform.namedBuildTarget == NamedBuildTarget.iOS)
                     {
                         EditorGUILayout.PropertyField(m_PrepareIOSForRecording, SettingsContent.prepareIOSForRecording);
+
+                        if (m_MuteOtherAudioSources.boolValue == false && m_PrepareIOSForRecording.boolValue == false)
+                            EditorGUILayout.HelpBox(SettingsContent.iOSExternalAudioInputNotSupported.text, MessageType.Warning);
+
                         EditorGUILayout.PropertyField(m_ForceIOSSpeakersWhenRecording, SettingsContent.forceIOSSpeakersWhenRecording);
                     }
                     EditorGUILayout.PropertyField(m_UIRequiresPersistentWiFi, SettingsContent.UIRequiresPersistentWiFi);
@@ -3150,6 +3218,9 @@ private void OtherSectionOptimizationGUI(BuildPlatform platform)
             // Optimization
             GUILayout.Label(SettingsContent.optimizationTitle, EditorStyles.boldLabel);
 
+            if (platform.namedBuildTarget == NamedBuildTarget.Server)
+                EditorGUILayout.PropertyField(m_DedicatedServerOptimizations, SettingsContent.dedicatedServerOptimizations);
+
             EditorGUILayout.PropertyField(m_BakeCollisionMeshes, SettingsContent.bakeCollisionMeshes);
 
             if (isPreset)
@@ -3261,6 +3332,31 @@ private GUIContent[] GetIl2CppCompilerConfigurationNames()
             return m_Il2cppCompilerConfigurationNames;
         }
 
+        static Il2CppStacktraceInformation[] m_Il2cppStacktraceOptions;
+        static GUIContent[] m_Il2cppStacktraceOptionNames;
+
+        private Il2CppStacktraceInformation[] GetIl2CppStacktraceOptions()
+        {
+            if (m_Il2cppStacktraceOptions == null)
+                m_Il2cppStacktraceOptions = (Il2CppStacktraceInformation[])Enum.GetValues(typeof(Il2CppStacktraceInformation));
+
+            return m_Il2cppStacktraceOptions;
+        }
+
+        private GUIContent[] GetIl2CppStacktraceOptionNames()
+        {
+            if (m_Il2cppStacktraceOptionNames == null)
+            {
+                m_Il2cppStacktraceOptionNames = new GUIContent[]
+                {
+                    EditorGUIUtility.TextContent("Method Name"),
+                    EditorGUIUtility.TextContent("Method Name, File Name, and Line Number"),
+                };
+            }
+
+            return m_Il2cppStacktraceOptionNames;
+        }
+
         public static bool IsLatestApiCompatibility(ApiCompatibilityLevel level)
         {
             return (level == ApiCompatibilityLevel.NET_4_6 || level == ApiCompatibilityLevel.NET_Standard_2_0);
diff --git a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs
index db95a28427..eac6ee47b8 100644
--- a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs
+++ b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs
@@ -81,7 +81,7 @@ static AssetDeleteResult OnWillDeleteAsset(string asset, RemoveAssetOptions opti
         class Texts
         {
             public GUIContent animate = EditorGUIUtility.TrTextContent("Animation");
-            public GUIContent backgroundColor = EditorGUIUtility.TrTextContent("Background Color", "Background color when no background image is used.");
+            public GUIContent backgroundColor = EditorGUIUtility.TrTextContent("Background Color", "Background color when no background image is used. On Android, use this property to set static splash image background color.");
             public GUIContent backgroundImage = EditorGUIUtility.TrTextContent("Background Image", "Image to be used in landscape and portrait (when portrait image is not set).");
             public GUIContent backgroundPortraitImage = EditorGUIUtility.TrTextContent("Alternate Portrait Image*", "Optional image to be used in portrait mode.");
             public GUIContent backgroundTitle = EditorGUIUtility.TrTextContent("Background*");
@@ -319,13 +319,20 @@ public void SplashSectionGUI(BuildPlatform platform, ISettingEditorExtension set
                 }
                 else
                 {
-                    ObjectReferencePropertyField<Texture2D>(m_VirtualRealitySplashScreen, k_Texts.vrSplashScreen);
+                    bool VREnabled = BuildPipeline.IsFeatureSupported("ENABLE_VR", platform.defaultTarget);
+
+                    if (VREnabled)
+                        ObjectReferencePropertyField<Texture2D>(m_VirtualRealitySplashScreen, k_Texts.vrSplashScreen);
 
                     if (TargetSupportsOptionalBuiltinSplashScreen(platform.namedBuildTarget.ToBuildTargetGroup(), settingsExtension))
                         BuiltinCustomSplashScreenGUI(platform.namedBuildTarget.ToBuildTargetGroup(), settingsExtension);
 
                     if (settingsExtension != null)
+                    {
                         settingsExtension.SplashSectionGUI();
+                        if (!m_ShowUnitySplashScreen.boolValue && settingsExtension.SupportsStaticSplashScreenBackgroundColor())
+                            EditorGUILayout.PropertyField(m_SplashScreenBackgroundColor, k_Texts.backgroundColor);
+                    }
 
                     if (m_ShowUnitySplashScreen.boolValue)
                         m_Owner.ShowSharedNote();
diff --git a/Editor/Mono/Inspector/PreviewRenderUtility.cs b/Editor/Mono/Inspector/PreviewRenderUtility.cs
index 4ddda64d1a..d3807a21ff 100644
--- a/Editor/Mono/Inspector/PreviewRenderUtility.cs
+++ b/Editor/Mono/Inspector/PreviewRenderUtility.cs
@@ -311,7 +311,7 @@ private void InitPreview(Rect r)
             }
 
             m_TargetRect = r;
-            float scaleFac = GetScaleFactor(r.width, r.height);
+            float scaleFac = EditorGUIUtility.pixelsPerPoint;
 
             int rtWidth = (int)(r.width * scaleFac);
             int rtHeight = (int)(r.height * scaleFac);
diff --git a/Editor/Mono/Inspector/PreviewWindow.cs b/Editor/Mono/Inspector/PreviewWindow.cs
index 32dbf2ced1..ee74887ac9 100644
--- a/Editor/Mono/Inspector/PreviewWindow.cs
+++ b/Editor/Mono/Inspector/PreviewWindow.cs
@@ -52,7 +52,7 @@ protected override void OnEnable()
         protected override void OnDisable()
         {
             base.OnDisable();
-            if (m_ParentInspectorWindow != null)
+            if (m_ParentInspectorWindow != null && GetInspectors().Contains(m_ParentInspectorWindow))
                 m_ParentInspectorWindow.RebuildContentsContainers();
         }
 
diff --git a/Editor/Mono/Inspector/PropertyEditor.cs b/Editor/Mono/Inspector/PropertyEditor.cs
index 9bf3f126b3..0e0336ffe4 100644
--- a/Editor/Mono/Inspector/PropertyEditor.cs
+++ b/Editor/Mono/Inspector/PropertyEditor.cs
@@ -47,7 +47,7 @@ interface IPropertySourceOpener
         Object hoveredObject { get; }
     }
 
-    class PropertyEditor : EditorWindow, IPropertyView, IHasCustomMenu, IDataModeHandlerAndDispatcher
+    class PropertyEditor : EditorWindow, IPropertyView, IHasCustomMenu
     {
         internal const string k_AssetPropertiesMenuItemName = "Assets/Properties... _&P";
         protected const string s_MultiEditClassName = "unity-inspector-no-multi-edit-warning";
@@ -89,6 +89,7 @@ class PropertyEditor : EditorWindow, IPropertyView, IHasCustomMenu, IDataModeHan
         [SerializeField] protected string m_GlobalObjectId = "";
         [SerializeField] protected InspectorMode m_InspectorMode = InspectorMode.Normal;
 
+        private static readonly List<PropertyEditor> m_AllPropertyEditors = new List<PropertyEditor>();
         private Object m_InspectedObject;
         private static PropertyEditor s_LastPropertyEditor;
         protected int m_LastInitialEditorInstanceID;
@@ -126,10 +127,14 @@ class PropertyEditor : EditorWindow, IPropertyView, IHasCustomMenu, IDataModeHan
         protected bool m_HasPreview;
         protected HashSet<int> m_DrawnSelection = new HashSet<int>();
 
+        readonly List<Type> m_EditorTargetTypes = new List<Type>();
+
+        List<DataMode> m_SupportedDataModes = new(4);
+        static readonly List<DataMode> k_DisabledDataModes = new() {DataMode.Disabled};
+
         public GUIView parent => m_Parent;
         public HashSet<int> editorsWithImportedObjectLabel { get; } = new HashSet<int>();
         public EditorDragging editorDragging { get; }
-        internal int inspectorElementModeOverride { get; set; } = 0;
         public Editor lastInteractedEditor { get; set; }
         internal static PropertyEditor HoveredPropertyEditor { get; private set; }
         internal static PropertyEditor FocusedPropertyEditor { get; private set; }
@@ -323,10 +328,10 @@ protected virtual void OnEnable()
             m_PreviewResizer.Init("InspectorPreview");
             m_LabelGUI.OnEnable();
             m_FirstInitialize = true;
+            var shouldUpdateSupportedDataModes = m_SerializedDataModeController == null;
             CreateTracker();
 
             EditorApplication.focusChanged += OnFocusChanged;
-            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
             Undo.undoRedoEvent += OnUndoRedoPerformed;
             PrefabUtility.prefabInstanceUnpacked += OnPrefabInstanceUnpacked;
             ObjectChangeEvents.changesPublished += OnObjectChanged;
@@ -337,6 +342,14 @@ protected virtual void OnEnable()
             rootVisualElement.RegisterCallback<MouseLeaveEvent>(OnMouseLeave);
             rootVisualElement.RegisterCallback<FocusInEvent>(OnFocusIn);
             rootVisualElement.RegisterCallback<FocusOutEvent>(OnFocusOut);
+
+            dataModeController.dataModeChanged += OnDataModeChanged;
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
+
+            if (shouldUpdateSupportedDataModes)
+                EditorApplication.CallDelayed(UpdateSupportedDataModesList);
+
+            if (!m_AllPropertyEditors.Contains(this)) m_AllPropertyEditors.Add(this);
         }
 
         [UsedImplicitly]
@@ -349,7 +362,6 @@ protected virtual void OnDisable()
             m_LastVerticalScrollValue = m_ScrollView?.verticalScroller.value ?? 0;
 
             EditorApplication.focusChanged -= OnFocusChanged;
-            EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
             Undo.undoRedoEvent -= OnUndoRedoPerformed;
             PrefabUtility.prefabInstanceUnpacked -= OnPrefabInstanceUnpacked;
             ObjectChangeEvents.changesPublished -= OnObjectChanged;
@@ -360,6 +372,11 @@ protected virtual void OnDisable()
             rootVisualElement.UnregisterCallback<MouseLeaveEvent>(OnMouseLeave);
             rootVisualElement.UnregisterCallback<FocusInEvent>(OnFocusIn);
             rootVisualElement.UnregisterCallback<FocusOutEvent>(OnFocusOut);
+
+            dataModeController.dataModeChanged -= OnDataModeChanged;
+            EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
+
+            m_AllPropertyEditors.Remove(this);
         }
 
         private void OnMouseEnter(MouseEnterEvent e) => HoveredPropertyEditor = this;
@@ -440,6 +457,12 @@ protected virtual void Update()
                 UpdateWindowObjectNameTitle();
         }
 
+        internal static IEnumerable<PropertyEditor> GetPropertyEditors()
+        {
+            return m_AllPropertyEditors.AsEnumerable();
+        }
+
+
         protected void SetMode(InspectorMode mode)
         {
             if (m_InspectorMode != mode)
@@ -535,6 +558,23 @@ private void OnGeometryChanged(GeometryChangedEvent e)
             RestoreVerticalScrollIfNeeded();
         }
 
+        internal static void ClearAndRebuildAll()
+        {
+            // Needs to be delayCall because it forces redrawing of UI which messes with the current IMGUI context of the Settings window.
+            EditorApplication.delayCall += ClearAndRebuildAllDelayed;
+        }
+
+        static void ClearAndRebuildAllDelayed()
+        {
+            // 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();
+        }
+
         internal void ClearEditorsAndRebuild()
         {
             // Clear the editors Element so that a real rebuild is done
@@ -687,7 +727,6 @@ protected virtual void CreateTracker()
             m_Tracker = new ActiveEditorTracker { inspectorMode = InspectorMode.Normal };
             if (LoadPersistedObject())
             {
-                dataMode = GetLastKnownDataMode();
                 m_Tracker.ForceRebuild();
             }
         }
@@ -728,8 +767,23 @@ protected virtual void UpdateWindowObjectNameTitle()
             Repaint();
         }
 
-        private void OnUndoRedoPerformed(in UndoRedoInfo info)
+        void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
+            // Fix for a swapping an `m_Script` field in debug mode followed by an undo/redo. This causes the serialized object
+            // to be reset back to it's previous type. The editor instance remains the same, the serialized object remains the same and property iterators return
+            // the previous type properties. This breaks most assumptions in the inspectors and property drawers and causes numerous errors. As a patch we do a nuclear
+            // rebuild of everything if this state is detected.
+            var editors = tracker.activeEditors;
+            for (var i = 0; i < m_EditorTargetTypes.Count && i < editors.Length; i++)
+            {
+                var targetType = editors[i].target ? editors[i].target.GetType() : null;
+
+                if (targetType == m_EditorTargetTypes[i])
+                    continue;
+
+                ActiveEditorTracker.sharedTracker.ForceRebuild();
+            }
+
             // We need to detect and rebuild removed or suppressed component titlebars if the
             // backend changes. Situations where this detection is needed is when:
             // 1) Undo could cause a removed component to become a suppressed component and vice versa
@@ -1005,6 +1059,13 @@ internal virtual void RebuildContentsContainers()
 
             Editor[] editors = tracker.activeEditors;
 
+            // Fix for a swapping an `m_Script` field in debug mode followed by an undo/redo. This causes the serialized object to be reset back to it's previous type.
+            // The editor instance remains the same, the serialized object remains the same and property iterators return the previous type properties.
+            // Here we track the last built editor types which is compared during the next undo-redo operation.
+            m_EditorTargetTypes.Clear();
+            foreach (var editor in editors)
+                m_EditorTargetTypes.Add(editor.target ? editor.target.GetType() : null);
+
             if (editors.Any() && versionControlElement != null)
             {
                 versionControlElement.Add(CreateIMGUIContainer(
@@ -1075,10 +1136,6 @@ internal virtual void RebuildContentsContainers()
             ScriptAttributeUtility.ClearGlobalCache();
 
             EndRebuildContentContainers();
-
-            if (dataMode == DataMode.Disabled)
-                SwitchToDefaultDataMode();
-
             Repaint();
             RefreshTitle();
         }
@@ -1297,7 +1354,7 @@ private Object[] GetInspectedAssets()
 
             // 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(IsOpenForEdit).ToArray();
+            return Selection.objects.Where(EditorUtility.IsPersistent).ToArray();
         }
 
         protected virtual bool BeginDrawPreviewAndLabels() { return true; }
@@ -1467,7 +1524,7 @@ private void DrawPreviewAndLabels()
                 GUILayout.BeginVertical(Styles.footer);
                 if (hasLabels)
                 {
-                    using (new EditorGUI.DisabledScope(assets.Any(a => EditorUtility.IsPersistent(a) && !Editor.IsAppropriateFileOpenForEdit(a))))
+                    using (new EditorGUI.DisabledScope(assets.Any(a => !IsOpenForEdit(a) || !Editor.IsAppropriateFileOpenForEdit(a))))
                     {
                         m_LabelGUI.OnLabelGUI(assets);
                     }
@@ -1475,7 +1532,10 @@ private void DrawPreviewAndLabels()
 
                 if (hasBundleName)
                 {
-                    m_AssetBundleNameGUI.OnAssetBundleNameGUI(assets);
+                    using (new EditorGUI.DisabledScope(assets.Any(a => !IsOpenForEdit(a))))
+                    {
+                        m_AssetBundleNameGUI.OnAssetBundleNameGUI(assets);
+                    }
                 }
                 GUILayout.EndVertical();
             }
@@ -1852,11 +1912,8 @@ private void DrawEditors(Editor[] editors)
                         if (!(editor.target is ParticleSystemRenderer) && (mapping == null || !mapping.TryGetValue(editor.target.GetInstanceID(),
                             out var culledEditorContainer)))
                         {
-                            string editorTitle = editorTarget == null
-                                ? "Nothing Selected"
-                                : ObjectNames.GetInspectorTitle(editorTarget);
                             culledEditorContainer =
-                                new UIElements.EditorElement(editorIndex, this, editors, true) { name = editorTitle };
+                                new UIElements.EditorElement(editorIndex, this, editors, true);
                             editorsElement.Add(culledEditorContainer as VisualElement);
 
                             if (!InspectorElement.disabledThrottling)
@@ -1868,10 +1925,7 @@ private void DrawEditors(Editor[] editors)
 
                     if (mapping == null || !mapping.TryGetValue(editors[editorIndex].target.GetInstanceID(), out var editorContainer))
                     {
-                        string editorTitle = editorTarget == null ?
-                            "Nothing Selected" :
-                            $"{editor.GetType().Name}_{editorTarget.GetType().Name}_{editorTarget.GetInstanceID()}";
-                        editorContainer = new UIElements.EditorElement(editorIndex, this, editors) { name = editorTitle };
+                        editorContainer = new UIElements.EditorElement(editorIndex, this, editors);
                         editorsElement.Add(editorContainer as VisualElement);
                         if (!InspectorElement.disabledThrottling)
                             m_EditorElementUpdater.Add(editorContainer);
@@ -2278,6 +2332,7 @@ private Dictionary<int, IEditorElement> ProcessEditorElementsToRebuild(Editor[]
                     return null;
                 }
 
+                editors[newEditorsIndex].propertyViewer = this;
                 currentElement.Reinit(newEditorsIndex, editors);
                 editorToElementMap[ed.target.GetInstanceID()] = currentElement;
                 ++newEditorsIndex;
@@ -2288,6 +2343,7 @@ private Dictionary<int, IEditorElement> ProcessEditorElementsToRebuild(Editor[]
             for (int j = previousEditorsIndex; j < currentElements.Count; ++j)
             {
                 currentElements[j].RemoveFromHierarchy();
+                m_EditorElementUpdater.Remove(currentElements[j]);
             }
 
             return editorToElementMap;
@@ -2372,123 +2428,52 @@ static void OpenHoveredItemPropertyEditor(ShortcutManagement.ShortcutArguments a
             }
         }
 
-        static readonly List<DataMode> k_DisabledDataModes = new() {DataMode.Disabled};
+        internal static DataMode GetPreferredDataMode()
+            => EditorApplication.isPlaying
+                ? DataMode.Mixed
+                : DataMode.Authoring;
 
-        readonly List<DataMode> m_SupportedDataModes = new(4);
+        List<DataMode> GetSupportedDataModes() => m_SupportedDataModes;
 
-        bool areDataModesEnabled =>
-            m_InspectorMode == InspectorMode.Normal &&
-            m_SupportedDataModes.Count > 0;
+        bool m_IsEnteringPlaymode;
 
-        List<DataMode> GetSupportedDataModesForContext() =>
-            areDataModesEnabled && m_SupportedDataModes.Count > 0
-                ? m_SupportedDataModes
-                : k_DisabledDataModes;
-
-        DataMode GetLastKnownDataMode()
+        void OnPlayModeStateChanged(PlayModeStateChange stateChange)
         {
-            if (areDataModesEnabled)
-                return EditorApplication.isPlaying
-                    ? m_LastKnownPlayModeDataMode
-                    : m_LastKnownEditModeDataMode;
-
-            return DataMode.Disabled;
-        }
-
-        [SerializeField] DataMode m_LastKnownEditModeDataMode = DataMode.Authoring;
-        [SerializeField] DataMode m_LastKnownPlayModeDataMode = DataMode.Runtime;
-
-        public event Action<DataMode> dataModeChanged;
-
-        // Caching the DataMode to avoid round-trips to native multiple times per frame.
-        // Note: DataMode.Disabled is the same default as in ActiveEditorTracker.cpp
-        DataMode m_DataMode = DataMode.Disabled;
-
-        public DataMode dataMode
-        {
-            get => m_DataMode;
-            private set
-            {
-                if (m_DataMode == value)
-                    return;
-
-                tracker.dataMode = value;
-                m_DataMode = value;
-            }
-        }
-
-        public IReadOnlyList<DataMode> supportedDataModes => GetSupportedDataModesForContext();
-
-        public bool IsDataModeSupported(DataMode mode) => GetSupportedDataModesForContext().Contains(mode);
-
-        public void SwitchToNextDataMode()
-        {
-            var possibleDataModes = GetSupportedDataModesForContext();
-            var nextIndex = possibleDataModes.IndexOf(dataMode) + 1;
-            if (nextIndex >= possibleDataModes.Count)
-                nextIndex = 0;
+            if (stateChange is not (PlayModeStateChange.EnteredEditMode or PlayModeStateChange.EnteredPlayMode))
+                return;
 
-            SwitchToDataMode(possibleDataModes[nextIndex]);
+            m_IsEnteringPlaymode = true;
+            UpdateSupportedDataModesList();
         }
 
-        public void SwitchToDefaultDataMode()
+        void OnDataModeChanged(DataModeChangeEventArgs evt)
         {
-            var selectedDataMode = GetLastKnownDataMode();
-
-            if (!IsDataModeSupported(selectedDataMode))
-            {
-                // Fallback
-                selectedDataMode = supportedDataModes[0];
-            }
-
-            SwitchToDataMode(selectedDataMode);
+            tracker.dataMode = evt.nextDataMode;
+            tracker.ForceRebuild();
         }
 
-        public void SwitchToDataMode(DataMode mode)
+        protected void UpdateSupportedDataModesList()
         {
-            if (!IsDataModeSupported(mode))
-                SwitchToDefaultDataMode();
-
-            if (dataMode == mode)
-                return;
+            m_SupportedDataModes.Clear();
+            OnUpdateSupportedDataModes(m_SupportedDataModes);
+            m_SupportedDataModes.Sort();
 
-            dataMode = mode;
-            tracker.ForceRebuild();
+            if (m_InspectorMode != InspectorMode.Normal || m_SupportedDataModes.Count == 0)
+                m_SupportedDataModes = k_DisabledDataModes;
 
-            dataModeChanged?.Invoke(dataMode);
-        }
+            var dataMode = Selection.dataModeHint == DataMode.Disabled ? GetPreferredDataMode() : Selection.dataModeHint;
 
-        void OnPlayModeStateChanged(PlayModeStateChange playModeStateChange)
-        {
-            switch (playModeStateChange)
+            // When entering playmode, Inspector relies on getting selection hint
+            // from Hierarchy window to switch to the proper data mode.
+            // However when inspector is locked, selection is locked too.
+            // Here we force the preferred data mode to inspector for this special case.
+            if (m_IsEnteringPlaymode && m_Tracker.isLocked)
             {
-                case PlayModeStateChange.ExitingEditMode:
-                {
-                    // We're about to exit edit mode, save the last known DataMode
-                    m_LastKnownEditModeDataMode = dataMode;
-                    break;
-                }
-                case PlayModeStateChange.ExitingPlayMode:
-                {
-                    // We're about to exit play mode, save the last known DataMode
-                    m_LastKnownPlayModeDataMode = dataMode;
-                    break;
-                }
-                case PlayModeStateChange.EnteredEditMode:
-                case PlayModeStateChange.EnteredPlayMode:
-                {
-                    UpdateSupportedDataModes();
-                    SwitchToDefaultDataMode();
-                    break;
-                }
+                dataMode = GetPreferredDataMode();
+                m_IsEnteringPlaymode = false;
             }
-        }
 
-        protected void UpdateSupportedDataModes()
-        {
-            m_SupportedDataModes.Clear();
-            OnUpdateSupportedDataModes(m_SupportedDataModes);
-            m_SupportedDataModes.Sort();
+            dataModeController.UpdateSupportedDataModes(m_SupportedDataModes, dataMode);
         }
 
         protected virtual void OnUpdateSupportedDataModes(List<DataMode> supportedModes)
diff --git a/Editor/Mono/Inspector/QualitySettingsEditor.cs b/Editor/Mono/Inspector/QualitySettingsEditor.cs
index c96b3cbbf6..b2f0c0fa11 100644
--- a/Editor/Mono/Inspector/QualitySettingsEditor.cs
+++ b/Editor/Mono/Inspector/QualitySettingsEditor.cs
@@ -31,13 +31,13 @@ private class Content
             };
             public static readonly GUIContent[] kTextureMipmapLimitGroupsOffsetModeItems =
             {
-                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: -3", "Upload 3 mips less compared to the Global Mipmap Limit."),
-                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: -2", "Upload 2 mips less compared to the Global Mipmap Limit."),
-                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: -1", "Upload 1 mip less compared to the Global Mipmap Limit."),
+                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: -3", "Upload 3 mips extra compared to the Global Mipmap Limit."),
+                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: -2", "Upload 2 mips extra compared to the Global Mipmap Limit."),
+                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: -1", "Upload 1 mip extra compared to the Global Mipmap Limit."),
                 EditorGUIUtility.TrTextContent("Use Global Mipmap Limit", "No offset or override occurs, simply use the Global Mipmap Limit. (Default)"),
-                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: +1", "Upload 1 mip extra compared to the Global Mipmap Limit."),
-                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: +2", "Upload 2 mips extra compared to the Global Mipmap Limit."),
-                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: +3", "Upload 3 mips extra compared to the Global Mipmap Limit.")
+                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: +1", "Upload 1 mip less compared to the Global Mipmap Limit."),
+                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: +2", "Upload 2 mips less compared to the Global Mipmap Limit."),
+                EditorGUIUtility.TrTextContent("Offset Global Mipmap Limit: +3", "Upload 3 mips less compared to the Global Mipmap Limit.")
             };
             public static readonly GUIContent kTextureMipmapLimitGroupsOptions = EditorGUIUtility.TrIconContent("_Menu", "Show additional options");
             public static readonly GUIContent kTextureMipmapLimitGroupsOptionsIdentify = EditorGUIUtility.TrTextContent("Identify textures");
@@ -46,12 +46,13 @@ private class Content
             public static readonly GUIContent kTextureMipmapLimitGroupsAddButton = EditorGUIUtility.TrIconContent("Toolbar Plus", "Create a new mipmap limit group. Note that this adds a group to all quality levels, not only the active one!");
             public static readonly GUIContent kTextureMipmapLimitGroupsRemoveButton = EditorGUIUtility.TrIconContent("Toolbar Minus", "Remove mipmap limit group. Note that this removes the group from all quality levels, not only the active one!");
 
-            public static readonly string kTextureMipmapLimitGroupsDialogTitle = L10n.Tr("Mipmap Limit Groups");
-            public static readonly string kTextureMipmapLimitGroupsDialogMessageOnRemove = L10n.Tr("Textures in your project may still be using '{0}'.\n\nSelect 'No' to remove '{0}' without modifying its associated textures. Relevant textures stay bound to '{0}' and fall back automatically to the global mipmap limit.\n\nSelect 'Yes' to remove '{0}' and reset the group property of associated textures to 'None'. This triggers a re-import and may take some time.\n\nSelect 'Cancel' if you do not wish to remove '{0}' anymore.");
-            public static readonly string kTextureMipmapLimitGroupsDialogMessageOnRename = L10n.Tr("Textures in your project may still be using '{0}'.\n\nSelect 'No' to rename '{0}' without modifying its associated textures. Relevant textures stay bound to '{0}' and fall back automatically to the global mipmap limit.\n\nSelect 'Yes' to rename '{0}' and update the group property of associated textures to '{1}'. This triggers a re-import and may take some time.\n\nSelect 'Cancel' if you do not wish to rename '{0}' anymore.");
-            public static readonly string kTextureMipmapLimitGroupsDialogMessageOnRenameFail = L10n.Tr("The mipmap limit group '{0}' already exists!\n'{1}' was not renamed.");
+            public static readonly string kTextureMipmapLimitGroupsDialogTitleOnUpdate = L10n.Tr("Mipmap Limit Groups: Update textures?");
+            public static readonly string kTextureMipmapLimitGroupsDialogMessageOnRemove = L10n.Tr("Textures in your project may still be using '{0}'.\n\nSelect 'No' to remove the group without modifying its associated textures. Relevant textures stay bound to the group and fall back automatically to the global mipmap limit.\n\nSelect 'Yes' to remove the group and reset the group property of associated textures to 'None'. This triggers a re-import and may take some time. An undo cannot revert the importer changes.");
+            public static readonly string kTextureMipmapLimitGroupsDialogMessageOnRename = L10n.Tr("Textures in your project may still be using '{0}'.\n\nSelect 'No' to rename the group without modifying its associated textures. Relevant textures stay bound to the group and fall back automatically to the global mipmap limit.\n\nSelect 'Yes' to rename the group and update the group property of associated textures to '{1}'. This triggers a re-import and may take some time. An undo cannot revert the importer changes.");
+            public static readonly string kTextureMipmapLimitGroupsDialogTitleOnFailure = L10n.Tr("Mipmap Limit Groups: Operation failed");
+            public static readonly string kTextureMipmapLimitGroupsDialogMessageOnRenameFail = L10n.Tr("The mipmap limit group '{0}' already exists.\n'{1}' was not renamed.");
             public static readonly string kTextureMipmapLimitGroupsDialogMessageOnUpdateAssetsError = L10n.Tr("An error occured while updating texture assets: {0}");
-            public static readonly string kTextureMipmapLimitGroupsDialogMessageOnIdentifyFail = L10n.Tr("No textures are linked to the mipmap limit group '{0}'!");
+            public static readonly string kTextureMipmapLimitGroupsDialogMessageOnIdentifyFail = L10n.Tr("No textures are linked to the mipmap limit group '{0}'.");
 
             public static readonly GUIContent kStreamingMipmapsActive = EditorGUIUtility.TrTextContent("Texture Streaming", "When enabled, Unity only streams texture mipmaps relevant to the current Camera's position in a Scene. This reduces the total amount of memory Unity needs for textures. Individual textures must also have 'Streaming Mip Maps' enabled in their Import Settings.");
             public static readonly GUIContent kStreamingMipmapsMemoryBudget = EditorGUIUtility.TrTextContent("Memory Budget", "The amount of memory (in megabytes) to allocate for all loaded textures.");
@@ -65,6 +66,7 @@ private class Content
             public static readonly GUIContent kBillboardsFaceCameraPos = EditorGUIUtility.TrTextContent("Billboards Face Camera Position", "When enabled, terrain billboards face towards the camera position. Otherwise, they face towards the camera plane. This makes billboards look nicer when the camera rotates but it is more resource intensive to process.");
             public static readonly GUIContent kUseLegacyDistribution = EditorGUIUtility.TrTextContent("Use Legacy Details Distribution", "When enabled, terrain details will be scattered using the old scattering algorithm that often resulted in overlapping details. Included for backwards compatibility with terrain authored in Unity 2022.1 and earlier.");
             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 kRealtimeLGiCpuUsageLabel = EditorGUIUtility.TrTextContent("Realtime GI 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.");
             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.");
@@ -73,6 +75,7 @@ private class Content
             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.");
             public static readonly GUIContent kAsyncUploadBufferSize = EditorGUIUtility.TrTextContent("Buffer Size", "The size (in megabytes) of the upload buffer Unity uses to stream Texture and Mesh data to GPU.");
             public static readonly GUIContent kAsyncUploadPersistentBuffer = EditorGUIUtility.TrTextContent("Persistent Buffer", "When enabled, the upload buffer persists even when there is nothing left to upload.");
+            public static readonly GUIContent kAsyncUploadBufferSizeWarning = EditorGUIUtility.TrTextContent("Unity has detected that you are using an upload buffer size of {0} MB with the '{1}' setting enabled. If you have issues with excessive memory usage, you may need to reduce the upload buffer size or disable the '{1}' setting. Memory fragmentation can occur if you choose the latter option.");
 
             public static readonly GUIContent kOverrideTerrainPixelError = EditorGUIUtility.TrTextContent("", "Whether to override pixel error in active Terrains.");
             public static readonly GUIContent kOverrideTerrainBasemapDist = EditorGUIUtility.TrTextContent("", "Whether to override base map distance in active Terrains.");
@@ -119,7 +122,8 @@ private class Styles
         }
 
         public const int kMinAsyncRingBufferSize = 2;
-        public const int kMaxAsyncRingBufferSize = 512;
+        public const int kMaxAsyncRingBufferSize = 2047;
+        public const int kAsyncRingBufferSizeWarningThreshold = 513;
         public const int kMinAsyncUploadTimeSlice = 1;
         public const int kMaxAsyncUploadTimeSlice = 33;
 
@@ -647,6 +651,7 @@ public override void OnInspectorGUI()
             var terrainFadeLengthProperty = currentSettings.FindPropertyRelative("terrainFadeLength");
             var terrainMaxTreesProperty = currentSettings.FindPropertyRelative("terrainMaxTrees");
             var vSyncCountProperty = currentSettings.FindPropertyRelative("vSyncCount");
+            var realtimeGICPUUsageProperty = currentSettings.FindPropertyRelative("realtimeGICPUUsage");
             var lodBiasProperty = currentSettings.FindPropertyRelative("lodBias");
             var maximumLODLevelProperty = currentSettings.FindPropertyRelative("maximumLODLevel");
             var enableLODCrossFadeProperty = currentSettings.FindPropertyRelative("enableLODCrossFade");
@@ -702,6 +707,9 @@ public override void OnInspectorGUI()
                     EditorGUILayout.HelpBox(EditorGUIUtility.TrTextContent($"VSync Count '{vSyncCountProperty.enumLocalizedDisplayNames[vSyncCountProperty.enumValueIndex]}' is ignored on Android, iOS and tvOS.", EditorGUIUtility.GetHelpIcon(MessageType.Warning)));
             }
 
+            if (usingSRP)
+                EditorGUILayout.PropertyField(realtimeGICPUUsageProperty, Content.kRealtimeLGiCpuUsageLabel);
+
             bool shadowMaskSupported = SupportedRenderingFeatures.IsMixedLightingModeSupported(MixedLightingMode.Shadowmask);
             bool showShadowMaskUsage = shadowMaskSupported && !SupportedRenderingFeatures.active.overridesShadowmask;
 
@@ -853,6 +861,12 @@ public override void OnInspectorGUI()
             asyncUploadTimeSliceProperty.intValue = Mathf.Clamp(asyncUploadTimeSliceProperty.intValue, kMinAsyncUploadTimeSlice, kMaxAsyncUploadTimeSlice);
             asyncUploadBufferSizeProperty.intValue = Mathf.Clamp(asyncUploadBufferSizeProperty.intValue, kMinAsyncRingBufferSize, kMaxAsyncRingBufferSize);
 
+            if (asyncUploadBufferSizeProperty.intValue >= kAsyncRingBufferSizeWarningThreshold && asyncUploadPersistentBufferProperty.boolValue)
+            {
+                string messageToDisplay = string.Format(Content.kAsyncUploadBufferSizeWarning.text, asyncUploadBufferSizeProperty.intValue, Content.kAsyncUploadPersistentBuffer.text);
+                EditorGUILayout.HelpBox(messageToDisplay, MessageType.Warning, false);
+            }
+
             GUILayout.Space(10);
             GUILayout.Label(EditorGUIUtility.TempContent("Level of Detail"), EditorStyles.boldLabel);
 
@@ -1026,37 +1040,40 @@ void DoTextureMipmapLimitGroupNameTextField(Rect rect, GUIContent label)
         {
             const string controlName = "TextFieldTextureMipmapLimitGroup";
 
-            using (var changed = new EditorGUI.ChangeCheckScope())
-            {
-                GUI.SetNextControlName(controlName);
-                string newName = EditorGUI.DelayedTextField(rect, label.text, EditorStyles.textField);
+            GUI.SetNextControlName(controlName);
+            EditorGUI.DelayedTextField(rect, label.text, EditorStyles.textField);
 
-                Event e = Event.current;
-                if (m_TextureMipmapLimitGroupsTextFieldNeedsFocus)
+            Event e = Event.current;
+            if (m_TextureMipmapLimitGroupsTextFieldNeedsFocus)
+            {
+                if (e.type == EventType.Repaint) // Wait until all other events are out of the way
                 {
-                    if (e.type == EventType.Repaint) // Wait until all other events are out of the way
-                    {
-                        EditorGUI.s_DelayedTextEditor.text = label.text; // Should already be the case, but just to make sure.
-                        EditorGUI.s_DelayedTextEditor.SelectAll();
-                        EditorGUI.FocusTextInControl(controlName);
-                        m_TextureMipmapLimitGroupsTextFieldNeedsFocus = false;
-                    }
+                    EditorGUI.s_DelayedTextEditor.text = label.text; // Should already be the case, but just to make sure.
+                    EditorGUI.s_DelayedTextEditor.SelectAll();
+                    EditorGUI.FocusTextInControl(controlName);
+                    m_TextureMipmapLimitGroupsTextFieldNeedsFocus = false;
                 }
-                else
+            }
+            else
+            {
+                // If clicking out, the rename is NOT cancelled.
+                if (e.isMouse && !rect.Contains(e.mousePosition))
                 {
-                    if (changed.changed)
-                    {
-                        EndRenamingTextureMipmapLimitGroup(newName);
-                    }
-                    // If clicking out, the rename is NOT cancelled.
-                    else if (e.isMouse && !rect.Contains(e.mousePosition))
+                    EndRenamingTextureMipmapLimitGroup(EditorGUI.s_DelayedTextEditor.text);
+                }
+                // If editing stops or focus is lost, submit the current content of the text editor.
+                // Pressing ESC effectively cancels the rename. Pressing Enter, Tab or clicking away
+                // submits the user's new group name. (renaming is cancelled if the name didn't change)
+                else if (!EditorGUIUtility.editingTextField || GUI.GetNameOfFocusedControl() != controlName)
+                {
+                    // Cannot open a dialog box until a Repaint event if the user clicked away from the QualitySettingsEditor.
+                    if (e.type == EventType.Repaint)
                     {
                         EndRenamingTextureMipmapLimitGroup(EditorGUI.s_DelayedTextEditor.text);
+                        GUIUtility.ExitGUI(); // Prevents layout errors when clicking on certain other windows. (Hierarchy)
                     }
-                    else if (!EditorGUIUtility.editingTextField)
-                    {
-                        EndRenamingTextureMipmapLimitGroup();
-                    }
+                    else
+                        GUI.InternalRepaintEditorWindow(); // Prevents missing controls when window doesn't repaint on its own.
                 }
             }
         }
@@ -1141,8 +1158,8 @@ void RemoveTextureMipmapLimitGroup(ReorderableList list)
 
             if (!Presets.Preset.IsEditorTargetAPreset(target))
             {
-                int selection = EditorUtility.DisplayDialogComplex(Content.kTextureMipmapLimitGroupsDialogTitle,
-                string.Format(Content.kTextureMipmapLimitGroupsDialogMessageOnRemove, nameOfGroupToRemove),
+                int selection = EditorUtility.DisplayDialogComplex(Content.kTextureMipmapLimitGroupsDialogTitleOnUpdate,
+                string.Format(Content.kTextureMipmapLimitGroupsDialogMessageOnRemove, GetShortTextureMipmapLimitGroupName(nameOfGroupToRemove)),
                 L10n.Tr("No"), L10n.Tr("Cancel"), L10n.Tr("Yes"));
 
                 switch (selection)
@@ -1203,14 +1220,23 @@ void DuplicateTextureMipmapLimitGroup(int indexOfGroupToDuplicate)
 
         void UpdateTextureAssetsLinkedToOldTextureMipmapLimitGroup(string oldName, string newName)
         {
+            // If we operate on importers while they are selected, the user will still be prompted to confirm changes
+            // that they already agreed to. To avoid this: reset the selection, and restore it after we're done.
+            Object[] originalSelection = Selection.objects;
+
             try
             {
-                string[] guids = AssetDatabase.FindAssets("t:texture");
+                Selection.objects = null;
+
+                string[] guids = AssetDatabase.FindAssets("t:texture t:preset");
                 AssetDatabase.StartAssetEditing();
 
                 for (int i = 0; i < guids.Length; ++i)
                 {
-                    AssetImporter importer = AssetImporter.GetAtPath(AssetDatabase.GUIDToAssetPath(guids[i]));
+                    string assetPath = AssetDatabase.GUIDToAssetPath(guids[i]);
+                    Presets.Preset preset = AssetDatabase.LoadMainAssetAtPath(assetPath) as Presets.Preset;
+                    bool isPreset = preset is not null;
+                    AssetImporter importer = isPreset ? preset.GetReferenceObject() as AssetImporter : AssetImporter.GetAtPath(assetPath);
 
                     if (importer is TextureImporter)
                     {
@@ -1218,7 +1244,13 @@ void UpdateTextureAssetsLinkedToOldTextureMipmapLimitGroup(string oldName, strin
                         if (texImporter.textureShape == TextureImporterShape.Texture2D && texImporter.mipmapLimitGroupName == oldName)
                         {
                             texImporter.mipmapLimitGroupName = newName;
-                            importer.SaveAndReimport();
+                            if (!isPreset)
+                                importer.SaveAndReimport();
+                            else
+                            {
+                                preset.UpdateProperties(importer);
+                                AssetDatabase.ImportAsset(assetPath);
+                            }
                         }
                     }
                     else if (importer is IHVImageFormatImporter)
@@ -1227,20 +1259,27 @@ void UpdateTextureAssetsLinkedToOldTextureMipmapLimitGroup(string oldName, strin
                         if (ihvImporter.mipmapLimitGroupName == oldName)
                         {
                             ihvImporter.mipmapLimitGroupName = newName;
-                            importer.SaveAndReimport();
+                            if (!isPreset)
+                                importer.SaveAndReimport();
+                            else
+                            {
+                                preset.UpdateProperties(importer);
+                                AssetDatabase.ImportAsset(assetPath);
+                            }
                         }
                     }
                 }
             }
             catch (System.Exception e)
             {
-                EditorUtility.DisplayDialog(Content.kTextureMipmapLimitGroupsDialogTitle,
+                EditorUtility.DisplayDialog(Content.kTextureMipmapLimitGroupsDialogTitleOnFailure,
                     string.Format(Content.kTextureMipmapLimitGroupsDialogMessageOnUpdateAssetsError, e.Message),
                     L10n.Tr("OK"));
             }
             finally
             {
                 AssetDatabase.StopAssetEditing();
+                Selection.objects = originalSelection;
             }
         }
 
@@ -1275,8 +1314,8 @@ void IdentifyAssetsUsingTextureMipmapLimitGroup(string groupNameToIdentify)
             }
             else
             {
-                EditorUtility.DisplayDialog(Content.kTextureMipmapLimitGroupsDialogTitle,
-                    string.Format(Content.kTextureMipmapLimitGroupsDialogMessageOnIdentifyFail, groupNameToIdentify),
+                EditorUtility.DisplayDialog(Content.kTextureMipmapLimitGroupsDialogTitleOnFailure,
+                    string.Format(Content.kTextureMipmapLimitGroupsDialogMessageOnIdentifyFail, GetShortTextureMipmapLimitGroupName(groupNameToIdentify)),
                     L10n.Tr("OK"));
             }
         }
@@ -1311,12 +1350,15 @@ void EndRenamingTextureMipmapLimitGroup(string newName = "")
                     return;
                 }
 
+                string shortNewName = GetShortTextureMipmapLimitGroupName(newName);
+                string shortToRename = GetShortTextureMipmapLimitGroupName(toRename);
+
                 for (int i = 0; i < m_TextureMipmapLimitGroupNamesProperty.arraySize; ++i)
                 {
                     if (m_TextureMipmapLimitGroupNamesProperty.GetArrayElementAtIndex(i).stringValue == newName)
                     {
-                        EditorUtility.DisplayDialog(Content.kTextureMipmapLimitGroupsDialogTitle,
-                            string.Format(Content.kTextureMipmapLimitGroupsDialogMessageOnRenameFail, newName, toRename),
+                        EditorUtility.DisplayDialog(Content.kTextureMipmapLimitGroupsDialogTitleOnFailure,
+                            string.Format(Content.kTextureMipmapLimitGroupsDialogMessageOnRenameFail, shortNewName, shortToRename),
                             L10n.Tr("OK"));
                         return;
                     }
@@ -1325,8 +1367,8 @@ void EndRenamingTextureMipmapLimitGroup(string newName = "")
                 bool applyModifiedProperties = true;
                 if (m_TextureMipmapLimitGroupsRenameShowUpdatePrompt)
                 {
-                    int selection = EditorUtility.DisplayDialogComplex(Content.kTextureMipmapLimitGroupsDialogTitle,
-                        string.Format(Content.kTextureMipmapLimitGroupsDialogMessageOnRename, toRename, newName),
+                    int selection = EditorUtility.DisplayDialogComplex(Content.kTextureMipmapLimitGroupsDialogTitleOnUpdate,
+                        string.Format(Content.kTextureMipmapLimitGroupsDialogMessageOnRename, shortToRename, shortNewName),
                         L10n.Tr("No"), L10n.Tr("Cancel"), L10n.Tr("Yes"));
 
                     switch (selection)
@@ -1380,6 +1422,20 @@ string[] GetAllKnownTextureMipmapLimitGroupNames()
             return existingNames;
         }
 
+        // Only meant to limit the length of various messages addressed to the user that concern mipmap limit groups.
+        // Don't use elsewhere.
+        string GetShortTextureMipmapLimitGroupName(string groupName)
+        {
+            const int maxGroupNameLength = 41;
+            // ^ Cannot fit more than this many characters on 1 line.
+            if (groupName.Length > maxGroupNameLength)
+            {
+                const string suffix = " (...)";
+                groupName = groupName.Substring(0, maxGroupNameLength - suffix.Length) + suffix;
+            }
+            return groupName;
+        }
+
         [SettingsProvider]
         internal static SettingsProvider CreateProjectSettingsProvider()
         {
diff --git a/Editor/Mono/Inspector/ReflectionProbeEditor.cs b/Editor/Mono/Inspector/ReflectionProbeEditor.cs
index a9eb5df846..5da525110e 100644
--- a/Editor/Mono/Inspector/ReflectionProbeEditor.cs
+++ b/Editor/Mono/Inspector/ReflectionProbeEditor.cs
@@ -239,7 +239,7 @@ public void OnDisable()
 
         private bool IsCollidingWithOtherProbes(string targetPath, ReflectionProbe targetProbe, out ReflectionProbe collidingProbe)
         {
-            ReflectionProbe[] probes = FindObjectsOfType<ReflectionProbe>().ToArray();
+            ReflectionProbe[] probes = FindObjectsByType<ReflectionProbe>(FindObjectsSortMode.InstanceID).ToArray();
             collidingProbe = null;
             foreach (var probe in probes)
             {
@@ -692,7 +692,7 @@ private void OnPreSceneGUICallback(SceneView sceneView)
                 if (!reflectiveMaterial)
                     return;
 
-                if (!StageUtility.IsGameObjectRenderedByCameraAndPartOfEditableScene(p.gameObject, Camera.current))
+                if (StageUtility.IsGizmoCulledBySceneCullingMasksOrFocusedScene(p.gameObject, Camera.current))
                     return;
 
                 Matrix4x4 m = new Matrix4x4();
diff --git a/Editor/Mono/Inspector/RenderPipelineEditorUtility.cs b/Editor/Mono/Inspector/RenderPipelineEditorUtility.cs
index 61edf8d303..690db4bc23 100644
--- a/Editor/Mono/Inspector/RenderPipelineEditorUtility.cs
+++ b/Editor/Mono/Inspector/RenderPipelineEditorUtility.cs
@@ -9,42 +9,27 @@
 
 namespace UnityEditor.Rendering
 {
-    [AttributeUsage(AttributeTargets.Class)]
-    public class ScriptableRenderPipelineExtensionAttribute : Attribute
-    {
-        internal Type renderPipelineType;
-
-        public ScriptableRenderPipelineExtensionAttribute(Type renderPipelineAsset)
-        {
-            if (!(renderPipelineAsset?.IsSubclassOf(typeof(RenderPipelineAsset)) ?? false))
-                throw new ArgumentException("Given renderPipelineAsset must derive from RenderPipelineAsset");
-            renderPipelineType = renderPipelineAsset;
-        }
-
-        public bool inUse
-            => GraphicsSettings.currentRenderPipeline?.GetType() == renderPipelineType;
-    }
-
     public static class RenderPipelineEditorUtility
     {
         public static Type[] GetDerivedTypesSupportedOnCurrentPipeline<T>()
         {
-            return TypeCache.GetTypesDerivedFrom<T>().Where(t =>
-            {
-                var attribute = t.GetCustomAttribute<SupportedOnRenderPipelineAttribute>();
-                return attribute != null && attribute.isSupportedOnCurrentPipeline;
-
-            }).ToArray();
+            return TypeCache.GetTypesDerivedFrom<T>()
+                .Where(t => t.GetCustomAttribute<SupportedOnRenderPipelineAttribute>() is { isSupportedOnCurrentPipeline: true })
+                .ToArray();
         }
 
+        [Obsolete($"{nameof(FetchFirstCompatibleTypeUsingScriptableRenderPipelineExtension)} is deprecated. Use {nameof(GetDerivedTypesSupportedOnCurrentPipeline)} instead. #from(2023.1)", false)]
         public static Type FetchFirstCompatibleTypeUsingScriptableRenderPipelineExtension<TBaseClass>()
         {
             var extensionTypes = TypeCache.GetTypesDerivedFrom<TBaseClass>();
 
             foreach (Type extensionType in extensionTypes)
             {
+#pragma warning disable CS0618
                 if (Attribute.GetCustomAttribute(extensionType, typeof(ScriptableRenderPipelineExtensionAttribute)) is ScriptableRenderPipelineExtensionAttribute { inUse: true })
                     return extensionType;
+#pragma warning restore CS0618
+
             }
 
             return null;
diff --git a/Editor/Mono/Inspector/RenderTextureEditor.cs b/Editor/Mono/Inspector/RenderTextureEditor.cs
index db07e6b22d..d539d32dbf 100644
--- a/Editor/Mono/Inspector/RenderTextureEditor.cs
+++ b/Editor/Mono/Inspector/RenderTextureEditor.cs
@@ -27,6 +27,7 @@ private class Styles
             public readonly GUIContent enableMipmaps = EditorGUIUtility.TrTextContent("Enable Mip Maps", "This render texture will have Mip Maps.");
             public readonly GUIContent autoGeneratesMipmaps = EditorGUIUtility.TrTextContent("Auto generate Mip Maps", "This render texture automatically generates its Mip Maps.");
             public readonly GUIContent useDynamicScale = EditorGUIUtility.TrTextContent("Dynamic Scaling", "Allow the texture to be automatically resized by ScalableBufferManager, to support dynamic resolution.");
+            public readonly GUIContent enableRandomWrite = EditorGUIUtility.TrTextContent("Random Write", "Enable/disable random access write into the color buffer of this render texture.");
             public readonly GUIContent shadowSamplingMode = EditorGUIUtility.TrTextContent("Shadow Sampling Mode", "Enable/disable shadow depth-compare sampling and percentage closer filtering.");
 
             public readonly GUIContent[] renderTextureAntiAliasing =
@@ -68,6 +69,7 @@ protected enum GUIElements
         SerializedProperty m_Dimension;
         SerializedProperty m_sRGB;
         SerializedProperty m_UseDynamicScale;
+        SerializedProperty m_EnableRandomWrite;
         SerializedProperty m_ShadowSamplingMode;
 
         protected override void OnEnable()
@@ -85,6 +87,7 @@ protected override void OnEnable()
             m_Dimension = serializedObject.FindProperty("m_Dimension");
             m_sRGB = serializedObject.FindProperty("m_SRGB");
             m_UseDynamicScale = serializedObject.FindProperty("m_UseDynamicScale");
+            m_EnableRandomWrite = serializedObject.FindProperty("m_EnableRandomWrite");
             m_ShadowSamplingMode = serializedObject.FindProperty("m_ShadowSamplingMode");
 
             Undo.undoRedoEvent += OnUndoRedoPerformed;
@@ -220,6 +223,7 @@ protected void OnRenderTextureGUI(GUIElements guiElements)
             }
 
             EditorGUILayout.PropertyField(m_UseDynamicScale, styles.useDynamicScale);
+            EditorGUILayout.PropertyField(m_EnableRandomWrite, styles.enableRandomWrite);
 
             var rt = target as RenderTexture;
             if (GUI.changed && rt != null)
diff --git a/Editor/Mono/Inspector/RendererLightingSettings.cs b/Editor/Mono/Inspector/RendererLightingSettings.cs
index 818fba4046..091251a7a5 100644
--- a/Editor/Mono/Inspector/RendererLightingSettings.cs
+++ b/Editor/Mono/Inspector/RendererLightingSettings.cs
@@ -375,6 +375,7 @@ public void RenderTerrainSettings()
                 {
                     EditorGUILayout.HelpBox(Styles.giNotEnabledInfo.text, MessageType.Info);
                     EditorGUI.indentLevel -= 1;
+                    EditorGUILayout.EndFoldoutHeaderGroup();
                     return;
                 }
 
@@ -594,24 +595,6 @@ void ShowAtlasGUI(int instanceID, bool isMeshRenderer)
             GUILayout.FlexibleSpace();
             GUILayout.EndHorizontal();
 
-            bool showProgressiveInfo = !isPreset && settings.bakedGI;
-
-            if (showProgressiveInfo && Unsupported.IsDeveloperMode())
-            {
-                Hash128 instanceHash;
-                Lightmapping.GetPVRInstanceHash(instanceID, out instanceHash);
-                EditorGUILayout.LabelField(Styles.pvrInstanceHash, GUIContent.Temp(instanceHash.ToString()));
-
-                Hash128 atlasHash;
-                Lightmapping.GetPVRAtlasHash(instanceID, out atlasHash);
-                EditorGUILayout.LabelField(Styles.pvrAtlasHash, GUIContent.Temp(atlasHash.ToString()));
-
-                int atlasInstanceOffset;
-                Lightmapping.GetPVRAtlasInstanceOffset(instanceID, out atlasInstanceOffset);
-                EditorGUILayout.LabelField(Styles.pvrAtlasInstanceOffset, GUIContent.Temp(atlasInstanceOffset.ToString()));
-            }
-            EditorGUI.indentLevel -= 1;
-
             GUILayout.Space(5);
         }
 
diff --git a/Editor/Mono/Inspector/ReorderableListWrapper.cs b/Editor/Mono/Inspector/ReorderableListWrapper.cs
index b2a5dd1139..66e085a3df 100644
--- a/Editor/Mono/Inspector/ReorderableListWrapper.cs
+++ b/Editor/Mono/Inspector/ReorderableListWrapper.cs
@@ -24,10 +24,13 @@ public static class Constants
         internal ReorderableList m_ReorderableList;
         float m_HeaderHeight;
         bool m_Reorderable = false;
-        bool m_IsNotInPrefabContextModeWithOverrides = false;
+        bool m_ListIsPatchedInPrefabModeInContext = false;
+        bool m_DisableListElements = false;
 
         SerializedProperty m_OriginalProperty;
         SerializedProperty m_ArraySize;
+        string m_PropertyPath = string.Empty;
+        string m_PropertyPathArraySize = string.Empty;
 
         internal static Rect s_ToolTipRect;
 
@@ -41,14 +44,23 @@ internal SerializedProperty Property
             set
             {
                 m_OriginalProperty = value;
-                if (!m_OriginalProperty.isValid) return;
+                if (!m_OriginalProperty.isValid)
+                {
+                    m_ArraySize = null;
+                    m_PropertyPath = string.Empty;
+                    m_PropertyPathArraySize = string.Empty;
+                    return;
+                }
                 m_ArraySize = m_OriginalProperty.FindPropertyRelative("Array.size");
+                m_PropertyPath = m_OriginalProperty.propertyPath;
+                m_PropertyPathArraySize = m_OriginalProperty + ".Array.size";
 
                 if (m_ReorderableList != null)
                 {
                     bool versionChanged = !SerializedProperty.VersionEquals(m_ReorderableList.serializedProperty, m_OriginalProperty);
 
                     m_ReorderableList.serializedProperty = m_OriginalProperty;
+                    UpdatePrefabPatchState(m_OriginalProperty.serializedObject.targetObject);
 
                     if (versionChanged || m_ArraySize != null && m_LastArraySize != m_ArraySize.intValue)
                     {
@@ -78,18 +90,16 @@ public static string GetPropertyIdentifier(SerializedProperty serializedProperty
 
         public ReorderableListWrapper(SerializedProperty property, GUIContent label, bool reorderable = true)
         {
-            Property = property;
-            m_HeaderHeight = Constants.kDefaultFoldoutHeaderHeight;
-            Init(reorderable);
+            Init(reorderable, property);
         }
 
-        void Init(bool reorderable)
+        void Init(bool reorderable, SerializedProperty property)
         {
             m_Reorderable = reorderable;
-            SerializedProperty childProperty = Property.Copy();
+            SerializedProperty childProperty = property.Copy();
             childProperty.Next(true);
 
-            m_ReorderableList = new ReorderableList(Property.serializedObject, Property.Copy(), m_Reorderable, false, true, true);
+            m_ReorderableList = new ReorderableList(property.serializedObject, property.Copy(), m_Reorderable, false, true, true);
             m_ReorderableList.headerHeight = ReorderableList.Defaults.minHeaderHeight;
             m_ReorderableList.m_IsEditable = true;
             m_ReorderableList.multiSelect = true;
@@ -98,13 +108,16 @@ void Init(bool reorderable)
 
             m_ReorderableList.onCanAddCallback += (list) =>
             {
-                return m_IsNotInPrefabContextModeWithOverrides;
+                return !m_ListIsPatchedInPrefabModeInContext;
             };
 
             m_ReorderableList.onCanRemoveCallback += (list) =>
             {
-                return m_IsNotInPrefabContextModeWithOverrides;
+                return !m_ListIsPatchedInPrefabModeInContext;
             };
+
+            Property = property;
+            m_HeaderHeight = Constants.kDefaultFoldoutHeaderHeight;
         }
 
         internal void InvalidateCache() => m_ReorderableList.InvalidateCache();
@@ -114,13 +127,28 @@ public float GetHeight()
             return m_HeaderHeight + (Property.isExpanded && m_ReorderableList != null ? Constants.kHeaderPadding + m_ReorderableList.GetHeight() : 0.0f);
         }
 
+        void UpdatePrefabPatchState(Object serializedObjectTarget)
+        {
+            m_DisableListElements = false;
+            m_ListIsPatchedInPrefabModeInContext = false;
+
+            var prefabStage = PrefabStageUtility.GetCurrentPrefabStage();
+            if (prefabStage != null)
+            {
+                m_ListIsPatchedInPrefabModeInContext = prefabStage.HasPatchedPropertyModificationsFor(serializedObjectTarget, m_PropertyPath);
+                if (m_ListIsPatchedInPrefabModeInContext)
+                {
+                    m_DisableListElements = prefabStage.HasPatchedPropertyModificationsFor(serializedObjectTarget, m_PropertyPathArraySize);
+                }
+            }
+
+            if (m_ReorderableList != null)
+                m_ReorderableList.draggable = m_Reorderable && !m_ListIsPatchedInPrefabModeInContext;
+        }
+
         public void Draw(GUIContent label, Rect r, Rect visibleArea, string tooltip, bool includeChildren)
         {
             r.xMin += EditorGUI.indent;
-            var prefabStage = PrefabStageUtility.GetCurrentPrefabStage();
-            m_IsNotInPrefabContextModeWithOverrides = prefabStage == null || prefabStage.mode != PrefabStage.Mode.InContext || !PrefabStage.s_PatchAllOverriddenProperties
-                || Selection.objects.All(obj => PrefabUtility.IsPartOfAnyPrefab(obj) && !AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(obj)).Equals(AssetDatabase.AssetPathToGUID(prefabStage.assetPath)));
-            m_ReorderableList.draggable = m_Reorderable && m_IsNotInPrefabContextModeWithOverrides;
 
             Rect headerRect = new Rect(r.x, r.y, r.width, m_HeaderHeight);
             Rect sizeRect = new Rect(headerRect.xMax - Constants.kArraySizeWidth - EditorGUI.indent * EditorGUI.indentLevel, headerRect.y,
@@ -165,7 +193,11 @@ public void Draw(GUIContent label, Rect r, Rect visibleArea, string tooltip, boo
                 m_ReorderableList.InvalidateCacheRecursive();
             }
 
+            if (m_DisableListElements)
+                GUI.enabled = false;
+
             DrawChildren(r, headerRect, sizeRect, visibleArea, prevType);
+            GUI.enabled = prevEnabled;
         }
 
         void DrawChildren(Rect listRect, Rect headerRect, Rect sizeRect, Rect visibleRect, EventType previousEvent)
diff --git a/Editor/Mono/Inspector/ScriptExecutionOrderInspector.cs b/Editor/Mono/Inspector/ScriptExecutionOrderInspector.cs
index 51a99df4f3..130810206c 100644
--- a/Editor/Mono/Inspector/ScriptExecutionOrderInspector.cs
+++ b/Editor/Mono/Inspector/ScriptExecutionOrderInspector.cs
@@ -207,7 +207,7 @@ static bool IsValidScript(MonoScript script)
 
             // The user can only define the order of scripts in the assets folder.
             bool isRootFolder, isReadOnly;
-            if (!AssetDatabase.GetAssetFolderInfo(AssetDatabase.GetAssetPath(script), out isRootFolder, out isReadOnly))
+            if (!AssetDatabase.TryGetAssetFolderInfo(AssetDatabase.GetAssetPath(script), out isRootFolder, out isReadOnly))
             {
                 return false;
             }
diff --git a/Editor/Mono/Inspector/ScriptableRenderPipelineExtensionAttribute.deprecated.cs b/Editor/Mono/Inspector/ScriptableRenderPipelineExtensionAttribute.deprecated.cs
new file mode 100644
index 0000000000..0f6a6bb85a
--- /dev/null
+++ b/Editor/Mono/Inspector/ScriptableRenderPipelineExtensionAttribute.deprecated.cs
@@ -0,0 +1,26 @@
+// 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.Rendering;
+
+namespace UnityEditor.Rendering;
+
+[Obsolete($"{nameof(ScriptableRenderPipelineExtensionAttribute)} is deprecated. Use {nameof(SupportedOnRenderPipelineAttribute)} instead. #from(23.1) (UnityUpgradable) -> UnityEngine.Rendering.SupportedOnRenderPipelineAttribute", false)]
+[AttributeUsage(AttributeTargets.Class)]
+public class ScriptableRenderPipelineExtensionAttribute : Attribute
+{
+    internal Type renderPipelineType;
+
+    public ScriptableRenderPipelineExtensionAttribute(Type rpAssetType)
+    {
+        if (!(rpAssetType?.IsSubclassOf(typeof(RenderPipelineAsset)) ?? false))
+            throw new ArgumentException($"Given {nameof(rpAssetType)} must derive from {nameof(RenderPipelineAsset)}");
+        renderPipelineType = rpAssetType;
+    }
+
+    [Obsolete($"ScriptableRenderPipelineExtensionAttribute.inUse is deprecated. Use SupportedOnRenderPipelineAttribute.isSupportedOnCurrentPipeline instead. #from(23.1) (UnityUpgradable) -> UnityEngine.Rendering.SupportedOnRenderPipelineAttribute.isSupportedOnCurrentPipeline", false)]
+    public bool inUse
+        => GraphicsSettings.currentRenderPipelineAssetType == renderPipelineType;
+}
diff --git a/Editor/Mono/Inspector/SpriteFrameInspector.cs b/Editor/Mono/Inspector/SpriteFrameInspector.cs
index 76a5c416f7..07ae7133f3 100644
--- a/Editor/Mono/Inspector/SpriteFrameInspector.cs
+++ b/Editor/Mono/Inspector/SpriteFrameInspector.cs
@@ -185,14 +185,18 @@ public static Texture2D BuildPreviewTexture(Sprite sprite, Material spriteRender
             if (!isPolygon)
             {
                 // 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);
+                var minWidth = Mathf.Min(64f, width);
+                var minHeight = Mathf.Min(64f, 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);
+                // Set minimum size for width/height to prevent small previews for small sprites
+                if (width < minWidth && height < minHeight)
+                {
+                    var ratio = Mathf.Min( minWidth / width, minHeight / height);
+                    width = Mathf.FloorToInt(width * ratio);
+                    height = Mathf.FloorToInt(height * ratio);
+                }
             }
 
             SavedRenderTargetState savedRTState = new SavedRenderTargetState();
diff --git a/Editor/Mono/Inspector/TagManagerInspector.cs b/Editor/Mono/Inspector/TagManagerInspector.cs
index 1ac0eb1f36..f028a3a3f6 100644
--- a/Editor/Mono/Inspector/TagManagerInspector.cs
+++ b/Editor/Mono/Inspector/TagManagerInspector.cs
@@ -151,7 +151,8 @@ public override void OnGUI(Rect windowRect)
                 }
 
                 GUI.enabled = m_NewTagName.Length != 0;
-                if (GUILayout.Button("Save") || hitEnter)
+                var savePressed = GUILayout.Button("Save");
+                if (!string.IsNullOrWhiteSpace(m_NewTagName) && (savePressed || hitEnter))
                 {
                     EnterCB(m_NewTagName);
                     editorWindow.Close();
@@ -240,6 +241,9 @@ void AddToSortLayerList(ReorderableList list)
                 list.serializedProperty.GetArrayElementAtIndex(list.index).FindPropertyRelative("name").stringValue = "New Layer";
                 list.serializedProperty.serializedObject.ApplyModifiedProperties();
             }
+
+            if (SortingLayer.onLayerAdded != null)
+                SortingLayer.onLayerAdded(SortingLayer.layers[list.index]);
         }
 
         public void ReorderSortLayerList(ReorderableList list)
@@ -250,6 +254,9 @@ public void ReorderSortLayerList(ReorderableList list)
 
         private void RemoveFromSortLayerList(ReorderableList list)
         {
+            if (SortingLayer.onLayerRemoved != null)
+                SortingLayer.onLayerRemoved(SortingLayer.layers[list.index]);
+
             ReorderableList.defaultBehaviours.DoRemoveButton(list);
             serializedObject.ApplyModifiedProperties();
             serializedObject.Update();
diff --git a/Editor/Mono/Inspector/Texture2DArrayInspector.cs b/Editor/Mono/Inspector/Texture2DArrayInspector.cs
index eb45552ba9..becde6411c 100644
--- a/Editor/Mono/Inspector/Texture2DArrayInspector.cs
+++ b/Editor/Mono/Inspector/Texture2DArrayInspector.cs
@@ -15,7 +15,7 @@ class Texture2DArrayInspector : TextureInspector
         public override string GetInfoString()
         {
             var tex = (Texture2DArray)target;
-            var info = $"{tex.width}x{tex.height} {tex.depth} slice{(tex.depth != 1 ? "s" : "")} {GraphicsFormatUtility.GetFormatString(tex.format)} {EditorUtility.FormatBytes(TextureUtil.GetRuntimeMemorySizeLong(tex))}";
+            var info = $"{tex.width}x{tex.height} {tex.depth} slice{(tex.depth != 1 ? "s" : "")} {GraphicsFormatUtility.GetFormatString(tex.format)} {EditorUtility.FormatBytes(TextureUtil.GetStorageMemorySizeLong(tex))}";
             return info;
         }
 
diff --git a/Editor/Mono/Inspector/Texture3DPreview.cs b/Editor/Mono/Inspector/Texture3DPreview.cs
index 0f3edc1678..e36eb05462 100644
--- a/Editor/Mono/Inspector/Texture3DPreview.cs
+++ b/Editor/Mono/Inspector/Texture3DPreview.cs
@@ -98,6 +98,7 @@ static class Styles
         const float s_MinViewDistance = 0f;
         const float s_MaxViewDistance = 5.0f;
         static readonly Vector2 s_InitialRotation = new Vector2(15, 30);
+        const float s_MaxPreviewPixelCount = 512 * 512 * 512;
 
         PreviewRenderUtility m_PreviewUtility;
         Preview3DMode m_Preview3DMode;
@@ -188,7 +189,7 @@ public string GetInfoString()
 
             Vector3 resolution = GetTextureResolution(Texture);
             var format = GraphicsFormatUtility.GetFormatString(Texture.graphicsFormat);
-            var size = EditorUtility.FormatBytes(TextureUtil.GetRuntimeMemorySizeLong(Texture));
+            var size = EditorUtility.FormatBytes(TextureUtil.GetStorageMemorySizeLong(Texture));
             string info = $"{resolution.x}x{resolution.y}x{resolution.z} {format} {size}";
             return info;
         }
@@ -440,6 +441,16 @@ void DrawPreview()
             m_PreviewUtility.Render();
         }
 
+        bool IsPreviewExpensiveToDisplay()
+        {
+            if (m_Preview3DMode == Preview3DMode.Volume || m_Preview3DMode == Preview3DMode.SDF)
+            {
+                Vector3 res = GetTextureResolution(Texture);
+                return res.x * res.y * res.z > s_MaxPreviewPixelCount;
+            }
+            return false;
+        }
+
         public void OnPreviewGUI(Rect r, GUIStyle background)
         {
             if (!ShaderUtil.hardwareSupportsRectRenderTexture || !SystemInfo.supports3DTextures)
@@ -455,6 +466,12 @@ public void OnPreviewGUI(Rect r, GUIStyle background)
                     EditorGUI.DropShadowLabel(new Rect(r.x, r.y, r.width, 40), "Compressed 3D texture preview is not supported");
                 return;
             }
+            if (IsPreviewExpensiveToDisplay())
+            {
+                if (Event.current.type == EventType.Repaint)
+                    EditorGUI.DropShadowLabel(new Rect(r.x, r.y, r.width, 40), "Preview disabled (3D texture too large to display)");
+                return;
+            }
 
             InitPreviewUtility();
             Event e = Event.current;
@@ -487,6 +504,9 @@ public Texture2D RenderStaticPreview(Texture texture, int width, int height)
             OnEnable();
             m_QualityModifier *= 2;
 
+            if (IsPreviewExpensiveToDisplay())
+                return null;
+
             Rect r = new Rect(0, 0, width, height);
             m_PreviewUtility.BeginStaticPreview(r);
             DrawPreview();
diff --git a/Editor/Mono/Inspector/TextureInspector.cs b/Editor/Mono/Inspector/TextureInspector.cs
index 27be8f1962..cda9a7406a 100644
--- a/Editor/Mono/Inspector/TextureInspector.cs
+++ b/Editor/Mono/Inspector/TextureInspector.cs
@@ -30,8 +30,8 @@ internal static void AdjustWidthAndHeightForStaticPreview(int textureWidth, int
             {
                 // For textures larger than our wanted width and height we ensure to
                 // keep aspect ratio of the texture and fit it to best match our wanted width and height.
-                float relWidth = height / (float)textureWidth;
-                float relHeight = width / (float)textureHeight;
+                float relWidth = width / (float)textureWidth;
+                float relHeight = height / (float)textureHeight;
 
                 float scale = Mathf.Min(relHeight, relWidth);
 
@@ -69,7 +69,7 @@ internal class TextureInspector : Editor
         class Styles
         {
             public GUIContent smallZoom, largeZoom;
-            public GUIStyle toolbarButton, previewSlider, previewSliderThumb, previewLabel;
+            public GUIStyle toolbarButton, previewSlider, previewSliderThumb, previewLabel, mipLevelLabel;
 
             public readonly GUIContent[] previewButtonContents =
             {
@@ -111,6 +111,10 @@ public Styles()
                 previewSlider = "preSlider";
                 previewSliderThumb = "preSliderThumb";
                 previewLabel = "toolbarLabel";
+
+                mipLevelLabel = "PreOverlayLabel";
+                mipLevelLabel.alignment = TextAnchor.UpperCenter;
+                mipLevelLabel.padding.top = 5;
             }
         }
         static Styles s_Styles;
@@ -233,7 +237,10 @@ protected virtual void OnDisable()
         {
             RestoreLastTextureMipLevels();
 
+            m_TextureMipLevels.Clear();
+
             m_CubemapPreview.OnDisable();
+            m_Texture3DPreview.OnDisable();
             DestroyImmediate(m_Texture3DPreview);
         }
 
@@ -283,6 +290,15 @@ public float GetMipLevelForRendering()
                 return Mathf.Min(m_MipLevel, TextureUtil.GetMipmapCount(target as Texture) - 1);
         }
 
+        public int GetMipmapLimit(Texture t)
+        {
+            if (t is Texture2D)
+            {
+                return (t as Texture2D).activeMipmapLimit;
+            }
+            return 0;
+        }
+
         public float mipLevel
         {
             get
@@ -680,9 +696,17 @@ public override void OnPreviewSettings()
 
             if (mipCount > 1)
             {
+                int mipmapLimit = GetMipmapLimit(target as Texture);
                 GUILayout.Box(s_Styles.smallZoom, s_Styles.previewLabel);
                 GUI.changed = false;
-                m_MipLevel = Mathf.Round(GUILayout.HorizontalSlider(m_MipLevel, mipCount - 1, 0, s_Styles.previewSlider, s_Styles.previewSliderThumb, GUILayout.MaxWidth(64)));
+
+                int leftValue = mipCount - mipmapLimit - 1;
+                if (m_MipLevel > leftValue)
+                {
+                    // Left value can change depending on the mipmap limit. Cap slider value appropriately.
+                    m_MipLevel = leftValue;
+                }
+                m_MipLevel = Mathf.Round(GUILayout.HorizontalSlider(m_MipLevel, leftValue, 0, s_Styles.previewSlider, s_Styles.previewSliderThumb, GUILayout.MaxWidth(64)));
 
                 //For now, we don't have mipmaps smaller than the tile size when using VT.
                 if (EditorGUI.UseVTMaterial(tex))
@@ -847,9 +871,20 @@ public override void OnPreviewGUI(Rect r, GUIStyle background)
 
             TextureUtil.SetFilterModeNoDirty(t, oldFilter);
 
+            int mipmapLimit = GetMipmapLimit(target as Texture);
+            int cpuMipLevel = Mathf.Min(TextureUtil.GetMipmapCount(target as Texture) - 1, (int)mipLevel + mipmapLimit);
             m_Pos = PreviewGUI.EndScrollView();
-            if (mipLevel != 0)
-                EditorGUI.DropShadowLabel(new Rect(r.x, r.y, r.width, 20), "Mip " + mipLevel);
+            if (cpuMipLevel != 0)
+            {
+                GUIContent mipLevelTextContent = new GUIContent((cpuMipLevel != mipLevel)
+                        ? string.Format("Mip {0}\nMip {1} on GPU (Texture Limit)", cpuMipLevel, mipLevel)
+                        : string.Format("Mip {0}", mipLevel));
+                Vector2 size = s_Styles.mipLevelLabel.CalcSize(mipLevelTextContent);
+                if (size.x <= r.width)
+                {
+                    EditorGUI.DropShadowLabel(new Rect(r.x, r.y, r.width, size.y), mipLevelTextContent, s_Styles.mipLevelLabel);
+                }
+            }
         }
 
         private void DrawRect(Rect rect)
diff --git a/Editor/Mono/Inspector/TimeManagerInspector.cs b/Editor/Mono/Inspector/TimeManagerInspector.cs
index d9ec0bf632..bec8951261 100644
--- a/Editor/Mono/Inspector/TimeManagerInspector.cs
+++ b/Editor/Mono/Inspector/TimeManagerInspector.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;
+using Unity.IntegerTime;
 using UnityEngine;
 
 namespace UnityEditor
@@ -17,24 +19,36 @@ class Content
             public static readonly GUIContent maxParticleTimestepLabel = EditorGUIUtility.TrTextContent("Maximum Particle Timestep", "The maximum frame delta time Unity permits for a single iteration of the Particle System update. If the delta time is larger than this value, Unity will run the Particle System update multiple times during the frame with smaller timesteps. This preserves the quality of the simulation.");
         }
 
-        SerializedProperty m_FixedTimestepProperty;
+        SerializedProperty m_FixedTimestepCountProperty;
         SerializedProperty m_MaxAllowedTimestepProperty;
         SerializedProperty m_TimeScaleProperty;
         SerializedProperty m_MaxParticleTimestepProperty;
 
+        static RationalTime.TicksPerSecond m_FixedTimeTicksPerSecond;
+        const float MinFixedTimeStep = 0.0001f;
+
         public void OnEnable()
         {
-            m_FixedTimestepProperty = serializedObject.FindProperty("Fixed Timestep");
+            var fixedTimestepProperty = serializedObject.FindProperty("Fixed Timestep");
+            m_FixedTimestepCountProperty = fixedTimestepProperty.FindPropertyRelative("m_Count");
             m_MaxAllowedTimestepProperty = serializedObject.FindProperty("Maximum Allowed Timestep");
             m_TimeScaleProperty = serializedObject.FindProperty("m_TimeScale");
             m_MaxParticleTimestepProperty = serializedObject.FindProperty("Maximum Particle Timestep");
+
+            if (!m_FixedTimeTicksPerSecond.Valid) // FixedTime has a constant ticks per second value
+            {
+                var numerator = fixedTimestepProperty.FindPropertyRelative("m_Rate.m_Numerator");
+                var denominator = fixedTimestepProperty.FindPropertyRelative("m_Rate.m_Denominator");
+                m_FixedTimeTicksPerSecond =
+                    new RationalTime.TicksPerSecond(numerator.uintValue, denominator.uintValue);
+            }
         }
 
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
 
-            EditorGUILayout.PropertyField(m_FixedTimestepProperty, Content.fixedTimestepLabel);
+            DrawFixedTimeAsFloat(m_FixedTimestepCountProperty);
             EditorGUILayout.PropertyField(m_MaxAllowedTimestepProperty, Content.maxAllowedTimestepLabel);
             EditorGUILayout.PropertyField(m_TimeScaleProperty, Content.timeScaleLabel);
             EditorGUILayout.PropertyField(m_MaxParticleTimestepProperty, Content.maxParticleTimestepLabel);
@@ -42,6 +56,26 @@ public override void OnInspectorGUI()
             serializedObject.ApplyModifiedProperties();
         }
 
+        static void DrawFixedTimeAsFloat(SerializedProperty prop)
+        {
+            var fixedTime = (float)new RationalTime(prop.longValue, m_FixedTimeTicksPerSecond).ToDouble(); // Convert a tick count to a float
+            using (var c = new EditorGUI.ChangeCheckScope())
+            {
+                var maxFixedTime = MathF.Max(fixedTime, MinFixedTimeStep);
+                var roundedTime = Math.Round(maxFixedTime, 4, MidpointRounding.AwayFromZero);
+                fixedTime = EditorGUILayout.FloatField(Content.fixedTimestepLabel, (float)roundedTime);
+
+                if (c.changed)
+                {
+                    var newCount = RationalTime
+                        .FromDouble(fixedTime, m_FixedTimeTicksPerSecond)
+                        .Count; // convert it back to a count to store in the property
+                    prop.longValue = newCount;
+                }
+            }
+        }
+
+
         [SettingsProvider]
         internal static SettingsProvider CreateProjectSettingsProvider()
         {
diff --git a/Editor/Mono/Inspector/TrailRendererEditor.cs b/Editor/Mono/Inspector/TrailRendererEditor.cs
index ff3d7b5ffc..9023f644a4 100644
--- a/Editor/Mono/Inspector/TrailRendererEditor.cs
+++ b/Editor/Mono/Inspector/TrailRendererEditor.cs
@@ -309,9 +309,9 @@ private void OnSceneViewGUI(SceneView sceneView)
 
                 foreach (var obj in targets)
                 {
-                    if (obj is TrailRenderer tr)
+                    if (obj is TrailRenderer trail)
                     {
-                        var worldBounds = tr.bounds;
+                        var worldBounds = trail.bounds;
                         Handles.DrawWireCube(worldBounds.center, worldBounds.size);
                     }
                 }
@@ -320,9 +320,9 @@ private void OnSceneViewGUI(SceneView sceneView)
             }
 
             // Move trail using shape
-            if (m_PreviewBackupPosition.HasValue)
+            if (target is TrailRenderer tr)
             {
-                if (target is TrailRenderer tr)
+                if (m_PreviewBackupPosition.HasValue)
                 {
                     if (s_PreviewIsPlaying && !s_PreviewIsPaused)
                     {
@@ -388,6 +388,10 @@ private void OnSceneViewGUI(SceneView sceneView)
                         tr.previewTimeScale = 0.0f;
                     }
                 }
+                else
+                {
+                    tr.previewTimeScale = s_PreviewTimeScale; // Not playing or paused, but might be dragging the Trail around the scene view using the Transform gizmo
+                }
             }
         }
 
diff --git a/Editor/Mono/Inspector/TransformRotationGUI.cs b/Editor/Mono/Inspector/TransformRotationGUI.cs
index 41d1a9e243..dfa51ba56d 100644
--- a/Editor/Mono/Inspector/TransformRotationGUI.cs
+++ b/Editor/Mono/Inspector/TransformRotationGUI.cs
@@ -100,8 +100,13 @@ public void RotationField(bool disabled)
                 var prevWidth = EditorGUIUtility.labelWidth;
                 var prevIndent = EditorGUI.indentLevel;
                 EditorGUI.indentLevel = 0;
+                SerializedProperty rotation = m_Rotation.Copy();
+
                 for (int i = 0; i < m_EulerFloats.Length; i++)
                 {
+                    rotation.Next(true);
+                    EditorGUI.BeginProperty(nr, s_XYZLabels[i], rotation);
+
                     EditorGUIUtility.labelWidth = EditorGUI.GetLabelWidth(s_XYZLabels[i]);
                     EditorGUI.BeginChangeCheck();
                     EditorGUI.showMixedValue = (differentRotationMask & (1 << i)) != 0;
@@ -125,6 +130,8 @@ public void RotationField(bool disabled)
                     }
 
                     nr.x += w + EditorGUI.kSpacingSubLabel;
+
+                    EditorGUI.EndProperty();
                 }
                 EditorGUIUtility.labelWidth = prevWidth;
                 EditorGUI.indentLevel = prevIndent;
diff --git a/Editor/Mono/Inspector/UnityEventDrawer.cs b/Editor/Mono/Inspector/UnityEventDrawer.cs
index 44ad0876e9..e4981d9bb7 100644
--- a/Editor/Mono/Inspector/UnityEventDrawer.cs
+++ b/Editor/Mono/Inspector/UnityEventDrawer.cs
@@ -212,6 +212,20 @@ private ListView CreateListView(SerializedProperty property)
                 eventItem.BindFields(propertyData, createMenuCallback, formatSelectedValueCallback, getArgumentCallback);
             };
 
+            listView.itemsAdded += indices =>
+            {
+                foreach (var i in indices)
+                {
+                    var pListener = propertyRelative.GetArrayElementAtIndex(i);
+                    var callState = pListener.FindPropertyRelative(kCallStatePath);
+                    // SERIAL-124
+                    // Objects added to an array via SerializedObject do not have their default values set.
+                    // Therefore we need to set the initial values here to fix UUM-27561
+                    callState.enumValueIndex = (int)UnityEventCallState.RuntimeOnly;
+                    callState.serializedObject.ApplyModifiedPropertiesWithoutUndo();
+                }
+            };
+
             return listView;
         }
 
@@ -256,7 +270,7 @@ private SerializedProperty GetArgument(SerializedProperty pListener)
         public override VisualElement CreatePropertyGUI(SerializedProperty property)
         {
             m_Prop = property;
-            m_Text = property.displayName;
+            m_Text = preferredLabel;
             m_DummyEvent = GetDummyEvent(m_Prop);
 
             var listViewContainer = new VisualElement();
@@ -264,6 +278,7 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
 
             var header = new Label();
             header.text = GetHeaderText();
+            header.tooltip = property.tooltip;
             header.AddToClassList(kHeaderClassName);
 
             var listView = CreateListView(property);
diff --git a/Editor/Mono/Inspector/VersionControlSettingsInspector.cs b/Editor/Mono/Inspector/VersionControlSettingsInspector.cs
index 1fae6146be..1dd04ccf43 100644
--- a/Editor/Mono/Inspector/VersionControlSettingsInspector.cs
+++ b/Editor/Mono/Inspector/VersionControlSettingsInspector.cs
@@ -11,7 +11,6 @@
 using UnityEditorInternal;
 using UnityEngine;
 using UnityEngine.UIElements;
-using UnityEditor.Collaboration;
 
 namespace UnityEditor
 {
@@ -25,6 +24,7 @@ class Styles
             public static GUIContent automaticAdd = new GUIContent("Automatic Add",
                 "Automatically add newly created assets to version control.");
             public static GUIContent smartMerge = new GUIContent("Smart merge");
+            public static GUIContent trackPackagesOutsideProject = new GUIContent("Version Packages Outside Project", "Tracks changes to packages that reside on disk outside of the project's root folder.");
             public static GUIContent vcsConnect = new GUIContent("Connect");
             public static GUIContent vcsReconnect = new GUIContent("Reconnect");
             public static GUIContent workOffline = new GUIContent("Work Offline",
@@ -156,9 +156,6 @@ private void SetVersionControlSystem(object data)
 
         private bool VersionControlSystemHasGUI()
         {
-            bool collabEnabled = Collab.instance.IsCollabEnabledForCurrentProject();
-            if (!collabEnabled)
-            {
             ExternalVersionControl system = VersionControlSettings.mode;
             return
                 system != ExternalVersionControl.Disabled &&
@@ -166,9 +163,6 @@ private bool VersionControlSystemHasGUI()
                 system != ExternalVersionControl.Generic;
         }
 
-        return false;
-        }
-
         string[] GetVCConfigFieldRecentValues(string fieldName)
         {
             if (m_VCConfigFieldsRecentValues.ContainsKey(fieldName))
@@ -243,20 +237,13 @@ public override void OnInspectorGUI()
             GUILayout.Space(10);
             GUILayout.BeginVertical(EditorStyles.inspectorDefaultMargins);
 
-            bool collabEnabled = Collab.instance.IsCollabEnabledForCurrentProject();
-            using (new EditorGUI.DisabledScope(!collabEnabled))
+            using (new EditorGUI.DisabledScope(true))
             {
-                GUI.enabled = !collabEnabled;
+                GUI.enabled = true;
 
                 ExternalVersionControl selvc = VersionControlSettings.mode;
                 CreatePopupMenuVersionControl(Styles.mode.text, vcPopupList, selvc, SetVersionControlSystem);
-                GUI.enabled = !collabEnabled;
-            }
-
-            if (collabEnabled)
-            {
-                EditorGUILayout.HelpBox("Version Control not available when using Collaboration feature.",
-                    MessageType.Warning);
+                GUI.enabled = true;
             }
 
             GUI.enabled = true;
@@ -410,6 +397,9 @@ public override void OnInspectorGUI()
                 EditorUserSettings.semanticMergeMode = (SemanticMergeMode)EditorGUILayout.Popup(Styles.smartMerge,
                     (int)EditorUserSettings.semanticMergeMode, semanticMergePopupList);
 
+                VersionControlSettings.trackPackagesOutsideProject =
+                EditorGUILayout.Toggle(Styles.trackPackagesOutsideProject, VersionControlSettings.trackPackagesOutsideProject);
+
                 GUILayout.Space(10);
                 GUILayout.Label(Styles.overlayIcons);
 
diff --git a/Editor/Mono/InternalEditorUtility.bindings.cs b/Editor/Mono/InternalEditorUtility.bindings.cs
index 88f469ce01..424b3fedb4 100644
--- a/Editor/Mono/InternalEditorUtility.bindings.cs
+++ b/Editor/Mono/InternalEditorUtility.bindings.cs
@@ -529,6 +529,9 @@ public static Version GetUnityVersion()
         [FreeFunction("InternalEditorUtilityBindings::ReadScreenPixelUnderCursor")]
         extern public static Color[] ReadScreenPixelUnderCursor(Vector2 cursorPosHint, int sizex, int sizey);
 
+        [FreeFunction("InternalEditorUtilityBindings::IsAllowedToReadPixelOutsideUnity")]
+        extern internal static bool IsAllowedToReadPixelOutsideUnity(out string errorMessage);
+
         [StaticAccessor("GetGpuDeviceManager()", StaticAccessorType.Dot)]
         [NativeMethod("SetDevice")]
         extern public static void SetGpuDeviceAndRecreateGraphics(int index, string name);
@@ -672,7 +675,7 @@ extern public static float remoteScreenHeight
 
         [StaticAccessor("CustomLighting::Get()", StaticAccessorType.Dot)]
         [NativeMethod("SetCustomLighting")]
-        extern public static void SetCustomLightingInternal(Light[] lights, Color ambient);
+        extern public static void SetCustomLightingInternal([Unmarshalled] Light[] lights, Color ambient);
 
         public static void SetCustomLighting(Light[] lights, Color ambient)
         {
@@ -913,7 +916,7 @@ internal static PrecompiledAssembly[] GetUnityAssemblies(bool buildingForEditor,
         extern internal static bool SaveCursorToInMemoryResource(Texture2D image, Vector2 hotSpot, ushort cursorDataResourceId, IntPtr cursorDirectoryBuffer, uint cursorDirectoryBufferSize, IntPtr cursorDataBuffer, uint cursorDataBufferSize);
 
         [FreeFunction("GetScriptCompilationDefines")]
-        extern internal static string[] GetCompilationDefines(EditorScriptCompilationOptions options, BuildTargetGroup targetGroup, BuildTarget target, int subtarget, ApiCompatibilityLevel apiCompatibilityLevel, string[] extraDefines = null);
+        extern internal static string[] GetCompilationDefines(EditorScriptCompilationOptions options, BuildTargetGroup targetGroup, BuildTarget target, int subtarget, ApiCompatibilityLevel apiCompatibilityLevel,  string[] extraDefines = null);
 
         //Launches an application that is kept alive, even during a domain reload
         [FreeFunction("LaunchApplication")]
diff --git a/Editor/Mono/Modules/BeeBuildPostprocessor.cs b/Editor/Mono/Modules/BeeBuildPostprocessor.cs
index 954f5f6411..83a81b617b 100644
--- a/Editor/Mono/Modules/BeeBuildPostprocessor.cs
+++ b/Editor/Mono/Modules/BeeBuildPostprocessor.cs
@@ -168,6 +168,13 @@ IEnumerable<Plugin> GetPluginsFor(BuildTarget target)
             }
         }
 
+        static IEnumerable<NPath> GetFilesWithRoleFromBuildReport(BuildReport report, params string[] roles) =>
+            report.GetFiles()
+                .Where(file => roles.Contains(file.role))
+                .Select(file => file.path.ToNPath())
+                .GroupBy(file => file.FileName)
+                .Select(group => group.First());
+        
         LinkerConfig LinkerConfigFor(BuildPostProcessArgs args)
         {
             var namedBuildTarget = GetNamedBuildTarget(args);
@@ -178,39 +185,45 @@ LinkerConfig LinkerConfigFor(BuildPostProcessArgs args)
             if (GetScriptingBackend(args) == ScriptingBackend.IL2CPP && strippingLevel == ManagedStrippingLevel.Disabled)
                 strippingLevel = ManagedStrippingLevel.Minimal;
 
-            if (strippingLevel > ManagedStrippingLevel.Disabled)
-            {
-                var additionalArgs = new List<string>();
+            var additionalArgs = new List<string>();
 
-                var diagArgs = Debug.GetDiagnosticSwitch("VMUnityLinkerAdditionalArgs").value as string;
-                if (!string.IsNullOrEmpty(diagArgs))
-                    additionalArgs.Add(diagArgs.Trim('\''));
-
-                var linkerInputDirectory = DagDirectory.Combine($"artifacts/UnityLinkerInputs").CreateDirectory();
-                return new LinkerConfig
+            var diagArgs = Debug.GetDiagnosticSwitch("VMUnityLinkerAdditionalArgs").value as string;
+            if (!string.IsNullOrEmpty(diagArgs))
+                additionalArgs.Add(diagArgs.Trim('\''));
+
+            var linkerInputDirectory = DagDirectory.Combine($"artifacts/UnityLinkerInputs").CreateDirectory();
+            
+            // In Disabled mode, we pass all generated and engine assemblies to the linker as roots, as the linker
+            // will only perform a simple assembly reference traversal, ignoring link.xml files and attributes which 
+            // would otherwise find dependent assemblies to preserve.
+            // In other modes (when stripping is desired), we pass only a smaller set of user assemblies (assemblies from
+            // packages if used in any scenes, as well as any assembly from the Assets folder) as roots.
+            var assembliesToProcess = strippingLevel == ManagedStrippingLevel.Disabled
+                ? GetFilesWithRoleFromBuildReport(args.report, "ManagedLibrary", "ManagedEngineAPI").Select(f => f.FileName)
+                : args.usedClassRegistry.GetUserAssemblies();
+            
+            return new LinkerConfig
+            {
+                LinkXmlFiles = AssemblyStripper.GetLinkXmlFiles(args, linkerInputDirectory),
+                EditorToLinkerData = AssemblyStripper.WriteEditorData(args, linkerInputDirectory),
+                AssembliesToProcess = assembliesToProcess.ToArray(),
+                Runtime = GetScriptingBackend(args).ToString().ToLowerInvariant(),
+                Profile = IL2CPPUtils.ApiCompatibilityLevelToDotNetProfileArgument(
+                    PlayerSettings.GetApiCompatibilityLevel(namedBuildTarget), args.target),
+                Ruleset = strippingLevel switch
                 {
-                    LinkXmlFiles = AssemblyStripper.GetLinkXmlFiles(args, linkerInputDirectory),
-                    EditorToLinkerData = AssemblyStripper.WriteEditorData(args, linkerInputDirectory),
-                    AssembliesToProcess = args.usedClassRegistry.GetUserAssemblies(),
-                    Runtime = GetScriptingBackend(args).ToString().ToLower(),
-                    Profile = IL2CPPUtils.ApiCompatibilityLevelToDotNetProfileArgument(
-                        PlayerSettings.GetApiCompatibilityLevel(namedBuildTarget), args.target),
-                    Ruleset = strippingLevel switch
-                    {
-                        ManagedStrippingLevel.Minimal => "Minimal",
-                        ManagedStrippingLevel.Low => "Conservative",
-                        ManagedStrippingLevel.Medium => "Aggressive",
-                        ManagedStrippingLevel.High => "Experimental",
-                        _ => throw new ArgumentException($"Unhandled {nameof(ManagedStrippingLevel)} value")
-                    },
-                    AdditionalArgs = additionalArgs.ToArray(),
-                    ModulesAssetPath = $"{BuildPipeline.GetPlaybackEngineDirectory(args.target, 0)}/modules.asset",
-                    AllowDebugging = GetAllowDebugging(args),
-                    PerformEngineStripping = PlayerSettings.stripEngineCode,
-                };
-            }
-
-            return null;
+                    ManagedStrippingLevel.Disabled => "Copy",
+                    ManagedStrippingLevel.Minimal => "Minimal",
+                    ManagedStrippingLevel.Low => "Conservative",
+                    ManagedStrippingLevel.Medium => "Aggressive",
+                    ManagedStrippingLevel.High => "Experimental",
+                    _ => throw new ArgumentException($"Unhandled {nameof(ManagedStrippingLevel)} value")
+                },
+                AdditionalArgs = additionalArgs.ToArray(),
+                ModulesAssetPath = $"{BuildPipeline.GetPlaybackEngineDirectory(args.target, 0)}/modules.asset",
+                AllowDebugging = GetAllowDebugging(args),
+                PerformEngineStripping = PlayerSettings.stripEngineCode,
+            };
         }
 
         static bool IsBuildOptionSet(BuildOptions options, BuildOptions flag) => (options & flag) != 0;
@@ -332,9 +345,21 @@ Il2CppConfig Il2CppConfigFor(BuildPostProcessArgs args)
                 ToolChainPath = toolchainPath,
                 RelativeDataPath = relativeDataPath,
                 ExtraTypes = extraTypesFile?.ToString(),
+                GenerateUsymFile = PlayerSettings.GetIl2CppStacktraceInformation(NamedBuildTarget.FromBuildTargetGroup(BuildPipeline.GetBuildTargetGroup(args.target))) == Il2CppStacktraceInformation.MethodFileLineNumber,
+                UsymtoolPath = GetUsymtoolPath(),
             };
         }
 
+        static string GetUsymtoolPath()
+        {
+            if (Application.platform == RuntimePlatform.OSXEditor)
+                return Paths.Combine(EditorApplication.applicationContentsPath, "Tools", "macosx", "usymtool");
+            if (Application.platform == RuntimePlatform.LinuxEditor)
+                return Paths.Combine(EditorApplication.applicationContentsPath, "Tools", "usymtool");
+
+            return Paths.Combine(EditorApplication.applicationContentsPath, "Tools", "usymtool.exe");
+        }
+
         static bool IsNewInputSystemEnabled()
         {
             var propName = "activeInputHandler";
@@ -375,7 +400,8 @@ static GenerateNativePluginsForAssembliesSettings GetGenerateNativePluginsForAss
             ApplicationIdentifier = PlayerSettings.GetApplicationIdentifier(GetNamedBuildTarget(args)),
             InstallIntoBuildsFolder = GetInstallingIntoBuildsFolder(args),
             GenerateIdeProject = GetCreateSolution(args),
-            Development = (args.report.summary.options & BuildOptions.Development) == BuildOptions.Development,
+            Development = (args.options & BuildOptions.Development) == BuildOptions.Development,
+            NoGUID = (args.options & BuildOptions.NoUniqueIdentifier) == BuildOptions.NoUniqueIdentifier,
             ScriptingBackend = GetScriptingBackend(args),
             Architecture = GetArchitecture(args),
             DataFolder = GetDataFolderFor(args),
@@ -391,11 +417,8 @@ static GenerateNativePluginsForAssembliesSettings GetGenerateNativePluginsForAss
                 .Select(e => new StreamingAssetsFile { File = e.src.ToString(), RelativePath = e.dst.ToString() })
                 .ToArray(),
             UseNewInputSystem = IsNewInputSystemEnabled(),
-            ManagedAssemblies = args.report.GetFiles()
-                .Where(file => file.role == "ManagedLibrary" || file.role == "DependentManagedLibrary" || file.role == "ManagedEngineAPI")
-                .Select(file => file.path.ToNPath())
-                .GroupBy(file => file.FileName)
-                .Select(group => group.First().ToString())
+            ManagedAssemblies = GetFilesWithRoleFromBuildReport(args.report, "ManagedLibrary", "DependentManagedLibrary", "ManagedEngineAPI")
+                .Select(p => p.ToString())
                 .ToArray()
         };
 
@@ -443,8 +466,7 @@ RunnableProgram MakePlayerBuildProgram(BuildPostProcessArgs args)
             var searchPaths = $"{beePlatformFolder}{Path.PathSeparator}";
             if (IL2CPPUtils.UsingDevelopmentBuild())
             {
-                NPath il2cppPath = IL2CPPUtils.GetExePath("il2cpp").ToNPath().Parent;
-                searchPaths = $"{il2cppPath}{Path.PathSeparator}";
+                searchPaths = $"{IL2CPPUtils.ConstructBeeLibrarySearchPath()}{Path.PathSeparator}";
             }
 
             return new SystemProcessRunnableProgram(NetCoreRunProgram.NetCoreRunPath,
@@ -501,12 +523,20 @@ void UnityLinkerResultProcessor(NodeFinishedMessage node)
                 DefaultResultProcessor(node);
         }
 
+        void UsymtoolResultProcessor(NodeFinishedMessage node)
+        {
+            // Usymtool might print a message like "error: <something>" to stdout, even when
+            // it succeeds. So only process error messages when it fails.
+            if (node.ExitCode != 0)
+                DefaultResultProcessor(node);
+        }
+
         public BeeBuildPostprocessor()
         {
             ResultProcessors["IL2CPP_CodeGen"] = PrintStdoutOnErrorProcessor;
             ResultProcessors["UnityLinker"] = UnityLinkerResultProcessor;
             ResultProcessors["ExtractUsedFeatures"] = PrintStdoutOnErrorProcessor;
-
+            ResultProcessors["Usym"] = UsymtoolResultProcessor;
         }
 
         protected void DefaultResultProcessor(NodeFinishedMessage node, bool printErrors = true, bool printWarnings = true)
@@ -569,12 +599,25 @@ void ReportBuildOutputFiles(BuildPostProcessArgs args)
             var filesOutput = BeeDriverResult.DataFromBuildProgram.Get<BuiltFilesOutput>();
             foreach (var outputfile in filesOutput.Files.ToNPaths().Where(f => f.FileExists() && !f.IsSymbolicLink))
                 args.report.RecordFileAdded(outputfile.ToString(), outputfile.Extension);
+
+            var config = filesOutput.BootConfigArtifact.ToNPath().ReadAllLines();
+            var guidKey = "build-guid=";
+            var guidLine = config.FirstOrDefault(l => l.StartsWith(guidKey));
+            if (guidLine != null)
+            {
+                var guid = guidLine.Substring(guidKey.Length);
+                args.report.SetBuildGUID(new GUID(guid));
+            }
+            else
+            {
+                args.report.SetBuildGUID(new GUID("00000000000000000000000000000000"));
+            }
         }
 
-        public virtual string PrepareForBuild(BuildOptions options, BuildTarget target)
+        public virtual string PrepareForBuild(BuildPlayerOptions buildOptions)
         {
             // Clean the Bee folder in PrepareForBuild, so that it is also clean for script compilation.
-            if ((options & BuildOptions.CleanBuildCache) == BuildOptions.CleanBuildCache)
+            if ((buildOptions.options & BuildOptions.CleanBuildCache) == BuildOptions.CleanBuildCache)
                 EditorCompilation.ClearBeeBuildArtifacts();
 
             return null;
@@ -665,7 +708,6 @@ public virtual void PostProcess(BuildPostProcessArgs args)
                         {
                             EditorUtility.DisplayCancelableProgressBar("Incremental Player Build", "Canceling build", 1.0f);
                             cancellationTokenSource.Cancel();
-                            throw new OperationCanceledException();
                         }
                     }
                     args.report.EndBuildStep(buildStep);
@@ -699,6 +741,13 @@ public virtual void PostProcess(BuildPostProcessArgs args)
             {
                 throw;
             }
+            catch (AggregateException e)
+            {
+                if (e.InnerException is OperationCanceledException or BuildFailedException)
+                    throw e.InnerException;
+
+                throw new BuildFailedException(e);
+            }
             catch (Exception e)
             {
                 throw new BuildFailedException(e);
diff --git a/Editor/Mono/Modules/DefaultPlayerSettingsEditorExtension.cs b/Editor/Mono/Modules/DefaultPlayerSettingsEditorExtension.cs
index 74aab2fa5b..c0ec91b87d 100644
--- a/Editor/Mono/Modules/DefaultPlayerSettingsEditorExtension.cs
+++ b/Editor/Mono/Modules/DefaultPlayerSettingsEditorExtension.cs
@@ -146,5 +146,10 @@ public virtual bool ShouldShowVulkanSettings()
         }
 
         public virtual void VulkanSectionGUI() {}
+
+        public virtual bool SupportsStaticSplashScreenBackgroundColor()
+        {
+            return false;
+        }
     }
 }
diff --git a/Editor/Mono/Modules/DefaultPluginImporterExtension.cs b/Editor/Mono/Modules/DefaultPluginImporterExtension.cs
index 1a85779c90..59e9a1c917 100644
--- a/Editor/Mono/Modules/DefaultPluginImporterExtension.cs
+++ b/Editor/Mono/Modules/DefaultPluginImporterExtension.cs
@@ -17,6 +17,7 @@ internal class DefaultPluginImporterExtension : IPluginImporterExtension
     {
         protected bool hasModified = false;
         protected Property[] properties = null;
+        protected const string cpuKey = "CPU";
 
         internal class Property
         {
@@ -127,6 +128,9 @@ public virtual void OnPlatformSettingsGUI(PluginImporterInspector inspector)
             EditorGUI.BeginChangeCheck();
             foreach (var p in properties)
             {
+                // skip CPU property for things that aren't native libs
+                if (p.key == cpuKey && !inspector.importer.isNativePlugin)
+                    continue;
                 p.OnGUI(inspector);
             }
             if (EditorGUI.EndChangeCheck()) hasModified = true;
@@ -143,7 +147,7 @@ protected virtual void RefreshProperties(PluginImporterInspector inspector)
 
         public virtual string CalculateFinalPluginPath(string platformName, PluginImporter imp)
         {
-            string cpu = imp.GetPlatformData(platformName, "CPU");
+            string cpu = imp.GetPlatformData(platformName, cpuKey);
 
             if (!string.IsNullOrEmpty(cpu) && (string.Compare(cpu, "AnyCPU", true) != 0) && (string.Compare(cpu, "None", true) != 0))
                 return Path.Combine(cpu, Path.GetFileName(imp.assetPath));
diff --git a/Editor/Mono/Modules/DefaultTextureImportSettingsExtension.cs b/Editor/Mono/Modules/DefaultTextureImportSettingsExtension.cs
index b7ffd898ba..bbf3a8cbfd 100644
--- a/Editor/Mono/Modules/DefaultTextureImportSettingsExtension.cs
+++ b/Editor/Mono/Modules/DefaultTextureImportSettingsExtension.cs
@@ -59,7 +59,11 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
         {
             // Max texture size
             Rect controlRect = EditorGUILayout.GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup);
-            GUIContent label = EditorGUI.BeginProperty(controlRect, maxSize, editor.model.maxTextureSizeProperty);
+            GUIContent label = maxSize;
+            if (editor.model.maxTextureSizeProperty != null)
+            {
+                label = EditorGUI.BeginProperty(controlRect, label, editor.model.maxTextureSizeProperty);
+            }
             EditorGUI.BeginChangeCheck();
             EditorGUI.showMixedValue = editor.model.maxTextureSizeIsDifferent;
             int maxTextureSize = EditorGUI.IntPopup(controlRect, label, editor.model.platformTextureSettings.maxTextureSize, GUIContent.Temp(kMaxTextureSizeStrings), kMaxTextureSizeValues);
@@ -67,7 +71,10 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
             {
                 editor.model.SetMaxTextureSizeForAll(maxTextureSize);
             }
-            EditorGUI.EndProperty();
+            if (editor.model.maxTextureSizeProperty != null)
+            {
+                EditorGUI.EndProperty();
+            }
 
             // Show a note if max size is overriden globally by the user
             var userMaxSizeOverride = EditorUserBuildSettings.overrideMaxTextureSize;
@@ -76,7 +83,11 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
 
             // Resize Algorithm
             controlRect = EditorGUILayout.GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup);
-            label = EditorGUI.BeginProperty(controlRect, kResizeAlgorithm, editor.model.resizeAlgorithmProperty);
+            label = kResizeAlgorithm;
+            if (editor.model.resizeAlgorithmProperty != null)
+            {
+                label = EditorGUI.BeginProperty(controlRect, label, editor.model.resizeAlgorithmProperty);
+            }
             EditorGUI.BeginChangeCheck();
             EditorGUI.showMixedValue = editor.model.resizeAlgorithmIsDifferent;
             int resizeAlgorithmVal = EditorGUI.IntPopup(controlRect, label, (int)editor.model.platformTextureSettings.resizeAlgorithm, GUIContent.Temp(kResizeAlgorithmStrings), kResizeAlgorithmValues);
@@ -84,7 +95,10 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
             {
                 editor.model.SetResizeAlgorithmForAll((TextureResizeAlgorithm)resizeAlgorithmVal);
             }
-            EditorGUI.EndProperty();
+            if (editor.model.resizeAlgorithmProperty != null)
+            {
+                EditorGUI.EndProperty();
+            }
 
             // Texture format
             int[] formatValuesForAll = {};
@@ -149,7 +163,11 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
             using (new EditorGUI.DisabledScope(formatOptionsAreDifferent || formatStringsForAll.Length == 1))
             {
                 controlRect = EditorGUILayout.GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup);
-                label = EditorGUI.BeginProperty(controlRect, kTextureFormat, editor.model.textureFormatProperty);
+                label = kTextureFormat;
+                if (editor.model.textureFormatProperty != null)
+                {
+                    label = EditorGUI.BeginProperty(controlRect, label, editor.model.textureFormatProperty);
+                }
                 EditorGUI.BeginChangeCheck();
                 bool mixedValues = formatOptionsAreDifferent || editor.model.textureFormatIsDifferent;
                 EditorGUI.showMixedValue = mixedValues;
@@ -159,7 +177,10 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
                     editor.model.SetTextureFormatForAll((TextureImporterFormat)selectionResult);
                     formatForAll = selectionResult;
                 }
-                EditorGUI.EndProperty();
+                if (editor.model.textureFormatProperty != null)
+                {
+                    EditorGUI.EndProperty();
+                }
 
                 if (!mixedValues && !Array.Exists(formatValuesForAll, i => i == formatForAll))
                 {
@@ -171,7 +192,11 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
             if (editor.model.isDefault && editor.model.platformTextureSettings.format == TextureImporterFormat.Automatic)
             {
                 controlRect = EditorGUILayout.GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup);
-                label = EditorGUI.BeginProperty(controlRect, kTextureCompression, editor.model.textureCompressionProperty);
+                label = kTextureCompression;
+                if (editor.model.textureCompressionProperty != null)
+                {
+                    label = EditorGUI.BeginProperty(controlRect, label, editor.model.textureCompressionProperty);
+                }
                 EditorGUI.BeginChangeCheck();
                 EditorGUI.showMixedValue = editor.model.overriddenIsDifferent ||
                     editor.model.textureCompressionIsDifferent;
@@ -183,7 +208,10 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
                 {
                     editor.model.SetTextureCompressionForAll(textureCompression);
                 }
-                EditorGUI.EndProperty();
+                if (editor.model.textureCompressionProperty != null)
+                {
+                    EditorGUI.EndProperty();
+                }
             }
 
             // Use Crunch Compression
@@ -193,7 +221,11 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
                 (textureShape == TextureImporterShape.Texture2D || textureShape == TextureImporterShape.TextureCube)) // 2DArray & 3D don't support Crunch
             {
                 controlRect = EditorGUILayout.GetToggleRect(true);
-                label = EditorGUI.BeginProperty(controlRect, kCrunchedCompression, editor.model.crunchedCompressionProperty);
+                label = kCrunchedCompression;
+                if (editor.model.crunchedCompressionProperty != null)
+                {
+                    label = EditorGUI.BeginProperty(controlRect, label, editor.model.crunchedCompressionProperty);
+                }
                 EditorGUI.BeginChangeCheck();
                 EditorGUI.showMixedValue = editor.model.overriddenIsDifferent ||
                     editor.model.crunchedCompressionIsDifferent;
@@ -203,7 +235,10 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
                 {
                     editor.model.SetCrunchedCompressionForAll(crunchedCompression);
                 }
-                EditorGUI.EndProperty();
+                if (editor.model.crunchedCompressionProperty != null)
+                {
+                    EditorGUI.EndProperty();
+                }
             }
 
             // compression quality
@@ -233,7 +268,11 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
             if (isETCPlatform && isDealingWithSprite && isETCFormatSelected)
             {
                 controlRect = EditorGUILayout.GetToggleRect(true);
-                label = EditorGUI.BeginProperty(controlRect, kUseAlphaSplitLabel, editor.model.alphaSplitProperty);
+                label = kUseAlphaSplitLabel;
+                if (editor.model.alphaSplitProperty != null)
+                {
+                    label = EditorGUI.BeginProperty(controlRect, label, editor.model.alphaSplitProperty);
+                }
                 EditorGUI.BeginChangeCheck();
                 EditorGUI.showMixedValue = editor.model.overriddenIsDifferent || editor.model.allowsAlphaSplitIsDifferent;
                 bool allowsAlphaSplit = EditorGUI.Toggle(controlRect, label, editor.model.platformTextureSettings.allowsAlphaSplitting);
@@ -241,7 +280,10 @@ public virtual void ShowImportSettings(BaseTextureImportPlatformSettings editor)
                 {
                     editor.model.SetAllowsAlphaSplitForAll(allowsAlphaSplit);
                 }
-                EditorGUI.EndProperty();
+                if (editor.model.alphaSplitProperty != null)
+                {
+                    EditorGUI.EndProperty();
+                }
             }
         }
 
@@ -250,7 +292,11 @@ private void EditCompressionQuality(BaseTextureImportPlatformSettings editor, bo
             bool showAsEnum = !isCrunchedFormat && (BuildTargetDiscovery.PlatformHasFlag(editor.model.buildTarget, TargetAttributes.HasIntegratedGPU) || (textureFormat == TextureImporterFormat.BC6H) || (textureFormat == TextureImporterFormat.BC7));
 
             Rect controlRect = showAsEnum ? EditorGUILayout.GetControlRect(true, EditorGUI.kSingleLineHeight, EditorStyles.popup) : EditorGUILayout.GetSliderRect(true);
-            GUIContent label = EditorGUI.BeginProperty(controlRect, showAsEnum ? kCompressionQuality : kCompressionQualitySlider, editor.model.compressionQualityProperty);
+            GUIContent label = showAsEnum ? kCompressionQuality : kCompressionQualitySlider;
+            if (editor.model.compressionQualityProperty != null)
+            {
+                label = EditorGUI.BeginProperty(controlRect, label, editor.model.compressionQualityProperty);
+            }
 
             EditorGUI.BeginChangeCheck();
             EditorGUI.showMixedValue = editor.model.overriddenIsDifferent ||
@@ -298,7 +344,10 @@ private void EditCompressionQuality(BaseTextureImportPlatformSettings editor, bo
                 editor.model.SetCompressionQualityForAll(compression);
                 //SyncPlatformSettings ();
             }
-            EditorGUI.EndProperty();
+            if (editor.model.compressionQualityProperty != null)
+            {
+                EditorGUI.EndProperty();
+            }
         }
     }
 }
diff --git a/Editor/Mono/Modules/ModuleManager.cs b/Editor/Mono/Modules/ModuleManager.cs
index 29e61d5c1e..f8af789703 100644
--- a/Editor/Mono/Modules/ModuleManager.cs
+++ b/Editor/Mono/Modules/ModuleManager.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using Unity.Profiling;
 using UnityEditor.Hardware;
 using UnityEditorInternal;
 using UnityEngine;
@@ -17,6 +18,8 @@ namespace UnityEditor.Modules
 {
     internal static class ModuleManager
     {
+        private static readonly ProfilerMarkerWithStringData s_InitializePlatformSupportModule = ProfilerMarkerWithStringData.Create("InitializePlatformSupportModule", "Name");
+
         [NonSerialized]
         static Dictionary<string, IPlatformSupportModule> s_PlatformModules;
 
@@ -113,14 +116,17 @@ internal static void InitializePlatformSupportModules()
 
             foreach (var module in platformSupportModules.Values)
             {
-                foreach (var library in module.NativeLibraries)
-                    EditorUtility.LoadPlatformSupportNativeLibrary(library);
-                foreach (var fullPath in module.AssemblyReferencesForUserScripts)
-                    InternalEditorUtility.RegisterPlatformModuleAssembly(Path.GetFileName(fullPath), fullPath);
+                using (s_InitializePlatformSupportModule.Auto(module.TargetName))
+                {
+                    foreach (var library in module.NativeLibraries)
+                        EditorUtility.LoadPlatformSupportNativeLibrary(library);
+                    foreach (var fullPath in module.AssemblyReferencesForUserScripts)
+                        InternalEditorUtility.RegisterPlatformModuleAssembly(Path.GetFileName(fullPath), fullPath);
 
-                EditorUtility.LoadPlatformSupportModuleNativeDllInternal(module.TargetName);
+                    EditorUtility.LoadPlatformSupportModuleNativeDllInternal(module.TargetName);
 
-                module.OnLoad();
+                    module.OnLoad();
+                }
             }
 
             // Setup active build target and call OnActivate() for current platform module
diff --git a/Editor/Mono/Modules/PlatformSupportModule.cs b/Editor/Mono/Modules/PlatformSupportModule.cs
index e4b8721c45..bdb5790a98 100644
--- a/Editor/Mono/Modules/PlatformSupportModule.cs
+++ b/Editor/Mono/Modules/PlatformSupportModule.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using UnityEditor.DeploymentTargets;
 using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
 using UnityEngine;
 
 namespace UnityEditor.Modules
@@ -146,7 +147,8 @@ internal interface IBuildPostprocessor
         // This is the place to make sure platform has everything it needs for the build.
         // Use EditorUtility.Display(Cancelable)ProgressBar when running long tasks (e.g. downloading SDK from internet).
         // Return non-empty string indicating error message to stop the build.
-        string PrepareForBuild(BuildOptions options, BuildTarget target);
+        /// <param name="buildOptions">Build details. Useful to get the location of the player to build, for instance.</param>
+        string PrepareForBuild(BuildPlayerOptions buildOptions);
 
         void PostProcessCompletedBuild(BuildPostProcessArgs args);
 
@@ -256,6 +258,8 @@ internal interface ISettingEditorExtension
         bool SupportsFrameTimingStatistics();
 
         void SerializedObjectUpdated();
+
+        bool SupportsStaticSplashScreenBackgroundColor();
     }
 
 
diff --git a/Editor/Mono/Networking/PlayerConnection/ConnectionDropDown.cs b/Editor/Mono/Networking/PlayerConnection/ConnectionDropDown.cs
index 3b5bd0cda3..aba28e0286 100644
--- a/Editor/Mono/Networking/PlayerConnection/ConnectionDropDown.cs
+++ b/Editor/Mono/Networking/PlayerConnection/ConnectionDropDown.cs
@@ -142,7 +142,6 @@ public static GUIContent GetIcon(string name)
                     "WSAPlayerX64" => EditorGUIUtility.IconContent("BuildSettings.Metro.Small"),
                     "WSAPlayerARM" => EditorGUIUtility.IconContent("BuildSettings.Metro.Small"),
                     "Switch" => EditorGUIUtility.IconContent("BuildSettings.Switch.Small"),
-                    "Stadia" => EditorGUIUtility.IconContent("BuildSettings.Stadia.small"),
                     "EmbeddedLinuxArm64" => EditorGUIUtility.IconContent("BuildSettings.EmbeddedLinux.Small"),
                     "EmbeddedLinuxArm32" => EditorGUIUtility.IconContent("BuildSettings.EmbeddedLinux.Small"),
                     "EmbeddedLinuxX64" => EditorGUIUtility.IconContent("BuildSettings.EmbeddedLinux.Small"),
diff --git a/Editor/Mono/ObjectListArea.cs b/Editor/Mono/ObjectListArea.cs
index bc50f31383..8357301ad2 100644
--- a/Editor/Mono/ObjectListArea.cs
+++ b/Editor/Mono/ObjectListArea.cs
@@ -103,8 +103,6 @@ static class Styles
         public bool foldersFirst { get; set; }
         int m_KeyboardControlID;
 
-        Dictionary<AssetReference, string> m_AssetReferenceToCroppedNameMap = new Dictionary<AssetReference, string>(new AssetReference.GuidThenInstanceIDEqualityComparer());
-        int m_WidthUsedForCroppingName;
         bool m_AllowRenameOnMouseUp = true;
 
 
@@ -212,9 +210,6 @@ public void Init(Rect rect, HierarchyType hierarchyType, SearchFilter searchFilt
 
             Repaint();
 
-            // Clear instanceID to cropped name cache on init
-            ClearCroppedLabelCache();
-
             // Prepare data
             SetupData(true);
         }
@@ -419,6 +414,8 @@ void HandleUnusedEvents()
                 SetSelection(new int[0], false);
         }
 
+        internal Vector2 sizeUsedForCroppingName;
+
         public bool CanShowThumbnails()
         {
             //
@@ -1280,43 +1277,6 @@ public void OnInspectorUpdate()
             }
         }
 
-        void ClearCroppedLabelCache()
-        {
-            m_AssetReferenceToCroppedNameMap.Clear();
-        }
-
-        protected string GetCroppedLabelText(AssetReference assetReference, string fullText, float cropWidth)
-        {
-            // Clear when width changes
-            if (m_WidthUsedForCroppingName != (int)cropWidth)
-                ClearCroppedLabelCache();
-
-            string croppedText;
-            if (!m_AssetReferenceToCroppedNameMap.TryGetValue(assetReference, out croppedText))
-            {
-                // Ensure to clean up once in a while
-                if (m_AssetReferenceToCroppedNameMap.Count > GetMaxNumVisibleItems() * 2 + 30)
-                    ClearCroppedLabelCache();
-
-                // Check if we need to crop
-                int characterCountVisible = Styles.resultsGridLabel.GetNumCharactersThatFitWithinWidth(fullText, cropWidth);
-                if (characterCountVisible == -1)
-                {
-                    Repaint();
-                    return fullText; // failed: do not cache result
-                }
-
-                if (characterCountVisible > 1 && characterCountVisible != fullText.Length)
-                    croppedText = fullText.Substring(0, characterCountVisible - 1) + ("\u2026"); // 'horizontal ellipsis' (U+2026) is: ...
-                else
-                    croppedText = fullText;
-
-                m_AssetReferenceToCroppedNameMap[assetReference] = croppedText;
-                m_WidthUsedForCroppingName = (int)cropWidth;
-            }
-            return croppedText;
-        }
-
         public bool IsShowing(int instanceID)
         {
             return m_LocalAssets.IndexOf(instanceID) >= 0;
@@ -1386,7 +1346,8 @@ public void BeginPing(int instanceID)
 
                 float vcPadding = s_VCEnabled ? k_ListModeVersionControlOverlayPadding : 0f;
                 var assetReference = new AssetReference() { instanceID = instanceID };
-                GUIContent cont = new GUIContent(m_LocalAssets.ListMode ? name : GetCroppedLabelText(assetReference, name, m_WidthUsedForCroppingName));
+                var textClipping = m_LocalAssets.ListMode ? TextClipping.Overflow : TextClipping.Ellipsis;
+                GUIContent cont = new GUIContent(name);
                 string label = cont.text;
 
                 if (m_LocalAssets.ListMode)
@@ -1410,17 +1371,25 @@ public void BeginPing(int instanceID)
                 else
                 {
                     m_Ping.m_PingStyle = Styles.miniPing;
-                    Vector2 pingLabelSize = m_Ping.m_PingStyle.CalcSize(cont);
-                    m_Ping.m_ContentRect.width = pingLabelSize.x;
+                    var oldClipping = m_Ping.m_PingStyle.clipping;
+                    m_Ping.m_PingStyle.clipping = textClipping;
+                    Vector2 pingLabelSize = Styles.resultsGridLabel.CalcSizeWithConstraints(cont, sizeUsedForCroppingName);
+                    m_Ping.m_ContentRect.width = pingLabelSize.x + Styles.resultsGridLabel.padding.horizontal;
                     m_Ping.m_ContentRect.height = pingLabelSize.y;
                     m_Ping.m_ContentDraw = (Rect r) =>
                     {
                         // We need to temporary adjust style to render into content rect (org anchor is middle-centered)
-                        TextAnchor orgAnchor = Styles.resultsGridLabel.alignment;
-                        Styles.resultsGridLabel.alignment = TextAnchor.UpperLeft;
+                        var orgAnchor = Styles.resultsGridLabel.alignment;
+                        var orgClipping = Styles.resultsGridLabel.clipping;
+                        // Shift the rect to match the original text position
+                        r.position -= new Vector2(5, 1);
+                        Styles.resultsGridLabel.alignment = TextAnchor.MiddleCenter;
+                        Styles.resultsGridLabel.clipping = TextClipping.Ellipsis;
                         Styles.resultsGridLabel.Draw(r, label, false, false, false, false);
                         Styles.resultsGridLabel.alignment = orgAnchor;
+                        Styles.resultsGridLabel.clipping = orgClipping;
                     };
+                    m_Ping.m_PingStyle.clipping = oldClipping;
                 }
                 Vector2 pos = CalculatePingPosition();
                 m_Ping.m_ContentRect.x = pos.x;
diff --git a/Editor/Mono/ObjectListLocalGroup.cs b/Editor/Mono/ObjectListLocalGroup.cs
index 3b8c3468ba..e3f9e548c8 100644
--- a/Editor/Mono/ObjectListLocalGroup.cs
+++ b/Editor/Mono/ObjectListLocalGroup.cs
@@ -7,11 +7,8 @@
 using UnityEditor.VersionControl;
 using UnityEditorInternal;
 using UnityEditorInternal.VersionControl;
-using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using Math = System.Math;
-using IndexOutOfRangeException = System.IndexOutOfRangeException;
 using AssetReference = UnityEditorInternal.InternalEditorUtility.AssetReference;
 
 namespace UnityEditor
@@ -117,6 +114,7 @@ private void InitAssetPreviewIgnoreList()
                 m_AssetPreviewIgnoreList.Add(typeof(LightingSettings));
 
                 m_AssetExtensionsPreviewIgnoreList.Add(".index");
+                m_AssetExtensionsPreviewIgnoreList.Add(".vfx");
             }
 
             //Use this to add the specific types that needs to ignored for AssetPreview image generation.
@@ -835,6 +833,8 @@ void DrawItem(Rect position, FilteredHierarchy.FilterResult filterItem, BuiltinR
                     }
                     else // Icon grid
                     {
+                        Texture previewImage = null;
+
                         // Get icon
                         bool drawDropShadow = false;
                         if (string.IsNullOrEmpty(assetReference.guid) && m_Owner.GetCreateAssetUtility().instanceID == assetReference.instanceID && m_Owner.GetCreateAssetUtility().icon != null)
@@ -849,17 +849,16 @@ void DrawItem(Rect position, FilteredHierarchy.FilterResult filterItem, BuiltinR
                         else
                         {
                             // Check for asset preview
-                            Texture image = null;
                             bool shouldGetAssetPreview = ShouldGetAssetPreview(assetReference.instanceID);
                             if (shouldGetAssetPreview)
                             {
                                 if (assetReference.instanceID != 0)
-                                    image = AssetPreview.GetAssetPreview(assetReference.instanceID, m_Owner.GetAssetPreviewManagerID());
+                                    previewImage = AssetPreview.GetAssetPreview(assetReference.instanceID, m_Owner.GetAssetPreviewManagerID());
                                 else if (!string.IsNullOrEmpty(assetReference.guid))
-                                    image = AssetPreview.GetAssetPreviewFromGUID(assetReference.guid, m_Owner.GetAssetPreviewManagerID());
+                                    previewImage = AssetPreview.GetAssetPreviewFromGUID(assetReference.guid, m_Owner.GetAssetPreviewManagerID());
                             }
 
-                            m_Content.image = image;
+                            m_Content.image = previewImage;
                             if (m_Content.image != null)
                                 drawDropShadow = true;
 
@@ -942,11 +941,66 @@ void DrawItem(Rect position, FilteredHierarchy.FilterResult filterItem, BuiltinR
                                 if (isDropTarget)
                                     Styles.resultsLabel.Draw(new Rect(labelRect.x - 10, labelRect.y, labelRect.width + 20, labelRect.height), GUIContent.none, true, true, false, false);
 
-                                labeltext = m_Owner.GetCroppedLabelText(assetReference, labeltext, orgPosition.width);
-                                var labelNewRect = Styles.resultsGridLabel.CalcSizeWithConstraints(GUIContent.Temp(labeltext), orgPosition.size);
-                                labelRect.x = orgPosition.x + (orgPosition.width - labelNewRect.x) / 2.0f;
-                                labelRect.width = labelNewRect.x;
-                                Styles.resultsGridLabel.Draw(labelRect, labeltext, false, false, selected, m_Owner.HasFocus());
+
+                                Texture2D typeIcon = null;
+                                if (filterItem != null && previewImage != null)
+                                {
+                                    Type type = InternalEditorUtility.GetTypeWithoutLoadingObject(filterItem.instanceID);
+                                    
+                                    if (type != typeof(Texture2D))
+                                    {
+                                        typeIcon = filterItem.icon;
+                                    }
+                                }
+
+                                if (builtinResource != null)
+                                {
+                                    Type type = InternalEditorUtility.GetTypeWithoutLoadingObject(builtinResource.m_InstanceID);
+
+                                    if (type != typeof(Texture2D))
+                                    {
+                                        typeIcon = AssetPreview.GetMiniTypeThumbnail(type);
+                                    }
+                                }
+
+                                var orgClipping = Styles.resultsGridLabel.clipping;
+                                var orgAlignment = Styles.resultsLabel.alignment;
+                                var size  = Styles.resultsGridLabel.CalcSizeWithConstraints(GUIContent.Temp(labeltext, typeIcon), orgPosition.size);
+                                size.x += Styles.resultsGridLabel.padding.horizontal;
+                                labelRect.x = orgPosition.x + (orgPosition.width - size.x) / 2.0f;
+                                labelRect.width = size.x;
+                                labelRect.height = size.y;
+                                m_Owner.sizeUsedForCroppingName = orgPosition.size;
+
+                                Styles.resultsGridLabel.clipping = TextClipping.Ellipsis;
+                                Styles.resultsGridLabel.alignment = TextAnchor.MiddleCenter;
+                                Styles.resultsGridLabel.Draw(labelRect, GUIContent.Temp(labeltext, typeIcon), false, false, selected, m_Owner.HasFocus());
+                                Styles.resultsGridLabel.clipping = orgClipping;
+                                Styles.resultsLabel.alignment = orgAlignment;
+
+                                // We only need to set the tooltip once, and not for every item.
+                                if (labelRect.Contains(Event.current.mousePosition))
+                                {
+                                    string tooltip = null;
+
+                                    if (filterItem != null)
+                                    {
+                                        //We use GetAssetPath to have the file extension as well
+                                        string path = AssetDatabase.GetAssetPath(filterItem.instanceID);
+                                        tooltip = path.Substring(path.LastIndexOf('/') + 1);
+                                    }
+                                    else if (builtinResource != null)
+                                    {
+                                        //We have a "None" item in the ObjectSelector that has a 0 instanceID
+                                        if (builtinResource.m_InstanceID != 0)     
+                                            tooltip = builtinResource.m_Name + "\n" + "(Built-in Resource)";
+                                    }
+
+                                    if (tooltip != null)
+                                    {
+                                        GUI.Label(labelRect, GUIContent.Temp("", tooltip));
+                                    }
+                                }
                             }
                         }
 
diff --git a/Editor/Mono/ObjectNames.cs b/Editor/Mono/ObjectNames.cs
index b40fbc23fb..f90bfb6a70 100644
--- a/Editor/Mono/ObjectNames.cs
+++ b/Editor/Mono/ObjectNames.cs
@@ -49,7 +49,7 @@ public static bool TryGet(Type objectType, out string title)
             }
         }
 
-        private static string GetObjectTypeName([NotNull] Object o)
+        private static string GetObjectTypeName([NotNull] Object o, bool multiObjectEditing = false)
         {
             if (o is GameObject)
                 return o.name;
@@ -72,6 +72,9 @@ private static string GetObjectTypeName([NotNull] Object o)
                 var meshfilter = o as MeshFilter;
                 if (meshfilter)
                 {
+                    if (multiObjectEditing)
+                        return "MeshFilter";
+
                     var mesh = meshfilter.sharedMesh;
                     return (mesh ? mesh.name : L10n.Tr("[none]")) + " (MeshFilter)";
                 }
@@ -102,8 +105,7 @@ private static string GetObjectTypeName([NotNull] Object o)
             return o.name + " (" + o.GetType().Name + ")";
         }
 
-        // Inspector title for an object.
-        public static string GetInspectorTitle(Object obj)
+        public static string GetInspectorTitle(Object obj, bool multiObjectEditing)
         {
             if (obj == null && (object)obj != null && (obj is MonoBehaviour || obj is ScriptableObject))
                 return L10n.Tr(" (Script)");
@@ -113,7 +115,7 @@ public static string GetInspectorTitle(Object obj)
 
             string title;
             if (!InspectorTitles.TryGet(obj.GetType(), out title))
-                title = NicifyVariableName(GetObjectTypeName(obj));
+                title = NicifyVariableName(GetObjectTypeName(obj, multiObjectEditing));
 
             if (Attribute.IsDefined(obj.GetType(), typeof(ObsoleteAttribute)))
                 title += L10n.Tr(" (Deprecated)");
@@ -121,6 +123,12 @@ public static string GetInspectorTitle(Object obj)
             return title;
         }
 
+        // Inspector title for an object.
+        public static string GetInspectorTitle(Object obj)
+        {
+            return GetInspectorTitle(obj, false);
+        }
+
         // Like GetClassName but handles folders, scenes, GUISkins, and other default assets as separate types.
         internal static string GetTypeName(Object obj)
         {
@@ -137,7 +145,7 @@ internal static string GetTypeName(Object obj)
                 return "Folder";
             else if (obj.GetType() == typeof(Object))
                 return System.IO.Path.GetExtension(pathLower) + " File";
-            return ObjectNames.GetClassName(obj);
+            return obj.GetType().Name;
         }
 
         [Obsolete("Please use NicifyVariableName instead")]
diff --git a/Editor/Mono/ObjectSelector.cs b/Editor/Mono/ObjectSelector.cs
index 790990a32d..bf8680172d 100644
--- a/Editor/Mono/ObjectSelector.cs
+++ b/Editor/Mono/ObjectSelector.cs
@@ -545,10 +545,8 @@ internal void Show(UnityObject obj, Type[] requiredTypes, UnityObject objectBein
 
             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++)
-                text += (i == requiredTypes.Length - 1 ? " or " : ", ") + (requiredTypes[i] == null ? m_RequiredTypes[i] : requiredTypes[i].Name);
-            titleContent = EditorGUIUtility.TrTextContent(text);
+
+            titleContent = EditorGUIUtility.TrTextContent(GenerateTitleContent(requiredTypes, m_RequiredTypes));
 
             // Deal with window size
             if (shouldRepositionWindow)
@@ -598,6 +596,20 @@ internal void Show(UnityObject obj, Type[] requiredTypes, UnityObject objectBein
             }
         }
 
+        internal static string GenerateTitleContent(Type[] requiredTypes, string[] requiredTypeStrings)
+        {
+            var typeName = requiredTypes[0] == null ? requiredTypeStrings[0] : requiredTypes[0].Name;
+            var text = "Select " + ObjectNames.NicifyVariableName(typeName);
+
+            for (int i = 1; i < requiredTypes.Length; i++)
+            {
+                typeName = requiredTypes[i] == null ? requiredTypeStrings[i] : requiredTypes[i].Name;
+                text += (i == requiredTypes.Length - 1 ? " or " : ", ") + ObjectNames.NicifyVariableName(typeName);
+            }
+
+            return text;
+        }
+
         void ItemWasDoubleClicked()
         {
             SendEvent(ObjectSelectorSelectionDoneCommand, false);
@@ -855,10 +867,13 @@ void WidePreview(float actualSize, string s, UnityObject o, EditorWrapper p)
             else if (o != null)
                 DrawObjectIcon(previewRect, m_ListArea.m_SelectedObjectIcon);
 
+            var prevClipping = Styles.smallStatus.clipping;
+            Styles.smallStatus.clipping = TextClipping.Overflow;
             if (EditorGUIUtility.isProSkin)
                 EditorGUI.DropShadowLabel(labelRect, s, Styles.smallStatus);
             else
                 GUI.Label(labelRect, s, Styles.smallStatus);
+            Styles.smallStatus.clipping = prevClipping;
         }
 
         void OverlapPreview(float actualSize, string s, UnityObject o, EditorWrapper p)
diff --git a/Editor/Mono/Overlays/OverlayAttribute.cs b/Editor/Mono/Overlays/OverlayAttribute.cs
index 472241b0fe..50209d7ca0 100644
--- a/Editor/Mono/Overlays/OverlayAttribute.cs
+++ b/Editor/Mono/Overlays/OverlayAttribute.cs
@@ -90,7 +90,7 @@ public float defaultHeight
         public OverlayAttribute()
         {
             m_EditorWindowType = null;
-            m_DefaultDisplay = false;
+            m_DefaultDisplay = true;
             m_Id = null;
             m_DisplayName = null;
             m_UssName = null;
diff --git a/Editor/Mono/Overlays/OverlayCanvas.cs b/Editor/Mono/Overlays/OverlayCanvas.cs
index cabdd1df31..fd2eeca98d 100644
--- a/Editor/Mono/Overlays/OverlayCanvas.cs
+++ b/Editor/Mono/Overlays/OverlayCanvas.cs
@@ -141,6 +141,13 @@ public override string ToString()
         }
     }
 
+    [Serializable]
+    sealed class ContainerData
+    {
+        public string containerId;
+        public float scrollOffset;
+    }
+
     //Dock position within container
     //for a horizontal container, Top is left, Bottom is right
     public enum DockPosition
@@ -231,6 +238,7 @@ internal OverlayContainer GetDockZoneContainer(DockZone zone)
             return null;
         }
 
+        bool m_MouseInCurrentCanvas = false;
         OverlayMenu m_Menu;
         internal string lastAppliedPresetName => m_LastAppliedPresetName;
         List<Overlay> m_Overlays = new List<Overlay>();
@@ -242,6 +250,12 @@ internal OverlayContainer GetDockZoneContainer(DockZone zone)
         [SerializeField]
         List<SaveData> m_SaveData = new List<SaveData>();
 
+        [SerializeField]
+        List<ContainerData> m_ContainerData = new List<ContainerData>();
+
+        [SerializeField]
+        bool m_OverlaysVisible = true;
+
         VisualElement m_RootVisualElement;
         internal EditorWindow containerWindow { get; set; }
 
@@ -281,6 +295,8 @@ internal OverlayCanvas() { }
 
         internal void SetOverlaysEnabled(bool visible)
         {
+            m_OverlaysVisible = visible;
+
             if (visible == overlaysEnabled)
                 return;
 
@@ -335,6 +351,10 @@ VisualElement CreateRoot()
                     else
                         defaultContainer = container;
                 }
+
+                var data = GetContainerData(container.name);
+                if (container is ToolbarOverlayContainer toolbar)
+                    toolbar.scrollOffset = data.scrollOffset;
             }
 
             m_OriginGhost = new VisualElement { name = "origin-ghost"};
@@ -350,6 +370,9 @@ VisualElement CreateRoot()
             ve.RegisterCallback<DetachFromPanelEvent>(OnDetachedFromPanel);
 
             m_WindowRoot = ve.Q("overlay-window-root");
+
+            SetOverlaysEnabled(m_OverlaysVisible);
+
             return ve;
         }
 
@@ -370,11 +393,15 @@ void OnAttachedToPanel(AttachToPanelEvent evt)
         {
             //this is used to clamp overlays to floating container bounds.
             floatingContainer.RegisterCallback<GeometryChangedEvent>(GeometryChanged);
+            rootVisualElement.RegisterCallback<MouseEnterEvent>(OnMouseEnter);
+            rootVisualElement.RegisterCallback<MouseLeaveEvent>(OnMouseLeave);
         }
 
         void OnDetachedFromPanel(DetachFromPanelEvent evt)
         {
             floatingContainer.UnregisterCallback<GeometryChangedEvent>(GeometryChanged);
+            rootVisualElement.UnregisterCallback<MouseEnterEvent>(OnMouseEnter);
+            rootVisualElement.UnregisterCallback<MouseLeaveEvent>(OnMouseLeave);
         }
 
         internal void OnContainerWindowDisabled()
@@ -383,6 +410,16 @@ internal void OnContainerWindowDisabled()
                 overlay.OnWillBeDestroyed();
         }
 
+        void OnMouseEnter(MouseEnterEvent evt)
+        {
+            m_MouseInCurrentCanvas = true;
+        }
+
+        void OnMouseLeave(MouseLeaveEvent evt)
+        {
+            m_MouseInCurrentCanvas = false;
+        }
+
         internal Rect ClampToOverlayWindow(Rect rect)
         {
             return ClampRectToBounds(rootVisualElement.localBound, rect);
@@ -451,7 +488,7 @@ internal void HideHoveredOverlay()
         internal void ShowMenu(bool show, bool atMousePosition = true)
         {
             if (show && !menuVisible)
-                menu.Show(atMousePosition);
+                menu.Show(atMousePosition && m_MouseInCurrentCanvas);
             else if (!show)
                 menu.Hide();
         }
@@ -505,7 +542,10 @@ internal void ShowOriginGhost(Overlay overlay)
         {
             m_OriginGhost.style.width = overlay.rootVisualElement.layout.width;
             m_OriginGhost.style.height = overlay.rootVisualElement.layout.height;
-            overlay.container?.Insert(overlay.container.IndexOf(overlay.rootVisualElement), m_OriginGhost);
+            if (overlay.container.GetOverlayIndex(overlay, out var section, out var index))
+            {
+                overlay.container.GetSectionElement(section)?.Insert(index, m_OriginGhost);
+            }
         }
 
         internal void UpdateGhostHover(bool hovered)
@@ -551,6 +591,10 @@ public void OnBeforeSerialize()
                         if (!after[i].dontSaveInLayout)
                             WriteOrReplaceSaveData(after[i], i);
                     }
+
+                    var data = GetContainerData(container.name);
+                    if (container is ToolbarOverlayContainer toolbar)
+                        data.scrollOffset = toolbar.scrollOffset;
                 }
             }
         }
@@ -780,5 +824,21 @@ void RestoreOverlays()
 
             afterOverlaysInitialized?.Invoke();
         }
+
+        ContainerData GetContainerData(string containerId)
+        {
+            foreach (var data in m_ContainerData)
+                if (data.containerId == containerId)
+                    return data;
+
+            var newData = new ContainerData
+            {
+                containerId = containerId,
+                scrollOffset = 0
+            };
+
+            m_ContainerData.Add(newData);
+            return newData;
+        }
     }
 }
diff --git a/Editor/Mono/Overlays/OverlayContainer.cs b/Editor/Mono/Overlays/OverlayContainer.cs
index a31d7c8b43..7f1b47c79e 100644
--- a/Editor/Mono/Overlays/OverlayContainer.cs
+++ b/Editor/Mono/Overlays/OverlayContainer.cs
@@ -53,14 +53,18 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         }
 
         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";
+        const string k_ContentClassName = className + "__content";
+        const string k_BeforeClassName = className + "__before-spacer-container";
+        const string k_AfterClassName = className + "__after-spacer-container";
+        const string k_SpacingContainerClassName = className + "__spacing-container";
         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;
+        readonly VisualElement m_BeforeSectionContent;
+        readonly VisualElement m_AfterSectionContent;
 
         // This is set by querying the stylesheet for 'vertical' and 'horizontal'
         Layout m_SupportedOverlayLayouts = 0; //Used as a flag in this case
@@ -68,6 +72,9 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
 
         public OverlayCanvas canvas { get; internal set; }
 
+        protected readonly VisualElement beforeSectionContainer;
+        protected readonly VisualElement afterSectionContainer;
+
         public int overlayCount => m_BeforeOverlays.Count + m_AfterOverlays.Count;
         public virtual Layout preferredLayout => Layout.Panel;
 
@@ -87,21 +94,32 @@ public bool isHorizontal
             }
         }
 
-        protected VisualElement spacer => m_Spacer;
-        public bool isSpacerVisible => !Mathf.Approximately(spacer.rect.width, 0) && !Mathf.Approximately(spacer.rect.height, 0);
+        public float spacerSize => isHorizontal
+                ? layout.width - (beforeSectionContainer.layout.width + afterSectionContainer.layout.width)
+                : layout.height - (beforeSectionContainer.layout.height + afterSectionContainer.layout.height);
+
+        public bool isSpacerVisible => !Mathf.Approximately(spacerSize, 0);
 
         public OverlayContainer()
         {
             AddToClassList(className);
             name = className;
 
-            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));
+            beforeSectionContainer = new VisualElement();
+            Add(beforeSectionContainer);
+            beforeSectionContainer.Add(m_BeforeSectionContent = new VisualElement());
+            beforeSectionContainer.Add(new OverlayContainerDropZone(this, OverlayContainerDropZone.Placement.Start));
+            beforeSectionContainer.AddToClassList(k_BeforeClassName);
+            beforeSectionContainer.AddToClassList(k_SpacingContainerClassName);
+            m_BeforeSectionContent.AddToClassList(k_ContentClassName);
+
+            afterSectionContainer = new VisualElement();
+            Add(afterSectionContainer);
+            afterSectionContainer.Add(new OverlayContainerDropZone(this, OverlayContainerDropZone.Placement.End));
+            afterSectionContainer.Add(m_AfterSectionContent = new VisualElement());
+            afterSectionContainer.AddToClassList(k_AfterClassName);
+            afterSectionContainer.AddToClassList(k_SpacingContainerClassName);
+            m_AfterSectionContent.AddToClassList(k_ContentClassName);
 
             SetVertical();
         }
@@ -135,32 +153,22 @@ public void InsertOverlay(Overlay overlay, OverlayContainerSection section, int
                 return;
 
             var list = GetSectionInternal(section);
-
+            var element = GetSectionElement(section);
             int realIndex = -1;
 
             //Insert relative to another element in case other visual elements are added to hierarchy
             if (index < list.Count)
             {
-                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;
-
+                realIndex = element.IndexOf(list[index].rootVisualElement);
             }
-
-            if (realIndex < 0)
+            else if (index == list.Count)
             {
-                switch (section)
-                {
-                    case OverlayContainerSection.BeforeSpacer: realIndex = IndexOf(m_Spacer); break;
-                    case OverlayContainerSection.AfterSpacer: realIndex = IndexOf(m_Spacer) + 1; break;
-                }
+                realIndex = element.childCount;
             }
 
+            realIndex = Mathf.Max(realIndex, 0);
 
-            Insert(realIndex, overlay.rootVisualElement);
+            element.Insert(realIndex, overlay.rootVisualElement);
             list.Insert(index, overlay);
         }
 
@@ -219,6 +227,17 @@ public ReadOnlyCollection<Overlay> GetSection(OverlayContainerSection section)
             return GetSectionInternal(section).AsReadOnly();
         }
 
+        public VisualElement GetSectionElement(OverlayContainerSection section)
+        {
+            switch (section)
+            {
+                case OverlayContainerSection.BeforeSpacer: return m_BeforeSectionContent;
+                case OverlayContainerSection.AfterSpacer: return m_AfterSectionContent;
+                default:
+                    throw new InvalidEnumArgumentException();
+            }
+        }
+
         List<Overlay> GetSectionInternal(OverlayContainerSection section)
         {
             switch (section)
@@ -283,38 +302,82 @@ class ToolbarOverlayContainer : OverlayContainer
 
         readonly OverlayDropZoneBase m_NoElementDropZone;
         readonly VisualElement m_ContentContainer;
+        readonly ScrollView m_ScrollView;
+
+        float m_ScrollOffsetRequestedValue;
 
         public override VisualElement contentContainer => m_ContentContainer ?? base.contentContainer;
 
         public override Layout preferredLayout => isHorizontal ? Layout.HorizontalToolbar : Layout.VerticalToolbar;
 
+        internal bool canAssignScrollOffset => isHorizontal ? HasValidScrollerValues(m_ScrollView.horizontalScroller) : HasValidScrollerValues(m_ScrollView.verticalScroller);
+
+        public float scrollOffset
+        {
+            get => isHorizontal ? m_ScrollView.scrollOffset.x : m_ScrollView.scrollOffset.y;
+            set
+            {
+                if (canAssignScrollOffset)
+                    m_ScrollView.scrollOffset = isHorizontal ? new Vector2(value, 0) : new Vector2(0, value);
+                else
+                    m_ScrollOffsetRequestedValue = value;
+            }
+        }
+
+        
+
         public ToolbarOverlayContainer()
         {
+            m_ScrollView = new ScrollView(ScrollViewMode.Horizontal);
+            m_ScrollView.style.width = new StyleLength(new Length(100, LengthUnit.Percent));
+            hierarchy.Add(m_ScrollView);
+            m_ScrollView.RegisterCallback<GeometryChangedEvent>(DelayScrollViewInit);
+
             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);
+            m_ContentContainer = m_ScrollView.contentContainer;
+            Add(beforeSectionContainer);
+            Add(afterSectionContainer);
+
+            //Force the current direction because scroll view was just created
+            if (isHorizontal)
+                SetHorizontal();
+            else
+                SetVertical();
+        }
+
+        void DelayScrollViewInit(GeometryChangedEvent evt)
+        {
+            m_ScrollView.UnregisterCallback<GeometryChangedEvent>(DelayScrollViewInit);
+            m_ScrollView.horizontalScrollerVisibility = m_ScrollView.verticalScrollerVisibility = ScrollerVisibility.Hidden;
+            if (!Mathf.Approximately(m_ScrollOffsetRequestedValue, 0))
+                scrollOffset = m_ScrollOffsetRequestedValue;
         }
 
         protected override void SetHorizontal()
         {
             base.SetHorizontal();
 
-            if (contentContainer != null)
-                contentContainer.style.flexDirection = FlexDirection.Row;
+            if (m_ScrollView != null)
+            {
+                m_ScrollView.mode = ScrollViewMode.Horizontal;
+                m_ScrollView.style.width = new StyleLength(new Length(100, LengthUnit.Percent));
+                m_ScrollView.style.height = new StyleLength(StyleKeyword.Auto);
+            }
         }
 
         protected override void SetVertical()
         {
             base.SetVertical();
 
-            if (contentContainer != null)
-                contentContainer.style.flexDirection = FlexDirection.Column;
+            if (m_ScrollView != null)
+            {
+                m_ScrollView.mode = ScrollViewMode.Vertical;
+                m_ScrollView.style.height = new StyleLength(new Length(100, LengthUnit.Percent));
+                m_ScrollView.style.width = new StyleLength(StyleKeyword.Auto);
+            }
         }
 
         public override bool IsOverlayLayoutSupported(Layout requested)
@@ -323,5 +386,10 @@ public override bool IsOverlayLayoutSupported(Layout requested)
                 return (requested & Layout.HorizontalToolbar) > 0;
             return (requested & Layout.VerticalToolbar) > 0;
         }
+
+        bool HasValidScrollerValues(Scroller scroller)
+        {
+            return !float.IsNaN(scroller.lowValue) && !float.IsNaN(scroller.highValue);
+        }
     }
 }
diff --git a/Editor/Mono/Overlays/OverlayDropZone.cs b/Editor/Mono/Overlays/OverlayDropZone.cs
index 87f5db1458..f3c32e19b8 100644
--- a/Editor/Mono/Overlays/OverlayDropZone.cs
+++ b/Editor/Mono/Overlays/OverlayDropZone.cs
@@ -107,6 +107,15 @@ protected override void OnDropZoneActivated(Overlay draggedOverlay)
             }
             else
             {
+                if (m_Container is ToolbarOverlayContainer)
+                {
+                    var targetSize = m_Container.spacerSize * .5f;
+                    if (m_Container.isHorizontal)
+                        dropArea.style.width = targetSize;
+                    else
+                        dropArea.style.height = targetSize;
+                }
+
                 if (m_Container is ToolbarOverlayContainer && !m_Container.HasVisibleOverlays())
                 {
                     SetVisualMode(VisualMode.Disabled);
@@ -271,8 +280,6 @@ public override void PopulateDestMarkerClassList(IList<string> classes)
 
         protected override void OnDropZoneActivated(Overlay draggedOverlay)
         {
-            base.OnDropZoneActivated(draggedOverlay);
-
             SetVisualMode(m_OverlayContainer.HasVisibleOverlays() ? VisualMode.Disabled : VisualMode.Custom);
         }
 
@@ -315,6 +322,8 @@ protected enum VisualMode
         public int priority { get; set; }
         public abstract void DropOverlay(Overlay overlay);
 
+        protected VisualElement dropArea => m_DropArea;
+
         public virtual void PopulateDestMarkerClassList(IList<string> classes)
         {
             switch (visualMode)
@@ -364,6 +373,7 @@ protected OverlayDropZoneBase()
             pickingMode = PickingMode.Ignore;
             m_DropArea.pickingMode = PickingMode.Ignore;
             m_VisualBounds.pickingMode = PickingMode.Ignore;
+            m_DropArea.style.display = DisplayStyle.None;
 
             RegisterCallback<AttachToPanelEvent>(OnAttachToPanel);
             RegisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
@@ -385,12 +395,14 @@ void OnDragStarted(Overlay overlay)
         {
             //TODO check if in same canvas? or we support dragging to different canvas
             m_DropArea.pickingMode = PickingMode.Position;
+            m_DropArea.style.display = DisplayStyle.Flex;
             OnDropZoneActivated(overlay);
         }
 
         void OnDragEnded(Overlay overlay)
         {
             m_DropArea.pickingMode = PickingMode.Ignore;
+            m_DropArea.style.display = DisplayStyle.None;
             OnDropZoneDeactivated(overlay);
         }
 
diff --git a/Editor/Mono/Overlays/OverlayPopup.cs b/Editor/Mono/Overlays/OverlayPopup.cs
index 8e03328486..26078d57ed 100644
--- a/Editor/Mono/Overlays/OverlayPopup.cs
+++ b/Editor/Mono/Overlays/OverlayPopup.cs
@@ -41,6 +41,7 @@ public OverlayPopup(Overlay overlay)
             {
                 var proposed = overlay.collapsedButtonRect;
                 proposed.size = evt.newRect.size;
+
                 var placement = OverlayCanvas.ClampRectToBounds(overlay.canvas.windowRoot.worldBound, proposed);
 
                 if (!Mathf.Approximately(proposed.position.x, placement.position.x))
@@ -54,34 +55,63 @@ public OverlayPopup(Overlay overlay)
                     this.EnableInClassList(k_FromVertical, true);
 
                 if (!overlay.isInToolbar)
-                {
                     this.EnableInClassList(k_OutsideToolbar, true);
-                    var overlayWorldBound = overlay.rootVisualElement.worldBound;
 
-                    var rightPlacement = overlayWorldBound.x + overlayWorldBound.width;
-                    var rightSideSpace = canvasWorld.xMax - rightPlacement;
+                var overlayWorldBound = overlay.rootVisualElement.worldBound;
+
+                var rightPlacement = overlayWorldBound.x + overlayWorldBound.width;
+                var rightSideSpace = canvasWorld.xMax - rightPlacement;
 
-                    var xAdjusted = placement.position.x;
-                    if (rightSideSpace >= placement.width)
-                        xAdjusted = rightPlacement;
-                    else
+                var xAdjusted = placement.position.x;
+                var maxWidth = placement.width;
+                if (rightSideSpace >= placement.width)
+                {
+                    xAdjusted = rightPlacement;
+                }
+                else
+                {
+                    var leftSideSpace = placement.x - overlay.canvas.rootVisualElement.worldBound.x;
+                    if (leftSideSpace >= placement.width)
+                    {
+                        xAdjusted = overlayWorldBound.x - placement.width;
+                    }
+                    else // If neither side has enough space, show the popup on the widest one
                     {
-                        var leftSideSpace = placement.x - overlay.canvas.rootVisualElement.worldBound.x;
-                        if (leftSideSpace >= placement.width)
+                        if (rightSideSpace > leftSideSpace)
+                            xAdjusted = overlayWorldBound.x + overlayWorldBound.width;
+                        else
                             xAdjusted = overlayWorldBound.x - placement.width;
-                        else // If neither side has enough space, show the popup on the widest one
-                        {
-                            if (rightSideSpace > leftSideSpace)
-                                xAdjusted = overlayWorldBound.x + overlayWorldBound.width;
-                            else
-                                xAdjusted = overlayWorldBound.x - placement.width;
-                        }
+
+                        maxWidth = canvasWorld.xMax - xAdjusted;
+                    }
+                }
+
+                var yAdjusted = placement.position.y;
+                var bottomSpace = canvasWorld.yMax - yAdjusted;
+
+                var maxHeight = placement.height;
+                if (bottomSpace < placement.height)
+                {
+                    var upPlacement = overlayWorldBound.y + overlayWorldBound.height;
+                    var upSpace = upPlacement - canvasWorld.y;
+                    if (upSpace >= placement.height)
+                    {
+                        yAdjusted = upPlacement - placement.height;
+                    }
+                    else // If neither side has enough space, show the popup on the widest one
+                    {
+                        if (bottomSpace <= upSpace)
+                            yAdjusted = upPlacement - placement.height;
+
+                        maxHeight = canvasWorld.yMax - yAdjusted;
                     }
-                    placement.position = new Vector2(xAdjusted, placement.position.y);
                 }
 
-                style.maxWidth = canvasWorld.xMax - placement.position.x;
-                style.maxHeight = canvasWorld.yMax - placement.position.y;
+                placement.position = new Vector2(xAdjusted, yAdjusted);
+
+                style.maxHeight = maxHeight;
+                style.maxWidth = maxWidth;
+
                 transform.position = placement.position - canvasWorld.position;
             });
         }
diff --git a/Editor/Mono/Overlays/OverlayResizer.cs b/Editor/Mono/Overlays/OverlayResizer.cs
index 9bb742c3a2..5abd03bbe6 100644
--- a/Editor/Mono/Overlays/OverlayResizer.cs
+++ b/Editor/Mono/Overlays/OverlayResizer.cs
@@ -13,6 +13,7 @@ class OverlayResizerGroup : VisualElement
     {
         const float k_CornerSize = 8;
         const float k_SideSize = 6;
+        const float k_MinDistanceFromEdge = 10;
 
         [Flags]
         enum Direction
@@ -75,11 +76,18 @@ public OverlayResizer(Overlay overlay, Direction direction)
 
             void OnMouseDown(MouseDownEvent evt)
             {
+                var container = m_Overlay.rootVisualElement.GetFirstAncestorOfType<OverlayContainer>();
+
+
+                var overlayPosition = m_Overlay.rootVisualElement.layout.position;
+                if (container != null)
+                    overlayPosition = m_Overlay.rootVisualElement.parent.ChangeCoordinatesTo(container, overlayPosition);
+
                 m_OriginalRect = new Rect(
-                    m_Overlay.floating ?  m_Overlay.floatingPosition : m_Overlay.rootVisualElement.layout.position,
+                    m_Overlay.floating ?  m_Overlay.floatingPosition : overlayPosition,
                     m_Overlay.size);
 
-                m_ContainerRect = m_Overlay.rootVisualElement.parent.rect;
+                m_ContainerRect = container?.rect ?? new Rect(float.NegativeInfinity,float.NegativeInfinity,float.PositiveInfinity,float.PositiveInfinity);
                 m_OriginalMousePosition = evt.mousePosition;
                 m_MaxSize = m_Overlay.maxSize;
                 m_MinSize = m_Overlay.minSize;
@@ -210,6 +218,9 @@ public OverlayResizerGroup(Overlay overlay)
 
             overlay.containerChanged += OnOverlayContainerChanged;
             overlay.layoutChanged += OnOverlayLayoutChanged;
+            overlay.floatingPositionChanged += OnOverlayPositionChanged;
+            overlay.collapsedChanged += OnOverlayCollaspedChanged;
+            m_Overlay.rootVisualElement.RegisterCallback<GeometryChangedEvent>(OnOverlayGeometryChanged);
             UpdateResizerVisibility();
         }
 
@@ -223,6 +234,21 @@ void OnOverlayContainerChanged(OverlayContainer container)
             UpdateResizerVisibility();
         }
 
+        void OnOverlayGeometryChanged(GeometryChangedEvent evt)
+        {
+            UpdateResizerVisibility();
+        }
+
+        void OnOverlayPositionChanged(Vector3 position)
+        {
+            UpdateResizerVisibility();
+        }
+
+        void OnOverlayCollaspedChanged(bool collapsed)
+        {
+            UpdateResizerVisibility();
+        }
+
         bool ContainerCanShowResizer(OverlayResizer resizer)
         {
             var container = m_Overlay.container;
@@ -255,14 +281,15 @@ bool ContainerCanShowResizer(OverlayResizer resizer)
 
         void UpdateResizerVisibility()
         {
-            bool globalHide = m_Overlay.layout != Layout.Panel;
+            bool globalHide = m_Overlay.layout != Layout.Panel && !m_Overlay.collapsed;
             foreach (var resizer in m_Resizers)
             {
                 bool hide = globalHide || !ContainerCanShowResizer(resizer);
 
                 if (resizer.HasMultipleDirections())
                 {
-                    hide |= m_Overlay.minSize == m_Overlay.maxSize;
+                    hide |= Mathf.Approximately(m_Overlay.minSize.x, m_Overlay.maxSize.x);
+                    hide |= Mathf.Approximately(m_Overlay.minSize.y, m_Overlay.maxSize.y);
                 }
                 else
                 {
@@ -273,6 +300,26 @@ void UpdateResizerVisibility()
                         hide |= Mathf.Approximately(m_Overlay.minSize.y, m_Overlay.maxSize.y);
                 }
 
+                if (m_Overlay.canvas != null)
+                {
+                    var canvas = m_Overlay.canvas.rootVisualElement;
+                    var canvasRect = canvas.rect;
+                    var overlayRect = canvas.WorldToLocal(m_Overlay.rootVisualElement.worldBound);
+
+                    if (resizer.HasDirection(Direction.Left))
+                        hide |= overlayRect.xMin <= k_MinDistanceFromEdge;
+
+                    if (resizer.HasDirection(Direction.Right))
+                        hide |= overlayRect.xMax >= canvasRect.xMax - k_MinDistanceFromEdge;
+
+                    if (resizer.HasDirection(Direction.Top))
+                        hide |= overlayRect.yMin <= k_MinDistanceFromEdge;
+
+                    if (resizer.HasDirection(Direction.Bottom))
+                        hide |= overlayRect.yMax >= canvasRect.yMax - k_MinDistanceFromEdge;
+                }
+
+
                 resizer.style.display = hide ? DisplayStyle.None : DisplayStyle.Flex;
             }
         }
diff --git a/Editor/Mono/Overlays/OverlayUtilities.cs b/Editor/Mono/Overlays/OverlayUtilities.cs
index 92f9a4e5b8..fe4c09d0ab 100644
--- a/Editor/Mono/Overlays/OverlayUtilities.cs
+++ b/Editor/Mono/Overlays/OverlayUtilities.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using UnityEditor.EditorTools;
 using UnityEditor.Toolbars;
 using UnityEngine;
@@ -142,11 +143,21 @@ internal static string GetSignificantLettersForIcon(string s)
 
             var folders = s.Split('/');
             var last = folders[folders.Length - 1];
-            var words = last.Trim().Split(' ');
+            if (string.IsNullOrEmpty(last))
+                return string.Empty;
 
+            var words = last.Trim().Split(' ');
             if (words.Length == 1)
             {
-                return words[0].Length > 1 ? words[0].Substring(0, 2) : words[0][0].ToString();
+                var regex = new Regex(@"[A-Z][^A-Z]*", RegexOptions.Compiled);
+                var matches = regex.Matches(words[0]);
+                if (matches == null || matches.Count == 0)
+                    return words[0].Length > 1 ? words[0].Substring(0, 2) : words[0][0].ToString();
+
+                if (matches.Count == 1)
+                    return matches[0].Length > 1 ? matches[0].Value.Substring(0, 2) : matches[0].Value[0].ToString();
+
+                return matches[0].Value.Substring(0, 1) + matches[1].Value.Substring(0, 1);
             }
 
             return words[0].Substring(0, 1) + words[1].Substring(0, 1);
diff --git a/Editor/Mono/PerformanceTools/FrameDebugger.cs b/Editor/Mono/PerformanceTools/FrameDebugger.cs
index 1e0445443d..b4439cd664 100644
--- a/Editor/Mono/PerformanceTools/FrameDebugger.cs
+++ b/Editor/Mono/PerformanceTools/FrameDebugger.cs
@@ -27,6 +27,8 @@ internal class FrameDebuggerWindow : EditorWindow
         private int m_EnablingWaitCounter = 0;
         private int m_RepaintFrames = k_NeedToRepaintFrames;
         private int m_FrameEventsHash;
+        private bool m_ShowTabbedErrorBox;
+        private bool m_HasOpenedPlaymodeView;
         private Rect m_SearchRect;
         private string m_SearchString = String.Empty;
         private IConnectionState m_AttachToPlayerState;
@@ -103,6 +105,12 @@ internal void ChangeFrameEventLimit(int newLimit, FrameDebuggerTreeView.FrameDeb
             m_TreeView?.SelectFrameEventIndex(newLimit);
         }
 
+        internal void OnConnectedProfilerChange()
+        {
+            DisableFrameDebugger();
+            EnableFrameDebugger();
+        }
+
         internal static void RepaintAll()
         {
             foreach (var fd in s_FrameDebuggers)
@@ -186,10 +194,17 @@ private void DrawDisabledFrameDebugger()
             }
 
             EditorGUILayout.HelpBox(FrameDebuggerStyles.EventDetails.k_DescriptionString, MessageType.Info, true);
+
+            if (m_ShowTabbedErrorBox)
+                EditorGUILayout.HelpBox(FrameDebuggerStyles.EventDetails.k_TabbedWithPlaymodeErrorString, MessageType.Error, true);
         }
 
         private void HandleEnablingFrameDebugger()
         {
+            // Make sure the PlayMode window is enabled and shown...
+            if (!OpenPlayModeView())
+                return;
+
             if (Event.current.type != EventType.Repaint)
                 return;
 
@@ -203,19 +218,74 @@ private void HandleEnablingFrameDebugger()
             }
         }
 
-        private void DrawEnabledFrameDebugger(bool repaint)
+        private bool CheckIfFDIsDockedWithGameWindow(DockArea da, PlayModeView gameWindow)
         {
-            int oldLimit = FrameDebuggerUtility.limit;
-            FrameDebuggerEvent[] descs = FrameDebuggerUtility.GetFrameEvents();
+            for (int i = 0; i < da.m_Panes.Count; i++)
+                if (gameWindow == da.m_Panes[i])
+                    return true;
+            return false;
+        }
 
-            // Make sure the PlayMode window is enabled and shown...
-            if (FrameDebugger.IsLocalEnabled())
+        private bool OpenPlayModeView()
+        {
+            if (m_HasOpenedPlaymodeView)
+                return true;
+
+            // When debugging remote players, we can ignore this check as it doesn't render to the Game Window.
+            if (!FrameDebugger.IsLocalEnabled() && m_AttachToPlayerState.connectedToTarget != ConnectionTarget.Editor)
+                return true;
+
+            PlayModeView mainGameWindow = PlayModeView.GetMainPlayModeView();
+            List<PlayModeView> allGameWindows = PlayModeView.GetAllPlayModeViewWindows();
+            if (mainGameWindow || allGameWindows.Count > 0)
             {
-                PlayModeView playModeView = PlayModeView.GetMainPlayModeView();
-                if (playModeView)
-                    playModeView.ShowTab();
+                PlayModeView gameWindowToUse = mainGameWindow;
+
+                // The Frame Debugger and Game Window can not be docked together in
+                // the panes list (tabs) as both need to be shown in the Editor.
+                bool isFDInTheSamePaneAsGameWindow = false;
+                DockArea da = m_Parent as DockArea;
+                if (da)
+                    isFDInTheSamePaneAsGameWindow |= CheckIfFDIsDockedWithGameWindow(da, mainGameWindow);
+
+                // If it's docked, check if there are other game windows available to use
+                if (isFDInTheSamePaneAsGameWindow && allGameWindows.Count > 1)
+                {
+                    for (int i = 0; i < allGameWindows.Count; i++)
+                    {
+                        if (CheckIfFDIsDockedWithGameWindow(da, allGameWindows[i]))
+                            continue;
+
+                        isFDInTheSamePaneAsGameWindow = false;
+                        gameWindowToUse = allGameWindows[i];
+                        break;
+                    }
+                }
+
+                // When we can't enable the FD debugger, we display an error box informing the
+                // user to undock the Frame Debugger Window so it's not tabbed with the Game Window.
+                if (isFDInTheSamePaneAsGameWindow)
+                {
+                    m_ShowTabbedErrorBox = true;
+                    return false;
+                }
+                // Otherwise we show the Game Window
+                else
+                {
+                    gameWindowToUse.ShowTab();
+                    m_HasOpenedPlaymodeView = true;
+                    return true;
+                }
             }
 
+            return false;
+        }
+
+        private void DrawEnabledFrameDebugger(bool repaint)
+        {
+            int oldLimit = FrameDebuggerUtility.limit;
+            FrameDebuggerEvent[] descs = FrameDebuggerUtility.GetFrameEvents();
+
             // captured frame event contents have changed, rebuild the tree data
             if (HasEventHashChanged)
             {
@@ -319,13 +389,10 @@ private void EnableFrameDebugger()
             if (enablingLocally && !FrameDebuggerUtility.locallySupported)
                 return;
 
-            // Make sure game view is visible when enabling frame debugger locally
-            if (FrameDebugger.IsLocalEnabled())
-            {
-                PlayModeView playModeView = PlayModeView.GetMainPlayModeView();
-                if (playModeView)
-                    playModeView.ShowTab();
-            }
+            m_ShowTabbedErrorBox = false;
+            m_HasOpenedPlaymodeView = false;
+            if (!OpenPlayModeView())
+                return;
 
             // pause play mode if needed
             if (enablingLocally)
@@ -342,7 +409,6 @@ private void EnableFrameDebugger()
 
             m_EnablingWaitCounter = 0;
             m_EventDetailsView.Reset();
-
             RepaintOnLimitChange();
         }
 
@@ -363,12 +429,13 @@ private void DisableFrameDebugger()
                 m_EventDetailsView = null;
             }
 
+            m_HasOpenedPlaymodeView = false;
             FrameDebuggerStyles.OnDisable();
             m_TreeViewState = null;
             m_TreeView = null;
         }
 
-        private void RepaintOnLimitChange()
+        internal void RepaintOnLimitChange()
         {
             m_RepaintFrames = k_NeedToRepaintFrames;
             RepaintAllNeededThings();
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerEventDetailsView.cs b/Editor/Mono/PerformanceTools/FrameDebuggerEventDetailsView.cs
index 6a8cc31401..988bc13305 100644
--- a/Editor/Mono/PerformanceTools/FrameDebuggerEventDetailsView.cs
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerEventDetailsView.cs
@@ -548,7 +548,11 @@ private void DrawEventMesh(float viewportWidth, float viewportHeight, float texW
             }
             EditorGUILayout.EndHorizontal();
 
-            m_Preview?.OnPreviewGUI(previewRect, EditorStyles.helpBox);
+            var evt = Event.current;
+            if (FrameDebuggerHelper.IsHoveringRect(previewRect) || evt.type != EventType.ScrollWheel)
+            {
+                m_Preview?.OnPreviewGUI(previewRect, EditorStyles.helpBox);
+            }
         }
 
         private void DrawEventMeshBackground(float viewportWidth, float viewportHeight)
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerEventDisplayData.cs b/Editor/Mono/PerformanceTools/FrameDebuggerEventDisplayData.cs
index 345e746967..fb9441f8ba 100644
--- a/Editor/Mono/PerformanceTools/FrameDebuggerEventDisplayData.cs
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerEventDisplayData.cs
@@ -408,6 +408,12 @@ private bool CreateShaderPropertyDisplayInfo(ShaderPropertyType dataType, int ar
             return true;
         }
 
+        private string GetArrayIndexString(int nameLength, int numOfValues, int currentIndex)
+        {
+            int numOfSpaces = nameLength + (FrameDebuggerHelper.CountDigits(numOfValues) - FrameDebuggerHelper.CountDigits(currentIndex));
+            return $"{new string(' ', numOfSpaces)}[{currentIndex}]";
+        }
+
         private bool GetShaderPropertyData(ShaderPropertyType dataType, int arrayIndex, string name, ref ShaderPropertyCollection propertyTypeDisplayData, ref ShaderInfo shaderInfo, ref ShaderPropertyDisplayInfo data)
         {
             m_StringBuilder.Clear();
@@ -501,7 +507,13 @@ private bool GetShaderPropertyData(ShaderPropertyType dataType, int arrayIndex,
                         m_StringBuilder.Clear();
                         data.m_FoldoutString = String.Format(propertyTypeDisplayData.m_Format, $"{name}[{numOfValues}]", stage, string.Empty, string.Empty, string.Empty, string.Empty);
                         for (int k = arrayIndex; k < arrayIndex + numOfValues; k++)
-                            m_StringBuilder.Append(String.Format(propertyTypeDisplayData.m_Format, $"[{k - arrayIndex}]", string.Empty, shaderInfo.m_Vectors[k].m_Value));
+                        {
+                            int value = shaderInfo.m_Ints[k].m_Value;
+                            m_StringBuilder.AppendFormat(propertyTypeDisplayData.m_Format,
+                                                         GetArrayIndexString(name.Length, numOfValues, k - arrayIndex),
+                                                         string.Empty,
+                                                         value).AppendLine();
+                        }
 
                         // Remove last linebreak
                         if (m_StringBuilder.Length > 2)
@@ -529,7 +541,13 @@ private bool GetShaderPropertyData(ShaderPropertyType dataType, int arrayIndex,
                         data.m_FoldoutString = m_StringBuilder.AppendFormat(propertyTypeDisplayData.m_Format, $"{name}[{numOfValues}]", stage, string.Empty, string.Empty, string.Empty, string.Empty).ToString();
                         m_StringBuilder.Clear();
                         for (int k = arrayIndex; k < arrayIndex + numOfValues; k++)
-                            m_StringBuilder.AppendFormat(propertyTypeDisplayData.m_Format, $"[{k - arrayIndex}]", string.Empty, shaderInfo.m_Floats[k].m_Value);
+                        {
+                            float value = shaderInfo.m_Floats[k].m_Value;
+                            m_StringBuilder.AppendFormat(propertyTypeDisplayData.m_Format,
+                                                         GetArrayIndexString(name.Length, numOfValues, k - arrayIndex),
+                                                         string.Empty,
+                                                         value).AppendLine();
+                        }
 
                         // Remove last linebreak
                         if (numOfValues > 1 && m_StringBuilder.Length > 2)
@@ -557,9 +575,13 @@ private bool GetShaderPropertyData(ShaderPropertyType dataType, int arrayIndex,
                         for (int k = arrayIndex; k < arrayIndex + numOfValues; k++)
                         {
                             Vector4 value = shaderInfo.m_Vectors[k].m_Value;
-                            int numOfSpaces = name.Length + (FrameDebuggerHelper.CountDigits(numOfValues) - FrameDebuggerHelper.CountDigits(k - arrayIndex));
-                            m_StringBuilder.AppendFormat(propertyTypeDisplayData.m_Format, $"{new string(' ', numOfSpaces)}[{k - arrayIndex}]", string.Empty, value.x, value.y, value.z, value.w);
-                            m_StringBuilder.AppendLine();
+                            m_StringBuilder.AppendFormat(propertyTypeDisplayData.m_Format,
+                                                         GetArrayIndexString(name.Length, numOfValues, k - arrayIndex),
+                                                         string.Empty,
+                                                         value.x,
+                                                         value.y,
+                                                         value.z,
+                                                         value.w).AppendLine();
                         }
 
                         // Remove last linebreak
@@ -597,13 +619,12 @@ private bool GetShaderPropertyData(ShaderPropertyType dataType, int arrayIndex,
                         for (int k = arrayIndex; k < arrayIndex + numOfValues; k++)
                         {
                             Matrix4x4 value = shaderInfo.m_Matrices[k].m_Value;
-                            int numOfSpaces = name.Length + (FrameDebuggerHelper.CountDigits(numOfValues) - FrameDebuggerHelper.CountDigits(k - arrayIndex));
                             m_StringBuilder.AppendFormat(propertyTypeDisplayData.m_Format,
-                                         $"{new string(' ', numOfSpaces)}[{k - arrayIndex}]", string.Empty, value.m00, value.m01, value.m02, value.m03,
-                                         string.Empty, string.Empty, value.m10, value.m11, value.m12, value.m13,
-                                         string.Empty, string.Empty, value.m20, value.m21, value.m22, value.m23,
-                                         string.Empty, string.Empty, value.m30, value.m31, value.m32, value.m33);
-                            m_StringBuilder.AppendLine();
+                                                         GetArrayIndexString(name.Length, numOfValues, k - arrayIndex),
+                                                                       string.Empty, value.m00, value.m01, value.m02, value.m03,
+                                                         string.Empty, string.Empty, value.m10, value.m11, value.m12, value.m13,
+                                                         string.Empty, string.Empty, value.m20, value.m21, value.m22, value.m23,
+                                                         string.Empty, string.Empty, value.m30, value.m31, value.m32, value.m33).AppendLine();
                         }
 
                         // Remove last linebreak
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerHelper.cs b/Editor/Mono/PerformanceTools/FrameDebuggerHelper.cs
index 84ba201ea1..e724455b33 100644
--- a/Editor/Mono/PerformanceTools/FrameDebuggerHelper.cs
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerHelper.cs
@@ -41,6 +41,7 @@ internal static Material frameDebuggerMaterial
         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 bool IsHoveringRect(Rect rect) => rect.Contains(Event.current.mousePosition);
         internal static bool IsARenderTexture(ref Texture t) => t != null && (t as RenderTexture) != null;
         internal static bool IsADepthTexture(ref Texture t) => IsARenderTexture(ref t) && ((t as RenderTexture).graphicsFormat == GraphicsFormat.None);
 
@@ -129,7 +130,7 @@ private static void SetMaterialProperties(
                 frameDebuggerMaterial.EnableKeyword(ShaderPropertyIDs._TEX2DARRAY);
             else if (samplerType == TextureDimension.CubeArray)
                 frameDebuggerMaterial.EnableKeyword(ShaderPropertyIDs._CUBEMAP);
-            
+
             mat.DisableKeyword(ShaderPropertyIDs._MSAA_2);
             mat.DisableKeyword(ShaderPropertyIDs._MSAA_4);
             mat.DisableKeyword(ShaderPropertyIDs._MSAA_8);
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerStyles.cs b/Editor/Mono/PerformanceTools/FrameDebuggerStyles.cs
index c8ae23f7de..fd63a8f6c2 100644
--- a/Editor/Mono/PerformanceTools/FrameDebuggerStyles.cs
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerStyles.cs
@@ -58,8 +58,13 @@ internal struct Window
         // Tree
         internal struct Tree
         {
-            internal static readonly GUIStyle s_RowText = "OL Label";
-            internal static readonly GUIStyle s_RowTextRight = "OL RightLabel";
+            internal static readonly GUIStyle s_RowText = new GUIStyle(EditorStyles.label);
+            internal static readonly GUIStyle s_RowTextBold = new GUIStyle(EditorStyles.boldLabel);
+            internal static readonly GUIStyle s_RowTextRight = new GUIStyle(EditorStyles.boldLabel)
+            {
+                alignment = TextAnchor.MiddleRight
+            };
+
             internal const string k_UnknownScopeString = "<unknown scope>";
         }
 
@@ -162,7 +167,7 @@ internal struct EventDetails
 
             internal static readonly GUIStyle s_ArrayFoldoutStyle = new GUIStyle(EditorStyles.foldout)
             {
-                margin = new RectOffset(-30, 0, 0, 0),
+                margin = new RectOffset(-29, 0, 0, 0),
             };
 
             internal static readonly GUIStyle s_TitleHorizontalStyle = new GUIStyle(EditorStyles.label)
@@ -225,6 +230,7 @@ internal struct EventDetails
             internal const string k_WarningMultiThreadedMsg = "The Frame Debugger requires multi-threaded renderer. If this error persists, try starting the Editor with -force-gfx-mt command line argument.";
             internal const string k_WarningLinuxOpenGLMsg = k_WarningMultiThreadedMsg + " On Linux, the editor does not support a multi-threaded renderer when using OpenGL.";
             internal const string k_DescriptionString = "Frame Debugger lets you step through draw calls and see how exactly frame is rendered. Click Enable!";
+            internal const string k_TabbedWithPlaymodeErrorString = "Frame Debugger can not be docked with the Game Window when trying to debug the editor.";
             internal static readonly GUIContent s_RenderTargetText = EditorGUIUtility.TrTextContent("RenderTarget");
             internal static readonly GUIContent s_CopyEventText = EditorGUIUtility.TrTextContent("Copy Event Info");
             internal static readonly GUIContent s_CopyPropertyText = EditorGUIUtility.TrTextContent("Copy Property");
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerToolbarView.cs b/Editor/Mono/PerformanceTools/FrameDebuggerToolbarView.cs
index fbd9e1f767..eea124a760 100644
--- a/Editor/Mono/PerformanceTools/FrameDebuggerToolbarView.cs
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerToolbarView.cs
@@ -68,8 +68,7 @@ private void DrawConnectionDropdown(FrameDebuggerWindow frameDebuggerWindow, ICo
             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);
+                frameDebuggerWindow.OnConnectedProfilerChange();
             }
         }
 
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerTreeView.cs b/Editor/Mono/PerformanceTools/FrameDebuggerTreeView.cs
index ea8b1c1574..088d282808 100644
--- a/Editor/Mono/PerformanceTools/FrameDebuggerTreeView.cs
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerTreeView.cs
@@ -77,13 +77,9 @@ private void PingFrameEventObject(int selectedID)
 
         public void ReselectFrameEventIndex()
         {
-            int[] selection = m_TreeView.GetSelection();
-            if (selection.Length > 0)
-            {
-                FrameDebuggerTreeViewItem item = m_TreeView.FindItem(selection[0]) as FrameDebuggerTreeViewItem;
-                if (item != null)
-                    m_TreeView.SetSelection(new[] { item.m_EventIndex }, true);
-            }
+            FrameDebuggerTreeViewItem item = GetSelectedTreeViewItem();
+            if (item != null)
+                SetSelection(item.m_EventIndex);
         }
 
         public void SelectFrameEventIndex(int eventIndex)
@@ -92,14 +88,24 @@ public void SelectFrameEventIndex(int eventIndex)
             // different tree nodes could result in the same frame debugger event
             // limit, e.g. a hierarchy node sets last child event as the limit.
             // If the limit event is the same, then do not change the currently selected item.
+            FrameDebuggerTreeViewItem item = GetSelectedTreeViewItem();
+            if (item == null || item.m_EventIndex != eventIndex)
+                SetSelection(eventIndex);
+        }
+
+        private FrameDebuggerTreeViewItem GetSelectedTreeViewItem()
+        {
             int[] selection = m_TreeView.GetSelection();
             if (selection.Length > 0)
-            {
-                FrameDebuggerTreeViewItem item = m_TreeView.FindItem(selection[0]) as FrameDebuggerTreeViewItem;
-                if (item != null && eventIndex == item.m_EventIndex)
-                    return;
-            }
+                return m_TreeView.FindItem(selection[0]) as FrameDebuggerTreeViewItem;
+
+            return null;
+        }
+
+        private void SetSelection(int eventIndex)
+        {
             m_TreeView.SetSelection(new[] { eventIndex }, true);
+            m_FrameDebugger.RepaintOnLimitChange();
         }
 
         public void DrawTree(Rect rect)
@@ -148,17 +154,15 @@ protected override void OnContentGUI(Rect rect, int row, TreeViewItem itemRaw, s
                     return;
 
                 FrameDebuggerTreeViewItem item = (FrameDebuggerTreeViewItem)itemRaw;
-                string text;
                 GUIContent tempContent;
                 GUIStyle style;
 
                 bool isParent = (item.hasChildren);
-                FontStyle fontStyle = (isParent) ? FontStyle.Bold : FontStyle.Normal;
                 childCounter = (isParent) ? 1 : (childCounter + 1);
 
                 // Draw background
-                style = FrameDebuggerStyles.Tree.s_RowText;
                 tempContent = EditorGUIUtility.TempContent("");
+                style = FrameDebuggerStyles.Tree.s_RowText;
                 style.Draw(rect, tempContent, false, false, false, false);
 
                 // indent
@@ -169,30 +173,25 @@ protected override void OnContentGUI(Rect rect, int row, TreeViewItem itemRaw, s
                 // child event count
                 if (isParent)
                 {
-                    text = item.m_ChildEventCount.ToString(CultureInfo.InvariantCulture);
-                    tempContent = EditorGUIUtility.TempContent(text);
-
-                    style = FrameDebuggerStyles.Tree.s_RowTextRight;
-                    style.fontStyle = fontStyle;
+                    tempContent = EditorGUIUtility.TempContent(item.m_ChildEventCount.ToString(CultureInfo.InvariantCulture));
 
                     Rect r = rect;
                     r.width -= kSmallMargin;
+                    style = FrameDebuggerStyles.Tree.s_RowTextRight;
                     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(tempContent).x + kSmallMargin * 2;
                 }
 
-                style = FrameDebuggerStyles.Tree.s_RowText;
-                style.fontStyle = fontStyle;
 
                 // draw event name
-                text = item.displayName;
-
-                if (string.IsNullOrEmpty(text))
-                    text = FrameDebuggerStyles.Tree.k_UnknownScopeString;
+                if (string.IsNullOrEmpty(item.displayName))
+                    tempContent = EditorGUIUtility.TempContent(FrameDebuggerStyles.Tree.k_UnknownScopeString);
+                else
+                    tempContent = EditorGUIUtility.TempContent(item.displayName);
 
-                tempContent = EditorGUIUtility.TempContent(text);
+                style = isParent ? FrameDebuggerStyles.Tree.s_RowTextBold : FrameDebuggerStyles.Tree.s_RowText;
                 style.Draw(rect, tempContent, false, false, false, selected && focused);
             }
 
diff --git a/Editor/Mono/PlayModeView/PlayModeView.cs b/Editor/Mono/PlayModeView/PlayModeView.cs
index 274410ab0a..a03f8ed159 100644
--- a/Editor/Mono/PlayModeView/PlayModeView.cs
+++ b/Editor/Mono/PlayModeView/PlayModeView.cs
@@ -10,6 +10,7 @@
 using UnityEditor.Modules;
 using UnityEditorInternal;
 using UnityEngine;
+using UnityEngine.Bindings;
 using UnityEngine.Experimental.Rendering;
 using UnityEngine.Scripting;
 
@@ -46,11 +47,9 @@ internal abstract class PlayModeView : EditorWindow
         [SerializeField] HideFlags m_TextureHideFlags = HideFlags.HideAndDontSave;
         [SerializeField] bool m_RenderIMGUI;
         [SerializeField] EnterPlayModeBehavior m_EnterPlayModeBehavior;
-        [SerializeField] int m_fullscreenMonitorIdx = 0;
-        [SerializeField] int m_playModeBehaviorIdx = 0;
         [SerializeField] bool m_UseMipMap;
-        [SerializeField] bool m_isFullscreen;
-        [SerializeField] bool m_suppressRenderingForFullscreen;
+
+        protected bool m_SwitchingPlayModeViewType = false;
 
         private const int k_MaxSupportedDisplays = 8;
 
@@ -143,18 +142,6 @@ public EnterPlayModeBehavior enterPlayModeBehavior
         public const int kFullscreenInvalidIdx = -1;
         public const int kFullscreenNone = 0;
 
-        public int fullscreenMonitorIdx
-        {
-            get => m_fullscreenMonitorIdx;
-            set => m_fullscreenMonitorIdx = value;
-        }
-
-        public int playModeBehaviorIdx
-        {
-            get => m_playModeBehaviorIdx;
-            set => m_playModeBehaviorIdx = value;
-        }
-
         [Obsolete("PlayModeView.maximizeOnPlay is obsolete. Use PlayModeView.enterPlayModeBehavior instead")]
         public bool maximizeOnPlay
         {
@@ -162,21 +149,6 @@ public bool maximizeOnPlay
             set { m_EnterPlayModeBehavior = value ? EnterPlayModeBehavior.PlayMaximized : EnterPlayModeBehavior.PlayFocused; }
         }
 
-        public bool isFullscreen
-        {
-            get { return m_isFullscreen; }
-            set { m_isFullscreen = value; }
-        }
-
-        internal bool suppressRenderingForFullscreen
-        {
-            get { return m_suppressRenderingForFullscreen; }
-            set
-            {
-                m_suppressRenderingForFullscreen = value;
-            }
-        }
-
         protected bool useMipMap
         {
             get { return m_UseMipMap; }
@@ -199,6 +171,14 @@ public static bool openWindowOnEnteringPlayMode
         RenderTexture m_TargetTexture;
         ColorSpace m_CurrentColorSpace = ColorSpace.Uninitialized;
 
+        [FreeFunction]
+        extern protected static bool NeedToPerformRendering();
+
+        protected static bool renderViewCallNeededInOnGUI =>
+            !EditorApplication.isPlaying ||
+            (EditorApplication.isPlaying && NeedToPerformRendering() && !Unsupported.IsEditorPlayerLoopWaiting());
+
+
         class RenderingView : IDisposable
         {
             bool disposed = false;
@@ -241,11 +221,15 @@ protected RenderTexture RenderView(Vector2 mousePosition, bool clearTexture)
             using (var renderingView = new RenderingView(this))
             {
                 SetPlayModeViewSize(targetSize);
-                int width = Mathf.RoundToInt(targetSize.x);
-                int height = Mathf.RoundToInt(targetSize.y);
-                // This should be called configure virtual display or sth
-                EditorDisplayUtility.AddVirtualDisplay(targetDisplay, width, height);
-                // EditorDisplayManager.UpdateVirtualDisplay(this);
+
+                // The target size and GUI rects are communicated to C++ as floats throughout the engine. This means the final size in pixels
+                // of the view will be calculated in C++ so we have to ensure we use the C++ float rounding conventions here. Failure to do so
+                // may result in subtly differences and subtle bugs (like the Screen class thinking something sized 640.5 is 641 pixels but the
+                // RenderTexture being allocated here only being 640 pixels in size with standard C# rounding used by Mathf.RoundToInt.
+                // So we use the c++ AwayFromZero convention when rounding here.
+                int width = (int)Math.Round(targetSize.x, MidpointRounding.AwayFromZero);
+                int height = (int)Math.Round(targetSize.y, MidpointRounding.AwayFromZero);
+
                 var currentTargetDisplay = 0;
                 if (ModuleManager.ShouldShowMultiDisplayOption())
                 {
@@ -308,8 +292,6 @@ protected internal void SwapMainWindow(Type type)
                 throw new ArgumentException("Type should derive from " + typeof(PlayModeView).Name);
             if (type.Name != GetType().Name)
             {
-                EditorFullscreenController.SetMainDisplayPlayModeViewType(type);
-
                 var serializedViews = ListsToDictionary(m_SerializedViewNames, m_SerializedViewValues);
 
                 // Clear serialized views so they wouldn't be serialized again
@@ -345,6 +327,11 @@ protected internal void SwapMainWindow(Type type)
 
                 if (m_Parent is DockArea dockAreaParent)
                 {
+                    // Mark that this view is the one switching out so when we do the tab management we don't have
+                    //   the old tab rewrite the desired size when GameView.OnBackgroundResized() is called during
+                    //   SplitView.Reflow().
+                    m_SwitchingPlayModeViewType = true;
+
                     dockAreaParent.AddTab(window);
                     dockAreaParent.RemoveTab(this);
                     DestroyImmediate(this, true);
@@ -502,9 +489,6 @@ protected void SetVSync(bool enable)
 
         protected void SetFocus(bool focused)
         {
-            if (suppressRenderingForFullscreen)
-                return; //suppressed views should not grab "play mode" focus
-
             if (!focused && s_LastFocused == this)
             {
                 InternalEditorUtility.OnGameViewFocus(false);
@@ -522,21 +506,6 @@ protected void SetFocus(bool focused)
             SetDisplayViewSize(m_TargetDisplay, m_TargetSize);
         }
 
-        internal virtual void ApplyEditorDisplayFullscreenSetting(IPlayModeViewFullscreenSettings settings)
-        {
-            m_isFullscreen = true;
-
-            if (ModuleManager.ShouldShowMultiDisplayOption())
-            {
-                if (targetDisplay != settings.DisplayNumber)
-                {
-                    targetDisplay = settings.DisplayNumber;
-                }
-            }
-
-            SetVSync(settings.VsyncEnabled);
-        }
-
         [RequiredByNativeCode]
         internal static void IsPlayModeViewOpen(out bool isPlayModeViewOpen)
         {
@@ -556,55 +525,32 @@ public enum EnterPlayModeBehavior
         {
             PlayFocused,
             PlayMaximized,
-            PlayUnfocused,
-            PlayFullscreen
+            PlayUnfocused
         }
 
         void SetPlayModeWindowsStates(EnterPlayModeBehavior behavior)
         {
-            var isFullscreen = (behavior == EnterPlayModeBehavior.PlayFullscreen);
+            if(m_EnterPlayModeBehavior == behavior)
+                return;
 
-            this.m_EnterPlayModeBehavior = behavior;
-            this.fullscreenMonitorIdx = isFullscreen
-                ? GameViewOnPlayMenu.SelectedIndexToDisplayIndex(this.playModeBehaviorIdx)
-                : -1;
+            m_EnterPlayModeBehavior = behavior;
+            OnEnterPlayModeBehaviorChange();
+
+            if (behavior != EnterPlayModeBehavior.PlayMaximized)
+                return;
 
             foreach (var view in s_PlayModeViews)
             {
-                if (view == this)
-                {
+                if (view == this || view.m_EnterPlayModeBehavior != EnterPlayModeBehavior.PlayMaximized)
                     continue;
-                }
-                if (behavior == EnterPlayModeBehavior.PlayMaximized && view.m_EnterPlayModeBehavior == EnterPlayModeBehavior.PlayMaximized)
-                {
-                    // Only one play mode view can be maximized at a time.
-                    view.m_EnterPlayModeBehavior = EnterPlayModeBehavior.PlayUnfocused;
-                    view.playModeBehaviorIdx = 0;
-                    view.fullscreenMonitorIdx = PlayModeView.kFullscreenNone;
-                }
-                else if (behavior == EnterPlayModeBehavior.PlayFullscreen && view.m_EnterPlayModeBehavior == EnterPlayModeBehavior.PlayFullscreen)
-                {
-                    // We can have multiple fullscreen views, so long as they're not on the same monitor
-                    if (this.fullscreenMonitorIdx == view.fullscreenMonitorIdx)
-                    {
-                        view.m_EnterPlayModeBehavior = EnterPlayModeBehavior.PlayUnfocused;
-                        view.playModeBehaviorIdx = 0;
-                        view.fullscreenMonitorIdx = PlayModeView.kFullscreenNone;
-                    }
-                }
 
+                // Only one play mode view can be maximized at a time.
+                view.m_EnterPlayModeBehavior = EnterPlayModeBehavior.PlayUnfocused;
                 view.OnEnterPlayModeBehaviorChange();
                 view.Repaint();
             }
         }
 
         protected virtual void OnEnterPlayModeBehaviorChange() {}
-        internal static PlayModeView GetAssociatedViewForTargetDisplay(int targetDisplay)
-        {
-            return s_PlayModeViews.Where(v => v.targetDisplay == targetDisplay && !v.m_suppressRenderingForFullscreen)
-                .OrderByDescending(v => v.isFullscreen)
-                .ThenByDescending(v => v.hasFocus)
-                .FirstOrDefault();
-        }
     }
 }
diff --git a/Editor/Mono/PlayerSettings.bindings.cs b/Editor/Mono/PlayerSettings.bindings.cs
index 68110ea3ba..5ab8baa7d0 100644
--- a/Editor/Mono/PlayerSettings.bindings.cs
+++ b/Editor/Mono/PlayerSettings.bindings.cs
@@ -46,6 +46,13 @@ public enum Il2CppCompilerConfiguration
         Master = 2,
     }
 
+    // Must be in sync with Il2CppStacktraceInformation enum in SerializationMetaFlags.h
+    public enum Il2CppStacktraceInformation
+    {
+        MethodOnly = 0,
+        MethodFileLineNumber = 1,
+    }
+
     // Mac fullscreen mode
     public enum MacFullscreenMode
     {
@@ -215,7 +222,53 @@ public enum SplashScreenStyle
     public enum GraphicsJobMode
     {
         Native = 0,
-        Legacy = 1
+        Legacy = 1,
+        Split
+    }
+
+    // Must be in sync with GfxThreadingMode enum in GfxDeviceTypes.h
+    public enum GfxThreadingMode
+    {
+        // Direct threading mode.
+        // Main thread writes native graphics commands and submits them directly.
+        Direct = 0,
+
+        // SingleThreaded mode.
+        // Main thread writes Unity graphics commands that it later reads and converts to native graphics commands.
+        NonThreaded = 1,
+
+        // MultiThreaded mode.
+        // Main thread writes Unity graphics commands. A Render thread reads Unity graphics commands and converts them to native graphics commands.
+        Threaded = 2,
+
+        // Legacy Graphics Jobs ("Jobified Rendering").
+        // Main thread writes Unity graphics commands and starts worker threads to do the same.
+        // A Render thread reads Unity graphics commands and converts them to native graphics commands.
+        ClientWorkerJobs = 3,
+
+        // Native Graphics Jobs.
+        // Main thread writes Unity graphics commands.
+        // Render thread reads Unity graphics commands and converts them to native graphics commands.
+        // The render thread also starts worker threads to write native graphics commands.
+        ClientWorkerNativeJobs = 4,
+
+        // Native Graphics Jobs without Render Thread.
+        // Main thread writes native graphics commands, starts worker threads to do the same, and submits them directly.
+        DirectNativeJobs = 5,
+
+        // Split Graphics Jobs.
+        // Main thread starts worker threads to write Unity graphics commands.
+        // Render thread reads Unity graphics commands converts them to native graphics commands.
+        // The render thread also starts worker threads to write native graphics commands. 
+        SplitJobs = 6
+    }
+
+    // Must be in sync with MeshDeformation enum in GfxDeviceTypes.h
+    public enum MeshDeformation
+    {
+        CPU = 0,
+        GPU = 1,
+        GPUBatched = 2
     }
 
     // Must be in sync with IconKind enum in EditorOnlyPlayerSettings.h
@@ -258,7 +311,7 @@ public enum NormalMapEncoding
         DXT5nm = 1
     }
 
-    internal enum TextureCompressionFormat
+    public enum TextureCompressionFormat
     {
         Unknown = 0,
         ETC = 1,
@@ -539,6 +592,9 @@ public static Guid productGUID
         // Enable receipt validation for the Mac App Store.
         public static extern bool useMacAppStoreValidation { get; set; }
 
+        // Enable advanced optimiztions for Dedicated Server builds
+        public static extern bool dedicatedServerOptimizations { get; set; }
+
         // Define how to handle fullscreen mode in Mac OS X standalones
         [Obsolete("macFullscreenMode is deprecated, use fullScreenMode instead")]
         [StaticAccessor("PlayerSettingsBindings", StaticAccessorType.DoubleColon)]
@@ -593,10 +649,13 @@ public static bool singlePassStereoRendering
         public static extern bool enableFrameTimingStats { get; set; }
         public static extern bool enableOpenGLProfilerGPURecorders { get; set; }
 
+        public static extern bool allowHDRDisplaySupport { get; set; }
         public static extern bool useHDRDisplay { get; set; }
 
-        public static extern D3DHDRDisplayBitDepth D3DHDRBitDepth { get; set; }
+        [Obsolete("D3DHDRBitDepth has been replaced by hdrBitDepth. (UnityUpgradable) -> hdrBitDepth", true)]
+        public static extern D3DHDRDisplayBitDepth D3DHDRBitDepth { [NativeName("GetHDRBitDepthForObseleteEnum")] get; [NativeName("SetHDRBitDepthForObseleteEnum")] set; }
 
+        public static extern HDRDisplayBitDepth hdrBitDepth { get; set; }
 
         // What happens with the fullscreen Window when it runs in the background
 
@@ -726,6 +785,31 @@ internal static string GetPlatformName(BuildTargetGroup targetGroup)
         [StaticAccessor("PlayerSettingsBindings", StaticAccessorType.DoubleColon)]
         internal static extern void SetBatchingForPlatform(BuildTarget platform, int staticBatching, int dynamicBatching);
 
+        public static bool GetStaticBatchingForPlatform(BuildTarget platform)
+        {
+            PlayerSettings.GetBatchingForPlatform(platform, out var staticBatching, out _);
+            return staticBatching > 0;
+        }
+
+        public static void SetStaticBatchingForPlatform(BuildTarget platform, bool enable)
+        {
+            PlayerSettings.GetBatchingForPlatform(platform, out _, out var dynamicBatching);
+            PlayerSettings.SetBatchingForPlatform(platform, enable == true ? 1 : 0, dynamicBatching);
+        }
+
+        public static bool GetDynamicBatchingForPlatform(BuildTarget platform)
+        {
+
+            PlayerSettings.GetBatchingForPlatform(platform, out _, out var dynamicBatching);
+            return dynamicBatching > 0;
+        }
+
+        public static void SetDynamicBatchingForPlatform(BuildTarget platform, bool enable)
+        {
+            PlayerSettings.GetBatchingForPlatform(platform, out var staticBatching, out _);
+            PlayerSettings.SetBatchingForPlatform(platform, staticBatching, enable == true ? 1 : 0);
+        }
+
         [StaticAccessor("PlayerSettingsBindings", StaticAccessorType.DoubleColon)]
         public static extern int GetShaderChunkSizeInMBForPlatform(BuildTarget buildTarget);
 
@@ -1111,6 +1195,20 @@ public static void SetIl2CppCompilerConfiguration(NamedBuildTarget buildTarget,
             SetIl2CppCompilerConfigurationInternal(buildTarget.TargetName, configuration);
         }
 
+        [NativeThrows]
+        [StaticAccessor("GetPlayerSettings().GetEditorOnly()")]
+        [NativeMethod("GetIl2CppStacktraceInformation")]
+        private static extern Il2CppStacktraceInformation GetIl2CppStacktraceInformationInternal(string buildTargetName);
+        public static Il2CppStacktraceInformation GetIl2CppStacktraceInformation(NamedBuildTarget buildTarget) =>
+            GetIl2CppStacktraceInformationInternal(buildTarget.TargetName);
+
+        [NativeThrows]
+        [StaticAccessor("GetPlayerSettings().GetEditorOnlyForUpdate()")]
+        [NativeMethod("SetIl2CppStacktraceInformation")]
+        private static extern void SetIl2CppStacktraceInformationInternal(string buildTargetName, Il2CppStacktraceInformation option);
+        public static void SetIl2CppStacktraceInformation(NamedBuildTarget buildTarget, Il2CppStacktraceInformation option) =>
+            SetIl2CppStacktraceInformationInternal(buildTarget.TargetName, option);
+
         [NativeThrows]
         [StaticAccessor("GetPlayerSettings().GetEditorOnly()")]
         [NativeMethod("GetPlatformIncrementalIl2CppBuild")]
@@ -1422,6 +1520,9 @@ public static UInt32 xboxSpeechDB
         [NativeProperty("GPUSkinning")]
         public static extern bool gpuSkinning { get; set; }
 
+        [NativeProperty("MeshDeformation")]
+        public static extern MeshDeformation meshDeformation { get; set; }
+
         public static bool graphicsJobs
         {
             get { return GetGraphicsJobsForPlatform(EditorUserBuildSettings.activeBuildTarget); }
@@ -1446,6 +1547,12 @@ public static GraphicsJobMode graphicsJobMode
         [StaticAccessor("PlayerSettingsBindings", StaticAccessorType.DoubleColon)]
         internal static extern void SetGraphicsJobModeForPlatform(BuildTarget platform, GraphicsJobMode gfxJobMode);
 
+        [StaticAccessor("PlayerSettingsBindings", StaticAccessorType.DoubleColon)]
+        internal static extern GfxThreadingMode GetGraphicsThreadingModeForPlatform(BuildTarget platform);
+
+        [StaticAccessor("PlayerSettingsBindings", StaticAccessorType.DoubleColon)]
+        internal static extern void SetGraphicsThreadingModeForPlatform(BuildTarget platform, GfxThreadingMode gfxJobMode);
+
         [StaticAccessor("GetPlayerSettings()")]
         public static extern bool GetWsaHolographicRemotingEnabled();
 
@@ -1680,6 +1787,14 @@ public static WindowsGamepadBackendHint windowsGamepadBackendHint
         [StaticAccessor("GetPlayerSettings().GetEditorOnlyForUpdate()")]
         internal static extern void SetDefaultTextureCompressionFormat(BuildTargetGroup platform, TextureCompressionFormat format);
 
+        [NativeMethod("GetTextureCompressionFormats")]
+        [StaticAccessor("GetPlayerSettings().GetEditorOnly()")]
+        internal static extern TextureCompressionFormat[] GetTextureCompressionFormatsImpl(BuildTargetGroup platform);
+
+        [NativeMethod("SetTextureCompressionFormats")]
+        [StaticAccessor("GetPlayerSettings().GetEditorOnlyForUpdate()")]
+        internal static extern void SetTextureCompressionFormatsImpl(BuildTargetGroup platform, TextureCompressionFormat[] formats);
+
         [FreeFunction("GetPlayerSettings().GetEditorOnly().RecompileScripts")]
         internal static extern void RecompileScripts(string reason, bool refreshProject = true);
 
diff --git a/Editor/Mono/PlayerSettings.deprecated.cs b/Editor/Mono/PlayerSettings.deprecated.cs
index 3c7deb6721..623ede4a10 100644
--- a/Editor/Mono/PlayerSettings.deprecated.cs
+++ b/Editor/Mono/PlayerSettings.deprecated.cs
@@ -4,6 +4,7 @@
 
 using System;
 using UnityEngine;
+using UnityEngine.Bindings;
 
 using EditorGraphicsSettings = UnityEditor.Rendering.EditorGraphicsSettings;
 
@@ -167,6 +168,15 @@ public static AndroidTargetDevice targetDevice
 
             [Obsolete("minifyWithR8 is obsolete and has no effect anymore, since Android Gradle Plugin 7.0 always uses R8", false)]
             public static bool minifyWithR8 { get { return true; } set {} }
+
+            [Obsolete("Renamed to match UI. Please use splitApplicationBinary instead. (UnityUpgradable) -> splitApplicationBinary", false)]
+            public static extern bool useAPKExpansionFiles
+            {
+                [NativeMethod("GetAndroidSplitApplicationBinary")]
+                get;
+                [NativeMethod("SetAndroidSplitApplicationBinary")]
+                set;
+            }
         }
 
         partial class iOS
diff --git a/Editor/Mono/PlayerSettingsAndroid.bindings.cs b/Editor/Mono/PlayerSettingsAndroid.bindings.cs
index 5c3fe0fdda..2b84a0fb8c 100644
--- a/Editor/Mono/PlayerSettingsAndroid.bindings.cs
+++ b/Editor/Mono/PlayerSettingsAndroid.bindings.cs
@@ -184,6 +184,20 @@ internal struct AndroidBanner
         public Texture2D banner;
     }
 
+    [Flags]
+    public enum AndroidApplicationEntry : uint
+    {
+        /// <summary>
+        /// Include entry which derives from Activity
+        /// - Activity https://developer.android.com/reference/android/app/Activity
+        /// </summary>
+        Activity = 1 << 0,
+        /// <summary>
+        /// Include entry which derives from Game Activity https://developer.android.com/games/agdk/game-activity
+        /// </summary>
+        GameActivity = 1 << 1
+    }
+
     // Player Settings is where you define various parameters for the final game that you will build in Unity. Some of these values are used in the Resolution Dialog that launches when you open a standalone game.
     public partial class PlayerSettings : UnityEngine.Object
     {
@@ -452,9 +466,13 @@ public static extern bool licenseVerification
                 [NativeMethod("GetAndroidLicenseVerification")]
                 get;
             }
-
-            // Use APK Expansion Files
-            public static extern bool useAPKExpansionFiles { get; set; }
+            public static extern bool splitApplicationBinary
+            {
+                [NativeMethod("GetAndroidSplitApplicationBinary")]
+                get;
+                [NativeMethod("SetAndroidSplitApplicationBinary")]
+                set;
+            }
 
             // Application should show ActivityIndicator when loading
             public static extern AndroidShowActivityIndicatorOnLoading showActivityIndicatorOnLoading
@@ -558,9 +576,40 @@ public static extern bool optimizedFramePacing
                 set;
             }
 
+            public static TextureCompressionFormat[] textureCompressionFormats
+            {
+                get
+                {
+                    return GetTextureCompressionFormatsImpl(BuildTargetGroup.Android);
+                }
+                set
+                {
+                    if (value == null || value.Length == 0)
+                    {
+                        throw new ArgumentException($"Android textureCompressionFormats can't be null or empty");
+                    }
+                    foreach (var format in value)
+                    {
+                        if (format == TextureCompressionFormat.Unknown || format == TextureCompressionFormat.BPTC)
+                        {
+                            throw new ArgumentException($"{format} can't be used as a target texture compression for Android");
+                        }
+                    }
+                    SetTextureCompressionFormatsImpl(BuildTargetGroup.Android, value);
+                }
+            }
+
             // Google Play App Dependencies info.
             [NativeProperty("AndroidReportGooglePlayAppDependencies", TargetType.Function)]
             public static extern bool reportGooglePlayAppDependencies { get; set; }
+
+            public static extern AndroidApplicationEntry applicationEntry
+            {
+                [NativeMethod("GetAndroidApplicationEntry")]
+                get;
+                [NativeMethod("SetAndroidApplicationEntry")]
+                set;
+            }
         }
     }
 }
diff --git a/Editor/Mono/PlayerSettingsDefaultTextureCompressionHandler.cs b/Editor/Mono/PlayerSettingsDefaultTextureCompressionHandler.cs
new file mode 100644
index 0000000000..275e78d8de
--- /dev/null
+++ b/Editor/Mono/PlayerSettingsDefaultTextureCompressionHandler.cs
@@ -0,0 +1,319 @@
+// 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 UnityEditorInternal;
+using UnityEngine;
+
+
+namespace UnityEditor
+{
+    internal abstract class PlayerSettingsDefaultTextureCompressionHandler
+    {
+        private SerializedProperty m_BuildTargetDefaultTextureCompressionFormat;
+        private SerializedObject m_SerializedObject;
+        private SerializedProperty m_TextureArraySerializedProperty;
+        private GUIContent m_TextureCompressionFormatsGUI;
+
+        private TextureCompressionFormat[] m_LastSavedFormat;
+        private List<TextureCompressionFormat> m_StoredTextureCompressionList;
+        private bool m_IsDirty = false;
+        private bool m_ToBeUpdated = true;
+        private ReorderableList m_TextureCompressionsList;
+        private Func<TextureCompressionFormat[]> m_AvailableTextureCompressionsProvider;
+        private Func<bool> m_IsPreset;
+        private Action m_EditorSerialization;
+
+        private const string k_BuildTargetKey = "m_BuildTarget";
+        private const string k_FormatsKey = "m_Formats";
+        private const string k_BuildTargetDefaultTextureCompressionFormatName = "m_BuildTargetDefaultTextureCompressionFormat";
+
+        protected abstract string PlatformName { get; }
+
+        protected abstract TextureCompressionFormat[] CurrentPlatformGlobalEditorTextureFormat { get; set; }
+
+        protected abstract string ToString(TextureCompressionFormat textureCompression);
+
+        private ReorderableList TextureCompressionsList
+        {
+            get
+            {
+                if (m_TextureCompressionsList == null)
+                {
+                    var textureCompressionsList = GetStoredCompressionFormatOrDefaultOne();
+                    m_TextureCompressionsList = new ReorderableList(textureCompressionsList, typeof(TextureCompressionFormat), true, true, true, true)
+                    {
+                        onCanRemoveCallback = (list) => true,
+                        onRemoveCallback = RemoveTextureCompressionElement,
+                        onReorderCallback = ReorderTextureCompressionElement,
+                        drawHeaderCallback = (rect) => GUI.Label(rect, m_TextureCompressionFormatsGUI, EditorStyles.label),
+                        onAddDropdownCallback = AddTextureCompressionElement,
+                        drawElementCallback = DrawTextureCompressionElement,
+                        onChangedCallback = Onchanged,
+                        elementHeight = 16
+                    };
+                }
+
+                return m_TextureCompressionsList;
+            }
+        }
+
+
+        private SerializedProperty TextureFormatArraySerializedProperty
+        {
+            get
+            {
+                if (m_TextureArraySerializedProperty == null)
+                {
+                    foreach (SerializedProperty element in m_BuildTargetDefaultTextureCompressionFormat)
+                    {
+                        var buildTarget = element.FindPropertyRelative(k_BuildTargetKey).stringValue;
+                        if (buildTarget == PlatformName)
+                        {
+                            m_TextureArraySerializedProperty = element.FindPropertyRelative(k_FormatsKey);
+                        }
+                    }
+                }
+
+                return m_TextureArraySerializedProperty;
+            }
+        }
+
+        public List<TextureCompressionFormat> StoredTextureCompressionList
+        {
+            get
+            {
+                if (m_StoredTextureCompressionList == null)
+                {
+                    m_StoredTextureCompressionList = GetStoredCompressionFormatOrDefaultOne();
+                }
+
+                return m_StoredTextureCompressionList;
+            }
+
+            private set { m_StoredTextureCompressionList = value; }
+        }
+
+        protected bool IsGlobalProjectSetting
+        {
+            get { return !IsAPreset; }
+        }
+
+        protected bool IsAPreset
+        {
+            get
+            {
+                if (m_IsPreset != null)
+                {
+                    return m_IsPreset.Invoke();
+                }
+
+                return false;
+            }
+        }
+
+        public void Reset()
+        {
+            m_TextureArraySerializedProperty = null;
+            m_TextureCompressionsList = null;
+            m_LastSavedFormat = null;
+            m_StoredTextureCompressionList = null;
+            m_IsDirty = false;
+            m_ToBeUpdated = true;
+        }
+
+        public PlayerSettingsDefaultTextureCompressionHandler(Func<TextureCompressionFormat[]> availableTextureCompressionsProvider)
+        {
+            m_AvailableTextureCompressionsProvider = availableTextureCompressionsProvider;
+        }
+
+        public PlayerSettingsDefaultTextureCompressionHandler SetupSerializedObject(SerializedObject serializedObject, string variableName = k_BuildTargetDefaultTextureCompressionFormatName)
+        {
+            m_SerializedObject = serializedObject;
+            m_BuildTargetDefaultTextureCompressionFormat = FindPropertyAssert(variableName);
+            return this;
+        }
+
+        public PlayerSettingsDefaultTextureCompressionHandler SetEditorSerializationAction(Action editorSerialization)
+        {
+            m_EditorSerialization = editorSerialization;
+            return this;
+        }
+
+        public PlayerSettingsDefaultTextureCompressionHandler SetIsPreset(Func<bool> isPreset)
+        {
+            m_IsPreset = isPreset;
+            return this;
+        }
+
+        public PlayerSettingsDefaultTextureCompressionHandler SetGUIContent(GUIContent guiContent)
+        {
+            m_TextureCompressionFormatsGUI = guiContent;
+            return this;
+        }
+
+        private SerializedProperty FindPropertyAssert(string name)
+        {
+            var property = m_SerializedObject.FindProperty(name);
+            if (property == null)
+            {
+                Debug.LogError($"Failed to find: {name}");
+            }
+
+            return property;
+        }
+
+        public void RenderingSectionGUI()
+        {
+            EditorGUILayout.Space();
+            var updated = false;
+            if (m_IsDirty)
+            {
+                updated = UpdateSerialization();
+            }
+
+            TextureCompressionsList.DoLayoutList();
+            if (updated || m_ToBeUpdated)
+            {
+                var textureCompressions = GetStoredCompressionFormatOrDefaultOne();
+                TextureCompressionsList.list = textureCompressions;
+                m_ToBeUpdated = false;
+            }
+
+            EditorGUILayout.Space();
+        }
+
+        private List<TextureCompressionFormat> GetTextureCompressionFormatFromSerialization(SerializedProperty serializedProperty)
+        {
+            var formats = new List<TextureCompressionFormat>();
+            if (serializedProperty != null)
+            {
+                var arraysize = serializedProperty.arraySize;
+                for (var i = 0; i < arraysize; i++)
+                {
+                    var format = (TextureCompressionFormat)serializedProperty.GetArrayElementAtIndex(i).intValue;
+                    formats.Add(format);
+                }
+            }
+
+            return formats;
+        }
+
+        private List<TextureCompressionFormat> GetStoredCompressionFormatOrDefaultOne()
+        {
+            var formats = GetTextureCompressionFormatFromSerialization(TextureFormatArraySerializedProperty);
+
+            if (formats.Count > 0)
+            {
+                return formats;
+            }
+
+            if (CurrentPlatformGlobalEditorTextureFormat != null)
+            {
+                return CurrentPlatformGlobalEditorTextureFormat.ToList();
+            }
+
+            return new List<TextureCompressionFormat>();
+        }
+
+        private bool UpdateTextureCompressionFormatSerialization(SerializedProperty serializedProperty, TextureCompressionFormat[] formats)
+        {
+            var same = m_LastSavedFormat != null && m_LastSavedFormat.Length == formats.Length && m_LastSavedFormat.SequenceEqual(formats);
+            if (same) return false;
+            m_LastSavedFormat = formats;
+            var intValues = Array.ConvertAll(formats, format => (int)format);
+            serializedProperty.SetValue(SerializedPropertyExtensions.Setter, intValues);
+
+            return true;
+        }
+
+        private bool UpdateSerialization()
+        {
+            var updated = UpdateTextureCompressionFormatSerialization(TextureFormatArraySerializedProperty, StoredTextureCompressionList.ToArray());
+            if (updated)
+            {
+                m_BuildTargetDefaultTextureCompressionFormat.serializedObject.ApplyModifiedProperties();
+                if (IsGlobalProjectSetting)
+                {
+                    CurrentPlatformGlobalEditorTextureFormat = StoredTextureCompressionList.ToArray();
+                    m_EditorSerialization?.Invoke();
+                }
+
+                m_SerializedObject.ApplyModifiedProperties();
+
+                TextureCompressionsList.list = StoredTextureCompressionList;
+            }
+
+            m_IsDirty = false;
+            return updated;
+        }
+
+        private void AddTextureCompressionElement(Rect rect, ReorderableList list)
+        {
+            var availableTextureCompressions = m_AvailableTextureCompressionsProvider();
+            var names = availableTextureCompressions
+                .Select(m => ToString(m))
+                .ToArray();
+            var enabled = availableTextureCompressions
+                .Select(m => !list.list.Contains(m))
+                .ToArray();
+
+            EditorUtility.DisplayCustomMenu(rect, names, enabled, null, AddTextureCompressionMenuSelected, availableTextureCompressions);
+        }
+
+        private void AddTextureCompressionMenuSelected(object userData, string[] options, int selected)
+        {
+            var textureCompressions = (TextureCompressionFormat[])userData;
+            if (textureCompressions[selected] == TextureCompressionFormat.DXTC_RGTC)
+            {
+                StoredTextureCompressionList.Remove(TextureCompressionFormat.DXTC);
+            }
+            else if (textureCompressions[selected] == TextureCompressionFormat.DXTC)
+            {
+                StoredTextureCompressionList.Remove(TextureCompressionFormat.DXTC_RGTC);
+            }
+
+            StoredTextureCompressionList.Add(textureCompressions[selected]);
+            m_IsDirty = true;
+        }
+
+        private string GetTextureFormatAsAString(TextureCompressionFormat[] formats)
+        {
+            return String.Join(",", formats);
+        }
+
+        private void Onchanged(ReorderableList list)
+        {
+            m_IsDirty = true;
+        }
+
+        private void RemoveTextureCompressionElement(ReorderableList list)
+        {
+            // don't allow removing the last TextureCompression
+            if (StoredTextureCompressionList.Count < 2)
+            {
+                EditorApplication.Beep();
+                return;
+            }
+
+            StoredTextureCompressionList.RemoveAt(list.index);
+            m_IsDirty = true;
+        }
+
+        private void ReorderTextureCompressionElement(ReorderableList list)
+        {
+            var textureCompressionsList = (List<TextureCompressionFormat>)list.list;
+            StoredTextureCompressionList = textureCompressionsList;
+            m_IsDirty = true;
+        }
+
+        private void DrawTextureCompressionElement(Rect rect, int index, bool selected, bool focused)
+        {
+            var textureCompression = TextureCompressionsList.list[index];
+            GUI.Label(rect, ToString((TextureCompressionFormat)textureCompression), EditorStyles.label);
+        }
+    }
+}
diff --git a/Editor/Mono/PlayerSettingsIOS.bindings.cs b/Editor/Mono/PlayerSettingsIOS.bindings.cs
index 96a0f9896f..1f6f2abd08 100644
--- a/Editor/Mono/PlayerSettingsIOS.bindings.cs
+++ b/Editor/Mono/PlayerSettingsIOS.bindings.cs
@@ -159,7 +159,7 @@ internal partial class iOSDeviceRequirementGroup
         private string m_VariantName;
 
         [FreeFunction("PlayerSettingsIOSBindings::SetOrAddDeviceRequirementForVariantNameImpl")]
-        extern private static void SetOrAddDeviceRequirementForVariantNameImpl(string name, int index, string[] keys, string[] values);
+        extern private static void SetOrAddDeviceRequirementForVariantNameImpl(string name, int index, [Unmarshalled] string[] keys, [Unmarshalled] string[] values);
 
         [NativeMethod(Name = "GetIOSDeviceRequirementCountForVariantName")]
         [StaticAccessor("GetPlayerSettings()", StaticAccessorType.Dot)]
@@ -362,7 +362,7 @@ public static UnityEngine.iOS.SystemGestureDeferMode deferSystemGesturesMode
             }
 
             [NativeProperty("HideHomeButton")]
-            public static bool hideHomeButton { get; set; }
+            public extern static bool hideHomeButton { get; set; }
 
             [NativeProperty("IOSAppInBackgroundBehavior")]
             private extern static int  appInBackgroundBehaviorInternal
diff --git a/Editor/Mono/PlayerSettingsSwitch.bindings.cs b/Editor/Mono/PlayerSettingsSwitch.bindings.cs
index 8665319ec8..245d984cc2 100644
--- a/Editor/Mono/PlayerSettingsSwitch.bindings.cs
+++ b/Editor/Mono/PlayerSettingsSwitch.bindings.cs
@@ -30,26 +30,26 @@ public enum ScreenResolutionBehavior
                 Both = 3
             }
 
-            // These language names should be match to the name descriptions where in an NMETA file.
+            // These language names should be match to the name descriptions where in an NMETA file and SwitchBuildUtils.Languages.
             // And, please notice that you have to increase numSwitchLanguages in EditorOnlyPlayerSettings.h when you add a new language here.
             public enum Languages
             {
-                AmericanEnglish,
-                BritishEnglish,
-                Japanese,
-                French,
-                German,
-                LatinAmericanSpanish,
-                Spanish,
-                Italian,
-                Dutch,
-                CanadianFrench,
-                Portuguese,
-                Russian,
-                SimplifiedChinese,
-                TraditionalChinese,
-                Korean,
-                BrazilianPortuguese,
+                AmericanEnglish = 0,
+                BritishEnglish = 1,
+                Japanese = 2,
+                French = 3,
+                German = 4,
+                LatinAmericanSpanish = 5,
+                Spanish = 6,
+                Italian = 7,
+                Dutch = 8,
+                CanadianFrench = 9,
+                Portuguese = 10,
+                Russian = 11,
+                SimplifiedChinese = 12,
+                TraditionalChinese = 13,
+                Korean = 14,
+                BrazilianPortuguese = 15,
             }
 
             public enum
@@ -60,13 +60,6 @@ public enum
                 RequiredWithNetworkServiceAccountAvailable = 2
             }
 
-            public enum TouchScreenUsage
-            {
-                Supported = 0,
-                Required = 1,
-                None = 2
-            }
-
             public enum LogoHandling
             {
                 Auto = 0,
@@ -139,6 +132,10 @@ public enum SupportedNpadStyle
             [NativeProperty("switchUseCPUProfiler", TargetType.Field)]
             extern public static bool useSwitchCPUProfiler { get; set; }
 
+            // Whether to enable file system trace on Nintendo Switch CPU Profiler.
+            [NativeProperty("switchEnableFileSystemTrace", TargetType.Field)]
+            extern public static bool enableFileSystemTrace { get; set; }
+
             // What LTO setting to use on Switch.
             [NativeProperty("switchLTOSetting", TargetType.Field)]
             extern public static int switchLTOSetting { get; set; }
@@ -274,6 +271,15 @@ extern public static int NVNGraphicsFirmwareMemory
 
             [StaticAccessor("PlayerSettings", StaticAccessorType.DoubleColon)]
             extern public static int maximumSwitchNVNGraphicsFirmwareMemory { get; }
+			
+			[StaticAccessor("GetPlayerSettings()", StaticAccessorType.Dot)]
+            extern public static int switchMaxWorkerMultiple
+            {
+                [NativeMethod("GetSwitchKMaxWorkerMultiple")]
+                get;
+                [NativeMethod("SetSwitchKMaxWorkerMultiple")]
+                set;
+            }
 
             // Controls the behavior of Switch's auto-changing screen resolution
             [NativeProperty("switchScreenResolutionBehavior", TargetType.Field)]
@@ -469,9 +475,6 @@ extern public static string releaseVersion
             [NativeProperty("switchStartupUserAccount", TargetType.Field)]
             extern public static StartupUserAccount startupUserAccount { get; set; }
 
-            [NativeProperty("switchTouchScreenUsage", TargetType.Field)]
-            extern public static TouchScreenUsage touchScreenUsage { get; set; }
-
             [NativeProperty("switchSupportedLanguagesMask", TargetType.Field)]
             extern public static int supportedLanguages { get; set; }
 
@@ -583,6 +586,9 @@ extern public static int[] ratingAgeArray
             [NativeProperty("switchSupportedNpadCount", TargetType.Field)]
             extern public static int supportedNpadCount { get; set; }
 
+            [NativeProperty("switchEnableTouchScreen", TargetType.Field)]
+            extern public static bool enableTouchScreen { get; set; }
+
             // SocketConfigEnabled
             [NativeProperty("switchSocketConfigEnabled", TargetType.Field)]
             extern public static bool socketConfigEnabled { get; set; }
@@ -623,10 +629,6 @@ extern public static int[] ratingAgeArray
             [NativeProperty("switchNetworkInterfaceManagerInitializeEnabled", TargetType.Field)]
             extern public static bool networkInterfaceManagerInitializeEnabled { get; set; }
 
-            // Player Connection Enabled
-            [NativeProperty("switchPlayerConnectionEnabled", TargetType.Field)]
-            extern public static bool playerConnectionEnabled { get; set; }
-
             // Using the new path style system
             [NativeProperty("switchUseNewStyleFilepaths", TargetType.Field)]
             extern public static bool useNewStyleFilepaths { get; set; }
diff --git a/Editor/Mono/Prefabs/PrefabImporter.bindings.cs b/Editor/Mono/Prefabs/PrefabImporter.bindings.cs
index 2b7c1373ba..ec01abdfe2 100644
--- a/Editor/Mono/Prefabs/PrefabImporter.bindings.cs
+++ b/Editor/Mono/Prefabs/PrefabImporter.bindings.cs
@@ -11,6 +11,7 @@ namespace UnityEditor
 {
     [NativeHeader("Editor/Src/AssetPipeline/PrefabImporter.h")]
     [ExcludeFromPreset]
+    [HelpURL("https://docs.unity3d.com/2023.1/Documentation/Manual/Prefabs.html")]
     internal class PrefabImporter : AssetImporter
     {
     }
diff --git a/Editor/Mono/Prefabs/PrefabImporterEditor.cs b/Editor/Mono/Prefabs/PrefabImporterEditor.cs
index 7919ffb1ab..8d78721584 100644
--- a/Editor/Mono/Prefabs/PrefabImporterEditor.cs
+++ b/Editor/Mono/Prefabs/PrefabImporterEditor.cs
@@ -2,10 +2,11 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using UnityEngine;
+using System.Collections.Generic;
 using UnityEditor.AssetImporters;
 using UnityEditor.SceneManagement;
-using System.Collections.Generic;
+using UnityEditor.UIElements;
+using UnityEngine;
 
 namespace UnityEditor
 {
@@ -40,8 +41,9 @@ struct TrackedAsset
             public Hash128 hash;
         }
 
-        List<Component> m_TempComponentsResults = new List<Component>();
-        List<TrackedAsset> m_DirtyPrefabAssets = new List<TrackedAsset>();
+        readonly List<Component> m_TempComponentsResults = new List<Component>();
+        readonly List<TrackedAsset> m_DirtyPrefabAssets = new List<TrackedAsset>();
+        bool m_HasPendingChanges;
 
         public override bool showImportedObject { get { return !hasMissingScripts; } }
 
@@ -53,7 +55,7 @@ bool isTextFieldCaretShowing
             get { return EditorGUI.IsEditingTextField() && !EditorGUIUtility.textFieldHasSelection; }
         }
 
-        bool readyToAutoSave
+        internal bool readyToAutoSave
         {
             get { return !m_SavingHasFailed && !hasMissingScripts && GUIUtility.hotControl == 0 && !isTextFieldCaretShowing && !EditorApplication.isCompiling; }
         }
@@ -66,15 +68,51 @@ bool hasMissingScripts
         public override void OnEnable()
         {
             base.OnEnable();
-            EditorApplication.update += Update;
+            ObjectChangeEvents.changesPublished += ObjectChangeEventPublished;
         }
 
         public override void OnDisable()
         {
-            EditorApplication.update -= Update;
+            if (m_HasPendingChanges)
+            {
+                EditorApplication.update -= WaitToApplyChanges;
+                m_HasPendingChanges = false;
+                SaveDirtyPrefabAssets(false);
+            }
+
+            ObjectChangeEvents.changesPublished -= ObjectChangeEventPublished;
             base.OnDisable();
         }
 
+        private void ObjectChangeEventPublished(ref ObjectChangeEventStream stream)
+        {
+            if (m_HasPendingChanges)
+                return;
+
+            for (int i = 0; i < stream.length; ++i)
+            {
+                if (stream.GetEventType(i) == ObjectChangeKind.ChangeGameObjectOrComponentProperties)
+                {
+                    stream.GetChangeGameObjectOrComponentPropertiesEvent(i, out var changeGameObjectOrComponent);
+                    var asset = EditorUtility.InstanceIDToObject(changeGameObjectOrComponent.instanceId);
+                    if (IsTargetAsset(asset))
+                    {
+                        if (!EditorFocusMonitor.AreBindableElementsSelected() && readyToAutoSave)
+                        {
+                            SaveDirtyPrefabAssets(true);
+                        }
+                        else
+                        {
+                            m_HasPendingChanges = true;
+                            EditorApplication.update += WaitToApplyChanges;
+                        }
+
+                        return;
+                    }
+                }
+            }
+        }
+
         protected override void Awake()
         {
             base.Awake();
@@ -102,14 +140,14 @@ void OnDestroy()
                 SaveDirtyPrefabAssets(false);
         }
 
-        void Update()
+        void WaitToApplyChanges()
         {
             var time = EditorApplication.timeSinceStartup;
             if (time > m_NextUpdate)
             {
                 m_NextUpdate = time + 0.2;
 
-                if (readyToAutoSave && HasDirtyPrefabAssets())
+                if (!EditorFocusMonitor.AreBindableElementsSelected() && readyToAutoSave)
                     SaveDirtyPrefabAssets(true);
             }
         }
@@ -190,22 +228,28 @@ internal void SaveDirtyPrefabAssets(bool reloadInspectors)
                             }
                         }
                     }
+
+                    // We reset the flag after the changes have been applied in order to avoid a new change being detected from the save operation.
+                    if (m_HasPendingChanges)
+                    {
+                        EditorApplication.update -= WaitToApplyChanges;
+                        m_HasPendingChanges = false;
+                    }
                 }
             }
         }
 
-        internal bool HasDirtyPrefabAssets()
+        bool IsTargetAsset(Object obj)
         {
-            if (assetTarget == null)
-                return false;
+            if (obj is Component component)
+                obj = component.gameObject;
 
-            if (typeof(GameObject) != assetTarget.GetType())
-                return false;
-
-            // We just check one target since we assume that a multi-edit will
-            // always edit that target. So no need to spend resources on checking
-            // all targets in multiselection.
-            return IsDirty((GameObject)assetTarget);
+            foreach (var asset in assetTargets)
+            {
+                if (obj == asset)
+                    return true;
+            }
+            return false;
         }
 
         bool IsDirty(GameObject prefabAssetRoot)
diff --git a/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesWindow.cs b/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesWindow.cs
index 8d3bca32e8..9737c4f6d7 100644
--- a/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesWindow.cs
+++ b/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesWindow.cs
@@ -20,6 +20,7 @@ internal class PrefabOverridesWindow : PopupWindowContent
         RectOffset k_TreeViewPadding = new RectOffset(0, 0, 4, 4);
         const float k_HeaderHeight = 60f;
         const float k_ButtonWidth = 120;
+        const float k_ButtonWidthVariant = 201;
         const float k_ButtonWidthPadding = 10; //Padding in case the text is long to give the window a bit of margins around the buttons
         const float k_HeaderLeftMargin = 6;
         const float k_NoOverridesLabelHeight = 26f;
@@ -629,7 +630,7 @@ void UpdateText(Texture assetIcon, string assetName)
             if (stage is PrefabStage && PrefabUtility.IsPartOfVariantPrefab(AssetDatabase.LoadAssetAtPath<Object>(stage.assetPath)))
             {
                 applyAllContent = Styles.applyAllToBaseContent;
-                m_ApplyButtonWidth = GUI.skin.button.CalcSize(applyAllContent).x;
+                m_ApplyButtonWidth = k_ButtonWidthVariant;
                 applySelectedContent = Styles.applySelectedToBaseContent;
 
             }
diff --git a/Editor/Mono/Prefabs/PrefabUtility.bindings.cs b/Editor/Mono/Prefabs/PrefabUtility.bindings.cs
index 4fc0198edc..254c580324 100644
--- a/Editor/Mono/Prefabs/PrefabUtility.bindings.cs
+++ b/Editor/Mono/Prefabs/PrefabUtility.bindings.cs
@@ -20,6 +20,12 @@ namespace UnityEditor
     [NativeHeader("Editor/Mono/Prefabs/PrefabUtility.bindings.h")]
     public sealed partial class PrefabUtility
     {
+        [StaticAccessor("PrefabInstance", StaticAccessorType.DoubleColon)]
+        extern internal static int defaultOverridesCount { get; }
+
+        [StaticAccessor("PrefabInstance", StaticAccessorType.DoubleColon)]
+        extern internal static int defaultOverridesCountUsingRectTransform { get; }
+
         // Returns the corresponding GameObject/Component from /source/, or null if it can't be found.
         [StaticAccessor("PrefabUtilityBindings", StaticAccessorType.DoubleColon)]
         extern private static Object GetCorrespondingObjectFromSource_internal([NotNull] Object obj);
@@ -103,9 +109,8 @@ public sealed partial class PrefabUtility
         extern public static bool HasPrefabInstanceAnyOverrides(GameObject instanceRoot, bool includeDefaultOverrides);
 
         // Instantiate an asset that is referenced by a prefab and use it on the prefab instance.
-        [FreeFunction]
-        [NativeHeader("Editor/Src/Prefabs/AttachedPrefabAsset.h")]
-        extern public static Object InstantiateAttachedAsset([NotNull("NullExceptionObject")] Object targetObject);
+        [Obsolete("InstantiateAttachedAsset is deprecated")]
+        public static Object InstantiateAttachedAsset(Object targetObject) { return null; }
 
         // Force record property modifications by comparing against the parent prefab.
         [FreeFunction]
diff --git a/Editor/Mono/Prefabs/PrefabUtility.cs b/Editor/Mono/Prefabs/PrefabUtility.cs
index 1611c44b47..116df8343a 100644
--- a/Editor/Mono/Prefabs/PrefabUtility.cs
+++ b/Editor/Mono/Prefabs/PrefabUtility.cs
@@ -570,8 +570,12 @@ InteractionMode action
             {
                 if (property.prefabOverride && property.propertyType == SerializedPropertyType.ManagedReference)
                 {
-                    allowWarnAboutApplyingPartsOfManagedReferences = false; // we should always be allowed to apply a managed reference root
-                    ApplySinglePropertyAndRemoveOverride(property, prefabSourceSerializedObject, prefabSourceObject, isObjectOnRootInAsset, false, allowWarnAboutApplyingPartsOfManagedReferences, allowApplyDefaultOverride, serializedObjects, changedObjects, action, out _);
+                    bool skipRestOfProperties = false;
+                    ApplySinglePropertyAndRemoveOverride(property, prefabSourceSerializedObject, prefabSourceObject, isObjectOnRootInAsset, false, allowWarnAboutApplyingPartsOfManagedReferences, allowApplyDefaultOverride, serializedObjects, changedObjects, action, out skipRestOfProperties);
+                    if (skipRestOfProperties)
+                        return;
+
+                    allowWarnAboutApplyingPartsOfManagedReferences = false; // The managed reference was applied to the Asset so do not check for sub properties
                 }
 
                 var visitedManagedReferenceProperties = new HashSet<long>();
@@ -621,11 +625,11 @@ InteractionMode action
                 }
             }
         }
-        
+
         internal static PropertyValueOriginInfo GetPropertyValueOriginInfo(SerializedProperty property)
-        {            
+        {
             if (property == null)
-                return new PropertyValueOriginInfo("The property is null");            
+                return new PropertyValueOriginInfo("The property is null");
 
             if (property.prefabOverride)
                 return new PropertyValueOriginInfo("The property value is overriden in the currently open object");
@@ -1004,6 +1008,29 @@ internal static void RevertPropertyOverride(SerializedProperty instanceProperty,
                 RaiseRevertedEvents(instanceProperty.serializedObject);
         }
 
+        internal static bool IsPropertyBeingDrivenByPrefabStage(SerializedProperty property)
+        {
+            Object target = property.serializedObject.targetObject;
+            GameObject go = GetGameObject(target);
+            if (go != null && go.scene.IsValid() && EditorSceneManager.IsPreviewScene(go.scene))
+            {
+                var prefabStage = SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
+                if (prefabStage != null && prefabStage.mode == SceneManagement.PrefabStage.Mode.InContext)
+                {
+                    var propertyPath = property.propertyPath;
+                    ScriptableObject driver = prefabStage;
+                    if (
+                        (DrivenPropertyManagerInternal.IsDriving(driver, target, propertyPath))
+                        ||
+                        ((target is Transform || target is ParticleSystem || property.propertyType == SerializedPropertyType.Color) && DrivenPropertyManagerInternal.IsDrivingPartial(driver, target, propertyPath)))
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
         internal static void RaiseRevertingEvents(SerializedObject serializedObject)
         {
             foreach (Object targetObject in serializedObject.targetObjects)
@@ -1411,11 +1438,20 @@ public static void ApplyRemovedComponent(GameObject instanceGameObject, Componen
                     Debug.LogError($"No undo was registered when removing {assetComponent.name} from {assetRoot.name}. \nError: {errorMessage}", assetRoot);
             }
 
+            var prefabInstanceObject = PrefabUtility.GetPrefabInstanceHandle(instanceGameObject);
+
+            if (action == InteractionMode.UserAction)
+                Undo.RegisterCompleteObjectUndo(prefabInstanceObject, actionName);
+
+            // Having registered undo on the Prefab instance we can now apply the removed component override
             using (var scope = new EditPrefabContentsScope(assetPath))
             {
                 //Search components in file that matches the FileIds of componentInAsset
-                void DeleteCorrespondingComponent(Component componentInAsset)
+                bool DeleteCorrespondingComponent(Component componentInAsset)
                 {
+                    if (componentInAsset == null)
+                        return false;
+
                     var assetComponentId = Unsupported.GetFileIDHint(componentInAsset);
                     var componentsOfTypeInAsset = scope.prefabContentsRoot.GetComponentsInChildren(componentInAsset.GetType(), true);
 
@@ -1424,17 +1460,23 @@ void DeleteCorrespondingComponent(Component componentInAsset)
                         if (Unsupported.GetOrGenerateFileIDHint(component) == assetComponentId)
                         {
                             Object.DestroyImmediate(component);
-                            return;
+                            return true;
                         }
                     }
                     Debug.LogError($"Component {componentInAsset} could not be found and deleted from corresponding asset.");
+                    return false;
                 }
 
-                DeleteCorrespondingComponent(assetComponent);
-                if (coupledAssetComponent != null)
-                    DeleteCorrespondingComponent(coupledAssetComponent);
+                if (DeleteCorrespondingComponent(assetComponent))
+                {
+                    RemoveRemovedComponentOverride(instanceGameObject, assetComponent);
+
+                    if (DeleteCorrespondingComponent(coupledAssetComponent))
+                        RemoveRemovedComponentOverride(instanceGameObject, coupledAssetComponent);
+                }
             }
 
+            // Register undo for the changed asset
             if (action == InteractionMode.UserAction && originalFileContent != null)
             {
                 var guid = AssetDatabase.GUIDFromAssetPath(assetPath);
@@ -1444,10 +1486,8 @@ void DeleteCorrespondingComponent(Component componentInAsset)
                     Debug.LogError($"No undo was registered when removing {assetComponent.name} from {assetRoot.name}. \nError: {errorMessage}", assetRoot);
             }
 
-            var prefabInstanceObject = PrefabUtility.GetPrefabInstanceHandle(instanceGameObject);
-
-            if (action == InteractionMode.UserAction)
-                Undo.RegisterCompleteObjectUndo(prefabInstanceObject, actionName);
+            // Ensure correct action name after asset undo
+            Undo.SetCurrentGroupName(actionName);
 
             RemoveRemovedComponentOverridesWhichAreInvalid(prefabInstanceObject);
 
@@ -2040,7 +2080,7 @@ internal static void ValidatePath(GameObject instanceRoot, string path)
             // We allow relative paths outside the Assets folder so we do not throw if isValidAssetFolder is false
             bool isRootFolder = false;
             bool isImmutableFolder = false;
-            bool isValidAssetFolder = AssetDatabase.GetAssetFolderInfo(directory, out isRootFolder, out isImmutableFolder);
+            bool isValidAssetFolder = AssetDatabase.TryGetAssetFolderInfo(directory, out isRootFolder, out isImmutableFolder);
 
             if (isValidAssetFolder && isImmutableFolder)
                 throw new ArgumentException("Saving Prefab to immutable folder is not allowed: '" + path + "'");
@@ -2345,6 +2385,10 @@ internal static void ThrowIfInvalidArgumentsForConvertToPrefabInstance(GameObjec
             if (plainGameObject.transform.GetType() != prefabAssetRoot.transform.GetType())
                 throw new InvalidOperationException(string.Format("Cannot convert the GameObject '{0}' with root transform of type {1} with a Prefab asset with root transform of type {2}. Transform types must match.", plainGameObject.name, plainGameObject.transform.GetType().Name, prefabAssetRoot.transform.GetType().Name));
 
+            // Prefab Mode and EditPrefabContents scope handling
+            if (PrefabStageUtility.IsGameObjectThePrefabRootInAnyPrefabStage(plainGameObject) || (EditorSceneManager.IsPreviewSceneObject(plainGameObject) && plainGameObject.transform.parent == null))
+                throw new InvalidOperationException("Replacing the root GameObject in a Prefab with a Prefab instance is not supported since it will break all overrides for existing instances of this Prefab, including their positions and rotations." + plainGameObject.name);
+
             if (plainGameObject.hideFlags.HasFlag(HideFlags.DontSaveInEditor) || plainGameObject.transform.hideFlags.HasFlag(HideFlags.DontSaveInEditor))
                 throw new ArgumentException("Input GameObject is using the HideFlags.DontSaveInEditor flag which is not supported when converting to Prefab instance: GameObject: " + plainGameObject.name, nameof(plainGameObject));
 
@@ -3575,7 +3619,7 @@ internal static bool DoRemovePrefabInstanceUnusedOverridesDialog(InstanceOverrid
             {
                 title = titleRemoveUnusedOverrides;
                 message += "\n\n" + msgDetailsWrittenToTheLog;
-                if (EditorUtility.DisplayDialog(title, message, L10n.Tr("Yes"), L10n.Tr("No")))
+                if (EditorUtility.DisplayDialog(title, message, L10n.Tr("Remove"), L10n.Tr("Cancel")))
                     return true;
             }
             else
diff --git a/Editor/Mono/PreferencesWindow/AssetPipelinePreferences.cs b/Editor/Mono/PreferencesWindow/AssetPipelinePreferences.cs
index 100cd6e52c..0853ec033f 100644
--- a/Editor/Mono/PreferencesWindow/AssetPipelinePreferences.cs
+++ b/Editor/Mono/PreferencesWindow/AssetPipelinePreferences.cs
@@ -299,22 +299,7 @@ void AssetImportGUI()
 
         void DoAutoRefreshMode()
         {
-            bool collabEnabled = Collab.instance.IsCollabEnabledForCurrentProject();
-            using (new EditorGUI.DisabledScope(collabEnabled))
-            {
-                if (collabEnabled)
-                {
-                    // Don't keep toggle value in m_AutoRefresh since we don't want to save the overwritten value
-                    EditorGUILayout.EnumPopup(Properties.autoRefresh, AssetPipelineAutoRefreshMode.Enabled);
-
-                    EditorGUILayout.Toggle(Properties.autoRefresh, true);
-                    EditorGUILayout.HelpBox(Properties.autoRefreshHelpBox);
-                }
-                else
-                {
-                    m_AutoRefresh = (AssetPipelineAutoRefreshMode)EditorGUILayout.EnumPopup(Properties.autoRefresh, m_AutoRefresh);
-                }
-            }
+            m_AutoRefresh = (AssetPipelineAutoRefreshMode)EditorGUILayout.EnumPopup(Properties.autoRefresh, m_AutoRefresh);
         }
 
         void DoImportWorkerCount()
diff --git a/Editor/Mono/PreferencesWindow/CollectionsPreferences.cs b/Editor/Mono/PreferencesWindow/CollectionsPreferences.cs
index 0190b49334..ee7bb326d7 100644
--- a/Editor/Mono/PreferencesWindow/CollectionsPreferences.cs
+++ b/Editor/Mono/PreferencesWindow/CollectionsPreferences.cs
@@ -98,21 +98,17 @@ static void SetLeakDetection(NativeLeakDetectionMode value)
         {
             case NativeLeakDetectionMode.Disabled:
                 {
-                    // In the case where someone enables, disables, then re-enables leak checking, we might miss some frees
-                    // while disabled. So to avoid spurious leak warnings, just forgive the leaks every time someone disables
-                    // leak checking through the menu.
-                    UnsafeUtility.ForgiveLeaks();
                     Debug.LogWarning("Leak detection has been disabled. Leak warnings will not be generated, and all leaks up to now are forgotten.");
                     break;
                 }
             case NativeLeakDetectionMode.Enabled:
                 {
-                    Debug.Log("Leak detection has been enabled. Leak warnings will be generated upon exiting play mode.");
+                    Debug.Log("Leak detection has been enabled. Leak warnings will be generated upon domain reload.");
                     break;
                 }
             case NativeLeakDetectionMode.EnabledWithStackTrace:
                 {
-                    Debug.Log("Leak detection with stack traces has been enabled. Leak warnings will be generated upon exiting play mode.");
+                    Debug.Log("Leak detection with stack traces has been enabled. Leak warnings will be generated upon domain reload.");
                     break;
                 }
             default:
diff --git a/Editor/Mono/PreferencesWindow/PreferencesSettingsProviders.cs b/Editor/Mono/PreferencesWindow/PreferencesSettingsProviders.cs
index cdceeac7e8..1795e680b3 100644
--- a/Editor/Mono/PreferencesWindow/PreferencesSettingsProviders.cs
+++ b/Editor/Mono/PreferencesWindow/PreferencesSettingsProviders.cs
@@ -51,6 +51,7 @@ class GeneralProperties
             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 editorTextSharpness = EditorGUIUtility.TrTextContent("Editor Text Sharpness");
             public static readonly GUIContent editorSkin = EditorGUIUtility.TrTextContent("Editor Theme");
             public static readonly GUIContent[] editorSkinOptions = { EditorGUIUtility.TrTextContent("Light"), EditorGUIUtility.TrTextContent("Dark") };
             public static readonly GUIContent hierarchyHeader = EditorGUIUtility.TrTextContent("Hierarchy window");
@@ -131,6 +132,7 @@ class SceneViewProperties
             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");
+            public static readonly GUIContent ignoreAlwaysRefreshWhenNotFocused = EditorGUIUtility.TrTextContent("Refresh the Scene view only when the Editor is in focus.", "If enabled, ignore the \"Always Refresh\" flag on the Scene view when the Editor is not the foregrounded application.");
         }
 
         class LanguageProperties
@@ -193,6 +195,7 @@ private struct GICacheSettings
         private static SystemLanguage[] m_stableLanguages = { SystemLanguage.English };
         private bool m_EnableCompilerMessagesLocalization;
 
+        private float m_EditorTextSharpness = 0.0f;
         private bool m_AllowAlphaNumericHierarchy = false;
         private PrefabStage.Mode m_DefaultPrefabModeFromHierarchy = PrefabStage.Mode.InContext;
         private bool m_Create3DObjectsAtOrigin = false;
@@ -516,6 +519,8 @@ private void ShowGeneral(string searchContext)
                 }
             }
 
+            m_EditorTextSharpness = EditorGUILayout.Slider(GeneralProperties.editorTextSharpness, m_EditorTextSharpness, -0.5f, 1.0f);
+
             if (InternalEditorUtility.IsGpuDeviceSelectionSupported())
             {
                 // Cache gpu devices
@@ -556,7 +561,7 @@ private void ShowGeneral(string searchContext)
 
             if (Application.platform == RuntimePlatform.WindowsEditor)
             {
-                var progressDialogDelay = EditorGUILayout.DelayedFloatField(GeneralProperties.progressDialogDelay, m_ProgressDialogDelay);
+                var progressDialogDelay = EditorGUILayout.FloatField(GeneralProperties.progressDialogDelay, m_ProgressDialogDelay);
                 progressDialogDelay = Mathf.Clamp(progressDialogDelay, 0.1f, 1000.0f);
                 if (progressDialogDelay != m_ProgressDialogDelay)
                 {
@@ -771,11 +776,7 @@ internal static SortedDictionary<string, List<KeyValuePair<string, T>>> OrderPre
 
         private void RevertColors()
         {
-            foreach (KeyValuePair<string, PrefColor> kvp in PrefSettings.Prefs<PrefColor>())
-            {
-                kvp.Value.ResetToDefault();
-                EditorPrefs.SetString(kvp.Value.Name, kvp.Value.ToUniqueString());
-            }
+            PrefSettings.RevertAll<PrefColor>();
         }
 
         private void ShowColors(string searchContext)
@@ -824,6 +825,7 @@ private void ShowSceneView(string searchContext)
             m_Create3DObjectsAtOrigin = EditorGUILayout.Toggle(SceneViewProperties.createObjectsAtWorldOrigin, m_Create3DObjectsAtOrigin);
             m_EnableConstrainProportionsScalingForNewObjects = EditorGUILayout.Toggle(SceneViewProperties.enableConstrainProportionsScalingForNewObjects, m_EnableConstrainProportionsScalingForNewObjects);
             AnnotationUtility.useInspectorExpandedState = EditorGUILayout.Toggle(SceneViewProperties.useInspectorExpandedStateContent, AnnotationUtility.useInspectorExpandedState);
+            SceneView.s_PreferenceIgnoreAlwaysRefreshWhenNotFocused.value = EditorGUILayout.Toggle(SceneViewProperties.ignoreAlwaysRefreshWhenNotFocused, SceneView.s_PreferenceIgnoreAlwaysRefreshWhenNotFocused);
 
             GUILayout.Label("Handles", EditorStyles.boldLabel);
             Handles.s_LineThickness.value = EditorGUILayout.IntSlider(SceneViewProperties.handlesLineThickness, (int)Handles.s_LineThickness.value, 1, 5);
@@ -1044,6 +1046,7 @@ private void ShowDeveloperMode(string searchContext)
             if (m_DeveloperModeDirty)
             {
                 ApplyChangesToPrefs();
+                EditorApplication.UpdateMainWindowTitle();
             }
         }
 
@@ -1109,6 +1112,9 @@ private void WritePreferences()
             EditorPrefs.SetString("Editor.kEditorLocale", m_SelectedLanguage);
             EditorPrefs.SetBool("Editor.kEnableCompilerMessagesLocalization", m_EnableCompilerMessagesLocalization);
 
+            EditorPrefs.SetFloat($"EditorTextSharpness_{EditorResources.GetFont(FontDef.Style.Normal).name}", m_EditorTextSharpness);
+            EditorApplication.RequestRepaintAllTexts();
+
             EditorPrefs.SetBool("AllowAlphaNumericHierarchy", m_AllowAlphaNumericHierarchy);
             EditorPrefs.SetInt("DefaultPrefabModeFromHierarchy", (int)m_DefaultPrefabModeFromHierarchy);
 
@@ -1197,6 +1203,9 @@ private void ReadPreferences()
             m_EnableEditorLocalization = EditorPrefs.GetBool("Editor.kEnableEditorLocalization", true);
             m_SelectedLanguage = EditorPrefs.GetString("Editor.kEditorLocale", LocalizationDatabase.GetDefaultEditorLanguage().ToString());
             m_EnableCompilerMessagesLocalization = EditorPrefs.GetBool("Editor.kEnableCompilerMessagesLocalization", false);
+            m_EditorTextSharpness = EditorPrefs.GetFloat($"EditorTextSharpness_{EditorResources.GetFont(FontDef.Style.Normal).name}", 0.0f);
+            EditorTextSettings.SetCurrentEditorSharpness(m_EditorTextSharpness);
+
             m_AllowAlphaNumericHierarchy = EditorPrefs.GetBool("AllowAlphaNumericHierarchy", false);
             m_DefaultPrefabModeFromHierarchy = GetDefaultPrefabModeForHierarchy();
             m_ProgressDialogDelay = EditorPrefs.GetFloat("EditorBusyProgressDialogDelay", 3.0f);
diff --git a/Editor/Mono/Progress/Progress.bindings.cs b/Editor/Mono/Progress/Progress.bindings.cs
index 97072a3db8..15f265adf7 100644
--- a/Editor/Mono/Progress/Progress.bindings.cs
+++ b/Editor/Mono/Progress/Progress.bindings.cs
@@ -79,6 +79,14 @@ internal enum Updates : uint
             EverythingChanged = 0xffffffff
         }
 
+        [NativeType(Header = k_NativeHeader)]
+        internal enum ExplicitLoggingState
+        {
+            NotSet,
+            Enabled,
+            Disabled
+        }
+
         [StructLayout(LayoutKind.Sequential)]
         [NativeHeader(k_NativeHeader)]
         [RequiredByNativeCode(GenerateProxy = true)]
@@ -471,7 +479,7 @@ internal static float GetMaxElapsedTime()
             return maxElapsedTime;
         }
 
-        // For testing purposes only.
+        // Anything below this line is for testing purposes only.
         internal static void ClearProgressItems()
         {
             s_ProgressItems.Clear();
@@ -482,6 +490,44 @@ internal static void ClearProgressItems()
             s_RemainingTime = TimeSpan.Zero;
             s_LastRemainingTimeUpdate = DateTime.Now;
         }
+
+        internal static ExplicitLoggingState errorLoggingState
+        {
+            get => GetExplicitErrorLoggingState();
+            set => SetExplicitErrorLoggingState(value);
+        }
+        internal static ExplicitLoggingState warningLoggingState
+        {
+            get => GetExplicitWarningLoggingState();
+            set => SetExplicitWarningLoggingState(value);
+        }
+
+        [NativeMethod(IsFreeFunction = true, IsThreadSafe = false, Name = "Editor::Progress::Internal_GetExplicitErrorLoggingState")]
+        static extern ExplicitLoggingState GetExplicitErrorLoggingState();
+
+        [NativeMethod(IsFreeFunction = true, IsThreadSafe = false, Name = "Editor::Progress::Internal_GetExplicitWarningLoggingState")]
+        static extern ExplicitLoggingState GetExplicitWarningLoggingState();
+
+        [NativeMethod(IsFreeFunction = true, IsThreadSafe = false, Name = "Editor::Progress::Internal_SetExplicitErrorLoggingState")]
+        static extern void SetExplicitErrorLoggingState(ExplicitLoggingState state);
+
+        [NativeMethod(IsFreeFunction = true, IsThreadSafe = false, Name = "Editor::Progress::Internal_SetExplicitWarningLoggingState")]
+        static extern void SetExplicitWarningLoggingState(ExplicitLoggingState state);
+
+        internal static bool manualUpdate
+        {
+            get => IsManualUpdate();
+            set => SetManualUpdate(value);
+        }
+
+        [NativeMethod(IsFreeFunction = true, IsThreadSafe = false, Name = "Editor::Progress::Internal_IsManualUpdate")]
+        static extern bool IsManualUpdate();
+
+        [NativeMethod(IsFreeFunction = true, IsThreadSafe = false, Name = "Editor::Progress::Internal_SetManualUpdate")]
+        static extern void SetManualUpdate(bool manualUpdate);
+
+        [NativeMethod(IsFreeFunction = true, IsThreadSafe = false, Name = "Editor::Progress::ForceUpdateProgress")]
+        internal static extern void ForceUpdate();
     }
 
     static class ProgressEnumExtensions
diff --git a/Editor/Mono/ProjectBrowser.cs b/Editor/Mono/ProjectBrowser.cs
index 3e9e4521d0..ea63e9483f 100644
--- a/Editor/Mono/ProjectBrowser.cs
+++ b/Editor/Mono/ProjectBrowser.cs
@@ -1012,15 +1012,6 @@ void ShowFolderContents(int folderInstanceID, bool revealAndFrameInFolderTree)
             if (folderInstanceID == kPackagesFolderInstanceId)
                 folderPath = PackageManager.Folders.GetPackagesPath();
 
-
-            if (m_SearchFilter.GetState() == SearchFilter.State.FolderBrowsing)
-            {
-                if (m_SearchFilter.folders.Length == 1 && m_SearchFilter.folders[0] == folderPath)
-                {
-                    return; // Already showing folder
-                }
-            }
-
             if (!m_SkipHiddenPackages || PackageManagerUtilityInternal.IsPathInVisiblePackage(folderPath))
             {
                 m_SearchFilter.ClearSearch();
@@ -2896,7 +2887,8 @@ public void FrameObject(int instanceID, bool ping)
                 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))
+                if ((m_ViewMode == ViewMode.TwoColumns && m_ListArea != null && !m_ListArea.IsShowing(instanceID))
+                    || (m_ViewMode == ViewMode.OneColumn && m_AssetTree != null && m_AssetTree.data.GetRow(instanceID) == -1))
                 {
                     Repaint();
                     m_LockTracker.PingIcon();
@@ -3004,7 +2996,7 @@ internal static bool CanDeleteSelectedAssets()
                 {
                     var path = AssetDatabase.GetAssetPath(instanceID);
                     bool isRootFolder, isImmutable;
-                    if (string.IsNullOrEmpty(path) || !AssetDatabase.GetAssetFolderInfo(path, out isRootFolder, out isImmutable) || isRootFolder || isImmutable)
+                    if (string.IsNullOrEmpty(path) || !AssetDatabase.TryGetAssetFolderInfo(path, out isRootFolder, out isImmutable) || isRootFolder || isImmutable)
                     {
                         return false;
                     }
diff --git a/Editor/Mono/ProjectBrowser/SavedSearchFilter.cs b/Editor/Mono/ProjectBrowser/SavedSearchFilter.cs
index 9b6a27d0dc..0d757d0381 100644
--- a/Editor/Mono/ProjectBrowser/SavedSearchFilter.cs
+++ b/Editor/Mono/ProjectBrowser/SavedSearchFilter.cs
@@ -10,7 +10,6 @@
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
 using UnityEditorInternal;
-using UnityEditor.Collaboration;
 using Object = UnityEngine.Object;
 
 
@@ -465,22 +464,6 @@ TreeViewItem BuildTreeView()
                     root = item;
                 else
                 {
-                    if (Collab.instance.collabFilters.ContainsSearchFilter(savedFilter.m_Name, savedFilter.m_Filter.FilterToSearchFieldString()))
-                    {
-                        if (!Collab.instance.IsCollabEnabledForCurrentProject())
-                            continue;
-                    }
-
-                    if (SoftlockViewController.Instance.softLockFilters.ContainsSearchFilter(savedFilter.m_Name, savedFilter.m_Filter.FilterToSearchFieldString()))
-                    {
-                        if (CollabSettingsManager.IsAvailable(CollabSettingType.InProgressEnabled))
-                        {
-                            if (!Collab.instance.IsCollabEnabledForCurrentProject() || !CollabSettingsManager.inProgressEnabled)
-                                continue;
-                        }
-                        else
-                            continue;
-                    }
                     items.Add(item);
                 }
             }
diff --git a/Editor/Mono/ProjectWindow/GlobSearchUtilities.cs b/Editor/Mono/ProjectWindow/GlobSearchUtilities.cs
index 749c23bf0e..e6149e3e7b 100644
--- a/Editor/Mono/ProjectWindow/GlobSearchUtilities.cs
+++ b/Editor/Mono/ProjectWindow/GlobSearchUtilities.cs
@@ -11,8 +11,8 @@ namespace UnityEditor
 {
     static class GlobSearchUtilities
     {
-        static readonly Regex k_BasicSymbolsRegex = new Regex(@"(?<range>\\\[..+\])|(?<dstarfold>\\\*\\\*/)|(?<dstar>\\\*\\\*)|(?<star>\\\*)|(?<single>\\\?)");
-        static readonly Regex k_ComplexSymbolsRegex = new Regex(@"(?<or>\\\(.+(?:\\\|.+)+\\\))");
+        static readonly Regex k_BasicSymbolsRegex = new Regex(@"(?<range>\\\[..+?\])|(?<dstarfold>\\\*\\\*/)|(?<dstar>\\\*\\\*)|(?<star>\\\*)|(?<single>\\\?)");
+        static readonly Regex k_ComplexSymbolsRegex = new Regex(@"(?<or>\\\(.+?(?:\\\|.+?)+\\\))");
         static Dictionary<string, Func<string, string>> s_GlobToRegexMatch;
 
         static GlobSearchUtilities()
diff --git a/Editor/Mono/ProjectWindow/ProjectWindowUtil.cs b/Editor/Mono/ProjectWindow/ProjectWindowUtil.cs
index 468e653138..bf10cf0251 100644
--- a/Editor/Mono/ProjectWindow/ProjectWindowUtil.cs
+++ b/Editor/Mono/ProjectWindow/ProjectWindowUtil.cs
@@ -364,7 +364,7 @@ static void CreatePrefabVariant()
 
                 string sourcePath = AssetDatabase.GetAssetPath(go);
                 string sourceDir = Path.GetDirectoryName(sourcePath).ConvertSeparatorsToUnity();
-                string variantPath = GetPrefabVariantPath(sourceDir, go.name);
+                string variantPath = GetPrefabVariantPath(sourceDir, go);
 
                 StartNameEditingIfProjectWindowExists(
                     0,
@@ -395,7 +395,7 @@ static GameObject[] CreatePrefabVariants(GameObject[] gameObjects)
             {
                 string sourcePath = AssetDatabase.GetAssetPath(go);
                 string sourceDir = Path.GetDirectoryName(sourcePath).ConvertSeparatorsToUnity();
-                string variantPath = GetPrefabVariantPath(sourceDir, go.name);
+                string variantPath = GetPrefabVariantPath(sourceDir, go);
                 variantPath = AssetDatabase.GenerateUniqueAssetPath(variantPath);
 
                 var variant = PrefabUtility.CreateVariant(go, variantPath);
@@ -412,9 +412,12 @@ static GameObject[] CreatePrefabVariants(GameObject[] gameObjects)
             return createdVariants.ToArray();
         }
 
-        static string GetPrefabVariantPath(string folder, string gameObjectName)
+        static string GetPrefabVariantPath(string folder, GameObject gameObject)
         {
-            return string.Format("{0}/{1} Variant.prefab", folder, gameObjectName);
+            if (PrefabUtility.IsPartOfModelPrefab(gameObject))
+                return string.Format("{0}/{1}.prefab", folder, gameObject.name);
+            else
+                return string.Format("{0}/{1} Variant.prefab", folder, gameObject.name);
         }
 
         public static void CreateAssetWithContent(string filename, string content, Texture2D icon = null)
@@ -533,8 +536,8 @@ internal static string RemoveOrInsertNamespace(string content, string rootNamesp
 
             if (string.IsNullOrEmpty(rootNamespace))
             {
-                content = Regex.Replace(content, $"((\\r\\n)|\\n)[ \\t]*{rootNamespaceBeginTag}[ \\t]*", string.Empty);
-                content = Regex.Replace(content, $"((\\r\\n)|\\n)[ \\t]*{rootNamespaceEndTag}[ \\t]*", string.Empty);
+                content = Regex.Replace(content, $"((\\r\\n)|\\n)?[ \\t]*{rootNamespaceBeginTag}[ \\t]*", string.Empty);
+                content = Regex.Replace(content, $"((\\r\\n)|\\n)?[ \\t]*{rootNamespaceEndTag}[ \\t]*", string.Empty);
 
                 return content;
             }
diff --git a/Editor/Mono/ProjectWindow/SearchFilter.cs b/Editor/Mono/ProjectWindow/SearchFilter.cs
index d0a16ae7f9..de81e955bc 100644
--- a/Editor/Mono/ProjectWindow/SearchFilter.cs
+++ b/Editor/Mono/ProjectWindow/SearchFilter.cs
@@ -8,8 +8,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using UnityEditor.Collaboration;
-using UnityEditor.Connect;
 
 namespace UnityEditor
 {
@@ -44,10 +42,6 @@ public enum State
         [SerializeField]
         private string[] m_AssetBundleNames = new string[0];
         [SerializeField]
-        private string[] m_VersionControlStates = new string[0];
-        [SerializeField]
-        private string[] m_SoftLockControlStates = new string[0];
-        [SerializeField]
         private int[] m_ReferencingInstanceIDs = new int[0];
         [SerializeField]
         private int[] m_SceneHandles;
@@ -74,12 +68,13 @@ public enum State
         [SerializeField]
         private ImportLogFlags m_ImportLogFlags;
 
+        [SerializeField]
+        private bool m_FilterByTypeIntersection;
+
         // Interface
         public string nameFilter { get { return m_NameFilter; } set { m_NameFilter = value; }}
         public string[] classNames { get { return m_ClassNames; } set { m_ClassNames = value; }}
         public string[] assetLabels { get { return m_AssetLabels; } set { m_AssetLabels = value; }}
-        public string[] versionControlStates { get { return m_VersionControlStates; } set { m_VersionControlStates = value; }}
-        public string[] softLockControlStates { get { return m_SoftLockControlStates; } set { m_SoftLockControlStates = value; }}
         public string[] assetBundleNames { get { return m_AssetBundleNames; } set { m_AssetBundleNames = value; }}
         public int[] referencingInstanceIDs { get { return m_ReferencingInstanceIDs; } set { m_ReferencingInstanceIDs = value; }}
         public int[] sceneHandles { get { return m_SceneHandles; } set { m_SceneHandles = value; }}
@@ -94,6 +89,7 @@ public enum State
         public bool anyWithAssetOrigin { get { return m_AnyWithAssetOrigin; } set { m_AnyWithAssetOrigin = value; }}
         public string originalText { get => m_OriginalText; set => m_OriginalText = value; }
         public ImportLogFlags importLogFlags { get => m_ImportLogFlags; set => m_ImportLogFlags = value; }
+        internal bool filterByTypeIntersection { get => m_FilterByTypeIntersection; set => m_FilterByTypeIntersection = value; }
 
         public void ClearSearch()
         {
@@ -107,11 +103,10 @@ public void ClearSearch()
             m_Globs = new string[0];
             m_ProductIds = new int[0];
             m_AnyWithAssetOrigin = false;
-            m_VersionControlStates = new string[0];
-            m_SoftLockControlStates = new string[0];
             m_ShowAllHits = false;
             m_SkipHidden = false;
             m_ImportLogFlags = ImportLogFlags.None;
+            m_FilterByTypeIntersection = false;
         }
 
         bool IsNullOrEmpty<T>(T[] list)
@@ -130,8 +125,6 @@ public State GetState()
                 !IsNullOrEmpty(m_ReferencingInstanceIDs) ||
                 m_ImportLogFlags != ImportLogFlags.None;
 
-            isSearchActive = isSearchActive || !IsNullOrEmpty(m_VersionControlStates);
-            isSearchActive = isSearchActive || !IsNullOrEmpty(m_SoftLockControlStates);
 
 
             bool foldersActive = !IsNullOrEmpty(m_Folders);
@@ -193,16 +186,6 @@ public bool SetNewFilter(SearchFilter newFilter)
                 m_Folders = newFilter.m_Folders;
                 changed = true;
             }
-            if (newFilter.m_VersionControlStates != m_VersionControlStates)
-            {
-                m_VersionControlStates = newFilter.m_VersionControlStates;
-                changed = true;
-            }
-            if (newFilter.m_SoftLockControlStates != m_SoftLockControlStates)
-            {
-                m_SoftLockControlStates = newFilter.m_SoftLockControlStates;
-                changed = true;
-            }
             if (newFilter.m_AssetLabels != m_AssetLabels)
             {
                 m_AssetLabels = newFilter.m_AssetLabels;
@@ -265,6 +248,12 @@ public bool SetNewFilter(SearchFilter newFilter)
                 changed = true;
             }
 
+            if (newFilter.m_FilterByTypeIntersection != m_FilterByTypeIntersection)
+            {
+                m_FilterByTypeIntersection = newFilter.m_FilterByTypeIntersection;
+                changed = true;
+            }
+
             return changed;
         }
 
@@ -281,11 +270,6 @@ public override string ToString()
             if (m_AssetLabels != null && m_AssetLabels.Length > 0)
                 result += "[Labels: " + m_AssetLabels[0] + "]";
 
-            if (m_VersionControlStates != null && m_VersionControlStates.Length > 0)
-                result += "[VersionStates: " + m_VersionControlStates[0] + "]";
-
-            if (m_SoftLockControlStates != null && m_SoftLockControlStates.Length > 0)
-                result += "[SoftLockStates: " + m_SoftLockControlStates[0] + "]";
 
             if (m_AssetBundleNames != null && m_AssetBundleNames.Length > 0)
                 result += "[AssetBundleNames: " + m_AssetBundleNames[0] + "]";
@@ -322,6 +306,11 @@ public override string ToString()
                 result += $"[ImportLog: {ImportLog.Filters.WarningsStr}]";
             }
 
+            if (m_FilterByTypeIntersection)
+            {
+                result += $"[FilterByTypeIntersection]";
+            }
+
             return result;
         }
 
@@ -341,8 +330,6 @@ internal string FilterToSearchFieldString()
             // See SearchUtility.cs for search tokens
             AddToString(FormatFilterTokenForSearchEngine("t"), m_ClassNames, ref result);
             AddToString(FormatFilterTokenForSearchEngine("l"), m_AssetLabels, ref result);
-            AddToString("v:", m_VersionControlStates, ref result);
-            AddToString("s:", m_SoftLockControlStates, ref result);
             AddToString("b:", m_AssetBundleNames, ref result);
             AddToString("glob:", m_Globs.Select(a => $"\"{a}\"").ToArray(), ref result);
             AddToString("assetorigin.productid:", m_ProductIds.Select(o => $"\"{o}\"").ToArray(), ref result);
diff --git a/Editor/Mono/ProjectWindow/SearchableEditorWindow.cs b/Editor/Mono/ProjectWindow/SearchableEditorWindow.cs
index 3fcbc5d595..77ac4cd3ef 100644
--- a/Editor/Mono/ProjectWindow/SearchableEditorWindow.cs
+++ b/Editor/Mono/ProjectWindow/SearchableEditorWindow.cs
@@ -72,18 +72,7 @@ private static void OnSearchForReferencesToComponent(MenuCommand command)
         {
             var component = command.context as Component;
             if (component)
-            {
-                var searchFilter = "ref:" + component.GetInstanceID() + ":";
-                foreach (SearchableEditorWindow sw in searchableWindows)
-                {
-                    if (sw.m_HierarchyType == HierarchyType.GameObjects)
-                    {
-                        sw.SetSearchFilter(searchFilter, SearchMode.All, false, false);
-                        sw.m_HasSearchFilterFocus = true;
-                        sw.Repaint();
-                    }
-                }
-            }
+                SearchForReferencesToInstanceID(component.GetInstanceID());
         }
 
         [MenuItem("CONTEXT/Component/Properties...", false, 99999)]
diff --git a/Editor/Mono/SceneHierarchy.cs b/Editor/Mono/SceneHierarchy.cs
index 4a577b6840..ae07312a8a 100644
--- a/Editor/Mono/SceneHierarchy.cs
+++ b/Editor/Mono/SceneHierarchy.cs
@@ -463,14 +463,27 @@ void PlayModeStateChanged(PlayModeStateChange state)
 
         void OnSceneCreated(Scene scene, NewSceneSetup setup, NewSceneMode mode)
         {
+            ClearSearchSessionIfAny();
             ExpandTreeViewItem(scene.handle, true);
         }
 
         void OnSceneOpened(Scene scene, OpenSceneMode mode)
         {
+            ClearSearchSessionIfAny();
             ExpandTreeViewItem(scene.handle, true);
         }
 
+        void ClearSearchSessionIfAny()
+        {
+            var dataSource = treeView.data as GameObjectTreeViewDataSource;
+            if (dataSource != null && !string.IsNullOrEmpty(dataSource.searchString))
+            {
+                var oldSearch = dataSource.searchString;
+                dataSource.searchString = "";
+                dataSource.searchString = oldSearch;
+            }
+        }
+
         internal void ExpandTreeViewItem(int id, bool expand)
         {
             var dataSource = treeView.data as TreeViewDataSource;
@@ -1195,6 +1208,16 @@ void CreateGameObjectContextClick(GenericMenu menu, int contextClickedItemID)
             else
                 menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Select Children"));
 
+            menu.AddSeparator("");
+            if (Selection.activeGameObject)
+            {
+                menu.AddItem(EditorGUIUtility.TrTextContent("Find References in Scene"), false, FindReferenceInScene);
+            }
+            else
+            {
+                menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Find References in Scene"));
+            }
+
             menu.AddSeparator("");
 
             GameObject selectedObject = null;
@@ -1378,6 +1401,14 @@ void CreateGameObjectContextClick(GenericMenu menu, int contextClickedItemID)
             menu.ShowAsContext();
         }
 
+        private void FindReferenceInScene()
+        {
+            var selectedObject = Selection.activeObject;
+            if (!selectedObject)
+                return;
+            SearchableEditorWindow.SearchForReferencesToInstanceID(selectedObject.GetInstanceID());
+        }
+
         protected void AddCreateGameObjectItemsToSceneMenu(GenericMenu menu, Scene scene)
         {
             AddCreateGameObjectItemsToMenu(menu, Selection.transforms.Select(t => t.gameObject).ToArray(), false, false, true, scene.handle, MenuUtils.ContextMenuOrigin.Scene);
diff --git a/Editor/Mono/SceneManagement/EditorSceneManager.cs b/Editor/Mono/SceneManagement/EditorSceneManager.cs
index 8ca4e14cb7..0d5a95feb9 100644
--- a/Editor/Mono/SceneManagement/EditorSceneManager.cs
+++ b/Editor/Mono/SceneManagement/EditorSceneManager.cs
@@ -10,6 +10,7 @@ namespace UnityEditor.SceneManagement
 {
     public sealed partial class EditorSceneManager
     {
+        public delegate void SceneManagerSetupRestoredCallback(Scene[] scenes);
         public delegate void NewSceneCreatedCallback(Scene scene, NewSceneSetup setup, NewSceneMode mode);
         public delegate void SceneOpeningCallback(string path, OpenSceneMode mode);
         public delegate void SceneOpenedCallback(Scene scene, OpenSceneMode mode);
@@ -19,30 +20,41 @@ public sealed partial class EditorSceneManager
         public delegate void SceneSavedCallback(Scene scene);
         public delegate void SceneDirtiedCallback(Scene scene);
 
+        public static event SceneManagerSetupRestoredCallback sceneManagerSetupRestored
+        {
+            add => m_SceneManagerSetupRestoredEvent.Add(value);
+            remove => m_SceneManagerSetupRestoredEvent.Remove(value);
+        }
+        private static EventWithPerformanceTracker<SceneManagerSetupRestoredCallback> m_SceneManagerSetupRestoredEvent = new EventWithPerformanceTracker<SceneManagerSetupRestoredCallback>($"{nameof(EditorSceneManager)}.{nameof(sceneManagerSetupRestored)}");
+
         public static event NewSceneCreatedCallback newSceneCreated
         {
             add => m_NewSceneCreatedEvent.Add(value);
             remove => m_NewSceneCreatedEvent.Remove(value);
         }
         private static EventWithPerformanceTracker<NewSceneCreatedCallback> m_NewSceneCreatedEvent = new EventWithPerformanceTracker<NewSceneCreatedCallback>($"{nameof(EditorSceneManager)}.{nameof(newSceneCreated)}");
+
         public static event SceneOpeningCallback sceneOpening
         {
             add => m_SceneOpeningEvent.Add(value);
             remove => m_SceneOpeningEvent.Remove(value);
         }
         private static EventWithPerformanceTracker<SceneOpeningCallback> m_SceneOpeningEvent = new EventWithPerformanceTracker<SceneOpeningCallback>($"{nameof(EditorSceneManager)}.{nameof(sceneOpening)}");
+
         public static event SceneOpenedCallback sceneOpened
         {
             add => m_SceneOpenedEvent.Add(value);
             remove => m_SceneOpenedEvent.Remove(value);
         }
         private static EventWithPerformanceTracker<SceneOpenedCallback> m_SceneOpenedEvent = new EventWithPerformanceTracker<SceneOpenedCallback>($"{nameof(EditorSceneManager)}.{nameof(sceneOpened)}");
+
         public static event SceneClosingCallback sceneClosing
         {
             add => m_SceneClosingEvent.Add(value);
             remove => m_SceneClosingEvent.Remove(value);
         }
         private static EventWithPerformanceTracker<SceneClosingCallback> m_SceneClosingEvent = new EventWithPerformanceTracker<SceneClosingCallback>($"{nameof(EditorSceneManager)}.{nameof(sceneClosing)}");
+
         public static event SceneClosedCallback sceneClosed
         {
             add => m_SceneClosedEvent.Add(value);
@@ -68,6 +80,13 @@ public static event SceneDirtiedCallback sceneDirtied
         }
         private static EventWithPerformanceTracker<SceneDirtiedCallback> m_SceneDirtiedEvent = new EventWithPerformanceTracker<SceneDirtiedCallback>($"{nameof(EditorSceneManager)}.{nameof(sceneDirtied)}");
 
+        [RequiredByNativeCode]
+        private static void Internal_SceneManagerSetupRestored(Scene[] scenes)
+        {
+            foreach (var evt in m_SceneManagerSetupRestoredEvent)
+                evt(scenes);
+        }
+
         [RequiredByNativeCode]
         private static void Internal_NewSceneCreated(Scene scene, NewSceneSetup setup, NewSceneMode mode)
         {
diff --git a/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStage.cs b/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStage.cs
index 37c2909acb..94628f8326 100644
--- a/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStage.cs
+++ b/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStage.cs
@@ -47,6 +47,8 @@ static Styles()
             }
         }
 
+        internal static string s_PrefabInContextPreviewValuesTooltip = L10n.Tr("This property is previewing the overridden value on the Prefab instance.\n\nTo edit this property, open this Prefab Asset in isolation by pressing the modifier key [Alt] while you open it.");
+
         public enum Mode
         {
             InIsolation,
@@ -451,7 +453,23 @@ void SetPrefabInstanceHiddenForInContextEditing(bool hide)
                 StageUtility.SetPrefabInstanceHiddenForInContextEditing(m_OpenedFromInstanceRoot, hide);
         }
 
-        static List<Canvas> s_ReusableCanvasList = new List<Canvas>();
+        void UpdateSortableComponentsWithStagePriority(int stagePriority)
+        {
+            List<Renderer> rendererList = new List<Renderer>();
+            List<Canvas> canvasList = new List<Canvas>();
+
+            // Renderer components requires to know there is stage priority when entering context and isolation
+            // mode. If this is not shared, their sorting order will not be evaluated accordingly since they are not
+            // in the same layer.
+            m_PrefabContentsRoot.GetComponentsInChildren<Renderer>(true, rendererList);
+            m_PrefabContentsRoot.GetComponentsInChildren<Canvas>(true, canvasList);
+
+            foreach (Renderer renderer in rendererList)
+                renderer.stagePriority = (byte)stagePriority;
+
+            foreach (Canvas canvas in canvasList)
+                canvas.stagePriority = (byte)stagePriority;
+        }
 
         bool LoadStage()
         {
@@ -496,12 +514,15 @@ bool LoadStage()
             m_PrefabContentsRoot = PrefabStageUtility.LoadPrefabIntoPreviewScene(m_PrefabAssetPath, scene);
             if (m_PrefabContentsRoot != null)
             {
+                // Corresponds to which breadcrumb this is.
+                var stagePriority = StageNavigationManager.instance.stageHistory.IndexOf(this);
+
                 if (isUIPrefab)
                 {
-                    m_PrefabContentsRoot.GetComponentsInChildren<Canvas>(true, s_ReusableCanvasList);
+                    UpdateSortableComponentsWithStagePriority(stagePriority);
 
                     if (m_Mode == Mode.InIsolation && m_PrefabContentsRoot.transform.parent == null)
-                        PrefabStageUtility.HandleUIReparentingIfNeeded(m_PrefabContentsRoot, 0);
+                        PrefabStageUtility.HandleUIReparentingIfNeeded(m_PrefabContentsRoot, stagePriority);
                 }
 
                 m_PrefabFileIcon = DeterminePrefabFileIconFromInstanceRootGameObject();
@@ -540,6 +561,8 @@ bool LoadStage()
                             {
                                 dummyCanvas.sortingOrder = instanceCanvas.sortingOrder;
                                 dummyCanvas.referencePixelsPerUnit = instanceCanvas.referencePixelsPerUnit;
+                                dummyCanvas.stagePriority = (byte)stagePriority;
+                                dummyCanvas.sortingLayerID = instanceCanvas.sortingLayerID;
                             }
                         }
 
@@ -651,7 +674,7 @@ protected internal override void OnReturnToStage()
             }
         }
 
-        bool HasPatchedPropertyModificationsFor(UnityEngine.Object obj, string partialPropertyName)
+        internal bool HasPatchedPropertyModificationsFor(UnityEngine.Object obj, string partialPropertyName)
         {
             if (m_PatchedProperties == null)
                 return false;
@@ -1239,7 +1262,15 @@ void DetectPrefabFileIconChange()
         void DetectSceneDirtinessChange()
         {
             if (scene.dirtyID != m_LastSceneDirtyID)
+            {
+                // We want to make sure that all the new sortable components (e.g, canvas, renderer) being added have
+                // the correct StagePriority assigned to them. Otherwise they won't be sorted accordingly when in
+                // context/isolation mode.
+                if (PrefabStageUtility.IsUIPrefab(m_PrefabAssetPath))
+                    UpdateSortableComponentsWithStagePriority(StageNavigationManager.instance.stageHistory.IndexOf(this));
+
                 SceneView.RepaintAll();
+            }
             m_LastSceneDirtyID = scene.dirtyID;
         }
 
@@ -1916,7 +1947,8 @@ internal bool showOverrides
                     if (prefabStage != null)
                         prefabStage.RefreshPatchedProperties();
                 }
-                EditorApplication.RequestRepaintAllViews();
+
+                PropertyEditor.ClearAndRebuildAll();
             }
         }
 
@@ -1942,7 +1974,7 @@ void VisualizeOverridesToggle()
         void CachePrefabFolderInfo()
         {
             bool isRootFolder;
-            m_IsPrefabInValidAssetFolder = AssetDatabase.GetAssetFolderInfo(m_PrefabAssetPath, out isRootFolder, out m_IsPrefabInImmutableFolder);
+            m_IsPrefabInValidAssetFolder = AssetDatabase.TryGetAssetFolderInfo(m_PrefabAssetPath, out isRootFolder, out m_IsPrefabInImmutableFolder);
         }
 
         bool IsPrefabInImmutableFolder()
diff --git a/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStageUtility.cs b/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStageUtility.cs
index 0c76a3cf06..325835bd3d 100644
--- a/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStageUtility.cs
+++ b/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStageUtility.cs
@@ -235,7 +235,9 @@ internal static bool CheckIfAnyComponentShouldBlockPrefabModeInPlayMode(string p
 
             if (warnList.Count > 0)
             {
-                string blockingNames = string.Join(", ", warnList.Select(e => MonoScript.FromMonoBehaviour(e).name).ToArray());
+                string blockingNames = string.Join(", ", warnList.Select(e => MonoScript.FromMonoBehaviour(e).name).Distinct().ToArray());
+                if (blockingNames.Length > 1000)
+                    blockingNames = blockingNames.Substring(0, 1000) + "\n...";
                 return EditorUtility.DisplayDialog(
                     L10n.Tr("Risk of unwanted modifications"),
                     string.Format(
@@ -665,13 +667,14 @@ internal static GUIContent GetPrefabButtonContent(int instanceID)
         {
             GUIContent result;
             var defaultPrefabMode = PreferencesProvider.GetDefaultPrefabModeForHierarchy();
+            var modifierKey = Application.platform == RuntimePlatform.OSXEditor ? "Option" : "Alt";
             switch (defaultPrefabMode)
             {
                 case PrefabStage.Mode.InContext:
-                    result = new GUIContent("", null, $"Open Prefab Asset in context.\nPress modifier key [Alt] to open in isolation.");
+                    result = new GUIContent("", null, $"Open Prefab Asset in context.\nPress the {modifierKey} modifier key 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.");
+                    result = new GUIContent("", null, $"Open Prefab Asset in isolation.\nPress the {modifierKey} modifier key to open in context.");
                     break;
                 default:
                     result = new GUIContent("");
diff --git a/Editor/Mono/SceneManagement/StageManager/StageUtility.bindings.cs b/Editor/Mono/SceneManagement/StageManager/StageUtility.bindings.cs
index 3afb05e064..4d50daea01 100644
--- a/Editor/Mono/SceneManagement/StageManager/StageUtility.bindings.cs
+++ b/Editor/Mono/SceneManagement/StageManager/StageUtility.bindings.cs
@@ -61,5 +61,8 @@ public static partial class StageUtility
 
         [StaticAccessor("StageUtilityBindings", StaticAccessorType.DoubleColon)]
         extern private static void CallAwakeFromLoadOnSubHierarchyInternal([NotNull("NullExceptionObject")] GameObject prefabInstanceRoot);
+
+        [StaticAccessor("StageUtility", StaticAccessorType.DoubleColon)]
+        extern internal static bool IsGizmoCulledBySceneCullingMasksOrFocusedScene([NotNull] GameObject gameObject, [NotNull] Camera camera);
     }
 }
diff --git a/Editor/Mono/SceneModeWindows/DefaultLightingExplorerExtension.cs b/Editor/Mono/SceneModeWindows/DefaultLightingExplorerExtension.cs
index ca1dd05b43..3f1cfe4372 100644
--- a/Editor/Mono/SceneModeWindows/DefaultLightingExplorerExtension.cs
+++ b/Editor/Mono/SceneModeWindows/DefaultLightingExplorerExtension.cs
@@ -23,6 +23,7 @@ private static class Styles
             public static readonly GUIContent Shape = EditorGUIUtility.TrTextContent("Shape");
             public static readonly GUIContent Mode = EditorGUIUtility.TrTextContent("Mode");
             public static readonly GUIContent Color = EditorGUIUtility.TrTextContent("Color");
+            public static readonly GUIContent Range = EditorGUIUtility.TrTextContent("Range");
             public static readonly GUIContent Intensity = EditorGUIUtility.TrTextContent("Intensity");
             public static readonly GUIContent IndirectMultiplier = EditorGUIUtility.TrTextContent("Indirect Multiplier");
             public static readonly GUIContent ShadowType = EditorGUIUtility.TrTextContent("Shadows");
@@ -232,7 +233,7 @@ protected virtual  LightingExplorerTableColumn[] Get2DLightColumns()
                                 EditorGUI.LabelField(r, Styles.Mixed);
                         }
                     }), // 8: Target Sorting Layer
-                new LightingExplorerTableColumn(LightingExplorerTableColumn.DataType.Custom, Styles.ShadowIntensityEnabled, "m_ShadowIntensityEnabled", 50, (r, prop, dep) => // 9
+                new LightingExplorerTableColumn(LightingExplorerTableColumn.DataType.Custom, Styles.ShadowIntensityEnabled, "m_ShadowsEnabled", 50, (r, prop, dep) => // 9
                 {
                     if (prop != null)
                     {
@@ -340,7 +341,19 @@ protected virtual LightingExplorerTableColumn[] GetLightColumns()
                     }
                 }, null, null, new int[] { 2 }),     // 4: Mode
                 new LightingExplorerTableColumn(LightingExplorerTableColumn.DataType.Color, Styles.Color, "m_Color", 70), // 5: Color
-                new LightingExplorerTableColumn(LightingExplorerTableColumn.DataType.Float, Styles.Intensity, "m_Intensity", 60), // 6: Intensity
+                new LightingExplorerTableColumn(LightingExplorerTableColumn.DataType.Float, Styles.Range, "m_Range", 60, (r, prop, dep) => 
+                {
+                    var lightType = prop.serializedObject.FindProperty("m_Type");
+                    if (lightType != null)
+                    {
+                        bool directionalLight = lightType.enumValueIndex == (int)LightType.Directional;
+                        if (!directionalLight)
+                        {
+                            EditorGUI.PropertyField(r, prop, GUIContent.none);
+                        }
+                    }
+                }), // 6: Range
+                new LightingExplorerTableColumn(LightingExplorerTableColumn.DataType.Float, Styles.Intensity, "m_Intensity", 60), // 7: Intensity
                 new LightingExplorerTableColumn(LightingExplorerTableColumn.DataType.Float, Styles.IndirectMultiplier, "m_BounceIntensity", 110, (r, prop, dep) =>
                 {
                     bool realtimeLight = dep.Length > 1 && dep[0].intValue == (int)LightmapBakeType.Realtime;
@@ -349,7 +362,7 @@ protected virtual LightingExplorerTableColumn[] GetLightColumns()
                     {
                         EditorGUI.PropertyField(r, prop, GUIContent.none);
                     }
-                }, null, null, new int[] { 4 }), // 7: Indirect Multiplier
+                }, null, null, new int[] { 4 }), // 8: Indirect Multiplier
                 new LightingExplorerTableColumn(LightingExplorerTableColumn.DataType.Enum, Styles.ShadowType, "m_Shadows.m_Type", 100, (r, prop, dep) =>
                 {
                     bool areaLight = dep.Length > 1 && (dep[0].enumValueIndex == (int)LightType.Rectangle || dep[0].enumValueIndex == (int)LightType.Disc);
@@ -370,7 +383,7 @@ protected virtual LightingExplorerTableColumn[] GetLightColumns()
                     {
                         EditorGUI.PropertyField(r, prop, GUIContent.none);
                     }
-                }, null, null, new int[] { 2 }),     // 8: Shadow Type
+                }, null, null, new int[] { 2 }),     // 9: Shadow Type
             };
         }
 
diff --git a/Editor/Mono/SceneModeWindows/LightingExplorerExtensionAttribute.deprecated.cs b/Editor/Mono/SceneModeWindows/LightingExplorerExtensionAttribute.deprecated.cs
new file mode 100644
index 0000000000..19696e0623
--- /dev/null
+++ b/Editor/Mono/SceneModeWindows/LightingExplorerExtensionAttribute.deprecated.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 UnityEditor.Rendering;
+using UnityEngine.Rendering;
+
+namespace UnityEditor;
+
+[Obsolete($"{nameof(LightingExplorerExtensionAttribute)} is deprecated. Use {nameof(SupportedOnRenderPipelineAttribute)} instead. #from(23.1) (UnityUpgradable) -> UnityEngine.Rendering.SupportedOnRenderPipelineAttribute", false)]
+[AttributeUsage(AttributeTargets.Class)]
+public class LightingExplorerExtensionAttribute : ScriptableRenderPipelineExtensionAttribute
+{
+    public LightingExplorerExtensionAttribute(Type renderPipeline)
+        : base(renderPipeline) {}
+}
diff --git a/Editor/Mono/SceneModeWindows/LightingExplorerWindow.cs b/Editor/Mono/SceneModeWindows/LightingExplorerWindow.cs
index 8dbd8ca957..40ce468a99 100644
--- a/Editor/Mono/SceneModeWindows/LightingExplorerWindow.cs
+++ b/Editor/Mono/SceneModeWindows/LightingExplorerWindow.cs
@@ -13,12 +13,6 @@ namespace UnityEditor
     //Attribute that should be deprecated in 2020.1
     //Will be replaced by ScriptableRenderPipelineAttribute
     //Kept for package compatibility and user SRP compatibility at the moment
-    [AttributeUsage(AttributeTargets.Class)]
-    public class LightingExplorerExtensionAttribute : ScriptableRenderPipelineExtensionAttribute
-    {
-        public LightingExplorerExtensionAttribute(Type renderPipeline)
-            : base(renderPipeline) {}
-    }
 
     public interface ILightingExplorerExtension
     {
@@ -59,6 +53,12 @@ void OnEnable()
         }
 
         void OnDisable()
+        {
+            OnDisableTabsAndExtension();
+            EditorApplication.searchChanged -= Repaint;
+        }
+
+        void OnDisableTabsAndExtension()
         {
             if (m_TableTabs != null)
             {
@@ -72,8 +72,6 @@ void OnDisable()
             {
                 m_CurrentLightingExplorerExtension.OnDisable();
             }
-
-            EditorApplication.searchChanged -= Repaint;
         }
 
         void OnInspectorUpdate()
@@ -92,7 +90,7 @@ void OnSelectionChange()
                 {
                     if (i == (m_TableTabs.Length - 1)) // last tab containing materials
                     {
-                        int[] selectedIds = UnityEngine.Object.FindObjectsOfType<MeshRenderer>().Where((MeshRenderer mr) => {
+                        int[] selectedIds = UnityEngine.Object.FindObjectsByType<MeshRenderer>(UnityEngine.FindObjectsSortMode.InstanceID).Where((MeshRenderer mr) => {
                             return Selection.instanceIDs.Contains(mr.gameObject.GetInstanceID());
                         }).SelectMany(meshRenderer => meshRenderer.sharedMaterials).Where((Material m) => {
                                 return m != null && (m.globalIlluminationFlags & MaterialGlobalIlluminationFlags.AnyEmissive) != 0;
@@ -165,10 +163,7 @@ private void UpdateTabs()
             {
                 m_CurrentSRPType = SRPType;
 
-                if (m_CurrentLightingExplorerExtension != null)
-                {
-                    m_CurrentLightingExplorerExtension.OnDisable();
-                }
+                OnDisableTabsAndExtension();
 
                 m_CurrentLightingExplorerExtension = GetLightExplorerExtension(SRPType);
                 m_CurrentLightingExplorerExtension.OnEnable();
@@ -185,29 +180,23 @@ private void UpdateTabs()
             }
         }
 
-        private ILightingExplorerExtension GetDefaultLightingExplorerExtension()
+        ILightingExplorerExtension GetDefaultLightingExplorerExtension()
         {
-            if (s_DefaultLightingExplorerExtension == null)
-            {
-                s_DefaultLightingExplorerExtension = new DefaultLightingExplorerExtension();
-            }
-            return s_DefaultLightingExplorerExtension;
+            return s_DefaultLightingExplorerExtension ??= new DefaultLightingExplorerExtension();
         }
 
-        private ILightingExplorerExtension GetLightExplorerExtension(System.Type currentSRPType)
+        ILightingExplorerExtension GetLightExplorerExtension(Type currentSRPType)
         {
             if (currentSRPType == null)
                 return GetDefaultLightingExplorerExtension();
 
-            Type extensionType = RenderPipelineEditorUtility.FetchFirstCompatibleTypeUsingScriptableRenderPipelineExtension<ILightingExplorerExtension>();
-            if (extensionType != null)
-            {
-                ILightingExplorerExtension extension = (ILightingExplorerExtension)System.Activator.CreateInstance(extensionType);
-                return extension;
-            }
+            var extensionType = RenderPipelineEditorUtility.GetDerivedTypesSupportedOnCurrentPipeline<ILightingExplorerExtension>().FirstOrDefault();
+            if (extensionType == null)
+                return GetDefaultLightingExplorerExtension();
 
+            var extension = (ILightingExplorerExtension) Activator.CreateInstance(extensionType);
+            return extension;
             // no light explorer extension found for current srp, return the default one
-            return GetDefaultLightingExplorerExtension();
         }
     }
 }
diff --git a/Editor/Mono/SceneModeWindows/LightingWindow.cs b/Editor/Mono/SceneModeWindows/LightingWindow.cs
index 31a207d042..7965c357a6 100644
--- a/Editor/Mono/SceneModeWindows/LightingWindow.cs
+++ b/Editor/Mono/SceneModeWindows/LightingWindow.cs
@@ -63,7 +63,7 @@ enum Mode
             BakedLightmaps
         }
 
-        const string kGlobalIlluminationUnityManualPage = "file:///unity/Manual/GlobalIllumination.html";
+        const string kGlobalIlluminationUnityManualPage = "https://docs.unity3d.com/Manual/lighting-window.html";
 
         int m_SelectedModeIndex = 0;
         List<Mode> m_Modes = null;
@@ -124,6 +124,18 @@ internal void SetSelectedTabIndex(int index)
             }
         }
 
+        // Repaint when MRays/sec changes
+        float m_LastRepaintedMraysPerSec;
+        protected void Update()
+        {
+            float totalNow = Lightmapping.GetLightmapBakePerformanceTotal();
+            if (Math.Abs(totalNow - m_LastRepaintedMraysPerSec) < s_MraysPerSecRepaintThreshold)
+                return;
+
+            m_LastRepaintedMraysPerSec = totalNow;
+            Repaint();
+        }
+
         void OnEnable()
         {
             s_Window = this;
@@ -428,19 +440,6 @@ void BakeDropDownCallback(object data)
             }
         }
 
-        private bool IsPackageUsed(string packageName)
-        {
-            PackageManager.PackageInfo[] allInfo = PackageManager.PackageInfo.GetAllRegisteredPackages();
-            foreach (PackageManager.PackageInfo info in allInfo)
-            {
-                if (info.name == packageName)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
         void Buttons(Mode selectedMode)
         {
             using (new EditorGUI.DisabledScope(EditorApplication.isPlayingOrWillChangePlaymode))
@@ -450,42 +449,39 @@ void Buttons(Mode selectedMode)
                     EditorGUILayout.HelpBox(Lightmapping.lightingDataAsset.validityErrorMessage, MessageType.Warning);
                 }
 
-                bool entitiesPackage = IsPackageUsed("com.unity.entities");
+                bool isEntitiesPackageUsed = PackageManager.PackageInfo.IsPackageRegistered("com.unity.entities");
+                bool iterativeInLightingSettings = (m_WorkflowMode.intValue == (int)Lightmapping.GIWorkflowMode.Iterative);
 
-                if (entitiesPackage)
-                    EditorGUILayout.HelpBox("Auto Generate mode is unavailable when the Entities package is installed. When you generate lighting in a project where you have installed the Entities package, the Unity Editor opens all loaded subscenes. This may slow down Editor performance.", MessageType.Warning);
+                if (isEntitiesPackageUsed && iterativeInLightingSettings)
+                    EditorGUILayout.HelpBox("Unity ignores Auto Generate mode when the Entities package is installed. When you generate lighting in a project where you have installed the Entities package, the Unity Editor opens all loaded subscenes. This may slow down Editor performance.", MessageType.Warning);
 
                 EditorGUILayout.Space();
                 GUILayout.BeginHorizontal();
                 GUILayout.FlexibleSpace();
 
-                bool iterative = (m_WorkflowMode.intValue == (int)Lightmapping.GIWorkflowMode.Iterative);
-
                 Rect rect = GUILayoutUtility.GetRect(Styles.continuousBakeLabel, GUIStyle.none);
 
                 EditorGUI.BeginProperty(rect, Styles.continuousBakeLabel, m_WorkflowMode);
 
                 // Auto Generate checkbox.
                 EditorGUI.BeginChangeCheck();
-                using (new EditorGUI.DisabledScope(m_LightingSettingsReadOnlyMode || entitiesPackage))
+                using (new EditorGUI.DisabledScope(m_LightingSettingsReadOnlyMode))
                 {
-                    if (entitiesPackage)
-                        iterative = false;
-
-                    iterative = GUILayout.Toggle(iterative, Styles.continuousBakeLabel);
+                    iterativeInLightingSettings = GUILayout.Toggle(iterativeInLightingSettings, Styles.continuousBakeLabel);
                 }
 
                 if (EditorGUI.EndChangeCheck())
                 {
-                    m_WorkflowMode.intValue = (int)(iterative ? Lightmapping.GIWorkflowMode.Iterative : Lightmapping.GIWorkflowMode.OnDemand);
+                    m_WorkflowMode.intValue = (int)(iterativeInLightingSettings ? Lightmapping.GIWorkflowMode.Iterative : Lightmapping.GIWorkflowMode.OnDemand);
                 }
 
                 EditorGUI.EndProperty();
 
-                using (new EditorGUI.DisabledScope(iterative))
+                bool resultingIterative = iterativeInLightingSettings && !isEntitiesPackageUsed;
+                using (new EditorGUI.DisabledScope(resultingIterative))
                 {
                     // Bake button if we are not currently baking
-                    bool showBakeButton = iterative || !Lightmapping.isRunning;
+                    bool showBakeButton = resultingIterative || !Lightmapping.isRunning;
                     if (showBakeButton)
                     {
                         var customTab = m_Tabs[selectedMode] as LightingWindowTab;
@@ -504,11 +500,6 @@ void Buttons(Mode selectedMode)
                     else
                     {
                         var settings = Lightmapping.GetLightingSettingsOrDefaultsFallback();
-                        // Only show Force Stop when using the PathTracer backend
-                        if (settings.bakedGI && GUILayout.Button("Force Stop", GUILayout.Width(Styles.ButtonWidth)))
-                        {
-                            Lightmapping.ForceStop();
-                        }
                         if (GUILayout.Button("Cancel", GUILayout.Width(Styles.ButtonWidth)))
                         {
                             Lightmapping.Cancel();
@@ -539,143 +530,187 @@ private void DoBakeReflectionProbes()
 
         internal static void Summary()
         {
-            long totalMemorySize = 0;
-            int lightmapCount = 0;
-            Dictionary<Vector2, int> sizes = new Dictionary<Vector2, int>();
-            bool directionalLightmapsMode = false;
-            bool shadowmaskMode = false;
-            foreach (LightmapData ld in LightmapSettings.lightmaps)
-            {
-                if (ld.lightmapColor == null)
-                    continue;
-                lightmapCount++;
+            bool autoGenerate = Lightmapping.GetLightingSettingsOrDefaultsFallback().autoGenerate;
 
-                Vector2 texSize = new Vector2(ld.lightmapColor.width, ld.lightmapColor.height);
-                if (sizes.ContainsKey(texSize))
-                    sizes[texSize]++;
-                else
-                    sizes.Add(texSize, 1);
-
-                totalMemorySize += TextureUtil.GetStorageMemorySizeLong(ld.lightmapColor);
-                if (ld.lightmapDir)
+            // Show the number of lightmaps:
+            {
+                int lightmapCount = 0;
+                long totalMemorySize = 0;
+                StringBuilder sizesString = new();
+                var sizes = new Dictionary<LightmapSize, int>();
+                if (!autoGenerate && Lightmapping.isRunning) // These are the lightmaps that will be baked or is being baked.
                 {
-                    totalMemorySize += TextureUtil.GetStorageMemorySizeLong(ld.lightmapDir);
-                    directionalLightmapsMode = true;
+                    RunningBakeInfo info = Lightmapping.GetRunningBakeInfo();
+                    lightmapCount = info.lightmapSizes.Length;
+                    var probesCount = info.probePositions;
+                    string lightmapsPlural = lightmapCount != 1 ? "s" : string.Empty;
+                    string probesPlural = probesCount != 1 ? "s" : string.Empty;
+                    string probesString = probesCount != 0 ? $"{probesCount} probe{probesPlural} and " : string.Empty;
+                    sizesString.Append($"Baking {probesString}{lightmapCount} lightmap{lightmapsPlural}");
+
+                    foreach (var ld in info.lightmapSizes)
+                        if (sizes.ContainsKey(ld))
+                            sizes[ld]++;
+                        else
+                            sizes.Add(ld, 1);
                 }
-                if (ld.shadowMask)
+                else // These are the lightmaps that were baked last.
                 {
-                    totalMemorySize += TextureUtil.GetStorageMemorySizeLong(ld.shadowMask);
-                    shadowmaskMode = true;
+                    bool shadowmaskMode = false;
+                    foreach (LightmapData ld in LightmapSettings.lightmaps)
+                    {
+                        if (ld.lightmapColor == null)
+                            continue;
+                        lightmapCount++;
+
+                        LightmapSize ls = new() { width = ld.lightmapColor.width, height = ld.lightmapColor.height};
+                        if (sizes.ContainsKey(ls))
+                            sizes[ls]++;
+                        else
+                            sizes.Add(ls, 1);
+
+                        totalMemorySize += TextureUtil.GetStorageMemorySizeLong(ld.lightmapColor);
+                        if (ld.lightmapDir)
+                            totalMemorySize += TextureUtil.GetStorageMemorySizeLong(ld.lightmapDir);
+
+                        if (ld.shadowMask)
+                        {
+                            totalMemorySize += TextureUtil.GetStorageMemorySizeLong(ld.shadowMask);
+                            shadowmaskMode = true;
+                        }
+                    }
+
+                    sizesString.Append(lightmapCount);
+                    sizesString.Append(" lightmap");
+                    if (lightmapCount != 1) sizesString.Append("s");
+                    if (shadowmaskMode)
+                    {
+                        sizesString.Append(" with Shadowmask");
+                        if (lightmapCount != 1) sizesString.Append("s");
+                    }
                 }
-            }
-            StringBuilder sizesString = new StringBuilder();
-            sizesString.Append(lightmapCount);
-            sizesString.Append((directionalLightmapsMode ? " Directional" : " Non-Directional"));
-            sizesString.Append(" Lightmap");
-            if (lightmapCount != 1) sizesString.Append("s");
-            if (shadowmaskMode)
-            {
-                sizesString.Append(" with Shadowmask");
-                if (lightmapCount != 1) sizesString.Append("s");
-            }
 
-            bool first = true;
-            foreach (var s in sizes)
-            {
-                sizesString.Append(first ? ": " : ", ");
-                first = false;
-                if (s.Value > 1)
+                bool first = true;
+                foreach (KeyValuePair<LightmapSize, int> s in sizes)
                 {
-                    sizesString.Append(s.Value);
+                    sizesString.Append(first ? ": " : ", ");
+                    first = false;
+                    if (s.Value > 1)
+                    {
+                        sizesString.Append(s.Value);
+                        sizesString.Append("x");
+                    }
+
+                    sizesString.Append(s.Key.width.ToString(CultureInfo.InvariantCulture.NumberFormat));
                     sizesString.Append("x");
+                    sizesString.Append(s.Key.height.ToString(CultureInfo.InvariantCulture.NumberFormat));
+                    sizesString.Append("px");
                 }
-                sizesString.Append(s.Key.x.ToString(CultureInfo.InvariantCulture.NumberFormat));
-                sizesString.Append("x");
-                sizesString.Append(s.Key.y.ToString(CultureInfo.InvariantCulture.NumberFormat));
-                sizesString.Append("px");
-            }
-            sizesString.Append(" ");
 
-            GUILayout.BeginHorizontal();
+                sizesString.Append(" ");
 
-            GUILayout.BeginVertical();
-            GUILayout.Label(sizesString.ToString(), Styles.labelStyle);
-            GUILayout.EndVertical();
+                GUILayout.BeginHorizontal();
 
-            GUILayout.BeginVertical();
-            GUILayout.Label(EditorUtility.FormatBytes(totalMemorySize), Styles.labelStyle);
-            GUILayout.Label((lightmapCount == 0 ? "No Lightmaps" : ""), Styles.labelStyle);
-            GUILayout.EndVertical();
+                GUILayout.BeginVertical();
+                GUILayout.Label(sizesString.ToString(), Styles.labelStyle);
+                GUILayout.EndVertical();
 
-            GUILayout.EndHorizontal();
+                if (totalMemorySize != 0)
+                {
+                    GUILayout.BeginVertical();
+                    GUILayout.Label(EditorUtility.FormatBytes(totalMemorySize), Styles.labelStyle);
+                    GUILayout.Label((lightmapCount == 0 ? "No Lightmaps" : ""), Styles.labelStyle);
+                    GUILayout.EndVertical();
+                }
+
+                GUILayout.EndHorizontal();
+            }
 
             GUILayout.BeginVertical();
-            GUILayout.Label("Occupied Texels: " + InternalEditorUtility.CountToString(Lightmapping.occupiedTexelCount), Styles.labelStyle);
-            if (Lightmapping.isRunning)
+            if (autoGenerate)
             {
-                int numLightmapsInView = 0;
-                int numConvergedLightmapsInView = 0;
-                int numNotConvergedLightmapsInView = 0;
+                GUILayout.Label("Occupied Texels: " + InternalEditorUtility.CountToString(Lightmapping.occupiedTexelCount), Styles.labelStyle);
+                if (Lightmapping.isRunning)
+                {
+                    int numLightmapsInView = 0;
+                    int numConvergedLightmapsInView = 0;
+                    int numNotConvergedLightmapsInView = 0;
 
-                int numLightmapsNotInView = 0;
-                int numConvergedLightmapsNotInView = 0;
-                int numNotConvergedLightmapsNotInView = 0;
+                    int numLightmapsNotInView = 0;
+                    int numConvergedLightmapsNotInView = 0;
+                    int numNotConvergedLightmapsNotInView = 0;
 
-                int numInvalidConvergenceLightmaps = 0;
-                int numLightmaps = LightmapSettings.lightmaps.Length;
-                for (int i = 0; i < numLightmaps; ++i)
-                {
-                    LightmapConvergence lc = Lightmapping.GetLightmapConvergence(i);
-                    if (!lc.IsValid())
+                    int numInvalidConvergenceLightmaps = 0;
+                    int numLightmaps = LightmapSettings.lightmaps.Length;
+                    for (int i = 0; i < numLightmaps; ++i)
                     {
-                        numInvalidConvergenceLightmaps++;
-                        continue;
-                    }
+                        LightmapConvergence lc = Lightmapping.GetLightmapConvergence(i);
+                        if (!lc.IsValid())
+                        {
+                            numInvalidConvergenceLightmaps++;
+                            continue;
+                        }
 
-                    if (Lightmapping.GetVisibleTexelCount(i) > 0)
-                    {
-                        numLightmapsInView++;
-                        if (lc.IsConverged())
-                            numConvergedLightmapsInView++;
+                        if (Lightmapping.GetVisibleTexelCount(i) > 0)
+                        {
+                            numLightmapsInView++;
+                            if (lc.IsConverged())
+                                numConvergedLightmapsInView++;
+                            else
+                                numNotConvergedLightmapsInView++;
+                        }
                         else
-                            numNotConvergedLightmapsInView++;
+                        {
+                            numLightmapsNotInView++;
+                            if (lc.IsConverged())
+                                numConvergedLightmapsNotInView++;
+                            else
+                                numNotConvergedLightmapsNotInView++;
+                        }
                     }
-                    else
+                    if (Lightmapping.atlasCount > 0)
                     {
-                        numLightmapsNotInView++;
-                        if (lc.IsConverged())
-                            numConvergedLightmapsNotInView++;
-                        else
-                            numNotConvergedLightmapsNotInView++;
+                        int convergedMaps = numConvergedLightmapsInView + numConvergedLightmapsNotInView;
+                        GUILayout.Label("Lightmap convergence: (" + convergedMaps + "/" + Lightmapping.atlasCount + ")", Styles.labelStyle);
                     }
+                    EditorGUILayout.LabelField("Lightmaps in view: " + numLightmapsInView, Styles.labelStyle);
+                    EditorGUI.indentLevel += 1;
+                    EditorGUILayout.LabelField("Converged: " + numConvergedLightmapsInView, Styles.labelStyle);
+                    EditorGUILayout.LabelField("Not Converged: " + numNotConvergedLightmapsInView, Styles.labelStyle);
+                    EditorGUI.indentLevel -= 1;
+                    EditorGUILayout.LabelField("Lightmaps not in view: " + numLightmapsNotInView, Styles.labelStyle);
+                    EditorGUI.indentLevel += 1;
+                    EditorGUILayout.LabelField("Converged: " + numConvergedLightmapsNotInView, Styles.labelStyle);
+                    EditorGUILayout.LabelField("Not Converged: " + numNotConvergedLightmapsNotInView, Styles.labelStyle);
+                    EditorGUI.indentLevel -= 1;
+
+                    LightProbesConvergence lpc = Lightmapping.GetLightProbesConvergence();
+                    if (lpc.IsValid() && lpc.probeSetCount > 0)
+                        GUILayout.Label("Light Probes convergence: (" + lpc.convergedProbeSetCount + "/" + lpc.probeSetCount + ")", Styles.labelStyle);
                 }
-                if (Lightmapping.atlasCount > 0)
+                float bakeTime = Lightmapping.GetLightmapBakeTimeTotal();
+            }
+
+            // We show baking device and performance even when not baking, so the user can see the information after a long bake:
+            {
+                string deviceName = Lightmapping.GetLightmapBakeGPUDeviceName();
+                if (deviceName.Length > 0)
+                    GUILayout.Label("Baking device: " + deviceName, Styles.labelStyle);
+
+                float mraysPerSec = Lightmapping.GetLightmapBakePerformanceTotal();
                 {
-                    int convergedMaps = numConvergedLightmapsInView + numConvergedLightmapsNotInView;
-                    GUILayout.Label("Lightmap convergence: (" + convergedMaps + "/" + Lightmapping.atlasCount + ")", Styles.labelStyle);
+                    string text;
+                    if (mraysPerSec >= 0.0)
+                        text = @$"Bake Performance: {mraysPerSec.ToString("0.00", CultureInfo.InvariantCulture.NumberFormat)} mrays/sec";
+                    else
+                        text = "";
+                    GUILayout.Label(text, Styles.labelStyle);
                 }
-                EditorGUILayout.LabelField("Lightmaps in view: " + numLightmapsInView, Styles.labelStyle);
-                EditorGUI.indentLevel += 1;
-                EditorGUILayout.LabelField("Converged: " + numConvergedLightmapsInView, Styles.labelStyle);
-                EditorGUILayout.LabelField("Not Converged: " + numNotConvergedLightmapsInView, Styles.labelStyle);
-                EditorGUI.indentLevel -= 1;
-                EditorGUILayout.LabelField("Lightmaps not in view: " + numLightmapsNotInView, Styles.labelStyle);
-                EditorGUI.indentLevel += 1;
-                EditorGUILayout.LabelField("Converged: " + numConvergedLightmapsNotInView, Styles.labelStyle);
-                EditorGUILayout.LabelField("Not Converged: " + numNotConvergedLightmapsNotInView, Styles.labelStyle);
-                EditorGUI.indentLevel -= 1;
-
-                LightProbesConvergence lpc = Lightmapping.GetLightProbesConvergence();
-                if (lpc.IsValid() && lpc.probeSetCount > 0)
-                    GUILayout.Label("Light Probes convergence: (" + lpc.convergedProbeSetCount + "/" + lpc.probeSetCount + ")", Styles.labelStyle);
             }
-            float bakeTime = Lightmapping.GetLightmapBakeTimeTotal();
-            float mraysPerSec = Lightmapping.GetLightmapBakePerformanceTotal();
-            if (mraysPerSec >= 0.0)
-                GUILayout.Label("Bake Performance: " + mraysPerSec.ToString("0.00", CultureInfo.InvariantCulture.NumberFormat) + " mrays/sec", Styles.labelStyle);
+
             if (!Lightmapping.isRunning)
             {
-                float bakeTimeRaw = Lightmapping.GetLightmapBakeTimeRaw();
+                float bakeTime = Lightmapping.GetLightmapBakeTimeTotal();
                 if (bakeTime >= 0.0)
                 {
                     int time = (int)bakeTime;
@@ -684,37 +719,19 @@ internal static void Summary()
                     int timeM = time / 60;
                     time -= 60 * timeM;
                     int timeS = time;
+                    int decimalPart = (int)(bakeTime % 1 * 100);
 
-                    int timeRaw = (int)bakeTimeRaw;
-                    int timeRawH = timeRaw / 3600;
-                    timeRaw -= 3600 * timeRawH;
-                    int timeRawM = timeRaw / 60;
-                    timeRaw -= 60 * timeRawM;
-                    int timeRawS = timeRaw;
-
-                    int oHeadTime = Math.Max(0, (int)(bakeTime - bakeTimeRaw));
-                    int oHeadTimeH = oHeadTime / 3600;
-                    oHeadTime -= 3600 * oHeadTimeH;
-                    int oHeadTimeM = oHeadTime / 60;
-                    oHeadTime -= 60 * oHeadTimeM;
-                    int oHeadTimeS = oHeadTime;
-
-
-                    GUILayout.Label("Total Bake Time: " + timeH.ToString("0") + ":" + timeM.ToString("00") + ":" + timeS.ToString("00"), Styles.labelStyle);
-                    if (Unsupported.IsDeveloperBuild())
-                        GUILayout.Label("(Raw Bake Time: " + timeRawH.ToString("0") + ":" + timeRawM.ToString("00") + ":" + timeRawS.ToString("00") + ", Overhead: " + oHeadTimeH.ToString("0") + ":" + oHeadTimeM.ToString("00") + ":" + oHeadTimeS.ToString("00") + ")", Styles.labelStyle);
+                    GUILayout.Label($"Total Bake Time: {timeH:00}:{timeM:00}:{timeS:00}.{decimalPart:00}", Styles.labelStyle);
                 }
             }
-            string deviceName = Lightmapping.GetLightmapBakeGPUDeviceName();
-            if (deviceName.Length > 0)
-                GUILayout.Label("Baking device: " + deviceName, Styles.labelStyle);
             GUILayout.EndVertical();
         }
 
         internal static LightingWindow s_Window;
+        private static readonly double s_MraysPerSecRepaintThreshold = 0.01;
         internal static bool isShown => s_Window && !s_Window.docked;
 
-        [MenuItem("Window/Rendering/Lighting", false, 1)]
+        [MenuItem("Window/Rendering/Lighting %9", false, 1)]
         internal static void CreateLightingWindow()
         {
             LightingWindow window = EditorWindow.GetWindow<LightingWindow>();
diff --git a/Editor/Mono/SceneModeWindows/LightingWindowEnvironmentTab.cs b/Editor/Mono/SceneModeWindows/LightingWindowEnvironmentTab.cs
index c679494dca..a4426b2487 100644
--- a/Editor/Mono/SceneModeWindows/LightingWindowEnvironmentTab.cs
+++ b/Editor/Mono/SceneModeWindows/LightingWindowEnvironmentTab.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Linq;
 using Object = UnityEngine.Object;
 using UnityEngine;
 using UnityEngine.Rendering;
@@ -79,7 +80,7 @@ LightingWindowEnvironmentSection environmentEditor
         {
             get
             {
-                var currentSRP = GraphicsSettings.currentRenderPipeline?.GetType();
+                var currentSRP = GraphicsSettings.currentRenderPipelineAssetType;
                 if (m_EnvironmentSection != null && m_SRP != currentSRP)
                 {
                     m_SRP = currentSRP;
@@ -89,9 +90,7 @@ LightingWindowEnvironmentSection environmentEditor
 
                 if (m_EnvironmentSection == null)
                 {
-                    Type extensionType = RenderPipelineEditorUtility.FetchFirstCompatibleTypeUsingScriptableRenderPipelineExtension<LightingWindowEnvironmentSection>();
-                    if (extensionType == null)
-                        extensionType = typeof(DefaultEnvironmentSectionExtension);
+                    var extensionType = RenderPipelineEditorUtility.GetDerivedTypesSupportedOnCurrentPipeline<LightingWindowEnvironmentSection>().FirstOrDefault() ?? typeof(DefaultEnvironmentSectionExtension);
                     LightingWindowEnvironmentSection extension = (LightingWindowEnvironmentSection)Activator.CreateInstance(extensionType);
                     m_EnvironmentSection = extension;
                     m_EnvironmentSection.OnEnable();
@@ -129,7 +128,7 @@ Editor otherRenderingEditor
 
         public void OnEnable()
         {
-            m_SRP = GraphicsSettings.currentRenderPipeline?.GetType();
+            m_SRP = GraphicsSettings.currentRenderPipelineAssetType;
             m_ShowOtherSettings = new SavedBool($"LightingWindow.ShowOtherSettings", true);
         }
 
diff --git a/Editor/Mono/SceneModeWindows/LightingWindowLightingTab.cs b/Editor/Mono/SceneModeWindows/LightingWindowLightingTab.cs
index 1f001c3b91..f8bc2140d9 100644
--- a/Editor/Mono/SceneModeWindows/LightingWindowLightingTab.cs
+++ b/Editor/Mono/SceneModeWindows/LightingWindowLightingTab.cs
@@ -32,6 +32,7 @@ class Styles
             public static readonly GUIContent displayOcclusion = EditorGUIUtility.TrTextContent("Display Occlusion");
             public static readonly GUIContent highlightInvalidCells = EditorGUIUtility.TrTextContent("Highlight Invalid Cells", "Highlight the invalid cells that cannot be used for probe interpolation.");
             public static readonly GUIContent progressiveGPUBakingDevice = EditorGUIUtility.TrTextContent("GPU Baking Device", "Will list all available GPU devices.");
+            public static readonly GUIContent gpuBakingProfile = EditorGUIUtility.TrTextContent("GPU Baking Profile", "The profile chosen for trading off between performance and memory usage when baking using the GPU.");
             public static readonly GUIContent progressiveGPUChangeWarning = EditorGUIUtility.TrTextContent("Changing the compute device used by the Progressive GPU Lightmapper requires the editor to be relaunched. Do you want to change device and restart?");
             public static readonly GUIContent concurrentJobs = EditorGUIUtility.TrTextContent("Concurrent Jobs", "The amount of simultaneously scheduled jobs.");
             public static readonly GUIContent progressiveGPUUnknownDeviceInfo = EditorGUIUtility.TrTextContent("No devices found. Please start an initial bake to make this information available.");
@@ -50,13 +51,26 @@ class Styles
                 EditorGUIUtility.TrTextContent("Low"),
                 EditorGUIUtility.TrTextContent("High")
             };
+
+            // Keep in sync with BakingProfile.h::BakingProfile
+            public static readonly int bakingProfileDefault = 2;
+            public static readonly int[] bakingProfileValues = {0, 1, 2, 3, 4};
+            public static readonly GUIContent[] bakingProfileStrings =
+            {
+                EditorGUIUtility.TrTextContent("Highest Performance"),
+                EditorGUIUtility.TrTextContent("High Performance"),
+                EditorGUIUtility.TrTextContent("Automatic"),
+                EditorGUIUtility.TrTextContent("Low Memory Usage"),
+                EditorGUIUtility.TrTextContent("Lowest Memory Usage"),
+            };
         }
 
         SavedBool m_ShowLightingSettings;
         SavedBool m_ShowWorkflowSettings;
         SavedBool m_ShowProbeDebugSettings;
         Vector2 m_ScrollPosition = Vector2.zero;
-        string m_LightmappingDeviceIndex = "lightmappingDeviceIndex";
+        string m_LightmappingDeviceIndexKey = "lightmappingDeviceIndex";
+        string m_BakingProfileKey = "lightmappingBakingProfile";
         LightingWindowBakeSettings m_BakeSettings;
 
         SerializedObject m_LightmapSettings;
@@ -179,7 +193,7 @@ void WorkflowSettingsGUI()
                         GUIContent[] lightmappingDeviceStrings = devicesAndPlatforms.Select(x => new GUIContent(x.name)).ToArray();
 
                         int bakingDeviceAndPlatform = -1;
-                        string configDeviceAndPlatform = EditorUserSettings.GetConfigValue(m_LightmappingDeviceIndex);
+                        string configDeviceAndPlatform = EditorUserSettings.GetConfigValue(m_LightmappingDeviceIndexKey);
                         if (configDeviceAndPlatform != null)
                         {
                             bakingDeviceAndPlatform = Int32.Parse(configDeviceAndPlatform);
@@ -199,7 +213,7 @@ void WorkflowSettingsGUI()
                         {
                             if (EditorUtility.DisplayDialog("Warning", Styles.progressiveGPUChangeWarning.text, "OK", "Cancel"))
                             {
-                                EditorUserSettings.SetConfigValue(m_LightmappingDeviceIndex, bakingDeviceAndPlatform.ToString());
+                                EditorUserSettings.SetConfigValue(m_LightmappingDeviceIndexKey, bakingDeviceAndPlatform.ToString());
                                 DeviceAndPlatform selectedDeviceAndPlatform = devicesAndPlatforms[bakingDeviceAndPlatform];
                                 EditorApplication.CloseAndRelaunch(new string[] { "-OpenCL-PlatformAndDeviceIndices", selectedDeviceAndPlatform.platformId.ToString(), selectedDeviceAndPlatform.deviceId.ToString() });
                             }
@@ -215,23 +229,42 @@ void WorkflowSettingsGUI()
 
                         EditorGUILayout.HelpBox(Styles.progressiveGPUUnknownDeviceInfo.text, MessageType.Info);
                     }
+
+                    // Handle the baking profile setting
+                    int bakingProfile = Styles.bakingProfileDefault;
+                    string bakingProfileString = EditorUserSettings.GetConfigValue(m_BakingProfileKey);
+                    if (bakingProfileString != null)
+                    {
+                        if (Int32.TryParse(bakingProfileString, out int bakingProfileStoredValue))
+                        {
+                            const Int32 maxBakingProfile = 4; // Keep in sync with kMaxBakingProfile (C++).
+                            if (bakingProfileStoredValue >= 0 && bakingProfileStoredValue <= maxBakingProfile)
+                                bakingProfile = bakingProfileStoredValue;
+                        }
+                    }
+                    bakingProfile = EditorGUILayout.IntPopup(Styles.gpuBakingProfile, bakingProfile, Styles.bakingProfileStrings, Styles.bakingProfileValues);
+                    EditorUserSettings.SetConfigValue(m_BakingProfileKey, bakingProfile.ToString());
                 }
 
-                m_ShowProbeDebugSettings.value = EditorGUILayout.Foldout(m_ShowProbeDebugSettings.value, Styles.lightProbeVisualization, true);
 
-                if (m_ShowProbeDebugSettings.value)
+                if (!UnityEngine.Rendering.SupportedRenderingFeatures.active.overridesLightProbeSystem)
                 {
-                    EditorGUI.BeginChangeCheck();
+                    m_ShowProbeDebugSettings.value = EditorGUILayout.Foldout(m_ShowProbeDebugSettings.value, Styles.lightProbeVisualization, true);
+
+                    if (m_ShowProbeDebugSettings.value)
+                    {
+                        EditorGUI.BeginChangeCheck();
 
-                    EditorGUI.indentLevel++;
-                    LightProbeVisualization.lightProbeVisualizationMode = (LightProbeVisualization.LightProbeVisualizationMode)EditorGUILayout.EnumPopup(LightProbeVisualization.lightProbeVisualizationMode);
-                    LightProbeVisualization.showInterpolationWeights = EditorGUILayout.Toggle(Styles.displayWeights, LightProbeVisualization.showInterpolationWeights);
-                    LightProbeVisualization.showOcclusions = EditorGUILayout.Toggle(Styles.displayOcclusion, LightProbeVisualization.showOcclusions);
-                    LightProbeVisualization.highlightInvalidCells = EditorGUILayout.Toggle(Styles.highlightInvalidCells, LightProbeVisualization.highlightInvalidCells);
-                    EditorGUI.indentLevel--;
+                        EditorGUI.indentLevel++;
+                        LightProbeVisualization.lightProbeVisualizationMode = (LightProbeVisualization.LightProbeVisualizationMode)EditorGUILayout.EnumPopup(LightProbeVisualization.lightProbeVisualizationMode);
+                        LightProbeVisualization.showInterpolationWeights = EditorGUILayout.Toggle(Styles.displayWeights, LightProbeVisualization.showInterpolationWeights);
+                        LightProbeVisualization.showOcclusions = EditorGUILayout.Toggle(Styles.displayOcclusion, LightProbeVisualization.showOcclusions);
+                        LightProbeVisualization.highlightInvalidCells = EditorGUILayout.Toggle(Styles.highlightInvalidCells, LightProbeVisualization.highlightInvalidCells);
+                        EditorGUI.indentLevel--;
 
-                    if (EditorGUI.EndChangeCheck())
-                        EditorApplication.SetSceneRepaintDirty();
+                        if (EditorGUI.EndChangeCheck())
+                            EditorApplication.SetSceneRepaintDirty();
+                    }
                 }
 
                 // If either auto ambient or auto reflection baking is supported, show the SkyManager toggle.
diff --git a/Editor/Mono/SceneModeWindows/LightingWindowLightmapPreviewTab.cs b/Editor/Mono/SceneModeWindows/LightingWindowLightmapPreviewTab.cs
index 2f50599f2c..9a8d8d1820 100644
--- a/Editor/Mono/SceneModeWindows/LightingWindowLightmapPreviewTab.cs
+++ b/Editor/Mono/SceneModeWindows/LightingWindowLightmapPreviewTab.cs
@@ -176,7 +176,6 @@ private void LightmapListGUI(LightmapData[] lightmaps, VisualisationGITexture[]
                     }
 
                     GUILayout.EndVertical();
-                    LightmapDebugInfo(i);
                     GUILayout.FlexibleSpace();
                     GUILayout.EndHorizontal();
                     GUILayout.Space(5);
@@ -302,159 +301,10 @@ private void DebugInfoSection(LightmapData[] lightmaps)
                 }
             }
 
-            {
-                Dictionary<Hash128, SortedList<int, int>> gbufferHashToLightmapIndices = new Dictionary<Hash128, SortedList<int, int>>();
-                for (int i = 0; i < lightmaps.Length; i++)
-                {
-                    Hash128 gbufferHash;
-                    if (Lightmapping.GetGBufferHash(i, out gbufferHash))
-                    {
-                        if (!gbufferHashToLightmapIndices.ContainsKey(gbufferHash))
-                            gbufferHashToLightmapIndices.Add(gbufferHash, new SortedList<int, int>());
-
-                        gbufferHashToLightmapIndices[gbufferHash].Add(i, i);
-                    }
-                }
-
-                float totalGBuffersSize = 0.0f;
-                float totalLightmapsSize = 0.0f;
-
-                foreach (var entry in gbufferHashToLightmapIndices)
-                {
-                    Hash128 gbufferHash = entry.Key;
-                    float gbufferDataSize = Lightmapping.GetGBufferMemory(ref gbufferHash);
-                    totalGBuffersSize += gbufferDataSize;
-
-                    SortedList<int, int> lightmapIndices = entry.Value;
-                    foreach (var i in lightmapIndices)
-                    {
-                        LightmapMemory lightmapMemory = Lightmapping.GetLightmapMemory(i.Value);
-                        totalLightmapsSize += lightmapMemory.lightmapDataSizeCPU;
-                        totalLightmapsSize += lightmapMemory.lightmapTexturesSize;
-                    }
-                }
-
-                string foldoutNameFull = String.Format(
-                    "G-buffers ({0}) | Lightmaps ({1})",
-                    SizeString(totalGBuffersSize),
-                    SizeString(totalLightmapsSize));
-
-                if (lightmaps.Length > 0)
-                    EditorGUILayout.FoldoutTitlebar(false, new GUIContent(foldoutNameFull), true);
-            }
-
-            System.UInt64[] dummyCounts = new System.UInt64[0];
-
-            {
-                MemLabels labels = Lightmapping.GetLightProbeMemLabels();
-                ShowObjectNamesSizesAndCounts("Light Probes", kEditorPrefsLightProbes, labels.labels, labels.sizes, dummyCounts);
-            }
-
-            {
-                MemLabels labels = Lightmapping.GetTransmissionTexturesMemLabels();
-                ShowObjectNamesSizesAndCounts("Transmission textures", kEditorPrefsTransmissionTextures, labels.labels, labels.sizes, dummyCounts);
-            }
-
-            {
-                MemLabels labels = Lightmapping.GetMaterialTexturesMemLabels();
-                ShowObjectNamesSizesAndCounts("Albedo/emissive textures", kEditorPrefsMaterialTextures, labels.labels, labels.sizes, dummyCounts);
-            }
-
-            {
-                GeoMemLabels labels = Lightmapping.GetGeometryMemory();
-                ShowObjectNamesSizesAndCounts("Geometry data", kEditorPrefsGeometryData, labels.labels, labels.sizes, labels.triCounts);
-            }
-
-            {
-                // Note: this needs to go last.
-                // It simply shows all the memory labels that were not explicitly queried after the Lightmapping.ResetExplicitlyShownMemLabels() call.
-                MemLabels labels = Lightmapping.GetNotShownMemLabels();
-                string remainingEntriesFoldoutName = Lightmapping.isProgressiveLightmapperDone ? "Leaks" : "In-flight";
-                ShowObjectNamesSizesAndCounts(remainingEntriesFoldoutName, kEditorPrefsInFlight, labels.labels, labels.sizes, dummyCounts);
-            }
-
             EditorGUILayout.Space();
             EditorGUIUtility.labelWidth = oldWidth;
         }
 
-        private void LightmapDebugInfo(int index)
-        {
-            if (!showDebugInfo)
-                return;
-
-            GUILayout.Space(5);
-            GUILayout.BeginVertical();
-
-            LightmapConvergence lc = Lightmapping.GetLightmapConvergence(index);
-            if (lc.IsValid())
-            {
-                ulong occupiedTexels = (ulong)lc.occupiedTexelCount;
-                if (lc.tilingMode > 0)
-                {
-                    // Make sure we display the total amount of occupied texels once lightmap is converged
-                    // If tiling is on, and lightmap is not converged, display the occupied texel count in current tile
-                    if (lc.IsConverged())
-                    {
-                        GUILayout.Label("Occupied: " + InternalEditorUtility.CountToString(occupiedTexels), EditorStyles.miniLabel);
-                        GUILayout.Label("Baked using " + lc.GetTileCount() + " tiles", EditorStyles.miniLabel);
-                    }
-                    else
-                    {
-                        occupiedTexels = (ulong)lc.occupiedTexelCountInCurrentTile;
-                        GUILayout.Label("Occupied (in tile): " + InternalEditorUtility.CountToString(occupiedTexels), EditorStyles.miniLabel);
-                        GUILayout.Label("Baking pass (#tile): " + (lc.tilingPassNum + 1) + "/" + lc.GetTileCount(), EditorStyles.miniLabel);
-                    }
-                }
-                else
-                {
-                    GUILayout.Label("Occupied: " + InternalEditorUtility.CountToString(occupiedTexels), EditorStyles.miniLabel);
-                }
-                GUIContent direct = EditorGUIUtility.TrTextContent("Direct: " + lc.minDirectSamples + " / " + lc.maxDirectSamples + " / " + lc.avgDirectSamples + "", "min / max / avg samples per texel");
-                GUILayout.Label(direct, EditorStyles.miniLabel);
-
-                GUIContent gi = EditorGUIUtility.TrTextContent("GI: " + lc.minGISamples + " / " + lc.maxGISamples + " / " + lc.avgGISamples + "", "min / max / avg samples per texel");
-                GUILayout.Label(gi, EditorStyles.miniLabel);
-
-                GUIContent env = EditorGUIUtility.TrTextContent("Environment: " + lc.minEnvSamples + " / " + lc.maxEnvSamples + " / " + lc.avgEnvSamples + "", "min / max / avg samples per texel");
-                GUILayout.Label(env, EditorStyles.miniLabel);
-            }
-            else
-            {
-                GUILayout.Label("Occupied: N/A", EditorStyles.miniLabel);
-                GUILayout.Label("Direct: N/A", EditorStyles.miniLabel);
-                GUILayout.Label("GI: N/A", EditorStyles.miniLabel);
-                GUILayout.Label("Environment: N/A", EditorStyles.miniLabel);
-            }
-            float mraysPerSec = Lightmapping.GetLightmapBakePerformance(index);
-            if (mraysPerSec >= 0.0)
-                GUILayout.Label(mraysPerSec.ToString("0.00", CultureInfo.InvariantCulture.NumberFormat) + " mrays/sec", EditorStyles.miniLabel);
-            else
-                GUILayout.Label("N/A mrays/sec", EditorStyles.miniLabel);
-
-            GUILayout.EndVertical();
-            GUILayout.Space(5);
-            GUILayout.BeginVertical();
-
-            LightmapMemory lightmapMemory = Lightmapping.GetLightmapMemory(index);
-            GUILayout.Label("Lightmap data: " + SizeString(lightmapMemory.lightmapDataSizeCPU), EditorStyles.miniLabel);
-
-            GUIContent lightmapTexturesSizeContent = null;
-            if (lightmapMemory.lightmapTexturesSize > 0.0f)
-                lightmapTexturesSizeContent = EditorGUIUtility.TrTextContent("Lightmap textures: " + SizeString(lightmapMemory.lightmapTexturesSize));
-            else
-                lightmapTexturesSizeContent = EditorGUIUtility.TrTextContent("Lightmap textures: N/A", "This lightmap has converged and is not owned by the Progressive Lightmapper anymore.");
-            GUILayout.Label(lightmapTexturesSizeContent, EditorStyles.miniLabel);
-
-            GUIContent GPUSizeContent = null;
-            if (lightmapMemory.lightmapDataSizeGPU > 0.0f)
-                GPUSizeContent = EditorGUIUtility.TrTextContent("GPU memory: " + SizeString(lightmapMemory.lightmapDataSizeGPU));
-            else
-                GPUSizeContent = EditorGUIUtility.TrTextContent("GPU memory: N/A");
-            GUILayout.Label(GPUSizeContent, EditorStyles.miniLabel);
-
-            GUILayout.EndVertical();
-        }
-
         private void ShowObjectNamesSizesAndCounts(string foldoutName, string editorPrefsName, string[] objectNames, float[] sizes, System.UInt64[] counts)
         {
             Debug.Assert(objectNames.Length == sizes.Length);
diff --git a/Editor/Mono/SceneModeWindows/TierSettingsWindow.cs b/Editor/Mono/SceneModeWindows/TierSettingsWindow.cs
deleted file mode 100644
index c7d0776e5e..0000000000
--- a/Editor/Mono/SceneModeWindows/TierSettingsWindow.cs
+++ /dev/null
@@ -1,64 +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 UnityEngine;
-
-using Object = UnityEngine.Object;
-using EditorGraphicsSettings = UnityEditor.Rendering.EditorGraphicsSettings;
-using TierSettingsEditor = UnityEditor.GraphicsSettingsWindow.TierSettingsEditor;
-
-namespace UnityEditor
-{
-    internal partial class TierSettingsWindow : EditorWindow
-    {
-        static TierSettingsWindow s_Instance;
-        static public void CreateWindow()
-        {
-            s_Instance = EditorWindow.GetWindow<TierSettingsWindow>();
-            s_Instance.minSize = new Vector2(600, 300);
-            s_Instance.titleContent = EditorGUIUtility.TrTextContent("Tier Settings");
-        }
-
-        internal static TierSettingsWindow GetInstance()
-        {
-            return s_Instance;
-        }
-
-        Editor m_TierSettingsEditor;
-
-        void OnEnable()
-        {
-            s_Instance = this;
-        }
-
-        void OnDisable()
-        {
-            DestroyImmediate(m_TierSettingsEditor); m_TierSettingsEditor = null;
-            if (s_Instance == this)
-                s_Instance = null;
-        }
-
-        Object graphicsSettings
-        {
-            get { return UnityEngine.Rendering.GraphicsSettings.GetGraphicsSettings(); }
-        }
-        Editor tierSettingsEditor
-        {
-            get
-            {
-                Editor.CreateCachedEditor(graphicsSettings, typeof(TierSettingsEditor), ref m_TierSettingsEditor);
-                ((TierSettingsEditor)m_TierSettingsEditor).verticalLayout = false;
-                return m_TierSettingsEditor;
-            }
-        }
-
-        void OnGUI()
-        {
-            tierSettingsEditor.OnInspectorGUI();
-        }
-    }
-}
diff --git a/Editor/Mono/SceneView/RectSelection.cs b/Editor/Mono/SceneView/RectSelection.cs
index 0c81f7428c..6ca392e828 100644
--- a/Editor/Mono/SceneView/RectSelection.cs
+++ b/Editor/Mono/SceneView/RectSelection.cs
@@ -67,7 +67,7 @@ public void OnGUI()
                 case EventType.MouseDrag:
                     if (GUIUtility.hotControl == id)
                     {
-                        if (!m_RectSelecting && (mousePos - m_SelectStartPoint).magnitude > 6f)
+                        if (!m_RectSelecting && (mousePos - m_SelectStartPoint).magnitude > 6f && Tools.s_LockedViewTool == ViewTool.None)
                         {
                             EditorApplication.modifierKeysChanged += SendCommandsOnModifierKeys;
                             m_RectSelecting = true;
@@ -277,7 +277,6 @@ 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/SceneView.cs b/Editor/Mono/SceneView/SceneView.cs
index b45f6b47c7..07fcdea0b3 100644
--- a/Editor/Mono/SceneView/SceneView.cs
+++ b/Editor/Mono/SceneView/SceneView.cs
@@ -151,6 +151,7 @@ private set
         public static Color selectedOutlineColor => kSceneViewSelectedOutline.Color;
         public bool isUsingSceneFiltering => UseSceneFiltering();
 
+        internal static SavedBool s_PreferenceIgnoreAlwaysRefreshWhenNotFocused = new SavedBool("SceneView.ignoreAlwaysRefreshWhenNotFocused", false);
         internal static SavedBool s_PreferenceEnableFilteringWhileSearching = new SavedBool("SceneView.enableFilteringWhileSearching", true);
         internal static SavedBool s_PreferenceEnableFilteringWhileLodGroupEditing = new SavedBool("SceneView.enableFilteringWhileLodGroupEditing", true);
 
@@ -400,11 +401,18 @@ public bool alwaysRefresh
                 set => m_AlwaysRefresh = value;
             }
 
+            public bool showClouds
+            {
+                get => m_ShowClouds;
+                set => m_ShowClouds = value;
+            }
+
             public bool showSkybox = true;
             public bool showFlares = true;
             public bool showImageEffects = true;
             public bool showParticleSystems = true;
             public bool showVisualEffectGraphs = true;
+            bool m_ShowClouds = true;
 
             public bool fogEnabled => fxEnabled && showFog;
             // marked obsolete by @karlh 2020/4/14
@@ -413,6 +421,7 @@ public bool alwaysRefresh
             public bool materialUpdateEnabled => alwaysRefreshEnabled;
             public bool alwaysRefreshEnabled => fxEnabled && alwaysRefresh;
             public bool skyboxEnabled => fxEnabled && showSkybox;
+            public bool cloudsEnabled => fxEnabled && showClouds;
             public bool flaresEnabled => fxEnabled && showFlares;
             public bool imageEffectsEnabled => fxEnabled && showImageEffects;
             public bool particleSystemsEnabled => fxEnabled && showParticleSystems;
@@ -433,6 +442,7 @@ public SceneViewState(SceneViewState other)
                 showFog = other.showFog;
                 alwaysRefresh = other.alwaysRefresh;
                 showSkybox = other.showSkybox;
+                showClouds = other.showClouds;
                 showFlares = other.showFlares;
                 showImageEffects = other.showImageEffects;
                 showParticleSystems = other.showParticleSystems;
@@ -449,7 +459,7 @@ public bool allEnabled
             {
                 get
                 {
-                    bool all =  showFog && alwaysRefresh && showSkybox && showFlares && showImageEffects && showParticleSystems;
+                    bool all =  showFog && alwaysRefresh && showSkybox && showClouds && showFlares && showImageEffects && showParticleSystems;
                     if (UnityEngine.VFX.VFXManager.activateVFX)
                         all = all && showVisualEffectGraphs;
                     return all;
@@ -467,6 +477,7 @@ public void SetAllEnabled(bool value)
                 showFog = value;
                 alwaysRefresh = value;
                 showSkybox = value;
+                showClouds = value;
                 showFlares = value;
                 showImageEffects = value;
                 showParticleSystems = value;
@@ -1097,6 +1108,26 @@ internal bool viewIsLockedToObject
         }
 
         [RequiredByNativeCode]
+        static void FrameSelectedMenuItem(bool locked)
+        {
+            var command = locked ? EventCommandNames.FrameSelectedWithLock : EventCommandNames.FrameSelected;
+
+            var win = focusedWindow;
+            var ret = win != null && win.SendEvent(EditorGUIUtility.CommandEvent(command));
+
+            if (!ret)
+            {
+                win = mouseOverWindow;
+                ret = win != null && win.SendEvent(EditorGUIUtility.CommandEvent(command));
+            }
+
+            // if no hovered or focused window used the frame command, send the command to the last active scene view.
+            // as a special case, if the window that used the frame command was hierarchy, also send a frame event to
+            // the last active scene view.
+            if ((!ret || win is SceneHierarchyWindow) && lastActiveSceneView != null)
+                lastActiveSceneView.SendEvent(EditorGUIUtility.CommandEvent(command));
+        }
+
         public static bool FrameLastActiveSceneView()
         {
             if (lastActiveSceneView == null)
@@ -1104,7 +1135,6 @@ public static bool FrameLastActiveSceneView()
             return lastActiveSceneView.SendEvent(EditorGUIUtility.CommandEvent(EventCommandNames.FrameSelected));
         }
 
-        [RequiredByNativeCode]
         public static bool FrameLastActiveSceneViewWithLock()
         {
             if (lastActiveSceneView == null)
@@ -1303,7 +1333,8 @@ VisualElement CreateCameraRectVisualElement()
                 name = s_CameraRectVisualElementName,
                 pickingMode = PickingMode.Position,
                 viewDataKey = name,
-                renderHints = RenderHints.ClipWithScissors
+                renderHints = RenderHints.ClipWithScissors,
+                requireMeasureFunction = false
             };
 
             UIElementsEditorUtility.AddDefaultEditorStyleSheets(root);
@@ -1557,7 +1588,7 @@ void RefreshAudioPlay()
                     }
                     else
                     {
-                        if (!source.isPlaying)
+                        if (!source.isPlaying && source.isActiveAndEnabled)
                             source.Play();
                     }
                 }
@@ -1891,8 +1922,8 @@ private void CreateCameraTargetTexture(Rect cameraRect, bool hdr)
             }
 
             Rect actualCameraRect = Handles.GetCameraRect(cameraRect);
-            int width = (int)actualCameraRect.width;
-            int height = (int)actualCameraRect.height;
+            int width = (int)Mathf.Max(1f, actualCameraRect.width);
+            int height = (int)Mathf.Max(1f, actualCameraRect.height);
 
             if (m_SceneTargetTexture == null)
             {
@@ -2309,7 +2340,7 @@ void DoOnPreSceneGUICallbacks(Rect cameraRect)
         {
             // Don't do callbacks in search mode, as editors calling Handles.BeginGUI
             // will break camera setup.
-            if (UseSceneFiltering())
+            if (hasSearchFilter)
                 return;
 
             CallOnPreSceneGUI();
@@ -2948,8 +2979,19 @@ internal bool CheckDrawModeForRenderingPath(DrawCameraMode mode)
             return true;
         }
 
-        private void SetSceneCameraHDRAndDepthModes()
+        private void UpdateSceneCameraSettings()
         {
+            var mainCamera = GetMainCamera();
+
+            // update physical camera properties
+            if (mainCamera != null)
+            {
+                m_Camera.iso = mainCamera.iso;
+                m_Camera.shutterSpeed = mainCamera.shutterSpeed;
+                m_Camera.aperture = mainCamera.aperture;
+                m_Camera.anamorphism = mainCamera.anamorphism;
+            }
+
             if (!m_SceneIsLit || !DoesCameraDrawModeSupportHDR(m_CameraMode.drawMode))
             {
                 m_Camera.allowHDR = false;
@@ -2957,7 +2999,7 @@ private void SetSceneCameraHDRAndDepthModes()
                 m_Camera.clearStencilAfterLightingPass = false;
                 return;
             }
-            var mainCamera = GetMainCamera();
+
             if (mainCamera == null)
             {
                 m_Camera.allowHDR = false;
@@ -2995,6 +3037,7 @@ void SetupCamera()
             ParticleSystemEditorUtils.renderInSceneView = m_SceneViewState.particleSystemsEnabled;
             UnityEngine.VFX.VFXManager.renderInSceneView = m_SceneViewState.visualEffectGraphsEnabled;
             SceneVisibilityManager.instance.enableSceneVisibility = m_SceneVisActive;
+            m_Camera.renderCloudsInSceneView = m_SceneViewState.cloudsEnabled;
             ResetIfNaN();
 
             m_Camera.transform.rotation = m_2DMode && !m_Rotation.isAnimating ? Quaternion.identity : m_Rotation.value;
@@ -3042,7 +3085,8 @@ void SetupCamera()
             m_Camera.renderingPath = GetSceneViewRenderingPath();
             if (!CheckDrawModeForRenderingPath(m_CameraMode.drawMode))
                 m_CameraMode = GetBuiltinCameraMode(DrawCameraMode.Textured);
-            SetSceneCameraHDRAndDepthModes();
+
+            UpdateSceneCameraSettings();
 
             if (m_CameraMode.drawMode == DrawCameraMode.Textured ||
                 m_CameraMode.drawMode == DrawCameraMode.TexturedWire ||
@@ -3103,8 +3147,17 @@ void OnBecameInvisible()
         void UpdateAnimatedMaterials()
         {
             var repaint = false;
-            if (m_lastRenderedTime + 0.033f < EditorApplication.timeSinceStartup)
+
+            // Ensure that we in fact do want to paint when not in focus.
+            if (!EditorApplication.isFocused && s_PreferenceIgnoreAlwaysRefreshWhenNotFocused.value)
+            {
+                // We're going to capture this condition, so that it doesnt fall through.
+            }
+            else if (m_lastRenderedTime + 0.033f < EditorApplication.timeSinceStartup)
+            {
                 repaint = sceneViewState.alwaysRefreshEnabled;
+            }
+
             repaint |= LODUtility.IsLODAnimating(m_Camera);
 
             if (repaint)
@@ -3456,7 +3509,7 @@ void CommandsGUI()
                 case EventCommandNames.SelectAll:
                     if (execute)
                     {
-                        var gameObjects = FindObjectsOfType<GameObject>();
+                        var gameObjects = FindObjectsByType<GameObject>(FindObjectsSortMode.InstanceID);
                         var objs = new List<Object>(gameObjects.Length);
                         foreach (var go in gameObjects)
                             if (SceneVisibilityManager.instance.IsSelectable(go))
@@ -3473,7 +3526,9 @@ void CommandsGUI()
                     break;
                 case EventCommandNames.InvertSelection:
                     if (execute)
-                        Selection.objects = FindObjectsOfType<GameObject>().Except(Selection.gameObjects).Where(SceneVisibilityManager.instance.IsSelectable).ToArray();
+                    {
+                        Selection.objects = FindObjectsByType<GameObject>(FindObjectsSortMode.InstanceID).Except(Selection.gameObjects).Where(SceneVisibilityManager.instance.IsSelectable).ToArray();
+                    }
                     Event.current.Use();
                     break;
                 case EventCommandNames.SelectChildren:
@@ -3563,7 +3618,7 @@ internal bool IsGameObjectInThisSceneView(GameObject gameObject)
             if (gameObject == null)
                 return false;
 
-            return StageUtility.IsGameObjectRenderedByCamera(gameObject, camera);
+            return !StageUtility.IsGizmoCulledBySceneCullingMasksOrFocusedScene(gameObject, camera);
         }
 
         public bool FrameSelected()
@@ -4010,7 +4065,8 @@ void CopyLastActiveSceneViewSettings()
             m_CameraSettings = new CameraSettings(lastActiveSceneView.m_CameraSettings);
             m_2DMode = view.m_2DMode;
             pivot = view.pivot;
-            rotation = view.rotation;
+            if(!m_2DMode)
+                rotation = view.rotation;
             size = view.size;
             m_Ortho.value = view.orthographic;
             if (m_Grid == null)
diff --git a/Editor/Mono/SceneView/SceneViewMotion.cs b/Editor/Mono/SceneView/SceneViewMotion.cs
index 4102697171..e8d8482bca 100644
--- a/Editor/Mono/SceneView/SceneViewMotion.cs
+++ b/Editor/Mono/SceneView/SceneViewMotion.cs
@@ -11,6 +11,29 @@ namespace UnityEditor
 {
     internal static class SceneViewMotion
     {
+        const string k_TemporaryPanTool2D = "Scene View/Temporary Pan Tool for 2D Mode";
+        const string k_TemporaryPanTool1 = "Scene View/Temporary Pan Tool 1";
+        const string k_TemporaryPanTool2 = "Scene View/Temporary Pan Tool 2";
+        const string k_TemporaryPanTool3 = "Scene View/Temporary Pan Tool 3";
+        const string k_TemporaryPanTool4 = "Scene View/Temporary Pan Tool 4";
+        const string k_TemporaryZoomTool1 = "Scene View/Temporary Zoom Tool 1";
+        const string k_TemporaryZoomTool2 = "Scene View/Temporary Zoom Tool 2";
+        const string k_TemporaryOrbitTool = "Scene View/Temporary Orbit Tool";
+        const string k_TemporaryFpsTool = "Scene View/Temporary FPS Tool";
+
+        static readonly ShortcutEntry[] ViewToolShortcuts =
+        {
+            ShortcutIntegration.instance.directory.FindShortcutEntry(k_TemporaryPanTool2D),
+            ShortcutIntegration.instance.directory.FindShortcutEntry(k_TemporaryPanTool1),
+            ShortcutIntegration.instance.directory.FindShortcutEntry(k_TemporaryPanTool2),
+            ShortcutIntegration.instance.directory.FindShortcutEntry(k_TemporaryPanTool3),
+            ShortcutIntegration.instance.directory.FindShortcutEntry(k_TemporaryPanTool4),
+            ShortcutIntegration.instance.directory.FindShortcutEntry(k_TemporaryZoomTool1),
+            ShortcutIntegration.instance.directory.FindShortcutEntry(k_TemporaryZoomTool2),
+            ShortcutIntegration.instance.directory.FindShortcutEntry(k_TemporaryOrbitTool),
+            ShortcutIntegration.instance.directory.FindShortcutEntry(k_TemporaryFpsTool),
+        };
+
         [NonSerialized]
         static bool s_Initialized;
         static SceneView s_CurrentSceneView; // The SceneView that is calling OnGUI
@@ -52,7 +75,8 @@ internal static bool viewToolActive
             {
                 if (Event.current != null)
                     UpdateViewToolState(Event.current);
-                return s_ViewToolActive;
+
+                return s_ViewToolActive || Tools.current == Tool.View;
             }
         }
         internal static event Action viewToolActiveChanged;
@@ -67,6 +91,7 @@ static void Init()
             s_Initialized = true;
         }
 
+        [ReserveModifiers(ShortcutModifiers.Shift)]
         class SceneViewViewport : IShortcutToolContext
         {
             public bool active => IsActive;
@@ -75,51 +100,59 @@ public static bool IsActive
             {
                 get
                 {
-                    var sceneViewFocus = EditorWindow.focusedWindow?.GetType() == typeof(SceneView);
-                    
+                    var sceneViewFocus = EditorWindow.focusedWindow is SceneView;
                     return sceneViewFocus && s_ViewportsUnderMouse;
                 }
             }
         }
 
+        [ReserveModifiers(ShortcutModifiers.Shift)]
         class SceneViewViewport2D : IShortcutToolContext
         {
             public bool active => SceneViewViewport.IsActive
                 && ((SceneView.lastActiveSceneView?.in2DMode ?? false) || (SceneView.lastActiveSceneView?.isRotationLocked ?? false));
         }
 
+        [ReserveModifiers(ShortcutModifiers.Shift)]
         class SceneViewViewport3D : IShortcutToolContext
         {
             public bool active => SceneViewViewport.IsActive
                 && ((!SceneView.lastActiveSceneView?.in2DMode ?? false) && (!SceneView.lastActiveSceneView?.isRotationLocked ?? false));
         }
 
-        [ClutchShortcut("Scene View/Temporary Pan Tool for 2D Mode", typeof(SceneViewViewport2D), KeyCode.Mouse1)]
-        [ClutchShortcut("Scene View/Temporary Pan Tool 1", typeof(SceneViewViewport), KeyCode.Mouse2)]
-        [ClutchShortcut("Scene View/Temporary Pan Tool 2", typeof(SceneViewViewport), KeyCode.Mouse2, ShortcutModifiers.Alt)]
-        [ClutchShortcut("Scene View/Temporary Pan Tool 3", typeof(SceneViewViewport), KeyCode.Mouse0, ShortcutModifiers.Action | ShortcutModifiers.Alt)]
-        [ClutchShortcut("Scene View/Temporary Pan Tool 4", typeof(SceneViewViewport), KeyCode.Mouse2, ShortcutModifiers.Action | ShortcutModifiers.Alt)]
+        [ClutchShortcut(k_TemporaryPanTool2D, typeof(SceneViewViewport2D), KeyCode.Mouse1)]
+        [ClutchShortcut(k_TemporaryPanTool1, typeof(SceneViewViewport), KeyCode.Mouse2)]
+        [ClutchShortcut(k_TemporaryPanTool2, typeof(SceneViewViewport), KeyCode.Mouse2, ShortcutModifiers.Alt)]
+        [ClutchShortcut(k_TemporaryPanTool3, typeof(SceneViewViewport), KeyCode.Mouse0, ShortcutModifiers.Action | ShortcutModifiers.Alt)]
+        [ClutchShortcut(k_TemporaryPanTool4, typeof(SceneViewViewport), KeyCode.Mouse2, ShortcutModifiers.Action | ShortcutModifiers.Alt)]
         static void TemporaryPan(ShortcutArguments args)
         {
-            if (args.stage == ShortcutStage.Begin) TemporaryTool(ViewTool.Pan);
-            else HandleMouseUp(s_CurrentSceneView, s_ViewToolID, 0, 0);
+            if (args.stage == ShortcutStage.Begin)
+                TemporaryTool(ViewTool.Pan);
+            else
+                HandleMouseUp(s_CurrentSceneView, s_ViewToolID, 0, 0);
         }
 
-        [ClutchShortcut("Scene View/Temporary Zoom Tool", typeof(SceneViewViewport), KeyCode.Mouse1, ShortcutModifiers.Alt)]
+        [ClutchShortcut(k_TemporaryZoomTool1, typeof(SceneViewViewport), KeyCode.Mouse1, ShortcutModifiers.Alt)]
+        [ClutchShortcut(k_TemporaryZoomTool2, typeof(SceneViewViewport), KeyCode.Mouse1, ShortcutModifiers.Action | ShortcutModifiers.Alt)]
         static void TemporaryZoom(ShortcutArguments args)
         {
-            if (args.stage == ShortcutStage.Begin) TemporaryTool(ViewTool.Zoom);
-            else HandleMouseUp(s_CurrentSceneView, s_ViewToolID, 0, 0);
+            if (args.stage == ShortcutStage.Begin)
+                TemporaryTool(ViewTool.Zoom);
+            else
+                HandleMouseUp(s_CurrentSceneView, s_ViewToolID, 0, 0);
         }
 
-        [ClutchShortcut("Scene View/Temporary Orbit Tool", typeof(SceneViewViewport), KeyCode.Mouse0, ShortcutModifiers.Alt)]
+        [ClutchShortcut(k_TemporaryOrbitTool, typeof(SceneViewViewport), KeyCode.Mouse0, ShortcutModifiers.Alt)]
         static void TemporaryOrbit(ShortcutArguments args)
         {
-            if (args.stage == ShortcutStage.Begin) TemporaryTool(ViewTool.Orbit);
-            else HandleMouseUp(s_CurrentSceneView, s_ViewToolID, 0, 0);
+            if (args.stage == ShortcutStage.Begin)
+                TemporaryTool(ViewTool.Orbit);
+            else
+                HandleMouseUp(s_CurrentSceneView, s_ViewToolID, 0, 0);
         }
 
-        [ClutchShortcut("Scene View/Temporary FPS Tool", typeof(SceneViewViewport3D), KeyCode.Mouse1)]
+        [ClutchShortcut(k_TemporaryFpsTool, typeof(SceneViewViewport3D), KeyCode.Mouse1)]
         static void TemporaryFPS(ShortcutArguments args)
         {
             if (args.stage == ShortcutStage.Begin)
@@ -140,9 +173,14 @@ static void TemporaryTool(ViewTool tool)
             Tools.s_LockedViewTool = Tools.viewTool = tool;
             s_CurrentState = MotionState.kDragging;
             HandleMouseDown(SceneView.lastActiveSceneView, s_ViewToolID, Event.current?.button ?? 0);
-            UpdateViewToolState(Event.current);
-            if(Event.current != null) shortcutKey = Event.current.isMouse ? KeyCode.Mouse0 + Event.current.button : Event.current.keyCode;
-            else shortcutKey = KeyCode.None;
+            // We should only allow mouse jumping when the shortcuts are enabled.
+            EditorGUIUtility.SetWantsMouseJumping(1);
+            // Do not pass the event here to avoid string comparisons in the method as this is not needed here.
+            UpdateViewToolState(null);
+            if(Event.current != null)
+                shortcutKey = Event.current.isMouse ? KeyCode.Mouse0 + Event.current.button : Event.current.keyCode;
+            else
+                shortcutKey = KeyCode.None;
         }
 
         public static void DoViewTool(SceneView view)
@@ -199,12 +237,21 @@ public static void DoViewTool(SceneView view)
                 HandleMouseDrag(view, id);
             }
 
-            if (shortcutKey != KeyCode.None && Tools.viewTool != ViewTool.None) GUIUtility.hotControl = s_ViewToolID;
+            if (shortcutKey != KeyCode.None && Tools.viewTool != ViewTool.None)
+                GUIUtility.hotControl = s_ViewToolID;
         }
 
         static void UpdateViewToolState(Event evt)
         {
-            bool shouldBeActive = Tools.s_LockedViewTool != ViewTool.None;
+            bool shouldBeActive = false;
+            if (evt?.type == EventType.MouseDown)
+            {
+                var eventKeyCombination = new[] { KeyCombination.FromInput(evt) };
+                foreach (var shortcut in ViewToolShortcuts)
+                    shouldBeActive |= shortcut?.StartsWith(eventKeyCombination) ?? false;
+            }
+
+            shouldBeActive |= Tools.s_LockedViewTool != ViewTool.None || Tools.current == Tool.View;
             if (shouldBeActive != s_ViewToolActive)
             {
                 s_ViewToolActive = shouldBeActive;
@@ -260,7 +307,7 @@ private static void HandleMouseDown(SceneView view, int id, int button)
 
             if (Toolbar.get)
                 Toolbar.get.Repaint();
-            EditorGUIUtility.SetWantsMouseJumping(1);
+
             s_ActiveSceneView = s_CurrentSceneView;
 
             if (Tools.s_LockedViewTool == ViewTool.None && Tools.current == Tool.View)
@@ -296,7 +343,7 @@ internal static void ResetMotion()
 
         private static void HandleMouseUp(SceneView view, int id, int button, int clickCount)
         {
-            if (GUIUtility.hotControl == id && (shortcutKey == KeyCode.None || shortcutKey == (Event.current.keyCode == KeyCode.None ? KeyCode.Mouse0 + Event.current.button : Event.current.keyCode)))
+            if (Event.current != null && GUIUtility.hotControl == id && (shortcutKey == KeyCode.None || shortcutKey == (Event.current.keyCode == KeyCode.None ? KeyCode.Mouse0 + Event.current.button : Event.current.keyCode)))
             {
                 // Move pivot to clicked point.
                 if (Tools.s_LockedViewTool == ViewTool.Pan && !s_Drag)
diff --git a/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceDrawer.cs b/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceDrawer.cs
index 4641e216af..f3206d7eff 100644
--- a/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceDrawer.cs
+++ b/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceDrawer.cs
@@ -2,12 +2,9 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
 using UnityEditor;
+using UnityEngine;
 using UnityEngine.UIElements;
-using UnityEditor.UIElements;
 using ObjectField = UnityEditor.UIElements.ObjectField;
 
 abstract class BaseExposedPropertyDrawer : UnityEditor.PropertyDrawer
@@ -17,7 +14,7 @@ abstract class BaseExposedPropertyDrawer : UnityEditor.PropertyDrawer
     private static Color kMissingOverrideColor = new Color(1.0f, 0.11f, 0.11f, 1.0f);
     protected static string kSetExposedPropertyMsg = "Set Exposed Property";
     protected static string kClearExposedPropertyMsg = "Clear Exposed Property";
-    private  const string kVisualElementName = "ExposedReference";
+    internal  const string kVisualElementName = "ExposedReference";
 
     internal readonly GUIContent ExposePropertyContent = EditorGUIUtility.TrTextContent("Expose Property");
     internal readonly GUIContent UnexposePropertyContent = EditorGUIUtility.TrTextContent("Unexpose Property");
@@ -149,8 +146,7 @@ public override VisualElement CreatePropertyGUI(SerializedProperty prop)
         ObjectField obj = new ObjectField()
         {
             name = kVisualElementName,
-            label = prop.displayName,
-            bindingPath = m_Item.exposedPropertyDefault.propertyPath,
+            label = preferredLabel,
             objectType = typeOfExposedReference,
             value = m_Item.currentReferenceValue,
             allowSceneObjects = m_Item.exposedPropertyTable != null
@@ -159,13 +155,28 @@ public override VisualElement CreatePropertyGUI(SerializedProperty prop)
         obj.RegisterValueChangedCallback(SetReference);
         obj.AddManipulator(new ContextualMenuManipulator(BuildContextualMenu));
 
+        Undo.UndoRedoCallback undoRedoCallback = () =>
+        {
+            m_Item.UpdateValue();
+            obj.SetValueWithoutNotify(m_Item.currentReferenceValue);
+        };
+
+        obj.RegisterCallback<AttachToPanelEvent>(evt => Undo.undoRedoPerformed += undoRedoCallback);
+        obj.RegisterCallback<DetachFromPanelEvent>(evt => Undo.undoRedoPerformed -= undoRedoCallback);
+
         return obj;
     }
 
     void SetReference(ChangeEvent<Object> evt)
     {
         SetReference(evt.newValue);
-        m_Item.currentReferenceValue = evt.newValue;
+        if (m_Item.currentReferenceValue != evt.newValue)
+        {
+            m_Item.currentReferenceValue = evt.newValue;
+
+            //save the modified SerializedObject since we are bypassing the binding system
+            m_Item.exposedPropertyName.serializedObject.ApplyModifiedProperties();
+        }
     }
 
     internal void SetReference(Object newValue)
@@ -189,10 +200,10 @@ internal void SetReference(Object newValue)
             }
             else
             {
-                var guid = UnityEditor.GUID.Generate();
-                var str = guid.ToString();
+                var str = UnityEditor.GUID.Generate().ToString();
                 m_Item.exposedPropertyNameString = str;
                 m_Item.exposedPropertyName.stringValue = str;
+                m_Item.propertyMode = ExposedPropertyMode.NamedGUID;
 
                 Undo.RecordObject(m_Item.exposedPropertyTable as UnityEngine.Object, kSetExposedPropertyMsg);
                 m_Item.exposedPropertyTable.SetReferenceValue(m_Item.exposedPropertyNameString, newValue);
diff --git a/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceObject.cs b/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceObject.cs
index b8287fb590..18da27015a 100644
--- a/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceObject.cs
+++ b/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceObject.cs
@@ -33,6 +33,11 @@ internal ExposedReferenceObject(SerializedProperty property)
             propertyMode = BaseExposedPropertyDrawer.GetExposedPropertyMode(exposedPropertyNameString);
             exposedPropertyTable = GetExposedPropertyTable(property);
             currentOverrideState = BaseExposedPropertyDrawer.OverrideState.DefaultValue;
+            UpdateValue();
+        }
+
+        public void UpdateValue()
+        {
             currentReferenceValue = Resolve(out m_CurrentOverrideState);
         }
 
diff --git a/Editor/Mono/ScriptAttributeGUI/Implementations/PropertyDrawers.cs b/Editor/Mono/ScriptAttributeGUI/Implementations/PropertyDrawers.cs
index 49ba65313c..38279a7c6d 100644
--- a/Editor/Mono/ScriptAttributeGUI/Implementations/PropertyDrawers.cs
+++ b/Editor/Mono/ScriptAttributeGUI/Implementations/PropertyDrawers.cs
@@ -33,7 +33,7 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
 
             if (property.propertyType == SerializedPropertyType.Float)
             {
-                var slider = new Slider(property.displayName, range.min, range.max);
+                var slider = new Slider(preferredLabel, range.min, range.max);
                 slider.AddToClassList(Slider.alignedFieldUssClassName);
                 slider.bindingPath = property.propertyPath;
                 slider.showInputField = true;
@@ -41,7 +41,7 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             }
             else if (property.propertyType == SerializedPropertyType.Integer)
             {
-                var intSlider = new SliderInt(property.displayName, (int)range.min, (int)range.max);
+                var intSlider = new SliderInt(preferredLabel, (int)range.min, (int)range.max);
                 intSlider.AddToClassList(SliderInt.alignedFieldUssClassName);
                 intSlider.bindingPath = property.propertyPath;
                 intSlider.showInputField = true;
@@ -124,12 +124,12 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             {
                 if (property.type == "float")
                 {
-                    newField = new FloatField(property.displayName);
+                    newField = new FloatField(preferredLabel);
                     ((BaseField<float>)newField).onValidateValue += OnValidateValue;
                 }
                 else if (property.type == "double")
                 {
-                    newField = new DoubleField(property.displayName);
+                    newField = new DoubleField(preferredLabel);
                     ((BaseField<double>)newField).onValidateValue += OnValidateValue;
                 }
             }
@@ -137,38 +137,48 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             {
                 if (property.type == "int")
                 {
-                    newField = new IntegerField(property.displayName);
+                    newField = new IntegerField(preferredLabel);
                     ((BaseField<int>)newField).onValidateValue += OnValidateValue;
                 }
                 else if (property.type == "long")
                 {
-                    newField = new LongField(property.displayName);
+                    newField = new LongField(preferredLabel);
                     ((BaseField<long>)newField).onValidateValue += OnValidateValue;
                 }
+                else if (property.type == "uint")
+                {
+                    newField = new UnsignedIntegerField(preferredLabel);
+                    ((BaseField<uint>)newField).onValidateValue += OnValidateValue;
+                }
+                else if (property.type == "ulong")
+                {
+                    newField = new UnsignedLongField(preferredLabel);
+                    ((BaseField<ulong>)newField).onValidateValue += OnValidateValue;
+                }
             }
             else if (property.propertyType == SerializedPropertyType.Vector2)
             {
-                newField = new Vector2Field(property.displayName);
+                newField = new Vector2Field(preferredLabel);
                 ((BaseField<Vector2>)newField).onValidateValue += OnValidateValue;
             }
             else if (property.propertyType == SerializedPropertyType.Vector2Int)
             {
-                newField = new Vector2IntField(property.displayName);
+                newField = new Vector2IntField(preferredLabel);
                 ((BaseField<Vector2Int>)newField).onValidateValue += OnValidateValue;
             }
             else if (property.propertyType == SerializedPropertyType.Vector3)
             {
-                newField =  new Vector3Field(property.displayName);
+                newField =  new Vector3Field(preferredLabel);
                 ((BaseField<Vector3>)newField).onValidateValue += OnValidateValue;
             }
             else if (property.propertyType == SerializedPropertyType.Vector3Int)
             {
-                newField = new Vector3IntField(property.displayName);
+                newField = new Vector3IntField(preferredLabel);
                 ((BaseField<Vector3Int>)newField).onValidateValue += OnValidateValue;
             }
             else if (property.propertyType == SerializedPropertyType.Vector4)
             {
-                newField = new Vector4Field(property.displayName);
+                newField = new Vector4Field(preferredLabel);
                 ((BaseField<Vector4>)newField).onValidateValue += OnValidateValue;
             }
 
@@ -203,6 +213,16 @@ private long OnValidateValue(long value)
             return Math.Max((long)minAttribute.min, value);
         }
 
+        private uint OnValidateValue(uint value)
+        {
+            return Math.Max((uint)minAttribute.min, value);
+        }
+
+        private ulong OnValidateValue(ulong value)
+        {
+            return Math.Max((ulong)minAttribute.min, value);
+        }
+
         private Vector2 OnValidateValue(Vector2 value)
         {
             return new Vector2(Mathf.Max(minAttribute.min, value.x), Mathf.Max(minAttribute.min, value.y));
@@ -262,7 +282,7 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             if (property.propertyType == SerializedPropertyType.String)
             {
                 var lines = ((MultilineAttribute)attribute).lines;
-                var field = new TextField(property.displayName);
+                var field = new TextField(preferredLabel);
                 field.multiline = true;
                 field.bindingPath = property.propertyPath;
                 field.style.height = EditorGUI.kSingleLineHeight + (lines - 1) * kLineHeight;
@@ -284,7 +304,7 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
     [CustomPropertyDrawer(typeof(TextAreaAttribute))]
     internal sealed class TextAreaDrawer : PropertyDrawer
     {
-        private const int kLineHeight = 13;
+        private const int kLineHeight = 15;
         private static string s_InvalidTypeMessage = L10n.Tr("Use TextAreaDrawer with string.");
         private Vector2 m_ScrollPosition = new Vector2();
 
@@ -311,31 +331,39 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
 
         public override VisualElement CreatePropertyGUI(SerializedProperty property)
         {
-            if (property.propertyType == SerializedPropertyType.String)
+            if (property.propertyType != SerializedPropertyType.String)
+                return new Label(s_InvalidTypeMessage);
+
+            var textAreaAttribute = attribute as TextAreaAttribute;
+
+            // Label + first line
+            var initialHeight = EditorGUI.kSingleLineHeight + EditorGUI.kSingleLineHeight;
+
+            var minHeight = initialHeight + (textAreaAttribute!.minLines - 1) * kLineHeight;
+            var maxHeight = initialHeight + (textAreaAttribute!.maxLines - 1) * kLineHeight;
+
+            if (maxHeight < minHeight)
+                maxHeight = minHeight;
+
+            var textField = new TextField
             {
-                var textAreaAttribute = attribute as TextAreaAttribute;
-                var element = new VisualElement();
-                var label = new Label(property.displayName);
-                var scrollView = new ScrollView();
-                var textField = new TextField();
-                textField.multiline = true;
-                var minHeight = EditorGUI.kSingleLineHeight + (textAreaAttribute.minLines - 1) * kLineHeight;
-                var maxHeight = minHeight;
-
-                element.Add(label);
-                element.Add(scrollView);
-
-                scrollView.Add(textField);
-                scrollView.style.minHeight = minHeight;
-                scrollView.style.maxHeight = maxHeight;
-
-                textField.style.minHeight = minHeight;
-                textField.bindingPath = property.propertyPath;
-
-                return element;
-            }
+                label = preferredLabel,
+                multiline = true,
+                style =
+                {
+                    flexDirection = FlexDirection.Column,
+                    whiteSpace = WhiteSpace.Normal,
+                    minHeight = minHeight,
+                    maxHeight = maxHeight
+                }
+            };
 
-            return new Label(s_InvalidTypeMessage);
+            textField.verticalScrollerVisibility = ScrollerVisibility.Auto;
+
+            textField.style.minHeight = minHeight;
+            textField.bindingPath = property.propertyPath;
+
+            return textField;
         }
 
         public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
@@ -384,7 +412,7 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             if (property.propertyType == SerializedPropertyType.Color)
             {
                 var colorUsage = (ColorUsageAttribute)attribute;
-                var field = new ColorField(property.displayName);
+                var field = new ColorField(preferredLabel);
                 field.showAlpha = colorUsage.showAlpha;
                 field.hdr = colorUsage.hdr;
                 field.bindingPath = property.propertyPath;
@@ -418,7 +446,7 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             if (property.propertyType == SerializedPropertyType.Gradient)
             {
                 var gradientUsage = (GradientUsageAttribute)attribute;
-                var field = new GradientField(property.displayName);
+                var field = new GradientField(preferredLabel);
                 field.hdr = gradientUsage.hdr;
                 field.colorSpace = gradientUsage.colorSpace;
                 field.bindingPath = property.propertyPath;
@@ -454,12 +482,12 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             {
                 if (property.type == "float")
                 {
-                    newField = new FloatField(property.displayName);
+                    newField = new FloatField(preferredLabel);
                     ((TextInputBaseField<float>)newField).isDelayed = true;
                 }
                 else if (property.type == "double")
                 {
-                    newField = new DoubleField(property.displayName);
+                    newField = new DoubleField(preferredLabel);
                     ((TextInputBaseField<double>)newField).isDelayed = true;
                 }
             }
@@ -467,18 +495,18 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             {
                 if (property.type == "int")
                 {
-                    newField = new IntegerField(property.displayName);
+                    newField = new IntegerField(preferredLabel);
                     ((TextInputBaseField<int>)newField).isDelayed = true;
                 }
                 else if (property.type == "long")
                 {
-                    newField = new LongField(property.displayName);
+                    newField = new LongField(preferredLabel);
                     ((TextInputBaseField<long>)newField).isDelayed = true;
                 }
             }
             else if (property.propertyType == SerializedPropertyType.String)
             {
-                newField = new TextField(property.displayName);
+                newField = new TextField(preferredLabel);
                 ((TextInputBaseField<string>)newField).isDelayed = true;
             }
 
diff --git a/Editor/Mono/ScriptAttributeGUI/PropertyDrawer.cs b/Editor/Mono/ScriptAttributeGUI/PropertyDrawer.cs
index f6103f0cc4..5dc8cc3d84 100644
--- a/Editor/Mono/ScriptAttributeGUI/PropertyDrawer.cs
+++ b/Editor/Mono/ScriptAttributeGUI/PropertyDrawer.cs
@@ -14,6 +14,7 @@ public abstract class PropertyDrawer : GUIDrawer
     {
         internal PropertyAttribute m_Attribute;
         internal FieldInfo m_FieldInfo;
+        internal string m_PreferredLabel;
 
         // The [[PropertyAttribute]] for the property. Not applicable for custom class drawers. (RO)
         public PropertyAttribute attribute { get { return m_Attribute; } }
@@ -21,6 +22,9 @@ public abstract class PropertyDrawer : GUIDrawer
         // The reflection FieldInfo for the member this property represents. (RO)
         public FieldInfo fieldInfo { get { return m_FieldInfo; } }
 
+        // The preferred label for this property.
+        public string preferredLabel => m_PreferredLabel;
+
         internal void OnGUISafe(Rect position, SerializedProperty property, GUIContent label)
         {
             ScriptAttributeUtility.s_DrawerStack.Push(this);
diff --git a/Editor/Mono/ScriptAttributeGUI/PropertyHandler.cs b/Editor/Mono/ScriptAttributeGUI/PropertyHandler.cs
index dff46e8072..d3111dfc6e 100644
--- a/Editor/Mono/ScriptAttributeGUI/PropertyHandler.cs
+++ b/Editor/Mono/ScriptAttributeGUI/PropertyHandler.cs
@@ -29,6 +29,7 @@ internal PropertyDrawer propertyDrawer
         }
 
         internal List<DecoratorDrawer> decoratorDrawers => m_DecoratorDrawers;
+        internal bool skipDecoratorDrawers { get; set; }
 
         private int m_NestingLevel;
 
@@ -153,7 +154,8 @@ internal bool OnGUI(Rect position, SerializedProperty property, GUIContent label
 
             float propHeight = position.height;
             position.height = 0;
-            if (m_DecoratorDrawers != null && !isCurrentlyNested)
+
+            if (!skipDecoratorDrawers && m_DecoratorDrawers != null && !isCurrentlyNested)
             {
                 foreach (DecoratorDrawer decorator in m_DecoratorDrawers)
                 {
@@ -302,7 +304,7 @@ public float GetHeight(SerializedProperty property, GUIContent label, bool inclu
         {
             float height = 0;
 
-            if (m_DecoratorDrawers != null && !isCurrentlyNested)
+            if (!skipDecoratorDrawers && m_DecoratorDrawers != null && !isCurrentlyNested)
                 foreach (DecoratorDrawer drawer in m_DecoratorDrawers)
                     height += drawer.GetHeight();
 
@@ -346,9 +348,9 @@ public float GetHeight(SerializedProperty property, GUIContent label, bool inclu
                 bool childrenAreExpanded = property.isExpanded && EditorGUI.HasVisibleChildFields(property);
 
                 // Loop through all child properties
-                var tc = EditorGUIUtility.TempContent(property.localizedDisplayName, tooltip);
                 if (childrenAreExpanded)
                 {
+                    var tc = EditorGUIUtility.TempContent(property.localizedDisplayName, tooltip);
                     SerializedProperty endProperty = property.GetEndProperty();
                     while (property.NextVisible(childrenAreExpanded) && !SerializedProperty.EqualContents(property, endProperty))
                     {
diff --git a/Editor/Mono/ScriptAttributeGUI/ScriptAttributeUtility.cs b/Editor/Mono/ScriptAttributeGUI/ScriptAttributeUtility.cs
index 6542e04cd1..97924da5a4 100644
--- a/Editor/Mono/ScriptAttributeGUI/ScriptAttributeUtility.cs
+++ b/Editor/Mono/ScriptAttributeGUI/ScriptAttributeUtility.cs
@@ -284,11 +284,11 @@ internal static bool GetTypeFromManagedReferenceFullTypeName(string managedRefer
         {
             managedReferenceInstanceType = null;
 
-            var parts = managedReferenceFullTypename.Split(' ');
-            if (parts.Length == 2)
+            var splitIndex = managedReferenceFullTypename.IndexOf(' ');
+            if (splitIndex > 0)
             {
-                var assemblyPart = parts[0];
-                var nsClassnamePart = parts[1];
+                var assemblyPart = managedReferenceFullTypename.Substring(0, splitIndex);
+                var nsClassnamePart = managedReferenceFullTypename.Substring(splitIndex);
                 managedReferenceInstanceType = Type.GetType($"{nsClassnamePart}, {assemblyPart}");
             }
 
diff --git a/Editor/Mono/ScriptReloadProperties.cs b/Editor/Mono/ScriptReloadProperties.cs
index b57cbd2b1b..3bb23a2d91 100644
--- a/Editor/Mono/ScriptReloadProperties.cs
+++ b/Editor/Mono/ScriptReloadProperties.cs
@@ -67,7 +67,7 @@ private void ManagedStore()
             EditorGUI_TextEditor_cursorIndex = EditorGUI.s_RecycledEditor.cursorIndex;
             EditorGUI_TextEditor_selectIndex = EditorGUI.s_RecycledEditor.selectIndex;
             EditorGUI_TextEditor_controlID = EditorGUI.s_RecycledEditor.controlID;
-            EditorGUI_TextEditor_hasHorizontalCursorPos = EditorGUI.s_RecycledEditor.hasHorizontalCursorPos;
+            EditorGUI_TextEditor_hasHorizontalCursorPos = EditorGUI.s_RecycledEditor.hasHorizontalCursor;
             EditorGUI_TextEditor_scrollOffset = EditorGUI.s_RecycledEditor.scrollOffset;
             EditorGUI_TextEditor_hasFocus = EditorGUI.s_RecycledEditor.m_HasFocus;
             EditorGUI_TextEditor_graphicalCursorPos = EditorGUI.s_RecycledEditor.graphicalCursorPos;
@@ -77,7 +77,7 @@ private void ManagedStore()
             EditorGUI_DelayedTextEditor_cursorIndex = EditorGUI.s_DelayedTextEditor.cursorIndex;
             EditorGUI_DelayedTextEditor_selectIndex = EditorGUI.s_DelayedTextEditor.selectIndex;
             EditorGUI_DelayedTextEditor_controlID = EditorGUI.s_DelayedTextEditor.controlID;
-            EditorGUI_DelayedTextEditor_hasHorizontalCursorPos = EditorGUI.s_DelayedTextEditor.hasHorizontalCursorPos;
+            EditorGUI_DelayedTextEditor_hasHorizontalCursorPos = EditorGUI.s_DelayedTextEditor.hasHorizontalCursor;
             EditorGUI_DelayedTextEditor_scrollOffset = EditorGUI.s_DelayedTextEditor.scrollOffset;
             EditorGUI_DelayedTextEditor_hasFocus = EditorGUI.s_DelayedTextEditor.m_HasFocus;
             EditorGUI_DelayedTextEditor_graphicalCursorPos = EditorGUI.s_DelayedTextEditor.graphicalCursorPos;
@@ -93,7 +93,7 @@ private void ManagedLoad()
             EditorGUI.s_RecycledEditor.cursorIndex = EditorGUI_TextEditor_cursorIndex;
             EditorGUI.s_RecycledEditor.selectIndex = EditorGUI_TextEditor_selectIndex;
             EditorGUI.s_RecycledEditor.controlID = EditorGUI_TextEditor_controlID;
-            EditorGUI.s_RecycledEditor.hasHorizontalCursorPos = EditorGUI_TextEditor_hasHorizontalCursorPos;
+            EditorGUI.s_RecycledEditor.hasHorizontalCursor = EditorGUI_TextEditor_hasHorizontalCursorPos;
             EditorGUI.s_RecycledEditor.scrollOffset = EditorGUI_TextEditor_scrollOffset;
             EditorGUI.s_RecycledEditor.m_HasFocus = EditorGUI_TextEditor_hasFocus;
             EditorGUI.s_RecycledEditor.graphicalCursorPos = EditorGUI_TextEditor_graphicalCursorPos;
@@ -103,7 +103,7 @@ private void ManagedLoad()
             EditorGUI.s_DelayedTextEditor.cursorIndex = EditorGUI_DelayedTextEditor_cursorIndex;
             EditorGUI.s_DelayedTextEditor.selectIndex = EditorGUI_DelayedTextEditor_selectIndex;
             EditorGUI.s_DelayedTextEditor.controlID = EditorGUI_DelayedTextEditor_controlID;
-            EditorGUI.s_DelayedTextEditor.hasHorizontalCursorPos = EditorGUI_DelayedTextEditor_hasHorizontalCursorPos;
+            EditorGUI.s_DelayedTextEditor.hasHorizontalCursor = EditorGUI_DelayedTextEditor_hasHorizontalCursorPos;
             EditorGUI.s_DelayedTextEditor.scrollOffset = EditorGUI_DelayedTextEditor_scrollOffset;
             EditorGUI.s_DelayedTextEditor.m_HasFocus = EditorGUI_DelayedTextEditor_hasFocus;
             EditorGUI.s_DelayedTextEditor.graphicalCursorPos = EditorGUI_DelayedTextEditor_graphicalCursorPos;
diff --git a/Editor/Mono/ScriptableSingleton.cs b/Editor/Mono/ScriptableSingleton.cs
index 2eae2e1973..836f04ce39 100644
--- a/Editor/Mono/ScriptableSingleton.cs
+++ b/Editor/Mono/ScriptableSingleton.cs
@@ -110,7 +110,9 @@ private static void CreateAndLoad()
             {
                 // Create
                 T t = CreateInstance<T>();
-                t.hideFlags = HideFlags.HideAndDontSave;
+
+                // Editing should be allowed, but the user is responsible for calling Save() (case uum-40767)
+                t.hideFlags = HideFlags.HideAndDontSave & ~HideFlags.NotEditable;
             }
 
             System.Diagnostics.Debug.Assert(s_Instance != null);
diff --git a/Editor/Mono/Scripting/APIUpdater/APIUpdaterAssemblyHelper.cs b/Editor/Mono/Scripting/APIUpdater/APIUpdaterAssemblyHelper.cs
index ee0fe213a9..08092954dc 100644
--- a/Editor/Mono/Scripting/APIUpdater/APIUpdaterAssemblyHelper.cs
+++ b/Editor/Mono/Scripting/APIUpdater/APIUpdaterAssemblyHelper.cs
@@ -47,8 +47,8 @@ internal static int Run(string arguments, string workingDir, out string stdOut,
 
             return assemblyUpdaterProcess.ExitCode;
         }
-
-        static string AssemblyUpdaterPath() => EditorApplication.applicationContentsPath + "/Tools/ScriptUpdater/AssemblyUpdater.exe";
+        
+        static string AssemblyUpdaterPath() => $"{EditorApplication.applicationContentsPath}/Tools/Compilation/ApiUpdater/AssemblyUpdater.dll";
 
         internal static string ArgumentsForUpdateAssembly(string assemblyPath, string tempOutputPath, IEnumerable<string> updateConfigSourcePaths)
         {
diff --git a/Editor/Mono/Scripting/Compilers/APIUpdaterHelper.cs b/Editor/Mono/Scripting/APIUpdater/APIUpdaterHelper.cs
similarity index 94%
rename from Editor/Mono/Scripting/Compilers/APIUpdaterHelper.cs
rename to Editor/Mono/Scripting/APIUpdater/APIUpdaterHelper.cs
index ac35565b20..8998807262 100644
--- a/Editor/Mono/Scripting/Compilers/APIUpdaterHelper.cs
+++ b/Editor/Mono/Scripting/APIUpdater/APIUpdaterHelper.cs
@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Runtime.InteropServices;
 using Mono.Cecil;
 using NiceIO;
 using UnityEditor.PackageManager;
@@ -18,10 +19,14 @@
 using UnityEngine.Scripting.APIUpdating;
 using static System.Environment;
 
-namespace UnityEditor.Scripting.Compilers
+namespace UnityEditor.Scripting
 {
     internal static class APIUpdaterHelper
     {
+        private static string ComputePlatformExecutableExtension() => RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty;
+        
+        internal static readonly string PlatformExecutableExtensionWithDot = ComputePlatformExecutableExtension();
+
         public static bool IsInPackage(this string filePath)
         {
             return EditorCompilationInterface.Instance.IsPathInPackageDirectory(filePath);
diff --git a/Editor/Mono/Scripting/APIUpdater/APIUpdaterManager.bindings.cs b/Editor/Mono/Scripting/APIUpdater/APIUpdaterManager.bindings.cs
index ec3858667b..c4a2d3323e 100644
--- a/Editor/Mono/Scripting/APIUpdater/APIUpdaterManager.bindings.cs
+++ b/Editor/Mono/Scripting/APIUpdater/APIUpdaterManager.bindings.cs
@@ -9,7 +9,6 @@
 using UnityEditor.Scripting;
 using UnityEditor.Scripting.APIUpdater;
 using UnityEditor.Scripting.ScriptCompilation;
-using UnityEditor.Scripting.Compilers;
 using UnityEditor.Utils;
 using UnityEditor.VersionControl;
 using UnityEditor.PackageManager;
@@ -300,7 +299,7 @@ private static int ProcessSuccessfulUpdates(AssemblyUpdaterUpdateTask[] tasks)
                 APIUpdaterLogger.WriteToFile("Assemblies not requiring updates:");
                 foreach (var noUpdateRequired in noUpdatesRequiredAssemblies)
                 {
-                    APIUpdaterLogger.WriteToFile($"{noUpdateRequired.Candidate.Path} (stdout below):{Environment.NewLine}{noUpdateRequired.StdOut}{Environment.NewLine}");
+                    APIUpdaterLogger.WriteToFile($"{noUpdateRequired.Candidate.Path}{FormattedStoutFrom(noUpdateRequired)}");
                 }
             }
 
@@ -366,6 +365,14 @@ IEnumerable<string> FilterOutLocalAndEmbeddedPackagesWhenAskingForConsent(IEnume
                         yield return path;
                 }
             }
+
+            static string FormattedStoutFrom(AssemblyUpdaterUpdateTask task)
+            {
+                if (task.StdOut.Length == 0)
+                    return string.Empty;
+
+                return $" (stdout below):{Environment.NewLine}{task.StdOut}{Environment.NewLine}";
+            }
         }
 
         private static void RunAssemblyUpdaterTask(object o)
diff --git a/Editor/Mono/Scripting/Compilers/CompilerOutputParserBase.cs b/Editor/Mono/Scripting/Compilers/CompilerOutputParserBase.cs
index 166ccfe87e..190c4f08e4 100644
--- a/Editor/Mono/Scripting/Compilers/CompilerOutputParserBase.cs
+++ b/Editor/Mono/Scripting/Compilers/CompilerOutputParserBase.cs
@@ -101,6 +101,11 @@ public virtual IEnumerable<CompilerMessage> Parse(string[] errorOutput, string[]
             return msgs;
         }
 
+        protected virtual bool ShouldParseLine(string line)
+        {
+            return true;
+        }
+
         protected abstract string GetErrorIdentifier();
 
         protected virtual string GetInformationIdentifier()
diff --git a/Editor/Mono/Scripting/ScriptCompilation/AssemblyGraphBuilder.cs b/Editor/Mono/Scripting/ScriptCompilation/AssemblyGraphBuilder.cs
index 05956a9893..1084ae54f8 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/AssemblyGraphBuilder.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/AssemblyGraphBuilder.cs
@@ -12,7 +12,7 @@ namespace UnityEditor.Scripting.ScriptCompilation
     internal interface IAssemblyGraphBuilder
     {
         Dictionary<CustomScriptAssembly, List<string>> Match(
-            IReadOnlyCollection<string> sources);
+            IReadOnlyCollection<string> sources, bool logWarningOnMiss = true);
     }
 
     internal class AssemblyGraphBuilder : IAssemblyGraphBuilder
@@ -131,7 +131,7 @@ public void Initialize(IReadOnlyCollection<CustomScriptAssembly> assemblies,
         }
 
         public Dictionary<CustomScriptAssembly, List<string>> Match(
-            IReadOnlyCollection<string> sources)
+            IReadOnlyCollection<string> sources, bool logWarningOnMiss = true)
         {
             var assemblyNameSources = new Dictionary<CustomScriptAssembly, List<string>>();
 
@@ -144,8 +144,12 @@ public Dictionary<CustomScriptAssembly, List<string>> Match(
 
                 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.");
+                    if (logWarningOnMiss)
+                    {
+                        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;
                 }
 
diff --git a/Editor/Mono/Scripting/ScriptCompilation/AssetPathVersionMetaData.cs b/Editor/Mono/Scripting/ScriptCompilation/AssetPathVersionMetaData.cs
index 780289633d..24f0299c58 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/AssetPathVersionMetaData.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/AssetPathVersionMetaData.cs
@@ -26,6 +26,24 @@ class VersionMetaData
         public string Name;
         public string Version;
         public VersionType Type;
+
+        public VersionMetaData(string name)
+        {
+            Name = name;
+        }
+
+        public VersionMetaData(string name, string version)
+        {
+            Name = name;
+            Version = version;
+        }
+		
+        public VersionMetaData(string name, string version, VersionType type)
+        {
+            Name = name;
+            Version = version;
+			Type = type;
+        }
     }
 
 
diff --git a/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/BeeScriptCompilation.cs b/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/BeeScriptCompilation.cs
index 006e2e5cfe..ae49eba4f4 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/BeeScriptCompilation.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/BeeScriptCompilation.cs
@@ -48,7 +48,7 @@ public static ScriptCompilationData ScriptCompilationDataFor(
                     : AssemblyDataFrom(CodeGenAssemblies(CompilationPipeline.GetScriptAssemblies(editorCompilation, AssembliesType.Editor, extraScriptingDefines)));
             }
 
-            var movedFromExtractorPath = EditorApplication.applicationContentsPath + $"/Tools/ScriptUpdater/ApiUpdater.MovedFromExtractor.exe";
+            var movedFromExtractorPath = $"{EditorApplication.applicationContentsPath}/Tools/Compilation/ApiUpdater/ApiUpdater.MovedFromExtractor.dll";
             var dotNetSdkRoslynPath = EditorApplication.applicationContentsPath + $"/DotNetSdkRoslyn";
 
             var localization = "en-US";
@@ -129,7 +129,7 @@ private static AssemblyData[] AssemblyDataFrom(ScriptAssembly[] assemblies)
 
         private static AssemblyData AssemblyDataFrom(ScriptAssembly a, ScriptAssembly[] allAssemblies, int index)
         {
-            Array.Sort(a.Files, StringComparer.InvariantCulture);
+            Array.Sort(a.Files, StringComparer.Ordinal);
             var references = a.ScriptAssemblyReferences.Select(r => Array.IndexOf(allAssemblies, r)).ToArray();
             Array.Sort(references);
             return new AssemblyData
diff --git a/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/UnityScriptUpdater.cs b/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/UnityScriptUpdater.cs
index 86a11592df..eb40258215 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/UnityScriptUpdater.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/UnityScriptUpdater.cs
@@ -38,7 +38,7 @@ public UnityScriptUpdater(NPath projectRoot)
 
         static RunnableProgram DefaultScriptUpdaterProgram()
         {
-            NPath scriptUpdaterExe = $"{EditorApplication.applicationContentsPath}/Tools/ScriptUpdater/ScriptUpdater.exe";
+            NPath scriptUpdaterExe = $"{EditorApplication.applicationContentsPath}/Tools/Compilation/ApiUpdater/ScriptUpdater.dll";
             return new SystemProcessRunnableProgram(NetCoreRunProgram.NetCoreRunPath, new[] {scriptUpdaterExe.InQuotes()}, stdOutMode: StdOutMode.LogStdOutOnFinish);
         }
 
diff --git a/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssembly.cs b/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssembly.cs
index bafdba1c32..7b5d10b7a8 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssembly.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssembly.cs
@@ -285,7 +285,7 @@ public AssemblyFlags AssemblyFlags
                 }
 
                 bool rootFolder, immutable;
-                bool imported = AssetDatabase.GetAssetFolderInfo(PathPrefix, out rootFolder, out immutable);
+                bool imported = AssetDatabase.TryGetAssetFolderInfo(PathPrefix, out rootFolder, out immutable);
 
                 // Do not emit warnings for immutable (package) folders,
                 // as the user cannot do anything to fix them.
@@ -358,6 +358,7 @@ static CustomScriptAssembly()
                 new CustomScriptAssemblyPlatform("LinuxStandalone32", BuildTarget.StandaloneLinux),
                 new CustomScriptAssemblyPlatform("LinuxStandaloneUniversal", BuildTarget.StandaloneLinuxUniversal),
                 new CustomScriptAssemblyPlatform("Lumin", BuildTarget.Lumin),
+                new CustomScriptAssemblyPlatform("Stadia", BuildTarget.Stadia),
             };
 #pragma warning restore 0618
         }
diff --git a/Editor/Mono/Scripting/ScriptCompilation/EditorBuildRules.cs b/Editor/Mono/Scripting/ScriptCompilation/EditorBuildRules.cs
index 9864da668a..ba10a39ac8 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/EditorBuildRules.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/EditorBuildRules.cs
@@ -332,7 +332,7 @@ internal static void AddScriptAssemblyReferences(ref ScriptAssembly scriptAssemb
             if (shouldProcessPredefinedCustomTargets && assemblies.PredefinedAssembliesCustomTargetReferences != null)
                 predefinedCustomTargetReferences = assemblies.PredefinedAssembliesCustomTargetReferences;
 
-            var unityReferences = Array.Empty<PrecompiledAssembly>();
+            var unityReferences = new HashSet<string>();
 
             // Add Unity assemblies (UnityEngine.dll, UnityEditor.dll) references, as long as the target
             // doesn't specify that it doesn't want them.
@@ -340,8 +340,13 @@ internal static void AddScriptAssemblyReferences(ref ScriptAssembly scriptAssemb
             {
                 // Add predefined custom target references in a hash-set for fast lookup
                 var predefinedCustomTargetRefs = new HashSet<string>(predefinedCustomTargetReferences.Select(x => x.Filename));
-                unityReferences = GetUnityReferences(scriptAssembly, targetAssembly, assemblies.UnityAssemblies, predefinedCustomTargetRefs, settings.CompilationOptions, UnityReferencesOptions.None);
-                references.AddRange(unityReferences.Select(r => r.Path));
+                foreach (var unityReference in GetUnityReferences(scriptAssembly, targetAssembly,
+                             assemblies.UnityAssemblies, predefinedCustomTargetRefs, settings.CompilationOptions,
+                             UnityReferencesOptions.None))
+                {
+                    unityReferences.Add(Path.GetFileName(unityReference.Path));
+                    references.Add(unityReference.Path);
+                }
             }
 
             AddTestRunnerCustomReferences(ref targetAssembly, assemblies.CustomTargetAssemblies);
@@ -354,7 +359,7 @@ internal static void AddScriptAssemblyReferences(ref ScriptAssembly scriptAssemb
                 // If the assembly already showed up in the unity references, don't reference it here.
                 // This can happen when an assembly is configured as a unity assembly override, but
                 // overrides are disabled. The Unity assembly should take precedence in that case.
-                if (unityReferences.Any(r => Path.GetFileName(r.Path) == reference.Filename))
+                if (unityReferences.Contains(reference.Filename))
                     continue;
 
                 // Add ScriptAssembly references to other dirty script assemblies that also need to be rebuilt.
diff --git a/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs b/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs
index 497ecaebde..4f6a579580 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs
@@ -65,6 +65,8 @@ public struct TargetAssemblyInfo
         {
             public string Name;
             public AssemblyFlags Flags;
+
+            public static readonly TargetAssemblyInfo Unknown = new TargetAssemblyInfo { Flags = AssemblyFlags.None, Name = null };
         }
 
         public struct CustomScriptAssemblyAndReference
@@ -1368,7 +1370,11 @@ public TargetAssemblyInfo GetTargetAssembly(string scriptPath)
                 path = Path.Combine(projectDirectory, scriptPath);
             }
 
-            var matchedAssembly = GetAssemblyGraphBuilder().Match(new []{path});
+            var matchedAssembly = GetAssemblyGraphBuilder().Match(new []{path}, false);
+            if (matchedAssembly.Count == 0)
+            {
+                return TargetAssemblyInfo.Unknown;
+            }
 
             TargetAssembly targetAssembly;
             var scriptAssembly = matchedAssembly.Single().Key;
diff --git a/Editor/Mono/Scripting/ScriptCompilation/ILPostProcessingProgram.cs b/Editor/Mono/Scripting/ScriptCompilation/ILPostProcessingProgram.cs
index f3c67c6ecf..702ec1bd37 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/ILPostProcessingProgram.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/ILPostProcessingProgram.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -12,6 +13,7 @@
 using UnityEditor.Utils;
 using UnityEngine;
 using UnityEngine.Bindings;
+using UnityEngine.Scripting;
 
 namespace UnityEditor.Scripting.ScriptCompilation
 {
@@ -30,5 +32,42 @@ public virtual string EnsureRunningAndGetSocketOrNamedPipe()
         [NativeHeader("Editor/Src/ScriptCompilation/ILPPExternalProcess.h")]
         [FreeFunction("ILPPExternalProcess::EnsureRunningAndGetSocketOrNamedPipe", IsThreadSafe = true)]
         private static extern string EnsureRunningAndGetSocketOrNamedPipeImpl();
+
+        [RequiredByNativeCode(GenerateProxy = true)]
+        private static void KillLingeringILPPRunner()
+        {
+            var pidFilePath = Path.Combine("Library", "ilpp.pid");
+            if (!File.Exists(pidFilePath))
+            {
+                return;
+            }
+            int processId;
+            try
+            {
+                processId = int.Parse(File.ReadAllText(pidFilePath), CultureInfo.InvariantCulture);
+            }
+            catch(FormatException) {
+                // corrupted pid file, return
+                return;
+            }
+            try
+            {
+                var process = Process.GetProcessById(processId);
+                if(process.ProcessName == "Unity.ILPP.Runner" || process.ProcessName == "Unity.ILPP.Runner.exe")
+                {
+                    UnityEngine.Debug.Log($"Found a lingering IL Post Processing runner process with PID {processId}. Killing it.");
+                    process.Kill();
+                }
+            }
+            catch (ArgumentException)
+            {
+                // no process with this ID
+                return;
+            }
+            catch (InvalidOperationException)
+            {
+                // process exitted while the Process instance is manipulated
+            }
+        }
     }
 }
diff --git a/Editor/Mono/Scripting/ScriptCompilation/PostProcessorOutputParser.cs b/Editor/Mono/Scripting/ScriptCompilation/PostProcessorOutputParser.cs
index 30e34b42af..f65f52e72a 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/PostProcessorOutputParser.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/PostProcessorOutputParser.cs
@@ -2,8 +2,12 @@
 // 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.RegularExpressions;
 using UnityEditor.Scripting.Compilers;
+using UnityEditorInternal;
+using UnityEngine;
 
 namespace UnityEditor.Scripting.ScriptCompilation
 {
@@ -11,6 +15,67 @@ internal class PostProcessorOutputParser : CompilerOutputParserBase
     {
         private static Regex sCompilerOutput = new Regex(@"(?<filename>[^:]*)\((?<line>\d+),(?<column>\d+)\):\s*(?<type>warning|error)\s*(?<message>.*)", RegexOptions.ExplicitCapture | RegexOptions.Compiled);
 
+        protected override bool ShouldParseLine(string line)
+        {
+            return line.Contains("warning", StringComparison.Ordinal) ||
+                   line.Contains("error", StringComparison.Ordinal);
+        }
+
+        public override IEnumerable<CompilerMessage> Parse(string[] errorOutput, string[] standardOutput, bool compilationHadFailure, string assemblyName_unused = null)
+        {
+            var hasErrors = false;
+            var msgs = new List<CompilerMessage>();
+            var regex = GetOutputRegex();
+            var internalErrorRegex = GetInternalErrorOutputRegex();
+
+            var isWarningError = false;
+            var completeWarningErrors = new List<string>();
+            for (int i = 0; i < errorOutput.Length; i++)
+            {
+                if (!ShouldParseLine(errorOutput[i]))
+                {
+                    if (isWarningError)
+                        completeWarningErrors[completeWarningErrors.Count - 1] += "\n" + errorOutput[i];
+
+                    continue;
+                }
+
+                if (regex.Match(errorOutput[i]).Success || (internalErrorRegex != null && internalErrorRegex.Match(errorOutput[i]).Success))
+                {
+                    completeWarningErrors.Add(errorOutput[i]);
+                    isWarningError = true;
+                }
+                else if (completeWarningErrors.Count > 0)
+                    completeWarningErrors[completeWarningErrors.Count - 1] += "\n" + errorOutput[i];
+            }
+
+            foreach (var line in completeWarningErrors)
+            {
+                //Jamplus can fail with enormous lines in the stdout, parsing of which can take 30! seconds.
+                var line2 = line.Length > 1000 ? line.Substring(0, 100) : line;
+                var regrexLineToMatch = line2.Split("\n");
+                Match m = regex.Match(regrexLineToMatch[0]);
+                if (!m.Success)
+                {
+                    if (internalErrorRegex != null)
+                        m = internalErrorRegex.Match(regrexLineToMatch[0]);
+                    if (!m.Success)
+                        continue;
+                }
+                CompilerMessage message = CreateCompilerMessageFromMatchedRegex(line, m, GetErrorIdentifier(), GetInformationIdentifier());
+
+                if (message.type == CompilerMessageType.Error)
+                    hasErrors = true;
+
+                msgs.Add(message);
+            }
+            if (compilationHadFailure && !hasErrors)
+            {
+                msgs.Add(CreateInternalCompilerErrorMessage(errorOutput));
+            }
+            return msgs;
+        }
+
         protected override string GetInformationIdentifier()
         {
             return default;
diff --git a/Editor/Mono/Search/SearchService.cs b/Editor/Mono/Search/SearchService.cs
index d8fa52f3e3..3292b92801 100644
--- a/Editor/Mono/Search/SearchService.cs
+++ b/Editor/Mono/Search/SearchService.cs
@@ -220,21 +220,6 @@ public enum SyncSearchEvent
 
         public static event Action<SyncSearchEvent, string, string> syncSearchChanged;
 
-        static SearchService()
-        {
-            Build.BuildDefines.getScriptCompilationDefinesDelegates += AddSearchServiceBuildDefines;
-        }
-
-        private static void AddSearchServiceBuildDefines(BuildTarget target, HashSet<string> defines)
-        {
-            defines.Add("USE_SEARCH_ENGINE_API");
-            defines.Add("USE_SEARCH_TABLE");
-            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)
         {
             syncSearchChanged?.Invoke(evt, syncViewId, searchQuery);
diff --git a/Editor/Mono/SearchUtility.cs b/Editor/Mono/SearchUtility.cs
index bc460b41ad..013049fa40 100644
--- a/Editor/Mono/SearchUtility.cs
+++ b/Editor/Mono/SearchUtility.cs
@@ -6,8 +6,6 @@
 using System.Collections.Generic;
 using UnityEditor.AssetImporters;
 using Object = UnityEngine.Object;
-using UnityEditor.Collaboration;
-using UnityEditor.Connect;
 
 namespace UnityEditor
 {
@@ -119,25 +117,6 @@ internal static bool CheckForKeyWords(string searchString, SearchFilter filter,
                 parsed = true;
             }
 
-            // Support: 'v:versionState' syntax
-            if (HasFilter(searchString, "v"))
-            {
-                string versionStateString = searchString.Substring(2);
-                List<string> tmp = new List<string>(filter.versionControlStates);
-                tmp.Add(versionStateString);
-                filter.versionControlStates = tmp.ToArray();
-                parsed = true;
-            }
-
-            // Support: 's:softLockState' syntax
-            if (HasFilter(searchString, "s"))
-            {
-                string softLockStateString = searchString.Substring(2);
-                List<string> tmp = new List<string>(filter.softLockControlStates);
-                tmp.Add(softLockStateString);
-                filter.softLockControlStates = tmp.ToArray();
-                parsed = true;
-            }
             // Support: 'a:area' syntax
             if (HasFilter(searchString, "a"))
             {
diff --git a/Editor/Mono/Selection.bindings.cs b/Editor/Mono/Selection.bindings.cs
index 626077c6c9..f9f8745e85 100644
--- a/Editor/Mono/Selection.bindings.cs
+++ b/Editor/Mono/Selection.bindings.cs
@@ -82,13 +82,13 @@ extern public static Object activeObject
         }
 
         [StaticAccessor("SelectionBindings", StaticAccessorType.DoubleColon)]
-        extern internal static void SetSelectionWithActiveObject(Object[] newSelection, Object activeObject);
+        extern internal static void SetSelectionWithActiveObject([Unmarshalled] Object[] newSelection, Object activeObject);
 
         [StaticAccessor("SelectionBindings", StaticAccessorType.DoubleColon)]
         extern internal static void SetSelectionWithActiveInstanceID([NotNull("NullReferenceException")] int[] newSelection, int activeObject);
 
         [StaticAccessor("SelectionBindings", StaticAccessorType.DoubleColon)]
-        internal static extern void SetFullSelection(Object[] newSelection, Object activeObject, Object context, DataMode dataModeHint);
+        internal static extern void SetFullSelection([Unmarshalled] Object[] newSelection, Object activeObject, Object context, DataMode dataModeHint);
 
         [StaticAccessor("SelectionBindings", StaticAccessorType.DoubleColon)]
         internal static extern void SetFullSelectionByID([NotNull("NullReferenceException")]int[] newSelection, int activeObjectInstanceID, int contextInstanceID, DataMode dataModeHint);
@@ -121,7 +121,7 @@ internal extern static DataMode dataModeHint
 
         // The actual unfiltered selection from the Scene.
         [StaticAccessor("SelectionBindings", StaticAccessorType.DoubleColon)]
-        extern public static Object[] objects { get; set; }
+        extern public static Object[] objects { get; [param:Unmarshalled] set; }
 
         // The actual unfiltered selection from the Scene returned as instance ids instead of ::ref::objects.
         [StaticAccessor("SelectionBindings", StaticAccessorType.DoubleColon)]
diff --git a/Editor/Mono/SerializedObject.bindings.cs b/Editor/Mono/SerializedObject.bindings.cs
index dfb176f481..49e18c5a18 100644
--- a/Editor/Mono/SerializedObject.bindings.cs
+++ b/Editor/Mono/SerializedObject.bindings.cs
@@ -208,6 +208,12 @@ internal extern InspectorMode inspectorMode
             set;
         }
 
+        internal extern DataMode inspectorDataMode
+        {
+            get;
+            set;
+        }
+
         // Does the serialized object represents multiple objects due to multi-object editing? (RO)
         public extern bool isEditingMultipleObjects
         {
diff --git a/Editor/Mono/SerializedProperty/SerializedPropertyTable.cs b/Editor/Mono/SerializedProperty/SerializedPropertyTable.cs
index 667d05bee6..41f9da3574 100644
--- a/Editor/Mono/SerializedProperty/SerializedPropertyTable.cs
+++ b/Editor/Mono/SerializedProperty/SerializedPropertyTable.cs
@@ -123,13 +123,14 @@ public void OnGUI()
             r.y += m_FilterHeight;
             Rect tableRect = r;
 
+            // filter
+            m_TreeView.OnFilterGUI(filterRect);
+
             // table
             Profiler.BeginSample("TreeView.OnGUI");
             m_TreeView.OnGUI(tableRect);
             Profiler.EndSample();
 
-            m_TreeView.OnFilterGUI(filterRect);
-
             if (m_TreeView.IsFilteredDirty())
                 m_TreeView.Reload();
 
diff --git a/Editor/Mono/SerializedPropertyExtensions.cs b/Editor/Mono/SerializedPropertyExtensions.cs
index 968b5038c2..a017f20690 100644
--- a/Editor/Mono/SerializedPropertyExtensions.cs
+++ b/Editor/Mono/SerializedPropertyExtensions.cs
@@ -2,6 +2,9 @@
 // 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.Assertions;
 
 namespace UnityEditor
@@ -21,6 +24,7 @@ public static bool TryGetMapEntry(this SerializedProperty map, string key, out S
                     return true;
                 }
             }
+
             entry = null;
             return false;
         }
@@ -38,6 +42,7 @@ public static bool TryGetMapEntry(this SerializedProperty map, int key, out Seri
                     return true;
                 }
             }
+
             entry = null;
             return false;
         }
@@ -51,6 +56,7 @@ public static bool TryGetMapEntry(this SerializedProperty map, string key, strin
                 Assert.IsTrue(innerMap.type == "map");
                 return innerMap.TryGetMapEntry(elementMapKey, out entry);
             }
+
             entry = null;
             return false;
         }
@@ -188,5 +194,79 @@ public static void SetMapValue(this SerializedProperty map, string key, string e
                 innerMap.SetMapValue(elementMapKey, elementMapValue);
             }
         }
+
+        public static void SetValue<DataSourceType>(this SerializedProperty serializedProperty, Action<SerializedProperty, DataSourceType> serialziedPropertySetter, IList<DataSourceType> dstValues)
+        {
+            if (serializedProperty != null && serializedProperty.isArray && serialziedPropertySetter != null)
+            {
+                var numElementSerialized = serializedProperty.arraySize;
+                var numElementToInsert = dstValues.Count;
+                if (numElementSerialized > numElementToInsert)
+                {
+                    for (var i = numElementSerialized - 1; i >= numElementToInsert; i--)
+                    {
+                        serializedProperty.DeleteArrayElementAtIndex(i);
+                    }
+                }
+
+                for (var i = 0; i < numElementToInsert; i++)
+                {
+                    if (i >= numElementSerialized)
+                    {
+                        serializedProperty.InsertArrayElementAtIndex(i);
+                        numElementSerialized = serializedProperty.arraySize;
+                    }
+
+                    var objToEdit = serializedProperty.GetArrayElementAtIndex(i);
+                    DataSourceType newValue = dstValues[i];
+                    serialziedPropertySetter.Invoke(objToEdit, newValue);
+                }
+            }
+        }
+
+        public static void Setter(SerializedProperty serializedProperty, int value)
+        {
+            serializedProperty.intValue = value;
+        }
+
+        public static void Setter(SerializedProperty serializedProperty, double value)
+        {
+            serializedProperty.doubleValue = value;
+        }
+
+        public static void Setter(SerializedProperty serializedProperty, bool value)
+        {
+            serializedProperty.boolValue = value;
+        }
+
+        public static void Setter(SerializedProperty serializedProperty, string value)
+        {
+            serializedProperty.stringValue = value;
+        }
+
+        public static void Setter(SerializedProperty serializedProperty, long value)
+        {
+            serializedProperty.longValue = value;
+        }
+
+        public static void Setter(SerializedProperty serializedProperty, Color value)
+        {
+            serializedProperty.colorValue = value;
+        }
+
+        public static void Setter(SerializedProperty serializedProperty, AnimationCurve value)
+        {
+            serializedProperty.animationCurveValue = value;
+        }
+
+        public static void Setter(SerializedProperty serializedProperty, Bounds value)
+        {
+            serializedProperty.boundsValue = value;
+        }
+
+        public static void Setter(SerializedProperty serializedProperty, object value)
+        {
+            serializedProperty.boxedValue = value;
+        }
     }
 }
diff --git a/Editor/Mono/Settings.cs b/Editor/Mono/Settings.cs
index 5dd4feb09f..e50899f978 100644
--- a/Editor/Mono/Settings.cs
+++ b/Editor/Mono/Settings.cs
@@ -179,6 +179,7 @@ internal class PrefSettings
     {
         static List<IPrefType> m_AddedPrefs = new List<IPrefType>();
         static SortedList<string, object> m_Prefs = new SortedList<string, object>();
+        public static Action<string, Type> settingChanged;
 
         static internal void Add(IPrefType value)
         {
@@ -218,6 +219,7 @@ static internal void Set<T>(string name, T value)
 
             EditorPrefs.SetString(name, value.ToUniqueString());
             m_Prefs[name] = value;
+            settingChanged?.Invoke(name, typeof(T));
         }
 
         static internal IEnumerable<KeyValuePair<string, T>> Prefs<T>()
@@ -232,6 +234,16 @@ static internal IEnumerable<KeyValuePair<string, T>> Prefs<T>()
             }
         }
 
+        static internal void RevertAll<T>()
+        {
+            foreach (KeyValuePair<string, PrefColor> kvp in Prefs<PrefColor>())
+            {
+                kvp.Value.ResetToDefault();
+                EditorPrefs.SetString(kvp.Value.Name, kvp.Value.ToUniqueString());
+                settingChanged?.Invoke(kvp.Key, typeof(T));
+            }
+        }
+
         static void Load()
         {
             if (!m_AddedPrefs.Any())
diff --git a/Editor/Mono/SettingsWindow/GraphicsSettingsEditors.cs b/Editor/Mono/SettingsWindow/GraphicsSettingsEditors.cs
deleted file mode 100644
index b0239880f8..0000000000
--- a/Editor/Mono/SettingsWindow/GraphicsSettingsEditors.cs
+++ /dev/null
@@ -1,651 +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 UnityEngine;
-using UnityEditor.Build;
-using UnityEngine.Rendering;
-using EditorGraphicsSettings = UnityEditor.Rendering.EditorGraphicsSettings;
-using TierSettings = UnityEditor.Rendering.TierSettings;
-using GraphicsTier = UnityEngine.Rendering.GraphicsTier;
-using ShaderQuality = UnityEditor.Rendering.ShaderQuality;
-
-// these are smallish editor's we use for GraphicsSettings editing
-
-namespace UnityEditor
-{
-    //
-    // builtin shaders
-    //
-
-    internal partial class GraphicsSettingsWindow
-    {
-        internal class BuiltinShaderSettings
-        {
-            internal enum BuiltinShaderMode
-            {
-                None = 0,
-                Builtin,
-                Custom
-            }
-
-            readonly SerializedProperty m_Mode;
-            readonly SerializedProperty m_Shader;
-            readonly GUIContent         m_Label;
-
-            internal BuiltinShaderSettings(GUIContent label, string name, SerializedObject serializedObject)
-            {
-                m_Mode      = serializedObject.FindProperty(name + ".m_Mode");
-                m_Shader    = serializedObject.FindProperty(name + ".m_Shader");
-                m_Label = label;
-            }
-
-            internal void DoGUI()
-            {
-                EditorGUILayout.PropertyField(m_Mode, m_Label);
-                if (m_Mode.intValue == (int)BuiltinShaderMode.Custom)
-                    EditorGUILayout.PropertyField(m_Shader);
-            }
-        }
-
-        internal class BuiltinShadersEditor : Editor
-        {
-            BuiltinShaderSettings m_Deferred;
-            BuiltinShaderSettings m_DeferredReflections;
-            BuiltinShaderSettings m_ScreenSpaceShadows;
-            BuiltinShaderSettings m_DepthNormals;
-            BuiltinShaderSettings m_MotionVectors;
-            BuiltinShaderSettings m_LightHalo;
-            BuiltinShaderSettings m_LensFlare;
-
-            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 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.");
-                public static GUIContent lightHaloString = EditorGUIUtility.TrTextContent("Light Halo", "Default Shader used for light halos.");
-                public static GUIContent lensFlareString = EditorGUIUtility.TrTextContent("Lens Flare", "Default Shader used for lens flares.");
-            }
-
-            public void OnEnable()
-            {
-                m_Deferred              = new BuiltinShaderSettings(Styles.deferredString, "m_Deferred", serializedObject);
-                m_DeferredReflections   = new BuiltinShaderSettings(Styles.deferredReflString, "m_DeferredReflections", 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);
-                m_LightHalo             = new BuiltinShaderSettings(Styles.lightHaloString, "m_LightHalo", serializedObject);
-                m_LensFlare             = new BuiltinShaderSettings(Styles.lensFlareString, "m_LensFlare", serializedObject);
-            }
-
-            public override void OnInspectorGUI()
-            {
-                serializedObject.Update();
-
-                m_Deferred.DoGUI();
-
-                // deferred reflections being off affects forward vs deferred style probe rendering;
-                // need to reload shaders for new platform macro to live update
-                EditorGUI.BeginChangeCheck();
-                m_DeferredReflections.DoGUI();
-                if (EditorGUI.EndChangeCheck())
-                    ShaderUtil.ReloadAllShaders();
-
-                m_ScreenSpaceShadows.DoGUI();
-                m_DepthNormals.DoGUI();
-                m_MotionVectors.DoGUI();
-                m_LightHalo.DoGUI();
-                m_LensFlare.DoGUI();
-
-                serializedObject.ApplyModifiedProperties();
-            }
-        }
-    }
-
-
-    //
-    // video shaders
-    //
-
-
-    internal partial class GraphicsSettingsWindow
-    {
-        internal class VideoShadersEditor : Editor
-        {
-            SerializedProperty m_VideoShadersIncludeMode;
-
-            internal class Styles
-            {
-                public static GUIContent modeString = EditorGUIUtility.TrTextContent("Video", "Shaders used by the VideoPlayer decoding and compositing.");
-            }
-
-            public void OnEnable()
-            {
-                m_VideoShadersIncludeMode = serializedObject.FindProperty("m_VideoShadersIncludeMode");
-            }
-
-            public override void OnInspectorGUI()
-            {
-                serializedObject.Update();
-
-                EditorGUILayout.PropertyField(m_VideoShadersIncludeMode, Styles.modeString);
-
-                serializedObject.ApplyModifiedProperties();
-            }
-        }
-    }
-
-
-    //
-    // always included shaders
-    //
-
-
-    internal partial class GraphicsSettingsWindow
-    {
-        internal class AlwaysIncludedShadersEditor : Editor
-        {
-            SerializedProperty m_AlwaysIncludedShaders;
-
-            public void OnEnable()
-            {
-                m_AlwaysIncludedShaders = serializedObject.FindProperty("m_AlwaysIncludedShaders");
-                m_AlwaysIncludedShaders.isExpanded = true;
-            }
-
-            public override void OnInspectorGUI()
-            {
-                serializedObject.Update();
-
-                EditorGUILayout.PropertyField(m_AlwaysIncludedShaders, true);
-
-                serializedObject.ApplyModifiedProperties();
-            }
-        }
-    }
-
-
-    //
-    // shader stripping
-    //
-
-
-    internal partial class GraphicsSettingsWindow
-    {
-        internal class ShaderStrippingEditor : Editor
-        {
-            SerializedProperty m_LightmapStripping;
-            SerializedProperty m_LightmapKeepPlain;
-            SerializedProperty m_LightmapKeepDirCombined;
-            SerializedProperty m_LightmapKeepDynamicPlain;
-            SerializedProperty m_LightmapKeepDynamicDirCombined;
-            SerializedProperty m_LightmapKeepShadowMask;
-            SerializedProperty m_LightmapKeepSubtractive;
-            SerializedProperty m_FogStripping;
-            SerializedProperty m_FogKeepLinear;
-            SerializedProperty m_FogKeepExp;
-            SerializedProperty m_FogKeepExp2;
-            SerializedProperty m_InstancingStripping;
-            SerializedProperty m_BrgStripping;
-
-            public void OnEnable()
-            {
-                m_LightmapStripping = serializedObject.FindProperty("m_LightmapStripping");
-                m_LightmapKeepPlain = serializedObject.FindProperty("m_LightmapKeepPlain");
-                m_LightmapKeepDirCombined = serializedObject.FindProperty("m_LightmapKeepDirCombined");
-                m_LightmapKeepDynamicPlain = serializedObject.FindProperty("m_LightmapKeepDynamicPlain");
-                m_LightmapKeepDynamicDirCombined = serializedObject.FindProperty("m_LightmapKeepDynamicDirCombined");
-                m_LightmapKeepShadowMask = serializedObject.FindProperty("m_LightmapKeepShadowMask");
-                m_LightmapKeepSubtractive = serializedObject.FindProperty("m_LightmapKeepSubtractive");
-                m_FogStripping = serializedObject.FindProperty("m_FogStripping");
-                m_FogKeepLinear = serializedObject.FindProperty("m_FogKeepLinear");
-                m_FogKeepExp = serializedObject.FindProperty("m_FogKeepExp");
-                m_FogKeepExp2 = serializedObject.FindProperty("m_FogKeepExp2");
-                m_InstancingStripping = serializedObject.FindProperty("m_InstancingStripping");
-                m_BrgStripping = serializedObject.FindProperty("m_BrgStripping");
-            }
-
-            public override void OnInspectorGUI()
-            {
-                serializedObject.Update();
-
-                bool calcLightmapStripping = false, calcFogStripping = false;
-
-                EditorGUILayout.PropertyField(m_LightmapStripping, Styles.lightmapModes);
-
-                if (m_LightmapStripping.intValue != 0)
-                {
-                    EditorGUI.indentLevel++;
-                    EditorGUILayout.PropertyField(m_LightmapKeepPlain, Styles.lightmapPlain);
-                    EditorGUILayout.PropertyField(m_LightmapKeepDirCombined, Styles.lightmapDirCombined);
-                    EditorGUILayout.PropertyField(m_LightmapKeepDynamicPlain, Styles.lightmapDynamicPlain);
-                    EditorGUILayout.PropertyField(m_LightmapKeepDynamicDirCombined, Styles.lightmapDynamicDirCombined);
-                    EditorGUILayout.PropertyField(m_LightmapKeepShadowMask, Styles.lightmapKeepShadowMask);
-                    EditorGUILayout.PropertyField(m_LightmapKeepSubtractive, Styles.lightmapKeepSubtractive);
-                    EditorGUILayout.Space();
-
-                    EditorGUILayout.BeginHorizontal();
-                    EditorGUILayout.PrefixLabel(GUIContent.Temp(" "), EditorStyles.miniButton);
-
-                    if (GUILayout.Button(Styles.lightmapFromScene, EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
-                        calcLightmapStripping = true;
-
-                    EditorGUILayout.EndHorizontal();
-                    EditorGUI.indentLevel--;
-                    EditorGUILayout.Space();
-                }
-
-                EditorGUILayout.PropertyField(m_FogStripping, Styles.fogModes);
-                if (m_FogStripping.intValue != 0)
-                {
-                    EditorGUI.indentLevel++;
-                    EditorGUILayout.PropertyField(m_FogKeepLinear, Styles.fogLinear);
-                    EditorGUILayout.PropertyField(m_FogKeepExp, Styles.fogExp);
-                    EditorGUILayout.PropertyField(m_FogKeepExp2, Styles.fogExp2);
-                    EditorGUILayout.Space();
-
-                    EditorGUILayout.BeginHorizontal();
-                    EditorGUILayout.PrefixLabel(GUIContent.Temp(" "), EditorStyles.miniButton);
-
-                    if (GUILayout.Button(Styles.fogFromScene, EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
-                        calcFogStripping = true;
-
-                    EditorGUILayout.EndHorizontal();
-                    EditorGUI.indentLevel--;
-                    EditorGUILayout.Space();
-                }
-
-                EditorGUILayout.PropertyField(m_InstancingStripping, Styles.instancingVariants);
-                EditorGUILayout.PropertyField(m_BrgStripping, Styles.brgVariants);
-
-                serializedObject.ApplyModifiedProperties();
-
-                // need to do these after ApplyModifiedProperties, since it changes their values from native code
-                if (calcLightmapStripping)
-                    ShaderUtil.CalculateLightmapStrippingFromCurrentScene();
-                if (calcFogStripping)
-                    ShaderUtil.CalculateFogStrippingFromCurrentScene();
-            }
-
-            internal partial class Styles
-            {
-                public static readonly GUIContent shaderSettings = EditorGUIUtility.TrTextContent("Platform shader settings");
-                public static readonly GUIContent builtinSettings = EditorGUIUtility.TrTextContent("Built-in shader settings");
-                public static readonly GUIContent shaderPreloadSettings = EditorGUIUtility.TrTextContent("Shader preloading");
-
-                public static readonly GUIContent lightmapModes = EditorGUIUtility.TrTextContent("Lightmap Modes");
-                public static readonly GUIContent lightmapPlain = EditorGUIUtility.TrTextContent("Baked Non-Directional", "Include support for baked non-directional lightmaps.");
-                public static readonly GUIContent lightmapDirCombined = EditorGUIUtility.TrTextContent("Baked Directional", "Include support for baked directional lightmaps.");
-                public static readonly GUIContent lightmapKeepShadowMask = EditorGUIUtility.TrTextContent("Baked Shadowmask", "Include support for baked shadow occlusion.");
-                public static readonly GUIContent lightmapKeepSubtractive = EditorGUIUtility.TrTextContent("Baked Subtractive", "Include support for baked subtractive lightmaps.");
-                public static readonly GUIContent lightmapDynamicPlain = EditorGUIUtility.TrTextContent("Realtime Non-Directional", "Include support for realtime non-directional lightmaps.");
-                public static readonly GUIContent lightmapDynamicDirCombined = EditorGUIUtility.TrTextContent("Realtime Directional", "Include support for realtime directional lightmaps.");
-                public static readonly GUIContent lightmapFromScene = EditorGUIUtility.TrTextContent("Import From Current Scene", "Calculate lightmap modes used by the current scene.");
-
-                public static readonly GUIContent fogModes = EditorGUIUtility.TrTextContent("Fog Modes");
-                public static readonly GUIContent fogLinear = EditorGUIUtility.TrTextContent("Linear", "Include support for Linear fog.");
-                public static readonly GUIContent fogExp = EditorGUIUtility.TrTextContent("Exponential", "Include support for Exponential fog.");
-                public static readonly GUIContent fogExp2 = EditorGUIUtility.TrTextContent("Exponential Squared", "Include support for Exponential Squared fog.");
-                public static readonly GUIContent fogFromScene = EditorGUIUtility.TrTextContent("Import From Current Scene", "Calculate fog modes used by the current scene.");
-
-                public static readonly GUIContent instancingVariants = EditorGUIUtility.TrTextContent("Instancing Variants");
-                public static readonly GUIContent brgVariants = EditorGUIUtility.TrTextContent("BatchRendererGroup Variants");
-
-                public static readonly GUIContent shaderPreloadSave = EditorGUIUtility.TrTextContent("Save to asset...", "Save currently tracked shaders into a Shader Variant Manifest asset.");
-                public static readonly GUIContent shaderPreloadClear = EditorGUIUtility.TrTextContent("Clear", "Clear currently tracked shader variant information.");
-            }
-        }
-    }
-
-
-    //
-    // preloaded shaders
-    //
-
-
-    internal partial class GraphicsSettingsWindow
-    {
-        internal class ShaderPreloadEditor : Editor
-        {
-            SerializedProperty m_PreloadedShaders;
-            SerializedProperty m_PreloadShadersBatchTimeLimit;
-            bool m_DelayShaderPreload;
-            int m_PreloadShadersTimeLimit;
-
-            public void OnEnable()
-            {
-                m_PreloadedShaders = serializedObject.FindProperty("m_PreloadedShaders");
-                m_PreloadedShaders.isExpanded = true;
-                m_PreloadShadersBatchTimeLimit = serializedObject.FindProperty("m_PreloadShadersBatchTimeLimit");
-                LoadShaderPreloadingDelay();
-            }
-
-            public override void OnInspectorGUI()
-            {
-                serializedObject.Update();
-
-                serializedObject.ApplyModifiedProperties();
-
-                EditorGUILayout.PropertyField(m_PreloadedShaders, true);
-
-                m_DelayShaderPreload = EditorGUILayout.Toggle("Preload shaders after showing first scene", m_DelayShaderPreload);
-                if (m_DelayShaderPreload)
-                    m_PreloadShadersTimeLimit = EditorGUILayout.IntField("Preload time limit per frame (ms)", m_PreloadShadersTimeLimit);
-                SaveShaderPreloadingDelay();
-
-                EditorGUILayout.Space();
-                GUILayout.Label(
-                    string.Format("Currently tracked: {0} shaders {1} total variants",
-                        ShaderUtil.GetCurrentShaderVariantCollectionShaderCount(), ShaderUtil.GetCurrentShaderVariantCollectionVariantCount()
-                    )
-                );
-
-                EditorGUILayout.BeginHorizontal();
-                GUILayout.FlexibleSpace();
-                if (GUILayout.Button(Styles.shaderPreloadSave, EditorStyles.miniButton))
-                {
-                    string message = "Save shader variant collection";
-                    string assetPath = EditorUtility.SaveFilePanelInProject("Save Shader Variant Collection", "NewShaderVariants", "shadervariants", message, ProjectWindowUtil.GetActiveFolderPath());
-                    if (!string.IsNullOrEmpty(assetPath))
-                        ShaderUtil.SaveCurrentShaderVariantCollection(assetPath);
-                    GUIUtility.ExitGUI();
-                }
-                if (GUILayout.Button(Styles.shaderPreloadClear, EditorStyles.miniButton))
-                    ShaderUtil.ClearCurrentShaderVariantCollection();
-                EditorGUILayout.EndHorizontal();
-
-                serializedObject.ApplyModifiedProperties();
-            }
-
-            void LoadShaderPreloadingDelay()
-            {
-                m_PreloadShadersTimeLimit = m_PreloadShadersBatchTimeLimit.intValue;
-                m_DelayShaderPreload = m_PreloadShadersTimeLimit >= 0;
-                if (!m_DelayShaderPreload)
-                    m_PreloadShadersTimeLimit = 0;
-            }
-
-            void SaveShaderPreloadingDelay()
-            {
-                var newVal = m_DelayShaderPreload ? m_PreloadShadersTimeLimit : -1;
-                if (m_PreloadShadersBatchTimeLimit.intValue != newVal)
-                    m_PreloadShadersBatchTimeLimit.intValue = newVal;
-            }
-
-            internal partial class Styles
-            {
-                public static readonly GUIContent shaderPreloadSave = EditorGUIUtility.TrTextContent("Save to asset...", "Save currently tracked shaders into a Shader Variant Manifest asset.");
-                public static readonly GUIContent shaderPreloadClear = EditorGUIUtility.TrTextContent("Clear", "Clear currently tracked shader variant information.");
-            }
-        }
-    }
-
-
-    //
-    // tier settings
-    //
-
-
-    internal partial class GraphicsSettingsWindow
-    {
-        internal class TierSettingsEditor : Editor
-        {
-            public bool verticalLayout = false;
-
-            internal void OnFieldLabelsGUI(bool vertical)
-            {
-                bool usingSRP = GraphicsSettings.currentRenderPipeline != null;
-
-                if (!vertical)
-                    EditorGUILayout.LabelField(Styles.standardShaderSettings, EditorStyles.boldLabel);
-
-                if (!usingSRP)
-                {
-                    EditorGUILayout.LabelField(Styles.standardShaderQuality);
-                    EditorGUILayout.LabelField(Styles.reflectionProbeBoxProjection);
-                    EditorGUILayout.LabelField(Styles.reflectionProbeBlending);
-                    EditorGUILayout.LabelField(Styles.detailNormalMap);
-                    EditorGUILayout.LabelField(Styles.semitransparentShadows);
-                }
-
-                if (SupportedRenderingFeatures.active.lightProbeProxyVolumes)
-                    EditorGUILayout.LabelField(Styles.enableLPPV);
-
-                if (!vertical)
-                {
-                    EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
-                    EditorGUILayout.LabelField(Styles.renderingSettings, EditorStyles.boldLabel);
-                }
-
-                if (!usingSRP)
-                {
-                    EditorGUILayout.LabelField(Styles.cascadedShadowMaps);
-                    EditorGUILayout.LabelField(Styles.prefer32BitShadowMaps);
-                    EditorGUILayout.LabelField(Styles.useHDR);
-                    EditorGUILayout.LabelField(Styles.hdrMode);
-                    EditorGUILayout.LabelField(Styles.renderingPath);
-                }
-
-                if (SupportedRenderingFeatures.IsLightmapBakeTypeSupported(LightmapBakeType.Realtime))
-                    EditorGUILayout.LabelField(Styles.realtimeGICPUUsage);
-            }
-
-            // custom enum handling
-            internal partial class Styles
-            {
-                public static readonly GUIContent[] shaderQualityName =
-                { EditorGUIUtility.TrTextContent("Low"), EditorGUIUtility.TrTextContent("Medium"), EditorGUIUtility.TrTextContent("High") };
-                public static readonly int[] shaderQualityValue =
-                { (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") };
-                public static readonly int[] renderingPathValue =
-                { (int)RenderingPath.Forward, (int)RenderingPath.DeferredShading, (int)RenderingPath.VertexLit };
-
-                public static readonly GUIContent[] hdrModeName =
-                { EditorGUIUtility.TrTextContent("FP16"), EditorGUIUtility.TrTextContent("R11G11B10") };
-                public static readonly int[] hdrModeValue =
-                { (int)CameraHDRMode.FP16, (int)CameraHDRMode.R11G11B10};
-
-                public static readonly GUIContent[] realtimeGICPUUsageName =
-                { EditorGUIUtility.TrTextContent("Low"), EditorGUIUtility.TrTextContent("Medium"), EditorGUIUtility.TrTextContent("High"), EditorGUIUtility.TrTextContent("Unlimited")};
-                public static readonly int[] realtimeGICPUUsageValue =
-                { (int)RealtimeGICPUUsage.Low, (int)RealtimeGICPUUsage.Medium, (int)RealtimeGICPUUsage.High, (int)RealtimeGICPUUsage.Unlimited };
-            }
-
-            internal ShaderQuality ShaderQualityPopup(ShaderQuality sq)
-            {
-                return (ShaderQuality)EditorGUILayout.IntPopup((int)sq, Styles.shaderQualityName, Styles.shaderQualityValue);
-            }
-
-            internal RenderingPath RenderingPathPopup(RenderingPath rp)
-            {
-                return (RenderingPath)EditorGUILayout.IntPopup((int)rp, Styles.renderingPathName, Styles.renderingPathValue);
-            }
-
-            internal CameraHDRMode HDRModePopup(CameraHDRMode mode)
-            {
-                return (CameraHDRMode)EditorGUILayout.IntPopup((int)mode, Styles.hdrModeName, Styles.hdrModeValue);
-            }
-
-            internal RealtimeGICPUUsage RealtimeGICPUUsagePopup(RealtimeGICPUUsage usage)
-            {
-                return (RealtimeGICPUUsage)EditorGUILayout.IntPopup((int)usage, Styles.realtimeGICPUUsageName, Styles.realtimeGICPUUsageValue);
-            }
-
-            internal void OnTierGUI(BuildPlatform platform, GraphicsTier tier, bool vertical)
-            {
-                TierSettings ts = EditorGraphicsSettings.GetTierSettings(platform.namedBuildTarget, tier);
-
-                EditorGUI.BeginChangeCheck();
-
-
-                if (!vertical)
-                    EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
-
-                bool usingSRP = GraphicsSettings.currentRenderPipeline != null;
-                if (!usingSRP)
-                {
-                    ts.standardShaderQuality = ShaderQualityPopup(ts.standardShaderQuality);
-                    ts.reflectionProbeBoxProjection = EditorGUILayout.Toggle(ts.reflectionProbeBoxProjection);
-                    ts.reflectionProbeBlending = EditorGUILayout.Toggle(ts.reflectionProbeBlending);
-                    ts.detailNormalMap = EditorGUILayout.Toggle(ts.detailNormalMap);
-                    ts.semitransparentShadows = EditorGUILayout.Toggle(ts.semitransparentShadows);
-                }
-
-                if (SupportedRenderingFeatures.active.lightProbeProxyVolumes)
-                    ts.enableLPPV = EditorGUILayout.Toggle(ts.enableLPPV);
-
-                if (!vertical)
-                {
-                    EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
-                    EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
-                }
-
-                if (!usingSRP)
-                {
-                    ts.cascadedShadowMaps = EditorGUILayout.Toggle(ts.cascadedShadowMaps);
-                    ts.prefer32BitShadowMaps = EditorGUILayout.Toggle(ts.prefer32BitShadowMaps);
-                    ts.hdr = EditorGUILayout.Toggle(ts.hdr);
-                    ts.hdrMode = HDRModePopup(ts.hdrMode);
-                    ts.renderingPath = RenderingPathPopup(ts.renderingPath);
-                }
-
-                if (SupportedRenderingFeatures.IsLightmapBakeTypeSupported(LightmapBakeType.Realtime))
-                    ts.realtimeGICPUUsage = RealtimeGICPUUsagePopup(ts.realtimeGICPUUsage);
-
-                if (EditorGUI.EndChangeCheck())
-                {
-                    // TODO: it should be doable in c# now as we "expose" GraphicsSettings anyway
-                    EditorGraphicsSettings.RegisterUndo();
-                    EditorGraphicsSettings.SetTierSettings(platform.namedBuildTarget, tier, ts);
-                }
-            }
-
-            internal void OnGuiHorizontal(BuildPlatform platform)
-            {
-                EditorGUILayout.BeginHorizontal();
-
-                EditorGUILayout.BeginVertical();
-                EditorGUIUtility.labelWidth = 140;
-                EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
-                OnFieldLabelsGUI(false);
-                EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
-                EditorGUILayout.LabelField(Styles.autoSettings, EditorStyles.boldLabel);
-                EditorGUILayout.EndVertical();
-
-                EditorGUIUtility.labelWidth = 50;
-                foreach (GraphicsTier tier in Enum.GetValues(typeof(GraphicsTier)))
-                {
-                    bool autoSettings = EditorGraphicsSettings.AreTierSettingsAutomatic(platform.namedBuildTarget.ToBuildTargetGroup(), tier);
-
-                    EditorGUILayout.BeginVertical();
-                    EditorGUILayout.LabelField(Styles.tierName[(int)tier], EditorStyles.boldLabel);
-                    using (new EditorGUI.DisabledScope(autoSettings))
-                        OnTierGUI(platform, tier, false);
-
-                    EditorGUILayout.LabelField(Styles.empty, EditorStyles.boldLabel);
-                    EditorGUI.BeginChangeCheck();
-                    autoSettings = EditorGUILayout.Toggle(autoSettings);
-                    if (EditorGUI.EndChangeCheck())
-                    {
-                        EditorGraphicsSettings.RegisterUndo();
-                        EditorGraphicsSettings.MakeTierSettingsAutomatic(platform.namedBuildTarget.ToBuildTargetGroup(), tier, autoSettings);
-                        EditorGraphicsSettings.OnUpdateTierSettings(platform.namedBuildTarget.ToBuildTargetGroup(), true);
-                    }
-                    EditorGUILayout.EndVertical();
-                }
-                EditorGUIUtility.labelWidth = 0;
-
-                EditorGUILayout.EndHorizontal();
-            }
-
-            internal void OnGuiVertical(BuildPlatform platform)
-            {
-                EditorGUILayout.BeginVertical();
-                foreach (GraphicsTier tier in Enum.GetValues(typeof(GraphicsTier)))
-                {
-                    bool autoSettings = EditorGraphicsSettings.AreTierSettingsAutomatic(platform.namedBuildTarget.ToBuildTargetGroup(), tier);
-                    EditorGUI.BeginChangeCheck();
-                    {
-                        GUILayout.BeginHorizontal();
-                        EditorGUIUtility.labelWidth = 80;
-                        EditorGUILayout.LabelField(Styles.tierName[(int)tier], EditorStyles.boldLabel);
-                        GUILayout.FlexibleSpace();
-                        EditorGUIUtility.labelWidth = 80;
-                        autoSettings = EditorGUILayout.Toggle(Styles.autoSettings, autoSettings);
-                        GUILayout.EndHorizontal();
-                    }
-
-                    if (EditorGUI.EndChangeCheck())
-                    {
-                        EditorGraphicsSettings.RegisterUndo();
-                        EditorGraphicsSettings.MakeTierSettingsAutomatic(platform.namedBuildTarget.ToBuildTargetGroup(), tier, autoSettings);
-                        EditorGraphicsSettings.OnUpdateTierSettings(platform.namedBuildTarget.ToBuildTargetGroup(), true);
-                    }
-
-                    using (new EditorGUI.DisabledScope(autoSettings))
-                    {
-                        EditorGUI.indentLevel++;
-                        EditorGUILayout.BeginHorizontal();
-
-                        EditorGUILayout.BeginVertical();
-                        EditorGUIUtility.labelWidth = 140;
-                        OnFieldLabelsGUI(true);
-                        EditorGUILayout.EndVertical();
-
-                        EditorGUILayout.BeginVertical();
-                        EditorGUIUtility.labelWidth = 50;
-                        OnTierGUI(platform, tier, true);
-                        EditorGUILayout.EndVertical();
-
-                        GUILayout.EndHorizontal();
-                        EditorGUI.indentLevel--;
-                    }
-                }
-                GUILayout.EndVertical();
-                EditorGUIUtility.labelWidth = 0;
-            }
-
-            public override void OnInspectorGUI()
-            {
-                BuildPlatform[] validPlatforms = BuildPlatforms.instance.GetValidPlatforms().ToArray();
-                BuildPlatform platform = validPlatforms[EditorGUILayout.BeginPlatformGrouping(validPlatforms, null, EditorStyles.frameBox)];
-
-                if (verticalLayout)  OnGuiVertical(platform);
-                else                OnGuiHorizontal(platform);
-
-                EditorGUILayout.EndPlatformGrouping();
-            }
-
-            internal partial class Styles
-            {
-                public static readonly GUIContent[] tierName =
-                { EditorGUIUtility.TrTextContent("Low (Tier 1)"), EditorGUIUtility.TrTextContent("Medium (Tier 2)"), EditorGUIUtility.TrTextContent("High (Tier 3)") };
-
-                public static readonly GUIContent empty = EditorGUIUtility.TextContent("");
-                public static readonly GUIContent autoSettings = EditorGUIUtility.TrTextContent("Use Defaults");
-
-                public static readonly GUIContent standardShaderSettings = EditorGUIUtility.TrTextContent("Standard Shader");
-                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", "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", "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", "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 559be05539..622eb02d92 100644
--- a/Editor/Mono/ShaderUtil.bindings.cs
+++ b/Editor/Mono/ShaderUtil.bindings.cs
@@ -209,7 +209,6 @@ public static void UpdateShaderAsset(Shader shader, string source, bool compileI
 
 
         extern internal static void OpenCompiledShader(Shader shader, int mode, int externPlatformsMask, bool includeAllVariants, bool preprocessOnly, bool stripLineDirectives);
-        extern internal static void CompileShaderForTargetCompilerPlatform(Shader shader, ShaderCompilerPlatform platform);
 
         extern internal static void OpenCompiledComputeShader(ComputeShader shader, bool allVariantsAndPlatforms, bool showPreprocessed, bool stripLineDirectives);
         extern internal static void OpenParsedSurfaceShader(Shader shader);
@@ -343,9 +342,9 @@ extern internal static ShaderData.PreprocessedVariant PreprocessShaderVariant([N
         [FreeFunction("ShaderUtil::GetPassKeywords")] extern private static LocalKeyword[] GetPassAllStageKeywords(Shader s, in PassIdentifier passIdentifier);
         [FreeFunction("ShaderUtil::GetPassKeywords")] extern private static LocalKeyword[] GetPassStageKeywords(Shader s, in PassIdentifier passIdentifier, ShaderType shaderType);
         [FreeFunction("ShaderUtil::GetPassKeywords")] extern private static LocalKeyword[] GetPassStageKeywordsForAPI(Shader s, in PassIdentifier passIdentifier, ShaderType shaderType, ShaderCompilerPlatform shaderCompilerPlatform);
-        [FreeFunction("ShaderUtil::PassHasKeyword")] extern private static bool PassAnyStageHasKeyword(Shader s, in PassIdentifier passIdentifier, in LocalKeyword keyword);
-        [FreeFunction("ShaderUtil::PassHasKeyword")] extern private static bool PassStageHasKeyword(Shader s, in PassIdentifier passIdentifier, in LocalKeyword keyword, ShaderType shaderType);
-        [FreeFunction("ShaderUtil::PassHasKeyword")] extern private static bool PassStageHasKeywordForAPI(Shader s, in PassIdentifier passIdentifier, in LocalKeyword keyword, ShaderType shaderType, ShaderCompilerPlatform shaderCompilerPlatform);
+        [FreeFunction("ShaderUtil::PassHasKeyword")] extern private static bool PassAnyStageHasKeyword(Shader s, in PassIdentifier passIdentifier, uint keywordIndex);
+        [FreeFunction("ShaderUtil::PassHasKeyword")] extern private static bool PassStageHasKeyword(Shader s, in PassIdentifier passIdentifier, uint keywordIndex, ShaderType shaderType);
+        [FreeFunction("ShaderUtil::PassHasKeyword")] extern private static bool PassStageHasKeywordForAPI(Shader s, in PassIdentifier passIdentifier, uint keywordIndex, ShaderType shaderType, ShaderCompilerPlatform shaderCompilerPlatform);
 
         public static LocalKeyword[] GetPassKeywords(Shader s, in PassIdentifier passIdentifier)
         {
@@ -364,17 +363,17 @@ public static LocalKeyword[] GetPassKeywords(Shader s, in PassIdentifier passIde
 
         public static bool PassHasKeyword(Shader s, in PassIdentifier passIdentifier, in LocalKeyword keyword)
         {
-            return PassAnyStageHasKeyword(s, passIdentifier, keyword);
+            return PassAnyStageHasKeyword(s, passIdentifier, keyword.m_Index);
         }
 
         public static bool PassHasKeyword(Shader s, in PassIdentifier passIdentifier, in LocalKeyword keyword, ShaderType shaderType)
         {
-            return PassStageHasKeyword(s, passIdentifier, keyword, shaderType);
+            return PassStageHasKeyword(s, passIdentifier, keyword.m_Index, shaderType);
         }
 
         public static bool PassHasKeyword(Shader s, in PassIdentifier passIdentifier, in LocalKeyword keyword, ShaderType shaderType, ShaderCompilerPlatform shaderCompilerPlatform)
         {
-            return PassStageHasKeywordForAPI(s, passIdentifier, keyword, shaderType, shaderCompilerPlatform);
+            return PassStageHasKeywordForAPI(s, passIdentifier, keyword.m_Index, shaderType, shaderCompilerPlatform);
         }
     }
 }
diff --git a/Editor/Mono/Shaders/ShaderKeywordFilterData.cs b/Editor/Mono/Shaders/ShaderKeywordFilterData.cs
index 34dade6ff2..8941e8c86c 100644
--- a/Editor/Mono/Shaders/ShaderKeywordFilterData.cs
+++ b/Editor/Mono/Shaders/ShaderKeywordFilterData.cs
@@ -189,12 +189,15 @@ private static Constraints GetConstraintAttributes(ICustomAttributeProvider ap)
         // settings tree structure out of it.
         // Returns null if no filter attributes were found.
         // This method is called recursively for the tree traversing purposes.
-        internal static SettingsNode GatherFilterData(string nodeName, object containerObject, Constraints parentConstraints = null)
+        internal static SettingsNode GatherFilterData(string nodeName, object containerObject, HashSet<object> visited, Constraints parentConstraints = null)
         {
             SettingsNode node = null; // defer construction to when filter data is actually found
             if (containerObject == null)
                 return node;
 
+            if (!visited.Add(containerObject))
+                return node;
+
             var containerConstraints = GetConstraintAttributes(containerObject.GetType());
             if (parentConstraints != null)
             {
@@ -233,7 +236,8 @@ internal static SettingsNode GatherFilterData(string nodeName, object containerO
                     bool hasDifferentChildren = (node != null) && (node.m_Children.Count > 0);
                     foreach (var e in enumerable)
                     {
-                        SettingsNode newBranch = GatherFilterData(f.Name, e, containerConstraints);
+                        var childVisited = new HashSet<object>(visited);
+                        SettingsNode newBranch = GatherFilterData(f.Name, e, childVisited, containerConstraints);
                         if (newBranch != null)
                         {
                             if (node == null)
@@ -252,7 +256,8 @@ internal static SettingsNode GatherFilterData(string nodeName, object containerO
                 }
                 else if (!type.IsValueType || (type.IsValueType && !type.IsPrimitive && !type.IsEnum)) // class or struct
                 {
-                    var nestedNode = GatherFilterData(f.Name, value, containerConstraints);
+                    var childVisited = new HashSet<object>(visited);
+                    var nestedNode = GatherFilterData(f.Name, value, childVisited, containerConstraints);
                     if (nestedNode != null)
                     {
                         if (node == null)
diff --git a/Editor/Mono/Shaders/ShaderKeywordFilterUtil.cs b/Editor/Mono/Shaders/ShaderKeywordFilterUtil.cs
index 1b0eb60286..3e923fe666 100644
--- a/Editor/Mono/Shaders/ShaderKeywordFilterUtil.cs
+++ b/Editor/Mono/Shaders/ShaderKeywordFilterUtil.cs
@@ -84,6 +84,40 @@ internal struct ConstraintState
     [RequiredByNativeCode]
     internal static class ShaderKeywordFilterUtil
     {
+        internal struct CachedFilterData
+        {
+            public Hash128 dependencyHash;
+            public SettingsNode settingsNode;
+        };
+
+        // In memory cache for filter data per renderpipeline asset.
+        // This is to avoid redundant attribute search for each shader/pass/stage.
+        internal static Dictionary<string, CachedFilterData> PerAssetFilterDataCache = new Dictionary<string, CachedFilterData>();
+
+        internal static SettingsNode GetFilterDataCached(string nodeName, UnityEngine.Object containerObject)
+        {
+            string assetPath = AssetDatabase.GetAssetPath(containerObject);
+            Hash128 dependencyHash = AssetDatabase.GetAssetDependencyHash(assetPath);
+
+            CachedFilterData cachedData;
+            if (PerAssetFilterDataCache.TryGetValue(assetPath, out cachedData))
+            {
+                // Cached data is valid only if dependency hash hasn't changed
+                if (cachedData.dependencyHash == dependencyHash)
+                    return cachedData.settingsNode;
+            }
+
+            // No valid data found in the cache so we need to do the full processing
+            // and then enter the result into the cache.
+            var visited = new HashSet<object>();
+            cachedData.dependencyHash = dependencyHash;
+            cachedData.settingsNode = SettingsNode.GatherFilterData(nodeName, containerObject, visited);
+
+            PerAssetFilterDataCache[assetPath] = cachedData;
+
+            return cachedData.settingsNode;
+        }
+
         // For the current build target with given constraint state, gets the list of active filter rule sets.
         [RequiredByNativeCode]
         internal static SettingsVariant[] GetKeywordFilterVariants(string buildTargetGroupName, ConstraintState constraintState)
@@ -98,7 +132,7 @@ internal static SettingsVariant[] GetKeywordFilterVariants(string buildTargetGro
                 if (rpAsset == null)
                     continue;
 
-                var node = SettingsNode.GatherFilterData(rpAsset.name, rpAsset);
+                var node = GetFilterDataCached(rpAsset.name, rpAsset);
                 if (node != null)
                     root.Children.Add(node);
             }
diff --git a/Editor/Mono/Tutorial/Highlighter.bindings.cs b/Editor/Mono/Tutorial/Highlighter.bindings.cs
index a3dba272a8..421b68fddd 100644
--- a/Editor/Mono/Tutorial/Highlighter.bindings.cs
+++ b/Editor/Mono/Tutorial/Highlighter.bindings.cs
@@ -32,8 +32,8 @@ public static extern string activeText
         [NativeProperty("s_ActiveVisible", false, TargetType.Field)]
         public static extern bool activeVisible { get; private set; }
 
-        [NativeProperty("s_ActiveIsImguiContainer", false, TargetType.Field)]
-        internal static extern bool activeIsImguiContainer { get; private set; }
+        [NativeProperty("s_UseUIToolkitScrolling", false, TargetType.Field)]
+        internal static extern bool useUIToolkitScrolling { get; private set; }
 
         [NativeProperty("k_Padding", false, TargetType.Field)]
         internal static extern float padding { get; }
diff --git a/Editor/Mono/Tutorial/Highlighter.cs b/Editor/Mono/Tutorial/Highlighter.cs
index cbbb708542..0aa0cc6fd8 100644
--- a/Editor/Mono/Tutorial/Highlighter.cs
+++ b/Editor/Mono/Tutorial/Highlighter.cs
@@ -29,11 +29,14 @@ public partial class Highlighter
         private const float kPulseSpeed = 0.45f; // Pulses per second
         private const float kPopupDuration = 0.33f; // How long time in seconds the popup takes
         private const int kExpansionMovementSize = 5; // How many pixels the rect expands out in the pulsing movement
+        // Twice the IMGUI speed because UIToolkit ScrollView scroll offset has a frame delay between updates
+        private static readonly float kUIToolkitScrollSpeed = scrollSpeed * 2;
 
         private static bool s_RecursionLock = false;
 
         private static VisualElement activeElement = null;
         private static ScrollView activeScrollView = null;
+        private static bool activeIsImgui = false;
 
         private static GUIStyle s_HighlightStyle;
         private static GUIStyle highlightStyle
@@ -54,8 +57,9 @@ public static void Stop()
             activeVisible = false;
             activeText = string.Empty;
             activeElement = null;
-            activeIsImguiContainer = false;
+            activeIsImgui = false;
             activeScrollView = null;
+            useUIToolkitScrolling = true;
             activeRect = new Rect();
 
             searchMode = HighlightSearchMode.None;
@@ -148,7 +152,7 @@ private static void Update()
 
             // If view's actualView has changed, we might still find a property with the right name in the other view,
             // but it's not the one we're looking for.
-            var elementHidden = activeElement != null && (!activeElement.isHierarchyDisplayed || activeElement.panel == null);
+            var elementHidden = activeElement != null && (!activeElement.areAncestorsAndSelfDisplayed || activeElement.panel == null);
             if (activeRect.width == 0 || !ViewWindowIsActive() || elementHidden)
             {
                 EditorApplication.update -= Update;
@@ -165,7 +169,7 @@ private static void Update()
                 Search();
             }
 
-            if (isUIToolkitWindow)
+            if (useUIToolkitScrolling)
                 HandleScroll();
 
             // Keep elapsed time explicitly rather than measuring time since highlight began.
@@ -246,7 +250,7 @@ private static bool Search()
         {
             searchMode = s_SearchMode;
 
-            if (isUIToolkitWindow && !activeIsImguiContainer)
+            if (isUIToolkitWindow && !activeIsImgui)
             {
                 var found = activeElement != null;
                 if (!found)
@@ -261,15 +265,15 @@ private static bool Search()
                     return true;
                 }
 
-                activeIsImguiContainer = true;
+                activeIsImgui = true;
             }
 
             // Try IMGUI
             s_View.RepaintImmediately();
             if (searchMode == HighlightSearchMode.None)
             {
-                if (!activeIsImguiContainer)
-                    return true; // Success - control was found in pure Imgui window
+                if (activeIsImgui && !useUIToolkitScrolling)
+                    return true; // Success - control was found in window that doesn't use UIToolkit ScrollView
 
                 if (activeElement != null)
                     return true; // Already found the IMGUIContainer
@@ -280,10 +284,8 @@ private static bool Search()
                 r.y -= windowPos.y;
 
                 activeElement = SearchIMGUIContainer(s_ViewWindow.rootVisualElement, r.center);
-                if (activeElement != null)
-                    return true;
-
-                activeIsImguiContainer = false;
+                useUIToolkitScrolling = activeScrollView != null;
+                return true;
             }
 
             s_SearchMode = HighlightSearchMode.None;
@@ -358,7 +360,7 @@ private static void HandleScroll()
                 var paddedRect = new Rect(r.x - padding, r.y - padding,
                     r.width + padding * 2, r.height + padding * 2);
 
-                activeVisible = !ScrollTowardsRect(activeScrollView, paddedRect, scrollSpeed);
+                activeVisible = !ScrollTowardsRect(activeScrollView, paddedRect, kUIToolkitScrollSpeed);
             }
             else
             {
diff --git a/Editor/Mono/TypeCache.bindings.cs b/Editor/Mono/TypeCache.bindings.cs
index 21289569b2..4342f88262 100644
--- a/Editor/Mono/TypeCache.bindings.cs
+++ b/Editor/Mono/TypeCache.bindings.cs
@@ -115,7 +115,7 @@ public int IndexOf(object item)
             static extern Type GetValue(IntPtr key, int index);
 
             [ThreadSafe]
-            extern void Internal_CopyTo(Type[] array, int arrayIndex);
+            extern void Internal_CopyTo([Unmarshalled] Type[] array, int arrayIndex);
 
             IEnumerator<Type> IEnumerable<Type>.GetEnumerator() => GetEnumerator();
 
@@ -338,7 +338,7 @@ public int IndexOf(object item)
             static extern MethodInfo GetValue(IntPtr key, int index);
 
             [ThreadSafe]
-            extern void Internal_CopyTo(MethodInfo[] array, int arrayIndex);
+            extern void Internal_CopyTo([Unmarshalled] MethodInfo[] array, int arrayIndex);
 
             IEnumerator<MethodInfo> IEnumerable<MethodInfo>.GetEnumerator() => GetEnumerator();
 
@@ -562,7 +562,7 @@ public int IndexOf(object item)
             static extern FieldInfo GetValue(IntPtr key, int index);
 
             [ThreadSafe]
-            extern void Internal_CopyTo(FieldInfo[] array, int arrayIndex);
+            extern void Internal_CopyTo([Unmarshalled] FieldInfo[] array, int arrayIndex);
 
             IEnumerator<FieldInfo> IEnumerable<FieldInfo>.GetEnumerator() => GetEnumerator();
 
diff --git a/Editor/Mono/UIElements/Controls/ColorField.cs b/Editor/Mono/UIElements/Controls/ColorField.cs
index a8d7e3ad70..bbf6a4ae0f 100644
--- a/Editor/Mono/UIElements/Controls/ColorField.cs
+++ b/Editor/Mono/UIElements/Controls/ColorField.cs
@@ -2,16 +2,21 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using Unity.Properties;
 using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// Makes a field for selecting a color.
+    /// Makes a field for selecting a color. For more information, refer to [[wiki:UIE-uxml-element-ColorField|UXML element ColorField]].
     /// </summary>
     public class ColorField : BaseField<Color>
     {
+        internal static readonly DataBindingProperty showEyeDropperProperty = nameof(showEyeDropper);
+        internal static readonly DataBindingProperty showAlphaProperty = nameof(showAlpha);
+        internal static readonly DataBindingProperty hdrProperty = nameof(hdr);
+
         /// <summary>
         /// Instantiates a <see cref="ColorField"/> using the data read from a UXML file.
         /// </summary>
@@ -45,39 +50,50 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// <summary>
         /// If true, the color picker will show the eyedropper control. If false, the color picker won't show the eyedropper control.
         /// </summary>
+        [CreateProperty]
         public bool showEyeDropper
         {
             get => m_ShowEyeDropper;
             set
             {
+                var previous = m_ShowEyeDropper;
                 m_ShowEyeDropper = value;
                 if (m_EyeDropperElement != null)
                     m_EyeDropperElement.style.display = m_ShowEyeDropper ? DisplayStyle.Flex : DisplayStyle.None;
+
+                if (previous != m_ShowEyeDropper)
+                    NotifyPropertyChanged(showEyeDropperProperty);
             }
         }
 
         /// <summary>
         /// If true, allows the user to set an alpha value for the color. If false, hides the alpha component.
         /// </summary>
+        [CreateProperty]
         public bool showAlpha
         {
             get => m_ShowAlpha;
             set
             {
+                var previous = m_ShowAlpha;
                 m_ShowAlpha = value;
                 if (m_AlphaElement != null)
                     m_AlphaElement.style.display = m_ShowAlpha ? DisplayStyle.Flex : DisplayStyle.None;
+                if (previous != m_ShowAlpha)
+                    NotifyPropertyChanged(showAlphaProperty);
             }
         }
 
         /// <summary>
         /// If true, treats the color as an HDR value. If false, treats the color as a standard LDR value.
         /// </summary>
+        [CreateProperty]
         public bool hdr
         {
             get => m_HDR;
             set
             {
+                var previous = m_HDR;
                 m_HDR = value;
                 if (m_HDRLabel != null)
                     m_HDRLabel.style.display = m_HDR ? DisplayStyle.Flex : DisplayStyle.None;
@@ -86,6 +102,9 @@ public bool hdr
                 if (m_AlphaGradientContainer != null)
                     m_AlphaGradientContainer.style.display = m_HDR ? DisplayStyle.Flex : DisplayStyle.None;
                 UpdateColorProperties(this.value);
+
+                if (previous != m_HDR)
+                    NotifyPropertyChanged(hdrProperty);
             }
         }
 
@@ -213,8 +232,10 @@ public ColorField(string label)
 
             m_ColorContainer.RegisterCallback<AttachToPanelEvent>(OnAttach);
             m_ColorContainer.RegisterCallback<PointerDownEvent>(OnColorFieldClicked);
+            m_ColorContainer.RegisterCallback<MouseDownEvent>(OnColorFieldClickedCompatibilityEventHandler);
             visualInput.RegisterCallback<KeyDownEvent>(OnColorFieldKeyDown);
             m_EyeDropperElement.RegisterCallback<PointerDownEvent>(OnEyeDropperClicked);
+            m_EyeDropperElement.RegisterCallback<MouseDownEvent>(OnEyeDropperClickedCompatibilityEventHandler);
             RegisterCallback<ExecuteCommandEvent>(OnCommandExecute);
 
             m_ColorContainer.AddManipulator(new ContextualMenuManipulator(BuildContextualMenu));
@@ -259,6 +280,15 @@ void OnColorFieldClicked(PointerDownEvent evt)
             }
         }
 
+        static void OnColorFieldClickedCompatibilityEventHandler(MouseDownEvent evt)
+        {
+            var mdeInternal = (IMouseEventInternal)evt;
+            if (evt.button == (int) MouseButton.LeftMouse && mdeInternal.sourcePointerEvent != null && ((EventBase)mdeInternal.sourcePointerEvent).isPropagationStopped)
+            {
+                evt.StopPropagation();
+            }
+        }
+
         void ShowColorPicker()
         {
             ColorPicker.Show((c) =>
@@ -290,6 +320,15 @@ void OnEyeDropperClicked(PointerDownEvent evt)
             evt.StopPropagation();
         }
 
+        static void OnEyeDropperClickedCompatibilityEventHandler(MouseDownEvent evt)
+        {
+            var mdeInternal = (IMouseEventInternal)evt;
+            if (evt.button == (int) MouseButton.LeftMouse && mdeInternal.sourcePointerEvent != null && ((EventBase)mdeInternal.sourcePointerEvent).isPropagationStopped)
+            {
+                evt.StopPropagation();
+            }
+        }
+
         bool ShouldStopWatchingEyeDropper()
         {
             if (EyeDropper.IsOpened)
diff --git a/Editor/Mono/UIElements/Controls/CurveField.cs b/Editor/Mono/UIElements/Controls/CurveField.cs
index 83cc6c5b32..a8e94af648 100644
--- a/Editor/Mono/UIElements/Controls/CurveField.cs
+++ b/Editor/Mono/UIElements/Controls/CurveField.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using Unity.Properties;
 using UnityEngine;
 using UnityEditorInternal;
 using UnityEngine.UIElements;
@@ -12,10 +13,12 @@
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// Makes a field for editing an <see cref="AnimationCurve"/>.
+    /// Makes a field for editing an <see cref="AnimationCurve"/>. For more information, refer to [[wiki:UIE-uxml-element-CurveField|UXML element CurveField]].
     /// </summary>
     public class CurveField : BaseField<AnimationCurve>
     {
+        internal static readonly DataBindingProperty renderModeProperty = nameof(renderMode);
+
         /// <summary>
         /// Instantiates a <see cref="CurveField"/> using the data read from a UXML file.
         /// </summary>
@@ -89,6 +92,7 @@ public enum RenderMode
         /// <summary>
         /// The RenderMode of CurveField. The default is RenderMode.Default.
         /// </summary>
+        [CreateProperty]
         public RenderMode renderMode
         {
             get { return m_RenderMode; }
@@ -124,6 +128,7 @@ public RenderMode renderMode
                     }
 
                     m_TextureDirty = true;
+                    NotifyPropertyChanged(renderModeProperty);
                 }
             }
         }
@@ -159,6 +164,7 @@ public override AnimationCurve value
                             evt.elementTarget = this;
                             SetValueWithoutNotify(value);
                             SendEvent(evt);
+                            NotifyPropertyChanged(valueProperty);
                         }
                     }
                     else
@@ -204,6 +210,9 @@ public CurveField(string label)
             visualInput.Add(borderElement);
 
             RegisterCallback<CustomStyleResolvedEvent>(OnCustomStyleResolved);
+            RegisterCallback<KeyDownEvent>(OnKeyDown);
+            RegisterCallback<PointerDownEvent>(OnPointerDown);
+            RegisterCallback<MouseDownEvent>(OnMouseDownCompatibilityEvent);
 
             visualInput.generateVisualContent += OnGenerateVisualContent;
         }
@@ -274,42 +283,51 @@ void ShowCurveEditor()
             CurveEditorWindow.color = curveColor;
         }
 
-        [EventInterest(typeof(KeyDownEvent), typeof(PointerDownEvent), typeof(DetachFromPanelEvent),
-            typeof(GeometryChangedEvent))]
-        protected override void ExecuteDefaultAction(EventBase evt)
+        void OnKeyDown(KeyDownEvent kde)
         {
-            base.ExecuteDefaultAction(evt);
-
-            if (evt == null)
-            {
-                return;
-            }
-
-            var showCurveEditor = false;
-            KeyDownEvent kde = (evt as KeyDownEvent);
             if (kde != null)
             {
                 if ((kde.keyCode == KeyCode.Space) ||
                     (kde.keyCode == KeyCode.KeypadEnter) ||
                     (kde.keyCode == KeyCode.Return))
                 {
-                    showCurveEditor = true;
+                    ShowCurveEditor();
+                    kde.StopPropagation();
                 }
             }
-            else if ((evt as PointerDownEvent)?.button == (int)MouseButton.LeftMouse)
+        }
+
+        void OnPointerDown(PointerDownEvent evt)
+        {
+            if (visualInput.ContainsPoint(visualInput.WorldToLocal(evt.position)) && evt.button == (int)MouseButton.LeftMouse)
             {
-                var mde = (PointerDownEvent)evt;
-                if (visualInput.ContainsPoint(visualInput.WorldToLocal(mde.position)))
-                {
-                    showCurveEditor = true;
-                }
+                ShowCurveEditor();
+                evt.StopPropagation();
             }
+        }
 
-            if (showCurveEditor)
-                ShowCurveEditor();
-            else if (evt.eventTypeId == DetachFromPanelEvent.TypeId())
+        void OnMouseDownCompatibilityEvent(MouseDownEvent evt)
+        {
+            var mdeInternal = (IMouseEventInternal)evt;
+            if (visualInput.ContainsPoint(visualInput.WorldToLocal(evt.mousePosition)) && mdeInternal.sourcePointerEvent != null && ((EventBase)mdeInternal.sourcePointerEvent).isPropagationStopped)
+            {
+                evt.StopPropagation();
+            }
+        }
+
+        [EventInterest(typeof(DetachFromPanelEvent), typeof(GeometryChangedEvent))]
+        protected override void ExecuteDefaultAction(EventBase evt)
+        {
+            base.ExecuteDefaultAction(evt);
+
+            if (evt == null)
+            {
+                return;
+            }
+
+            if (evt.eventTypeId == DetachFromPanelEvent.TypeId())
                 OnDetach();
-            if (evt.eventTypeId == GeometryChangedEvent.TypeId())
+            else if (evt.eventTypeId == GeometryChangedEvent.TypeId())
                 m_TextureDirty = true;
         }
 
diff --git a/Editor/Mono/UIElements/Controls/EnumFlagsField.cs b/Editor/Mono/UIElements/Controls/EnumFlagsField.cs
index f1e3d76368..c524739654 100644
--- a/Editor/Mono/UIElements/Controls/EnumFlagsField.cs
+++ b/Editor/Mono/UIElements/Controls/EnumFlagsField.cs
@@ -12,11 +12,13 @@ namespace UnityEditor.UIElements
     /// <summary>
     /// Makes a dropdown for switching between enum flag values that are marked with the Flags attribute.
     /// </summary>
-    /// <description>
+    /// <remarks>
     /// An option for the value 0 with name "Nothing" and an option for the value ~0 (that is, all bits set) with the
     /// name "Everything" are always displayed at the top of the menu. The names for the values 0 and ~0 can be
     /// overriden by defining these values in the enum type.
-    /// </description>
+    /// 
+    /// For more information, refer to [[wiki:UIE-uxml-element-EnumFlagsField|UXML element EnumFlagsField]].
+    /// </remarks>
     public class EnumFlagsField : BaseMaskField<Enum>
     {
         /// <summary>
@@ -186,9 +188,15 @@ internal void PopulateDataFromType(Type enumType)
 
         internal override string GetNothingName()
         {
-            if (m_EnumData.flagValues != null && m_EnumData.flagValues.Length > 0 && m_EnumData.flagValues[0] == 0)
+            if (m_EnumData.flagValues is not { Length: > 0 })
+                return base.GetNothingName();
+
+            for (var i = 0; i < m_EnumData.flagValues.Length; i++)
             {
-                return m_EnumData.displayNames[0];
+                if (m_EnumData.flagValues[i] == 0)
+                {
+                    return m_EnumData.displayNames[i];
+                }
             }
 
             return base.GetNothingName();
@@ -196,10 +204,15 @@ internal override string GetNothingName()
 
         internal override string GetEverythingName()
         {
-            if (m_EnumData.flagValues != null && m_EnumData.flagValues.Length > 0
-                && m_EnumData.flagValues[^1] == ~0)
+            if (m_EnumData.flagValues is not { Length: > 0 })
+                return base.GetEverythingName();
+
+            for (var i = 0; i < m_EnumData.flagValues.Length; i++)
             {
-                return m_EnumData.displayNames[^1];
+                if (m_EnumData.flagValues[i] == ~0)
+                {
+                    return m_EnumData.displayNames[i];
+                }
             }
 
             return base.GetEverythingName();
diff --git a/Editor/Mono/UIElements/Controls/GradientField.cs b/Editor/Mono/UIElements/Controls/GradientField.cs
index 48dd41f48d..90ce05fafe 100644
--- a/Editor/Mono/UIElements/Controls/GradientField.cs
+++ b/Editor/Mono/UIElements/Controls/GradientField.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using Unity.Properties;
 using UnityEngine;
 using UnityEditorInternal;
 using UnityEngine.UIElements;
@@ -11,10 +12,13 @@
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// Makes a field for editing an <see cref="Gradient"/>.
+    /// Makes a field for editing an <see cref="Gradient"/>. For more information, refer to [[wiki:UIE-uxml-element-GradientField|UXML element GradientField]].
     /// </summary>
     public class GradientField : BaseField<Gradient>
     {
+        internal static readonly DataBindingProperty colorSpaceProperty = nameof(colorSpace);
+        internal static readonly DataBindingProperty hdrProperty = nameof(hdr);
+
         static readonly GradientColorKey k_WhiteKeyBegin = new GradientColorKey(Color.white, 0);
         static readonly GradientColorKey k_WhiteKeyEnd = new GradientColorKey(Color.white, 1);
         static readonly GradientAlphaKey k_AlphaKeyBegin = new GradientAlphaKey(1, 0);
@@ -53,19 +57,47 @@ public override Gradient value
                         evt.elementTarget = this;
                         SetValueWithoutNotify(value);
                         SendEvent(evt);
+                        NotifyPropertyChanged(valueProperty);
                     }
                 }
             }
         }
 
+        private ColorSpace m_ColorSpace;
+
         /// <summary>
         /// The color space currently used by the field.
         /// </summary>
-        public ColorSpace colorSpace { get; set; }
+        [CreateProperty]
+        public ColorSpace colorSpace
+        {
+            get => m_ColorSpace;
+            set
+            {
+                if (m_ColorSpace == value)
+                    return;
+                m_ColorSpace = value;
+                NotifyPropertyChanged(colorSpaceProperty);
+            }
+        }
+
+        private bool m_Hdr;
+
         /// <summary>
         /// If true, treats the color as an HDR value. If false, treats the color as a standard LDR value.
         /// </summary>
-        public bool hdr { get; set; }
+        [CreateProperty]
+        public bool hdr
+        {
+            get => m_Hdr;
+            set
+            {
+                if (m_Hdr == value)
+                    return;
+                m_Hdr = value;
+                NotifyPropertyChanged(hdrProperty);
+            }
+        }
 
         internal static Gradient GradientCopy(Gradient other)
         {
@@ -134,11 +166,10 @@ public GradientField(string label)
             rawValue = new Gradient();
         }
 
-        [EventInterest(typeof(KeyDownEvent), typeof(MouseDownEvent),
-            typeof(DetachFromPanelEvent), typeof(AttachToPanelEvent))]
-        protected override void ExecuteDefaultAction(EventBase evt)
+        [EventInterest(typeof(KeyDownEvent), typeof(MouseDownEvent))]
+        protected override void ExecuteDefaultActionAtTarget(EventBase evt)
         {
-            base.ExecuteDefaultAction(evt);
+            base.ExecuteDefaultActionAtTarget(evt);
 
             if (evt == null)
             {
@@ -168,8 +199,21 @@ protected override void ExecuteDefaultAction(EventBase evt)
             if (showGradientPicker)
             {
                 ShowGradientPicker();
+                evt.StopPropagation();
             }
-            else if (evt.eventTypeId == DetachFromPanelEvent.TypeId())
+        }
+
+        [EventInterest(typeof(DetachFromPanelEvent), typeof(AttachToPanelEvent))]
+        protected override void ExecuteDefaultAction(EventBase evt)
+        {
+            base.ExecuteDefaultAction(evt);
+
+            if (evt == null)
+            {
+                return;
+            }
+
+            if (evt.eventTypeId == DetachFromPanelEvent.TypeId())
                 OnDetach();
             else if (evt.eventTypeId == AttachToPanelEvent.TypeId())
                 OnAttach();
diff --git a/Editor/Mono/UIElements/Controls/LayerField.cs b/Editor/Mono/UIElements/Controls/LayerField.cs
index 80bce447f2..27a00b05f6 100644
--- a/Editor/Mono/UIElements/Controls/LayerField.cs
+++ b/Editor/Mono/UIElements/Controls/LayerField.cs
@@ -11,7 +11,7 @@
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// A <see cref="LayerField"/> editor.
+    /// A LayerField editor. For more information, refer to [[wiki:UIE-uxml-element-LayerField|UXML element LayerField]].
     /// </summary>
     public class LayerField : PopupField<int>
     {
diff --git a/Editor/Mono/UIElements/Controls/LayerMaskField.cs b/Editor/Mono/UIElements/Controls/LayerMaskField.cs
index ceb3de3b7c..19e9e8a898 100644
--- a/Editor/Mono/UIElements/Controls/LayerMaskField.cs
+++ b/Editor/Mono/UIElements/Controls/LayerMaskField.cs
@@ -11,7 +11,7 @@
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// Make a field for layer as masks.
+    /// A LayerMaskField editor. For more information, refer to [[wiki:UIE-uxml-element-LayerMaskField|UXML element LayerMaskField]].
     /// </summary>
     public class LayerMaskField : MaskField
     {
diff --git a/Editor/Mono/UIElements/Controls/MaskField.cs b/Editor/Mono/UIElements/Controls/MaskField.cs
index a5b30dd2dd..eda19c5bbb 100644
--- a/Editor/Mono/UIElements/Controls/MaskField.cs
+++ b/Editor/Mono/UIElements/Controls/MaskField.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
 using System.Text;
 using UnityEngine.Pool;
 using UnityEngine.UIElements;
@@ -15,6 +16,8 @@ namespace UnityEditor.UIElements
     /// </summary>
     public abstract class BaseMaskField<TChoice> : BasePopupField<TChoice, string>
     {
+        internal static readonly DataBindingProperty choicesMasksProperty = nameof(choicesMasks);
+
         internal abstract TChoice MaskToValue(int newMask);
         internal abstract int ValueToMask(TChoice value);
 
@@ -126,6 +129,7 @@ public override List<string> choices
 
                 // Make sure to update the text displayed
                 SetValueWithoutNotify(rawValue);
+                NotifyPropertyChanged(choicesProperty);
             }
         }
 
@@ -142,6 +146,7 @@ internal virtual string GetEverythingName()
         /// <summary>
         /// The list of list of masks for every specific choice to display in the popup menu.
         /// </summary>
+        [CreateProperty]
         public virtual List<int> choicesMasks
         {
             get { return m_UserChoicesMasks; }
@@ -167,6 +172,7 @@ public virtual List<int> choicesMasks
                     // Make sure to update the text displayed
                     SetValueWithoutNotify(rawValue);
                 }
+                NotifyPropertyChanged(choicesMasksProperty);
             }
         }
 
@@ -257,7 +263,7 @@ internal string GetDisplayedValue(int itemIndex)
                             // Find the actual index of the selected choice...
                             foreach (int itemMask in m_UserChoicesMasks)
                             {
-                                if ((itemMask & itemIndex) == itemIndex)
+                                if (itemMask != ~0 && ((itemMask & itemIndex) == itemIndex))
                                 {
                                     indexOfValue = m_UserChoicesMasks.IndexOf(itemMask);
                                     break;
@@ -543,7 +549,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 string choicesFromBag = m_MaskChoices.GetValueFromBag(bag, cc);
 
 
-                var listOfChoices = ParseChoiceList(choicesFromBag);
+                var listOfChoices = UxmlUtility.ParseStringListAttribute(choicesFromBag);
 
                 if (listOfChoices != null && listOfChoices.Count > 0)
                 {
diff --git a/Editor/Mono/UIElements/Controls/ObjectField.cs b/Editor/Mono/UIElements/Controls/ObjectField.cs
index ad9557a538..a2eee909d2 100644
--- a/Editor/Mono/UIElements/Controls/ObjectField.cs
+++ b/Editor/Mono/UIElements/Controls/ObjectField.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
 using UnityEngine;
 using UnityEngine.UIElements;
 using Object = UnityEngine.Object;
@@ -15,6 +16,9 @@ namespace UnityEditor.UIElements
     /// </summary>
     public class ObjectField : BaseField<Object>
     {
+        internal static readonly DataBindingProperty objectTypeProperty = nameof(objectType);
+        internal static readonly DataBindingProperty allowSceneObjectsProperty = nameof(allowSceneObjects);
+
         /// <summary>
         /// Instantiates an <see cref="ObjectField"/> using the data read from a UXML file.
         /// </summary>
@@ -61,6 +65,7 @@ public override void SetValueWithoutNotify(Object newValue)
         /// <summary>
         /// The type of the objects that can be assigned.
         /// </summary>
+        [CreateProperty]
         public Type objectType
         {
             get { return m_objectType; }
@@ -70,6 +75,7 @@ public Type objectType
                 {
                     m_objectType = value;
                     UpdateDisplay();
+                    NotifyPropertyChanged(objectTypeProperty);
                 }
             }
         }
@@ -79,22 +85,35 @@ internal void SetObjectTypeWithoutDisplayUpdate(Type type)
             m_objectType = type;
         }
 
+        private bool m_AllowSceneObjects;
+
         /// <summary>
         /// Allows scene objects to be assigned to the field.
         /// </summary>
-        public bool allowSceneObjects { get; set; }
+        [CreateProperty]
+        public bool allowSceneObjects
+        {
+            get => m_AllowSceneObjects;
+            set
+            {
+                if (m_AllowSceneObjects == value)
+                    return;
+                m_AllowSceneObjects = value;
+                NotifyPropertyChanged(allowSceneObjectsProperty);
+            }
+        }
 
         protected override void UpdateMixedValueContent()
         {
             m_ObjectFieldDisplay?.ShowMixedValue(showMixedValue);
         }
 
-        internal void UpdateDisplay()
+        internal virtual void UpdateDisplay()
         {
             m_ObjectFieldDisplay.Update();
         }
 
-        private class ObjectFieldDisplay : VisualElement
+        internal class ObjectFieldDisplay : VisualElement
         {
             private readonly ObjectField m_ObjectField;
             private readonly Image m_ObjectIcon;
@@ -102,7 +121,7 @@ private class ObjectFieldDisplay : VisualElement
 
             static readonly string ussClassName = "unity-object-field-display";
             static readonly string iconUssClassName = ussClassName + "__icon";
-            static readonly string labelUssClassName = ussClassName + "__label";
+            internal static readonly string labelUssClassName = ussClassName + "__label";
             static readonly string acceptDropVariantUssClassName = ussClassName + "--accept-drop";
 
             internal void ShowMixedValue(bool show)
@@ -241,6 +260,7 @@ private void OnKeyboardEnter()
 
             private void OnKeyboardDelete()
             {
+                m_ObjectField.SetProperty(serializedPropertyKey, null);
                 m_ObjectField.value = null;
             }
 
@@ -297,12 +317,15 @@ public ObjectFieldSelector(ObjectField objectField)
             }
 
             [EventInterest(typeof(MouseDownEvent))]
-            protected override void ExecuteDefaultAction(EventBase evt)
+            protected override void ExecuteDefaultActionAtTarget(EventBase evt)
             {
-                base.ExecuteDefaultAction(evt);
+                base.ExecuteDefaultActionAtTarget(evt);
 
                 if ((evt as MouseDownEvent)?.button == (int)MouseButton.LeftMouse)
+                {
                     m_ObjectField.ShowObjectSelector();
+                    evt.StopPropagation();
+                }
             }
         }
 
diff --git a/Editor/Mono/UIElements/Controls/PropertyControl.cs b/Editor/Mono/UIElements/Controls/PropertyControl.cs
deleted file mode 100644
index 793e6875c9..0000000000
--- a/Editor/Mono/UIElements/Controls/PropertyControl.cs
+++ /dev/null
@@ -1,310 +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 UnityEngine;
-using UnityEngine.UIElements;
-
-namespace UnityEditor.UIElements
-{
-    static class BuiltInTypeConverter
-    {
-        static Dictionary<string, Type> s_TypeDictionary;
-
-        static BuiltInTypeConverter()
-        {
-            if (s_TypeDictionary == null)
-            {
-                s_TypeDictionary = new Dictionary<string, Type>();
-                s_TypeDictionary.Add("bool", typeof(long));
-                s_TypeDictionary.Add("byte", typeof(byte));
-                s_TypeDictionary.Add("sbyte", typeof(sbyte));
-                s_TypeDictionary.Add("char", typeof(char));
-                s_TypeDictionary.Add("decimal", typeof(decimal));
-                s_TypeDictionary.Add("double", typeof(double));
-                s_TypeDictionary.Add("float", typeof(float));
-                s_TypeDictionary.Add("int", typeof(int));
-                s_TypeDictionary.Add("uint", typeof(uint));
-                s_TypeDictionary.Add("long", typeof(long));
-                s_TypeDictionary.Add("ulong", typeof(ulong));
-                s_TypeDictionary.Add("object", typeof(object));
-                s_TypeDictionary.Add("short", typeof(short));
-                s_TypeDictionary.Add("ushort", typeof(ushort));
-                s_TypeDictionary.Add("string", typeof(string));
-            }
-        }
-
-        public static Type GetTypeFromName(string typeName)
-        {
-            Type t;
-            if (!s_TypeDictionary.TryGetValue(typeName, out t))
-            {
-                t = Type.GetType(typeName);
-            }
-
-            return t;
-        }
-    }
-
-    [Obsolete("Please use PropertyField instead", false)]
-    internal class PropertyControl<TType> : BaseField<TType>
-    {
-        public new class UxmlFactory : UxmlFactory<PropertyControl<TType>, UxmlTraits>
-        {
-            public override string uxmlName
-            {
-                get
-                {
-                    string name = typeof(PropertyControl<TType>).Name;
-                    if (name.Contains("`"))
-                    {
-                        name = name.Substring(0, name.IndexOf("`"));
-                    }
-                    return name;
-                }
-            }
-
-            public override string uxmlQualifiedName
-            {
-                get { return uxmlNamespace + "." + uxmlName; }
-            }
-
-            public override bool AcceptsAttributeBag(IUxmlAttributes bag, CreationContext cc)
-            {
-                string type = m_Traits.GetValueType(bag, cc);
-                if (BuiltInTypeConverter.GetTypeFromName(type) == typeof(TType))
-                {
-                    return true;
-                }
-
-                return false;
-            }
-        }
-
-        public new class UxmlTraits : BaseField<TType>.UxmlTraits
-        {
-            UxmlStringAttributeDescription m_TypeOf = new UxmlStringAttributeDescription { name = "value-type", obsoleteNames = new[] {"typeOf"}, use = UxmlAttributeDescription.Use.Required };
-            UxmlStringAttributeDescription m_Value = new UxmlStringAttributeDescription { name = "value" };
-
-            public UxmlTraits()
-            {
-                m_TypeOf.restriction = new UxmlEnumeration
-                {
-                    values = Enum.GetValues(typeof(DataType)).Cast<DataType>()
-                        .Where(dt => dt != DataType.Unsupported)
-                        .Select(dt => dt.ToString())
-                };
-            }
-
-            public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
-            {
-                base.Init(ve, bag, cc);
-
-                var initValue = m_Value.GetValueFromBag(bag, cc);
-                ((PropertyControl<TType>)ve).SetValueWithoutNotify(((PropertyControl<TType>)ve).StringToValue(initValue));
-                ((PropertyControl<TType>)ve).label = ((BaseField<TType>)ve).label;
-                ((BaseField<TType>)ve).label = null;
-            }
-
-            public string GetValueType(IUxmlAttributes bag, CreationContext cc)
-            {
-                return m_TypeOf.GetValueFromBag(bag, cc);
-            }
-        }
-
-        enum DataType
-        {
-            Long,
-            Double,
-            Int,
-            Float,
-            String,
-            Unsupported
-        }
-
-        private Func<TType> GetValueDelegate;
-        private Action<TType> SetValueDelegate;
-
-        private Label m_Label;
-        private BaseField<TType> m_Field;
-
-        public new static readonly string ussClassName = "unity-property-control";
-        public new static readonly string labelUssClassName = ussClassName + "__label";
-        public static readonly string draggerUssClassName = ussClassName + "__dragger";
-        public static readonly string controlUssClassName = ussClassName + "__control";
-
-        public PropertyControl()
-            : this("")
-        {}
-
-        public PropertyControl(string labelText)
-            : base(null)
-        {
-            Init("", labelText);
-        }
-
-        private void Init(string initialValue, string labelText)
-        {
-            AddToClassList(ussClassName);
-            focusable = true;
-            CacheType();
-
-            m_Label = new Label(labelText);
-            m_Label.AddToClassList(labelUssClassName);
-
-            Add(m_Label);
-            CreateControl();
-            SetValueWithoutNotify(StringToValue(initialValue));
-
-            EnableMouseDraggerForNumericType();
-        }
-
-        DataType dataType { get; set; }
-
-        private void CacheType()
-        {
-            var ttype = typeof(TType);
-            if (ttype == typeof(long))
-                dataType = DataType.Long;
-            else if (ttype == typeof(int))
-                dataType = DataType.Int;
-            else if (ttype == typeof(float))
-                dataType = DataType.Float;
-            else if (ttype == typeof(double))
-                dataType = DataType.Double;
-            else if (ttype == typeof(string))
-                dataType = DataType.String;
-            else
-            {
-                dataType = DataType.Unsupported;
-                throw new NotSupportedException($"Unsupported type for PropertyControl {ttype}");
-            }
-        }
-
-        private void EnableMouseDraggerForNumericType()
-        {
-            switch (dataType)
-            {
-                case DataType.Long:
-                    AddLabelDragger<long>();
-                    break;
-                case DataType.Int:
-                    AddLabelDragger<int>();
-                    break;
-                case DataType.Float:
-                    AddLabelDragger<float>();
-                    break;
-                case DataType.Double:
-                    AddLabelDragger<double>();
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        private void AddLabelDragger<TDraggerType>()
-        {
-            var dragger = new FieldMouseDragger<TDraggerType>((IValueField<TDraggerType>)m_Field);
-            dragger.SetDragZone(m_Label);
-
-            m_Label.AddToClassList(draggerUssClassName);
-        }
-
-        private static TTo ConvertType<TFrom, TTo>(TFrom value)
-        {
-            return (TTo)Convert.ChangeType(value, typeof(TTo));
-        }
-
-        private void CreateControl<TControlType, TDataType>() where TControlType : BaseField<TDataType>, new()
-        {
-            var c = new TControlType();
-            GetValueDelegate = () => ConvertType<TDataType, TType>(c.value);
-            SetValueDelegate = (x) => c.value = ConvertType<TType, TDataType>(x);
-            m_Field = c as BaseField<TType>;
-        }
-
-        private void CreateControl()
-        {
-            switch (dataType)
-            {
-                case DataType.Long:
-                    CreateControl<LongField, long>();
-                    break;
-                case DataType.Int:
-                    CreateControl<IntegerField, int>();
-                    break;
-                case DataType.Float:
-                    CreateControl<FloatField, float>();
-                    break;
-                case DataType.Double:
-                    CreateControl<DoubleField, double>();
-                    break;
-                case DataType.String:
-                    CreateControl<TextField, string>();
-                    break;
-            }
-
-            if (m_Field == null)
-                throw new NotSupportedException($"Unsupported type attribute: {typeof(TType)}");
-
-            m_Field.AddToClassList(controlUssClassName);
-            m_Field.RegisterValueChangedCallback(OnFieldValueChanged);
-            Add(m_Field);
-        }
-
-        public new string label
-        {
-            get { return m_Label.text; }
-            set { m_Label.text = value; }
-        }
-
-        private TType StringToValue(string str)
-        {
-            switch (dataType)
-            {
-                case DataType.Long:
-                case DataType.Int:
-                {
-                    long v;
-                    EditorGUI.StringToLong(str, out v);
-                    return ConvertType<long, TType>(v);
-                }
-                case DataType.Double:
-                case DataType.Float:
-                {
-                    double v;
-                    EditorGUI.StringToDouble(str, out v);
-                    return ConvertType<double, TType>(v);
-                }
-            }
-            return ConvertType<string, TType>(str);
-        }
-
-        private void OnFieldValueChanged(ChangeEvent<TType> evt)
-        {
-            using (ChangeEvent<TType> newEvent = ChangeEvent<TType>.GetPooled(evt.previousValue, evt.newValue))
-            {
-                newEvent.elementTarget = this;
-                SendEvent(newEvent);
-            }
-        }
-
-        public override void SetValueWithoutNotify(TType newValue)
-        {
-            m_Field.SetValueWithoutNotify(newValue);
-        }
-
-        public override TType value
-        {
-            get { return GetValueDelegate(); }
-            set { SetValueDelegate(value); }
-        }
-
-        protected override void UpdateMixedValueContent()
-        {
-        }
-    }
-}
diff --git a/Editor/Mono/UIElements/Controls/PropertyField.cs b/Editor/Mono/UIElements/Controls/PropertyField.cs
index 52963bbe61..e4c573d6a6 100644
--- a/Editor/Mono/UIElements/Controls/PropertyField.cs
+++ b/Editor/Mono/UIElements/Controls/PropertyField.cs
@@ -12,13 +12,14 @@
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// A SerializedProperty wrapper VisualElement that, on Bind(), will generate the correct field elements with the correct bindingPaths.
+    /// A SerializedProperty wrapper VisualElement that, on Bind(), will generate the correct field elements with the correct binding paths. For more information, refer to [[wiki:UIE-uxml-element-PropertyField|UXML element PropertyField]].
     /// </summary>
     public class PropertyField : VisualElement, IBindable
     {
         private static readonly Regex s_MatchPPtrTypeName = new Regex(@"PPtr\<(\w+)\>");
         internal static readonly string foldoutTitleBoundLabelProperty = "unity-foldout-bound-title";
         internal static readonly string decoratorDrawersContainerClassName = "unity-decorator-drawers-container";
+        static readonly string listViewNamePrefix = "unity-list-";
 
         /// <summary>
         /// Instantiates a <see cref="PropertyField"/> using the data read from a UXML file.
@@ -72,16 +73,17 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// </summary>
         public string label { get; set; }
 
-        private SerializedProperty m_SerializedProperty;
-        private string m_SerializedPropertyReferenceTypeName;
-        private PropertyField m_ParentPropertyField;
-        private int m_FoldoutDepth;
-        private VisualElement m_InspectorElement;
-        private VisualElement m_ContextWidthElement;
+        SerializedObject m_SerializedObject;
+        SerializedProperty m_SerializedProperty;
+        string m_SerializedPropertyReferenceTypeName;
+        PropertyField m_ParentPropertyField;
+        int m_FoldoutDepth;
+        VisualElement m_InspectorElement;
+        VisualElement m_ContextWidthElement;
 
-        private int m_DrawNestingLevel;
-        private PropertyField m_DrawParentProperty;
-        private VisualElement m_DecoratorDrawersContainer;
+        int m_DrawNestingLevel;
+        PropertyField m_DrawParentProperty;
+        VisualElement m_DecoratorDrawersContainer;
 
         SerializedProperty serializedProperty => m_SerializedProperty;
 
@@ -200,8 +202,9 @@ void Reset(SerializedProperty newProperty)
 
             bool newPropertyTypeIsDifferent = true;
 
+            var serializedObjectIsValid = m_SerializedObject != null && m_SerializedObject.m_NativeObjectPtr != IntPtr.Zero && m_SerializedObject.isValid;
 
-            if (m_SerializedProperty != null && m_SerializedProperty.isValid && newPropertyType == m_SerializedProperty.propertyType)
+            if (serializedObjectIsValid && m_SerializedProperty != null && m_SerializedProperty.isValid && newPropertyType == m_SerializedProperty.propertyType)
             {
                 if(newPropertyType == SerializedPropertyType.ManagedReference)
                 {
@@ -215,7 +218,7 @@ void Reset(SerializedProperty newProperty)
 
             m_SerializedProperty = newProperty;
             m_SerializedPropertyReferenceTypeName = newPropertyTypeName;
-
+            m_SerializedObject = newProperty.serializedObject;
 
             // if we already have a serialized property, determine if the property field can be reused without reset
             // this is only supported for non propertydrawer types
@@ -261,6 +264,7 @@ void Reset(SerializedProperty newProperty)
             {
                 if (handler.hasPropertyDrawer)
                 {
+                    handler.propertyDrawer.m_PreferredLabel = label ?? serializedProperty.localizedDisplayName;
                     customPropertyGUI = handler.propertyDrawer.CreatePropertyGUI(m_SerializedProperty);
 
                     if (customPropertyGUI == null)
@@ -299,7 +303,7 @@ private void ResetDecoratorDrawers(PropertyHandler handler)
         {
              var decorators = handler.decoratorDrawers;
 
-             if (decorators == null || decorators.Count == 0)
+             if (decorators == null || decorators.Count == 0 || m_DrawNestingLevel > 0)
              {
                  if (m_DecoratorDrawersContainer != null)
                  {
@@ -333,6 +337,7 @@ private void ResetDecoratorDrawers(PropertyHandler handler)
                          decoratorRect.height = decorator.GetHeight();
                          decoratorRect.width = resolvedStyle.width;
                          decorator.OnGUI(decoratorRect);
+                         ve.style.height = decoratorRect.height;
                      });
                      ve.style.height = decorator.GetHeight();
                  }
@@ -360,6 +365,12 @@ private VisualElement CreatePropertyIMGUIContainer()
                     if (!serializedProperty.isValid)
                         return;
 
+                    if (m_InspectorElement is InspectorElement inspectorElement)
+                    {
+                        //set the current PropertyHandlerCache to the current editor
+                        ScriptAttributeUtility.propertyHandlerCache = inspectorElement.editor.propertyHandlerCache;
+                    }
+
                     EditorGUI.BeginChangeCheck();
                     serializedProperty.serializedObject.Update();
 
@@ -391,6 +402,9 @@ private VisualElement CreatePropertyIMGUIContainer()
                     var handler = ScriptAttributeUtility.GetHandler(serializedProperty);
                     using (var nestingContext = handler.ApplyNestingContext(m_DrawNestingLevel))
                     {
+                        // Decorator drawers are already handled on the uitk side
+                        handler.skipDecoratorDrawers = true;
+
                         if (label == null)
                         {
                             EditorGUILayout.PropertyField(serializedProperty, true);
@@ -575,10 +589,13 @@ void RefreshChildrenProperties(SerializedProperty property, bool bindNewFields)
         private VisualElement CreateFoldout(SerializedProperty property, object originalField = null)
         {
             property = property.Copy();
-            var foldout = originalField != null && originalField is Foldout ? originalField as Foldout : new Foldout();
-            bool hasCustomLabel = !string.IsNullOrEmpty(label);
+            if (originalField is not Foldout foldout)
+            {
+                foldout = new Foldout();
+            }
+
+            var hasCustomLabel = !string.IsNullOrEmpty(label);
             foldout.text = hasCustomLabel ? label : property.localizedDisplayName;
-            foldout.value = property.isExpanded;
             foldout.bindingPath = property.propertyPath;
             foldout.name = "unity-foldout-" + property.propertyPath;
 
@@ -633,6 +650,13 @@ private TField ConfigureField<TField, TValue>(TField field, SerializedProperty p
             field.name = "unity-input-" + property.propertyPath;
             field.label = fieldLabel;
 
+            ConfigureFieldStyles<TField, TValue>(field);
+
+            return field;
+        }
+
+        internal static void ConfigureFieldStyles<TField, TValue>(TField field) where TField : BaseField<TValue>
+        {
             field.labelElement.AddToClassList(labelUssClassName);
             field.visualInput.AddToClassList(inputUssClassName);
             field.AddToClassList(BaseField<TValue>.alignedFieldUssClassName);
@@ -644,30 +668,36 @@ private TField ConfigureField<TField, TValue>(TField field, SerializedProperty p
             {
                 x.AddToClassList(BaseField<TValue>.alignedFieldUssClassName);
             });
-
-
-            return field;
         }
 
         VisualElement ConfigureListView(ListView listView, SerializedProperty property, Func<ListView> factory)
         {
-            listView ??= factory();
+            if (listView == null)
+            {
+                listView = factory();
+                listView.showBorder = true;
+                listView.selectionType = SelectionType.Multiple;
+                listView.showAddRemoveFooter = true;
+                listView.showBoundCollectionSize = true;
+                listView.showFoldoutHeader = true;
+                listView.virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight;
+                listView.showAlternatingRowBackgrounds = AlternatingRowBackground.None;
+                listView.itemsSourceSizeChanged += DispatchPropertyChangedEvent;
+            }
+
             var propertyCopy = property.Copy();
-            listView.reorderMode = ListViewReorderMode.Animated;
-            listView.reorderable = PropertyHandler.IsArrayReorderable(property);
-            listView.showBorder = true;
-            listView.showAddRemoveFooter = true;
-            listView.showBoundCollectionSize = true;
-            listView.showFoldoutHeader = true;
+            var listViewName = $"{listViewNamePrefix}{property.propertyPath}";
             listView.headerTitle = string.IsNullOrEmpty(label) ? propertyCopy.localizedDisplayName : label;
-            listView.virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight;
             listView.userData = propertyCopy;
-            listView.showAlternatingRowBackgrounds = AlternatingRowBackground.None;
             listView.bindingPath = property.propertyPath;
-            listView.viewDataKey = property.propertyPath;
-            listView.name = "unity-list-" + property.propertyPath;
-            listView.headerFoldout.viewDataKey = property.propertyPath;
-            listView.Bind(property.serializedObject);
+            listView.viewDataKey = listViewName;
+            listView.name = listViewName;
+
+            // Make list view foldout react even when disabled, like EditorGUILayout.Foldout.
+            var toggle = listView.Q<Toggle>(className: Foldout.toggleUssClassName);
+            if (toggle != null)
+                toggle.m_Clickable.acceptClicksIfDisabled = true;
+
             return listView;
         }
 
@@ -687,6 +717,13 @@ private VisualElement CreateOrUpdateFieldFromProperty(SerializedProperty propert
                     if (property.type == "long")
                         return ConfigureField<LongField, long>(originalField as LongField, property,
                             () => new LongField());
+                    if (property.type == "ulong")
+                        return ConfigureField<UnsignedLongField, ulong>(originalField as UnsignedLongField, property,
+                            () => new UnsignedLongField());
+                    if (property.type == "uint")
+                        return ConfigureField<UnsignedIntegerField, uint>(originalField as UnsignedIntegerField, property,
+                            () => new UnsignedIntegerField());
+
                 {
                     var intField = ConfigureField<IntegerField, int>(originalField as IntegerField, property,
                         () => new IntegerField()) as IntegerField;
@@ -739,12 +776,17 @@ private VisualElement CreateOrUpdateFieldFromProperty(SerializedProperty propert
                         {
                             if (!objectTypes.Name.Equals(targetTypeName, StringComparison.OrdinalIgnoreCase))
                                 continue;
+
+                            // We ignore C# types as they can can be confused with a built-in type with the same name,
+                            // we can use the FieldInfo to find MonoScript types. (UUM-29499)
+                            if (typeof(MonoBehaviour).IsAssignableFrom(objectTypes) || typeof(ScriptableObject).IsAssignableFrom(objectTypes))
+                                continue;
+
                             requiredType = objectTypes;
                             break;
                         }
                     }
 
-                    field.SetProperty(ObjectField.serializedPropertyKey, property);
                     field.SetObjectTypeWithoutDisplayUpdate(requiredType);
                     field.UpdateDisplay();
 
@@ -902,7 +944,6 @@ private void RegisterPropertyChangesOnCustomDrawerElement(VisualElement customPr
             customPropertyDrawer.RegisterCallback<ChangeEvent<Quaternion>>((changeEvent) => AsyncDispatchPropertyChangedEvent());
             customPropertyDrawer.RegisterCallback<ChangeEvent<Vector2Int>>((changeEvent) => AsyncDispatchPropertyChangedEvent());
             customPropertyDrawer.RegisterCallback<ChangeEvent<Vector3Int>>((changeEvent) => AsyncDispatchPropertyChangedEvent());
-            customPropertyDrawer.RegisterCallback<ChangeEvent<Vector3Int>>((changeEvent) => AsyncDispatchPropertyChangedEvent());
             customPropertyDrawer.RegisterCallback<ChangeEvent<RectInt>>((changeEvent) => AsyncDispatchPropertyChangedEvent());
             customPropertyDrawer.RegisterCallback<ChangeEvent<BoundsInt>>((changeEvent) => AsyncDispatchPropertyChangedEvent());
             customPropertyDrawer.RegisterCallback<ChangeEvent<Hash128>>((changeEvent) => AsyncDispatchPropertyChangedEvent());
diff --git a/Editor/Mono/UIElements/Controls/Toolbar/SearchFieldBase.cs b/Editor/Mono/UIElements/Controls/Toolbar/SearchFieldBase.cs
index e27992a6f9..068295c99c 100644
--- a/Editor/Mono/UIElements/Controls/Toolbar/SearchFieldBase.cs
+++ b/Editor/Mono/UIElements/Controls/Toolbar/SearchFieldBase.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.Collections.Generic;
+using Unity.Properties;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -13,6 +15,8 @@ namespace UnityEditor.UIElements
     public abstract class SearchFieldBase<TextInputType, T> : VisualElement, INotifyValueChanged<T>
         where TextInputType : TextInputBaseField<T>, new()
     {
+        internal static readonly DataBindingProperty valueProperty = nameof(value);
+
         private readonly Button m_SearchButton;
         private readonly Button m_CancelButton;
         private readonly TextInputType m_TextField;
@@ -35,10 +39,17 @@ protected Button searchButton
         /// <remarks>
         /// If the new value is different from the current value, this method notifies registered callbacks with a <see cref="ChangeEvent{T}"/>.
         /// </remarks>
+        [CreateProperty]
         public T value
         {
             get { return m_TextField.value; }
-            set { m_TextField.value = value; }
+            set
+            {
+                var previous = m_TextField.value;
+                m_TextField.value = value;
+                if (!EqualityComparer<T>.Default.Equals(m_TextField.value, previous))
+                    NotifyPropertyChanged(valueProperty);
+            }
         }
 
         /// <summary>
diff --git a/Editor/Mono/UIElements/Controls/Toolbar/Toolbar.cs b/Editor/Mono/UIElements/Controls/Toolbar/Toolbar.cs
index 051f644454..a621abc7b5 100644
--- a/Editor/Mono/UIElements/Controls/Toolbar/Toolbar.cs
+++ b/Editor/Mono/UIElements/Controls/Toolbar/Toolbar.cs
@@ -7,7 +7,7 @@
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// A toolbar for tool windows.
+    /// A toolbar for tool windows. For more information, refer to [[wiki:UIE-uxml-element-Toolbar|UXML element Toolbar]].
     /// </summary>
     public class Toolbar : VisualElement
     {
diff --git a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarBreadcrumbs.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarBreadcrumbs.cs
index d66a1a8719..09843a4803 100644
--- a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarBreadcrumbs.cs
+++ b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarBreadcrumbs.cs
@@ -9,7 +9,7 @@
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// Creates a breadcrumb UI element for the toolbar to help users navigate a hierarchy. For example, the visual scripting breadcrumb toolbar makes it easier to explore scripts because users can jump to any level of the script by clicking a breadcrumb item.
+    /// Creates a breadcrumb UI element for the toolbar to help users navigate a hierarchy. For example, the visual scripting breadcrumb toolbar makes it easier to explore scripts because users can jump to any level of the script by clicking a breadcrumb item. For more information, refer to [[wiki:UIE-uxml-element-ToolbarBreadcrumbs|UXML element ToolbarBreadcrumbs]].
     /// </summary>
     /// <remarks>
     /// Represents a breadcrumb trail to facilitate navigation between related items in a hierarchy.
diff --git a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarButton.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarButton.cs
index 77ae366fea..04f028e864 100644
--- a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarButton.cs
+++ b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarButton.cs
@@ -8,7 +8,7 @@
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// A button for the toolbar.
+    /// A button for the toolbar. For more information, refer to [[wiki:UIE-uxml-element-ToolbarButton|UXML element ToolbarButton]].
     /// </summary>
     public class ToolbarButton : Button
     {
diff --git a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarMenu.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarMenu.cs
index c100eac81b..68797ce008 100644
--- a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarMenu.cs
+++ b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarMenu.cs
@@ -2,15 +2,19 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using Unity.Properties;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// A drop-down menu for the toolbar.
+    /// A drop-down menu for the toolbar. For more information, refer to [[wiki:UIE-uxml-element-ToolbarMenu|UXML element ToolbarMenu]].
     /// </summary>
     public class ToolbarMenu : TextElement, IToolbarMenuElement
     {
+        internal static readonly DataBindingProperty menuProperty = nameof(menu);
+        internal static readonly DataBindingProperty variantProperty = nameof(variant);
+
         /// <summary>
         /// Instantiates a <see cref="ToolbarMenu"/> using the data read from a UXML file.
         /// </summary>
@@ -38,6 +42,7 @@ public enum Variant
         /// <summary>
         /// The menu.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public DropdownMenu menu { get; }
         public override string text
         {
@@ -93,13 +98,18 @@ public ToolbarMenu()
         /// <summary>
         /// The display styles that you can use when creating menus.
         /// </summary>
+        [CreateProperty]
         public Variant variant
         {
             get { return m_Variant; }
             set
             {
+                var previous = m_Variant;
                 m_Variant = value;
                 EnableInClassList(popupVariantUssClassName, value == Variant.Popup);
+
+                if (previous != m_Variant)
+                    NotifyPropertyChanged(variantProperty);
             }
         }
     }
diff --git a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarPopupSearchField.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarPopupSearchField.cs
index 64e9155d17..55195eeaad 100644
--- a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarPopupSearchField.cs
+++ b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarPopupSearchField.cs
@@ -2,15 +2,18 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using Unity.Properties;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// The pop-up search field for the toolbar. The search field includes a menu button.
+    /// The pop-up search field for the toolbar. The search field includes a menu button. For more information, refer to [[wiki:UIE-uxml-element-ToolbarPopupSearchField|UXML element ToolbarPopupSearchField]].
     /// </summary>
     public class ToolbarPopupSearchField : ToolbarSearchField, IToolbarMenuElement
     {
+        internal static readonly DataBindingProperty menuProperty = nameof(menu);
+
         /// <summary>
         /// Instantiates a <see cref="ToolbarPopupSearchField"/> using the data read from a UXML file.
         /// </summary>
@@ -28,6 +31,7 @@ public class ToolbarPopupSearchField : ToolbarSearchField, IToolbarMenuElement
         /// <summary>
         /// The menu used by the pop-up search field element.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public DropdownMenu menu { get; }
 
         /// <summary>
diff --git a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarSearchField.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarSearchField.cs
index 61f99f5e34..263438e566 100644
--- a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarSearchField.cs
+++ b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarSearchField.cs
@@ -9,7 +9,7 @@
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// A search field for the toolbar.
+    /// A search field for the toolbar. For more information, refer to [[wiki:UIE-uxml-element-ToolbarSearchField|UXML element ToolbarSearchField]].
     /// </summary>
     public class ToolbarSearchField : SearchFieldBase<TextField, string>
     {
@@ -43,26 +43,6 @@ public class ToolbarSearchField : SearchFieldBase<TextField, string>
             get { return base.searchButton; }
         }
 
-        /// <summary>
-        /// The object currently being exposed by the field.
-        /// </summary>
-        /// <remarks>
-        /// If the new value is different from the current value, this method notifies registered callbacks with a <see cref="ChangeEvent{T}"/> of type string.
-        /// </remarks>
-        public new string value
-        {
-            get { return base.value; }
-            set { base.value = value; }
-        }
-
-        /// <summary>
-        /// Sets the value for the toolbar search field without sending a change event.
-        /// </summary>
-        public override void SetValueWithoutNotify(string newValue)
-        {
-            base.SetValueWithoutNotify(newValue);
-        }
-
         // KEEP ABOVE CODE TO BE BACKWARD COMPATIBLE WITH 2019.1 ToolbarSearchField
 
         /// <summary>
diff --git a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarSpacer.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarSpacer.cs
index 4d1b19cf6c..fe07a12b30 100644
--- a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarSpacer.cs
+++ b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarSpacer.cs
@@ -3,15 +3,18 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using Unity.Properties;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// A toolbar spacer of static size.
+    /// A toolbar spacer of static size. For more information, refer to [[wiki:UIE-uxml-element-ToolbarSpacer|UXML element ToolbarSpacer]].
     /// </summary>
     public class ToolbarSpacer : VisualElement
     {
+        internal static readonly DataBindingProperty flexProperty = nameof(flex);
+
         /// <summary>
         /// Instantiates a <see cref="ToolbarSpacer"/> using the data read from a UXML file.
         /// </summary>
@@ -45,6 +48,7 @@ public ToolbarSpacer()
         /// <summary>
         /// Return true if the spacer stretches or shrinks to occupy available space.
         /// </summary>
+        [CreateProperty]
         public bool flex
         {
             get { return ClassListContains(flexibleSpacerVariantUssClassName); }
@@ -53,6 +57,7 @@ public bool flex
                 if (flex != value)
                 {
                     EnableInClassList(flexibleSpacerVariantUssClassName, value);
+                    NotifyPropertyChanged(flexProperty);
                 }
             }
         }
diff --git a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarToggle.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarToggle.cs
index a557466f56..ddcccf7e3e 100644
--- a/Editor/Mono/UIElements/Controls/Toolbar/ToolbarToggle.cs
+++ b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarToggle.cs
@@ -7,7 +7,7 @@
 namespace UnityEditor.UIElements
 {
     /// <summary>
-    /// A toggle for the toolbar.
+    /// A toggle for the toolbar. For more information, refer to [[wiki:UIE-uxml-element-ToolbarToggle|UXML element ToolbarToggle]].
     /// </summary>
     public class ToolbarToggle : Toggle
     {
diff --git a/Editor/Mono/UIElements/DefaultMainToolbar.cs b/Editor/Mono/UIElements/DefaultMainToolbar.cs
index b68710edb2..05a28c9df5 100644
--- a/Editor/Mono/UIElements/DefaultMainToolbar.cs
+++ b/Editor/Mono/UIElements/DefaultMainToolbar.cs
@@ -16,6 +16,7 @@ static IEnumerable<string> leftToolbar
             {
                 yield return "Services/Account";
                 yield return "Services/Cloud";
+                yield return "Editor Utility/Store";
                 yield return "Editor Utility/Imgui Subtoolbars";
             }
         }
diff --git a/Editor/Mono/UIElements/EditorFocusMonitor.cs b/Editor/Mono/UIElements/EditorFocusMonitor.cs
new file mode 100644
index 0000000000..88d75a999a
--- /dev/null
+++ b/Editor/Mono/UIElements/EditorFocusMonitor.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 UnityEngine.UIElements;
+
+namespace UnityEditor.UIElements
+{
+    class EditorFocusMonitor
+    {
+        /// <summary>
+        /// Checks if any Editor windows have a bindable element currently focused.
+        /// </summary>
+        /// <returns>True if a bindable element is focused; false otherwise.</returns>
+        public static bool AreBindableElementsSelected()
+        {
+            foreach (var window in EditorWindow.activeEditorWindows)
+            {
+                var focusController = window.rootVisualElement?.panel?.focusController;
+
+                // We only care about elements that are bindable, as they are the only ones that could be making changes to the prefab.
+                if (focusController?.focusedElement is BindableElement)
+                    return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/Editor/Mono/UIElements/Inspector/EditorElement.cs b/Editor/Mono/UIElements/Inspector/EditorElement.cs
index a2068cf1d7..59c15f1805 100644
--- a/Editor/Mono/UIElements/Inspector/EditorElement.cs
+++ b/Editor/Mono/UIElements/Inspector/EditorElement.cs
@@ -94,6 +94,9 @@ internal EditorElement(int editorIndex, IPropertyView iw, Editor[] editors, bool
             m_IsCulled = isCulled;
             pickingMode = PickingMode.Ignore;
 
+            var editor = editors == null || editors.Length == 0 || m_EditorIndex < 0 || m_EditorIndex >= editors.Length ? null : editors[m_EditorIndex];
+            name = GetNameFromEditor(editor);
+
             if (isCulled)
             {
                 InitCulled(editors);
@@ -126,7 +129,7 @@ void Init(Editor[] editors)
         {
             PopulateCache(editors);
             m_EditorTarget = editor.targets[0];
-            var editorTitle = ObjectNames.GetInspectorTitle(m_EditorTarget);
+            var editorTitle = ObjectNames.GetInspectorTitle(m_EditorTarget, editor.targets.Length > 1);
 
             m_Header = BuildHeaderElement(editorTitle);
             m_Footer = BuildFooterElement(editorTitle);
@@ -134,6 +137,13 @@ void Init(Editor[] editors)
             Add(m_Header);
             Add(m_Footer);
 
+            // For GameObjects we want to ensure the first component's title bar is flush with the header,
+            // so we apply a small offset to the margin. (UUM-16138)
+            if (m_EditorTarget is GameObject)
+            {
+                AddToClassList("game-object-inspector");
+            }
+
             if (InspectorElement.disabledThrottling)
                 CreateInspectorElement();
         }
@@ -143,23 +153,7 @@ InspectorElement BuildInspectorElement()
             var editors = PopulateCache();
             var editorTitle = ObjectNames.GetInspectorTitle(m_EditorTarget);
 
-            InspectorElement.Mode inspectorElementMode;
-
-            var propertyEditor = inspectorWindow as PropertyEditor;
-
-            if (null == propertyEditor || propertyEditor.inspectorElementModeOverride == 0)
-            {
-                inspectorElementMode = InspectorElement.GetModeFromInspectorMode(inspectorWindow.inspectorMode);
-
-                if (!EditorSettings.inspectorUseIMGUIDefaultInspector)
-                    inspectorElementMode &= ~(InspectorElement.Mode.IMGUIDefault);
-            }
-            else
-            {
-                inspectorElementMode = (InspectorElement.Mode) propertyEditor.inspectorElementModeOverride;
-            }
-
-            var inspectorElement = new InspectorElement(editor, inspectorElementMode)
+            var inspectorElement = new InspectorElement(editor)
             {
                 focusable = false,
                 name = editorTitle + "Inspector",
@@ -203,6 +197,7 @@ public void Reinit(int editorIndex, Editor[] editors)
 
             PopulateCache(editors);
             Object editorTarget = editor.targets[0];
+            name = GetNameFromEditor(editor);
             string editorTitle = ObjectNames.GetInspectorTitle(editorTarget);
 
             // If the target change we need to invalidate IMGUI container cached measurements
@@ -219,13 +214,12 @@ public void Reinit(int editorIndex, Editor[] editors)
             m_Header.onGUIHandler = HeaderOnGUI;
             m_Footer.onGUIHandler = FooterOnGUI;
 
-            name = editorTitle;
             m_Header.name = editorTitle + "Header";
             m_Footer.name = editorTitle + "Footer";
 
             if (m_InspectorElement != null)
             {
-                m_InspectorElement.AssignExistingEditor(editor);
+                m_InspectorElement.SetEditor(editor);
                 m_InspectorElement.name = editorTitle + "Inspector";
 
                 // InspectorElement should be enabled only if the Editor is open for edit.
@@ -240,6 +234,9 @@ public void CreateInspectorElement()
             if (null == editor || null != m_InspectorElement || m_IsCulled)
                 return;
 
+            //set the current PropertyHandlerCache to the current editor
+            ScriptAttributeUtility.propertyHandlerCache = editor.propertyHandlerCache;
+
             // Need to update the cache for multi-object edit detection.
             if (editor.targets.Length != Selection.objects.Length)
                 inspectorWindow.tracker.RebuildIfNecessary();
@@ -254,6 +251,13 @@ public void CreateInspectorElement()
             }
         }
 
+        string GetNameFromEditor(Editor editor)
+        {
+            return editor == null ?
+                    "Nothing Selected" :
+                    $"{editor.GetType().Name}_{editor.targets[0].GetType().Name}_{editor.targets[0].GetInstanceID()}";
+        }
+
         void UpdateInspectorVisibility()
         {
             if (editor.CanBeExpandedViaAFoldoutWithoutUpdate())
@@ -483,17 +487,6 @@ Rect DrawEditorSmallHeader(Editor[] editors, Object target, bool wasVisible)
             if (currentEditor == null)
                 return GUILayoutUtility.GetLastRect();
 
-            // ensure first component's title bar is flush with the header
-            if (EditorNeedsVerticalOffset(editors, target))
-            {
-                // TODO: Check if we can fix this in the GameObjectInspector instead
-                GUILayout.Space(
-                    -3f // move back up so line overlaps
-                    - EditorStyles.inspectorBig.margin.bottom -
-                    EditorStyles.inspectorTitlebar.margin.top // move back up margins
-                );
-            }
-
             using (new EditorGUI.DisabledScope(!currentEditor.IsEnabled()))
             {
                 bool isVisible = EditorGUILayout.InspectorTitlebar(wasVisible, currentEditor);
diff --git a/Editor/Mono/UIElements/Inspector/InspectorElement.cs b/Editor/Mono/UIElements/Inspector/InspectorElement.cs
index fc27802550..5e4504c580 100644
--- a/Editor/Mono/UIElements/Inspector/InspectorElement.cs
+++ b/Editor/Mono/UIElements/Inspector/InspectorElement.cs
@@ -3,13 +3,11 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using System.Collections.Generic;
 using Unity.Profiling;
 using UnityEditor.Profiling;
 using UnityEngine;
 using UnityEngine.UIElements;
 using Object = UnityEngine.Object;
-using AssetImporterEditor = UnityEditor.AssetImporters.AssetImporterEditor;
 
 namespace UnityEditor.UIElements
 {
@@ -21,14 +19,34 @@ namespace UnityEditor.UIElements
     /// </remarks>
     public class InspectorElement : BindableElement
     {
+        /// <summary>
+        /// The framework that should be used to build and run the UI. This is only used for default inspectors (i.e. editors of type <see cref="GenericInspector"/>)
+        /// </summary>
+        internal enum DefaultInspectorFramework
+        {
+            /// <summary>
+            /// UIToolkit should be used to generate property fields for default inspectors.
+            /// </summary>
+            UIToolkit,
+
+            /// <summary>
+            /// IMGUI should be used to generate property fields for default inspectors. These will be placed inside of a <see cref="IMGUIContainer"/>.
+            /// </summary>
+            IMGUI
+        }
+
+        static readonly ProfilerMarker k_CreateInspectorElementFromSerializedObject = new ProfilerMarker("InspectorElement.CreateInspectorElementFromSerializedObject");
+
         /// <summary>
         /// USS class name of elements of this type.
         /// </summary>
         public static readonly string ussClassName = "unity-inspector-element";
+
         /// <summary>
         /// USS class name of custom inspector elements in elements of this type.
         /// </summary>
         public static readonly string customInspectorUssClassName = ussClassName + "__custom-inspector-container";
+
         /// <summary>
         /// USS class name of IMGUI containers in elements of this type.
         /// </summary>
@@ -38,6 +56,7 @@ public class InspectorElement : BindableElement
         /// USS class name of elements of this type, when they are displayed in IMGUI inspector mode.
         /// </summary>
         public static readonly string iMGUIInspectorVariantUssClassName = ussClassName + "--imgui";
+
         /// <summary>
         /// USS class name of elements of this type, when they are displayed in UIElements inspector mode.
         /// </summary>
@@ -47,31 +66,40 @@ public class InspectorElement : BindableElement
         /// USS class name of elements of this type, when no inspector is found.
         /// </summary>
         public static readonly string noInspectorFoundVariantUssClassName = ussClassName + "--no-inspector-found";
+
         /// <summary>
         /// USS class name of elements of this type, when they are displayed in UIElements custom mode.
         /// </summary>
         public static readonly string uIECustomVariantUssClassName = ussClassName + "--uie-custom";
+
         /// <summary>
         /// USS class name of elements of this type, when they are displayed in IMGUI custom mode.
         /// </summary>
         public static readonly string iMGUICustomVariantUssClassName = ussClassName + "--imgui-custom";
+
         /// <summary>
         /// USS class name of elements of this type, when they are displayed in IMGUI default mode.
         /// </summary>
         public static readonly string iMGUIDefaultVariantUssClassName = ussClassName + "--imgui-default";
+
         /// <summary>
         /// USS class name of elements of this type, when they are displayed in UIElements default mode.
         /// </summary>
         public static readonly string uIEDefaultVariantUssClassName = ussClassName + "--uie-default";
+
         /// <summary>
         /// USS class name of elements of this type, when they are displayed in debug USS mode.
         /// </summary>
         public static readonly string debugVariantUssClassName = ussClassName + "--debug";
+
         /// <summary>
         /// USS class name of elements of this type, when they are displayed in debug internal mode.
         /// </summary>
         public static readonly string debugInternalVariantUssClassName = ussClassName + "--debug-internal";
 
+        /// <summary>
+        /// USS class name of elements of this type, when they are displayed without a missing script type.
+        /// </summary>
         internal static readonly string noScriptErrorContainerName = "unity-inspector-no-script-error-container";
 
         internal static bool disabledThrottling { get; set; } = false;
@@ -95,204 +123,289 @@ public UxmlTraits()
             }
         }
 
-        [Flags]
-        internal enum Mode
-        {
-            UIECustom = 1 << 0,
-            IMGUICustom = 1 << 1,
-            IMGUIDefault = 1 << 2,
-            UIEDefault = 1 << 3,
-
-            DebugMod = 1 << 4,
-            DebugInternalMod = 1 << 5,
-
-            Normal = UIECustom | IMGUICustom | IMGUIDefault | UIEDefault,
-            Default = IMGUIDefault | UIEDefault,
-            Custom = UIECustom | IMGUICustom,
-            IMGUI = IMGUICustom | IMGUIDefault,
-            UIE = UIECustom | UIEDefault,
-
-            Debug = Default | DebugMod,
-            DebugInternal = Default | DebugInternalMod
-        }
+        /// <summary>
+        /// Gets the default backend to use based on the current editor settings.
+        /// </summary>
+        /// <returns>The default backend type to use.</returns>
+        static DefaultInspectorFramework GetDefaultInspectorFramework() => EditorSettings.inspectorUseIMGUIDefaultInspector ? DefaultInspectorFramework.IMGUI : DefaultInspectorFramework.UIToolkit;
 
-        internal Mode mode { get; private set; }
+        /// <summary>
+        /// The editor this element is inspecting.
+        /// <remarks>
+        /// An <see cref="InspectorElement"/> must ALWAYS be backed by an <see cref="Editor"/>. If one does not exist the inspector will create and manage one.
+        /// </remarks>
+        /// </summary>
+        Editor m_Editor;
 
-        internal Editor editor
-        {
-            get { return m_Editor; }
-            private set
-            {
-                if (m_Editor != value)
-                {
-                    DestroyOwnedEditor();
-                    m_Editor = value;
-                    ownsEditor = false;
-                }
-            }
-        }
+        /// <summary>
+        /// Flag indicating if the InspectorElement is managing it's own editor instance.
+        /// </summary>
+        bool m_OwnsEditor;
+
+        /// <summary>
+        /// The currently bound serialized object.
+        /// </summary>
+        SerializedObject m_BoundObject;
+
+        /// <summary>
+        /// The currently bound object type, this can be used as an optional optimization to avoid rebuilding the UI if the type doesn't change.
+        /// </summary>
+        Type m_BoundObjectType;
 
-        private string m_TrackerName;
-        internal string trackerName => m_TrackerName ?? (m_TrackerName = GetInspectorTrackerName(this));
+        /// <summary>
+        /// The root element of this inspector. This can either be a full visual hierarchy or an IMGUIContainer.
+        /// </summary>
+        VisualElement m_InspectorElement;
 
-        internal bool ownsEditor { get; private set; } = false;
+        /// <summary>
+        /// The default framework to use for generic inspectors.
+        /// </summary>
+        DefaultInspectorFramework m_DefaultInspectorFramework;
 
-        internal SerializedObject boundObject { get; private set; }
+        /// <summary>
+        /// The cached tracker name.
+        /// </summary>
+        string m_TrackerName;
 
-        internal VisualElement prefabOverrideBlueBarsContainer { get; private set; }
-        internal VisualElement livePropertyYellowBarsContainer { get; private set; }
+        bool m_IgnoreOnInspectorGUIErrors;
+        bool m_IsOpenForEdit;
+        bool m_InvalidateGUIBlockCache = true;
+        bool m_Rebind;
 
-        private bool m_IgnoreOnInspectorGUIErrors;
+        /// <summary>
+        /// Gets or sets the editor backing this inspector element.
+        /// </summary>
+        internal Editor editor => m_Editor;
 
-        static readonly ProfilerMarker k_Reset = new ProfilerMarker("InspectorElement.Reset");
-        static readonly ProfilerMarker k_CreateInspectorGUI = new ProfilerMarker("InspectorElement.CreateInspectorGUI");
+        /// <summary>
+        /// Returns true if the inspector element owns and manages it's own editor instance.
+        /// </summary>
+        internal bool ownsEditor => m_OwnsEditor;
 
         /// <summary>
-        /// InspectorElement constructor.
+        /// Returns the current tracker name for this element. This is used for editor performance tracking.
         /// </summary>
-        public InspectorElement() : this(null as Object) {}
+        internal string trackerName => m_TrackerName ??= GetInspectorTrackerName(this);
 
         /// <summary>
-        /// InspectorElement constructor.
+        /// The currently bound object.
         /// </summary>
-        /// <param name="obj">Create a SerializedObject from given obj and automatically Bind() to it.</param>
-        public InspectorElement(Object obj) : this(obj, Mode.Normal) {}
+        internal SerializedObject boundObject => m_BoundObject;
 
-        internal InspectorElement(Object obj, Mode mode)
-        {
-            m_IgnoreOnInspectorGUIErrors = false;
+        /// <summary>
+        /// Visual element reference for prefab override bar.
+        /// </summary>
+        internal VisualElement prefabOverrideBlueBarsContainer { get; private set; }
 
-            pickingMode = PickingMode.Ignore;
-            AddToClassList(ussClassName);
+        /// <summary>
+        /// Visual element reference for live property bar.
+        /// </summary>
+        internal VisualElement livePropertyYellowBarsContainer { get; private set; }
 
-            this.mode = mode;
-            if (obj == null)
+        /// <summary>
+        /// Gets or sets the default inspector framework to use for this inspector. This will take affect during the next bind.
+        /// </summary>
+        internal DefaultInspectorFramework defaultInspectorFramework
+        {
+            get => m_DefaultInspectorFramework;
+            set
             {
-                if (!GenericInspector.ObjectIsMonoBehaviourOrScriptableObjectWithoutScript(obj))
-                {
-                    return;
-                }
+                m_Rebind = true;
+                m_DefaultInspectorFramework = value;
             }
-
-            this.Bind(new SerializedObject(obj));
         }
 
         /// <summary>
-        /// InspectorElement constructor.
+        /// Returns the editor performance tracker name for this inspector element.
         /// </summary>
-        /// <param name="obj">Create a SerializedObject from given obj and automatically Bind() to it.</param>
-        public InspectorElement(SerializedObject obj) : this(obj, Mode.Normal) {}
-
-        internal InspectorElement(SerializedObject obj, Mode mode)
+        /// <param name="element">The element to generate a name for.</param>
+        /// <returns>The generated performance tracker name.</returns>
+        internal static string GetInspectorTrackerName(VisualElement element)
         {
-            pickingMode = PickingMode.Ignore;
-            AddToClassList(ussClassName);
+            var editorElementParent = element.parent as EditorElement;
 
-            this.mode = mode;
-            if (obj.targetObject == null)
+            return editorElementParent == null
+                ? $"Editor.Unknown.OnInspectorGUI"
+                : $"Editor.{editorElementParent.name}.OnInspectorGUI";
+        }
+
+        /// <summary>
+        /// Constructs a <see cref="SerializedObject"/> instance for a given target.
+        /// </summary>
+        static SerializedObject CreateSerializedObjectForTarget(Object target)
+        {
+            if (target == null)
             {
-                if (!GenericInspector.ObjectIsMonoBehaviourOrScriptableObjectWithoutScript(obj.targetObject))
-                {
-                    return;
-                }
+                // ReSharper disable once ExpressionIsAlwaysNull
+                // Check if this is a 'fake null' object (i.e. equals operator reports null but the object still exists)
+                if (!GenericInspector.ObjectIsMonoBehaviourOrScriptableObjectWithoutScript(target))
+                    return null;
             }
 
-            this.Bind(obj);
+            return new SerializedObject(target);
         }
 
         /// <summary>
-        /// InspectorElement constructor.
+        /// Initialized a new instance of <see cref="InspectorElement"/>.
+        /// </summary>
+        public InspectorElement() : this(null as Object) {}
+
+        /// <summary>
+        /// Initialized a new instance of <see cref="InspectorElement"/> for the specified <see cref="Object"/>.
+        /// </summary>
+        /// <param name="obj">The object to bind to.</param>
+        public InspectorElement(Object obj) : this(CreateSerializedObjectForTarget(obj), GetDefaultInspectorFramework()) {}
+
+        /// <summary>
+        /// Initialized a new instance of <see cref="InspectorElement"/> for the specified <see cref="SerializedObject"/>.
         /// </summary>
-        public InspectorElement(Editor editor) : this(editor, Mode.Normal) {}
+        /// <param name="obj">The object to bind to.</param>
+        public InspectorElement(SerializedObject obj) : this(obj, GetDefaultInspectorFramework()) {}
 
-        internal InspectorElement(Editor editor, Mode mode)
+        /// <summary>
+        /// Initialized a new instance of <see cref="InspectorElement"/> for the specified <see cref="Editor"/>.
+        /// </summary>
+        /// <param name="editor">The editor to bind to.</param>
+        public InspectorElement(Editor editor) : this(editor, GetDefaultInspectorFramework()) {}
+
+        internal InspectorElement(Object obj, DefaultInspectorFramework defaultInspectorFramework) : this(new SerializedObject(obj), null, defaultInspectorFramework) { }
+        internal InspectorElement(SerializedObject serializedObject, DefaultInspectorFramework defaultInspectorFramework) : this(serializedObject, null, defaultInspectorFramework) {}
+        internal InspectorElement(Editor editor, DefaultInspectorFramework defaultInspectorFramework) : this(editor.serializedObject, editor, defaultInspectorFramework) {}
+
+        InspectorElement(SerializedObject obj, Editor editor, DefaultInspectorFramework defaultInspectorFramework)
         {
             pickingMode = PickingMode.Ignore;
             AddToClassList(ussClassName);
 
-            this.mode = mode;
+            // Register ui callbacks
+            RegisterCallback<AttachToPanelEvent>(OnAttachToPanel);
+            RegisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
 
-            this.editor = editor;
+            prefabOverrideBlueBarsContainer = new VisualElement
+            {
+                name = BindingExtensions.prefabOverrideBarContainerName,
+                style = { position = Position.Absolute }
+            };
 
-            if (editor.targets.Length == 0)
+            livePropertyYellowBarsContainer = new VisualElement
             {
-                return;
-            }
+                name = BindingExtensions.livePropertyBarContainerName,
+                style = { position = Position.Absolute }
+            };
 
-            var targetObject = editor.targets[0];
-            if (targetObject == null)
+            Add(prefabOverrideBlueBarsContainer);
+            Add(livePropertyYellowBarsContainer);
+
+            m_DefaultInspectorFramework = defaultInspectorFramework;
+
+            // Find or construct an editor for this object.
+            if (editor == null)
             {
-                if (!GenericInspector.ObjectIsMonoBehaviourOrScriptableObjectWithoutScript(targetObject))
-                {
+                if (obj == null)
                     return;
-                }
+
+                m_Editor = Editor.CreateEditor(obj.targetObject);
+                m_OwnsEditor = true;
             }
+            else
+            {
+                m_Editor = editor;
 
-            this.Bind(editor.serializedObject);
-        }
+                // If an editor was provided but the targets are not set.
+                // This should never happen in normal operation since all multi argument constructors are internal/private.
+                if (m_Editor.targets.Length == 0)
+                    return;
+            }
 
-        void OnDetachFromPanel(DetachFromPanelEvent evt)
-        {
-            DestroyOwnedEditor();
+            // We have a valid target, initiate binding.
+            this.Bind(obj);
         }
 
-        internal void AssignExistingEditor(Editor value)
+        void OnAttachToPanel(AttachToPanelEvent evt)
         {
-            if (m_Editor != value)
+            if (boundObject != null && m_Editor == null)
             {
-                editor = value;
-                PartialReset(m_Editor.serializedObject);
+                m_Rebind = true;
+                this.Bind(boundObject);
             }
         }
 
-        void DestroyOwnedEditor()
+        void OnDetachFromPanel(DetachFromPanelEvent evt)
         {
-            if (ownsEditor && editor != null)
-            {
-                Object.DestroyImmediate(editor);
-                editor = null;
-                ownsEditor = false;
-                RegisterCallback<AttachToPanelEvent>(OnAttachToPanel);
-            }
-
-            UnregisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
+            DestroyOwnedEditor();
         }
 
-        void OnAttachToPanel(AttachToPanelEvent evt)
+        /// <summary>
+        /// Destroys and cleans up the editor instance managed by this inspector element. If any.
+        /// </summary>
+        void DestroyOwnedEditor()
         {
-            Reset(boundObject);
-            UnregisterCallback<AttachToPanelEvent>(OnAttachToPanel);
+            if (!m_OwnsEditor || m_Editor == null)
+                return;
+
+            Object.DestroyImmediate(m_Editor);
+
+            m_Editor = null;
+            m_OwnsEditor = false;
         }
 
-        internal static Mode GetModeFromInspectorMode(InspectorMode mode)
+        [EventInterest(typeof(SerializedObjectBindEvent))]
+        protected override void ExecuteDefaultActionAtTarget(EventBase evt)
         {
-            switch (mode)
+            base.ExecuteDefaultActionAtTarget(evt);
+
+            var bindEvent = evt as SerializedObjectBindEvent;
+            if (bindEvent == null)
+                return;
+
+            // Case 1336093. nested InspectorElement for other editors have their own BindTree processes,
+            // so we need to ignore SerializedObjectBindEvent that aren't meant for them.
+            // We use the DataSource property to store a reference to the target object that is being bound
+            // so we can ignore the binding process that targets a parent inspector.
+            var dataSource = GetProperty(BindingExtensions.s_DataSourceProperty);
+            if (dataSource != null && dataSource != bindEvent.bindObject)
             {
-                case InspectorMode.Debug:
-                    return Mode.Debug;
-                case InspectorMode.DebugInternal:
-                    return Mode.DebugInternal;
-                default:
-                    return Mode.Normal;
+                evt.StopPropagation();
+                return;
+            }
+
+            // Determine if we need to rebuild. This should only be done when our serialized object target changes or something forces us to rebuild (i.e. backend changing).
+            var shouldRebuildElements = m_Rebind || m_BoundObject != bindEvent.bindObject;
+
+            if (shouldRebuildElements)
+            {
+                m_Rebind = false;
+                CreateInspectorElementFromSerializedObject(bindEvent.bindObject);
             }
         }
 
-        private void Reset(SerializedObject bindObject)
+        /// <summary>
+        /// Assigns the given editor to this inspector element instance. This will trigger a re-bind.
+        /// </summary>
+        /// <param name="value">The editor to assign.</param>
+        internal void SetEditor(Editor value)
         {
-            k_Reset.Begin();
+            // NOTE: We need a special check here for undo/redo cases when the script is changing.
+            var targetTypeMatches = value.target && value.target.GetType() == m_BoundObjectType;
+            var editorInstanceMatches = m_Editor == value;
 
-            Clear();
+            if (targetTypeMatches && editorInstanceMatches)
+                return;
 
-            prefabOverrideBlueBarsContainer = new VisualElement();
-            prefabOverrideBlueBarsContainer.name = BindingExtensions.prefabOverrideBarContainerName;
-            prefabOverrideBlueBarsContainer.style.position = Position.Absolute;
-            Add(prefabOverrideBlueBarsContainer);
+            DestroyOwnedEditor();
 
-            livePropertyYellowBarsContainer = new VisualElement();
-            livePropertyYellowBarsContainer.name = BindingExtensions.livePropertyBarContainerName;
-            livePropertyYellowBarsContainer.style.position = Position.Absolute;
-            Add(livePropertyYellowBarsContainer);
+            m_Editor = value;
+            m_Rebind = true;
+
+            this.Bind(m_Editor.serializedObject);
+        }
+
+        void ClearInspectorElement()
+        {
+            // Clear any previously generated element.
+            m_InspectorElement?.RemoveFromHierarchy();
 
+            // Clear all top level styles
             RemoveFromClassList(iMGUIInspectorVariantUssClassName);
             RemoveFromClassList(uIEInspectorVariantUssClassName);
             RemoveFromClassList(noInspectorFoundVariantUssClassName);
@@ -302,120 +415,96 @@ private void Reset(SerializedObject bindObject)
             RemoveFromClassList(uIEDefaultVariantUssClassName);
             RemoveFromClassList(debugVariantUssClassName);
             RemoveFromClassList(debugInternalVariantUssClassName);
-
-            if (bindObject == null)
-                return;
-
-            var editor = GetOrCreateEditor(bindObject);
-            if (editor == null)
-            {
-                return;
-            }
-
-            boundObject = bindObject;
-
-            CreateInspectorGUI(false);
-
-            k_Reset.End();
         }
 
-        private void PartialReset(SerializedObject bindObject)
+        void CreateInspectorElementFromSerializedObject(SerializedObject bindObject)
         {
-            boundObject = bindObject;
-            if (boundObject == null)
-            {
-                Reset(null);
-                return;
-            }
-
-            CreateInspectorGUI(true);
-        }
+            k_CreateInspectorElementFromSerializedObject.Begin();
 
-        void CreateInspectorGUI(bool updateBinding)
-        {
-            k_CreateInspectorGUI.Begin();
+            // Unpack the given serialized object. We want to cache the target type to facilitate re-using UI later down the pipeline.
+            var targetObject = bindObject?.targetObject;
+            var targetObjectType = targetObject != null ? targetObject.GetType() : null;
 
-            Clear();
+            var bindObjectTypeMatches = m_BoundObjectType == targetObjectType;
 
-            // Add prefabOverrideBlueBarsContainer again.
-            if (prefabOverrideBlueBarsContainer != null)
-            {
-                Add(prefabOverrideBlueBarsContainer);
-            }
+            m_BoundObject = bindObject;
+            m_BoundObjectType = targetObjectType;
 
-            // Add livePropertyYellowBarsContainer again.
-            if (livePropertyYellowBarsContainer != null)
+            if (m_BoundObject == null)
             {
-                Add(livePropertyYellowBarsContainer);
+                ClearInspectorElement();
+                return;
             }
 
-            var element = CreateInspectorElementFromEditor(editor, true) ?? CreateDefaultInspector(boundObject);
-
-            if (element != null && element != this)
-                hierarchy.Add(element);
-
-            if (updateBinding)
-                element?.Bind(boundObject);
+            m_Editor = GetOrCreateEditor(bindObject);
 
-            k_CreateInspectorGUI.End();
-        }
+            if (m_Editor != null)
+            {
+                if (m_Editor is GenericInspector)
+                {
+                    // Only re-build default inspectors when the type changes or when using the IMGUI backend.
+                    // NOTE: When using IMGUI the delegate captures locals so we must rebuild it.
+                    if (!bindObjectTypeMatches || m_InspectorElement == null || m_DefaultInspectorFramework == DefaultInspectorFramework.IMGUI)
+                    {
+                        ClearInspectorElement();
 
-        [EventInterest(typeof(SerializedObjectBindEvent))]
-        protected override void ExecuteDefaultActionAtTarget(EventBase evt)
-        {
-            base.ExecuteDefaultActionAtTarget(evt);
+                        // When looking at a generic inspector we choose the backend based on a user provided default.
+                        switch (m_DefaultInspectorFramework)
+                        {
+                            case DefaultInspectorFramework.UIToolkit:
+                                m_InspectorElement = CreateInspectorElementUsingUIToolkit(m_Editor);
+                                break;
+                            case DefaultInspectorFramework.IMGUI:
+                                m_InspectorElement = CreateInspectorElementUsingIMGUI(m_Editor);
+                                break;
+                        }
+                    }
+                }
+                else
+                {
+                    // Always clear and re-build when dealing with custom inspectors. User code is assumed to take a reference to the ScriptableObject in `CreateInspectorGUI()`.
+                    ClearInspectorElement();
 
-            var bindEvent = evt as SerializedObjectBindEvent;
-            if (bindEvent == null)
-                return;
+                    // This is a custom editor type. Try to use UI toolkit first with an IMGUI fallback.
+                    m_InspectorElement = CreateInspectorElementUsingUIToolkit(m_Editor) ?? CreateInspectorElementUsingIMGUI(m_Editor);
+                    m_InspectorElement.AddToClassList(customInspectorUssClassName);
+                }
 
-            // Case 1336093. nested InspectorElement for other editors have their own BindTree processes,
-            // so we need to ignore SerializedObjectBindEvent that aren't meant for them.
-            // We use the DataSource property to store a reference to the target object that is being bound
-            // so we can ignore the binding process that targets a parent inspector.
-            var dataSource = this.GetProperty(BindingExtensions.s_DataSourceProperty);
-            if (dataSource != null && dataSource != bindEvent.bindObject)
-            {
-                evt.StopPropagation();
-                return;
+                // Re-add the generated element if it was re-created.
+                if (m_InspectorElement != null && m_InspectorElement.parent != this)
+                    hierarchy.Add(m_InspectorElement);
             }
 
-            Reset(bindEvent.bindObject);
+            k_CreateInspectorElementFromSerializedObject.End();
         }
 
-        private Editor GetOrCreateEditor(SerializedObject serializedObject)
+        /// <summary>
+        /// This method handles all the internals of getting a <see cref="Editor"/> object for the given serialized object.
+        /// </summary>
+        /// <param name="serializedObject">The serialized object to get an editor for.</param>
+        /// <returns>The found or created instance.</returns>
+        Editor GetOrCreateEditor(SerializedObject serializedObject)
         {
-            var target = serializedObject?.targetObject;
+            Object target = null;
 
-            if (editor != null)
-            {
-                if (editor.target == target || editor.serializedObject == serializedObject)
-                    return editor;
+            if (serializedObject != null && serializedObject.m_NativeObjectPtr != IntPtr.Zero)
+                target = serializedObject.targetObject;
 
-                if (ownsEditor)
-                {
-                    DestroyOwnedEditor();
-                }
-            }
-
-            foreach (var inspectorWindow in InspectorWindow.GetInspectors())
+            if (m_Editor != null)
             {
-                foreach (var trackerEditor in inspectorWindow.tracker.activeEditors)
-                {
-                    if (trackerEditor.target == target || trackerEditor.serializedObject == serializedObject)
-                    {
-                        return editor = trackerEditor;
-                    }
-                }
-            }
+                // First try to re-use the instance we have on hand. If this matches our given object we can simply re-use it.
+                if (m_Editor.target == target || m_Editor.serializedObject == serializedObject)
+                    return m_Editor;
 
-            RegisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
+                // We need to generate a new editor instance, first cleanup any owned editor resources we have.
+                DestroyOwnedEditor();
+            }
 
-            var ed = Editor.CreateEditor(serializedObject?.targetObject);
-            editor = ed;
-            ownsEditor = true;
+            // Fallback to creating our own editor instance for the given object.
+            m_Editor = Editor.CreateEditor(target);
+            m_OwnsEditor = true;
 
-            return ed;
+            return m_Editor;
         }
 
         /// <summary>
@@ -436,12 +525,17 @@ public static void FillDefaultInspector(VisualElement container, SerializedObjec
             {
                 do
                 {
-                    var field = new PropertyField(property);
-                    field.name = "PropertyField:" + property.propertyPath;
+                    var field = new PropertyField(property)
+                    {
+                        name = "PropertyField:" + property.propertyPath
+                    };
 
                     if (property.propertyPath == "m_Script")
                     {
-                        if (serializedObject.targetObject != null || property.objectReferenceValue != null || isPartOfPrefabInstance)
+                        // Allow script re-assignment in debug mode.
+                        var isDebugMode = editor != null && (editor.inspectorMode == InspectorMode.Debug || editor.inspectorMode == InspectorMode.DebugInternal);
+
+                        if (!isDebugMode && (serializedObject.targetObject != null || property.objectReferenceValue != null || isPartOfPrefabInstance))
                             field.SetEnabled(false);
                     }
 
@@ -451,105 +545,70 @@ public static void FillDefaultInspector(VisualElement container, SerializedObjec
             }
 
             if (serializedObject.targetObject == null)
-                AddMissingScriptLabel(container, serializedObject, isPartOfPrefabInstance);
-        }
-
-        private VisualElement CreateDefaultInspector(SerializedObject serializedObject)
-        {
-            if (serializedObject == null)
-                return null;
-
-            if (GenericInspector.MissingSerializeReference(editor.target))
             {
-                Add(new HelpBox(GenericInspector.GetMissingSerializeRefererenceMessageContainer(), HelpBoxMessageType.Warning));
-            }
-
-            FillDefaultInspector(this, serializedObject, editor);
+                var scriptProperty = serializedObject.FindProperty("m_Script");
 
-            if ((mode & Mode.DebugMod) > 0)
-                AddToClassList(debugVariantUssClassName);
-            else if ((mode & Mode.DebugInternalMod) > 0)
-                AddToClassList(debugInternalVariantUssClassName);
-
-            AddToClassList(uIEDefaultVariantUssClassName);
-            AddToClassList(uIEInspectorVariantUssClassName);
-
-            return this;
-        }
-
-        static bool AddMissingScriptLabel(VisualElement container, SerializedObject serializedObject, bool isPartOfPrefabInstance)
-        {
-            SerializedProperty scriptProperty = serializedObject.FindProperty("m_Script");
-            if (scriptProperty != null)
-            {
-                var noScriptErrorContainer = new IMGUIContainer(() => GenericInspector.ShowScriptNotLoadedWarning(scriptProperty, isPartOfPrefabInstance));
-                noScriptErrorContainer.name = noScriptErrorContainerName;
-                container.Add(noScriptErrorContainer);
-                return true;
+                if (scriptProperty != null)
+                {
+                    var noScriptErrorContainer = new IMGUIContainer(() =>
+                    {
+                        if (scriptProperty.isValid)
+                            GenericInspector.ShowScriptNotLoadedWarning(scriptProperty, isPartOfPrefabInstance);
+                    });
+                    noScriptErrorContainer.name = noScriptErrorContainerName;
+                    container.Add(noScriptErrorContainer);
+                }
             }
-
-            return false;
         }
 
-        internal static bool SetWideModeForWidth(VisualElement displayElement)
+        VisualElement CreateInspectorElementUsingUIToolkit(Editor targetEditor)
         {
-            var previousWideMode = EditorGUIUtility.wideMode;
-
-            float inspectorWidth = 0;
+            var element = targetEditor.CreateInspectorGUI();
 
-            // the inspector's width can be NaN if this is our first layout check.
-            // or when the inspector display is changed from none to flex, the width will be zero during the measuring phase.
-            // we try to find a parent with a a width. If none are found, we'll set wideMode to true to avoid computing
-            // too tall an inspector on the first layout calculation
-            while (displayElement != null && (float.IsNaN(inspectorWidth) || inspectorWidth == 0))
+            if (element != null)
             {
-                inspectorWidth = displayElement.layout.width;
-                displayElement = displayElement.hierarchy.parent;
-            }
+                // Decorate the InspectorElement based on the editor type (i.e. custom vs generic).
+                if (targetEditor is GenericInspector)
+                {
+                    AddToClassList(uIEDefaultVariantUssClassName);
+                    AddToClassList(uIEInspectorVariantUssClassName);
 
-            if (!float.IsNaN(inspectorWidth) && inspectorWidth > 0)
-            {
-                EditorGUIUtility.wideMode = inspectorWidth > Editor.k_WideModeMinWidth;
-                EditorGUIUtility.currentViewWidth = inspectorWidth;
-            }
-            else
-            {
-                EditorGUIUtility.wideMode = true;
+                    switch (targetEditor.inspectorMode)
+                    {
+                        case InspectorMode.Debug:
+                            AddToClassList(debugVariantUssClassName);
+                            break;
+                        case InspectorMode.DebugInternal:
+                            AddToClassList(debugInternalVariantUssClassName);
+                            break;
+                    }
+                }
+                else
+                {
+                    AddToClassList(uIECustomVariantUssClassName);
+
+                    if (editor.UseDefaultMargins())
+                        AddToClassList(uIEInspectorVariantUssClassName);
+                }
             }
 
-            return previousWideMode;
+            return element;
         }
 
-        IMGUIContainer m_IMGUIContainer;
-
-        private VisualElement CreateIMGUIInspectorFromEditor(SerializedObject serializedObject, Editor editor,
-            bool reuseIMGUIContainer)
+        VisualElement CreateInspectorElementUsingIMGUI(Editor targetEditor)
         {
-            if ((mode & (Mode.IMGUICustom | Mode.IMGUIDefault)) == 0)
-                return null;
-
-            if ((mode & Mode.IMGUICustom) > 0 && (mode & Mode.IMGUIDefault) == 0 && editor is GenericInspector)
-                return null;
-
-            if ((mode & Mode.IMGUICustom) == 0 && (mode & Mode.IMGUIDefault) > 0 && !(editor is GenericInspector) && !(editor is AssetImporterEditor) && !(editor is GameObjectInspector))
-            {
-                editor = ScriptableObject.CreateInstance<GenericInspector>();
-                editor.hideFlags = HideFlags.HideAndDontSave;
-                editor.InternalSetTargets(new[] { serializedObject.targetObject });
-            }
-
-            if (editor is GenericInspector)
+            if (targetEditor is GenericInspector)
             {
                 AddToClassList(iMGUIDefaultVariantUssClassName);
-                if ((mode & Mode.DebugMod) > 0)
-                {
-                    AddToClassList(debugVariantUssClassName);
-                    editor.inspectorMode = InspectorMode.Debug;
-                }
-                else if ((mode & Mode.DebugInternalMod) > 0)
+
+                switch (targetEditor.inspectorMode)
                 {
-                    AddToClassList(debugInternalVariantUssClassName);
-                    editor.inspectorMode = InspectorMode.DebugInternal;
+                    case InspectorMode.Debug:
+                        AddToClassList(debugVariantUssClassName);
+                        break;
+                    case InspectorMode.DebugInternal:
+                        AddToClassList(debugInternalVariantUssClassName);
+                        break;
                 }
             }
             else
@@ -557,16 +616,8 @@ private VisualElement CreateIMGUIInspectorFromEditor(SerializedObject serialized
                 AddToClassList(iMGUICustomVariantUssClassName);
             }
 
-            IMGUIContainer inspector;
-            // Reusing the existing IMGUIContainer allows us to re-use the existing gui state, when we are drawing the same inspector this will let us keep the same control ids
-            if (reuseIMGUIContainer && m_IMGUIContainer != null)
-            {
-                inspector = m_IMGUIContainer;
-            }
-            else
-            {
-                inspector = new IMGUIContainer();
-            }
+            // Always try to re-use the imgui container if possible.
+            var inspector = m_InspectorElement as IMGUIContainer ?? new IMGUIContainer();
 
             m_IgnoreOnInspectorGUIErrors = false;
             inspector.onGUIHandler = () =>
@@ -593,42 +644,23 @@ private VisualElement CreateIMGUIInspectorFromEditor(SerializedObject serialized
                 // rely heavily on yields and timing of UI redraws. Yes..
                 //
                 // case 1119612
-                if (editor.m_SerializedObject == null)
+                if (targetEditor.m_SerializedObject == null)
                 {
-                    editor.Repaint();
+                    targetEditor.Repaint();
                     m_IgnoreOnInspectorGUIErrors = true;
                 }
 
-                if ((editor.target == null && !GenericInspector.ObjectIsMonoBehaviourOrScriptableObjectWithoutScript(editor.target)) ||
-                    !editor.serializedObject.isValid)
+                if ((targetEditor.target == null && !GenericInspector.ObjectIsMonoBehaviourOrScriptableObjectWithoutScript(targetEditor.target)) ||
+                    !targetEditor.serializedObject.isValid)
                 {
                     return;
                 }
 
                 EditorGUIUtility.ResetGUIState();
-                using (new EditorGUI.DisabledScope(!editor.IsEnabled()))
+                using (new EditorGUI.DisabledScope(!targetEditor.IsEnabled() || !enabledInHierarchy))
                 {
-                    var genericEditor = editor as GenericInspector;
-                    if (genericEditor != null)
-                    {
-                        switch (mode)
-                        {
-                            case Mode.Normal:
-                                genericEditor.inspectorMode = InspectorMode.Normal;
-                                break;
-                            case Mode.Default:
-                                genericEditor.inspectorMode = InspectorMode.Debug;
-                                break;
-                            case Mode.Custom:
-                                genericEditor.inspectorMode = InspectorMode.DebugInternal;
-                                break;
-                            case Mode.IMGUI:
-                                break;
-                        }
-                    }
-
                     //set the current PropertyHandlerCache to the current editor
-                    ScriptAttributeUtility.propertyHandlerCache = editor.propertyHandlerCache;
+                    ScriptAttributeUtility.propertyHandlerCache = targetEditor.propertyHandlerCache;
 
                     var originalViewWidth = EditorGUIUtility.currentViewWidth;
                     var originalHierarchyMode = EditorGUIUtility.hierarchyMode;
@@ -636,7 +668,7 @@ private VisualElement CreateIMGUIInspectorFromEditor(SerializedObject serialized
 
                     var originalWideMode = SetWideModeForWidth(inspector);
 
-                    GUIStyle editorWrapper = (editor.UseDefaultMargins() && editor.CanBeExpandedViaAFoldoutWithoutUpdate()
+                    GUIStyle editorWrapper = (targetEditor.UseDefaultMargins() && targetEditor.CanBeExpandedViaAFoldoutWithoutUpdate()
                         ? EditorStyles.inspectorDefaultMargins
                         : GUIStyle.none);
                     try
@@ -655,34 +687,34 @@ private VisualElement CreateIMGUIInspectorFromEditor(SerializedObject serialized
                                 var layoutCacheState = GUILayoutUtility.current.State;
                                 try
                                 {
-                                    var rebuildOptimizedGUIBlocks = GetRebuildOptimizedGUIBlocks(editor.target);
-                                    rebuildOptimizedGUIBlocks |= editor.isInspectorDirty;
-                                    float height;
-                                    if (editor.GetOptimizedGUIBlock(rebuildOptimizedGUIBlocks, visible, out height))
+                                    var rebuildOptimizedGUIBlocks = GetRebuildOptimizedGUIBlocks(targetEditor.target);
+                                    rebuildOptimizedGUIBlocks |= targetEditor.isInspectorDirty;
+
+                                    if (targetEditor.GetOptimizedGUIBlock(rebuildOptimizedGUIBlocks, visible, out var height))
                                     {
-                                        var contentRect = GUILayoutUtility.GetRect(0, visible ? height : 0);
+                                        var contentHeightRect = GUILayoutUtility.GetRect(0, visible ? height : 0);
 
                                         // Layout events are ignored in the optimized code path
                                         // The exception is when we are drawing a GenericInspector, they always use the optimized path and must therefore run at least one layout calculation in it
-                                        if (Event.current.type == EventType.Layout && !(editor is GenericInspector))
+                                        if (Event.current.type == EventType.Layout && !(targetEditor is GenericInspector))
                                         {
                                             return;
                                         }
 
-                                        InspectorWindowUtils.DrawAddedComponentBackground(contentRect, editor.targets);
+                                        InspectorWindowUtils.DrawAddedComponentBackground(contentHeightRect, targetEditor.targets);
 
                                         // Draw content
                                         if (visible)
                                         {
                                             GUI.changed = false;
-                                            editor.OnOptimizedInspectorGUI(contentRect);
+                                            targetEditor.OnOptimizedInspectorGUI(contentHeightRect);
                                         }
                                     }
                                     else
                                     {
-                                        InspectorWindowUtils.DrawAddedComponentBackground(contentRect, editor.targets);
+                                        InspectorWindowUtils.DrawAddedComponentBackground(contentRect, targetEditor.targets);
                                         using (new EditorPerformanceTracker(trackerName))
-                                            editor.OnInspectorGUI();
+                                            targetEditor.OnInspectorGUI();
                                     }
                                 }
                                 catch (Exception e)
@@ -707,7 +739,7 @@ private VisualElement CreateIMGUIInspectorFromEditor(SerializedObject serialized
                     {
                         if (GUI.changed)
                         {
-                            // This forces a relayout of all imguicontainers in this inspector window.
+                            // This forces a re-layout of all imgui containers in this inspector window.
                             // fixes part of case 1148706
                             var element = inspector.GetFirstAncestorOfType<EditorElement>();
                             if (element != null)
@@ -721,10 +753,6 @@ private VisualElement CreateIMGUIInspectorFromEditor(SerializedObject serialized
             };
 
             inspector.style.overflow = Overflow.Visible;
-            m_IMGUIContainer = inspector;
-
-            if (!(editor is GenericInspector))
-                inspector.AddToClassList(customInspectorUssClassName);
 
             inspector.AddToClassList(iMGUIContainerUssClassName);
 
@@ -733,63 +761,36 @@ private VisualElement CreateIMGUIInspectorFromEditor(SerializedObject serialized
             return inspector;
         }
 
-        internal static string GetInspectorTrackerName(VisualElement el)
+        internal static bool SetWideModeForWidth(VisualElement displayElement)
         {
-            var editorElementParent = el.parent as EditorElement;
-            if (editorElementParent == null)
-                return $"Editor.Unknown.OnInspectorGUI";
+            var previousWideMode = EditorGUIUtility.wideMode;
 
-            return $"Editor.{editorElementParent.name}.OnInspectorGUI";
-        }
+            float inspectorWidth = 0;
 
-        private VisualElement CreateInspectorElementFromEditor(Editor editor, bool reuseIMGUIContainer = false)
-        {
-            var serializedObject = editor.serializedObject;
-            var target = editor.targets[0];
-            if (target == null)
+            // the inspector's width can be NaN if this is our first layout check.
+            // or when the inspector display is changed from none to flex, the width will be zero during the measuring phase.
+            // we try to find a parent with a a width. If none are found, we'll set wideMode to true to avoid computing
+            // too tall an inspector on the first layout calculation
+            while (displayElement != null && (float.IsNaN(inspectorWidth) || inspectorWidth == 0))
             {
-                if (!GenericInspector.ObjectIsMonoBehaviourOrScriptableObjectWithoutScript(target))
-                {
-                    return null;
-                }
+                inspectorWidth = displayElement.layout.width;
+                displayElement = displayElement.hierarchy.parent;
             }
 
-            VisualElement inspectorElement = null;
-
-            if ((mode & Mode.UIECustom) > 0)
+            if (!float.IsNaN(inspectorWidth) && inspectorWidth > 0)
             {
-                inspectorElement = editor.CreateInspectorGUI();
-
-                if (inspectorElement != null)
-                {
-                    AddToClassList(uIECustomVariantUssClassName);
-                    if (editor.UseDefaultMargins())
-                        AddToClassList(uIEInspectorVariantUssClassName);
-                    inspectorElement.AddToClassList(customInspectorUssClassName);
-                }
+                EditorGUIUtility.wideMode = inspectorWidth > Editor.k_WideModeMinWidth;
+                EditorGUIUtility.currentViewWidth = inspectorWidth;
             }
-
-            if (inspectorElement == null)
-                inspectorElement = CreateIMGUIInspectorFromEditor(serializedObject, editor, reuseIMGUIContainer);
-
-            if (inspectorElement == null && (mode & Mode.UIEDefault) > 0)
-                inspectorElement = CreateDefaultInspector(serializedObject);
-
-            if (inspectorElement == null)
+            else
             {
-                AddToClassList(noInspectorFoundVariantUssClassName);
-                AddToClassList(uIEInspectorVariantUssClassName);
-                inspectorElement = new Label("No inspector found given the current Inspector.Mode.");
+                EditorGUIUtility.wideMode = true;
             }
 
-            return inspectorElement;
+            return previousWideMode;
         }
 
-        bool m_IsOpenForEdit;
-        bool m_InvalidateGUIBlockCache = true;
-        Editor m_Editor;
-
-        private bool GetRebuildOptimizedGUIBlocks(Object inspectedObject)
+        bool GetRebuildOptimizedGUIBlocks(Object inspectedObject)
         {
             var rebuildOptimizedGUIBlocks = false;
 
diff --git a/Editor/Mono/UIElements/StyleSheets/StyleSheetImporterImpl.cs b/Editor/Mono/UIElements/StyleSheets/StyleSheetImporterImpl.cs
index fe4fbfc774..051d77b237 100644
--- a/Editor/Mono/UIElements/StyleSheets/StyleSheetImporterImpl.cs
+++ b/Editor/Mono/UIElements/StyleSheets/StyleSheetImporterImpl.cs
@@ -122,6 +122,11 @@ public virtual UnityEngine.Object DeclareDependencyAndLoad(string path, string s
                 if (o.name == subAssetPath)
                     return o;
             }
+
+            // We sometimes include the main asset name in the sub-asset name. (UUM-49355)
+            if (mainAsset != null && mainAsset.name == subAssetPath)
+                return mainAsset;
+
             return null;
         }
 
@@ -344,9 +349,9 @@ private struct StoredAsset
                     }
                 }
 
+                using (var so = new SerializedObject(font))
                 {
-                    var so = new SerializedObject(font);
-                    var oldTex = so.FindProperty("m_Texture").objectReferenceValue;
+                        var oldTex = so.FindProperty("m_Texture").objectReferenceValue;
                     if (oldTex != null)
                     {
                         //Reuse the same texture if the reference was equal
diff --git a/Editor/Mono/UIElements/StyleSheets/ThemeStyleSheetImporter.cs b/Editor/Mono/UIElements/StyleSheets/ThemeStyleSheetImporter.cs
index a3820cc021..70bb42d9a1 100644
--- a/Editor/Mono/UIElements/StyleSheets/ThemeStyleSheetImporter.cs
+++ b/Editor/Mono/UIElements/StyleSheets/ThemeStyleSheetImporter.cs
@@ -11,7 +11,7 @@ namespace UnityEditor.UIElements.StyleSheets
 {
     // Make sure style sheets importer after allowed dependent assets: textures, fonts, json and uss.
     // Has to be higher then AssetImportOrder.kImportOrderLate
-    [ScriptedImporter(version: 3, ext: "tss", importQueueOffset: 1101)]
+    [ScriptedImporter(version: 4, ext: "tss", importQueueOffset: 1101)]
     [ExcludeFromPreset]
     class ThemeStyleSheetImporter : StyleSheetImporter
     {
diff --git a/Editor/Mono/Undo/Undo.bindings.cs b/Editor/Mono/Undo/Undo.bindings.cs
index 2ac5ff4d9b..6a4d59b13d 100644
--- a/Editor/Mono/Undo/Undo.bindings.cs
+++ b/Editor/Mono/Undo/Undo.bindings.cs
@@ -64,9 +64,15 @@ public void Dispose()
     [NativeHeader("Editor/Src/Undo/ObjectUndo.h")]
     [NativeHeader("Editor/Mono/Undo/Undo.bindings.h")]
     [NativeHeader("Editor/Src/Undo/AssetUndo.h")]
-
     public partial class Undo
     {
+        [StaticAccessor("UndoBindings", StaticAccessorType.DoubleColon)]
+        public static extern bool isProcessing
+        {
+            [NativeMethod("GetIsProcessing")]
+            get;
+        }
+
         [StaticAccessor("UndoBindings", StaticAccessorType.DoubleColon)]
         private static extern void GetRecordsInternal(object undoRecords, out int undoCursorPos);
 
@@ -105,7 +111,7 @@ public static void RegisterCompleteObjectUndo(Object[] objectsToUndo, string nam
 
         [NativeThrows]
         [StaticAccessor("UndoBindings", StaticAccessorType.DoubleColon)]
-        private static extern void RegisterCompleteObjectUndoMultiple([NotNull] Object identifier, Object[] objectsToUndo, string name, int namePriority);
+        private static extern void RegisterCompleteObjectUndoMultiple([NotNull] Object identifier, [Unmarshalled] Object[] objectsToUndo, string name, int namePriority);
 
         public static void SetTransformParent(Transform transform, Transform newParent, string name)
         {
@@ -119,6 +125,9 @@ public static void SetTransformParent(Transform transform, Transform newParent,
         [StaticAccessor("UndoBindings", StaticAccessorType.DoubleColon)]
         public static extern void MoveGameObjectToScene([NotNull] GameObject go, Scene scene, string name);
 
+        [StaticAccessor("UndoBindings", StaticAccessorType.DoubleColon)]
+        public static extern void SetSiblingIndex([NotNull] Transform transform, int siblingIndex, string name);
+
         // Register the state of a Unity Object so the user can later undo back to that state.
         public static void RegisterCreatedObjectUndo(Object objectToUndo, string name)
         {
@@ -188,7 +197,7 @@ public static void RecordObjects(Object[] objectsToUndo, string name)
 
         [NativeThrows]
         [StaticAccessor("UndoBindings", StaticAccessorType.DoubleColon)]
-        private static extern void RecordObjectsInternal(Object[] objectToUndo, int size, string name);
+        private static extern void RecordObjectsInternal([Unmarshalled] Object[] objectToUndo, int size, string name);
 
         [StaticAccessor("GetUndoManager()", StaticAccessorType.Dot)]
         [NativeMethod("ClearUndoIdentifier")]
diff --git a/Editor/Mono/Unsupported.bindings.cs b/Editor/Mono/Unsupported.bindings.cs
index 6523eaf5c4..841dd06285 100644
--- a/Editor/Mono/Unsupported.bindings.cs
+++ b/Editor/Mono/Unsupported.bindings.cs
@@ -80,6 +80,8 @@ public static bool IsDeveloperBuild()
 
         public static extern bool IsNativeCodeBuiltInReleaseMode();
 
+        internal static extern void CheckCorrectAwakeUsage();
+
         [FreeFunction(IsThreadSafe = true)]
         public static extern string GetBaseUnityDeveloperFolder();
 
@@ -88,6 +90,9 @@ public static bool IsDeveloperBuild()
         [FreeFunction("GetSceneTracker().FlushDirty")]
         public static extern void SceneTrackerFlushDirty();
 
+        [FreeFunction("GetSceneTracker().TickHierarchyHasChanged")]
+        internal static extern void TickHierarchyHasChanged();
+
         [FreeFunction("GetScreenManager().SetAllowCursorHide")]
         public static extern void SetAllowCursorHide(bool allow);
 
diff --git a/Editor/Mono/Unwrapping.bindings.cs b/Editor/Mono/Unwrapping.bindings.cs
index eb66678f06..40e0f8cf59 100644
--- a/Editor/Mono/Unwrapping.bindings.cs
+++ b/Editor/Mono/Unwrapping.bindings.cs
@@ -44,6 +44,9 @@ public static Vector2[] GeneratePerTriangleUV(Mesh src)
         // Will generate per-triangle uv (3 uv pairs for each triangle) with provided settings
         public static Vector2[] GeneratePerTriangleUV(Mesh src, UnwrapParam settings)
         {
+            if (src == null)
+                throw new ArgumentNullException("src");
+
             return GeneratePerTriangleUVImpl(src, settings);
         }
 
diff --git a/Editor/Mono/Utils/Program.cs b/Editor/Mono/Utils/Program.cs
index a4dd94b420..a53ab53fbd 100644
--- a/Editor/Mono/Utils/Program.cs
+++ b/Editor/Mono/Utils/Program.cs
@@ -47,6 +47,7 @@ public void Start(EventHandler exitCallback)
             _process.StartInfo.RedirectStandardInput = true;
             _process.StartInfo.RedirectStandardError = true;
             _process.StartInfo.RedirectStandardOutput = true;
+            _process.StartInfo.StandardInputEncoding = new UTF8Encoding(false);
             _process.StartInfo.UseShellExecute = false;
 
             _process.Start();
diff --git a/Editor/Mono/Utils/WebURLs.bindings.cs b/Editor/Mono/Utils/WebURLs.bindings.cs
index 0b8b271d98..2ae1870a82 100644
--- a/Editor/Mono/Utils/WebURLs.bindings.cs
+++ b/Editor/Mono/Utils/WebURLs.bindings.cs
@@ -15,8 +15,8 @@ internal static class WebURLs
         public static extern string unityConnect { get; }
         [NativeProperty("kURLUnityForum", true, TargetType.Field)]
         public static extern string unityForum { get; }
-        [NativeProperty("kURLUnityAnswers", true, TargetType.Field)]
-        public static extern string unityAnswers { get; }
+        [NativeProperty("kURLUnityDiscussions", true, TargetType.Field)]
+        public static extern string unityDiscussions { get; }
         [NativeProperty("kURLUnityFeedback", true, TargetType.Field)]
         public static extern string unityFeedback { get; }
         [NativeProperty("kURLWhatsNewPage", true, TargetType.Field)]
diff --git a/Editor/Mono/VersionControlSettings.bindings.cs b/Editor/Mono/VersionControlSettings.bindings.cs
index 8249de6ce7..bdc8633a48 100644
--- a/Editor/Mono/VersionControlSettings.bindings.cs
+++ b/Editor/Mono/VersionControlSettings.bindings.cs
@@ -67,6 +67,10 @@ public static extern string mode
             set;
         }
 
+        [StaticAccessor("GetVersionControlSettings()", StaticAccessorType.Dot)]
+        [ExcludeFromDocs]
+        public static extern bool trackPackagesOutsideProject { get; set; }
+
         [StaticAccessor("GetEditorUserSettings()", StaticAccessorType.Dot)]
         private static extern string GetConfigValue(string name);
 
diff --git a/External/JsonParsers/MiniJson/MiniJSON.cs b/External/JsonParsers/MiniJson/MiniJSON.cs
index e7e5be0e31..27efbc376f 100644
--- a/External/JsonParsers/MiniJson/MiniJSON.cs
+++ b/External/JsonParsers/MiniJson/MiniJSON.cs
@@ -322,16 +322,13 @@ object ParseNumber ()
 			{
 				string number = NextWord;
 
-				if (number.IndexOf ('.') == -1)
-				{
-					long parsedInt;
-					Int64.TryParse (number, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out parsedInt);
-					return parsedInt;
-				}
+                if (Int64.TryParse(number, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out var parsedInt))
+                {
+                    return parsedInt;
+                }
 
-				double parsedDouble;
-				Double.TryParse (number, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out parsedDouble);
-				return parsedDouble;
+                Double.TryParse(number, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out var parsedDouble);
+                return parsedDouble;
 			}
 
 			void EatWhitespace ()
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
deleted file mode 100644
index 5cbb4ad1cd..0000000000
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorAttributes.cs
+++ /dev/null
@@ -1,1183 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using UnityEditor;
-using UnityEditor.UIElements;
-using UnityEditor.UIElements.StyleSheets;
-using UnityEngine;
-using UnityEngine.UIElements;
-using Object = UnityEngine.Object;
-
-namespace Unity.UI.Builder
-{
-    internal class BuilderInspectorAttributes : IBuilderInspectorSection
-    {
-        static readonly Dictionary<Type, TypeInfo> s_CachedTypeInfos = new Dictionary<Type, TypeInfo>();
-
-        static readonly UnityEngine.Pool.ObjectPool<BuilderAttributeTypeName> s_TypeNameItemPool =
-            new UnityEngine.Pool.ObjectPool<BuilderAttributeTypeName>(
-                () => new BuilderAttributeTypeName(),
-                null,
-                c => c.ClearType());
-
-        static TypeInfo GetTypeInfo(Type type)
-        {
-            if (!s_CachedTypeInfos.TryGetValue(type, out var typeInfo))
-                s_CachedTypeInfos[type] = typeInfo = new TypeInfo(type);
-            return typeInfo;
-        }
-
-        internal readonly struct TypeInfo
-        {
-            public readonly Type type;
-            public readonly string value;
-
-            public TypeInfo(Type type)
-            {
-                this.type = type;
-                this.value = $"{type.FullName}, {type.Assembly.GetName().Name}";
-            }
-        }
-
-        BuilderInspector m_Inspector;
-        BuilderSelection m_Selection;
-        PersistedFoldout m_AttributesSection;
-
-        VisualElement currentVisualElement => m_Inspector.currentVisualElement;
-
-        public VisualElement root => m_AttributesSection;
-
-        public BuilderInspectorAttributes(BuilderInspector inspector)
-        {
-            m_Inspector = inspector;
-            m_Selection = inspector.selection;
-
-            m_AttributesSection = m_Inspector.Q<PersistedFoldout>("inspector-attributes-foldout");
-        }
-
-        public void Refresh()
-        {
-            m_AttributesSection.Clear();
-
-            if (currentVisualElement == null)
-                return;
-
-            if (m_Selection.selectionType != BuilderSelectionType.Element &&
-                m_Selection.selectionType != BuilderSelectionType.ElementInTemplateInstance &&
-                m_Selection.selectionType != BuilderSelectionType.ElementInControlInstance)
-                return;
-
-            if (m_Selection.selectionType == BuilderSelectionType.ElementInTemplateInstance &&
-                string.IsNullOrEmpty(currentVisualElement.name))
-            {
-                var helpBox = new HelpBox();
-                helpBox.AddToClassList(BuilderConstants.InspectorClassHelpBox);
-                helpBox.text = BuilderConstants.NoNameElementAttributes;
-
-                m_AttributesSection.Add(helpBox);
-            }
-
-            GenerateAttributeFields();
-
-            // Forward focus to the panel header.
-            m_AttributesSection
-                .Query()
-                .Where(e => e.focusable)
-                .ForEach((e) => m_Inspector.AddFocusable(e));
-        }
-
-        public void Enable()
-        {
-            m_AttributesSection.contentContainer.SetEnabled(true);
-        }
-
-        public void Disable()
-        {
-            m_AttributesSection.contentContainer.SetEnabled(false);
-        }
-
-        void GenerateAttributeFields()
-        {
-            var attributeList = currentVisualElement.GetAttributeDescriptions();
-
-            foreach (var attribute in attributeList)
-            {
-                if (attribute == null || attribute.name == null || IsAttributeIgnored(attribute))
-                    continue;
-
-                CreateAttributeRow(m_AttributesSection, attribute);
-            }
-        }
-
-        static bool IsAttributeIgnored(UxmlAttributeDescription attribute)
-        {
-            // Temporary check until we add an "obsolete" mechanism to uxml attribute description.
-            return attribute.name == "show-horizontal-scroller" || attribute.name == "show-vertical-scroller" || attribute.name == "name";
-        }
-
-        BuilderStyleRow CreateAttributeRow(VisualElement parent, UxmlAttributeDescription attribute)
-        {
-            var attributeType = attribute.GetType();
-
-            // Generate field label.
-            var fieldLabel = BuilderNameUtilities.ConvertDashToHuman(attribute.name);
-            BindableElement fieldElement;
-            if (attribute is UxmlStringAttributeDescription)
-            {
-                // Hard-coded
-                if (attribute.name.Equals("value") && currentVisualElement is EnumField enumField)
-                {
-                    var uiField = new EnumField("Value");
-                    if (null != enumField.value)
-                        uiField.Init(enumField.value, enumField.includeObsoleteValues);
-                    else
-                        uiField.SetValueWithoutNotify(null);
-                    uiField.RegisterValueChangedCallback(evt =>
-                        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");
-                    uiField.RegisterValueChangedCallback(evt =>
-                        PostAttributeValueChange(uiField, uiField.value.ToString()));
-                    fieldElement = uiField;
-                }
-                else
-                {
-                    var uiField = new TextField(fieldLabel);
-                    if (attribute.name.Equals("name") || attribute.name.Equals("view-data-key"))
-                        uiField.RegisterValueChangedCallback(e =>
-                        {
-                            OnValidatedAttributeValueChange(e, BuilderNameUtilities.attributeRegex,
-                                BuilderConstants.AttributeValidationSpacialCharacters);
-                        });
-                    else if (attribute.name.Equals("binding-path"))
-                        uiField.RegisterValueChangedCallback(e =>
-                        {
-                            OnValidatedAttributeValueChange(e, BuilderNameUtilities.bindingPathAttributeRegex,
-                                BuilderConstants.BindingPathAttributeValidationSpacialCharacters);
-                        });
-                    else
-                        uiField.RegisterValueChangedCallback(OnAttributeValueChange);
-
-                    if (attribute.name.Equals("text") || attribute.name.Equals("label"))
-                    {
-                        uiField.multiline = true;
-                        uiField.AddToClassList(BuilderConstants.InspectorMultiLineTextFieldClassName);
-                    }
-
-                    fieldElement = uiField;
-                }
-            }
-            else if (attribute is UxmlFloatAttributeDescription)
-            {
-                var uiField = new FloatField(fieldLabel);
-                uiField.RegisterValueChangedCallback(OnAttributeValueChange);
-                fieldElement = uiField;
-            }
-            else if (attribute is UxmlDoubleAttributeDescription)
-            {
-                var uiField = new DoubleField(fieldLabel);
-                uiField.RegisterValueChangedCallback(OnAttributeValueChange);
-                fieldElement = uiField;
-            }
-            else if (attribute is UxmlIntAttributeDescription)
-            {
-                if (attribute.name.Equals("value") && currentVisualElement is LayerField)
-                {
-                    var uiField = new LayerField("Value");
-                    uiField.RegisterValueChangedCallback(OnAttributeValueChange);
-                    fieldElement = uiField;
-                }
-                else if (attribute.name.Equals("value") && currentVisualElement is LayerMaskField)
-                {
-                    var uiField = new LayerMaskField("Value");
-                    uiField.RegisterValueChangedCallback(OnAttributeValueChange);
-                    fieldElement = uiField;
-                }
-                else
-                {
-                    var uiField = new IntegerField(fieldLabel);
-                    uiField.RegisterValueChangedCallback(OnAttributeValueChange);
-                    fieldElement = uiField;
-                }
-            }
-            else if (attribute is UxmlLongAttributeDescription)
-            {
-                var uiField = new LongField(fieldLabel);
-                uiField.RegisterValueChangedCallback(OnAttributeValueChange);
-                fieldElement = uiField;
-            }
-            else if (attribute is UxmlBoolAttributeDescription)
-            {
-                var uiField = new Toggle(fieldLabel);
-                uiField.RegisterValueChangedCallback(OnAttributeValueChange);
-                fieldElement = uiField;
-            }
-            else if (attribute is UxmlColorAttributeDescription)
-            {
-                var uiField = new ColorField(fieldLabel);
-                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)
-            {
-                var desiredType = attributeType.GetGenericArguments()[0];
-
-                var uiField = new TextField(fieldLabel) { isDelayed = true };
-
-                var completer = new FieldSearchCompleter<TypeInfo>(uiField);
-                uiField.RegisterCallback<AttachToPanelEvent, FieldSearchCompleter<TypeInfo>>((evt, c) =>
-                {
-                    // When possible, the popup should have the same width as the input field, so that the auto-complete
-                    // characters will try to match said input field.
-                    c.popup.anchoredControl = evt.elementTarget.Q(className: "unity-text-field__input");
-                }, completer);
-                completer.matcherCallback += (str, info) => info.value.IndexOf(str, StringComparison.OrdinalIgnoreCase) >= 0;
-                completer.itemHeight = 36;
-                completer.dataSourceCallback += () =>
-                {
-                    var desiredTypeInfo = new TypeInfo(desiredType);
-
-                    return TypeCache.GetTypesDerivedFrom(desiredType)
-                        .Where(t => !t.IsGenericType)
-                        // Remove UIBuilder types from the list
-                        .Where(t => t.Assembly != GetType().Assembly)
-                        .Select(GetTypeInfo)
-                        .Append(desiredTypeInfo);
-                };
-                completer.getTextFromDataCallback += info => info.value;
-                completer.makeItem = () => s_TypeNameItemPool.Get();
-                completer.destroyItem = e =>
-                {
-                    if (e is BuilderAttributeTypeName typeItem)
-                        s_TypeNameItemPool.Release(typeItem);
-                };
-                completer.bindItem = (v, i) =>
-                {
-                    if (v is BuilderAttributeTypeName l)
-                        l.SetType(completer.results[i].type, completer.textField.text);
-                };
-
-                uiField.RegisterValueChangedCallback(e => OnValidatedTypeAttributeChange(e, desiredType));
-
-                fieldElement = uiField;
-                uiField.RegisterCallback<DetachFromPanelEvent, FieldSearchCompleter<TypeInfo>>((evt, c) =>
-                {
-                    c.popup.RemoveFromHierarchy();
-                }, completer);
-                uiField.userData = completer;
-            }
-            else if (attributeType.IsGenericType && attributeType.GetGenericArguments()[0].IsEnum)
-            {
-                var propInfo = attributeType.GetProperty("defaultValue");
-                var defaultEnumValue = propInfo.GetValue(attribute, null) as Enum;
-
-                if (defaultEnumValue.GetType().GetCustomAttribute<FlagsAttribute>() == null)
-                {
-                    // Create and initialize the EnumField.
-                    var uiField = new EnumField(fieldLabel);
-                    uiField.Init(defaultEnumValue);
-
-                    uiField.RegisterValueChangedCallback(OnAttributeValueChange);
-                    fieldElement = uiField;
-                }
-                else
-                {
-                    // Create and initialize the EnumFlagsField.
-                    var uiField = new EnumFlagsField(fieldLabel);
-                    uiField.Init(defaultEnumValue);
-
-                    uiField.RegisterValueChangedCallback(OnAttributeValueChange);
-                    fieldElement = uiField;
-                }
-            }
-            else
-            {
-                var uiField = new TextField(fieldLabel);
-                uiField.RegisterValueChangedCallback(OnAttributeValueChange);
-                fieldElement = uiField;
-            }
-
-            // Create row.
-            var styleRow = new BuilderStyleRow();
-            styleRow.Add(fieldElement);
-
-            // Link the field.
-            fieldElement.SetProperty(BuilderConstants.InspectorLinkedStyleRowVEPropertyName, styleRow);
-            fieldElement.SetProperty(BuilderConstants.InspectorLinkedAttributeDescriptionVEPropertyName, attribute);
-
-            // Ensure the row is added to the inspector hierarchy before refreshing
-            parent.Add(styleRow);
-
-            // Set initial value.
-            RefreshAttributeField(fieldElement);
-
-            // Setup field binding path.
-            fieldElement.bindingPath = attribute.name;
-            fieldElement.tooltip = attribute.name;
-
-            // Context menu.
-            styleRow.AddManipulator(new ContextualMenuManipulator((evt) => BuildAttributeFieldContextualMenu(evt.menu, fieldElement)));
-
-            if (fieldElement.GetFieldStatusIndicator() != null)
-            {
-                fieldElement.GetFieldStatusIndicator().populateMenuItems =
-                    (menu) => BuildAttributeFieldContextualMenu(menu, fieldElement);
-            }
-
-            m_Inspector.UpdateFieldStatus(fieldElement, null);
-            return styleRow;
-        }
-
-        string GetRemapAttributeNameToCSProperty(string attributeName)
-        {
-            if (currentVisualElement is ObjectField && attributeName == "type")
-                return "objectType";
-            else if (attributeName == "readonly")
-                return "isReadOnly";
-
-            var camel = BuilderNameUtilities.ConvertDashToCamel(attributeName);
-            return camel;
-        }
-
-        object GetCustomValueAbstract(string attributeName)
-        {
-            if (currentVisualElement is ScrollView scrollView)
-            {
-                if (attributeName == "show-horizontal-scroller")
-                {
-                    return scrollView.horizontalScrollerVisibility != ScrollerVisibility.Hidden;
-                }
-                else if (attributeName == "show-vertical-scroller")
-                {
-                    return scrollView.verticalScrollerVisibility != ScrollerVisibility.Hidden;
-                }
-                else if (attributeName == "touch-scroll-type")
-                {
-                    return scrollView.touchScrollBehavior;
-                }
-            }
-            else if (currentVisualElement is ListView listView)
-            {
-                if (attributeName == "horizontal-scrolling")
-                    return listView.horizontalScrollingEnabled;
-            }
-
-            return null;
-        }
-
-        void RefreshAttributeField(BindableElement fieldElement)
-        {
-            var styleRow =
-                fieldElement.GetProperty(BuilderConstants.InspectorLinkedStyleRowVEPropertyName) as VisualElement;
-            var attribute =
-                fieldElement.GetProperty(BuilderConstants.InspectorLinkedAttributeDescriptionVEPropertyName) as
-                    UxmlAttributeDescription;
-
-            var veType = currentVisualElement.GetType();
-            var csPropertyName = GetRemapAttributeNameToCSProperty(attribute.name);
-            var fieldInfo = veType.GetProperty(csPropertyName,
-                BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.IgnoreCase);
-
-            object veValueAbstract = null;
-            if (fieldInfo == null)
-            {
-                veValueAbstract = GetCustomValueAbstract(attribute.name);
-            }
-            else
-            {
-                veValueAbstract = fieldInfo.GetValue(currentVisualElement, null);
-            }
-
-            var attributeType = attribute.GetType();
-            var vea = currentVisualElement.GetVisualElementAsset();
-            var isAssetAttribute = attributeType.IsGenericType && attributeType.GetGenericTypeDefinition() == typeof(UxmlAssetAttributeDescription<>);
-
-            if (veValueAbstract == null)
-            {
-                if (currentVisualElement is EnumField defaultEnumField &&
-                    attribute.name == "value")
-                {
-                    if (defaultEnumField.type == null)
-                    {
-                        fieldElement.SetEnabled(false);
-                    }
-                    else
-                    {
-                        ((EnumField)fieldElement).PopulateDataFromType(defaultEnumField.type);
-                        fieldElement.SetEnabled(true);
-                    }
-                }
-                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);
-                    }
-                }
-                else if (isAssetAttribute && fieldElement is ObjectField objectField)
-                {
-                    if (vea != null && attribute.TryGetValueFromBagAsString(vea, CreationContext.Default, out var value))
-                    {
-                        // Asset wasn't loaded correctly, most likely due to an invalid path. Show the missing reference.
-                        var asset = m_Inspector.visualTreeAsset.GetAsset(value, objectField.objectType);
-                        objectField.SetValueWithoutNotify(asset);
-
-                        styleRow.EnableInClassList(BuilderConstants.InspectorLocalStyleOverrideClassName, true);
-                        m_Inspector.UpdateFieldStatus(fieldElement, null);
-                    }
-                }
-
-                return;
-            }
-
-            if (attribute is UxmlStringAttributeDescription &&
-                attribute.name == "value" &&
-                currentVisualElement is EnumField enumField
-                && fieldElement is EnumField inputEnumField)
-            {
-                var hasValue = enumField.value != null;
-                if (hasValue)
-                    inputEnumField.Init(enumField.value, enumField.includeObsoleteValues);
-                else
-                    inputEnumField.SetValueWithoutNotify(null);
-                inputEnumField.SetEnabled(hasValue);
-            }
-            else if (attribute is UxmlStringAttributeDescription &&
-                     attribute.name == "value" &&
-                     currentVisualElement is TagField tagField
-                     && fieldElement is TagField inputTagField)
-            {
-                inputTagField.SetValueWithoutNotify(tagField.value);
-            }
-            else if (attribute is UxmlIntAttributeDescription &&
-                     attribute.name == "value" &&
-                     currentVisualElement is LayerField layerField
-                     && fieldElement is LayerField inputLayerField)
-            {
-                inputLayerField.SetValueWithoutNotify(layerField.value);
-            }
-            else if (attribute is UxmlIntAttributeDescription &&
-                     attribute.name == "value" &&
-                     currentVisualElement is LayerMaskField layerMaskField
-                     && fieldElement is LayerMaskField inputLayerMaskField)
-            {
-                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 textField)
-            {
-                textField.SetValueWithoutNotify(GetAttributeStringValue(veValueAbstract));
-            }
-            else if (attribute is UxmlFloatAttributeDescription && fieldElement is FloatField floatField)
-            {
-                floatField.SetValueWithoutNotify((float) veValueAbstract);
-            }
-            else if (attribute is UxmlDoubleAttributeDescription && fieldElement is DoubleField doubleField)
-            {
-                doubleField.SetValueWithoutNotify((double) veValueAbstract);
-            }
-            else if (attribute is UxmlIntAttributeDescription && fieldElement is IntegerField integerField)
-            {
-                if (veValueAbstract is int)
-                    integerField.SetValueWithoutNotify((int) veValueAbstract);
-                else if (veValueAbstract is float)
-                    integerField.SetValueWithoutNotify(Convert.ToInt32(veValueAbstract));
-            }
-            else if (attribute is UxmlLongAttributeDescription && fieldElement is LongField longField)
-            {
-                longField.SetValueWithoutNotify((long) veValueAbstract);
-            }
-            else if (attribute is UxmlBoolAttributeDescription && fieldElement is Toggle toggle)
-            {
-                toggle.SetValueWithoutNotify((bool) veValueAbstract);
-            }
-            else if (attribute is UxmlColorAttributeDescription && fieldElement is ColorField colorField)
-            {
-                colorField.SetValueWithoutNotify((Color) veValueAbstract);
-            }
-            else if (isAssetAttribute && fieldElement is ObjectField objectField)
-            {
-                objectField.SetValueWithoutNotify((Object)veValueAbstract);
-            }
-            else if (attributeType.IsGenericType &&
-                     !attributeType.GetGenericArguments()[0].IsEnum &&
-                     attributeType.GetGenericArguments()[0] is Type &&
-                     fieldElement is TextField typeTextField &&
-                     veValueAbstract is Type veTypeValue)
-            {
-                var fullTypeName = veTypeValue.AssemblyQualifiedName;
-                var fullTypeNameSplit = fullTypeName.Split(',');
-                typeTextField.SetValueWithoutNotify($"{fullTypeNameSplit[0]},{fullTypeNameSplit[1]}");
-            }
-            else if (attributeType.IsGenericType &&
-                     attributeType.GetGenericArguments()[0].IsEnum &&
-                     fieldElement is BaseField<Enum> baseEnumField)
-            {
-                var propInfo = attributeType.GetProperty("defaultValue");
-                var defaultEnumValue = propInfo.GetValue(attribute, null) as Enum;
-
-                string enumAttributeValueStr;
-                if (m_Selection.selectionType == BuilderSelectionType.ElementInTemplateInstance)
-                {
-                    // Special case for template children and usageHints that is not set in the visual element when set in the builder
-                    var parentTemplate = BuilderAssetUtilities.GetVisualElementRootTemplate(currentVisualElement);
-                    var parentTemplateAsset = parentTemplate.GetVisualElementAsset() as TemplateAsset;
-                    var fieldAttributeOverride = parentTemplateAsset.attributeOverrides.FirstOrDefault(x =>
-                        x.m_AttributeName == attribute.name && x.m_ElementName == currentVisualElement.name);
-
-                    if (fieldAttributeOverride.m_ElementName == currentVisualElement.name)
-                    {
-                        enumAttributeValueStr = fieldAttributeOverride.m_Value;
-                    }
-                    else
-                    {
-                        enumAttributeValueStr = veValueAbstract.ToString();
-                    }
-                }
-                else
-                {
-                    enumAttributeValueStr = vea?.GetAttributeValue(attribute.name);
-                }
-
-                // Set the value from the UXML attribute.
-                if (!string.IsNullOrEmpty(enumAttributeValueStr))
-                {
-                    try
-                    {
-                        var parsedValue = Enum.Parse(defaultEnumValue.GetType(), enumAttributeValueStr, true) as Enum;
-                        baseEnumField.SetValueWithoutNotify(parsedValue);
-                    }
-                    catch (ArgumentException exception)
-                    {
-                        Debug.LogException(exception);
-                        // use default if anything went wrong
-                        baseEnumField.SetValueWithoutNotify(defaultEnumValue);
-                    }
-                    catch (OverflowException exception)
-                    {
-                        Debug.LogException(exception);
-                        // use default if anything went wrong
-                        baseEnumField.SetValueWithoutNotify(defaultEnumValue);
-                    }
-                }
-            }
-            else if (fieldElement is TextField defaultTextField)
-            {
-                defaultTextField.SetValueWithoutNotify(veValueAbstract.ToString());
-            }
-
-            styleRow.EnableInClassList(BuilderConstants.InspectorLocalStyleOverrideClassName, IsAttributeOverriden(attribute));
-            m_Inspector.UpdateFieldStatus(fieldElement, null);
-        }
-
-        string GetAttributeStringValue(object attributeValue)
-        {
-            string value;
-            if (attributeValue is Enum @enum)
-                value = @enum.ToString();
-            else if (attributeValue is IEnumerable<string> list)
-            {
-                value = string.Join(",", list.ToArray());
-            }
-            else
-            {
-                value = attributeValue.ToString();
-            }
-
-            return value;
-        }
-
-        bool IsAttributeOverriden(UxmlAttributeDescription attribute)
-        {
-            return IsAttributeOverriden(currentVisualElement, attribute);
-        }
-
-        public static bool IsAttributeOverriden(VisualElement currentVisualElement, UxmlAttributeDescription attribute)
-        {
-            var vea = currentVisualElement.GetVisualElementAsset();
-            if (vea != null && attribute.name == "picking-mode")
-            {
-                var veaAttributeValue = vea.GetAttributeValue(attribute.name);
-                if (veaAttributeValue != null &&
-                    veaAttributeValue.ToLower() != attribute.defaultValueAsString.ToLower())
-                    return true;
-            }
-            else if (attribute.name == "name")
-            {
-                if (!string.IsNullOrEmpty(currentVisualElement.name))
-                    return true;
-            }
-            else if (vea != null && vea.HasAttribute(attribute.name))
-            {
-                return true;
-            }
-            else if (BuilderAssetUtilities.HasAttributeOverrideInRootTemplate(currentVisualElement, attribute.name))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        void ResetAttributeFieldToDefault(BindableElement fieldElement)
-        {
-            var styleRow =
-                fieldElement.GetProperty(BuilderConstants.InspectorLinkedStyleRowVEPropertyName) as VisualElement;
-            var attribute =
-                fieldElement.GetProperty(BuilderConstants.InspectorLinkedAttributeDescriptionVEPropertyName) as
-                    UxmlAttributeDescription;
-
-            var attributeType = attribute.GetType();
-
-            if (attribute is UxmlStringAttributeDescription stringAttribute && fieldElement is TextField textField)
-            {
-                textField.SetValueWithoutNotify(stringAttribute.defaultValue);
-            }
-            else if (attribute is UxmlStringAttributeDescription && fieldElement is EnumField enumField &&
-                     currentVisualElement is EnumField)
-            {
-                if (null == enumField.type)
-                    enumField.SetValueWithoutNotify(null);
-                else
-                    enumField.SetValueWithoutNotify((Enum)Enum.ToObject(enumField.type, 0));
-            }
-            else if (attribute is UxmlStringAttributeDescription && fieldElement is EnumFlagsField enumFlagsField &&
-                     currentVisualElement is EnumFlagsField)
-            {
-                if (null == enumFlagsField.type)
-                    enumFlagsField.SetValueWithoutNotify(null);
-                else
-                    enumFlagsField.SetValueWithoutNotify((Enum)Enum.ToObject(enumFlagsField.type, 0));
-            }
-            else if (attribute is UxmlFloatAttributeDescription floatAttribute && fieldElement is FloatField floatField)
-            {
-                floatField.SetValueWithoutNotify(floatAttribute.defaultValue);
-            }
-            else if (attribute is UxmlDoubleAttributeDescription doubleAttribute && fieldElement is DoubleField doubleField)
-            {
-                doubleField.SetValueWithoutNotify(doubleAttribute.defaultValue);
-            }
-            else if (attribute is UxmlIntAttributeDescription intAttribute && fieldElement is IntegerField intField)
-            {
-                intField.SetValueWithoutNotify(intAttribute.defaultValue);
-            }
-            else if (attribute is UxmlLongAttributeDescription longAttribute && fieldElement is LongField longField)
-            {
-                longField.SetValueWithoutNotify(longAttribute.defaultValue);
-            }
-            else if (attribute is UxmlBoolAttributeDescription boolAttribute && fieldElement is Toggle toggle)
-            {
-                toggle.SetValueWithoutNotify(boolAttribute.defaultValue);
-            }
-            else if (attribute is UxmlColorAttributeDescription colorAttribute && fieldElement is ColorField colorField)
-            {
-                colorField.SetValueWithoutNotify(colorAttribute.defaultValue);
-            }
-            else if (attributeType.IsGenericType && attributeType.GetGenericTypeDefinition() == typeof(UxmlAssetAttributeDescription<>) &&
-                     fieldElement is ObjectField objectField)
-            {
-                objectField.SetValueWithoutNotify(default);
-            }
-            else if (attributeType.IsGenericType &&
-                     !attributeType.GetGenericArguments()[0].IsEnum &&
-                     attributeType.GetGenericArguments()[0] is Type &&
-                     fieldElement is TextField typeTextField)
-            {
-                var a = attribute as TypedUxmlAttributeDescription<Type>;
-                if (a.defaultValue == null)
-                    typeTextField.SetValueWithoutNotify(string.Empty);
-                else
-                    typeTextField.SetValueWithoutNotify(a.defaultValue.ToString());
-            }
-            else if (attributeType.IsGenericType &&
-                     attributeType.GetGenericArguments()[0].IsEnum &&
-                     fieldElement is BaseField<Enum> baseEnumField)
-            {
-                var propInfo = attributeType.GetProperty("defaultValue");
-                var defaultEnumValue = propInfo.GetValue(attribute, null) as Enum;
-
-                baseEnumField.SetValueWithoutNotify(defaultEnumValue);
-            }
-            else if (fieldElement is TextField defaultTextField)
-            {
-                defaultTextField.SetValueWithoutNotify(string.Empty);
-            }
-
-            // Clear override.
-            styleRow.RemoveFromClassList(BuilderConstants.InspectorLocalStyleOverrideClassName);
-            var styleFields = styleRow.Query<BindableElement>().ToList();
-            foreach (var styleField in styleFields)
-            {
-                styleField.RemoveFromClassList(BuilderConstants.InspectorLocalStyleResetClassName);
-                styleField.RemoveFromClassList(BuilderConstants.InspectorLocalStyleOverrideClassName);
-            }
-        }
-
-        void BuildAttributeFieldContextualMenu(ContextualMenuPopulateEvent evt)
-        {
-            BuildAttributeFieldContextualMenu(evt.menu, evt.elementTarget);
-        }
-
-        void BuildAttributeFieldContextualMenu(DropdownMenu menu, VisualElement fieldElement)
-        {
-            // if the context menu is already populated by the field (text field) then ignore
-            if (menu.MenuItems() != null & menu.MenuItems().Count > 0)
-                return;
-
-            menu.AppendAction(
-                BuilderConstants.ContextMenuUnsetMessage,
-                UnsetAttributeProperty,
-                action =>
-                {
-                    var fieldElement = action.userData as BindableElement;
-                    if (fieldElement == null)
-                        return DropdownMenuAction.Status.Disabled;
-
-                    var attributeName = fieldElement.bindingPath;
-                    var vea = currentVisualElement.GetVisualElementAsset();
-                    var isAttributeOverrideAttribute =
-                        m_Selection.selectionType == BuilderSelectionType.ElementInTemplateInstance
-                        && BuilderAssetUtilities.HasAttributeOverrideInRootTemplate(currentVisualElement,
-                            attributeName);
-
-                    return (vea != null && vea.HasAttribute(attributeName)) || isAttributeOverrideAttribute
-                        ? DropdownMenuAction.Status.Normal
-                        : DropdownMenuAction.Status.Disabled;
-                },
-                fieldElement);
-
-            menu.AppendAction(
-                BuilderConstants.ContextMenuUnsetAllMessage,
-                (action) => UnsetAllAttributes(),
-                action =>
-                {
-                    var attributeList = currentVisualElement.GetAttributeDescriptions();
-                    foreach (var attribute in attributeList)
-                    {
-                        if (attribute?.name == null)
-                            continue;
-
-                        if (m_Selection.selectionType == BuilderSelectionType.ElementInTemplateInstance
-                            && attribute.name == "name")
-                        {
-                            continue;
-                        }
-
-                        if (IsAttributeOverriden(attribute))
-                            return DropdownMenuAction.Status.Normal;
-                    }
-
-                    return DropdownMenuAction.Status.Disabled;
-                },
-                fieldElement);
-        }
-
-        internal void UnsetAllAttributes()
-        {
-            // Undo/Redo
-            Undo.RegisterCompleteObjectUndo(m_Inspector.visualTreeAsset,
-                BuilderConstants.ChangeAttributeValueUndoMessage);
-
-            if (m_Selection.selectionType == BuilderSelectionType.ElementInTemplateInstance)
-            {
-                var parentTemplate = BuilderAssetUtilities.GetVisualElementRootTemplate(currentVisualElement);
-                var parentTemplateAsset = parentTemplate.GetVisualElementAsset() as TemplateAsset;
-                var attributeOverrides =
-                    new List<TemplateAsset.AttributeOverride>(parentTemplateAsset.attributeOverrides);
-
-                foreach (var attributeOverride in attributeOverrides)
-                {
-                    if (attributeOverride.m_ElementName == currentVisualElement.name)
-                    {
-                        parentTemplateAsset.RemoveAttributeOverride(attributeOverride.m_ElementName,
-                            attributeOverride.m_AttributeName);
-                    }
-                }
-
-                var builder = Builder.ActiveWindow;
-                var hierarchyView = builder.hierarchy.elementHierarchyView;
-                var selectionId = hierarchyView.GetSelectedItemId();
-
-                builder.OnEnableAfterAllSerialization();
-
-                hierarchyView.SelectItemById(selectionId);
-            }
-            else
-            {
-                var attributeList = currentVisualElement.GetAttributeDescriptions();
-                var vea = currentVisualElement.GetVisualElementAsset();
-
-                foreach (var attribute in attributeList)
-                {
-                    if (attribute?.name == null)
-                        continue;
-
-                    // Unset value in asset.
-                    vea.RemoveAttribute(attribute.name);
-                }
-
-                var fields = m_AttributesSection.Query<BindableElement>()
-                    .Where(e => !string.IsNullOrEmpty(e.bindingPath)).ToList();
-                foreach (var fieldElement in fields)
-                {
-                    // Reset UI value.
-                    ResetAttributeFieldToDefault(fieldElement);
-                    m_Inspector.UpdateFieldStatus(fieldElement, null);
-                }
-
-                // Call Init();
-                m_Inspector.CallInitOnElement();
-
-                // Notify of changes.
-                m_Selection.NotifyOfHierarchyChange(m_Inspector);
-            }
-        }
-
-        void UnsetAttributeProperty(DropdownMenuAction action)
-        {
-            var fieldElement = action.userData as BindableElement;
-            UnsetAttributeProperty(fieldElement);
-
-            // When unsetting the type value for an enum field, we also need to clear the value field as well.
-            if (currentVisualElement is EnumField && 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<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);
-            }
-        }
-
-        public void UnsetAttributeProperty(BindableElement fieldElement)
-        {
-            var attributeName = fieldElement.bindingPath;
-            // Undo/Redo
-            Undo.RegisterCompleteObjectUndo(m_Inspector.visualTreeAsset,
-                BuilderConstants.ChangeAttributeValueUndoMessage);
-
-            // Unset value in asset.
-            var vea = currentVisualElement.GetVisualElementAsset();
-
-            if (m_Selection.selectionType == BuilderSelectionType.ElementInTemplateInstance)
-            {
-                var templateContainer = BuilderAssetUtilities.GetVisualElementRootTemplate(currentVisualElement);
-                var templateAsset = templateContainer.GetVisualElementAsset() as TemplateAsset;
-
-                if (templateAsset != null)
-                {
-                    var builder = Builder.ActiveWindow;
-                    var hierarchyView = builder.hierarchy.elementHierarchyView;
-                    var selectionId = hierarchyView.GetSelectedItemId();
-
-                    templateAsset.RemoveAttributeOverride(currentVisualElement.name, attributeName);
-
-                    builder.OnEnableAfterAllSerialization();
-
-                    hierarchyView.SelectItemById(selectionId);
-                }
-            }
-            else
-            {
-                vea.RemoveAttribute(attributeName);
-
-                // Reset UI value.
-                ResetAttributeFieldToDefault(fieldElement);
-
-                // Call Init();
-                m_Inspector.CallInitOnElement();
-
-                // Notify of changes.
-                m_Selection.NotifyOfHierarchyChange(m_Inspector);
-
-                m_Inspector.UpdateFieldStatus(fieldElement, null);
-                Refresh();
-            }
-        }
-
-        void OnAttributeValueChange(ChangeEvent<string> evt)
-        {
-            var field = evt.target as TextField;
-            PostAttributeValueChange(field, evt.newValue);
-        }
-
-        void OnValidatedTypeAttributeChange(ChangeEvent<string> evt, Type desiredType)
-        {
-            var field = evt.target as TextField;
-            var typeName = evt.newValue;
-            var fullTypeName = typeName;
-
-            Type type = null;
-            if (!string.IsNullOrEmpty(typeName))
-            {
-                type = Type.GetType(fullTypeName, false);
-
-                // Try some auto-fixes.
-                if (type == null)
-                {
-                    fullTypeName = typeName + ", UnityEngine.CoreModule";
-                    type = Type.GetType(fullTypeName, false);
-                }
-
-                if (type == null)
-                {
-                    fullTypeName = typeName + ", UnityEditor";
-                    type = Type.GetType(fullTypeName, false);
-                }
-
-                if (type == null && typeName.Contains("."))
-                {
-                    var split = typeName.Split('.');
-                    fullTypeName = typeName + $", {split[0]}.{split[1]}Module";
-                    type = Type.GetType(fullTypeName, false);
-                }
-
-                if (type == null)
-                {
-                    Builder.ShowWarning(string.Format(BuilderConstants.TypeAttributeInvalidTypeMessage, field.label));
-                    evt.StopPropagation();
-                    return;
-                }
-                else if (!desiredType.IsAssignableFrom(type))
-                {
-                    Builder.ShowWarning(string.Format(BuilderConstants.TypeAttributeMustDeriveFromMessage, field.label,
-                        desiredType.FullName));
-                    evt.StopPropagation();
-                    return;
-                }
-            }
-
-            if (currentVisualElement is EnumField)
-            {
-                // 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<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);
-
-            Refresh();
-        }
-
-        internal void OnValidatedAttributeValueChange(ChangeEvent<string> evt, Regex regex, string message)
-        {
-            var field = evt.target as TextField;
-            if (!string.IsNullOrEmpty(evt.newValue) && !regex.IsMatch(evt.newValue))
-            {
-                Builder.ShowWarning(string.Format(message, field.label));
-                field.SetValueWithoutNotify(evt.previousValue);
-                evt.StopPropagation();
-                return;
-            }
-
-            OnAttributeValueChange(evt);
-        }
-
-        void OnAttributeValueChange(ChangeEvent<float> evt)
-        {
-            var field = evt.target as FloatField;
-            PostAttributeValueChange(field, evt.newValue.ToString(CultureInfo.InvariantCulture.NumberFormat));
-        }
-
-        void OnAttributeValueChange(ChangeEvent<double> evt)
-        {
-            var field = evt.target as DoubleField;
-            PostAttributeValueChange(field, evt.newValue.ToString(CultureInfo.InvariantCulture.NumberFormat));
-        }
-
-        void OnAttributeValueChange(ChangeEvent<int> evt)
-        {
-            var field = evt.target as BaseField<int>;
-            PostAttributeValueChange(field, evt.newValue.ToString());
-        }
-
-        void OnAttributeValueChange(ChangeEvent<long> evt)
-        {
-            var field = evt.target as LongField;
-            PostAttributeValueChange(field, evt.newValue.ToString());
-        }
-
-        void OnAttributeValueChange(ChangeEvent<bool> evt)
-        {
-            var field = evt.target as Toggle;
-            PostAttributeValueChange(field, evt.newValue.ToString().ToLower());
-        }
-
-        void OnAttributeValueChange(ChangeEvent<Color> evt)
-        {
-            var field = evt.target as ColorField;
-            PostAttributeValueChange(field, "#" + ColorUtility.ToHtmlStringRGBA(evt.newValue));
-        }
-
-        void OnAssetAttributeValueChange(ChangeEvent<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>;
-            PostAttributeValueChange(field, evt.newValue.ToString());
-        }
-
-        void PostAttributeValueChange(BindableElement field, string value)
-        {
-            // Undo/Redo
-            Undo.RegisterCompleteObjectUndo(m_Inspector.visualTreeAsset,
-                BuilderConstants.ChangeAttributeValueUndoMessage);
-
-            // Set value in asset.
-            var vea = currentVisualElement.GetVisualElementAsset();
-            var vta = currentVisualElement.GetVisualTreeAsset();
-
-            if (m_Selection.selectionType == BuilderSelectionType.ElementInTemplateInstance)
-            {
-                TemplateContainer templateContainerParent =
-                    BuilderAssetUtilities.GetVisualElementRootTemplate(currentVisualElement);
-
-                if (templateContainerParent != null)
-                {
-                    var templateAsset = templateContainerParent.GetVisualElementAsset() as TemplateAsset;
-                    var currentVisualElementName = currentVisualElement.name;
-
-                    if (!string.IsNullOrEmpty(currentVisualElementName))
-                    {
-                        templateAsset.SetAttributeOverride(currentVisualElementName, field.bindingPath, value);
-
-                        var document = Builder.ActiveWindow.document;
-                        var rootElement = Builder.ActiveWindow.viewport.documentRootElement;
-
-                        var elementsToChange = templateContainerParent.Query<VisualElement>(currentVisualElementName);
-                        elementsToChange.ForEach(x =>
-                        {
-                            var templateVea =
-                                x.GetProperty(VisualTreeAsset.LinkedVEAInTemplatePropertyName) as VisualElementAsset;
-                            var attributeOverrides =
-                                BuilderAssetUtilities.GetAccumulatedAttributeOverrides(currentVisualElement);
-                            m_Inspector.CallInitOnTemplateChild(x, templateVea, attributeOverrides);
-                        });
-                    }
-                }
-            }
-            else
-            {
-                vea.SetAttribute(field.bindingPath, value);
-
-                // Call Init();
-                m_Inspector.CallInitOnElement();
-            }
-
-            // Mark field as overridden.
-            var styleRow = field.GetProperty(BuilderConstants.InspectorLinkedStyleRowVEPropertyName) as BuilderStyleRow;
-
-            if (styleRow != null)
-            {
-                styleRow.AddToClassList(BuilderConstants.InspectorLocalStyleOverrideClassName);
-
-                var styleFields = styleRow.Query<BindableElement>().ToList();
-
-                foreach (var styleField in styleFields)
-                {
-                    styleField.RemoveFromClassList(BuilderConstants.InspectorLocalStyleResetClassName);
-                    if (field.bindingPath == styleField.bindingPath)
-                    {
-                        styleField.AddToClassList(BuilderConstants.InspectorLocalStyleOverrideClassName);
-                    }
-                    else if (!string.IsNullOrEmpty(styleField.bindingPath) &&
-                             field.bindingPath != styleField.bindingPath &&
-                             !styleField.ClassListContains(BuilderConstants.InspectorLocalStyleOverrideClassName))
-                    {
-                        styleField.AddToClassList(BuilderConstants.InspectorLocalStyleResetClassName);
-                    }
-                }
-            }
-
-            // Notify of changes.
-            m_Selection.NotifyOfHierarchyChange(m_Inspector);
-
-            if (styleRow != null)
-            {
-                m_Inspector.UpdateFieldStatus(field, null);
-            }
-        }
-    }
-}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderInPlaceTextEditingUtilities.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderInPlaceTextEditingUtilities.cs
deleted file mode 100644
index 475c009842..0000000000
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderInPlaceTextEditingUtilities.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-using System;
-using UnityEditor;
-using UnityEngine;
-using UnityEngine.UIElements;
-using Object = UnityEngine.Object;
-
-namespace Unity.UI.Builder
-{
-    static class BuilderInPlaceTextEditingUtilities
-    {
-        static readonly string s_DummyText = " ";
-        static readonly string s_TextAttributeName = "text";
-
-        static BuilderViewport s_Viewport;
-
-        static UxmlAttributeDescription s_EditedTextAttribute;
-        static VisualElement s_EditedElement;
-        static TextElement s_EditedTextElement;
-
-        internal static void GetAlignmentFromTextAnchor(TextAnchor anchor, out Align align, out Justify justifyContent)
-        {
-            align = Align.FlexStart;
-            justifyContent = Justify.FlexStart;
-
-            switch (anchor)
-            {
-                case TextAnchor.UpperCenter:
-                case TextAnchor.MiddleCenter:
-                case TextAnchor.LowerCenter:
-                    align = Align.Center;
-                    break;
-                case TextAnchor.UpperRight:
-                case TextAnchor.MiddleRight:
-                case TextAnchor.LowerRight:
-                    align = Align.FlexEnd;
-                    break;
-            }
-
-            switch (anchor)
-            {
-                case TextAnchor.MiddleLeft:
-                case TextAnchor.MiddleCenter:
-                case TextAnchor.MiddleRight:
-                    justifyContent = Justify.Center;
-                    break;
-                case TextAnchor.LowerLeft:
-                case TextAnchor.LowerCenter:
-                case TextAnchor.LowerRight:
-                    justifyContent = Justify.FlexEnd;
-                    break;
-            }
-        }
-
-        static void GetAttributeToEdit(VisualElement editedElement, Vector2 pos, out TextElement textElement, out string attributeName)
-        {
-            TextElement labelElement = null;
-
-            textElement = null;
-            attributeName = null;
-
-            switch (editedElement)
-            {
-                case BaseField<bool> boolField: labelElement = boolField.labelElement; break;
-                case BaseField<int> inField: labelElement = inField.labelElement; break;
-                case BaseField<float> floatField: labelElement = floatField.labelElement; break;
-                case BaseField<long> longField: labelElement = longField.labelElement; break;
-                case BaseField<string> strField: labelElement = strField.labelElement; break;
-                case BaseField<Vector2> vec2Field: labelElement = vec2Field.labelElement; break;
-                case BaseField<Vector3> vec3Field: labelElement = vec3Field.labelElement; break;
-                case BaseField<Vector4> vec4Field: labelElement = vec4Field.labelElement; break;
-                case BaseField<Rect> rectField: labelElement = rectField.labelElement; break;
-                case BaseField<Color> colorField: labelElement = colorField.labelElement; break;
-                case BaseField<Gradient> gradField: labelElement = gradField.labelElement; break;
-                case BaseField<Object> objField: labelElement = objField.labelElement; break;
-                case BaseField<Bounds> boundsField: labelElement = boundsField.labelElement; break;
-                case BaseField<AnimationCurve> animCurveField: labelElement = animCurveField.labelElement; break;
-                case BaseField<Enum> enumField: labelElement = enumField.labelElement; break;
-            }
-
-            if (labelElement != null)
-            {
-                textElement = labelElement;
-                attributeName = "label";
-            }
-            else if (editedElement is TextElement editorTextElement)
-            {
-                textElement = editorTextElement;
-                attributeName = s_TextAttributeName;
-            }
-        }
-
-        public static void OpenEditor(VisualElement element, Vector2 pos)
-        {
-            BuilderViewport viewport = element.GetFirstAncestorOfType<BuilderViewport>();
-            var editorLayer = viewport.editorLayer;
-            var textEditor = viewport.textEditor;
-
-            GetAttributeToEdit(element, pos, out var textElement, out var attributeName);
-
-            if (textElement == null || string.IsNullOrEmpty(attributeName))
-                return;
-
-            var attributeList = element.GetAttributeDescriptions();
-
-            foreach (var attribute in attributeList)
-            {
-                if (attribute?.name != null && attribute.name.Equals(attributeName))
-                {
-                    s_EditedTextAttribute = attribute;
-                    break;
-                }
-            }
-
-            if (s_EditedTextAttribute == null)
-                return;
-
-            s_Viewport = viewport;
-            s_EditedElement = element;
-            s_EditedTextElement = textElement;
-
-            var value = s_EditedElement.GetValueByReflection(s_EditedTextAttribute.name) as string;
-
-            // To ensure the text element is visible
-            if (string.IsNullOrEmpty(value))
-            {
-                s_EditedElement.SetValueByReflection(s_EditedTextAttribute.name, s_DummyText);
-            }
-
-            editorLayer.RemoveFromClassList(BuilderConstants.HiddenStyleClassName);
-
-            var textInput = textEditor.Q(TextField.textInputUssName);
-            textEditor.value = value;
-            textInput.style.unityTextAlign = textElement.resolvedStyle.unityTextAlign;
-            textInput.style.fontSize = textElement.resolvedStyle.fontSize;
-            textInput.style.unityFontStyleAndWeight = textElement.resolvedStyle.unityFontStyleAndWeight;
-            textInput.style.whiteSpace = s_EditedTextElement.resolvedStyle.whiteSpace;
-            textInput.style.width = s_EditedTextElement.resolvedStyle.width;
-            textInput.style.height = s_EditedTextElement.resolvedStyle.height;
-
-            textEditor.multiline = true;
-
-            GetAlignmentFromTextAnchor(textElement.resolvedStyle.unityTextAlign, out var alignItems, out var justifyContent);
-
-            var textEditorContainer = textEditor.parent;
-            textEditorContainer.style.paddingLeft = s_EditedTextElement.resolvedStyle.paddingLeft;
-            textEditorContainer.style.paddingTop = s_EditedTextElement.resolvedStyle.paddingTop;
-            textEditorContainer.style.paddingRight = s_EditedTextElement.resolvedStyle.paddingRight;
-            textEditorContainer.style.paddingBottom = s_EditedTextElement.resolvedStyle.paddingBottom;
-            textEditorContainer.style.alignItems = alignItems;
-            textEditorContainer.style.justifyContent = justifyContent;
-            UpdateTextEditorGeometry();
-            textElement.RegisterCallback<GeometryChangedEvent>(OnTextElementGeometryChanged);
-
-            textEditor.schedule.Execute(a => textEditor.Focus());
-            textEditor.textSelection.SelectAll();
-
-            textInput.RegisterCallback<FocusOutEvent>(OnFocusOutEvent, TrickleDown.TrickleDown);
-            textEditor.RegisterCallback<ChangeEvent<string>>(OnTextChanged);
-        }
-
-        static void OnTextElementGeometryChanged(GeometryChangedEvent evt)
-        {
-            UpdateTextEditorGeometry();
-        }
-
-        static void UpdateTextEditorGeometry()
-        {
-            // The text element may have been removed from its hierarchy if the text is empty. This is the case with Fields.
-            if (s_EditedTextElement.panel == null)
-                return;
-
-            var textElementPos =
-                s_EditedTextElement.parent.ChangeCoordinatesTo(s_Viewport.documentRootElement, new Vector2(s_EditedTextElement.layout.x, s_EditedTextElement.layout.y));
-
-            var textEditorContainer = s_Viewport.textEditor.parent;
-
-            // Note: Set the font here it because the font maybe still null of empty label of field in OpenEditor()
-            s_Viewport.textEditor.Q(TextField.textInputUssName).style.unityFont = s_EditedTextElement.resolvedStyle.unityFont;
-
-            textEditorContainer.style.left = textElementPos.x;
-            textEditorContainer.style.top = textElementPos.y;
-            var textInput = textEditorContainer.Q(TextField.textInputUssName);
-            textInput.style.width = s_EditedTextElement.layout.width;
-            textInput.style.height = s_EditedTextElement.layout.height;
-        }
-
-        public static void CloseEditor()
-        {
-            if (s_Viewport == null)
-                return;
-
-            s_Viewport.textEditor.UnregisterCallback<FocusOutEvent>(OnFocusOutEvent, TrickleDown.TrickleDown);
-            s_Viewport.textEditor.UnregisterCallback<ChangeEvent<string>>(OnTextChanged);
-            s_Viewport.editorLayer.AddToClassList(BuilderConstants.HiddenStyleClassName);
-            s_EditedTextElement.UnregisterCallback<GeometryChangedEvent>(OnTextElementGeometryChanged);
-            s_Viewport = null;
-            s_EditedElement = null;
-            s_EditedTextAttribute = null;
-        }
-
-        static void OnTextChanged(ChangeEvent<string> evt)
-        {
-            s_EditedElement.SetValueByReflection(s_EditedTextAttribute.name, string.IsNullOrEmpty(evt.newValue) ? s_DummyText : evt.newValue);
-        }
-
-        static void OnFocusOutEvent(FocusOutEvent evt)
-        {
-            OnEditTextFinished();
-        }
-
-        static void OnEditTextFinished()
-        {
-            if (s_EditedElement == null)
-                return;
-
-            // Undo/Redo
-            Undo.RegisterCompleteObjectUndo(s_Viewport.paneWindow.document.visualTreeAsset, BuilderConstants.ChangeAttributeValueUndoMessage);
-
-            var newValue = s_Viewport.textEditor.value;
-            var type = s_EditedElement.GetType();
-            var vea = s_EditedElement.GetVisualElementAsset();
-            var oldValue = vea.GetAttributeValue(s_EditedTextAttribute.name);
-
-            if (newValue != oldValue)
-            {
-                // Set value in asset.
-                vea.SetAttribute(s_EditedTextAttribute.name, newValue);
-
-                var fullTypeName = type.ToString();
-
-                if (VisualElementFactoryRegistry.TryGetValue(fullTypeName, out var factoryList))
-                {
-                    var traits = factoryList[0].GetTraits();
-
-                    if (traits == null)
-                    {
-                        CloseEditor();
-                        return;
-                    }
-
-                    var context = new CreationContext();
-
-                    try
-                    {
-                        traits.Init(s_EditedElement, vea, context);
-                    }
-                    catch
-                    {
-                        // HACK: This throws in 2019.3.0a4 because usageHints property throws when set after the element has already been added to the panel.
-                    }
-                }
-
-                s_Viewport.selection.NotifyOfHierarchyChange(s_Viewport);
-            }
-            CloseEditor();
-        }
-    }
-}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/SampleDocument/BuilderAttributesTestElement.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/SampleDocument/BuilderAttributesTestElement.cs
deleted file mode 100644
index 5421fc7ba7..0000000000
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/SampleDocument/BuilderAttributesTestElement.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEditor.UIElements;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace Unity.UI.Builder
-{
-    internal class BuilderAttributesTestElement : VisualElement
-    {
-        public enum Existance
-        {
-            None,
-            Good,
-            Bad
-        }
-
-        public new class UxmlFactory : UxmlFactory<BuilderAttributesTestElement, UxmlTraits> { }
-
-        public new class UxmlTraits : VisualElement.UxmlTraits
-        {
-            UxmlStringAttributeDescription m_String = new UxmlStringAttributeDescription { name = "string-attr", defaultValue = "default_value" };
-            UxmlFloatAttributeDescription m_Float = new UxmlFloatAttributeDescription { name = "float-attr", defaultValue = 0.1f };
-            UxmlDoubleAttributeDescription m_Double = new UxmlDoubleAttributeDescription { name = "double-attr", defaultValue = 0.1 };
-            UxmlIntAttributeDescription m_Int = new UxmlIntAttributeDescription { name = "int-attr", defaultValue = 2 };
-            UxmlLongAttributeDescription m_Long = new UxmlLongAttributeDescription { name = "long-attr", defaultValue = 3 };
-            UxmlBoolAttributeDescription m_Bool = new UxmlBoolAttributeDescription { name = "bool-attr", defaultValue = false };
-            UxmlColorAttributeDescription m_Color = new UxmlColorAttributeDescription { name = "color-attr", defaultValue = Color.red };
-            UxmlEnumAttributeDescription<Existance> m_Enum = new UxmlEnumAttributeDescription<Existance> { name = "enum-attr", defaultValue = Existance.Bad };
-
-            public override IEnumerable<UxmlChildElementDescription> uxmlChildElementsDescription
-            {
-                get { yield break; }
-            }
-
-            public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
-            {
-                base.Init(ve, bag, cc);
-                var ate = ve as BuilderAttributesTestElement;
-
-                ate.Clear();
-
-                ate.stringAttr = m_String.GetValueFromBag(bag, cc);
-                ate.Add(new TextField("String") { value = ate.stringAttr });
-
-                ate.floatAttr = m_Float.GetValueFromBag(bag, cc);
-                ate.Add(new FloatField("Float") { value = ate.floatAttr });
-
-                ate.doubleAttr = m_Double.GetValueFromBag(bag, cc);
-                ate.Add(new DoubleField("Double") { value = ate.doubleAttr });
-
-                ate.intAttr = m_Int.GetValueFromBag(bag, cc);
-                ate.Add(new IntegerField("Integer") { value = ate.intAttr });
-
-                ate.longAttr = m_Long.GetValueFromBag(bag, cc);
-                ate.Add(new LongField("Long") { value = ate.longAttr });
-
-                ate.boolAttr = m_Bool.GetValueFromBag(bag, cc);
-                ate.Add(new Toggle("Toggle") { value = ate.boolAttr });
-
-                ate.colorAttr = m_Color.GetValueFromBag(bag, cc);
-                ate.Add(new ColorField("Color") { value = ate.colorAttr });
-
-                ate.enumAttr = m_Enum.GetValueFromBag(bag, cc);
-                var en = new EnumField("Enum");
-                en.Init(m_Enum.defaultValue);
-                en.value = ate.enumAttr;
-                ate.Add(en);
-            }
-        }
-
-        public string stringAttr { get; set; }
-        public float floatAttr { get; set; }
-        public double doubleAttr { get; set; }
-        public int intAttr { get; set; }
-        public long longAttr { get; set; }
-        public bool boolAttr { get; set; }
-        public Color colorAttr { get; set; }
-        public Existance enumAttr { get; set; }
-    }
-}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionPropertyDropdownContent.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionPropertyDropdownContent.cs
deleted file mode 100644
index ece2d791a4..0000000000
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionPropertyDropdownContent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Unity.UI.Builder
-{
-    static class TransitionPropertyDropdownContent
-    {
-        public static CategoryDropdownContent Content;
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/BaselineFunction.cs b/External/Yoga/csharp/Facebook.Yoga/BaselineFunction.cs
deleted file mode 100644
index 15ac81abdd..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/BaselineFunction.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal delegate float BaselineFunction(YogaNode node, float width, float height);
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/Logger.cs b/External/Yoga/csharp/Facebook.Yoga/Logger.cs
deleted file mode 100644
index 24691f74d0..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/Logger.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal delegate void Logger(
-        YogaConfig config,
-        YogaNode node,
-        YogaLogLevel level,
-        string message);
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/MeasureFunction.cs b/External/Yoga/csharp/Facebook.Yoga/MeasureFunction.cs
deleted file mode 100644
index c31fdbc6e6..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/MeasureFunction.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal delegate YogaSize MeasureFunction(
-        YogaNode node,
-        float width,
-        YogaMeasureMode widthMode,
-        float height,
-        YogaMeasureMode heightMode);
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/MeasureOutput.cs b/External/Yoga/csharp/Facebook.Yoga/MeasureOutput.cs
deleted file mode 100644
index 47efd12042..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/MeasureOutput.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal class MeasureOutput
-    {
-        public static YogaSize Make(float width, float height)
-        {
-            return new YogaSize { width = width, height = height};
-        }
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YGConfigHandle.cs b/External/Yoga/csharp/Facebook.Yoga/YGConfigHandle.cs
deleted file mode 100644
index 77870be7c1..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YGConfigHandle.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace UnityEngine.Yoga
-{
-// BEGIN_UNITY @jonathanma Remove usage of YGConfigHandle (less allocation)
-//END_UNITY
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YGNodeHandle.cs b/External/Yoga/csharp/Facebook.Yoga/YGNodeHandle.cs
deleted file mode 100644
index 120738a7e1..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YGNodeHandle.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace UnityEngine.Yoga
-{
-    // BEGIN_UNITY @jonathanma Remove usage of YGNodeHandle (less allocation)
-// END_UNITY
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaAlign.cs b/External/Yoga/csharp/Facebook.Yoga/YogaAlign.cs
deleted file mode 100644
index c242f75bad..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaAlign.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaAlign
-    {
-        Auto,
-        FlexStart,
-        Center,
-        FlexEnd,
-        Stretch,
-        Baseline,
-        SpaceBetween,
-        SpaceAround,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaBaselineFunc.cs b/External/Yoga/csharp/Facebook.Yoga/YogaBaselineFunc.cs
deleted file mode 100644
index 0199019d0a..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaBaselineFunc.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace UnityEngine.Yoga
-{
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    internal delegate float YogaBaselineFunc(IntPtr unmanagedNodePtr, float width, float height);
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaConfig.cs b/External/Yoga/csharp/Facebook.Yoga/YogaConfig.cs
deleted file mode 100644
index 3b422c563f..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaConfig.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System;
-using System.Runtime.InteropServices;
-
-
-// BEGIN_UNITY @jonathanma 
-// The facebook implementation use the YGConfig context to keep a mapping between the native and managed object.
-// However, since we don't really use YogaConfig this has been removed to avoid pinning the object.
-// END_UNITY
-namespace UnityEngine.Yoga
-{
-    internal class YogaConfig
-    {
-        internal static readonly YogaConfig Default = new YogaConfig(Native.YGConfigGetDefault());
-
-        private IntPtr _ygConfig;
-        private Logger _logger;
-
-        private YogaConfig(IntPtr ygConfig)
-        {
-            _ygConfig = ygConfig;
-            if (_ygConfig == IntPtr.Zero)
-            {
-                throw new InvalidOperationException("Failed to allocate native memory");
-            }
-
-            // BEGIN_UNITY @jonathanma RemoveContext
-            //_ygConfig.SetContext(this);
-            // END_UNITY
-
-            // BEGIN_UNITY @jonathanma DisableLogger
-            //if (_ygConfig == YGConfigHandle.Default)
-            //{
-                //_managedLogger = LoggerInternal;
-                //Native.YGInteropSetLogger(_managedLogger);
-            //}
-            // END_UNITY
-        }
-
-        public YogaConfig()
-          : this(Native.YGConfigNew())
-        {
-        }
-
-        ~YogaConfig()
-        {
-            if (this.Handle != Default.Handle)
-            {
-                Native.YGConfigFree(this.Handle);
-            }
-        }
-
-        internal IntPtr Handle
-        {
-            get {
-                return _ygConfig;
-            }
-        }
-
-    // BEGIN_UNITY @jonathanma Do not support C# logger
-    // END_UNITY
-
-    public Logger Logger
-        {
-            get {
-                return _logger;
-            }
-
-            set {
-                _logger = value;
-            }
-        }
-
-        public void SetExperimentalFeatureEnabled(
-            YogaExperimentalFeature feature,
-            bool enabled)
-        {
-            Native.YGConfigSetExperimentalFeatureEnabled(_ygConfig, feature, enabled);
-        }
-
-        public bool IsExperimentalFeatureEnabled(YogaExperimentalFeature feature)
-        {
-            return Native.YGConfigIsExperimentalFeatureEnabled(_ygConfig, feature);
-        }
-
-        public bool UseWebDefaults
-        {
-            get
-            {
-                return Native.YGConfigGetUseWebDefaults(_ygConfig);
-            }
-
-            set
-            {
-                Native.YGConfigSetUseWebDefaults(_ygConfig, value);
-            }
-        }
-
-        public float PointScaleFactor
-        {
-            get
-            {
-                return Native.YGConfigGetPointScaleFactor(_ygConfig);
-            }
-            set
-            {
-                Native.YGConfigSetPointScaleFactor(_ygConfig, value);
-            }
-        }
-
-        public static int GetInstanceCount()
-        {
-            return Native.YGConfigGetInstanceCount();
-        }
-
-        public static void SetDefaultLogger(Logger logger)
-        {
-            Default.Logger = logger;
-        }
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaConstants.cs b/External/Yoga/csharp/Facebook.Yoga/YogaConstants.cs
deleted file mode 100644
index 3cce0c4c30..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaConstants.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal static class YogaConstants
-    {
-        public const float Undefined = float.NaN;
-
-        public static bool IsUndefined(float value)
-        {
-            return float.IsNaN(value);
-        }
-
-        public static bool IsUndefined(YogaValue value)
-        {
-            return value.Unit == YogaUnit.Undefined;
-        }
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaDimension.cs b/External/Yoga/csharp/Facebook.Yoga/YogaDimension.cs
deleted file mode 100644
index 3f74ee613d..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaDimension.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaDimension
-    {
-        Width,
-        Height,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaDirection.cs b/External/Yoga/csharp/Facebook.Yoga/YogaDirection.cs
deleted file mode 100644
index 258bbdb9be..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaDirection.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaDirection
-    {
-        Inherit,
-        LTR,
-        RTL,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaDisplay.cs b/External/Yoga/csharp/Facebook.Yoga/YogaDisplay.cs
deleted file mode 100644
index 5f5787322b..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaDisplay.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaDisplay
-    {
-        Flex,
-        None,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaEdge.cs b/External/Yoga/csharp/Facebook.Yoga/YogaEdge.cs
deleted file mode 100644
index 4098b06253..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaEdge.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaEdge
-    {
-        Left,
-        Top,
-        Right,
-        Bottom,
-        Start,
-        End,
-        Horizontal,
-        Vertical,
-        All,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaExperimentalFeature.cs b/External/Yoga/csharp/Facebook.Yoga/YogaExperimentalFeature.cs
deleted file mode 100644
index 45faffcfa4..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaExperimentalFeature.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaExperimentalFeature
-    {
-        WebFlexBasis,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaFlexDirection.cs b/External/Yoga/csharp/Facebook.Yoga/YogaFlexDirection.cs
deleted file mode 100644
index 5a52d849b4..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaFlexDirection.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaFlexDirection
-    {
-        Column,
-        ColumnReverse,
-        Row,
-        RowReverse,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaJustify.cs b/External/Yoga/csharp/Facebook.Yoga/YogaJustify.cs
deleted file mode 100644
index bd47854655..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaJustify.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaJustify
-    {
-        FlexStart,
-        Center,
-        FlexEnd,
-        SpaceBetween,
-        SpaceAround,
-        SpaceEvenly
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaLogLevel.cs b/External/Yoga/csharp/Facebook.Yoga/YogaLogLevel.cs
deleted file mode 100644
index c66dc9a66f..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaLogLevel.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaLogLevel
-    {
-        Error,
-        Warn,
-        Info,
-        Debug,
-        Verbose,
-        Fatal,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaLogger.cs b/External/Yoga/csharp/Facebook.Yoga/YogaLogger.cs
deleted file mode 100644
index d2047d327e..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaLogger.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace UnityEngine.Yoga
-{
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    internal delegate void YogaLogger(
-        IntPtr unmanagedConfigPtr,
-        IntPtr unmanagedNotePtr,
-        YogaLogLevel level,
-        string message);
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaMeasureFunc.cs b/External/Yoga/csharp/Facebook.Yoga/YogaMeasureFunc.cs
deleted file mode 100644
index 1f8ca502e7..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaMeasureFunc.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace UnityEngine.Yoga
-{
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    internal delegate YogaSize YogaMeasureFunc(
-        IntPtr unmanagedNodePtr,
-        float width,
-        YogaMeasureMode widthMode,
-        float height,
-        YogaMeasureMode heightMode);
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaMeasureMode.cs b/External/Yoga/csharp/Facebook.Yoga/YogaMeasureMode.cs
deleted file mode 100644
index 6fc6677776..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaMeasureMode.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaMeasureMode
-    {
-        Undefined,
-        Exactly,
-        AtMost,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaNative.bindings.cs b/External/Yoga/csharp/Facebook.Yoga/YogaNative.bindings.cs
deleted file mode 100644
index ae4e01cd99..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaNative.bindings.cs
+++ /dev/null
@@ -1,411 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-// BEGIN_UNITY @jonathanma This file is heavily modified to use Unity bindings system 
-
-using System;
-using UnityEngine.Scripting;
-using UnityEngine.Bindings;
-
-namespace UnityEngine.Yoga
-{
-    using YogaValueType = YogaValue;
-
-    [NativeHeader("ModuleOverrides/com.unity.ui/Core/Native/YogaNative.bindings.h")]
-    internal static partial class Native
-    {
-        // We don't support setting custom C# logger (only use a default one in native code).
-        //[FreeFunction]
-        //public static extern void YGInteropSetLogger(YogaLogger logger);
-
-        [FreeFunction]
-        static extern IntPtr YGNodeNew();
-
-        [FreeFunction]
-        public static extern IntPtr YGNodeNewWithConfig(IntPtr config);
-
-        public static void YGNodeFree(IntPtr ygNode)
-        {
-            if (ygNode == IntPtr.Zero)
-                return;
-
-            YGNodeFreeInternal(ygNode);
-        }
-
-        [FreeFunction(Name = "YGNodeFree", IsThreadSafe = true)]
-        private static extern void YGNodeFreeInternal(IntPtr ygNode);
-
-        [FreeFunction]
-        public static extern void YGNodeReset(IntPtr node);
-
-        // BEGIN_UNITY @jonathanma Added this function to store a reference in native code to the managed object
-        // This is used by callback functions.
-        [FreeFunction]
-        public static extern void YGSetManagedObject(IntPtr ygNode, YogaNode node);
-        // END_UNITY
-
-        [FreeFunction]
-        public static extern void YGNodeSetConfig(IntPtr ygNode, IntPtr config);
-
-        [FreeFunction(IsThreadSafe = true)]
-        public static extern IntPtr YGConfigGetDefault();
-
-        [FreeFunction]
-        public static extern IntPtr YGConfigNew();
-
-        public static void YGConfigFree(IntPtr config)
-        {
-            if (config == IntPtr.Zero)
-                return;
-
-            YGConfigFreeInternal(config);
-        }
-
-        [FreeFunction(Name = "YGConfigFree", IsThreadSafe = true)]
-        static extern void YGConfigFreeInternal(IntPtr config);
-
-        [FreeFunction]
-        public static extern int YGNodeGetInstanceCount();
-
-        [FreeFunction]
-        public static extern int YGConfigGetInstanceCount();
-
-        [FreeFunction]
-        public static extern void YGConfigSetExperimentalFeatureEnabled(
-            IntPtr config,
-            YogaExperimentalFeature feature,
-            bool enabled);
-
-        [FreeFunction]
-        public static extern bool YGConfigIsExperimentalFeatureEnabled(
-            IntPtr config,
-            YogaExperimentalFeature feature);
-
-        [FreeFunction]
-        public static extern void YGConfigSetUseWebDefaults(
-            IntPtr config,
-            bool useWebDefaults);
-
-        [FreeFunction]
-        public static extern bool YGConfigGetUseWebDefaults(IntPtr config);
-
-        [FreeFunction]
-        public static extern void YGConfigSetPointScaleFactor(
-            IntPtr config,
-            float pixelsInPoint);
-
-        [FreeFunction]
-        public static extern float YGConfigGetPointScaleFactor(
-            IntPtr config);
-
-        [FreeFunction]
-        public static extern void YGNodeInsertChild(
-            IntPtr node,
-            IntPtr child,
-            uint index);
-
-        [FreeFunction]
-        public static extern void YGNodeRemoveChild(IntPtr node, IntPtr child);
-
-        [FreeFunction]
-        public static extern void YGNodeCalculateLayout(
-            IntPtr node,
-            float availableWidth,
-            float availableHeight,
-            YogaDirection parentDirection);
-
-        [FreeFunction]
-        public static extern void YGNodeMarkDirty(IntPtr node);
-
-        [FreeFunction]
-        public static extern bool YGNodeIsDirty(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodePrint(IntPtr node, YogaPrintOptions options);
-
-        [FreeFunction]
-        public static extern void YGNodeCopyStyle(IntPtr dstNode, IntPtr srcNode);
-
-#region YG_NODE_PROPERTY
-
-        [FreeFunction(Name = "YogaCallback::SetMeasureFunc")]
-        public static extern void YGNodeSetMeasureFunc(IntPtr node);
-
-        [FreeFunction(Name = "YogaCallback::RemoveMeasureFunc")]
-        public static extern void YGNodeRemoveMeasureFunc(IntPtr node);
-
-        [RequiredByNativeCode]
-        unsafe public static void YGNodeMeasureInvoke(YogaNode node, float width, YogaMeasureMode widthMode, float height, YogaMeasureMode heightMode, IntPtr returnValueAddress)
-        {
-            (*(YogaSize*)returnValueAddress) = YogaNode.MeasureInternal(node, width, widthMode, height, heightMode);
-        }
-
-        [FreeFunction(Name = "YogaCallback::SetBaselineFunc")]
-        public static extern void YGNodeSetBaselineFunc(IntPtr node);
-
-        [FreeFunction(Name = "YogaCallback::RemoveBaselineFunc")]
-        public static extern void YGNodeRemoveBaselineFunc(IntPtr node);
-
-        [RequiredByNativeCode]
-        unsafe public static void YGNodeBaselineInvoke(YogaNode node, float width, float height, IntPtr returnValueAddress)
-        {
-            (*(float*)returnValueAddress) = YogaNode.BaselineInternal(node, width, height);
-        }
-
-        [FreeFunction]
-        public static extern void YGNodeSetHasNewLayout(IntPtr node, bool hasNewLayout);
-
-        [FreeFunction]
-        public static extern bool YGNodeGetHasNewLayout(IntPtr node);
-
-#endregion
-
-#region YG_NODE_STYLE_PROPERTY
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetDirection(IntPtr node, YogaDirection direction);
-
-        [FreeFunction]
-        public static extern YogaDirection YGNodeStyleGetDirection(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetFlexDirection(IntPtr node, YogaFlexDirection flexDirection);
-
-        [FreeFunction]
-        public static extern YogaFlexDirection YGNodeStyleGetFlexDirection(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetJustifyContent(IntPtr node, YogaJustify justifyContent);
-
-        [FreeFunction]
-        public static extern YogaJustify YGNodeStyleGetJustifyContent(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetAlignContent(IntPtr node, YogaAlign alignContent);
-
-        [FreeFunction]
-        public static extern YogaAlign YGNodeStyleGetAlignContent(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetAlignItems(IntPtr node, YogaAlign alignItems);
-
-        [FreeFunction]
-        public static extern YogaAlign YGNodeStyleGetAlignItems(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetAlignSelf(IntPtr node, YogaAlign alignSelf);
-
-        [FreeFunction]
-        public static extern YogaAlign YGNodeStyleGetAlignSelf(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetPositionType(IntPtr node, YogaPositionType positionType);
-
-        [FreeFunction]
-        public static extern YogaPositionType YGNodeStyleGetPositionType(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetFlexWrap(IntPtr node, YogaWrap flexWrap);
-
-        [FreeFunction]
-        public static extern YogaWrap YGNodeStyleGetFlexWrap(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetOverflow(IntPtr node, YogaOverflow flexWrap);
-
-        [FreeFunction]
-        public static extern YogaOverflow YGNodeStyleGetOverflow(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetDisplay(IntPtr node, YogaDisplay display);
-
-        [FreeFunction]
-        public static extern YogaDisplay YGNodeStyleGetDisplay(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetFlex(IntPtr node, float flex);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetFlexGrow(IntPtr node, float flexGrow);
-
-        [FreeFunction]
-        public static extern float YGNodeStyleGetFlexGrow(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetFlexShrink(IntPtr node, float flexShrink);
-
-        [FreeFunction]
-        public static extern float YGNodeStyleGetFlexShrink(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetFlexBasis(IntPtr node, float flexBasis);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetFlexBasisPercent(IntPtr node, float flexBasis);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetFlexBasisAuto(IntPtr node);
-
-        [FreeFunction]
-        public static extern YogaValueType YGNodeStyleGetFlexBasis(IntPtr node);
-
-        [FreeFunction]
-        public static extern float YGNodeGetComputedFlexBasis(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetWidth(IntPtr node, float width);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetWidthPercent(IntPtr node, float width);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetWidthAuto(IntPtr node);
-
-        [FreeFunction]
-        public static extern YogaValueType YGNodeStyleGetWidth(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetHeight(IntPtr node, float height);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetHeightPercent(IntPtr node, float height);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetHeightAuto(IntPtr node);
-
-        [FreeFunction]
-        public static extern YogaValueType YGNodeStyleGetHeight(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetMinWidth(IntPtr node, float minWidth);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetMinWidthPercent(IntPtr node, float minWidth);
-
-        [FreeFunction]
-        public static extern YogaValueType YGNodeStyleGetMinWidth(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetMinHeight(IntPtr node, float minHeight);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetMinHeightPercent(IntPtr node, float minHeight);
-
-        [FreeFunction]
-        public static extern YogaValueType YGNodeStyleGetMinHeight(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetMaxWidth(IntPtr node, float maxWidth);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetMaxWidthPercent(IntPtr node, float maxWidth);
-
-        [FreeFunction]
-        public static extern YogaValueType YGNodeStyleGetMaxWidth(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetMaxHeight(IntPtr node, float maxHeight);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetMaxHeightPercent(IntPtr node, float maxHeight);
-
-        [FreeFunction]
-        public static extern YogaValueType YGNodeStyleGetMaxHeight(IntPtr node);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetAspectRatio(IntPtr node, float aspectRatio);
-
-        [FreeFunction]
-        public static extern float YGNodeStyleGetAspectRatio(IntPtr node);
-
-#endregion
-
-#region YG_NODE_STYLE_EDGE_PROPERTY
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetPosition(IntPtr node, YogaEdge edge, float position);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetPositionPercent(IntPtr node, YogaEdge edge, float position);
-
-        [FreeFunction]
-        public static extern YogaValueType YGNodeStyleGetPosition(IntPtr node, YogaEdge edge);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetMargin(IntPtr node, YogaEdge edge, float margin);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetMarginPercent(IntPtr node, YogaEdge edge, float margin);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetMarginAuto(IntPtr node, YogaEdge edge);
-
-        [FreeFunction]
-        public static extern YogaValueType YGNodeStyleGetMargin(IntPtr node, YogaEdge edge);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetPadding(IntPtr node, YogaEdge edge, float padding);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetPaddingPercent(IntPtr node, YogaEdge edge, float padding);
-
-        [FreeFunction]
-        public static extern YogaValueType YGNodeStyleGetPadding(IntPtr node, YogaEdge edge);
-
-        [FreeFunction]
-        public static extern void YGNodeStyleSetBorder(IntPtr node, YogaEdge edge, float border);
-
-        [FreeFunction]
-        public static extern float YGNodeStyleGetBorder(IntPtr node, YogaEdge edge);
-
-#endregion
-
-#region YG_NODE_LAYOUT_PROPERTY
-
-        [FreeFunction]
-        public static extern float YGNodeLayoutGetLeft(IntPtr node);
-
-        [FreeFunction]
-        public static extern float YGNodeLayoutGetTop(IntPtr node);
-
-        [FreeFunction]
-        public static extern float YGNodeLayoutGetRight(IntPtr node);
-
-        [FreeFunction]
-        public static extern float YGNodeLayoutGetBottom(IntPtr node);
-
-        [FreeFunction]
-        public static extern float YGNodeLayoutGetWidth(IntPtr node);
-
-        [FreeFunction]
-        public static extern float YGNodeLayoutGetHeight(IntPtr node);
-
-        [FreeFunction]
-        public static extern float YGNodeLayoutGetMargin(IntPtr node, YogaEdge edge);
-
-        [FreeFunction]
-        public static extern float YGNodeLayoutGetPadding(IntPtr node, YogaEdge edge);
-
-        [FreeFunction]
-        public static extern float YGNodeLayoutGetBorder(IntPtr node, YogaEdge edge);
-
-        [FreeFunction]
-        public static extern YogaDirection YGNodeLayoutGetDirection(IntPtr node);
-
-        #endregion
-
-        #region Context
-
-// BEGIN_UNITY @jonathanma Remove YGNode and YGConfig context to avoid pinning GC objects
-// END_UNITY
-
-#endregion
-    }
-}
-// END_UNITY
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaNode.Spacing.cs b/External/Yoga/csharp/Facebook.Yoga/YogaNode.Spacing.cs
deleted file mode 100644
index ef72e56b2f..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaNode.Spacing.cs
+++ /dev/null
@@ -1,593 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal partial class YogaNode
-    {
-        public YogaValue Left
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Left));
-            }
-
-            set
-            {
-                SetStylePosition(YogaEdge.Left, value);
-            }
-        }
-
-        public YogaValue Top
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Top));
-            }
-
-            set
-            {
-                SetStylePosition(YogaEdge.Top, value);
-            }
-        }
-
-        public YogaValue Right
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Right));
-            }
-
-            set
-            {
-                SetStylePosition(YogaEdge.Right, value);
-            }
-        }
-
-        public YogaValue Bottom
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Bottom));
-            }
-
-            set
-            {
-                SetStylePosition(YogaEdge.Bottom, value);
-            }
-        }
-
-        public YogaValue Start
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Start));
-            }
-
-            set
-            {
-                SetStylePosition(YogaEdge.Start, value);
-            }
-        }
-
-        public YogaValue End
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.End));
-            }
-
-            set
-            {
-                SetStylePosition(YogaEdge.End, value);
-            }
-        }
-
-        private void SetStylePosition(YogaEdge edge, YogaValue value)
-        {
-            if (value.Unit == YogaUnit.Percent)
-            {
-                Native.YGNodeStyleSetPositionPercent(_ygNode, edge, value.Value);
-            }
-            else
-            {
-                Native.YGNodeStyleSetPosition(_ygNode, edge, value.Value);
-            }
-        }
-
-        public YogaValue MarginLeft
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Left));
-            }
-
-            set
-            {
-                SetStyleMargin(YogaEdge.Left, value);
-            }
-        }
-
-        public YogaValue MarginTop
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Top));
-            }
-
-            set
-            {
-                SetStyleMargin(YogaEdge.Top, value);
-            }
-        }
-
-        public YogaValue MarginRight
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Right));
-            }
-
-            set
-            {
-                SetStyleMargin(YogaEdge.Right, value);
-            }
-        }
-
-        public YogaValue MarginBottom
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Bottom));
-            }
-
-            set
-            {
-                SetStyleMargin(YogaEdge.Bottom, value);
-            }
-        }
-
-        public YogaValue MarginStart
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Start));
-            }
-
-            set
-            {
-                SetStyleMargin(YogaEdge.Start, value);
-            }
-        }
-
-        public YogaValue MarginEnd
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.End));
-            }
-
-            set
-            {
-                SetStyleMargin(YogaEdge.End, value);
-            }
-        }
-
-        public YogaValue MarginHorizontal
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Horizontal));
-            }
-
-            set
-            {
-                SetStyleMargin(YogaEdge.Horizontal, value);
-            }
-        }
-
-        public YogaValue MarginVertical
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Vertical));
-            }
-
-            set
-            {
-                SetStyleMargin(YogaEdge.Vertical, value);
-            }
-        }
-
-        public YogaValue Margin
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.All));
-            }
-
-            set
-            {
-                SetStyleMargin(YogaEdge.All, value);
-            }
-        }
-
-        private void SetStyleMargin(YogaEdge edge, YogaValue value)
-        {
-            if (value.Unit == YogaUnit.Percent)
-            {
-                Native.YGNodeStyleSetMarginPercent(_ygNode, edge, value.Value);
-            }
-            else if (value.Unit == YogaUnit.Auto)
-            {
-                Native.YGNodeStyleSetMarginAuto(_ygNode, edge);
-            }
-            else
-            {
-                Native.YGNodeStyleSetMargin(_ygNode, edge, value.Value);
-            }
-        }
-
-        public YogaValue PaddingLeft
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Left));
-            }
-
-            set
-            {
-                SetStylePadding(YogaEdge.Left, value);
-            }
-        }
-
-        public YogaValue PaddingTop
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Top));
-            }
-
-            set
-            {
-                SetStylePadding(YogaEdge.Top, value);
-            }
-        }
-
-        public YogaValue PaddingRight
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Right));
-            }
-
-            set
-            {
-                SetStylePadding(YogaEdge.Right, value);
-            }
-        }
-
-        public YogaValue PaddingBottom
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Bottom));
-            }
-
-            set
-            {
-                SetStylePadding(YogaEdge.Bottom, value);
-            }
-        }
-
-        public YogaValue PaddingStart
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Start));
-            }
-
-            set
-            {
-                SetStylePadding(YogaEdge.Start, value);
-            }
-        }
-
-        public YogaValue PaddingEnd
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.End));
-            }
-
-            set
-            {
-                SetStylePadding(YogaEdge.End, value);
-            }
-        }
-
-        public YogaValue PaddingHorizontal
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Horizontal));
-            }
-
-            set
-            {
-                SetStylePadding(YogaEdge.Horizontal, value);
-            }
-        }
-
-        public YogaValue PaddingVertical
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Vertical));
-            }
-
-            set
-            {
-                SetStylePadding(YogaEdge.Vertical, value);
-            }
-        }
-
-        public YogaValue Padding
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.All));
-            }
-
-            set
-            {
-                SetStylePadding(YogaEdge.All, value);
-            }
-        }
-
-        private void SetStylePadding(YogaEdge edge, YogaValue value)
-        {
-            if (value.Unit == YogaUnit.Percent)
-            {
-                Native.YGNodeStyleSetPaddingPercent(_ygNode, edge, value.Value);
-            }
-            else
-            {
-                Native.YGNodeStyleSetPadding(_ygNode, edge, value.Value);
-            }
-        }
-
-        public float BorderLeftWidth
-        {
-            get
-            {
-                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Left);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Left, value);
-            }
-        }
-
-        public float BorderTopWidth
-        {
-            get
-            {
-                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Top);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Top, value);
-            }
-        }
-
-        public float BorderRightWidth
-        {
-            get
-            {
-                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Right);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Right, value);
-            }
-        }
-
-        public float BorderBottomWidth
-        {
-            get
-            {
-                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Bottom);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Bottom, value);
-            }
-        }
-
-        public float BorderStartWidth
-        {
-            get
-            {
-                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Start);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Start, value);
-            }
-        }
-
-        public float BorderEndWidth
-        {
-            get
-            {
-                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.End);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.End, value);
-            }
-        }
-
-        public float BorderWidth
-        {
-            get
-            {
-                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.All);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.All, value);
-            }
-        }
-
-        public float LayoutMarginLeft
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Left);
-            }
-        }
-
-        public float LayoutMarginTop
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Top);
-            }
-        }
-
-        public float LayoutMarginRight
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Right);
-            }
-        }
-
-        public float LayoutMarginBottom
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Bottom);
-            }
-        }
-
-        public float LayoutMarginStart
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Start);
-            }
-        }
-
-        public float LayoutMarginEnd
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.End);
-            }
-        }
-
-        public float LayoutPaddingLeft
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Left);
-            }
-        }
-
-        public float LayoutPaddingTop
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Top);
-            }
-        }
-
-        public float LayoutPaddingRight
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Right);
-            }
-        }
-
-        public float LayoutPaddingBottom
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Bottom);
-            }
-        }
-
-        public float LayoutBorderLeft
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetBorder(_ygNode, YogaEdge.Left);
-            }
-        }
-
-        public float LayoutBorderTop
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetBorder(_ygNode, YogaEdge.Top);
-            }
-        }
-
-        public float LayoutBorderRight
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetBorder(_ygNode, YogaEdge.Right);
-            }
-        }
-
-        public float LayoutBorderBottom
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetBorder(_ygNode, YogaEdge.Bottom);
-            }
-        }
-
-        public float LayoutPaddingStart
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Start);
-            }
-        }
-
-        public float LayoutPaddingEnd
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.End);
-            }
-        }
-
-        public float ComputedFlexBasis
-        {
-            get
-            {
-                return Native.YGNodeGetComputedFlexBasis(_ygNode);
-            }
-        }
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaNode.cs b/External/Yoga/csharp/Facebook.Yoga/YogaNode.cs
deleted file mode 100644
index 690eabf5d9..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaNode.cs
+++ /dev/null
@@ -1,733 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
-
-
-// BEGIN_UNITY @jonathanma 
-// This file is modified to set a managed object reference on the native side when a callback is set on a node.
-// The facebook implementation use the YGNode context to create a mapping between IntPtr and managed objects (YGNodeHandle SetContext and GetManaged). 
-// However, this require pinning the managed objects in the GC and since there might be quite a few
-// nodes alive at the same time we avoid that and use a weak GC handle in the native code instead.
-// END_UNITY
-namespace UnityEngine.Yoga
-{
-    internal partial class YogaNode : IEnumerable<YogaNode>
-    {
-        // BEGIN_UNITY @jonathanma _ygNode needs to be accessible on UWP (see YogaNodeIntPtrMarshaler)
-        //private readonly IntPtr _ygNode;
-        internal IntPtr _ygNode;
-        // END_UNITY
-        private YogaConfig _config; //@mathieum not readonly anymore
-        private WeakReference _parent;
-        private List<YogaNode> _children;
-        private MeasureFunction _measureFunction;
-        private BaselineFunction _baselineFunction;
-        private object _data;
-
-        public YogaNode(YogaConfig config = null)
-        {
-            _config = config == null ? YogaConfig.Default : config;
-            _ygNode = Native.YGNodeNewWithConfig(_config.Handle);
-            if (_ygNode == IntPtr.Zero)
-            {
-                throw new InvalidOperationException("Failed to allocate native memory");
-            }
-        }
-
-        public YogaNode(YogaNode srcNode)
-            : this(srcNode._config)
-        {
-            CopyStyle(srcNode);
-        }
-
-        ~YogaNode()
-        {
-            Native.YGNodeFree(_ygNode);
-        }
-
-        public void Reset()
-        {
-            _measureFunction = null;
-            _baselineFunction = null;
-            _data = null;
-
-// BEGIN_UNITY @jonathanma Remove Context usage and YGNodeHandle, native YGNode has a reference of the managed object
-            //_ygNode.ReleaseManaged();
-            Native.YGSetManagedObject(_ygNode, null);
-            Native.YGNodeReset(_ygNode);
-            //_ygNode.SetContext(this);
-// END_UNITY
-        }
-
-// BEGIN_UNITY @mathieum Needed for dpi awareness
-        internal YogaConfig Config
-        {
-            get { return _config; }
-            set
-            {
-                _config = value ?? YogaConfig.Default;
-                Native.YGNodeSetConfig(_ygNode, _config.Handle);
-                
-            }
-        }
-// END_UNITY
-
-        public bool IsDirty
-        {
-            get
-            {
-                return Native.YGNodeIsDirty(_ygNode);
-            }
-        }
-
-        public virtual void MarkDirty()
-        {
-            Native.YGNodeMarkDirty(_ygNode);
-        }
-
-        public bool HasNewLayout
-        {
-            get
-            {
-                return Native.YGNodeGetHasNewLayout(_ygNode);
-            }
-        }
-
-        public void MarkHasNewLayout()
-        {
-            Native.YGNodeSetHasNewLayout(_ygNode, true);
-        }
-
-        public YogaNode Parent
-        {
-            get
-            {
-                return _parent != null ? _parent.Target as YogaNode : null;
-            }
-        }
-
-        public bool IsMeasureDefined
-        {
-            get
-            {
-                return _measureFunction != null;
-            }
-        }
-
-        public bool IsBaselineDefined
-        {
-            get
-            {
-                return _baselineFunction != null;
-            }
-        }
-
-        public void CopyStyle(YogaNode srcNode)
-        {
-            Native.YGNodeCopyStyle(_ygNode, srcNode._ygNode);
-        }
-
-        public YogaDirection StyleDirection
-        {
-            get
-            {
-                return Native.YGNodeStyleGetDirection(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetDirection(_ygNode, value);
-            }
-        }
-
-        public YogaFlexDirection FlexDirection
-        {
-            get
-            {
-                return Native.YGNodeStyleGetFlexDirection(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetFlexDirection(_ygNode, value);
-            }
-        }
-
-        public YogaJustify JustifyContent
-        {
-            get
-            {
-                return Native.YGNodeStyleGetJustifyContent(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetJustifyContent(_ygNode, value);
-            }
-        }
-
-        public YogaDisplay Display
-        {
-            get
-            {
-                return Native.YGNodeStyleGetDisplay(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetDisplay(_ygNode, value);
-            }
-        }
-
-        public YogaAlign AlignItems
-        {
-            get
-            {
-                return Native.YGNodeStyleGetAlignItems(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetAlignItems(_ygNode, value);
-            }
-        }
-
-        public YogaAlign AlignSelf
-        {
-            get
-            {
-                return Native.YGNodeStyleGetAlignSelf(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetAlignSelf(_ygNode, value);
-            }
-        }
-
-        public YogaAlign AlignContent
-        {
-            get
-            {
-                return Native.YGNodeStyleGetAlignContent(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetAlignContent(_ygNode, value);
-            }
-        }
-
-        public YogaPositionType PositionType
-        {
-            get
-            {
-                return Native.YGNodeStyleGetPositionType(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetPositionType(_ygNode, value);
-            }
-        }
-
-        public YogaWrap Wrap
-        {
-            get
-            {
-                return Native.YGNodeStyleGetFlexWrap(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetFlexWrap(_ygNode, value);
-            }
-        }
-
-        public float Flex
-        {
-            set
-            {
-                Native.YGNodeStyleSetFlex(_ygNode, value);
-            }
-        }
-
-        public float FlexGrow
-        {
-            get
-            {
-                return Native.YGNodeStyleGetFlexGrow(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetFlexGrow(_ygNode, value);
-            }
-        }
-
-        public float FlexShrink
-        {
-            get
-            {
-                return Native.YGNodeStyleGetFlexShrink(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetFlexShrink(_ygNode, value);
-            }
-        }
-
-        public YogaValue FlexBasis
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetFlexBasis(_ygNode));
-            }
-
-            set
-            {
-                if (value.Unit == YogaUnit.Percent)
-                {
-                    Native.YGNodeStyleSetFlexBasisPercent(_ygNode, value.Value);
-                }
-                else if (value.Unit == YogaUnit.Auto)
-                {
-                    Native.YGNodeStyleSetFlexBasisAuto(_ygNode);
-                }
-                else
-                {
-                    Native.YGNodeStyleSetFlexBasis(_ygNode, value.Value);
-                }
-            }
-        }
-
-        public YogaValue Width
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetWidth(_ygNode));
-            }
-
-            set
-            {
-                if (value.Unit == YogaUnit.Percent)
-                {
-                    Native.YGNodeStyleSetWidthPercent(_ygNode, value.Value);
-                }
-                else if (value.Unit == YogaUnit.Auto)
-                {
-                    Native.YGNodeStyleSetWidthAuto(_ygNode);
-                }
-                else
-                {
-                    Native.YGNodeStyleSetWidth(_ygNode, value.Value);
-                }
-            }
-        }
-
-        public YogaValue Height
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetHeight(_ygNode));
-            }
-
-            set
-            {
-                if (value.Unit == YogaUnit.Percent)
-                {
-                    Native.YGNodeStyleSetHeightPercent(_ygNode, value.Value);
-                }
-                else if (value.Unit == YogaUnit.Auto)
-                {
-                    Native.YGNodeStyleSetHeightAuto(_ygNode);
-                }
-                else
-                {
-                    Native.YGNodeStyleSetHeight(_ygNode, value.Value);
-                }
-            }
-        }
-
-        public YogaValue MaxWidth
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMaxWidth(_ygNode));
-            }
-
-            set
-            {
-                if (value.Unit == YogaUnit.Percent)
-                {
-                    Native.YGNodeStyleSetMaxWidthPercent(_ygNode, value.Value);
-                }
-                else
-                {
-                    Native.YGNodeStyleSetMaxWidth(_ygNode, value.Value);
-                }
-            }
-        }
-
-        public YogaValue MaxHeight
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMaxHeight(_ygNode));
-            }
-
-            set
-            {
-                if (value.Unit == YogaUnit.Percent)
-                {
-                    Native.YGNodeStyleSetMaxHeightPercent(_ygNode, value.Value);
-                }
-                else
-                {
-                    Native.YGNodeStyleSetMaxHeight(_ygNode, value.Value);
-                }
-            }
-        }
-
-        public YogaValue MinWidth
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMinWidth(_ygNode));
-            }
-
-            set
-            {
-                if (value.Unit == YogaUnit.Percent)
-                {
-                    Native.YGNodeStyleSetMinWidthPercent(_ygNode, value.Value);
-                }
-                else
-                {
-                    Native.YGNodeStyleSetMinWidth(_ygNode, value.Value);
-                }
-            }
-        }
-
-        public YogaValue MinHeight
-        {
-            get
-            {
-                return YogaValue.MarshalValue(Native.YGNodeStyleGetMinHeight(_ygNode));
-            }
-
-            set
-            {
-                if (value.Unit == YogaUnit.Percent)
-                {
-                    Native.YGNodeStyleSetMinHeightPercent(_ygNode, value.Value);
-                }
-                else
-                {
-                    Native.YGNodeStyleSetMinHeight(_ygNode, value.Value);
-                }
-            }
-        }
-
-        public float AspectRatio
-        {
-            get
-            {
-                return Native.YGNodeStyleGetAspectRatio(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetAspectRatio(_ygNode, value);
-            }
-        }
-
-        public float LayoutX
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetLeft(_ygNode);
-            }
-        }
-
-        public float LayoutY
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetTop(_ygNode);
-            }
-        }
-
-        public float LayoutRight
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetRight(_ygNode);
-            }
-        }
-
-        public float LayoutBottom
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetBottom(_ygNode);
-            }
-        }
-
-        public float LayoutWidth
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetWidth(_ygNode);
-            }
-        }
-
-        public float LayoutHeight
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetHeight(_ygNode);
-            }
-        }
-
-        public YogaDirection LayoutDirection
-        {
-            get
-            {
-                return Native.YGNodeLayoutGetDirection(_ygNode);
-            }
-        }
-
-        public YogaOverflow Overflow
-        {
-            get
-            {
-                return Native.YGNodeStyleGetOverflow(_ygNode);
-            }
-
-            set
-            {
-                Native.YGNodeStyleSetOverflow(_ygNode, value);
-            }
-        }
-
-        public object Data
-        {
-            get
-            {
-                return _data;
-            }
-
-            set
-            {
-                _data = value;
-            }
-        }
-
-        public YogaNode this[int index]
-        {
-            get
-            {
-                return _children[index];
-            }
-        }
-
-        public int Count
-        {
-            get
-            {
-                return _children != null ? _children.Count : 0;
-            }
-        }
-
-        public void MarkLayoutSeen()
-        {
-            Native.YGNodeSetHasNewLayout(_ygNode, false);
-        }
-
-        public bool ValuesEqual(float f1, float f2)
-        {
-            if (float.IsNaN(f1) || float.IsNaN(f2))
-            {
-                return float.IsNaN(f1) && float.IsNaN(f2);
-            }
-
-            return Math.Abs(f2 - f1) < float.Epsilon;
-        }
-
-        public void Insert(int index, YogaNode node)
-        {
-            if (_children == null)
-            {
-                _children = new List<YogaNode>(4);
-            }
-            _children.Insert(index, node);
-            node._parent = new WeakReference(this);
-            Native.YGNodeInsertChild(_ygNode, node._ygNode, (uint)index);
-        }
-
-        public void RemoveAt(int index)
-        {
-            var child = _children[index];
-            child._parent = null;
-            _children.RemoveAt(index);
-            Native.YGNodeRemoveChild(_ygNode, child._ygNode);
-        }
-
-        public void AddChild(YogaNode child)
-        {
-            Insert(Count, child);
-        }
-
-        public void RemoveChild(YogaNode child)
-        {
-            int index = IndexOf(child);
-            if (index >= 0)
-            {
-                RemoveAt(index);
-            }
-        }
-
-        public void Clear()
-        {
-            if (_children != null)
-            {
-                while (_children.Count > 0)
-                {
-                    RemoveAt(_children.Count-1);
-                }
-            }
-        }
-
-        public int IndexOf(YogaNode node)
-        {
-            return _children != null ? _children.IndexOf(node) : -1;
-        }
-
-        public void SetMeasureFunction(MeasureFunction measureFunction)
-        {
-            _measureFunction = measureFunction;
-            if (measureFunction == null)
-            {
-                if (!IsBaselineDefined)
-                {
-                   Native.YGSetManagedObject(_ygNode, null); 
-                }
-                Native.YGNodeRemoveMeasureFunc(_ygNode);
-            }
-            else
-            {
-                Native.YGSetManagedObject(_ygNode, this); 
-                Native.YGNodeSetMeasureFunc(_ygNode);
-            }
-        }
-
-        public void SetBaselineFunction(BaselineFunction baselineFunction)
-        {
-            _baselineFunction = baselineFunction;
-            if (baselineFunction == null)
-            {
-                if (!IsMeasureDefined)
-                {
-                   Native.YGSetManagedObject(_ygNode, null); 
-                }
-                Native.YGNodeRemoveBaselineFunc(_ygNode);
-            }
-            else
-            {
-                Native.YGSetManagedObject(_ygNode, this); 
-                Native.YGNodeSetBaselineFunc(_ygNode);
-            }
-        }
-
-        public void CalculateLayout(
-            float width = YogaConstants.Undefined, 
-            float height = YogaConstants.Undefined)
-        {
-            Native.YGNodeCalculateLayout(
-                _ygNode,
-                width,
-                height,
-                Native.YGNodeStyleGetDirection(_ygNode));
-        }
-// BEGIN_UNITY @jonathanma Required for Unity package
-//#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
-        //[MonoPInvokeCallback(typeof(YogaMeasureFunc))]
-//#endif
-       //private static YogaSize MeasureInternal(
-            //IntPtr unmanagedNodePtr,
-// END_UNITY
-        public static YogaSize MeasureInternal(
-            YogaNode node,
-            float width,
-            YogaMeasureMode widthMode,
-            float height,
-            YogaMeasureMode heightMode)
-        {
-            if (node == null || node._measureFunction == null)
-            {
-                throw new InvalidOperationException("Measure function is not defined.");
-            }
-            return node._measureFunction(node, width, widthMode, height, heightMode);
-        }
-
-        // BEGIN_UNITY @jonathanma Required for Unity package
-        //#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
-        //[MonoPInvokeCallback(typeof(YogaMeasureFunc))]
-        //#endif
-        //private static float BaselineInternal(
-            //IntPtr unmanagedNodePtr,
-        // END_UNITY
-        public static float BaselineInternal(
-            YogaNode node,
-            float width,
-            float height)
-        {
-            if (node == null || node._baselineFunction == null)
-            {
-                throw new InvalidOperationException("Baseline function is not defined.");
-            }
-            return node._baselineFunction(node, width, height);
-        }
-
-        public string Print(YogaPrintOptions options =
-            YogaPrintOptions.Layout|YogaPrintOptions.Style|YogaPrintOptions.Children)
-        {
-            StringBuilder sb = new StringBuilder();
-            Logger orig = _config.Logger;
-            _config.Logger = (config, node, level, message) => {sb.Append(message);};
-            Native.YGNodePrint(_ygNode, options);
-            _config.Logger = orig;
-            return sb.ToString();
-        }
-
-        public IEnumerator<YogaNode> GetEnumerator()
-        {
-            return _children != null ? ((IEnumerable<YogaNode>)_children).GetEnumerator() :
-                System.Linq.Enumerable.Empty<YogaNode>().GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return _children != null ? ((IEnumerable<YogaNode>)_children).GetEnumerator() :
-                System.Linq.Enumerable.Empty<YogaNode>().GetEnumerator();
-        }
-
-        public static int GetInstanceCount()
-        {
-            return Native.YGNodeGetInstanceCount();
-        }
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaNodeType.cs b/External/Yoga/csharp/Facebook.Yoga/YogaNodeType.cs
deleted file mode 100644
index e76be6c314..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaNodeType.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaNodeType
-    {
-        Default,
-        Text,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaOverflow.cs b/External/Yoga/csharp/Facebook.Yoga/YogaOverflow.cs
deleted file mode 100644
index 963a930fb4..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaOverflow.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaOverflow
-    {
-        Visible,
-        Hidden,
-        Scroll,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaPositionType.cs b/External/Yoga/csharp/Facebook.Yoga/YogaPositionType.cs
deleted file mode 100644
index 39a0411bbc..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaPositionType.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaPositionType
-    {
-        Relative,
-        Absolute,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaPrintOptions.cs b/External/Yoga/csharp/Facebook.Yoga/YogaPrintOptions.cs
deleted file mode 100644
index 2d92b01b65..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaPrintOptions.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    [System.Flags]
-    internal enum YogaPrintOptions
-    {
-        Layout = 1,
-        Style = 2,
-        Children = 4,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaSize.cs b/External/Yoga/csharp/Facebook.Yoga/YogaSize.cs
deleted file mode 100644
index f4803e0893..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaSize.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System.Runtime.InteropServices;
-
-namespace UnityEngine.Yoga
-{
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct YogaSize
-    {
-        public float width;
-        public float height;
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaUnit.cs b/External/Yoga/csharp/Facebook.Yoga/YogaUnit.cs
deleted file mode 100644
index 2bc091a37b..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaUnit.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaUnit
-    {
-        Undefined,
-        Point,
-        Percent,
-        Auto,
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaValue.cs b/External/Yoga/csharp/Facebook.Yoga/YogaValue.cs
deleted file mode 100644
index 5140334816..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaValue.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace UnityEngine.Yoga
-{
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct YogaValue
-    {
-        private float value;
-        private YogaUnit unit;
-
-        public YogaUnit Unit
-        {
-            get
-            {
-                return unit;
-            }
-        }
-
-        public float Value
-        {
-            get
-            {
-                return value;
-            }
-        }
-
-        public static YogaValue Point(float value)
-        {
-            return new YogaValue
-            {
-                value = value,
-                unit = YogaConstants.IsUndefined(value) ? YogaUnit.Undefined : YogaUnit.Point
-            };
-        }
-
-        public bool Equals(YogaValue other)
-        {
-            return Unit == other.Unit && (Value.Equals(other.Value) || Unit == YogaUnit.Undefined);
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            return obj is YogaValue && Equals((YogaValue) obj);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return (Value.GetHashCode() * 397) ^ (int) Unit;
-            }
-        }
-
-        public static YogaValue Undefined()
-        {
-            return new YogaValue
-            {
-                value = YogaConstants.Undefined,
-                unit = YogaUnit.Undefined
-            };
-        }
-
-        public static YogaValue Auto()
-        {
-            return new YogaValue
-            {
-                // BEGIN_UNITY @jonathanma For some styles Auto has to be NaN
-                value = float.NaN,
-                // END_UNITY
-                unit = YogaUnit.Auto
-            };
-        }
-
-        public static YogaValue Percent(float value)
-        {
-            return new YogaValue
-            {
-                value = value,
-                unit = YogaConstants.IsUndefined(value) ? YogaUnit.Undefined : YogaUnit.Percent
-            };
-        }
-
-        public static implicit operator YogaValue(float pointValue)
-        {
-            return Point(pointValue);
-        }
-
-        internal static YogaValue MarshalValue(YogaValue value)
-        {
-            return value;
-        }
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaValueExtensions.cs b/External/Yoga/csharp/Facebook.Yoga/YogaValueExtensions.cs
deleted file mode 100644
index ba2440d378..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaValueExtensions.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal static class YogaValueExtensions
-    {
-        public static YogaValue Percent(this float value)
-        {
-            return YogaValue.Percent(value);
-        }
-
-        public static YogaValue Pt(this float value)
-        {
-            return YogaValue.Point(value);
-        }
-
-        public static YogaValue Percent(this int value)
-        {
-            return YogaValue.Percent(value);
-        }
-
-        public static YogaValue Pt(this int value)
-        {
-            return YogaValue.Point(value);
-        }
-    }
-}
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaWrap.cs b/External/Yoga/csharp/Facebook.Yoga/YogaWrap.cs
deleted file mode 100644
index e35e6a3dd2..0000000000
--- a/External/Yoga/csharp/Facebook.Yoga/YogaWrap.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace UnityEngine.Yoga
-{
-    internal enum YogaWrap
-    {
-        NoWrap,
-        Wrap,
-        WrapReverse,
-    }
-}
diff --git a/External/unitytls/builds/CSharp/BindingsUnity/TLSAgent.gen.bindings.cs b/External/unitytls/builds/CSharp/BindingsUnity/TLSAgent.gen.bindings.cs
index 7e9358afa9..e9d6371044 100644
--- a/External/unitytls/builds/CSharp/BindingsUnity/TLSAgent.gen.bindings.cs
+++ b/External/unitytls/builds/CSharp/BindingsUnity/TLSAgent.gen.bindings.cs
@@ -79,9 +79,31 @@ internal static unsafe partial class Binding
         public const int UNITYTLS_SSL_HANDSHAKE_CLIENT_FINISHED = 11;
         public const int UNITYTLS_SSL_HANDSHAKE_SERVER_CHANGE_CIPHER_SPEC = 12;
         public const int UNITYTLS_SSL_HANDSHAKE_SERVER_FINISHED = 13;
+        public const int UNITYTLS_SSL_HANDSHAKE_FLUSH_BUFFERS = 14;
+        public const int UNITYTLS_SSL_HANDSHAKE_WRAPUP = 15;
+        public const int UNITYTLS_SSL_HANDSHAKE_OVER = 16;
+        public const int UNITYTLS_SSL_HANDSHAKE_SERVER_NEW_SESSION_TICKET = 17;
+        public const int UNITYTLS_SSL_HANDSHAKE_HELLO_VERIFY_REQUIRED = 18;
+        /// <summary>Number of constant definitions</summary>
+        public const int UNITYTLS_SSL_HANDSHAKE_COUNT = 19;
+        /// <summary>Deprecated: for backward compatibility only</summary>
+        public const int UNITYTLS_SSL_HANDSHAKE_BEGIN = 0;
+        /// <summary>Deprecated: for backward compatibility only</summary>
+        public const int UNITYTLS_SSL_HANDSHAKE_DONE = 16;
+        /// <summary>Deprecated: for backward compatibility only</summary>
         public const int UNITYTLS_SSL_HANDSHAKE_HANDSHAKE_FLUSH_BUFFERS = 14;
+        /// <summary>Deprecated: for backward compatibility only</summary>
         public const int UNITYTLS_SSL_HANDSHAKE_HANDSHAKE_WRAPUP = 15;
+        /// <summary>Deprecated: for backward compatibility only</summary>
         public const int UNITYTLS_SSL_HANDSHAKE_HANDSHAKE_OVER = 16;
+        [StructLayout(LayoutKind.Sequential)]
+        public struct unitytls_errorstate
+        {
+            public uint magic;
+            public uint code;
+            /// <summary>Implementation specific error code/handle.</summary>
+            public ulong reserved;
+        }
         /// <summary>struct that encapsulates a data pointer and data length.</summary>
         [StructLayout(LayoutKind.Sequential)]
         public struct unitytls_dataRef
@@ -89,12 +111,12 @@ public struct unitytls_dataRef
             public byte* dataPtr;
             public size_t dataLen;
         }
-        public const int UnityTLSRole_None = 0;
-        public const int UnityTLSRole_Server = 1;
-        public const int UnityTLSRole_Client = 2;
         public const int UnityTLSClientAuth_None = 0;
         public const int UnityTLSClientAuth_Optional = 1;
         public const int UnityTLSClientAuth_Required = 2;
+        public const int UnityTLSRole_None = 0;
+        public const int UnityTLSRole_Server = 1;
+        public const int UnityTLSRole_Client = 2;
         public const int UnityTLSTransportProtocol_Stream = 0;
         public const int UnityTLSTransportProtocol_Datagram = 1;
         public const int UnityTLSClientState_None = 0;
@@ -197,7 +219,7 @@ public struct unitytls_client_config
             /// <summary>server's hostname's name</summary>
             public byte* hostname;
             /// <summary>one of unitytls_log_level_t above.</summary>
-            public int tracelevel;
+            public uint tracelevel;
             /// <summary>callback for logging statements.</summary>
             // Delegates are managed types, putting it here directly would prevent us from creating pointers to this struct.
             // Use System.Runtime.InteropServices.GetFunctionPointerForDelegate to generate IntPtr from the original delegate.
diff --git a/ModuleOverrides/com.unity.ui/Core/BackgroundPropertyHelper.cs b/ModuleOverrides/com.unity.ui/Core/BackgroundPropertyHelper.cs
index 325676f781..290b39c27b 100644
--- a/ModuleOverrides/com.unity.ui/Core/BackgroundPropertyHelper.cs
+++ b/ModuleOverrides/com.unity.ui/Core/BackgroundPropertyHelper.cs
@@ -34,13 +34,15 @@ public static BackgroundSize ConvertScaleModeToBackgroundSize(ScaleMode scaleMod
         }
 
         public static ScaleMode ResolveUnityBackgroundScaleMode(BackgroundPosition backgroundPositionX, BackgroundPosition backgroundPositionY,
-            BackgroundRepeat backgroundRepeat, BackgroundSize backgroundSize)
+            BackgroundRepeat backgroundRepeat, BackgroundSize backgroundSize, out bool valid)
         {
+
             if (backgroundPositionX == BackgroundPropertyHelper.ConvertScaleModeToBackgroundPosition(ScaleMode.ScaleAndCrop) &&
                 backgroundPositionY == BackgroundPropertyHelper.ConvertScaleModeToBackgroundPosition(ScaleMode.ScaleAndCrop) &&
                 backgroundRepeat == BackgroundPropertyHelper.ConvertScaleModeToBackgroundRepeat(ScaleMode.ScaleAndCrop) &&
                 backgroundSize == BackgroundPropertyHelper.ConvertScaleModeToBackgroundSize(ScaleMode.ScaleAndCrop))
             {
+                valid = true;
                 return ScaleMode.ScaleAndCrop;
             }
             else if (backgroundPositionX == BackgroundPropertyHelper.ConvertScaleModeToBackgroundPosition(ScaleMode.ScaleToFit) &&
@@ -48,10 +50,20 @@ public static ScaleMode ResolveUnityBackgroundScaleMode(BackgroundPosition backg
                      backgroundRepeat == BackgroundPropertyHelper.ConvertScaleModeToBackgroundRepeat(ScaleMode.ScaleToFit) &&
                      backgroundSize == BackgroundPropertyHelper.ConvertScaleModeToBackgroundSize(ScaleMode.ScaleToFit))
             {
+                valid = true;
                 return ScaleMode.ScaleToFit;
             }
+            else if (backgroundPositionX == BackgroundPropertyHelper.ConvertScaleModeToBackgroundPosition(ScaleMode.StretchToFill) &&
+                     backgroundPositionY == BackgroundPropertyHelper.ConvertScaleModeToBackgroundPosition(ScaleMode.StretchToFill) &&
+                     backgroundRepeat == BackgroundPropertyHelper.ConvertScaleModeToBackgroundRepeat(ScaleMode.StretchToFill) &&
+                     backgroundSize == BackgroundPropertyHelper.ConvertScaleModeToBackgroundSize(ScaleMode.StretchToFill))
+            {
+                valid = true;
+                return ScaleMode.StretchToFill;
+            }
             else
             {
+                valid = false;
                 return ScaleMode.StretchToFill;
             }
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/ClampedDragger.cs b/ModuleOverrides/com.unity.ui/Core/ClampedDragger.cs
index a0086599ba..402f87f3ba 100644
--- a/ModuleOverrides/com.unity.ui/Core/ClampedDragger.cs
+++ b/ModuleOverrides/com.unity.ui/Core/ClampedDragger.cs
@@ -44,6 +44,9 @@ protected override void ProcessDownEvent(EventBase evt, Vector2 localPosition, i
             startMousePosition = localPosition;
             dragDirection = DragDirection.None;
             base.ProcessDownEvent(evt, localPosition, pointerId);
+
+            // First click should behave like dragging immediately & ensure that the cursor is clamped on first touch
+            dragging?.Invoke();
         }
 
         protected override void ProcessMoveEvent(EventBase evt, Vector2 localPosition)
diff --git a/ModuleOverrides/com.unity.ui/Core/ClickDetector.cs b/ModuleOverrides/com.unity.ui/Core/ClickDetector.cs
index 5046414ea1..c8f430c470 100644
--- a/ModuleOverrides/com.unity.ui/Core/ClickDetector.cs
+++ b/ModuleOverrides/com.unity.ui/Core/ClickDetector.cs
@@ -170,5 +170,18 @@ private static bool ContainsPointer(VisualElement element, Vector2 position)
             var elementUnderPointer = element.panel.Pick(position);
             return element == elementUnderPointer || element.Contains(elementUnderPointer);
         }
+
+        //Called when a visual element is removed from a panel to clear all reference to the visual element
+        internal void Cleanup(List<VisualElement> elements)
+        {
+            foreach (var status in m_ClickStatus)
+            {
+                if( status.m_Target == null)
+                    continue;
+
+                if(elements.Contains(status.m_Target))
+                    status.Reset();
+            }
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Clickable.cs b/ModuleOverrides/com.unity.ui/Core/Clickable.cs
index e168880747..0f65febb29 100644
--- a/ModuleOverrides/com.unity.ui/Core/Clickable.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Clickable.cs
@@ -17,10 +17,32 @@ public class Clickable : PointerManipulator
         /// <summary>
         /// Callback triggered when the target element is clicked, including event data.
         /// </summary>
+        /// <remarks>
+        /// Encapsulates a method that has an <see cref="EventBase"/> parameter and does not return a value.
+        /// </remarks>
         public event System.Action<EventBase> clickedWithEventInfo;
+
         /// <summary>
         /// Callback triggered when the target element is clicked.
         /// </summary>
+        /// <remarks>
+        /// Encapsulates a method that has no parameters and does not return a value.
+        /// </remarks>
+        /// <example>
+        /// <code>
+        /// <![CDATA[
+        /// public VisualElement CreateButton()
+        /// {
+        ///     var button = new Button { text = "Press Me" };
+        ///     button.clicked += () =>
+        ///     {
+        ///         Debug.Log("Button was pressed!");
+        ///     };
+        ///     return button;
+        /// }
+        /// ]]>
+        /// </code>
+        /// </example>
         public event System.Action clicked;
 
         private readonly long m_Delay; // in milliseconds
@@ -61,8 +83,8 @@ internal bool acceptClicksIfDisabled
         /// <summary>
         /// Constructor.
         /// </summary>
-        /// <param name="delay">Determines when the event begins. Applies if delay > 0.</param>
-        /// <param name="interval">Determines the time delta between event repetition. Applies if interval > 0.</param>
+        /// <param name="delay">Determines when the event begins. Value is defined in milliseconds. Applies if delay > 0.</param>
+        /// <param name="interval">Determines the time delta between event repetition. Value is defined in milliseconds. Applies if interval > 0.</param>
         public Clickable(System.Action handler, long delay, long interval) : this(handler)
         {
             m_Delay = delay;
@@ -96,7 +118,7 @@ private void OnTimer(TimerState timerState)
         {
             if ((clicked != null || clickedWithEventInfo != null) && IsRepeatable())
             {
-                if (ContainsPointer(m_ActivePointerId))
+                if (ContainsPointer(m_ActivePointerId) && (target.enabledInHierarchy || acceptClicksIfDisabled))
                 {
                     Invoke(null);
                     target.pseudoStates |= PseudoStates.Active;
@@ -310,7 +332,7 @@ protected virtual void ProcessDownEvent(EventBase evt, Vector2 localPosition, in
             if (IsRepeatable())
             {
                 // Repeatable button clicks are performed on the MouseDown and at timer events
-                if (ContainsPointer(pointerId))
+                if (ContainsPointer(pointerId) && (target.enabledInHierarchy || acceptClicksIfDisabled))
                 {
                     Invoke(evt);
                 }
@@ -370,7 +392,7 @@ protected virtual void ProcessUpEvent(EventBase evt, Vector2 localPosition, int
             else
             {
                 // Non repeatable button clicks are performed on the MouseUp
-                if (ContainsPointer(pointerId) && target.enabledInHierarchy)
+                if (ContainsPointer(pointerId) && (target.enabledInHierarchy || acceptClicksIfDisabled))
                 {
                     Invoke(evt);
                 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/BaseListViewController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/BaseListViewController.cs
index f9c92555dd..365ac6e87f 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/BaseListViewController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/BaseListViewController.cs
@@ -49,6 +49,7 @@ internal void PostInitRegistration(ReusableListViewItem listItem)
             listItem.bindableElement.style.flexBasis = StyleKeyword.Initial;
             listItem.bindableElement.style.marginTop = 0f;
             listItem.bindableElement.style.marginBottom = 0f;
+            listItem.bindableElement.style.paddingTop = 0f;
             listItem.bindableElement.style.flexGrow = 0f;
             listItem.bindableElement.style.flexShrink = 0f;
         }
@@ -99,10 +100,25 @@ public virtual void AddItems(int itemCount)
                 }
                 else
                 {
-                    for (var i = 0; i < itemCount; i++)
+                    var sourceType = itemsSource.GetType();
+                    bool IsGenericList(Type t) => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(IList<>);
+                    var listType = sourceType.GetInterfaces().FirstOrDefault(IsGenericList);
+                    if (listType != null && listType.GetGenericArguments()[0].IsValueType)
                     {
-                        indices.Add(previousCount + i);
-                        itemsSource.Add(default);
+                        var elementValueType = listType.GetGenericArguments()[0];
+                        for (var i = 0; i < itemCount; i++)
+                        {
+                            indices.Add(previousCount + i);
+                            itemsSource.Add(Activator.CreateInstance(elementValueType));
+                        }
+                    }
+                    else
+                    {
+                        for (var i = 0; i < itemCount; i++)
+                        {
+                            indices.Add(previousCount + i);
+                            itemsSource.Add(default);
+                        }
                     }
                 }
 
@@ -126,6 +142,9 @@ public virtual void Move(int index, int newIndex)
             if (itemsSource == null)
                 return;
 
+            if (index == newIndex)
+                return;
+
             var minIndex = Mathf.Min(index, newIndex);
             var maxIndex = Mathf.Max(index, newIndex);
 
@@ -150,16 +169,11 @@ public virtual void Move(int index, int newIndex)
         /// <param name="index">The item index.</param>
         public virtual void RemoveItem(int index)
         {
-            var indices = ListPool<int>.Get();
-            try
+            using (ListPool<int>.Get(out var indices))
             {
                 indices.Add(index);
                 RemoveItems(indices);
             }
-            finally
-            {
-                ListPool<int>.Release(indices);
-            }
         }
 
         /// <summary>
@@ -297,9 +311,7 @@ static Array RemoveFromArray(Array source, List<int> indicesToRemove)
 
         void Swap(int lhs, int rhs)
         {
-            var current = itemsSource[lhs];
-            itemsSource[lhs] = itemsSource[rhs];
-            itemsSource[rhs] = current;
+            (itemsSource[lhs], itemsSource[rhs]) = (itemsSource[rhs], itemsSource[lhs]);
         }
 
         void EnsureItemSourceCanBeResized()
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/BaseTreeViewController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/BaseTreeViewController.cs
index 9e7bb9973c..8395d817d4 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/BaseTreeViewController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/BaseTreeViewController.cs
@@ -6,6 +6,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.Profiling;
+using UnityEngine.Pool;
 
 namespace UnityEngine.UIElements
 {
@@ -14,10 +16,11 @@ namespace UnityEngine.UIElements
     /// </summary>
     public abstract class BaseTreeViewController : CollectionViewController
     {
-        Dictionary<int, TreeItem> m_TreeItems = new Dictionary<int, TreeItem>();
-        List<int> m_RootIndices = new List<int>();
-        List<TreeViewItemWrapper> m_ItemWrappers = new List<TreeViewItemWrapper>();
-        List<TreeViewItemWrapper> m_WrapperInsertionList = new List<TreeViewItemWrapper>();
+        Dictionary<int, TreeItem> m_TreeItems = new();
+        List<int> m_RootIndices = new();
+        List<TreeViewItemWrapper> m_ItemWrappers = new();
+        HashSet<int> m_TreeItemIdsWithItemWrappers = new();
+        List<TreeViewItemWrapper> m_WrapperInsertionList = new();
 
         /// <summary>
         /// View for this controller, cast as a <see cref="BaseTreeView"/>.
@@ -56,37 +59,37 @@ public void RebuildTree()
         }
 
         /// <summary>
-        /// Returns the root items of the tree, by ids.
+        /// Returns the root items of the tree, by IDs.
         /// </summary>
-        /// <returns>The root item ids.</returns>
+        /// <returns>The root item IDs.</returns>
         public IEnumerable<int> GetRootItemIds()
         {
             return m_RootIndices;
         }
 
         /// <summary>
-        /// Returns all item ids that can be found in the tree, optionally specifying root ids from where to start.
+        /// Returns all item IDs that can be found in the tree, optionally specifying root IDs from where to start.
         /// </summary>
-        /// <param name="rootIds">Root ids to start from. If null, will use the tree root ids.</param>
-        /// <returns>All items ids in the tree, starting from the specified ids.</returns>
+        /// <param name="rootIds">Root IDs to start from. If null, will use the tree root ids.</param>
+        /// <returns>All items IDs in the tree, starting from the specified IDs.</returns>
         public abstract IEnumerable<int> GetAllItemIds(IEnumerable<int> rootIds = null);
         /// <summary>
-        /// Returns the parent id of an item, by id.
+        /// Returns the parent ID of an item, by ID.
         /// </summary>
-        /// <param name="id">The id of the item to fetch the parent from.</param>
-        /// <returns>The parent id, or -1 if the item is at the root of the tree.</returns>
+        /// <param name="id">The ID of the item to fetch the parent from.</param>
+        /// <returns>The parent ID, or -1 if the item is at the root of the tree.</returns>
         public abstract int GetParentId(int id);
         /// <summary>
-        /// Get all children of a specific id in the tree.
+        /// Get all children of a specific ID in the tree.
         /// </summary>
-        /// <param name="id">The item id.</param>
-        /// <returns>The children ids.</returns>
+        /// <param name="id">The item ID.</param>
+        /// <returns>The children IDs.</returns>
         public abstract IEnumerable<int> GetChildrenIds(int id);
         /// <summary>
-        /// Moves an item by id, to a new parent and child index.
+        /// Moves an item by ID, to a new parent and child index.
         /// </summary>
-        /// <param name="id">The id of the item to move.</param>
-        /// <param name="newParentId">The new parent id. -1 if moved at the root.</param>
+        /// <param name="id">The ID of the item to move.</param>
+        /// <param name="newParentId">The new parent ID. -1 if moved at the root.</param>
         /// <param name="childIndex">The child index to insert at under the parent. -1 will add as the last child.</param>
         /// <param name="rebuildTree">Whether we need to rebuild tree data. Set to false when doing multiple operations.</param>
         public abstract void Move(int id, int newParentId, int childIndex = -1, bool rebuildTree = true);
@@ -94,8 +97,8 @@ public IEnumerable<int> GetRootItemIds()
         /// Removes an item by id.
         /// </summary>
         /// <param name="id">The item id.</param>
-        /// <param name="rebuildTree">Whether we need to rebuild tree data. Set to false when doing multiple operations.</param>
-        /// <returns>Whether or not the item was successfully found and removed.</returns>
+        /// <param name="rebuildTree">Whether we need to rebuild tree data. Set to <c>false</c> when doing multiple operations and call <see cref="TreeViewController.RebuildTree()"/>.</param>
+        /// <returns>Whether the item was successfully found and removed.</returns>
         public abstract bool TryRemoveItem(int id, bool rebuildTree = true);
 
         internal override void InvokeMakeItem(ReusableCollectionItem reusableItem)
@@ -111,7 +114,7 @@ internal override void InvokeBindItem(ReusableCollectionItem reusableItem, int i
         {
             if (reusableItem is ReusableTreeViewItem treeItem)
             {
-                treeItem.Indent(GetIndentationDepth(index));
+                treeItem.Indent(GetIndentationDepthByIndex(index));
                 treeItem.SetExpandedWithoutNotify(IsExpandedByIndex(index));
                 treeItem.SetToggleVisibility(HasChildrenByIndex(index));
             }
@@ -208,18 +211,21 @@ public virtual int GetTreeItemsCount()
         }
 
         /// <summary>
-        /// Returns the index in the source of the item, by id.
+        /// Returns the index in the source of the item, by ID.
         /// </summary>
-        /// <param name="id">The id of the item to look for.</param>
+        /// <param name="id">The ID of the item to look for.</param>
         /// <returns>The index of the item in the expanded items source. Returns -1 if the item is not visible.</returns>
         public override int GetIndexForId(int id)
         {
-            for (var index = 0; index < m_ItemWrappers.Count; index++)
+            if (m_TreeItemIdsWithItemWrappers.Contains(id))
             {
-                var wrapper = m_ItemWrappers[index];
-                if (wrapper.id == id)
+                for (var index = 0; index < m_ItemWrappers.Count; index++)
                 {
-                    return index;
+                    var wrapper = m_ItemWrappers[index];
+                    if (wrapper.id == id)
+                    {
+                        return index;
+                    }
                 }
             }
 
@@ -227,7 +233,7 @@ public override int GetIndexForId(int id)
         }
 
         /// <summary>
-        /// Returns the id for a specified index in the visible items source.
+        /// Returns the ID for a specified index in the visible items source.
         /// </summary>
         /// <param name="index"></param>
         /// <returns></returns>
@@ -237,10 +243,10 @@ public override int GetIdForIndex(int index)
         }
 
         /// <summary>
-        /// Returns whether or not the item with the specified id has one or more child.
+        /// Return whether the item with the specified ID has one or more child.
         /// </summary>
         /// <param name="id">The item id.</param>
-        /// <returns>Whether or not the item with the specified id has one or more child.</returns>
+        /// <returns>Whether the item with the specified ID has one or more child.</returns>
         public virtual bool HasChildren(int id)
         {
             if (m_TreeItems.TryGetValue(id, out var item))
@@ -250,29 +256,39 @@ public virtual bool HasChildren(int id)
         }
 
         /// <summary>
-        /// Returns whether or not the item with the specified index has one or more child.
+        /// Checks if an ID exists within this tree.
+        /// </summary>
+        /// <param name="id">The id to look for.</param>
+        /// <returns>Whether an item with this id exists in the tree.</returns>
+        internal bool Exists(int id)
+        {
+            return m_TreeItems.ContainsKey(id);
+        }
+
+        /// <summary>
+        /// Return whether the item with the specified index has one or more child.
         /// </summary>
         /// <param name="index">The item index.</param>
-        /// <returns>Whether or not the item with the specified id has one or more child.</returns>
+        /// <returns>Whether the item with the specified ID has one or more child.</returns>
         public bool HasChildrenByIndex(int index)
         {
             return IsIndexValid(index) && m_ItemWrappers[index].hasChildren;
         }
 
         /// <summary>
-        /// Gets the children ids of the item with the specified index.
+        /// Gets the children IDs of the item with the specified index.
         /// </summary>
         /// <param name="index">The item index.</param>
-        /// <returns>The children ids.</returns>
+        /// <returns>The children IDs.</returns>
         public IEnumerable<int> GetChildrenIdsByIndex(int index)
         {
             return IsIndexValid(index) ? m_ItemWrappers[index].childrenIds : null;
         }
 
         /// <summary>
-        /// Gets the child index under the parent of the item with the specified id.
+        /// Gets the child index under the parent of the item with the specified ID.
         /// </summary>
-        /// <param name="id">The item id.</param>
+        /// <param name="id">The item ID.</param>
         /// <returns>The child index under the parent. Returns -1 if the item has no parent or doesn't exist in the tree.</returns>
         public int GetChildIndexForId(int id)
         {
@@ -292,26 +308,58 @@ public int GetChildIndexForId(int id)
             return -1;
         }
 
-        int GetIndentationDepth(int index)
+        /// <summary>
+        /// Returns the depth of the element at that ID.
+        /// </summary>
+        /// <param name="id">The item ID.</param>
+        /// <returns>The depth of the element.</returns>
+        internal int GetIndentationDepth(int id)
         {
-            return IsIndexValid(index) ? m_ItemWrappers[index].depth : 0;
+            var depth = 0;
+            var parentId = GetParentId(id);
+            while (parentId != -1)
+            {
+                parentId = GetParentId(parentId);
+                depth++;
+            }
+
+            return depth;
         }
 
         /// <summary>
-        /// Returns whether or not the item with the specified id is expanded in the tree.
+        /// Return the depth of the element at that index.
         /// </summary>
-        /// <param name="id">The item id</param>
-        /// <returns>Whether or not the item with the specified id is expanded in the tree.</returns>
+        /// <param name="index">The item index.</param>
+        /// <returns>The depth of the element.</returns>
+        internal int GetIndentationDepthByIndex(int index)
+        {
+            var id = GetIdForIndex(index);
+            return GetIndentationDepth(id);
+        }
+
+        /// <summary>
+        /// Determines whether the item with the specified ID can be expanded or collapsed.
+        /// </summary>
+        internal virtual bool CanChangeExpandedState(int id)
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// Return whether the item with the specified ID is expanded in the tree.
+        /// </summary>
+        /// <param name="id">The item ID</param>
+        /// <returns>Whether the item with the specified ID is expanded in the tree.</returns>
         public bool IsExpanded(int id)
         {
             return baseTreeView.expandedItemIds.Contains(id);
         }
 
         /// <summary>
-        /// Returns whether or not the item with the specified index is expanded in the tree.
+        /// Return whether the item with the specified index is expanded in the tree.
         /// </summary>
         /// <param name="index">The item index</param>
-        /// <returns>Whether or not the item with the specified id is expanded in the tree. Will return false if the index is not valid.</returns>
+        /// <returns>Whether the item with the specified index is expanded in the tree. Will return false if the index is not valid.</returns>
         public bool IsExpandedByIndex(int index)
         {
             if (!IsIndexValid(index))
@@ -320,28 +368,34 @@ public bool IsExpandedByIndex(int index)
             return IsExpanded(m_ItemWrappers[index].id);
         }
 
+        static readonly ProfilerMarker K_ExpandItemByIndex = new ProfilerMarker(ProfilerCategory.Scripts, "BaseTreeViewController.ExpandItemByIndex");
         /// <summary>
         /// Expands the item with the specified index, making his children visible. Allows to expand the whole hierarchy under that item.
         /// </summary>
         /// <param name="index">The item index.</param>
-        /// <param name="expandAllChildren">Whether or not to expand the whole hierarchy under that item.</param>
+        /// <param name="expandAllChildren">Whether the whole hierarchy under that item will be expanded.</param>
         /// <param name="refresh">Whether to refresh items or not. Set to false when doing multiple operations on the tree, to only do one RefreshItems once all operations are done.</param>
         public void ExpandItemByIndex(int index, bool expandAllChildren, bool refresh = true)
         {
+            using var marker = K_ExpandItemByIndex.Auto();
             if (!HasChildrenByIndex(index))
                 return;
 
-            if (!baseTreeView.expandedItemIds.Contains(GetIdForIndex(index)) || expandAllChildren)
+            var id = GetIdForIndex(index);
+            if (!CanChangeExpandedState(id))
+                return;
+
+            if (!baseTreeView.expandedItemIds.Contains(id) || expandAllChildren)
             {
                 var childrenIds = GetChildrenIdsByIndex(index);
                 var childrenIdsList = new List<int>();
                 foreach (var childId in childrenIds)
                 {
-                    if (m_ItemWrappers.All(x => x.id != childId))
+                    if (!m_TreeItemIdsWithItemWrappers.Contains(childId))
                         childrenIdsList.Add(childId);
                 }
 
-                CreateWrappers(childrenIdsList, GetIndentationDepth(index) + 1,
+                CreateWrappers(childrenIdsList, GetIndentationDepth(id) + 1,
                     ref m_WrapperInsertionList);
                 m_ItemWrappers.InsertRange(index + 1, m_WrapperInsertionList);
                 if (!baseTreeView.expandedItemIds.Contains(m_ItemWrappers[index].id))
@@ -351,7 +405,6 @@ public void ExpandItemByIndex(int index, bool expandAllChildren, bool refresh =
 
             if (expandAllChildren)
             {
-                var id = GetIdForIndex(index);
                 var childrenIds = GetChildrenIds(id);
                 foreach (var childId in GetAllItemIds(childrenIds))
                     if (!baseTreeView.expandedItemIds.Contains(childId))
@@ -363,14 +416,14 @@ public void ExpandItemByIndex(int index, bool expandAllChildren, bool refresh =
         }
 
         /// <summary>
-        /// Expands the item with the specified id, making its children visible. Allows to expand the whole hierarchy under that item.
+        /// Expands the item with the specified ID, making its children visible. Allows to expand the whole hierarchy under that item.
         /// </summary>
-        /// <param name="id">The item id.</param>
-        /// <param name="expandAllChildren">Whether or not to expand the whole hierarchy under that item.</param>
+        /// <param name="id">The item ID.</param>
+        /// <param name="expandAllChildren">Whether the whole hierarchy under that item will be expanded.</param>
         /// <param name="refresh">Whether to refresh items or not. Set to false when doing multiple operations on the tree, to only do one RefreshItems once all operations are done.</param>
         public void ExpandItem(int id, bool expandAllChildren, bool refresh = true)
         {
-            if (!HasChildren(id))
+            if (!HasChildren(id) || !CanChangeExpandedState(id))
                 return;
 
             // Try to find it in the currently visible list.
@@ -392,51 +445,66 @@ public void ExpandItem(int id, bool expandAllChildren, bool refresh = true)
         /// Collapses the item with the specified index, hiding its children. Allows to collapse the whole hierarchy under that item.
         /// </summary>
         /// <param name="index">The item index.</param>
-        /// <param name="collapseAllChildren">Whether or not to collapse the whole hierarchy under that item.</param>
+        /// <param name="collapseAllChildren">Whether the whole hierarchy under that item will be collapsed.</param>
         public void CollapseItemByIndex(int index, bool collapseAllChildren)
         {
             if (!HasChildrenByIndex(index))
                 return;
 
+            var id = GetIdForIndex(index);
+            if (!CanChangeExpandedState(id))
+             return;
+
             if (collapseAllChildren)
             {
-                var id = GetIdForIndex(index);
                 var childrenIds = GetChildrenIds(id);
                 foreach (var childId in GetAllItemIds(childrenIds))
                     baseTreeView.expandedItemIds.Remove(childId);
             }
 
-            baseTreeView.expandedItemIds.Remove(GetIdForIndex(index));
+            baseTreeView.expandedItemIds.Remove(id);
 
             var recursiveChildCount = 0;
             var currentIndex = index + 1;
-            var currentDepth = GetIndentationDepth(index);
-            while (currentIndex < m_ItemWrappers.Count && GetIndentationDepth(currentIndex) > currentDepth)
+            var currentDepth = GetIndentationDepthByIndex(index);
+            while (currentIndex < m_ItemWrappers.Count && GetIndentationDepthByIndex(currentIndex) > currentDepth)
             {
                 recursiveChildCount++;
                 currentIndex++;
             }
+            var end = index + 1 + recursiveChildCount;
+            for (int i = index + 1; i < end; i++)
+            {
+                m_TreeItemIdsWithItemWrappers.Remove(m_ItemWrappers[i].id);
+            }
 
             m_ItemWrappers.RemoveRange(index + 1, recursiveChildCount);
-
             baseTreeView.RefreshItems();
         }
 
         /// <summary>
-        /// Collapses the item with the specified id, hiding its children. Allows to collapse the whole hierarchy under that item.
+        /// Collapses the item with the specified ID, hiding its children. Allows to collapse the whole hierarchy under that item.
         /// </summary>
-        /// <param name="id">The item id.</param>
-        /// <param name="collapseAllChildren">Whether or not to collapse the whole hierarchy under that item.</param>
+        /// <param name="id">The item ID.</param>
+        /// <param name="collapseAllChildren">Whether the whole hierarchy under that item will be collapsed.</param>
         public void CollapseItem(int id, bool collapseAllChildren)
         {
+            if (!CanChangeExpandedState(id))
+                return;
+
             // Try to find it in the currently visible list.
             for (var i = 0; i < m_ItemWrappers.Count; ++i)
+            {
                 if (m_ItemWrappers[i].id == id)
+                {
                     if (IsExpandedByIndex(i))
                     {
                         CollapseItemByIndex(i, collapseAllChildren);
                         return;
                     }
+                    break;
+                }
+            }
 
             if (!baseTreeView.expandedItemIds.Contains(id))
                 return;
@@ -450,8 +518,13 @@ public void CollapseItem(int id, bool collapseAllChildren)
         public void ExpandAll()
         {
             foreach (var itemId in GetAllItemIds())
+            {
+                if (!CanChangeExpandedState(itemId))
+                    continue;
+
                 if (!baseTreeView.expandedItemIds.Contains(itemId))
                     baseTreeView.expandedItemIds.Add(itemId);
+            }
 
             RegenerateWrappers();
             baseTreeView.RefreshItems();
@@ -465,7 +538,20 @@ public void CollapseAll()
             if (baseTreeView.expandedItemIds.Count == 0)
                 return;
 
-            baseTreeView.expandedItemIds.Clear();
+            using (ListPool<int>.Get(out var list))
+            {
+                foreach (var itemId in baseTreeView.expandedItemIds)
+                {
+                    if (!CanChangeExpandedState(itemId))
+                    {
+                        list.Add(itemId);
+                    }
+                }
+
+                baseTreeView.expandedItemIds.Clear();
+                baseTreeView.expandedItemIds.AddRange(list);
+            }
+
             RegenerateWrappers();
             baseTreeView.RefreshItems();
         }
@@ -473,6 +559,7 @@ public void CollapseAll()
         internal void RegenerateWrappers()
         {
             m_ItemWrappers.Clear();
+            m_TreeItemIdsWithItemWrappers.Clear();
 
             var rootItemIds = GetRootItemIds();
             if (rootItemIds == null)
@@ -482,15 +569,21 @@ internal void RegenerateWrappers()
             SetItemsSourceWithoutNotify(m_ItemWrappers);
         }
 
+        static readonly ProfilerMarker k_CreateWrappers = new ProfilerMarker("BaseTreeViewController.CreateWrappers");
         void CreateWrappers(IEnumerable<int> treeViewItemIds, int depth, ref List<TreeViewItemWrapper> wrappers)
         {
-            if (treeViewItemIds == null || wrappers == null)
+            using var marker = k_CreateWrappers.Auto();
+            if (treeViewItemIds == null || wrappers == null || m_TreeItemIdsWithItemWrappers == null)
                 return;
 
             foreach (var id in treeViewItemIds)
             {
-                var wrapper = new TreeViewItemWrapper(m_TreeItems[id], depth);
+                if (!m_TreeItems.TryGetValue(id, out var treeItem))
+                    continue;
+
+                var wrapper = new TreeViewItemWrapper(treeItem, depth);
                 wrappers.Add(wrapper);
+                m_TreeItemIdsWithItemWrappers.Add(id); 
 
                 if (baseTreeView?.expandedItemIds == null)
                     continue;
@@ -504,5 +597,10 @@ bool IsIndexValid(int index)
         {
             return index >= 0 && index < m_ItemWrappers.Count;
         }
+
+        internal void RaiseItemParentChanged(int id, int newParentId)
+        {
+            RaiseItemIndexChanged(id, newParentId);
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/CollectionViewController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/CollectionViewController.cs
index 3d96ea70fb..018a1dea27 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/CollectionViewController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/CollectionViewController.cs
@@ -38,7 +38,19 @@ public virtual IList itemsSource
             {
                 if (m_ItemsSource == value)
                     return;
+                
+                var hadValidDataAndBindings = m_View.HasValidDataAndBindings();
+
                 m_ItemsSource = value;
+
+                // We need to make sure to RefreshItems if itemsSource was set last, but only when we're not using
+                // ListViewBindings, that does the refresh already when the SerializedProperty is ready.
+                if (!hadValidDataAndBindings && m_View.HasValidDataAndBindings() && 
+                    m_View.GetProperty(BaseVerticalCollectionView.internalBindingKey) == null)
+                {
+                    m_View.RefreshItems();
+                }
+
                 RaiseItemsSourceChanged();
             }
         }
@@ -116,11 +128,11 @@ public virtual int GetIndexForId(int id)
         /// <remarks>For example, the index will be different from the id in a tree.</remarks>
         public virtual int GetIdForIndex(int index)
         {
-            return m_View.getItemId?.Invoke(index) ?? index;
+            return index;
         }
 
         /// <summary>
-        /// Returns the item for the specified index.
+        /// Returns the item with the specified index.
         /// </summary>
         /// <param name="index">The item index.</param>
         /// <returns>The object in the source at this index.</returns>
@@ -135,6 +147,23 @@ public virtual object GetItemForIndex(int index)
             return m_ItemsSource[index];
         }
 
+        /// <summary>
+        /// Returns the item with the specified ID.
+        /// </summary>
+        /// <param name="id">The item ID.</param>
+        /// <returns>The object in the source with this ID.</returns>
+        internal virtual object GetItemForId(int id)
+        {
+            if (m_ItemsSource == null)
+                return null;
+
+            var index = GetIndexForId(id);
+            if (index < 0 || index >= m_ItemsSource.Count)
+                return null;
+
+            return m_ItemsSource[index];
+        }
+
         internal virtual void InvokeMakeItem(ReusableCollectionItem reusableItem)
         {
             reusableItem.Init(MakeItem());
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/DefaultMultiColumnTreeViewController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/DefaultMultiColumnTreeViewController.cs
new file mode 100644
index 0000000000..bc6ec84a42
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/DefaultMultiColumnTreeViewController.cs
@@ -0,0 +1,194 @@
+// 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;
+
+namespace UnityEngine.UIElements
+{
+    /// <summary>
+    /// Default implementation of a <see cref="MultiColumnTreeViewController"/>.
+    /// </summary>
+    /// <typeparam name="T">The data type.</typeparam>
+    internal class DefaultMultiColumnTreeViewController<T> : MultiColumnTreeViewController, IDefaultTreeViewController<T>
+    {
+        TreeDataController<T> m_TreeDataController;
+        TreeDataController<T> treeDataController => m_TreeDataController ??= new TreeDataController<T>();
+
+        /// <summary>
+        /// The constructor for DefaultMultiColumnTreeViewController.
+        /// </summary>
+        /// <param name="columns">The columns data used to initialize the header.</param>
+        /// <param name="sortDescriptions">The sort data used to initialize the header.</param>
+        /// <param name="sortedColumns">The sorted columns for the view.</param>
+        public DefaultMultiColumnTreeViewController(Columns columns, SortColumnDescriptions sortDescriptions, List<SortColumnDescription> sortedColumns)
+            : base(columns, sortDescriptions, sortedColumns) {}
+
+        /// <inheritdoc />
+        public override IList itemsSource
+        {
+            get => base.itemsSource;
+            set
+            {
+                if (value == null)
+                {
+                    SetRootItems(null);
+                }
+                else if (value is IList<TreeViewItemData<T>> dataList)
+                {
+                    SetRootItems(dataList);
+                }
+                else
+                {
+                    Debug.LogError($"Type does not match this tree view controller's data type ({typeof(T)}).");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sets the root items.
+        /// </summary>
+        /// <remarks>
+        /// Root items can include their children directly.
+        /// </remarks>
+        /// <param name="items">The TreeView root items.</param>
+        public void SetRootItems(IList<TreeViewItemData<T>> items)
+        {
+            if (items == base.itemsSource)
+                return;
+
+            treeDataController.SetRootItems(items);
+            RebuildTree();
+            RaiseItemsSourceChanged();
+        }
+
+        /// <summary>
+        /// Adds an item to the tree.
+        /// </summary>
+        /// <param name="item">Item to add.</param>
+        /// <param name="parentId">The parent id for the item.</param>
+        /// <param name="childIndex">The child index in the parent's children list.</param>
+        /// <param name="rebuildTree">Whether the tree data should be rebuilt right away. Call <see cref="TreeViewController.RebuildTree()"/> when <c>false</c>.</param>
+        public virtual void AddItem(in TreeViewItemData<T> item, int parentId, int childIndex, bool rebuildTree = true)
+        {
+            treeDataController.AddItem(item, parentId, childIndex);
+
+            if (rebuildTree)
+                RebuildTree();
+        }
+
+        /// <summary>
+        /// Gets the tree item data for the specified TreeView item ID.
+        /// </summary>
+        /// <param name="id">The TreeView item ID.</param>
+        /// <typeparam name="T">Type of the data inside TreeViewItemData.</typeparam>
+        /// <returns>The tree item data.</returns>
+        public virtual TreeViewItemData<T> GetTreeViewItemDataForId(int id)
+        {
+            return treeDataController.GetTreeItemDataForId(id);
+        }
+
+        /// <summary>
+        /// Gets the tree item data for the specified TreeView item index.
+        /// </summary>
+        /// <param name="index">The TreeView item index.</param>
+        /// <typeparam name="T">Type of the data inside TreeViewItemData.</typeparam>
+        /// <returns>The tree item data.</returns>
+        public virtual TreeViewItemData<T> GetTreeViewItemDataForIndex(int index)
+        {
+            var itemId = GetIdForIndex(index);
+            return treeDataController.GetTreeItemDataForId(itemId);
+        }
+
+        /// <inheritdoc />
+        public override bool TryRemoveItem(int id, bool rebuildTree = true)
+        {
+            if (treeDataController.TryRemoveItem(id))
+            {
+                if (rebuildTree)
+                    RebuildTree();
+
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Gets data for the specified TreeView item ID.
+        /// </summary>
+        /// <param name="id">The TreeView item ID.</param>
+        /// <typeparam name="T">Type of the data inside TreeViewItemData.</typeparam>
+        /// <returns>The data.</returns>
+        public T GetDataForId(int id)
+        {
+            return treeDataController.GetDataForId(id);
+        }
+
+        /// <summary>
+        /// Gets data for the specified TreeView item index.
+        /// </summary>
+        /// <param name="index">The TreeView item index.</param>
+        /// <typeparam name="T">Type of the data inside TreeViewItemData.</typeparam>
+        /// <returns>The data.</returns>
+        public T GetDataForIndex(int index)
+        {
+            return treeDataController.GetDataForId(GetIdForIndex(index));
+        }
+
+        /// <inheritdoc />
+        public override object GetItemForIndex(int index)
+        {
+            return treeDataController.GetDataForId(GetIdForIndex(index));
+        }
+
+        /// <inheritdoc />
+        public override int GetParentId(int id)
+        {
+            return treeDataController.GetParentId(id);
+        }
+
+        /// <inheritdoc />
+        public override bool HasChildren(int id)
+        {
+            return treeDataController.HasChildren(id);
+        }
+
+        /// <inheritdoc />
+        public override IEnumerable<int> GetChildrenIds(int id)
+        {
+            return treeDataController.GetChildrenIds(id);
+        }
+
+        /// <inheritdoc />
+        public override void Move(int id, int newParentId, int childIndex = -1, bool rebuildTree = true)
+        {
+            if (id == newParentId)
+                return;
+
+            if (IsChildOf(newParentId, id))
+                return;
+
+            treeDataController.Move(id, newParentId, childIndex);
+
+            if (rebuildTree)
+            {
+                RebuildTree();
+                RaiseItemIndexChanged(id, newParentId);
+            }
+        }
+
+        bool IsChildOf(int childId, int id)
+        {
+            return treeDataController.IsChildOf(childId, id);
+        }
+
+        /// <inheritdoc />
+        public override IEnumerable<int> GetAllItemIds(IEnumerable<int> rootIds = null)
+        {
+            return treeDataController.GetAllItemIds(rootIds);
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/DefaultTreeViewController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/DefaultTreeViewController.cs
new file mode 100644
index 0000000000..f8eca77355
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/DefaultTreeViewController.cs
@@ -0,0 +1,196 @@
+// 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;
+
+namespace UnityEngine.UIElements
+{
+    /// <summary>
+    /// Default implementation of a <see cref="TreeViewController"/>.
+    /// </summary>
+    /// <typeparam name="T">The data type.</typeparam>
+    internal class DefaultTreeViewController<T> : TreeViewController, IDefaultTreeViewController, IDefaultTreeViewController<T>
+    {
+        TreeDataController<T> m_TreeDataController;
+        TreeDataController<T> treeDataController => m_TreeDataController ??= new TreeDataController<T>();
+
+        /// <inheritdoc />
+        public override IList itemsSource
+        {
+            get => base.itemsSource;
+            set
+            {
+                if (value == null)
+                {
+                    SetRootItems(null);
+                }
+                else if (value is IList<TreeViewItemData<T>> dataList)
+                {
+                    SetRootItems(dataList);
+                }
+                else
+                {
+                    Debug.LogError($"Type does not match this tree view controller's data type ({typeof(T)}).");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sets the root items.
+        /// </summary>
+        /// <remarks>
+        /// Root items can include their children directly.
+        /// </remarks>
+        /// <param name="items">The TreeView root items.</param>
+        public void SetRootItems(IList<TreeViewItemData<T>> items)
+        {
+            if (items == base.itemsSource)
+                return;
+
+            treeDataController.SetRootItems(items);
+            RebuildTree();
+            RaiseItemsSourceChanged();
+        }
+
+        /// <summary>
+        /// Adds an item to the tree.
+        /// </summary>
+        /// <param name="item">Item to add.</param>
+        /// <param name="parentId">The parent id for the item.</param>
+        /// <param name="childIndex">The child index in the parent's children list.</param>
+        /// <param name="rebuildTree">Whether the tree data should be rebuilt right away. Call <see cref="TreeViewController.RebuildTree()"/> when <c>false</c>.</param>
+        public virtual void AddItem(in TreeViewItemData<T> item, int parentId, int childIndex, bool rebuildTree = true)
+        {
+            treeDataController.AddItem(item, parentId, childIndex);
+
+            if (rebuildTree)
+                RebuildTree();
+        }
+
+        /// <inheritdoc />
+        public override bool TryRemoveItem(int id, bool rebuildTree = true)
+        {
+            if (treeDataController.TryRemoveItem(id))
+            {
+                if (rebuildTree)
+                    RebuildTree();
+
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Gets the tree item data for the specified TreeView item ID.
+        /// </summary>
+        /// <param name="id">The TreeView item ID.</param>
+        /// <typeparam name="T">Type of the data inside TreeViewItemData.</typeparam>
+        /// <returns>The tree item data.</returns>
+        public virtual object GetItemDataForId(int id)
+        {
+            return treeDataController.GetTreeItemDataForId(id).data;
+        }
+
+        /// <summary>
+        /// Gets the tree item data for the specified TreeView item ID.
+        /// </summary>
+        /// <param name="id">The TreeView item ID.</param>
+        /// <typeparam name="T">Type of the data inside TreeViewItemData.</typeparam>
+        /// <returns>The tree item data.</returns>
+        public virtual TreeViewItemData<T> GetTreeViewItemDataForId(int id)
+        {
+            return treeDataController.GetTreeItemDataForId(id);
+        }
+
+        /// <summary>
+        /// Gets the tree item data for the specified TreeView item index.
+        /// </summary>
+        /// <param name="index">The TreeView item index.</param>
+        /// <typeparam name="T">Type of the data inside TreeViewItemData.</typeparam>
+        /// <returns>The tree item data.</returns>
+        public virtual TreeViewItemData<T> GetTreeViewItemDataForIndex(int index)
+        {
+            var itemId = GetIdForIndex(index);
+            return treeDataController.GetTreeItemDataForId(itemId);
+        }
+
+        /// <summary>
+        /// Gets data for the specified TreeView item ID.
+        /// </summary>
+        /// <param name="id">The TreeView item ID.</param>
+        /// <typeparam name="T">Type of the data inside TreeViewItemData.</typeparam>
+        /// <returns>The data.</returns>
+        public virtual T GetDataForId(int id)
+        {
+            return treeDataController.GetDataForId(id);
+        }
+
+        /// <summary>
+        /// Gets data for the specified TreeView item index.
+        /// </summary>
+        /// <param name="index">The TreeView item index.</param>
+        /// <typeparam name="T">Type of the data inside TreeViewItemData.</typeparam>
+        /// <returns>The data.</returns>
+        public virtual T GetDataForIndex(int index)
+        {
+            return treeDataController.GetDataForId(GetIdForIndex(index));
+        }
+
+        /// <inheritdoc />
+        public override object GetItemForIndex(int index)
+        {
+            return treeDataController.GetDataForId(GetIdForIndex(index));
+        }
+
+        /// <inheritdoc />
+        public override int GetParentId(int id)
+        {
+            return treeDataController.GetParentId(id);
+        }
+
+        /// <inheritdoc />
+        public override bool HasChildren(int id)
+        {
+            return treeDataController.HasChildren(id);
+        }
+
+        /// <inheritdoc />
+        public override IEnumerable<int> GetChildrenIds(int id)
+        {
+            return treeDataController.GetChildrenIds(id);
+        }
+
+        /// <inheritdoc />
+        public override void Move(int id, int newParentId, int childIndex = -1, bool rebuildTree = true)
+        {
+            if (id == newParentId)
+                return;
+
+            if (IsChildOf(newParentId, id))
+                return;
+
+            treeDataController.Move(id, newParentId, childIndex);
+
+            if (rebuildTree)
+            {
+                RebuildTree();
+                RaiseItemParentChanged(id, newParentId);
+            }
+        }
+
+        bool IsChildOf(int childId, int id)
+        {
+            return treeDataController.IsChildOf(childId, id);
+        }
+
+        /// <inheritdoc />
+        public override IEnumerable<int> GetAllItemIds(IEnumerable<int> rootIds = null)
+        {
+            return treeDataController.GetAllItemIds(rootIds);
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/IDefaultTreeViewController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/IDefaultTreeViewController.cs
index 85f99e8f5c..f613574a30 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/IDefaultTreeViewController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/IDefaultTreeViewController.cs
@@ -6,6 +6,11 @@
 
 namespace UnityEngine.UIElements
 {
+    internal interface IDefaultTreeViewController
+    {
+        object GetItemDataForId(int id);
+    }
+
     internal interface IDefaultTreeViewController<T>
     {
         void SetRootItems(IList<TreeViewItemData<T>> items);
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/MultiColumnTreeViewController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/MultiColumnTreeViewController.cs
index 76a649c647..80e42f3411 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/MultiColumnTreeViewController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/MultiColumnTreeViewController.cs
@@ -3,7 +3,6 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using UnityEngine.UIElements.Internal;
 
@@ -87,131 +86,4 @@ public override void Dispose()
             base.Dispose();
         }
     }
-
-    class DefaultMultiColumnTreeViewController<T> : MultiColumnTreeViewController, IDefaultTreeViewController<T>
-    {
-        TreeDataController<T> m_TreeDataController;
-        TreeDataController<T> treeDataController => m_TreeDataController ??= new TreeDataController<T>();
-
-        public DefaultMultiColumnTreeViewController(Columns columns, SortColumnDescriptions sortDescriptions, List<SortColumnDescription> sortedColumns)
-            : base(columns, sortDescriptions, sortedColumns) {}
-
-        public override IList itemsSource
-        {
-            get => base.itemsSource;
-            set
-            {
-                if (value == null)
-                {
-                    SetRootItems(null);
-                }
-                else if (value is IList<TreeViewItemData<T>> dataList)
-                {
-                    SetRootItems(dataList);
-                }
-                else
-                {
-                    Debug.LogError($"Type does not match this tree view controller's data type ({typeof(T)}).");
-                }
-            }
-        }
-
-        public void SetRootItems(IList<TreeViewItemData<T>> items)
-        {
-            if (items == base.itemsSource)
-                return;
-
-            treeDataController.SetRootItems(items);
-            RebuildTree();
-            RaiseItemsSourceChanged();
-        }
-
-        public void AddItem(in TreeViewItemData<T> item, int parentId, int childIndex, bool rebuildTree = true)
-        {
-            treeDataController.AddItem(item, parentId, childIndex);
-
-            if (rebuildTree)
-                RebuildTree();
-        }
-
-        public TreeViewItemData<T> GetTreeViewItemDataForId(int id)
-        {
-            return treeDataController.GetTreeItemDataForId(id);
-        }
-
-        public TreeViewItemData<T> GetTreeViewItemDataForIndex(int index)
-        {
-            var itemId = GetIdForIndex(index);
-            return treeDataController.GetTreeItemDataForId(itemId);
-        }
-
-        public override bool TryRemoveItem(int id, bool rebuildTree = true)
-        {
-            if (treeDataController.TryRemoveItem(id))
-            {
-                if (rebuildTree)
-                    RebuildTree();
-
-                return true;
-            }
-
-            return false;
-        }
-
-        public T GetDataForId(int id)
-        {
-            return treeDataController.GetDataForId(id);
-        }
-
-        public T GetDataForIndex(int index)
-        {
-            return treeDataController.GetDataForId(GetIdForIndex(index));
-        }
-
-        public override object GetItemForIndex(int index)
-        {
-            return treeDataController.GetDataForId(GetIdForIndex(index));
-        }
-
-        public override int GetParentId(int id)
-        {
-            return treeDataController.GetParentId(id);
-        }
-
-        public override bool HasChildren(int id)
-        {
-            return treeDataController.HasChildren(id);
-        }
-
-        public override IEnumerable<int> GetChildrenIds(int id)
-        {
-            return treeDataController.GetChildrenIds(id);
-        }
-
-        public override void Move(int id, int newParentId, int childIndex = -1, bool rebuildTree = true)
-        {
-            if (id == newParentId)
-                return;
-
-            if (IsChildOf(newParentId, id))
-                return;
-
-            treeDataController.Move(id, newParentId, childIndex);
-
-            if (rebuildTree)
-                RebuildTree();
-
-            RaiseItemIndexChanged(id, newParentId);
-        }
-
-        bool IsChildOf(int childId, int id)
-        {
-            return treeDataController.IsChildOf(childId, id);
-        }
-
-        public override IEnumerable<int> GetAllItemIds(IEnumerable<int> rootIds = null)
-        {
-            return treeDataController.GetAllItemIds(rootIds);
-        }
-    }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/TreeViewController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/TreeViewController.cs
index 5ff485d061..f94509890f 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/TreeViewController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/TreeViewController.cs
@@ -3,8 +3,6 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace UnityEngine.UIElements
@@ -59,129 +57,13 @@ protected override void DestroyItem(VisualElement element)
         {
             treeView.destroyItem?.Invoke(element);
         }
-    }
-
-    internal sealed class DefaultTreeViewController<T> : TreeViewController, IDefaultTreeViewController<T>
-    {
-        TreeDataController<T> m_TreeDataController;
-        TreeDataController<T> treeDataController => m_TreeDataController ??= new TreeDataController<T>();
-
-        public override IList itemsSource
-        {
-            get => base.itemsSource;
-            set
-            {
-                if (value == null)
-                {
-                    SetRootItems(null);
-                }
-                else if (value is IList<TreeViewItemData<T>> dataList)
-                {
-                    SetRootItems(dataList);
-                }
-                else
-                {
-                    Debug.LogError($"Type does not match this tree view controller's data type ({typeof(T)}).");
-                }
-            }
-        }
-
-        public void SetRootItems(IList<TreeViewItemData<T>> items)
-        {
-            if (items == base.itemsSource)
-                return;
-
-            treeDataController.SetRootItems(items);
-            RebuildTree();
-            RaiseItemsSourceChanged();
-        }
-
-        public void AddItem(in TreeViewItemData<T> item, int parentId, int childIndex, bool rebuildTree = true)
-        {
-            treeDataController.AddItem(item, parentId, childIndex);
 
-            if (rebuildTree)
-                RebuildTree();
-        }
-
-        public override bool TryRemoveItem(int id, bool rebuildTree = true)
+        internal override object GetItemForId(int id)
         {
-            if (treeDataController.TryRemoveItem(id))
-            {
-                if (rebuildTree)
-                    RebuildTree();
-
-                return true;
-            }
-
-            return false;
-        }
+            if (this is IDefaultTreeViewController defaultController)
+                return defaultController.GetItemDataForId(id);
 
-        public TreeViewItemData<T> GetTreeViewItemDataForId(int id)
-        {
-            return treeDataController.GetTreeItemDataForId(id);
-        }
-
-        public TreeViewItemData<T> GetTreeViewItemDataForIndex(int index)
-        {
-            var itemId = GetIdForIndex(index);
-            return treeDataController.GetTreeItemDataForId(itemId);
-        }
-
-        public T GetDataForId(int id)
-        {
-            return treeDataController.GetDataForId(id);
-        }
-
-        public T GetDataForIndex(int index)
-        {
-            return treeDataController.GetDataForId(GetIdForIndex(index));
-        }
-
-        public override object GetItemForIndex(int index)
-        {
-            return treeDataController.GetDataForId(GetIdForIndex(index));
-        }
-
-        public override int GetParentId(int id)
-        {
-            return treeDataController.GetParentId(id);
-        }
-
-        public override bool HasChildren(int id)
-        {
-            return treeDataController.HasChildren(id);
-        }
-
-        public override IEnumerable<int> GetChildrenIds(int id)
-        {
-            return treeDataController.GetChildrenIds(id);
-        }
-
-        public override void Move(int id, int newParentId, int childIndex = -1, bool rebuildTree = true)
-        {
-            if (id == newParentId)
-                return;
-
-            if (IsChildOf(newParentId, id))
-                return;
-
-            treeDataController.Move(id, newParentId, childIndex);
-
-            if (rebuildTree)
-                RebuildTree();
-
-            RaiseItemIndexChanged(id, newParentId);
-        }
-
-        bool IsChildOf(int childId, int id)
-        {
-            return treeDataController.IsChildOf(childId, id);
-        }
-
-        public override IEnumerable<int> GetAllItemIds(IEnumerable<int> rootIds = null)
-        {
-            return treeDataController.GetAllItemIds(rootIds);
+            return base.GetItemForId(id);
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/CollectionVirtualizationController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/CollectionVirtualizationController.cs
index d03205647d..1824a4d2e3 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/CollectionVirtualizationController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/CollectionVirtualizationController.cs
@@ -20,7 +20,7 @@ protected CollectionVirtualizationController(ScrollView scrollView)
 
         public abstract void Refresh(bool rebuild);
         public abstract void ScrollToItem(int id);
-        public abstract void Resize(Vector2 size, int layoutPass);
+        public abstract void Resize(Vector2 size);
         public abstract void OnScroll(Vector2 offset);
         public abstract int GetIndexFromPosition(Vector2 position);
         public abstract float GetExpectedItemHeight(int index);
@@ -30,6 +30,8 @@ protected CollectionVirtualizationController(ScrollView scrollView)
         public abstract void UpdateBackground();
 
         public abstract IEnumerable<ReusableCollectionItem> activeItems { get; }
-        public abstract void ReplaceActiveItem(int index);
+
+        internal abstract void StartDragItem(ReusableCollectionItem item);
+        internal abstract void EndDrag(int dropIndex);
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/DynamicHeightVirtualizationController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/DynamicHeightVirtualizationController.cs
index 6faa54f01f..668e462059 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/DynamicHeightVirtualizationController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/DynamicHeightVirtualizationController.cs
@@ -22,11 +22,10 @@ public ContentHeightCacheInfo(float sum, int count)
             }
         }
 
-        const int k_AdditionalItems = 5;
         int m_HighestCachedIndex = -1;
-        readonly Dictionary<int, float> m_ItemHeightCache = new Dictionary<int, float>(32);
-        readonly Dictionary<int, ContentHeightCacheInfo> m_ContentHeightCache = new Dictionary<int, ContentHeightCacheInfo>(32);
-        readonly HashSet<int> m_WaitingCache = new HashSet<int>(32);
+        readonly Dictionary<int, float> m_ItemHeightCache = new (32);
+        readonly Dictionary<int, ContentHeightCacheInfo> m_ContentHeightCache = new (32);
+        readonly HashSet<int> m_WaitingCache = new (32);
 
         // Internal for tests.
         internal IReadOnlyDictionary<int, float> itemHeightCache => m_ItemHeightCache;
@@ -34,69 +33,159 @@ public ContentHeightCacheInfo(float sum, int count)
         int m_ForcedFirstVisibleItem = -1;
         int m_ForcedLastVisibleItem = -1;
         bool m_StickToBottom;
+        VirtualizationChange m_LastChange;
+        ScrollDirection m_ScrollDirection;
+        Vector2 m_DelayedScrollOffset = Vector2.negativeInfinity;
+
+        enum VirtualizationChange
+        {
+            /// <summary>
+            /// We're back in an idle state.
+            /// </summary>
+            None,
+            /// <summary>
+            /// Viewport was resized.
+            /// </summary>
+            Resize,
+            /// <summary>
+            /// Regular scroll changes, through mouse wheel or scroller changes.
+            /// </summary>
+            Scroll,
+            /// <summary>
+            /// ScrollToItem was called.
+            /// </summary>
+            ForcedScroll,
+        }
+
+        enum ScrollDirection
+        {
+            Idle,
+            Up,
+            Down,
+        }
 
-        float m_AverageHeight = BaseVerticalCollectionView.s_DefaultItemHeight;
         float m_AccumulatedHeight;
+        float m_MinimumItemHeight = -1;
+
+        float defaultExpectedHeight
+        {
+            get
+            {
+                if (m_MinimumItemHeight > 0)
+                    return m_MinimumItemHeight;
+
+                if (m_CollectionView.m_ItemHeightIsInline && m_CollectionView.fixedItemHeight > 0)
+                    return m_CollectionView.fixedItemHeight;
+
+                return BaseVerticalCollectionView.s_DefaultItemHeight;
+            }
+        }
+
+        float contentPadding
+        {
+            get => serializedData.contentPadding;
+            set
+            {
+                m_CollectionView.scrollView.contentContainer.style.paddingTop = value;
+                serializedData.contentPadding = value;
+                m_CollectionView.SaveViewData();
+            }
+        }
+
+        float contentHeight
+        {
+            get => serializedData.contentHeight;
+            set
+            {
+                m_CollectionView.scrollView.contentContainer.style.height = value;
+                serializedData.contentHeight = value;
+                m_CollectionView.SaveViewData();
+            }
+        }
+
+        int anchoredIndex
+        {
+            get => serializedData.anchoredItemIndex;
+            set
+            {
+                serializedData.anchoredItemIndex = value;
+                m_CollectionView.SaveViewData();
+            }
+        }
 
-        float storedPadding
+        float anchorOffset
         {
-            get => m_CollectionView.serializedVirtualizationData.storedPadding;
+            get => serializedData.anchorOffset;
             set
             {
-                m_CollectionView.serializedVirtualizationData.storedPadding = value;
+                serializedData.anchorOffset = value;
                 m_CollectionView.SaveViewData();
             }
         }
 
+        float viewportMaxOffset => serializedData.scrollOffset.y + m_ScrollView.contentViewport.layout.height;
+
         Action m_FillCallback;
+        Action m_ScrollCallback;
+        Action m_ScrollResetCallback;
         Action<ReusableCollectionItem> m_GeometryChangedCallback;
         IVisualElementScheduledItem m_ScheduledItem;
-        IVisualElementScheduledItem m_ScrollbarsScheduledItem;
-        Action m_UpdateScrollbarsCallback;
+        IVisualElementScheduledItem m_ScrollScheduledItem;
+        IVisualElementScheduledItem m_ScrollResetScheduledItem;
         Predicate<int> m_IndexOutOfBoundsPredicate;
 
+        // Dynamic height virtualization handles the refresh binding with the scheduled Fill call.
+        protected override bool alwaysRebindOnRefresh => false;
+
         public DynamicHeightVirtualizationController(BaseVerticalCollectionView collectionView)
             : base(collectionView)
         {
             m_FillCallback = Fill;
+            m_ScrollCallback = OnScrollUpdate;
             m_GeometryChangedCallback = OnRecycledItemGeometryChanged;
             m_IndexOutOfBoundsPredicate = IsIndexOutOfBounds;
-            m_UpdateScrollbarsCallback = UpdateScrollViewScrollers;
+            m_ScrollResetCallback = ResetScroll;
         }
 
         public override void Refresh(bool rebuild)
         {
             CleanItemHeightCache();
 
+            var previousActiveItemsCount = m_ActiveItems.Count;
+            var needsApply = false;
+
             if (rebuild)
             {
                 m_WaitingCache.Clear();
             }
             else
             {
-                m_WaitingCache.RemoveWhere(m_IndexOutOfBoundsPredicate);
-
-                // Update item height of active items to support index changes (reordering).
-                foreach (var item in m_ActiveItems)
-                {
-                    if (IsIndexOutOfBounds(item.index) || item.rootElement.style.display == DisplayStyle.None)
-                        continue;
-
-                    UpdateRegisteredHeight(item);
-                }
+                needsApply |= m_WaitingCache.RemoveWhere(m_IndexOutOfBoundsPredicate) > 0;
             }
 
             base.Refresh(rebuild);
 
+            m_ScrollDirection = ScrollDirection.Idle;
+            m_LastChange = VirtualizationChange.None;
+
             if (m_CollectionView.HasValidDataAndBindings())
             {
-                m_ScheduledItem ??= m_CollectionView.schedule.Execute(m_FillCallback);
+                if (needsApply || previousActiveItemsCount != m_ActiveItems.Count)
+                {
+                    contentHeight = GetExpectedContentHeight();
+                    var scrollableHeight = Mathf.Max(0, contentHeight - m_ScrollView.contentViewport.layout.height);
+                    m_ScrollView.verticalScroller.slider.SetHighValueWithoutNotify(scrollableHeight);
+                    m_ScrollView.verticalScroller.value = serializedData.scrollOffset.y;
+                    serializedData.scrollOffset.y = m_ScrollView.verticalScroller.value;
+                }
+
+                ScheduleFill();
             }
         }
 
         public override void ScrollToItem(int index)
         {
-            if (visibleItemCount == 0 || index < -1)
+            if (index < ReusableCollectionItem.UndefinedIndex)
                 return;
 
             var currentContentHeight = m_ScrollView.contentContainer.layout.height;
@@ -106,207 +195,285 @@ public override void ScrollToItem(int index)
             {
                 // Scroll to last item
                 m_ForcedLastVisibleItem = itemsCount - 1;
+                m_ForcedFirstVisibleItem = ReusableCollectionItem.UndefinedIndex;
                 m_StickToBottom = true;
                 m_ScrollView.scrollOffset = new Vector2(0, viewportHeight >= currentContentHeight ? 0 : currentContentHeight);
             }
             else if (firstVisibleIndex >= index)
             {
                 m_ForcedFirstVisibleItem = index;
+                m_ForcedLastVisibleItem = ReusableCollectionItem.UndefinedIndex;
                 m_ScrollView.scrollOffset = new Vector2(0, GetContentHeightForIndex(index - 1));
             }
             else // index > first
             {
                 var itemOffset = GetContentHeightForIndex(index);
-                if (itemOffset < storedPadding + viewportHeight)
+                if (itemOffset < contentPadding + viewportHeight)
                     return;
 
-                m_ForcedLastVisibleItem = index;
-
                 var yScrollOffset = itemOffset - viewportHeight + BaseVerticalCollectionView.s_DefaultItemHeight;
-
+                m_ForcedLastVisibleItem = index;
+                m_ForcedFirstVisibleItem = ReusableCollectionItem.UndefinedIndex;
                 m_ScrollView.scrollOffset = new Vector2(0, yScrollOffset);
             }
         }
 
-        public override void Resize(Vector2 size, int layoutPass)
+        public override void Resize(Vector2 size)
         {
-            var contentHeight = GetExpectedContentHeight();
-            m_ScrollView.contentContainer.style.height = contentHeight;
-
-            // Recalculate offset
-            var firstItemPadding = GetContentHeightForIndex(firstVisibleIndex - 1);
-
-            var previousOffset = m_CollectionView.serializedVirtualizationData.scrollOffset.y;
-            var previousPadding = storedPadding;
-            var deltaOffset = previousOffset - previousPadding;
-            var offset = firstItemPadding + deltaOffset;
+            var expectedContentHeight = GetExpectedContentHeight();
+            contentHeight = Mathf.Max(expectedContentHeight, contentHeight);
 
             // Restore scroll offset and preemptively update the highValue
             // in case this is the initial restore from persistent data and
             // the ScrollView's OnGeometryChanged() didn't update the low
             // and highValues.
-            var scrollableHeight = Mathf.Max(0, contentHeight - m_ScrollView.contentViewport.layout.height);
-            var scrollOffset = Mathf.Min(offset, scrollableHeight);
+            var viewportHeight = m_ScrollView.contentViewport.layout.height;
+            var scrollableHeight = Mathf.Max(0, contentHeight - viewportHeight);
+            var scrollOffset = Mathf.Min(serializedData.scrollOffset.y, scrollableHeight);
             m_ScrollView.verticalScroller.slider.SetHighValueWithoutNotify(scrollableHeight);
-            m_ScrollView.verticalScroller.value = scrollOffset;
-            m_CollectionView.serializedVirtualizationData.scrollOffset.y = m_ScrollView.verticalScroller.value;
-            m_ScrollView.contentContainer.style.paddingTop = firstItemPadding;
-            storedPadding = firstItemPadding;
+            m_ScrollView.verticalScroller.slider.SetValueWithoutNotify(scrollOffset);
+            serializedData.scrollOffset.y = m_ScrollView.verticalScroller.value;
+
+            // We virtualize a number of items based on the smallest expected item height.
+            var resolvedViewportHeight = m_CollectionView.ResolveItemHeight(size.y);
+            var itemCountFromHeight = Mathf.CeilToInt(resolvedViewportHeight / defaultExpectedHeight);
+            var expectedItemCount = itemCountFromHeight;
+            if (expectedItemCount <= 0)
+                return;
 
-            if (layoutPass == 0)
-            {
-                Fill();
-                OnScroll(new Vector2(0, scrollOffset));
-            }
-            else if (m_ScheduledItem == null)
+            expectedItemCount += k_ExtraVisibleItems;
+
+            var itemCount = Mathf.Min(expectedItemCount, itemsCount);
+
+            if (m_ActiveItems.Count != itemCount)
             {
-                m_ScheduledItem = m_CollectionView.schedule.Execute(m_FillCallback);
+                var initialItemCount = m_ActiveItems.Count;
+                if (initialItemCount > itemCount)
+                {
+                    // Shrink
+                    var removeCount = initialItemCount - itemCount;
+                    for (var i = 0; i < removeCount; i++)
+                    {
+                        var lastIndex = m_ActiveItems.Count - 1;
+                        ReleaseItem(lastIndex);
+                    }
+                }
+                else
+                {
+                    // Grow
+                    var addCount = itemCount - m_ActiveItems.Count;
+                    for (var i = 0; i < addCount; i++)
+                    {
+                        var index = i + firstVisibleIndex + initialItemCount;
+                        var recycledItem = GetOrMakeItemAtIndex();
+
+                        if (IsIndexOutOfBounds(index))
+                        {
+                            HideItem(m_ActiveItems.Count - 1);
+                            continue;
+                        }
+
+                        Setup(recycledItem, index);
+                        MarkWaitingForLayout(recycledItem);
+                    }
+                }
             }
+
+            ScheduleFill();
+            ScheduleScrollDirectionReset();
+
+            m_LastChange = VirtualizationChange.Resize;
         }
 
         public override void OnScroll(Vector2 scrollOffset)
         {
-            if (float.IsNaN(lastHeight) || float.IsNaN(scrollOffset.y))
+            if (m_DelayedScrollOffset == scrollOffset)
                 return;
 
-            var offset = scrollOffset.y;
-            var contentHeight = GetExpectedContentHeight();
-            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.serializedVirtualizationData.scrollOffset.y = Mathf.Min(offset, maxOffset);
+            m_DelayedScrollOffset = scrollOffset;
 
-            if (scrollOffset.y == 0)
+            // ScrollToItem forced a new offset, let's scroll right away, it will be our new saved state.
+            if (m_ForcedFirstVisibleItem != -1 || m_ForcedLastVisibleItem != -1)
             {
-                m_ForcedFirstVisibleItem = 0;
+                OnScrollUpdate();
+                m_LastChange = VirtualizationChange.ForcedScroll;
+                return;
             }
-            else
+
+            // As we resize, the geometry changed event of the ScrollView tries to change the scroll offset as it
+            // updates the scrollers. We want to keep our cached values, so we reassign them and early out until we're
+            // in an idle state where we receive true user input.
+            if (m_LastChange is VirtualizationChange.Resize or VirtualizationChange.ForcedScroll)
+            {
+                var viewportHeight = m_ScrollView.contentViewport.layout.height;
+                var scrollableHeight = Mathf.Max(0, contentHeight - viewportHeight);
+                var offset = Mathf.Min(serializedData.scrollOffset.y, scrollableHeight);
+                m_ScrollView.verticalScroller.slider.SetHighValueWithoutNotify(scrollableHeight);
+                m_ScrollView.verticalScroller.slider.SetValueWithoutNotify(offset);
+                serializedData.scrollOffset.y = m_ScrollView.verticalScroller.value;
+                return;
+            }
+
+            // Schedule later to allow receiving multiple scroll events in one frame and potentially avoid a few expensive rebind.
+            ScheduleScroll();
+        }
+
+        void OnScrollUpdate()
+        {
+            var scrollOffset = float.IsNegativeInfinity(m_DelayedScrollOffset.y) ? serializedData.scrollOffset : m_DelayedScrollOffset;
+
+            if (float.IsNaN(m_ScrollView.contentViewport.layout.height) || float.IsNaN(scrollOffset.y))
+                return;
+
+            m_LastChange = VirtualizationChange.Scroll;
+            var expectedContentHeight = GetExpectedContentHeight();
+
+            // Keep the serialized value if new content is smaller. Adjustment will come later in Fill or Apply.
+            contentHeight = Mathf.Max(expectedContentHeight, contentHeight);
+            m_ScrollDirection = scrollOffset.y < serializedData.scrollOffset.y ? ScrollDirection.Up : ScrollDirection.Down;
+            var scrollableHeight = Mathf.Max(0, contentHeight - m_ScrollView.contentViewport.layout.height);
+
+            if (scrollOffset.y <= 0)
             {
-                m_StickToBottom = scrollableHeight > 0 && Math.Abs(scrollOffset.y - m_ScrollView.verticalScroller.highValue) < float.Epsilon;
+                m_ForcedFirstVisibleItem = 0;
             }
 
-            var firstIndex = m_ForcedFirstVisibleItem != -1 ? m_ForcedFirstVisibleItem : GetFirstVisibleItem(m_CollectionView.serializedVirtualizationData.scrollOffset.y);
+            m_StickToBottom = scrollableHeight > 0 && Math.Abs(scrollOffset.y - m_ScrollView.verticalScroller.highValue) < float.Epsilon;
+            serializedData.scrollOffset = scrollOffset;
+            m_CollectionView.SaveViewData();
+
+            var firstIndex = m_ForcedFirstVisibleItem != -1 ? m_ForcedFirstVisibleItem : GetFirstVisibleItem(serializedData.scrollOffset.y);
             var firstVisiblePadding = GetContentHeightForIndex(firstIndex - 1);
+            contentPadding = firstVisiblePadding;
             m_ForcedFirstVisibleItem = -1;
 
             if (firstIndex != firstVisibleIndex)
             {
-                firstVisibleIndex = firstIndex;
+                CycleItems(firstIndex);
+            }
+            else
+            {
+                Fill();
+            }
 
-                if (m_ActiveItems.Count > 0)
-                {
-                    var currentFirstVisibleItem = firstVisibleItem;
-                    if (m_StickToBottom || currentFirstVisibleItem == null)
-                    {
-                        // Skip the item swapping.
-                    }
-                    else if (firstVisibleIndex < currentFirstVisibleItem.index) //we're scrolling up
-                    {
-                        //How many do we have to swap back
-                        var count = currentFirstVisibleItem.index - firstVisibleIndex;
+            ScheduleScrollDirectionReset();
 
-                        var inserting = m_ScrollInsertionList;
+            m_DelayedScrollOffset = Vector2.negativeInfinity;
+        }
 
-                        for (var i = 0; i < count && m_ActiveItems.Count > 0; ++i)
-                        {
-                            var last = m_ActiveItems[^1];
-                            if (last.rootElement.layout.y < m_CollectionView.serializedVirtualizationData.scrollOffset.y + m_ScrollView.contentViewport.layout.height)
-                                break;
+        void CycleItems(int firstIndex)
+        {
+            if (firstIndex == firstVisibleIndex)
+                return;
 
-                            inserting.Add(last);
-                            m_ActiveItems.RemoveAt(m_ActiveItems.Count - 1); //we remove from the end
+            var currentFirstVisibleItem = firstVisibleItem;
+            contentPadding = GetContentHeightForIndex(firstIndex - 1);
+            firstVisibleIndex = firstIndex;
 
-                            last.rootElement.SendToBack(); //We send the element to the top of the list (back in z-order)
-                        }
+            if (m_ActiveItems.Count > 0)
+            {
+                if (currentFirstVisibleItem == null || m_ActiveItems.Count <= Mathf.Abs(firstVisibleIndex - currentFirstVisibleItem.index))
+                {
+                    // We're scrolling for more items than the number of visible items, let's just rebind everything
+                    // without cycling them in the scroll view / active items.
+                }
+                else if (firstVisibleIndex < currentFirstVisibleItem.index) // we're scrolling up.
+                {
+                    //How many do we have to swap back.
+                    var count = currentFirstVisibleItem.index - firstVisibleIndex;
+                    var inserting = m_ScrollInsertionList;
 
-                        m_ActiveItems.InsertRange(0, inserting);
-                        m_ScrollInsertionList.Clear();
-                    }
-                    else // down
+                    for (var i = 0; i < count; ++i)
                     {
-                        var currentLastVisibleItem = lastVisibleItem;
-                        if (firstVisibleIndex < currentLastVisibleItem.index && !IsIndexOutOfBounds(currentLastVisibleItem.index))
-                        {
-                            var inserting = m_ScrollInsertionList;
-
-                            var checkIndex = 0;
-                            while (firstVisibleIndex > m_ActiveItems[checkIndex].index)
-                            {
-                                var first = m_ActiveItems[checkIndex];
-                                inserting.Add(first);
-                                checkIndex++;
+                        var last = m_ActiveItems[^1];
+                        inserting.Insert(0, last);
+                        m_ActiveItems.RemoveAt(m_ActiveItems.Count - 1); // we remove from the end.
 
-                                first.rootElement.BringToFront(); //We send the element to the bottom of the list (front in z-order)
-                            }
-
-                            m_ActiveItems.RemoveRange(0, checkIndex); //we remove them all at once
-                            m_ActiveItems.AddRange(inserting); // add them back to the end
-                            m_ScrollInsertionList.Clear();
-                        }
+                        last.rootElement.SendToBack(); //We send the element to the top of the list (back in z-order)
                     }
 
-                    var itemContentOffset = firstVisiblePadding;
+                    m_ActiveItems.InsertRange(0, inserting);
+                    m_ScrollInsertionList.Clear();
+                }
+                else // we're scrolling down
+                {
+                    var inserting = m_ScrollInsertionList;
 
-                    //Let's rebind everything
-                    for (var i = 0; i < m_ActiveItems.Count; i++)
+                    var checkIndex = 0;
+                    while (firstVisibleIndex > m_ActiveItems[checkIndex].index)
                     {
-                        var recycledItem = m_ActiveItems[i];
-                        var index = firstVisibleIndex + i;
-                        var previousIndex = recycledItem.index;
-                        m_WaitingCache.Remove(previousIndex);
+                        var first = m_ActiveItems[checkIndex];
+                        inserting.Add(first);
+                        checkIndex++;
 
-                        if (IsIndexOutOfBounds(index))
-                        {
-                            if (recycledItem.rootElement.style.display == DisplayStyle.Flex)
-                            {
-                                m_StickToBottom = true;
-                                m_ForcedLastVisibleItem = -1;
-                                HideItem(i);
-                            }
-
-                            m_WaitingCache.Remove(index);
-                            continue;
-                        }
+                        first.rootElement.BringToFront(); //We send the element to the bottom of the list (front in z-order)
+                    }
 
-                        var isItemInViewport = itemContentOffset - m_CollectionView.serializedVirtualizationData.scrollOffset.y <= m_ScrollView.contentViewport.layout.height;
+                    m_ActiveItems.RemoveRange(0, checkIndex); //we remove them all at once
+                    m_ActiveItems.AddRange(inserting); // add them back to the end
+                    m_ScrollInsertionList.Clear();
+                }
 
-                        Setup(recycledItem, index);
+                var itemContentOffset = contentPadding;
 
-                        if (isItemInViewport)
-                        {
-                            if (index != previousIndex)
-                            {
-                                m_WaitingCache.Add(index);
-                            }
-                        }
-                        else
-                        {
-                            HideItem(i);
-                        }
+                //Let's rebind everything
+                for (var i = 0; i < m_ActiveItems.Count; i++)
+                {
+                    var recycledItem = m_ActiveItems[i];
+                    var index = firstVisibleIndex + i;
+                    var previousIndex = recycledItem.index;
+                    var wasVisible = recycledItem.rootElement.style.display == DisplayStyle.Flex;
+                    m_WaitingCache.Remove(previousIndex);
+
+                    if (IsIndexOutOfBounds(index))
+                    {
+                        HideItem(i);
+                        continue;
+                    }
+
+                    Setup(recycledItem, index);
 
-                        itemContentOffset += GetExpectedItemHeight(index);
+                    var isItemOutsideViewport = itemContentOffset > viewportMaxOffset;
+                    if (isItemOutsideViewport)
+                    {
+                        HideItem(i);
+                    }
+                    else if (index != previousIndex || !wasVisible)
+                    {
+                        MarkWaitingForLayout(recycledItem);
                     }
+
+                    itemContentOffset += GetExpectedItemHeight(index);
                 }
             }
 
-            storedPadding = firstVisiblePadding;
-            m_ScrollView.contentContainer.style.paddingTop = firstVisiblePadding;
-            m_ScheduledItem ??= m_CollectionView.schedule.Execute(m_FillCallback);
+            // Save anchored item.
+            if (m_LastChange != VirtualizationChange.Resize)
+            {
+                UpdateAnchor();
+            }
+
+            ScheduleFill();
         }
 
         bool NeedsFill()
         {
+            // No need to fill until we get to a stable state.
+            if (m_LastChange != VirtualizationChange.None || anchoredIndex < 0)
+                return false;
+
             var lastItemIndex = lastVisibleItem?.index ?? -1;
-            var padding = storedPadding;
+            var contentOffset = contentPadding;
 
-            if (padding > m_CollectionView.serializedVirtualizationData.scrollOffset.y)
+            if (contentOffset > serializedData.scrollOffset.y)
                 return true;
 
             for (var i = firstVisibleIndex; i < itemsCount; i++)
             {
-                if (padding - m_CollectionView.serializedVirtualizationData.scrollOffset.y > m_ScrollView.contentViewport.layout.height)
+                if (contentOffset >= viewportMaxOffset)
                     break;
 
-                padding += GetExpectedItemHeight(i);
+                contentOffset += GetExpectedItemHeight(i);
 
                 if (i > lastItemIndex)
                     return true;
@@ -320,209 +487,312 @@ void Fill()
             if (!m_CollectionView.HasValidDataAndBindings())
                 return;
 
-            // Wait for view to scroll first.
-            var contentHeight = GetExpectedContentHeight();
-            if (storedPadding > contentHeight)
+            if (m_ActiveItems.Count == 0)
+            {
+                // Reset the saved content height.
+                contentHeight = 0;
+                contentPadding = 0;
                 return;
+            }
 
-            var itemsToAdd = 0;
-            var lastItemIndex = lastVisibleItem?.index ?? -1;
-            var firstVisiblePadding = storedPadding;
-            var padding = firstVisiblePadding;
+            // Let the UI stabilize.
+            if (anchoredIndex < 0)
+                return;
 
-            if (m_CollectionView.dragger is ListViewDraggerAnimated dragger && dragger.draggedItem != null)
+            // Wait for view to scroll first.
+            if (contentPadding > contentHeight)
             {
-                padding -= dragger.draggedItem.rootElement.style.height.value.value;
+                OnScrollUpdate();
+                return;
             }
 
-            // Find how many items we should add to fill the viewport.
+            var firstVisiblePadding = contentPadding;
+            var contentOffset = contentPadding;
+            var activeIndex = 0;
+
+            // Change the visibility of items under the current content to fill the viewport below.
             for (var i = firstVisibleIndex; i < itemsCount; i++)
             {
-                if (padding - m_CollectionView.serializedVirtualizationData.scrollOffset.y > m_ScrollView.contentViewport.layout.height)
+                if (contentOffset >= viewportMaxOffset)
                     break;
+            
+                contentOffset += GetExpectedItemHeight(i);
 
-                padding += GetExpectedItemHeight(i);
+                var item = m_ActiveItems[activeIndex++];
+                if (item.index != i || item.rootElement.style.display == DisplayStyle.None)
+                {
+                    Setup(item, i);
+                    MarkWaitingForLayout(item);
+                }
 
-                if (i > lastItemIndex)
-                    itemsToAdd++;
+                if (activeIndex >= m_ActiveItems.Count)
+                {
+                    break;
+                }
             }
 
-            // Give some leverage to the layout system to avoid coming back here too often.
-            if (itemsToAdd > 0 && !m_StickToBottom && m_ActiveItems.Count - visibleItemCount < itemsToAdd)
-                itemsToAdd += k_AdditionalItems;
-
-            // Grow down
-            var initialVisibleCount = visibleItemCount;
-            for (var i = 0; i < itemsToAdd; i++)
+            // Bring back items in front of the current content to fill the viewport above.
+            if (firstVisibleIndex > 0 && contentPadding > serializedData.scrollOffset.y)
             {
-                var index = i + firstVisibleIndex + initialVisibleCount;
-                if (index >= itemsCount)
-                    break;
+                var inserting = m_ScrollInsertionList;
 
-                var recycledItem = GetOrMakeItemAtIndex();
-                m_WaitingCache.Add(index);
-                Setup(recycledItem, index);
-            }
+                for (var i = m_ActiveItems.Count - 1; i >= activeIndex; --i)
+                {
+                    if (firstVisibleIndex == 0)
+                        break;
 
-            // Grow upwards
-            while (firstVisiblePadding > m_CollectionView.serializedVirtualizationData.scrollOffset.y)
-            {
-                var index = firstVisibleIndex - 1;
+                    var last = m_ActiveItems[i];
 
-                if (index < 0)
-                    break;
+                    inserting.Insert(0, last);
+                    m_ActiveItems.RemoveAt(m_ActiveItems.Count - 1); // we remove from the end
+                    last.rootElement.SendToBack();
 
-                var recycledItem = GetOrMakeItemAtIndex(0, 0);
-                m_WaitingCache.Add(index);
-                Setup(recycledItem, index);
+                    var newIndex = --firstVisibleIndex;
+                    Setup(last, newIndex);
+                    MarkWaitingForLayout(last);
 
-                firstVisiblePadding -= GetExpectedItemHeight(index);
-                firstVisibleIndex = index;
+                    firstVisiblePadding -= GetExpectedItemHeight(newIndex);
+                    if (firstVisiblePadding < serializedData.scrollOffset.y)
+                        break;
+                }
+            
+                m_ActiveItems.InsertRange(0, inserting);
+                m_ScrollInsertionList.Clear();
             }
 
-            m_ScrollView.contentContainer.style.paddingTop = firstVisiblePadding;
-            storedPadding = firstVisiblePadding;
-            m_ScheduledItem = null;
-        }
+            contentPadding = firstVisiblePadding;
+            contentHeight = GetExpectedContentHeight();
 
-        public override int GetIndexFromPosition(Vector2 position)
-        {
-            var index = 0;
-            var traversedHeight = 0f;
-            while (traversedHeight < position.y)
+            // During resize, we must not update the anchored item, as it may take a while for the UI to stabilize.
+            if (m_LastChange != VirtualizationChange.Resize)
             {
-                traversedHeight += GetExpectedItemHeight(index++);
+                UpdateAnchor();
             }
 
-            return index - 1;
-        }
-
-        float defaultExpectedHeight => m_CollectionView.m_ItemHeightIsInline ? m_CollectionView.fixedItemHeight : m_AverageHeight;
-
-        public override float GetExpectedItemHeight(int index)
-        {
-            return m_ItemHeightCache.TryGetValue(index, out var height) ? height : defaultExpectedHeight;
-        }
-
-        int GetFirstVisibleItem(float offset)
-        {
-            if (offset <= 0)
-                return 0;
-
-            var index = -1;
-            while (offset > 0)
+            // After a fill, we want to reapply the dimensions correctly if anything changed.
+            if (m_WaitingCache.Count == 0)
             {
-                index++;
-                var height = GetExpectedItemHeight(index);
-                offset -= height;
+                ResetScroll();
+                ApplyScrollViewUpdate(true);
             }
-
-            return index;
         }
 
-        void UpdateScrollViewContainer(int index, float previousHeight, float newHeight)
+        void UpdateScrollViewContainer(float previousHeight, float newHeight)
         {
-            var previousOffset = m_CollectionView.serializedVirtualizationData.scrollOffset.y;
-            var previousPadding = storedPadding;
-
-            storedPadding = GetContentHeightForIndex(firstVisibleIndex - 1);
-
             if (m_StickToBottom)
                 return;
 
-            if (newHeight < previousHeight)
-            {
-                foreach (var item in m_ActiveItems)
-                {
-                    if (item.index == itemsCount - 1 && item.rootElement.style.display == DisplayStyle.Flex)
-                    {
-                        m_StickToBottom = true;
-                        return;
-                    }
-                }
-            }
-
             if (m_ForcedLastVisibleItem >= 0)
             {
                 var lastItemHeight = GetContentHeightForIndex(m_ForcedLastVisibleItem);
-                m_CollectionView.serializedVirtualizationData.scrollOffset.y = lastItemHeight + BaseVerticalCollectionView.s_DefaultItemHeight - m_ScrollView.contentViewport.layout.height;
+                serializedData.scrollOffset.y = lastItemHeight + BaseVerticalCollectionView.s_DefaultItemHeight - m_ScrollView.contentViewport.layout.height;
             }
             else
             {
-                var offset = previousOffset - previousPadding;
-
-                // We need to adjust the scroll offset relative to the new item height.
-                if (index == firstVisibleIndex && offset != 0)
+                if (m_ScrollDirection == ScrollDirection.Up)
                 {
-                    offset += newHeight - previousHeight;
+                    serializedData.scrollOffset.y += newHeight - previousHeight;
                 }
-
-                m_CollectionView.serializedVirtualizationData.scrollOffset.y = storedPadding + offset;
             }
         }
 
-        void ApplyScrollViewUpdate()
+        void ApplyScrollViewUpdate(bool dimensionsOnly = false)
         {
-            var contentHeight = GetExpectedContentHeight();
-            storedPadding = GetContentHeightForIndex(firstVisibleIndex - 1);
+            var previousPadding = contentPadding;
+            var previousScrollOffset = serializedData.scrollOffset.y;
+            var itemOffset = previousScrollOffset - previousPadding;
 
-            m_ScrollView.contentContainer.style.paddingTop = storedPadding;
-            m_ScrollView.contentContainer.style.height = contentHeight;
+            if (anchoredIndex >= 0)
+            {
+                // Force the anchored item to the top.
+                if (firstVisibleIndex != anchoredIndex)
+                {
+                    CycleItems(anchoredIndex);
+                    ScheduleFill();
+                }
+                
+                firstVisibleIndex = anchoredIndex;
+                itemOffset = anchorOffset;
+            }
 
-            var scrollableHeight = Mathf.Max(0, contentHeight - m_ScrollView.contentViewport.layout.height);
+            var expectedContentHeight = GetExpectedContentHeight();
+            contentHeight = expectedContentHeight;
+            contentPadding = GetContentHeightForIndex(firstVisibleIndex - 1);
 
-            if (m_StickToBottom)
+            var scrollableHeight = Mathf.Max(0, expectedContentHeight - m_ScrollView.contentViewport.layout.height);
+            var scrollOffset = Mathf.Min(contentPadding + itemOffset, scrollableHeight);
+
+            // Stick to the end of the viewport.
+            if (m_StickToBottom && scrollableHeight > 0)
             {
-                m_CollectionView.serializedVirtualizationData.scrollOffset.y = scrollableHeight;
+                scrollOffset = scrollableHeight;
+            }
+            else if (m_ForcedLastVisibleItem != -1)
+            {
+                var lastItemHeight = GetContentHeightForIndex(m_ForcedLastVisibleItem);
+                var lastItemViewportOffset = lastItemHeight + BaseVerticalCollectionView.s_DefaultItemHeight - m_ScrollView.contentViewport.layout.height;
+                scrollOffset = lastItemViewportOffset;
             }
 
+            // Don't notify to avoid coming back in the scroll update for no reason.
             m_ScrollView.verticalScroller.slider.SetHighValueWithoutNotify(scrollableHeight);
-            m_ScrollView.verticalScroller.slider.SetValueWithoutNotify(m_CollectionView.serializedVirtualizationData.scrollOffset.y);
-            m_CollectionView.serializedVirtualizationData.scrollOffset.y = m_ScrollView.verticalScroller.slider.value;
+            m_ScrollView.verticalScroller.slider.SetValueWithoutNotify(scrollOffset);
+            serializedData.scrollOffset.y = m_ScrollView.verticalScroller.slider.value;
 
-            if (!NeedsFill())
+            if (dimensionsOnly || m_LastChange == VirtualizationChange.Resize)
+            {
+                ScheduleScrollDirectionReset();
+                return;
+            }
+
+            if (NeedsFill())
+            {
+                Fill();
+            }
+            else
             {
                 // Clear extra items.
-                var itemContentOffset = storedPadding;
+                var itemContentOffset = contentPadding;
                 var previousFirstVisibleIndex = firstVisibleIndex;
 
+                var inserting = m_ScrollInsertionList;
+                var bumpCount = 0;
                 for (var i = 0; i < m_ActiveItems.Count; i++)
                 {
-                    var index = firstVisibleIndex + i;
-                    var isItemInViewport = itemContentOffset - m_CollectionView.serializedVirtualizationData.scrollOffset.y < m_ScrollView.contentViewport.layout.height;
+                    var item = m_ActiveItems[i];
+                    var index = item.index;
 
-                    if (!isItemInViewport && m_ActiveItems[i].rootElement.style.display == DisplayStyle.Flex)
-                    {
-                        HideItem(i);
+                    if (index < 0)
+                        break;
 
-                        if (firstVisibleIndex == index)
-                            firstVisibleIndex = index + 1;
+                    var itemHeight = GetExpectedItemHeight(index);
+
+                    // Hide items outside viewport's top/bottom.
+                    if (m_ActiveItems[i].rootElement.style.display == DisplayStyle.Flex)
+                    {
+                        // Items above the viewport bounds need to be sent back to the back of active items.
+                        if (itemContentOffset + itemHeight <= serializedData.scrollOffset.y)
+                        {
+                            item.rootElement.BringToFront(); // We send the element to the bottom of the list (front in z-order)
+                            HideItem(i);
+                            inserting.Add(item);
+                            bumpCount++;
+                            firstVisibleIndex++;
+                        }
+                        else if (itemContentOffset > viewportMaxOffset)
+                        {
+                            // We can just hide items below the bounds of the viewport.
+                            HideItem(i);
+                        }
                     }
 
                     itemContentOffset += GetExpectedItemHeight(index);
                 }
 
+                m_ActiveItems.RemoveRange(0, bumpCount); //we remove them all at once
+                m_ActiveItems.AddRange(inserting); // add them back to the end
+                m_ScrollInsertionList.Clear();
+
                 if (firstVisibleIndex != previousFirstVisibleIndex)
                 {
-                    storedPadding = GetContentHeightForIndex(firstVisibleIndex - 1);
+                    contentPadding = GetContentHeightForIndex(firstVisibleIndex - 1);
+                    UpdateAnchor();
                 }
 
-                m_StickToBottom = false;
+                ScheduleScrollDirectionReset();
                 m_ForcedLastVisibleItem = -1;
-                m_ScheduledItem?.Pause();
-                m_ScheduledItem = null;
                 m_CollectionView.SaveViewData();
             }
-            else
+        }
+
+        void UpdateAnchor()
+        {
+            anchoredIndex = firstVisibleIndex;
+            anchorOffset = serializedData.scrollOffset.y - contentPadding;
+        }
+
+        void ScheduleFill()
+        {
+            if (m_ScheduledItem == null)
             {
-                Fill();
+                m_ScheduledItem = m_CollectionView.schedule.Execute(m_FillCallback);
+                return;
+            }
+
+            m_ScheduledItem.Pause();
+            m_ScheduledItem.Resume();
+        }
+        
+        void ScheduleScroll()
+        {
+            if (m_ScrollScheduledItem == null)
+            {
+                m_ScrollScheduledItem = m_CollectionView.schedule.Execute(m_ScrollCallback);
+                return;
+            }
+
+            m_ScrollScheduledItem.Pause();
+            m_ScrollScheduledItem.Resume();
+        }
+
+        void ScheduleScrollDirectionReset()
+        {
+            if (m_ScrollResetScheduledItem == null)
+            {
+                m_ScrollResetScheduledItem = m_CollectionView.schedule.Execute(m_ScrollResetCallback);
+                return;
+            }
+
+            m_ScrollResetScheduledItem.Pause();
+            m_ScrollResetScheduledItem.Resume();
+        }
+
+        void ResetScroll()
+        {
+            m_ScrollDirection = ScrollDirection.Idle;
+            m_LastChange = VirtualizationChange.None;
+            m_ScrollView.UpdateContentViewTransform();
+            UpdateAnchor();
+            m_CollectionView.SaveViewData();
+        }
+
+        public override int GetIndexFromPosition(Vector2 position)
+        {
+            var index = 0;
+            var traversedHeight = 0f;
+            while (traversedHeight < position.y)
+            {
+                traversedHeight += GetExpectedItemHeight(index++);
             }
+
+            return index - 1;
         }
 
-        void UpdateScrollViewScrollers()
+        public override float GetExpectedItemHeight(int index)
         {
-            m_ScrollView.UpdateScrollers(m_ScrollView.needsHorizontal, m_ScrollView.needsVertical);
-            m_ScrollbarsScheduledItem = null;
+            var draggedIndex = GetDraggedIndex();
+            if (draggedIndex >= 0 && index == draggedIndex)
+            {
+                return 0;
+            }
+
+            return m_ItemHeightCache.TryGetValue(index, out var height) ? height : defaultExpectedHeight;
+        }
+
+        int GetFirstVisibleItem(float offset)
+        {
+            if (offset <= 0)
+                return 0;
+
+            var index = -1;
+            while (offset > 0)
+            {
+                index++;
+                var height = GetExpectedItemHeight(index);
+                offset -= height;
+            }
+
+            return index;
         }
 
         public override float GetExpectedContentHeight()
@@ -535,9 +805,16 @@ float GetContentHeightForIndex(int lastIndex)
             if (lastIndex < 0)
                 return 0;
 
-            if (m_ContentHeightCache.TryGetValue(lastIndex, out var contentHeight))
+            if (m_ContentHeightCache.TryGetValue(lastIndex, out var height))
             {
-                return contentHeight.sum + (lastIndex - contentHeight.count + 1) * defaultExpectedHeight;
+                // Make sure we don't include the dragged item height.
+                var draggedIndex = GetDraggedIndex();
+                if (draggedIndex >= 0 && lastIndex >= draggedIndex)
+                {
+                    return height.sum + (lastIndex - height.count + 1) * defaultExpectedHeight - m_DraggedItem.rootElement.layout.height;
+                }
+
+                return height.sum + (lastIndex - height.count + 1) * defaultExpectedHeight;
             }
 
             return GetContentHeightForIndex(lastIndex - 1) + GetExpectedItemHeight(lastIndex);
@@ -545,13 +822,15 @@ float GetContentHeightForIndex(int lastIndex)
 
         ContentHeightCacheInfo GetCachedContentHeight(int index)
         {
-            if (index < 0)
-                return default;
+            while (index >= 0)
+            {
+                if (m_ContentHeightCache.TryGetValue(index, out var content))
+                    return content;
 
-            if (m_ContentHeightCache.TryGetValue(index, out var content))
-                return content;
+                index -= 1;
+            }
 
-            return GetCachedContentHeight(index - 1);
+            return default;
         }
 
         void RegisterItemHeight(int index, float height)
@@ -565,8 +844,6 @@ void RegisterItemHeight(int index, float height)
                 m_AccumulatedHeight -= value;
 
             m_AccumulatedHeight += resolvedHeight;
-            var count = m_ItemHeightCache.Count;
-            m_AverageHeight = m_CollectionView.ResolveItemHeight(count > 0 ? m_AccumulatedHeight / count : m_AccumulatedHeight);
             m_ItemHeightCache[index] = resolvedHeight;
 
             if (index > m_HighestCachedIndex)
@@ -613,16 +890,6 @@ void UnregisterItemHeight(int index)
             }
 
             m_HighestCachedIndex = highestIndex;
-
-            var count = m_ItemHeightCache.Count;
-            if (m_AccumulatedHeight <= 0)
-            {
-                m_AverageHeight = BaseVerticalCollectionView.s_DefaultItemHeight;
-            }
-            else
-            {
-                m_AverageHeight = m_CollectionView.ResolveItemHeight(count > 0 ? m_AccumulatedHeight / count : m_AccumulatedHeight);
-            }
         }
 
         void CleanItemHeightCache()
@@ -651,15 +918,15 @@ void CleanItemHeightCache()
             {
                 ListPool<int>.Release(unregisterList);
             }
+
+            m_MinimumItemHeight = -1;
         }
 
         void OnRecycledItemGeometryChanged(ReusableCollectionItem item)
         {
-            if (item.index == ReusableCollectionItem.UndefinedIndex || float.IsNaN(item.rootElement.layout.height) || item.rootElement.layout.height == 0)
+            if (item.index == ReusableCollectionItem.UndefinedIndex || item.isDragGhost || float.IsNaN(item.rootElement.layout.height) || item.rootElement.layout.height == 0)
                 return;
 
-            m_ScrollbarsScheduledItem ??= m_ScrollView.contentContainer.schedule.Execute(m_UpdateScrollbarsCallback);
-
             if (UpdateRegisteredHeight(item))
             {
                 ApplyScrollViewUpdate();
@@ -668,17 +935,40 @@ void OnRecycledItemGeometryChanged(ReusableCollectionItem item)
 
         bool UpdateRegisteredHeight(ReusableCollectionItem item)
         {
-            if (item.index == ReusableCollectionItem.UndefinedIndex || float.IsNaN(item.rootElement.layout.height) || item.rootElement.layout.height == 0)
+            if (item.index == ReusableCollectionItem.UndefinedIndex || item.isDragGhost || float.IsNaN(item.rootElement.layout.height) || item.rootElement.layout.height == 0)
                 return false;
 
-            var targetHeight = item.rootElement.layout.height - item.rootElement.style.paddingTop.value.value;
+            if (item.rootElement.layout.height < defaultExpectedHeight)
+            {
+                m_MinimumItemHeight = item.rootElement.layout.height;
+                Resize(m_ScrollView.layout.size);
+            }
+
+            var targetHeight = item.rootElement.layout.height - item.rootElement.resolvedStyle.paddingTop;
             var wasCached = m_ItemHeightCache.TryGetValue(item.index, out var height);
-            var previousHeight = wasCached ? GetExpectedItemHeight(item.index) : targetHeight;
+            var previousHeight = wasCached ? GetExpectedItemHeight(item.index) : defaultExpectedHeight;
 
-            if (!wasCached || !targetHeight.Equals(height))
+            // Update the m_StickToBottom variable.
+            if (m_WaitingCache.Count == 0)
+            {
+                // When the size increases on an item that wasn't waiting for layout, we are certainly not sticking
+                // to the bottom. Otherwise, we should check if we should.
+                if (targetHeight > previousHeight)
+                {
+                    m_StickToBottom = false;
+                }
+                else
+                {
+                    var deltaHeight = targetHeight - previousHeight;
+                    var scrollableHeight = Mathf.Max(0, contentHeight - m_ScrollView.contentViewport.layout.height);
+                    m_StickToBottom = scrollableHeight > 0 && serializedData.scrollOffset.y >= m_ScrollView.verticalScroller.highValue + deltaHeight;
+                }
+            }
+
+            if (!wasCached || !Mathf.Approximately(targetHeight, height))
             {
                 RegisterItemHeight(item.index, targetHeight);
-                UpdateScrollViewContainer(item.index, previousHeight, targetHeight);
+                UpdateScrollViewContainer(previousHeight, targetHeight);
 
                 if (m_WaitingCache.Count == 0)
                 {
@@ -691,47 +981,64 @@ bool UpdateRegisteredHeight(ReusableCollectionItem item)
 
         internal override T GetOrMakeItemAtIndex(int activeItemIndex = -1, int scrollViewIndex = -1)
         {
-            // Reuse hidden items first.
-            foreach (var i in m_ActiveItems)
-            {
-                if (i.rootElement.style.display == DisplayStyle.None)
-                {
-                    if (activeItemIndex != -1)
-                    {
-                        m_ActiveItems.Remove(i);
-                        m_ActiveItems.Insert(activeItemIndex, i);
-                    }
-
-                    if (scrollViewIndex != -1)
-                    {
-                        m_ScrollView.Insert(scrollViewIndex, i.rootElement);
-                    }
-
-                    return i;
-                }
-            }
-
             var item = base.GetOrMakeItemAtIndex(activeItemIndex, scrollViewIndex);
             item.onGeometryChanged += m_GeometryChangedCallback;
             return item;
         }
 
-        public override void ReplaceActiveItem(int index)
-        {
-            base.ReplaceActiveItem(index);
-            m_WaitingCache.Remove(index);
-        }
-
         internal override void ReleaseItem(int activeItemsIndex)
         {
             var item = m_ActiveItems[activeItemsIndex];
             item.onGeometryChanged -= m_GeometryChangedCallback;
             var index = item.index;
+
             UnregisterItemHeight(index);
             base.ReleaseItem(activeItemsIndex);
             m_WaitingCache.Remove(index);
         }
 
+        internal override void StartDragItem(ReusableCollectionItem item)
+        {
+            m_WaitingCache.Remove(item.index);
+            base.StartDragItem(item);
+
+            // We don't need to track geometry changes for the dragged item
+            m_DraggedItem.onGeometryChanged -= m_GeometryChangedCallback;
+        }
+
+        internal override void EndDrag(int dropIndex)
+        {
+            // Update item height of active items to support index changes (reordering).
+            var draggingDown = m_DraggedItem.index < dropIndex;
+            var startIndex = m_DraggedItem.index;
+            var increment = draggingDown ? 1 : -1;
+            var startItemHeight = GetExpectedItemHeight(startIndex);
+            for (var i = startIndex; i != dropIndex; i += increment)
+            {
+                var height = GetExpectedItemHeight(i);
+                var nextHeight = GetExpectedItemHeight(i + increment);
+                if (Mathf.Approximately(height, nextHeight))
+                    continue;
+
+                RegisterItemHeight(i, nextHeight);
+            }
+
+            RegisterItemHeight(draggingDown ? dropIndex - 1 : dropIndex, startItemHeight);
+
+            // With the new updated height, we need to grab anchors on the new first element if needed.
+            if (firstVisibleIndex > m_DraggedItem.index)
+            {
+                firstVisibleIndex = GetFirstVisibleItem(serializedData.scrollOffset.y);
+                UpdateAnchor();
+            }
+
+            // Restore the geometry changed event.
+            m_DraggedItem.onGeometryChanged += m_GeometryChangedCallback;
+
+            // Clear the dragged item reference.
+            base.EndDrag(dropIndex);
+        }
+
         void HideItem(int activeItemsIndex)
         {
             var item = m_ActiveItems[activeItemsIndex];
@@ -739,6 +1046,21 @@ void HideItem(int activeItemsIndex)
             m_WaitingCache.Remove(item.index);
         }
 
+        void MarkWaitingForLayout(T item)
+        {
+            // We don't wait for the layout of the dragged item, it will stay hidden.
+            if (item.isDragGhost)
+                return;
+
+            m_WaitingCache.Add(item.index);
+
+            // This will ensure the GeometryChangedEvent is triggered no matter what.
+            // We depend on it to know when all items are laid out to update the contentContainer size,
+            // so we need to make sure it is going to be called when we track it.
+            item.rootElement.lastLayout = Rect.zero;
+            item.rootElement.MarkDirtyRepaint();
+        }
+
         bool IsIndexOutOfBounds(int i)
         {
             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 5bbf26963f..00eba51d20 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/FixedHeightVirtualizationController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/FixedHeightVirtualizationController.cs
@@ -64,7 +64,7 @@ public override void ScrollToItem(int index)
             }
         }
 
-        public override void Resize(Vector2 size, int layoutPass)
+        public override void Resize(Vector2 size)
         {
             var pixelAlignedItemHeight = resolvedItemHeight;
             var contentHeight = GetExpectedContentHeight();
@@ -75,7 +75,7 @@ public override void Resize(Vector2 size, int layoutPass)
             // the ScrollView's OnGeometryChanged() didn't update the low
             // and highValues.
             var scrollableHeight = Mathf.Max(0, contentHeight - m_ScrollView.contentViewport.layout.height);
-            var scrollOffset = Mathf.Min(m_CollectionView.serializedVirtualizationData.scrollOffset.y, scrollableHeight);
+            var scrollOffset = Mathf.Min(serializedData.scrollOffset.y, scrollableHeight);
             m_ScrollView.verticalScroller.slider.SetHighValueWithoutNotify(scrollableHeight);
             m_ScrollView.verticalScroller.slider.SetValueWithoutNotify(scrollOffset);
 
@@ -118,13 +118,13 @@ public override void Resize(Vector2 size, int layoutPass)
 
         public override void OnScroll(Vector2 scrollOffset)
         {
-            var offset = scrollOffset.y;
+            var clampedOffset = Mathf.Max(0, scrollOffset.y);
             var pixelAlignedItemHeight = resolvedItemHeight;
-            var firstVisibleItemIndex = (int)(offset / pixelAlignedItemHeight);
+            var firstVisibleItemIndex = (int)(clampedOffset / pixelAlignedItemHeight);
 
             m_ScrollView.contentContainer.style.paddingTop = firstVisibleItemIndex * pixelAlignedItemHeight;
             m_ScrollView.contentContainer.style.height = itemsCount * pixelAlignedItemHeight;
-            m_CollectionView.serializedVirtualizationData.scrollOffset.y = scrollOffset.y;
+            serializedData.scrollOffset.y = scrollOffset.y;
 
             if (firstVisibleItemIndex != firstVisibleIndex)
             {
@@ -141,7 +141,7 @@ public override void OnScroll(Vector2 scrollOffset)
 
                         for (int i = 0; i < count && m_ActiveItems.Count > 0; ++i)
                         {
-                            var last = m_ActiveItems[m_ActiveItems.Count - 1];
+                            var last = m_ActiveItems[^1];
                             inserting.Add(last);
                             m_ActiveItems.RemoveAt(m_ActiveItems.Count - 1); //we remove from the end
 
@@ -153,7 +153,7 @@ public override void OnScroll(Vector2 scrollOffset)
                     }
                     else //down
                     {
-                        if (firstVisibleIndex < m_ActiveItems[m_ActiveItems.Count - 1].index)
+                        if (firstVisibleIndex < m_ActiveItems[^1].index)
                         {
                             var inserting = m_ScrollInsertionList;
 
@@ -189,5 +189,17 @@ internal override T GetOrMakeItemAtIndex(int activeItemIndex = -1, int scrollVie
             item.rootElement.style.height = resolvedItemHeight;
             return item;
         }
+
+        internal override void EndDrag(int dropIndex)
+        {
+            m_DraggedItem.rootElement.style.height = resolvedItemHeight;
+
+            if (firstVisibleIndex > m_DraggedItem.index)
+            {
+                m_ScrollView.verticalScroller.value = serializedData.scrollOffset.y - resolvedItemHeight;
+            }
+
+            base.EndDrag(dropIndex);
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableCollectionItem.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableCollectionItem.cs
index a040ba74b5..28dacea9f7 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableCollectionItem.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableCollectionItem.cs
@@ -18,6 +18,9 @@ class ReusableCollectionItem
         public int index { get; set; }
         public int id { get; set; }
 
+        // Identifies an item as an invisible duplicate of the dragged item.
+        internal bool isDragGhost { get; private set; }
+
         public event Action<ReusableCollectionItem> onGeometryChanged;
 
         protected EventCallback<GeometryChangedEvent> m_GeometryChangedEventCallback;
@@ -46,6 +49,7 @@ public virtual void DetachElement()
 
             rootElement?.RemoveFromHierarchy();
             SetSelected(false);
+            SetDragGhost(false);
             index = id = UndefinedIndex;
         }
 
@@ -63,6 +67,13 @@ public virtual void SetSelected(bool selected)
             }
         }
 
+        public virtual void SetDragGhost(bool dragGhost)
+        {
+            isDragGhost = dragGhost;
+            rootElement.style.maxHeight = isDragGhost ? 0 : StyleKeyword.Initial;
+            bindableElement.style.display = isDragGhost ? DisplayStyle.None : DisplayStyle.Flex;
+        }
+
         protected void OnGeometryChanged(GeometryChangedEvent evt)
         {
             onGeometryChanged?.Invoke(this);
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableListViewItem.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableListViewItem.cs
index ffbb35ff2f..292048ee16 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableListViewItem.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableListViewItem.cs
@@ -90,5 +90,14 @@ public override void DetachElement()
             base.DetachElement();
             rootElement.RemoveFromClassList(BaseListView.itemUssClassName);
         }
+
+        public override void SetDragGhost(bool dragGhost)
+        {
+            base.SetDragGhost(dragGhost);
+            if (m_DragHandle != null)
+            {
+                m_DragHandle.style.display = isDragGhost ? DisplayStyle.None : DisplayStyle.Flex;
+            }
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableTreeViewItem.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableTreeViewItem.cs
index a565f1c7ac..3f8339c4cd 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableTreeViewItem.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableTreeViewItem.cs
@@ -10,28 +10,29 @@ class ReusableTreeViewItem : ReusableCollectionItem
     {
         Toggle m_Toggle;
         VisualElement m_Container;
-        VisualElement m_IndentContainer;
+        VisualElement m_IndentElement;
         VisualElement m_BindableContainer;
+        VisualElement m_Checkmark;
 
         public override VisualElement rootElement => m_Container ?? bindableElement;
         public event Action<PointerUpEvent> onPointerUp;
         public event Action<ChangeEvent<bool>> onToggleValueChanged;
 
-        static Pool.ObjectPool<VisualElement> s_IndentPool = new Pool.ObjectPool<VisualElement>(
-            () =>
-            {
-                var indentElement = new VisualElement();
-                indentElement.AddToClassList(BaseTreeView.itemIndentUssClassName);
-                return indentElement;
-            });
+        int m_Depth;
+        float m_IndentWidth;
+
+        // Internal for tests.
+        internal float indentWidth => m_IndentWidth;
 
         EventCallback<PointerUpEvent> m_PointerUpCallback;
         EventCallback<ChangeEvent<bool>> m_ToggleValueChangedCallback;
+        EventCallback<GeometryChangedEvent> m_ToggleGeometryChangedCallback;
 
         public ReusableTreeViewItem()
         {
             m_PointerUpCallback = OnPointerUp;
             m_ToggleValueChangedCallback = OnToggleValueChanged;
+            m_ToggleGeometryChangedCallback = OnToggleGeometryChanged;
         }
 
         public override void Init(VisualElement item)
@@ -49,20 +50,23 @@ protected void InitExpandHierarchy(VisualElement root, VisualElement item)
             m_Container = root;
             m_Container.style.flexDirection = FlexDirection.Row;
 
-            m_IndentContainer = new VisualElement()
+            m_IndentElement = new VisualElement()
             {
-                name = BaseTreeView.itemIndentsContainerUssClassName,
+                name = BaseTreeView.itemIndentUssClassName,
                 style = { flexDirection = FlexDirection.Row },
             };
-            m_IndentContainer.AddToClassList(BaseTreeView.itemIndentsContainerUssClassName);
-            m_Container.hierarchy.Add(m_IndentContainer);
+            m_Container.hierarchy.Add(m_IndentElement);
 
-            m_Toggle = new Toggle { name = BaseTreeView.itemToggleUssClassName };
-            m_Toggle.userData = this;
+            m_Toggle = new Toggle
+            {
+                name = BaseTreeView.itemToggleUssClassName,
+                userData = this
+            };
             m_Toggle.AddToClassList(Foldout.toggleUssClassName);
             m_Toggle.AddToClassList(BaseTreeView.itemToggleUssClassName);
             m_Toggle.visualInput.AddToClassList(Foldout.inputUssClassName);
-            m_Toggle.visualInput.Q(className: Toggle.checkmarkUssClassName).AddToClassList(Foldout.checkmarkUssClassName);
+            m_Checkmark = m_Toggle.visualInput.Q(className: Toggle.checkmarkUssClassName);
+            m_Checkmark.AddToClassList(Foldout.checkmarkUssClassName);
             m_Container.hierarchy.Add(m_Toggle);
 
             m_BindableContainer = new VisualElement()
@@ -81,6 +85,7 @@ public override void PreAttachElement()
             base.PreAttachElement();
             rootElement.AddToClassList(BaseTreeView.itemUssClassName);
             m_Container?.RegisterCallback(m_PointerUpCallback);
+            m_Toggle?.visualInput.Q(className: Toggle.checkmarkUssClassName).RegisterCallback(m_ToggleGeometryChangedCallback);
             m_Toggle?.RegisterValueChangedCallback(m_ToggleValueChangedCallback);
         }
 
@@ -89,28 +94,17 @@ public override void DetachElement()
             base.DetachElement();
             rootElement.RemoveFromClassList(BaseTreeView.itemUssClassName);
             m_Container?.UnregisterCallback(m_PointerUpCallback);
+            m_Toggle?.visualInput.Q(className: Toggle.checkmarkUssClassName).UnregisterCallback(m_ToggleGeometryChangedCallback);
             m_Toggle?.UnregisterValueChangedCallback(m_ToggleValueChangedCallback);
         }
 
         public void Indent(int depth)
         {
-            if (m_IndentContainer == null)
+            if (m_IndentElement == null)
                 return;
 
-            for (var i = 0; i < m_IndentContainer.childCount; i++)
-            {
-                s_IndentPool.Release(m_IndentContainer[i]);
-            }
-
-            m_IndentContainer.Clear();
-
-            for (var i = 0; i < depth; ++i)
-            {
-                var indentElement = s_IndentPool.Get();
-                m_IndentContainer.Add(indentElement);
-            }
-
-            m_IndentContainer.EnableInClassList(BaseTreeView.itemIndentsContainerUssClassName, depth > 0);
+            m_Depth = depth;
+            UpdateIndentLayout();
         }
 
         public void SetExpandedWithoutNotify(bool expanded)
@@ -124,6 +118,22 @@ public void SetToggleVisibility(bool visible)
                 m_Toggle.visible = visible;
         }
 
+        void OnToggleGeometryChanged(GeometryChangedEvent evt)
+        {
+            var width = m_Checkmark.resolvedStyle.width + m_Checkmark.resolvedStyle.marginLeft + m_Checkmark.resolvedStyle.marginRight;
+            if (Math.Abs(width - m_IndentWidth) < float.Epsilon)
+                return;
+
+            m_IndentWidth = width;
+            UpdateIndentLayout();
+        }
+
+        void UpdateIndentLayout()
+        {
+            m_IndentElement.style.width = m_IndentWidth * m_Depth;
+            m_IndentElement.EnableInClassList(BaseTreeView.itemIndentUssClassName, m_Depth > 0);
+        }
+
         void OnPointerUp(PointerUpEvent evt)
         {
             onPointerUp?.Invoke(evt);
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/VerticalVirtualizationController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/VerticalVirtualizationController.cs
index 36732fa91d..63f2189982 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/VerticalVirtualizationController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/VerticalVirtualizationController.cs
@@ -11,13 +11,14 @@ namespace UnityEngine.UIElements
     // TODO [GR] Could move some of that stuff to a base CollectionVirtualizationController<T> class (pool, active items, visible items, etc.)
     abstract class VerticalVirtualizationController<T> : CollectionVirtualizationController where T : ReusableCollectionItem, new()
     {
+        readonly UnityEngine.Pool.ObjectPool<T> m_Pool = new (() => new T(), null, i => i.DetachElement());
+
         protected BaseVerticalCollectionView m_CollectionView;
         protected const int k_ExtraVisibleItems = 2;
-
-        protected readonly UnityEngine.Pool.ObjectPool<T> m_Pool = new UnityEngine.Pool.ObjectPool<T>(() => new T(), null, i => i.DetachElement());
         protected List<T> m_ActiveItems;
+        protected T m_DraggedItem;
 
-        public override IEnumerable<ReusableCollectionItem> activeItems => m_ActiveItems as IEnumerable<ReusableCollectionItem>;
+        public override IEnumerable<ReusableCollectionItem> activeItems => m_ActiveItems;
 
         int m_LastFocusedElementIndex = -1;
         List<int> m_LastFocusedElementTreeChildIndexes = new List<int>();
@@ -29,32 +30,28 @@ namespace UnityEngine.UIElements
                 ? m_CollectionView.itemsSource.Count - 1
                 : m_CollectionView.itemsSource.Count;
 
-        protected virtual bool VisibleItemPredicate(T i)
-        {
-            var isBeingDragged = false;
-            if (m_CollectionView.dragger is ListViewDraggerAnimated dragger)
-                isBeingDragged = dragger.isDragging && i.index == dragger.draggedItem.index;
-
-            return i.rootElement.style.display == DisplayStyle.Flex && !isBeingDragged;
-        }
+        protected virtual bool VisibleItemPredicate(T i)=> i.rootElement.style.display == DisplayStyle.Flex;
 
         internal T firstVisibleItem => m_ActiveItems.FirstOrDefault(m_VisibleItemPredicateDelegate);
         internal T lastVisibleItem => m_ActiveItems.LastOrDefault(m_VisibleItemPredicateDelegate);
 
         public override int visibleItemCount => m_ActiveItems.Count(m_VisibleItemPredicateDelegate);
 
+        protected SerializedVirtualizationData serializedData => m_CollectionView.serializedVirtualizationData;
+
         public override int firstVisibleIndex
         {
-            get => Mathf.Min(m_CollectionView.serializedVirtualizationData.firstVisibleIndex, m_CollectionView.viewController.GetItemsCount() - 1);
-            protected set => m_CollectionView.serializedVirtualizationData.firstVisibleIndex = value;
+            get => Mathf.Min(serializedData.firstVisibleIndex, m_CollectionView.viewController.GetItemsCount() - 1);
+            protected set => serializedData.firstVisibleIndex = value;
         }
 
         // we keep this list in order to minimize temporary gc allocs
-        protected List<T> m_ScrollInsertionList = new List<T>();
+        protected List<T> m_ScrollInsertionList = new ();
 
         VisualElement m_EmptyRows;
 
         protected float lastHeight => m_CollectionView.lastHeight;
+        protected virtual bool alwaysRebindOnRefresh => true;
 
         protected VerticalVirtualizationController(BaseVerticalCollectionView collectionView)
             : base(collectionView.scrollView)
@@ -92,9 +89,17 @@ public override void Refresh(bool rebuild)
 
                 if (m_CollectionView.itemsSource != null && index >= 0 && index < itemsCount)
                 {
-                    if (hasValidBindings && isVisible)
+                    if (!hasValidBindings)
+                        continue;
+
+                    // Rebind visible items.
+                    if (isVisible || alwaysRebindOnRefresh)
                     {
-                        m_CollectionView.viewController.InvokeUnbindItem(recycledItem, recycledItem.index);
+                        if (recycledItem.index != ReusableCollectionItem.UndefinedIndex)
+                        {
+                            m_CollectionView.viewController.InvokeUnbindItem(recycledItem, recycledItem.index);
+                        }
+
                         recycledItem.index = ReusableCollectionItem.UndefinedIndex;
                         Setup(recycledItem, index);
                     }
@@ -116,9 +121,23 @@ public override void Refresh(bool rebuild)
         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;
+            var wasGhostItem = recycledItem.isDragGhost;
+            if (GetDraggedIndex() == newIndex)
+            {
+                if (recycledItem.index != ReusableCollectionItem.UndefinedIndex)
+                    m_CollectionView.viewController.InvokeUnbindItem(recycledItem, recycledItem.index);
+
+                recycledItem.SetDragGhost(true);
+                recycledItem.index = m_DraggedItem.index;
+                recycledItem.rootElement.style.display = DisplayStyle.Flex;
+                return;
+            }
+
+            // Restore the state of the item if it was hidden by a drag.
+            if (wasGhostItem)
+            {
+                recycledItem.SetDragGhost(false);
+            }
 
             if (newIndex >= itemsCount)
             {
@@ -132,13 +151,15 @@ protected void Setup(T recycledItem, int newIndex)
             }
 
             recycledItem.rootElement.style.display = DisplayStyle.Flex;
-            if (recycledItem.index == newIndex) return;
+
+            var newId = m_CollectionView.viewController.GetIdForIndex(newIndex);
+            if (recycledItem.index == newIndex && recycledItem.id == newId) 
+                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);
@@ -231,8 +252,10 @@ public override void UpdateBackground()
 
             if (m_EmptyRows == null)
             {
-                m_EmptyRows = new VisualElement();
-                m_EmptyRows.AddToClassList(BaseVerticalCollectionView.backgroundFillUssClassName);
+                m_EmptyRows = new VisualElement()
+                {
+                    classList = {BaseVerticalCollectionView.backgroundFillUssClassName}
+                };
             }
 
             if (m_EmptyRows.parent == null)
@@ -240,6 +263,7 @@ public override void UpdateBackground()
 
             var pixelAlignedItemHeight = GetExpectedItemHeight(-1);
             var itemCount = Mathf.FloorToInt(backgroundFillHeight / pixelAlignedItemHeight) + 1;
+
             if (itemCount > m_EmptyRows.childCount)
             {
                 var itemsToAdd = itemCount - m_EmptyRows.childCount;
@@ -265,28 +289,61 @@ public override void UpdateBackground()
             }
         }
 
-        public override void ReplaceActiveItem(int index)
+        internal override void StartDragItem(ReusableCollectionItem item)
+        {
+            m_DraggedItem = item as T;
+
+            // Remove the active item from the list to prevent recycling it.
+            var activeIndex = m_ActiveItems.IndexOf(m_DraggedItem);
+            m_ActiveItems.RemoveAt(activeIndex);
+
+            // Create a replacement item. Flag it as being dragged, so that we know it needs to stay hidden during item cycling.
+            var replacementItem = GetOrMakeItemAtIndex(activeIndex, activeIndex);
+            Setup(replacementItem, m_DraggedItem.index);
+        }
+
+        internal override void EndDrag(int dropIndex)
         {
-            var i = 0;
-            foreach (var item in m_ActiveItems)
+            // Reinsert the dragged item.
+            var item = m_CollectionView.GetRecycledItemFromIndex(dropIndex);
+            var activeItemIndex = item != null ? m_ScrollView.IndexOf(item.rootElement) : m_ActiveItems.Count;
+            m_ScrollView.Insert(activeItemIndex, m_DraggedItem.rootElement);
+            m_ActiveItems.Insert(activeItemIndex, m_DraggedItem);
+
+            // Release the ghost items.
+            for (var i = 0; i < m_ActiveItems.Count; i++)
             {
-                if (item.index == index)
+                var activeItem = m_ActiveItems[i];
+                if (activeItem.isDragGhost)
                 {
-                    // Detach the old one
-                    var scrollViewIndex = m_ScrollView.IndexOf(item.rootElement);
-                    m_CollectionView.viewController.InvokeUnbindItem(item, index);
-                    m_CollectionView.viewController.InvokeDestroyItem(item);
-                    item.DetachElement();
-                    m_ActiveItems.Remove(item);
-
-                    // Attach and setup new one.
-                    var recycledItem = GetOrMakeItemAtIndex(i, scrollViewIndex);
-                    Setup(recycledItem, index);
-                    break;
+                    // Clear index so that it doesn't get unbound since it was never bound, then restore and release it.
+                    activeItem.index = ReusableCollectionItem.UndefinedIndex;
+                    ReleaseItem(i);
+                    i--;
                 }
+            }
+
+            // We want to avoid releasing items in Refresh, that happens when an item is out of bounds and visible,
+            // so we set the last one invisible and let the virtualization display it if necessary.
+            if (Math.Min(dropIndex, itemsCount - 1) != m_DraggedItem.index)
+            {
+                if (lastVisibleItem != null)
+                    lastVisibleItem.rootElement.style.display = DisplayStyle.None;
 
-                i++;
+                // We unbind in order.
+                if (m_DraggedItem.index < dropIndex)
+                {
+                    m_CollectionView.viewController.InvokeUnbindItem(m_DraggedItem, m_DraggedItem.index);
+                    m_DraggedItem.index = ReusableCollectionItem.UndefinedIndex;
+                }
+                else if (item != null)
+                {
+                    m_CollectionView.viewController.InvokeUnbindItem(item, item.index);
+                    item.index = ReusableCollectionItem.UndefinedIndex;
+                }
             }
+
+            m_DraggedItem = null;
         }
 
         internal virtual T GetOrMakeItemAtIndex(int activeItemIndex = -1, int scrollViewIndex = -1)
@@ -324,15 +381,21 @@ internal virtual T GetOrMakeItemAtIndex(int activeItemIndex = -1, int scrollView
         internal virtual void ReleaseItem(int activeItemsIndex)
         {
             var item = m_ActiveItems[activeItemsIndex];
-            var index = item.index;
-
-            if (index != ReusableCollectionItem.UndefinedIndex)
+            if (item.index != ReusableCollectionItem.UndefinedIndex)
             {
-                m_CollectionView.viewController.InvokeUnbindItem(item, index);
+                m_CollectionView.viewController.InvokeUnbindItem(item, item.index);
             }
 
             m_Pool.Release(item);
-            m_ActiveItems.RemoveAt(activeItemsIndex);
+            m_ActiveItems.Remove(item);
+        }
+
+        protected int GetDraggedIndex()
+        {
+            if (m_CollectionView.dragger is ListViewDraggerAnimated { isDragging: true } dragger)
+                return dragger.draggedItem.index;
+
+            return ReusableCollectionItem.UndefinedIndex;
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseBoolField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseBoolField.cs
index 3992330ea3..fa8a500b44 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseBoolField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseBoolField.cs
@@ -2,18 +2,25 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using Unity.Properties;
+
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// A <see cref="BaseBoolField"/> is a clickable element that represents a boolean value.
+    /// A BaseBoolField is a clickable element that represents a boolean value.
     /// </summary>
     public abstract class BaseBoolField : BaseField<bool>
     {
+        internal static readonly DataBindingProperty textProperty = nameof(text);
+
         protected Label m_Label;
         protected readonly VisualElement m_CheckMark;
 
         internal Clickable m_Clickable;
 
+        // Needed by the UIBuilder for authoring in the viewport
+        internal Label boolFieldLabelElement => m_Label;
+
         /// <summary>
         /// Creates a <see cref="BaseBoolField"/> with a Label and a default manipulator.
         /// </summary>
@@ -52,11 +59,15 @@ private void OnNavigationSubmit(NavigationSubmitEvent evt)
         /// <remarks>
         /// Unity creates a <see cref="Label"/> automatically if one does not exist.
         /// </remarks>
+        [CreateProperty]
         public string text
         {
             get { return m_Label?.text; }
             set
             {
+                if (string.CompareOrdinal(m_Label?.text, value) == 0)
+                    return;
+
                 if (!string.IsNullOrEmpty(value))
                 {
                     // Lazy allocation of label if needed...
@@ -72,6 +83,7 @@ public string text
                     m_Label.RemoveFromHierarchy();
                     m_Label = null;
                 }
+                NotifyPropertyChanged(textProperty);
             }
         }
 
@@ -169,5 +181,18 @@ protected override void UpdateMixedValueContent()
                     text = m_OriginalText;
             }
         }
+
+        internal override void RegisterEditingCallbacks()
+        {
+            RegisterCallback<PointerUpEvent>(StartEditing);
+            RegisterCallback<FocusOutEvent>(EndEditing);
+        }
+
+        internal override void UnregisterEditingCallbacks()
+        {
+            RegisterCallback<PointerUpEvent>(StartEditing);
+            RegisterCallback<FocusOutEvent>(EndEditing);
+        }
+
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseCompositeField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseCompositeField.cs
index ff073810d0..fa22ef23df 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseCompositeField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseCompositeField.cs
@@ -235,7 +235,7 @@ private void UpdateDisplay()
                 FieldDescription[] fieldDescriptions = DescribeFields();
                 foreach (var fd in fieldDescriptions)
                 {
-                    m_Fields[i].value = (fd.read(rawValue));
+                    m_Fields[i].SetValueWithoutNotify(fd.read(rawValue));
                     i++;
                 }
             }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseListView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseListView.cs
index cccb02068d..5d8ed32b84 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseListView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseListView.cs
@@ -6,11 +6,12 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// Options to change the drag and drop mode for items in the ListView.
+    /// Options to change the drag-and-drop mode for items in the ListView.
     /// </summary>
     /// <remarks>
     /// Using @@Animated@@ will affect the layout of the ListView, by adding drag handles before every item.
@@ -33,6 +34,12 @@ public enum ListViewReorderMode
     /// </summary>
     public abstract class BaseListView : BaseVerticalCollectionView
     {
+        internal static readonly DataBindingProperty showBoundCollectionSizeProperty = nameof(showBoundCollectionSize);
+        internal static readonly DataBindingProperty showFoldoutHeaderProperty = nameof(showFoldoutHeader);
+        internal static readonly DataBindingProperty headerTitleProperty = nameof(headerTitle);
+        internal static readonly DataBindingProperty showAddRemoveFooterProperty = nameof(showAddRemoveFooter);
+        internal static readonly DataBindingProperty reorderModeProperty = nameof(reorderMode);
+
         /// <summary>
         /// Defines <see cref="UxmlTraits"/> for the <see cref="BaseListView"/>.
         /// </summary>
@@ -72,6 +79,16 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 view.showAddRemoveFooter = m_ShowAddRemoveFooter.GetValueFromBag(bag, cc);
                 view.showBoundCollectionSize = m_ShowBoundCollectionSize.GetValueFromBag(bag, cc);
             }
+
+            /// <summary>
+            /// Constructor.
+            /// </summary>
+            protected UxmlTraits()
+            {
+                // Ignore by default, because the ListView content can have empty space when using footer for example.
+                // PointerEvents are registered on the ScrollView, which is pickingMode = PickingMode.Position.
+                m_PickingMode.defaultValue = PickingMode.Ignore;
+            }
         }
 
         bool m_ShowBoundCollectionSize = true;
@@ -89,6 +106,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// linked correctly. In production, the collection size rarely displays as a line item in a ListView.
         /// </remarks>>
         /// <seealso cref="UnityEditor.UIElements.BindingExtensions.Bind"/>
+        [CreateProperty]
         public bool showBoundCollectionSize
         {
             get => m_ShowBoundCollectionSize;
@@ -100,6 +118,7 @@ public bool showBoundCollectionSize
                 m_ShowBoundCollectionSize = value;
 
                 SetupArraySizeField();
+                NotifyPropertyChanged(showBoundCollectionSizeProperty);
             }
         }
 
@@ -118,6 +137,7 @@ public bool showBoundCollectionSize
         /// If <see cref="showBoundCollectionSize"/> is set to <c>true</c>, the header includes a TextField to control
         /// the array size, instead of using the field as part of the list.
         /// </remarks>>
+        [CreateProperty]
         public bool showFoldoutHeader
         {
             get => m_ShowFoldoutHeader;
@@ -130,30 +150,41 @@ public bool showFoldoutHeader
 
                 EnableInClassList(listViewWithHeaderUssClassName, value);
 
-                if (m_ShowFoldoutHeader)
+                try
                 {
-                    if (m_Foldout != null)
-                        return;
-
-                    m_Foldout = new Foldout() { name = foldoutHeaderUssClassName, text = m_HeaderTitle };
-                    m_Foldout.AddToClassList(foldoutHeaderUssClassName);
-                    m_Foldout.tabIndex = 1;
-                    hierarchy.Add(m_Foldout);
-                    m_Foldout.Add(scrollView);
+                    if (m_ShowFoldoutHeader)
+                    {
+                        if (m_Foldout != null)
+                            return;
+
+                        m_Foldout = new Foldout() {name = foldoutHeaderUssClassName, text = m_HeaderTitle};
+
+                        var foldoutToggle = m_Foldout.Q<Toggle>(className: Foldout.toggleUssClassName);
+                        foldoutToggle.m_Clickable.acceptClicksIfDisabled = true;
+
+                        m_Foldout.AddToClassList(foldoutHeaderUssClassName);
+                        m_Foldout.tabIndex = 1;
+                        hierarchy.Add(m_Foldout);
+                        m_Foldout.Add(scrollView);
+                    }
+                    else if (m_Foldout != null)
+                    {
+                        m_Foldout?.RemoveFromHierarchy();
+                        m_Foldout = null;
+                        hierarchy.Add(scrollView);
+                    }
+
+                    SetupArraySizeField();
+                    UpdateListViewLabel();
+
+                    if (showAddRemoveFooter)
+                    {
+                        EnableFooter(true);
+                    }
                 }
-                else if (m_Foldout != null)
+                finally
                 {
-                    m_Foldout?.RemoveFromHierarchy();
-                    m_Foldout = null;
-                    hierarchy.Add(scrollView);
-                }
-
-                SetupArraySizeField();
-                UpdateListViewLabel();
-
-                if (showAddRemoveFooter)
-                {
-                    EnableFooter(true);
+                    NotifyPropertyChanged(showFoldoutHeaderProperty);
                 }
             }
         }
@@ -182,15 +213,21 @@ void SetupArraySizeField()
         /// <summary>
         /// This property controls the text of the foldout header when using <see cref="showFoldoutHeader"/>.
         /// </summary>
+        [CreateProperty]
         public string headerTitle
         {
             get => m_HeaderTitle;
             set
             {
+                var previous = m_HeaderTitle;
+
                 m_HeaderTitle = value;
 
                 if (m_Foldout != null)
                     m_Foldout.text = m_HeaderTitle;
+
+                if (string.CompareOrdinal(previous, m_HeaderTitle) != 0)
+                    NotifyPropertyChanged(headerTitleProperty);
             }
         }
 
@@ -204,10 +241,18 @@ public string headerTitle
         /// A "+" button. When clicked, it adds a single item at the end of the list view.
         /// A "-" button. When clicked, it removes all selected items, or the last item if none are selected.
         /// </remarks>
+        [CreateProperty]
         public bool showAddRemoveFooter
         {
             get => m_Footer != null;
-            set => EnableFooter(value);
+            set
+            {
+                var previous = showAddRemoveFooter;
+                EnableFooter(value);
+
+                if (previous != showFoldoutHeader)
+                    NotifyPropertyChanged(showAddRemoveFooterProperty);
+            }
         }
 
         internal Foldout headerFoldout => m_Foldout;
@@ -248,15 +293,25 @@ void EnableFooter(bool enabled)
         }
 
         /// <summary>
-        /// This event is called for every item added to the itemsSource. Includes the item index.
+        /// This event is called for every item added to the ::ref::itemsSource. Includes the item index.
         /// </summary>
+        /// <remarks>
+        /// Note: This event is only called when items are added through the ::ref::viewController, such as when calling ::ref::AddItems.
+        /// Adding items directly to the ::ref::itemsSource will not trigger this event.
+        /// </remarks>
         public event Action<IEnumerable<int>> itemsAdded;
 
         /// <summary>
-        /// This event is called for every item added to the itemsSource. Includes the item index.
+        /// This event is called for every item removed from the ::ref::itemsSource. Includes the item index.
         /// </summary>
+        /// <remarks>
+        /// Note: This event is only called when items are removed through the ::ref::viewController, such as when
+        /// calling ::ref::RemoveItems or <see cref="BaseListViewController.ClearItems"/>.
+        /// </remarks>
         public event Action<IEnumerable<int>> itemsRemoved;
 
+        internal event Action itemsSourceSizeChanged;
+
         private void AddItems(int itemCount)
         {
             viewController.AddItems(itemCount);
@@ -463,8 +518,12 @@ void OnItemsRemoved(IEnumerable<int> indices)
         void OnItemsSourceSizeChanged()
         {
             // When bound, the ListViewBinding class takes care of refreshing when the array size is updated.
-            if (!(binding is IInternalListViewBinding))
+            if (GetProperty(internalBindingKey) == null)
+            {
                 RefreshItems();
+            }
+
+            itemsSourceSizeChanged?.Invoke();
         }
 
         ListViewReorderMode m_ReorderMode;
@@ -479,6 +538,7 @@ void OnItemsSourceSizeChanged()
         /// drop manipulation pushes items with an animation when the reordering happens.
         /// Multiple item reordering is only supported with the <c>Simple</c> drag mode.
         /// </remarks>
+        [CreateProperty]
         public ListViewReorderMode reorderMode
         {
             get => m_ReorderMode;
@@ -490,6 +550,7 @@ public ListViewReorderMode reorderMode
                     InitializeDragAndDropController(reorderable);
                     reorderModeChanged?.Invoke();
                     Rebuild();
+                    NotifyPropertyChanged(reorderModeProperty);
                 }
             }
         }
@@ -621,13 +682,24 @@ internal override ListViewDragger CreateDragger()
         /// The USS class name for scroll view when add/remove footer is enabled.
         /// </summary>
         /// <remarks>
-        /// Unity adds this USS class to ListView's scroll view when <see cref="showAddRemoveFooter"/> is set to <c>true</c>.
+        /// Unity adds this USS class  scroll view of <see cref="BaseListView"/>when <see cref="showAddRemoveFooter"/> is set to <c>true</c>.
         /// Any styling applied to this class affects every list located beside, or below the stylesheet in the visual tree.
         /// </remarks>
         public static readonly string scrollViewWithFooterUssClassName = ussClassName + "__scroll-view--with-footer";
-
-        internal static readonly string footerAddButtonName = ussClassName + "__add-button";
-        internal static readonly string footerRemoveButtonName = ussClassName + "__remove-button";
+        /// <summary>
+        /// The name of the add button element in the footer.
+        /// </summary>
+        /// <remarks>
+        /// Unity uses this name of <see cref="BaseListView"/> add button when <see cref="showAddRemoveFooter"/> is set to <c>true</c>.
+        /// </remarks>
+        public static readonly string footerAddButtonName = ussClassName + "__add-button";
+        /// <summary>
+        /// The name of the remove button element in the footer.
+        /// </summary>
+        /// <remarks>
+        /// Unity uses this name of <see cref="BaseListView"/> remove button when <see cref="showAddRemoveFooter"/> is set to <c>true</c>.
+        /// </remarks>
+        public static readonly string footerRemoveButtonName = ussClassName + "__remove-button";
 
         string m_MaxMultiEditStr;
         static readonly string k_EmptyListStr = "List is empty";
@@ -639,6 +711,7 @@ internal override ListViewDragger CreateDragger()
         public BaseListView()
         {
             AddToClassList(ussClassName);
+            pickingMode = PickingMode.Ignore;
         }
 
         /// <summary>
@@ -650,6 +723,7 @@ public BaseListView(IList itemsSource, float itemHeight = ItemHeightUnset)
             : base(itemsSource, itemHeight)
         {
             AddToClassList(ussClassName);
+            pickingMode = PickingMode.Ignore;
         }
 
         private protected override void PostRefresh()
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BasePopupField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BasePopupField.cs
index fccab7f7b8..44036abd66 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BasePopupField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BasePopupField.cs
@@ -4,7 +4,7 @@
 
 using System;
 using System.Collections.Generic;
-using UnityEngine;
+using Unity.Properties;
 using UnityEngine.Scripting.APIUpdating;
 
 namespace UnityEngine.UIElements
@@ -19,6 +19,9 @@ namespace UnityEngine.UIElements
     [MovedFrom(true, UpgradeConstants.EditorNamespace, UpgradeConstants.EditorAssembly)]
     public abstract class BasePopupField<TValueType, TValueChoice> : BaseField<TValueType>
     {
+        internal static readonly DataBindingProperty choicesProperty = nameof(choices);
+        internal static readonly DataBindingProperty textProperty = nameof(text);
+
         internal List<TValueChoice> m_Choices;
         TextElement m_TextElement;
         VisualElement m_ArrowElement;
@@ -48,6 +51,7 @@ protected TextElement textElement
         /// <summary>
         /// The list of choices to display in the popup menu.
         /// </summary>
+        [CreateProperty]
         public virtual List<TValueChoice> choices
         {
             get { return m_Choices; }
@@ -60,6 +64,7 @@ public virtual List<TValueChoice> choices
 
                 // Make sure to update the text displayed
                 SetValueWithoutNotify(rawValue);
+                NotifyPropertyChanged(choicesProperty);
             }
         }
 
@@ -76,6 +81,7 @@ public override void SetValueWithoutNotify(TValueType newValue)
         /// <summary>
         /// This is the text displayed to the user for the current selection of the popup.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public string text
         {
             get { return m_TextElement.text; }
@@ -213,6 +219,7 @@ protected override void UpdateMixedValueContent()
         {
             if (showMixedValue)
             {
+                value = default;
                 textElement.text = mixedValueString;
             }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseSlider.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseSlider.cs
index 05871f49b7..42cbc528e4 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseSlider.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseSlider.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -29,23 +30,39 @@ public enum SliderDirection
     public abstract class BaseSlider<TValueType> : BaseField<TValueType>, IValueField<TValueType>
         where TValueType : System.IComparable<TValueType>
     {
+        internal static readonly DataBindingProperty lowValueProperty = nameof(lowValue);
+        internal static readonly DataBindingProperty highValueProperty = nameof(highValue);
+        internal static readonly DataBindingProperty rangeProperty = nameof(range);
+        internal static readonly DataBindingProperty pageSizeProperty = nameof(pageSize);
+        internal static readonly DataBindingProperty showInputFieldProperty = nameof(showInputField);
+        internal static readonly DataBindingProperty directionProperty = nameof(direction);
+        internal static readonly DataBindingProperty invertedProperty = nameof(inverted);
+
         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; }
 
-        [SerializeField]
+        bool m_IsEditingTextField;
+
+        [SerializeField, DontCreateProperty]
         private TValueType m_LowValue;
 
+        [Obsolete($"Use the generic BaseSlider<TValueType>.UxmlTraits<TValueUxmlAttributeType> class", true)]
+        public new class UxmlTraits : BaseField<TValueType>.UxmlTraits {}
+
         /// <summary>
         /// Defines <see cref="UxmlTraits"/> for the <see cref="BaseSlider"/>.
+        ///
+        /// This class must be used instead of the non-generic inherited UxmlTraits equivalent.
         /// </summary>
         /// <remarks>
         /// This class defines the properties of a BaseSlider element that you can
         /// use in a UXML asset.
         /// </remarks>
-        public new class UxmlTraits : BaseField<TValueType>.UxmlTraits
+        public class UxmlTraits<TValueUxmlAttributeType> : BaseFieldTraits<TValueType, TValueUxmlAttributeType>
+            where TValueUxmlAttributeType : TypedUxmlAttributeDescription<TValueType>, new()
         {
             /// <summary>
             /// Constructor.
@@ -59,6 +76,7 @@ public UxmlTraits()
         /// <summary>
         /// This is the minimum value that the slider encodes.
         /// </summary>
+        [CreateProperty]
         public TValueType lowValue
         {
             get { return m_LowValue; }
@@ -70,16 +88,18 @@ public TValueType lowValue
                     ClampValue();
                     UpdateDragElementPosition();
                     SaveViewData();
+                    NotifyPropertyChanged(lowValueProperty);
                 }
             }
         }
 
-        [SerializeField]
+        [SerializeField, DontCreateProperty]
         private TValueType m_HighValue;
 
         /// <summary>
         /// This is the maximum value that the slider encodes.
         /// </summary>
+        [CreateProperty]
         public TValueType highValue
         {
             get { return m_HighValue; }
@@ -91,6 +111,7 @@ public TValueType highValue
                     ClampValue();
                     UpdateDragElementPosition();
                     SaveViewData();
+                    NotifyPropertyChanged(highValueProperty);
                 }
             }
         }
@@ -107,6 +128,7 @@ internal void SetHighValueWithoutNotify(TValueType newHighValue)
         /// <summary>
         /// This is the range from the minimum value to the maximum value of the slider.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public TValueType range
         {
             get { return SliderRange(); }
@@ -115,12 +137,19 @@ public TValueType range
         private float m_PageSize;
 
         /// <summary>
-        /// This is a generic page size used to change the value when clicking in the slider.
+        /// Represents the value that should be applied to the calculated scroll offset while scrolling the slider, such as when clicking within the track or clicking the slider arrows.
         /// </summary>
+        [CreateProperty]
         public virtual float pageSize
         {
             get { return m_PageSize; }
-            set { m_PageSize = value; }
+            set
+            {
+                if (m_PageSize == value)
+                    return;
+                m_PageSize = value;
+                NotifyPropertyChanged(pageSizeProperty);
+            }
         }
 
         private bool m_ShowInputField = false;
@@ -132,6 +161,7 @@ public virtual float pageSize
         /// Set this property to true to display a numerical text field that provides another way to
         /// edit the slider value.
         /// </remarks>
+        [CreateProperty]
         public virtual bool showInputField
         {
             get { return m_ShowInputField; }
@@ -141,6 +171,7 @@ public virtual bool showInputField
                 {
                     m_ShowInputField = value;
                     UpdateTextFieldVisibility();
+                    NotifyPropertyChanged(showInputFieldProperty);
                 }
             }
         }
@@ -224,11 +255,14 @@ public override void SetValueWithoutNotify(TValueType newValue)
         /// <summary>
         /// This is the actual property to contain the direction of the slider.
         /// </summary>
+        [CreateProperty]
         public SliderDirection direction
         {
             get { return m_Direction; }
             set
             {
+                var previous = m_Direction;
+
                 m_Direction = value;
                 if (m_Direction == SliderDirection.Horizontal)
                 {
@@ -240,6 +274,8 @@ public SliderDirection direction
                     RemoveFromClassList(horizontalVariantUssClassName);
                     AddToClassList(verticalVariantUssClassName);
                 }
+                if (previous != m_Direction)
+                    NotifyPropertyChanged(directionProperty);
             }
         }
 
@@ -250,6 +286,7 @@ public SliderDirection direction
         /// For an inverted horizontal slider, high value is located to the left, low value is located to the right
         /// For an inverted vertical slider, high value is located to the bottom, low value is located to the top.
         /// </summary>
+        [CreateProperty]
         public bool inverted
         {
             get { return m_Inverted; }
@@ -259,6 +296,7 @@ public bool inverted
                 {
                     m_Inverted = value;
                     UpdateDragElementPosition();
+                    NotifyPropertyChanged(invertedProperty);
                 }
             }
         }
@@ -381,7 +419,7 @@ private void ClampValue()
         internal abstract TValueType SliderLerpUnclamped(TValueType a, TValueType b, float interpolant);
         internal abstract float SliderNormalizeValue(TValueType currentValue, TValueType lowerValue, TValueType higherValue);
         internal abstract TValueType SliderRange();
-        internal abstract TValueType ParseStringToValue(string stringValue);
+        internal abstract TValueType ParseStringToValue(string previousValue, string newValue);
         internal abstract void ComputeValueFromKey(SliderKey sliderKey, bool isShift);
 
         internal enum SliderKey
@@ -430,7 +468,13 @@ void ComputeValueAndDirectionFromDrag(float sliderLength, float dragElementLengt
             if (Mathf.Abs(totalRange) < UIRUtility.k_Epsilon)
                 return;
 
-            float normalizedDragElementPosition = Mathf.Max(0f, Mathf.Min(dragElementPos, totalRange)) / totalRange;
+            float normalizedDragElementPosition;
+
+            if (clamped)
+                normalizedDragElementPosition = Mathf.Max(0f, Mathf.Min(dragElementPos, totalRange)) / totalRange;
+            else
+                normalizedDragElementPosition = dragElementPos / totalRange;
+
             value = SliderLerpDirectionalUnclamped(lowValue, highValue, normalizedDragElementPosition);
         }
 
@@ -690,7 +734,9 @@ private void UpdateTextFieldVisibility()
                 {
                     inputTextField = new TextField() { name = "unity-text-field" };
                     inputTextField.AddToClassList(textFieldClassName);
+                    inputTextField.RegisterCallback<NavigationMoveEvent>(OnInputNavigationMoveEvent, TrickleDown.TrickleDown);
                     inputTextField.RegisterValueChangedCallback(OnTextFieldValueChange);
+                    inputTextField.RegisterCallback<FocusInEvent>(OnTextFieldFocusIn);
                     inputTextField.RegisterCallback<FocusOutEvent>(OnTextFieldFocusOut);
                     visualInput.Add(inputTextField);
                     UpdateTextFieldValue();
@@ -701,7 +747,9 @@ private void UpdateTextFieldVisibility()
                 if (inputTextField.panel != null)
                     inputTextField.RemoveFromHierarchy();
 
+                inputTextField.UnregisterCallback<NavigationMoveEvent>(OnInputNavigationMoveEvent);
                 inputTextField.UnregisterValueChangedCallback(OnTextFieldValueChange);
+                inputTextField.UnregisterCallback<FocusInEvent>(OnTextFieldFocusIn);
                 inputTextField.UnregisterCallback<FocusOutEvent>(OnTextFieldFocusOut);
                 inputTextField = null;
             }
@@ -709,20 +757,32 @@ private void UpdateTextFieldVisibility()
 
         private void UpdateTextFieldValue()
         {
-            if (inputTextField == null)
+            if (inputTextField == null || m_IsEditingTextField)
                 return;
 
             inputTextField.SetValueWithoutNotify(String.Format(CultureInfo.InvariantCulture, "{0:g7}", value));
         }
 
+        private void OnTextFieldFocusIn(FocusInEvent evt)
+        {
+            m_IsEditingTextField = true;
+        }
+
         private void OnTextFieldFocusOut(FocusOutEvent evt)
         {
+            m_IsEditingTextField = false;
             UpdateTextFieldValue();
         }
 
+        private void OnInputNavigationMoveEvent(NavigationMoveEvent evt)
+        {
+            // The input field should not do any navigation when using the arrow keys.
+            evt.StopPropagation();
+        }
+
         void OnTextFieldValueChange(ChangeEvent<string> evt)
         {
-            var newValue = GetClampedValue(ParseStringToValue(evt.newValue));
+            var newValue = GetClampedValue(ParseStringToValue(evt.previousValue, evt.newValue));
             if (!EqualityComparer<TValueType>.Default.Equals(newValue, value))
             {
                 value = newValue;
@@ -741,8 +801,24 @@ protected override void UpdateMixedValueContent()
             }
             else
             {
-                visualInput.Add(dragElement);
+                dragContainer.Add(dragElement);
             }
         }
+
+        internal override void RegisterEditingCallbacks()
+        {
+            labelElement.RegisterCallback<PointerDownEvent>(StartEditing, TrickleDown.TrickleDown);
+            dragContainer.RegisterCallback<PointerDownEvent>(StartEditing, TrickleDown.TrickleDown);
+
+            dragContainer.RegisterCallback<PointerUpEvent>(EndEditing);
+        }
+
+        internal override void UnregisterEditingCallbacks()
+        {
+            labelElement.UnregisterCallback<PointerDownEvent>(StartEditing, TrickleDown.TrickleDown);
+            dragContainer.RegisterCallback<PointerDownEvent>(StartEditing, TrickleDown.TrickleDown);
+
+            dragContainer.RegisterCallback<PointerUpEvent>(EndEditing);
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseTreeView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseTreeView.cs
index 3e32a16268..e758e3245e 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseTreeView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseTreeView.cs
@@ -6,6 +6,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -14,6 +15,8 @@ namespace UnityEngine.UIElements
     /// </summary>
     public abstract class BaseTreeView : BaseVerticalCollectionView
     {
+        internal static readonly DataBindingProperty autoExpandProperty = nameof(autoExpand);
+
         /// <summary>
         /// The USS class name for TreeView elements.
         /// </summary>
@@ -47,7 +50,7 @@ public abstract class BaseTreeView : BaseVerticalCollectionView
         /// </remarks>
         public static readonly string itemIndentsContainerUssClassName = ussClassName + "__item-indents";
         /// <summary>
-        /// The USS class name for TreeView indent elements.
+        /// The USS class name for TreeView indent element.
         /// </summary>
         /// <remarks>
         /// Unity adds this USS class to every indent element of the TreeView. Any styling applied to
@@ -92,9 +95,10 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// <remarks>
         /// To set the items source, use <see cref="SetRootItems{T}"/> instead, which allows fully typed items.
         /// </remarks>
+        [CreateProperty(ReadOnly = true)]
         public new IList itemsSource
         {
-            get => viewController.itemsSource;
+            get => viewController?.itemsSource;
             internal set => GetOrCreateViewController().itemsSource = value;
         }
 
@@ -174,18 +178,23 @@ void OnItemIndexChanged(int srcIndex, int dstIndex)
         /// <summary>
         /// When true, items are automatically expanded when added to the TreeView.
         /// </summary>
+        [CreateProperty]
         public bool autoExpand
         {
             get => m_AutoExpand;
             set
             {
+                if (m_AutoExpand == value)
+                    return;
+
                 m_AutoExpand = value;
                 viewController?.RegenerateWrappers();
                 RefreshItems();
+                NotifyPropertyChanged(autoExpandProperty);
             }
         }
 
-        [SerializeField]
+        [SerializeField, DontCreateProperty]
         private List<int> m_ExpandedItemIds;
 
         internal List<int> expandedItemIds
@@ -212,13 +221,9 @@ public BaseTreeView() : this((int)ItemHeightUnset) {}
         public BaseTreeView(int itemHeight) : base(null, itemHeight)
         {
             m_ExpandedItemIds = new List<int>();
-
-            viewDataKey = ussClassName;
             AddToClassList(ussClassName);
 
-            scrollView.contentContainer.RegisterCallback<NavigationMoveEvent>(OnScrollViewNavigationMove);
-
-            RegisterCallback<MouseUpEvent>(OnTreeViewMouseUp, TrickleDown.TrickleDown);
+            RegisterCallback<PointerUpEvent>(OnTreeViewPointerUp, TrickleDown.TrickleDown);
         }
 
         /// <summary>
@@ -334,54 +339,58 @@ internal override void OnViewDataReady()
             }
         }
 
-        private void OnScrollViewKeyDown(KeyDownEvent evt)
+        private protected override bool HandleItemNavigation(bool moveIn, bool altPressed)
         {
             var index = selectedIndex;
+            var hasChildren = viewController.HasChildrenByIndex(index);
 
-            bool shouldStopPropagation = true;
-
-            switch (evt.keyCode)
+            var selectionIncrement = 1;
+            if (moveIn)
             {
-                case KeyCode.RightArrow:
-                    if (evt.altKey || !IsExpandedByIndex(index))
-                        ExpandItemByIndex(index, evt.altKey);
-                    break;
-                case KeyCode.LeftArrow:
-                    if (evt.altKey || IsExpandedByIndex(index))
-                        CollapseItemByIndex(index, evt.altKey);
-                    break;
-                default:
-                    shouldStopPropagation = false;
-                    break;
+                if (hasChildren && !IsExpandedByIndex(index))
+                {
+                    ExpandItemByIndex(index, altPressed);
+                    return true;
+                }
             }
+            else
+            {
+                if (hasChildren && IsExpandedByIndex(index))
+                {
+                    CollapseItemByIndex(index, altPressed);
+                    return true;
+                }
 
-            if (shouldStopPropagation)
-                evt.StopPropagation();
-        }
+                // Find the nearest ancestor with children in the tree and select it.
+                // If no ancestor is found, find the closest item with children before the current one.
+                var id = viewController.GetIdForIndex(index);
+                var ancestorId = viewController.GetParentId(id);
+                if (ancestorId != ReusableCollectionItem.UndefinedIndex)
+                {
+                    SetSelectionById(ancestorId);
+                    ScrollToItemById(ancestorId);
+                    return true;
+                }
 
-        private void OnScrollViewNavigationMove(NavigationMoveEvent evt)
-        {
-            var index = selectedIndex;
+                selectionIncrement = -1;
+            }
 
-            bool shouldStopPropagation = true;
+            // Find the next item with children in the tree and select it.
+            var selectionIndex = index;
+            do
+            {
+                selectionIndex += selectionIncrement;
+                hasChildren = viewController.HasChildrenByIndex(selectionIndex);
+            } while (!hasChildren && selectionIndex >= 0 && selectionIndex < itemsSource.Count);
 
-            switch (evt.direction)
+            if (hasChildren)
             {
-                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;
+                SetSelection(selectionIndex);
+                ScrollToItem(selectionIndex);
+                return true;
             }
 
-            if (shouldStopPropagation)
-                evt.StopPropagation();
+            return false;
         }
 
         /// <summary>
@@ -558,7 +567,7 @@ public void CollapseAll()
             viewController.CollapseAll();
         }
 
-        private void OnTreeViewMouseUp(MouseUpEvent evt)
+        private void OnTreeViewPointerUp(PointerUpEvent evt)
         {
             scrollView.contentContainer.Focus();
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseVerticalCollectionView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseVerticalCollectionView.cs
index 635da8c1b5..3a6077237f 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseVerticalCollectionView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseVerticalCollectionView.cs
@@ -7,6 +7,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Unity.Profiling;
+using UnityEngine.Pool;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -53,7 +55,10 @@ class SerializedVirtualizationData
     {
         public Vector2 scrollOffset;
         public int firstVisibleIndex;
-        public float storedPadding;
+        public float contentPadding;
+        public float contentHeight;
+        public int anchoredItemIndex;
+        public float anchorOffset;
     }
 
     /// <summary>
@@ -61,6 +66,23 @@ class SerializedVirtualizationData
     /// </summary>
     public abstract class BaseVerticalCollectionView : BindableElement, ISerializationCallbackReceiver
     {
+        internal static readonly DataBindingProperty itemsSourceProperty = nameof(itemsSource);
+        internal static readonly DataBindingProperty selectionTypeProperty = nameof(selectionType);
+        internal static readonly DataBindingProperty selectedItemProperty = nameof(selectedItem);
+        internal static readonly DataBindingProperty selectedItemsProperty = nameof(selectedItems);
+        internal static readonly DataBindingProperty selectedIndexProperty = nameof(selectedIndex);
+        internal static readonly DataBindingProperty selectedIndicesProperty = nameof(selectedIndices);
+        internal static readonly DataBindingProperty showBorderProperty = nameof(showBorder);
+        internal static readonly DataBindingProperty reorderableProperty = nameof(reorderable);
+        internal static readonly DataBindingProperty horizontalScrollingEnabledProperty = nameof(horizontalScrollingEnabled);
+        internal static readonly DataBindingProperty showAlternatingRowBackgroundsProperty = nameof(showAlternatingRowBackgrounds);
+        internal static readonly DataBindingProperty virtualizationMethodProperty = nameof(virtualizationMethod);
+        internal static readonly DataBindingProperty fixedItemHeightProperty = nameof(fixedItemHeight);
+
+        internal const string internalBindingKey = "__unity-collection-view-internal-binding";
+        static readonly ProfilerMarker k_RefreshMarker = new ("BaseVerticalCollectionView.RefreshItems");
+        static readonly ProfilerMarker k_RebuildMarker = new ("BaseVerticalCollectionView.Rebuild");
+
         /// <summary>
         /// Defines <see cref="UxmlTraits"/> for the <see cref="BaseVerticalCollectionView"/>.
         /// </summary>
@@ -69,8 +91,8 @@ public abstract class BaseVerticalCollectionView : BindableElement, ISerializati
         /// </remarks>
         public new class UxmlTraits : BindableElement.UxmlTraits
         {
-            private readonly UxmlIntAttributeDescription m_FixedItemHeight = new UxmlIntAttributeDescription { name = "fixed-item-height", obsoleteNames = new[] { "itemHeight, item-height" }, defaultValue = s_DefaultItemHeight };
             private readonly UxmlEnumAttributeDescription<CollectionVirtualizationMethod> m_VirtualizationMethod = new UxmlEnumAttributeDescription<CollectionVirtualizationMethod> { name = "virtualization-method", defaultValue = CollectionVirtualizationMethod.FixedHeight };
+            private readonly UxmlIntAttributeDescription m_FixedItemHeight = new UxmlIntAttributeDescription { name = "fixed-item-height", obsoleteNames = new[] { "itemHeight, item-height" }, defaultValue = s_DefaultItemHeight };
             private readonly UxmlBoolAttributeDescription m_ShowBorder = new UxmlBoolAttributeDescription { name = "show-border", defaultValue = false };
             private readonly UxmlEnumAttributeDescription<SelectionType> m_SelectionType = new UxmlEnumAttributeDescription<SelectionType> { name = "selection-type", defaultValue = SelectionType.Single };
             private readonly UxmlEnumAttributeDescription<AlternatingRowBackground> m_ShowAlternatingRowBackgrounds = new UxmlEnumAttributeDescription<AlternatingRowBackground> { name = "show-alternating-row-backgrounds", defaultValue = AlternatingRowBackground.None };
@@ -123,7 +145,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         }
 
         /// <summary>
-        /// Callback triggered when the user acts on a selection of one or more items, for example by double-clicking or pressing Enter.
+        /// Obsolete. Use <see cref="BaseVerticalCollectionView.itemsChosen"/> instead.
         /// </summary>
         /// <remarks>
         /// This callback receives an enumerable that contains the item or items chosen.
@@ -140,11 +162,12 @@ public event Action<IEnumerable<object>> onItemsChosen
         /// </summary>
         /// <remarks>
         /// This callback receives an enumerable that contains the item or items chosen.
+        /// <para>__Note__: A single-click only changes the selection. Use a double-click to submit the selection.</para>
         /// </remarks>
         public event Action<IEnumerable<object>> itemsChosen;
 
         /// <summary>
-        /// Callback triggered when the selection changes.
+        /// Obsolete. Use <see cref="BaseVerticalCollectionView.selectionChanged"/> instead.
         /// </summary>
         /// <remarks>
         /// This callback receives an enumerable that contains the item or items selected.
@@ -165,7 +188,7 @@ public event Action<IEnumerable<object>> onSelectionChange
         public event Action<IEnumerable<object>> selectionChanged;
 
         /// <summary>
-        /// Callback triggered when the selection changes.
+        /// Obsolete. Use <see cref="BaseVerticalCollectionView.selectedIndicesChanged"/> instead.
         /// </summary>
         /// <remarks>
         /// This callback receives an enumerable that contains the item index or item indices selected.
@@ -199,17 +222,48 @@ public event Action<IEnumerable<int>> onSelectedIndicesChange
         /// </summary>
         public event Action itemsSourceChanged;
 
-        // [GR] We can get rid of this once the InternalTreeView is removed.
-        private Func<int, int> m_GetItemId;
+        internal event Action selectionNotChanged;
+
+        /// <summary>
+        /// Called when a drag operation wants to start in this collection view.
+        /// </summary>
+        internal event Func<CanStartDragArgs, bool> canStartDrag;
 
-        internal Func<int, int> getItemId
+        internal bool HasCanStartDrag() => canStartDrag != null;
+
+        internal bool RaiseCanStartDrag(ReusableCollectionItem item, IEnumerable<int> ids)
         {
-            get => m_GetItemId;
-            set
-            {
-                m_GetItemId = value;
-                RefreshItems();
-            }
+            return canStartDrag?.Invoke(new CanStartDragArgs(item?.rootElement, item?.id ?? TreeItem.invalidId, ids)) ?? true;
+        }
+
+        /// <summary>
+        /// Called when a drag operation starts in this collection view.
+        /// </summary>
+        internal event Func<SetupDragAndDropArgs, StartDragArgs> setupDragAndDrop;
+
+        internal StartDragArgs RaiseSetupDragAndDrop(ReusableCollectionItem item, IEnumerable<int> ids, StartDragArgs args)
+        {
+            return setupDragAndDrop?.Invoke(new SetupDragAndDropArgs(item?.rootElement, ids, args)) ?? args;
+        }
+
+        /// <summary>
+        /// Called when a drag operation updates in this collection view.
+        /// </summary>
+        internal event Func<HandleDragAndDropArgs, DragVisualMode> dragAndDropUpdate;
+
+        internal DragVisualMode RaiseHandleDragAndDrop(Vector2 pointerPosition, DragAndDropArgs dragAndDropArgs)
+        {
+            return dragAndDropUpdate?.Invoke(new HandleDragAndDropArgs(pointerPosition, dragAndDropArgs)) ?? DragVisualMode.None;
+        }
+
+        /// <summary>
+        /// Called when a drag operation is released in this collection view.
+        /// </summary>
+        internal event Func<HandleDragAndDropArgs, DragVisualMode> handleDrop;
+
+        internal DragVisualMode RaiseDrop(Vector2 pointerPosition, DragAndDropArgs dragAndDropArgs)
+        {
+            return handleDrop?.Invoke(new HandleDragAndDropArgs(pointerPosition, dragAndDropArgs)) ?? DragVisualMode.None;
         }
 
         /// <summary>
@@ -218,16 +272,25 @@ internal Func<int, int> getItemId
         /// <remarks>
         /// This list contains the items that the <see cref="BaseVerticalCollectionView"/> displays.
         /// </remarks>
+        [CreateProperty]
         public IList itemsSource
         {
             get => viewController?.itemsSource;
-            set => GetOrCreateViewController().itemsSource = value;
+            set
+            {
+                var previous = itemsSource;
+                GetOrCreateViewController().itemsSource = value;
+                if (previous != itemsSource)
+                {
+                    NotifyPropertyChanged(itemsSourceProperty);
+                }
+            }
         }
 
         internal virtual bool sourceIncludesArraySize => false;
 
         /// <summary>
-        /// Callback for constructing the VisualElement that is the template for each recycled and re-bound element in the list.
+        /// Obsolete. Use <see cref="ListView.makeItem"/> or <see cref="TreeView.makeItem"/> instead.
         /// </summary>
         [Obsolete("makeItem has been moved to ListView and TreeView. Use these ones instead.")]
         public Func<VisualElement> makeItem
@@ -237,7 +300,7 @@ public Func<VisualElement> makeItem
         }
 
         /// <summary>
-        /// Callback for binding a data item to the visual element.
+        /// Obsolete. Use <see cref="ListView.bindItem"/> or <see cref="TreeView.bindItem"/> instead.
         /// </summary>
         [Obsolete("bindItem has been moved to ListView and TreeView. Use these ones instead.")]
         public Action<VisualElement, int> bindItem
@@ -247,7 +310,7 @@ public Action<VisualElement, int> bindItem
         }
 
         /// <summary>
-        /// Callback for unbinding a data item from the VisualElement.
+        /// Obsolete. Use <see cref="ListView.unbindItem"/> or <see cref="TreeView.unbindItem"/> instead.
         /// </summary>
         [Obsolete("unbindItem has been moved to ListView and TreeView. Use these ones instead.")]
         public Action<VisualElement, int> unbindItem
@@ -257,7 +320,7 @@ public Action<VisualElement, int> unbindItem
         }
 
         /// <summary>
-        /// Callback invoked when a <see cref="VisualElement"/> created via <see cref="makeItem"/> is no longer needed and will be destroyed.
+        /// Obsolete. Use <see cref="ListView.destroyItem"/> or <see cref="TreeView.destroyItem"/> instead.
         /// </summary>
         [Obsolete("destroyItem has been moved to ListView and TreeView. Use these ones instead.")]
         public Action<VisualElement> destroyItem
@@ -281,11 +344,13 @@ public Action<VisualElement> destroyItem
         /// The default value is <see cref="SelectionType.Single"/>.
         /// When you set the collection view to disable selections, any current selection is cleared.
         /// </remarks>
+        [CreateProperty]
         public SelectionType selectionType
         {
             get { return m_SelectionType; }
             set
             {
+                var previous = m_SelectionType;
                 m_SelectionType = value;
                 if (m_SelectionType == SelectionType.None)
                 {
@@ -298,39 +363,52 @@ public SelectionType selectionType
                         SetSelection(m_SelectedIndices.First());
                     }
                 }
+
+                if (previous != m_SelectionType)
+                    NotifyPropertyChanged(selectionTypeProperty);
             }
         }
 
         /// <summary>
         /// Returns the selected item from the data source. If multiple items are selected, returns the first selected item.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public object selectedItem => m_SelectedItems.Count == 0 ? null : m_SelectedItems.First();
 
         /// <summary>
         /// Returns the selected items from the data source. Always returns an enumerable, even if no item is selected, or a single
         /// item is selected.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public IEnumerable<object> selectedItems => m_SelectedItems;
 
         /// <summary>
         /// Returns or sets the selected item's index in the data source. If multiple items are selected, returns the
         /// first selected item's index. If multiple items are provided, sets them all as selected.
         /// </summary>
+        [CreateProperty]
         public int selectedIndex
         {
             get { return m_SelectedIndices.Count == 0 ? -1 : m_SelectedIndices.First(); }
-            set { SetSelection(value); }
+            set
+            {
+                var previous = selectedIndex;
+                SetSelection(value);
+                if (previous != selectedIndex)
+                    NotifyPropertyChanged(selectedIndexProperty);
+            }
         }
 
         /// <summary>
         /// Returns the indices of selected items in the data source. Always returns an enumerable, even if no item  is selected, or a
         /// single item is selected.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public IEnumerable<int> selectedIndices => m_SelectedIndices;
 
-        internal List<int> currentSelectionIds => m_SelectedIds;
+        internal IEnumerable<int> selectedIds => m_SelectedIds;
 
-        static readonly List<ReusableCollectionItem> k_EmptyItems = new List<ReusableCollectionItem>();
+        static readonly List<ReusableCollectionItem> k_EmptyItems = new();
         internal IEnumerable<ReusableCollectionItem> activeItems => m_VirtualizationController?.activeItems ?? k_EmptyItems;
         internal ScrollView scrollView => m_ScrollView;
         internal ListViewDragger dragger => m_Dragger;
@@ -342,7 +420,7 @@ public int selectedIndex
         public CollectionViewController viewController => m_ViewController;
 
         /// <summary>
-        /// The computed pixel-aligned height for the list elements.
+        /// Obsolete, will be removed from the API.
         /// </summary>
         /// <remarks>
         /// This value changes depending on the current panel's DPI scaling.
@@ -364,41 +442,49 @@ internal float ResolveItemHeight(float height = -1)
         /// <remarks>
         /// If set to true, a border appears around the ScrollView that the collection view uses internally.
         /// </remarks>
+        [CreateProperty]
         public bool showBorder
         {
             get => m_ScrollView.ClassListContains(borderUssClassName);
-            set => m_ScrollView.EnableInClassList(borderUssClassName, value);
+            set
+            {
+                var previous = showBorder;
+                m_ScrollView.EnableInClassList(borderUssClassName, value);
+
+                if (previous != showBorder)
+                    NotifyPropertyChanged(showBorderProperty);
+            }
         }
 
         /// <summary>
         /// Gets or sets a value that indicates whether the user can drag list items to reorder them.
         /// </summary>
         /// <remarks>
-        /// The default value is <c>false</c>.
-        /// Set this value to <c>true</c> to allow the user to drag and drop the items in the list. The collection view
-        /// provides a default controller to allow standard behavior. It also automatically handles reordering
-        /// the items in the data source.
+        /// The default value is <c>false</c> which allows the user to drag items to and from other views
+        /// when you implement <see cref="canStartDrag"/>, <see cref="setupDragAndDrop"/>, <see cref="dragAndDropUpdate"/>, and <see cref="handleDrop"/>.
+        /// Set this value to <c>true</c> to allow the user to reorder items in the list.
         /// </remarks>
+        [CreateProperty]
         public bool reorderable
         {
             get => m_Dragger?.dragAndDropController?.enableReordering ?? false;
             set
             {
-                if (m_Dragger?.dragAndDropController == null)
+                var previous = reorderable;
+
+                try
                 {
-                    if (value)
+                    var controller = m_Dragger.dragAndDropController;
+                    if (controller != null && controller.enableReordering != value)
                     {
-                        InitializeDragAndDropController(true);
+                        controller.enableReordering = value;
+                        Rebuild();
                     }
-
-                    return;
                 }
-
-                var controller = m_Dragger.dragAndDropController;
-                if (controller != null && controller.enableReordering != value)
+                finally
                 {
-                    controller.enableReordering = value;
-                    Rebuild();
+                    if (previous != reorderable)
+                        NotifyPropertyChanged(reorderableProperty);
                 }
             }
         }
@@ -409,26 +495,30 @@ public bool reorderable
         /// This property controls whether the collection view shows a horizontal scroll bar when its content
         /// does not fit in the visible area.
         /// </summary>
+        [CreateProperty]
         public bool horizontalScrollingEnabled
         {
-            get { return m_HorizontalScrollingEnabled; }
+            get => m_HorizontalScrollingEnabled;
             set
             {
                 if (m_HorizontalScrollingEnabled == value)
                     return;
 
                 m_HorizontalScrollingEnabled = value;
-                m_ScrollView.mode = (value ? ScrollViewMode.VerticalAndHorizontal : ScrollViewMode.Vertical);
+                m_ScrollView.horizontalScrollerVisibility = value ? ScrollerVisibility.Auto : ScrollerVisibility.Hidden;
+                m_ScrollView.mode = value ? ScrollViewMode.VerticalAndHorizontal : ScrollViewMode.Vertical;
+                NotifyPropertyChanged(horizontalScrollingEnabledProperty);
             }
         }
 
-        [SerializeField]
+        [SerializeField, DontCreateProperty]
         private AlternatingRowBackground m_ShowAlternatingRowBackgrounds = AlternatingRowBackground.None;
 
         /// <summary>
         /// This property controls whether the background colors of collection view rows alternate.
         /// Takes a value from the <see cref="AlternatingRowBackground"/> enum.
         /// </summary>
+        [CreateProperty]
         public AlternatingRowBackground showAlternatingRowBackgrounds
         {
             get { return m_ShowAlternatingRowBackgrounds; }
@@ -439,9 +529,11 @@ public AlternatingRowBackground showAlternatingRowBackgrounds
 
                 m_ShowAlternatingRowBackgrounds = value;
                 RefreshItems();
+                NotifyPropertyChanged(showAlternatingRowBackgroundsProperty);
             }
         }
 
+        internal static readonly string k_InvalidTemplateError = "Template Not Found";
         // If we ever change the default item height, we should consider changing the default max height of the view when
         // used in property fields. The rule to look for is ".unity-property-field > .unity-collection-view"
         internal static readonly int s_DefaultItemHeight = 22;
@@ -460,23 +552,23 @@ public AlternatingRowBackground showAlternatingRowBackgrounds
         /// When using <c>DynamicHeight</c>, the collection will wait for the actual height to be computed.
         /// Dynamic height is more flexible but less performant.
         /// </remarks>
+        [CreateProperty]
         public CollectionVirtualizationMethod virtualizationMethod
         {
             get => m_VirtualizationMethod;
             set
             {
-                var oldValue = m_VirtualizationMethod;
+                if (m_VirtualizationMethod == value)
+                    return;
                 m_VirtualizationMethod = value;
-                if (oldValue != value)
-                {
-                    CreateVirtualizationController();
-                    Rebuild();
-                }
+                CreateVirtualizationController();
+                Rebuild();
+                NotifyPropertyChanged(virtualizationMethodProperty);
             }
         }
 
         /// <summary>
-        /// The height of a single item in the list, in pixels.
+        /// Obsolete. Use <see cref="BaseVerticalCollectionView.fixedItemHeight"/> instead.
         /// </summary>
         /// <remarks>
         /// This property must be set when using the <see cref="virtualizationMethod"/> is set to <c>FixedHeight</c>, for the collection view to function.
@@ -493,12 +585,17 @@ public int itemHeight
         /// </summary>
         /// <remarks>
         /// This property must be set when using the <see cref="virtualizationMethod"/> is set to <c>FixedHeight</c>, for the collection view to function.
+        /// If set when <see cref="virtualizationMethod"/> is <c>DynamicHeight</c>, it serves as the default height to help calculate the
+        /// number of items necessary and the scrollable area, before items are laid out. It should be set to the minimum expected height of an item.
         /// </remarks>
+        [CreateProperty]
         public float fixedItemHeight
         {
             get => m_FixedItemHeight;
             set
             {
+                var previous = fixedItemHeight;
+
                 if (value < 0)
                     throw new ArgumentOutOfRangeException(nameof(fixedItemHeight), "Value needs to be positive for virtualization.");
 
@@ -507,6 +604,7 @@ public float fixedItemHeight
                 {
                     m_FixedItemHeight = value;
                     RefreshItems();
+                    NotifyPropertyChanged(fixedItemHeightProperty);
                 }
             }
         }
@@ -516,11 +614,11 @@ public float fixedItemHeight
         CollectionVirtualizationController m_VirtualizationController;
         KeyboardNavigationManipulator m_NavigationManipulator;
 
-        [SerializeField]
+        [SerializeField, DontCreateProperty]
         internal SerializedVirtualizationData serializedVirtualizationData = new SerializedVirtualizationData();
 
         // Persisted. It's why this can't be a HashSet(). :(
-        [SerializeField]
+        [SerializeField, DontCreateProperty]
         private readonly List<int> m_SelectedIds = new List<int>();
 
         // Not persisted! Just used for fast lookups of selected indices and object references.
@@ -627,6 +725,9 @@ internal void InitializeDragAndDropController(bool enableReordering)
 
             m_Dragger = CreateDragger();
             m_Dragger.dragAndDropController = CreateDragAndDropController();
+            if (m_Dragger.dragAndDropController == null)
+                return;
+
             m_Dragger.dragAndDropController.enableReordering = enableReordering;
         }
 
@@ -667,18 +768,24 @@ internal void SetDragAndDropController(ICollectionDragAndDropController dragAndD
         /// The USS class name of the drag hover bar.
         /// </summary>
         /// <remarks>
-        /// Unity adds this USS class to the bar that appears when an item element is dragged. The
-        /// <see cref="BaseVerticalCollectionView.reorderable"/> property must be true in order for items to be dragged.
+        /// Unity adds this USS class to the bar that appears when the user drags an item in the list.
         /// Any styling applied to this class affects every BaseVerticalCollectionView located beside, or below the stylesheet in the
         /// visual tree.
         /// </remarks>
         public static readonly string dragHoverBarUssClassName = ussClassName + "__drag-hover-bar";
         /// <summary>
+        /// The USS class name of the drag hover circular marker used to indicate depth.
+        /// </summary>
+        /// <remarks>
+        /// Unity adds this USS class to the bar that appears when the user drags an item in the list. Any styling applied to this class affects
+        /// every BaseVerticalCollectionView located beside, or below the stylesheet in the visual tree.
+        /// </remarks>
+        public static readonly string dragHoverMarkerUssClassName = ussClassName + "__drag-hover-marker";
+        /// <summary>
         /// The USS class name applied to an item element on drag hover.
         /// </summary>
         /// <remarks>
-        /// Unity adds this USS class to the list element that is dragged. The <see cref="BaseVerticalCollectionView.reorderable"/>
-        /// property must be set to true for items to be draggable. Any styling applied to this class affects
+        /// Unity adds this USS class to the item element when it's being dragged. Any styling applied to this class affects
         /// every BaseVerticalCollectionView item located beside, or below the stylesheet in the visual tree.
         /// </remarks>
         public static readonly string itemDragHoverUssClassName = itemUssClassName + "--drag-hover";
@@ -696,10 +803,10 @@ internal void SetDragAndDropController(ICollectionDragAndDropController dragAndD
         /// </summary>
         /// <remarks>
         /// Unity adds this USS class to every odd-numbered item in the BaseVerticalCollectionView when the
-        /// <see cref="BaseVerticalCollectionView.showAlternatingRowBackground"/> property is set to <c>ContentOnly</c> or <c>All</c>.
-        /// When the <c>showAlternatingRowBackground</c> property is set to either of those values, odd-numbered items
+        /// <see cref="BaseVerticalCollectionView.showAlternatingRowBackgrounds"/> property is set to <c>ContentOnly</c> or <c>All</c>.
+        /// When the <c>showAlternatingRowBackgrounds</c> property is set to either of those values, odd-numbered items
         /// are displayed with a different background color than even-numbered items. This USS class is used to differentiate
-        /// odd-numbered items from even-numbered items. When the <c>showAlternatingRowBackground</c> property is set to
+        /// odd-numbered items from even-numbered items. When the <c>showAlternatingRowBackgrounds</c> property is set to
         /// <c>None</c>, the USS class is not added, and any styling or behavior that relies on it's invalidated.
         /// </remarks>
         public static readonly string itemAlternativeBackgroundUssClassName = itemUssClassName + "--alternative-background";
@@ -712,11 +819,11 @@ internal void SetDragAndDropController(ICollectionDragAndDropController dragAndD
         /// </remarks>
         public static readonly string listScrollViewUssClassName = ussClassName + "__scroll-view";
 
-        internal static readonly string backgroundFillUssClassName = ussClassName + "__background";
+        internal static readonly string backgroundFillUssClassName = ussClassName + "__background-fill";
 
         /// <summary>
         /// Creates a <see cref="BaseVerticalCollectionView"/> with all default properties.
-        /// The <see cref="BaseVerticalCollectionView.itemSource"/> must all be set for the BaseVerticalCollectionView to function properly.
+        /// The <see cref="BaseVerticalCollectionView.itemsSource"/> must all be set for the BaseVerticalCollectionView to function properly.
         /// </summary>
         public BaseVerticalCollectionView()
         {
@@ -725,11 +832,10 @@ public BaseVerticalCollectionView()
             selectionType = SelectionType.Single;
 
             m_ScrollView = new ScrollView();
-            m_ScrollView.viewDataKey = "list-view__scroll-view";
             m_ScrollView.AddToClassList(listScrollViewUssClassName);
             m_ScrollView.verticalScroller.valueChanged += v => OnScroll(new Vector2(0, v));
 
-            RegisterCallback<GeometryChangedEvent>(OnSizeChanged);
+            m_ScrollView.RegisterCallback<GeometryChangedEvent>(OnSizeChanged);
             RegisterCallback<CustomStyleResolvedEvent>(OnCustomStyleResolved);
 
             m_ScrollView.contentContainer.RegisterCallback<AttachToPanelEvent>(OnAttachToPanel);
@@ -746,6 +852,8 @@ public BaseVerticalCollectionView()
 
             m_ItemIndexChangedCallback = OnItemIndexChanged;
             m_ItemsSourceChangedCallback = OnItemsSourceChanged;
+
+            InitializeDragAndDropController(false);
         }
 
         /// <summary>
@@ -769,7 +877,7 @@ public BaseVerticalCollectionView(IList itemsSource, float itemHeight = ItemHeig
         }
 
         /// <summary>
-        /// Constructs a <see cref="BaseVerticalCollectionView"/>, with all required properties provided.
+        /// Obsolete.  Use <see cref="ListView"/> or <see cref="TreeView"/> constructor directly.
         /// </summary>
         /// <param name="itemsSource">The list of items to use as a data source.</param>
         /// <param name="itemHeight">The height of each item, in pixels. For <c>FixedHeight</c> virtualization only.</param>
@@ -791,17 +899,21 @@ public BaseVerticalCollectionView(IList itemsSource, float itemHeight = ItemHeig
         }
 
         /// <summary>
-        /// Gets the root element the specified TreeView item.
+        /// Gets the root element of the specified collection view item.
         /// </summary>
-        /// <param name="id">The TreeView item identifier.</param>
-        /// <returns>The TreeView item's root element.</returns>
+        /// <param name="id">The item identifier.</param>
+        /// <returns>The item's root element.</returns>
+        /// <remarks>
+        /// This method provides an entry point to re-style elements added by Unity over the user-driven content.
+        /// Ex. the drag handle in a ListView, or the Toggle in a TreeView.
+        /// </remarks>
         public VisualElement GetRootElementForId(int id)
         {
             return activeItems.FirstOrDefault(t => t.id == id)?.rootElement;
         }
 
         /// <summary>
-        /// Gets the root element the specified collection view item.
+        /// Gets the root element of the specified collection view item.
         /// </summary>
         /// <param name="index">The item index.</param>
         /// <returns>The item's root element.</returns>
@@ -822,10 +934,7 @@ internal virtual bool HasValidDataAndBindings()
         void OnItemIndexChanged(int srcIndex, int dstIndex)
         {
             itemIndexChanged?.Invoke(srcIndex, dstIndex);
-            if (!(binding is IInternalListViewBinding))
-                RefreshItems();
-            else
-                schedule.Execute(RefreshItems).ExecuteLater(100);
+            RefreshItems();
         }
 
         void OnItemsSourceChanged()
@@ -857,7 +966,7 @@ public void RefreshItem(int index)
         /// </remarks>
         public void RefreshItems()
         {
-            using (new ProfilerMarker("BaseVerticalCollectionView.RefreshItems").Auto())
+            using (k_RefreshMarker.Auto())
             {
                 if (m_ViewController == null)
                     return;
@@ -868,6 +977,9 @@ public void RefreshItems()
             }
         }
 
+        /// <summary>
+        /// Obsolete. Use <see cref="BaseVerticalCollectionView.Rebuild"/> instead.
+        /// </summary>
         [Obsolete("Refresh() has been deprecated. Use Rebuild() instead. (UnityUpgradable) -> Rebuild()", false)]
         public void Refresh()
         {
@@ -882,7 +994,7 @@ public void Refresh()
         /// </remarks>
         public void Rebuild()
         {
-            using (new ProfilerMarker("BaseVerticalCollectionView.Rebuild").Auto())
+            using (k_RebuildMarker.Auto())
             {
                 if (m_ViewController == null)
                     return;
@@ -952,7 +1064,7 @@ public void ScrollToItem(int index)
         }
 
         /// <summary>
-        /// Scrolls to a specific item id and makes it visible.
+        /// Obsolete. Use <see cref="BaseVerticalCollectionView.ScrollToItemById"/> instead.
         /// </summary>
         /// <param name="id">Item id to scroll to.</param>
         [Obsolete("ScrollToId() has been deprecated. Use ScrollToItemById() instead. (UnityUpgradable) -> ScrollToItemById(*)", false)]
@@ -982,9 +1094,9 @@ private void OnScroll(Vector2 offset)
             virtualizationController.OnScroll(offset);
         }
 
-        private void Resize(Vector2 size, int layoutPass = -1)
+        private void Resize(Vector2 size)
         {
-            virtualizationController.Resize(size, layoutPass);
+            virtualizationController.Resize(size);
             m_LastHeight = size.y;
             virtualizationController.UpdateBackground();
         }
@@ -1021,7 +1133,7 @@ public void OnKeyDown(KeyDownEvent evt)
             m_NavigationManipulator.OnKeyDown(evt);
         }
 
-        private bool Apply(KeyboardNavigationOperation op, bool shiftKey)
+        private bool Apply(KeyboardNavigationOperation op, bool shiftKey, bool altKey)
         {
             if (selectionType == SelectionType.None || !HasValidDataAndBindings())
             {
@@ -1091,6 +1203,20 @@ void HandleSelectionAndScroll(int index)
                         HandleSelectionAndScroll(Mathf.Max(0, selectionUp - (virtualizationController.visibleItemCount - 1)));
                     }
                     return true;
+                case KeyboardNavigationOperation.MoveRight:
+                    if (m_SelectedIndices.Count > 0)
+                    {
+                        return HandleItemNavigation(true, altKey);
+                    }
+                    break;
+                case KeyboardNavigationOperation.MoveLeft:
+                    if (m_SelectedIndices.Count > 0)
+                    {
+                        return HandleItemNavigation(false, altKey);
+                    }
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(op), op, null);
             }
 
             return false;
@@ -1098,15 +1224,21 @@ void HandleSelectionAndScroll(int index)
 
         private void Apply(KeyboardNavigationOperation op, EventBase sourceEvent)
         {
-            var shiftKey = sourceEvent is KeyDownEvent kde && kde.shiftKey ||
-                           sourceEvent is INavigationEvent ne && ne.shiftKey;
-            if (Apply(op, shiftKey))
+            var shiftKey = sourceEvent is KeyDownEvent { shiftKey: true } or INavigationEvent { shiftKey: true };
+            var altKey = sourceEvent is KeyDownEvent { altKey: true } or INavigationEvent { altKey: true };
+            if (Apply(op, shiftKey, altKey))
             {
                 sourceEvent.StopPropagation();
                 sourceEvent.PreventDefault();
             }
         }
 
+        private protected virtual bool HandleItemNavigation(bool moveIn, bool altKey)
+        {
+            // We could possibly want to expand child items here.
+            return false;
+        }
+
         private void OnPointerMove(PointerMoveEvent evt)
         {
             // Support cases where PointerMove corresponds to a MouseDown or MouseUp event with multiple buttons.
@@ -1249,21 +1381,41 @@ private void DoSelect(Vector2 localPosition, int clickCount, bool actionKey, boo
                     }
                     else if (selectionType == SelectionType.Multiple && m_SelectedIndices.Contains(clickedIndex))
                     {
-                        // Do noting, selection will be processed OnPointerUp.
+                        // Do nothing, selection will be processed OnPointerUp.
                         // If drag and drop will be started ListViewDragger will capture the mouse and ListView will not receive the mouse up event.
+                        selectionNotChanged?.Invoke();
                     }
                     else // single
                     {
+                        if (selectionType == SelectionType.Single && m_SelectedIndices.Contains(clickedIndex))
+                        {
+                            selectionNotChanged?.Invoke();
+                        }
+
                         SetSelection(clickedIndex);
                     }
 
                     break;
                 case 2:
-                    if (itemsChosen != null)
+                    if (itemsChosen == null)
+                        return;
+
+                    var wasClickedIndexInSelection = false;
+                    foreach (var index in selectedIndices)
                     {
-                        ProcessSingleClick(clickedIndex);
+                        if (clickedIndex == index)
+                        {
+                            wasClickedIndexInSelection = true;
+                            break;
+                        }
                     }
 
+                    ProcessSingleClick(clickedIndex);
+
+                    // Only invoke itemsChosen if we're clicking on the same entry. Case UUM-42450.
+                    if (!wasClickedIndexInSelection)
+                        return;
+
                     itemsChosen?.Invoke(m_SelectedItems);
                     break;
             }
@@ -1437,6 +1589,9 @@ internal void SetSelectionInternal(IEnumerable<int> indices, bool sendNotificati
             if (!HasValidDataAndBindings() || indices == null)
                 return;
 
+            if (MatchesExistingSelection(indices))
+                return;
+
             ClearSelectionWithoutValidation();
             foreach (var index in indices)
                 AddToSelectionWithoutValidation(index);
@@ -1447,6 +1602,28 @@ internal void SetSelectionInternal(IEnumerable<int> indices, bool sendNotificati
             SaveViewData();
         }
 
+        private bool MatchesExistingSelection(IEnumerable<int> indices)
+        {
+            var pooled = ListPool<int>.Get();
+            try
+            {
+                pooled.AddRange(indices);
+                if (pooled.Count != m_SelectedIndices.Count)
+                    return false;
+                for (var i = 0; i < pooled.Count; ++i)
+                {
+                    if (pooled[i] != m_SelectedIndices[i])
+                        return false;
+                }
+
+                return true;
+            }
+            finally
+            {
+                ListPool<int>.Release(pooled);
+            }
+        }
+
         private void NotifyOfSelectionChange()
         {
             if (!HasValidDataAndBindings())
@@ -1484,6 +1661,7 @@ internal override void OnViewDataReady()
 
             var key = GetFullHierarchicalViewDataKey();
             OverwriteFromViewData(this, key);
+            m_ScrollView.UpdateContentViewTransform();
         }
 
         [EventInterest(typeof(PointerUpEvent), typeof(FocusEvent), typeof(NavigationSubmitEvent), typeof(BlurEvent))]
@@ -1528,7 +1706,7 @@ private void OnSizeChanged(GeometryChangedEvent evt)
                 Mathf.Approximately(evt.newRect.height, evt.oldRect.height))
                 return;
 
-            Resize(evt.newRect.size, evt.layoutPass);
+            Resize(evt.newRect.size);
         }
 
         private void OnCustomStyleResolved(CustomStyleResolvedEvent e)
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Binding.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Binding.cs
index 106e77fa2f..86e5c3f8f9 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Binding.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Binding.cs
@@ -53,6 +53,4 @@ public static bool IsBound(this IBindable control)
             return control?.binding != null;
         }
     }
-
-    internal interface IInternalListViewBinding { }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Box.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Box.cs
index ba3306d431..8b483c8854 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Box.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Box.cs
@@ -5,7 +5,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// Styled visual element to match the IMGUI Box Style.
+    /// Styled visual element to match the IMGUI Box Style. For more information, refer to [[wiki:UIE-uxml-element-box|UXML element Box]].
     /// </summary>
     public class Box : VisualElement
     {
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Button.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Button.cs
index a3e7df66f9..4f38f448e2 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Button.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Button.cs
@@ -10,10 +10,10 @@ namespace UnityEngine.UIElements
     /// This is a clickable button.
     /// </summary>
     /// <remarks>
-    /// A <see cref="Button"/> consists of a text label element that can respond to pointer and mouse events.
-    /// You can replace or add to the content of the button by adding elements to its hierarchy.
-    /// For example, to use a separate image as an icon for the button, you can make an <see cref="Image"/>
-    /// element a child of the button.
+    /// A Button has a text label element that can respond to pointer and mouse events.
+    /// You can customize a button by adding child elements to its hierarchy.
+    /// For example, to use a separate image as an icon for the button, you can add an <see cref="Image"/>
+    /// element as a child of the button.
     ///
     /// By default, a single left mouse click activates the Button's <see cref="Clickable"/> property button.
     /// To remove this activator, or add more activators, modify the <c>clickable.activators</c> property.
@@ -21,6 +21,8 @@ namespace UnityEngine.UIElements
     ///
     /// To bind a Button's text value to the contents of a variable, set the <c>binding-path</c> property in the
     /// UXML file, or the <c>bindingPath</c> property in the C# code, to a string that contains the variable name.
+    /// 
+    /// For more information, refer to [[wiki:UIE-uxml-element-Button|UXML element Button]].
     /// </remarks>
     public class Button : TextElement
     {
@@ -120,6 +122,10 @@ public event Action onClick
         /// <remarks>
         /// This is a shortcut for modifying <seealso cref="Clickable.clicked"/>. It is provided as a convenience. When you add or remove actions from clicked, it adds or removes them from <c>Clickable.clicked</c> automatically.
         /// </remarks>
+        /// <example>
+        /// The following example shows how to use the clicked event to print a message to the console when the button is clicked.
+        /// <code source="../../../../Modules/UIElements/Tests/UIElementsExamples/Assets/Examples/Button_clicked.cs"/>
+        /// </example>
         public event Action clicked
         {
             add
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/CompoundFields.cs b/ModuleOverrides/com.unity.ui/Core/Controls/CompoundFields.cs
index 231f562fa2..018c6b7a68 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/CompoundFields.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/CompoundFields.cs
@@ -169,7 +169,7 @@ public RectIntField(string label)
     }
 
     /// <summary>
-    /// A <see cref="Vector2"/> field.
+    /// A <see cref="Vector2"/> field. For more information, refer to [[wiki:UIE-uxm-element-Vector2Field|UXML element Vector2Field]].
     /// </summary>
     [MovedFrom(true, UpgradeConstants.EditorNamespace, UpgradeConstants.EditorAssembly)]
     public class Vector2Field : BaseCompositeField<Vector2, FloatField, float>
@@ -244,7 +244,7 @@ public Vector2Field(string label)
     }
 
     /// <summary>
-    /// A <see cref="Vector3"/> field.
+    /// A <see cref="Vector3"/> field. For more information, refer to [[wiki:UIE-uxm-element-Vector3Field|UXML element Vector3Field]].
     /// </summary>
     [MovedFrom(true, UpgradeConstants.EditorNamespace, UpgradeConstants.EditorAssembly)]
     public class Vector3Field : BaseCompositeField<Vector3, FloatField, float>
@@ -265,7 +265,7 @@ internal override FieldDescription[] DescribeFields()
         public new class UxmlFactory : UxmlFactory<Vector3Field, UxmlTraits> {}
 
         /// <summary>
-        /// Defines <see cref="UxmlTraits"/> for the <see cref="Vetor3Field"/>.
+        /// Defines <see cref="UxmlTraits"/> for the <see cref="Vector3Field"/>.
         /// </summary>
         public new class UxmlTraits : BaseCompositeField<Vector3, FloatField, float>.UxmlTraits
         {
@@ -322,7 +322,7 @@ public Vector3Field(string label)
 
 
     /// <summary>
-    /// A <see cref="Vector4"/> field.
+    /// A <see cref="Vector4"/> field. For more information, refer to [[wiki:UIE-uxm-element-Vector4Field|UXML element Vector4Field]].
     /// </summary>
     [MovedFrom(true, UpgradeConstants.EditorNamespace, UpgradeConstants.EditorAssembly)]
     public class Vector4Field : BaseCompositeField<Vector4, FloatField, float>
@@ -401,7 +401,7 @@ public Vector4Field(string label)
 
 
     /// <summary>
-    /// A <see cref="Vector2Int"/> field.
+    /// A <see cref="Vector2Int"/> field. For more information, refer to [[wiki:UIE-uxm-element-Vector2IntField|UXML element Vector2IntField]].
     /// </summary>
     [MovedFrom(true, UpgradeConstants.EditorNamespace, UpgradeConstants.EditorAssembly)]
     public class Vector2IntField : BaseCompositeField<Vector2Int, IntegerField, int>
@@ -476,7 +476,7 @@ public Vector2IntField(string label)
     }
 
     /// <summary>
-    /// A <see cref="Vector3Int"/> field.
+    /// A <see cref="Vector3Int"/> field. For more information, refer to [[wiki:UIE-uxm-element-Vector3IntField|UXML element Vector3IntField]].
     /// </summary>
     [MovedFrom(true, UpgradeConstants.EditorNamespace, UpgradeConstants.EditorAssembly)]
     public class Vector3IntField : BaseCompositeField<Vector3Int, IntegerField, int>
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/DoubleField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/DoubleField.cs
index 26a9d610ba..af9539756a 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/DoubleField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/DoubleField.cs
@@ -43,7 +43,8 @@ protected override string ValueToString(double v)
         /// <returns>The double parsed from the string.</returns>
         protected override double StringToValue(string str)
         {
-            return UINumericFieldsUtils.StringToDouble(str, out var v) ? v : rawValue;
+            var success = UINumericFieldsUtils.TryConvertStringToDouble(str, textInputBase.originalText, out var v);
+            return success ? v : rawValue;
         }
 
         /// <summary>
@@ -87,7 +88,7 @@ public DoubleField(string label, int maxLength = kMaxLengthNone)
         internal override bool CanTryParse(string textString) => double.TryParse(textString, out _);
 
         /// <summary>
-        /// Modify the value using a 3D delta and a speed, typically coming from an input device.
+        /// Applies the values of a 3D delta and a speed from an input device.
         /// </summary>
         /// <param name="delta">A vector used to compute the value change.</param>
         /// <param name="speed">A multiplier for the value change.</param>
@@ -132,8 +133,7 @@ protected override string ValueToString(double v)
 
             protected override double StringToValue(string str)
             {
-                double v;
-                UINumericFieldsUtils.StringToDouble(str, out v);
+                UINumericFieldsUtils.TryConvertStringToDouble(str, originalText, out var v);
                 return v;
             }
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/DropdownField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/DropdownField.cs
index 84fa9ded39..f2489825e1 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/DropdownField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/DropdownField.cs
@@ -8,7 +8,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// A control that allows the user to pick a choice from a list of options.
+    /// A control that allows the user to pick a choice from a list of options. For more information, refer to [[wiki:UIE-uxml-element-dropdown|UXML element Dropdown]].
     /// </summary>
     public class DropdownField : PopupField<string>
     {
@@ -30,7 +30,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 base.Init(ve, bag, cc);
 
                 var f = (DropdownField)ve;
-                var choices = ParseChoiceList(m_Choices.GetValueFromBag(bag, cc));
+                var choices = UxmlUtility.ParseStringListAttribute(m_Choices.GetValueFromBag(bag, cc));
                 if (choices != null)
                     f.choices = choices;
                 f.index = m_Index.GetValueFromBag(bag, cc);
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/EnumField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/EnumField.cs
index 7c980a7270..f2c3d00aa2 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/EnumField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/EnumField.cs
@@ -3,8 +3,10 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using Unity.Properties;
 using UnityEngine;
 using UnityEngine.Scripting.APIUpdating;
+using static UnityEngine.EnumDataUtility;
 
 namespace UnityEngine.UIElements
 {
@@ -41,11 +43,13 @@ internal static bool ExtractValue(IUxmlAttributes bag, CreationContext cc, out T
     }
 
     /// <summary>
-    /// Makes a dropdown for switching between enum values.
+    /// Makes a dropdown for switching between enum values. For more information, refer to [[wiki:|UIE-uxml-element EnumField|UXML element EnumField]].
     /// </summary>
     [MovedFrom(true, UpgradeConstants.EditorNamespace, UpgradeConstants.EditorAssembly)]
     public class EnumField : BaseField<Enum>
     {
+        internal static readonly DataBindingProperty textProperty = nameof(text);
+
         /// <summary>
         /// Instantiates an <see cref="EnumField"/> using the data read from a UXML file.
         /// </summary>
@@ -112,6 +116,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// <summary>
         /// Return the text value of the currently selected enum.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public string text
         {
             get { return m_TextElement.text; }
@@ -214,34 +219,44 @@ public void Init(Enum defaultValue, bool includeObsoleteValues)
             m_IncludeObsoleteValues = includeObsoleteValues;
             PopulateDataFromType(defaultValue.GetType());
 
-            SetValueWithoutNotify(defaultValue);
+            // If the value is the same then we just need to ensure that the value label is
+            // updated as m_EnumType may have been null when the value was set. (UUM-28904)
+            if (!Enum.Equals(rawValue, defaultValue))
+                SetValueWithoutNotify(defaultValue);
+            else
+                UpdateValueLabel(defaultValue);
         }
 
         internal void PopulateDataFromType(Type enumType)
         {
             m_EnumType = enumType;
-            m_EnumData = EnumDataUtility.GetCachedEnumData(m_EnumType, !includeObsoleteValues);
+            m_EnumData = GetCachedEnumData(m_EnumType, includeObsoleteValues ? CachedType.IncludeObsoleteExceptErrors : CachedType.ExcludeObsolete);
         }
 
         public override void SetValueWithoutNotify(Enum newValue)
         {
-            if (rawValue != newValue)
+            if (!Enum.Equals(rawValue, newValue))
             {
                 base.SetValueWithoutNotify(newValue);
 
                 if (m_EnumType == null)
                     return;
 
-                int idx = Array.IndexOf(m_EnumData.values, newValue);
+                UpdateValueLabel(newValue);
+            }
+        }
 
-                if (idx >= 0 & idx < m_EnumData.values.Length)
-                {
-                    m_TextElement.text = m_EnumData.displayNames[idx];
-                }
-                else
-                {
-                    m_TextElement.text = string.Empty;
-                }
+        void UpdateValueLabel(Enum value)
+        {
+            int idx = Array.IndexOf(m_EnumData.values, value);
+
+            if (idx >= 0 & idx < m_EnumData.values.Length)
+            {
+                m_TextElement.text = m_EnumData.displayNames[idx];
+            }
+            else
+            {
+                m_TextElement.text = string.Empty;
             }
         }
 
@@ -323,6 +338,10 @@ protected override void UpdateMixedValueContent()
             {
                 m_TextElement.text = mixedValueString;
             }
+            else
+            {
+                UpdateValueLabel(value);
+            }
 
             m_TextElement.EnableInClassList(labelUssClassName, showMixedValue);
             m_TextElement.EnableInClassList(mixedValueLabelUssClassName, showMixedValue);
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/FloatField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/FloatField.cs
index 554786172c..10e8d17266 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/FloatField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/FloatField.cs
@@ -8,7 +8,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// Makes a text field for entering a float.
+    /// Makes a text field for entering a float. For more information, refer to [[wiki:UIE-uxml-element-FloatField|UXML element FloatField]].
     /// </summary>
     [MovedFrom(true, UpgradeConstants.EditorNamespace, UpgradeConstants.EditorAssembly)]
     public class FloatField : TextValueField<float>
@@ -42,7 +42,8 @@ protected override string ValueToString(float v)
         /// <returns>The float parsed from the string.</returns>
         protected override float StringToValue(string str)
         {
-            return UINumericFieldsUtils.StringToDouble(str, out var v) ? Mathf.ClampToFloat(v) : rawValue;
+            var success = UINumericFieldsUtils.TryConvertStringToFloat(str, textInputBase.originalText, out var v);
+            return success ? v : rawValue;
         }
 
         /// <summary>
@@ -86,7 +87,7 @@ public FloatField(string label, int maxLength = kMaxLengthNone)
         internal override bool CanTryParse(string textString) => float.TryParse(textString, out _);
 
         /// <summary>
-        /// Modify the value using a 3D delta and a speed, typically coming from an input device.
+        /// Applies the values of a 3D delta and a speed from an input device.
         /// </summary>
         /// <param name="delta">A vector used to compute the value change.</param>
         /// <param name="speed">A multiplier for the value change.</param>
@@ -131,9 +132,8 @@ protected override string ValueToString(float v)
 
             protected override float StringToValue(string str)
             {
-                double v;
-                UINumericFieldsUtils.StringToDouble(str, out v);
-                return Mathf.ClampToFloat(v);
+                UINumericFieldsUtils.TryConvertStringToFloat(str, originalText, out var v);
+                return v;
             }
         }
     }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Foldout.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Foldout.cs
index e4e0febe41..048bde6eca 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Foldout.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Foldout.cs
@@ -2,6 +2,8 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using Unity.Properties;
+
 namespace UnityEngine.UIElements
 {
     /// <summary>
@@ -15,6 +17,9 @@ namespace UnityEngine.UIElements
     /// </remarks>
     public class Foldout : BindableElement, INotifyValueChanged<bool>
     {
+        internal static readonly DataBindingProperty textProperty = nameof(text);
+        internal static readonly DataBindingProperty valueProperty = nameof(value);
+
         /// <summary>
         /// Instantiates a <see cref="Foldout"/> using the data from a UXML file.
         /// </summary>
@@ -54,10 +59,10 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         }
 
         Toggle m_Toggle;
-        VisualElement m_Container;
-
         internal Toggle toggle => m_Toggle;
 
+        VisualElement m_Container;
+
         /// <summary>
         /// This element contains the elements that are shown or hidden when you toggle the <see cref="Foldout"/>.
         /// </summary>
@@ -66,23 +71,28 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// <summary>
         /// This is the text of the toggle's label.
         /// </summary>
+        [CreateProperty]
         public string text
         {
             get => m_Toggle.text;
             set
             {
+                var previous = text;
                 m_Toggle.text = value;
                 m_Toggle.visualInput.Q(className: Toggle.textUssClassName)?.AddToClassList(textUssClassName);
+                if (string.CompareOrdinal(previous, text) != 0)
+                    NotifyPropertyChanged(textProperty);
             }
         }
 
-        [SerializeField]
+        [SerializeField, DontCreateProperty]
         private bool m_Value;
 
         /// <summary>
         /// This is the state of the Foldout's toggle. It is true if the <see cref="Foldout"/> is open and its contents are
         /// visible, and false if the Foldout is closed, and its contents are hidden.
         /// </summary>
+        [CreateProperty]
         public bool value
         {
             get => m_Value;
@@ -97,6 +107,7 @@ public bool value
                     SetValueWithoutNotify(value);
                     SendEvent(evt);
                     SaveViewData();
+                    NotifyPropertyChanged(valueProperty);
                 }
             }
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/GenericDropdownMenu.cs b/ModuleOverrides/com.unity.ui/Core/Controls/GenericDropdownMenu.cs
index 00ec090236..3a02ee6639 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/GenericDropdownMenu.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/GenericDropdownMenu.cs
@@ -129,9 +129,6 @@ void OnDetachFromPanel(DetachFromPanelEvent evt)
             if (evt.originPanel == null)
                 return;
 
-            m_MenuContainer.UnregisterCallback<AttachToPanelEvent>(OnAttachToPanel);
-            m_MenuContainer.UnregisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
-
             contentContainer.RemoveManipulator(m_NavigationManipulator);
             m_MenuContainer.UnregisterCallback<PointerDownEvent>(OnPointerDown);
             m_MenuContainer.UnregisterCallback<PointerMoveEvent>(OnPointerMove);
@@ -148,6 +145,7 @@ void Hide(bool giveFocusBack = false)
 
             if (m_TargetElement != null)
             {
+                m_TargetElement.UnregisterCallback<DetachFromPanelEvent>(OnTargetElementDetachFromPanel);
                 m_TargetElement.pseudoStates ^= PseudoStates.Active;
                 if (giveFocusBack)
                     m_TargetElement.Focus();
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/GroupBox.cs b/ModuleOverrides/com.unity.ui/Core/Controls/GroupBox.cs
index 3dd682525c..2266417c64 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/GroupBox.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/GroupBox.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -14,6 +15,8 @@ namespace UnityEngine.UIElements
     /// </summary>
     public class GroupBox : BindableElement, IGroupBox
     {
+        internal static readonly DataBindingProperty textProperty = nameof(text);
+
         /// <summary>
         /// Instantiates a <see cref="GroupBox"/> using data from a UXML file.
         /// </summary>
@@ -57,14 +60,20 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
 
         Label m_TitleLabel;
 
+        // Needed by the UIBuilder for authoring in the viewport
+        internal Label titleLabel => m_TitleLabel;
+
         /// <summary>
         /// The title text of the box.
         /// </summary>
+        [CreateProperty]
         public string text
         {
             get => m_TitleLabel?.text;
             set
             {
+                var previous = text;
+
                 if (!string.IsNullOrEmpty(value))
                 {
                     // Lazy allocation of label if needed...
@@ -82,6 +91,9 @@ public string text
                     m_TitleLabel.RemoveFromHierarchy();
                     m_TitleLabel = null;
                 }
+
+                if (string.CompareOrdinal(previous, text) != 0)
+                    NotifyPropertyChanged(textProperty);
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/HelpBox.cs b/ModuleOverrides/com.unity.ui/Core/Controls/HelpBox.cs
index 9c4b36ae69..075a6f6b21 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/HelpBox.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/HelpBox.cs
@@ -2,6 +2,8 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using Unity.Properties;
+
 namespace UnityEngine.UIElements
 {
     /// <summary>
@@ -28,7 +30,7 @@ public enum HelpBoxMessageType
     }
 
     /// <summary>
-    /// Makes a help box with a message to the user.
+    /// Makes a help box with a message to the user. For more information, refer to [[wiki:UIE-uxml-element-HelpBox|UXML element HelpBox]].
     /// </summary>
     /// <example>
     /// <code>
@@ -50,6 +52,9 @@ public enum HelpBoxMessageType
     /// </example>
     public class HelpBox : VisualElement
     {
+        internal static readonly DataBindingProperty textProperty = nameof(text);
+        internal static readonly DataBindingProperty messageTypeProperty = nameof(messageType);
+
         /// <summary>
         /// The USS class name for Elements of this type.
         /// </summary>
@@ -112,15 +117,24 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// <summary>
         /// The message text.
         /// </summary>
+        [CreateProperty]
         public string text
         {
             get { return m_Label.text; }
-            set { m_Label.text = value; }
+            set
+            {
+                var previous = text;
+                m_Label.text = value;
+
+                if (string.CompareOrdinal(previous, text) != 0)
+                    NotifyPropertyChanged(textProperty);
+            }
         }
 
         /// <summary>
         /// The type of message.
         /// </summary>
+        [CreateProperty]
         public HelpBoxMessageType messageType
         {
             get { return m_HelpBoxMessageType; }
@@ -130,6 +144,7 @@ public HelpBoxMessageType messageType
                 {
                     m_HelpBoxMessageType = value;
                     UpdateIcon(value);
+                    NotifyPropertyChanged(messageTypeProperty);
                 }
             }
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Image.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Image.cs
index f9e3f41007..2a36978182 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Image.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Image.cs
@@ -2,17 +2,28 @@
 // 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.CompilerServices;
+using Unity.Properties;
 using UnityEngine.UIElements.StyleSheets;
 
 namespace UnityEngine.UIElements
 {
     /// <summary>
     /// A <see cref="VisualElement"/> representing a source texture.
+    ///
+    /// **Note**: This is not related to the `UnityEngine.UI.Image` uGUI control. This is the Image control for the UI Toolkit framework.
     /// </summary>
     public class Image : VisualElement
     {
+        internal static readonly DataBindingProperty imageProperty = nameof(image);
+        internal static readonly DataBindingProperty spriteProperty = nameof(sprite);
+        internal static readonly DataBindingProperty vectorImageProperty = nameof(vectorImage);
+        internal static readonly DataBindingProperty sourceRectProperty = nameof(sourceRect);
+        internal static readonly DataBindingProperty uvProperty = nameof(uv);
+        internal static readonly DataBindingProperty scaleModeProperty = nameof(scaleMode);
+        internal static readonly DataBindingProperty tintColorProperty = nameof(tintColor);
+
         /// <summary>
         /// Instantiates an <see cref="Image"/> using the data read from a UXML file.
         /// </summary>
@@ -39,126 +50,111 @@ public override IEnumerable<UxmlChildElementDescription> uxmlChildElementsDescri
         private Rect m_UV;
         private Color m_TintColor;
 
-        private bool m_ImageIsInline;
+        // Internal for tests
+        internal bool m_ImageIsInline;
         private bool m_ScaleModeIsInline;
         private bool m_TintColorIsInline;
 
-
         /// <summary>
-        /// The texture to display in this image.
+        /// The texture to display in this image. If you assign a `Texture` or `Texture2D`, the Image element will resize and show the assigned texture.
         /// </summary>
+        [CreateProperty]
         public Texture image
         {
-            get { return m_Image; }
+            get => m_Image;
             set
             {
-                if (value != null && (m_Sprite != null || m_VectorImage != null))
-                {
-                    var unsetProp = m_Sprite != null ? "sprite" : "vector image";
-                    Debug.LogWarning($"Image object already has a background, removing {unsetProp}");
-                    m_Sprite = null;
-                    m_VectorImage = null;
-                }
+                if (m_Image == value && m_ImageIsInline)
+                    return;
+
                 m_ImageIsInline = value != null;
-                if (m_Image != value)
-                {
-                    m_Image = value;
-                    IncrementVersion(VersionChangeType.Layout | VersionChangeType.Repaint);
-                    if (m_Image == null)
-                    {
-                        m_UV = new Rect(0, 0, 1, 1);
-                    }
-                }
+                SetProperty(value, ref m_Image, ref m_Sprite, ref m_VectorImage, imageProperty);
             }
         }
 
         /// <summary>
         /// The sprite to display in this image.
         /// </summary>
+        [CreateProperty]
         public Sprite sprite
         {
-            get { return m_Sprite; }
+            get => m_Sprite;
             set
             {
-                if (value != null && (m_Image != null || m_VectorImage != null))
-                {
-                    var unsetProp = m_Image != null ? "texture" : "vector image";
-                    Debug.LogWarning($"Image object already has a background, removing {unsetProp}");
-                    m_Image = null;
-                    m_VectorImage = null;
-                }
+                if (m_Sprite == value && m_ImageIsInline)
+                    return;
+
                 m_ImageIsInline = value != null;
-                if (m_Sprite != value)
-                {
-                    m_Sprite = value;
-                    IncrementVersion(VersionChangeType.Layout | VersionChangeType.Repaint);
-                }
+                SetProperty(value, ref m_Sprite, ref m_Image, ref m_VectorImage, spriteProperty);
             }
         }
 
-
         /// <summary>
         /// The <see cref="VectorImage"/> to display in this image.
         /// </summary>
+        [CreateProperty]
         public VectorImage vectorImage
         {
-            get { return m_VectorImage; }
+            get => m_VectorImage;
             set
             {
-                if (value != null && (m_Image != null || m_Sprite != null))
-                {
-                    var unsetProp = m_Image != null ? "texture" : "sprite";
-                    Debug.LogWarning($"Image object already has a background, removing {unsetProp}");
-                    m_Image = null;
-                    m_Sprite = null;
-                }
+                if (m_VectorImage == value && m_ImageIsInline)
+                    return;
+
                 m_ImageIsInline = value != null;
-                if (m_VectorImage != value)
-                {
-                    m_VectorImage = value;
-                    IncrementVersion(VersionChangeType.Layout | VersionChangeType.Repaint);
-                    if (m_VectorImage == null)
-                    {
-                        m_UV = new Rect(0, 0, 1, 1);
-                    }
-                }
+                SetProperty(value, ref m_VectorImage, ref m_Image, ref m_Sprite, vectorImageProperty);
             }
         }
 
         /// <summary>
         /// The source rectangle inside the texture relative to the top left corner.
         /// </summary>
+        [CreateProperty]
         public Rect sourceRect
         {
-            get { return GetSourceRect(); }
+            get => GetSourceRect();
             set
             {
+                if (GetSourceRect() == value)
+                    return;
+
                 if (sprite != null)
                 {
                     Debug.LogError("Cannot set sourceRect on a sprite image");
                     return;
                 }
                 CalculateUV(value);
+                NotifyPropertyChanged(sourceRectProperty);
             }
         }
 
         /// <summary>
         /// The base texture coordinates of the Image relative to the bottom left corner.
         /// </summary>
+        [CreateProperty]
         public Rect uv
         {
-            get { return m_UV; }
-            set { m_UV = value; }
+            get => m_UV;
+            set
+            {
+                if (m_UV == value)
+                    return;
+                m_UV = value;
+                NotifyPropertyChanged(uvProperty);
+            }
         }
 
         /// <summary>
         /// ScaleMode used to display the Image.
         /// </summary>
+        [CreateProperty]
         public ScaleMode scaleMode
         {
-            get { return m_ScaleMode; }
+            get => m_ScaleMode;
             set
             {
+                if (m_ScaleMode == value && m_ScaleModeIsInline)
+                    return;
                 m_ScaleModeIsInline = true;
                 SetScaleMode(value);
             }
@@ -167,20 +163,16 @@ public ScaleMode scaleMode
         /// <summary>
         /// Tinting color for this Image.
         /// </summary>
+        [CreateProperty]
         public Color tintColor
         {
-            get
-            {
-                return m_TintColor;
-            }
+            get => m_TintColor;
             set
             {
+                if (m_TintColor == value && m_TintColorIsInline)
+                    return;
                 m_TintColorIsInline = true;
-                if (m_TintColor != value)
-                {
-                    m_TintColor = value;
-                    IncrementVersion(VersionChangeType.Repaint);
-                }
+                SetTintColor(value);
             }
         }
 
@@ -251,9 +243,10 @@ protected internal override Vector2 DoMeasure(float desiredWidth, MeasureMode wi
 
             // covers the MeasureMode.Exactly case
             Rect rect = sourceRect;
-            bool hasImagePosition = rect != Rect.zero;
-            measuredWidth = hasImagePosition ? rect.width : sourceSize.x;
-            measuredHeight = hasImagePosition ? rect.height : sourceSize.y;
+            bool hasRect = rect != Rect.zero;
+            // UUM-17229: rect width/height can be negative (e.g. when the UVs are flipped)
+            measuredWidth = hasRect ? Mathf.Abs(rect.width) : sourceSize.x;
+            measuredHeight = hasRect ? Mathf.Abs(rect.height) : sourceSize.y;
 
             if (widthMode == MeasureMode.AtMost)
             {
@@ -281,7 +274,7 @@ private void OnGenerateVisualContent(MeshGenerationContext mgc)
             else if (sprite != null)
             {
                 var slices = Vector4.zero;
-                rectParams = UIR.MeshGenerator.RectangleParams.MakeSprite(alignedRect, sprite, scaleMode, panel.contextType, false, ref slices);
+                rectParams = UIR.MeshGenerator.RectangleParams.MakeSprite(alignedRect, uv, sprite, scaleMode, panel.contextType, false, ref slices);
             }
             else if (vectorImage != null)
                 rectParams = UIR.MeshGenerator.RectangleParams.MakeVectorTextured(alignedRect, uv, vectorImage, scaleMode, panel.contextType);
@@ -298,41 +291,76 @@ private void OnGenerateVisualContent(MeshGenerationContext mgc)
         private void OnCustomStyleResolved(CustomStyleResolvedEvent e)
         {
             // We should consider not exposing image as a style at all, since it's intimately tied to uv/sourceRect
-            Texture2D textureValue = null;
-            Sprite spriteValue = null;
-            VectorImage vectorImageValue = null;
-            string scaleModeValue;
-            Color tintValue = Color.white;
-            ICustomStyle customStyle = e.customStyle;
-            if (!m_ImageIsInline && customStyle.TryGetValue(s_ImageProperty, out textureValue))
+            ReadCustomProperties(e.customStyle);
+        }
+
+        private void ReadCustomProperties(ICustomStyle customStyleProvider)
+        {
+            if (!m_ImageIsInline)
             {
-                m_Image = textureValue;
-                m_Sprite = null;
-                m_VectorImage = null;
+                if (customStyleProvider.TryGetValue(s_ImageProperty, out var textureValue))
+                {
+                    SetProperty(textureValue, ref m_Image, ref m_Sprite, ref m_VectorImage, imageProperty);
+                }
+                else if (customStyleProvider.TryGetValue(s_SpriteProperty, out var spriteValue))
+                {
+                    SetProperty(spriteValue, ref m_Sprite, ref m_Image, ref m_VectorImage, spriteProperty);
+                }
+                else if (customStyleProvider.TryGetValue(s_VectorImageProperty, out var vectorImageValue))
+                {
+                    SetProperty(vectorImageValue, ref m_VectorImage, ref m_Image, ref m_Sprite, vectorImageProperty);
+                }
+                // If the value is not inline and none of the custom style properties are resolved, unset the value.
+                else
+                {
+                    ClearProperty();
+                }
             }
 
-            if (!m_ImageIsInline && customStyle.TryGetValue(s_SpriteProperty, out spriteValue))
+            if (!m_ScaleModeIsInline && customStyleProvider.TryGetValue(s_ScaleModeProperty, out var scaleModeValue))
             {
-                m_Image = null;
-                m_Sprite = spriteValue;
-                m_VectorImage = null;
+                StylePropertyUtil.TryGetEnumIntValue(StyleEnumType.ScaleMode, scaleModeValue, out var intValue);
+                SetScaleMode((ScaleMode)intValue);
             }
 
-            if (!m_ImageIsInline && customStyle.TryGetValue(s_VectorImageProperty, out vectorImageValue))
+            if (!m_TintColorIsInline && customStyleProvider.TryGetValue(s_TintColorProperty, out var tintValue))
             {
-                m_Image = null;
-                m_Sprite = null;
-                m_VectorImage = vectorImageValue;
+                SetTintColor(tintValue);
             }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void SetProperty<T0, T1, T2>(T0 src, ref T0 dst, ref T1 alt0, ref T2 alt1, DataBindingProperty binding)
+            where T0 : Object where T1 : Object where T2 : Object
+        {
+            if (src == dst)
+                return;
 
-            if (!m_ScaleModeIsInline && customStyle.TryGetValue(s_ScaleModeProperty, out scaleModeValue))
+            dst = src;
+
+            if (dst != null)
             {
-                StylePropertyUtil.TryGetEnumIntValue(StyleEnumType.ScaleMode, scaleModeValue, out var intValue);
-                SetScaleMode((ScaleMode)intValue);
+                alt0 = null;
+                alt1 = null;
+            }
+
+            if (dst == null)
+            {
+                uv = new Rect(0, 0, 1, 1);
+                ReadCustomProperties(customStyle);
             }
 
-            if (!m_TintColorIsInline && customStyle.TryGetValue(s_TintColorProperty, out tintValue))
-                m_TintColor = tintValue;
+            IncrementVersion(VersionChangeType.Layout | VersionChangeType.Repaint);
+            NotifyPropertyChanged(binding);
+        }
+
+        private void ClearProperty()
+        {
+            if (m_ImageIsInline)
+                return;
+            image = null;
+            sprite = null;
+            vectorImage = null;
         }
 
         private void SetScaleMode(ScaleMode mode)
@@ -341,6 +369,17 @@ private void SetScaleMode(ScaleMode mode)
             {
                 m_ScaleMode = mode;
                 IncrementVersion(VersionChangeType.Repaint);
+                NotifyPropertyChanged(scaleModeProperty);
+            }
+        }
+
+        private void SetTintColor(Color color)
+        {
+            if (m_TintColor != color)
+            {
+                m_TintColor = color;
+                IncrementVersion(VersionChangeType.Repaint);
+                NotifyPropertyChanged(tintColorProperty);
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/BaseField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/BaseField.cs
index 5d279f3f78..15b3db2366 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/BaseField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/BaseField.cs
@@ -4,19 +4,43 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
     internal interface IPrefixLabel
     {
         string label { get; }
+        Label labelElement { get; }
     }
 
     /// <summary>
-    /// Abstract base class for controls.
+    /// Interface for all editable elements.
     /// </summary>
-    public abstract class BaseField<TValueType> : BindableElement, INotifyValueChanged<TValueType>, IMixedValueSupport, IPrefixLabel
+    internal interface IEditableElement
     {
+        internal Action editingStarted { get; set; }
+        internal Action editingEnded { get; set; }
+    }
+
+    /// <summary>
+    /// <para>Abstract base class for controls.</para>
+    /// <para>A BaseField is a base class for field elements like <see cref="TextField"/> and <see cref="IntegerField"/>.
+    /// To align a BaseField element automatically with other fields in an Inspector window,
+    /// use the @@.unity-base-field__aligned@@ USS class. This style class is designed for use with
+    /// Inspector elements like <see cref="PropertyField"/>, which has the style class by default.
+    /// However, if you manually add a child BaseField element to a PropertyField, you must add
+    /// the style class manually.</para>
+    /// <para>When the style class is present, the field automatically calculates the label width
+    /// to align with other fields in the Inspector window. If there are IMGUI fields present,
+    /// UI Toolkit fields are aligned with them for consistency and compatibility.</para>
+    /// </summary>
+    public abstract class BaseField<TValueType> : BindableElement, INotifyValueChanged<TValueType>, IMixedValueSupport, IPrefixLabel, IEditableElement
+    {
+        internal static readonly DataBindingProperty valueProperty = nameof(value);
+        internal static readonly DataBindingProperty labelProperty = nameof(label);
+        internal static readonly DataBindingProperty showMixedValueProperty = nameof(showMixedValue);
+
         /// <summary>
         /// Defines <see cref="UxmlTraits"/> for the <see cref="BaseField"/>.
         /// </summary>
@@ -38,26 +62,6 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 base.Init(ve, bag, cc);
                 ((BaseField<TValueType>)ve).label = m_Label.GetValueFromBag(bag, cc);
             }
-
-            internal static List<string> ParseChoiceList(string choicesFromBag)
-            {
-                if (string.IsNullOrEmpty(choicesFromBag.Trim()))
-                    return null;
-
-                // Here the choices is comma separated in the string...
-                var choices = choicesFromBag.Split(',');
-
-                if (choices.Length != 0)
-                {
-                    var listOfChoices = new List<string>();
-                    foreach (var choice in choices)
-                    {
-                        listOfChoices.Add(choice.Trim());
-                    }
-                    return listOfChoices;
-                }
-                return null;
-            }
         }
 
         /// <summary>
@@ -138,7 +142,7 @@ internal VisualElement visualInput
             }
         }
 
-        [SerializeField]
+        [SerializeField, DontCreateProperty]
         TValueType m_Value;
 
         /// <summary>
@@ -155,6 +159,7 @@ protected TValueType rawValue
         /// <summary>
         /// The value associated with the field.
         /// </summary>
+        [CreateProperty]
         public virtual TValueType value
         {
             get
@@ -175,6 +180,7 @@ public virtual TValueType value
                             evt.elementTarget = this;
                             SendEvent(evt);
                         }
+                        NotifyPropertyChanged(valueProperty);
                     }
                     else
                     {
@@ -191,6 +197,7 @@ public virtual TValueType value
         /// <summary>
         /// The string representing the label that will appear beside the field.
         /// </summary>
+        [CreateProperty]
         public string label
         {
             get
@@ -202,7 +209,6 @@ public string label
                 if (labelElement.text != value)
                 {
                     labelElement.text = value;
-
                     if (string.IsNullOrEmpty(labelElement.text))
                     {
                         AddToClassList(noLabelVariantUssClassName);
@@ -212,10 +218,12 @@ public string label
                     {
                         if (!Contains(labelElement))
                         {
-                            Insert(0, labelElement);
+                            hierarchy.Insert(0, labelElement);
                             RemoveFromClassList(noLabelVariantUssClassName);
                         }
                     }
+
+                    NotifyPropertyChanged(labelProperty);
                 }
             }
         }
@@ -225,6 +233,7 @@ public string label
         /// <summary>
         /// When set to true, gives the field the appearance of editing multiple different values.
         /// </summary>
+        [CreateProperty]
         public bool showMixedValue
         {
             get => m_ShowMixedValue;
@@ -236,6 +245,8 @@ public bool showMixedValue
 
                 // Once value has been set, update the field's appearance
                 UpdateMixedValueContent();
+
+                NotifyPropertyChanged(showMixedValueProperty);
             }
         }
 
@@ -262,6 +273,9 @@ protected Label mixedValueLabel
         private VisualElement m_CachedContextWidthElement;
         private VisualElement m_CachedInspectorElement;
 
+        Action IEditableElement.editingStarted { get; set; }
+        Action IEditableElement.editingEnded { get; set; }
+
         internal BaseField(string label)
         {
             isCompositeRoot = true;
@@ -297,6 +311,9 @@ protected BaseField(string label, VisualElement visualInput)
 
         private void OnAttachToPanel(AttachToPanelEvent e)
         {
+            // indicates the start and end of the field value being edited
+            RegisterEditingCallbacks();
+
             if (e.destinationPanel == null)
             {
                 return;
@@ -347,9 +364,33 @@ private void OnAttachToPanel(AttachToPanelEvent e)
 
         private void OnDetachFromPanel(DetachFromPanelEvent e)
         {
+            UnregisterEditingCallbacks();
+
             onValidateValue = null;
         }
 
+        internal virtual void RegisterEditingCallbacks()
+        {
+            RegisterCallback<FocusInEvent>(StartEditing);
+            RegisterCallback<FocusOutEvent>(EndEditing);
+        }
+
+        internal virtual void UnregisterEditingCallbacks()
+        {
+            UnregisterCallback<FocusInEvent>(StartEditing);
+            UnregisterCallback<FocusOutEvent>(EndEditing);
+        }
+
+        internal void StartEditing(EventBase e)
+        {
+            ((IEditableElement)this).editingStarted?.Invoke();
+        }
+
+        internal void EndEditing(EventBase e)
+        {
+            ((IEditableElement)this).editingEnded?.Invoke();
+        }
+
         private void OnCustomStyleResolved(CustomStyleResolvedEvent evt)
         {
             if (evt.customStyle.TryGetValue(s_LabelWidthRatioProperty, out var labelWidthRatio))
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/KeyboardTextEditor.cs b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/KeyboardTextEditor.cs
index f306392c3b..07336a2b63 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/KeyboardTextEditor.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/KeyboardTextEditor.cs
@@ -94,11 +94,13 @@ void OnKeyDown(KeyDownEvent evt)
                     return;
 
                 // We rely on KeyCode.Tab for both navigation and inserting tabulation.
-                if (c == '\t')
+                // On Linux Platform regular tab event occupies both keycode and character fields
+                if (c == '\t' && evt.keyCode == KeyCode.None && evt.modifiers == EventModifiers.None)
                     return;
 
                 // Ignore tab in single-line text fields, modifier+tab in multiline text fields
-                if (evt.keyCode == KeyCode.Tab)
+                // On Linux Platform modifier+tab case will be represented as keycode=None and character='\t'
+                if (evt.keyCode == KeyCode.Tab || (evt.keyCode == KeyCode.Tab && evt.character == '\t' && evt.modifiers == EventModifiers.Shift))
                 {
                     if(!textElement.edition.multiline || evt.shiftKey)
                     {
@@ -145,7 +147,7 @@ void OnKeyDown(KeyDownEvent evt)
                 if (!textElement.edition.AcceptCharacter(c))
                     return;
 
-                if (c >= k_Space || evt.keyCode == KeyCode.Tab || c == '\n' || c == '\r' || c == k_LineFeed)
+                if (c >= k_Space || evt.keyCode == KeyCode.Tab || (textElement.edition.multiline && !evt.altKey && (c == '\n' || c == '\r' || c == k_LineFeed)))
                 {
                     editingUtilities.Insert(c);
                     m_Changed = true;
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextField.cs
index 278a284c34..9217b76c98 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextField.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -12,6 +13,8 @@ namespace UnityEngine.UIElements
     /// </summary>
     public class TextField : TextInputBaseField<string>
     {
+        internal static readonly DataBindingProperty multilineProperty = nameof(multiline);
+
         // This property to alleviate the fact we have to cast all the time
         TextInput textInput => (TextInput)textInputBase;
 
@@ -44,7 +47,6 @@ public class TextField : TextInputBaseField<string>
             public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
             {
                 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.
@@ -55,16 +57,33 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 {
                     field.SetValueWithoutNotify(value);
                 }
+
+                field.multiline = m_Multiline.GetValueFromBag(bag, cc);
+
+                // \n characters in the string are only removed when multiline goes from true to false.
+                // If the field value in the bag contains \n and multiline is false in the bag, we remove any \n here.
+                if (!field.multiline && !string.IsNullOrEmpty(field.value) && field.value.Contains("\n"))
+                {
+                    field.SetValueWithoutNotify(field.value.Replace("\n",""));
+                }
             }
         }
 
         /// <summary>
         /// Set this to true to allow multiple lines in the textfield and false if otherwise.
         /// </summary>
+        [CreateProperty]
         public bool multiline
         {
             get { return textInput.multiline; }
-            set { textInput.multiline = value; }
+            set
+            {
+                var previous = multiline;
+                textInput.multiline = value;
+
+                if (previous != multiline)
+                    NotifyPropertyChanged(multilineProperty);
+            }
         }
 
         /// <summary>
@@ -125,9 +144,6 @@ public TextField(string label, int maxLength, bool multiline, bool isPasswordFie
         /// <summary>
         /// The string currently being exposed by the field.
         /// </summary>
-        /// <remarks>
-        /// Note that changing this will not trigger a change event to be sent.
-        /// </remarks>
         public override string value
         {
             get { return base.value; }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextInputFieldBase.cs b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextInputFieldBase.cs
index ab10eb8b63..09f23ff7c1 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 Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -11,6 +12,27 @@ namespace UnityEngine.UIElements
     /// </summary>
     public abstract class TextInputBaseField<TValueType> : BaseField<TValueType>
     {
+        internal static readonly DataBindingProperty autoCorrectionProperty = nameof(autoCorrection);
+        internal static readonly DataBindingProperty hideMobileInputProperty = nameof(hideMobileInput);
+        internal static readonly DataBindingProperty keyboardTypeProperty = nameof(keyboardType);
+        internal static readonly DataBindingProperty isReadOnlyProperty = nameof(isReadOnly);
+        internal static readonly DataBindingProperty isPasswordFieldProperty = nameof(isPasswordField);
+        internal static readonly DataBindingProperty textSelectionProperty = nameof(textSelection);
+        internal static readonly DataBindingProperty textEditionProperty = nameof(textEdition);
+        internal static readonly DataBindingProperty selectionColorProperty = nameof(selectionColor);
+        internal static readonly DataBindingProperty cursorColorProperty = nameof(cursorColor);
+        internal static readonly DataBindingProperty cursorIndexProperty = nameof(cursorIndex);
+        internal static readonly DataBindingProperty cursorPositionProperty = nameof(cursorPosition);
+        internal static readonly DataBindingProperty selectIndexProperty = nameof(selectIndex);
+        internal static readonly DataBindingProperty selectAllOnFocusProperty = nameof(selectAllOnFocus);
+        internal static readonly DataBindingProperty selectAllOnMouseUpProperty = nameof(selectAllOnMouseUp);
+        internal static readonly DataBindingProperty maxLengthProperty = nameof(maxLength);
+        internal static readonly DataBindingProperty doubleClickSelectsWordProperty = nameof(doubleClickSelectsWord);
+        internal static readonly DataBindingProperty tripleClickSelectsLineProperty = nameof(tripleClickSelectsLine);
+        internal static readonly DataBindingProperty isDelayedProperty = nameof(isDelayed);
+        internal static readonly DataBindingProperty maskCharProperty = nameof(maskChar);
+        internal static readonly DataBindingProperty verticalScrollerVisibilityProperty = nameof(verticalScrollerVisibility);
+
         static CustomStyleProperty<Color> s_SelectionColorProperty = new CustomStyleProperty<Color>("--unity-selection-color");
         static CustomStyleProperty<Color> s_CursorColorProperty = new CustomStyleProperty<Color>("--unity-cursor-color");
         internal const int kMaxLengthNone = -1;
@@ -212,11 +234,13 @@ protected TextInputBaseField(string label, int maxLength, char maskChar, TextInp
         /// <summary>
         /// Retrieves this Field's TextElement ITextSelection
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public ITextSelection textSelection => m_TextInputBase.textElement.selection;
 
         /// <summary>
         /// Retrieves this Field's TextElement ITextEdition
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public ITextEdition textEdition => m_TextInputBase.textElement.edition;
 
         #region TextEdition
@@ -232,16 +256,24 @@ protected Action<bool> onIsReadOnlyChanged
         /// <summary>
         /// Returns true if the field is read only.
         /// </summary>
+        [CreateProperty]
         public bool isReadOnly
         {
             get => textEdition.isReadOnly;
-            set => textEdition.isReadOnly = value;
+            set
+            {
+                if (textEdition.isReadOnly == value)
+                    return;
+                textEdition.isReadOnly = value;
+                NotifyPropertyChanged(isReadOnlyProperty);
+            }
         }
 
         // Password field (indirectly lossy behaviour when activated via multiline)
         /// <summary>
         /// Returns true if the field is used to edit a password.
         /// </summary>
+        [CreateProperty]
         public bool isPasswordField
         {
             get => textEdition.isPassword;
@@ -252,34 +284,56 @@ public bool isPasswordField
 
                 textEdition.isPassword = value;
                 m_TextInputBase.IncrementVersion(VersionChangeType.Repaint);
+                NotifyPropertyChanged(isPasswordFieldProperty);
             }
         }
 
         /// <summary>
         /// Determines if the touch screen keyboard auto correction is turned on or off.
         /// </summary>
+        [CreateProperty]
         public bool autoCorrection
         {
             get => textEdition.autoCorrection;
-            set => textEdition.autoCorrection = value;
+            set
+            {
+                if (textEdition.autoCorrection == value)
+                    return;
+                textEdition.autoCorrection = value;
+                NotifyPropertyChanged(autoCorrectionProperty);
+            }
         }
 
         /// <summary>
         /// Hides or shows the mobile input field.
         /// </summary>
+        [CreateProperty]
         public bool hideMobileInput
         {
             get => textEdition.hideMobileInput;
-            set => textEdition.hideMobileInput = value;
+            set
+            {
+                if (textEdition.hideMobileInput == value)
+                    return;
+                textEdition.hideMobileInput = value;
+                NotifyPropertyChanged(hideMobileInputProperty);
+            }
         }
 
         /// <summary>
         /// The type of mobile keyboard that will be used.
         /// </summary>
+        [CreateProperty]
         public TouchScreenKeyboardType keyboardType
         {
             get => textEdition.keyboardType;
-            set => textEdition.keyboardType = value;
+            set
+            {
+                if (textEdition.keyboardType == value)
+                    return;
+                textEdition.keyboardType = value;
+                NotifyPropertyChanged(keyboardTypeProperty);
+            }
         }
 
         /// <summary>
@@ -293,28 +347,49 @@ public TouchScreenKeyboard touchScreenKeyboard
         /// <summary>
         /// Maximum number of characters for the field.
         /// </summary>
+        [CreateProperty]
         public int maxLength
         {
             get => textEdition.maxLength;
-            set => textEdition.maxLength = value;
+            set
+            {
+                if (textEdition.maxLength == value)
+                    return;
+                textEdition.maxLength = value;
+                NotifyPropertyChanged(maxLengthProperty);
+            }
         }
 
         /// <summary>
         /// If set to true, the value property isn't updated until either the user presses Enter or the text field loses focus.
         /// </summary>
+        [CreateProperty]
         public bool isDelayed
         {
             get => textEdition.isDelayed;
-            set => textEdition.isDelayed = value;
+            set
+            {
+                if (textEdition.isDelayed == value)
+                    return;
+                textEdition.isDelayed = value;
+                NotifyPropertyChanged(isDelayedProperty);
+            }
         }
 
         /// <summary>
         /// The character used for masking in a password field.
         /// </summary>
+        [CreateProperty]
         public char maskChar
         {
             get => textEdition.maskChar;
-            set => textEdition.maskChar = value;
+            set
+            {
+                if (textEdition.maskChar == value)
+                    return;
+                textEdition.maskChar = value;
+                NotifyPropertyChanged(maskCharProperty);
+            }
         }
 
         #endregion
@@ -323,24 +398,34 @@ public char maskChar
         /// <summary>
         /// Background color of selected text.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public Color selectionColor => textSelection.selectionColor;
         /// <summary>
         /// Color of the cursor.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public Color cursorColor => textSelection.cursorColor;
 
         /// <summary>
         /// This is the cursor index in the text presented.
         /// </summary>
+        [CreateProperty]
         public int cursorIndex
         {
             get => textSelection.cursorIndex;
-            set => textSelection.cursorIndex = value;
+            set
+            {
+                if (textSelection.cursorIndex == value)
+                    return;
+                textSelection.cursorIndex = value;
+                NotifyPropertyChanged(cursorIndexProperty);
+            }
         }
 
         /// <summary>
         /// The position of the text cursor inside the element.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public Vector2 cursorPosition
         {
             get => textSelection.cursorPosition;
@@ -349,10 +434,17 @@ public Vector2 cursorPosition
         /// <summary>
         /// This is the selection index in the text presented.
         /// </summary>
+        [CreateProperty]
         public int selectIndex
         {
             get => textSelection.selectIndex;
-            set => textSelection.selectIndex = value;
+            set
+            {
+                if (textSelection.selectIndex == value)
+                    return;
+                textSelection.selectIndex = value;
+                NotifyPropertyChanged(selectIndexProperty);
+            }
         }
 
         /// <summary>
@@ -382,36 +474,65 @@ public void SelectRange(int cursorIndex, int selectionIndex)
         /// <summary>
         /// Controls whether the element's content is selected upon receiving focus.
         /// </summary>
+        [CreateProperty]
         public bool selectAllOnFocus
         {
             get => textSelection.selectAllOnFocus;
-            set => textSelection.selectAllOnFocus = value;
+            set
+            {
+                if (textSelection.selectAllOnFocus == value)
+                    return;
+                textSelection.selectAllOnFocus = value;
+                NotifyPropertyChanged(selectAllOnFocusProperty);
+            }
         }
 
         /// <summary>
         /// Controls whether the element's content is selected when you mouse up for the first time.
         /// </summary>
+        [CreateProperty]
         public bool selectAllOnMouseUp
         {
             get => textSelection.selectAllOnMouseUp;
-            set => textSelection.selectAllOnMouseUp = value;
+            set
+            {
+                if (textSelection.selectAllOnMouseUp == value)
+                    return;
+                textSelection.selectAllOnMouseUp = value;
+                NotifyPropertyChanged(selectAllOnMouseUpProperty);
+            }
         }
 
         /// <summary>
         /// Controls whether double clicking selects the word under the mouse pointer or not.
         /// </summary>
+        [CreateProperty]
         public bool doubleClickSelectsWord
         {
             get => textSelection.doubleClickSelectsWord;
-            set => textSelection.doubleClickSelectsWord = value;
+            set
+            {
+                if (textSelection.doubleClickSelectsWord == value)
+                    return;
+                textSelection.doubleClickSelectsWord = value;
+                NotifyPropertyChanged(doubleClickSelectsWordProperty);
+            }
         }
+
         /// <summary>
         /// Controls whether triple clicking selects the entire line under the mouse pointer or not.
         /// </summary>
+        [CreateProperty]
         public bool tripleClickSelectsLine
         {
             get => textSelection.tripleClickSelectsLine;
-            set => textSelection.tripleClickSelectsLine = value;
+            set
+            {
+                if (textSelection.tripleClickSelectsLine == value)
+                    return;
+                textSelection.tripleClickSelectsLine = value;
+                NotifyPropertyChanged(tripleClickSelectsLineProperty);
+            }
         }
 
         /// <summary>
@@ -435,10 +556,17 @@ public string text
         /// <summary>
         /// Option for controlling the visibility of the vertical scroll bar in the <see cref="TextInputBaseField{TValueType}"/>.
         /// </summary>
+        [CreateProperty]
         public ScrollerVisibility verticalScrollerVisibility
         {
             get => textInputBase.verticalScrollerVisibility;
-            set => textInputBase.SetVerticalScrollerVisibility(value);
+            set
+            {
+                if (textInputBase.verticalScrollerVisibility == value)
+                    return;
+                textInputBase.SetVerticalScrollerVisibility(value);
+                NotifyPropertyChanged(verticalScrollerVisibilityProperty);
+            }
         }
 
         /// <summary>
@@ -686,6 +814,11 @@ public string text
                 }
             }
 
+            /// <summary>
+            /// The initial value of the input field before being edited.
+            /// </summary>
+            internal string originalText => textElement.originalText;
+
             /// <summary>
             /// Converts a string to a value type.
             /// </summary>
@@ -792,10 +925,7 @@ void ScrollViewOnGeometryChangedEvent(GeometryChangedEvent e)
             {
                 if (e.oldRect.size == e.newRect.size)
                     return;
-
-                // The ScrollView is updating its Scroller values the next frame after the GeometryChangedEvent.
-                // We need to make sure the new ScrollOffset value is not clamped.
-                scrollView.OnUpdateScrollers += UpdateScrollOffset;
+                UpdateScrollOffset();
             }
 
             void TextElementOnGeometryChangedEvent(GeometryChangedEvent e)
@@ -803,21 +933,20 @@ void TextElementOnGeometryChangedEvent(GeometryChangedEvent e)
                 if (e.oldRect.size == e.newRect.size)
                     return;
 
-                UpdateScrollOffset();
+                var widthChanged = Math.Abs(e.oldRect.size.x - e.newRect.size.x) > UIRUtility.k_Epsilon;
+
+                UpdateScrollOffset(isBackspace: false, widthChanged);
             }
 
             internal void OnInputCustomStyleResolved(CustomStyleResolvedEvent e)
             {
-                Color selectionValue = Color.clear;
-                Color cursorValue = Color.clear;
-
                 // These don't quite follow the inline style behavior
                 // (aka setting the value via code should always overrides the one from styleSheets)
                 ICustomStyle customStyle = e.customStyle;
-                if (customStyle.TryGetValue(s_SelectionColorProperty, out selectionValue))
+                if (customStyle.TryGetValue(s_SelectionColorProperty, out Color selectionValue))
                     textSelection.selectionColor = selectionValue;
 
-                if (customStyle.TryGetValue(s_CursorColorProperty, out cursorValue))
+                if (customStyle.TryGetValue(s_CursorColorProperty, out Color cursorValue))
                     textSelection.cursorColor = cursorValue;
 
                 SetScrollViewMode();
@@ -835,28 +964,32 @@ internal virtual bool AcceptCharacter(char c)
                 return !textEdition.isReadOnly && enabledInHierarchy;
             }
 
+            internal void UpdateScrollOffset(bool isBackspace = false)
+            {
+                UpdateScrollOffset(isBackspace, widthChanged: false);
+            }
+
             // scrollOffset is used in automated tests
             internal Vector2 scrollOffset = Vector2.zero;
             bool m_ScrollViewWasClamped;
-            internal void UpdateScrollOffset(bool isBackspace = false)
+            internal void UpdateScrollOffset(bool isBackspace, bool widthChanged)
             {
                 var selection = textSelection;
-                if (selection.cursorIndex < 0)
+                if (selection.cursorIndex < 0 || (selection.cursorIndex <= 0 && selection.selectIndex <= 0 && scrollOffset == Vector2.zero))
                     return;
 
                 if (scrollView != null)
                 {
-                    scrollOffset = GetScrollOffset(scrollView.scrollOffset.x, scrollView.scrollOffset.y, scrollView.contentViewport.layout.width, isBackspace);
+                    scrollOffset = GetScrollOffset(scrollView.scrollOffset.x, scrollView.scrollOffset.y, scrollView.contentViewport.layout.width, isBackspace, widthChanged);
                     scrollView.scrollOffset = scrollOffset;
 
                     m_ScrollViewWasClamped = scrollOffset.x > scrollView.scrollOffset.x || scrollOffset.y > scrollView.scrollOffset.y;
-                    scrollView.OnUpdateScrollers -= UpdateScrollOffset;
                 }
                 else
                 {
                     var t = textElement.transform.position;
 
-                    scrollOffset = GetScrollOffset(scrollOffset.x, scrollOffset.y, contentRect.width, isBackspace);
+                    scrollOffset = GetScrollOffset(scrollOffset.x, scrollOffset.y, contentRect.width, isBackspace, widthChanged);
 
                     t.y = -Mathf.Min(scrollOffset.y, Math.Abs(textElement.contentRect.height - contentRect.height));
                     t.x = -scrollOffset.x;
@@ -867,7 +1000,7 @@ internal void UpdateScrollOffset(bool isBackspace = false)
             }
 
             Vector2 lastCursorPos = Vector2.zero;
-            Vector2 GetScrollOffset(float xOffset, float yOffset, float contentViewportWidth, bool isBackspace = false)
+            Vector2 GetScrollOffset(float xOffset, float yOffset, float contentViewportWidth, bool isBackspace, bool widthChanged)
             {
                 var cursorPos = textSelection.cursorPosition;
                 var cursorWidth = textSelection.cursorWidth;
@@ -884,14 +1017,21 @@ Vector2 GetScrollOffset(float xOffset, float yOffset, float contentViewportWidth
                 // {
                 //     newXOffset = xOffset + cursorPos.x - lastCursorPos.x;
                 // }
-                if (Math.Abs(lastCursorPos.x - cursorPos.x) > epsilon || m_ScrollViewWasClamped)
+
+                if (Math.Abs(lastCursorPos.x - cursorPos.x) > epsilon || m_ScrollViewWasClamped || widthChanged)
                 {
-                    // Update scrollOffset when cursor moves right.
-                    if (cursorPos.x > xOffset + contentViewportWidth - cursorWidth)
-                        newXOffset = cursorPos.x + cursorWidth - contentViewportWidth;
+                    // Update scrollOffset when cursor moves right or when the offset is not needed anymore.
+                    if (cursorPos.x > xOffset + contentViewportWidth - cursorWidth
+                        || xOffset > 0 && widthChanged)
+                    {
+                        var roundedValue = Mathf.Ceil(cursorPos.x + cursorWidth - contentViewportWidth);
+                        newXOffset = Mathf.Max(roundedValue, 0);
+                    }
                     // Update scrollOffset when cursor moves left.
                     else if (cursorPos.x < xOffset + leftScrollOffsetPadding)
+                    {
                         newXOffset = Mathf.Max(cursorPos.x - leftScrollOffsetPadding, 0);
+                    }
                 }
 
                 if (textEdition.multiline && (Math.Abs(lastCursorPos.y - cursorPos.y) > epsilon || m_ScrollViewWasClamped))
@@ -906,8 +1046,10 @@ Vector2 GetScrollOffset(float xOffset, float yOffset, float contentViewportWidth
 
                 lastCursorPos = cursorPos;
 
-                if (xOffset != newXOffset || yOffset != newYOffset)
+                if (Math.Abs(xOffset - newXOffset) > epsilon || Math.Abs(yOffset - newYOffset) > epsilon)
+                {
                     return new Vector2(newXOffset, newYOffset);
+                }
 
                 return scrollView != null ? scrollView.scrollOffset : scrollOffset;
             }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TouchScreenTextEditor.cs b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TouchScreenTextEditor.cs
index ffce234074..748456e61f 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TouchScreenTextEditor.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TouchScreenTextEditor.cs
@@ -138,6 +138,7 @@ private void CloseTouchScreenKeyboard()
                 textElement.m_TouchScreenKeyboard.active = false;
                 textElement.m_TouchScreenKeyboard = null;
                 m_TouchKeyboardPoller.Pause();
+                TouchScreenKeyboard.hideInput = true;
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/IntegerField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/IntegerField.cs
index ce7895687f..6940c1a1ca 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/IntegerField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/IntegerField.cs
@@ -43,7 +43,8 @@ protected override string ValueToString(int v)
         /// <returns>The integer parsed from the string.</returns>
         protected override int StringToValue(string str)
         {
-            return UINumericFieldsUtils.StringToLong(str, out var v) ? Mathf.ClampToInt(v) : rawValue;
+            var success = UINumericFieldsUtils.TryConvertStringToInt(str, textInputBase.originalText, out var v);
+            return success ? v : rawValue;
         }
 
         /// <summary>
@@ -88,7 +89,7 @@ public IntegerField(string label, int maxLength = kMaxLengthNone)
         internal override bool CanTryParse(string textString) => int.TryParse(textString, out _);
 
         /// <summary>
-        /// Modify the value using a 3D delta and a speed, typically coming from an input device.
+        /// Applies the values of a 3D delta and a speed from an input device.
         /// </summary>
         /// <param name="delta">A vector used to compute the value change.</param>
         /// <param name="speed">A multiplier for the value change.</param>
@@ -132,9 +133,8 @@ protected override string ValueToString(int v)
 
             protected override int StringToValue(string str)
             {
-                long v;
-                UINumericFieldsUtils.StringToLong(str, out v);
-                return Mathf.ClampToInt(v);
+                UINumericFieldsUtils.TryConvertStringToInt(str, originalText, out var v);
+                return v;
             }
         }
     }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Label.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Label.cs
index 53af804715..3001daba75 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Label.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Label.cs
@@ -7,7 +7,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// Provides an Element displaying text.
+    /// Provides an Element displaying text. For more information, refer to [[wiki:UIE-uxml-element-label|UXML element Label]].
     /// </summary>
     public class Label : TextElement
     {
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/ListView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/ListView.cs
index 6543122da2..0b2a90a0a3 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/ListView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/ListView.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -20,8 +21,10 @@ namespace UnityEngine.UIElements
     /// <see cref="BaseVerticalCollectionView.itemsSource">itemsSource</see>.
     ///
     /// It's also recommended to supply the following properties for more complex items:\\
-    /// - <see cref="BaseVerticalCollectionView.makeItem">makeItem</see> \\
-    /// - <see cref="BaseVerticalCollectionView.bindItem">bindItem</see> \\
+    /// - <see cref="ListView.makeItem">makeItem</see> \\
+    /// - <see cref="ListView.bindItem">bindItem</see> \\
+    /// - <see cref="ListView.unbindItem">unbindItem</see> \\
+    /// - <see cref="ListView.destroyItem">destroyItem</see> \\
     /// - <see cref="BaseVerticalCollectionView.fixedItemHeight">fixedItemHeight</see> when using <see cref="CollectionVirtualizationMethod.FixedHeight"/>\\
     ///
     /// The <c>ListView</c> creates multiple <see cref="VisualElement"/> objects for the visible items. As the user scrolls, the ListView
@@ -35,7 +38,7 @@ namespace UnityEngine.UIElements
     ///     \\
     /// By default, the user can select one element in the list at a time. To change the default selection
     /// use the <c>selection-type</c> property in UXML or the<see cref="ListView.selectionType"/> property in C#.
-    ///      To allow the user to select more than one element simultaneously, set the property to <c>Selection.Multiple</c>.
+    ///     To allow the user to select more than one element simultaneously, set the property to <c>Selection.Multiple</c>.
     ///     To prevent the user from selecting items, set the property to <c>Selection.None</c>.\\
     /// \\
     ///     By default, all rows in the ListView have same background color. To make the row background colors
@@ -55,57 +58,20 @@ namespace UnityEngine.UIElements
     /// To enable horizontal scrolling when the displayed element is wider than the visible area, set the
     ///     <c>horizontal-scrolling-enabled</c> property in UXML or the <see cref="ListView.horizontalScrollingEnabled"/>
     ///     to <c>true</c>.
+    ///     
+    /// For more information, refer to [[wiki:UIE-uxml-element-ListView|ListView]].
     /// </remarks>
     /// <example>
-    /// <code>
-    /// <![CDATA[
-    /// public class ListViewExampleWindow : EditorWindow
-    /// {
-    ///     [MenuItem("Window/ListViewExampleWindow")]
-    ///     public static void OpenDemoManual()
-    ///     {
-    ///         GetWindow<ListViewExampleWindow>().Show();
-    ///     }
-    ///
-    ///     public void OnEnable()
-    ///     {
-    ///         // Create a list of data. In this case, numbers from 1 to 1000.
-    ///         const int itemCount = 1000;
-    ///         var items = new List<string>(itemCount);
-    ///         for (int i = 1; i <= itemCount; i++)
-    ///             items.Add(i.ToString());
-    ///
-    ///         // The "makeItem" function is called when the
-    ///         // ListView needs more items to render.
-    ///         Func<VisualElement> makeItem = () => new Label();
-    ///
-    ///         // As the user scrolls through the list, the ListView object
-    ///         // recycles elements created by the "makeItem" function,
-    ///         // 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) => (e as Label).text = items[i];
-    ///
-    ///         // Provide the list view with an explicit height for every row
-    ///         // so it can calculate how many items to actually display
-    ///         const int itemHeight = 16;
-    ///
-    ///         var listView = new ListView(items, itemHeight, makeItem, bindItem);
-    ///
-    ///         listView.selectionType = SelectionType.Multiple;
-    ///
-    ///         listView.itemsChosen += objects => Debug.Log(objects);
-    ///         listView.selectionChanged += objects => Debug.Log(objects);
-    ///
-    ///         listView.style.flexGrow = 1.0f;
-    ///
-    ///         rootVisualElement.Add(listView);
-    ///     }
-    /// }
-    /// ]]>
-    /// </code>
+    /// The following example creates an editor window with a list view of a thousand items.
+    /// <code source="../../../../Modules/UIElements/Tests/UIElementsExamples/Assets/Examples/ListView_Example.cs"/>
     /// </example>
     public class ListView : BaseListView
     {
+        internal static readonly DataBindingProperty makeItemProperty = nameof(makeItem);
+        internal static readonly DataBindingProperty bindItemProperty = nameof(bindItem);
+        internal static readonly DataBindingProperty unbindItemProperty = nameof(unbindItem);
+        internal static readonly DataBindingProperty destroyItemProperty = nameof(destroyItem);
+
         /// <summary>
         /// Instantiates a <see cref="ListView"/> using data from a UXML file.
         /// </summary>
@@ -137,6 +103,7 @@ public class ListView : BaseListView
         /// If this property and <see cref="bindItem"/> are not set, Unity will either create a PropertyField if bound
         /// to a SerializedProperty, or create an empty label for any other case.
         /// </remarks>
+        [CreateProperty]
         public new Func<VisualElement> makeItem
         {
             get => m_MakeItem;
@@ -146,6 +113,7 @@ public class ListView : BaseListView
                 {
                     m_MakeItem = value;
                     Rebuild();
+                    NotifyPropertyChanged(makeItemProperty);
                 }
             }
         }
@@ -166,7 +134,11 @@ internal void SetMakeItemWithoutNotify(Func<VisualElement> func)
         ///
         /// If this property and <see cref="makeItem"/> are not set, Unity will try to bind to a SerializedProperty if
         /// bound, or simply set text in the created Label.
+        ///
+        /// **Note:**: Setting this callback without also setting <see cref="unbindItem"/> might result in unexpected behavior.
+        /// This is because the default implementation of unbindItem expects the default implementation of bindItem.
         /// </remarks>
+        [CreateProperty]
         public new Action<VisualElement, int> bindItem
         {
             get => m_BindItem;
@@ -176,6 +148,7 @@ internal void SetMakeItemWithoutNotify(Func<VisualElement> func)
                 {
                     m_BindItem = value;
                     RefreshItems();
+                    NotifyPropertyChanged(bindItemProperty);
                 }
             }
         }
@@ -185,14 +158,31 @@ internal void SetBindItemWithoutNotify(Action<VisualElement, int> callback)
             m_BindItem = callback;
         }
 
+        private Action<VisualElement, int> m_UnbindItem;
         /// <summary>
         /// Callback for unbinding a data item from the VisualElement.
         /// </summary>
         /// <remarks>
         /// The method called by this callback receives the VisualElement to unbind, and the index of the
         /// element to unbind it from.
+        ///
+        /// **Note:**: Setting this callback without also setting <see cref="bindItem"/> might cause unexpected behavior.
+        /// This is because the default implementation of bindItem expects the default implementation of unbindItem.
         /// </remarks>
-        public new Action<VisualElement, int> unbindItem { get; set; }
+        [CreateProperty]
+        public new Action<VisualElement, int> unbindItem
+        {
+            get => m_UnbindItem;
+            set
+            {
+                if (value == m_UnbindItem)
+                    return;
+                m_UnbindItem = value;
+                NotifyPropertyChanged(unbindItemProperty);
+            }
+        }
+
+        private Action<VisualElement> m_DestroyItem;
 
         /// <summary>
         /// Callback invoked when a <see cref="VisualElement"/> created via <see cref="makeItem"/> is no longer needed and will be destroyed.
@@ -200,7 +190,18 @@ internal void SetBindItemWithoutNotify(Action<VisualElement, int> callback)
         /// <remarks>
         /// The method called by this callback receives the VisualElement that will be destroyed from the pool.
         /// </remarks>
-        public new Action<VisualElement> destroyItem { get; set; }
+        [CreateProperty]
+        public new Action<VisualElement> destroyItem
+        {
+            get => m_DestroyItem;
+            set
+            {
+                if (value == m_DestroyItem)
+                    return;
+                m_DestroyItem = value;
+                NotifyPropertyChanged(destroyItemProperty);
+            }
+        }
 
         internal override bool HasValidDataAndBindings()
         {
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/LongField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/LongField.cs
index 55936c74e2..72c4dcc22d 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/LongField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/LongField.cs
@@ -43,7 +43,8 @@ protected override string ValueToString(long v)
         /// <returns>The long integer parsed from the string.</returns>
         protected override long StringToValue(string str)
         {
-            return UINumericFieldsUtils.StringToLong(str, out var v) ? v : rawValue;
+            var success = UINumericFieldsUtils.TryConvertStringToLong(str, textInputBase.originalText, out var v);
+            return success ? v : rawValue;
         }
 
         /// <summary>
@@ -88,7 +89,7 @@ public LongField(string label, int maxLength = kMaxLengthNone)
         internal override bool CanTryParse(string textString) => long.TryParse(textString, out _);
 
         /// <summary>
-        /// Modify the value using a 3D delta and a speed, typically coming from an input device.
+        /// Applies the values of a 3D delta and a speed from an input device.
         /// </summary>
         /// <param name="delta">A vector used to compute the value change.</param>
         /// <param name="speed">A multiplier for the value change.</param>
@@ -115,9 +116,12 @@ protected override string allowedCharacters
             public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, long startValue)
             {
                 double sensitivity = NumericFieldDraggerUtility.CalculateIntDragSensitivity(startValue);
-                float acceleration = NumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
-                long v = StringToValue(text);
-                v += (long)Math.Round(NumericFieldDraggerUtility.NiceDelta(delta, acceleration) * sensitivity);
+                var acceleration = NumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+                var v = StringToValue(text);
+                var niceDelta = (long)Math.Round(NumericFieldDraggerUtility.NiceDelta(delta, acceleration) * sensitivity);
+
+                v = ClampMinMaxLongValue(niceDelta, v);
+
                 if (parentLongField.isDelayed)
                 {
                     text = ValueToString(v);
@@ -128,6 +132,27 @@ public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, long
                 }
             }
 
+            private long ClampMinMaxLongValue(long niceDelta, long value)
+            {
+                var niceDeltaAbs = Math.Abs(niceDelta);
+                if (niceDelta > 0)
+                {
+                    if (value > 0 && niceDeltaAbs > long.MaxValue - value)
+                    {
+                        return long.MaxValue;
+                    }
+
+                    return value + niceDelta;
+                }
+
+                if (value < 0 && value < long.MinValue + niceDeltaAbs)
+                {
+                    return long.MinValue;
+                }
+
+                return value - niceDeltaAbs;
+            }
+
             protected override string ValueToString(long v)
             {
                 return v.ToString(formatString);
@@ -135,8 +160,7 @@ protected override string ValueToString(long v)
 
             protected override long StringToValue(string str)
             {
-                long v;
-                UINumericFieldsUtils.StringToLong(str, out v);
+                UINumericFieldsUtils.TryConvertStringToLong(str, originalText, out var v);
                 return v;
             }
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/MinMaxSlider.cs b/ModuleOverrides/com.unity.ui/Core/Controls/MinMaxSlider.cs
index 167435b0f8..cf57bb619d 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/MinMaxSlider.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/MinMaxSlider.cs
@@ -3,14 +3,21 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// A min/max slider containing a representation of a range.
+    /// A min/max slider containing a representation of a range. For more information, refer to [[wiki:UIE-uxml-element-MinMaxSlider|UXML element MinMaxSlider]].
     /// </summary>
     public class MinMaxSlider : BaseField<Vector2>
     {
+        internal static readonly DataBindingProperty minValueProperty = nameof(minValue);
+        internal static readonly DataBindingProperty maxValueProperty = nameof(maxValue);
+        internal static readonly DataBindingProperty rangeProperty = nameof(range);
+        internal static readonly DataBindingProperty lowLimitProperty = nameof(lowLimit);
+        internal static readonly DataBindingProperty highLimitProperty = nameof(highLimit);
+
         /// <summary>
         /// Instantiates a <see cref="MinMaxSlider"/> using the data read from a UXML file.
         /// </summary>
@@ -77,12 +84,17 @@ private enum DragState
         /// <summary>
         /// This is the low value of the range represented on the slider.
         /// </summary>
+        [CreateProperty]
         public float minValue
         {
             get { return value.x; }
             set
             {
+                var previous = minValue;
                 base.value = ClampValues(new Vector2(value, rawValue.y));
+
+                if (!Mathf.Approximately(previous, minValue))
+                    NotifyPropertyChanged(minValueProperty);
             }
         }
 
@@ -90,12 +102,17 @@ public float minValue
         /// <summary>
         /// This is the high value of the range represented on the slider.
         /// </summary>
+        [CreateProperty]
         public float maxValue
         {
             get { return value.y; }
             set
             {
+                var previous = maxValue;
                 base.value = ClampValues(new Vector2(rawValue.x, value));
+
+                if (!Mathf.Approximately(previous, maxValue))
+                    NotifyPropertyChanged(maxValueProperty);
             }
         }
 
@@ -122,6 +139,7 @@ public override void SetValueWithoutNotify(Vector2 newValue)
         /// <summary>
         /// Returns the range of the low/high limits of the slider.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public float range
         {
             get { return Math.Abs(highLimit - lowLimit); }
@@ -134,6 +152,7 @@ public float range
         /// <summary>
         /// This is the low limit of the slider.
         /// </summary>
+        [CreateProperty]
         public float lowLimit
         {
             get { return m_MinLimit; }
@@ -152,6 +171,7 @@ public float lowLimit
 
                     if (!string.IsNullOrEmpty(viewDataKey))
                         SaveViewData();
+                    NotifyPropertyChanged(lowLimitProperty);
                 }
             }
         }
@@ -160,6 +180,7 @@ public float lowLimit
         /// <summary>
         /// This is the high limit of the slider.
         /// </summary>
+        [CreateProperty]
         public float highLimit
         {
             get { return m_MaxLimit; }
@@ -178,6 +199,7 @@ public float highLimit
 
                     if (!string.IsNullOrEmpty(viewDataKey))
                         SaveViewData();
+                    NotifyPropertyChanged(highLimitProperty);
                 }
             }
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/Columns.cs b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/Columns.cs
index 32fe2bba5c..0383efbded 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/Columns.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/Columns.cs
@@ -111,6 +111,8 @@ public override void Init(ref T obj, IUxmlAttributes bag, CreationContext cc)
         bool m_ResizePreview;
         string m_PrimaryColumnName;
 
+        internal IList<Column> columns => m_Columns;
+
         /// <summary>
         /// Indicates the column that needs to be considered as primary column, by id.
         /// </summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnCollectionHeader.cs b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnCollectionHeader.cs
index bb4bb0cbc3..e43fba336b 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnCollectionHeader.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnCollectionHeader.cs
@@ -17,8 +17,9 @@ class MultiColumnCollectionHeader : VisualElement, IDisposable
         const int kMaxStableLayoutPassCount = 2; // Beyond this threshold, DoLayout must be performed in the next frame; otherwise, this may lead to Layout instabilities. This is caused by the dependencies between the geometries of the header, the viewport and the content.
 
         [Serializable]
-        class ViewState : ISerializationCallbackReceiver
+        class ViewState
         {
+            [SerializeField]
             bool m_HasPersistedData;
 
             /// <summary>
@@ -117,16 +118,6 @@ internal void Apply(MultiColumnCollectionHeader header)
                     header.sortDescriptions.Add(sortDesc);
                 }
             }
-
-            public void OnBeforeSerialize()
-            {
-                m_HasPersistedData = true;
-            }
-
-            public void OnAfterDeserialize()
-            {
-                m_HasPersistedData = true;
-            }
         }
 
         internal class ColumnData
@@ -169,12 +160,15 @@ public SortedColumnState(SortColumnDescription desc, SortDirection dir)
 
         bool m_SortingEnabled;
         List<SortColumnDescription> m_SortedColumns;
+        SortColumnDescriptions m_SortDescriptions;
         List<SortedColumnState> m_OldSortedColumnStates = new List<SortedColumnState>();
         bool m_SortingUpdatesTemporarilyDisabled;
 
         ViewState m_ViewState;
         bool m_ApplyingViewState;
 
+        internal bool isApplyingViewState => m_ApplyingViewState;
+
         bool m_DoLayoutScheduled;
 
         /// <summary>
@@ -205,7 +199,16 @@ public SortedColumnState(SortColumnDescription desc, SortDirection dir)
         /// <summary>
         /// The descriptions of sorted columns.
         /// </summary>
-        public SortColumnDescriptions sortDescriptions { get; }
+        public SortColumnDescriptions sortDescriptions
+        {
+            get => m_SortDescriptions;
+            protected internal set
+            {
+                m_SortDescriptions = value;
+                m_SortDescriptions.changed += UpdateSortedColumns;
+                UpdateSortedColumns();
+            }
+        }
 
         /// <summary>
         ///  The list of columns.
@@ -243,6 +246,11 @@ public bool sortingEnabled
         /// </summary>
         public event Action<ContextualMenuPopulateEvent, Column> contextMenuPopulateEvent;
 
+        /// <summary>
+        ///  Sent whenever a ContextMenuPopulate event sent allowing user code to add its own actions to the context menu.
+        /// </summary>
+        internal event Action viewDataRestored;
+
         /// <summary>
         /// Default constructor.
         /// </summary>
@@ -262,7 +270,6 @@ public MultiColumnCollectionHeader(Columns columns, SortColumnDescriptions sortD
             this.columns = columns;
             m_SortedColumns = sortedColumns;
             this.sortDescriptions = sortDescriptions;
-            this.sortDescriptions.changed += UpdateSortedColumns;
 
             columnContainer = new VisualElement()
             {
@@ -416,25 +423,31 @@ void OnColumnAdded(Column column)
                 return;
 
             var columnElement = new MultiColumnHeaderColumn(column);
+            var resizeHandle = new MultiColumnHeaderColumnResizeHandle();
 
             columnElement.RegisterCallback<GeometryChangedEvent>(OnColumnControlGeometryChanged);
             columnElement.clickable.clickedWithEventInfo += OnColumnClicked;
             // Prevent cursor change when hovering handles while drag reordering columns
             columnElement.mover.activeChanged += OnMoveManipulatorActivated;
 
-            columnContainer.Insert(column.visibleIndex, columnElement);
-
-            var resHandle = new MultiColumnHeaderColumnResizeHandle();
-
-            resizeHandleContainer.Insert(column.visibleIndex, resHandle);
-            resHandle.dragArea.AddManipulator(new ColumnResizer(column));
+            resizeHandle.dragArea.AddManipulator(new ColumnResizer(column));
 
             columnDataMap[column] = new ColumnData()
             {
                 control = columnElement,
-                resizeHandle = resHandle
+                resizeHandle = resizeHandle
             };
 
+            if (column.visible)
+            {
+                columnContainer.Insert(column.visibleIndex, columnElement);
+                resizeHandleContainer.Insert(column.visibleIndex, resizeHandle);
+            }
+            else
+            {
+                OnColumnRemoved(column);
+            }
+
             UpdateColumnControls();
             SaveViewState();
         }
@@ -476,6 +489,8 @@ void OnColumnChanged(Column column, ColumnDataType type)
                     OnColumnAdded(column);
                 else
                     OnColumnRemoved(column);
+
+                ApplyColumnSorting();
             }
 
             UpdateColumnControls();
@@ -492,7 +507,7 @@ void OnColumnChanged(Column column, ColumnDataType type)
         /// <param name="to"></param>
         void OnColumnReordered(Column column, int from, int to)
         {
-            if (!column.visible)
+            if (!column.visible || from == to)
                 return;
 
             if (columnDataMap.TryGetValue(column, out var columnData))
@@ -741,7 +756,8 @@ void RaiseColumnResized(int columnIndex)
         void RaiseColumnSortingChanged()
         {
             ApplyColumnSorting();
-            columnSortingChanged?.Invoke();
+             if (!m_ApplyingViewState)
+                columnSortingChanged?.Invoke();
         }
 
         void ApplyColumnSorting()
@@ -826,6 +842,8 @@ internal override void OnViewDataReady()
 
                 m_ViewState = GetOrCreateViewData<ViewState>(m_ViewState, key);
                 m_ViewState.Apply(this);
+
+                viewDataRestored?.Invoke();
             }
             finally
             {
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnController.cs b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnController.cs
index fc3e54e46c..f60888e0fd 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnController.cs
@@ -18,6 +18,7 @@ public class MultiColumnController : IDisposable
         internal static readonly PropertyName bindableElementPropertyName = "__unity-multi-column-bindable-element";
 
         internal static readonly string baseUssClassName = "unity-multi-column-view";
+        static readonly string k_HeaderContainerViewDataKey = "unity-multi-column-header-container";
 
         /// <summary>
         /// The USS class name for the header container inside a multi column view.
@@ -48,6 +49,7 @@ public class MultiColumnController : IDisposable
         public event Action<ContextualMenuPopulateEvent, Column> headerContextMenuPopulateEvent;
 
         BaseVerticalCollectionView m_View;
+        VisualElement m_HeaderContainer;
         MultiColumnCollectionHeader m_MultiColumnHeader;
         internal MultiColumnCollectionHeader header => m_MultiColumnHeader;
 
@@ -64,6 +66,7 @@ public MultiColumnController(Columns columns, SortColumnDescriptions sortDescrip
             m_MultiColumnHeader.columnSortingChanged += OnColumnSortingChanged;
             m_MultiColumnHeader.contextMenuPopulateEvent += OnContextMenuPopulateEvent;
             m_MultiColumnHeader.columnResized += OnColumnResized;
+            m_MultiColumnHeader.viewDataRestored += OnViewDataRestored;
 
             m_MultiColumnHeader.columns.columnAdded += OnColumnAdded;
             m_MultiColumnHeader.columns.columnRemoved += OnColumnRemoved;
@@ -203,8 +206,12 @@ public void PrepareView(BaseVerticalCollectionView collectionView)
 
             m_View = collectionView;
 
-            // Insert header to the view.
-            collectionView.Insert(0, m_MultiColumnHeader);
+            // Insert header to the multi column view.
+            m_HeaderContainer = new VisualElement { name = headerContainerUssClassName };
+            m_HeaderContainer.AddToClassList(headerContainerUssClassName);
+            m_HeaderContainer.viewDataKey = k_HeaderContainerViewDataKey;
+            collectionView.scrollView.hierarchy.Insert(0, m_HeaderContainer);
+            m_HeaderContainer.Add(m_MultiColumnHeader);
 
             // Handle horizontal scrolling
             m_View.scrollView.horizontalScroller.valueChanged += OnHorizontalScrollerValueChanged;
@@ -228,6 +235,7 @@ public void Dispose()
             m_MultiColumnHeader.columnSortingChanged -= OnColumnSortingChanged;
             m_MultiColumnHeader.contextMenuPopulateEvent -= OnContextMenuPopulateEvent;
             m_MultiColumnHeader.columnResized -= OnColumnResized;
+            m_MultiColumnHeader.viewDataRestored -= OnViewDataRestored;
             m_MultiColumnHeader.columns.columnAdded -= OnColumnAdded;
             m_MultiColumnHeader.columns.columnRemoved -= OnColumnRemoved;
             m_MultiColumnHeader.columns.columnReordered -= OnColumnReordered;
@@ -236,6 +244,9 @@ public void Dispose()
             m_MultiColumnHeader.RemoveFromHierarchy();
             m_MultiColumnHeader.Dispose();
             m_MultiColumnHeader = null;
+
+            m_HeaderContainer.RemoveFromHierarchy();
+            m_HeaderContainer = null;
         }
 
         void OnHorizontalScrollerValueChanged(float v)
@@ -288,17 +299,31 @@ void OnColumnRemoved(Column column)
 
         void OnColumnReordered(Column column, int from, int to)
         {
+            if (m_MultiColumnHeader.isApplyingViewState)
+                return;
+
             m_View.Rebuild();
         }
 
         void OnColumnsChanged(Column column, ColumnDataType type)
         {
+            if (m_MultiColumnHeader.isApplyingViewState)
+                return;
+
             if (type == ColumnDataType.Visibility) m_View.Rebuild();
         }
 
         void OnColumnChanged(ColumnsDataType type)
         {
+            if (m_MultiColumnHeader.isApplyingViewState)
+                return;
+
             if (type == ColumnsDataType.PrimaryColumn) m_View.Rebuild();
         }
+
+        void OnViewDataRestored()
+        {
+            m_View.Rebuild();
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnListView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnListView.cs
index 44bb897825..26c1a8a704 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnListView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnListView.cs
@@ -49,10 +49,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
             }
         }
 
-        static readonly string k_HeaderContainerViewDataKey = "HeaderContainer";
-
         Columns m_Columns;
-        VisualElement m_HeaderContainer;
 
         bool m_SortingEnabled;
         SortColumnDescriptions m_SortColumnDescriptions = new SortColumnDescriptions();
@@ -63,11 +60,6 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// </summary>
         public new MultiColumnListViewController viewController => base.viewController as MultiColumnListViewController;
 
-        /// <summary>
-        /// The content container.
-        /// </summary>
-        public override VisualElement contentContainer => m_HeaderContainer;
-
         /// <summary>
         /// If a column is clicked to change sorting, this event is raised to allow users to sort the tree view items.
         /// </summary>
@@ -122,6 +114,12 @@ private set
                 }
 
                 m_SortColumnDescriptions = value;
+
+                if (viewController != null)
+                {
+                    viewController.columnController.header.sortDescriptions = value;
+                    RaiseColumnSortingChanged();
+                }
             }
         }
 
@@ -154,10 +152,14 @@ public MultiColumnListView()
         /// <param name="columns">Column definitions used to initialize the header.</param>
         public MultiColumnListView(Columns columns)
         {
-            m_HeaderContainer = new VisualElement() { name = MultiColumnController.headerContainerUssClassName };
-            m_HeaderContainer.AddToClassList(MultiColumnController.headerContainerUssClassName);
-            m_HeaderContainer.viewDataKey = k_HeaderContainerViewDataKey;
-            scrollView.hierarchy.Insert(0, m_HeaderContainer);
+            // Setting the view data key on the ScrollView to get view data persistence on the header which
+            // is inside the contentViewport.
+            // Disabling view data persistence on the vertical and horizontal scrollers to make sure we keep
+            // the previous behavior on the scrollOffset.
+            scrollView.viewDataKey = "unity-multi-column-scroll-view";
+            scrollView.verticalScroller.viewDataKey = null;
+            scrollView.horizontalScroller.viewDataKey = null;
+
             this.columns = columns ?? new Columns();
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnTreeView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnTreeView.cs
index 4c19c1ebf0..1dbd9ba988 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnTreeView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/MultiColumnTreeView.cs
@@ -49,10 +49,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
             }
         }
 
-        static readonly string k_HeaderContainerViewDataKey = "HeaderContainer";
-
         Columns m_Columns;
-        VisualElement m_HeaderContainer;
 
         bool m_SortingEnabled;
         SortColumnDescriptions m_SortColumnDescriptions = new SortColumnDescriptions();
@@ -63,11 +60,6 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// </summary>
         public new MultiColumnTreeViewController viewController => base.viewController as MultiColumnTreeViewController;
 
-        /// <summary>
-        /// The content container.
-        /// </summary>
-        public override VisualElement contentContainer => m_HeaderContainer;
-
         /// <summary>
         /// If a column is clicked to change sorting, this event is raised to allow users to sort the tree view items.
         /// </summary>
@@ -122,6 +114,12 @@ private set
                 }
 
                 m_SortColumnDescriptions = value;
+
+                if (viewController != null)
+                {
+                    viewController.columnController.header.sortDescriptions = value;
+                    RaiseColumnSortingChanged();
+                }
             }
         }
 
@@ -153,10 +151,14 @@ public MultiColumnTreeView()
         /// <param name="columns">Column definitions used to initialize the header.</param>
         public MultiColumnTreeView(Columns columns)
         {
-            m_HeaderContainer = new VisualElement() { name = MultiColumnController.headerContainerUssClassName };
-            m_HeaderContainer.AddToClassList(MultiColumnController.headerContainerUssClassName);
-            m_HeaderContainer.viewDataKey = k_HeaderContainerViewDataKey;
-            scrollView.hierarchy.Insert(0, m_HeaderContainer);
+            // Setting the view data key on the ScrollView to get view data persistence on the header which
+            // is inside the contentViewport.
+            // Disabling view data persistence on the vertical and horizontal scrollers to make sure we keep
+            // the previous behavior on the scrollOffset.
+            scrollView.viewDataKey = "unity-multi-column-scroll-view";
+            scrollView.verticalScroller.viewDataKey = null;
+            scrollView.horizontalScroller.viewDataKey = null;
+
             this.columns = columns ?? new Columns();
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/SortColumnDescription.cs b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/SortColumnDescription.cs
index 4bfaa6ddff..8550449e0b 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/SortColumnDescription.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/MultiColumn/SortColumnDescription.cs
@@ -81,7 +81,7 @@ public string columnName
         }
 
         /// <summary>
-        /// The index of the column.
+        /// The index of the column to be used to find the column only if the <see cref="SortColumnDescription.columnName">columnName</see> isn't set.
         /// </summary>
         public int columnIndex
         {
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/PopupField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/PopupField.cs
index c4a6007e73..f239cdcb06 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/PopupField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/PopupField.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
 using UnityEngine.Scripting.APIUpdating;
 
 namespace UnityEngine.UIElements
@@ -14,6 +15,10 @@ namespace UnityEngine.UIElements
     [MovedFrom(true, UpgradeConstants.EditorNamespace, UpgradeConstants.EditorAssembly)]
     public class PopupField<T> : BasePopupField<T, T>
     {
+        internal static readonly DataBindingProperty indexProperty = nameof(index);
+
+        internal static List<char> s_Modifiers = new List<char>() { '&', '%', '^', '#', '_' };
+
         /// <summary>
         /// Callback that provides a string representation used to display the selected value.
         /// </summary>
@@ -40,7 +45,20 @@ internal override string GetValueToDisplay()
         {
             if (m_FormatSelectedValueCallback != null)
                 return m_FormatSelectedValueCallback(value);
-            return (value != null) ? value.ToString() : string.Empty;
+
+            Func<string, string> defaultFormatSelectedValue = (value) => {
+                string displayValue = value.TrimEnd();
+                int pos = displayValue.LastIndexOf(' ');
+                if (pos != -1 && displayValue.Length > pos + 1 && s_Modifiers.Contains(displayValue[pos + 1]))
+                    displayValue = displayValue.Substring(0, pos).TrimEnd();
+
+                return displayValue;
+            };
+
+            if (value != null)
+                return defaultFormatSelectedValue(value.ToString());
+
+            return string.Empty;
         }
 
         internal override string GetListItemToDisplay(T value)
@@ -58,8 +76,11 @@ public override T value
             get { return base.value; }
             set
             {
-                m_Index = m_Choices?.IndexOf(value) ?? -1;
+                var newIndex = m_Choices?.IndexOf(value) ?? -1;
+                m_Index = newIndex;
                 base.value = value;
+                if (m_Index != newIndex)
+                    NotifyPropertyChanged(indexProperty);
             }
         }
 
@@ -73,7 +94,9 @@ public override void SetValueWithoutNotify(T newValue)
         private int m_Index = kPopupFieldDefaultIndex;
         /// <summary>
         /// The currently selected index in the popup menu.
+        /// Setting the index will update the ::ref::value field and send a property change notification.
         /// </summary>
+        [CreateProperty]
         public int index
         {
             get { return m_Index; }
@@ -86,6 +109,7 @@ public int index
                         this.value = m_Choices[m_Index];
                     else
                         this.value = default(T);
+                    NotifyPropertyChanged(indexProperty);
                 }
             }
         }
@@ -188,6 +212,7 @@ internal override void AddMenuItems(IGenericMenu menu)
 
         private void ChangeValueFromMenu(T menuItem)
         {
+			showMixedValue = false;
             value = menuItem;
         }
     }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/PopupWindow.cs b/ModuleOverrides/com.unity.ui/Core/Controls/PopupWindow.cs
index 30c3fcbc7c..c950e39dc4 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/PopupWindow.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/PopupWindow.cs
@@ -8,8 +8,14 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// Styled visual element that matches the EditorGUILayout.Popup IMGUI element.
+    /// Styled visual text element. This element doesn't have any functionality. It's just a container with a border and a title, rather than a window or popup.
     /// </summary>
+    /// <example>
+    /// <code>
+    /// var popupWindow = new UnityEngine.UIElements.PopupWindow() { text = "Title" };
+    /// popupWindow.Add(new Button());
+    /// </code>
+    /// </example>
     public class PopupWindow : TextElement
     {
         /// <summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/ProgressBar.cs b/ModuleOverrides/com.unity.ui/Core/Controls/ProgressBar.cs
index 2772ef5d8b..b0ecf67fed 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/ProgressBar.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/ProgressBar.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System.Collections.Generic;
+using Unity.Properties;
 using UnityEngine;
 using UnityEngine.Scripting.APIUpdating;
 
@@ -13,6 +14,11 @@ namespace UnityEngine.UIElements
     /// </summary>
     public abstract class AbstractProgressBar : BindableElement, INotifyValueChanged<float>
     {
+        internal static readonly DataBindingProperty titleProperty = nameof(title);
+        internal static readonly DataBindingProperty lowValueProperty = nameof(lowValue);
+        internal static readonly DataBindingProperty highValueProperty = nameof(highValue);
+        internal static readonly DataBindingProperty valueProperty = nameof(value);
+
         /// <summary>
         /// USS Class Name used to style the <see cref="ProgressBar"/>.
         /// </summary>
@@ -44,7 +50,7 @@ public abstract class AbstractProgressBar : BindableElement, INotifyValueChanged
             UxmlFloatAttributeDescription m_LowValue = new UxmlFloatAttributeDescription { name = "low-value", defaultValue = 0 };
             UxmlFloatAttributeDescription m_HighValue = new UxmlFloatAttributeDescription { name = "high-value", defaultValue = 100 };
             UxmlFloatAttributeDescription m_Value = new UxmlFloatAttributeDescription { name = "value", defaultValue = 0 };
-            UxmlStringAttributeDescription m_Title = new UxmlStringAttributeDescription() { name = "title" };
+            UxmlStringAttributeDescription m_Title = new UxmlStringAttributeDescription() { name = "title", defaultValue = string.Empty };
 
             public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
             {
@@ -53,8 +59,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 bar.lowValue = m_LowValue.GetValueFromBag(bag, cc);
                 bar.highValue = m_HighValue.GetValueFromBag(bag, cc);
                 bar.value = m_Value.GetValueFromBag(bag, cc);
-                var title = m_Title.GetValueFromBag(bag, cc);
-                bar.title = (string.IsNullOrEmpty(title)) ? string.Empty : title;
+                bar.title = m_Title.GetValueFromBag(bag, cc);
             }
         }
 
@@ -67,35 +72,54 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// <summary>
         /// Sets the title of the ProgressBar that displays in the center of the control.
         /// </summary>
+        [CreateProperty]
         public string title
         {
             get => m_Title.text;
-            set => m_Title.text = value;
+            set
+            {
+                var previous = title;
+                m_Title.text = value;
+
+                if (string.CompareOrdinal(previous, title) != 0)
+                    NotifyPropertyChanged(titleProperty);
+            }
         }
 
         /// <summary>
         /// Sets the minimum value of the ProgressBar.
         /// </summary>
+        [CreateProperty]
         public float lowValue
         {
             get => m_LowValue;
             set
             {
+                var previous = lowValue;
                 m_LowValue = value;
                 SetProgress(m_Value);
+
+                if (!Mathf.Approximately(previous, lowValue))
+                    NotifyPropertyChanged(lowValueProperty);
             }
         }
 
         /// <summary>
         /// Sets the maximum value of the ProgressBar.
         /// </summary>
+        [CreateProperty]
         public float highValue
         {
             get => m_HighValue;
             set
             {
+                var previous = highValue;
+
                 m_HighValue = value;
                 SetProgress(m_Value);
+
+                if (!Mathf.Approximately(previous, highValue))
+                    NotifyPropertyChanged(highValueProperty);
             }
         }
 
@@ -138,6 +162,7 @@ void OnGeometryChanged(GeometryChangedEvent e)
         /// <summary>
         /// Sets the progress value. If the value has changed, dispatches an <see cref="ChangeEvent{T}"/> of type float.
         /// </summary>
+        [CreateProperty]
         public virtual float value
         {
             get { return m_Value; }
@@ -152,6 +177,7 @@ public virtual float value
                             evt.elementTarget = this;
                             SetValueWithoutNotify(value);
                             SendEvent(evt);
+                            NotifyPropertyChanged(valueProperty);
                         }
                     }
                     else
@@ -214,10 +240,32 @@ float CalculateProgressWidth(float width)
         }
     }
 
-
     /// <summary>
     /// A control that displays the progress between a lower and upper bound value.
     /// </summary>
+    /// <example>
+    /// <code>
+    /// <![CDATA[
+    /// public ProgressBar CreateProgressBar()
+    /// {
+    ///     var progressBar = new ProgressBar
+    ///     {
+    ///         title = "Progress",
+    ///         lowValue = 0f,
+    ///         highValue = 100f,
+    ///         value = 0f
+    ///     };
+    ///
+    ///     progressBar.schedule.Execute(() =>
+    ///     {
+    ///         progressBar.value += 2f;
+    ///     }).Every(75).Until(() => progressBar.value >= 100f);
+    ///
+    ///     return progressBar;
+    /// }
+    /// ]]>
+    /// </code>
+    /// </example>
     [MovedFrom(true, UpgradeConstants.EditorNamespace, UpgradeConstants.EditorAssembly)]
     public class ProgressBar : AbstractProgressBar
     {
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/RadioButton.cs b/ModuleOverrides/com.unity.ui/Core/Controls/RadioButton.cs
index db8367aa51..44c7276be8 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/RadioButton.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/RadioButton.cs
@@ -7,7 +7,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// A control that allows users to select a single option inside a <see cref="RadioButtonGroup"/>
+    /// A control that allows users to select a single option inside a <see cref="RadioButtonGroup"/>. For more information, refer to [[wiki:UIE-uxml-element-RadioButton|UXML element RadioButton]].
     /// </summary>
     public class RadioButton : BaseBoolField, IGroupBoxOption
     {
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/RadioButtonGroup.cs b/ModuleOverrides/com.unity.ui/Core/Controls/RadioButtonGroup.cs
index de230ff0fd..7e0e7258d9 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/RadioButtonGroup.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/RadioButtonGroup.cs
@@ -4,14 +4,17 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// A control that allows single selection out of a logical group of <see cref="RadioButton"/> elements. Selecting one will deselect the others.
+    /// A control that allows single selection out of a logical group of <see cref="RadioButton"/> elements. Selecting one will deselect the others. For more information, refer to [[wiki:UIE-uxml-element-RadioButtonGroup|UXML element RadioButtonGroup]].
     /// </summary>
     public class RadioButtonGroup : BaseField<int>, IGroupBox
     {
+        internal static readonly DataBindingProperty choicesProperty = nameof(choices);
+
         /// <summary>
         /// Instantiates a <see cref="RadioButtonGroup"/> using data from a UXML file.
         /// </summary>
@@ -35,7 +38,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 base.Init(ve, bag, cc);
 
                 var f = (RadioButtonGroup)ve;
-                f.choices = ParseChoiceList(m_Choices.GetValueFromBag(bag, cc));
+                f.choices = UxmlUtility.ParseStringListAttribute(m_Choices.GetValueFromBag(bag, cc));
             }
         }
 
@@ -62,6 +65,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// Writing to this property removes existing <see cref="RadioButton"/> elements and
         /// re-creates them to display the new list.
         /// </remarks>
+        [CreateProperty]
         public IEnumerable<string> choices
         {
             get
@@ -73,9 +77,23 @@ public IEnumerable<string> choices
             }
             set
             {
-                if (value == null)
+                if (!value.HasValues())
                 {
                     m_RadioButtonContainer.Clear();
+
+                    // Only need to clear radio buttons if we're attached to a panel, because we already
+                    // do the cleaning on detach to panel otherwise.
+                    if (panel != null)
+                    {
+                        return;
+                    }
+
+                    foreach (var radioButton in m_RadioButtons)
+                    {
+                        radioButton.UnregisterValueChangedCallback(m_RadioButtonValueChangedCallback);
+                    }
+                    m_RadioButtons.Clear();
+
                     return;
                 }
 
@@ -107,11 +125,14 @@ public IEnumerable<string> choices
                 }
 
                 UpdateRadioButtons();
+                NotifyPropertyChanged(choicesProperty);
             }
         }
 
         VisualElement m_RadioButtonContainer;
 
+        public override VisualElement contentContainer => m_RadioButtonContainer ?? this;
+
         /// <summary>
         /// Initializes and returns an instance of RadioButtonGroup.
         /// </summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/RepeatButton.cs b/ModuleOverrides/com.unity.ui/Core/Controls/RepeatButton.cs
index c70932d640..afcd974d8a 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/RepeatButton.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/RepeatButton.cs
@@ -7,7 +7,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// A button that executes an action repeatedly while it is pressed.
+    /// A button that executes an action repeatedly while it is pressed. For more information, refer to [[wiki:UIE-uxml-element-RepeatButton|UXML element RepeatButton]].
     /// </summary>
     public class RepeatButton : TextElement
     {
@@ -58,8 +58,8 @@ public RepeatButton()
         /// Constructor.
         /// </summary>
         /// <param name="clickEvent">The action to execute when the button is pressed.</param>
-        /// <param name="delay">The initial delay before the action is executed for the first time.</param>
-        /// <param name="interval">The interval between each execution of the action.</param>
+        /// <param name="delay">The initial delay before the action is executed for the first time. Value is defined in milliseconds.</param>
+        /// <param name="interval">The interval between each execution of the action. Value is defined in milliseconds.</param>
         public RepeatButton(System.Action clickEvent, long delay, long interval) : this()
         {
             SetAction(clickEvent, delay, interval);
@@ -69,8 +69,8 @@ public RepeatButton(System.Action clickEvent, long delay, long interval) : this(
         /// Set the action that should be executed when the button is pressed.
         /// </summary>
         /// <param name="clickEvent">The action to execute.</param>
-        /// <param name="delay">The initial delay before the action is executed for the first time.</param>
-        /// <param name="interval">The interval between each execution of the action.</param>
+        /// <param name="delay">The initial delay before the action is executed for the first time. Value is defined in milliseconds.</param>
+        /// <param name="interval">The interval between each execution of the action. Value is defined in milliseconds.</param>
         public void SetAction(System.Action clickEvent, long delay, long interval)
         {
             this.RemoveManipulator(m_Clickable);
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/ScrollView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/ScrollView.cs
index 9aaf19363c..33b32cdeb2 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/ScrollView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/ScrollView.cs
@@ -3,6 +3,8 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -43,6 +45,8 @@ namespace UnityEngine.UIElements
     /// </summary>
     /// <remarks>
     /// The default is <see cref="ScrollViewMode.Vertical"/>.
+    /// 
+    /// For more information, refer to [[wiki:UIE-uxml-element-ScrollView|UXML element ScrollView]].
     /// </remarks>
     public enum ScrollViewMode
     {
@@ -95,10 +99,23 @@ public enum ScrollerVisibility
     }
 
     /// <summary>
-    /// Displays its contents inside a scrollable frame.
+    /// Displays its contents inside a scrollable frame. For more information, see [[wiki:UIE-uxml-element-ScrollView|ScrollView]].
     /// </summary>
     public class ScrollView : VisualElement
     {
+        internal static readonly DataBindingProperty horizontalScrollerVisibilityProperty = nameof(horizontalScrollerVisibility);
+        internal static readonly DataBindingProperty verticalScrollerVisibilityProperty = nameof(verticalScrollerVisibility);
+        internal static readonly DataBindingProperty scrollOffsetProperty = nameof(scrollOffset);
+        internal static readonly DataBindingProperty horizontalPageSizeProperty = nameof(horizontalPageSize);
+        internal static readonly DataBindingProperty verticalPageSizeProperty = nameof(verticalPageSize);
+        internal static readonly DataBindingProperty mouseWheelScrollSizeProperty = nameof(mouseWheelScrollSize);
+        internal static readonly DataBindingProperty scrollDecelerationRateProperty = nameof(scrollDecelerationRate);
+        internal static readonly DataBindingProperty elasticityProperty = nameof(elasticity);
+        internal static readonly DataBindingProperty touchScrollBehaviorProperty = nameof(touchScrollBehavior);
+        internal static readonly DataBindingProperty nestedInteractionKindProperty = nameof(nestedInteractionKind);
+        internal static readonly DataBindingProperty modeProperty = nameof(mode);
+        internal static readonly DataBindingProperty elasticAnimationIntervalMsProperty = nameof(elasticAnimationIntervalMs);
+
         /// <summary>
         /// Instantiates a <see cref="ScrollView"/> using the data read from a UXML file.
         /// </summary>
@@ -135,6 +152,9 @@ public class ScrollView : VisualElement
             UxmlFloatAttributeDescription m_VerticalPageSize = new UxmlFloatAttributeDescription
             { name = "vertical-page-size", defaultValue = k_UnsetPageSizeValue };
 
+            UxmlFloatAttributeDescription m_MouseWheelScrollSize = new UxmlFloatAttributeDescription
+            { name = "mouse-wheel-scroll-size", defaultValue = k_MouseWheelScrollSizeDefaultValue };
+
             UxmlEnumAttributeDescription<TouchScrollBehavior> m_TouchScrollBehavior = new UxmlEnumAttributeDescription<TouchScrollBehavior>
             { name = "touch-scroll-type", defaultValue = TouchScrollBehavior.Clamped };
 
@@ -144,6 +164,8 @@ public class ScrollView : VisualElement
             UxmlFloatAttributeDescription m_Elasticity = new UxmlFloatAttributeDescription
             { name = "elasticity", defaultValue = k_DefaultElasticity };
 
+            UxmlLongAttributeDescription m_ElasticAnimationIntervalMs = new UxmlLongAttributeDescription
+                { name = "elastic-animation-interval-ms", defaultValue = k_DefaultElasticAnimationInterval };
 
             /// <summary>
             /// Initialize <see cref="ScrollView"/> properties using values from the attribute bag.
@@ -176,24 +198,36 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 scrollView.nestedInteractionKind = m_NestedInteractionKind.GetValueFromBag(bag, cc);
                 scrollView.horizontalPageSize = m_HorizontalPageSize.GetValueFromBag(bag, cc);
                 scrollView.verticalPageSize = m_VerticalPageSize.GetValueFromBag(bag, cc);
+                scrollView.mouseWheelScrollSize = m_MouseWheelScrollSize.GetValueFromBag(bag, cc);
                 scrollView.scrollDecelerationRate = m_ScrollDecelerationRate.GetValueFromBag(bag, cc);
                 scrollView.touchScrollBehavior = m_TouchScrollBehavior.GetValueFromBag(bag, cc);
                 scrollView.elasticity = m_Elasticity.GetValueFromBag(bag, cc);
+                scrollView.elasticAnimationIntervalMs = m_ElasticAnimationIntervalMs.GetValueFromBag(bag, cc);
             }
         }
 
+        // ScrollViews can take more than 3 passes to stabilize. This can be the case when a scrollview contains elements with height bound to their width (e.g label with wrapped text).
+        // Beyond 5 passes, we assume that the layout may never be stabilized then we stop updating the visibility of the scrollers.
+        private const int k_MaxLocalLayoutPassCount = 5;
+        private int m_FirstLayoutPass = -1; // The layout pass when the first geometry changed occurred. It may not be layoutPass = 0, which could occur when you have nested ScrollViews.
+
         ScrollerVisibility m_HorizontalScrollerVisibility;
 
         /// <summary>
         /// Specifies whether the horizontal scroll bar is visible.
         /// </summary>
+        [CreateProperty]
         public ScrollerVisibility horizontalScrollerVisibility
         {
             get { return m_HorizontalScrollerVisibility; }
             set
             {
+                var previous = m_HorizontalScrollerVisibility;
                 m_HorizontalScrollerVisibility = value;
                 UpdateScrollers(needsHorizontal, needsVertical);
+
+                if (previous != m_HorizontalScrollerVisibility)
+                    NotifyPropertyChanged(horizontalScrollerVisibilityProperty);
             }
         }
 
@@ -202,13 +236,17 @@ public ScrollerVisibility horizontalScrollerVisibility
         /// <summary>
         /// Specifies whether the vertical scroll bar is visible.
         /// </summary>
+        [CreateProperty]
         public ScrollerVisibility verticalScrollerVisibility
         {
             get { return m_VerticalScrollerVisibility; }
             set
             {
+                var previous = m_VerticalScrollerVisibility;
                 m_VerticalScrollerVisibility = value;
                 UpdateScrollers(needsHorizontal, needsVertical);
+                if (previous != m_VerticalScrollerVisibility)
+                    NotifyPropertyChanged(verticalScrollerVisibilityProperty);
             }
         }
 
@@ -242,24 +280,15 @@ public bool showVertical
         const float k_ScrollPageOverlapFactor = 0.1f;
         internal const float k_UnsetPageSizeValue = -1.0f;
 
-        private IVisualElementScheduledItem m_UpdateScrollersScheduledItem;
-        internal Action<bool> OnUpdateScrollers;
+        internal const float k_MouseWheelScrollSizeDefaultValue = 18.0f;
+        internal const float k_MouseWheelScrollSizeUnset = -1.0f;
+        internal bool m_MouseWheelScrollSizeIsInline;
 
-        internal bool needsHorizontal
-        {
-            get
-            {
-                return horizontalScrollerVisibility == ScrollerVisibility.AlwaysVisible || (horizontalScrollerVisibility == ScrollerVisibility.Auto && scrollableWidth > k_SizeThreshold);
-            }
-        }
+        internal bool needsHorizontal => mode != ScrollViewMode.Vertical && horizontalScrollerVisibility == ScrollerVisibility.AlwaysVisible || (horizontalScrollerVisibility == ScrollerVisibility.Auto && scrollableWidth > k_SizeThreshold);
 
-        internal bool needsVertical
-        {
-            get
-            {
-                return verticalScrollerVisibility == ScrollerVisibility.AlwaysVisible || (verticalScrollerVisibility == ScrollerVisibility.Auto && scrollableHeight > k_SizeThreshold);
-            }
-        }
+        internal bool needsVertical => mode != ScrollViewMode.Horizontal &&
+            verticalScrollerVisibility == ScrollerVisibility.AlwaysVisible ||
+            (verticalScrollerVisibility == ScrollerVisibility.Auto && scrollableHeight > k_SizeThreshold);
 
         internal bool isVerticalScrollDisplayed
         {
@@ -280,6 +309,7 @@ internal bool isHorizontalScrollDisplayed
         /// <summary>
         /// The current scrolling position.
         /// </summary>
+        [CreateProperty]
         public Vector2 scrollOffset
         {
             get { return new Vector2(horizontalScroller.value, verticalScroller.value); }
@@ -289,7 +319,14 @@ public Vector2 scrollOffset
                 {
                     horizontalScroller.value = value.x;
                     verticalScroller.value = value.y;
-                    UpdateContentViewTransform();
+
+                    if (panel != null)
+                    {
+                        UpdateScrollers(needsHorizontal, needsVertical);
+                        UpdateContentViewTransform();
+                    }
+
+                    NotifyPropertyChanged(scrollOffsetProperty);
                 }
             }
         }
@@ -297,30 +334,67 @@ public Vector2 scrollOffset
         private float m_HorizontalPageSize;
 
         /// <summary>
-        /// This property is controlling the scrolling speed of the horizontal scroller.
+        /// This property controls the speed of the horizontal scrolling when using a keyboard or the on-screen scrollbar buttons (arrows and handle), based on the size of the page.
         /// </summary>
+        /// <remarks>
+        /// When scrolling the page size will be applied to the offset for each scroll step, so the final offset will be the page size multiplied by the number of steps.
+        /// SA: BaseSlider_1::ref::pageSize.
+        /// </remarks>
+        [CreateProperty]
         public float horizontalPageSize
         {
             get { return m_HorizontalPageSize; }
             set
             {
+                var previous = m_HorizontalPageSize;
                 m_HorizontalPageSize = value;
                 UpdateHorizontalSliderPageSize();
+                if (!Mathf.Approximately(previous, m_HorizontalPageSize))
+                    NotifyPropertyChanged(horizontalPageSizeProperty);
             }
         }
 
         private float m_VerticalPageSize;
 
         /// <summary>
-        /// This property is controlling the scrolling speed of the vertical scroller.
+        /// This property controls the speed of the vertical scrolling when using a keyboard or the on-screen scrollbar buttons (arrows and handle), based on the size of the page.
         /// </summary>
+        /// <remarks>
+        /// When scrolling the page size will be applied to the offset for each scroll step, so the final offset will be the page size multiplied by the number of steps.
+        /// SA: BaseSlider_1::ref::pageSize.
+        /// </remarks>
+        [CreateProperty]
         public float verticalPageSize
         {
             get { return m_VerticalPageSize; }
             set
             {
+                var previous = m_VerticalPageSize;
                 m_VerticalPageSize = value;
                 UpdateVerticalSliderPageSize();
+                if (!Mathf.Approximately(previous, m_VerticalPageSize))
+                    NotifyPropertyChanged(verticalPageSizeProperty);
+            }
+        }
+
+        private float m_MouseWheelScrollSize = k_MouseWheelScrollSizeDefaultValue;
+
+        /// <summary>
+        /// This property controls the scrolling speed only when using a mouse scroll wheel, based on the size of the page. It takes precedence over the --unity-metrics-single_line-height USS variable.
+        /// </summary>
+        [CreateProperty]
+        public float mouseWheelScrollSize
+        {
+            get { return m_MouseWheelScrollSize; }
+            set
+            {
+                var previous = m_MouseWheelScrollSize;
+                if (Math.Abs(m_MouseWheelScrollSize - value) > float.Epsilon)
+                {
+                    m_MouseWheelScrollSizeIsInline = true;
+                    m_MouseWheelScrollSize = value;
+                    NotifyPropertyChanged(mouseWheelScrollSizeProperty);
+                }
             }
         }
 
@@ -344,10 +418,17 @@ internal float scrollableHeight
         /// <remarks>
         /// The deceleration rate is the speed reduction per second. A value of 0.5 halves the speed each second. A value of 0 stops the scrolling immediately.
         /// </remarks>
+        [CreateProperty]
         public float scrollDecelerationRate
         {
             get { return m_ScrollDecelerationRate; }
-            set { m_ScrollDecelerationRate = Mathf.Max(0f, value); }
+            set
+            {
+                var previous = m_ScrollDecelerationRate;
+                m_ScrollDecelerationRate = Mathf.Max(0f, value);
+                if (!Mathf.Approximately(previous, m_ScrollDecelerationRate))
+                    NotifyPropertyChanged(scrollDecelerationRateProperty);
+            }
         }
 
         // For elastic behavior: how long it takes to go back to original position.
@@ -359,10 +440,17 @@ public float scrollDecelerationRate
         /// <remarks>
         /// Elasticity is only used when <see cref="touchScrollBehavior"/> is set to Elastic.
         /// </remarks>
+        [CreateProperty]
         public float elasticity
         {
             get { return m_Elasticity;}
-            set { m_Elasticity = Mathf.Max(0f, value); }
+            set
+            {
+                var previous = m_Elasticity;
+                m_Elasticity = Mathf.Max(0f, value);
+                if (!Mathf.Approximately(previous, m_Elasticity))
+                    NotifyPropertyChanged(elasticityProperty);
+            }
         }
 
         /// <summary>
@@ -388,11 +476,13 @@ public enum TouchScrollBehavior
         /// <summary>
         /// The behavior to use when a user tries to scroll past the boundaries of the ScrollView content using a touch interaction.
         /// </summary>
+        [CreateProperty]
         public TouchScrollBehavior touchScrollBehavior
         {
             get { return m_TouchScrollBehavior; }
             set
             {
+                var previous = m_TouchScrollBehavior;
                 m_TouchScrollBehavior = value;
                 if (m_TouchScrollBehavior == TouchScrollBehavior.Clamped)
                 {
@@ -404,6 +494,8 @@ public TouchScrollBehavior touchScrollBehavior
                     horizontalScroller.slider.clamped = false;
                     verticalScroller.slider.clamped = false;
                 }
+                if (previous != m_TouchScrollBehavior)
+                    NotifyPropertyChanged(touchScrollBehaviorProperty);
             }
         }
 
@@ -433,10 +525,39 @@ public enum NestedInteractionKind
         /// <summary>
         /// The behavior to use when scrolling reaches limits of a nested <see cref="ScrollView"/>.
         /// </summary>
+        [CreateProperty]
         public NestedInteractionKind nestedInteractionKind
         {
             get => m_NestedInteractionKind;
-            set => m_NestedInteractionKind = value;
+            set
+            {
+                var previous = m_NestedInteractionKind;
+                m_NestedInteractionKind = value;
+                if (previous != m_NestedInteractionKind)
+                    NotifyPropertyChanged(nestedInteractionKindProperty);
+            }
+        }
+
+        static readonly long k_DefaultElasticAnimationInterval = 16;
+        long m_ElasticAnimationIntervalMs = k_DefaultElasticAnimationInterval;
+
+        /// <summary>
+        /// Specifies the minimum amount of time in milliseconds between each elastic spring animation execution.
+        /// </summary>
+        [CreateProperty]
+        public long elasticAnimationIntervalMs
+        {
+            get { return m_ElasticAnimationIntervalMs; }
+            set
+            {
+                var previous = m_ElasticAnimationIntervalMs;
+                m_ElasticAnimationIntervalMs = value;
+                if (previous != m_ElasticAnimationIntervalMs)
+                {
+                    NotifyPropertyChanged(elasticAnimationIntervalMsProperty);
+                    m_PostPointerUpAnimation = schedule.Execute(PostPointerUpAnimation).Every(m_ElasticAnimationIntervalMs);
+                }
+            }
         }
 
         void OnHorizontalScrollDragElementChanged(GeometryChangedEvent evt)
@@ -499,7 +620,7 @@ void UpdateVerticalSliderPageSize()
             }
         }
 
-        void UpdateContentViewTransform()
+        internal void UpdateContentViewTransform()
         {
             // Adjust contentContainer's position
             var t = contentContainer.transform.position;
@@ -520,6 +641,10 @@ void UpdateContentViewTransform()
         /// Scroll to a specific child element.
         /// </summary>
         /// <param name="child">The child to scroll to.</param>
+        /// <example>
+        /// This example creates a ScrollView that contains multiple labels. A Button is added that can be used to scroll to a selected label.
+        /// <code source="../../../../Modules/UIElements/Tests/UIElementsExamples/Assets/Examples/ScrollView_ScrollTo.cs"/>
+        /// </example>
         public void ScrollTo(VisualElement child)
         {
             if (child == null)
@@ -528,6 +653,7 @@ public void ScrollTo(VisualElement child)
             if (!contentContainer.Contains(child))
                 throw new ArgumentException("Cannot scroll to a VisualElement that's not a child of the ScrollView content-container.");
 
+            m_Velocity = Vector2.zero;
             float yDeltaOffset = 0, xDeltaOffset = 0;
 
             if (scrollableHeight > 0)
@@ -611,16 +737,16 @@ private float GetDeltaDistance(float viewMin, float viewMax, float childBoundary
         /// <summary>
         /// Represents the visible part of contentContainer.
         /// </summary>
-        public VisualElement contentViewport { get; private set; } // Represents the visible part of contentContainer
+        public VisualElement contentViewport { get; } // Represents the visible part of contentContainer
 
         /// <summary>
         /// Horizontal scrollbar.
         /// </summary>
-        public Scroller horizontalScroller { get; private set; }
+        public Scroller horizontalScroller { get; }
         /// <summary>
         /// Vertical Scrollbar.
         /// </summary>
-        public Scroller verticalScroller { get; private set; }
+        public Scroller verticalScroller { get; }
 
         private VisualElement m_ContentContainer;
         private VisualElement m_ContentAndVerticalScrollContainer;
@@ -751,6 +877,7 @@ public ScrollView(ScrollViewMode scrollViewMode)
                 (value) =>
                 {
                     scrollOffset = new Vector2(value, scrollOffset.y);
+                    UpdateElasticBehaviour();
                     UpdateContentViewTransform();
                 }, SliderDirection.Horizontal)
             { viewDataKey = "HorizontalScroller" };
@@ -762,6 +889,7 @@ public ScrollView(ScrollViewMode scrollViewMode)
                 (value) =>
                 {
                     scrollOffset = new Vector2(scrollOffset.x, value);
+                    UpdateElasticBehaviour();
                     UpdateContentViewTransform();
                 }, SliderDirection.Vertical)
             { viewDataKey = "VerticalScroller" };
@@ -778,6 +906,7 @@ public ScrollView(ScrollViewMode scrollViewMode)
             horizontalPageSize = k_UnsetPageSizeValue;
             verticalPageSize = k_UnsetPageSizeValue;
 
+
             horizontalScroller.slider.dragElement.RegisterCallback<GeometryChangedEvent>(OnHorizontalScrollDragElementChanged);
             verticalScroller.slider.dragElement.RegisterCallback<GeometryChangedEvent>(OnVerticalScrollDragElementChanged);
 
@@ -798,6 +927,7 @@ public ScrollView(ScrollViewMode scrollViewMode)
         /// <see cref="ScrollViewMode"/>. When the value changes, the class list matching the old value is removed and
         /// the class list matching the new value is added.
         /// </remarks>
+        [CreateProperty]
         public ScrollViewMode mode
         {
             get => m_Mode;
@@ -806,6 +936,7 @@ public ScrollViewMode mode
                 if (m_Mode == value)
                     return;
                 SetScrollViewMode(value);
+                NotifyPropertyChanged(modeProperty);
             }
         }
 
@@ -862,11 +993,11 @@ private void OnAttachToPanel(AttachToPanelEvent evt)
 
             if (evt.destinationPanel.contextType == ContextType.Player)
             {
-                m_ContentAndVerticalScrollContainer.RegisterCallback<PointerDownEvent>(OnPointerDown, TrickleDown.TrickleDown);
                 m_ContentAndVerticalScrollContainer.RegisterCallback<PointerMoveEvent>(OnPointerMove);
-                m_ContentAndVerticalScrollContainer.RegisterCallback<PointerCancelEvent>(OnPointerCancel);
-                m_ContentAndVerticalScrollContainer.RegisterCallback<PointerUpEvent>(OnPointerUp, TrickleDown.TrickleDown);
 
+                contentContainer.RegisterCallback<PointerDownEvent>(OnPointerDown, TrickleDown.TrickleDown);
+                contentContainer.RegisterCallback<PointerCancelEvent>(OnPointerCancel);
+                contentContainer.RegisterCallback<PointerUpEvent>(OnPointerUp, TrickleDown.TrickleDown);
                 contentContainer.RegisterCallback<PointerCaptureEvent>(OnPointerCapture);
                 contentContainer.RegisterCallback<PointerCaptureOutEvent>(OnPointerCaptureOut);
             }
@@ -874,6 +1005,9 @@ private void OnAttachToPanel(AttachToPanelEvent evt)
 
         private void OnDetachFromPanel(DetachFromPanelEvent evt)
         {
+            m_ScheduledLayoutPassResetItem?.Pause();
+            ResetLayoutPass();
+
             if (evt.originPanel == null)
             {
                 return;
@@ -925,7 +1059,48 @@ private void OnGeometryChanged(GeometryChangedEvent evt)
             {
                 return;
             }
-            DelayUpdateScrollers();
+
+            // Get the initial information on the necessity of the scrollbars
+            bool needsVerticalCached = needsVertical;
+            bool needsHorizontalCached = needsHorizontal;
+
+            if (m_FirstLayoutPass == -1)
+                m_FirstLayoutPass = evt.layoutPass;
+            else
+            {
+                // Here, we update the visibility of the scrollbars for only few layout pass.
+                // Exceeding this limit could suggest that the layout will never be stabilized if we keep showing/hiding the scrollbars.
+                if ((evt.layoutPass - m_FirstLayoutPass) > k_MaxLocalLayoutPassCount)
+                {
+                    needsVerticalCached = needsVerticalCached || isVerticalScrollDisplayed;
+                    needsHorizontalCached = needsHorizontalCached || isHorizontalScrollDisplayed;
+                }
+            }
+
+            UpdateScrollers(needsHorizontalCached, needsVerticalCached);
+            UpdateContentViewTransform();
+            ScheduleResetLayoutPass();
+        }
+
+        private IVisualElementScheduledItem m_ScheduledLayoutPassResetItem;
+
+        void ScheduleResetLayoutPass()
+        {
+            // Reset the cached layout pass information in the next frame.
+            if (m_ScheduledLayoutPassResetItem == null)
+            {
+                m_ScheduledLayoutPassResetItem = schedule.Execute(ResetLayoutPass);
+            }
+            else
+            {
+                m_ScheduledLayoutPassResetItem.Pause();
+                m_ScheduledLayoutPassResetItem.Resume();
+            }
+        }
+
+        void ResetLayoutPass()
+        {
+            m_FirstLayoutPass = -1;
         }
 
         private int m_ScrollingPointerId = PointerId.invalidPointerId;
@@ -943,7 +1118,9 @@ private void OnGeometryChanged(GeometryChangedEvent evt)
         VisualElement m_CapturedTarget;
         EventCallback<PointerMoveEvent> m_CapturedTargetPointerMoveCallback;
         EventCallback<PointerUpEvent> m_CapturedTargetPointerUpCallback;
-        private IVisualElementScheduledItem m_PostPointerUpAnimation;
+
+        // Internal for tests
+        internal IVisualElementScheduledItem m_PostPointerUpAnimation;
 
         // Compute the new scroll view offset from a pointer delta, taking elasticity into account.
         // Low and high limits are the values beyond which the scrollview starts to show resistance to scrolling (elasticity).
@@ -1127,7 +1304,8 @@ private void SpringBack()
             scrollOffset = newOffset;
         }
 
-        private void ApplyScrollInertia()
+        // Internal for tests.
+        internal void ApplyScrollInertia()
         {
             if (hasInertia && m_Velocity != Vector2.zero)
             {
@@ -1371,7 +1549,7 @@ void ExecuteElasticSpringAnimation()
 
             if (m_PostPointerUpAnimation == null)
             {
-                m_PostPointerUpAnimation = schedule.Execute(PostPointerUpAnimation).Every(30);
+                m_PostPointerUpAnimation = schedule.Execute(PostPointerUpAnimation).Every(m_ElasticAnimationIntervalMs);
             }
             else
             {
@@ -1387,38 +1565,6 @@ void AdjustScrollers()
             horizontalScroller.Adjust(horizontalFactor);
             verticalScroller.Adjust(verticalFactor);
         }
-
-        void DelayUpdateScrollers()
-        {
-            if (m_UpdateScrollersScheduledItem == null)
-            {
-                m_UpdateScrollersScheduledItem = schedule.Execute(UpdateScrollers);
-            }
-            else
-            {
-                // Restart the scheduled update of the scrollers
-                m_UpdateScrollersScheduledItem.Pause();
-                m_UpdateScrollersScheduledItem.Resume();
-            }
-        }
-
-        void UpdateScrollers()
-        {
-            UpdateScrollers(needsHorizontal, needsVertical);
-            UpdateContentViewTransform();
-            // Cancel the scheduled update if this method is not called from the scheduler
-            m_UpdateScrollersScheduledItem?.Pause();
-            OnUpdateScrollers?.Invoke(false);
-        }
-
-        void UpdateViewportContentMargins(bool displayHorizontal, bool displayVertical)
-        {
-            // Expand content if scrollbars are hidden
-            contentViewport.style.marginRight = displayVertical ? verticalScroller.layout.width : 0;
-            m_ContentAndVerticalScrollContainer.style.marginBottom =
-                displayHorizontal ? horizontalScroller.layout.height : 0;
-        }
-
         internal void UpdateScrollers(bool displayHorizontal, bool displayVertical)
         {
             AdjustScrollers();
@@ -1427,8 +1573,6 @@ internal void UpdateScrollers(bool displayHorizontal, bool displayVertical)
             horizontalScroller.SetEnabled(contentContainer.boundingBox.width - contentViewport.layout.width > 0);
             verticalScroller.SetEnabled(contentContainer.boundingBox.height - contentViewport.layout.height > 0);
 
-            UpdateViewportContentMargins(displayHorizontal, displayVertical);
-
             var newShowHorizontal = displayHorizontal && m_HorizontalScrollerVisibility != ScrollerVisibility.Hidden;
             var newShowVertical = displayVertical && m_VerticalScrollerVisibility != ScrollerVisibility.Hidden;
             var newHorizontalDisplay = newShowHorizontal ? DisplayStyle.Flex : DisplayStyle.None;
@@ -1449,16 +1593,6 @@ internal void UpdateScrollers(bool displayHorizontal, bool displayVertical)
             verticalScroller.highValue = scrollableHeight;
             horizontalScroller.lowValue = 0f;
             horizontalScroller.highValue = scrollableWidth;
-
-            if (scrollableHeight <= 0f)
-            {
-                verticalScroller.value = 0f;
-            }
-
-            if (scrollableWidth <= 0f)
-            {
-                horizontalScroller.value = 0f;
-            }
         }
 
         private void OnScrollersGeometryChanged(GeometryChangedEvent evt)
@@ -1467,17 +1601,16 @@ private void OnScrollersGeometryChanged(GeometryChangedEvent evt)
             {
                 return;
             }
-            var newShowVertical = needsVertical && m_VerticalScrollerVisibility != ScrollerVisibility.Hidden;
+
             var newShowHorizontal = needsHorizontal && m_HorizontalScrollerVisibility != ScrollerVisibility.Hidden;
 
-            // Add some space if both scrollers are visible
+            // Align the right side of the horizontal scroller with the left side of the vertical scroller.
             if (newShowHorizontal)
             {
                 horizontalScroller.style.marginRight = verticalScroller.layout.width;
             }
 
             AdjustScrollers();
-            UpdateViewportContentMargins(newShowHorizontal, newShowVertical);
         }
 
         // TODO: Same behaviour as IMGUI Scroll view
@@ -1487,11 +1620,12 @@ void OnScrollWheel(WheelEvent evt)
             var canUseVerticalScroll = mode != ScrollViewMode.Horizontal && contentContainer.boundingBox.height - layout.height > 0;
             var canUseHorizontalScroll = mode != ScrollViewMode.Vertical && contentContainer.boundingBox.width - layout.width > 0;
             var horizontalScrollDelta = canUseHorizontalScroll && !canUseVerticalScroll ? evt.delta.y : evt.delta.x;
+            var mouseScrollFactor = m_MouseWheelScrollSizeIsInline ? mouseWheelScrollSize : m_SingleLineHeight;
 
             if (canUseVerticalScroll)
             {
                 var oldVerticalValue = verticalScroller.value;
-                verticalScroller.value += evt.delta.y * (verticalScroller.lowValue < verticalScroller.highValue ? 1f : -1f) * m_SingleLineHeight;
+                verticalScroller.value += evt.delta.y * (verticalScroller.lowValue < verticalScroller.highValue ? 1f : -1f) * mouseScrollFactor;
 
                 if (nestedInteractionKind == NestedInteractionKind.StopScrolling || !Mathf.Approximately(verticalScroller.value, oldVerticalValue))
                 {
@@ -1503,7 +1637,7 @@ void OnScrollWheel(WheelEvent evt)
             if (canUseHorizontalScroll)
             {
                 var oldHorizontalValue = horizontalScroller.value;
-                horizontalScroller.value += horizontalScrollDelta * (horizontalScroller.lowValue < horizontalScroller.highValue ? 1f : -1f) * m_SingleLineHeight;
+                horizontalScroller.value += horizontalScrollDelta * (horizontalScroller.lowValue < horizontalScroller.highValue ? 1f : -1f) * mouseScrollFactor;
 
                 if (nestedInteractionKind == NestedInteractionKind.StopScrolling || !Mathf.Approximately(horizontalScroller.value, oldHorizontalValue))
                 {
@@ -1514,19 +1648,7 @@ void OnScrollWheel(WheelEvent evt)
 
             if (updateContentViewTransform)
             {
-                // Update elastic behavior
-                if (touchScrollBehavior == TouchScrollBehavior.Elastic)
-                {
-                    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));
-
-                    ExecuteElasticSpringAnimation();
-                }
-
+                UpdateElasticBehaviour();
                 UpdateContentViewTransform();
             }
         }
@@ -1551,5 +1673,20 @@ void ReadSingleLineHeight()
                 m_SingleLineHeight = UIElementsUtility.singleLineHeight;
             }
         }
+
+        void UpdateElasticBehaviour()
+        {
+            if (touchScrollBehavior == TouchScrollBehavior.Elastic)
+            {
+                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));
+
+                ExecuteElasticSpringAnimation();
+            }
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Scroller.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Scroller.cs
index 0fa1e28b48..9b58aae62c 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Scroller.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Scroller.cs
@@ -4,14 +4,20 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// A vertical or horizontal scrollbar.
+    /// A vertical or horizontal scrollbar. For more information, refer to [[wiki:UIE-uxml-element-scroller|UXML element Scroller]].
     /// </summary>
     public class Scroller : VisualElement
     {
+        internal static readonly DataBindingProperty valueProperty = nameof(value);
+        internal static readonly DataBindingProperty lowValueProperty = nameof(lowValue);
+        internal static readonly DataBindingProperty highValueProperty = nameof(highValue);
+        internal static readonly DataBindingProperty directionProperty = nameof(direction);
+
         class ScrollerSlider : Slider
         {
             public ScrollerSlider(float start, float end,
@@ -78,51 +84,78 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// <summary>
         /// The slider used by this scroller.
         /// </summary>
-        public Slider slider { get; private set; }
+        public Slider slider { get; }
+
         /// <summary>
         /// Bottom or left scroll button.
         /// </summary>
-        public RepeatButton lowButton { get; private set; }
+        public RepeatButton lowButton { get;  }
+
         /// <summary>
         /// Top or right scroll button.
         /// </summary>
-        public RepeatButton highButton { get; private set; }
+        public RepeatButton highButton { get; }
 
         /// <summary>
         /// Value that defines the slider position. It lies between <see cref="lowValue"/> and <see cref="highValue"/>.
         /// </summary>
+        [CreateProperty]
         public float value
         {
             get { return slider.value; }
-            set { slider.value = value; }
+            set
+            {
+                var previous = slider.value;
+                slider.value = value;
+                if (!Mathf.Approximately(previous, slider.value))
+                    NotifyPropertyChanged(valueProperty);
+            }
         }
 
         /// <summary>
         /// Minimum value.
         /// </summary>
+        [CreateProperty]
         public float lowValue
         {
             get { return slider.lowValue; }
-            set { slider.lowValue = value; }
+            set
+            {
+                var previous = slider.lowValue;
+                slider.lowValue = value;
+
+                if (!Mathf.Approximately(previous, slider.lowValue))
+                    NotifyPropertyChanged(lowValueProperty);
+            }
         }
 
         /// <summary>
         /// Maximum value.
         /// </summary>
+        [CreateProperty]
         public float highValue
         {
             get { return slider.highValue; }
-            set { slider.highValue = value; }
+            set
+            {
+                var previous = slider.highValue;
+                slider.highValue = value;
+
+                if (!Mathf.Approximately(previous, slider.highValue))
+                    NotifyPropertyChanged(highValueProperty);
+            }
         }
 
         /// <summary>
         /// Direction of this scrollbar.
         /// </summary>
+        [CreateProperty]
         public SliderDirection direction
         {
             get { return resolvedStyle.flexDirection == FlexDirection.Row ? SliderDirection.Horizontal : SliderDirection.Vertical; }
             set
             {
+                var previous = slider.direction;
                 slider.direction = value;
                 // We want default behavior for vertical scrollers to be lowValue at the top and highValue at the bottom,
                 // instead of the default Slider behavior.
@@ -139,6 +172,8 @@ public SliderDirection direction
                     AddToClassList(verticalVariantUssClassName);
                     RemoveFromClassList(horizontalVariantUssClassName);
                 }
+                if (previous != slider.direction)
+                    NotifyPropertyChanged(directionProperty);
             }
         }
 
@@ -200,7 +235,7 @@ public Scroller(float lowValue, float highValue, System.Action<float> valueChang
         }
 
         /// <summary>
-        /// Updates the slider element size as a ratio of total range. A value greater than 1 will disable the Scroller.
+        /// Updates the slider element size as a ratio of total range. A value greater than or equal to 1 will disable the Scroller.
         /// </summary>
         /// <param name="factor">Slider size ratio.</param>
         public void Adjust(float factor)
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Slider.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Slider.cs
index ed05ce4404..7bc17786ec 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Slider.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Slider.cs
@@ -8,7 +8,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// A slider containing floating point values.
+    /// A slider containing floating point values. For more information, refer to [[wiki:UIE-uxml-element-slider|UXML element Slider]].
     /// </summary>
     public class Slider : BaseSlider<float>
     {
@@ -20,7 +20,7 @@ public class Slider : BaseSlider<float>
         /// <summary>
         /// Defines <see cref="UxmlTraits"/> for the <see cref="Slider"/>.
         /// </summary>
-        public new class UxmlTraits : BaseSlider<float>.UxmlTraits
+        public new class UxmlTraits : UxmlTraits<UxmlFloatAttributeDescription>
         {
             UxmlFloatAttributeDescription m_LowValue = new UxmlFloatAttributeDescription { name = "low-value" };
             UxmlFloatAttributeDescription m_HighValue = new UxmlFloatAttributeDescription { name = "high-value", defaultValue = kDefaultHighValue };
@@ -66,20 +66,29 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         public new static readonly string inputUssClassName = ussClassName + "__input";
 
         /// <summary>
-        /// Constructor.
+        /// Creates a new instance of a Slider.
         /// </summary>
         public Slider()
             : this((string)null, 0, kDefaultHighValue) {}
 
         /// <summary>
-        /// Constructor.
+        /// Creates a new instance of a Slider.
         /// </summary>
+        /// <param name="start">The minimum value that the slider encodes.</param>
+        /// <param name="end">The maximum value that the slider encodes.</param>
+        /// <param name="direction">The direction of the slider (Horizontal or Vertical).</param>
+        /// <param name="pageSize">A generic page size used to change the value when clicking in the slider.</param>
         public Slider(float start, float end, SliderDirection direction = SliderDirection.Horizontal, float pageSize = kDefaultPageSize)
             : this(null, start, end, direction, pageSize) {}
 
         /// <summary>
-        /// Constructor.
+        /// Creates a new instance of a Slider.
         /// </summary>
+        /// <param name="label">The string representing the label that will appear beside the field.</param>
+        /// <param name="start">The minimum value that the slider encodes.</param>
+        /// <param name="end">The maximum value that the slider encodes.</param>
+        /// <param name="direction">The direction of the slider (Horizontal or Vertical).</param>
+        /// <param name="pageSize">A generic page size used to change the value when clicking in the slider.</param>
         public Slider(string label, float start = 0, float end = kDefaultHighValue, SliderDirection direction = SliderDirection.Horizontal, float pageSize = kDefaultPageSize)
             : base(label, start, end, direction, pageSize)
         {
@@ -123,18 +132,11 @@ internal override float SliderRange()
             return Math.Abs(highValue - lowValue);
         }
 
-        internal override float ParseStringToValue(string stringValue)
+        internal override float ParseStringToValue(string previousValue, string newValue)
         {
-            float result;
-
-            if (float.TryParse(stringValue.Replace(",", "."), NumberStyles.Float, CultureInfo.InvariantCulture, out result))
-            {
-                return result;
-            }
-            else
-            {
-                return 0f;
-            }
+            if (UINumericFieldsUtils.TryConvertStringToFloat(newValue, previousValue, out var value))
+                return value;
+            return 0;
         }
 
         internal override void ComputeValueFromKey(SliderKey sliderKey, bool isShift)
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/SliderInt.cs b/ModuleOverrides/com.unity.ui/Core/Controls/SliderInt.cs
index 248ccce3da..065b92b832 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/SliderInt.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/SliderInt.cs
@@ -8,7 +8,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// A slider containing Integer discrete values.
+    /// A slider containing Integer discrete values. For more information, refer to [[wiki:UIE-uxml-element-sliderInt|UXML element SliderInt]].
     /// </summary>
     public class SliderInt : BaseSlider<int>
     {
@@ -20,7 +20,7 @@ public class SliderInt : BaseSlider<int>
         /// <summary>
         /// Defines <see cref="UxmlTraits"/> for the <see cref="SliderInt"/>.
         /// </summary>
-        public new class UxmlTraits : BaseSlider<int>.UxmlTraits
+        public new class UxmlTraits : UxmlTraits<UxmlIntAttributeDescription>
         {
             UxmlIntAttributeDescription m_LowValue = new UxmlIntAttributeDescription { name = "low-value" };
             UxmlIntAttributeDescription m_HighValue = new UxmlIntAttributeDescription { name = "high-value", defaultValue = kDefaultHighValue };
@@ -134,17 +134,11 @@ internal override int SliderRange()
             return Math.Abs(highValue - lowValue);
         }
 
-        internal override int ParseStringToValue(string stringValue)
+        internal override int ParseStringToValue(string previousValue, string newValue)
         {
-            int result;
-            if (int.TryParse(stringValue, out result))
-            {
-                return result;
-            }
-            else
-            {
-                return 0;
-            }
+            if (UINumericFieldsUtils.TryConvertStringToInt(newValue, previousValue, out var value))
+                return value;
+            return 0;
         }
 
         internal override void ComputeValueAndDirectionFromClick(float sliderLength, float dragElementLength, float dragElementPos, float dragElementLastPos)
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/TextValueField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/TextValueField.cs
index bfe387187d..9598559014 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/TextValueField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/TextValueField.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
 using UnityEngine.Scripting.APIUpdating;
 
 namespace UnityEngine.UIElements
@@ -40,7 +41,7 @@ public interface IValueField<T>
         T value { get; set; }
 
         /// <summary>
-        /// Modify the value using a 3D delta and a speed, typically coming from an input device.
+        /// Applies the values of a 3D delta and a speed from an input device.
         /// </summary>
         /// <param name="delta">A vector used to compute the value change.</param>
         /// <param name="speed">A multiplier for the value change.</param>
@@ -62,6 +63,8 @@ public interface IValueField<T>
     [MovedFrom(true, UpgradeConstants.EditorNamespace, UpgradeConstants.EditorAssembly)]
     public abstract class TextValueField<TValueType> : TextInputBaseField<TValueType>, IValueField<TValueType>
     {
+        internal static readonly DataBindingProperty formatStringProperty = nameof(formatString);
+
         // This property to alleviate the fact we have to cast all the time
         TextValueInput textValueInput => (TextValueInput)textInputBase;
 
@@ -72,6 +75,7 @@ public abstract class TextValueField<TValueType> : TextInputBaseField<TValueType
         /// <summary>
         /// The format string for the value.
         /// </summary>
+        [CreateProperty]
         public string formatString
         {
             get => textValueInput.formatString;
@@ -81,6 +85,7 @@ public string formatString
                 {
                     textValueInput.formatString = value;
                     textEdition.UpdateText(ValueToString(rawValue));
+                    NotifyPropertyChanged(formatStringProperty);
                 }
             }
         }
@@ -97,7 +102,7 @@ protected TextValueField(string label, int maxLength, TextValueInput textValueIn
         }
 
         /// <summary>
-        /// Modify the value using a 3D delta and a speed, typically coming from an input device.
+        /// Applies the values of a 3D delta and a speed from an input device.
         /// </summary>
         /// <param name="delta">A vector used to compute the value change.</param>
         /// <param name="speed">A multiplier for the value change.</param>
@@ -124,15 +129,6 @@ public void StopDragging()
             textValueInput.StopDragging();
         }
 
-        /// <summary>
-        /// This is the value of the field.
-        /// </summary>
-        public override TValueType value
-        {
-            get => base.value;
-            set => base.value = value;
-        }
-
         internal override void UpdateValueFromText()
         {
             // Prevent text from changing when the value change
@@ -244,6 +240,20 @@ internal override void OnViewDataReady()
             base.OnViewDataReady();
         }
 
+        internal override void RegisterEditingCallbacks()
+        {
+            base.RegisterEditingCallbacks();
+            labelElement.RegisterCallback<PointerDownEvent>(StartEditing, TrickleDown.TrickleDown);
+            labelElement.RegisterCallback<PointerUpEvent>(EndEditing);
+        }
+
+        internal override void UnregisterEditingCallbacks()
+        {
+            base.UnregisterEditingCallbacks();
+            labelElement.RegisterCallback<PointerDownEvent>(StartEditing, TrickleDown.TrickleDown);
+            labelElement.RegisterCallback<PointerUpEvent>(EndEditing);
+        }
+
         // Implements a control with a value of type T backed by a text.
         /// <summary>
         /// This is the inner representation of the Text input.
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Toggle.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Toggle.cs
index 9cc3ba8a53..91b89e913b 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Toggle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Toggle.cs
@@ -7,7 +7,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// A <see cref="Toggle"/> is a clickable element that represents a boolean value.
+    /// A Toggle is a clickable element that represents a boolean value.
     /// </summary>
     /// <remarks>
     /// A Toggle control consists of a label and an input field. The input field contains a sprite for the control. By default,
@@ -20,6 +20,8 @@ namespace UnityEngine.UIElements
     ///
     /// To bind the Toggle's state to a boolean variable, set the`binding-path` property in a UI Document (.uxml file), or
     /// the C# `bindingPath` to the variable name.
+    /// 
+    /// For more information, refer to [[wiki:UIE-uxml-element-toggle|UXML element Toggle]].
     /// </remarks>
     public class Toggle : BaseBoolField
     {
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/TreeView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/TreeView.cs
index c758a3d26e..fc491d8323 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/TreeView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/TreeView.cs
@@ -3,9 +3,8 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -31,9 +30,16 @@ namespace UnityEngine.UIElements
     ///
     /// The TreeView creates VisualElements for the visible items, and supports binding many more. As the user scrolls, the TreeView
     /// recycles VisualElements and re-binds them to new data items.
+    /// 
+    /// For more information, refer to [[wiki:UIE-uxml-element-TreeView|UXML element TreeView]].
     /// </remarks>
     public class TreeView : BaseTreeView
     {
+        internal static readonly DataBindingProperty makeItemProperty = nameof(makeItem);
+        internal static readonly DataBindingProperty bindItemProperty = nameof(bindItem);
+        internal static readonly DataBindingProperty unbindItemProperty = nameof(unbindItem);
+        internal static readonly DataBindingProperty destroyItemProperty = nameof(destroyItem);
+
         /// <summary>
         /// Instantiates a <see cref="TreeView"/> using data from a UXML file.
         /// </summary>
@@ -65,6 +71,7 @@ public class TreeView : BaseTreeView
         /// If this property and <see cref="bindItem"/> are not set, Unity will either create a PropertyField if bound
         /// to a SerializedProperty, or create an empty label for any other case.
         /// </remarks>
+        [CreateProperty]
         public new Func<VisualElement> makeItem
         {
             get => m_MakeItem;
@@ -74,6 +81,7 @@ public class TreeView : BaseTreeView
                 {
                     m_MakeItem = value;
                     Rebuild();
+                    NotifyPropertyChanged(makeItemProperty);
                 }
             }
         }
@@ -89,7 +97,11 @@ public class TreeView : BaseTreeView
         ///
         /// If this property and <see cref="makeItem"/> are not set, Unity will try to bind to a SerializedProperty if
         /// bound, or simply set text in the created Label.
+        ///
+        /// **Note:**: Setting this callback without also setting <see cref="unbindItem"/> might result in unexpected behavior.
+        /// This is because the default implementation of unbindItem expects the default implementation of bindItem.
         /// </remarks>
+        [CreateProperty]
         public new Action<VisualElement, int> bindItem
         {
             get => m_BindItem;
@@ -99,19 +111,38 @@ public class TreeView : BaseTreeView
                 {
                     m_BindItem = value;
                     RefreshItems();
+                    NotifyPropertyChanged(bindItemProperty);
                 }
-
             }
         }
 
+        private Action<VisualElement, int> m_UnbindItem;
+
         /// <summary>
         /// Callback for unbinding a data item from the VisualElement.
         /// </summary>
         /// <remarks>
         /// The method called by this callback receives the VisualElement to unbind, and the index of the
         /// element to unbind it from.
+        ///
+        /// **Note:**: Setting this callback without also setting <see cref="bindItem"/> might cause unexpected behavior.
+        /// This is because the default implementation of bindItem expects the default implementation of unbindItem.
         /// </remarks>
-        public new Action<VisualElement, int> unbindItem { get; set; }
+        [CreateProperty]
+        public new Action<VisualElement, int> unbindItem
+        {
+            get => m_UnbindItem;
+            set
+            {
+                if (value != m_UnbindItem)
+                {
+                    m_UnbindItem = value;
+                    NotifyPropertyChanged(unbindItemProperty);
+                }
+            }
+        }
+
+        private Action<VisualElement> m_DestroyItem;
 
         /// <summary>
         /// Callback invoked when a <see cref="VisualElement"/> created via <see cref="makeItem"/> is no longer needed and will be destroyed.
@@ -119,7 +150,20 @@ public class TreeView : BaseTreeView
         /// <remarks>
         /// The method called by this callback receives the VisualElement that will be destroyed from the pool.
         /// </remarks>
-        public new Action<VisualElement> destroyItem { get; set; }
+        [CreateProperty]
+        public new Action<VisualElement> destroyItem
+        {
+            get => m_DestroyItem;
+            set
+            {
+                if (value != m_DestroyItem)
+                {
+                    m_DestroyItem = value;
+                    NotifyPropertyChanged(destroyItemProperty);
+                }
+            }
+        }
+
 
         /// <summary>
         /// Sets the root items.
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/TreeViewItem.cs b/ModuleOverrides/com.unity.ui/Core/Controls/TreeViewItem.cs
index 5c0c42d09a..191156e065 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/TreeViewItem.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/TreeViewItem.cs
@@ -86,7 +86,7 @@ public void Move(int id, int newParentId, int childIndex)
             else
             {
                 var rootItemIdsPositionForId = m_RootItemIds.IndexOf(id);
-                if (rootItemIdsPositionForId < childIndex)
+                if (newParentId == ReusableCollectionItem.UndefinedIndex && rootItemIdsPositionForId < childIndex)
                     childIndex--;
 
                 m_RootItemIds.Remove(id);
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitView.cs
index 68b90589a0..5e456fe5f9 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitView.cs
@@ -3,14 +3,19 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System.Collections.Generic;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// A SplitView that contains two resizable panes. One pane is fixed-size while the other pane has flex-grow style set to 1 to take all remaining space. The border between he panes is draggable to resize both panes. Both horizontal and vertical modes are supported. Requires _exactly_ two child elements to operate.
+    /// A SplitView that contains two resizable panes. One pane is fixed-size while the other pane has flex-grow style set to 1 to take all remaining space. The border between the panes is draggable to resize both panes. Both horizontal and vertical modes are supported. Requires exactly two child elements to operate.
     /// </summary>
     public class TwoPaneSplitView : VisualElement
     {
+        internal static readonly DataBindingProperty fixedPaneIndexProperty = nameof(fixedPaneIndex);
+        internal static readonly DataBindingProperty fixedPaneInitialDimensionProperty = nameof(fixedPaneInitialDimension);
+        internal static readonly DataBindingProperty orientationProperty = nameof(orientation);
+
         static readonly string s_UssClassName = "unity-two-pane-split-view";
         static readonly string s_ContentContainerClassName = "unity-two-pane-split-view__content-container";
         static readonly string s_HandleDragLineClassName = "unity-two-pane-split-view__dragline";
@@ -58,7 +63,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         VisualElement m_FixedPane;
         VisualElement m_FlexedPane;
 
-        [SerializeField] float m_FixedPaneDimension = -1;
+        [SerializeField, DontCreateProperty] float m_FixedPaneDimension = -1;
 
         /// <summary>
         /// The child element that is set as the fixed size pane.
@@ -83,6 +88,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// <summary>
         /// 0 for setting first child as the fixed pane, 1 for the second child element.
         /// </summary>
+        [CreateProperty]
         public int fixedPaneIndex
         {
             get => m_FixedPaneIndex;
@@ -92,12 +98,14 @@ public int fixedPaneIndex
                     return;
 
                 Init(value, m_FixedPaneInitialDimension, m_Orientation);
+                NotifyPropertyChanged(fixedPaneIndexProperty);
             }
         }
 
         /// <summary>
         /// The initial width or height for the fixed pane.
         /// </summary>
+        [CreateProperty]
         public float fixedPaneInitialDimension
         {
             get => m_FixedPaneInitialDimension;
@@ -107,12 +115,14 @@ public float fixedPaneInitialDimension
                     return;
 
                 Init(m_FixedPaneIndex, value, m_Orientation);
+                NotifyPropertyChanged(fixedPaneInitialDimensionProperty);
             }
         }
 
         /// <summary>
         /// Orientation of the split view.
         /// </summary>
+        [CreateProperty]
         public TwoPaneSplitViewOrientation orientation
         {
             get => m_Orientation;
@@ -122,6 +132,7 @@ public TwoPaneSplitViewOrientation orientation
                     return;
 
                 Init(m_FixedPaneIndex, m_FixedPaneInitialDimension, value);
+                NotifyPropertyChanged(orientationProperty);
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/UnsignedIntegerField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/UnsignedIntegerField.cs
new file mode 100644
index 0000000000..ab71a056d7
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/UnsignedIntegerField.cs
@@ -0,0 +1,140 @@
+// 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.Globalization;
+
+namespace UnityEngine.UIElements
+{
+    /// <summary>
+    /// Makes a text field for entering an unsigned integer.
+    /// </summary>
+    public class UnsignedIntegerField : TextValueField<uint>
+    {
+        // This property to alleviate the fact we have to cast all the time
+        UnsignedIntegerInput integerInput => (UnsignedIntegerInput)textInputBase;
+
+        /// <summary>
+        /// Instantiates an <see cref="UnsignedIntegerField"/> using the data read from a UXML file.
+        /// </summary>
+        public new class UxmlFactory : UxmlFactory<UnsignedIntegerField, UxmlTraits> {}
+        /// <summary>
+        /// Defines <see cref="UxmlTraits"/> for the <see cref="UnsignedIntegerField"/>.
+        /// </summary>
+        public new class UxmlTraits : TextValueFieldTraits<uint, UxmlUnsignedIntAttributeDescription> {}
+
+        /// <summary>
+        /// Converts the given unsigned integer to a string.
+        /// </summary>
+        /// <param name="v">The unsigned integer to be converted to string.</param>
+        /// <returns>The unsigned integer as string.</returns>
+        protected override string ValueToString(uint v)
+        {
+            return v.ToString(formatString, CultureInfo.InvariantCulture.NumberFormat);
+        }
+
+        /// <summary>
+        /// Converts a string to an unsigned integer.
+        /// </summary>
+        /// <param name="str">The string to convert.</param>
+        /// <returns>The unsigned integer parsed from the string.</returns>
+        protected override uint StringToValue(string str)
+        {
+            var success = UINumericFieldsUtils.TryConvertStringToUInt(str, textInputBase.originalText, out var v);
+            return success ? v : rawValue;
+        }
+
+        /// <summary>
+        /// USS class name of elements of this type.
+        /// </summary>
+        public new static readonly string ussClassName = "unity-unsigned-integer-field";
+        /// <summary>
+        /// USS class name of labels in elements of this type.
+        /// </summary>
+        public 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";
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public UnsignedIntegerField()
+            : this((string)null) {}
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="maxLength">Maximum number of characters the field can take.</param>
+        public UnsignedIntegerField(int maxLength)
+            : this(null, maxLength) {}
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="maxLength">Maximum number of characters the field can take.</param>
+        public UnsignedIntegerField(string label, int maxLength = kMaxLengthNone)
+            : base(label, maxLength, new UnsignedIntegerInput())
+        {
+            AddToClassList(ussClassName);
+            labelElement.AddToClassList(labelUssClassName);
+            visualInput.AddToClassList(inputUssClassName);
+            AddLabelDragger<uint>();
+        }
+
+        internal override bool CanTryParse(string textString) => uint.TryParse(textString, out _);
+
+        /// <summary>
+        /// Applies the values of a 3D delta and a speed from an input device.
+        /// </summary>
+        /// <param name="delta">A vector used to compute the value change.</param>
+        /// <param name="speed">A multiplier for the value change.</param>
+        /// <param name="startValue">The start value.</param>
+        public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, uint startValue)
+        {
+            integerInput.ApplyInputDeviceDelta(delta, speed, startValue);
+        }
+
+        class UnsignedIntegerInput : TextValueInput
+        {
+            UnsignedIntegerField parentUnsignedIntegerField => (UnsignedIntegerField)parent;
+
+            internal UnsignedIntegerInput()
+            {
+                formatString = UINumericFieldsUtils.k_IntFieldFormatString;
+            }
+
+            protected override string allowedCharacters => UINumericFieldsUtils.k_AllowedCharactersForInt;
+
+            public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, uint startValue)
+            {
+                double sensitivity = NumericFieldDraggerUtility.CalculateIntDragSensitivity(startValue);
+                var acceleration = NumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+                long v = StringToValue(text);
+                v += (long)Math.Round(NumericFieldDraggerUtility.NiceDelta(delta, acceleration) * sensitivity);
+
+                if (parentUnsignedIntegerField.isDelayed)
+                {
+                    text = ValueToString(Mathf.ClampToUInt(v));
+                }
+                else
+                {
+                    parentUnsignedIntegerField.value = Mathf.ClampToUInt(v);
+                }
+            }
+
+            protected override string ValueToString(uint v)
+            {
+                return v.ToString(formatString);
+            }
+
+            protected override uint StringToValue(string str)
+            {
+                UINumericFieldsUtils.TryConvertStringToUInt(str, originalText, out var v);
+                return v;
+            }
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/UnsignedLongField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/UnsignedLongField.cs
new file mode 100644
index 0000000000..74448aa186
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/UnsignedLongField.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;
+using System.Globalization;
+
+namespace UnityEngine.UIElements
+{
+    /// <summary>
+    /// Makes a text field for entering unsigned long integers.
+    /// </summary>
+    public class UnsignedLongField : TextValueField<ulong>
+    {
+        // This property to alleviate the fact we have to cast all the time
+        UnsignedLongInput unsignedLongInput => (UnsignedLongInput)textInputBase;
+
+        /// <summary>
+        /// Instantiates a <see cref="UnsignedLongField"/> using the data read from a UXML file.
+        /// </summary>
+        public new class UxmlFactory : UxmlFactory<UnsignedLongField, UxmlTraits> {}
+        /// <summary>
+        /// Defines <see cref="UxmlTraits"/> for the <see cref="UnsignedLongField"/>.
+        /// </summary>
+        public new class UxmlTraits : TextValueFieldTraits<ulong, UxmlUnsignedLongAttributeDescription> {}
+
+        /// <summary>
+        /// Converts the given unsigned long integer to a string.
+        /// </summary>
+        /// <param name="v">The unsigned long integer to be converted to string.</param>
+        /// <returns>The ulong integer as string.</returns>
+        protected override string ValueToString(ulong v)
+        {
+            return v.ToString(formatString, CultureInfo.InvariantCulture.NumberFormat);
+        }
+
+        /// <summary>
+        /// Converts a string to a unsigned long integer.
+        /// </summary>
+        /// <param name="str">The string to convert.</param>
+        /// <returns>The unsigned long integer parsed from the string.</returns>
+        protected override ulong StringToValue(string str)
+        {
+            var success = UINumericFieldsUtils.TryConvertStringToULong(str, textInputBase.originalText, out var v);
+            return success ? v : rawValue;
+        }
+
+        /// <summary>
+        /// USS class name of elements of this type.
+        /// </summary>
+        public new static readonly string ussClassName = "unity-unsigned-long-field";
+        /// <summary>
+        /// USS class name of labels in elements of this type.
+        /// </summary>
+        public 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";
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public UnsignedLongField()
+            : this((string)null) {}
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="maxLength">Maximum number of characters the field can take.</param>
+        public UnsignedLongField(int maxLength)
+            : this(null, maxLength) {}
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="maxLength">Maximum number of characters the field can take.</param>
+        public UnsignedLongField(string label, int maxLength = kMaxLengthNone)
+            : base(label, maxLength, new UnsignedLongInput())
+        {
+            AddToClassList(ussClassName);
+            labelElement.AddToClassList(labelUssClassName);
+            visualInput.AddToClassList(inputUssClassName);
+            AddLabelDragger<ulong>();
+        }
+
+        internal override bool CanTryParse(string textString) => ulong.TryParse(textString, out _);
+
+        /// <summary>
+        /// Applies the values of a 3D delta and a speed from an input device.
+        /// </summary>
+        /// <param name="delta">A vector used to compute the value change.</param>
+        /// <param name="speed">A multiplier for the value change.</param>
+        /// <param name="startValue">The start value.</param>
+        public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, ulong startValue)
+        {
+            unsignedLongInput.ApplyInputDeviceDelta(delta, speed, startValue);
+        }
+
+        class UnsignedLongInput : TextValueInput
+        {
+            UnsignedLongField parentUnsignedLongField => (UnsignedLongField)parent;
+
+            internal UnsignedLongInput()
+            {
+                formatString = UINumericFieldsUtils.k_IntFieldFormatString;
+            }
+
+            protected override string allowedCharacters => UINumericFieldsUtils.k_AllowedCharactersForInt;
+
+            public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, ulong startValue)
+            {
+                double sensitivity = NumericFieldDraggerUtility.CalculateIntDragSensitivity(startValue);
+                var acceleration = NumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+                var v = StringToValue(text);
+                var niceDelta = (long)Math.Round(NumericFieldDraggerUtility.NiceDelta(delta, acceleration) * sensitivity);
+
+                v = ClampToMinMaxULongValue(niceDelta, v);
+
+                if (parentUnsignedLongField.isDelayed)
+                {
+                    text = ValueToString(v);
+                }
+                else
+                {
+                    parentUnsignedLongField.value = v;
+                }
+            }
+
+            private ulong ClampToMinMaxULongValue(long niceDelta, ulong value)
+            {
+                var niceDeltaAbs = (ulong)Math.Abs(niceDelta);
+
+                if (niceDelta > 0)
+                {
+                    if (niceDeltaAbs > ulong.MaxValue - value)
+                    {
+                        return ulong.MaxValue;
+                    }
+
+                    return value + niceDeltaAbs;
+                }
+
+                if (niceDeltaAbs > value)
+                {
+                    return ulong.MinValue;
+                }
+
+                return value - niceDeltaAbs;
+            }
+
+            protected override string ValueToString(ulong v)
+            {
+                return v.ToString(formatString);
+            }
+
+            protected override ulong StringToValue(string str)
+            {
+                UINumericFieldsUtils.TryConvertStringToULong(str, originalText, out var v);
+                return v;
+            }
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Conversions/UIConversion.cs b/ModuleOverrides/com.unity.ui/Core/Conversions/UIConversion.cs
index 7bd1faa454..6169b94d3f 100644
--- a/ModuleOverrides/com.unity.ui/Core/Conversions/UIConversion.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Conversions/UIConversion.cs
@@ -16,6 +16,9 @@ internal static class UIConversion
         static readonly ConversionRegistry s_GlobalUIConverters = ConversionRegistry.Create();
         static readonly ConversionRegistry s_PrimitiveConverters = ConversionRegistry.Create();
 
+        internal static ConversionRegistry globalUIConverters => s_GlobalUIConverters;
+        internal static ConversionRegistry primitiveConverters => s_PrimitiveConverters;
+
         static UIConversion()
         {
             RegisterPrimitivesConverter();
@@ -175,6 +178,7 @@ static void RegisterPrimitivesConverter()
             RegisterDoubleConverters();
             RegisterBooleanConverters();
             RegisterCharConverters();
+            RegisterColorConverters();
         }
 
         static void RegisterInt8Converters()
@@ -467,5 +471,11 @@ static void RegisterCharConverters()
 
             s_PrimitiveConverters.Register(typeof(string), typeof(char), (TypeConverter<string, char>) ((ref string v) => !string.IsNullOrEmpty(v) ? v[0] : '\0'));
         }
+
+        static void RegisterColorConverters()
+        {
+            s_PrimitiveConverters.Register(typeof(Color), typeof(Color32), (TypeConverter<Color, Color32>) ((ref Color v) => v));
+            s_PrimitiveConverters.Register(typeof(Color32), typeof(Color), (TypeConverter<Color32, Color>) ((ref Color32 v) => v));
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/DefaultEventSystem.cs b/ModuleOverrides/com.unity.ui/Core/DefaultEventSystem.cs
index 1e7e2af1b6..9f6a9f068a 100644
--- a/ModuleOverrides/com.unity.ui/Core/DefaultEventSystem.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DefaultEventSystem.cs
@@ -166,6 +166,22 @@ void SendIMGUIEvents()
                     SendFocusBasedEvent(self => UIElementsRuntimeUtility.CreateEvent(self.m_Event), this);
                     ProcessTabEvent(m_Event, m_CurrentModifiers);
                 }
+                else if (m_Event.type == EventType.ScrollWheel)
+                {
+                    // There's different scrollDelta rates between Input Manager, New Input and IMGUI. UITK events use
+                    // IMGUI conventions. Factors can vary between platforms (they come from PlatformDependent code).
+                    // For example, InputEvent::InputEvent (InputEventWin.cpp) and NewInput::OnMessage (NewInput.cpp)
+                    // read data differently from the WM_MOUSEWHEEL message.
+                    // Since we want to rely as little as possible on IMGUI event position for multiple display support,
+                    // we use the mouse position from input and combine it with the scroll delta from IMGUI.
+                    var position = UIElementsRuntimeUtility.MultiDisplayBottomLeftToPanelPosition(input.mousePosition, out var targetDisplay);
+                    var delta = position - m_LastMousePosition;
+                    var scrollDelta = m_Event.delta;
+
+                    SendPositionBasedEvent(position, delta, PointerId.mousePointerId, targetDisplay,
+                        (panelPosition, _, t) => WheelEvent.GetPooled(t.scrollDelta, panelPosition, t.modifiers),
+                        (modifiers: m_CurrentModifiers, scrollDelta));
+                }
                 else if (!m_SendingTouchEvents && !m_SendingPenEvent && m_Event.pointerType != UnityEngine.PointerType.Mouse ||
                          m_Event.type == EventType.MouseEnterWindow || m_Event.type == EventType.MouseLeaveWindow)
                 {
@@ -198,7 +214,6 @@ private void ProcessMouseEvents()
 
             var position = UIElementsRuntimeUtility.MultiDisplayBottomLeftToPanelPosition(input.mousePosition, out var targetDisplay);
             var delta = position - m_LastMousePosition;
-            var scrollDelta = input.mouseScrollDelta;
 
             if (!m_MouseProcessedAtLeastOnce)
             {
@@ -217,13 +232,6 @@ private void ProcessMouseEvents()
                         (panelPosition, panelDelta, self) => PointerMoveEvent.GetPooled(EventType.MouseMove,
                             panelPosition, panelDelta, -1, 0, self.m_CurrentModifiers), this);
                 }
-
-                if (!Mathf.Approximately(scrollDelta.x, 0f) || !Mathf.Approximately(scrollDelta.y, 0f))
-                {
-                    SendPositionBasedEvent(position, delta, PointerId.mousePointerId, targetDisplay,
-                        (panelPosition, _, t) => WheelEvent.GetPooled(panelPosition, -1, 0, t.scrollDelta, t.modifiers),
-                        (modifiers: m_CurrentModifiers, scrollDelta));
-                }
             }
 
             int mouseButtonCount = input.mouseButtonCount;
@@ -231,15 +239,16 @@ private void ProcessMouseEvents()
             {
                 if (input.GetMouseButtonDown(button))
                 {
-                    if (m_LastMousePressButton != button || Time.unscaledTime >= m_NextMousePressTime)
+                    if (m_LastMousePressButton != button || input.unscaledTime >= m_NextMousePressTime)
                     {
                         m_LastMousePressButton = button;
                         m_LastMouseClickCount = 0;
-                        m_NextMousePressTime = Time.unscaledTime + Event.GetDoubleClickTime();
                     }
 
                     var clickCount = ++m_LastMouseClickCount;
 
+                    m_NextMousePressTime = input.unscaledTime + input.doubleClickTime;
+
                     SendPositionBasedEvent(position, delta, PointerId.mousePointerId, targetDisplay,
                         (panelPosition, panelDelta, t) => PointerEventHelper.GetPooled(EventType.MouseDown,
                             panelPosition, panelDelta, t.button, t.clickCount, t.modifiers),
@@ -537,7 +546,7 @@ private Vector2 GetRawMoveVector()
 
         private bool ShouldSendMoveFromInput()
         {
-            float time = Time.unscaledTime;
+            float time = input.unscaledTime;
 
             Vector2 movement = GetRawMoveVector();
             if (Mathf.Approximately(movement.x, 0f) && Mathf.Approximately(movement.y, 0f))
@@ -612,6 +621,8 @@ internal interface IInput
             Vector2 mouseScrollDelta { get; }
             int mouseButtonCount { get; }
             bool anyKey { get; }
+            float unscaledTime { get; } // overriden in unit tests
+            float doubleClickTime { get; }
         }
 
         private class Input : IInput
@@ -632,6 +643,8 @@ private class Input : IInput
             public Vector2 mouseScrollDelta => UnityEngine.Input.mouseScrollDelta;
             public int mouseButtonCount => 3;
             public bool anyKey => UnityEngine.Input.anyKey;
+            public float unscaledTime => Time.unscaledTime;
+            public float doubleClickTime => Event.GetDoubleClickTime() * 0.001f;
         }
 
         private class NoInput : IInput
@@ -652,6 +665,8 @@ public void ClearLastPenContactEvent() { }
             public Vector2 mouseScrollDelta => default;
             public int mouseButtonCount => 0;
             public bool anyKey => false;
+            public float unscaledTime => 0;
+            public float doubleClickTime => Mathf.Infinity;
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/BaseReorderableDragAndDropController.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/BaseReorderableDragAndDropController.cs
index 896465e063..380fb58a77 100644
--- a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/BaseReorderableDragAndDropController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/BaseReorderableDragAndDropController.cs
@@ -11,40 +11,41 @@ internal abstract class BaseReorderableDragAndDropController : ICollectionDragAn
     {
         protected readonly BaseVerticalCollectionView m_View;
 
-        protected List<int> m_SelectedIndices;
+        protected List<int> m_SortedSelectedIds = new ();
 
-        public BaseReorderableDragAndDropController(BaseVerticalCollectionView view)
+        // Sorted by index in the source.
+        public IEnumerable<int> GetSortedSelectedIds() => m_SortedSelectedIds;
+
+        protected BaseReorderableDragAndDropController(BaseVerticalCollectionView view)
         {
             m_View = view;
-            enableReordering = true;
         }
 
-        public bool enableReordering { get; set; }
+        public virtual bool enableReordering { get; set; } = true;
 
-        public virtual bool CanStartDrag(IEnumerable<int> itemIndices)
+        public virtual bool CanStartDrag(IEnumerable<int> itemIds)
         {
             return enableReordering;
         }
 
-        public virtual StartDragArgs SetupDragAndDrop(IEnumerable<int> itemIndices, bool skipText = false)
+        public virtual StartDragArgs SetupDragAndDrop(IEnumerable<int> itemIds, bool skipText = false)
         {
-            m_SelectedIndices ??= new List<int>();
-            m_SelectedIndices.Clear();
+            m_SortedSelectedIds.Clear();
 
             var title = string.Empty;
-            if (itemIndices != null)
+            if (itemIds != null)
             {
-                foreach (var index in itemIndices)
+                foreach (var id in itemIds)
                 {
-                    m_SelectedIndices.Add(index);
+                    m_SortedSelectedIds.Add(id);
 
                     if (skipText)
                         continue;
 
                     if (string.IsNullOrEmpty(title))
                     {
-                        var label = m_View.GetRecycledItemFromIndex(index)?.rootElement.Q<Label>();
-                        title = label != null ? label.text : $"Item {index}";
+                        var label = m_View.GetRecycledItemFromId(id)?.rootElement.Q<Label>();
+                        title = label != null ? label.text : $"Item {id}";
                     }
                     else
                     {
@@ -54,12 +55,18 @@ public virtual StartDragArgs SetupDragAndDrop(IEnumerable<int> itemIndices, bool
                 }
             }
 
-            m_SelectedIndices.Sort();
+            // Sort indices, store ids.
+            m_SortedSelectedIds.Sort(CompareId);
 
-            return new StartDragArgs(title, m_View);
+            return new StartDragArgs(title, DragVisualMode.Move);
         }
 
+        protected virtual int CompareId(int id1, int id2) => id1.CompareTo(id2);
+
         public abstract DragVisualMode HandleDragAndDrop(IListDragAndDropArgs args);
         public abstract void OnDrop(IListDragAndDropArgs args);
+
+        public virtual void DragCleanup() { }
+        public virtual void HandleAutoExpand(ReusableCollectionItem item, Vector2 pointerPosition) { }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/DragAndDropUtility.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/DragAndDropUtility.cs
index 14e734011b..2c9d1ff8f1 100644
--- a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/DragAndDropUtility.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/DragAndDropUtility.cs
@@ -3,71 +3,115 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace UnityEngine.UIElements
 {
     internal static class DragAndDropUtility
     {
-        private static Func<IDragAndDrop> s_MakeClientFunc;
-        private static IDragAndDrop s_DragAndDrop;
+        static Func<IDragAndDrop> s_MakeDragAndDropClientFunc;
+        static IDragAndDrop s_DragAndDropEditor;
+        static IDragAndDrop s_DragAndDropPlayMode;
 
-        public static IDragAndDrop dragAndDrop
+        internal static IDragAndDrop GetDragAndDrop(IPanel panel)
         {
-            get
+            if (panel.contextType == ContextType.Player)
             {
-                if (s_DragAndDrop == null)
-                {
-                    if (s_MakeClientFunc != null)
-                        s_DragAndDrop = s_MakeClientFunc.Invoke();
-                    else
-                        s_DragAndDrop = new DefaultDragAndDropClient();
-                }
-
-                return s_DragAndDrop;
+                return s_DragAndDropPlayMode ??= new DefaultDragAndDropClient();
             }
+
+            return s_DragAndDropEditor ??= s_MakeDragAndDropClientFunc != null ? s_MakeDragAndDropClientFunc.Invoke() : new DefaultDragAndDropClient();
         }
 
         internal static void RegisterMakeClientFunc(Func<IDragAndDrop> makeClient)
         {
-            if (s_MakeClientFunc != null)
-                throw new UnityException($"The MakeClientFunc has already been registered. Registration denied.");
-
-            s_MakeClientFunc = makeClient;
+            s_MakeDragAndDropClientFunc = makeClient;
+            s_DragAndDropEditor = null;
         }
     }
 
-    internal class DefaultDragAndDropClient : IDragAndDrop, IDragAndDropData
+    internal class DefaultDragAndDropClient : DragAndDropData, IDragAndDrop
     {
-        private StartDragArgs m_StartDragArgs;
-        public object userData => m_StartDragArgs?.userData;
-        public IEnumerable<Object> unityObjectReferences => m_StartDragArgs?.unityObjectReferences;
+        public override DragVisualMode visualMode => m_VisualMode;
+        public override object source => GetGenericData(dragSourceKey);
+
+        readonly Hashtable m_GenericData = new();
 
-        public void StartDrag(StartDragArgs args)
+        public override IEnumerable<Object> unityObjectReferences => m_UnityObjectReferences;
+
+        Label m_DraggedInfoLabel;
+        DragVisualMode m_VisualMode;
+        IEnumerable<Object> m_UnityObjectReferences;
+
+        public override object GetGenericData(string key)
         {
-            m_StartDragArgs = args;
+            return m_GenericData.ContainsKey(key) ? m_GenericData[key] : null;
         }
 
-        public void AcceptDrag()
+        public override void SetGenericData(string key, object value)
         {
-            m_StartDragArgs = null;
+            m_GenericData[key] = value;
         }
 
-        public void SetVisualMode(DragVisualMode visualMode)
+        public void StartDrag(StartDragArgs args, Vector3 pointerPosition)
         {
+            if (args.unityObjectReferences != null)
+                m_UnityObjectReferences = args.unityObjectReferences.ToArray();
+
+            m_VisualMode = args.visualMode;
+            foreach (DictionaryEntry entry in args.genericData)
+            {
+                m_GenericData[(string)entry.Key] = entry.Value;
+            }
+
+            if (string.IsNullOrWhiteSpace(args.title))
+                return;
+
+            var sourceElement = source as VisualElement;
+            var root = sourceElement?.panel.visualTree;
+            if (root == null)
+                return;
+
+            m_DraggedInfoLabel ??= new Label
+            {
+                pickingMode = PickingMode.Ignore,
+                style = { position = Position.Absolute },
+            };
+            m_DraggedInfoLabel.text = args.title;
+            m_DraggedInfoLabel.style.top = pointerPosition.y;
+            m_DraggedInfoLabel.style.left = pointerPosition.x;
+            root.Add(m_DraggedInfoLabel);
+        }
+
+        public void UpdateDrag(Vector3 pointerPosition)
+        {
+            if (m_DraggedInfoLabel == null)
+                return;
+
+            m_DraggedInfoLabel.style.top = pointerPosition.y;
+            m_DraggedInfoLabel.style.left = pointerPosition.x;
         }
 
-        public IDragAndDropData data
+        public void AcceptDrag()
         {
-            get { return this; }
+            // Nothing to do here.
         }
 
-        public object GetGenericData(string key)
+        public void SetVisualMode(DragVisualMode mode)
         {
-            if (m_StartDragArgs == null)
-                return null;
+            m_VisualMode = mode;
+        }
 
-            return m_StartDragArgs.genericData.ContainsKey(key) ? m_StartDragArgs.genericData[key] : null;
+        public void DragCleanup()
+        {
+            m_UnityObjectReferences = null;
+            m_GenericData?.Clear();
+            SetVisualMode(DragVisualMode.None);
+            m_DraggedInfoLabel?.RemoveFromHierarchy();
         }
+
+        public DragAndDropData data => this;
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/DragEventsProcessor.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/DragEventsProcessor.cs
index 51eef4615f..0ec975a303 100644
--- a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/DragEventsProcessor.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/DragEventsProcessor.cs
@@ -16,22 +16,20 @@ internal enum DragState
         }
 
         bool m_IsRegistered;
-        internal DragState m_DragState;
-        private Vector3 m_Start;
-        internal readonly VisualElement m_Target;
+        DragState m_DragState;
+        Vector3 m_Start;
+        protected readonly VisualElement m_Target;
 
         // Used in tests
         internal bool isRegistered => m_IsRegistered;
+        internal DragState dragState => m_DragState;
 
-        private const int k_DistanceToActivation = 5;
+        protected virtual bool supportsDragEvents => true;
+        bool useDragEvents => isEditorContext && supportsDragEvents;
 
-        // Need to store the args here for player, since we won't have access to DragAndDropUtility methods.
-        internal DefaultDragAndDropClient dragAndDropClient;
-        internal virtual bool supportsDragEvents => true;
+        protected IDragAndDrop dragAndDrop => DragAndDropUtility.GetDragAndDrop(m_Target.panel);
 
-        internal bool useDragEvents => isEditorContext && supportsDragEvents;
-
-        bool isEditorContext
+        internal virtual bool isEditorContext
         {
             get
             {
@@ -62,7 +60,7 @@ private void RegisterCallbacksFromTarget()
 
             m_IsRegistered = true;
 
-            m_Target.RegisterCallback<PointerDownEvent>(OnPointerDownEvent, TrickleDown.TrickleDown);
+            m_Target.RegisterCallback<PointerDownEvent>(OnPointerDownEvent);
             m_Target.RegisterCallback<PointerUpEvent>(OnPointerUpEvent, TrickleDown.TrickleDown);
             m_Target.RegisterCallback<PointerLeaveEvent>(OnPointerLeaveEvent);
             m_Target.RegisterCallback<PointerMoveEvent>(OnPointerMoveEvent);
@@ -87,7 +85,7 @@ internal void UnregisterCallbacksFromTarget(bool unregisterPanelEvents = false)
         {
             m_IsRegistered = false;
 
-            m_Target.UnregisterCallback<PointerDownEvent>(OnPointerDownEvent, TrickleDown.TrickleDown);
+            m_Target.UnregisterCallback<PointerDownEvent>(OnPointerDownEvent);
             m_Target.UnregisterCallback<PointerUpEvent>(OnPointerUpEvent, TrickleDown.TrickleDown);
             m_Target.UnregisterCallback<PointerLeaveEvent>(OnPointerLeaveEvent);
             m_Target.UnregisterCallback<PointerMoveEvent>(OnPointerMoveEvent);
@@ -108,14 +106,17 @@ internal void UnregisterCallbacksFromTarget(bool unregisterPanelEvents = false)
 
         // Internal for tests.
         protected internal abstract StartDragArgs StartDrag(Vector3 pointerPosition);
-        protected internal abstract DragVisualMode UpdateDrag(Vector3 pointerPosition);
+        protected internal abstract void UpdateDrag(Vector3 pointerPosition);
         protected internal abstract void OnDrop(Vector3 pointerPosition);
 
-        protected abstract void ClearDragAndDropUI();
+        protected abstract void ClearDragAndDropUI(bool dragCancelled);
 
         private void OnPointerDownEvent(PointerDownEvent evt)
         {
-            if (evt.button != (int)MouseButton.LeftMouse)
+            if (evt.button != (int)MouseButton.LeftMouse
+                // UUM-15264: An IMGUIContainer inside the ListView doesn't react to PointerDown properly so we should
+                // conservatively prevent the drag. A real, better fix is available starting from 2023.2.
+                || evt.leafTarget.isIMGUIContainer)
             {
                 m_DragState = DragState.None;
                 return;
@@ -130,38 +131,45 @@ private void OnPointerDownEvent(PointerDownEvent evt)
 
         internal void OnPointerUpEvent(PointerUpEvent evt)
         {
-            if (!useDragEvents)
+            if (!useDragEvents && m_DragState == DragState.Dragging)
             {
-                if (m_DragState == DragState.Dragging)
-                {
-                    m_Target.ReleasePointer(evt.pointerId);
-                    OnDrop(evt.position);
-                    ClearDragAndDropUI();
-                    evt.StopPropagation();
-                }
+                var target = GetDropTarget(evt.position) ?? this;
+                target.UpdateDrag(evt.position);
+                target.OnDrop(evt.position);
+                target.ClearDragAndDropUI(false);
+                evt.StopPropagation();
             }
 
+            m_Target.ReleasePointer(evt.pointerId);
+            ClearDragAndDropUI(m_DragState == DragState.Dragging);
+            dragAndDrop.DragCleanup();
             m_DragState = DragState.None;
         }
 
         private void OnPointerLeaveEvent(PointerLeaveEvent evt)
         {
-            if (evt.target == m_Target)
-                ClearDragAndDropUI();
+            ClearDragAndDropUI(false);
         }
 
         void OnPointerCancelEvent(PointerCancelEvent evt)
         {
             if (!useDragEvents)
-                ClearDragAndDropUI();
+                ClearDragAndDropUI(true);
+
+            m_Target.ReleasePointer(evt.pointerId);
+            ClearDragAndDropUI(m_DragState == DragState.Dragging);
+            dragAndDrop.DragCleanup();
+            m_DragState = DragState.None;
         }
 
         private void OnPointerCapturedOut(PointerCaptureOutEvent evt)
         {
             // Whenever the pointer is captured by another element, like a text input, we should reset the drag state.
             if (!useDragEvents)
-                ClearDragAndDropUI();
+                ClearDragAndDropUI(true);
 
+            ClearDragAndDropUI(m_DragState == DragState.Dragging);
+            dragAndDrop.DragCleanup();
             m_DragState = DragState.None;
         }
 
@@ -170,7 +178,16 @@ private void OnDragExitedEvent(DragExitedEvent evt)
             if (!useDragEvents)
                 return;
 
-            ClearDragAndDropUI();
+            var view = evt.leafTarget as BaseVerticalCollectionView;
+            view?.dragger?.ClearDragAndDropUI(false);
+
+            var target = GetDropTarget(evt.mousePosition);
+            if (target != null && target != view?.dragger)
+            {
+                target.ClearDragAndDropUI(false);
+            }
+
+            evt.StopPropagation();
         }
 
         private void OnDragPerformEvent(DragPerformEvent evt)
@@ -179,10 +196,12 @@ private void OnDragPerformEvent(DragPerformEvent evt)
                 return;
 
             m_DragState = DragState.None;
-            OnDrop(evt.mousePosition);
+            var target = GetDropTarget(evt.mousePosition);
+            target?.OnDrop(evt.mousePosition);
+            target?.ClearDragAndDropUI(false);
 
-            ClearDragAndDropUI();
-            DragAndDropUtility.dragAndDrop.AcceptDrag();
+            m_Target.ReleasePointer(PointerId.mousePointerId);
+            evt.StopPropagation();
         }
 
         private void OnDragUpdate(DragUpdatedEvent evt)
@@ -190,54 +209,83 @@ private void OnDragUpdate(DragUpdatedEvent evt)
             if (!useDragEvents)
                 return;
 
-            var visualMode = UpdateDrag(evt.mousePosition);
-            DragAndDropUtility.dragAndDrop.SetVisualMode(visualMode);
+            var target = GetDropTarget(evt.mousePosition);
+            target?.UpdateDrag(evt.mousePosition);
+            if (target != this)
+            {
+                ClearDragAndDropUI(false);
+            }
+
+            evt.StopPropagation();
         }
 
 
         private void OnPointerMoveEvent(PointerMoveEvent evt)
         {
-            if (useDragEvents)
+            if (evt.isHandledByDraggable)
+                return;
+
+            if (!useDragEvents && m_DragState == DragState.Dragging)
             {
-                if (m_DragState != DragState.CanStartDrag)
-                    return;
+                var target = GetDropTarget(evt.position) ?? this;
+                target.UpdateDrag(evt.position);
+                return;
             }
-            else
-            {
-                if (m_DragState == DragState.Dragging)
-                {
-                    UpdateDrag(evt.position);
-                    return;
-                }
 
-                if (m_DragState != DragState.CanStartDrag)
-                    return;
-            }
+            // Ignore moves if we're not on the target that started drag.
+            if (m_DragState != DragState.CanStartDrag)
+                return;
 
-            if (Mathf.Abs(m_Start.x - evt.position.x) > k_DistanceToActivation ||
-                Mathf.Abs(m_Start.y - evt.position.y) > k_DistanceToActivation)
+            var delta = m_Start - evt.position;
+            if (delta.sqrMagnitude >= ScrollView.ScrollThresholdSquared)
             {
                 var startDragArgs = StartDrag(m_Start);
 
-                if (useDragEvents)
+                if (startDragArgs.visualMode is DragVisualMode.Rejected)
                 {
-                    // Drag can only be started by mouse events or else it will throw an error, so we leave early.
-                    if (Event.current.type != EventType.MouseDown && Event.current.type != EventType.MouseDrag)
-                        return;
+                    m_DragState = DragState.None;
+                    return;
+                }
 
-                    DragAndDropUtility.dragAndDrop.StartDrag(startDragArgs);
+                if (!useDragEvents)
+                {
+                    if (supportsDragEvents)
+                    {
+                        dragAndDrop.StartDrag(startDragArgs, evt.position);
+                    }
                 }
-                else // Force default drag and drop client for runtime panels.
+                // Drag can only be started by mouse events or else it will throw an error, so we leave early.
+                else if (Event.current != null && Event.current.type != EventType.MouseDown && Event.current.type != EventType.MouseDrag)
                 {
-                    m_Target.CapturePointer(evt.pointerId);
-                    evt.StopPropagation();
-
-                    dragAndDropClient = new DefaultDragAndDropClient();
-                    dragAndDropClient.StartDrag(startDragArgs);
+                    return;
+                }
+                else
+                {
+                    dragAndDrop.StartDrag(startDragArgs, evt.position);
                 }
 
                 m_DragState = DragState.Dragging;
+                m_Target.CapturePointer(evt.pointerId);
+                evt.isHandledByDraggable = true;
+                evt.StopPropagation();
             }
         }
+
+        DragEventsProcessor GetDropTarget(Vector2 position)
+        {
+            DragEventsProcessor target = null;
+            if (m_Target.worldBound.Contains(position))
+            {
+                target = this;
+            }
+            else if (supportsDragEvents)
+            {
+                var leafTarget = m_Target.elementPanel.Pick(position);
+                var targetView = leafTarget?.GetFirstOfType<BaseVerticalCollectionView>();
+                target = targetView?.dragger;
+            }
+
+            return target;
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ICollectionDragAndDropController.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ICollectionDragAndDropController.cs
index 81ef022f82..382aff57ba 100644
--- a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ICollectionDragAndDropController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ICollectionDragAndDropController.cs
@@ -6,5 +6,6 @@ namespace UnityEngine.UIElements
 {
     internal interface ICollectionDragAndDropController : IDragAndDropController<IListDragAndDropArgs>, IReorderable
     {
+
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IDragAndDrop.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IDragAndDrop.cs
index b916213952..582adabef2 100644
--- a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IDragAndDrop.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IDragAndDrop.cs
@@ -8,10 +8,12 @@ namespace UnityEngine.UIElements
 {
     internal interface IDragAndDrop
     {
-        void StartDrag(StartDragArgs args);
+        void StartDrag(StartDragArgs args, Vector3 pointerPosition);
+        void UpdateDrag(Vector3 pointerPosition);
         void AcceptDrag();
+        void DragCleanup();
         void SetVisualMode(DragVisualMode visualMode);
-        IDragAndDropData data { get; }
+        DragAndDropData data { get; }
     }
 
     internal interface IDragAndDropData
@@ -20,4 +22,47 @@ internal interface IDragAndDropData
         object userData { get; }
         IEnumerable<Object> unityObjectReferences { get; }
     }
+
+    /// <summary>
+    /// Data stored during drag-and-drop operations, enabling information to be carried throughout the process.
+    /// </summary>
+    internal abstract class DragAndDropData : IDragAndDropData
+    {
+        internal const string dragSourceKey = "__unity-drag-and-drop__source-view";
+
+        /// <summary>
+        /// Gets data associated with the current drag-and-drop operation.
+        /// </summary>
+        /// <param name="key">The key for this entry.</param>
+        /// <returns>The object stored for this key.</returns>
+        public abstract object GetGenericData(string key);
+
+        object IDragAndDropData.userData => GetGenericData(dragSourceKey);
+
+        /// <summary>
+        /// Sets data associated with the current drag-and-drop operation.
+        /// </summary>
+        /// <param name="key">The key for this entry.</param>
+        /// <param name="data">The data to store.</param>
+        public abstract void SetGenericData(string key, object data);
+
+        /// <summary>
+        /// The object that started the drag.
+        /// </summary>
+        /// <remarks>
+        /// For collection views such as <see cref="ListView" />, <see cref="TreeView" />, and others, this refers to
+        /// the corresponding view that started the drag-and-drop.
+        /// </remarks>
+        public abstract object source { get; }
+
+        /// <summary>
+        /// The state of the current drag operation.
+        /// </summary>
+        public abstract DragVisualMode visualMode { get; }
+
+        /// <summary>
+        /// Unity Object references being dragged.
+        /// </summary>
+        public abstract IEnumerable<Object> unityObjectReferences { get; }
+    }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IDragAndDropArgs.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IDragAndDropArgs.cs
new file mode 100644
index 0000000000..6598e74e97
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IDragAndDropArgs.cs
@@ -0,0 +1,45 @@
+// 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 interface IListDragAndDropArgs
+    {
+        object target { get; }
+        int insertAtIndex { get; }
+        int parentId { get; }
+        int childIndex { get; }
+        DragAndDropData dragAndDropData { get; }
+        DragAndDropPosition dragAndDropPosition { get; }
+    }
+
+    internal struct DragAndDropArgs : IListDragAndDropArgs
+    {
+        public object target { get; set; }
+        public int insertAtIndex { get; set; }
+        public int parentId { get; set; }
+        public int childIndex { get; set; }
+        public DragAndDropPosition dragAndDropPosition { get; set;  }
+        public DragAndDropData dragAndDropData { get; set; }
+    }
+
+    /// <summary>
+    /// Position where the drop operation occurs.
+    /// </summary>
+    internal enum DragAndDropPosition
+    {
+        /// <summary>
+        /// Dragging over an item, to add as a child.
+        /// </summary>
+        OverItem,
+        /// <summary>
+        /// Dragging between items, to add as a sibling.
+        /// </summary>
+        BetweenItems,
+        /// <summary>
+        /// Dragging in front or after visible items.
+        /// </summary>
+        OutsideItems
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IDragAndDropController.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IDragAndDropController.cs
index d2dd8f8e33..d97a525270 100644
--- a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IDragAndDropController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IDragAndDropController.cs
@@ -4,51 +4,217 @@
 
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace UnityEngine.UIElements
 {
     internal interface IDragAndDropController<in TArgs>
     {
-        bool CanStartDrag(IEnumerable<int> itemIndices);
-        StartDragArgs SetupDragAndDrop(IEnumerable<int> itemIndices, bool skipText = false);
+        bool CanStartDrag(IEnumerable<int> itemIds);
+        StartDragArgs SetupDragAndDrop(IEnumerable<int> itemIds, bool skipText = false);
         DragVisualMode HandleDragAndDrop(TArgs args);
         void OnDrop(TArgs args);
+
+        void DragCleanup() { }
+        void HandleAutoExpand(ReusableCollectionItem item, Vector2 pointerPosition) { }
+        IEnumerable<int> GetSortedSelectedIds() => Enumerable.Empty<int>();
     }
 
+    /// <summary>
+    /// The status of a drag-and-drop operation.
+    /// </summary>
     internal enum DragVisualMode
     {
+        /// <summary>
+        /// The drag-and-drop is currently unhandled.
+        /// </summary>
         None,
+        /// <summary>
+        /// The drag-and-drop handlers want to copy data.
+        /// </summary>
         Copy,
+        /// <summary>
+        /// The drag-and-drop handlers want to move data.
+        /// </summary>
         Move,
+        /// <summary>
+        /// The drag-and-drop operation is being rejected by the handlers.
+        /// </summary>
         Rejected
     }
 
-    internal class StartDragArgs
+    /// <summary>
+    /// Information about a drag-and-drop operation that is about to start.
+    /// See <see cref="BaseVerticalCollectionView.canStartDrag"/>.
+    /// </summary>
+    internal readonly struct CanStartDragArgs
     {
-        public string title { get; }
-        public object userData { get; }
+        /// <summary>
+        /// The element on which the drag operation is starting.
+        /// </summary>
+        public readonly VisualElement draggedElement;
 
-        private readonly Hashtable m_GenericData = new Hashtable();
+        /// <summary>
+        /// The ID of the dragged element.
+        /// </summary>
+        public readonly int id;
 
-        internal Hashtable genericData => m_GenericData;
-        internal IEnumerable<Object> unityObjectReferences { get; private set; } = null;
+        /// <summary>
+        /// The selected IDs in the source.
+        /// </summary>
+        public readonly IEnumerable<int> selectedIds;
 
-        internal StartDragArgs()
+        internal CanStartDragArgs(VisualElement draggedElement, int id, IEnumerable<int> selectedIds)
         {
-            title = string.Empty;
+            this.draggedElement = draggedElement;
+            this.id = id;
+            this.selectedIds = selectedIds;
         }
+    }
+
+    /// <summary>
+    /// Information about a drag-and-drop operation that just started.
+    /// You can use it to store generic data for the rest of the drag.
+    /// See <see cref="BaseVerticalCollectionView.setupDragAndDrop"/>.
+    /// </summary>
+    internal readonly struct SetupDragAndDropArgs
+    {
+        /// <summary>
+        /// The element on which the drag operation started.
+        /// </summary>
+        public readonly VisualElement draggedElement;
 
-        public StartDragArgs(string title, object userData)
+        /// <summary>
+        /// The selected IDs in the source.
+        /// </summary>
+        public readonly IEnumerable<int> selectedIds;
+
+        /// <summary>
+        /// Provides entry points to initialize data and visual of the new drag-and-drop operation.
+        /// </summary>
+        public readonly StartDragArgs startDragArgs;
+
+        internal SetupDragAndDropArgs(VisualElement draggedElement, IEnumerable<int> selectedIds, StartDragArgs startDragArgs)
+        {
+            this.draggedElement = draggedElement;
+            this.selectedIds = selectedIds;
+            this.startDragArgs = startDragArgs;
+        }
+    }
+
+    /// <summary>
+    /// Information about a drag-and-drop operation in progress.
+    /// See <see cref="BaseVerticalCollectionView.dragAndDropUpdate"/> and <see cref="BaseVerticalCollectionView.handleDrop"/>.
+    /// </summary>
+    internal readonly struct HandleDragAndDropArgs
+    {
+        readonly DragAndDropArgs m_DragAndDropArgs;
+
+        /// <summary>
+        /// The world position of the pointer.
+        /// </summary>
+        public Vector2 position { get; }
+
+        /// <summary>
+        /// The target of the drop. There is only a target when hovering over an item. <see cref="DropPosition.OverItem"/>
+        /// </summary>
+        public object target => m_DragAndDropArgs.target;
+
+        /// <summary>
+        /// The index at which the drop operation wants to happen.
+        /// </summary>
+        public int insertAtIndex => m_DragAndDropArgs.insertAtIndex;
+
+        /// <summary>
+        /// The new parent targeted by the drag-and-drop operation. Used only for trees.
+        /// </summary>
+        /// <remarks>
+        /// Will always be -1 for drag-and-drop operations in list views.
+        /// </remarks>
+        public int parentId => m_DragAndDropArgs.parentId;
+
+        /// <summary>
+        /// The child index under the <see cref="parentId"/> that the drag-and-drop operation targets. Used only for trees.
+        /// </summary>
+        /// <remarks>
+        /// Will always be -1 for drag-and-drop operations in list views.
+        /// </remarks>
+        public int childIndex => m_DragAndDropArgs.childIndex;
+
+        /// <summary>
+        /// The type of drop position.
+        /// </summary>
+        public DragAndDropPosition dropPosition => m_DragAndDropArgs.dragAndDropPosition;
+
+        /// <summary>
+        /// Data stored for the drag-and-drop operation.
+        /// </summary>
+        public DragAndDropData dragAndDropData => m_DragAndDropArgs.dragAndDropData;
+
+        internal HandleDragAndDropArgs(Vector2 position, DragAndDropArgs dragAndDropArgs)
+        {
+            this.position = position;
+            m_DragAndDropArgs = dragAndDropArgs;
+        }
+    }
+
+    /// <summary>
+    /// Provides entry points to initialize the new drag-and-drop operation.
+    /// </summary>
+    internal struct StartDragArgs
+    {
+        /// <summary>
+        /// Initializes a <see cref="StartDragArgs"/>.
+        /// </summary>
+        /// <param name="title">The text to use during the drag.</param>
+        /// <param name="visualMode">The visual mode the drag starts with.</param>
+        public StartDragArgs(string title, DragVisualMode visualMode)
         {
             this.title = title;
-            this.userData = userData;
+            this.visualMode = visualMode;
+            genericData = null;
+            unityObjectReferences = null;
         }
 
+        // This API is used by com.unity.entities, we cannot remove it yet.
+        internal StartDragArgs(string title, object target)
+        {
+            this.title = title;
+            visualMode = DragVisualMode.Move;
+            genericData = null;
+            unityObjectReferences = null;
+            SetGenericData(DragAndDropData.dragSourceKey, target);
+        }
+
+        /// <summary>
+        /// The title displayed near the pointer to identify what is being dragged.
+        /// Should be set during the <see cref="BaseVerticalCollectionView.setupDragAndDrop"/> callback.
+        /// </summary>
+        public string title { get; }
+
+        /// <summary>
+        /// The mode to use for this drag-and-drop operation.
+        /// </summary>
+        public DragVisualMode visualMode { get; }
+
+        internal Hashtable genericData { get; private set; }
+        internal IEnumerable<Object> unityObjectReferences { get; private set; }
+
+        /// <summary>
+        /// Sets data associated with the current drag-and-drop operation.
+        /// </summary>
+        /// <param name="key">The key for this entry.</param>
+        /// <param name="data">The data to store.</param>
         public void SetGenericData(string key, object data)
         {
-            m_GenericData[key] = data;
+            genericData ??= new Hashtable();
+            genericData[key] = data;
         }
 
+        /// <summary>
+        /// Sets Unity Objects associated with the current drag-and-drop operation.
+        /// </summary>
+        /// <param name="references">The Unity Object references.</param>
         public void SetUnityObjectReferences(IEnumerable<Object> references)
         {
             unityObjectReferences = references;
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IListDragAndDropArgs.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IListDragAndDropArgs.cs
deleted file mode 100644
index c631880dc5..0000000000
--- a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/IListDragAndDropArgs.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// 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 interface IListDragAndDropArgs
-    {
-        object target { get; }
-        int insertAtIndex { get; }
-        IDragAndDropData dragAndDropData { get; }
-        DragAndDropPosition dragAndDropPosition { get; }
-    }
-
-    internal struct ListDragAndDropArgs : IListDragAndDropArgs
-    {
-        public object target { get; set; }
-        public int insertAtIndex { get; set; }
-        public DragAndDropPosition dragAndDropPosition { get; set;  }
-        public IDragAndDropData dragAndDropData { get; set; }
-    }
-
-    internal enum DragAndDropPosition
-    {
-        OverItem,
-        BetweenItems,
-        OutsideItems
-    }
-}
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewDragger.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewDragger.cs
index 36f0b9115e..4af6010e34 100644
--- a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewDragger.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewDragger.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace UnityEngine.UIElements
@@ -12,19 +13,23 @@ internal class ListViewDragger : DragEventsProcessor
         internal struct DragPosition : IEquatable<DragPosition>
         {
             public int insertAtIndex;
+            public int parentId;
+            public int childIndex;
             public ReusableCollectionItem recycledItem;
-            public DragAndDropPosition dragAndDropPosition;
+            public DragAndDropPosition dropPosition;
 
             public bool Equals(DragPosition other)
             {
                 return insertAtIndex == other.insertAtIndex
+                    && parentId == other.parentId
+                    && childIndex == other.childIndex
                     && Equals(recycledItem, other.recycledItem)
-                    && dragAndDropPosition == other.dragAndDropPosition;
+                    && dropPosition == other.dropPosition;
             }
 
             public override bool Equals(object obj)
             {
-                return obj is DragPosition && Equals((DragPosition)obj);
+                return obj is DragPosition position && Equals(position);
             }
 
             public override int GetHashCode()
@@ -32,31 +37,32 @@ public override int GetHashCode()
                 unchecked
                 {
                     var hashCode = insertAtIndex;
-                    hashCode = (hashCode * 397) ^ (recycledItem != null ? recycledItem.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ (int)dragAndDropPosition;
+                    hashCode = (hashCode * 397) ^ parentId;
+                    hashCode = (hashCode * 397) ^ childIndex;
+                    hashCode = (hashCode * 397) ^ (recycledItem?.GetHashCode() ?? 0);
+                    hashCode = (hashCode * 397) ^ (int)dropPosition;
                     return hashCode;
                 }
             }
         }
 
-        private DragPosition m_LastDragPosition;
+        DragPosition m_LastDragPosition;
 
-        private VisualElement m_DragHoverBar;
+        VisualElement m_DragHoverBar;
+        VisualElement m_DragHoverItemMarker;
+        VisualElement m_DragHoverSiblingMarker;
 
-        private const int k_AutoScrollAreaSize = 5;
-        private const int k_BetweenElementsAreaSize = 5;
-        private const int k_PanSpeed = 20;
-        private const int k_DragHoverBarHeight = 2;
+        float m_LeftIndentation = -1f;
+        float m_SiblingBottom = -1f;
 
-        protected BaseVerticalCollectionView targetListView
-        {
-            get { return m_Target as BaseVerticalCollectionView; }
-        }
+        const int k_AutoScrollAreaSize = 5;
+        const int k_BetweenElementsAreaSize = 5;
+        const int k_PanSpeed = 20;
+        const int k_DragHoverBarHeight = 2;
 
-        protected ScrollView targetScrollView
-        {
-            get { return targetListView.scrollView; }
-        }
+        protected BaseVerticalCollectionView targetView => m_Target as BaseVerticalCollectionView;
+
+        protected ScrollView targetScrollView => targetView.scrollView;
 
         public ICollectionDragAndDropController dragAndDropController { get; set; }
 
@@ -71,48 +77,84 @@ protected override bool CanStartDrag(Vector3 pointerPosition)
             if (!targetScrollView.contentContainer.worldBound.Contains(pointerPosition))
                 return false;
 
-            if (targetListView.selectedIndices.Any())
-                return dragAndDropController.CanStartDrag(targetListView.selectedIndices);
-
             var recycledItem = GetRecycledItem(pointerPosition);
-            return recycledItem != null && dragAndDropController.CanStartDrag(new[] { recycledItem.index });
+            if (recycledItem != null && targetView.HasCanStartDrag())
+            {
+                var ids = targetView.selectedIds.Any() ? targetView.selectedIds : new[] { recycledItem.id };
+                return targetView.RaiseCanStartDrag(recycledItem, ids);
+            }
+
+            if (targetView.selectedIds.Any())
+            {
+                return dragAndDropController.CanStartDrag(targetView.selectedIds);
+            }
+
+            return recycledItem != null && dragAndDropController.CanStartDrag(new[] { recycledItem.id });
         }
 
         protected internal override StartDragArgs StartDrag(Vector3 pointerPosition)
         {
-            if (targetListView.selectedIndices.Any())
-                return dragAndDropController.SetupDragAndDrop(targetListView.selectedIndices);
-
             var recycledItem = GetRecycledItem(pointerPosition);
-            if (recycledItem == null)
-                return default;
+            IEnumerable<int> ids;
+            if (recycledItem != null)
+            {
+                if (!targetView.selectedIndices.Contains(recycledItem.index))
+                {
+                    targetView.SetSelection(recycledItem.index);
+                }
+
+                ids = targetView.selectedIds;
+            }
+            else
+            {
+                ids = targetView.selectedIds.Any() ? targetView.selectedIds : Enumerable.Empty<int>();
+            }
 
-            return dragAndDropController.SetupDragAndDrop(new[] { recycledItem.index });
+            var startDragArgs = dragAndDropController.SetupDragAndDrop(ids);
+
+            // User defined handling, if any.
+            startDragArgs = targetView.RaiseSetupDragAndDrop(recycledItem, dragAndDropController.GetSortedSelectedIds(), startDragArgs);
+
+            startDragArgs.SetGenericData(DragAndDropData.dragSourceKey, targetView);
+            return startDragArgs;
         }
 
-        protected internal override DragVisualMode UpdateDrag(Vector3 pointerPosition)
+        protected internal override void UpdateDrag(Vector3 pointerPosition)
         {
             var dragPosition = new DragPosition();
             var visualMode = GetVisualMode(pointerPosition, ref dragPosition);
+
             if (visualMode == DragVisualMode.Rejected)
-                ClearDragAndDropUI();
+            {
+                ClearDragAndDropUI(false);
+            }
             else
+            {
+                HandleDragAndScroll(pointerPosition);
+                HandleAutoExpansion(pointerPosition);
                 ApplyDragAndDropUI(dragPosition);
+            }
 
-            return visualMode;
+            dragAndDrop.SetVisualMode(visualMode);
+            dragAndDrop.UpdateDrag(pointerPosition);
         }
 
-        private DragVisualMode GetVisualMode(Vector3 pointerPosition, ref DragPosition dragPosition)
+        DragVisualMode GetVisualMode(Vector3 pointerPosition, ref DragPosition dragPosition)
         {
             if (dragAndDropController == null)
+            {
                 return DragVisualMode.Rejected;
+            }
 
-            HandleDragAndScroll(pointerPosition);
-            if (!TryGetDragPosition(pointerPosition, ref dragPosition))
-                return DragVisualMode.Rejected;
-
+            var foundPosition = TryGetDragPosition(pointerPosition, ref dragPosition);
             var args = MakeDragAndDropArgs(dragPosition);
-            return dragAndDropController.HandleDragAndDrop(args);
+
+            // User defined handling, if any.
+            var mode = targetView.RaiseHandleDragAndDrop(pointerPosition, args);
+            if (mode != DragVisualMode.None)
+                return mode;
+
+            return foundPosition ? dragAndDropController.HandleDragAndDrop(args) : DragVisualMode.Rejected;
         }
 
         protected internal override void OnDrop(Vector3 pointerPosition)
@@ -122,8 +164,28 @@ protected internal override void OnDrop(Vector3 pointerPosition)
                 return;
 
             var args = MakeDragAndDropArgs(dragPosition);
+
+            // User defined drop handling.
+            var mode = targetView.RaiseDrop(pointerPosition, args);
+            if (mode != DragVisualMode.None)
+            {
+                if (mode != DragVisualMode.Rejected)
+                    dragAndDrop.AcceptDrag();
+                else
+                    dragAndDropController.DragCleanup();
+
+                return;
+            }
+
             if (dragAndDropController.HandleDragAndDrop(args) != DragVisualMode.Rejected)
+            {
                 dragAndDropController.OnDrop(args);
+                dragAndDrop.AcceptDrag();
+            }
+            else
+            {
+                dragAndDropController.DragCleanup();
+            }
         }
 
         // Internal for tests.
@@ -139,7 +201,16 @@ internal void HandleDragAndScroll(Vector2 pointerPosition)
             }
         }
 
-        protected void ApplyDragAndDropUI(DragPosition dragPosition)
+        void HandleAutoExpansion(Vector2 pointerPosition)
+        {   
+            var recycledItem = GetRecycledItem(pointerPosition);
+            if (recycledItem == null)
+                return;
+
+            dragAndDropController.HandleAutoExpand(recycledItem, pointerPosition);
+        }
+
+        void ApplyDragAndDropUI(DragPosition dragPosition)
         {
             if (m_LastDragPosition.Equals(dragPosition))
                 return;
@@ -148,149 +219,398 @@ protected void ApplyDragAndDropUI(DragPosition dragPosition)
             {
                 m_DragHoverBar = new VisualElement();
                 m_DragHoverBar.AddToClassList(BaseVerticalCollectionView.dragHoverBarUssClassName);
-                m_DragHoverBar.style.width = targetListView.localBound.width;
+                m_DragHoverBar.style.width = targetView.localBound.width;
                 m_DragHoverBar.style.visibility = Visibility.Hidden;
                 m_DragHoverBar.pickingMode = PickingMode.Ignore;
 
-                targetListView.RegisterCallback<GeometryChangedEvent>(e =>
+                void GeometryChangedCallback(GeometryChangedEvent e)
                 {
-                    m_DragHoverBar.style.width = targetListView.localBound.width;
-                });
+                    m_DragHoverBar.style.width = targetView.localBound.width;
+                }
+
+                targetView.RegisterCallback<GeometryChangedEvent>(GeometryChangedCallback);
                 targetScrollView.contentViewport.Add(m_DragHoverBar);
             }
 
-            ClearDragAndDropUI();
+            if (m_DragHoverItemMarker == null && targetView is BaseTreeView)
+            {
+                m_DragHoverItemMarker = new VisualElement();
+                m_DragHoverItemMarker.AddToClassList(BaseVerticalCollectionView.dragHoverMarkerUssClassName);
+                m_DragHoverItemMarker.style.visibility = Visibility.Hidden;
+                m_DragHoverItemMarker.pickingMode = PickingMode.Ignore;
+                m_DragHoverBar.Add(m_DragHoverItemMarker);
+
+                m_DragHoverSiblingMarker = new VisualElement();
+                m_DragHoverSiblingMarker.AddToClassList(BaseVerticalCollectionView.dragHoverMarkerUssClassName);
+                m_DragHoverSiblingMarker.style.visibility = Visibility.Hidden;
+                m_DragHoverSiblingMarker.pickingMode = PickingMode.Ignore;
+                targetScrollView.contentViewport.Add(m_DragHoverSiblingMarker);
+            }
+
+            ClearDragAndDropUI(false);
             m_LastDragPosition = dragPosition;
-            switch (dragPosition.dragAndDropPosition)
+            switch (dragPosition.dropPosition)
             {
                 case DragAndDropPosition.OverItem:
                     dragPosition.recycledItem.rootElement.AddToClassList(BaseVerticalCollectionView.itemDragHoverUssClassName);
                     break;
                 case DragAndDropPosition.BetweenItems:
                     if (dragPosition.insertAtIndex == 0)
+                    {
                         PlaceHoverBarAt(0);
+                    }
                     else
                     {
-                        var item = targetListView.GetRecycledItemFromIndex(dragPosition.insertAtIndex - 1);
-                        item ??= targetListView.GetRecycledItemFromIndex(dragPosition.insertAtIndex);
-                        PlaceHoverBarAtElement(item.rootElement);
+                        var beforeItem = targetView.GetRecycledItemFromIndex(dragPosition.insertAtIndex - 1);
+                        var afterItem = targetView.GetRecycledItemFromIndex(dragPosition.insertAtIndex);
+                        PlaceHoverBarAtElement(beforeItem ?? afterItem);
                     }
 
                     break;
                 case DragAndDropPosition.OutsideItems:
-                    var recycledItem = targetListView.GetRecycledItemFromIndex(targetListView.itemsSource.Count - 1);
+                    var recycledItem = targetView.GetRecycledItemFromIndex(targetView.itemsSource.Count - 1);
                     if (recycledItem != null)
-                        PlaceHoverBarAtElement(recycledItem.rootElement);
-                    else if (targetListView.sourceIncludesArraySize && targetListView.itemsSource.Count > 0)
-                        PlaceHoverBarAtElement(targetListView.GetRecycledItemFromIndex(0).rootElement);
+                        PlaceHoverBarAtElement(recycledItem);
+                    else if (targetView.sourceIncludesArraySize && targetView.itemsSource.Count > 0)
+                        PlaceHoverBarAtElement(targetView.GetRecycledItemFromIndex(0));
                     else
                         PlaceHoverBarAt(0);
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(dragPosition.dragAndDropPosition),
-                        dragPosition.dragAndDropPosition,
-                        $"Unsupported {nameof(dragPosition.dragAndDropPosition)} value");
+                    throw new ArgumentOutOfRangeException(nameof(dragPosition.dropPosition),
+                        dragPosition.dropPosition,
+                        $"Unsupported {nameof(dragPosition.dropPosition)} value");
+            }
+
+            // For some reason, the move cursor is missing when using visualMode, so we force it in editor.
+            if (dragAndDrop.data.visualMode == DragVisualMode.Move && targetView.elementPanel.contextType == ContextType.Editor)
+            {
+                targetView.elementPanel.cursorManager.SetCursor(new Cursor { defaultCursorId = 8 });
             }
         }
 
         protected virtual bool TryGetDragPosition(Vector2 pointerPosition, ref DragPosition dragPosition)
         {
             var recycledItem = GetRecycledItem(pointerPosition);
-            if (recycledItem != null)
+            if (recycledItem == null)
+            {
+                if (!targetView.worldBound.Contains(pointerPosition))
+                    return false;
+
+                dragPosition.dropPosition = DragAndDropPosition.OutsideItems;
+                if (pointerPosition.y >= targetScrollView.contentContainer.worldBound.yMax)
+                    dragPosition.insertAtIndex = targetView.itemsSource.Count;
+                else
+                    dragPosition.insertAtIndex = 0;
+
+                HandleTreePosition(pointerPosition, ref dragPosition);
+                return true;
+            }
+
+            // Skip array size item
+            if (targetView.sourceIncludesArraySize && recycledItem.index == 0)
+            {
+                dragPosition.insertAtIndex = recycledItem.index + 1;
+                dragPosition.childIndex = 0;
+                dragPosition.dropPosition = DragAndDropPosition.BetweenItems;
+                HandleTreePosition(pointerPosition, ref dragPosition);
+                return true;
+            }
+
+            // Below an item
+            if (recycledItem.rootElement.worldBound.yMax - pointerPosition.y < k_BetweenElementsAreaSize)
+            {
+                dragPosition.insertAtIndex = recycledItem.index + 1;
+                dragPosition.dropPosition = DragAndDropPosition.BetweenItems;
+            }
+            // Upon an item
+            else if (pointerPosition.y - recycledItem.rootElement.worldBound.yMin > k_BetweenElementsAreaSize)
             {
-                // Skip array size item
-                if (targetListView.sourceIncludesArraySize && recycledItem.index == 0)
+                var scrollOffset = targetScrollView.scrollOffset;
+                targetScrollView.ScrollTo(recycledItem.rootElement);
+                if (scrollOffset != targetScrollView.scrollOffset)
                 {
-                    dragPosition.insertAtIndex = recycledItem.index + 1;
-                    dragPosition.dragAndDropPosition = DragAndDropPosition.BetweenItems;
-                    return true;
+                    return TryGetDragPosition(pointerPosition, ref dragPosition);
                 }
 
-                //Below an item
-                if (recycledItem.rootElement.worldBound.yMax - pointerPosition.y < k_BetweenElementsAreaSize)
+                dragPosition.recycledItem = recycledItem;
+                dragPosition.insertAtIndex = recycledItem.index;
+                dragPosition.dropPosition = DragAndDropPosition.OverItem;
+            }
+            // Above an item
+            else
+            {
+                dragPosition.insertAtIndex = recycledItem.index;
+                dragPosition.dropPosition = DragAndDropPosition.BetweenItems;
+            }
+
+            HandleTreePosition(pointerPosition, ref dragPosition);
+            return true;
+        }
+
+        void HandleTreePosition(Vector2 pointerPosition, ref DragPosition dragPosition)
+        {
+            // Reset values.
+            dragPosition.parentId = -1;
+            dragPosition.childIndex = -1;
+            m_LeftIndentation = -1f;
+            m_SiblingBottom = -1f;
+
+            if (targetView is not BaseTreeView treeView)
+                return;
+
+            if (dragPosition.insertAtIndex < 0)
+                return; // Already handled.
+
+            // Insert inside an item, as the last child.
+            var treeController = treeView.viewController;
+            if (dragPosition.dropPosition == DragAndDropPosition.OverItem)
+            {
+                dragPosition.parentId = treeController.GetIdForIndex(dragPosition.insertAtIndex);
+                dragPosition.childIndex = -1;
+                return;
+            }
+
+            // Above first row.
+            if (dragPosition.insertAtIndex <= 0)
+            {
+                dragPosition.childIndex = 0;
+                return;
+            }
+
+            HandleSiblingInsertionAtAvailableDepthsAndChangeTargetIfNeeded(ref dragPosition, pointerPosition);
+        }
+
+        void HandleSiblingInsertionAtAvailableDepthsAndChangeTargetIfNeeded(ref DragPosition dragPosition, Vector2 pointerPosition)
+        {
+            if (targetView is not BaseTreeView treeView)
+                return;
+
+            var treeController = treeView.viewController;
+            var targetIndex = dragPosition.insertAtIndex;
+            var initialTargetId = treeController.GetIdForIndex(targetIndex);
+            // var targetId = initialTargetId;
+
+            GetPreviousAndNextItemsIgnoringDraggedItems(dragPosition.insertAtIndex, out var previousItemId, out var nextItemId);
+
+            if (previousItemId == TreeItem.invalidId)
+                return; // Above first row so keep targetItem
+
+            var hoveringBetweenExpandedParentAndFirstChild = treeController.HasChildren(previousItemId) && treeView.IsExpanded(previousItemId);
+            var previousItemDepth = treeController.GetIndentationDepth(previousItemId);
+            var nextItemDepth = treeController.GetIndentationDepth(nextItemId);
+            var minDepth = nextItemId != TreeItem.invalidId ? nextItemDepth : 0;
+            var maxDepth = treeController.GetIndentationDepth(previousItemId) + (hoveringBetweenExpandedParentAndFirstChild ? 1 : 0);
+
+            // Change target item.
+            var targetId = previousItemId;
+
+            // Get the indent width
+            var toggleWidth = 15f;
+            var indentWidth = 15f;
+            if (previousItemDepth > 0)
+            {
+                var rootElement = treeView.GetRootElementForId(previousItemId);
+                var indentElement = rootElement.Q(BaseTreeView.itemIndentUssClassName);
+                var toggle = rootElement.Q(BaseTreeView.itemToggleUssClassName);
+                toggleWidth = toggle.layout.width;
+                indentWidth = indentElement.layout.width / previousItemDepth;
+            }
+            else
+            {
+                var initialItemDepth = treeView.viewController.GetIndentationDepth(initialTargetId);
+                if (initialItemDepth > 0)
                 {
-                    dragPosition.insertAtIndex = recycledItem.index + 1;
-                    dragPosition.dragAndDropPosition = DragAndDropPosition.BetweenItems;
-                    return true;
+                    var rootElement = treeView.GetRootElementForId(initialTargetId);
+                    var indentElement = rootElement.Q(BaseTreeView.itemIndentUssClassName);
+                    var toggle = rootElement.Q(BaseTreeView.itemToggleUssClassName);
+                    toggleWidth = toggle.layout.width;
+                    indentWidth = indentElement.layout.width / initialItemDepth;
                 }
+            }
+
+            if (maxDepth <= minDepth)
+            {
+                m_LeftIndentation = toggleWidth + indentWidth * minDepth;
+                if (hoveringBetweenExpandedParentAndFirstChild)
+                {
+                    dragPosition.parentId = previousItemId;
+                    dragPosition.childIndex = 0;
+                }
+                else
+                {
+                    dragPosition.parentId = treeController.GetParentId(previousItemId);
+                    dragPosition.childIndex = treeController.GetChildIndexForId(nextItemId);
+                }
+                return; // The nextItem is a descendant of previous item so keep targetItem
+            }
 
-                //Upon an item
-                if (pointerPosition.y - recycledItem.rootElement.worldBound.yMin > k_BetweenElementsAreaSize)
+            var localMousePosition = treeView.scrollView.contentContainer.WorldToLocal(pointerPosition);
+            var cursorDepth = Mathf.FloorToInt((localMousePosition.x - toggleWidth) / indentWidth);
+            if (cursorDepth >= maxDepth)
+            {
+                m_LeftIndentation = toggleWidth + indentWidth * maxDepth;
+                if (hoveringBetweenExpandedParentAndFirstChild)
                 {
-                    var scrollOffset = targetScrollView.scrollOffset;
-                    targetScrollView.ScrollTo(recycledItem.rootElement);
-                    if (scrollOffset != targetScrollView.scrollOffset)
+                    dragPosition.parentId = previousItemId;
+                    dragPosition.childIndex = 0;
+                }
+                else
+                {
+                    dragPosition.parentId = treeController.GetParentId(previousItemId);
+                    dragPosition.childIndex = treeController.GetChildIndexForId(previousItemId) + 1;
+                }
+                return; // No need to change targetItem if same or higher depth
+            }
+
+            // Search through parents for a new target that matches the cursor
+            var targetDepth = treeController.GetIndentationDepth(targetId);
+            while (targetDepth > minDepth)
+            {
+                if (targetDepth == cursorDepth)
+                    break;
+
+                targetId = treeController.GetParentId(targetId);
+                targetDepth--;
+            }
+
+            var didChangeTargetToAncestor = targetId != initialTargetId;
+            if (didChangeTargetToAncestor)
+            {
+                var siblingRoot = treeView.GetRootElementForId(targetId);
+                if (siblingRoot != null)
+                {
+                    var contentViewport = targetScrollView.contentViewport;
+                    var elementBounds = contentViewport.WorldToLocal(siblingRoot.worldBound);
+                    if (contentViewport.localBound.yMin < elementBounds.yMax && elementBounds.yMax < contentViewport.localBound.yMax)
                     {
-                        return TryGetDragPosition(pointerPosition, ref dragPosition);
+                        m_SiblingBottom = elementBounds.yMax;
                     }
+                }
+            }
 
-                    dragPosition.recycledItem = recycledItem;
-                    dragPosition.insertAtIndex = recycledItem.index;
-                    dragPosition.dragAndDropPosition = DragAndDropPosition.OverItem;
-                    return true;
+            // Change to new target item
+            dragPosition.parentId = treeController.GetParentId(targetId);
+            dragPosition.childIndex = treeController.GetChildIndexForId(targetId) + 1;
+            m_LeftIndentation = toggleWidth + indentWidth * targetDepth;
+        }
+
+        void GetPreviousAndNextItemsIgnoringDraggedItems(int insertAtIndex, out int previousItemId, out int nextItemId)
+        {
+            previousItemId = nextItemId = -1;
+            var previousItemIndex = insertAtIndex - 1;
+            var nextItemIndex = insertAtIndex;
+
+            while (previousItemIndex >= 0)
+            {
+                var id = targetView.viewController.GetIdForIndex(previousItemIndex);
+                if (!dragAndDropController.GetSortedSelectedIds().Contains(id))
+                {
+                    previousItemId = id;
+                    break;
                 }
 
-                dragPosition.insertAtIndex = recycledItem.index;
-                dragPosition.dragAndDropPosition = DragAndDropPosition.BetweenItems;
-                return true;
+                previousItemIndex--;
             }
 
-            if (!targetListView.worldBound.Contains(pointerPosition))
-                return false;
-
-            dragPosition.dragAndDropPosition = DragAndDropPosition.OutsideItems;
-            if (pointerPosition.y >= targetScrollView.contentContainer.worldBound.yMax)
-                dragPosition.insertAtIndex = targetListView.itemsSource.Count;
-            else
-                dragPosition.insertAtIndex = 0;
+            while (nextItemIndex < targetView.itemsSource.Count)
+            {
+                var id = targetView.viewController.GetIdForIndex(nextItemIndex);
+                if (!dragAndDropController.GetSortedSelectedIds().Contains(id))
+                {
+                    nextItemId = id;
+                    break;
+                }
 
-            return true;
+                nextItemIndex++;
+            }
         }
 
-        private ListDragAndDropArgs MakeDragAndDropArgs(DragPosition dragPosition)
+        protected DragAndDropArgs MakeDragAndDropArgs(DragPosition dragPosition)
         {
             object target = null;
             var recycledItem = dragPosition.recycledItem;
             if (recycledItem != null)
-                target = targetListView.viewController.GetItemForIndex(recycledItem.index);
+                target = targetView.viewController.GetItemForIndex(recycledItem.index);
 
-            return new ListDragAndDropArgs
+            return new DragAndDropArgs
             {
                 target = target,
                 insertAtIndex = dragPosition.insertAtIndex,
-                dragAndDropPosition = dragPosition.dragAndDropPosition,
-                dragAndDropData = useDragEvents ? DragAndDropUtility.dragAndDrop.data : dragAndDropClient.data,
+                parentId = dragPosition.parentId,
+                childIndex = dragPosition.childIndex,
+                dragAndDropPosition = dragPosition.dropPosition,
+                dragAndDropData = DragAndDropUtility.GetDragAndDrop(m_Target.panel).data,
             };
         }
 
-        private void PlaceHoverBarAtElement(VisualElement element)
+        float GetHoverBarTopPosition(ReusableCollectionItem item)
         {
             var contentViewport = targetScrollView.contentViewport;
-            var elementBounds = contentViewport.WorldToLocal(element.worldBound);
-            PlaceHoverBarAt(Mathf.Min(elementBounds.yMax, contentViewport.localBound.yMax - k_DragHoverBarHeight));
+            var elementBounds = contentViewport.WorldToLocal(item.rootElement.worldBound);
+            var top = Mathf.Min(elementBounds.yMax, contentViewport.localBound.yMax - k_DragHoverBarHeight);
+            return top;
         }
 
-        private void PlaceHoverBarAt(float top)
+        void PlaceHoverBarAtElement(ReusableCollectionItem item)
+        {
+            PlaceHoverBarAt(GetHoverBarTopPosition(item), m_LeftIndentation, m_SiblingBottom);
+        }
+
+        void PlaceHoverBarAt(float top, float indentationPadding = -1f, float siblingBottom = -1f)
         {
             m_DragHoverBar.style.top = top;
             m_DragHoverBar.style.visibility = Visibility.Visible;
+            if (m_DragHoverItemMarker != null)
+            {
+                m_DragHoverItemMarker.style.visibility = Visibility.Visible;
+            }
+
+            if (indentationPadding >= 0)
+            {
+                m_DragHoverBar.style.marginLeft = indentationPadding;
+                m_DragHoverBar.style.width = targetView.localBound.width - indentationPadding;
+
+                if (siblingBottom > 0 && m_DragHoverSiblingMarker != null)
+                {
+                    m_DragHoverSiblingMarker.style.top = siblingBottom;
+                    m_DragHoverSiblingMarker.style.visibility = Visibility.Visible;
+                    m_DragHoverSiblingMarker.style.marginLeft = indentationPadding;
+                }
+            }
+            else
+            {
+                m_DragHoverBar.style.marginLeft = 0;
+                m_DragHoverBar.style.width = targetView.localBound.width;
+            }
         }
 
-        protected override void ClearDragAndDropUI()
+        protected override void ClearDragAndDropUI(bool dragCancelled)
         {
+            if (dragCancelled)
+            {
+                dragAndDropController.DragCleanup();
+            }
+
+            targetView.elementPanel.cursorManager.ResetCursor();
+
             m_LastDragPosition = new DragPosition();
-            foreach (var item in targetListView.activeItems)
+            foreach (var item in targetView.activeItems)
             {
                 item.rootElement.RemoveFromClassList(BaseVerticalCollectionView.itemDragHoverUssClassName);
             }
 
             if (m_DragHoverBar != null)
                 m_DragHoverBar.style.visibility = Visibility.Hidden;
+            if (m_DragHoverItemMarker != null)
+                m_DragHoverItemMarker.style.visibility = Visibility.Hidden;
+            if (m_DragHoverSiblingMarker != null)
+                m_DragHoverSiblingMarker.style.visibility = Visibility.Hidden;
         }
 
         protected ReusableCollectionItem GetRecycledItem(Vector3 pointerPosition)
         {
-            foreach (var recycledItem in targetListView.activeItems)
+            foreach (var recycledItem in targetView.activeItems)
             {
                 if (recycledItem.rootElement.worldBound.Contains(pointerPosition))
                     return recycledItem;
@@ -302,6 +622,17 @@ protected ReusableCollectionItem GetRecycledItem(Vector3 pointerPosition)
 
     internal static class ListViewDraggerExtension
     {
+        public static ReusableCollectionItem GetRecycledItemFromId(this BaseVerticalCollectionView listView, int id)
+        {
+            foreach (var recycledItem in listView.activeItems)
+            {
+                if (recycledItem.id.Equals(id))
+                    return recycledItem;
+            }
+
+            return null;
+        }
+
         public static ReusableCollectionItem GetRecycledItemFromIndex(this BaseVerticalCollectionView listView, int index)
         {
             foreach (var recycledItem in listView.activeItems)
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewDraggerAnimated.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewDraggerAnimated.cs
index bc66b872f5..f93d4bdfff 100644
--- a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewDraggerAnimated.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewDraggerAnimated.cs
@@ -16,27 +16,33 @@ internal class ListViewDraggerAnimated : ListViewDragger
         Vector3 m_CurrentPointerPosition;
         ReusableCollectionItem m_Item;
         ReusableCollectionItem m_OffsetItem;
-        public bool isDragging => m_Item != null;
+        public bool isDragging { get; private set; }
         public ReusableCollectionItem draggedItem => m_Item;
 
-        internal override bool supportsDragEvents => false;
+        protected override bool supportsDragEvents => false;
 
         public ListViewDraggerAnimated(BaseVerticalCollectionView listView)
             : base(listView) {}
 
         protected internal override StartDragArgs StartDrag(Vector3 pointerPosition)
         {
-            targetListView.ClearSelection();
+            targetView.ClearSelection();
 
             var recycledItem = GetRecycledItem(pointerPosition);
             if (recycledItem == null)
-                return default;
+            {
+                return new StartDragArgs(string.Empty, DragVisualMode.Rejected);
+            }
 
-            targetListView.SetSelection(recycledItem.index);
+            targetView.SetSelection(recycledItem.index);
 
+            isDragging = true;
             m_Item = recycledItem;
+            targetView.virtualizationController.StartDragItem(m_Item);
+
             var y = m_Item.rootElement.layout.y;
             m_SelectionHeight = m_Item.rootElement.layout.height;
+
             m_Item.rootElement.style.position = Position.Absolute;
             m_Item.rootElement.style.height = m_Item.rootElement.layout.height;
             m_Item.rootElement.style.width = m_Item.rootElement.layout.width;
@@ -47,7 +53,7 @@ protected internal override StartDragArgs StartDrag(Vector3 pointerPosition)
             m_CurrentPointerPosition = pointerPosition;
             m_LocalOffsetOnStart = targetScrollView.contentContainer.WorldToLocal(pointerPosition).y - y;
 
-            var item = targetListView.GetRecycledItemFromIndex(m_CurrentIndex + 1);
+            var item = targetView.GetRecycledItemFromIndex(m_CurrentIndex + 1);
             if (item != null)
             {
                 m_OffsetItem = item;
@@ -56,17 +62,17 @@ protected internal override StartDragArgs StartDrag(Vector3 pointerPosition)
                 Animate(m_OffsetItem, m_SelectionHeight);
 
                 m_OffsetItem.rootElement.style.paddingTop = m_SelectionHeight;
-                if (targetListView.virtualizationMethod == CollectionVirtualizationMethod.FixedHeight)
-                    m_OffsetItem.rootElement.style.height = targetListView.fixedItemHeight + m_SelectionHeight;
+                if (targetView.virtualizationMethod == CollectionVirtualizationMethod.FixedHeight)
+                    m_OffsetItem.rootElement.style.height = targetView.fixedItemHeight + m_SelectionHeight;
             }
 
             return dragAndDropController.SetupDragAndDrop(new[] { m_Item.index }, true);
         }
 
-        protected internal override DragVisualMode UpdateDrag(Vector3 pointerPosition)
+        protected internal override void UpdateDrag(Vector3 pointerPosition)
         {
             if (m_Item == null)
-                return DragVisualMode.Rejected;
+                return;
 
             HandleDragAndScroll(pointerPosition);
 
@@ -79,47 +85,50 @@ protected internal override DragVisualMode UpdateDrag(Vector3 pointerPosition)
 
             var y = targetScrollView.contentContainer.resolvedStyle.paddingTop;
             m_CurrentIndex = -1;
-            foreach (var item in targetListView.activeItems)
+            foreach (var item in targetView.activeItems)
             {
-                if (item.rootElement.style.display == DisplayStyle.None)
+                if (item.index < 0 || (item.rootElement.style.display == DisplayStyle.None && !item.isDragGhost))
                     continue;
 
-                var child = item;
-                if (child == m_Item)
+                if (item.index == m_Item.index && item.index < targetView.itemsSource.Count - 1)
                 {
+                    var nextExpectedHeight = targetView.virtualizationController.GetExpectedItemHeight(item.index + 1);
+                    if (itemLayout.y <= y + nextExpectedHeight * 0.5f)
+                    {
+                        m_CurrentIndex = item.index;
+                    }
+
                     continue;
                 }
 
-                var trueHeight = child.rootElement.layout.height - child.rootElement.resolvedStyle.paddingTop;
-
-                var shouldSkip = targetListView.sourceIncludesArraySize && child.index == 0;
-                if (!shouldSkip && m_CurrentIndex == -1 && itemLayout.y <= y + trueHeight * 0.5f)
+                var expectedHeight = targetView.virtualizationController.GetExpectedItemHeight(item.index);
+                var shouldSkip = targetView.sourceIncludesArraySize && item.index == 0;
+                if (!shouldSkip && itemLayout.y <= y + expectedHeight * 0.5f)
                 {
-                    m_CurrentIndex = child.index;
+                    if (m_CurrentIndex == -1)
+                        m_CurrentIndex = item.index;
 
-                    if (m_OffsetItem == child)
+                    if (m_OffsetItem == item)
                         break;
 
                     Animate(m_OffsetItem, 0);
-                    Animate(child, m_SelectionHeight);
-                    m_OffsetItem = child;
+                    Animate(item, m_SelectionHeight);
+                    m_OffsetItem = item;
                     break;
                 }
 
-                y += trueHeight;
+                y += expectedHeight;
             }
 
             if (m_CurrentIndex == -1)
             {
-                m_CurrentIndex = targetListView.itemsSource.Count;
+                m_CurrentIndex = targetView.itemsSource.Count;
                 Animate(m_OffsetItem, 0);
                 m_OffsetItem = null;
             }
 
             m_Item.rootElement.layout = itemLayout;
             m_Item.rootElement.BringToFront();
-
-            return DragVisualMode.Move;
         }
 
         void Animate(ReusableCollectionItem element, float paddingTop)
@@ -136,17 +145,20 @@ void Animate(ReusableCollectionItem element, float paddingTop)
 
             element.animator?.Stop();
             element.animator?.Recycle();
-            var targetStyle = targetListView.virtualizationMethod == CollectionVirtualizationMethod.FixedHeight ? new StyleValues { paddingTop = paddingTop, height = targetListView.ResolveItemHeight() + paddingTop } : new StyleValues { paddingTop = paddingTop };
+            var targetStyle = targetView.virtualizationMethod == CollectionVirtualizationMethod.FixedHeight ? new StyleValues { paddingTop = paddingTop, height = targetView.ResolveItemHeight() + paddingTop } : new StyleValues { paddingTop = paddingTop };
             element.animator = element.rootElement.experimental.animation.Start(targetStyle, 500);
             element.animator.KeepAlive();
         }
 
         protected internal override void OnDrop(Vector3 pointerPosition)
         {
-            if (m_Item != null && targetListView.binding == null)
-            {
-                targetListView.virtualizationController.ReplaceActiveItem(m_Item.index);
-            }
+            if (m_Item == null)
+                return;
+
+            // Stop dragging first, to allow the list to refresh properly dragged items.
+            isDragging = false;
+            m_Item.rootElement.ClearManualLayout();
+            targetView.virtualizationController.EndDrag(m_CurrentIndex);
 
             if (m_OffsetItem != null)
             {
@@ -154,22 +166,26 @@ protected internal override void OnDrop(Vector3 pointerPosition)
                 m_OffsetItem.animator?.Recycle();
                 m_OffsetItem.animator = null;
                 m_OffsetItem.rootElement.style.paddingTop = 0;
-                if (targetListView.virtualizationMethod == CollectionVirtualizationMethod.FixedHeight)
-                    m_OffsetItem.rootElement.style.height = targetListView.ResolveItemHeight();
+                if (targetView.virtualizationMethod == CollectionVirtualizationMethod.FixedHeight)
+                    m_OffsetItem.rootElement.style.height = targetView.ResolveItemHeight();
             }
 
-            base.OnDrop(pointerPosition);
-
-            if (m_Item != null && targetListView.binding != null)
+            var dragPosition = new DragPosition
             {
-                targetListView.virtualizationController.ReplaceActiveItem(m_Item.index);
-            }
+                recycledItem = m_Item,
+                insertAtIndex = m_CurrentIndex,
+                dropPosition = DragAndDropPosition.BetweenItems
+            };
+
+            var args = MakeDragAndDropArgs(dragPosition);
+            dragAndDropController.OnDrop(args);
+            dragAndDrop.AcceptDrag();
 
-            m_OffsetItem = null;
             m_Item = null;
+            m_OffsetItem = null;
         }
 
-        protected override void ClearDragAndDropUI()
+        protected override void ClearDragAndDropUI(bool dragCancelled)
         {
             // Nothing to clear.
         }
@@ -178,7 +194,7 @@ protected override bool TryGetDragPosition(Vector2 pointerPosition, ref DragPosi
         {
             dragPosition.recycledItem = m_Item;
             dragPosition.insertAtIndex = m_CurrentIndex;
-            dragPosition.dragAndDropPosition = DragAndDropPosition.BetweenItems;
+            dragPosition.dropPosition = DragAndDropPosition.BetweenItems;
             return true;
         }
     }
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewReorderableDragAndDropController.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewReorderableDragAndDropController.cs
index 446391bb19..4c3a920a97 100644
--- a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewReorderableDragAndDropController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/ListViewReorderableDragAndDropController.cs
@@ -22,7 +22,9 @@ public override DragVisualMode HandleDragAndDrop(IListDragAndDropArgs args)
             if (args.dragAndDropPosition == DragAndDropPosition.OverItem || !enableReordering)
                 return DragVisualMode.Rejected;
 
-            return args.dragAndDropData.userData == m_ListView ? DragVisualMode.Move : DragVisualMode.Rejected;
+            return args.dragAndDropData.source == m_ListView ?
+                DragVisualMode.Move :
+                DragVisualMode.Rejected;
         }
 
         public override void OnDrop(IListDragAndDropArgs args)
@@ -31,16 +33,17 @@ public override void OnDrop(IListDragAndDropArgs args)
 
             var insertIndexShift = 0;
             var srcIndexShift = 0;
-            for (var i = m_SelectedIndices.Count - 1; i >= 0; --i)
+            for (var i = m_SortedSelectedIds.Count - 1; i >= 0; --i)
             {
-                var index = m_SelectedIndices[i];
+                var id = m_SortedSelectedIds[i];
+                var index = m_View.viewController.GetIndexForId(id);
 
                 if (index < 0)
                     continue;
 
                 var newIndex = insertIndex - insertIndexShift;
 
-                if (index > insertIndex)
+                if (index >= insertIndex)
                 {
                     index += srcIndexShift;
                     srcIndexShift++;
@@ -58,7 +61,7 @@ public override void OnDrop(IListDragAndDropArgs args)
             {
                 var newSelection = new List<int>();
 
-                for (var i = 0; i < m_SelectedIndices.Count; ++i)
+                for (var i = 0; i < m_SortedSelectedIds.Count; ++i)
                 {
                     newSelection.Add(insertIndex - insertIndexShift + i);
                 }
diff --git a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/TreeViewReorderableDragAndDropController.cs b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/TreeViewReorderableDragAndDropController.cs
index 3994a43b35..925b6f6c97 100644
--- a/ModuleOverrides/com.unity.ui/Core/DragAndDrop/TreeViewReorderableDragAndDropController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DragAndDrop/TreeViewReorderableDragAndDropController.cs
@@ -3,18 +3,94 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine.Pool;
 
 namespace UnityEngine.UIElements
 {
     internal class TreeViewReorderableDragAndDropController : BaseReorderableDragAndDropController
     {
+        protected class DropData
+        {
+            public int[] expandedIdsBeforeDrag;
+            public int[] draggedIds;
+            public int lastItemId = -1;
+            public float expandItemBeginTimerMs;
+            public Vector2 expandItemBeginPosition;
+        }
+
+        const long k_ExpandUpdateIntervalMs = 10;
+        const float k_DropExpandTimeoutMs = 700f;
+        const float k_DropDeltaPosition = 100f;
+        const float k_HalfDropBetweenHeight = 4f; // Value taken from TreeViewGUI -> k_HalfDropBetweenHeight.
+
+        protected DropData m_DropData = new ();
         protected readonly BaseTreeView m_TreeView;
 
         public TreeViewReorderableDragAndDropController(BaseTreeView view)
             : base(view)
         {
             m_TreeView = view;
-            enableReordering = true;
+            m_ExpandDropItemCallback = ExpandDropItem;
+        }
+
+        protected override int CompareId(int id1, int id2)
+        {
+            if (id1 == id2)
+                return id1.CompareTo(id2);
+
+            // Find common parent and compare child indices to know which on comes first.
+            var parentId1 = id1;
+            var parentId2 = id2;
+
+            // Get parents of id1.
+            using var pool1 = ListPool<int>.Get(out var parentList1);
+            while (parentId1 != TreeItem.invalidId)
+            {
+                parentList1.Add(parentId1);
+                parentId1 = m_TreeView.viewController.GetParentId(parentId1);
+            }
+
+            // Get parents of id2.
+            using var pool2 = ListPool<int>.Get(out var parentList2);
+            while (parentId2 != TreeItem.invalidId)
+            {
+                parentList2.Add(parentId2);
+                parentId2 = m_TreeView.viewController.GetParentId(parentId2);
+            }
+
+            // Add the root.
+            parentList1.Add(TreeItem.invalidId);
+            parentList2.Add(TreeItem.invalidId);
+
+            // Look for the first common parent.
+            for (var i = 0; i < parentList1.Count; i++)
+            {
+                var parentId = parentList1[i];
+                var index2 = parentList2.IndexOf(parentId);
+                if (index2 >= 0)
+                {
+                    // id1 is the parent of id2. Leave early with the result -1, because id1 < id2.
+                    if (i == 0)
+                        return -1;
+
+                    var previousId1 = i > 0 ? parentList1[i - 1] : id1;
+                    var previousId2 = index2 > 0 ? parentList2[index2 - 1] : id2;
+                    var childIndex1 = m_TreeView.viewController.GetChildIndexForId(previousId1);
+                    var childIndex2 = m_TreeView.viewController.GetChildIndexForId(previousId2);
+                    return childIndex1.CompareTo(childIndex2);
+                }
+            }
+
+            throw new ArgumentOutOfRangeException($"[UI Toolkit] Trying to reorder ids that are not in the same tree.");
+        }
+
+        public override StartDragArgs SetupDragAndDrop(IEnumerable<int> itemIds, bool skipText = false)
+        {
+            var startDragArgs = base.SetupDragAndDrop(itemIds, skipText);
+            m_DropData.draggedIds = GetSortedSelectedIds().ToArray();
+            return startDragArgs;
         }
 
         public override DragVisualMode HandleDragAndDrop(IListDragAndDropArgs args)
@@ -22,42 +98,148 @@ public override DragVisualMode HandleDragAndDrop(IListDragAndDropArgs args)
             if (!enableReordering)
                 return DragVisualMode.Rejected;
 
-            return args.dragAndDropData.userData == m_TreeView ? DragVisualMode.Move : DragVisualMode.Rejected;
+            return args.dragAndDropData.source == m_TreeView ? DragVisualMode.Move : DragVisualMode.Rejected;
         }
 
         public override void OnDrop(IListDragAndDropArgs args)
         {
-            var insertAtId = m_TreeView.GetIdForIndex(args.insertAtIndex);
-            var insertAtParentId = m_TreeView.GetParentIdForIndex(args.insertAtIndex);
-            var insertAtChildIndex = m_TreeView.viewController.GetChildIndexForId(insertAtId);
+            var insertAtParentId = args.parentId;
+            var insertAtChildIndex = args.childIndex;
+            var insertIndexShift = 0;
 
-            if (args.dragAndDropPosition == DragAndDropPosition.OverItem || (insertAtId == -1 && insertAtParentId == -1 && insertAtChildIndex == -1))
+            const int undef = ReusableCollectionItem.UndefinedIndex;
+            var insertLast = args.dragAndDropPosition == DragAndDropPosition.OverItem || (insertAtParentId == undef && insertAtChildIndex == undef);
+            using var _ = ListPool<(int parentId, int childIndex)>.Get(out var previousStates);
+
+            foreach (var id in m_DropData.draggedIds)
             {
-                for (var i = 0; i < m_SelectedIndices.Count; i++)
+                var parentId = m_TreeView.viewController.GetParentId(id);
+                var childIndex = m_TreeView.viewController.GetChildIndexForId(id);
+                previousStates.Add((parentId, childIndex));
+
+                if (insertLast)
                 {
-                    var index = m_SelectedIndices[i];
-                    var id = m_TreeView.GetIdForIndex(index);
+                    m_TreeView.viewController.Move(id, insertAtParentId, -1, false);
+                    continue;
+                }
 
-                    var parentId = insertAtId;
-                    var childIndex = -1;
-                    m_TreeView.viewController.Move(id, parentId, childIndex, false);
+                var newChildIndex = insertAtChildIndex + insertIndexShift;
+
+                if (parentId != insertAtParentId || childIndex >= insertAtChildIndex)
+                {
+                    insertIndexShift++;
                 }
+
+                m_TreeView.viewController.Move(id, insertAtParentId, newChildIndex, false);
             }
-            else
+
+            if (args.dragAndDropPosition == DragAndDropPosition.OverItem)
+            {
+                // Expand parent after insertion.
+                m_TreeView.viewController.ExpandItem(insertAtParentId, false, false);
+            }
+
+            m_ExpandDropItemScheduledItem?.Pause();
+            m_TreeView.viewController.RebuildTree();
+            m_TreeView.RefreshItems();
+
+            for (var i = 0; i < m_DropData.draggedIds.Length; i++)
             {
-                for (var i = m_SelectedIndices.Count - 1; i >= 0; --i)
+                var id = m_DropData.draggedIds[i];
+                var previous = previousStates[i];
+                var newParentId = m_TreeView.viewController.GetParentId(id);
+                var newChildIndex = m_TreeView.viewController.GetChildIndexForId(id);
+                if (previous.parentId == newParentId && previous.childIndex == newChildIndex)
+                    continue;
+
+                m_TreeView.viewController.RaiseItemParentChanged(id, insertAtParentId);
+            }
+        }
+
+        public override void DragCleanup()
+        {
+            if (m_DropData != null)
+            {
+                if (m_DropData.expandedIdsBeforeDrag != null)
                 {
-                    var index = m_SelectedIndices[i];
-                    var id = m_TreeView.GetIdForIndex(index);
+                    RestoreExpanded(new List<int>(m_DropData.expandedIdsBeforeDrag));
+                }
+
+                m_DropData = new DropData();
+            }
+
+            m_ExpandDropItemScheduledItem?.Pause();
+        }
 
-                    var parentId = insertAtParentId;
-                    var childIndex = insertAtChildIndex;
-                    m_TreeView.viewController.Move(id, parentId, childIndex, false);
+        void RestoreExpanded(List<int> ids)
+        {
+            // We assume that we can only have expanded items during dragging
+            foreach (var itemId in m_TreeView.viewController.GetAllItemIds())
+            {
+                if (!ids.Contains(itemId))
+                {
+                    m_TreeView.CollapseItem(itemId);
                 }
             }
+        }
 
-            m_TreeView.viewController.RebuildTree();
-            m_TreeView.RefreshItems();
+        public override void HandleAutoExpand(ReusableCollectionItem item, Vector2 pointerPosition)
+        {
+            var itemId = item.id;
+            var targetItemRect = item.bindableElement.worldBound; // Use bindableElement to directly get the indented rect.
+
+            // Handle auto expansion
+            var indentedContentRect = new Rect(targetItemRect.x, targetItemRect.y + k_HalfDropBetweenHeight, targetItemRect.width, targetItemRect.height - k_HalfDropBetweenHeight * 2);
+            var hoveringOverIndentedContent = indentedContentRect.Contains(pointerPosition);
+            var deltaPosition = m_DropData.expandItemBeginPosition - pointerPosition;
+
+            if (itemId != m_DropData.lastItemId || !hoveringOverIndentedContent || deltaPosition.sqrMagnitude >= k_DropDeltaPosition)
+            {
+                m_DropData.lastItemId = itemId;
+                m_DropData.expandItemBeginTimerMs = Panel.TimeSinceStartupMs();
+                m_DropData.expandItemBeginPosition = pointerPosition;
+                DelayExpandDropItem();
+            }
+        }
+
+        IVisualElementScheduledItem m_ExpandDropItemScheduledItem;
+        Action m_ExpandDropItemCallback;
+
+        void DelayExpandDropItem()
+        {
+            if (m_ExpandDropItemScheduledItem == null)
+            {
+                m_ExpandDropItemScheduledItem = m_TreeView.schedule.Execute(m_ExpandDropItemCallback).Every(k_ExpandUpdateIntervalMs);
+            }
+            else
+            {
+                m_ExpandDropItemScheduledItem.Pause();
+                m_ExpandDropItemScheduledItem.Resume();
+            }
+        }
+
+        void ExpandDropItem()
+        {
+            var expandTimerExpired = Panel.TimeSinceStartupMs() - m_DropData.expandItemBeginTimerMs > k_DropExpandTimeoutMs;
+            var mayExpand = expandTimerExpired;
+            var itemId = m_DropData.lastItemId;
+
+            // Auto open folders we are about to drag into
+            if (m_TreeView.viewController.Exists(itemId) && mayExpand)
+            {
+                var hasChildren = m_TreeView.viewController.HasChildren(itemId);
+                var isExpanded = m_TreeView.IsExpanded(itemId);
+    
+                if (!hasChildren || isExpanded)
+                    return;
+
+                // Store the expanded array prior to drag so we can revert it with a delay later
+                m_DropData.expandedIdsBeforeDrag ??= m_TreeView.expandedItemIds.ToArray();
+                m_DropData.expandItemBeginTimerMs = Panel.TimeSinceStartupMs();
+                m_DropData.lastItemId = 0;
+
+                m_TreeView.ExpandItem(itemId);
+            }
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/CommandEvents.cs b/ModuleOverrides/com.unity.ui/Core/Events/CommandEvents.cs
index 83ed6bd086..a632beb073 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/CommandEvents.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/CommandEvents.cs
@@ -23,7 +23,7 @@ public interface ICommandEvent
     {
         string m_CommandName;
         /// <summary>
-        /// Name of the command.
+        /// The command to validate or execute.
         /// </summary>
         public string commandName
         {
@@ -91,8 +91,11 @@ protected CommandEventBase()
     }
 
     /// <summary>
-    /// The event sent to probe which elements accepts a command.
+    /// This event is sent by the Editor while it determines whether the command will be handled by an element in the panel.
     /// </summary>
+    /// <remarks>
+    /// See also: [[wiki:UIE-Command-Events|Command Events]].
+    /// </remarks>
     public class ValidateCommandEvent : CommandEventBase<ValidateCommandEvent>
     {
         static ValidateCommandEvent()
@@ -102,8 +105,11 @@ static ValidateCommandEvent()
     }
 
     /// <summary>
-    /// The event sent when an element should execute a command.
+    /// This event is sent by the Editor when an element in the panel should execute a command.
     /// </summary>
+    /// <remarks>
+    /// See also: [[wiki:UIE-Command-Events|Command Events]].
+    /// </remarks>
     public class ExecuteCommandEvent : CommandEventBase<ExecuteCommandEvent>
     {
         static ExecuteCommandEvent()
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/EventBase.cs b/ModuleOverrides/com.unity.ui/Core/Events/EventBase.cs
index 5f767a3af6..b2a82d4864 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/EventBase.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/EventBase.cs
@@ -10,7 +10,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// The base class for all UIElements events.
+    /// The base class for all UIElements events.  The class implements IDisposable to ensure proper release of the event from the pool and of any unmanaged resources, when necessary.
     /// </summary>
     public abstract class EventBase : IDisposable
     {
@@ -62,8 +62,11 @@ enum LifeCycleStatus
 
         // Read-only state
         /// <summary>
-        /// The time when the event was created.
+        /// The time when the event was created, in milliseconds.
         /// </summary>
+        /// <remarks>
+        /// This value is relative to the start time of the current application.
+        /// </remarks>
         public long timestamp { get; private set; }
 
         internal ulong eventId { get; private set; }
@@ -289,7 +292,7 @@ public void PreventDefault()
 
         // Propagation state
         /// <summary>
-        /// The current propagation phase.
+        /// The current propagation phase for this event. 
         /// </summary>
         public PropagationPhase propagationPhase { get; internal set; }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebuggerEventRecord.cs b/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebuggerEventRecord.cs
index d67e9559ac..374dc2a2bb 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebuggerEventRecord.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebuggerEventRecord.cs
@@ -132,6 +132,7 @@ void Init(EventBase evt)
             IKeyboardEvent keyboardEvent = evt as IKeyboardEvent;
             if (keyboardEvent != null)
             {
+                modifiers = keyboardEvent.modifiers;
                 character = keyboardEvent.character;
                 keyCode = keyboardEvent.keyCode;
             }
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/EventHandler.cs b/ModuleOverrides/com.unity.ui/Core/Events/EventHandler.cs
index 41e81c624d..a9d86caba6 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/EventHandler.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/EventHandler.cs
@@ -121,7 +121,7 @@ public abstract class CallbackEventHandler : IEventHandler
         /// <summary>
         /// Remove callback from the instance.
         /// </summary>
-        /// <param name="callback">The callback to remove.</param>
+        /// <param name="callback">The callback to remove. If this callback was never registered, nothing happens.</param>
         /// <param name="useTrickleDown">Set this parameter to true to remove the callback from the TrickleDown phase. Set this parameter to false to remove the callback from the BubbleUp phase.</param>
         public void UnregisterCallback<TEventType>(EventCallback<TEventType> callback, TrickleDown useTrickleDown = TrickleDown.NoTrickleDown) where TEventType : EventBase<TEventType>, new()
         {
@@ -136,7 +136,7 @@ public abstract class CallbackEventHandler : IEventHandler
         /// <summary>
         /// Remove callback from the instance.
         /// </summary>
-        /// <param name="callback">The callback to remove.</param>
+        /// <param name="callback">The callback to remove. If this callback was never registered, nothing happens.</param>
         /// <param name="useTrickleDown">Set this parameter to true to remove the callback from the TrickleDown phase. Set this parameter to false to remove the callback from the BubbleUp phase.</param>
         public void UnregisterCallback<TEventType, TUserArgsType>(EventCallback<TEventType, TUserArgsType> callback, TrickleDown useTrickleDown = TrickleDown.NoTrickleDown) where TEventType : EventBase<TEventType>, new()
         {
@@ -230,6 +230,15 @@ internal virtual void ExecuteDefaultActionDisabled(EventBase evt) {}
         internal const string ExecuteDefaultActionName = nameof(ExecuteDefaultAction);
         internal const string ExecuteDefaultActionAtTargetName = nameof(ExecuteDefaultActionAtTarget);
 
+        /// <summary>
+        /// Informs the data binding system that a property of a control has changed.
+        /// </summary>
+        /// <param name="property">The property that has changed.</param>
+        internal void NotifyPropertyChanged(DataBindingProperty property)
+        {
+            // Intentionally left empty. This will be implemented with the data binding feature.
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void ExecuteDefaultActionInternal(EventBase evt) => ExecuteDefaultAction(evt);
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEvents.cs b/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEvents.cs
index 744b8ded61..a391154407 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEvents.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEvents.cs
@@ -336,6 +336,7 @@ internal static class KeyboardEventExtensions
         internal static bool ShouldSendNavigationMoveEvent(this KeyDownEvent e)
         {
             // We must rely on KeyCode.Tab as Shift+Tab on Mac doesn't send the \t character. It sends char(25) instead.
+            // On linux Platform shift+tab event does contain both key code and character=='\t'
             return e.keyCode == KeyCode.Tab && !e.ctrlKey && !e.altKey && !e.commandKey && !e.functionKey;
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/MouseEvents.cs b/ModuleOverrides/com.unity.ui/Core/Events/MouseEvents.cs
index 873167cf31..04080b6677 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/MouseEvents.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/MouseEvents.cs
@@ -658,11 +658,12 @@ static WheelEvent()
             return e;
         }
 
-        internal static WheelEvent GetPooled(Vector3 delta, Vector3 mousePosition)
+        internal static WheelEvent GetPooled(Vector3 delta, Vector3 mousePosition, EventModifiers modifiers = default)
         {
             WheelEvent e = GetPooled();
             e.delta = delta;
             e.mousePosition = mousePosition;
+            e.modifiers = modifiers;
             return e;
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/FocusController.cs b/ModuleOverrides/com.unity.ui/Core/FocusController.cs
index 45b1e5c092..5427ac5ba1 100644
--- a/ModuleOverrides/com.unity.ui/Core/FocusController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/FocusController.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -15,6 +16,12 @@ namespace UnityEngine.UIElements
     /// </remarks>
     public abstract class Focusable : CallbackEventHandler
     {
+        internal static readonly DataBindingProperty focusableProperty = nameof(focusable);
+        internal static readonly DataBindingProperty tabIndexProperty = nameof(tabIndex);
+        internal static readonly DataBindingProperty delegatesFocusProperty = nameof(delegatesFocus);
+        internal static readonly DataBindingProperty canGrabFocusProperty = nameof(canGrabFocus);
+
+
         protected Focusable()
         {
             focusable = true;
@@ -26,27 +33,58 @@ protected Focusable()
         /// </summary>
         public abstract FocusController focusController { get; }
 
+        private bool m_Focusable;
+
         /// <summary>
         /// True if the element can be focused.
         /// </summary>
-        public bool focusable { get; set; }
+        [CreateProperty]
+        public bool focusable
+        {
+            get => m_Focusable;
+            set
+            {
+                if (m_Focusable == value)
+                    return;
+                m_Focusable = value;
+                NotifyPropertyChanged(focusableProperty);
+            }
+        }
+
+        private int m_TabIndex;
 
         // See http://w3c.github.io/html/editing.html#the-tabindex-attribute
         /// <summary>
         /// An integer used to sort focusables in the focus ring. Must be greater than or equal to zero.
         /// </summary>
-        public int tabIndex { get; set; }
+        [CreateProperty]
+        public int tabIndex
+        {
+            get => m_TabIndex;
+            set
+            {
+                if (m_TabIndex == value)
+                    return;
+                m_TabIndex = value;
+                NotifyPropertyChanged(tabIndexProperty);
+            }
+        }
 
         bool m_DelegatesFocus;
+
         /// <summary>
         /// Whether the element should delegate the focus to its children.
         /// </summary>
+        [CreateProperty]
         public bool delegatesFocus
         {
             get { return m_DelegatesFocus; }
             set
             {
+                if (m_DelegatesFocus == value)
+                    return;
                 m_DelegatesFocus = value;
+                NotifyPropertyChanged(delegatesFocusProperty);
             }
         }
 
@@ -70,6 +108,7 @@ internal bool excludeFromFocusRing
         /// <summary>
         /// Return true if the element can be focused.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public virtual bool canGrabFocus => focusable;
 
         /// <summary>
@@ -555,7 +594,7 @@ internal void ReevaluateFocus()
             if (focusedElement is VisualElement currentFocus)
             {
                 // If the currently focused element is not displayed in the hierarchy or not visible, blur it.
-                if (!currentFocus.isHierarchyDisplayed || !currentFocus.visible)
+                if (!currentFocus.areAncestorsAndSelfDisplayed || !currentFocus.visible)
                     currentFocus.Blur();
             }
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/GameObjects/PanelSettings.cs b/ModuleOverrides/com.unity.ui/Core/GameObjects/PanelSettings.cs
index 819e1225cf..751e1d8562 100644
--- a/ModuleOverrides/com.unity.ui/Core/GameObjects/PanelSettings.cs
+++ b/ModuleOverrides/com.unity.ui/Core/GameObjects/PanelSettings.cs
@@ -353,11 +353,10 @@ internal void ApplySortingOrder()
         private int m_TargetDisplay = 0;
 
         /// <summary>
-        /// When the Scene uses more than one panel, this value determines where this panel appears in the sorting
-        /// order relative to other panels.
+        /// Set the display intended for the panel. 
         /// </summary>
         /// <remarks>
-        /// Unity renders panels with a higher sorting order value on top of panels with a lower value.
+        /// This setting is relevant only when no render texture is applied, as the renderTexture takes precedence.
         /// </remarks>
         public int targetDisplay
         {
@@ -438,6 +437,7 @@ public UInt32 vertexBudget
 
         internal static Action<BaseRuntimePanel> CreateRuntimePanelDebug;
         internal static Func<ThemeStyleSheet> GetOrCreateDefaultTheme;
+        internal static Func<int, Vector2> GetGameViewResolution;
         internal static Action<PanelSettings> SetPanelSettingsAssetDirty;
 
         internal static void SetupLiveReloadPanelTrackers(bool isLiveReloadOn)
@@ -735,13 +735,12 @@ internal Rect GetDisplayRect()
                 return new Rect(0, 0, m_TargetTexture.width, m_TargetTexture.height); // TODO: Support sub-rects
             }
 
-            // Overlay.
-            if (targetDisplay > 0 && targetDisplay < Display.displays.Length)
-            {
-                return new Rect(0, 0, Display.displays[targetDisplay].renderingWidth, Display.displays[targetDisplay].renderingHeight);
-            }
+            //The device simulatior is a special game view on display 0, and the screen values are properly populated
+            if( m_TargetDisplay == 0)
+                return new Rect(0,0, Screen.width, Screen.height); 
 
-            return new Rect(0, 0, Screen.width, Screen.height);
+            // In the Unity Editor, Display.displays is not supported; displays.Length always has a value of 1, regardless of how many displays you have connected.
+            return new(Vector2.zero, GetGameViewResolution(m_TargetDisplay));
         }
 
         internal void AttachAndInsertUIDocumentToVisualTree(UIDocument uiDocument)
diff --git a/ModuleOverrides/com.unity.ui/Core/IEnumerableUtils.cs b/ModuleOverrides/com.unity.ui/Core/IEnumerableUtils.cs
new file mode 100644
index 0000000000..1a8a52a0a9
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/IEnumerableUtils.cs
@@ -0,0 +1,26 @@
+// 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 UnityEngine.UIElements
+{
+    internal static class IEnumerableExtensions
+    {
+        internal static bool HasValues(this IEnumerable<string> collection)
+        {
+            if (collection == null)
+            {
+                return false;
+            }
+
+            foreach (var unused in collection)
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/IMGUIContainer.cs b/ModuleOverrides/com.unity.ui/Core/IMGUIContainer.cs
index fc975ba060..afe4ddc17d 100644
--- a/ModuleOverrides/com.unity.ui/Core/IMGUIContainer.cs
+++ b/ModuleOverrides/com.unity.ui/Core/IMGUIContainer.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using Unity.Profiling;
+using Unity.Properties;
 using UnityEngine.UIElements.Experimental;
 
 namespace UnityEngine.UIElements
@@ -14,6 +15,9 @@ namespace UnityEngine.UIElements
     /// </summary>
     public class IMGUIContainer : VisualElement, IDisposable
     {
+        internal static readonly DataBindingProperty cullingEnabledProperty = nameof(cullingEnabled);
+        internal static readonly DataBindingProperty contextTypeProperty = nameof(contextType);
+
         /// <summary>
         /// Instantiates an <see cref="IMGUIContainer"/> using the data read from a UXML file.
         /// </summary>
@@ -92,10 +96,18 @@ internal ObjectGUIState guiState
         /// <summary>
         /// When this property is set to true, <see cref="onGUIHandler"/> is not called when the Element is outside the viewport.
         /// </summary>
+        [CreateProperty]
         public bool cullingEnabled
         {
             get { return m_CullingEnabled; }
-            set { m_CullingEnabled = value; IncrementVersion(VersionChangeType.Repaint); }
+            set
+            {
+                if (m_CullingEnabled == value)
+                    return;
+                m_CullingEnabled = value;
+                IncrementVersion(VersionChangeType.Repaint);
+                NotifyPropertyChanged(cullingEnabledProperty);
+            }
         }
 
         private bool m_RefreshCachedLayout = true;
@@ -134,10 +146,23 @@ private float layoutMeasuredHeight
             }
         }
 
+        private ContextType m_ContextType;
+
         /// <summary>
-        /// ContextType of this IMGUIContrainer. Currently only supports ContextType.Editor.
+        /// ContextType of this IMGUIContainer. Currently only supports ContextType.Editor.
         /// </summary>
-        public ContextType contextType { get; set; }
+        [CreateProperty]
+        public ContextType contextType
+        {
+            get => m_ContextType;
+            set
+            {
+                if (m_ContextType == value)
+                    return;
+                m_ContextType = value;
+                NotifyPropertyChanged(contextTypeProperty);
+            }
+        }
 
         // The following 2 flags indicate the following :
         // 1) lostFocus : a blur event occurred and we need to make sure the actual keyboard focus from IMGUI is really un-focused
diff --git a/ModuleOverrides/com.unity.ui/Core/ImmediateModeElement.cs b/ModuleOverrides/com.unity.ui/Core/ImmediateModeElement.cs
index 1cbe487733..3694179a6f 100644
--- a/ModuleOverrides/com.unity.ui/Core/ImmediateModeElement.cs
+++ b/ModuleOverrides/com.unity.ui/Core/ImmediateModeElement.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using Unity.Profiling;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -16,6 +17,8 @@ namespace UnityEngine.UIElements
     /// </remarks>
     public abstract class ImmediateModeElement : VisualElement
     {
+        internal static readonly DataBindingProperty cullingEnabledProperty = nameof(cullingEnabled);
+
         static readonly Dictionary<Type, ProfilerMarker> s_Markers = new Dictionary<Type, ProfilerMarker>();
         readonly ProfilerMarker m_ImmediateRepaintMarker;
 
@@ -24,10 +27,18 @@ public abstract class ImmediateModeElement : VisualElement
         /// <summary>
         /// When this property is set to true, the Element does not repaint itself when it is outside the viewport.
         /// </summary>
+        [CreateProperty]
         public bool cullingEnabled
         {
             get { return m_CullingEnabled; }
-            set { m_CullingEnabled = value; IncrementVersion(VersionChangeType.Repaint); }
+            set
+            {
+                if (m_CullingEnabled == value)
+                    return;
+                m_CullingEnabled = value;
+                IncrementVersion(VersionChangeType.Repaint);
+                NotifyPropertyChanged(cullingEnabledProperty);
+            }
         }
 
         /// <summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/KeyboardNavigationManipulator.cs b/ModuleOverrides/com.unity.ui/Core/KeyboardNavigationManipulator.cs
index de66007ae7..d33c38bac8 100644
--- a/ModuleOverrides/com.unity.ui/Core/KeyboardNavigationManipulator.cs
+++ b/ModuleOverrides/com.unity.ui/Core/KeyboardNavigationManipulator.cs
@@ -31,19 +31,27 @@ public enum KeyboardNavigationOperation
         /// </summary>
         Submit,
         /// <summary>
-        /// Selects the previous item.
+        /// Moves up to the previous item.
         /// </summary>
         Previous,
         /// <summary>
-        /// Selects the next item.
+        /// Moves down to the next item.
         /// </summary>
         Next,
         /// <summary>
-        /// Moves the selection up one page (in a list which has scrollable area).
+        /// Moves to the right.
+        /// </summary>
+        MoveRight,
+        /// <summary>
+        /// Moves to the left.
+        /// </summary>
+        MoveLeft,
+        /// <summary>
+        /// Moves the selection up one page (in a list that has a scrollable area).
         /// </summary>
         PageUp,
         /// <summary>
-        /// Moves the selection down one page (in a list which has scrollable area).
+        /// Moves the selection down one page (in a list that has a scrollable area).
         /// </summary>
         PageDown,
         /// <summary>
@@ -102,6 +110,14 @@ KeyboardNavigationOperation GetOperation()
                     case KeyCode.End: return KeyboardNavigationOperation.End;
                     case KeyCode.PageUp: return KeyboardNavigationOperation.PageUp;
                     case KeyCode.PageDown: return KeyboardNavigationOperation.PageDown;
+                    // Workaround for navigation with arrow keys. It will trigger the sound of an incorrect key being pressed.
+                    // Since we use navigation events, the input system should already prevent the sound. See case UUM-26264.
+                    case KeyCode.DownArrow:
+                    case KeyCode.UpArrow:
+                    case KeyCode.LeftArrow:
+                    case KeyCode.RightArrow:
+                        evt.StopPropagation();
+                        break;
                 }
                 return KeyboardNavigationOperation.None;
             }
@@ -133,6 +149,12 @@ void OnNavigationMove(NavigationMoveEvent evt)
                 case NavigationMoveEvent.Direction.Down:
                     Invoke(KeyboardNavigationOperation.Next, evt);
                     break;
+                case NavigationMoveEvent.Direction.Left:
+                    Invoke(KeyboardNavigationOperation.MoveLeft, evt);
+                    break;
+                case NavigationMoveEvent.Direction.Right:
+                    Invoke(KeyboardNavigationOperation.MoveRight, evt);
+                    break;
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/LayoutConfig.cs b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutConfig.cs
new file mode 100644
index 0000000000..b64a062da2
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutConfig.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.Runtime.InteropServices;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+readonly struct LayoutConfig
+{
+    public static LayoutConfig Undefined => new LayoutConfig(default, LayoutHandle.Undefined);
+
+    readonly LayoutDataAccess m_Access;
+    readonly LayoutHandle m_Handle;
+
+    internal LayoutConfig(LayoutDataAccess access, LayoutHandle handle)
+    {
+        m_Access = access;
+        m_Handle = handle;
+    }
+
+    /// <summary>
+    /// Returns <see langword="true"/> if this is an invalid/undefined node.
+    /// </summary>
+    public bool IsUndefined => m_Handle.Equals(LayoutHandle.Undefined);
+
+    /// <summary>
+    /// Returns the handle for this node.
+    /// </summary>
+    public LayoutHandle Handle => m_Handle;
+
+    /// <summary>
+    /// Gets or sets if configured nodes should use web default settings.
+    /// </summary>
+    public ref bool UseWebDefaults => ref m_Access.GetConfigData(m_Handle).UseWebDefaults;
+
+    /// <summary>
+    /// Gets or sets if configured nodes should legacy stretching behavior.
+    /// </summary>
+    public ref bool UseLegacyStretchBehaviour => ref m_Access.GetConfigData(m_Handle).UseLegacyStretchBehaviour;
+
+    /// <summary>
+    /// Gets or sets the shared point scale factor for configured nodes.
+    /// </summary>
+    public ref float PointScaleFactor => ref m_Access.GetConfigData(m_Handle).PointScaleFactor;
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/LayoutHandle.cs b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutHandle.cs
new file mode 100644
index 0000000000..0e1e7d85b9
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutHandle.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 System.Runtime.InteropServices;
+
+namespace UnityEngine.UIElements.Layout;
+
+/// <summary>
+/// A <see cref="LayoutHandle"/> represents a reference to unmanaged memory.
+///
+/// * The index specifies the data index in the <see cref="LayoutDataStore"/>.
+/// * The version is used for tracking lifecycle and re-using indices.
+/// </summary>
+[StructLayout(LayoutKind.Sequential)]
+readonly struct LayoutHandle
+{
+    public static LayoutHandle Undefined => new LayoutHandle();
+
+    public readonly int Index;
+    public readonly int Version;
+
+    internal LayoutHandle(int index, int version)
+    {
+        Index = index;
+        Version = version;
+    }
+
+    public bool IsUndefined => this.Equals(Undefined);
+
+    public bool Equals(LayoutHandle other)
+        => Index == other.Index && Version == other.Version;
+
+    public override bool Equals(object obj)
+        => obj is LayoutHandle other && Equals(other);
+
+    public override int GetHashCode()
+    {
+        unchecked
+        {
+            return (Index * 397) ^ Version;
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/LayoutManager.cs b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutManager.cs
new file mode 100644
index 0000000000..96b2390bc5
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutManager.cs
@@ -0,0 +1,424 @@
+// 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.CompilerServices;
+using System.Threading;
+using Unity.Collections;
+using UnityEngine.Scripting;
+
+namespace UnityEngine.UIElements.Layout;
+
+[RequiredByNativeCode]
+enum LayoutNodeDataType
+{
+    Node = 0,
+    Style = 1,
+    Computed = 2,
+    Cache = 3,
+    StyleDimensions = 4,
+    StyleMargin = 5,
+    StyleBorder = 6
+}
+
+[RequiredByNativeCode]
+enum LayoutConfigDataType
+{
+    Config = 0
+}
+
+delegate void LayoutMeasureFunction(
+    VisualElement ve,
+    ref LayoutNode node,
+    float width,
+    LayoutMeasureMode widthMode,
+    float height,
+    LayoutMeasureMode heightMode,
+    out LayoutSize result);
+
+delegate float LayoutBaselineFunction(
+    ref LayoutNode node,
+    float width,
+    float height);
+
+class ManagedObjectStore<T> where T : class
+{
+    const int k_ChunkSize = 1024 * 2; // 2k elements per 'chunk'
+
+    int m_Length;
+
+    readonly List<T[]> m_Chunks;
+    readonly Queue<int> m_Free;
+
+    public ManagedObjectStore()
+    {
+        m_Chunks = new List<T[]>
+        {
+            new T[k_ChunkSize]
+        };
+
+        m_Length = 1;
+
+        m_Free = new Queue<int>();
+    }
+
+    public T GetValue(int index)
+    {
+        if (index == 0)
+            return null;
+
+        var chunkIndex = index / k_ChunkSize;
+        var indexInChunk = index % k_ChunkSize;
+
+        return m_Chunks[chunkIndex][indexInChunk];
+    }
+
+    public void UpdateValue(ref int index, T value)
+    {
+        if (index != 0)
+        {
+            if (value != null)
+            {
+                var chunkIndex = index / k_ChunkSize;
+                var indexInChunk = index % k_ChunkSize;
+
+                // We have an index already and the value we are assigning is non-null. Perform a simple update.
+                m_Chunks[chunkIndex][indexInChunk] = value;
+            }
+            else
+            {
+                // We have an index but the assigned value is null. Treat this as a removal and record the index as free for re-use.
+                m_Free.Enqueue(index);
+
+                var chunkIndex = index / k_ChunkSize;
+                var indexInChunk = index % k_ChunkSize;
+
+                m_Chunks[chunkIndex][indexInChunk] = default;
+
+                index = 0;
+            }
+        }
+        else if (value != null)
+        {
+            // We don't have an index and the value is not null. We need a new entry in the list.
+            if (m_Free.Count > 0)
+            {
+                // Use the free list if available.
+                index = m_Free.Dequeue();
+
+                var chunkIndex = index / k_ChunkSize;
+                var indexInChunk = index % k_ChunkSize;
+
+                m_Chunks[chunkIndex][indexInChunk] = value;
+            }
+            else
+            {
+                // Otherwise allocate a new entry.
+                index = m_Length++;
+
+                if (index >= m_Chunks.Count * k_ChunkSize)
+                    m_Chunks.Add(new T[k_ChunkSize]);
+
+                var chunkIndex = index / k_ChunkSize;
+                var indexInChunk = index % k_ChunkSize;
+
+                m_Chunks[chunkIndex][indexInChunk] = value;
+            }
+        }
+    }
+}
+
+internal class LayoutManager : IDisposable
+{
+    static bool s_Initialized;
+    static bool s_AppDomainUnloadRegistered;
+
+    static LayoutManager s_SharedInstance;
+
+    public static LayoutManager SharedManager => s_SharedInstance;
+
+    static readonly List<LayoutManager> s_Managers = new List<LayoutManager>();
+
+    static LayoutManager()
+    {
+        Initialize();
+    }
+
+    static void Initialize()
+    {
+        if (s_Initialized)
+            return;
+
+        s_Initialized = true;
+
+        if (!s_AppDomainUnloadRegistered)
+        {
+            // important: this will always be called from a special unload thread (main thread will be blocking on this)
+            AppDomain.CurrentDomain.DomainUnload += (_, __) =>
+            {
+                if (s_Initialized)
+                    Shutdown();
+            };
+
+            s_AppDomainUnloadRegistered = true;
+        }
+
+        s_SharedInstance = new LayoutManager(Allocator.Persistent);
+    }
+
+    static void Shutdown()
+    {
+        if (!s_Initialized)
+            return;
+
+        s_Initialized = false;
+
+        s_SharedInstance.Dispose();
+    }
+
+    const int k_InitialNodeCapacity = 1024 * 64;
+    const int k_InitialConfigCapacity = 32;
+
+    readonly int m_Index;
+
+    LayoutDataStore m_Nodes;
+    LayoutDataStore m_Configs;
+
+    readonly object m_SyncRoot = new();
+    readonly Stack<LayoutHandle> m_NodesToFree = new();
+
+    readonly LayoutHandle m_DefaultConfig;
+
+    readonly ManagedObjectStore<LayoutMeasureFunction> m_ManagedMeasureFunctions = new();
+    readonly ManagedObjectStore<LayoutBaselineFunction> m_ManagedBaselineFunctions = new();
+    readonly ManagedObjectStore<WeakReference<VisualElement>> m_ManagedOwners = new();
+
+    int m_HighMark;
+
+    internal static LayoutManager GetManager(int index)
+        => (uint) index < s_Managers.Count ? s_Managers[index] : null;
+
+    public LayoutManager(Allocator allocator)
+    {
+        m_Index = s_Managers.Count;
+        s_Managers.Add(this);
+
+        var nodeComponentTypes = new[]
+        {
+            ComponentType.Create<LayoutNodeData>(),
+            ComponentType.Create<LayoutStyleData>(),
+            ComponentType.Create<LayoutComputedData>(),
+            ComponentType.Create<LayoutCacheData>(),
+            ComponentType.Create<LayoutStyleDimensionData>(),
+            ComponentType.Create<LayoutStyleMarginData>(),
+            ComponentType.Create<LayoutStyleBorderData>(),
+        };
+
+        var configComponentTypes = new[]
+        {
+            ComponentType.Create<LayoutConfigData>()
+        };
+
+        m_Nodes = new LayoutDataStore(nodeComponentTypes, k_InitialNodeCapacity, allocator);
+        m_Configs = new LayoutDataStore(configComponentTypes, k_InitialConfigCapacity, allocator);
+
+        m_DefaultConfig = CreateConfig().Handle;
+    }
+
+    public void Dispose()
+    {
+        s_Managers[m_Index] = null;
+
+        unsafe
+        {
+            for (var i = 0; i <= m_HighMark; i++)
+            {
+                ref var data = ref ((LayoutNodeData*) m_Nodes.GetComponentDataPtr(i, (int)LayoutNodeDataType.Node))[0];
+
+                if (!data.Children.IsCreated)
+                    continue;
+
+                data.Children.Dispose();
+                data.Children = default;
+            }
+        }
+
+        m_Nodes.Dispose();
+        m_Configs.Dispose();
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    LayoutDataAccess GetAccess()
+    {
+        return new LayoutDataAccess(m_Index, m_Nodes, m_Configs);
+    }
+
+    public LayoutConfig GetDefaultConfig()
+    {
+        return new LayoutConfig(GetAccess(), m_DefaultConfig);
+    }
+
+    public LayoutConfig CreateConfig()
+    {
+        return new LayoutConfig(GetAccess(), m_Configs.Allocate(LayoutConfigData.Default));
+    }
+
+    public void DestroyConfig(ref LayoutConfig config)
+    {
+        m_Configs.Free(config.Handle);
+        config = LayoutConfig.Undefined;
+    }
+
+    public LayoutNode CreateNode()
+    {
+        return CreateNodeInternal(m_DefaultConfig);
+    }
+
+    public LayoutNode CreateNode(LayoutConfig config)
+    {
+        return CreateNodeInternal(config.Handle);
+    }
+
+    public LayoutNode CreateNode(LayoutNode source)
+    {
+        var node = CreateNodeInternal(source.Config.Handle);
+        node.CopyStyle(source);
+        return node;
+    }
+
+    LayoutNode CreateNodeInternal(LayoutHandle configHandle)
+    {
+        TryFreeNodes();
+
+        var handle = m_Nodes.Allocate(
+            new LayoutNodeData { Config = configHandle },
+            LayoutStyleData.Default,
+            LayoutComputedData.Default,
+            LayoutCacheData.Default,
+            LayoutStyleDimensionData.Default,
+            LayoutStyleMarginData.Default,
+            LayoutStyleBorderData.Default);
+
+        if (handle.Index > m_HighMark)
+            m_HighMark = handle.Index;
+
+        var node = new LayoutNode(GetAccess(), handle);
+
+        node.InitializeStyle();
+
+        return node;
+    }
+
+    void TryFreeNodes()
+    {
+        var @lock = false;
+
+        try
+        {
+            Monitor.TryEnter(m_SyncRoot, ref @lock);
+
+            if (@lock)
+            {
+                while (m_NodesToFree.Count > 0)
+                    FreeNode(m_NodesToFree.Pop());
+            }
+        }
+        finally
+        {
+            if (@lock)
+                Monitor.Exit(m_SyncRoot);
+        }
+    }
+
+    public void DestroyNode(ref LayoutNode node)
+    {
+        if (node.IsUndefined)
+            return;
+
+        var access = GetAccess();
+
+        // The data access has been disposed.
+        if (!access.IsValid)
+            return;
+
+        // Destroy thread safe data as this can be called from the finalizer.
+        ref var data = ref access.GetNodeData(node.Handle);
+
+        if (data.Children.IsCreated)
+        {
+            data.Children.Dispose();
+            data.Children = default;
+        }
+
+        // Defer the shared resource free until later.
+        lock (m_SyncRoot)
+            m_NodesToFree.Push(node.Handle);
+
+        node = LayoutNode.Undefined;
+    }
+
+    void FreeNode(LayoutHandle handle)
+    {
+        ref var data = ref GetAccess().GetNodeData(handle);
+        m_ManagedMeasureFunctions.UpdateValue(ref data.ManagedMeasureFunctionIndex, null);
+        m_ManagedBaselineFunctions.UpdateValue(ref data.ManagedBaselineFunctionIndex, null);
+        m_ManagedOwners.UpdateValue(ref data.ManagedOwnerIndex, null);
+        m_Nodes.Free(handle);
+    }
+
+    public void Collect()
+    {
+        lock (m_SyncRoot)
+            while (m_NodesToFree.Count > 0)
+                FreeNode(m_NodesToFree.Pop());
+    }
+
+    public LayoutMeasureFunction GetMeasureFunction(LayoutHandle handle)
+    {
+        return m_ManagedMeasureFunctions.GetValue(GetAccess().GetNodeData(handle).ManagedMeasureFunctionIndex);
+    }
+
+    public void SetMeasureFunction(LayoutHandle handle, LayoutMeasureFunction value)
+    {
+        if (GetAccess().GetNodeData(handle).ManagedOwnerIndex == 0) Debug.LogWarning("Settomg Measure method on a node with no Owner");
+        ref var index = ref GetAccess().GetNodeData(handle).ManagedMeasureFunctionIndex;
+        m_ManagedMeasureFunctions.UpdateValue(ref index, value);
+    }
+
+    public VisualElement GetOwner(LayoutHandle handle)
+    {
+        //This assumes an internal behavior of the managed object store... invalid could be -1 instead
+        if (GetAccess().GetNodeData(handle).ManagedOwnerIndex == 0)
+            return null;
+
+        // Will throw if the weak referenc is not in the list
+        m_ManagedOwners.GetValue(GetAccess().GetNodeData(handle).ManagedOwnerIndex).TryGetTarget(out var ve);
+        return ve;
+    }
+
+    public void SetOwner(LayoutHandle handle, VisualElement value)
+    {
+        if (value == null)
+        {
+            if (GetAccess().GetNodeData(handle).ManagedMeasureFunctionIndex != 0) Debug.LogWarning("Node with no owner has a Measure method");
+            if (GetAccess().GetNodeData(handle).ManagedBaselineFunctionIndex != 0) Debug.LogWarning("Node with no owner has a baseline method");
+        }
+        ref var index = ref GetAccess().GetNodeData(handle).ManagedOwnerIndex;
+        m_ManagedOwners.UpdateValue(ref index, new(value));
+    }
+
+
+    public LayoutBaselineFunction GetBaselineFunction(LayoutHandle handle)
+    {
+        return m_ManagedBaselineFunctions.GetValue(GetAccess().GetNodeData(handle).ManagedMeasureFunctionIndex);
+    }
+
+    public void SetBaselineFunction(LayoutHandle handle, LayoutBaselineFunction value)
+    {
+        if (GetAccess().GetNodeData(handle).ManagedOwnerIndex == 0) Debug.LogWarning("Setting Baseline method on a node with no Owner");
+        ref var index = ref GetAccess().GetNodeData(handle).ManagedBaselineFunctionIndex;
+        m_ManagedBaselineFunctions.UpdateValue(ref index, value);
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode+Computed.cs b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode+Computed.cs
new file mode 100644
index 0000000000..2502850326
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode+Computed.cs
@@ -0,0 +1,53 @@
+// 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;
+
+namespace UnityEngine.UIElements.Layout;
+
+unsafe partial struct LayoutNode
+{
+    public LayoutDirection LayoutDirection => Layout.Direction;
+
+    public float LayoutX => Layout.Position[(int) LayoutEdge.Left];
+    public float LayoutY => Layout.Position[(int) LayoutEdge.Top];
+    public float LayoutRight => Layout.Position[(int) LayoutEdge.Right];
+    public float LayoutBottom => Layout.Position[(int) LayoutEdge.Bottom];
+    public float LayoutWidth => Layout.Dimensions[(int) LayoutDimension.Width];
+    public float LayoutHeight => Layout.Dimensions[(int) LayoutDimension.Height];
+
+    public float LayoutMarginLeft => GetLayoutValue(Layout.MarginBuffer, LayoutEdge.Left);
+    public float LayoutMarginTop => GetLayoutValue(Layout.MarginBuffer, LayoutEdge.Top);
+    public float LayoutMarginRight => GetLayoutValue(Layout.MarginBuffer, LayoutEdge.Right);
+    public float LayoutMarginBottom => GetLayoutValue(Layout.MarginBuffer, LayoutEdge.Bottom);
+    public float LayoutMarginStart => GetLayoutValue(Layout.MarginBuffer, LayoutEdge.Start);
+    public float LayoutMarginEnd => GetLayoutValue(Layout.MarginBuffer, LayoutEdge.End);
+
+    public float LayoutPaddingLeft => GetLayoutValue(Layout.PaddingBuffer, LayoutEdge.Left);
+    public float LayoutPaddingTop => GetLayoutValue(Layout.PaddingBuffer, LayoutEdge.Top);
+    public float LayoutPaddingRight => GetLayoutValue(Layout.PaddingBuffer, LayoutEdge.Right);
+    public float LayoutPaddingBottom => GetLayoutValue(Layout.PaddingBuffer, LayoutEdge.Bottom);
+    public float LayoutPaddingStart => GetLayoutValue(Layout.PaddingBuffer, LayoutEdge.Start);
+    public float LayoutPaddingEnd => GetLayoutValue(Layout.PaddingBuffer, LayoutEdge.End);
+
+    public float LayoutBorderLeft => GetLayoutValue(Layout.BorderBuffer, LayoutEdge.Left);
+    public float LayoutBorderTop => GetLayoutValue(Layout.BorderBuffer, LayoutEdge.Top);
+    public float LayoutBorderRight => GetLayoutValue(Layout.BorderBuffer, LayoutEdge.Right);
+    public float LayoutBorderBottom => GetLayoutValue(Layout.BorderBuffer, LayoutEdge.Bottom);
+    public float LayoutBorderStart => GetLayoutValue(Layout.BorderBuffer, LayoutEdge.Start);
+    public float LayoutBorderEnd => GetLayoutValue(Layout.BorderBuffer, LayoutEdge.End);
+
+    public float ComputedFlexBasis => Layout.ComputedFlexBasis;
+
+    [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+    float GetLayoutValue(float* buffer, LayoutEdge edge)
+    {
+        return edge switch
+        {
+            LayoutEdge.Left => Layout.Direction == LayoutDirection.RTL ? buffer[(int)LayoutEdge.End] : buffer[(int)LayoutEdge.Start],
+            LayoutEdge.Right => Layout.Direction == LayoutDirection.RTL ? buffer[(int)LayoutEdge.Start] : buffer[(int)LayoutEdge.End],
+            _ => buffer[(int)edge]
+        };
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode+Hierarchy.cs b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode+Hierarchy.cs
new file mode 100644
index 0000000000..05ad1cfec4
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode+Hierarchy.cs
@@ -0,0 +1,194 @@
+// 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 Unity.Collections;
+using UnityEngine.Assertions;
+
+namespace UnityEngine.UIElements.Layout;
+
+partial struct LayoutNode
+{
+    const int k_DefaultChildCapacity = 4;
+
+    /// <summary>
+    /// Gets or sets the parent for this node.
+    /// </summary>
+    public LayoutNode Parent
+    {
+        get => new (m_Access, m_Access.GetNodeData(m_Handle).Parent);
+        set => m_Access.GetNodeData(m_Handle).Parent = value.m_Handle;
+    }
+
+    /// <summary>
+    /// Gets or sets the next child for this node.
+    /// </summary>
+    public LayoutNode NextChild
+    {
+        get => new(m_Access, m_Access.GetNodeData(m_Handle).NextChild);
+        set => m_Access.GetNodeData(m_Handle).NextChild = value.m_Handle;
+    }
+
+    /// <summary>
+    /// Returns the underlying layout list of children.
+    /// </summary>
+    LayoutList<LayoutHandle> Children => m_Access.GetNodeData(m_Handle).Children;
+
+    /// <summary>
+    /// Return the child count for this node.
+    /// </summary>
+    public int Count => Children.IsCreated ? Children.Count : 0;
+
+    /// <summary>
+    /// Gets or sets the child at the given index.
+    /// </summary>
+    /// <remarks>
+    /// WARNING: This has no safety checks, use with caution.
+    /// </remarks>
+    /// <param name="index"></param>
+    public LayoutNode this[int index]
+    {
+        get => new (m_Access, Children[index]);
+        set => Children[index] = value.Handle;
+    }
+
+    /// <summary>
+    /// Adds the specified node as a child.
+    /// </summary>
+    /// <param name="child">The child to add.</param>
+    public void AddChild(LayoutNode child)
+    {
+        Insert(Count, child);
+    }
+
+    /// <summary>
+    /// Removes the specified child.
+    /// </summary>
+    /// <param name="child">The child to remove.</param>
+    public void RemoveChild(LayoutNode child)
+    {
+        ref var data = ref m_Access.GetNodeData(m_Handle);
+
+        Assert.IsTrue(data.Children.IsCreated);
+
+        var index = data.Children.IndexOf(child.m_Handle);
+
+        if (index >= 0)
+            RemoveAt(index);
+    }
+
+    /// <summary>
+    /// Returns the index of the specified child.
+    /// </summary>
+    /// <param name="child">The child to ge the index of</param>
+    /// <returns>The index of the specified child; -1 if it's not a child.</returns>
+    public int IndexOf(LayoutNode child)
+    {
+        ref var data = ref m_Access.GetNodeData(m_Handle);
+
+        if (data.Children.IsCreated)
+            return data.Children.IndexOf(child.m_Handle);
+
+        return -1;
+    }
+
+    /// <summary>
+    /// Inserts a new child to this node.
+    /// </summary>
+    /// <param name="index">The index to insert the child at.</param>
+    /// <param name="child">The child node to insert.</param>
+    public void Insert(int index, LayoutNode child)
+    {
+        ref var data = ref m_Access.GetNodeData(m_Handle);
+
+        if (!data.Children.IsCreated)
+            data.Children = new LayoutList<LayoutHandle>(k_DefaultChildCapacity, Allocator.Persistent);
+
+        data.Children.Insert(index, child.Handle);
+        child.Parent = this;
+
+        MarkDirty();
+    }
+
+    /// <summary>
+    /// Removes the child at the specified index.
+    /// </summary>
+    /// <param name="index">The index to remove the child at.</param>
+    public void RemoveAt(int index)
+    {
+        ref var data = ref m_Access.GetNodeData(m_Handle);
+
+        Assert.IsTrue(data.Children.IsCreated);
+
+        if ((uint) index >= data.Children.Count)
+            throw new ArgumentOutOfRangeException();
+
+        var childHandle = data.Children[index];
+
+        ref var childData = ref m_Access.GetNodeData(childHandle);
+
+        var isOwned = childData.Parent.Equals(m_Handle);
+        childData.Parent = LayoutHandle.Undefined;
+        data.Children.RemoveAt(index);
+
+        if (isOwned)
+            MarkDirty();
+    }
+
+    /// <summary>
+    /// Clears all children from this node.
+    /// </summary>
+    public void Clear()
+    {
+        ref var data = ref m_Access.GetNodeData(m_Handle);
+
+        if (!data.Children.IsCreated)
+            return;
+
+        while (data.Children.Count > 0)
+            RemoveAt(data.Children.Count-1);
+    }
+
+    /// <summary>
+    /// Gets an enumerator to iterate over all children.
+    /// </summary>
+    /// <remarks>
+    /// This uses duck typing and does explicitly implement IEnumerable{YogaNode}.
+    /// </remarks>
+    public Enumerator GetEnumerator()
+    {
+        return new Enumerator(m_Access, Children);
+    }
+
+    public struct Enumerator : IEnumerator<LayoutNode>
+    {
+        readonly LayoutDataAccess m_Access;
+        LayoutList<LayoutHandle>.Enumerator m_Enumerator;
+
+        public Enumerator(LayoutDataAccess access, LayoutList<LayoutHandle> children)
+        {
+            m_Access = access;
+            m_Enumerator = children.GetEnumerator();
+        }
+
+        public LayoutNode Current => new (m_Access, m_Enumerator.Current);
+        object IEnumerator.Current => Current;
+
+        public void Dispose()
+        {
+        }
+
+        public void Reset()
+        {
+            m_Enumerator.Reset();
+        }
+
+        public bool MoveNext()
+        {
+            return m_Enumerator.MoveNext();
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode+Style.cs b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode+Style.cs
new file mode 100644
index 0000000000..149a73ce56
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode+Style.cs
@@ -0,0 +1,546 @@
+// 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.Layout;
+
+partial struct LayoutNode
+{
+    public LayoutDirection StyleDirection
+    {
+        get => Style.Direction;
+        set
+        {
+            if (Style.Direction == value)
+                return;
+
+            Style.Direction = value;
+            MarkDirty();
+        }
+    }
+
+    public LayoutFlexDirection FlexDirection
+    {
+        get => Style.FlexDirection;
+        set
+        {
+            if (Style.FlexDirection == value)
+                return;
+
+            Style.FlexDirection = value;
+            MarkDirty();
+        }
+    }
+
+    public LayoutJustify JustifyContent
+    {
+        get => Style.JustifyContent;
+        set
+        {
+            if (Style.JustifyContent == value)
+                return;
+
+            Style.JustifyContent = value;
+            MarkDirty();
+        }
+    }
+
+    public LayoutDisplay Display
+    {
+        get => Style.Display;
+        set
+        {
+            if (Style.Display == value)
+                return;
+
+            Style.Display = value;
+            MarkDirty();
+        }
+    }
+
+    public LayoutAlign AlignItems
+    {
+        get => Style.AlignItems;
+        set
+        {
+            if (Style.AlignItems == value)
+                return;
+
+            Style.AlignItems = value;
+            MarkDirty();
+        }
+    }
+
+    public LayoutAlign AlignSelf
+    {
+        get => Style.AlignSelf;
+        set
+        {
+            if (Style.AlignSelf == value)
+                return;
+
+            Style.AlignSelf = value;
+            MarkDirty();
+        }
+    }
+
+    public LayoutAlign AlignContent
+    {
+        get => Style.AlignContent;
+        set
+        {
+            if (Style.AlignContent == value)
+                return;
+
+            Style.AlignContent = value;
+            MarkDirty();
+        }
+    }
+
+    public LayoutPositionType PositionType
+    {
+        get => Style.PositionType;
+        set
+        {
+            if (Style.PositionType == value)
+                return;
+
+            Style.PositionType = value;
+            MarkDirty();
+        }
+    }
+
+    public LayoutWrap Wrap
+    {
+        get => Style.FlexWrap;
+        set
+        {
+            if (Style.FlexWrap == value)
+                return;
+
+            Style.FlexWrap = value;
+            MarkDirty();
+        }
+    }
+
+    public float Flex
+    {
+        set => SetValue(ref Style.Flex, value);
+    }
+
+    public float FlexGrow
+    {
+        get => Style.FlexGrow;
+        set => SetValue(ref Style.FlexGrow, value);
+    }
+
+    public float FlexShrink
+    {
+        get => Style.FlexShrink;
+        set => SetValue(ref Style.FlexShrink, value);
+    }
+
+    public LayoutValue FlexBasis
+    {
+        get => Style.FlexBasis;
+        set => SetStyleValueUnit(ref Style.FlexBasis, value);
+    }
+
+    public LayoutValue Width
+    {
+        get => StyleDimensions.dimensions[(int)LayoutDimension.Width];
+        set => SetStyleValueUnit(ref StyleDimensions.dimensions[(int)LayoutDimension.Width], value);
+    }
+
+    public LayoutValue Height
+    {
+        get => StyleDimensions.dimensions[(int)LayoutDimension.Height];
+        set => SetStyleValueUnit(ref StyleDimensions.dimensions[(int)LayoutDimension.Height], value);
+    }
+
+    public LayoutValue MaxWidth
+    {
+        get => StyleDimensions.maxDimensions[(int)LayoutDimension.Width];
+        set => SetStyleValue(ref StyleDimensions.maxDimensions[(int)LayoutDimension.Width], value);
+    }
+
+    public LayoutValue MaxHeight
+    {
+        get => StyleDimensions.maxDimensions[(int)LayoutDimension.Height];
+        set => SetStyleValue(ref StyleDimensions.maxDimensions[(int)LayoutDimension.Height], value);
+    }
+
+    public LayoutValue MinWidth
+    {
+        get => StyleDimensions.minDimensions[(int)LayoutDimension.Width];
+        set => SetStyleValue(ref StyleDimensions.minDimensions[(int)LayoutDimension.Width], value);
+    }
+
+    public LayoutValue MinHeight
+    {
+        get => StyleDimensions.minDimensions[(int)LayoutDimension.Height];
+        set => SetStyleValue(ref StyleDimensions.minDimensions[(int)LayoutDimension.Height], value);
+    }
+
+    public float AspectRatio
+    {
+        get => Style.AspectRatio;
+        set => SetValue(ref Style.AspectRatio, value);
+    }
+
+    public LayoutOverflow Overflow
+    {
+        get => Style.Overflow;
+        set
+        {
+            if (Style.Overflow == value)
+                return;
+
+            Style.Overflow = value;
+            MarkDirty();
+        }
+    }
+
+    public LayoutValue Left
+    {
+        get => StyleBorders.position[(int)LayoutEdge.Left];
+        set => SetStyleEdgePosition(LayoutEdge.Left, value);
+    }
+
+    public LayoutValue Top
+    {
+        get => StyleBorders.position[(int)LayoutEdge.Top];
+        set => SetStyleEdgePosition(LayoutEdge.Top, value);
+    }
+
+    public LayoutValue Right
+    {
+        get => StyleBorders.position[(int)LayoutEdge.Right];
+        set => SetStyleEdgePosition(LayoutEdge.Right, value);
+    }
+
+    public LayoutValue Bottom
+    {
+        get => StyleBorders.position[(int)LayoutEdge.Bottom];
+        set => SetStyleEdgePosition(LayoutEdge.Bottom, value);
+    }
+
+    public LayoutValue Start
+    {
+        get => StyleBorders.position[(int)LayoutEdge.Start];
+        set => SetStyleEdgePosition(LayoutEdge.Start, value);
+    }
+
+    public LayoutValue End
+    {
+        get => StyleBorders.position[(int)LayoutEdge.End];
+        set => SetStyleEdgePosition(LayoutEdge.End, value);
+    }
+
+    public LayoutValue MarginLeft
+    {
+        get => StyleMargins.margin[(int)LayoutEdge.Left];
+        set => SetStyleEdgeMargin(LayoutEdge.Left, value);
+    }
+
+    public LayoutValue MarginTop
+    {
+        get => StyleMargins.margin[(int)LayoutEdge.Top];
+        set => SetStyleEdgeMargin(LayoutEdge.Top, value);
+    }
+
+    public LayoutValue MarginRight
+    {
+        get => StyleMargins.margin[(int)LayoutEdge.Right];
+        set => SetStyleEdgeMargin(LayoutEdge.Right, value);
+    }
+
+    public LayoutValue MarginBottom
+    {
+        get => StyleMargins.margin[(int)LayoutEdge.Bottom];
+        set => SetStyleEdgeMargin(LayoutEdge.Bottom, value);
+    }
+
+    public LayoutValue MarginStart
+    {
+        get => StyleMargins.margin[(int)LayoutEdge.Start];
+        set => SetStyleEdgeMargin(LayoutEdge.Start, value);
+    }
+
+    public LayoutValue MarginEnd
+    {
+        get => StyleMargins.margin[(int)LayoutEdge.End];
+        set => SetStyleEdgeMargin(LayoutEdge.End, value);
+    }
+
+    public LayoutValue MarginHorizontal
+    {
+        get => StyleMargins.margin[(int)LayoutEdge.Horizontal];
+        set => SetStyleEdgeMargin(LayoutEdge.Horizontal, value);
+    }
+
+    public LayoutValue MarginVertical
+    {
+        get => StyleMargins.margin[(int)LayoutEdge.Vertical];
+        set => SetStyleEdgeMargin(LayoutEdge.Vertical, value);
+    }
+
+    public LayoutValue Margin
+    {
+        get => StyleMargins.margin[(int)LayoutEdge.All];
+        set => SetStyleEdgeMargin(LayoutEdge.All, value);
+    }
+
+    public LayoutValue PaddingLeft
+    {
+        get => StyleMargins.padding[(int)LayoutEdge.Left];
+        set => SetStyleEdgePadding(LayoutEdge.Left, value);
+    }
+
+    public LayoutValue PaddingTop
+    {
+        get => StyleMargins.padding[(int)LayoutEdge.Top];
+        set => SetStyleEdgePadding(LayoutEdge.Top, value);
+    }
+
+    public LayoutValue PaddingRight
+    {
+        get => StyleMargins.padding[(int)LayoutEdge.Right];
+        set => SetStyleEdgePadding(LayoutEdge.Right, value);
+    }
+
+    public LayoutValue PaddingBottom
+    {
+        get => StyleMargins.padding[(int)LayoutEdge.Bottom];
+        set => SetStyleEdgePadding(LayoutEdge.Bottom, value);
+    }
+
+    public LayoutValue PaddingStart
+    {
+        get => StyleMargins.padding[(int)LayoutEdge.Start];
+        set => SetStyleEdgePadding(LayoutEdge.Start, value);
+    }
+
+    public LayoutValue PaddingEnd
+    {
+        get => StyleMargins.padding[(int)LayoutEdge.End];
+        set => SetStyleEdgePadding(LayoutEdge.End, value);
+    }
+
+    public LayoutValue PaddingHorizontal
+    {
+        get => StyleMargins.padding[(int)LayoutEdge.Horizontal];
+        set => SetStyleEdgePadding(LayoutEdge.Horizontal, value);
+    }
+
+    public LayoutValue PaddingVertical
+    {
+        get => StyleMargins.padding[(int)LayoutEdge.Vertical];
+        set => SetStyleEdgePadding(LayoutEdge.Vertical, value);
+    }
+
+    public LayoutValue Padding
+    {
+        get => StyleMargins.padding[(int)LayoutEdge.All];
+        set => SetStyleEdgePadding(LayoutEdge.All, value);
+    }
+
+    public float BorderLeftWidth
+    {
+        get => StyleBorders.border[(int) LayoutEdge.Left].Value;
+        set => StyleEdgeSetPoint(ref StyleBorders.border[(int)LayoutEdge.Left], value);
+    }
+
+    public float BorderTopWidth
+    {
+        get => StyleBorders.border[(int) LayoutEdge.Top].Value;
+        set => StyleEdgeSetPoint(ref StyleBorders.border[(int)LayoutEdge.Top], value);
+    }
+
+    public float BorderRightWidth
+    {
+        get => StyleBorders.border[(int) LayoutEdge.Right].Value;
+        set => StyleEdgeSetPoint(ref StyleBorders.border[(int)LayoutEdge.Right], value);
+    }
+
+    public float BorderBottomWidth
+    {
+        get => StyleBorders.border[(int) LayoutEdge.Bottom].Value;
+        set => StyleEdgeSetPoint(ref StyleBorders.border[(int)LayoutEdge.Bottom], value);
+    }
+
+    public float BorderStartWidth
+    {
+        get => StyleBorders.border[(int) LayoutEdge.Start].Value;
+        set => StyleEdgeSetPoint(ref StyleBorders.border[(int)LayoutEdge.Start], value);
+    }
+
+    public float BorderEndWidth
+    {
+        get => StyleBorders.border[(int) LayoutEdge.End].Value;
+        set => StyleEdgeSetPoint(ref StyleBorders.border[(int)LayoutEdge.End], value);
+    }
+
+    public float BorderWidth
+    {
+        get => StyleBorders.border[(int) LayoutEdge.All].Value;
+        set => StyleEdgeSetPoint(ref StyleBorders.border[(int)LayoutEdge.All], value);
+    }
+
+    void SetValue(ref float currentValue, float newValue)
+    {
+        if (currentValue.Equals(newValue))
+            return;
+
+        currentValue = newValue;
+        MarkDirty();
+    }
+
+    void SetStyleValue(ref LayoutValue currentValue, LayoutValue newValue)
+    {
+        if (newValue.Unit == LayoutUnit.Percent)
+        {
+            SetStyleValuePercent(ref currentValue, newValue);
+        }
+        else
+        {
+            SetStyleValuePoint(ref currentValue, newValue);
+        }
+    }
+
+    void SetStyleValueUnit(ref LayoutValue currentValue, LayoutValue newValue)
+    {
+        if (newValue.Unit == LayoutUnit.Percent)
+        {
+            SetStyleValuePercent(ref currentValue, newValue);
+        }
+        else if (newValue.Unit == LayoutUnit.Auto)
+        {
+            SetStyleValueAuto(ref currentValue);
+        }
+        else
+        {
+            SetStyleValuePoint(ref currentValue, newValue);
+        }
+    }
+
+    void SetStyleValuePoint(ref LayoutValue currentValue, LayoutValue newValue)
+    {
+        if (float.IsNaN(currentValue.Value) && float.IsNaN(newValue.Value) && newValue.Unit == currentValue.Unit)
+        {
+            return;
+        }
+
+        if (currentValue.Value != newValue.Value || currentValue.Unit != LayoutUnit.Point)
+        {
+            if (float.IsNaN(newValue.Value))
+                currentValue = LayoutValue.Auto();
+            else
+                currentValue = LayoutValue.Point(newValue.Value);
+
+            MarkDirty();
+        }
+    }
+
+    void SetStyleValuePercent(ref LayoutValue currentValue, LayoutValue newValue)
+    {
+        if (currentValue.Value != newValue.Value || currentValue.Unit != LayoutUnit.Percent)
+        {
+            if (float.IsNaN(newValue.Value))
+                currentValue = LayoutValue.Auto();
+            else
+                currentValue = newValue;
+
+            MarkDirty();
+        }
+    }
+
+    void SetStyleValueAuto(ref LayoutValue currentValue)
+    {
+        if (currentValue.Unit != LayoutUnit.Auto)
+        {
+            currentValue = LayoutValue.Auto();
+            MarkDirty();
+        }
+    }
+
+    void SetStyleEdgePosition(LayoutEdge edge, LayoutValue value)
+    {
+        if (value.Unit == LayoutUnit.Percent)
+        {
+            StyleEdgeSetPercent(ref StyleBorders.position[(int)edge], value.Value);
+        }
+        else
+        {
+            StyleEdgeSetPoint(ref StyleBorders.position[(int)edge], value.Value);
+        }
+    }
+
+    void SetStyleEdgeMargin(LayoutEdge edge, LayoutValue value)
+    {
+        if (value.Unit == LayoutUnit.Percent)
+        {
+            StyleEdgeSetPercent(ref StyleMargins.margin[(int)edge], value.Value);
+        }
+        else if (value.Unit == LayoutUnit.Auto)
+        {
+            StyleEdgeSetAuto(ref StyleMargins.margin[(int)edge]);
+        }
+        else
+        {
+            StyleEdgeSetPoint(ref StyleMargins.margin[(int)edge], value.Value);
+        }
+    }
+
+    void SetStyleEdgePadding(LayoutEdge edge, LayoutValue value)
+    {
+        if (value.Unit == LayoutUnit.Percent)
+        {
+            StyleEdgeSetPercent(ref StyleMargins.padding[(int)edge], value.Value);
+        }
+        else
+        {
+            StyleEdgeSetPoint(ref StyleMargins.padding[(int)edge], value.Value);
+        }
+    }
+
+    void StyleEdgeSetPercent(ref LayoutValue value, float newValue)
+    {
+        if (value.Value != newValue || value.Unit != LayoutUnit.Percent)
+        {
+            value = float.IsNaN(newValue)
+                ? LayoutValue.Undefined()
+                : LayoutValue.Percent(newValue);
+
+            MarkDirty();
+        }
+    }
+
+    void StyleEdgeSetAuto(ref LayoutValue value)
+    {
+        if (value.Unit != LayoutUnit.Auto)
+        {
+            value = LayoutValue.Auto();
+            MarkDirty();
+        }
+    }
+
+    void StyleEdgeSetPoint(ref LayoutValue value, float newValue)
+    {
+        if (float.IsNaN(value.Value) && float.IsNaN(newValue))
+        {
+            return;
+        }
+
+        if (value.Value != newValue || value.Unit != LayoutUnit.Point)
+        {
+            value = float.IsNaN(newValue)
+                ? LayoutValue.Undefined()
+                : LayoutValue.Point(newValue);
+
+            MarkDirty();
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode.cs b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode.cs
new file mode 100644
index 0000000000..136ccb8d4b
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutNode.cs
@@ -0,0 +1,330 @@
+// 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.LowLevel.Unsafe;
+using UnityEngine.Assertions;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+partial struct LayoutNode : IEquatable<LayoutNode>
+{
+    public static LayoutNode Undefined => new(default, LayoutHandle.Undefined);
+
+    readonly LayoutDataAccess m_Access;
+    readonly LayoutHandle m_Handle;
+
+    internal LayoutNode(LayoutDataAccess access, LayoutHandle handle)
+    {
+        m_Access = access;
+        m_Handle = handle;
+    }
+
+    /// <summary>
+    /// Returns <see langword="true"/> if this is an invalid/undefined node.
+    /// </summary>
+    public bool IsUndefined => m_Handle.Equals(LayoutHandle.Undefined);
+
+    /// <summary>
+    /// Returns the handle for this node.
+    /// </summary>
+    public LayoutHandle Handle => m_Handle;
+
+    /// <summary>
+    /// Gets the computed layout struct for this node.
+    /// </summary>
+    public ref LayoutComputedData Layout => ref m_Access.GetComputedData(m_Handle);
+
+    /// <summary>
+    /// Gets the style input struct for this node.
+    /// </summary>
+    public ref LayoutStyleData Style => ref m_Access.GetStyleData(m_Handle);
+
+    /// <summary>
+    /// Gets the style border input struct for this node.
+    /// </summary>
+    public ref LayoutStyleBorderData StyleBorders => ref m_Access.GetStyleBorderData(m_Handle);
+
+    /// <summary>
+    /// Gets the style margin input struct for this node.
+    /// </summary>
+    public ref LayoutStyleMarginData StyleMargins => ref m_Access.GetStyleMarginData(m_Handle);
+
+    /// <summary>
+    /// Gets the style dimension input struct for this node.
+    /// </summary>
+    public ref LayoutStyleDimensionData StyleDimensions => ref m_Access.GetStyleDimensionData(m_Handle);
+
+    /// <summary>
+    /// Gets or sets the dirty flag for this node. Used when calculating layout.
+    /// </summary>
+    public ref bool IsDirty => ref m_Access.GetNodeData(m_Handle).IsDirty;
+
+    /// <summary>
+    /// Gets or sets the new layout flag for this node. Used when calculating layout.
+    /// </summary>
+    public ref bool HasNewLayout => ref m_Access.GetNodeData(m_Handle).HasNewLayout;
+
+    /// <summary>
+    /// Returns <see langword="true"/> if a custom measurement method is defined.
+    /// </summary>
+    public bool IsMeasureDefined => m_Access.GetNodeData(m_Handle).ManagedMeasureFunctionIndex != 0;
+
+    /// <summary>
+    /// Gets or sets the custom measure function for this node.
+    /// </summary>
+    public LayoutMeasureFunction Measure
+    {
+        get => m_Access.GetMeasureFunction(m_Handle);
+        set => m_Access.SetMeasureFunction(m_Handle, value);
+    }
+
+    /// <summary>
+    /// Sets the owner of this node.
+    /// </summary>
+    public void SetOwner(VisualElement func)
+    {
+        m_Access.SetOwner(m_Handle, func);
+    }
+
+    public VisualElement GetOwner()
+    {
+       return m_Access.GetOwner(m_Handle);
+    }
+
+    /// <summary>
+    /// Returns <see langword="true"/> if a custom baseline method is defined.
+    /// </summary>
+    public bool IsBaselineDefined => m_Access.GetNodeData(m_Handle).ManagedBaselineFunctionIndex != 0;
+
+    /// <summary>
+    /// Gets or sets the custom baseline function for this node.
+    /// </summary>
+    public LayoutBaselineFunction Baseline
+    {
+        get => m_Access.GetBaselineFunction(m_Handle);
+        set => m_Access.SetBaselineFunction(m_Handle, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the line index for this node. Used when calculating layout.
+    /// </summary>
+    public ref int LineIndex => ref m_Access.GetNodeData(m_Handle).LineIndex;
+
+    /// <summary>
+    /// Gets or sets the shared configuration object for this node.
+    /// </summary>
+    public LayoutConfig Config
+    {
+        get => new(m_Access, m_Access.GetNodeData(m_Handle).Config);
+        set => m_Access.GetNodeData(m_Handle).Config = value.Handle;
+    }
+
+    /// <summary>
+    /// Marks this node and all ancestors as dirty.
+    /// </summary>
+    public void MarkDirty()
+    {
+        if (IsDirty)
+            return;
+
+        IsDirty = true;
+
+        Layout.ComputedFlexBasis = float.NaN;
+
+        if (!Parent.IsUndefined)
+            Parent.MarkDirty();
+    }
+
+    /// <summary>
+    /// Marks this node layout as seen (not new).
+    /// </summary>
+    public void MarkLayoutSeen()
+    {
+        HasNewLayout = false;
+    }
+
+    /// <summary>
+    /// Initialize the style based on the config.
+    /// </summary>
+    public void InitializeStyle()
+    {
+        if (!Config.IsUndefined && Config.UseWebDefaults)
+        {
+            Style.FlexDirection = LayoutFlexDirection.Row;
+            Style.AlignContent = LayoutAlign.Stretch;
+        }
+    }
+
+    public void CopyFromComputedStyle(ComputedStyle style)
+    {
+        Flex = float.NaN;
+        FlexGrow = style.flexGrow;
+        FlexShrink = style.flexShrink;
+        FlexBasis = style.flexBasis.ToLayoutValue();
+        Left = style.left.ToLayoutValue();
+        Top = style.top.ToLayoutValue();
+        Right = style.right.ToLayoutValue();
+        Bottom = style.bottom.ToLayoutValue();
+        MarginLeft = style.marginLeft.ToLayoutValue();
+        MarginTop = style.marginTop.ToLayoutValue();
+        MarginRight = style.marginRight.ToLayoutValue();
+        MarginBottom = style.marginBottom.ToLayoutValue();
+        PaddingLeft = style.paddingLeft.ToLayoutValue();
+        PaddingTop = style.paddingTop.ToLayoutValue();
+        PaddingRight = style.paddingRight.ToLayoutValue();
+        PaddingBottom = style.paddingBottom.ToLayoutValue();
+        BorderLeftWidth = style.borderLeftWidth;
+        BorderTopWidth = style.borderTopWidth;
+        BorderRightWidth = style.borderRightWidth;
+        BorderBottomWidth = style.borderBottomWidth;
+        Width = style.width.ToLayoutValue();
+        Height = style.height.ToLayoutValue();
+        PositionType = (LayoutPositionType)style.position;
+        Overflow = (LayoutOverflow)style.overflow;
+        AlignSelf = (LayoutAlign)style.alignSelf;
+        MaxWidth = style.maxWidth.ToLayoutValue();
+        MaxHeight = style.maxHeight.ToLayoutValue();
+        MinWidth = style.minWidth.ToLayoutValue();
+        MinHeight = style.minHeight.ToLayoutValue();
+        FlexDirection = (LayoutFlexDirection)style.flexDirection;
+        AlignContent = (LayoutAlign)style.alignContent;
+        AlignItems = (LayoutAlign)style.alignItems;
+        JustifyContent = (LayoutJustify)style.justifyContent;
+        Wrap = (LayoutWrap)style.flexWrap;
+        Display = (LayoutDisplay)style.display;
+    }
+
+    /// <summary>
+    /// Copies the style from the given <see cref="LayoutNode"/>.
+    /// </summary>
+    /// <param name="node">The node to copy the style from.</param>
+    public void CopyStyle(LayoutNode node)
+    {
+        var markDirty = false;
+        unsafe
+        {
+            fixed (LayoutStyleData* dstStyle = &Style)
+            fixed (LayoutStyleData* srcStyle = &node.Style)
+            {
+                if (UnsafeUtility.MemCmp(dstStyle, srcStyle, UnsafeUtility.SizeOf<LayoutStyleData>()) != 0)
+                {
+                    Style = node.Style;
+                    markDirty = true;
+                }
+            }
+            fixed (LayoutStyleBorderData* dstStyle = &StyleBorders)
+            fixed (LayoutStyleBorderData* srcStyle = &node.StyleBorders)
+            {
+                if (UnsafeUtility.MemCmp(dstStyle, srcStyle, UnsafeUtility.SizeOf<LayoutStyleBorderData>()) != 0)
+                {
+                    StyleBorders = node.StyleBorders;
+                    markDirty = true;
+                }
+            }
+            fixed (LayoutStyleMarginData* dstStyle = &StyleMargins)
+            fixed (LayoutStyleMarginData* srcStyle = &node.StyleMargins)
+            {
+                if (UnsafeUtility.MemCmp(dstStyle, srcStyle, UnsafeUtility.SizeOf<LayoutStyleMarginData>()) != 0)
+                {
+                    StyleMargins = node.StyleMargins;
+                    markDirty = true;
+                }
+            }
+            fixed (LayoutStyleDimensionData* dstStyle = &StyleDimensions)
+            fixed (LayoutStyleDimensionData* srcStyle = &node.StyleDimensions)
+            {
+                if (UnsafeUtility.MemCmp(dstStyle, srcStyle, UnsafeUtility.SizeOf<LayoutStyleDimensionData>()) != 0)
+                {
+                    StyleDimensions = node.StyleDimensions;
+                    markDirty = true;
+                }
+            }
+        }
+
+        if (markDirty)
+            MarkDirty();
+    }
+
+    /// <summary>
+    /// Resets the node for immediate re-use on the same element.
+    /// </summary>
+    public void SoftReset()
+    {
+        ref var data = ref m_Access.GetNodeData(m_Handle);
+        data.HasNewLayout = true;
+    }
+
+    /// <summary>
+    /// Resets the node for re-use.
+    /// </summary>
+    public void Reset()
+    {
+        ref var data = ref m_Access.GetNodeData(m_Handle);
+
+        Assert.IsTrue(!data.Children.IsCreated || data.Children.Count == 0, "Cannot reset a node which still has children attached");
+
+        data.Parent = default;
+        data.HasNewLayout = true;
+        data.ResolvedDimensions = new FixedBuffer2<LayoutValue>
+        {
+            [0] = LayoutValue.Undefined(),
+            [1] = LayoutValue.Undefined()
+        };
+
+        Measure = null;
+        Baseline = null;
+        SetOwner(null);
+
+        Layout = LayoutComputedData.Default;
+        Style = LayoutStyleData.Default;
+        StyleBorders = LayoutStyleBorderData.Default;
+        StyleMargins = LayoutStyleMarginData.Default;
+        StyleDimensions = LayoutStyleDimensionData.Default;
+
+        InitializeStyle();
+    }
+
+    public bool Equals(LayoutNode other)
+    {
+        return m_Handle.Equals(other.m_Handle);
+    }
+
+    public override bool Equals(object obj)
+    {
+        return obj is LayoutNode other && Equals(other);
+    }
+
+    public override int GetHashCode()
+    {
+        return m_Handle.GetHashCode();
+    }
+
+    public static bool operator ==(LayoutNode lhs, LayoutNode rhs)
+    {
+        if (lhs.IsUndefined)
+        {
+            if (rhs.IsUndefined)
+                return true;
+
+            return false;
+        }
+
+        return lhs.Equals(rhs);
+    }
+
+    public static bool operator !=(LayoutNode lhs, LayoutNode rhs) => !(lhs == rhs);
+
+    /// <summary>
+    /// Performs the flexbox layout calculation.
+    /// </summary>
+    /// <param name="width">The desired width.</param>
+    /// <param name="height">The desired height.</param>
+    public void CalculateLayout(float width = float.NaN, float height = float.NaN)
+    {
+        LayoutProcessor.CalculateLayout(this, width, height, Style.Direction);
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/LayoutProcessor.cs b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutProcessor.cs
new file mode 100644
index 0000000000..85db42ce1b
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/LayoutProcessor.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.Runtime.InteropServices;
+using Unity.Profiling;
+
+namespace UnityEngine.UIElements.Layout;
+
+interface ILayoutProcessor
+{
+    void CalculateLayout(
+        LayoutNode node,
+        float parentWidth,
+        float parentHeight,
+        LayoutDirection parentDirection);
+}
+
+static class LayoutProcessor
+{
+    static ILayoutProcessor s_Processor = new LayoutProcessorNative();
+
+    public static ILayoutProcessor Processor
+    {
+        get => s_Processor;
+        set => s_Processor = value ?? new LayoutProcessorNative();
+    }
+
+    public static void CalculateLayout(
+        LayoutNode node,
+        float parentWidth,
+        float parentHeight,
+        LayoutDirection parentDirection)
+    {
+        s_Processor.CalculateLayout(node, parentWidth, parentHeight, parentDirection);
+    }
+}
+
+[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+delegate void InvokeMeasureFunctionDelegate(
+    ref LayoutNode node,
+    float width,
+    LayoutMeasureMode widthMode,
+    float height,
+    LayoutMeasureMode heightMode,
+    out LayoutSize result);
+
+[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+delegate float InvokeBaselineFunctionDelegate(
+    ref LayoutNode node,
+    float width,
+    float height);
+
+static class LayoutDelegates
+{
+    static readonly ProfilerMarker s_InvokeMeasureFunctionMarker = new("InvokeMeasureFunction");
+    static readonly ProfilerMarker s_InvokeBaselineFunctionMarker = new("InvokeBaselineFunction");
+
+    [AOT.MonoPInvokeCallback(typeof(InvokeMeasureFunctionDelegate))]
+    static void InvokeMeasureFunction(
+        ref LayoutNode node,
+        float width,
+        LayoutMeasureMode widthMode,
+        float height,
+        LayoutMeasureMode heightMode,
+        out LayoutSize result)
+    {
+        var measureFunction = node.Measure;
+
+        if (measureFunction == null)
+        {
+            Debug.Assert(false, "Measure called on a null method");
+            result = default;
+            return;
+        }
+
+        using (s_InvokeMeasureFunctionMarker.Auto())
+            measureFunction(node.GetOwner(), ref node, width, widthMode, height, heightMode, out result);
+    }
+
+    [AOT.MonoPInvokeCallback(typeof(InvokeBaselineFunctionDelegate))]
+    static float InvokeBaselineFunction(
+        ref LayoutNode node,
+        float width,
+        float height)
+    {
+        var baselineFunction = node.Baseline;
+        if (baselineFunction == null)
+        {
+            return 0f;
+        }
+
+        using (s_InvokeBaselineFunctionMarker.Auto())
+            return baselineFunction(ref node, width, height);
+    }
+
+    static readonly InvokeMeasureFunctionDelegate s_InvokeMeasureDelegate = InvokeMeasureFunction;
+    static readonly InvokeBaselineFunctionDelegate s_InvokeBaselineDelegate = InvokeBaselineFunction;
+
+    internal static readonly IntPtr s_InvokeMeasureFunction = Marshal.GetFunctionPointerForDelegate(s_InvokeMeasureDelegate);
+    internal static readonly IntPtr s_InvokeBaselineFunction = Marshal.GetFunctionPointerForDelegate(s_InvokeBaselineDelegate);
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutCacheData.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutCacheData.cs
new file mode 100644
index 0000000000..2f43bf74dc
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutCacheData.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.Runtime.InteropServices;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+struct LayoutCacheData
+{
+    public static LayoutCacheData Default = new()
+    {
+        NextCachedMeasurementsIndex = 0,
+        CachedLayout = LayoutCachedMeasurement.Default
+    };
+
+    public uint NextCachedMeasurementsIndex;
+    public FixedBuffer16<LayoutCachedMeasurement> cachedMeasurements;
+    public LayoutCachedMeasurement CachedLayout;
+}
+
+[StructLayout(LayoutKind.Sequential)]
+struct LayoutCachedMeasurement
+{
+    public static LayoutCachedMeasurement Default = new()
+    {
+        AvailableWidth = 0f,
+        AvailableHeight = 0f,
+        ParentWidth = 0f,
+        ParentHeight = 0f,
+        WidthMeasureMode = (LayoutMeasureMode) (-1),
+        HeightMeasureMode = (LayoutMeasureMode) (-1),
+        ComputedWidth = -1f,
+        ComputedHeight = -1f
+    };
+
+    public float AvailableWidth;
+    public float AvailableHeight;
+    public float ParentWidth;
+    public float ParentHeight;
+    public LayoutMeasureMode WidthMeasureMode;
+    public LayoutMeasureMode HeightMeasureMode;
+    public float ComputedWidth;
+    public float ComputedHeight;
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutComputedData.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutComputedData.cs
new file mode 100644
index 0000000000..dd5ae37430
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutComputedData.cs
@@ -0,0 +1,78 @@
+// 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;
+using System.Runtime.InteropServices;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+unsafe struct LayoutComputedData
+{
+    public static LayoutComputedData Default
+    {
+        get
+        {
+            var r = new LayoutComputedData
+            {
+                Direction = LayoutDirection.Inherit,
+                ComputedFlexBasisGeneration = 0,
+                ComputedFlexBasis = float.NaN,
+                HadOverflow = false,
+                GenerationCount = 0,
+                LastParentDirection = (LayoutDirection) (-1),
+                LastPointScaleFactor = 1.0f
+            };
+            r.Dimensions[0] = LayoutDefaults.DimensionValues[0];
+            r.Dimensions[1] = LayoutDefaults.DimensionValues[1];
+            r.MeasuredDimensions[0] = LayoutDefaults.DimensionValues[0];
+            r.MeasuredDimensions[1] = LayoutDefaults.DimensionValues[1];
+            return r;
+        }
+    }
+
+    public fixed float Position[4];
+    public fixed float Dimensions[2];
+    public fixed float Margin[6];
+    public fixed float Border[6];
+    public fixed float Padding[6];
+    public LayoutDirection Direction;
+    public uint ComputedFlexBasisGeneration;
+    public float ComputedFlexBasis;
+    public bool HadOverflow;
+    public uint GenerationCount;
+    public LayoutDirection LastParentDirection;
+    public float LastPointScaleFactor;
+    public fixed float MeasuredDimensions[2];
+
+    public float* MarginBuffer
+    {
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        get
+        {
+            fixed (float* m = Margin)
+                return m;
+        }
+    }
+
+    public float* BorderBuffer
+    {
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        get
+        {
+            fixed (float* m = Border)
+                return m;
+        }
+    }
+
+    public float* PaddingBuffer
+    {
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        get
+        {
+            fixed (float* m = Padding)
+                return m;
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutConfigData.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutConfigData.cs
new file mode 100644
index 0000000000..228e03c6be
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutConfigData.cs
@@ -0,0 +1,20 @@
+// 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.InteropServices;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+struct LayoutConfigData
+{
+    public static LayoutConfigData Default => new()
+    {
+        PointScaleFactor = 1f
+    };
+
+    public float PointScaleFactor;
+    [MarshalAs(UnmanagedType.U1)] public bool UseWebDefaults;
+    [MarshalAs(UnmanagedType.U1)] public bool UseLegacyStretchBehaviour;
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutDataAccess.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutDataAccess.cs
new file mode 100644
index 0000000000..d9c9e3c382
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutDataAccess.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.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using UnityEngine.Scripting;
+
+namespace UnityEngine.UIElements.Layout;
+
+/// <summary>
+/// The <see cref="LayoutDataAccess"/> gives strongly typed unmanaged access to the individual components of a node.
+/// </summary>
+[RequiredByNativeCode, StructLayout(LayoutKind.Sequential)]
+readonly unsafe struct LayoutDataAccess
+{
+    readonly int m_Manager;
+    readonly LayoutDataStore m_Nodes;
+    readonly LayoutDataStore m_Configs;
+
+    public bool IsValid => m_Nodes.IsValid && m_Configs.IsValid;
+
+    internal LayoutDataAccess(int manager, LayoutDataStore nodes, LayoutDataStore configs)
+    {
+        m_Manager = manager;
+        m_Nodes = nodes;
+        m_Configs = configs;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    ref T GetTypedNodeDataRef<T>(LayoutHandle handle, LayoutNodeDataType type) where T : unmanaged
+        => ref ((T*) m_Nodes.GetComponentDataPtr(handle.Index, (int)type))[0];
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    ref T GetTypedConfigDataRef<T>(LayoutHandle handle, LayoutConfigDataType type) where T : unmanaged
+        => ref ((T*) m_Configs.GetComponentDataPtr(handle.Index, (int)type))[0];
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ref LayoutNodeData GetNodeData(LayoutHandle handle)
+        => ref GetTypedNodeDataRef<LayoutNodeData>(handle, LayoutNodeDataType.Node);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ref LayoutStyleData GetStyleData(LayoutHandle handle)
+        => ref GetTypedNodeDataRef<LayoutStyleData>(handle, LayoutNodeDataType.Style);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ref LayoutStyleBorderData GetStyleBorderData(LayoutHandle handle)
+        => ref GetTypedNodeDataRef<LayoutStyleBorderData>(handle, LayoutNodeDataType.StyleBorder);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ref LayoutStyleMarginData GetStyleMarginData(LayoutHandle handle)
+        => ref GetTypedNodeDataRef<LayoutStyleMarginData>(handle, LayoutNodeDataType.StyleMargin);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ref LayoutStyleDimensionData GetStyleDimensionData(LayoutHandle handle)
+        => ref GetTypedNodeDataRef<LayoutStyleDimensionData>(handle, LayoutNodeDataType.StyleDimensions);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ref LayoutComputedData GetComputedData(LayoutHandle handle)
+        => ref GetTypedNodeDataRef<LayoutComputedData>(handle, LayoutNodeDataType.Computed);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ref LayoutCacheData GetCacheData(LayoutHandle handle)
+        => ref GetTypedNodeDataRef<LayoutCacheData>(handle, LayoutNodeDataType.Cache);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ref LayoutConfigData GetConfigData(LayoutHandle handle)
+        => ref GetTypedConfigDataRef<LayoutConfigData>(handle, LayoutConfigDataType.Config);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public LayoutMeasureFunction GetMeasureFunction(LayoutHandle handle)
+        => LayoutManager.GetManager(m_Manager).GetMeasureFunction(handle);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void SetMeasureFunction(LayoutHandle handle, LayoutMeasureFunction value)
+        => LayoutManager.GetManager(m_Manager).SetMeasureFunction(handle, value);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public VisualElement GetOwner(LayoutHandle handle)
+    => LayoutManager.GetManager(m_Manager).GetOwner(handle);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void SetOwner(LayoutHandle handle, VisualElement value)
+        => LayoutManager.GetManager(m_Manager).SetOwner(handle, value);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public LayoutBaselineFunction GetBaselineFunction(LayoutHandle handle)
+        => LayoutManager.GetManager(m_Manager).GetBaselineFunction(handle);
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void SetBaselineFunction(LayoutHandle handle, LayoutBaselineFunction value)
+        => LayoutManager.GetManager(m_Manager).SetBaselineFunction(handle, value);
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutDataStore.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutDataStore.cs
new file mode 100644
index 0000000000..2a59c13a41
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutDataStore.cs
@@ -0,0 +1,461 @@
+// 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.CompilerServices;
+using System.Runtime.InteropServices;
+using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
+using UnityEngine.Assertions;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+struct ComponentType
+{
+    public int Size;
+
+    public static ComponentType Create<T>() where T : unmanaged => new ComponentType {Size = UnsafeUtility.SizeOf<T>()};
+}
+
+/// <summary>
+/// The <see cref="LayoutDataStore"/> is used to store "componentized" data for a set of objects. This storage is extremely simple and does
+/// not handle any sort of type index mapping. Each component is identified by it's array index specified at creation time.
+/// </summary>
+[StructLayout(LayoutKind.Sequential)]
+unsafe partial struct LayoutDataStore : IDisposable
+{
+    const int k_ChunkSize = 32 * 1024; // 32 kb
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct Chunk
+    {
+        [NativeDisableUnsafePtrRestriction] public byte* Buffer;
+    }
+
+    /// <summary>
+    /// The <see cref="ComponentDataStore"/> stores a contiguous array of one specific component where the <see cref="LayoutHandle.Index"/> maps to the data for that node.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    struct ComponentDataStore : IDisposable
+    {
+        /// <summary>
+        /// The allocator to use for the chunk storage.
+        /// </summary>
+        public Allocator Allocator;
+
+        /// <summary>
+        /// The size of the component.
+        /// </summary>
+        public int Size;
+
+        /// <summary>
+        /// The number of elements per chunk.
+        /// </summary>
+        public int ComponentCountPerChunk;
+
+        /// <summary>
+        /// The number of allocated chunks.
+        /// </summary>
+        public int ChunkCount;
+
+        /// <summary>
+        /// The component data ptr.
+        /// </summary>
+        [NativeDisableUnsafePtrRestriction] Chunk* m_Chunks;
+
+        public ComponentDataStore(int size, Allocator allocator)
+        {
+            Allocator = allocator;
+            Size = size;
+            ComponentCountPerChunk = k_ChunkSize / size;
+            ChunkCount = 0;
+            m_Chunks = null;
+        }
+
+        public void Dispose()
+        {
+            if (null == m_Chunks)
+                return;
+
+            for (var i = 0; i < ChunkCount; i++)
+                UnsafeUtility.Free(m_Chunks[i].Buffer, Allocator);
+
+            UnsafeUtility.Free(m_Chunks, Allocator);
+
+            ChunkCount = 0;
+            m_Chunks = null;
+        }
+
+        public byte* GetComponentDataPtr(int index)
+        {
+            var chunkIndex = index / ComponentCountPerChunk;
+            var indexInChunk = index % ComponentCountPerChunk;
+
+            return m_Chunks[chunkIndex].Buffer + indexInChunk * Size;
+        }
+
+        public void EnsureCapacity(int capacity)
+        {
+            var newChunkCount = capacity / ComponentCountPerChunk + 1;
+
+            if (newChunkCount > ChunkCount)
+            {
+                // Grow the chunk ptr array.
+                m_Chunks = (Chunk*)ResizeArray(m_Chunks, ChunkCount, newChunkCount, UnsafeUtility.SizeOf<Chunk>(), UnsafeUtility.AlignOf<Chunk>(), Allocator);
+
+                // Allocate new chunks.
+                for (var i = ChunkCount; i<newChunkCount; i++)
+                {
+                    m_Chunks[i] = new Chunk
+                    {
+                        Buffer = (byte*)UnsafeUtility.Malloc(k_ChunkSize, 4, Allocator)
+                    };
+                }
+
+                ChunkCount = newChunkCount;
+            }
+        }
+
+        public void ResizeCapacity(int capacity)
+        {
+            var newChunkCount = capacity / ComponentCountPerChunk + 1;
+
+            if (newChunkCount > ChunkCount)
+            {
+                // Grow the chunk ptr array.
+                m_Chunks = (Chunk*)ResizeArray(m_Chunks, ChunkCount, newChunkCount, UnsafeUtility.SizeOf<Chunk>(), UnsafeUtility.AlignOf<Chunk>(), Allocator);
+
+                // Allocate new chunks.
+                for (var i = ChunkCount; i<newChunkCount; i++)
+                {
+                    m_Chunks[i] = new Chunk
+                    {
+                        Buffer = (byte*)UnsafeUtility.Malloc(k_ChunkSize, 4, Allocator)
+                    };
+                }
+            }
+            else if (newChunkCount < ChunkCount)
+            {
+                // Free up allocated chunks.
+                for (var i = ChunkCount - 1; i >= newChunkCount; i--)
+                {
+                    UnsafeUtility.Free(m_Chunks[i].Buffer, Allocator);
+                }
+
+                // Shrink down the chunk ptr array.
+                m_Chunks = (Chunk*)ResizeArray(m_Chunks, ChunkCount, newChunkCount, UnsafeUtility.SizeOf<Chunk>(), UnsafeUtility.AlignOf<Chunk>(), Allocator);
+            }
+
+            ChunkCount = newChunkCount;
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct Data
+    {
+        public int Capacity;
+        public int NextFreeIndex;
+        public int ComponentCount;
+
+        [NativeDisableUnsafePtrRestriction] public int* Versions;
+        [NativeDisableUnsafePtrRestriction] public ComponentDataStore* Components;
+    }
+
+    readonly Allocator m_Allocator;
+    [NativeDisableUnsafePtrRestriction] Data* m_Data;
+
+    public bool IsValid => null != m_Data;
+
+    public int Capacity => m_Data->Capacity;
+
+    public LayoutDataStore(ComponentType[] components, int initialCapacity, Allocator allocator)
+    {
+        Assert.IsTrue(components.Length > 0, $"{nameof(LayoutDataStore)} requires at least one component size.");
+        Assert.IsTrue(components[0].Size >= sizeof(int), $"{nameof(LayoutDataStore)} requires a minimum element size of {sizeof(int)} to alias");
+
+        m_Allocator = allocator;
+        m_Data = (Data*)UnsafeUtility.Malloc(UnsafeUtility.SizeOf<Data>(), UnsafeUtility.AlignOf<Data>(), m_Allocator);
+        UnsafeUtility.MemClear(m_Data, UnsafeUtility.SizeOf<Data>());
+
+        m_Data->ComponentCount = components.Length;
+        m_Data->Components = (ComponentDataStore*)UnsafeUtility.Malloc(UnsafeUtility.SizeOf<ComponentDataStore>() * components.Length, UnsafeUtility.AlignOf<ComponentDataStore>(), allocator);
+
+        for (var i = 0; i < components.Length; i++)
+        {
+            m_Data->Components[i] = new ComponentDataStore(components[i].Size, allocator);
+        }
+
+        ResizeCapacity(initialCapacity);
+
+        m_Data->NextFreeIndex = 0;
+    }
+
+    public void Dispose()
+    {
+        for (var i = 0; i < m_Data->ComponentCount; i++)
+            m_Data->Components[i].Dispose();
+
+        UnsafeUtility.Free(m_Data->Versions, m_Allocator);
+        UnsafeUtility.Free(m_Data->Components, m_Allocator);
+        UnsafeUtility.Free(m_Data, m_Allocator);
+
+        m_Data = null;
+    }
+
+    public bool Exists(in LayoutHandle handle)
+    {
+        if ((uint)handle.Index >= m_Data->Capacity)
+            return false;
+
+        return m_Data->Versions[handle.Index] == handle.Version;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal readonly void* GetComponentDataPtr(int index, int componentIndex)
+    {
+        return m_Data->Components[componentIndex].GetComponentDataPtr(index);
+    }
+
+    public LayoutHandle Allocate()
+    {
+        return Allocate(null, 0);
+    }
+
+    LayoutHandle Allocate(byte** data, int count)
+    {
+        // Fetch the next available index. This is the element we are about to initialize.
+        var index = m_Data->NextFreeIndex;
+
+        // Fetch the next element in the chain before we overwrite the node data.
+        var nextIndex = GetNextFreeIndex(m_Data->Components, index);
+
+        if (nextIndex == -1)
+        {
+            // This element is the last in the chain. Initiate a resize.
+            IncreaseCapacity();
+
+            // At this point we now have our next index ready. Retrieve it before we overwrite the node data.
+            nextIndex = GetNextFreeIndex(m_Data->Components, index);
+        }
+
+        var version = m_Data->Versions[index];
+
+        m_Data->NextFreeIndex = nextIndex;
+
+        for (var i = 0; i < count; i++)
+        {
+            var ptr = m_Data->Components[i].GetComponentDataPtr(index);
+            UnsafeUtility.MemCpy(ptr, data[i], m_Data->Components[i].Size);
+        }
+
+        return new LayoutHandle(index, version);
+    }
+
+    public void Free(in LayoutHandle handle)
+    {
+        if (!Exists(handle))
+            throw new InvalidOperationException($"Failed to Free handle with Index={handle.Index} Version={handle.Version}");
+
+        m_Data->Versions[handle.Index]++;
+        SetNextFreeIndex(m_Data->Components, handle.Index, m_Data->NextFreeIndex);
+        m_Data->NextFreeIndex = handle.Index;
+    }
+
+    static void SetNextFreeIndex(ComponentDataStore* ptr, int index, int value)
+    {
+        *(int*)ptr->GetComponentDataPtr(index) = value;
+    }
+
+    static int GetNextFreeIndex(ComponentDataStore* ptr, int index)
+    {
+        return *(int*)ptr->GetComponentDataPtr(index);
+    }
+
+    void IncreaseCapacity()
+    {
+        ResizeCapacity((int) (m_Data->Capacity * 1.5f));
+    }
+
+    void ResizeCapacity(int capacity)
+    {
+        Assert.IsTrue(capacity > 0);
+
+        m_Data->Versions = (int*)ResizeArray(m_Data->Versions, m_Data->Capacity, capacity, sizeof(int), 4, m_Allocator);
+
+        for (var i=0; i<m_Data->ComponentCount; i++)
+            m_Data->Components[i].ResizeCapacity(capacity);
+
+        // Start one element back to maintain the linked list.
+        var start = m_Data->Capacity > 0 ? m_Data->Capacity - 1 : 0;
+
+        for (var i = start; i < capacity; i++)
+        {
+            m_Data->Versions[i] = 1;
+
+            // Create a linked list of free elements using the first 4 bytes of the data structure.
+            SetNextFreeIndex(m_Data->Components, i, i + 1);
+        }
+
+        // The last element receives a special index indicating we are at the end of the array and should resize.
+        SetNextFreeIndex(m_Data->Components, capacity - 1, -1);
+        m_Data->Capacity = capacity;
+    }
+
+    static void* ResizeArray(void* fromPtr, long fromCount, long toCount, long size, int align, Allocator allocator)
+    {
+        Assert.IsTrue(toCount > 0);
+
+        var toPtr = UnsafeUtility.Malloc(size * toCount, align, allocator);
+        Assert.IsTrue(toPtr != null);
+
+        if (fromCount <= 0)
+            return toPtr;
+
+        var countToCopy = toCount < fromCount ? toCount : fromCount;
+        var bytesToCopy = countToCopy * size;
+
+        UnsafeUtility.MemCpy(toPtr, fromPtr, bytesToCopy);
+        UnsafeUtility.Free(fromPtr, allocator);
+
+        return toPtr;
+    }
+
+    public LayoutHandle Allocate<T0>(in T0 component0) where T0 : unmanaged
+    {
+        fixed (T0* ptr0 = &component0)
+        {
+            var data = stackalloc byte*[1];
+
+            data[0] = (byte*)ptr0;
+
+            return Allocate(data, 1);
+        }
+    }
+
+    public LayoutHandle Allocate<T0, T1, T2>(in T0 component0, in T1 component1, in T2 component2)
+        where T0 : unmanaged
+        where T1 : unmanaged
+        where T2 : unmanaged
+    {
+        fixed (T0* ptr0 = &component0)
+        fixed (T1* ptr1 = &component1)
+        fixed (T2* ptr2 = &component2)
+        {
+            var data = stackalloc byte*[3];
+
+            data[0] = (byte*)ptr0;
+            data[1] = (byte*)ptr1;
+            data[2] = (byte*)ptr2;
+
+            return Allocate(data, 3);
+        }
+    }
+
+    public LayoutHandle Allocate<T0, T1, T2, T3>(in T0 component0, in T1 component1, in T2 component2, in T3 component3)
+        where T0 : unmanaged
+        where T1 : unmanaged
+        where T2 : unmanaged
+        where T3 : unmanaged
+    {
+        fixed (T0* ptr0 = &component0)
+        fixed (T1* ptr1 = &component1)
+        fixed (T2* ptr2 = &component2)
+        fixed (T3* ptr3 = &component3)
+        {
+            var data = stackalloc byte*[4];
+
+            data[0] = (byte*)ptr0;
+            data[1] = (byte*)ptr1;
+            data[2] = (byte*)ptr2;
+            data[3] = (byte*)ptr3;
+
+            return Allocate(data, 4);
+        }
+    }
+
+    public LayoutHandle Allocate<T0, T1, T2, T3, T4>(in T0 component0, in T1 component1, in T2 component2, in T3 component3, in T4 component4)
+        where T0 : unmanaged
+        where T1 : unmanaged
+        where T2 : unmanaged
+        where T3 : unmanaged
+        where T4 : unmanaged
+    {
+        fixed (T0* ptr0 = &component0)
+        fixed (T1* ptr1 = &component1)
+        fixed (T2* ptr2 = &component2)
+        fixed (T3* ptr3 = &component3)
+        fixed (T4* ptr4 = &component4)
+        {
+            var data = stackalloc byte*[5];
+
+            data[0] = (byte*)ptr0;
+            data[1] = (byte*)ptr1;
+            data[2] = (byte*)ptr2;
+            data[3] = (byte*)ptr3;
+            data[4] = (byte*)ptr4;
+
+            return Allocate(data, 5);
+        }
+    }
+
+    public LayoutHandle Allocate<T0, T1, T2, T3, T4, T5>(in T0 component0, in T1 component1, in T2 component2, in T3 component3, in T4 component4, in T5 component5)
+        where T0 : unmanaged
+        where T1 : unmanaged
+        where T2 : unmanaged
+        where T3 : unmanaged
+        where T4 : unmanaged
+        where T5 : unmanaged
+    {
+        fixed (T0* ptr0 = &component0)
+        fixed (T1* ptr1 = &component1)
+        fixed (T2* ptr2 = &component2)
+        fixed (T3* ptr3 = &component3)
+        fixed (T4* ptr4 = &component4)
+        fixed (T5* ptr5 = &component5)
+        {
+            var data = stackalloc byte*[6];
+
+            data[0] = (byte*)ptr0;
+            data[1] = (byte*)ptr1;
+            data[2] = (byte*)ptr2;
+            data[3] = (byte*)ptr3;
+            data[4] = (byte*)ptr4;
+            data[5] = (byte*)ptr5;
+
+            return Allocate(data, 6);
+        }
+    }
+
+    public LayoutHandle Allocate<T0, T1, T2, T3, T4, T5, T6>(in T0 component0, in T1 component1, in T2 component2, in T3 component3, in T4 component4, in T5 component5, in T6 component6)
+        where T0 : unmanaged
+        where T1 : unmanaged
+        where T2 : unmanaged
+        where T3 : unmanaged
+        where T4 : unmanaged
+        where T5 : unmanaged
+        where T6 : unmanaged
+    {
+        fixed (T0* ptr0 = &component0)
+        fixed (T1* ptr1 = &component1)
+        fixed (T2* ptr2 = &component2)
+        fixed (T3* ptr3 = &component3)
+        fixed (T4* ptr4 = &component4)
+        fixed (T5* ptr5 = &component5)
+        fixed (T6* ptr6 = &component6)
+        {
+            var data = stackalloc byte*[7];
+
+            data[0] = (byte*)ptr0;
+            data[1] = (byte*)ptr1;
+            data[2] = (byte*)ptr2;
+            data[3] = (byte*)ptr3;
+            data[4] = (byte*)ptr4;
+            data[5] = (byte*)ptr5;
+            data[6] = (byte*)ptr6;
+
+            return Allocate(data, 7);
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutNodeData.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutNodeData.cs
new file mode 100644
index 0000000000..88f1ef410a
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutNodeData.cs
@@ -0,0 +1,26 @@
+// 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.InteropServices;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+struct LayoutNodeData
+{
+    public FixedBuffer2<LayoutValue> ResolvedDimensions;
+
+    public bool IsDirty;
+    public bool HasNewLayout;
+    public int ManagedMeasureFunctionIndex;
+    public int ManagedBaselineFunctionIndex;
+    public int ManagedOwnerIndex;
+    public int LineIndex;
+
+    public LayoutHandle Config;
+    public LayoutHandle Parent;
+    public LayoutHandle NextChild;
+
+    public LayoutList<LayoutHandle> Children;
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutStyleData.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutStyleData.cs
new file mode 100644
index 0000000000..bf33b42736
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/Components/LayoutStyleData.cs
@@ -0,0 +1,89 @@
+// 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.InteropServices;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+struct LayoutStyleData
+{
+    public static LayoutStyleData Default = new()
+    {
+        Direction = LayoutDirection.Inherit,
+        FlexDirection = LayoutFlexDirection.Column,
+        JustifyContent = LayoutJustify.FlexStart,
+        AlignContent = LayoutAlign.Auto,
+        AlignItems = LayoutAlign.Stretch,
+        AlignSelf = LayoutAlign.Auto,
+        PositionType = LayoutPositionType.Relative,
+        AspectRatio = float.NaN,
+
+        FlexWrap = LayoutWrap.NoWrap,
+        Overflow = LayoutOverflow.Visible,
+        Display = LayoutDisplay.Flex,
+        Flex = float.NaN,
+        FlexGrow = float.NaN,
+        FlexShrink = float.NaN,
+        FlexBasis = LayoutValue.Auto()
+    };
+
+    public LayoutDirection Direction;
+    public LayoutFlexDirection FlexDirection;
+    public LayoutJustify JustifyContent;
+    public LayoutAlign AlignContent;
+    public LayoutAlign AlignItems;
+    public LayoutAlign AlignSelf;
+    public LayoutPositionType PositionType;
+    public float AspectRatio;
+
+    public LayoutWrap FlexWrap;
+    public LayoutOverflow Overflow;
+    public LayoutDisplay Display;
+    public float Flex;
+    public float FlexGrow;
+    public float FlexShrink;
+    public LayoutValue FlexBasis;
+}
+
+[StructLayout(LayoutKind.Sequential)]
+struct LayoutStyleBorderData
+{
+    public static LayoutStyleBorderData Default = new()
+    {
+        border = LayoutDefaults.EdgeValuesUnit,
+        position = LayoutDefaults.EdgeValuesUnit
+    };
+
+    public FixedBuffer9<LayoutValue> border;
+    public FixedBuffer9<LayoutValue> position;
+}
+
+[StructLayout(LayoutKind.Sequential)]
+struct LayoutStyleMarginData
+{
+    public static LayoutStyleMarginData Default = new()
+    {
+        margin = LayoutDefaults.EdgeValuesUnit,
+        padding = LayoutDefaults.EdgeValuesUnit
+    };
+
+    public FixedBuffer9<LayoutValue> margin;
+    public FixedBuffer9<LayoutValue> padding;
+}
+
+[StructLayout(LayoutKind.Sequential)]
+struct LayoutStyleDimensionData
+{
+    public static LayoutStyleDimensionData Default = new()
+    {
+        dimensions = LayoutDefaults.DimensionValuesAutoUnit,
+        minDimensions = LayoutDefaults.DimensionValuesUnit,
+        maxDimensions = LayoutDefaults.DimensionValuesUnit
+    };
+
+    public FixedBuffer2<LayoutValue> maxDimensions;
+    public FixedBuffer2<LayoutValue> minDimensions;
+    public FixedBuffer2<LayoutValue> dimensions;
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/FixedBuffer.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/FixedBuffer.cs
new file mode 100644
index 0000000000..843c224f93
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/FixedBuffer.cs
@@ -0,0 +1,170 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+// ReSharper disable FieldCanBeMadeReadOnly.Local
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+unsafe struct FixedBuffer2<T> where T : unmanaged
+{
+    T __0;
+    T __1;
+
+    public const int Length = 2;
+
+    public ref T this[int index]
+    {
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        get
+        {
+            if (index < 0 || index >= Length)
+                throw new IndexOutOfRangeException(nameof(index));
+
+            fixed (void* ptr = &this)
+            {
+                var p = (T*) ptr;
+                return ref p[index];
+            }
+        }
+    }
+}
+
+[StructLayout(LayoutKind.Sequential)]
+unsafe struct FixedBuffer4<T> where T : unmanaged
+{
+    T __0;
+    T __1;
+    T __2;
+    T __3;
+
+    public FixedBuffer4(T x, T y, T z, T w)
+    {
+        __0 = x;
+        __1 = y;
+        __2 = z;
+        __3 = w;
+    }
+
+    public const int Length = 4;
+
+    public ref T this[int index]
+    {
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        get
+        {
+            if (index < 0 || index >= Length)
+                throw new IndexOutOfRangeException(nameof(index));
+
+            fixed (void* ptr = &this)
+            {
+                var p = (T*) ptr;
+                return ref p[index];
+            }
+        }
+    }
+}
+
+[StructLayout(LayoutKind.Sequential)]
+unsafe struct FixedBuffer6<T> where T : unmanaged
+{
+    T __0;
+    T __1;
+    T __2;
+    T __3;
+    T __4;
+    T __5;
+
+    public const int Length = 6;
+
+    public ref T this[int index]
+    {
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        get
+        {
+            if (index < 0 || index >= Length)
+                throw new IndexOutOfRangeException(nameof(index));
+
+            fixed (void* ptr = &this)
+            {
+                var p = (T*) ptr;
+                return ref p[index];
+            }
+        }
+    }
+}
+
+[StructLayout(LayoutKind.Sequential)]
+unsafe struct FixedBuffer9<T> where T : unmanaged
+{
+    T __0;
+    T __1;
+    T __2;
+    T __3;
+    T __4;
+    T __5;
+    T __6;
+    T __7;
+    T __8;
+
+    public const int Length = 9;
+
+    public ref T this[int index]
+    {
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        get
+        {
+            if (index is < 0 or >= Length)
+                throw new IndexOutOfRangeException(nameof(index));
+
+            fixed (void* ptr = &this)
+            {
+                var p = (T*) ptr;
+                return ref p[index];
+            }
+        }
+    }
+}
+
+[StructLayout(LayoutKind.Sequential)]
+unsafe struct FixedBuffer16<T> where T : unmanaged
+{
+    T __0;
+    T __1;
+    T __2;
+    T __3;
+    T __4;
+    T __5;
+    T __6;
+    T __7;
+    T __8;
+    T __9;
+    T _10;
+    T _11;
+    T _12;
+    T _13;
+    T _14;
+    T _15;
+
+    public const int Length = 16;
+
+    public ref T this[int index]
+    {
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        get
+        {
+            if (index is < 0 or >= Length)
+                throw new IndexOutOfRangeException(nameof(index));
+
+            fixed (void* ptr = &this)
+            {
+                var p = (T*) ptr;
+                return ref p[index];
+            }
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutAlign.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutAlign.cs
new file mode 100644
index 0000000000..bb4611de6b
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutAlign.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
+
+namespace UnityEngine.UIElements.Layout;
+
+enum LayoutAlign
+{
+    Auto,
+    FlexStart,
+    Center,
+    FlexEnd,
+    Stretch,
+    Baseline,
+    SpaceBetween,
+    SpaceAround,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDefaults.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDefaults.cs
new file mode 100644
index 0000000000..44687e92e8
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDefaults.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
+
+namespace UnityEngine.UIElements.Layout;
+
+struct LayoutDefaults
+{
+    public static readonly FixedBuffer9<LayoutValue> EdgeValuesUnit = new FixedBuffer9<LayoutValue>
+    {
+        [0] = LayoutValue.Undefined(),
+        [1] = LayoutValue.Undefined(),
+        [2] = LayoutValue.Undefined(),
+        [3] = LayoutValue.Undefined(),
+        [4] = LayoutValue.Undefined(),
+        [5] = LayoutValue.Undefined(),
+        [6] = LayoutValue.Undefined(),
+        [7] = LayoutValue.Undefined(),
+        [8] = LayoutValue.Undefined(),
+    };
+
+    public static readonly float[] DimensionValues = {float.NaN, float.NaN};
+
+    public static readonly FixedBuffer2<LayoutValue> DimensionValuesUnit = new FixedBuffer2<LayoutValue>
+    {
+        [0] = LayoutValue.Undefined(),
+        [1] = LayoutValue.Undefined()
+    };
+
+    public static readonly FixedBuffer2<LayoutValue> DimensionValuesAutoUnit = new FixedBuffer2<LayoutValue>
+    {
+        [0] = LayoutValue.Auto(),
+        [1] = LayoutValue.Auto()
+    };
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDimension.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDimension.cs
new file mode 100644
index 0000000000..95c63b2ee1
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDimension.cs
@@ -0,0 +1,11 @@
+// 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.Layout;
+
+enum LayoutDimension
+{
+    Width,
+    Height,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDirection.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDirection.cs
new file mode 100644
index 0000000000..3bf2af1bb3
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDirection.cs
@@ -0,0 +1,12 @@
+// 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.Layout;
+
+enum LayoutDirection
+{
+    Inherit,
+    LTR,
+    RTL,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDisplay.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDisplay.cs
new file mode 100644
index 0000000000..74dfbe6be7
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutDisplay.cs
@@ -0,0 +1,11 @@
+// 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.Layout;
+
+enum LayoutDisplay
+{
+    Flex,
+    None,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutEdge.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutEdge.cs
new file mode 100644
index 0000000000..65a6a92e39
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutEdge.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
+
+namespace UnityEngine.UIElements.Layout;
+
+enum LayoutEdge
+{
+    Left,
+    Top,
+    Right,
+    Bottom,
+    Start,
+    End,
+    Horizontal,
+    Vertical,
+    All,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutFlexDirection.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutFlexDirection.cs
new file mode 100644
index 0000000000..1d5c05dd8e
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutFlexDirection.cs
@@ -0,0 +1,13 @@
+// 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.Layout;
+
+enum LayoutFlexDirection
+{
+    Column,
+    ColumnReverse,
+    Row,
+    RowReverse,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutJustify.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutJustify.cs
new file mode 100644
index 0000000000..c4448be062
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutJustify.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
+
+namespace UnityEngine.UIElements.Layout;
+
+enum LayoutJustify
+{
+    FlexStart,
+    Center,
+    FlexEnd,
+    SpaceBetween,
+    SpaceAround,
+    SpaceEvenly,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutList.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutList.cs
new file mode 100644
index 0000000000..758cbc2997
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutList.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;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
+using UnityEngine.Assertions;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+unsafe struct LayoutList<T> : IDisposable
+    where T : unmanaged
+{
+    [StructLayout(LayoutKind.Sequential)]
+    struct Data
+    {
+        public int Capacity;
+        public int Count;
+        public T* Values;
+    }
+
+    readonly Allocator m_Allocator;
+    Data* m_Data;
+
+    public int Count => m_Data->Count;
+
+    public bool IsCreated => null != m_Data;
+
+    public ref T this[int index]
+    {
+        get
+        {
+            if ((uint)index > m_Data->Count)
+                throw new ArgumentOutOfRangeException();
+
+            return ref m_Data->Values[index];
+        }
+    }
+
+    public LayoutList(int initialCapacity, Allocator allocator)
+    {
+        m_Allocator = allocator;
+        m_Data = (Data*)UnsafeUtility.Malloc(UnsafeUtility.SizeOf<Data>(), UnsafeUtility.AlignOf<Data>(), allocator);
+        Assert.IsTrue(m_Data != null);
+        UnsafeUtility.MemClear(m_Data, UnsafeUtility.SizeOf<Data>());
+        ResizeCapacity(initialCapacity);
+    }
+
+    public void Dispose()
+    {
+        if (null == m_Data)
+            return;
+
+        if (m_Data->Values != null)
+            UnsafeUtility.Free(m_Data->Values, m_Allocator);
+
+        UnsafeUtility.Free(m_Data, m_Allocator);
+        m_Data = null;
+    }
+
+    public void Insert(int index, T value)
+    {
+        if ((uint)index > m_Data->Count)
+            throw new ArgumentOutOfRangeException();
+
+        if (m_Data->Capacity == m_Data->Count)
+            IncreaseCapacity();
+
+        if (index < m_Data->Count)
+        {
+            // Shift elements to make space.
+            UnsafeUtility.MemMove(m_Data->Values + index + 1, m_Data->Values + index, UnsafeUtility.SizeOf<T>() * (m_Data->Count - index));
+        }
+
+        m_Data->Values[index] = value;
+        m_Data->Count++;
+    }
+
+    public int IndexOf(T value)
+    {
+        var count = m_Data->Count;
+
+        var src = &value;
+        var ptr = m_Data->Values;
+        var size = UnsafeUtility.SizeOf<T>();
+
+        for (var i = 0; i < count; i++, ptr++)
+        {
+            if (UnsafeUtility.MemCmp(ptr, src, size) == 0)
+                return i;
+        }
+
+        return -1;
+    }
+
+    public void RemoveAt(int index)
+    {
+        if ((uint)index >= m_Data->Count)
+            throw new ArgumentOutOfRangeException();
+
+        m_Data->Count--;
+
+        UnsafeUtility.MemMove(m_Data->Values + index, m_Data->Values + index + 1, UnsafeUtility.SizeOf<T>() * (m_Data->Count - index));
+        m_Data->Values[m_Data->Count] = default;
+    }
+
+    public void Clear()
+    {
+        m_Data->Count = 0;
+    }
+
+    void IncreaseCapacity()
+    {
+        EnsureCapacity(m_Data->Capacity * 2);
+    }
+
+    void EnsureCapacity(int capacity)
+    {
+        if (capacity <= m_Data->Capacity)
+            return;
+
+        ResizeCapacity(capacity);
+    }
+
+    void ResizeCapacity(int capacity)
+    {
+        Assert.IsTrue(capacity > 0);
+        m_Data->Values = (T*)ResizeArray(m_Data->Values, m_Data->Capacity, capacity, UnsafeUtility.SizeOf<T>(), UnsafeUtility.AlignOf<T>(), m_Allocator);
+        m_Data->Capacity = capacity;
+    }
+
+    static void* ResizeArray(void* fromPtr, long fromCount, long toCount, long size, int align, Allocator allocator)
+    {
+        Assert.IsTrue(toCount > 0);
+
+        var toPtr = UnsafeUtility.Malloc(size * toCount, align, allocator);
+        Assert.IsTrue(toPtr != null);
+
+        if (fromCount <= 0)
+            return toPtr;
+
+        var countToCopy = toCount < fromCount ? toCount : fromCount;
+        var bytesToCopy = countToCopy * size;
+
+        UnsafeUtility.MemCpy(toPtr, fromPtr, bytesToCopy);
+        UnsafeUtility.Free(fromPtr, allocator);
+
+        return toPtr;
+    }
+
+    public Enumerator GetEnumerator()
+    {
+        return new Enumerator(this);
+    }
+
+    public struct Enumerator : IEnumerator<T>
+    {
+        LayoutList<T> m_List;
+        int m_Index;
+        T m_Current;
+
+        public T Current => m_Current;
+        object IEnumerator.Current => m_Current;
+
+        public Enumerator(LayoutList<T> list)
+        {
+            m_List = list;
+            m_Index = 0;
+            m_Current = default;
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public bool MoveNext()
+        {
+            if (!m_List.IsCreated)
+            {
+                m_Current = default;
+                return false;
+            }
+
+            if ((uint)m_Index >= m_List.Count)
+            {
+                m_Current = default;
+                return false;
+            }
+
+            m_Current = m_List[m_Index];
+            m_Index++;
+            return true;
+        }
+
+        public void Reset()
+        {
+            m_Index = 0;
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutLogLevel.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutLogLevel.cs
new file mode 100644
index 0000000000..776ec3c79c
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutLogLevel.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
+
+namespace UnityEngine.UIElements.Layout;
+
+enum LayoutLogLevel
+{
+    Error,
+    Warn,
+    Info,
+    Debug,
+    Verbose,
+    Fatal,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutMeasureMode.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutMeasureMode.cs
new file mode 100644
index 0000000000..d74123e8d2
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutMeasureMode.cs
@@ -0,0 +1,13 @@
+// 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.Layout;
+
+enum LayoutMeasureMode
+{
+    Undefined = 0,
+    Exactly = 1,
+    AtMost = 2,
+    Invalid = -1
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutNodeType.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutNodeType.cs
new file mode 100644
index 0000000000..485a3cb18c
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutNodeType.cs
@@ -0,0 +1,11 @@
+// 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.Layout;
+
+enum LayoutNodeType
+{
+    Default,
+    Text,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutOverflow.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutOverflow.cs
new file mode 100644
index 0000000000..ef9e144c37
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutOverflow.cs
@@ -0,0 +1,12 @@
+// 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.Layout;
+
+enum LayoutOverflow
+{
+    Visible,
+    Hidden,
+    Scroll,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutPositionType.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutPositionType.cs
new file mode 100644
index 0000000000..0c52986a96
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutPositionType.cs
@@ -0,0 +1,11 @@
+// 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.Layout;
+
+enum LayoutPositionType
+{
+    Relative,
+    Absolute,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutPrintOptions.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutPrintOptions.cs
new file mode 100644
index 0000000000..64b911b9af
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutPrintOptions.cs
@@ -0,0 +1,13 @@
+// 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.Layout;
+
+[System.Flags]
+enum LayoutPrintOptions
+{
+    Layout = 1,
+    Style = 2,
+    Children = 4,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutSize.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutSize.cs
new file mode 100644
index 0000000000..eebd9cba7d
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutSize.cs
@@ -0,0 +1,20 @@
+// 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.InteropServices;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+struct LayoutSize
+{
+    public float width;
+    public float height;
+
+    public LayoutSize(float width, float height)
+    {
+        this.width = width;
+        this.height = height;
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutUnit.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutUnit.cs
new file mode 100644
index 0000000000..08ab41df69
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutUnit.cs
@@ -0,0 +1,13 @@
+// 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.Layout;
+
+enum LayoutUnit
+{
+    Undefined,
+    Point,
+    Percent,
+    Auto,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutValue.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutValue.cs
new file mode 100644
index 0000000000..7c19103a93
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutValue.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.Runtime.InteropServices;
+
+namespace UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+struct LayoutValue
+{
+    float value;
+    LayoutUnit unit;
+
+    public LayoutUnit Unit => unit;
+    public float Value => value;
+
+    public static LayoutValue Point(float value)
+    {
+        return new LayoutValue
+        {
+            value = value,
+            unit = float.IsNaN(value) ? LayoutUnit.Undefined : LayoutUnit.Point
+        };
+    }
+
+    public bool Equals(LayoutValue other)
+    {
+        return Unit == other.Unit && (Value.Equals(other.Value) || Unit == LayoutUnit.Undefined);
+    }
+
+    public override bool Equals(object obj)
+    {
+        if (ReferenceEquals(null, obj)) return false;
+        return obj is LayoutValue yogaValue && Equals(yogaValue);
+    }
+
+    public override int GetHashCode()
+    {
+        unchecked
+        {
+            return (Value.GetHashCode() * 397) ^ (int) Unit;
+        }
+    }
+
+    public static LayoutValue Undefined()
+    {
+        return new LayoutValue
+        {
+            value = float.NaN,
+            unit = LayoutUnit.Undefined
+        };
+    }
+
+    public static LayoutValue Auto()
+    {
+        return new LayoutValue
+        {
+            value = float.NaN,
+            unit = LayoutUnit.Auto
+        };
+    }
+
+    public static LayoutValue Percent(float value)
+    {
+        return new LayoutValue
+        {
+            value = value,
+            unit = float.IsNaN(value) ? LayoutUnit.Undefined : LayoutUnit.Percent
+        };
+    }
+
+    public static implicit operator LayoutValue(float value)
+    {
+        return Point(value);
+    }
+}
+
+static class LayoutValueExtensions
+{
+    public static LayoutValue Percent(this float value)
+    {
+        return LayoutValue.Percent(value);
+    }
+
+    public static LayoutValue Pt(this float value)
+    {
+        return LayoutValue.Point(value);
+    }
+
+    public static LayoutValue Percent(this int value)
+    {
+        return LayoutValue.Percent(value);
+    }
+
+    public static LayoutValue Pt(this int value)
+    {
+        return LayoutValue.Point(value);
+    }
+}
+
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutWrap.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutWrap.cs
new file mode 100644
index 0000000000..05bbcc2d37
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Model/LayoutWrap.cs
@@ -0,0 +1,12 @@
+// 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.Layout;
+
+enum LayoutWrap
+{
+    NoWrap,
+    Wrap,
+    WrapReverse,
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Native/LayoutNative.bindings.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Native/LayoutNative.bindings.cs
new file mode 100644
index 0000000000..f9e280aac0
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Native/LayoutNative.bindings.cs
@@ -0,0 +1,20 @@
+// 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 UnityEngine.UIElements.Layout;
+
+[NativeHeader("ModuleOverrides/com.unity.ui/Core/Layout/Native/LayoutNative.h")]
+static class LayoutNative
+{
+    [NativeMethod(IsThreadSafe = false)]
+    internal static extern void CalculateLayout(
+        IntPtr node,
+        float parentWidth,
+        float parentHeight,
+        int parentDirection,
+        IntPtr state);
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Layout/Native/LayoutProcessorNative.cs b/ModuleOverrides/com.unity.ui/Core/Layout/Native/LayoutProcessorNative.cs
new file mode 100644
index 0000000000..decce5ce06
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Layout/Native/LayoutProcessorNative.cs
@@ -0,0 +1,42 @@
+// 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 UnityEngine.UIElements.Layout;
+
+[StructLayout(LayoutKind.Sequential)]
+struct LayoutState
+{
+    public IntPtr measureFunctionCallback;
+    public IntPtr baselineFunctionCallback;
+
+    public uint depth;
+    public uint currentGenerationCount;
+
+    [MarshalAs(UnmanagedType.U1)] public bool error;
+
+    public static LayoutState Default => new LayoutState()
+    {
+        measureFunctionCallback = LayoutDelegates.s_InvokeMeasureFunction,
+        baselineFunctionCallback = LayoutDelegates.s_InvokeBaselineFunction
+    };
+}
+
+unsafe class LayoutProcessorNative : ILayoutProcessor
+{
+    LayoutState m_State = LayoutState.Default;
+
+    void ILayoutProcessor.CalculateLayout(LayoutNode node, float parentWidth, float parentHeight, LayoutDirection parentDirection)
+    {
+        var pNode = (IntPtr)(&node);
+
+        fixed (void* ptrState = &m_State)
+        {
+            var pState = (IntPtr) ptrState;
+            LayoutNative.CalculateLayout(pNode, parentWidth, parentHeight, (int)parentDirection, pState);
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Manipulators.cs b/ModuleOverrides/com.unity.ui/Core/Manipulators.cs
index 65393a9f52..9557635a27 100644
--- a/ModuleOverrides/com.unity.ui/Core/Manipulators.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Manipulators.cs
@@ -18,7 +18,7 @@ public interface IManipulator
     }
 
     /// <summary>
-    /// Base class for all Manipulator implementations.
+    /// Base class for all Manipulator implementations. For more information, refer to [[wiki:UIE-manipulators|Manipulators in User Manual]].
     /// </summary>
     public abstract class Manipulator : IManipulator
     {
diff --git a/ModuleOverrides/com.unity.ui/Core/Native/Renderer/UIRMeshBuilder.bindings.cs b/ModuleOverrides/com.unity.ui/Core/Native/Renderer/UIRMeshBuilder.bindings.cs
index df57a557b6..5d81b98a4b 100644
--- a/ModuleOverrides/com.unity.ui/Core/Native/Renderer/UIRMeshBuilder.bindings.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Native/Renderer/UIRMeshBuilder.bindings.cs
@@ -70,6 +70,8 @@ public struct NativeRectParams
             public int bottomSlice;
             public float sliceScale;
 
+            public Vector4 rectInset;
+
             public NativeColorPage colorPage;
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Native/UIElementsUtility.bindings.cs b/ModuleOverrides/com.unity.ui/Core/Native/UIElementsUtility.bindings.cs
index 16260cf9a8..5fcb572fb4 100644
--- a/ModuleOverrides/com.unity.ui/Core/Native/UIElementsUtility.bindings.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Native/UIElementsUtility.bindings.cs
@@ -17,6 +17,7 @@ internal static class UIElementsRuntimeUtilityNative
     {
         internal static Action RepaintOverlayPanelsCallback;
         internal static Action UpdateRuntimePanelsCallback;
+        internal static Action RepaintOffscreenPanelsCallback;
 
         [RequiredByNativeCode]
         public static void RepaintOverlayPanels()
@@ -30,6 +31,12 @@ public static void UpdateRuntimePanels()
             UpdateRuntimePanelsCallback?.Invoke();
         }
 
+        [RequiredByNativeCode]
+        public static void RepaintOffscreenPanels()
+        {
+            RepaintOffscreenPanelsCallback?.Invoke();
+        }
+
         public extern static void RegisterPlayerloopCallback();
         public extern static void UnregisterPlayerloopCallback();
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Panel.cs b/ModuleOverrides/com.unity.ui/Core/Panel.cs
index b9db05510e..33f32b7c6b 100644
--- a/ModuleOverrides/com.unity.ui/Core/Panel.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Panel.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Collections.Generic;
 using Unity.Profiling;
-using UnityEngine.Yoga;
+using UnityEngine.UIElements.Layout;
 
 namespace UnityEngine.UIElements
 {
@@ -58,6 +58,8 @@ internal enum VersionChangeType
         TransitionProperty = 1 << 15,
         // The combined registered callbacks' EventCategory values has changed
         EventCallbackCategories = 1 << 16,
+        // The DisableRendering flag has changed
+        DisableRendering = 1 << 17,
     }
 
     /// <summary>
@@ -233,6 +235,15 @@ public interface IPanel : IDisposable
         /// The Contextual menu manager for the panel.
         /// </summary>
         ContextualMenuManager contextualMenuManager { get; }
+
+
+        /// <summary>
+        /// This method returns true if any state was changed on an element of this panel since the last render of the panel.
+        /// </summary>
+        /// <remarks>
+        /// This method does not currently check for any binding that has to be updated, any currently pending transition, any referenced asset modified (like renderTexture, panelSettings or textSettings) 
+        /// </remarks>
+        bool isDirty { get; }
     }
 
     abstract class BaseVisualElementPanel : IPanel, IGroupBox
@@ -264,8 +275,8 @@ internal UIElementsBridge uiElementsBridge
 
         protected BaseVisualElementPanel()
         {
-            yogaConfig = new YogaConfig();
-            yogaConfig.UseWebDefaults = YogaConfig.Default.UseWebDefaults;
+            layoutConfig = LayoutManager.SharedManager.CreateConfig();
+            layoutConfig.UseWebDefaults = false;
             m_UIElementsBridge = new RuntimeUIElementsBridge();
         }
 
@@ -296,7 +307,7 @@ protected virtual void Dispose(bool disposing)
                 DisposeHelper.NotifyMissingDispose(this);
 
             panelDisposed?.Invoke(this);
-            yogaConfig = null;
+            LayoutManager.SharedManager.DestroyConfig(ref layoutConfig);
             disposed = true;
         }
 
@@ -329,7 +340,7 @@ internal float scale
 
                     //we need to update the yoga config
                     visualTree.IncrementVersion(VersionChangeType.Layout);
-                    yogaConfig.PointScaleFactor = scaledPixelsPerPoint;
+                    layoutConfig.PointScaleFactor = scaledPixelsPerPoint;
 
                     // if the surface DPI changes we need to invalidate styles
                     visualTree.IncrementVersion(VersionChangeType.StyleSheet);
@@ -338,7 +349,7 @@ internal float scale
         }
 
 
-        internal YogaConfig yogaConfig;
+        internal LayoutConfig layoutConfig;
 
         private float m_PixelsPerPoint = 1;
         internal float pixelsPerPoint
@@ -352,7 +363,7 @@ internal float pixelsPerPoint
 
                     //we need to update the yoga config
                     visualTree.IncrementVersion(VersionChangeType.Layout);
-                    yogaConfig.PointScaleFactor = scaledPixelsPerPoint;
+                    layoutConfig.PointScaleFactor = scaledPixelsPerPoint;
 
                     // if the surface DPI changes we need to invalidate styles
                     visualTree.IncrementVersion(VersionChangeType.StyleSheet);
@@ -419,7 +430,7 @@ internal uint vertexBudget
 
         internal bool duringLayoutPhase { get; set; }
 
-        internal bool isDirty
+        public bool isDirty
         {
             get
             {
@@ -1177,10 +1188,21 @@ internal bool drawToCameras
 
         internal int targetDisplay { get; set;}
 
-        internal int screenRenderingWidth => targetDisplay > 0 && targetDisplay < Display.displays.Length
-        ? Display.displays[targetDisplay].renderingWidth : Screen.width;
-        internal int screenRenderingHeight => targetDisplay > 0 && targetDisplay < Display.displays.Length
-        ? Display.displays[targetDisplay].renderingHeight : Screen.height;
+        internal int screenRenderingWidth => getScreenRenderingWidth(targetDisplay);
+        internal int screenRenderingHeight => getScreenRenderingHeight(targetDisplay);
+
+        // Expose common static method for getting the display/window resolution for calculation in the PanelSetting.
+        // Does not consider the gameView, so useless in the editor unless called directly after the render of a camera
+        internal static int getScreenRenderingHeight(int display)
+        {
+            return display >= 0 && display < Display.displays.Length ? Display.displays[display].renderingHeight : Screen.height;
+        }
+
+        internal static int getScreenRenderingWidth(int display)
+        {
+            return display >= 0 && display < Display.displays.Length ? Display.displays[display].renderingWidth : Screen.width;
+        }
+
 
         public override void Repaint(Event e)
         {
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRCommandManipulator.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRCommandManipulator.cs
index ef8cc687b2..dca00afe9e 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRCommandManipulator.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRCommandManipulator.cs
@@ -46,7 +46,7 @@ public static void ReplaceCommands(RenderChain renderChain, VisualElement ve, En
                 if (processor.firstHeadCommand != null)
                 {
                     if (!foundInsertionBounds)
-                        FindCommandInsertionPoint(ve, out prev, out next);
+                        FindHeadCommandInsertionPoint(ve, out prev, out next);
 
                     if (prev != null)
                     {
@@ -107,12 +107,12 @@ public static void ReplaceCommands(RenderChain renderChain, VisualElement ve, En
             }
         }
 
-        static void FindCommandInsertionPoint(VisualElement ve, out RenderChainCommand prev, out RenderChainCommand next)
+        static void FindHeadCommandInsertionPoint(VisualElement ve, out RenderChainCommand prev, out RenderChainCommand next)
         {
             VisualElement prevDrawingElem = ve.renderChainData.prev;
 
             // This can be potentially O(n) of VE count
-            // It is ok to check against lastCommand to mean the presence of tailCommand too, as we
+            // It is ok to check against lastHeadCommand to mean the presence of tailCommand too, as we
             // require that tail commands only exist if a head command exists too
             while (prevDrawingElem != null && prevDrawingElem.renderChainData.lastHeadCommand == null)
                 prevDrawingElem = prevDrawingElem.renderChainData.prev;
@@ -132,7 +132,7 @@ static void FindCommandInsertionPoint(VisualElement ve, out RenderChainCommand p
                     // Case C, get the last command that isn't owned by us, this is to skip potential
                     // tail commands wrapped after the previous drawing element
                     var lastCommand = prevDrawingElem.renderChainData.lastTailOrHeadCommand;
-                    for (;;)
+                    for (; ; )
                     {
                         prev = lastCommand;
                         lastCommand = lastCommand.next;
@@ -167,7 +167,7 @@ static void FindTailCommandInsertionPoint(VisualElement ve, out RenderChainComma
 
             // Depth first search for the first VE that has a command (i.e. non empty element).
             // This can be potentially O(n) of VE count
-            // It is ok to check against lastCommand to mean the presence of tailCommand too, as we
+            // It is ok to check against lastHeadCommand to mean the presence of tailCommand too, as we
             // require that tail commands only exist if a startup command exists too
             while (nextDrawingElem != null && nextDrawingElem.renderChainData.firstHeadCommand == null)
                 nextDrawingElem = nextDrawingElem.renderChainData.next;
@@ -186,7 +186,7 @@ static void FindTailCommandInsertionPoint(VisualElement ve, out RenderChainComma
                 else if (ve.IsParentOrAncestorOf(nextDrawingElem)) // Case B
                 {
                     // Enclose the last deepest drawing child by our tail command
-                    for (;;)
+                    for (; ; )
                     {
                         prev = nextDrawingElem.renderChainData.lastTailOrHeadCommand;
                         nextDrawingElem = prev.next?.owner;
@@ -281,5 +281,169 @@ public static void ResetCommands(RenderChain renderChain, VisualElement ve)
             }
             ve.renderChainData.firstTailCommand = ve.renderChainData.lastTailCommand = null;
         }
+
+        static void InjectCommandInBetween(RenderChain renderChain, RenderChainCommand cmd, RenderChainCommand prev, RenderChainCommand next)
+        {
+            if (prev != null)
+            {
+                cmd.prev = prev;
+                prev.next = cmd;
+            }
+            if (next != null)
+            {
+                cmd.next = next;
+                next.prev = cmd;
+            }
+            VisualElement ve = cmd.owner;
+
+            if (!cmd.isTail)
+            {
+                if (ve.renderChainData.firstHeadCommand == null || ve.renderChainData.firstHeadCommand == next)
+                    ve.renderChainData.firstHeadCommand = cmd;
+
+                if (ve.renderChainData.lastHeadCommand == null || ve.renderChainData.lastHeadCommand == prev)
+                    ve.renderChainData.lastHeadCommand = cmd;
+            }
+            else
+            {
+                if (ve.renderChainData.firstTailCommand == null || ve.renderChainData.firstTailCommand == next)
+                    ve.renderChainData.firstTailCommand = cmd;
+
+                if (ve.renderChainData.lastTailCommand == null || ve.renderChainData.lastTailCommand == prev)
+                    ve.renderChainData.lastTailCommand = cmd;
+            }
+            renderChain.OnRenderCommandAdded(cmd);
+
+        }
+
+        public static void DisableElementRendering(RenderChain renderChain, VisualElement ve, bool renderingDisabled)
+        {
+            if (!ve.renderChainData.isInChain)
+                return;
+
+            if (renderingDisabled)
+            {
+                if (ve.renderChainData.firstHeadCommand == null || ve.renderChainData.firstHeadCommand.type != CommandType.BeginDisable)
+                {
+                    var cmd = renderChain.AllocCommand();
+                    cmd.type = CommandType.BeginDisable;
+                    cmd.owner = ve;
+
+                    if (ve.renderChainData.firstHeadCommand == null)
+                    {
+                        FindHeadCommandInsertionPoint(ve, out var cmdPrev, out var cmdNext);
+                        InjectCommandInBetween(renderChain, cmd, cmdPrev, cmdNext);
+                    }
+                    else
+                    {
+                        // Need intermediate variable to pass by reference as it is modified
+                        var prev = ve.renderChainData.firstHeadCommand.prev;
+                        var next = ve.renderChainData.firstHeadCommand;
+                        var lastHeadCommand = ve.renderChainData.lastHeadCommand; // InjectCommandInBetween assumes we are adding the last command, witch is not the case now. Backup the value to restore after.
+                        Debug.Assert(lastHeadCommand != null);
+                        ve.renderChainData.firstHeadCommand = null; // will be replaced in InjectCommandInBetween
+                        InjectCommandInBetween(renderChain, cmd, prev, next);
+                        ve.renderChainData.lastHeadCommand = lastHeadCommand;
+                    }
+                }
+
+                if (ve.renderChainData.lastTailCommand == null || ve.renderChainData.lastTailCommand.type != CommandType.EndDisable)
+                {
+                    var cmd = renderChain.AllocCommand();
+                    cmd.type = CommandType.EndDisable;
+                    cmd.isTail = true;
+                    cmd.owner = ve;
+
+                    if (ve.renderChainData.lastTailCommand == null)
+                    {
+                        FindTailCommandInsertionPoint(ve, out var cmdPrev, out var cmdNext);
+                        InjectCommandInBetween(renderChain, cmd, cmdPrev, cmdNext);
+                    }
+                    else
+                    {
+                        // Need intermediate variable to pass by reference as it is modified
+                        var prev = ve.renderChainData.lastTailCommand;
+                        var next = ve.renderChainData.lastTailCommand.next;
+                        Debug.Assert(ve.renderChainData.firstTailCommand != null);
+                        InjectCommandInBetween(renderChain, cmd, prev, next);
+                    }
+                }
+            }
+            else
+            {
+
+                if (ve.renderChainData.firstHeadCommand != null && ve.renderChainData.firstHeadCommand.type == CommandType.BeginDisable)
+                    RemoveSingleCommand(renderChain, ve, ve.renderChainData.firstHeadCommand);
+
+                if (ve.renderChainData.lastTailCommand != null && ve.renderChainData.lastTailCommand.type == CommandType.EndDisable)
+                    RemoveSingleCommand(renderChain, ve, ve.renderChainData.lastTailCommand);
+            }
+
+        }
+
+        static void RemoveSingleCommand(RenderChain renderChain, VisualElement ve, RenderChainCommand cmd)
+        {
+            Debug.Assert(cmd != null);
+            Debug.Assert(cmd.owner == ve);
+            renderChain.OnRenderCommandsRemoved(cmd, cmd);
+            var prev = cmd.prev;
+            var next = cmd.next;
+            if (prev != null) prev.next = next;
+            if (next != null) next.prev = prev;
+
+            // Clean up renderChain head commands pointers in the VisualElement's renderChainData
+            if (ve.renderChainData.firstHeadCommand == cmd)
+            {
+                // is this the last Head command of the object
+                if (ve.renderChainData.firstHeadCommand == ve.renderChainData.lastHeadCommand)
+                {
+                    // Last command removed: extra checks
+                    Debug.Assert(cmd.prev?.owner != ve, "When removing the first head command, the command before this one in the queue should belong to an other parent");
+                    Debug.Assert(cmd.next?.owner != ve || cmd.next == ve.renderChainData.firstTailCommand); // It could be valid that there is a closing command if they get removed after this call.
+                    ve.renderChainData.firstHeadCommand = null;
+                    ve.renderChainData.lastHeadCommand = null;
+                }
+                else
+                {
+                    Debug.Assert(cmd.next.owner == ve);
+                    Debug.Assert(ve.renderChainData.lastHeadCommand != null);
+                    ve.renderChainData.firstHeadCommand = cmd.next;
+                }
+            }
+            else if (ve.renderChainData.lastHeadCommand == cmd)
+            {
+                Debug.Assert(cmd.prev.owner == ve);
+                Debug.Assert(ve.renderChainData.firstHeadCommand != null);
+                ve.renderChainData.lastHeadCommand = cmd.prev;
+            }
+
+
+            // Clean up renderChain Tail commands
+            if (ve.renderChainData.firstTailCommand == cmd)
+            {
+                //is this the last tailCommand?
+                if (ve.renderChainData.firstTailCommand == ve.renderChainData.lastTailCommand)
+                {
+                    // Last command removed: extra checks
+                    Debug.Assert(cmd.prev?.owner != ve || cmd.prev == ve.renderChainData.lastHeadCommand);
+                    Debug.Assert(cmd.next?.owner != ve);
+                    ve.renderChainData.firstTailCommand = null;
+                    ve.renderChainData.lastTailCommand = null;
+                }
+                else
+                {
+                    Debug.Assert(cmd.next.owner == ve);
+                    Debug.Assert(ve.renderChainData.lastTailCommand != null);
+                    ve.renderChainData.firstTailCommand = cmd.next;
+                }
+            }
+            else if (ve.renderChainData.lastTailCommand == cmd)
+            {
+                Debug.Assert(cmd.prev.owner == ve);
+                Debug.Assert(ve.renderChainData.firstTailCommand != null);
+                ve.renderChainData.lastTailCommand = cmd.prev;
+            }
+            renderChain.FreeCommand(cmd);
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRElementBuilder.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRElementBuilder.cs
index 359aeda61a..badd9e4b13 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRElementBuilder.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRElementBuilder.cs
@@ -13,6 +13,7 @@ abstract class BaseElementBuilder
         public void Build(MeshGenerationContext mgc)
         {
             var ve = mgc.visualElement;
+            Debug.Assert(ve.areAncestorsAndSelfDisplayed);
 
             bool isGroupTransform = (ve.renderHints & RenderHints.GroupTransform) == RenderHints.GroupTransform;
             if (isGroupTransform)
@@ -131,13 +132,19 @@ protected override void DrawVisualElementBackground(MeshGenerationContext mgc)
                 return;
 
             var style = ve.computedStyle;
-            if (style.backgroundColor != Color.clear)
+
+            // UUM-40007 Store the cached background color. This will prevent the DynamicColor from forcing a
+            // full repaint if the color didn't actually change.
+            var backgroundColor = style.backgroundColor;
+            ve.renderChainData.backgroundAlpha = backgroundColor.a;
+
+            if (backgroundColor.a > UIRUtility.k_Epsilon)
             {
                 // Draw solid color background
                 var rectParams = new MeshGenerator.RectangleParams
                 {
                     rect = ve.rect,
-                    color = style.backgroundColor,
+                    color = backgroundColor,
                     colorPage = ColorPage.Init(m_RenderChain, ve.renderChainData.backgroundColorID),
                     playmodeTintColor = ve.panel.contextType == ContextType.Editor ? UIElementsUtility.editorPlayModeTintColor : Color.white
                 };
@@ -147,7 +154,7 @@ protected override void DrawVisualElementBackground(MeshGenerationContext mgc)
                     out rectParams.topRightRadius,
                     out rectParams.bottomRightRadius);
 
-                MeshGenerator.AdjustBackgroundSizeForBorders(ve, ref rectParams.rect);
+                MeshGenerator.AdjustBackgroundSizeForBorders(ve, ref rectParams);
 
                 mgc.meshGenerator.DrawRectangle(rectParams);
             }
@@ -185,16 +192,28 @@ protected override void DrawVisualElementBackground(MeshGenerationContext mgc)
                 }
                 else if (background.sprite != null)
                 {
+                    ScaleMode scaleMode = BackgroundPropertyHelper.ResolveUnityBackgroundScaleMode(style.backgroundPositionX,
+                        style.backgroundPositionY,
+                        style.backgroundRepeat,
+                        style.backgroundSize,
+                        out bool validScaleMode);
+
+                    bool useRepeat = !validScaleMode || (scaleMode == ScaleMode.ScaleAndCrop);
+
                     rectParams = MeshGenerator.RectangleParams.MakeSprite(
                         ve.rect,
+                        new Rect(0, 0, 1, 1),
                         background.sprite,
-                        ScaleMode.StretchToFill,
+                        useRepeat ? ScaleMode.StretchToFill : scaleMode,
                         ve.panel.contextType,
                         radiusParams.HasRadius(MeshBuilderNative.kEpsilon),
                         ref slices,
-                        true);
+                        useRepeat);
 
-                    rectParams.rect = new Rect(0, 0, background.sprite.rect.width, background.sprite.rect.height);
+                    if (rectParams.texture != null)
+                    {
+                        rectParams.rect = new Rect(0, 0, background.sprite.rect.width, background.sprite.rect.height);
+                    }
 
                     sliceScale *= UIElementsUtility.PixelsPerUnitScaleForElement(ve, background.sprite);
                 }
@@ -212,11 +231,19 @@ protected override void DrawVisualElementBackground(MeshGenerationContext mgc)
                 }
                 else if (background.vectorImage != null)
                 {
+                    ScaleMode scaleMode = BackgroundPropertyHelper.ResolveUnityBackgroundScaleMode(style.backgroundPositionX,
+                        style.backgroundPositionY,
+                        style.backgroundRepeat,
+                        style.backgroundSize,
+                        out bool validScaleMode);
+
+                    bool useRepeat = !validScaleMode || (scaleMode == ScaleMode.ScaleAndCrop);
+
                     rectParams = MeshGenerator.RectangleParams.MakeVectorTextured(
                         ve.rect,
                         new Rect(0, 0, 1, 1),
                         background.vectorImage,
-                        ScaleMode.ScaleToFit,
+                        useRepeat ? ScaleMode.StretchToFill : scaleMode,
                         ve.panel.contextType);
 
                     rectParams.rect = new Rect(0, 0, rectParams.vectorImage.size.x, rectParams.vectorImage.size.y);
@@ -244,15 +271,15 @@ protected override void DrawVisualElementBackground(MeshGenerationContext mgc)
                 rectParams.backgroundRepeat = style.backgroundRepeat;
                 rectParams.backgroundSize = style.backgroundSize;
 
-                MeshGenerator.AdjustBackgroundSizeForBorders(ve, ref rectParams.rect);
+                MeshGenerator.AdjustBackgroundSizeForBorders(ve, ref rectParams);
 
                 if (rectParams.texture != null)
                 {
-                    mgc.meshGenerator.DrawRectangleRepeat(rectParams, ve.rect);
+                    mgc.meshGenerator.DrawRectangleRepeat(rectParams, ve.rect, ve.scaledPixelsPerPoint);
                 }
                 else if (rectParams.vectorImage != null)
                 {
-                    mgc.meshGenerator.DrawRectangleRepeat(rectParams, ve.rect);
+                    mgc.meshGenerator.DrawRectangleRepeat(rectParams, ve.rect, ve.scaledPixelsPerPoint);
                 }
                 else
                 {
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIREntryProcessor.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIREntryProcessor.cs
index 4d04b26c70..8c02862c6a 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIREntryProcessor.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIREntryProcessor.cs
@@ -513,6 +513,7 @@ unsafe void ProcessMeshEntry(Entry entry, TextureId textureId)
                 {
                     // Set font atlas texture gradient scale
                     cmd.state.sdfScale = entry.textScale;
+                    cmd.state.sharpness = entry.fontSharpness;
                 }
 
                 m_VertsFilled += entry.vertices.Length;
@@ -580,6 +581,7 @@ void AppendCommand(RenderChainCommand next)
             }
             else
             {
+                next.prev = m_LastCommand;
                 m_LastCommand.next = next;
                 m_LastCommand = next;
             }
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIREntryRecorder.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIREntryRecorder.cs
index ea2c3de3de..a5f033587d 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIREntryRecorder.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIREntryRecorder.cs
@@ -44,6 +44,7 @@ class Entry
 
         public Texture texture;
         public float textScale;
+        public float fontSharpness;
         public VectorImage gradientsOwner;
         public Material material;
         public Action immediateCallback;
@@ -106,7 +107,7 @@ public void DrawMesh(NativeSlice<Vertex> vertices, NativeSlice<ushort> indices,
             AppendMeshEntry(entry);
         }
 
-        public void DrawSdfText(NativeSlice<Vertex> vertices, NativeSlice<ushort> indices, Texture texture, float scale)
+        public void DrawSdfText(NativeSlice<Vertex> vertices, NativeSlice<ushort> indices, Texture texture, float scale, float sharpness)
         {
             var entry = m_EntryPool.Get();
             entry.type = EntryType.DrawSdfTextMesh;
@@ -114,6 +115,7 @@ public void DrawSdfText(NativeSlice<Vertex> vertices, NativeSlice<ushort> indice
             entry.indices = indices;
             entry.texture = texture;
             entry.textScale = scale;
+            entry.fontSharpness = sharpness;
             AppendMeshEntry(entry);
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRLayoutUpdater.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRLayoutUpdater.cs
index b4355ac89c..d8d977d811 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRLayoutUpdater.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRLayoutUpdater.cs
@@ -11,35 +11,42 @@
 namespace UnityEngine.UIElements
 {
     // This is basically the same as the standard layout update except for 1 thing :
-    // - Only call dirty repaint when the layout rect has changed instead of "yogaNode.HasNewLayout"
+    // - Only call dirty repaint when the layout rect has changed instead of "layoutNode.HasNewLayout"
     internal class UIRLayoutUpdater : BaseVisualTreeUpdater
     {
-        const int kMaxValidateLayoutCount = 5;
-
+         // When changing this value, we always consider that some controls may require multiple passes to compute their layout.
+         // We also consider that these controls can also be nested inside other similar controls.
+         // For example, a simple scroll view may need more than 2 passes to lay out the viewport and scrollers.
+         // Therefore, having a deep hierachy of scroll views can require a fair amount of layout passes.
+        const int kMaxValidateLayoutCount = 10;
 
         private static readonly string s_Description = "Update Layout";
         private static readonly ProfilerMarker s_ProfilerMarker = new ProfilerMarker(s_Description);
         public override ProfilerMarker profilerMarker => s_ProfilerMarker;
 
+        static readonly ProfilerMarker k_ComputeLayoutMarker = new("LayoutUpdater.ComputeLayout");
+        static readonly ProfilerMarker k_UpdateSubTreeMarker = new("LayoutUpdater.UpdateSubTree");
+        static readonly ProfilerMarker k_DispatchChangeEventsMarker = new("LayoutUpdater.DispatchChangeEvents");
+
         public override void OnVersionChanged(VisualElement ve, VersionChangeType versionChangeType)
         {
             if ((versionChangeType & (VersionChangeType.Layout | VersionChangeType.Hierarchy)) == 0)
                 return;
 
-            var yogaNode = ve.yogaNode;
-            if (yogaNode != null && yogaNode.IsMeasureDefined)
+            var layoutNode = ve.layoutNode;
+            if (layoutNode != null && layoutNode.IsMeasureDefined)
             {
-                yogaNode.MarkDirty();
+                layoutNode.MarkDirty();
             }
         }
 
-        List<KeyValuePair<Rect, VisualElement>> changeEventsList = new List<KeyValuePair<Rect, VisualElement>>();
+        List<(Rect, Rect, VisualElement)> changeEventsList = new ();
 
         public override void Update()
         {
             // update flex once
             int validateLayoutCount = 0;
-            while (visualTree.yogaNode.IsDirty)
+            while (visualTree.layoutNode.IsDirty)
             {
                 changeEventsList.Clear();
 
@@ -49,11 +56,17 @@ public override void Update()
                     panel.ApplyStyles();
 
                 panel.duringLayoutPhase = true;
-                visualTree.yogaNode.CalculateLayout();
+                    k_ComputeLayoutMarker.Begin();
+                visualTree.layoutNode.CalculateLayout();
+                    k_ComputeLayoutMarker.End();
                 panel.duringLayoutPhase = false;
 
-                UpdateSubTree(visualTree, true, changeEventsList);
+                    k_UpdateSubTreeMarker.Begin();
+                UpdateSubTree(visualTree, changeEventsList);
+                    k_UpdateSubTreeMarker.End();
+                    k_DispatchChangeEventsMarker.Begin();
                 DispatchChangeEvents(changeEventsList, validateLayoutCount);
+                    k_DispatchChangeEventsMarker.End();
 
                 if (validateLayoutCount++ >= kMaxValidateLayoutCount)
                 {
@@ -70,54 +83,130 @@ public override void Update()
             visualTree.focusController.ReevaluateFocus();
         }
 
-        private void UpdateSubTree(VisualElement ve, bool isDisplayed, List<KeyValuePair<Rect, VisualElement>> changeEvents)
+        /// <summary>
+        /// This method update areAncestorsAndSelfDisplayed and disableRendering for the provided element and for all disabled element under.
+        /// It also trigger changeEvents if some element were disabled
+        /// This method does not update the elements under a displayed element since they are updated in UpdateSubTree
+        /// </summary>
+        /// <param name="ve"></param>
+        /// <param name="changeEvents"> is a list to accumulate the event to dispatch later</param>
+        /// <param name="inheritedDisplayed"> false when any of the ancestors has display:none, otherwise true</param>
+        /// <returns> has his state changed</returns>
+        static private bool UpdateHierarchyDisplayed(VisualElement ve, List<(Rect, Rect, VisualElement)> changeEvents, bool inheritedDisplayed = true)
         {
-            Rect yogaLayoutRect = new Rect(ve.yogaNode.LayoutX, ve.yogaNode.LayoutY, ve.yogaNode.LayoutWidth, ve.yogaNode.LayoutHeight);
+            var isDisplayed = inheritedDisplayed & ve.resolvedStyle.display != DisplayStyle.None;
+
+            // If our parent is disabled, there is no need to disable the rendering on the child,
+            // but if the child is disabled, there is no need to re-enable it.
+            // If we are displayed we definitely don't want to be disabled!
+            if (inheritedDisplayed && !isDisplayed)
+                ve.disableRendering = true;
+            else if (isDisplayed)
+                ve.disableRendering = false;
+
+            // If the status changed, we need to update the display status of the children.
+            // If the children has already the correct state, we don't need to continue
+            // (This check will stop the depth first branch from being updated)
+            if (ve.areAncestorsAndSelfDisplayed == isDisplayed)
+                return false;
+
+            ve.areAncestorsAndSelfDisplayed = isDisplayed;
+
+            // UpdateSubTree will propagate the Display:flex status but will not recurse in the case of a display:none
+            // We need recurse here to update/propagate the Display:none status and generate changeEvents when elements were hidden this frame
+            if (!isDisplayed)
+            {
+                if (inheritedDisplayed)//for the element having a displayed parent and that just became in display:none
+                {
+                    // Make sure bounding box are re-computed (using layout).
+                    ve.IncrementVersion(VersionChangeType.Size);
+                }
+
+                if ( ve.HasEventCallbacksOrDefaultActions(GeometryChangedEvent.EventCategory) )
+                    changeEvents.Add( (ve.lastLayout, Rect.zero, ve));
+
+                var childCount = ve.hierarchy.childCount;
+                for (int i = 0; i < childCount; ++i)
+                {
+                    UpdateHierarchyDisplayed(ve.hierarchy[i], changeEvents, isDisplayed);
+                }
+            }
+
+            return true;
+        }
+
+        private void UpdateSubTree(VisualElement ve, List<(Rect, Rect, VisualElement)> changeEvents)
+        {
+            // Because the UpdateSubTree recursion always starts form the root, and does not process subtrees that are not displayed, inheritedDisplay is always true.
+            bool isDisplayedJustChanged = UpdateHierarchyDisplayed(ve, changeEvents, true);
+
+            // Events for disabled element and their descendant have been added by UpdateHierarchyDisplayed
+            // We don't trigger any IncrementVersion because we want to keep the UI buffered.
+            // the transform and size version change will occur when the element become displayed again.
+            if (!ve.areAncestorsAndSelfDisplayed)
+                return;
+
+            Rect layoutRect = new Rect(ve.layoutNode.LayoutX, ve.layoutNode.LayoutY, ve.layoutNode.LayoutWidth, ve.layoutNode.LayoutHeight);
 
             // we encode right/bottom into width/height
-            Rect rawPadding = new Rect(ve.yogaNode.LayoutPaddingLeft, ve.yogaNode.LayoutPaddingLeft, ve.yogaNode.LayoutPaddingRight, ve.yogaNode.LayoutPaddingBottom);
+            Rect rawPadding = new Rect(ve.layoutNode.LayoutPaddingLeft, ve.layoutNode.LayoutPaddingLeft, ve.layoutNode.LayoutPaddingRight, ve.layoutNode.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(
+            Rect layoutPseudoPaddingRect = new Rect(
                rawPadding.x,
                 rawPadding.y,
-                yogaLayoutRect.width - (rawPadding.x + rawPadding.width),
-                yogaLayoutRect.height - (rawPadding.y + rawPadding.height));
+                layoutRect.width - (rawPadding.x + rawPadding.width),
+                layoutRect.height - (rawPadding.y + rawPadding.height));
             Rect lastLayoutRect = ve.lastLayout;
             Rect lastPseudoPaddingRect = ve.lastPseudoPadding;
-            bool wasHierarchyDisplayed = ve.isHierarchyDisplayed;
 
             VersionChangeType changeType = 0;
             // Changing the layout/padding size should trigger the following version changes:
             // - Size:    to update the clipping rect, when required
             // - Repaint: to update the geometry inside the new rect
-            bool layoutSizeChanged = lastLayoutRect.size != yogaLayoutRect.size;
-            bool pseudoPaddingSizeChanged = lastPseudoPaddingRect.size != yogaPseudoPaddingRect.size;
+            bool layoutSizeChanged = lastLayoutRect.size != layoutRect.size;
+            bool pseudoPaddingSizeChanged = lastPseudoPaddingRect.size != layoutPseudoPaddingRect.size;
             if (layoutSizeChanged || pseudoPaddingSizeChanged)
                 changeType |= VersionChangeType.Size | VersionChangeType.Repaint;
 
             // Changing the layout/padding position should trigger the following version change:
             // - Transform: to draw the element and content at the right position
-            bool layoutPositionChanged = yogaLayoutRect.position != lastLayoutRect.position;
-            bool paddingPositionChanged = yogaPseudoPaddingRect.position != lastPseudoPaddingRect.position;
-            if (layoutPositionChanged || paddingPositionChanged)
+            bool layoutPositionChanged = layoutRect.position != lastLayoutRect.position;
+            bool paddingPositionChanged = layoutPseudoPaddingRect.position != lastPseudoPaddingRect.position;
+            if (layoutPositionChanged || paddingPositionChanged || isDisplayedJustChanged)
                 changeType |= VersionChangeType.Transform;
 
-            isDisplayed &= ve.resolvedStyle.display != DisplayStyle.None;
-            ve.isHierarchyDisplayed = isDisplayed;
+            if (isDisplayedJustChanged)
+                changeType |= VersionChangeType.Size;
+
+            // If the scale or rotate value of the style are not default, a change in the size will affect the resulting
+            // translation part of the local transform. Only when the transformOrigin is at (0, 0) we do not need to
+            // update the transform.
+            if ((changeType & (VersionChangeType.Size | VersionChangeType.Transform)) == VersionChangeType.Size)
+            {
+                if (!ve.hasDefaultRotationAndScale)
+                {
+                    // if the pivot is not at the top left, update the transform
+                    if (!Mathf.Approximately(ve.resolvedStyle.transformOrigin.x, 0.0f) ||
+                        !Mathf.Approximately(ve.resolvedStyle.transformOrigin.y, 0.0f))
+                    {
+                        changeType |= VersionChangeType.Transform;
+                    }
+                }
+            }
 
             if (changeType != 0)
                 ve.IncrementVersion(changeType);
 
-            ve.lastLayout = yogaLayoutRect;
-            ve.lastPseudoPadding = yogaPseudoPaddingRect;
+            ve.lastLayout = layoutRect;
+            ve.lastPseudoPadding = layoutPseudoPaddingRect;
 
             // ignore clean sub trees
-            bool hasNewLayout = ve.yogaNode.HasNewLayout;
+            bool hasNewLayout = ve.layoutNode.HasNewLayout;
             if (hasNewLayout)
             {
                 var childCount = ve.hierarchy.childCount;
@@ -125,32 +214,29 @@ private void UpdateSubTree(VisualElement ve, bool isDisplayed, List<KeyValuePair
                 {
                     var child = ve.hierarchy[i];
 
-                    if(child.yogaNode.HasNewLayout)
-                        UpdateSubTree(child, isDisplayed, changeEvents);
+                    if (child.layoutNode.HasNewLayout)
+                        UpdateSubTree(child, changeEvents);
                 }
             }
 
             // Only send GeometryChanged events when the layout changes
             // (padding changes don't affect the element's outer geometry).
-            if ((layoutSizeChanged || layoutPositionChanged) && ve.HasEventCallbacksOrDefaultActions(GeometryChangedEvent.EventCategory))
+            if ((layoutSizeChanged || layoutPositionChanged || isDisplayedJustChanged) && ve.HasEventCallbacksOrDefaultActions(GeometryChangedEvent.EventCategory))
             {
-                changeEvents.Add(new KeyValuePair<Rect, VisualElement>(lastLayoutRect, ve));
+                changeEvents.Add((isDisplayedJustChanged ? Rect.zero : lastLayoutRect, layoutRect, ve));
             }
 
             if (hasNewLayout)
             {
-                ve.yogaNode.MarkLayoutSeen();
+                ve.layoutNode.MarkLayoutSeen();
             }
         }
 
-
-        private void DispatchChangeEvents(List<KeyValuePair<Rect, VisualElement>> changeEvents, int currentLayoutPass)
+        private void DispatchChangeEvents(List<(Rect, Rect, VisualElement)> changeEvents, int currentLayoutPass)
         {
-            foreach (var changeElement in changeEvents)
+            foreach ((var oldRect, var newRect, var ve) in changeEvents)
             {
-                var ve = changeElement.Value;
-
-                using (var evt = GeometryChangedEvent.GetPooled(changeElement.Key, ve.lastLayout))
+                using (var evt = GeometryChangedEvent.GetPooled(oldRect, newRect))
                 {
                     evt.layoutPass = currentLayoutPass;
                     evt.elementTarget = ve;
@@ -158,6 +244,5 @@ private void DispatchChangeEvents(List<KeyValuePair<Rect, VisualElement>> change
                 }
             }
         }
-
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshGenerator.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshGenerator.cs
index 6403b92055..9e44f6a6a8 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshGenerator.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshGenerator.cs
@@ -14,12 +14,12 @@ namespace UnityEngine.UIElements.UIR
     interface IMeshGenerator
     {
         VisualElement currentElement { get; set; }
-        public void DrawText(TextInfo textInfo, Vector2 offset);
+        public void DrawText(MeshInfo[] meshInfo, Vector2 offset, bool hasMultipleColors);
         public void DrawText(string text, Vector2 pos, float fontSize, Color color, FontAsset font);
         public void DrawRectangle(MeshGenerator.RectangleParams rectParams);
         public void DrawBorder(MeshGenerator.BorderParams borderParams);
         public void DrawVectorImage(VectorImage vectorImage, Vector2 offset, Angle rotationAngle, Vector2 scale);
-        public void DrawRectangleRepeat(MeshGenerator.RectangleParams rectParams, Rect totalRect);
+        public void DrawRectangleRepeat(MeshGenerator.RectangleParams rectParams, Rect totalRect, float scaledPixelsPerPoint);
     }
 
     class MeshGenerator : IMeshGenerator
@@ -135,6 +135,9 @@ public struct RectangleParams
             // Cached sprite geometry, which is expensive to evaluate.
             internal Rect spriteGeomRect;
 
+            // Inset to apply before rendering (left, top, right, bottom)
+            public Vector4 rectInset;
+
             // The color allocation
             internal ColorPage colorPage;
 
@@ -161,7 +164,8 @@ private static void AdjustUVsForScaleMode(Rect rect, Rect uv, Texture texture, S
                 // Comparing aspects ratio is error-prone because the screenRect may end up being scaled by the
                 // transform and the corners will end up being pixel aligned, possibly resulting in blurriness.
 
-                float srcAspect = (texture.width * uv.width) / (texture.height * uv.height);
+                // UUM-17136: uv width/height can be negative (e.g. when the UVs are flipped)
+                float srcAspect = Mathf.Abs((texture.width * uv.width) / (texture.height * uv.height));
                 float destAspect = rect.width / rect.height;
 
                 switch (scaleMode)
@@ -204,15 +208,15 @@ private static void AdjustUVsForScaleMode(Rect rect, Rect uv, Texture texture, S
                 uvOut = uv;
             }
 
-            private static void AdjustSpriteUVsForScaleMode(Rect rect, Rect uv, Rect geomRect, Texture texture, Sprite sprite, ScaleMode scaleMode, out Rect rectOut, out Rect uvOut)
+            private static void AdjustSpriteUVsForScaleMode(Rect containerRect, Rect srcRect, Rect spriteGeomRect, Sprite sprite, ScaleMode scaleMode, out Rect rectOut, out Rect uvOut)
             {
                 // Adjust the sprite rect size and then determine where the sprite geometry should be inside it.
 
                 float srcAspect = sprite.rect.width / sprite.rect.height;
-                float destAspect = rect.width / rect.height;
+                float destAspect = containerRect.width / containerRect.height;
 
                 // Normalize the geom rect for easy scaling
-                var geomRectNorm = geomRect;
+                var geomRectNorm = spriteGeomRect;
                 geomRectNorm.position -= (Vector2)sprite.bounds.min;
                 geomRectNorm.position /= sprite.bounds.size;
                 geomRectNorm.size /= sprite.bounds.size;
@@ -226,9 +230,9 @@ private static void AdjustSpriteUVsForScaleMode(Rect rect, Rect uv, Rect geomRec
                 {
                     case ScaleMode.StretchToFill:
                     {
-                        var scale = rect.size;
-                        rect.position = geomRectNorm.position * scale;
-                        rect.size = geomRectNorm.size * scale;
+                        var scale = containerRect.size;
+                        containerRect.position = geomRectNorm.position * scale;
+                        containerRect.size = geomRectNorm.size * scale;
                     }
                     break;
 
@@ -240,16 +244,16 @@ private static void AdjustSpriteUVsForScaleMode(Rect rect, Rect uv, Rect geomRec
                         // - Compute the intersection of the geometry rect with the destination rect
                         // - Re-evaluate the UVs from that intersection
 
-                        var stretchedRect = rect;
+                        var stretchedRect = containerRect;
                         if (destAspect > srcAspect)
                         {
                             stretchedRect.height = stretchedRect.width / srcAspect;
-                            stretchedRect.position = new Vector2(stretchedRect.position.x, -(stretchedRect.height - rect.height) / 2.0f);
+                            stretchedRect.position = new Vector2(stretchedRect.position.x, -(stretchedRect.height - containerRect.height) / 2.0f);
                         }
                         else
                         {
                             stretchedRect.width = stretchedRect.height * srcAspect;
-                            stretchedRect.position = new Vector2(-(stretchedRect.width - rect.width) / 2.0f, stretchedRect.position.y);
+                            stretchedRect.position = new Vector2(-(stretchedRect.width - containerRect.width) / 2.0f, stretchedRect.position.y);
                         }
 
                         var scale = stretchedRect.size;
@@ -257,7 +261,7 @@ private static void AdjustSpriteUVsForScaleMode(Rect rect, Rect uv, Rect geomRec
                         stretchedRect.size = geomRectNorm.size * scale;
 
                         // Intersect the stretched rect with the destination rect to compute the new UVs
-                        var newRect = RectIntersection(rect, stretchedRect);
+                        var newRect = RectIntersection(containerRect, stretchedRect);
                         if (newRect.width < UIRUtility.k_Epsilon || newRect.height < UIRUtility.k_Epsilon)
                             newRect = Rect.zero;
                         else
@@ -272,11 +276,11 @@ private static void AdjustSpriteUVsForScaleMode(Rect rect, Rect uv, Rect geomRec
                             scalePos.y = 1.0f - uvScale.size.y - scalePos.y;
                             uvScale.position = scalePos;
 
-                            uv.position += uvScale.position * uv.size;
-                            uv.size *= uvScale.size;
+                            srcRect.position += uvScale.position * srcRect.size;
+                            srcRect.size *= uvScale.size;
                         }
 
-                        rect = newRect;
+                        containerRect = newRect;
                     }
                     break;
 
@@ -285,16 +289,16 @@ private static void AdjustSpriteUVsForScaleMode(Rect rect, Rect uv, Rect geomRec
                         if (destAspect > srcAspect)
                         {
                             float stretch = srcAspect / destAspect;
-                            rect = new Rect(rect.xMin + rect.width * (1.0f - stretch) * .5f, rect.yMin, stretch * rect.width, rect.height);
+                            containerRect = new Rect(containerRect.xMin + containerRect.width * (1.0f - stretch) * .5f, containerRect.yMin, stretch * containerRect.width, containerRect.height);
                         }
                         else
                         {
                             float stretch = destAspect / srcAspect;
-                            rect = new Rect(rect.xMin, rect.yMin + rect.height * (1.0f - stretch) * .5f, rect.width, stretch * rect.height);
+                            containerRect = new Rect(containerRect.xMin, containerRect.yMin + containerRect.height * (1.0f - stretch) * .5f, containerRect.width, stretch * containerRect.height);
                         }
 
-                        rect.position += geomRectNorm.position * rect.size;
-                        rect.size *= geomRectNorm.size;
+                        containerRect.position += geomRectNorm.position * containerRect.size;
+                        containerRect.size *= geomRectNorm.size;
                     }
                     break;
 
@@ -303,8 +307,8 @@ private static void AdjustSpriteUVsForScaleMode(Rect rect, Rect uv, Rect geomRec
                 }
 
 
-                rectOut = rect;
-                uvOut = uv;
+                rectOut = containerRect;
+                uvOut = srcRect;
             }
 
             internal static Rect RectIntersection(Rect a, Rect b)
@@ -398,7 +402,7 @@ public static RectangleParams MakeTextured(Rect rect, Rect uv, Texture texture,
                 return rp;
             }
 
-            public static RectangleParams MakeSprite(Rect rect, Sprite sprite, ScaleMode scaleMode, ContextType panelContext, bool hasRadius, ref Vector4 slices, bool useForRepeat = false)
+            public static RectangleParams MakeSprite(Rect containerRect, Rect subRect, Sprite sprite, ScaleMode scaleMode, ContextType panelContext, bool hasRadius, ref Vector4 slices, bool useForRepeat = false)
             {
                 if (sprite == null || sprite.bounds.size.x < UIRUtility.k_Epsilon || sprite.bounds.size.y < UIRUtility.k_Epsilon)
                     return new RectangleParams();
@@ -413,39 +417,54 @@ public static RectangleParams MakeSprite(Rect rect, Sprite sprite, ScaleMode sca
                     ? UIElementsUtility.editorPlayModeTintColor
                     : Color.white;
 
-                var geomRect = ComputeGeomRect(sprite);
-                var uv = ComputeUVRect(sprite);
+                var spriteGeomRect = ComputeGeomRect(sprite); // Min/Max Positions in the sprite
+                var spriteUVRect = ComputeUVRect(sprite); // Min/Max UVs in the sprite
 
                 // Use a textured quad (ignoring tight-mesh) if dealing with slicing or with
                 // scale-and-crop scale mode. This avoids expensive CPU-side transformation and
                 // polygon clipping.
                 var border = sprite.border;
                 bool hasSlices = (border != Vector4.zero) || (slices != Vector4.zero);
-                bool useTexturedQuad = (scaleMode == ScaleMode.ScaleAndCrop) || hasSlices || hasRadius || useForRepeat;
+                bool hasSubRect = subRect != new Rect(0, 0, 1, 1); // In the future, we could implement flips with geometry flip
+                bool useTexturedQuad = (scaleMode == ScaleMode.ScaleAndCrop) || hasSlices || hasRadius || useForRepeat || hasSubRect;
 
+                // The sprite UVs are adjusted according to the rotation. But When we use a texture quad, we generate
+                // the UVs ourselves, so we need to apply the rotation to our rect.
                 if (useTexturedQuad && sprite.packed && sprite.packingRotation != SpritePackingRotation.None)
-                    uv = ApplyPackingRotation(uv, sprite.packingRotation);
+                    spriteUVRect = ApplyPackingRotation(spriteUVRect, sprite.packingRotation);
+
+                Rect srcRect;
+                if (hasSubRect)
+                {
+                    // Remap the subRect within the sprite rect
+                    srcRect = subRect;
+                    srcRect.position *= spriteUVRect.size;
+                    srcRect.position += spriteUVRect.position;
+                    srcRect.size *= spriteUVRect.size;
+                }
+                else
+                    srcRect = spriteUVRect;
 
-                AdjustSpriteUVsForScaleMode(rect, uv, geomRect, sprite.texture, sprite, scaleMode, out rect, out uv);
+                AdjustSpriteUVsForScaleMode(containerRect, srcRect, spriteGeomRect, sprite, scaleMode, out Rect adjustedDstRect, out Rect adjustedSrcRect);
 
                 // Compute normalized subRect
-                var subRect = geomRect;
-                subRect.size /= (Vector2)sprite.bounds.size;
-                subRect.position -= (Vector2)sprite.bounds.min;
-                subRect.position /= (Vector2)sprite.bounds.size;
-                subRect.position = new Vector2(subRect.position.x, 1.0f - (subRect.position.y + subRect.height)); // Y-down for UIR
+                var normalizedRect = spriteGeomRect;
+                normalizedRect.size /= (Vector2)sprite.bounds.size;
+                normalizedRect.position -= (Vector2)sprite.bounds.min;
+                normalizedRect.position /= (Vector2)sprite.bounds.size;
+                normalizedRect.position = new Vector2(normalizedRect.position.x, 1.0f - (normalizedRect.position.y + normalizedRect.height)); // Y-down for UIR
 
                 var rp = new RectangleParams
                 {
-                    rect = rect,
-                    uv = uv,
-                    subRect = subRect,
+                    rect = adjustedDstRect,
+                    uv = adjustedSrcRect,
+                    subRect = normalizedRect,
                     color = Color.white,
-                    texture = useTexturedQuad ? sprite.texture : (Texture2D)null,
-                    sprite = useTexturedQuad ? (Sprite)null : sprite,
+                    texture = useTexturedQuad ? sprite.texture : null,
+                    sprite = useTexturedQuad ? null : sprite,
                     contentSize = sprite.rect.size,
                     textureSize = new Vector2(sprite.texture.width, sprite.texture.height),
-                    spriteGeomRect = geomRect,
+                    spriteGeomRect = spriteGeomRect,
                     scaleMode = scaleMode,
                     playmodeTintColor = playmodeTintColor,
                     meshFlags = sprite.packed ? MeshGenerationContext.MeshFlags.SkipDynamicAtlas : MeshGenerationContext.MeshFlags.None
@@ -516,6 +535,7 @@ internal MeshBuilderNative.NativeRectParams ToNativeParams()
                     rightSlice = rightSlice,
                     bottomSlice = bottomSlice,
                     sliceScale = sliceScale,
+                    rectInset = rectInset,
                     colorPage = colorPage.ToNativeColorPage()
                 };
             }
@@ -550,16 +570,20 @@ public static void GetVisualElementRadii(VisualElement ve, out Vector2 topLeft,
             bottomRight = ConvertBorderRadiusPercentToPoints(borderRectSize, computedStyle.borderBottomRightRadius);
         }
 
-        public static void AdjustBackgroundSizeForBorders(VisualElement visualElement, ref Rect rect)
+        public static void AdjustBackgroundSizeForBorders(VisualElement visualElement, ref MeshGenerator.RectangleParams rectParams)
         {
             var style = visualElement.resolvedStyle;
 
+            var inset = Vector4.zero;
+
             // If the border width allows it, slightly shrink the background size to avoid
             // having both the border and background blending together after antialiasing.
-            if (style.borderLeftWidth >= 1.0f && style.borderLeftColor.a >= 1.0f) { rect.x += 0.5f; rect.width -= 0.5f; }
-            if (style.borderTopWidth >= 1.0f && style.borderTopColor.a >= 1.0f) { rect.y += 0.5f; rect.height -= 0.5f; }
-            if (style.borderRightWidth >= 1.0f && style.borderRightColor.a >= 1.0f) { rect.width -= 0.5f; }
-            if (style.borderBottomWidth >= 1.0f && style.borderBottomColor.a >= 1.0f) { rect.height -= 0.5f; }
+            if (style.borderLeftWidth >= 1.0f && style.borderLeftColor.a >= 1.0f) { inset.x = 0.5f; }
+            if (style.borderTopWidth >= 1.0f && style.borderTopColor.a >= 1.0f) { inset.y = 0.5f; }
+            if (style.borderRightWidth >= 1.0f && style.borderRightColor.a >= 1.0f) { inset.z = 0.5f; }
+            if (style.borderBottomWidth >= 1.0f && style.borderBottomColor.a >= 1.0f) { inset.w = 0.5f; }
+
+            rectParams.rectInset = inset;
         }
 
         void BuildEntryFromNativeMesh(MeshWriteDataInterface meshData, Texture texture, bool skipAtlas)
@@ -608,12 +632,12 @@ void BuildGradientEntryFromNativeMesh(MeshWriteDataInterface meshData, VectorIma
             m_MeshGenerationContext.entryRecorder.DrawGradients(vertices, indices, gradientsOwner);
         }
 
-        public void DrawText(TextInfo textInfo, Vector2 offset)
+        public void DrawText(MeshInfo[] meshInfo, Vector2 offset, bool hasMultipleColors)
         {
-            DrawTextInfo(textInfo, offset, true);
+            DrawTextInfo(meshInfo, offset, !hasMultipleColors);
         }
 
-        TextInfo m_TextInfo = new();
+        TextInfo m_TextInfo = new TextInfo(VertexDataLayout.VBO);
 
         public void DrawText(string text, Vector2 pos, float fontSize, Color color, FontAsset font)
         {
@@ -632,26 +656,27 @@ public void DrawText(string text, Vector2 pos, float fontSize, Color color, Font
             };
             TextCore.Text.TextGenerator.GenerateText(textGenerationSettings, m_TextInfo);
 
-            DrawTextInfo(m_TextInfo, pos, false);
+            DrawTextInfo(m_TextInfo.meshInfo, pos, false);
         }
 
-        void DrawTextInfo(TextInfo textInfo, Vector2 offset, bool useHints)
+        void DrawTextInfo(MeshInfo[] meshInfo, Vector2 offset, bool useHints)
         {
-            for (int i = 0; i < textInfo.materialCount; i++)
+            for (int i = 0; i < meshInfo.Length; i++)
             {
-                if (textInfo.meshInfo[i].vertexCount == 0)
+                if (meshInfo[i].vertexCount == 0)
                     continue;
 
                 // SpriteAssets use an RGBA texture
-                if(((Texture2D)textInfo.meshInfo[i].material.mainTexture).format != TextureFormat.Alpha8)
+                if(((Texture2D)meshInfo[i].material.mainTexture).format != TextureFormat.Alpha8)
                 {
                     // Assume a sprite asset
                     MakeText(
-                        textInfo.meshInfo[i].material.mainTexture,
-                        textInfo.meshInfo[i],
+                        meshInfo[i].material.mainTexture,
+                        meshInfo[i],
                         offset,
                         false,
                         false,
+                        0,
                         0);
                 }
                 else
@@ -659,21 +684,29 @@ void DrawTextInfo(TextInfo textInfo, Vector2 offset, bool useHints)
                     // SDF scale is used to differentiate between Bitmap and SDF. The Bitmap Material doesn't have the
                     // GradientScale property which results in sdfScale always being 0.
                     float sdfScale = 0;
-                    if (!TextGeneratorUtilities.IsBitmapRendering(textInfo.meshInfo[i].glyphRenderMode))
-                        sdfScale = textInfo.meshInfo[i].material.GetFloat(TextShaderUtilities.ID_GradientScale);
+                    if (!TextGeneratorUtilities.IsBitmapRendering(meshInfo[i].glyphRenderMode))
+                        sdfScale = meshInfo[i].material.GetFloat(TextShaderUtilities.ID_GradientScale);
                     bool isDynamicColor = useHints && RenderEvents.NeedsColorID(currentElement);
+                    var sharpness = meshInfo[i].material.GetFloat("_Sharpness");
                     // Set the dynamic-color hint on TextCore fancy-text or the EditorUIE shader applies the
                     // tint over the fragment output, affecting the outline/shadows.
                     if (useHints)
                         isDynamicColor = isDynamicColor || (sdfScale > 0 && RenderEvents.NeedsTextCoreSettings(currentElement));
+                    if (sharpness == 0.0f && currentElement.panel.contextType == ContextType.Editor)
+                    {
+                        var font = TextUtilities.GetFont(currentElement);
+                        if (font)
+                            sharpness = TextUtilities.getEditorTextSharpness(font.name);
+                    }
 
                     MakeText(
-                        textInfo.meshInfo[i].material.mainTexture,
-                        textInfo.meshInfo[i],
+                        meshInfo[i].material.mainTexture,
+                        meshInfo[i],
                         offset,
                         true,
                         isDynamicColor,
-                        sdfScale);
+                        sdfScale,
+                        sharpness);
                 }
             }
         }
@@ -684,12 +717,12 @@ static Vertex ConvertTextVertexToUIRVertex(MeshInfo info, int index, Vector2 off
         {
             float dilate = 0.0f;
             // If Bold, dilate the shape (this value is hardcoded, should be set from the font actual bold weight)
-            if (info.uvs2[index].y < 0.0f) dilate = 1.0f;
+            if (info.vertexData[index].uv2.y < 0.0f) dilate = 1.0f;
             return new Vertex
             {
-                position = new Vector3(info.vertices[index].x + offset.x, info.vertices[index].y + offset.y, UIRUtility.k_MeshPosZ),
-                uv = new Vector2(info.uvs0[index].x, info.uvs0[index].y),
-                tint = info.colors32[index],
+                position = new Vector3(info.vertexData[index].position.x + offset.x, info.vertexData[index].position.y + offset.y, UIRUtility.k_MeshPosZ),
+                uv = new Vector2(info.vertexData[index].uv0.x, info.vertexData[index].uv0.y),
+                tint = info.vertexData[index].color,
                 // TODO: Don't set the flags here. The mesh conversion should perform these changes
                 flags = new Color32(0, (byte)(dilate * 255), 0, isDynamicColor ? (byte)1 : (byte)0)
             };
@@ -706,7 +739,7 @@ static int LimitTextVertices(int vertexCount, bool logTruncation = true)
             return s_MaxTextMeshVertices;
         }
 
-        void MakeText(Texture texture, MeshInfo meshInfo, Vector2 offset, bool isSdf, bool isDynamicColor, float sdfScale)
+        void MakeText(Texture texture, MeshInfo meshInfo, Vector2 offset, bool isSdf, bool isDynamicColor, float sdfScale, float sharpness)
         {
             int vertexCount = LimitTextVertices(meshInfo.vertexCount);
             int quadCount = vertexCount / 4;
@@ -730,7 +763,7 @@ void MakeText(Texture texture, MeshInfo meshInfo, Vector2 offset, bool isSdf, bo
             }
 
             if (isSdf)
-                m_MeshGenerationContext.entryRecorder.DrawSdfText(vertices, indices, texture, sdfScale);
+                m_MeshGenerationContext.entryRecorder.DrawSdfText(vertices, indices, texture, sdfScale, sharpness);
             else
                 m_MeshGenerationContext.entryRecorder.DrawMesh(vertices, indices, texture, true);
         }
@@ -750,11 +783,14 @@ public void DrawRectangle(RectangleParams rectParams)
                 DrawSprite(rectParams);
             else
             {
+                var nativeParams = rectParams.ToNativeParams();
+                ApplyInset(ref nativeParams, rectParams.texture);
+
                 MeshWriteDataInterface meshData;
                 if (rectParams.texture != null)
-                    meshData = MeshBuilderNative.MakeTexturedRect(rectParams.ToNativeParams(), UIRUtility.k_MeshPosZ);
+                    meshData = MeshBuilderNative.MakeTexturedRect(nativeParams, UIRUtility.k_MeshPosZ);
                 else
-                    meshData = MeshBuilderNative.MakeSolidRect(rectParams.ToNativeParams(), UIRUtility.k_MeshPosZ);
+                    meshData = MeshBuilderNative.MakeSolidRect(nativeParams, UIRUtility.k_MeshPosZ);
 
                 bool skipAtlas = (rectParams.meshFlags & MeshGenerationContext.MeshFlags.SkipDynamicAtlas) == MeshGenerationContext.MeshFlags.SkipDynamicAtlas;
                 BuildEntryFromNativeMesh(meshData, rectParams.texture, skipAtlas);
@@ -823,20 +859,19 @@ public void DrawVectorImage(VectorImage vectorImage, Vector2 offset, Angle rotat
             k_MarkerDrawVectorImage.End();
         }
 
-        public void DrawRectangleRepeat(RectangleParams rectParams, Rect totalRect)
+        public void DrawRectangleRepeat(RectangleParams rectParams, Rect totalRect, float scaledPixelsPerPoint)
         {
             k_MarkerDrawRectangleRepeat.Begin();
-            DoDrawRectangleRepeat(ref rectParams, totalRect);
+            DoDrawRectangleRepeat(ref rectParams, totalRect, scaledPixelsPerPoint);
             k_MarkerDrawRectangleRepeat.End();
         }
 
         // This method should not be called directly. Use the DrawRectangleRepeat wrapper instead which is properly
         // instrumented with performance counters.
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        void DoDrawRectangleRepeat(ref RectangleParams rectParams, Rect totalRect)
+        void DoDrawRectangleRepeat(ref RectangleParams rectParams, Rect totalRect, float scaledPixelsPerPoint)
         {
             var uv = new Rect(0, 0, 1, 1);
-            var targetRect = rectParams.rect;
 
             if (m_RepeatRectUVList == null)
             {
@@ -850,6 +885,8 @@ void DoDrawRectangleRepeat(ref RectangleParams rectParams, Rect totalRect)
                 m_RepeatRectUVList[1].Clear();
             }
 
+            // Compute the destination size for one repetition before clipping/offset is considered.
+            var targetRect = rectParams.rect;
             if (rectParams.backgroundSize.sizeType != BackgroundSizeType.Length)
             {
                 if (rectParams.backgroundSize.sizeType == BackgroundSizeType.Contain)
@@ -857,6 +894,8 @@ void DoDrawRectangleRepeat(ref RectangleParams rectParams, Rect totalRect)
                     float ratioX = totalRect.width / targetRect.width;
                     float ratioY = totalRect.height / targetRect.height;
 
+                    // The source is uniformly scaled to fit inside the total rect.
+                    // At this point, we ignore repetitions that may be used to fill the voids.
                     Rect rect = targetRect;
                     if (ratioX < ratioY)
                     {
@@ -876,6 +915,8 @@ void DoDrawRectangleRepeat(ref RectangleParams rectParams, Rect totalRect)
                     float ratioX = totalRect.width / targetRect.width;
                     float ratioY = totalRect.height / targetRect.height;
 
+                    // The source is uniformly scaled to completely cover the total rect.
+                    // At this point, we ignore cropping, but it will happen later.
                     Rect rect = targetRect;
                     if (ratioX > ratioY)
                     {
@@ -961,24 +1002,24 @@ void DoDrawRectangleRepeat(ref RectangleParams rectParams, Rect totalRect)
             // Adjust size when background-repeat is round and other axis background-size is auto
             if ((rectParams.backgroundSize.x.IsAuto()) && (rectParams.backgroundRepeat.y == Repeat.Round))
             {
-                int count = (int)((totalRect.size[1] + targetRect.size[1] * 0.5f) / targetRect.size[1]);
+                float invTargetHeight = 1f / targetRect.height;
+                int count = (int)(totalRect.height * invTargetHeight + 0.5f);
                 count = Math.Max(count, 1);
 
-                float new_size = (totalRect.size[1] / count);
                 Rect rect = new Rect();
-                rect.height = new_size;
-                rect.width = rect.height * targetRect.width / targetRect.height;
+                rect.height = totalRect.height / count;
+                rect.width = rect.height * targetRect.width * invTargetHeight;
                 targetRect = rect;
             }
             else if ((rectParams.backgroundSize.y.IsAuto()) && (rectParams.backgroundRepeat.x == Repeat.Round))
             {
-                int count = (int)((totalRect.size[0] + targetRect.size[0] * 0.5f) / targetRect.size[0]);
+                float invTargetWidth = 1f / targetRect.width;
+                int count = (int)(totalRect.width * invTargetWidth + 0.5f);
                 count = Math.Max(count, 1);
 
-                float new_size = (totalRect.size[0] / count);
                 Rect rect = new Rect();
-                rect.width = new_size;
-                rect.height = rect.width * targetRect.height / targetRect.width;
+                rect.width = totalRect.width / count;
+                rect.height = rect.width * targetRect.height * invTargetWidth;
                 targetRect = rect;
             }
 
@@ -1003,21 +1044,21 @@ void DoDrawRectangleRepeat(ref RectangleParams rectParams, Rect totalRect)
                 {
                     Rect rect = targetRect;
 
-                    int count = (int)(totalRect.size[axis] / targetRect.size[axis]);
+                    // We might attempt to align the texture on the pixel grid. In this process, we will offset the
+                    // texture by a fraction of a pixel. For this reason, we add one pixel to the total rect size.
+                    int count = (int)((totalRect.size[axis] + 1 / scaledPixelsPerPoint) / targetRect.size[axis]);
 
                     if (backgroundPosition.keyword == BackgroundPositionKeyword.Center)
                     {
-                        if ((count % 2) == 1)
-                        {
+                        // For center, we must keep an odd number of repetitions
+                        if ((count & 1) == 1)
                             count += 2;
-                        }
                         else
-                        {
                             count++;
-                        }
                     }
                     else
                     {
+                        // For other alignment, always add 2, to avoid changing what's in the center.
                         count += 2;
                     }
 
@@ -1093,7 +1134,7 @@ void DoDrawRectangleRepeat(ref RectangleParams rectParams, Rect totalRect)
 
                     if (backgroundPosition.keyword == BackgroundPositionKeyword.Center)
                     {
-                        if ((count % 2) == 1)
+                        if ((count & 1) == 1)
                         {
                             count += 2;
                         }
@@ -1129,16 +1170,19 @@ void DoDrawRectangleRepeat(ref RectangleParams rectParams, Rect totalRect)
 
                 // Adjust for position
                 float offset = 0;
+                bool alignToGrid = false;
 
                 if (backgroundPosition.keyword == BackgroundPositionKeyword.Center)
                 {
                     offset = (totalRect.size[axis] - linear_size) * 0.5f;
+                    alignToGrid = true;
                 }
                 else if (repeat != Repeat.Space)
                 {
                     if (backgroundPosition.offset.unit == LengthUnit.Percent)
                     {
                         offset = (totalRect.size[axis] - targetRect.size[axis]) * backgroundPosition.offset.value / 100.0f;
+                        alignToGrid = true;
                     }
                     else if (backgroundPosition.offset.unit == LengthUnit.Pixel)
                     {
@@ -1152,6 +1196,26 @@ void DoDrawRectangleRepeat(ref RectangleParams rectParams, Rect totalRect)
                     }
                 }
 
+                // UUM-36753: we need to round the offset to the nearest pixel. Otherwise, when the texture
+                // junctions are not pixel aligned, we get a seam because of the blending with the background.
+                // If the mesh is transformed (e.g. dynamic transform or nudging), the issues is likely to happen
+                // again though. The ultimate fix will be to modify the generation algorithm to avoid blending
+                // with arc-aa in the seams.
+                //
+                // Note that this doesn't work for non-rectangular sprites and vector images because their size
+                // is based on their mesh, which can be of non-integer size. As a result, the provided rect is
+                // fractional and we can't round it in a way that makes sense.
+                if (alignToGrid && rectParams.sprite == null && rectParams.vectorImage == null)
+                {
+                    // If the height of the rect is not an integer, it's not worth aligning at all because the end
+                    // is doomed to not be aligned on the pixel grid.
+                    float sizeInPixels = targetRect.size[axis] * scaledPixelsPerPoint;
+                    if (Mathf.Abs(Mathf.Round(sizeInPixels) - sizeInPixels) < 0.001f)
+                    {
+                        offset = AlignmentUtils.CeilToPixelGrid(offset, scaledPixelsPerPoint);
+                    }
+                }
+
                 // adjust offset position for repeat and round
                 if (repeat == Repeat.Repeat || repeat == Repeat.Round)
                 {
@@ -1160,13 +1224,13 @@ void DoDrawRectangleRepeat(ref RectangleParams rectParams, Rect totalRect)
                     {
                         if (offset < -size)
                         {
-                            int mod = (int)(-offset/size);
+                            int mod = (int)(-offset / size);
                             offset += mod * size;
                         }
 
                         if (offset > 0.0f)
                         {
-                            int mod = (int)(offset/size);
+                            int mod = (int)(offset / size);
                             offset -= (1 + mod) * size;
                         }
                     }
@@ -1367,6 +1431,13 @@ void DrawSprite(RectangleParams rectParams)
 
             AdjustSpriteWinding(spriteVertices, spriteIndices, indices);
 
+            var colorPage = rectParams.colorPage;
+            var pageAndID = colorPage.pageAndID;
+
+            var flags = new Color32(0, 0, 0, colorPage.isValid ? (byte)1 : (byte)0);
+            var page = new Color32(0, 0, colorPage.pageAndID.r, colorPage.pageAndID.g);
+            var ids = new Color32(0, 0, 0, colorPage.pageAndID.b);
+
             for (int i = 0; i < vertexCount; ++i)
             {
                 var v = spriteVertices[i];
@@ -1380,7 +1451,10 @@ void DrawSprite(RectangleParams rectParams)
                 {
                     position = new Vector3(v.x, v.y, Vertex.nearZ),
                     tint = rectParams.color,
-                    uv = spriteUV[i]
+                    uv = spriteUV[i],
+                    flags = flags,
+                    opacityColorPages = page,
+                    ids = ids
                 };
             }
 
@@ -1388,6 +1462,32 @@ void DrawSprite(RectangleParams rectParams)
             m_MeshGenerationContext.entryRecorder.DrawMesh(vertices, indices, sprite.texture, skipAtlas);
         }
 
+        void ApplyInset(ref MeshBuilderNative.NativeRectParams rectParams, Texture tex)
+        {
+            var rect = rectParams.rect;
+            var inset = rectParams.rectInset;
+            if (Mathf.Approximately(rect.size.x, 0.0f) || Mathf.Approximately(rect.size.y, 0.0f) || inset == Vector4.zero)
+                return;
+
+            var prevRect = rect;
+            rect.x += inset.x;
+            rect.y += inset.y;
+            rect.width -= (inset.x + inset.z);
+            rect.height -= (inset.y + inset.w);
+            rectParams.rect = rect;
+
+            var uv = rectParams.uv;
+            if (tex != null && uv.width > UIRUtility.k_Epsilon && uv.height > UIRUtility.k_Epsilon)
+            {
+                var uvScale = new Vector2(1.0f / prevRect.width, 1.0f / prevRect.height);
+                uv.x += (inset.x * uvScale.x);
+                uv.y += (inset.w * uvScale.y);
+                uv.width -= ((inset.x + inset.z) * uvScale.x);
+                uv.height -= ((inset.y + inset.w) * uvScale.y);
+                rectParams.uv = uv;
+            }
+        }
+
         void DrawVectorImage(RectangleParams rectParams)
         {
             var vi = rectParams.vectorImage;
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRPainter2D.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRPainter2D.cs
index da618dc701..3177ab59e7 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRPainter2D.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRPainter2D.cs
@@ -271,23 +271,7 @@ private bool ValidateState()
             return isValid;
         }
 
-        private static float s_MaxArcRadius = -1.0f;
-        private static float maxArcRadius
-        {
-            get {
-                if (s_MaxArcRadius < 0.0f)
-                {
-                    if (!UIRenderDevice.vertexTexturingIsAvailable)
-                        // If vertexTexturingIsAvailable is false, we probably are on a low-end
-                        // device which may have fp16 fragment shader float precision. We limit
-                        // the max arc radius even more in this case.
-                        s_MaxArcRadius = 1.0e3f;
-                    else
-                        s_MaxArcRadius = 1.0e5f;
-                }
-                return s_MaxArcRadius;
-            }
-        }
+        private static float maxArcRadius => 1.0e5f;
 
         /// <summary>
         /// Begins a new path and empties the list of recorded sub-paths and resets the pen position to (0,0).
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderChain.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderChain.cs
index 3d117bd97c..a3c8f73b79 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderChain.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderChain.cs
@@ -4,6 +4,7 @@
 
 //#define UIR_DEBUG_CHAIN_BUILDER
 using System;
+using System.Runtime.CompilerServices;
 using System.Collections.Generic;
 using Unity.Collections;
 using Unity.Profiling;
@@ -43,6 +44,9 @@ class EntryPool : ImplicitPool<Entry>
         {
             e.firstChild = null;
             e.nextSibling = null;
+            e.texture = null;
+            e.material = null;
+            e.gradientsOwner = null;
         };
 
         public EntryPool(int maxCapacity = 1000)
@@ -168,8 +172,6 @@ struct RenderNodeData
             public UIRenderDevice device;
             public Texture vectorAtlas, shaderInfoAtlas;
             public float dpiScale;
-            public NativeSlice<Transform3x4> transformConstants;
-            public NativeSlice<Vector4> clipRectConstants;
         };
 
         RenderChainCommand m_FirstCommand;
@@ -484,8 +486,7 @@ public void Render()
                     //TODO: Reactivate this guard check once InspectorWindow is fixed to stop adding VEs during OnGUI
                     //m_BlockDirtyRegistration = true;
                     device.EvaluateChain(m_FirstCommand, standardMaterial, standardMaterial, vectorImageManager?.atlas, shaderInfoAllocator.atlas,
-                        panel.scaledPixelsPerPoint, shaderInfoAllocator.transformConstants, shaderInfoAllocator.clipRectConstants,
-                        m_RenderNodesData[0].matPropBlock, true, ref immediateException);
+                        panel.scaledPixelsPerPoint, m_RenderNodesData[0].matPropBlock, true, ref immediateException);
                     //m_BlockDirtyRegistration = false;
                 }
             }
@@ -633,6 +634,17 @@ public void UIEOnOpacityIdChanged(VisualElement ve)
             }
         }
 
+        public void UIEOnDisableRenderingChanged(VisualElement ve)
+        {
+            if (ve.renderChainData.isInChain)
+            {
+                if (m_BlockDirtyRegistration)
+                    throw new InvalidOperationException("VisualElements cannot change their display style during generateVisualContent callback execution nor during visual tree rendering");
+
+                CommandManipulator.DisableElementRendering(this , ve, ve.disableRendering);
+            }
+        }
+
         #endregion
 
         internal BaseVisualElementPanel panel { get; private set; }
@@ -750,8 +762,7 @@ private unsafe static void OnRenderNodeExecute(IntPtr obj)
             Exception immediateException = null;
             rnd.device.EvaluateChain(rnd.firstCommand, rnd.initialMaterial, rnd.standardMaterial,
                 rnd.vectorAtlas, rnd.shaderInfoAtlas,
-                rnd.dpiScale, rnd.transformConstants, rnd.clipRectConstants,
-                rnd.matPropBlock, false, ref immediateException);
+                rnd.dpiScale, rnd.matPropBlock, false, ref immediateException);
         }
 
         private static void OnRegisterIntermediateRenderers(Camera camera)
@@ -773,8 +784,6 @@ private static void OnRegisterIntermediateRenderers(Camera camera)
                 rndSource.vectorAtlas = renderChain.vectorImageManager?.atlas;
                 rndSource.shaderInfoAtlas = renderChain.shaderInfoAllocator.atlas;
                 rndSource.dpiScale = rtp.scaledPixelsPerPoint;
-                rndSource.transformConstants = renderChain.shaderInfoAllocator.transformConstants;
-                rndSource.clipRectConstants = renderChain.shaderInfoAllocator.clipRectConstants;
 
                 if (renderChain.m_CustomMaterialCommands == 0)
                 {
@@ -925,7 +934,9 @@ void DrawStats()
             var drawStats = ((UIRenderDevice)device).GatherDrawStatistics();
             GUI.Label(rc, "Frame index\t: " + drawStats.currentFrameIndex); rc.y += y_off;
             GUI.Label(rc, "Command count\t: " + drawStats.commandCount); rc.y += y_off;
+            GUI.Label(rc, "Skip cmd counts\t: " + drawStats.skippedCommandCount); rc.y += y_off;
             GUI.Label(rc, "Draw commands\t: " + drawStats.drawCommandCount); rc.y += y_off;
+            GUI.Label(rc, "Disable commands\t: " + drawStats.disableCommandCount); rc.y += y_off;
             GUI.Label(rc, "Draw ranges\t: " + drawStats.drawRangeCount); rc.y += y_off;
             GUI.Label(rc, "Draw range calls\t: " + drawStats.drawRangeCallCount); rc.y += y_off;
             GUI.Label(rc, "Material sets\t: " + drawStats.materialSetCount); rc.y += y_off;
@@ -972,18 +983,24 @@ internal enum RenderDataDirtyTypeClasses
         Count
     }
 
+    [Flags]
+    enum RenderDataFlags
+    {
+        IsIgnoringDynamicColorHint = 1 << 0,
+    }
+
     internal struct RenderChainVEData
     {
         internal VisualElement prev, next; // This is a flattened view of the visual element hierarchy
         internal VisualElement groupTransformAncestor, boneTransformAncestor;
         internal VisualElement prevDirty, nextDirty; // Embedded doubly-linked list for dirty updates
+        internal RenderDataFlags flags;
         internal int hierarchyDepth; // 0 is for the root
         internal RenderDataDirtyTypes dirtiedValues;
         internal uint dirtyID;
         internal RenderChainCommand firstHeadCommand, lastHeadCommand; // Sequential for the same owner
         internal RenderChainCommand firstTailCommand, lastTailCommand; // Sequential for the same owner
         internal bool isInChain;
-        internal bool isHierarchyHidden;
         internal bool localFlipsWinding;
         internal bool localTransformScaleZero;
         internal bool worldFlipsWinding;
@@ -997,13 +1014,24 @@ internal struct RenderChainVEData
         internal BMPAlloc transformID, clipRectID, opacityID, textCoreSettingsID;
         internal BMPAlloc colorID, backgroundColorID, borderLeftColorID, borderTopColorID, borderRightColorID, borderBottomColorID, tintColorID;
         internal float compositeOpacity;
-        internal Color backgroundColor;
+        internal float backgroundAlpha;
 
         internal BasicNode<TextureEntry> textures;
 
         internal RenderChainCommand lastTailOrHeadCommand { get { return lastTailCommand ?? lastHeadCommand; } }
         static internal bool AllocatesID(BMPAlloc alloc) { return (alloc.ownedState == OwnedState.Owned) && alloc.IsValid(); }
         static internal bool InheritsID(BMPAlloc alloc) { return (alloc.ownedState == OwnedState.Inherited) && alloc.IsValid(); }
+
+        // This is set whenever there is repaint requested when HierarchyDisplayed == false and is used to trigger the repaint when it finally get displayed
+        internal bool pendingRepaint;
+        // This is set whenever a hierarchical repaint was needed when HierarchyDisplayed == false.
+        internal bool pendingHierarchicalRepaint;
+
+        public bool isIgnoringDynamicColorHint
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+            get => (flags & RenderDataFlags.IsIgnoringDynamicColorHint) == RenderDataFlags.IsIgnoringDynamicColorHint;
+        }
     }
 
     struct TextureEntry
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderEvents.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderEvents.cs
index bcd4e87d77..22d25058f5 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderEvents.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderEvents.cs
@@ -102,7 +102,7 @@ internal static uint DepthFirstOnChildAdded(RenderChain renderChain, VisualEleme
             ve.renderChainData.transformID = UIRVEShaderInfoAllocator.identityTransform;
             ve.renderChainData.clipRectID = UIRVEShaderInfoAllocator.infiniteClipRect;
             ve.renderChainData.opacityID = UIRVEShaderInfoAllocator.fullOpacity;
-            ve.renderChainData.colorID = BMPAlloc.Invalid; // Rely on vertex tint color by default
+            ve.renderChainData.colorID = BMPAlloc.Invalid;
             ve.renderChainData.backgroundColorID = BMPAlloc.Invalid;
             ve.renderChainData.borderLeftColorID = BMPAlloc.Invalid;
             ve.renderChainData.borderTopColorID = BMPAlloc.Invalid;
@@ -538,10 +538,17 @@ static void OnColorChanged(RenderChain renderChain, VisualElement ve, uint dirty
             stats.colorUpdatesExpanded++;
 
             var newColor = ve.resolvedStyle.backgroundColor;
-            ve.renderChainData.backgroundColor = newColor;
+
+            // UUM-21405: Fully-transparent backgrounds don't generate any geometry. So, we need to
+            // force a dirty-repaint if we were transparent before, otherwise we may be trying to
+            // change the color of a mesh that doesn't exists.
+            if (ve.renderChainData.backgroundAlpha == 0.0f && newColor.a > 0.0f)
+                renderChain.UIEOnVisualsChanged(ve, false);
+
+            ve.renderChainData.backgroundAlpha = newColor.a;
 
             bool shouldUpdateVisuals = false;
-            if ((ve.renderHints & RenderHints.DynamicColor) == RenderHints.DynamicColor)
+            if ((ve.renderHints & RenderHints.DynamicColor) == RenderHints.DynamicColor && !ve.renderChainData.isIgnoringDynamicColorHint)
             {
                 if (InitColorIDs(renderChain, ve))
                     // New colors were allocated, we need to update the visuals
@@ -641,7 +648,7 @@ public static bool UpdateTextCoreSettings(RenderChain renderChain, VisualElement
 
             // If we aren't using a color ID (the DynamicColor flag), the text color will be stored in the vertex data,
             // so there's no need for a color match with the default TextCore settings.
-            bool useDefaultColor = !NeedsColorID(ve) || settings.faceColor == Color.white;
+            bool useDefaultColor = !NeedsColorID(ve);
 
             if (useDefaultColor && !NeedsTextCoreSettings(ve) && !allocatesID)
             {
@@ -654,7 +661,15 @@ public static bool UpdateTextCoreSettings(RenderChain renderChain, VisualElement
                 ve.renderChainData.textCoreSettingsID = renderChain.shaderInfoAllocator.AllocTextCoreSettings(settings);
 
             if (RenderChainVEData.AllocatesID(ve.renderChainData.textCoreSettingsID))
-                renderChain.shaderInfoAllocator.SetTextCoreSettingValue(ve.renderChainData.textCoreSettingsID, settings);
+            {
+                if (ve.panel.contextType == ContextType.Editor)
+                {
+                    settings.faceColor *= UIElementsUtility.editorPlayModeTintColor;
+                    settings.outlineColor *= UIElementsUtility.editorPlayModeTintColor;
+                    settings.underlayColor *= UIElementsUtility.editorPlayModeTintColor;
+                }
+                renderChain.shaderInfoAllocator.SetTextCoreSettingValue(ve.renderChainData.textCoreSettingsID, settings, ve.panel.contextType == ContextType.Editor);
+            }
 
             return true;
         }
@@ -722,12 +737,6 @@ static unsafe void PrepareNudgeVertices(VisualElement ve, UIRenderDevice device,
             dst = (IntPtr)newVerts.GetUnsafePtr();
             count = vertCount;
         }
-
-        public static bool IsElementHierarchyHidden(VisualElement ve)
-        {
-            return ve.resolvedStyle.display == DisplayStyle.None;
-        }
-
         static VisualElement GetLastDeepestChild(VisualElement ve)
         {
             // O(n) of the visual tree depth, usually not too bad.. probably 10-15 in really bad cases
@@ -897,21 +906,22 @@ static void ResetColorIDs(VisualElement ve)
 
         public static void SetColorValues(RenderChain renderChain, VisualElement ve)
         {
+            bool isEditor = ve.panel.contextType == ContextType.Editor;
             var style = ve.resolvedStyle;
             if (ve.renderChainData.colorID.IsValid())
-                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.colorID, style.color);
+                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.colorID, style.color, isEditor);
             if (ve.renderChainData.backgroundColorID.IsValid())
-                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.backgroundColorID, style.backgroundColor);
+                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.backgroundColorID, style.backgroundColor, isEditor);
             if (ve.renderChainData.borderLeftColorID.IsValid())
-                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.borderLeftColorID, style.borderLeftColor);
+                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.borderLeftColorID, style.borderLeftColor, isEditor);
             if (ve.renderChainData.borderTopColorID.IsValid())
-                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.borderTopColorID, style.borderTopColor);
+                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.borderTopColorID, style.borderTopColor, isEditor);
             if (ve.renderChainData.borderRightColorID.IsValid())
-                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.borderRightColorID, style.borderRightColor);
+                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.borderRightColorID, style.borderRightColor, isEditor);
             if (ve.renderChainData.borderBottomColorID.IsValid())
-                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.borderBottomColorID, style.borderBottomColor);
+                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.borderBottomColorID, style.borderBottomColor, isEditor);
             if (ve.renderChainData.tintColorID.IsValid())
-                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.tintColorID, style.unityBackgroundImageTintColor);
+                renderChain.shaderInfoAllocator.SetColorValue(ve.renderChainData.tintColorID, style.unityBackgroundImageTintColor, isEditor);
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRepaintUpdater.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRepaintUpdater.cs
index db92635415..e8696c06e4 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRepaintUpdater.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRepaintUpdater.cs
@@ -35,6 +35,8 @@ public override void OnVersionChanged(VisualElement ve, VersionChangeType versio
             bool borderRadiusChanged = (versionChangeType & VersionChangeType.BorderRadius) != 0;
             bool borderWidthChanged = (versionChangeType & VersionChangeType.BorderWidth) != 0;
             bool renderHintsChanged = (versionChangeType & VersionChangeType.RenderHints) != 0;
+            bool disableRenderingChanged = (versionChangeType & VersionChangeType.DisableRendering) != 0;
+            bool repaintChanged = (versionChangeType & VersionChangeType.Repaint) != 0;
 
             if (renderHintsChanged)
                 renderChain.UIEOnRenderHintsChanged(ve);
@@ -51,8 +53,11 @@ public override void OnVersionChanged(VisualElement ve, VersionChangeType versio
             if ((versionChangeType & VersionChangeType.Color) != 0)
                 renderChain.UIEOnColorChanged(ve);
 
-            if ((versionChangeType & VersionChangeType.Repaint) != 0)
+            if (repaintChanged)
                 renderChain.UIEOnVisualsChanged(ve, false);
+
+            if (disableRenderingChanged && !repaintChanged) // The disable rendering will be taken care of by the repaint (it clear all commands)
+                renderChain.UIEOnDisableRenderingChanged(ve);
         }
 
         public override void Update()
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRTextureSlotManager.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRTextureSlotManager.cs
index db413da3b2..1a7466f7ef 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRTextureSlotManager.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRTextureSlotManager.cs
@@ -10,7 +10,7 @@ class TextureSlotManager
     {
         static TextureSlotManager()
         {
-            k_SlotCount = UIRenderDevice.shaderModelIs35 ? 8 : 4;
+            k_SlotCount = 8;
             slotIds = new int[k_SlotCount];
             for (int i = 0; i < k_SlotCount; ++i)
                 slotIds[i] = Shader.PropertyToID($"_Texture{i}");
@@ -47,7 +47,7 @@ public void Reset()
             {
                 m_Textures[i] = TextureId.invalid;
                 m_Tickets[i] = -1;
-                SetGpuData(i, TextureId.invalid, 1, 1, 0);
+                SetGpuData(i, TextureId.invalid, 1, 1, 0, 0);
             }
         }
 
@@ -96,7 +96,7 @@ public int FindOldestSlot()
             return slot;
         }
 
-        public void Bind(TextureId id, float sdfScale, int slot, MaterialPropertyBlock mat)
+        public void Bind(TextureId id, float sdfScale, float sharpness, int slot, MaterialPropertyBlock mat)
         {
             Texture tex = textureRegistry.GetTexture(id);
             if (tex == null) // Case 1364578: Texture may have been destroyed
@@ -104,18 +104,18 @@ public void Bind(TextureId id, float sdfScale, int slot, MaterialPropertyBlock m
 
             m_Textures[slot] = id;
             MarkUsed(slot);
-            SetGpuData(slot, id, tex.width, tex.height, sdfScale);
+            SetGpuData(slot, id, tex.width, tex.height, sdfScale, sharpness);
             mat.SetTexture(slotIds[slot], tex);
             mat.SetVectorArray(textureTableId, m_GpuTextures);
         }
 
-        public void SetGpuData(int slotIndex, TextureId id, int textureWidth, int textureHeight, float sdfScale)
+        public void SetGpuData(int slotIndex, TextureId id, int textureWidth, int textureHeight, float sdfScale, float sharpness)
         {
             int offset = slotIndex * k_SlotSize;
             float texelWidth = 1f / textureWidth;
             float texelHeight = 1f / textureHeight;
             m_GpuTextures[offset + 0] = new Vector4(id.ConvertToGpu(), texelWidth, texelHeight, sdfScale);
-            m_GpuTextures[offset + 1] = new Vector4(textureWidth, textureHeight, 0, 0);
+            m_GpuTextures[offset + 1] = new Vector4(textureWidth, textureHeight, sharpness, 0);
         }
 
         // Overridable for tests
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVEShaderInfoAllocator.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVEShaderInfoAllocator.cs
index 75a3137aa0..1d6472a207 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVEShaderInfoAllocator.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVEShaderInfoAllocator.cs
@@ -157,11 +157,6 @@ internal struct UIRVEShaderInfoAllocator
         BitmapAllocator32 m_TransformAllocator, m_ClipRectAllocator, m_OpacityAllocator, m_ColorAllocator, m_TextSettingsAllocator; // All allocators take pages from the same storage
         bool m_StorageReallyCreated;
 
-        // Support for absence of vertex texturing
-        bool m_VertexTexturingEnabled;
-        NativeArray<Transform3x4> m_Transforms;
-        NativeArray<Vector4> m_ClipRects;
-
         static int pageWidth { get { return BitmapAllocator32.kPageWidth; } }
         static int pageHeight { get { return 8; } } // 32*8 = 256, can be stored in a byte
 
@@ -203,11 +198,6 @@ static Vector2Int AllocToTexelCoord(ref BitmapAllocator32 allocator, BMPAlloc al
                 alloc.pageLine * allocator.entryHeight + y);
         }
 
-        static int AllocToConstantBufferIndex(BMPAlloc alloc)
-        {
-            return alloc.pageLine * pageWidth + alloc.bitIndex;
-        }
-
         static bool AtlasRectMatchesPage(ref BitmapAllocator32 allocator, BMPAlloc defAlloc, RectInt atlasRect)
         {
             UInt16 x, y;
@@ -217,15 +207,13 @@ static bool AtlasRectMatchesPage(ref BitmapAllocator32 allocator, BMPAlloc defAl
                 (allocator.entryHeight * pageHeight == atlasRect.height);
         }
 
-        public NativeSlice<Transform3x4> transformConstants { get { return m_Transforms; } }
-        public NativeSlice<Vector4> clipRectConstants { get { return m_ClipRects; } }
         public Texture atlas
         {
             get
             {
                 if (m_StorageReallyCreated)
                     return m_Storage.texture;
-                return m_VertexTexturingEnabled ? UIRenderDevice.defaultShaderInfoTexFloat : UIRenderDevice.defaultShaderInfoTexARGB8;
+                return UIRenderDevice.defaultShaderInfoTexFloat;
             }
         }
         public bool internalAtlasCreated { get { return m_StorageReallyCreated; } } // For diagnostics really
@@ -246,28 +234,12 @@ public void Construct()
             m_ColorAllocator.ForceFirstAlloc((ushort)clearColorTexel.x, (ushort)clearColorTexel.y);
             m_TextSettingsAllocator.Construct(pageHeight, 1, 4);
             m_TextSettingsAllocator.ForceFirstAlloc((ushort)defaultTextCoreSettingsTexel.x, (ushort)defaultTextCoreSettingsTexel.y);
-
-            m_VertexTexturingEnabled = UIRenderDevice.vertexTexturingIsAvailable;
-            if (!m_VertexTexturingEnabled)
-            {
-                int constantCount = 20; // Once custom materials are exposed, this number must be parameterized
-                // Note that we can't do a lazy late allocation on the constants array size here (e.g. allocate only the default entry)
-                // because once the material receives an array parameter value for the first time, it clings to its size and never
-                // allows size changes afterwards without recreating the material, so we need to get the size right pessimistically
-                m_Transforms = new NativeArray<Transform3x4>(constantCount, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-                m_ClipRects = new NativeArray<Vector4>(constantCount, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-                m_Transforms[0] = new Transform3x4() { v0 = identityTransformRow0Value, v1 = identityTransformRow1Value, v2 = identityTransformRow2Value };
-                m_ClipRects[0] = infiniteClipRectValue;
-            }
         }
 
         void ReallyCreateStorage()
         {
             // Because we want predictable placement of first pages, 64 will fit all default allocs
-            if (m_VertexTexturingEnabled)
-                m_Storage = new ShaderInfoStorageRGBAFloat(64);
-            else
-                m_Storage = new ShaderInfoStorageRGBA32(64); // If no vertex texturing, only store opacity in RGBA32
+            m_Storage = new ShaderInfoStorageRGBAFloat(64);
 
             // The order of allocation from the atlas below is important. See the comment at the beginning of Construct().
             RectInt rcTransform, rcClipRect, rcOpacity, rcColor, rcTextCoreSettings;
@@ -292,16 +264,11 @@ void ReallyCreateStorage()
             if (!AtlasRectMatchesPage(ref m_TextSettingsAllocator, defaultTextCoreSettings, rcTextCoreSettings))
                 throw new Exception("Atlas text setting allocation failed unexpectedly");
 
-            if (m_VertexTexturingEnabled)
-            {
-                SetTransformValue(identityTransform, identityTransformValue);
-                SetClipRectValue(infiniteClipRect, infiniteClipRectValue);
-            }
-            {
-                SetOpacityValue(fullOpacity, fullOpacityValue.w);
-                SetColorValue(clearColor, clearColorValue);
-                SetTextCoreSettingValue(defaultTextCoreSettings, defaultTextCoreSettingsValue);
-            }
+            SetTransformValue(identityTransform, identityTransformValue);
+            SetClipRectValue(infiniteClipRect, infiniteClipRectValue);
+            SetOpacityValue(fullOpacity, fullOpacityValue.w);
+            SetColorValue(clearColor, clearColorValue, false); // color is saturated, no need to check the colorspace
+            SetTextCoreSettingValue(defaultTextCoreSettings, defaultTextCoreSettingsValue, false); // colors are saturated, no need to check the colorspace
 
             m_StorageReallyCreated = true;
         }
@@ -311,10 +278,6 @@ public void Dispose()
             if (m_Storage != null)
                 m_Storage.Dispose();
             m_Storage = null;
-            if (m_ClipRects.IsCreated)
-                m_ClipRects.Dispose();
-            if (m_Transforms.IsCreated)
-                m_Transforms.Dispose();
             m_StorageReallyCreated = false;
         }
 
@@ -328,16 +291,7 @@ public BMPAlloc AllocTransform()
             if (!m_StorageReallyCreated)
                 ReallyCreateStorage();
 
-            if (m_VertexTexturingEnabled)
-                return m_TransformAllocator.Allocate(m_Storage);
-
-            var alloc = m_TransformAllocator.Allocate(null); // Don't want to allow new pages
-
-            // If the returned alloc address fits within the constant buffer then succeed, otherwise fail
-            if (AllocToConstantBufferIndex(alloc) < m_Transforms.Length)
-                return alloc;
-            m_TransformAllocator.Free(alloc); // Not really necessary, but feels cleaner
-            return BMPAlloc.Invalid;
+            return m_TransformAllocator.Allocate(m_Storage);
         }
 
         public BMPAlloc AllocClipRect()
@@ -345,16 +299,7 @@ public BMPAlloc AllocClipRect()
             if (!m_StorageReallyCreated)
                 ReallyCreateStorage();
 
-            if (m_VertexTexturingEnabled)
-                return m_ClipRectAllocator.Allocate(m_Storage);
-
-            var alloc = m_ClipRectAllocator.Allocate(null); // Don't want to allow new pages
-
-            // If the returned alloc address fits within the constant buffer then succeed, otherwise fail
-            if (AllocToConstantBufferIndex(alloc) < m_ClipRects.Length)
-                return alloc;
-            m_ClipRectAllocator.Free(alloc); // Not really necessary, but feels cleaner
-            return BMPAlloc.Invalid;
+            return m_ClipRectAllocator.Allocate(m_Storage);
         }
 
         public BMPAlloc AllocOpacity()
@@ -384,31 +329,17 @@ public BMPAlloc AllocTextCoreSettings(TextCoreSettings settings)
         public void SetTransformValue(BMPAlloc alloc, Matrix4x4 xform)
         {
             Debug.Assert(alloc.IsValid());
-            if (m_VertexTexturingEnabled)
-            {
-                var allocXY = AllocToTexelCoord(ref m_TransformAllocator, alloc);
-                m_Storage.SetTexel(allocXY.x, allocXY.y + 0, xform.GetRow(0));
-                m_Storage.SetTexel(allocXY.x, allocXY.y + 1, xform.GetRow(1));
-                m_Storage.SetTexel(allocXY.x, allocXY.y + 2, xform.GetRow(2));
-            }
-            else
-                m_Transforms[AllocToConstantBufferIndex(alloc)] = new Transform3x4()
-                {
-                    v0 = xform.GetRow(0),
-                    v1 = xform.GetRow(1),
-                    v2 = xform.GetRow(2)
-                };
+            var allocXY = AllocToTexelCoord(ref m_TransformAllocator, alloc);
+            m_Storage.SetTexel(allocXY.x, allocXY.y + 0, xform.GetRow(0));
+            m_Storage.SetTexel(allocXY.x, allocXY.y + 1, xform.GetRow(1));
+            m_Storage.SetTexel(allocXY.x, allocXY.y + 2, xform.GetRow(2));
         }
 
         public void SetClipRectValue(BMPAlloc alloc, Vector4 clipRect)
         {
             Debug.Assert(alloc.IsValid());
-            if (m_VertexTexturingEnabled)
-            {
-                var allocXY = AllocToTexelCoord(ref m_ClipRectAllocator, alloc);
-                m_Storage.SetTexel(allocXY.x, allocXY.y, clipRect);
-            }
-            else m_ClipRects[AllocToConstantBufferIndex(alloc)] = clipRect;
+            var allocXY = AllocToTexelCoord(ref m_ClipRectAllocator, alloc);
+            m_Storage.SetTexel(allocXY.x, allocXY.y, clipRect);
         }
 
         public void SetOpacityValue(BMPAlloc alloc, float opacity)
@@ -418,23 +349,39 @@ public void SetOpacityValue(BMPAlloc alloc, float opacity)
             m_Storage.SetTexel(allocXY.x, allocXY.y, new Color(1, 1, 1, opacity));
         }
 
-        public void SetColorValue(BMPAlloc alloc, Color color)
+        public void SetColorValue(BMPAlloc alloc, Color color, bool isEditorContext)
         {
             Debug.Assert(alloc.IsValid());
             var allocXY = AllocToTexelCoord(ref m_ColorAllocator, alloc);
-            m_Storage.SetTexel(allocXY.x, allocXY.y, color);
+
+            if(QualitySettings.activeColorSpace == ColorSpace.Linear && !isEditorContext)
+                m_Storage.SetTexel(allocXY.x, allocXY.y, color.linear);
+            else
+                m_Storage.SetTexel(allocXY.x, allocXY.y, color);
         }
 
-        public void SetTextCoreSettingValue(BMPAlloc alloc, TextCoreSettings settings)
+        public void SetTextCoreSettingValue(BMPAlloc alloc, TextCoreSettings settings, bool isEditorContext)
         {
             Debug.Assert(alloc.IsValid());
 
             var allocXY = AllocToTexelCoord(ref m_TextSettingsAllocator, alloc);
             var settingValues = new Color(-settings.underlayOffset.x, settings.underlayOffset.y, settings.underlaySoftness, settings.outlineWidth);
-            m_Storage.SetTexel(allocXY.x, allocXY.y + 0, settings.faceColor);
-            m_Storage.SetTexel(allocXY.x, allocXY.y + 1, settings.outlineColor);
-            m_Storage.SetTexel(allocXY.x, allocXY.y + 2, settings.underlayColor);
+
+            if (QualitySettings.activeColorSpace == ColorSpace.Linear && !isEditorContext)
+            {
+                m_Storage.SetTexel(allocXY.x, allocXY.y + 0, settings.faceColor.linear);
+                m_Storage.SetTexel(allocXY.x, allocXY.y + 1, settings.outlineColor.linear);
+                m_Storage.SetTexel(allocXY.x, allocXY.y + 2, settings.underlayColor.linear);
+            }
+            else
+            {
+                m_Storage.SetTexel(allocXY.x, allocXY.y + 0, settings.faceColor);
+                m_Storage.SetTexel(allocXY.x, allocXY.y + 1, settings.outlineColor);
+                m_Storage.SetTexel(allocXY.x, allocXY.y + 2, settings.underlayColor);
+            }
+
             m_Storage.SetTexel(allocXY.x, allocXY.y + 3, settingValues);
+
         }
 
         public void FreeTransform(BMPAlloc alloc)
@@ -471,8 +418,7 @@ public Color32 TransformAllocToVertexData(BMPAlloc alloc)
         {
             Debug.Assert(pageWidth == 32 && pageHeight == 8); // Match the bit-shift values below for fast integer division
             UInt16 x = 0, y = 0;
-            if (m_VertexTexturingEnabled)
-                m_TransformAllocator.GetAllocPageAtlasLocation(alloc.page, out x, out y);
+            m_TransformAllocator.GetAllocPageAtlasLocation(alloc.page, out x, out y);
             return new Color32((byte)(x >> 5), (byte)(y >> 3), (byte)(alloc.pageLine * pageWidth + alloc.bitIndex), 0);
         }
 
@@ -480,8 +426,7 @@ public Color32 ClipRectAllocToVertexData(BMPAlloc alloc)
         {
             Debug.Assert(pageWidth == 32 && pageHeight == 8); // Match the bit-shift values below for fast integer division
             UInt16 x = 0, y = 0;
-            if (m_VertexTexturingEnabled)
-                m_ClipRectAllocator.GetAllocPageAtlasLocation(alloc.page, out x, out y);
+            m_ClipRectAllocator.GetAllocPageAtlasLocation(alloc.page, out x, out y);
             return new Color32((byte)(x >> 5), (byte)(y >> 3), (byte)(alloc.pageLine * pageWidth + alloc.bitIndex), 0);
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVisualChangesProcessor.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVisualChangesProcessor.cs
index 0870ade21c..9083b27841 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVisualChangesProcessor.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVisualChangesProcessor.cs
@@ -53,17 +53,14 @@ public VisualChangesProcessor(RenderChain renderChain)
 
             public void ProcessOnVisualsChanged(VisualElement ve, uint dirtyID, ref ChainBuilderStats stats)
             {
-                bool hierarchical = (ve.renderChainData.dirtiedValues & RenderDataDirtyTypes.VisualsHierarchy) != 0;
+                bool hierarchical = ve.renderChainData.pendingHierarchicalRepaint || (ve.renderChainData.dirtiedValues & RenderDataDirtyTypes.VisualsHierarchy) != 0;
                 if (hierarchical)
                     stats.recursiveVisualUpdates++;
                 else stats.nonRecursiveVisualUpdates++;
-                var parent = ve.hierarchy.parent;
-                var parentHierarchyHidden = parent != null &&
-                    (parent.renderChainData.isHierarchyHidden || RenderEvents.IsElementHierarchyHidden(parent));
-                DepthFirstOnVisualsChanged(ve, dirtyID, parentHierarchyHidden, hierarchical, ref stats);
+                DepthFirstOnVisualsChanged(ve, dirtyID, hierarchical, ref stats);
             }
 
-            void DepthFirstOnVisualsChanged(VisualElement ve, uint dirtyID, bool parentHierarchyHidden, bool hierarchical, ref ChainBuilderStats stats)
+            void DepthFirstOnVisualsChanged(VisualElement ve, uint dirtyID, bool hierarchical, ref ChainBuilderStats stats)
             {
                 if (dirtyID == ve.renderChainData.dirtyID)
                     return;
@@ -72,10 +69,17 @@ void DepthFirstOnVisualsChanged(VisualElement ve, uint dirtyID, bool parentHiera
                 if (hierarchical)
                     stats.recursiveVisualUpdatesExpanded++;
 
-                bool wasHierarchyHidden = ve.renderChainData.isHierarchyHidden;
-                ve.renderChainData.isHierarchyHidden = parentHierarchyHidden || RenderEvents.IsElementHierarchyHidden(ve);
-                if (wasHierarchyHidden != ve.renderChainData.isHierarchyHidden)
-                    hierarchical = true;
+                if (!ve.areAncestorsAndSelfDisplayed)
+                {
+                    if (hierarchical)
+                        ve.renderChainData.pendingHierarchicalRepaint = true;
+                    else
+                        ve.renderChainData.pendingRepaint = true;
+                    return;
+                }
+
+                ve.renderChainData.pendingHierarchicalRepaint = false;
+                ve.renderChainData.pendingRepaint = false;
 
                 if (!hierarchical && (ve.renderChainData.dirtiedValues & RenderDataDirtyTypes.AllVisuals) == RenderDataDirtyTypes.VisualsOpacityId)
                 {
@@ -105,21 +109,18 @@ void DepthFirstOnVisualsChanged(VisualElement ve, uint dirtyID, bool parentHiera
                     rootEntry = rootEntry
                 });
 
-                if (!ve.renderChainData.isHierarchyHidden)
-                {
-                    k_GenerateEntriesMarker.Begin();
-                    m_MeshGenerationContext.Begin(new MeshGenerationNode { placeholder = rootEntry }, ve);
-                    m_ElementBuilder.Build(m_MeshGenerationContext);
-                    m_MeshGenerationContext.End();
-                    k_GenerateEntriesMarker.End();
-                }
+                k_GenerateEntriesMarker.Begin();
+                m_MeshGenerationContext.Begin(new MeshGenerationNode { placeholder = rootEntry }, ve);
+                m_ElementBuilder.Build(m_MeshGenerationContext);
+                m_MeshGenerationContext.End();
+                k_GenerateEntriesMarker.End();
 
                 if (hierarchical)
                 {
                     // Recurse on children
                     int childrenCount = ve.hierarchy.childCount;
                     for (int i = 0; i < childrenCount; i++)
-                        DepthFirstOnVisualsChanged(ve.hierarchy[i], dirtyID, ve.renderChainData.isHierarchyHidden, true, ref stats);
+                        DepthFirstOnVisualsChanged(ve.hierarchy[i], dirtyID, true, ref stats);
                 }
 
                 m_EntryProcessingList.Add(new EntryProcessingInfo
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderDevice.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderDevice.cs
index 3e3967db80..c778e391c5 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderDevice.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderDevice.cs
@@ -99,8 +99,6 @@ public void Dispose()
 
         static readonly int s_GradientSettingsTexID = Shader.PropertyToID("_GradientSettingsTex");
         static readonly int s_ShaderInfoTexID = Shader.PropertyToID("_ShaderInfoTex");
-        static readonly int s_TransformsPropID = Shader.PropertyToID("_Transforms");
-        static readonly int s_ClipRectsPropID = Shader.PropertyToID("_ClipRects");
 
         static ProfilerMarker s_MarkerAllocate = new ProfilerMarker("UIR.Allocate");
         static ProfilerMarker s_MarkerFree = new ProfilerMarker("UIR.Free");
@@ -108,14 +106,6 @@ public void Dispose()
         static ProfilerMarker s_MarkerFence = new ProfilerMarker("UIR.WaitOnFence");
         static ProfilerMarker s_MarkerBeforeDraw = new ProfilerMarker("UIR.BeforeDraw");
 
-        static bool? s_VertexTexturingIsAvailable;
-        const string k_VertexTexturingIsAvailableTag = "UIE_VertexTexturingIsAvailable";
-        const string k_VertexTexturingIsAvailableTrue = "1";
-
-        static bool? s_ShaderModelIs35;
-        const string k_ShaderModelIs35Tag = "UIE_ShaderModelIs35";
-        const string k_ShaderModelIs35True = "1";
-
         internal static uint maxVerticesPerPage => 0xFFFF; // On DX11, 0xFFFF is an invalid index (associated to primitive restart). With size = 0xFFFF last index is 0xFFFE    cases:1259449
 
         internal bool breakBatches { get; set; }
@@ -161,7 +151,7 @@ protected UIRenderDevice(uint initialVertexCapacity, uint initialIndexCapacity,
         }
 
         #region Default system resources
-        static private Texture2D s_DefaultShaderInfoTexFloat, s_DefaultShaderInfoTexARGB8;
+        static private Texture2D s_DefaultShaderInfoTexFloat;
         static internal Texture2D defaultShaderInfoTexFloat
         {
             get
@@ -186,63 +176,8 @@ static internal Texture2D defaultShaderInfoTexFloat
                 return s_DefaultShaderInfoTexFloat;
             }
         }
-        static internal Texture2D defaultShaderInfoTexARGB8
-        {
-            get
-            {
-                if (s_DefaultShaderInfoTexARGB8 == null)
-                {
-                    s_DefaultShaderInfoTexARGB8 = new Texture2D(64, 64, TextureFormat.RGBA32, false); // No mips
-                    s_DefaultShaderInfoTexARGB8.name = "DefaultShaderInfoTexARGB8";
-                    s_DefaultShaderInfoTexARGB8.hideFlags = HideFlags.HideAndDontSave;
-                    s_DefaultShaderInfoTexARGB8.filterMode = FilterMode.Point;
-                    s_DefaultShaderInfoTexARGB8.SetPixel(UIRVEShaderInfoAllocator.fullOpacityTexel.x, UIRVEShaderInfoAllocator.fullOpacityTexel.y, UIRVEShaderInfoAllocator.fullOpacityValue);
-                    s_DefaultShaderInfoTexARGB8.SetPixel(UIRVEShaderInfoAllocator.defaultTextCoreSettingsTexel.x, UIRVEShaderInfoAllocator.defaultTextCoreSettingsTexel.y + 0, Color.white);
-                    s_DefaultShaderInfoTexARGB8.SetPixel(UIRVEShaderInfoAllocator.defaultTextCoreSettingsTexel.x, UIRVEShaderInfoAllocator.defaultTextCoreSettingsTexel.y + 1, Color.clear);
-                    s_DefaultShaderInfoTexARGB8.SetPixel(UIRVEShaderInfoAllocator.defaultTextCoreSettingsTexel.x, UIRVEShaderInfoAllocator.defaultTextCoreSettingsTexel.y + 2, Color.clear);
-                    s_DefaultShaderInfoTexARGB8.SetPixel(UIRVEShaderInfoAllocator.defaultTextCoreSettingsTexel.x, UIRVEShaderInfoAllocator.defaultTextCoreSettingsTexel.y + 3, Color.clear);
-                    s_DefaultShaderInfoTexARGB8.Apply(false, true);
-                }
-                return s_DefaultShaderInfoTexARGB8;
-            }
-        }
-        #endregion
-
-        static internal bool vertexTexturingIsAvailable
-        {
-            get
-            {
-                if (!s_VertexTexturingIsAvailable.HasValue)
-                {
-                    var stockDefaultShader = Shader.Find(UIRUtility.k_DefaultShaderName);
-                    var stockDefaultMaterial = new Material(stockDefaultShader);
-                    stockDefaultMaterial.hideFlags |= HideFlags.DontSaveInEditor;
-                    string tagValue = stockDefaultMaterial.GetTag(k_VertexTexturingIsAvailableTag, false);
-                    UIRUtility.Destroy(stockDefaultMaterial);
-                    s_VertexTexturingIsAvailable = (tagValue == k_VertexTexturingIsAvailableTrue);
-                }
-
-                return s_VertexTexturingIsAvailable.Value;
-            }
-        }
-
-        internal static bool shaderModelIs35
-        {
-            get
-            {
-                if (!s_ShaderModelIs35.HasValue)
-                {
-                    var stockDefaultShader = Shader.Find(UIRUtility.k_DefaultShaderName);
-                    var stockDefaultMaterial = new Material(stockDefaultShader);
-                    stockDefaultMaterial.hideFlags |= HideFlags.DontSaveInEditor;
-                    string tagValue = stockDefaultMaterial.GetTag(k_ShaderModelIs35Tag, false);
-                    UIRUtility.Destroy(stockDefaultMaterial);
-                    s_ShaderModelIs35 = (tagValue == k_ShaderModelIs35True);
-                }
 
-                return s_ShaderModelIs35.Value;
-            }
-        }
+        #endregion
 
         void InitVertexDeclaration()
         {
@@ -711,7 +646,7 @@ void ApplyDrawCommandState(RenderChainCommand cmd, int textureSlot, Material new
                 if (textureSlot < 0)
                 {
                     textureSlot = m_TextureSlotManager.FindOldestSlot();
-                    m_TextureSlotManager.Bind(cmd.state.texture, cmd.state.sdfScale, textureSlot, st.stateMatProps);
+                    m_TextureSlotManager.Bind(cmd.state.texture, cmd.state.sdfScale, cmd.state.sharpness, textureSlot, st.stateMatProps);
                     st.mustApplyStateBlock = true;
                 }
                 else
@@ -772,7 +707,7 @@ void ApplyBatchState(ref EvaluationState st, bool allowMaterialChange)
         }
 
         public unsafe void EvaluateChain(RenderChainCommand head, Material initialMat, Material defaultMat, Texture gradientSettings, Texture shaderInfo,
-            float pixelsPerPoint, NativeSlice<Transform3x4> transforms, NativeSlice<Vector4> clipRects, MaterialPropertyBlock stateMatProps, bool allowMaterialChange,
+            float pixelsPerPoint, MaterialPropertyBlock stateMatProps, bool allowMaterialChange,
             ref Exception immediateException)
         {
             Utility.ProfileDrawChainBegin();
@@ -791,10 +726,6 @@ public unsafe void EvaluateChain(RenderChainCommand head, Material initialMat, M
                     m_StandardMatProps.SetTexture(s_GradientSettingsTexID, gradientSettings);
                 if (shaderInfo != null)
                     m_StandardMatProps.SetTexture(s_ShaderInfoTexID, shaderInfo);
-                if (transforms.Length > 0)
-                    UIR.Utility.SetVectorArray<Transform3x4>(m_StandardMatProps, s_TransformsPropID, transforms);
-                if (clipRects.Length > 0)
-                    UIR.Utility.SetVectorArray<Vector4>(m_StandardMatProps, s_ClipRectsPropID, clipRects);
                 Utility.SetPropertyBlock(m_StandardMatProps);
             }
 
@@ -805,6 +736,7 @@ public unsafe void EvaluateChain(RenderChainCommand head, Material initialMat, M
             int rangesReady = 0;
             DrawBufferRange curDrawRange = new DrawBufferRange();
             int curDrawIndex = -1;
+            int disableCounter = 0;
 
             var st = new EvaluationState
             {
@@ -818,7 +750,30 @@ public unsafe void EvaluateChain(RenderChainCommand head, Material initialMat, M
 
             while (head != null)
             {
-                m_DrawStats.commandCount++;
+
+                if (head.type == CommandType.BeginDisable)
+                {
+                    m_DrawStats.commandCount++;
+                    disableCounter++;
+                    head = head.next;
+                    continue;
+                }
+
+                if (head.type == CommandType.EndDisable)
+                {
+                    m_DrawStats.commandCount++;
+                    disableCounter--;
+                    head = head.next;
+                    continue;
+                }
+
+                if (disableCounter > 0)
+                {
+                    m_DrawStats.skippedCommandCount++;
+                    head = head.next;
+                    continue;
+                }
+
                 m_DrawStats.drawCommandCount += (head.type == CommandType.Draw ? 1u : 0u);
 
                 bool isLastRange = curDrawRange.indexCount > 0 && rangesReady == rangesCount - 1;
@@ -990,6 +945,8 @@ public unsafe void EvaluateChain(RenderChainCommand head, Material initialMat, M
                 KickRanges(ranges, ref rangesReady, ref rangesStart, rangesCount, st.curPage);
             }
 
+            Debug.Assert(disableCounter == 0, "Rendering disabled counter is not 0, indicating a mismatch of commands");
+
             UpdateFenceValue();
 
             Utility.ProfileDrawChainEnd();
@@ -1191,11 +1148,6 @@ internal static void PrepareForGfxDeviceRecreate()
                 UIRUtility.Destroy(s_DefaultShaderInfoTexFloat);
                 s_DefaultShaderInfoTexFloat = null;
             }
-            if (s_DefaultShaderInfoTexARGB8 != null)
-            {
-                UIRUtility.Destroy(s_DefaultShaderInfoTexARGB8);
-                s_DefaultShaderInfoTexARGB8 = null;
-            }
         }
 
         internal static void WrapUpGfxDeviceRecreate() { m_ActiveDeviceCount -= 1; }
@@ -1244,7 +1196,9 @@ internal struct DrawStatistics
             public int currentFrameIndex;
             public uint totalIndices;
             public uint commandCount;
+            public uint skippedCommandCount;
             public uint drawCommandCount;
+            public uint disableCommandCount;
             public uint materialSetCount;
             public uint drawRangeCount;
             public uint drawRangeCallCount;
@@ -1283,11 +1237,6 @@ private static void ProcessDeviceFreeQueue()
                     UIRUtility.Destroy(s_DefaultShaderInfoTexFloat);
                     s_DefaultShaderInfoTexFloat = null;
                 }
-                if (s_DefaultShaderInfoTexARGB8 != null)
-                {
-                    UIRUtility.Destroy(s_DefaultShaderInfoTexARGB8);
-                    s_DefaultShaderInfoTexARGB8 = null;
-                }
                 Utility.NotifyOfUIREvents(false);
                 m_SubscribedToNotifications = false;
             }
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderers.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderers.cs
index de8b9602fa..db7460251a 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderers.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderers.cs
@@ -31,6 +31,7 @@ internal struct State
         public TextureId texture;
         public int stencilRef;
         public float sdfScale;
+        public float sharpness;
     }
 
     internal enum CommandType
@@ -42,6 +43,7 @@ internal enum CommandType
         PushRenderTexture, PopRenderTexture,
         BlitToPreviousRT, //From Active target to previous on RT stack
         PushDefaultMaterial, PopDefaultMaterial,
+        BeginDisable, EndDisable,
     }
 
     internal class DrawParams
diff --git a/ModuleOverrides/com.unity.ui/Core/Scheduler.cs b/ModuleOverrides/com.unity.ui/Core/Scheduler.cs
index cfde598146..ed09bd9358 100644
--- a/ModuleOverrides/com.unity.ui/Core/Scheduler.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Scheduler.cs
@@ -265,6 +265,7 @@ private bool RemovedScheduledItemAt(int index)
         {
             if (index >= 0)
             {
+                if (index <= m_LastUpdatedIndex) --m_LastUpdatedIndex;
                 m_ScheduledItems.RemoveAt(index);
 
                 return true;
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/ComputedStyle.cs b/ModuleOverrides/com.unity.ui/Core/Style/ComputedStyle.cs
index 4ce97d8a42..5ac46e9526 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/ComputedStyle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/ComputedStyle.cs
@@ -4,8 +4,8 @@
 
 using System;
 using System.Collections.Generic;
+using UnityEngine.UIElements.Layout;
 using UnityEngine.UIElements.StyleSheets;
-using UnityEngine.Yoga;
 
 namespace UnityEngine.UIElements
 {
@@ -21,9 +21,6 @@ public static ComputedStyle Create()
 
         public void FinalizeApply(ref ComputedStyle parentStyle)
         {
-            if (yogaNode == null)
-                yogaNode = new YogaNode();
-
             // Calculate pixel font size
             if (fontSize.unit == LengthUnit.Percent)
             {
@@ -31,50 +28,6 @@ public void FinalizeApply(ref ComputedStyle parentStyle)
                 float computedSize = parentSize * fontSize.value / 100;
                 inheritedData.Write().fontSize = new Length(computedSize);
             }
-
-            SyncWithLayout(yogaNode);
-        }
-
-        public void SyncWithLayout(YogaNode targetNode)
-        {
-            targetNode.Flex = float.NaN;
-
-            targetNode.FlexGrow = flexGrow;
-            targetNode.FlexShrink = flexShrink;
-            targetNode.FlexBasis = flexBasis.ToYogaValue();
-            targetNode.Left = left.ToYogaValue();
-            targetNode.Top = top.ToYogaValue();
-            targetNode.Right = right.ToYogaValue();
-            targetNode.Bottom = bottom.ToYogaValue();
-            targetNode.MarginLeft = marginLeft.ToYogaValue();
-            targetNode.MarginTop = marginTop.ToYogaValue();
-            targetNode.MarginRight = marginRight.ToYogaValue();
-            targetNode.MarginBottom = marginBottom.ToYogaValue();
-            targetNode.PaddingLeft = paddingLeft.ToYogaValue();
-            targetNode.PaddingTop = paddingTop.ToYogaValue();
-            targetNode.PaddingRight = paddingRight.ToYogaValue();
-            targetNode.PaddingBottom = paddingBottom.ToYogaValue();
-            targetNode.BorderLeftWidth = borderLeftWidth;
-            targetNode.BorderTopWidth = borderTopWidth;
-            targetNode.BorderRightWidth = borderRightWidth;
-            targetNode.BorderBottomWidth = borderBottomWidth;
-            targetNode.Width = width.ToYogaValue();
-            targetNode.Height = height.ToYogaValue();
-
-            targetNode.PositionType = (YogaPositionType)position;
-            targetNode.Overflow = (YogaOverflow)overflow;
-            targetNode.AlignSelf = (YogaAlign)alignSelf;
-            targetNode.MaxWidth = maxWidth.ToYogaValue();
-            targetNode.MaxHeight = maxHeight.ToYogaValue();
-            targetNode.MinWidth = minWidth.ToYogaValue();
-            targetNode.MinHeight = minHeight.ToYogaValue();
-
-            targetNode.FlexDirection = (YogaFlexDirection)flexDirection;
-            targetNode.AlignContent = (YogaAlign)alignContent;
-            targetNode.AlignItems = (YogaAlign)alignItems;
-            targetNode.JustifyContent = (YogaJustify)justifyContent;
-            targetNode.Wrap = (YogaWrap)flexWrap;
-            targetNode.Display = (YogaDisplay)display;
         }
 
         private bool ApplyGlobalKeyword(StylePropertyReader reader, ref ComputedStyle parentStyle)
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/ComputedStyle.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/ComputedStyle.cs
index aa70edf1c1..00c72bbb2d 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/ComputedStyle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/ComputedStyle.cs
@@ -12,7 +12,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine.UIElements.StyleSheets;
-using UnityEngine.Yoga;
+using UnityEngine.UIElements.Layout;
 
 namespace UnityEngine.UIElements
 {
@@ -25,7 +25,6 @@ internal partial struct ComputedStyle
         public StyleDataRef<TransitionData> transitionData;
         public StyleDataRef<VisualData> visualData;
 
-        public YogaNode yogaNode;
         public Dictionary<string, StylePropertyValue> customProperties;
         public Int64 matchingRulesHash;
         public float dpiScaling;
@@ -168,7 +167,6 @@ public void CopyFrom(ref ComputedStyle other)
             transitionData.CopyFrom(other.transitionData);
             visualData.CopyFrom(other.visualData);
 
-            yogaNode = other.yogaNode;
             customProperties = other.customProperties;
             matchingRulesHash = other.matchingRulesHash;
             dpiScaling = other.dpiScaling;
@@ -1033,12 +1031,12 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, Length
                     break;
                 case StylePropertyId.Bottom:
                     layoutData.Write().bottom = newValue;
-                    ve.yogaNode.Bottom = newValue.ToYogaValue();
+                    ve.layoutNode.Bottom = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.FlexBasis:
                     layoutData.Write().flexBasis = newValue;
-                    ve.yogaNode.FlexBasis = newValue.ToYogaValue();
+                    ve.layoutNode.FlexBasis = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.FontSize:
@@ -1047,12 +1045,12 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, Length
                     break;
                 case StylePropertyId.Height:
                     layoutData.Write().height = newValue;
-                    ve.yogaNode.Height = newValue.ToYogaValue();
+                    ve.layoutNode.Height = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.Left:
                     layoutData.Write().left = newValue;
-                    ve.yogaNode.Left = newValue.ToYogaValue();
+                    ve.layoutNode.Left = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.LetterSpacing:
@@ -1061,72 +1059,72 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, Length
                     break;
                 case StylePropertyId.MarginBottom:
                     layoutData.Write().marginBottom = newValue;
-                    ve.yogaNode.MarginBottom = newValue.ToYogaValue();
+                    ve.layoutNode.MarginBottom = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.MarginLeft:
                     layoutData.Write().marginLeft = newValue;
-                    ve.yogaNode.MarginLeft = newValue.ToYogaValue();
+                    ve.layoutNode.MarginLeft = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.MarginRight:
                     layoutData.Write().marginRight = newValue;
-                    ve.yogaNode.MarginRight = newValue.ToYogaValue();
+                    ve.layoutNode.MarginRight = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.MarginTop:
                     layoutData.Write().marginTop = newValue;
-                    ve.yogaNode.MarginTop = newValue.ToYogaValue();
+                    ve.layoutNode.MarginTop = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.MaxHeight:
                     layoutData.Write().maxHeight = newValue;
-                    ve.yogaNode.MaxHeight = newValue.ToYogaValue();
+                    ve.layoutNode.MaxHeight = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.MaxWidth:
                     layoutData.Write().maxWidth = newValue;
-                    ve.yogaNode.MaxWidth = newValue.ToYogaValue();
+                    ve.layoutNode.MaxWidth = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.MinHeight:
                     layoutData.Write().minHeight = newValue;
-                    ve.yogaNode.MinHeight = newValue.ToYogaValue();
+                    ve.layoutNode.MinHeight = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.MinWidth:
                     layoutData.Write().minWidth = newValue;
-                    ve.yogaNode.MinWidth = newValue.ToYogaValue();
+                    ve.layoutNode.MinWidth = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.PaddingBottom:
                     layoutData.Write().paddingBottom = newValue;
-                    ve.yogaNode.PaddingBottom = newValue.ToYogaValue();
+                    ve.layoutNode.PaddingBottom = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.PaddingLeft:
                     layoutData.Write().paddingLeft = newValue;
-                    ve.yogaNode.PaddingLeft = newValue.ToYogaValue();
+                    ve.layoutNode.PaddingLeft = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.PaddingRight:
                     layoutData.Write().paddingRight = newValue;
-                    ve.yogaNode.PaddingRight = newValue.ToYogaValue();
+                    ve.layoutNode.PaddingRight = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.PaddingTop:
                     layoutData.Write().paddingTop = newValue;
-                    ve.yogaNode.PaddingTop = newValue.ToYogaValue();
+                    ve.layoutNode.PaddingTop = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.Right:
                     layoutData.Write().right = newValue;
-                    ve.yogaNode.Right = newValue.ToYogaValue();
+                    ve.layoutNode.Right = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.Top:
                     layoutData.Write().top = newValue;
-                    ve.yogaNode.Top = newValue.ToYogaValue();
+                    ve.layoutNode.Top = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.UnityParagraphSpacing:
@@ -1135,7 +1133,7 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, Length
                     break;
                 case StylePropertyId.Width:
                     layoutData.Write().width = newValue;
-                    ve.yogaNode.Width = newValue.ToYogaValue();
+                    ve.layoutNode.Width = newValue.ToLayoutValue();
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.WordSpacing:
@@ -1153,32 +1151,32 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, float n
             {
                 case StylePropertyId.BorderBottomWidth:
                     layoutData.Write().borderBottomWidth = newValue;
-                    ve.yogaNode.BorderBottomWidth = newValue;
+                    ve.layoutNode.BorderBottomWidth = newValue;
                     ve.IncrementVersion(VersionChangeType.BorderWidth | VersionChangeType.Layout | VersionChangeType.Repaint);
                     break;
                 case StylePropertyId.BorderLeftWidth:
                     layoutData.Write().borderLeftWidth = newValue;
-                    ve.yogaNode.BorderLeftWidth = newValue;
+                    ve.layoutNode.BorderLeftWidth = newValue;
                     ve.IncrementVersion(VersionChangeType.BorderWidth | VersionChangeType.Layout | VersionChangeType.Repaint);
                     break;
                 case StylePropertyId.BorderRightWidth:
                     layoutData.Write().borderRightWidth = newValue;
-                    ve.yogaNode.BorderRightWidth = newValue;
+                    ve.layoutNode.BorderRightWidth = newValue;
                     ve.IncrementVersion(VersionChangeType.BorderWidth | VersionChangeType.Layout | VersionChangeType.Repaint);
                     break;
                 case StylePropertyId.BorderTopWidth:
                     layoutData.Write().borderTopWidth = newValue;
-                    ve.yogaNode.BorderTopWidth = newValue;
+                    ve.layoutNode.BorderTopWidth = newValue;
                     ve.IncrementVersion(VersionChangeType.BorderWidth | VersionChangeType.Layout | VersionChangeType.Repaint);
                     break;
                 case StylePropertyId.FlexGrow:
                     layoutData.Write().flexGrow = newValue;
-                    ve.yogaNode.FlexGrow = newValue;
+                    ve.layoutNode.FlexGrow = newValue;
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.FlexShrink:
                     layoutData.Write().flexShrink = newValue;
-                    ve.yogaNode.FlexShrink = newValue;
+                    ve.layoutNode.FlexShrink = newValue;
                     ve.IncrementVersion(VersionChangeType.Layout);
                     break;
                 case StylePropertyId.Opacity:
@@ -1206,7 +1204,7 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, int new
                     if (layoutData.Read().alignContent != (Align)newValue)
                     {
                         layoutData.Write().alignContent = (Align)newValue;
-                        ve.yogaNode.AlignContent = (YogaAlign)newValue;
+                        ve.layoutNode.AlignContent = (LayoutAlign)newValue;
                         ve.IncrementVersion(VersionChangeType.Layout);
                     }
 
@@ -1215,7 +1213,7 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, int new
                     if (layoutData.Read().alignItems != (Align)newValue)
                     {
                         layoutData.Write().alignItems = (Align)newValue;
-                        ve.yogaNode.AlignItems = (YogaAlign)newValue;
+                        ve.layoutNode.AlignItems = (LayoutAlign)newValue;
                         ve.IncrementVersion(VersionChangeType.Layout);
                     }
 
@@ -1224,7 +1222,7 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, int new
                     if (layoutData.Read().alignSelf != (Align)newValue)
                     {
                         layoutData.Write().alignSelf = (Align)newValue;
-                        ve.yogaNode.AlignSelf = (YogaAlign)newValue;
+                        ve.layoutNode.AlignSelf = (LayoutAlign)newValue;
                         ve.IncrementVersion(VersionChangeType.Layout);
                     }
 
@@ -1233,8 +1231,8 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, int new
                     if (layoutData.Read().display != (DisplayStyle)newValue)
                     {
                         layoutData.Write().display = (DisplayStyle)newValue;
-                        ve.yogaNode.Display = (YogaDisplay)newValue;
-                        ve.IncrementVersion(VersionChangeType.Layout | VersionChangeType.Repaint);
+                        ve.layoutNode.Display = (LayoutDisplay)newValue;
+                        ve.IncrementVersion(VersionChangeType.Layout);
                     }
 
                     break;
@@ -1242,7 +1240,7 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, int new
                     if (layoutData.Read().flexDirection != (FlexDirection)newValue)
                     {
                         layoutData.Write().flexDirection = (FlexDirection)newValue;
-                        ve.yogaNode.FlexDirection = (YogaFlexDirection)newValue;
+                        ve.layoutNode.FlexDirection = (LayoutFlexDirection)newValue;
                         ve.IncrementVersion(VersionChangeType.Layout);
                     }
 
@@ -1251,7 +1249,7 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, int new
                     if (layoutData.Read().flexWrap != (Wrap)newValue)
                     {
                         layoutData.Write().flexWrap = (Wrap)newValue;
-                        ve.yogaNode.Wrap = (YogaWrap)newValue;
+                        ve.layoutNode.Wrap = (LayoutWrap)newValue;
                         ve.IncrementVersion(VersionChangeType.Layout);
                     }
 
@@ -1260,7 +1258,7 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, int new
                     if (layoutData.Read().justifyContent != (Justify)newValue)
                     {
                         layoutData.Write().justifyContent = (Justify)newValue;
-                        ve.yogaNode.JustifyContent = (YogaJustify)newValue;
+                        ve.layoutNode.JustifyContent = (LayoutJustify)newValue;
                         ve.IncrementVersion(VersionChangeType.Layout);
                     }
 
@@ -1269,7 +1267,7 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, int new
                     if (visualData.Read().overflow != (OverflowInternal)newValue)
                     {
                         visualData.Write().overflow = (OverflowInternal)newValue;
-                        ve.yogaNode.Overflow = (YogaOverflow)newValue;
+                        ve.layoutNode.Overflow = (LayoutOverflow)newValue;
                         ve.IncrementVersion(VersionChangeType.Layout | VersionChangeType.Overflow);
                     }
 
@@ -1278,7 +1276,7 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, int new
                     if (layoutData.Read().position != (Position)newValue)
                     {
                         layoutData.Write().position = (Position)newValue;
-                        ve.yogaNode.PositionType = (YogaPositionType)newValue;
+                        ve.layoutNode.PositionType = (LayoutPositionType)newValue;
                         ve.IncrementVersion(VersionChangeType.Layout);
                     }
 
@@ -3331,7 +3329,8 @@ public static VersionChangeType CompareChanges(ref ComputedStyle x, ref Computed
             VersionChangeType changes = VersionChangeType.Styles;
             if (!x.layoutData.ReferenceEquals(y.layoutData))
             {
-                if (x.flexGrow != y.flexGrow ||
+                if (x.display != y.display ||
+                    x.flexGrow != y.flexGrow ||
                     x.flexShrink != y.flexShrink ||
                     x.flexWrap != y.flexWrap ||
                     x.flexDirection != y.flexDirection ||
@@ -3370,11 +3369,6 @@ public static VersionChangeType CompareChanges(ref ComputedStyle x, ref Computed
                 {
                     changes |= VersionChangeType.BorderWidth | VersionChangeType.Layout | VersionChangeType.Repaint;
                 }
-
-                if (x.display != y.display)
-                {
-                    changes |= VersionChangeType.Layout | VersionChangeType.Repaint;
-                }
             }
 
             if (!x.inheritedData.ReferenceEquals(y.inheritedData))
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/IResolvedStyle.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/IResolvedStyle.cs
index d07d93bfd0..5dd242113c 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/IResolvedStyle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/IResolvedStyle.cs
@@ -130,7 +130,7 @@ public partial interface IResolvedStyle
         /// </summary>
         FlexDirection flexDirection { get; }
         /// <summary>
-        /// Specifies how the item will shrink relative to the rest of the flexible items inside the same container.
+        /// Specifies how the item will grow relative to the rest of the flexible items inside the same container.
         /// </summary>
         float flexGrow { get; }
         /// <summary>
@@ -346,7 +346,7 @@ public partial interface IResolvedStyle
         /// </remarks>
         Visibility visibility { get; }
         /// <summary>
-        /// Word wrapping over multiple lines if not enough space is available to draw the text of an element.
+        /// Word wrap over multiple lines if not enough space is available to draw the text of an element.
         /// </summary>
         /// <remarks>
         /// This property is inherited by default.
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/IStyle.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/IStyle.cs
index 9e0d61e735..bad0290962 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/IStyle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/IStyle.cs
@@ -137,7 +137,7 @@ public partial interface IStyle
         /// </summary>
         StyleEnum<FlexDirection> flexDirection { get; set; }
         /// <summary>
-        /// Specifies how the item will shrink relative to the rest of the flexible items inside the same container.
+        /// Specifies how the item will grow relative to the rest of the flexible items inside the same container.
         /// </summary>
         StyleFloat flexGrow { get; set; }
         /// <summary>
@@ -365,7 +365,7 @@ public partial interface IStyle
         /// </remarks>
         StyleEnum<Visibility> visibility { get; set; }
         /// <summary>
-        /// Word wrapping over multiple lines if not enough space is available to draw the text of an element.
+        /// Word wrap over multiple lines if not enough space is available to draw the text of an element.
         /// </summary>
         /// <remarks>
         /// This property is inherited by default.
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/InlineStyleAccess.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/InlineStyleAccess.cs
index 0a5f4d8280..59d78bf72c 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/InlineStyleAccess.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/InlineStyleAccess.cs
@@ -10,7 +10,7 @@
 //
 /******************************************************************************/
 using UnityEngine.UIElements.StyleSheets;
-using UnityEngine.Yoga;
+using UnityEngine.UIElements.Layout;
 
 namespace UnityEngine.UIElements
 {
@@ -29,7 +29,7 @@ StyleEnum<Align> IStyle.alignContent
                 if (SetStyleValue(StylePropertyId.AlignContent, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.AlignContent = (YogaAlign)ve.computedStyle.alignContent;
+                    ve.layoutNode.AlignContent = (LayoutAlign)ve.computedStyle.alignContent;
                 }
             }
         }
@@ -47,7 +47,7 @@ StyleEnum<Align> IStyle.alignItems
                 if (SetStyleValue(StylePropertyId.AlignItems, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.AlignItems = (YogaAlign)ve.computedStyle.alignItems;
+                    ve.layoutNode.AlignItems = (LayoutAlign)ve.computedStyle.alignItems;
                 }
             }
         }
@@ -65,7 +65,7 @@ StyleEnum<Align> IStyle.alignSelf
                 if (SetStyleValue(StylePropertyId.AlignSelf, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.AlignSelf = (YogaAlign)ve.computedStyle.alignSelf;
+                    ve.layoutNode.AlignSelf = (LayoutAlign)ve.computedStyle.alignSelf;
                 }
             }
         }
@@ -210,7 +210,7 @@ StyleFloat IStyle.borderBottomWidth
                 if (SetStyleValue(StylePropertyId.BorderBottomWidth, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.BorderWidth | VersionChangeType.Layout | VersionChangeType.Repaint);
-                    ve.yogaNode.BorderBottomWidth = ve.computedStyle.borderBottomWidth;
+                    ve.layoutNode.BorderBottomWidth = ve.computedStyle.borderBottomWidth;
                 }
             }
         }
@@ -243,7 +243,7 @@ StyleFloat IStyle.borderLeftWidth
                 if (SetStyleValue(StylePropertyId.BorderLeftWidth, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.BorderWidth | VersionChangeType.Layout | VersionChangeType.Repaint);
-                    ve.yogaNode.BorderLeftWidth = ve.computedStyle.borderLeftWidth;
+                    ve.layoutNode.BorderLeftWidth = ve.computedStyle.borderLeftWidth;
                 }
             }
         }
@@ -276,7 +276,7 @@ StyleFloat IStyle.borderRightWidth
                 if (SetStyleValue(StylePropertyId.BorderRightWidth, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.BorderWidth | VersionChangeType.Layout | VersionChangeType.Repaint);
-                    ve.yogaNode.BorderRightWidth = ve.computedStyle.borderRightWidth;
+                    ve.layoutNode.BorderRightWidth = ve.computedStyle.borderRightWidth;
                 }
             }
         }
@@ -341,7 +341,7 @@ StyleFloat IStyle.borderTopWidth
                 if (SetStyleValue(StylePropertyId.BorderTopWidth, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.BorderWidth | VersionChangeType.Layout | VersionChangeType.Repaint);
-                    ve.yogaNode.BorderTopWidth = ve.computedStyle.borderTopWidth;
+                    ve.layoutNode.BorderTopWidth = ve.computedStyle.borderTopWidth;
                 }
             }
         }
@@ -358,7 +358,7 @@ StyleLength IStyle.bottom
                 if (SetStyleValue(StylePropertyId.Bottom, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.Bottom = ve.computedStyle.bottom.ToYogaValue();
+                    ve.layoutNode.Bottom = ve.computedStyle.bottom.ToLayoutValue();
                 }
             }
         }
@@ -391,8 +391,8 @@ StyleEnum<DisplayStyle> IStyle.display
             {
                 if (SetStyleValue(StylePropertyId.Display, value))
                 {
-                    ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout | VersionChangeType.Repaint);
-                    ve.yogaNode.Display = (YogaDisplay)ve.computedStyle.display;
+                    ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
+                    ve.layoutNode.Display = (LayoutDisplay)ve.computedStyle.display;
                 }
             }
         }
@@ -409,7 +409,7 @@ StyleLength IStyle.flexBasis
                 if (SetStyleValue(StylePropertyId.FlexBasis, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.FlexBasis = ve.computedStyle.flexBasis.ToYogaValue();
+                    ve.layoutNode.FlexBasis = ve.computedStyle.flexBasis.ToLayoutValue();
                 }
             }
         }
@@ -427,7 +427,7 @@ StyleEnum<FlexDirection> IStyle.flexDirection
                 if (SetStyleValue(StylePropertyId.FlexDirection, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.FlexDirection = (YogaFlexDirection)ve.computedStyle.flexDirection;
+                    ve.layoutNode.FlexDirection = (LayoutFlexDirection)ve.computedStyle.flexDirection;
                 }
             }
         }
@@ -444,7 +444,7 @@ StyleFloat IStyle.flexGrow
                 if (SetStyleValue(StylePropertyId.FlexGrow, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.FlexGrow = ve.computedStyle.flexGrow;
+                    ve.layoutNode.FlexGrow = ve.computedStyle.flexGrow;
                 }
             }
         }
@@ -461,7 +461,7 @@ StyleFloat IStyle.flexShrink
                 if (SetStyleValue(StylePropertyId.FlexShrink, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.FlexShrink = ve.computedStyle.flexShrink;
+                    ve.layoutNode.FlexShrink = ve.computedStyle.flexShrink;
                 }
             }
         }
@@ -479,7 +479,7 @@ StyleEnum<Wrap> IStyle.flexWrap
                 if (SetStyleValue(StylePropertyId.FlexWrap, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.Wrap = (YogaWrap)ve.computedStyle.flexWrap;
+                    ve.layoutNode.Wrap = (LayoutWrap)ve.computedStyle.flexWrap;
                 }
             }
         }
@@ -512,7 +512,7 @@ StyleLength IStyle.height
                 if (SetStyleValue(StylePropertyId.Height, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.Height = ve.computedStyle.height.ToYogaValue();
+                    ve.layoutNode.Height = ve.computedStyle.height.ToLayoutValue();
                 }
             }
         }
@@ -530,7 +530,7 @@ StyleEnum<Justify> IStyle.justifyContent
                 if (SetStyleValue(StylePropertyId.JustifyContent, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.JustifyContent = (YogaJustify)ve.computedStyle.justifyContent;
+                    ve.layoutNode.JustifyContent = (LayoutJustify)ve.computedStyle.justifyContent;
                 }
             }
         }
@@ -547,7 +547,7 @@ StyleLength IStyle.left
                 if (SetStyleValue(StylePropertyId.Left, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.Left = ve.computedStyle.left.ToYogaValue();
+                    ve.layoutNode.Left = ve.computedStyle.left.ToLayoutValue();
                 }
             }
         }
@@ -580,7 +580,7 @@ StyleLength IStyle.marginBottom
                 if (SetStyleValue(StylePropertyId.MarginBottom, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.MarginBottom = ve.computedStyle.marginBottom.ToYogaValue();
+                    ve.layoutNode.MarginBottom = ve.computedStyle.marginBottom.ToLayoutValue();
                 }
             }
         }
@@ -597,7 +597,7 @@ StyleLength IStyle.marginLeft
                 if (SetStyleValue(StylePropertyId.MarginLeft, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.MarginLeft = ve.computedStyle.marginLeft.ToYogaValue();
+                    ve.layoutNode.MarginLeft = ve.computedStyle.marginLeft.ToLayoutValue();
                 }
             }
         }
@@ -614,7 +614,7 @@ StyleLength IStyle.marginRight
                 if (SetStyleValue(StylePropertyId.MarginRight, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.MarginRight = ve.computedStyle.marginRight.ToYogaValue();
+                    ve.layoutNode.MarginRight = ve.computedStyle.marginRight.ToLayoutValue();
                 }
             }
         }
@@ -631,7 +631,7 @@ StyleLength IStyle.marginTop
                 if (SetStyleValue(StylePropertyId.MarginTop, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.MarginTop = ve.computedStyle.marginTop.ToYogaValue();
+                    ve.layoutNode.MarginTop = ve.computedStyle.marginTop.ToLayoutValue();
                 }
             }
         }
@@ -648,7 +648,7 @@ StyleLength IStyle.maxHeight
                 if (SetStyleValue(StylePropertyId.MaxHeight, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.MaxHeight = ve.computedStyle.maxHeight.ToYogaValue();
+                    ve.layoutNode.MaxHeight = ve.computedStyle.maxHeight.ToLayoutValue();
                 }
             }
         }
@@ -665,7 +665,7 @@ StyleLength IStyle.maxWidth
                 if (SetStyleValue(StylePropertyId.MaxWidth, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.MaxWidth = ve.computedStyle.maxWidth.ToYogaValue();
+                    ve.layoutNode.MaxWidth = ve.computedStyle.maxWidth.ToLayoutValue();
                 }
             }
         }
@@ -682,7 +682,7 @@ StyleLength IStyle.minHeight
                 if (SetStyleValue(StylePropertyId.MinHeight, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.MinHeight = ve.computedStyle.minHeight.ToYogaValue();
+                    ve.layoutNode.MinHeight = ve.computedStyle.minHeight.ToLayoutValue();
                 }
             }
         }
@@ -699,7 +699,7 @@ StyleLength IStyle.minWidth
                 if (SetStyleValue(StylePropertyId.MinWidth, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.MinWidth = ve.computedStyle.minWidth.ToYogaValue();
+                    ve.layoutNode.MinWidth = ve.computedStyle.minWidth.ToLayoutValue();
                 }
             }
         }
@@ -734,7 +734,7 @@ StyleEnum<Overflow> IStyle.overflow
                 if (SetStyleValue(StylePropertyId.Overflow, tmp))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout | VersionChangeType.Overflow);
-                    ve.yogaNode.Overflow = (YogaOverflow)ve.computedStyle.overflow;
+                    ve.layoutNode.Overflow = (LayoutOverflow)ve.computedStyle.overflow;
                 }
             }
         }
@@ -751,7 +751,7 @@ StyleLength IStyle.paddingBottom
                 if (SetStyleValue(StylePropertyId.PaddingBottom, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.PaddingBottom = ve.computedStyle.paddingBottom.ToYogaValue();
+                    ve.layoutNode.PaddingBottom = ve.computedStyle.paddingBottom.ToLayoutValue();
                 }
             }
         }
@@ -768,7 +768,7 @@ StyleLength IStyle.paddingLeft
                 if (SetStyleValue(StylePropertyId.PaddingLeft, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.PaddingLeft = ve.computedStyle.paddingLeft.ToYogaValue();
+                    ve.layoutNode.PaddingLeft = ve.computedStyle.paddingLeft.ToLayoutValue();
                 }
             }
         }
@@ -785,7 +785,7 @@ StyleLength IStyle.paddingRight
                 if (SetStyleValue(StylePropertyId.PaddingRight, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.PaddingRight = ve.computedStyle.paddingRight.ToYogaValue();
+                    ve.layoutNode.PaddingRight = ve.computedStyle.paddingRight.ToLayoutValue();
                 }
             }
         }
@@ -802,7 +802,7 @@ StyleLength IStyle.paddingTop
                 if (SetStyleValue(StylePropertyId.PaddingTop, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.PaddingTop = ve.computedStyle.paddingTop.ToYogaValue();
+                    ve.layoutNode.PaddingTop = ve.computedStyle.paddingTop.ToLayoutValue();
                 }
             }
         }
@@ -820,7 +820,7 @@ StyleEnum<Position> IStyle.position
                 if (SetStyleValue(StylePropertyId.Position, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.PositionType = (YogaPositionType)ve.computedStyle.position;
+                    ve.layoutNode.PositionType = (LayoutPositionType)ve.computedStyle.position;
                 }
             }
         }
@@ -837,7 +837,7 @@ StyleLength IStyle.right
                 if (SetStyleValue(StylePropertyId.Right, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.Right = ve.computedStyle.right.ToYogaValue();
+                    ve.layoutNode.Right = ve.computedStyle.right.ToLayoutValue();
                 }
             }
         }
@@ -871,7 +871,7 @@ StyleLength IStyle.top
                 if (SetStyleValue(StylePropertyId.Top, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.Top = ve.computedStyle.top.ToYogaValue();
+                    ve.layoutNode.Top = ve.computedStyle.top.ToLayoutValue();
                 }
             }
         }
@@ -1230,7 +1230,7 @@ StyleLength IStyle.width
                 if (SetStyleValue(StylePropertyId.Width, value))
                 {
                     ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout);
-                    ve.yogaNode.Width = ve.computedStyle.width.ToYogaValue();
+                    ve.layoutNode.Width = ve.computedStyle.width.ToLayoutValue();
                 }
             }
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/ResolvedStyleAccess.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/ResolvedStyleAccess.cs
index 72913d11b8..02b7541a0e 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/ResolvedStyleAccess.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/ResolvedStyleAccess.cs
@@ -27,47 +27,47 @@ internal partial class ResolvedStyleAccess : IResolvedStyle
         public Color borderBottomColor => ve.computedStyle.borderBottomColor;
         public float borderBottomLeftRadius => ve.computedStyle.borderBottomLeftRadius.value;
         public float borderBottomRightRadius => ve.computedStyle.borderBottomRightRadius.value;
-        public float borderBottomWidth => ve.yogaNode.LayoutBorderBottom;
+        public float borderBottomWidth => ve.layoutNode.LayoutBorderBottom;
         public Color borderLeftColor => ve.computedStyle.borderLeftColor;
-        public float borderLeftWidth => ve.yogaNode.LayoutBorderLeft;
+        public float borderLeftWidth => ve.layoutNode.LayoutBorderLeft;
         public Color borderRightColor => ve.computedStyle.borderRightColor;
-        public float borderRightWidth => ve.yogaNode.LayoutBorderRight;
+        public float borderRightWidth => ve.layoutNode.LayoutBorderRight;
         public Color borderTopColor => ve.computedStyle.borderTopColor;
         public float borderTopLeftRadius => ve.computedStyle.borderTopLeftRadius.value;
         public float borderTopRightRadius => ve.computedStyle.borderTopRightRadius.value;
-        public float borderTopWidth => ve.yogaNode.LayoutBorderTop;
-        public float bottom => ve.yogaNode.LayoutBottom;
+        public float borderTopWidth => ve.layoutNode.LayoutBorderTop;
+        public float bottom => ve.layoutNode.LayoutBottom;
         public Color color => ve.computedStyle.color;
         public DisplayStyle display => ve.computedStyle.display;
-        public StyleFloat flexBasis => new StyleFloat(ve.yogaNode.ComputedFlexBasis);
+        public StyleFloat flexBasis => new StyleFloat(ve.layoutNode.ComputedFlexBasis);
         public FlexDirection flexDirection => ve.computedStyle.flexDirection;
         public float flexGrow => ve.computedStyle.flexGrow;
         public float flexShrink => ve.computedStyle.flexShrink;
         public Wrap flexWrap => ve.computedStyle.flexWrap;
         public float fontSize => ve.computedStyle.fontSize.value;
-        public float height => ve.yogaNode.LayoutHeight;
+        public float height => ve.layoutNode.LayoutHeight;
         public Justify justifyContent => ve.computedStyle.justifyContent;
-        public float left => ve.yogaNode.LayoutX;
+        public float left => ve.layoutNode.LayoutX;
         public float letterSpacing => ve.computedStyle.letterSpacing.value;
-        public float marginBottom => ve.yogaNode.LayoutMarginBottom;
-        public float marginLeft => ve.yogaNode.LayoutMarginLeft;
-        public float marginRight => ve.yogaNode.LayoutMarginRight;
-        public float marginTop => ve.yogaNode.LayoutMarginTop;
+        public float marginBottom => ve.layoutNode.LayoutMarginBottom;
+        public float marginLeft => ve.layoutNode.LayoutMarginLeft;
+        public float marginRight => ve.layoutNode.LayoutMarginRight;
+        public float marginTop => ve.layoutNode.LayoutMarginTop;
         public StyleFloat maxHeight => ve.ResolveLengthValue(ve.computedStyle.maxHeight, false);
         public StyleFloat maxWidth => ve.ResolveLengthValue(ve.computedStyle.maxWidth, true);
         public StyleFloat minHeight => ve.ResolveLengthValue(ve.computedStyle.minHeight, false);
         public StyleFloat minWidth => ve.ResolveLengthValue(ve.computedStyle.minWidth, true);
         public float opacity => ve.computedStyle.opacity;
-        public float paddingBottom => ve.yogaNode.LayoutPaddingBottom;
-        public float paddingLeft => ve.yogaNode.LayoutPaddingLeft;
-        public float paddingRight => ve.yogaNode.LayoutPaddingRight;
-        public float paddingTop => ve.yogaNode.LayoutPaddingTop;
+        public float paddingBottom => ve.layoutNode.LayoutPaddingBottom;
+        public float paddingLeft => ve.layoutNode.LayoutPaddingLeft;
+        public float paddingRight => ve.layoutNode.LayoutPaddingRight;
+        public float paddingTop => ve.layoutNode.LayoutPaddingTop;
         public Position position => ve.computedStyle.position;
-        public float right => ve.yogaNode.LayoutRight;
+        public float right => ve.layoutNode.LayoutRight;
         public Rotate rotate => ve.computedStyle.rotate;
         public Scale scale => ve.computedStyle.scale;
         public TextOverflow textOverflow => ve.computedStyle.textOverflow;
-        public float top => ve.yogaNode.LayoutY;
+        public float top => ve.layoutNode.LayoutY;
         public Vector3 transformOrigin => ve.ResolveTransformOrigin();
         public IEnumerable<TimeValue> transitionDelay => ve.computedStyle.transitionDelay;
         public IEnumerable<TimeValue> transitionDuration => ve.computedStyle.transitionDuration;
@@ -90,7 +90,7 @@ internal partial class ResolvedStyleAccess : IResolvedStyle
         public TextOverflowPosition unityTextOverflowPosition => ve.computedStyle.unityTextOverflowPosition;
         public Visibility visibility => ve.computedStyle.visibility;
         public WhiteSpace whiteSpace => ve.computedStyle.whiteSpace;
-        public float width => ve.yogaNode.LayoutWidth;
+        public float width => ve.layoutNode.LayoutWidth;
         public float wordSpacing => ve.computedStyle.wordSpacing.value;
     }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/ResolvedStyleProperties.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/ResolvedStyleProperties.cs
new file mode 100644
index 0000000000..88204a8a77
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/ResolvedStyleProperties.cs
@@ -0,0 +1,97 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+/******************************************************************************/
+//
+//                             DO NOT MODIFY
+//          This file has been generated by the UIElementsGenerator tool
+//              See VisualElementResolvedStylePropertiesCsGenerator class for details
+//
+/******************************************************************************/
+namespace UnityEngine.UIElements
+{
+    public partial class VisualElement
+    {
+        static partial class ResolvedStyleProperties
+        {
+            internal static readonly DataBindingProperty alignContentProperty = "resolvedStyle." + nameof(IResolvedStyle.alignContent);
+            internal static readonly DataBindingProperty alignItemsProperty = "resolvedStyle." + nameof(IResolvedStyle.alignItems);
+            internal static readonly DataBindingProperty alignSelfProperty = "resolvedStyle." + nameof(IResolvedStyle.alignSelf);
+            internal static readonly DataBindingProperty backgroundColorProperty = "resolvedStyle." + nameof(IResolvedStyle.backgroundColor);
+            internal static readonly DataBindingProperty backgroundImageProperty = "resolvedStyle." + nameof(IResolvedStyle.backgroundImage);
+            internal static readonly DataBindingProperty backgroundPositionXProperty = "resolvedStyle." + nameof(IResolvedStyle.backgroundPositionX);
+            internal static readonly DataBindingProperty backgroundPositionYProperty = "resolvedStyle." + nameof(IResolvedStyle.backgroundPositionY);
+            internal static readonly DataBindingProperty backgroundRepeatProperty = "resolvedStyle." + nameof(IResolvedStyle.backgroundRepeat);
+            internal static readonly DataBindingProperty backgroundSizeProperty = "resolvedStyle." + nameof(IResolvedStyle.backgroundSize);
+            internal static readonly DataBindingProperty borderBottomColorProperty = "resolvedStyle." + nameof(IResolvedStyle.borderBottomColor);
+            internal static readonly DataBindingProperty borderBottomLeftRadiusProperty = "resolvedStyle." + nameof(IResolvedStyle.borderBottomLeftRadius);
+            internal static readonly DataBindingProperty borderBottomRightRadiusProperty = "resolvedStyle." + nameof(IResolvedStyle.borderBottomRightRadius);
+            internal static readonly DataBindingProperty borderBottomWidthProperty = "resolvedStyle." + nameof(IResolvedStyle.borderBottomWidth);
+            internal static readonly DataBindingProperty borderLeftColorProperty = "resolvedStyle." + nameof(IResolvedStyle.borderLeftColor);
+            internal static readonly DataBindingProperty borderLeftWidthProperty = "resolvedStyle." + nameof(IResolvedStyle.borderLeftWidth);
+            internal static readonly DataBindingProperty borderRightColorProperty = "resolvedStyle." + nameof(IResolvedStyle.borderRightColor);
+            internal static readonly DataBindingProperty borderRightWidthProperty = "resolvedStyle." + nameof(IResolvedStyle.borderRightWidth);
+            internal static readonly DataBindingProperty borderTopColorProperty = "resolvedStyle." + nameof(IResolvedStyle.borderTopColor);
+            internal static readonly DataBindingProperty borderTopLeftRadiusProperty = "resolvedStyle." + nameof(IResolvedStyle.borderTopLeftRadius);
+            internal static readonly DataBindingProperty borderTopRightRadiusProperty = "resolvedStyle." + nameof(IResolvedStyle.borderTopRightRadius);
+            internal static readonly DataBindingProperty borderTopWidthProperty = "resolvedStyle." + nameof(IResolvedStyle.borderTopWidth);
+            internal static readonly DataBindingProperty bottomProperty = "resolvedStyle." + nameof(IResolvedStyle.bottom);
+            internal static readonly DataBindingProperty colorProperty = "resolvedStyle." + nameof(IResolvedStyle.color);
+            internal static readonly DataBindingProperty displayProperty = "resolvedStyle." + nameof(IResolvedStyle.display);
+            internal static readonly DataBindingProperty flexBasisProperty = "resolvedStyle." + nameof(IResolvedStyle.flexBasis);
+            internal static readonly DataBindingProperty flexDirectionProperty = "resolvedStyle." + nameof(IResolvedStyle.flexDirection);
+            internal static readonly DataBindingProperty flexGrowProperty = "resolvedStyle." + nameof(IResolvedStyle.flexGrow);
+            internal static readonly DataBindingProperty flexShrinkProperty = "resolvedStyle." + nameof(IResolvedStyle.flexShrink);
+            internal static readonly DataBindingProperty flexWrapProperty = "resolvedStyle." + nameof(IResolvedStyle.flexWrap);
+            internal static readonly DataBindingProperty fontSizeProperty = "resolvedStyle." + nameof(IResolvedStyle.fontSize);
+            internal static readonly DataBindingProperty heightProperty = "resolvedStyle." + nameof(IResolvedStyle.height);
+            internal static readonly DataBindingProperty justifyContentProperty = "resolvedStyle." + nameof(IResolvedStyle.justifyContent);
+            internal static readonly DataBindingProperty leftProperty = "resolvedStyle." + nameof(IResolvedStyle.left);
+            internal static readonly DataBindingProperty letterSpacingProperty = "resolvedStyle." + nameof(IResolvedStyle.letterSpacing);
+            internal static readonly DataBindingProperty marginBottomProperty = "resolvedStyle." + nameof(IResolvedStyle.marginBottom);
+            internal static readonly DataBindingProperty marginLeftProperty = "resolvedStyle." + nameof(IResolvedStyle.marginLeft);
+            internal static readonly DataBindingProperty marginRightProperty = "resolvedStyle." + nameof(IResolvedStyle.marginRight);
+            internal static readonly DataBindingProperty marginTopProperty = "resolvedStyle." + nameof(IResolvedStyle.marginTop);
+            internal static readonly DataBindingProperty maxHeightProperty = "resolvedStyle." + nameof(IResolvedStyle.maxHeight);
+            internal static readonly DataBindingProperty maxWidthProperty = "resolvedStyle." + nameof(IResolvedStyle.maxWidth);
+            internal static readonly DataBindingProperty minHeightProperty = "resolvedStyle." + nameof(IResolvedStyle.minHeight);
+            internal static readonly DataBindingProperty minWidthProperty = "resolvedStyle." + nameof(IResolvedStyle.minWidth);
+            internal static readonly DataBindingProperty opacityProperty = "resolvedStyle." + nameof(IResolvedStyle.opacity);
+            internal static readonly DataBindingProperty paddingBottomProperty = "resolvedStyle." + nameof(IResolvedStyle.paddingBottom);
+            internal static readonly DataBindingProperty paddingLeftProperty = "resolvedStyle." + nameof(IResolvedStyle.paddingLeft);
+            internal static readonly DataBindingProperty paddingRightProperty = "resolvedStyle." + nameof(IResolvedStyle.paddingRight);
+            internal static readonly DataBindingProperty paddingTopProperty = "resolvedStyle." + nameof(IResolvedStyle.paddingTop);
+            internal static readonly DataBindingProperty positionProperty = "resolvedStyle." + nameof(IResolvedStyle.position);
+            internal static readonly DataBindingProperty rightProperty = "resolvedStyle." + nameof(IResolvedStyle.right);
+            internal static readonly DataBindingProperty rotateProperty = "resolvedStyle." + nameof(IResolvedStyle.rotate);
+            internal static readonly DataBindingProperty scaleProperty = "resolvedStyle." + nameof(IResolvedStyle.scale);
+            internal static readonly DataBindingProperty textOverflowProperty = "resolvedStyle." + nameof(IResolvedStyle.textOverflow);
+            internal static readonly DataBindingProperty topProperty = "resolvedStyle." + nameof(IResolvedStyle.top);
+            internal static readonly DataBindingProperty transformOriginProperty = "resolvedStyle." + nameof(IResolvedStyle.transformOrigin);
+            internal static readonly DataBindingProperty transitionDelayProperty = "resolvedStyle." + nameof(IResolvedStyle.transitionDelay);
+            internal static readonly DataBindingProperty transitionDurationProperty = "resolvedStyle." + nameof(IResolvedStyle.transitionDuration);
+            internal static readonly DataBindingProperty transitionPropertyProperty = "resolvedStyle." + nameof(IResolvedStyle.transitionProperty);
+            internal static readonly DataBindingProperty transitionTimingFunctionProperty = "resolvedStyle." + nameof(IResolvedStyle.transitionTimingFunction);
+            internal static readonly DataBindingProperty translateProperty = "resolvedStyle." + nameof(IResolvedStyle.translate);
+            internal static readonly DataBindingProperty unityBackgroundImageTintColorProperty = "resolvedStyle." + nameof(IResolvedStyle.unityBackgroundImageTintColor);
+            internal static readonly DataBindingProperty unityFontProperty = "resolvedStyle." + nameof(IResolvedStyle.unityFont);
+            internal static readonly DataBindingProperty unityFontDefinitionProperty = "resolvedStyle." + nameof(IResolvedStyle.unityFontDefinition);
+            internal static readonly DataBindingProperty unityFontStyleAndWeightProperty = "resolvedStyle." + nameof(IResolvedStyle.unityFontStyleAndWeight);
+            internal static readonly DataBindingProperty unityParagraphSpacingProperty = "resolvedStyle." + nameof(IResolvedStyle.unityParagraphSpacing);
+            internal static readonly DataBindingProperty unitySliceBottomProperty = "resolvedStyle." + nameof(IResolvedStyle.unitySliceBottom);
+            internal static readonly DataBindingProperty unitySliceLeftProperty = "resolvedStyle." + nameof(IResolvedStyle.unitySliceLeft);
+            internal static readonly DataBindingProperty unitySliceRightProperty = "resolvedStyle." + nameof(IResolvedStyle.unitySliceRight);
+            internal static readonly DataBindingProperty unitySliceScaleProperty = "resolvedStyle." + nameof(IResolvedStyle.unitySliceScale);
+            internal static readonly DataBindingProperty unitySliceTopProperty = "resolvedStyle." + nameof(IResolvedStyle.unitySliceTop);
+            internal static readonly DataBindingProperty unityTextAlignProperty = "resolvedStyle." + nameof(IResolvedStyle.unityTextAlign);
+            internal static readonly DataBindingProperty unityTextOutlineColorProperty = "resolvedStyle." + nameof(IResolvedStyle.unityTextOutlineColor);
+            internal static readonly DataBindingProperty unityTextOutlineWidthProperty = "resolvedStyle." + nameof(IResolvedStyle.unityTextOutlineWidth);
+            internal static readonly DataBindingProperty unityTextOverflowPositionProperty = "resolvedStyle." + nameof(IResolvedStyle.unityTextOverflowPosition);
+            internal static readonly DataBindingProperty visibilityProperty = "resolvedStyle." + nameof(IResolvedStyle.visibility);
+            internal static readonly DataBindingProperty whiteSpaceProperty = "resolvedStyle." + nameof(IResolvedStyle.whiteSpace);
+            internal static readonly DataBindingProperty widthProperty = "resolvedStyle." + nameof(IResolvedStyle.width);
+            internal static readonly DataBindingProperty wordSpacingProperty = "resolvedStyle." + nameof(IResolvedStyle.wordSpacing);
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/StyleProperties.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StyleProperties.cs
new file mode 100644
index 0000000000..fe5632a9f8
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StyleProperties.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
+
+/******************************************************************************/
+//
+//                             DO NOT MODIFY
+//          This file has been generated by the UIElementsGenerator tool
+//              See VisualElementStylePropertiesCsGenerator class for details
+//
+/******************************************************************************/
+namespace UnityEngine.UIElements
+{
+    public partial class VisualElement
+    {
+        static partial class StyleProperties
+        {
+            internal static readonly DataBindingProperty alignContentProperty = "style." + nameof(IStyle.alignContent);
+            internal static readonly DataBindingProperty alignItemsProperty = "style." + nameof(IStyle.alignItems);
+            internal static readonly DataBindingProperty alignSelfProperty = "style." + nameof(IStyle.alignSelf);
+            internal static readonly DataBindingProperty backgroundColorProperty = "style." + nameof(IStyle.backgroundColor);
+            internal static readonly DataBindingProperty backgroundImageProperty = "style." + nameof(IStyle.backgroundImage);
+            internal static readonly DataBindingProperty backgroundPositionXProperty = "style." + nameof(IStyle.backgroundPositionX);
+            internal static readonly DataBindingProperty backgroundPositionYProperty = "style." + nameof(IStyle.backgroundPositionY);
+            internal static readonly DataBindingProperty backgroundRepeatProperty = "style." + nameof(IStyle.backgroundRepeat);
+            internal static readonly DataBindingProperty backgroundSizeProperty = "style." + nameof(IStyle.backgroundSize);
+            internal static readonly DataBindingProperty borderBottomColorProperty = "style." + nameof(IStyle.borderBottomColor);
+            internal static readonly DataBindingProperty borderBottomLeftRadiusProperty = "style." + nameof(IStyle.borderBottomLeftRadius);
+            internal static readonly DataBindingProperty borderBottomRightRadiusProperty = "style." + nameof(IStyle.borderBottomRightRadius);
+            internal static readonly DataBindingProperty borderBottomWidthProperty = "style." + nameof(IStyle.borderBottomWidth);
+            internal static readonly DataBindingProperty borderLeftColorProperty = "style." + nameof(IStyle.borderLeftColor);
+            internal static readonly DataBindingProperty borderLeftWidthProperty = "style." + nameof(IStyle.borderLeftWidth);
+            internal static readonly DataBindingProperty borderRightColorProperty = "style." + nameof(IStyle.borderRightColor);
+            internal static readonly DataBindingProperty borderRightWidthProperty = "style." + nameof(IStyle.borderRightWidth);
+            internal static readonly DataBindingProperty borderTopColorProperty = "style." + nameof(IStyle.borderTopColor);
+            internal static readonly DataBindingProperty borderTopLeftRadiusProperty = "style." + nameof(IStyle.borderTopLeftRadius);
+            internal static readonly DataBindingProperty borderTopRightRadiusProperty = "style." + nameof(IStyle.borderTopRightRadius);
+            internal static readonly DataBindingProperty borderTopWidthProperty = "style." + nameof(IStyle.borderTopWidth);
+            internal static readonly DataBindingProperty bottomProperty = "style." + nameof(IStyle.bottom);
+            internal static readonly DataBindingProperty colorProperty = "style." + nameof(IStyle.color);
+            internal static readonly DataBindingProperty cursorProperty = "style." + nameof(IStyle.cursor);
+            internal static readonly DataBindingProperty displayProperty = "style." + nameof(IStyle.display);
+            internal static readonly DataBindingProperty flexBasisProperty = "style." + nameof(IStyle.flexBasis);
+            internal static readonly DataBindingProperty flexDirectionProperty = "style." + nameof(IStyle.flexDirection);
+            internal static readonly DataBindingProperty flexGrowProperty = "style." + nameof(IStyle.flexGrow);
+            internal static readonly DataBindingProperty flexShrinkProperty = "style." + nameof(IStyle.flexShrink);
+            internal static readonly DataBindingProperty flexWrapProperty = "style." + nameof(IStyle.flexWrap);
+            internal static readonly DataBindingProperty fontSizeProperty = "style." + nameof(IStyle.fontSize);
+            internal static readonly DataBindingProperty heightProperty = "style." + nameof(IStyle.height);
+            internal static readonly DataBindingProperty justifyContentProperty = "style." + nameof(IStyle.justifyContent);
+            internal static readonly DataBindingProperty leftProperty = "style." + nameof(IStyle.left);
+            internal static readonly DataBindingProperty letterSpacingProperty = "style." + nameof(IStyle.letterSpacing);
+            internal static readonly DataBindingProperty marginBottomProperty = "style." + nameof(IStyle.marginBottom);
+            internal static readonly DataBindingProperty marginLeftProperty = "style." + nameof(IStyle.marginLeft);
+            internal static readonly DataBindingProperty marginRightProperty = "style." + nameof(IStyle.marginRight);
+            internal static readonly DataBindingProperty marginTopProperty = "style." + nameof(IStyle.marginTop);
+            internal static readonly DataBindingProperty maxHeightProperty = "style." + nameof(IStyle.maxHeight);
+            internal static readonly DataBindingProperty maxWidthProperty = "style." + nameof(IStyle.maxWidth);
+            internal static readonly DataBindingProperty minHeightProperty = "style." + nameof(IStyle.minHeight);
+            internal static readonly DataBindingProperty minWidthProperty = "style." + nameof(IStyle.minWidth);
+            internal static readonly DataBindingProperty opacityProperty = "style." + nameof(IStyle.opacity);
+            internal static readonly DataBindingProperty overflowProperty = "style." + nameof(IStyle.overflow);
+            internal static readonly DataBindingProperty paddingBottomProperty = "style." + nameof(IStyle.paddingBottom);
+            internal static readonly DataBindingProperty paddingLeftProperty = "style." + nameof(IStyle.paddingLeft);
+            internal static readonly DataBindingProperty paddingRightProperty = "style." + nameof(IStyle.paddingRight);
+            internal static readonly DataBindingProperty paddingTopProperty = "style." + nameof(IStyle.paddingTop);
+            internal static readonly DataBindingProperty positionProperty = "style." + nameof(IStyle.position);
+            internal static readonly DataBindingProperty rightProperty = "style." + nameof(IStyle.right);
+            internal static readonly DataBindingProperty rotateProperty = "style." + nameof(IStyle.rotate);
+            internal static readonly DataBindingProperty scaleProperty = "style." + nameof(IStyle.scale);
+            internal static readonly DataBindingProperty textOverflowProperty = "style." + nameof(IStyle.textOverflow);
+            internal static readonly DataBindingProperty textShadowProperty = "style." + nameof(IStyle.textShadow);
+            internal static readonly DataBindingProperty topProperty = "style." + nameof(IStyle.top);
+            internal static readonly DataBindingProperty transformOriginProperty = "style." + nameof(IStyle.transformOrigin);
+            internal static readonly DataBindingProperty transitionDelayProperty = "style." + nameof(IStyle.transitionDelay);
+            internal static readonly DataBindingProperty transitionDurationProperty = "style." + nameof(IStyle.transitionDuration);
+            internal static readonly DataBindingProperty transitionPropertyProperty = "style." + nameof(IStyle.transitionProperty);
+            internal static readonly DataBindingProperty transitionTimingFunctionProperty = "style." + nameof(IStyle.transitionTimingFunction);
+            internal static readonly DataBindingProperty translateProperty = "style." + nameof(IStyle.translate);
+            internal static readonly DataBindingProperty unityBackgroundImageTintColorProperty = "style." + nameof(IStyle.unityBackgroundImageTintColor);
+            internal static readonly DataBindingProperty unityFontProperty = "style." + nameof(IStyle.unityFont);
+            internal static readonly DataBindingProperty unityFontDefinitionProperty = "style." + nameof(IStyle.unityFontDefinition);
+            internal static readonly DataBindingProperty unityFontStyleAndWeightProperty = "style." + nameof(IStyle.unityFontStyleAndWeight);
+            internal static readonly DataBindingProperty unityOverflowClipBoxProperty = "style." + nameof(IStyle.unityOverflowClipBox);
+            internal static readonly DataBindingProperty unityParagraphSpacingProperty = "style." + nameof(IStyle.unityParagraphSpacing);
+            internal static readonly DataBindingProperty unitySliceBottomProperty = "style." + nameof(IStyle.unitySliceBottom);
+            internal static readonly DataBindingProperty unitySliceLeftProperty = "style." + nameof(IStyle.unitySliceLeft);
+            internal static readonly DataBindingProperty unitySliceRightProperty = "style." + nameof(IStyle.unitySliceRight);
+            internal static readonly DataBindingProperty unitySliceScaleProperty = "style." + nameof(IStyle.unitySliceScale);
+            internal static readonly DataBindingProperty unitySliceTopProperty = "style." + nameof(IStyle.unitySliceTop);
+            internal static readonly DataBindingProperty unityTextAlignProperty = "style." + nameof(IStyle.unityTextAlign);
+            internal static readonly DataBindingProperty unityTextOutlineColorProperty = "style." + nameof(IStyle.unityTextOutlineColor);
+            internal static readonly DataBindingProperty unityTextOutlineWidthProperty = "style." + nameof(IStyle.unityTextOutlineWidth);
+            internal static readonly DataBindingProperty unityTextOverflowPositionProperty = "style." + nameof(IStyle.unityTextOverflowPosition);
+            internal static readonly DataBindingProperty visibilityProperty = "style." + nameof(IStyle.visibility);
+            internal static readonly DataBindingProperty whiteSpaceProperty = "style." + nameof(IStyle.whiteSpace);
+            internal static readonly DataBindingProperty widthProperty = "style." + nameof(IStyle.width);
+            internal static readonly DataBindingProperty wordSpacingProperty = "style." + nameof(IStyle.wordSpacing);
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/InlineStyleAccess.cs b/ModuleOverrides/com.unity.ui/Core/Style/InlineStyleAccess.cs
index cbbf0164cd..042fbaa13a 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/InlineStyleAccess.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/InlineStyleAccess.cs
@@ -145,11 +145,6 @@ public void SetStyleValue(StyleValue value)
 
     internal partial class InlineStyleAccess : StyleValueCollection
     {
-        static InlineStyleAccess()
-        {
-            PropertyBag.Register(new InlineStyleAccessPropertyBag());
-        }
-
         private static StylePropertyReader s_StylePropertyReader = new StylePropertyReader();
 
         private List<StyleValueManaged> m_ValuesManaged;
@@ -1336,7 +1331,7 @@ StyleEnum<ScaleMode> IStyle.unityBackgroundScaleMode
             get
             {
                 return new StyleEnum<ScaleMode>(BackgroundPropertyHelper.ResolveUnityBackgroundScaleMode(ve.style.backgroundPositionX.value,
-                    ve.style.backgroundPositionY.value, ve.style.backgroundRepeat.value, ve.style.backgroundSize.value));
+                    ve.style.backgroundPositionY.value, ve.style.backgroundRepeat.value, ve.style.backgroundSize.value, out _));
             }
 
             set
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Length.cs b/ModuleOverrides/com.unity.ui/Core/Style/Length.cs
index b8ae493952..d0fb857872 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Length.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Length.cs
@@ -17,10 +17,10 @@ public enum LengthUnit
         /// </summary>
         Pixel,
         /// <summary>
-        /// Interprets length as a percentage.
+        /// Interprets length as a percentage, with 100 representing 100%.
+        /// The value is not constrained and can range from negative numbers to values greater than 100.
         /// </summary>
         Percent,
-        // Em
     }
 
     /// <summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/ResolvedStyleAccess.cs b/ModuleOverrides/com.unity.ui/Core/Style/ResolvedStyleAccess.cs
index 309d27ee2e..bee19abbe2 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/ResolvedStyleAccess.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/ResolvedStyleAccess.cs
@@ -9,11 +9,6 @@ namespace UnityEngine.UIElements
 {
     internal partial class ResolvedStyleAccess
     {
-        static ResolvedStyleAccess()
-        {
-            PropertyBag.Register(new ResolvedStyleAccessPropertyBag());
-        }
-
         private VisualElement ve { get; }
 
         public ResolvedStyleAccess(VisualElement ve)
@@ -24,6 +19,6 @@ public ResolvedStyleAccess(VisualElement ve)
         [Obsolete("unityBackgroundScaleMode is deprecated. Use background-* properties instead.")]
         public StyleEnum<ScaleMode> unityBackgroundScaleMode => BackgroundPropertyHelper.ResolveUnityBackgroundScaleMode(
             ve.computedStyle.backgroundPositionX, ve.computedStyle.backgroundPositionY,
-            ve.computedStyle.backgroundRepeat, ve.computedStyle.backgroundSize);
+            ve.computedStyle.backgroundRepeat, ve.computedStyle.backgroundSize, out _);
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/StyleDebug.cs b/ModuleOverrides/com.unity.ui/Core/Style/StyleDebug.cs
index aeb53d9b91..ff1d4b8b73 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/StyleDebug.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/StyleDebug.cs
@@ -59,7 +59,7 @@ public static object GetComputedStyleValue(in ComputedStyle computedStyle, strin
                 {
                     return BackgroundPropertyHelper.ResolveUnityBackgroundScaleMode(computedStyle.backgroundPositionX,
                         computedStyle.backgroundPositionY, computedStyle.backgroundRepeat,
-                        computedStyle.backgroundSize);
+                        computedStyle.backgroundSize, out _);
                 }
 
                 return GetComputedStyleValue(computedStyle, id);
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/StyleTypes.cs b/ModuleOverrides/com.unity.ui/Core/Style/StyleTypes.cs
index 89f60db096..cf7a895d35 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/StyleTypes.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/StyleTypes.cs
@@ -4,8 +4,8 @@
 
 using System;
 using System.Collections.Generic;
+using UnityEngine.UIElements.Layout;
 using UnityEngine.UIElements.StyleSheets;
-using UnityEngine.Yoga;
 
 namespace UnityEngine.UIElements
 {
@@ -52,10 +52,10 @@ internal static string DebugString<T>(this IStyleValue<T> styleValue)
             return styleValue.keyword != StyleKeyword.Undefined ? $"{styleValue.keyword}" : $"{styleValue.value}";
         }
 
-        internal static YogaValue ToYogaValue(this Length length)
+        internal static LayoutValue ToLayoutValue(this Length length)
         {
             if (length.IsAuto())
-                return YogaValue.Auto();
+                return LayoutValue.Auto();
 
             // For max-width and max-height
             if (length.IsNone())
@@ -64,9 +64,9 @@ internal static YogaValue ToYogaValue(this Length length)
             switch (length.unit)
             {
                 case LengthUnit.Pixel:
-                    return YogaValue.Point(length.value);
+                    return LayoutValue.Point(length.value);
                 case LengthUnit.Percent:
-                    return YogaValue.Percent(length.value);
+                    return LayoutValue.Percent(length.value);
                 default:
                     Debug.LogAssertion($"Unexpected unit '{length.unit}'");
                     return float.NaN;
diff --git a/ModuleOverrides/com.unity.ui/Core/StyleEnums.cs b/ModuleOverrides/com.unity.ui/Core/StyleEnums.cs
index 437a243945..163977b6b2 100644
--- a/ModuleOverrides/com.unity.ui/Core/StyleEnums.cs
+++ b/ModuleOverrides/com.unity.ui/Core/StyleEnums.cs
@@ -2,45 +2,45 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using UnityEngine.Yoga;
+using UnityEngine.UIElements.Layout;
 
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// Defaines how the position values are interpreted by the layout engine.
+    /// Defines how the position values are interpreted by the layout engine.
     /// </summary>
     public enum Position
     {
         /// <summary>
         /// The element is positioned in relation to its default box as calculated by layout.
         /// </summary>
-        Relative = YogaPositionType.Relative,
+        Relative = LayoutPositionType.Relative,
         /// <summary>
-        /// The element is positioned in relation to its parent box and does not contribute to the layout anymore.
+        /// The element is positioned in relation to its parent box and doesn't contribute to the layout anymore.
         /// </summary>
-        Absolute = YogaPositionType.Absolute,
+        Absolute = LayoutPositionType.Absolute,
     }
 
     /// <summary>
-    /// Defines what should happend if content overflows an element bounds.
+    /// Defines what should happened if content overflows an element bounds.
     /// </summary>
     public enum Overflow
     {
         /// <summary>
-        /// The overflow is not clipped. It renders outside the element's box. Default Value.
+        /// The overflow isn't clipped. It renders outside the element's box. Default Value.
         /// </summary>
-        Visible = YogaOverflow.Visible,
+        Visible = LayoutOverflow.Visible,
         /// <summary>
         /// The overflow is clipped, and the rest of the content will be invisible.
         /// </summary>
-        Hidden = YogaOverflow.Hidden
+        Hidden = LayoutOverflow.Hidden
     }
 
     internal enum OverflowInternal
     {
-        Visible = YogaOverflow.Visible,
-        Hidden = YogaOverflow.Hidden,
-        Scroll = YogaOverflow.Scroll,
+        Visible = LayoutOverflow.Visible,
+        Hidden = LayoutOverflow.Hidden,
+        Scroll = LayoutOverflow.Scroll,
     }
 
     /// <summary>
@@ -66,19 +66,19 @@ public enum FlexDirection
         /// <summary>
         /// Top to Bottom.
         /// </summary>
-        Column = YogaFlexDirection.Column,
+        Column = LayoutFlexDirection.Column,
         /// <summary>
         /// Bottom to Top.
         /// </summary>
-        ColumnReverse = YogaFlexDirection.ColumnReverse,
+        ColumnReverse = LayoutFlexDirection.ColumnReverse,
         /// <summary>
         /// Left to Right.
         /// </summary>
-        Row = YogaFlexDirection.Row,
+        Row = LayoutFlexDirection.Row,
         /// <summary>
         /// Right to Left.
         /// </summary>
-        RowReverse = YogaFlexDirection.RowReverse
+        RowReverse = LayoutFlexDirection.RowReverse
     }
 
     /// <summary>
@@ -89,42 +89,42 @@ public enum Wrap
         /// <summary>
         /// All items will be on one line. Default Value.
         /// </summary>
-        NoWrap = YogaWrap.NoWrap,
+        NoWrap = LayoutWrap.NoWrap,
         /// <summary>
         /// All items will be on one line. Default Value.
         /// </summary>
-        Wrap = YogaWrap.Wrap,
+        Wrap = LayoutWrap.Wrap,
         /// <summary>
         /// Items will wrap onto multiple lines from bottom to top.
         /// </summary>
-        WrapReverse = YogaWrap.WrapReverse
+        WrapReverse = LayoutWrap.WrapReverse
     }
 
     /// <summary>
-    /// Defines the alignement behavior along an axis.
+    /// Defines the alignment behavior along an axis.
     /// </summary>
     public enum Align
     {
         /// <summary>
         /// Let Flex decide.
         /// </summary>
-        Auto = YogaAlign.Auto,
+        Auto = LayoutAlign.Auto,
         /// <summary>
         /// Start margin of the item is placed at the start of the axis.
         /// </summary>
-        FlexStart = YogaAlign.FlexStart,
+        FlexStart = LayoutAlign.FlexStart,
         /// <summary>
         /// Items are centered on the axis.
         /// </summary>
-        Center = YogaAlign.Center,
+        Center = LayoutAlign.Center,
         /// <summary>
         /// End margin of the item is placed at the end of the axis.
         /// </summary>
-        FlexEnd = YogaAlign.FlexEnd,
+        FlexEnd = LayoutAlign.FlexEnd,
         /// <summary>
         /// Default. stretch to fill the axis while respecting min/max values.
         /// </summary>
-        Stretch = YogaAlign.Stretch
+        Stretch = LayoutAlign.Stretch
     }
 
     /// <summary>
@@ -135,27 +135,27 @@ public enum Justify
         /// <summary>
         /// Items are packed toward the start line. Default Value.
         /// </summary>
-        FlexStart = YogaJustify.FlexStart,
+        FlexStart = LayoutJustify.FlexStart,
         /// <summary>
         /// Items are centered along the line.
         /// </summary>
-        Center = YogaJustify.Center,
+        Center = LayoutJustify.Center,
         /// <summary>
         /// Items are packed toward the end line.
         /// </summary>
-        FlexEnd = YogaJustify.FlexEnd,
+        FlexEnd = LayoutJustify.FlexEnd,
         /// <summary>
         /// Items are evenly distributed in the line; first item is on the start line, last item on the end line.
         /// </summary>
-        SpaceBetween = YogaJustify.SpaceBetween,
+        SpaceBetween = LayoutJustify.SpaceBetween,
         /// <summary>
         /// Items are evenly distributed in the line with equal space around them. Space on the edge is half of the space between objects.
         /// </summary>
-        SpaceAround = YogaJustify.SpaceAround,
+        SpaceAround = LayoutJustify.SpaceAround,
         /// <summary>
         /// Items are evenly distributed in the line with equal space around them.
         /// </summary>
-        SpaceEvenly = YogaJustify.SpaceEvenly,
+        SpaceEvenly = LayoutJustify.SpaceEvenly,
 
     }
 
@@ -199,7 +199,7 @@ public enum TextOverflow
     public enum TransformOriginOffset
     {
         /// <summary>
-        /// The origin of the transform operation is is set to the left of the element.
+        /// The origin of the transform operation is set to the left of the element.
         /// </summary>
         Left = 1,
 
@@ -226,7 +226,7 @@ public enum TransformOriginOffset
 
 
     /// <summary>
-    /// Specifies whether or not a VisualElement is visible.
+    /// Style value that specifies whether or not a VisualElement is visible.
     /// </summary>
     public enum Visibility
     {
@@ -235,7 +235,7 @@ public enum Visibility
         /// </summary>
         Visible = 0,
         /// <summary>
-        /// The VisualElement is hidden. Hidden VisualElements will take up space in their parent layout if their positionType is set to PositionType.Relative. Use the display property to both hide and remove a VisualElement from the parent VisualElement layout.
+        /// The VisualElement is hidden. Hidden VisualElements will take up space in their parent layout if their positionType is set to PositionType.Relative. Use the <see cref="DisplayStyle"/> style property to both hide and remove a VisualElement from the parent VisualElement layout. Note, this is the enum value used when setting styles via VisualElement.style.visibility. In C#, you can just use VisualElement.visible = false.
         /// </summary>
         Hidden = 1
     }
@@ -264,21 +264,21 @@ public enum DisplayStyle
         /// <summary>
         /// The element displays normally.
         /// </summary>
-        Flex = YogaDisplay.Flex,
+        Flex = LayoutDisplay.Flex,
         /// <summary>
-        /// The element is not visible and absent from the layout.
+        /// The element isn't visible and absent from the layout.
         /// </summary>
-        None = YogaDisplay.None
+        None = LayoutDisplay.None
     }
 
     /// <summary>
-    /// Defines the position of the background
+    /// Defines the position of the background.
     /// </summary>
     public enum BackgroundPositionKeyword
     {
         /// <summary>
         /// Vertical alignment is centered and/or Horizontal alignment is centered.
-        /// This is the default value to make sure it is backward compatible
+        /// This is the default value to make sure it's backward compatible
         /// with unity-background-scale-mode default value.
         /// </summary>
         Center = 0,
@@ -305,7 +305,7 @@ public enum BackgroundPositionKeyword
     }
 
     /// <summary>
-    /// Defines the position of an element
+    /// Defines the position of an element.
     /// </summary>
     internal enum PositionProperty
     {
@@ -331,71 +331,71 @@ internal enum PositionProperty
     }
 
     /// <summary>
-    /// Defines how the background is repeated
+    /// Defines how the background is repeated.
     /// </summary>
     public enum Repeat
     {
         /// <summary>
-        /// The background-image is not repeated. The image will only be shown once
+        /// The background-image isn't repeated. The image is only shown once.
         /// This is the default to keep background compatibility with
-        /// unity-background-scale-mode
+        /// unity-background-scale-mode.
         /// </summary>
         NoRepeat = 0,
 
         /// <summary>
         /// The background-image is repeated as much as possible without clipping.
         /// The first and last image is pinned to either side of the element,
-        /// and whitespace is distributed evenly between the images
+        /// and whitespace is distributed evenly between the images.
         /// </summary>
         Space = 1,
 
         /// <summary>
-        /// The background-image is repeated and squished or stretched to fill the space (no gaps)
+        /// The background-image is repeated and squished or stretched to fill the space (no gaps).
         /// </summary>
         Round = 2,
 
         /// <summary>
         /// The background image is repeated both vertically and horizontally.
-        /// The last image will be clipped if it does not fit.
+        /// The last image will be clipped if it doesn't fit.
         /// </summary>
         Repeat = 3,
     }
 
     /// <summary>
-    /// Defines how the background is repeated (one-value only)
+    /// Defines how the background is repeated (one-value only).
     /// </summary>
     internal enum RepeatXY
     {
         /// <summary>
-        /// The background image is repeated only horizontally
+        /// The background image is repeated horizontally.
         /// </summary>
         RepeatX = 0,
 
         /// <summary>
-        /// The background image is repeated only vertically
+        /// The background image is repeated vertically.
         /// </summary>
         RepeatY = 1,
     }
 
     /// <summary>
-    /// Defines the size of the background
+    /// Defines the size of the background.
     /// </summary>
     public enum BackgroundSizeType
     {
         /// <summary>
         /// Determines if the size of the background image comes from the
-        /// <see cref="BackgroundSize.x"/> and <see cref="BackgroundSize.y"/> length values
+        /// <see cref="BackgroundSize.x"/> and <see cref="BackgroundSize.y"/> length values.
         /// </summary>
         Length = 0,
 
         /// <summary>
         /// Resize the background image to cover the entire container,
-        /// even if it has to stretch the image or cut a little bit off one of the edges
+        /// even if it has to stretch the image or cut a little bit off one of the edges.
         /// </summary>
         Cover = 1,
 
         /// <summary>
-        /// Resize the background image to make sure the image is fully visible
+        /// Resize the background image to make sure the image is fully visible.
         /// </summary>
         Contain = 2,
     }
diff --git a/ModuleOverrides/com.unity.ui/Core/TemplateContainer.cs b/ModuleOverrides/com.unity.ui/Core/TemplateContainer.cs
index 7afa1e384e..7e6f3c1090 100644
--- a/ModuleOverrides/com.unity.ui/Core/TemplateContainer.cs
+++ b/ModuleOverrides/com.unity.ui/Core/TemplateContainer.cs
@@ -3,6 +3,8 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System.Collections.Generic;
+using Unity.Properties;
+using UnityEngine.Pool;
 
 namespace UnityEngine.UIElements
 {
@@ -17,6 +19,9 @@ namespace UnityEngine.UIElements
     /// </remarks>
     public class TemplateContainer : BindableElement
     {
+        internal static readonly DataBindingProperty templateIdProperty = nameof(templateId);
+        internal static readonly DataBindingProperty templateSourceProperty = nameof(templateSource);
+
         /// <summary>
         /// Instantiates and clones a <see cref="TemplateContainer"/> using the data read from a UXML file.
         /// </summary>
@@ -64,19 +69,14 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                     templateContainer.Add(new Label(string.Format("Unknown Template: '{0}'", templateContainer.templateId)));
                 else
                 {
-                    var bagOverrides = (bag as TemplateAsset)?.attributeOverrides;
-                    var contextOverrides = cc.attributeOverrides;
-
-                    if (bagOverrides != null)
-                    {
-                        if (contextOverrides == null)
-                            contextOverrides = new();
-                        // We want to add new overrides at the end of the list, as we
-                        // want parent instances to always override child instances.
-                        contextOverrides.Add(new CreationContext.AttributeOverrideRange(cc.visualTreeAsset, bagOverrides));
-                    }
-
-                    vta.CloneTree(ve, cc.slotInsertionPoints, contextOverrides);
+                    using var traitsOverridesHandle = ListPool<CreationContext.AttributeOverrideRange>.Get(out var traitsOverrideRanges);
+                    if (null != cc.attributeOverrides)
+                        traitsOverrideRanges.AddRange(cc.attributeOverrides);
+                    var attributeOverrides = (bag as TemplateAsset)?.attributeOverrides;
+                    if (null != attributeOverrides)
+                        traitsOverrideRanges.Add(new CreationContext.AttributeOverrideRange(cc.visualTreeAsset, attributeOverrides));
+
+                    vta.CloneTree(ve, cc.slotInsertionPoints, traitsOverrideRanges);
                 }
 
                 if (vta == null)
@@ -88,6 +88,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// The local ID of the template in the parent UXML file (RO).
         /// </summary>
         /// <remarks>This value is null, unless the TemplateContainer represents a UXML template within another UXML file.</remarks>
+        [CreateProperty(ReadOnly = true)]
         public string templateId { get; private set; }
         private VisualElement m_ContentContainer;
 
@@ -97,6 +98,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// Stores the template asset reference, if the generated element is cloned from a VisualTreeAsset as a
         /// Template declaration inside another VisualTreeAsset.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public VisualTreeAsset templateSource
         {
             get => m_TemplateSource;
diff --git a/ModuleOverrides/com.unity.ui/Core/Text/PanelTextSettings.cs b/ModuleOverrides/com.unity.ui/Core/Text/PanelTextSettings.cs
index 12c1b7c299..293664d3a3 100644
--- a/ModuleOverrides/com.unity.ui/Core/Text/PanelTextSettings.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Text/PanelTextSettings.cs
@@ -25,46 +25,11 @@ internal static PanelTextSettings defaultPanelTextSettings
             {
                 if (s_DefaultPanelTextSettings == null)
                 {
-                    s_DefaultPanelTextSettings = EditorGUIUtilityLoad(s_DefaultEditorPanelTextSettingPath) as PanelTextSettings;
-                    UpdateLocalizationFontAsset();
-
-                    if (s_DefaultPanelTextSettings == null)
-                        s_DefaultPanelTextSettings = ScriptableObject.CreateInstance<PanelTextSettings>();
+                    s_DefaultPanelTextSettings = ScriptableObject.CreateInstance<PanelTextSettings>();
                 }
 
                 return s_DefaultPanelTextSettings;
             }
         }
-
-        internal static void UpdateLocalizationFontAsset()
-        {
-            string platform = " - Linux";
-            var localizationAssetPathPerSystemLanguage = new Dictionary<SystemLanguage, string>()
-            {
-                { SystemLanguage.English, Path.Combine(UIElementsPackageUtility.EditorResourcesBasePath, $"UIPackageResources/FontAssets/DynamicOSFontAssets/Localization/English{platform}.asset") },
-                { SystemLanguage.Japanese, Path.Combine(UIElementsPackageUtility.EditorResourcesBasePath, $"UIPackageResources/FontAssets/DynamicOSFontAssets/Localization/Japanese{platform}.asset") },
-                { SystemLanguage.ChineseSimplified, Path.Combine(UIElementsPackageUtility.EditorResourcesBasePath, $"UIPackageResources/FontAssets/DynamicOSFontAssets/Localization/ChineseSimplified{platform}.asset") },
-                { SystemLanguage.ChineseTraditional, Path.Combine(UIElementsPackageUtility.EditorResourcesBasePath, $"UIPackageResources/FontAssets/DynamicOSFontAssets/Localization/ChineseTraditional{platform}.asset") },
-                { SystemLanguage.Korean, Path.Combine(UIElementsPackageUtility.EditorResourcesBasePath, $"UIPackageResources/FontAssets/DynamicOSFontAssets/Localization/Korean{platform}.asset") }
-            };
-
-            var globalFallbackAssetPath = Path.Combine(UIElementsPackageUtility.EditorResourcesBasePath, $"UIPackageResources/FontAssets/DynamicOSFontAssets/GlobalFallback/GlobalFallback{platform}.asset");
-
-            var localizationAsset = EditorGUIUtilityLoad(localizationAssetPathPerSystemLanguage[GetCurrentLanguage()]) as FontAsset;
-            var globalFallbackAsset = EditorGUIUtilityLoad(globalFallbackAssetPath) as FontAsset;
-
-            defaultPanelTextSettings.fallbackFontAssets[0] = localizationAsset;
-            defaultPanelTextSettings.fallbackFontAssets[defaultPanelTextSettings.fallbackFontAssets.Count - 1] = globalFallbackAsset;
-        }
-
-        internal FontAsset GetCachedFontAsset(Font font)
-        {
-            return GetCachedFontAssetInternal(font);
-        }
-
-        internal static Func<string, Object> EditorGUIUtilityLoad;
-        internal static Func<SystemLanguage> GetCurrentLanguage;
-
-        internal static readonly string s_DefaultEditorPanelTextSettingPath = "UIPackageResources/Default Editor Text Settings.asset";
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Text/TextEditingManipulator.cs b/ModuleOverrides/com.unity.ui/Core/Text/TextEditingManipulator.cs
index 1c21c2f0ba..2b650987c1 100644
--- a/ModuleOverrides/com.unity.ui/Core/Text/TextEditingManipulator.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Text/TextEditingManipulator.cs
@@ -2,6 +2,8 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using UnityEngine.TextCore.Text;
+
 namespace UnityEngine.UIElements
 {
     internal class TextEditingManipulator
@@ -39,6 +41,15 @@ internal void ExecuteDefaultActionAtTarget(EventBase evt)
             if (m_TextElement.edition.isReadOnly)
                 return;
 
+            if (evt is BlurEvent)
+            {
+                m_TextElement.uitkTextHandle.RemoveTextInfoFromCache();
+            }
+            else if ((evt is not PointerMoveEvent && evt is not MouseMoveEvent) || m_TextElement.selectingManipulator.isClicking)
+            {
+                m_TextElement.uitkTextHandle.AddTextInfoToCache();
+            }
+
             switch (evt)
             {
                 case FocusInEvent fie:
diff --git a/ModuleOverrides/com.unity.ui/Core/Text/TextSelectingManipulator.cs b/ModuleOverrides/com.unity.ui/Core/Text/TextSelectingManipulator.cs
index f33a0797ac..d55731fa72 100644
--- a/ModuleOverrides/com.unity.ui/Core/Text/TextSelectingManipulator.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Text/TextSelectingManipulator.cs
@@ -18,10 +18,10 @@ internal class TextSelectingManipulator
 
         private int m_ConsecutiveMouseDownCount;
         private long m_LastMouseDownTimeStamp = 0;
-        private bool isClicking
+        internal bool isClicking
         {
             get => m_IsClicking;
-            set
+            private set
             {
                 if (m_IsClicking == value) return;
                 m_IsClicking = value;
@@ -87,8 +87,22 @@ internal bool HasSelection()
             return m_SelectingUtilities.hasSelection;
         }
 
+        internal bool HasFocus()
+        {
+            return m_TextElement.hasFocus;
+        }
+
         internal void ExecuteDefaultActionAtTarget(EventBase evt)
         {
+            if (evt is BlurEvent)
+            {
+                m_TextElement.uitkTextHandle.RemoveTextInfoFromCache();
+            }
+            else if ((evt is not PointerMoveEvent && evt is not MouseMoveEvent) || isClicking)
+            {
+                m_TextElement.uitkTextHandle.AddTextInfoToCache();
+            }
+
             switch (evt)
             {
                 case FocusEvent fe:
@@ -160,7 +174,15 @@ void OnPointerDownEvent(PointerDownEvent evt)
                     m_ConsecutiveMouseDownCount = 1;
 
                 if (m_ConsecutiveMouseDownCount == 2 && m_TextElement.selection.doubleClickSelectsWord)
+                {
+                    // We need to assign the correct cursor and select index to the current cursor position
+                    // prior to selecting the current word. Because selectAllOnMouseUp is true, it'll always
+                    // use a cursorIndex of 0.
+                    if (cursorIndex == 0 && cursorIndex != selectIndex)
+                        m_SelectingUtilities.MoveCursorToPosition_Internal(pointerPosition, evt.shiftKey);
+
                     m_SelectingUtilities.SelectCurrentWord();
+                }
                 else if (m_ConsecutiveMouseDownCount == 3 && m_TextElement.selection.tripleClickSelectsLine)
                     m_SelectingUtilities.SelectCurrentParagraph();
                 else
@@ -173,7 +195,6 @@ void OnPointerDownEvent(PointerDownEvent evt)
                 isClicking = true;
                 m_TextElement.CapturePointer(evt.pointerId);
                 m_ClickStartPosition = pointerPosition;
-                evt.StopPropagation();
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Text/UITKTextHandle.cs b/ModuleOverrides/com.unity.ui/Core/Text/UITKTextHandle.cs
index 64d3431069..39c189ee4b 100644
--- a/ModuleOverrides/com.unity.ui/Core/Text/UITKTextHandle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Text/UITKTextHandle.cs
@@ -20,26 +20,18 @@ public UITKTextHandle(TextElement te)
 
         TextElement m_TextElement;
 
-        public float ComputeTextWidth(string textToMeasure, bool wordWrap, float width, float height)
+        public Vector2 ComputeTextSize(string textToMeasure, float width, float height)
         {
-            ConvertUssToTextGenerationSettings(s_LayoutSettings);
-            s_LayoutSettings.text = textToMeasure;
-            s_LayoutSettings.screenRect = new Rect(0, 0, width, height);
-            s_LayoutSettings.wordWrap = wordWrap;
-            return ComputeTextWidth(s_LayoutSettings);
+            ConvertUssToTextGenerationSettings();
+            s_Settings.text = textToMeasure;
+            s_Settings.screenRect = new Rect(0, 0, width, height);
+            UpdatePreferredValues(s_Settings);
+            return preferredSize;
         }
 
-        public float ComputeTextHeight(string textToMeasure, float width, float height)
+        public virtual MeshInfo[] Update()
         {
-            ConvertUssToTextGenerationSettings(s_LayoutSettings);
-            s_LayoutSettings.text = textToMeasure;
-            s_LayoutSettings.screenRect = new Rect(0, 0, width, height);
-            return ComputeTextHeight(s_LayoutSettings);
-        }
-
-        public virtual TextInfo Update()
-        {
-            ConvertUssToTextGenerationSettings(textGenerationSettings);
+            ConvertUssToTextGenerationSettings();
 
             // The screenRect in TextCore is not properly implemented with regards to the offset part, so zero it out for now and we will add it ourselves later
             var size = m_TextElement.contentRect.size;
@@ -56,12 +48,25 @@ public virtual TextInfo Update()
                 MeasuredSizes = size;
             }
 
-            textGenerationSettings.screenRect = new Rect(Vector2.zero, size);
-            Update(textGenerationSettings);
+            s_Settings.screenRect = new Rect(Vector2.zero, size);
+
+
+            // this should be a dynamic asset
+            if (m_PreviousGenerationSettingsHash == s_Settings.GetHashCode())
+                AddTextInfoToCache();
+            else
+                Update(s_Settings);
+
             HandleATag();
             HandleLinkTag();
 
-            return textInfo;
+            return textInfo.meshInfo;
+        }
+
+        public override void AddTextInfoToCache()
+        {
+            ConvertUssToTextGenerationSettings();
+            base.AddTextInfoToCache();
         }
 
         void ATagOnPointerUp(PointerUpEvent pue)
@@ -239,6 +244,7 @@ void HandleLinkTag()
                     m_TextElement.RegisterCallback<PointerMoveEvent>(LinkTagOnPointerMove, TrickleDown.TrickleDown);
                     m_TextElement.RegisterCallback<PointerOutEvent>(LinkTagOnPointerOut, TrickleDown.TrickleDown);
                     hasLinkTag = true;
+                    AddTextInfoToCache();
                     return;
                 }
             }
@@ -246,6 +252,7 @@ void HandleLinkTag()
             if (hasLinkTag)
             {
                 hasLinkTag = false;
+                RemoveTextInfoFromCache();
                 m_TextElement.UnregisterCallback<PointerDownEvent>(LinkTagOnPointerDown, TrickleDown.TrickleDown);
                 m_TextElement.UnregisterCallback<PointerUpEvent>(LinkTagOnPointerUp, TrickleDown.TrickleDown);
                 m_TextElement.UnregisterCallback<PointerMoveEvent>(LinkTagOnPointerMove, TrickleDown.TrickleDown);
@@ -270,6 +277,7 @@ void HandleATag()
                         m_TextElement.RegisterCallback<PointerOverEvent>(ATagOnPointerOver, TrickleDown.TrickleDown);
                         m_TextElement.RegisterCallback<PointerOutEvent>(ATagOnPointerOut, TrickleDown.TrickleDown);
                     }
+                    AddTextInfoToCache();
                     hasATag = true;
                     return;
                 }
@@ -285,6 +293,7 @@ void HandleATag()
                     m_TextElement.UnregisterCallback<PointerOverEvent>(ATagOnPointerOver, TrickleDown.TrickleDown);
                     m_TextElement.UnregisterCallback<PointerOutEvent>(ATagOnPointerOut, TrickleDown.TrickleDown);
                 }
+                RemoveTextInfoFromCache();
             }
         }
 
@@ -307,10 +316,10 @@ TextOverflowMode GetTextOverflowMode()
             return TextOverflowMode.Overflow;
         }
 
-        internal void ConvertUssToTextGenerationSettings(UnityEngine.TextCore.Text.TextGenerationSettings tgs)
+        internal void ConvertUssToTextGenerationSettings()
         {
             var style = m_TextElement.computedStyle;
-
+            var tgs = s_Settings;
             tgs.textSettings = TextUtilities.GetTextSettingsFrom(m_TextElement);
             if (tgs.textSettings == null)
                 return;
@@ -322,6 +331,7 @@ internal void ConvertUssToTextGenerationSettings(UnityEngine.TextCore.Text.TextG
             tgs.material = tgs.fontAsset.material;
             // The screenRect in TextCore is not properly implemented with regards to the offset part, so zero it out for now and we will add it ourselves later
             tgs.screenRect = new Rect(0, 0, m_TextElement.contentRect.width, m_TextElement.contentRect.height);
+            tgs.extraPadding = GetTextEffectPadding(tgs.fontAsset);
             tgs.text = m_TextElement.isElided && !TextLibraryCanElide() ? m_TextElement.elidedText : m_TextElement.renderedText;
             tgs.isPlaceholder = m_TextElement.showPlaceholderText;
 
@@ -344,11 +354,13 @@ internal void ConvertUssToTextGenerationSettings(UnityEngine.TextCore.Text.TextG
             tgs.color = style.color;
             tgs.shouldConvertToLinearSpace = false;
             tgs.parseControlCharacters = m_TextElement.parseEscapeSequences;
+            tgs.isRightToLeft = m_TextElement.localLanguageDirection == LanguageDirection.RTL;
 
             if (m_TextElement.panel?.contextType == ContextType.Editor)
                 tgs.color *= UIElementsUtility.editorPlayModeTintColor;
 
             tgs.inverseYAxis = true;
+            tgs.isIMGUI = false;
         }
 
         internal bool TextLibraryCanElide()
@@ -357,10 +369,44 @@ internal bool TextLibraryCanElide()
             return m_TextElement.computedStyle.unityTextOverflowPosition == TextOverflowPosition.End;
         }
 
+        internal static readonly float k_MinPadding = 6.0f;
+        // Function to determine how much extra padding is required as a result of text effect like outline thickness, shadow etc... (see UUM-9524).
+        internal float GetTextEffectPadding(FontAsset fontAsset)
+        {
+            float horizontalPadding;
+            float verticalPadding;
+
+            var style = m_TextElement.computedStyle;
+
+            // Grow half inside and half outside
+            float outlineThickness = style.unityTextOutlineWidth / 2.0f;
+
+            // Text Shadow is not additive to outline thickness
+            float offsetX = Mathf.Abs(style.textShadow.offset.x);
+            float offsetY = Mathf.Abs(style.textShadow.offset.y);
+            float blurRadius = Mathf.Abs(style.textShadow.blurRadius);
+
+            if (outlineThickness <= 0.0f && offsetX <= 0.0f && offsetY <= 0.0f && blurRadius <= 0.0f)
+                return k_MinPadding;
+
+            horizontalPadding = Mathf.Max(offsetX + blurRadius, outlineThickness);
+            verticalPadding = Mathf.Max(offsetY + blurRadius, outlineThickness);
+
+            var padding = Mathf.Max(horizontalPadding, verticalPadding) + k_MinPadding;
+
+            var factor = TextUtilities.ConvertPixelUnitsToTextCoreRelativeUnits(m_TextElement, fontAsset);
+            var gradientScale = fontAsset.atlasPadding + 1;
+
+            return Mathf.Min(padding * factor * gradientScale, gradientScale);
+        }
+
     }
 
     internal static class TextUtilities
     {
+        public static Func<TextSettings> getEditorTextSettings;
+        public static Func<string, float> getEditorTextSharpness;
+
         internal static Vector2 MeasureVisualElementTextSize(TextElement te, string textToMeasure, float width, VisualElement.MeasureMode widthMode, float height, VisualElement.MeasureMode heightMode)
         {
             float measuredWidth = float.NaN;
@@ -374,14 +420,20 @@ internal static Vector2 MeasureVisualElementTextSize(TextElement te, string text
             if ( pixelsPerPoint <= 0)
                 return Vector2.zero;
 
+
+            if (widthMode != VisualElement.MeasureMode.Exactly || heightMode != VisualElement.MeasureMode.Exactly)
+            {
+                var size = te.uitkTextHandle.ComputeTextSize(textToMeasure, width, height);
+                measuredWidth = size.x;
+                measuredHeight = size.y;
+            }
+
             if (widthMode == VisualElement.MeasureMode.Exactly)
             {
                 measuredWidth = width;
             }
             else
             {
-                measuredWidth = te.uitkTextHandle.ComputeTextWidth(textToMeasure, false, width, height);
-
                 if (widthMode == VisualElement.MeasureMode.AtMost)
                 {
                     measuredWidth = Mathf.Min(measuredWidth, width);
@@ -394,8 +446,6 @@ internal static Vector2 MeasureVisualElementTextSize(TextElement te, string text
             }
             else
             {
-                measuredHeight = te.uitkTextHandle.ComputeTextHeight(textToMeasure, width, height);
-
                 if (heightMode == VisualElement.MeasureMode.AtMost)
                 {
                     measuredHeight = Mathf.Min(measuredHeight, height);
@@ -420,9 +470,11 @@ internal static FontAsset GetFontAsset(VisualElement ve)
 
             var textSettings = GetTextSettingsFrom(ve);
             if (ve.computedStyle.unityFontDefinition.font != null)
-                return textSettings.GetCachedFontAsset(ve.computedStyle.unityFontDefinition.font);
+                return textSettings.GetCachedFontAsset(ve.computedStyle.unityFontDefinition.font, TextShaderUtilities.ShaderRef_MobileSDF);
             else if (ve.computedStyle.unityFont != null)
-                return textSettings.GetCachedFontAsset(ve.computedStyle.unityFont);
+                return textSettings.GetCachedFontAsset(ve.computedStyle.unityFont, TextShaderUtilities.ShaderRef_MobileSDF);
+            else if (textSettings != null)
+                return textSettings.defaultFontAsset;
             return null;
         }
 
@@ -442,11 +494,19 @@ internal static bool IsFontAssigned(VisualElement ve)
             return ve.computedStyle.unityFont != null || !ve.computedStyle.unityFontDefinition.IsEmpty();
         }
 
-        internal static PanelTextSettings GetTextSettingsFrom(VisualElement ve)
+        internal static TextSettings GetTextSettingsFrom(VisualElement ve)
         {
             if (ve.panel is RuntimePanel runtimePanel)
                 return runtimePanel.panelSettings.textSettings ?? PanelTextSettings.defaultPanelTextSettings;
-            return PanelTextSettings.defaultPanelTextSettings;
+            return getEditorTextSettings();
+        }
+
+        internal static float ConvertPixelUnitsToTextCoreRelativeUnits(VisualElement ve, FontAsset fontAsset)
+        {
+            // Convert the text settings pixel units to TextCore relative units
+            float paddingPercent = 1.0f / fontAsset.atlasPadding;
+            float pointSizeRatio = ((float)fontAsset.faceInfo.pointSize) / ve.computedStyle.fontSize.value;
+            return paddingPercent * pointSizeRatio;
         }
 
         internal static TextCoreSettings GetTextCoreSettingsForElement(VisualElement ve)
@@ -458,14 +518,14 @@ internal static TextCoreSettings GetTextCoreSettingsForElement(VisualElement ve)
             var resolvedStyle = ve.resolvedStyle;
             var computedStyle = ve.computedStyle;
 
-            // Convert the text settings pixel units to TextCore relative units
-            float paddingPercent = 1.0f / fontAsset.atlasPadding;
-            float pointSizeRatio = ((float)fontAsset.faceInfo.pointSize) / ve.computedStyle.fontSize.value;
-            float factor = paddingPercent * pointSizeRatio;
+            float factor = ConvertPixelUnitsToTextCoreRelativeUnits(ve, fontAsset);
+
+            float outlineWidth = Mathf.Clamp(resolvedStyle.unityTextOutlineWidth * factor, 0.0f, 1.0f);
+            float underlaySoftness = Mathf.Clamp(computedStyle.textShadow.blurRadius * factor, 0.0f, 1.0f);
 
-            float outlineWidth = Mathf.Max(0.0f, resolvedStyle.unityTextOutlineWidth * factor);
-            float underlaySoftness = Mathf.Max(0.0f, computedStyle.textShadow.blurRadius * factor);
-            Vector2 underlayOffset = computedStyle.textShadow.offset * factor;
+            float underlayOffsetX = computedStyle.textShadow.offset.x < 0 ? Mathf.Max(computedStyle.textShadow.offset.x * factor, -1.0f) : Mathf.Min(computedStyle.textShadow.offset.x * factor, 1.0f);
+            float underlayOffsetY = computedStyle.textShadow.offset.y < 0 ? Mathf.Max(computedStyle.textShadow.offset.y * factor, -1.0f) : Mathf.Min(computedStyle.textShadow.offset.y * factor, 1.0f);
+            Vector2 underlayOffset = new Vector2(underlayOffsetX, underlayOffsetY);
 
             var faceColor = resolvedStyle.color;
             var outlineColor = resolvedStyle.unityTextOutlineColor;
diff --git a/ModuleOverrides/com.unity.ui/Core/TextElement.cs b/ModuleOverrides/com.unity.ui/Core/TextElement.cs
index 4203ddfd72..9127372d52 100644
--- a/ModuleOverrides/com.unity.ui/Core/TextElement.cs
+++ b/ModuleOverrides/com.unity.ui/Core/TextElement.cs
@@ -4,6 +4,8 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
+using UnityEngine.TextCore.Text;
 using UnityEngine.UIElements.UIR;
 
 namespace UnityEngine.UIElements
@@ -21,6 +23,13 @@ internal interface ITextElement
     /// </summary>
     public partial class TextElement : BindableElement, ITextElement, INotifyValueChanged<string>
     {
+        internal static readonly DataBindingProperty textProperty = nameof(text);
+        internal static readonly DataBindingProperty enableRichTextProperty = nameof(enableRichText);
+        internal static readonly DataBindingProperty parseEscapeSequencesProperty = nameof(parseEscapeSequences);
+        internal static readonly DataBindingProperty isElidedProperty = nameof(isElided);
+        internal static readonly DataBindingProperty displayTooltipWhenElidedProperty = nameof(displayTooltipWhenElided);
+        internal static readonly DataBindingProperty valueProperty = nameof(value);
+
         /// <summary>
         /// Instantiates a <see cref="TextElement"/> using the data read from a UXML file.
         /// </summary>
@@ -143,7 +152,6 @@ private void OnDetachFromPanel(DetachFromPanelEvent detachEvent)
             (detachEvent.originPanel as BaseVisualElementPanel)?.liveReloadSystem.UnregisterTextElement(this);
         }
 
-        [SerializeField]
         private string m_Text = String.Empty;
 
         /// <summary>
@@ -152,6 +160,7 @@ private void OnDetachFromPanel(DetachFromPanelEvent detachEvent)
         /// <remarks>
         /// Changing this value will implicitly invoke the <see cref="INotifyValueChanged{T}.value"/> setter, which will raise a <see cref="ChangeEvent{T}"/> of type string.
         /// </remarks>
+        [CreateProperty]
         public virtual string text
         {
             get => ((INotifyValueChanged<string>) this).value;
@@ -163,6 +172,7 @@ public virtual string text
         /// <summary>
         /// When false, rich text tags will not be parsed.
         /// </summary>
+        [CreateProperty]
         public bool enableRichText
         {
             get => m_EnableRichText;
@@ -171,6 +181,7 @@ public bool enableRichText
                 if (m_EnableRichText == value) return;
                 m_EnableRichText = value;
                 MarkDirtyRepaint();
+                NotifyPropertyChanged(enableRichTextProperty);
             }
         }
 
@@ -178,6 +189,7 @@ public bool enableRichText
         /// <summary>
         /// Specifies whether escape sequences are displayed as is or if they are replaced by the character they represent.
         /// </summary>
+        [CreateProperty]
         public bool parseEscapeSequences
         {
             get => m_ParseEscapeSequences;
@@ -187,6 +199,7 @@ public bool parseEscapeSequences
 
                 m_ParseEscapeSequences = value;
                 MarkDirtyRepaint();
+                NotifyPropertyChanged(parseEscapeSequencesProperty);
             }
         }
 
@@ -196,6 +209,7 @@ public bool parseEscapeSequences
         /// When true, a tooltip displays the full version of elided text, and also if a tooltip had been previously
         /// provided, it will be overwritten.
         /// </summary>
+        [CreateProperty]
         public bool displayTooltipWhenElided
         {
             get => m_DisplayTooltipWhenElided;
@@ -206,6 +220,7 @@ public bool displayTooltipWhenElided
                     m_DisplayTooltipWhenElided = value;
                     UpdateVisibleText();
                     MarkDirtyRepaint();
+                    NotifyPropertyChanged(displayTooltipWhenElidedProperty);
                 }
             }
         }
@@ -222,6 +237,7 @@ public bool displayTooltipWhenElided
         ///
         /// The text Element hides elided text, and displays an ellipsis ('...') to indicate that there is hidden overflow content.
         /// </remarks>
+        [CreateProperty(ReadOnly = true)]
         public bool isElided { get; private set; }
 
         internal static readonly string k_EllipsisText = @"..."; // Some web standards seem to suggest "\u2026" (horizontal ellipsis Unicode character)
@@ -241,7 +257,7 @@ internal void OnGenerateVisualContent(MeshGenerationContext mgc)
 
             UpdateTooltip();
 
-            if(selection.HasSelection())
+            if(selection.HasSelection() && selectingManipulator.HasFocus())
                 DrawHighlighting(mgc);
             else if(!edition.isReadOnly && selection.isSelectable && selectingManipulator.RevealCursor())
                 DrawCaret(mgc);
@@ -251,8 +267,17 @@ internal void DrawText(MeshGenerationContext mgc)
         {
             if (TextUtilities.IsFontAssigned(this))
             {
-                TextCore.Text.TextInfo textInfo = uitkTextHandle.Update();
-                mgc.meshGenerator.DrawText(textInfo, contentRect.min);
+                MeshInfo[] meshInfo = uitkTextHandle.Update();
+
+                // If multiple colors are required (e.g., color tags are used), then ignore the dynamic-color hint
+                // since we cannot store multiple colors for a given text element.
+                bool hasMultipleColors = uitkTextHandle.textInfo.hasMultipleColors;
+                if (hasMultipleColors)
+                    renderChainData.flags |= RenderDataFlags.IsIgnoringDynamicColorHint;
+                else
+                    renderChainData.flags &= ~RenderDataFlags.IsIgnoringDynamicColorHint;
+
+                mgc.meshGenerator.DrawText(meshInfo, contentRect.min, hasMultipleColors);
             }
         }
 
@@ -421,6 +446,9 @@ string INotifyValueChanged<string>.value
                             evt.elementTarget = this;
                             ((INotifyValueChanged<string>) this).SetValueWithoutNotify(value);
                             SendEvent(evt);
+                            NotifyPropertyChanged(valueProperty);
+                            // We fire the property changed for text here because text simply assigns the value.
+                            NotifyPropertyChanged(textProperty);
                         }
                     }
                     else
@@ -431,6 +459,13 @@ string INotifyValueChanged<string>.value
             }
         }
 
+        [CreateProperty]
+        private string value
+        {
+            get => ((INotifyValueChanged<string>) this).value;
+            set => ((INotifyValueChanged<string>) this).value = value;
+        }
+
         void INotifyValueChanged<string>.SetValueWithoutNotify(string newValue)
         {
             newValue = ((ITextEdition)this).CullString(newValue);
@@ -444,7 +479,8 @@ void INotifyValueChanged<string>.SetValueWithoutNotify(string newValue)
                     SaveViewData();
             }
 
-            if (!edition.isReadOnly && editingManipulator?.editingUtilities.text != newValue)
+            // Always sync the manipulator if it exists even if the element is read-only or disabled. See issue UUM-8802
+            if (editingManipulator != null)
                 editingManipulator.editingUtilities.text = newValue;
         }
     }
diff --git a/ModuleOverrides/com.unity.ui/Core/TextElementEdition.cs b/ModuleOverrides/com.unity.ui/Core/TextElementEdition.cs
index f99c176a56..6a25ca975c 100644
--- a/ModuleOverrides/com.unity.ui/Core/TextElementEdition.cs
+++ b/ModuleOverrides/com.unity.ui/Core/TextElementEdition.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
 using UnityEngine.UIElements.UIR;
 
 namespace UnityEngine.UIElements
@@ -128,6 +129,14 @@ public TouchScreenKeyboardType keyboardType
     // Text editing and selection management implementation
     public partial class TextElement : ITextEdition
     {
+        internal static readonly DataBindingProperty autoCorrectionProperty = nameof(autoCorrection);
+        internal static readonly DataBindingProperty hideMobileInputProperty = nameof(hideMobileInput);
+        internal static readonly DataBindingProperty keyboardTypeProperty = nameof(keyboardType);
+        internal static readonly DataBindingProperty isReadOnlyProperty = nameof(isReadOnly);
+        internal static readonly DataBindingProperty isPasswordProperty = nameof(isPassword);
+        internal static readonly DataBindingProperty maxLengthProperty = nameof(maxLength);
+        internal static readonly DataBindingProperty maskCharProperty = nameof(maskChar);
+
         /// <summary>
         /// Retrieves this TextElement's ITextEdition
         /// </summary>
@@ -163,7 +172,20 @@ TouchScreenKeyboard ITextEdition.touchScreenKeyboard
         TouchScreenKeyboardType ITextEdition.keyboardType
         {
             get => m_KeyboardType;
-            set => m_KeyboardType = value;
+            set
+            {
+                if (m_KeyboardType == value)
+                    return;
+                m_KeyboardType = value;
+                NotifyPropertyChanged(keyboardTypeProperty);
+            }
+        }
+
+        [CreateProperty]
+        private TouchScreenKeyboardType keyboardType
+        {
+            get => edition.keyboardType;
+            set => edition.keyboardType = value;
         }
 
         bool m_HideMobileInput;
@@ -184,6 +206,7 @@ bool ITextEdition.hideMobileInput
             }
             set
             {
+                var current = m_HideMobileInput;
                 switch(Application.platform)
                 {
                     case RuntimePlatform.Android:
@@ -196,9 +219,18 @@ bool ITextEdition.hideMobileInput
                         m_HideMobileInput = value;
                         break;
                 }
+                if (current != m_HideMobileInput)
+                    NotifyPropertyChanged(hideMobileInputProperty);
             }
         }
 
+        [CreateProperty]
+        private bool hideMobileInput
+        {
+            get => edition.hideMobileInput;
+            set => edition.hideMobileInput = value;
+        }
+
         bool m_IsReadOnly = true;
 
         bool ITextEdition.isReadOnly
@@ -212,9 +244,17 @@ bool ITextEdition.isReadOnly
                 editingManipulator = value ? null : new TextEditingManipulator(this);
                 m_IsReadOnly = value;
                 onIsReadOnlyChanged?.Invoke(value);
+                NotifyPropertyChanged(isReadOnlyProperty);
             }
         }
 
+        [CreateProperty]
+        private bool isReadOnly
+        {
+            get => edition.isReadOnly;
+            set => edition.isReadOnly = value;
+        }
+
         void ProcessMenuCommand(string command)
         {
             using (ExecuteCommandEvent evt = ExecuteCommandEvent.GetPooled(command))
@@ -318,11 +358,21 @@ int ITextEdition.maxLength
             get => m_MaxLength;
             set
             {
+                if (m_MaxLength == value)
+                    return;
                 m_MaxLength = value;
                 text = edition.CullString(text);
+                NotifyPropertyChanged(maxLengthProperty);
             }
         }
 
+        [CreateProperty]
+        private int maxLength
+        {
+            get => edition.maxLength;
+            set => edition.maxLength = value;
+        }
+
         string m_PlaceholderText = "";
         string ITextEdition.placeholder
         {
@@ -337,7 +387,7 @@ string ITextEdition.placeholder
 
                 m_PlaceholderText = value;
                 OnPlaceholderChanged?.Invoke();
-
+                MarkDirtyRepaint();
             }
         }
 
@@ -407,10 +457,18 @@ char ITextEdition.maskChar
                     {
                         IncrementVersion(VersionChangeType.Repaint);
                     }
+                    NotifyPropertyChanged(maskCharProperty);
                 }
             }
         }
 
+        [CreateProperty]
+        private char maskChar
+        {
+            get => edition.maskChar;
+            set => edition.maskChar = value;
+        }
+
         char effectiveMaskChar
         {
             get => edition.isPassword ? m_MaskChar : Char.MinValue;
@@ -425,10 +483,18 @@ bool ITextEdition.isPassword
                 {
                     m_IsPassword = value;
                     IncrementVersion(VersionChangeType.Repaint);
+                    NotifyPropertyChanged(isPasswordProperty);
                 }
             }
         }
 
+        [CreateProperty]
+        private bool isPassword
+        {
+            get => edition.isPassword;
+            set => edition.isPassword = value;
+        }
+
         bool ITextEdition.hidePlaceholderOnFocus
         {
             get => m_HidePlaceholderTextOnFocus;
@@ -449,7 +515,20 @@ internal bool showPlaceholderText
         bool ITextEdition.autoCorrection
         {
             get => m_AutoCorrection;
-            set => m_AutoCorrection = value;
+            set
+            {
+                if (m_AutoCorrection == value)
+                    return;
+                m_AutoCorrection = value;
+                NotifyPropertyChanged(autoCorrectionProperty);
+            }
+        }
+
+        [CreateProperty]
+        private bool autoCorrection
+        {
+            get => edition.autoCorrection;
+            set => edition.autoCorrection = value;
         }
 
         string m_RenderedText;
@@ -461,9 +540,8 @@ internal string renderedText
                     return m_PlaceholderText + "\u200B";
 
                 // Handles password fields.
-                var mskChar = effectiveMaskChar;
-                if (mskChar != Char.MinValue)
-                    return "".PadLeft(text.Length, mskChar) + "\u200B";
+                if (effectiveMaskChar != Char.MinValue)
+                    return "".PadLeft(text.Length, effectiveMaskChar) + "\u200B";
 
                 return string.IsNullOrEmpty(m_RenderedText) ? "\u200B" : m_RenderedText;
             }
@@ -474,6 +552,8 @@ internal string renderedText
         }
 
         string m_OriginalText;
+        internal string originalText => m_OriginalText;
+
         private char m_MaskChar;
         private bool m_IsPassword;
         private bool m_HidePlaceholderTextOnFocus;
diff --git a/ModuleOverrides/com.unity.ui/Core/TextElementExperimental.cs b/ModuleOverrides/com.unity.ui/Core/TextElementExperimental.cs
new file mode 100644
index 0000000000..4d0c445fe8
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/TextElementExperimental.cs
@@ -0,0 +1,48 @@
+// 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.Experimental;
+
+namespace UnityEngine.UIElements
+{
+    /// <summary>
+    /// Give access to TextElement experimental features.
+    /// </summary>
+    public interface ITextElementExperimentalFeatures : IExperimentalFeatures
+    {
+        /// <summary>
+        /// Setting this property will override the displayed text while preserving the original text value.
+        /// </summary>
+        /// <remarks>
+        /// It is frequently employed to integrate third-party plugins available in the Unity Asset Store for text shaping purposes in combination with the <see cref="LanguageDirection"/> property.
+        /// </remarks>
+        void SetRenderedText(string renderedText);
+    }
+
+    /// <summary>
+    /// Base class for a <see cref="VisualElement"/> that displays text.
+    /// </summary>
+    /// <summary>
+    /// Use this as the super class if you are declaring a custom VisualElement that displays text. For example, <see cref="Button"/> or <see cref="Label"/> use this as their base class.
+    /// </summary>
+    public partial class TextElement : ITextElementExperimentalFeatures
+    {
+        /// <summary>
+        /// Returns the TextElement experimental interface.
+        /// </summary>
+        public new ITextElementExperimentalFeatures experimental => this;
+
+        /// <summary>
+        /// Setting this property will override the displayed text while preserving the original text value.
+        /// </summary>
+        /// <remarks>
+        /// It is frequently employed to integrate third-party plugins available in the Unity Asset Store for text shaping purposes in combination with the <see cref="LanguageDirection"/> property.
+        /// </remarks>
+        void ITextElementExperimentalFeatures.SetRenderedText(string renderedText)
+        {
+            this.renderedText = renderedText;
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/TextElementSelection.cs b/ModuleOverrides/com.unity.ui/Core/TextElementSelection.cs
index 6dddc69112..b94868c742 100644
--- a/ModuleOverrides/com.unity.ui/Core/TextElementSelection.cs
+++ b/ModuleOverrides/com.unity.ui/Core/TextElementSelection.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -93,9 +94,22 @@ public interface ITextSelection
     // Text editing and selection management implementation
     public partial class TextElement : ITextSelection
     {
+        internal static readonly DataBindingProperty isSelectableProperty = nameof(isSelectable);
+        internal static readonly DataBindingProperty cursorIndexProperty = nameof(cursorIndex);
+        internal static readonly DataBindingProperty selectIndexProperty = nameof(selectIndex);
+        internal static readonly DataBindingProperty doubleClickSelectsWordProperty = nameof(doubleClickSelectsWord);
+        internal static readonly DataBindingProperty tripleClickSelectsLineProperty = nameof(tripleClickSelectsLine);
+        internal static readonly DataBindingProperty cursorPositionProperty = nameof(cursorPosition);
+        internal static readonly DataBindingProperty selectionColorProperty = nameof(selectionColor);
+        internal static readonly DataBindingProperty cursorColorProperty = nameof(cursorColor);
+        internal static readonly DataBindingProperty selectAllOnFocusProperty = nameof(selectAllOnFocus);
+        internal static readonly DataBindingProperty selectAllOnMouseUpProperty = nameof(selectAllOnMouseUp);
+        internal static readonly DataBindingProperty selectionProperty = nameof(selection);
+
         /// <summary>
         /// Retrieves this TextElement's ITextSelection
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public ITextSelection selection => this;
 
         TextSelectingManipulator m_SelectingManipulator;
@@ -109,32 +123,63 @@ bool ITextSelection.isSelectable
             get => m_IsSelectable && focusable;
             set
             {
+                if (value == m_IsSelectable)
+                    return;
+
                 focusable = value;
                 m_IsSelectable = value;
+                NotifyPropertyChanged(isSelectableProperty);
             }
         }
 
+        [CreateProperty]
+        private bool isSelectable
+        {
+            get => selection.isSelectable;
+            set => selection.isSelectable = value;
+        }
+
         int ITextSelection.cursorIndex
         {
             get => selection.isSelectable ? selectingManipulator.cursorIndex : -1;
             set
             {
+                var current = selection.cursorIndex;
                 if (selection.isSelectable)
                     selectingManipulator.cursorIndex = value;
+
+                if (current != selection.cursorIndex)
+                    NotifyPropertyChanged(cursorIndexProperty);
             }
         }
 
+        [CreateProperty]
+        private int cursorIndex
+        {
+            get => selection.cursorIndex;
+            set => selection.cursorIndex = value;
+        }
 
         int ITextSelection.selectIndex
         {
             get => selection.isSelectable ? selectingManipulator.selectIndex : -1;
             set
             {
+                var current = selection.selectIndex;
                 if (selection.isSelectable)
                     selectingManipulator.selectIndex = value;
+                if (current != selection.selectIndex)
+                    NotifyPropertyChanged(selectIndexProperty);
             }
         }
 
+        [CreateProperty]
+        private int selectIndex
+        {
+            get => selection.selectIndex;
+            set => selection.selectIndex = value;
+        }
+
         void ITextSelection.SelectAll()
         {
             if (selection.isSelectable)
@@ -161,23 +206,116 @@ bool ITextSelection.HasSelection()
             return selection.isSelectable && selectingManipulator.HasSelection();
         }
 
-        bool ITextSelection.doubleClickSelectsWord { get; set; } = true;
+        private bool m_DoubleClickSelectsWord = true;
+
+        bool ITextSelection.doubleClickSelectsWord
+        {
+            get => m_DoubleClickSelectsWord;
+            set
+            {
+                if (m_DoubleClickSelectsWord == value)
+                    return;
+                m_DoubleClickSelectsWord = value;
+                NotifyPropertyChanged(doubleClickSelectsWordProperty);
+            }
+        }
+
+        [CreateProperty]
+        private bool doubleClickSelectsWord
+        {
+            get => selection.doubleClickSelectsWord;
+            set => selection.doubleClickSelectsWord = value;
+        }
+
+        private bool m_TripleClickSelectsLine = true;
+
+        bool ITextSelection.tripleClickSelectsLine
+        {
+            get => m_TripleClickSelectsLine;
+            set
+            {
+                if (m_TripleClickSelectsLine == value)
+                    return;
+                m_TripleClickSelectsLine = value;
+                NotifyPropertyChanged(tripleClickSelectsLineProperty);
+            }
+        }
+
+        [CreateProperty]
+        private bool tripleClickSelectsLine
+        {
+            get => selection.tripleClickSelectsLine;
+            set => selection.tripleClickSelectsLine = value;
+        }
 
-        bool ITextSelection.tripleClickSelectsLine { get; set; } = true;
+        private bool m_SelectAllOnFocus = false;
 
         /// <summary>
         /// Controls whether the element's content is selected upon receiving focus.
         /// </summary>
-        bool ITextSelection.selectAllOnFocus { get; set; } = false;
+        bool ITextSelection.selectAllOnFocus
+        {
+            get => m_SelectAllOnFocus;
+            set
+            {
+                if (m_SelectAllOnFocus == value)
+                    return;
+                m_SelectAllOnFocus = value;
+                NotifyPropertyChanged(selectAllOnFocusProperty);
+            }
+        }
+
+        [CreateProperty]
+        private bool selectAllOnFocus
+        {
+            get => selection.selectAllOnFocus;
+            set => selection.selectAllOnFocus = value;
+        }
+
+        private bool m_SelectAllOnMouseUp = false;
 
         /// <summary>
         /// Controls whether the element's content is selected when you mouse up for the first time.
         /// </summary>
-        bool ITextSelection.selectAllOnMouseUp { get; set; } = false;
+        bool ITextSelection.selectAllOnMouseUp
+        {
+            get => m_SelectAllOnMouseUp;
+            set
+            {
+                if (m_SelectAllOnMouseUp == value)
+                    return;
+                m_SelectAllOnMouseUp = value;
+                NotifyPropertyChanged(selectAllOnMouseUpProperty);
+            }
+        }
 
-        Vector2 ITextSelection.cursorPosition => uitkTextHandle.GetCursorPositionFromStringIndexUsingLineHeight(selection.cursorIndex) + contentRect.min;
+        [CreateProperty]
+        private bool selectAllOnMouseUp
+        {
+            get => selection.selectAllOnMouseUp;
+            set => selection.selectAllOnMouseUp = value;
+        }
 
-        float ITextSelection.lineHeightAtCursorPosition => uitkTextHandle.GetLineHeightFromCharacterIndex(selection.cursorIndex);
+        Vector2 ITextSelection.cursorPosition
+        {
+            get
+            {
+                uitkTextHandle.AddTextInfoToCache();
+                return uitkTextHandle.GetCursorPositionFromStringIndexUsingLineHeight(selection.cursorIndex) + contentRect.min;
+            }
+        }
+
+        [CreateProperty(ReadOnly = true)]
+        private Vector2 cursorPosition => selection.cursorPosition;
+
+        float ITextSelection.lineHeightAtCursorPosition
+        {
+            get
+            {
+                uitkTextHandle.AddTextInfoToCache();
+                return uitkTextHandle.GetLineHeightFromCharacterIndex(selection.cursorIndex);
+            }
+        }
 
         void ITextSelection.MoveTextEnd()
         {
@@ -185,12 +323,61 @@ void ITextSelection.MoveTextEnd()
                 selectingManipulator.m_SelectingUtilities.MoveTextEnd();
         }
 
-        Color ITextSelection.selectionColor { get; set; } = new Color(0.239f, 0.502f, 0.875f, 0.65f);
+        private Color m_SelectionColor = new Color(0.239f, 0.502f, 0.875f, 0.65f);
+
+        Color ITextSelection.selectionColor
+        {
+            get => m_SelectionColor;
+            set
+            {
+                if (m_SelectionColor == value)
+                    return;
+                m_SelectionColor = value;
+                NotifyPropertyChanged(selectionColorProperty);
+                MarkDirtyRepaint();
+            }
+        }
+
+        [CreateProperty]
+        private Color selectionColor
+        {
+            get => selection.selectionColor;
+            set => selection.selectionColor = value;
+        }
+
+        private Color m_CursorColor = new Color(0.706f, 0.706f, 0.706f, 1.0f);
+        Color ITextSelection.cursorColor {
+            get => m_CursorColor;
+            set
+            {
+                if (m_CursorColor == value)
+                    return;
+                m_CursorColor = value;
+                NotifyPropertyChanged(cursorColorProperty);
+                MarkDirtyRepaint();
+            }
+        }
 
+        [CreateProperty]
+        private Color cursorColor
+        {
+            get => selection.cursorColor;
+            set => selection.cursorColor = value;
+        }
 
-        Color ITextSelection.cursorColor { get; set; } = new Color(0.706f, 0.706f, 0.706f, 1.0f);
+        private float m_CursorWidth = 1.0f;
 
-        float ITextSelection.cursorWidth { get; set; } = 1.0f;
+        float ITextSelection.cursorWidth
+        {
+            get => m_CursorWidth;
+            set
+            {
+                if (Mathf.Approximately(m_CursorWidth, value))
+                    return;
+                m_CursorWidth = value;
+                MarkDirtyRepaint();
+            }
+        }
 
         // Always return a valid selecting manipulator and rely on isSelectable to use it/not
         internal TextSelectingManipulator selectingManipulator =>
@@ -246,7 +433,7 @@ private void DrawHighlighting(MeshGenerationContext mgc)
                 {
                     if (lineIndex == firstLineIndex)
                     {
-                        lastCharacterOnLine = uitkTextHandle.textInfo.lineInfo[lineIndex].lastCharacterIndex;
+                        lastCharacterOnLine = GetLastCharacterAt(lineIndex);
                         endPos = uitkTextHandle.GetCursorPositionFromStringIndexUsingLineHeight(lastCharacterOnLine, true);
                     }
                     else if (lineIndex == lastLineIndex)
@@ -263,7 +450,7 @@ private void DrawHighlighting(MeshGenerationContext mgc)
                             uitkTextHandle.textInfo.lineInfo[lineIndex].firstCharacterIndex;
                         startPos = uitkTextHandle.GetCursorPositionFromStringIndexUsingLineHeight(firstCharacterOnLine);
 
-                        lastCharacterOnLine = uitkTextHandle.textInfo.lineInfo[lineIndex].lastCharacterIndex;
+                        lastCharacterOnLine = GetLastCharacterAt(lineIndex);
                         endPos = uitkTextHandle.GetCursorPositionFromStringIndexUsingLineHeight(lastCharacterOnLine, true);
                     }
 
@@ -297,5 +484,29 @@ internal void DrawCaret(MeshGenerationContext mgc)
                 playmodeTintColor = playmodeTintColor
             });
         }
+
+        int GetLastCharacterAt(int lineIndex)
+        {
+            var lastCharacterIndex = uitkTextHandle.textInfo.lineInfo[lineIndex].lastCharacterIndex;
+            var firstCharacterIndex = uitkTextHandle.textInfo.lineInfo[lineIndex].firstCharacterIndex;
+            var lastCharacter = uitkTextHandle.textInfo.textElementInfo[lastCharacterIndex];
+
+            // Select the last character that is not a \n or a \r
+            while (lastCharacter.character == '\n' || lastCharacter.character == '\r')
+            {
+                // Make sure it doesn't go out of range and remains on the same line
+                if (lastCharacterIndex > firstCharacterIndex)
+                {
+                    lastCharacterIndex--;
+                    lastCharacter = uitkTextHandle.textInfo.textElementInfo[lastCharacterIndex];
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            return lastCharacterIndex;
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/UIElementsInitialization.cs b/ModuleOverrides/com.unity.ui/Core/UIElementsInitialization.cs
new file mode 100644
index 0000000000..c8d0151919
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/UIElementsInitialization.cs
@@ -0,0 +1,82 @@
+// 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.Properties;
+using UnityEngine.Scripting;
+
+namespace UnityEngine.UIElements
+{
+    static class UIElementsInitialization
+    {
+        [RequiredByNativeCode(optional:false)]
+        public static void InitializeUIElementsManaged()
+        {
+            RegisterBuiltInPropertyBags();
+        }
+
+        internal static void RegisterBuiltInPropertyBags()
+        {
+            PropertyBag.Register(new InlineStyleAccessPropertyBag());
+            PropertyBag.Register(new ResolvedStyleAccessPropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<Align>, Align>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<DisplayStyle>, DisplayStyle>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<EasingMode>, EasingMode>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<FlexDirection>, FlexDirection>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<FontStyle>, FontStyle>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<Justify>, Justify>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<Overflow>, Overflow>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<OverflowClipBox>, OverflowClipBox>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<OverflowInternal>, OverflowInternal>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<Position>, Position>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<ScaleMode>, ScaleMode>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<TextAnchor>, TextAnchor>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<TextOverflow>, TextOverflow>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<TextOverflowPosition>, TextOverflowPosition>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<TransformOriginOffset>, TransformOriginOffset>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<Visibility>, Visibility>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<WhiteSpace>, WhiteSpace>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleEnum<Wrap>, Wrap>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleBackground, Background>());
+            PropertyBag.Register(new Length.PropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleBackgroundPosition, BackgroundPosition>());
+            PropertyBag.Register(new BackgroundPosition.PropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleBackgroundRepeat, BackgroundRepeat>());
+            PropertyBag.Register(new BackgroundRepeat.PropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleBackgroundSize, BackgroundSize>());
+            PropertyBag.Register(new BackgroundSize.PropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleColor, Color>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleCursor, Cursor>());
+            PropertyBag.Register(new Cursor.PropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleFloat, float>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleFont, Font>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleFontDefinition, FontDefinition>());
+            PropertyBag.Register(new FontDefinition.PropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleInt, int>());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleLength, Length>());
+            PropertyBag.Register(new Background.PropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleList<EasingFunction>, List<EasingFunction>>());
+            PropertyBag.Register(new EasingFunction.PropertyBag());
+            PropertyBag.RegisterList<StyleList<EasingFunction>, EasingFunction>();
+            PropertyBag.Register(new StyleValuePropertyBag<StyleList<StylePropertyName>, List<StylePropertyName>>());
+            PropertyBag.Register(new StylePropertyName.PropertyBag());
+            PropertyBag.RegisterList<StyleList<StylePropertyName>, StylePropertyName>();
+            PropertyBag.Register(new StyleValuePropertyBag<StyleList<TimeValue>, List<TimeValue>>());
+            PropertyBag.Register(new TimeValue.PropertyBag());
+            PropertyBag.RegisterList<StyleList<TimeValue>, TimeValue>();
+            PropertyBag.Register(new StyleValuePropertyBag<StyleRotate, Rotate>());
+            PropertyBag.Register(new Rotate.PropertyBag());
+            PropertyBag.Register(new Angle.PropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleScale, Scale>());
+            PropertyBag.Register(new Scale.PropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleTransformOrigin, TransformOrigin>());
+            PropertyBag.Register(new TransformOrigin.PropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleTranslate, Translate>());
+            PropertyBag.Register(new Translate.PropertyBag());
+            PropertyBag.Register(new StyleValuePropertyBag<StyleTextShadow, TextShadow>());
+            PropertyBag.Register(new TextShadow.PropertyBag());
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/UIElementsRuntimeUtility.cs b/ModuleOverrides/com.unity.ui/Core/UIElementsRuntimeUtility.cs
index 8e11aee678..4729325b4f 100644
--- a/ModuleOverrides/com.unity.ui/Core/UIElementsRuntimeUtility.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UIElementsRuntimeUtility.cs
@@ -40,6 +40,7 @@ static UIElementsRuntimeUtility()
         {
             // We no longer need it
             UIElementsRuntimeUtilityNative.RepaintOverlayPanelsCallback = () => {};  //RepaintOverlayPanels;
+            UIElementsRuntimeUtilityNative.RepaintOffscreenPanelsCallback = RepaintOffscreenPanels;
 
             Canvas.externBeginRenderOverlays = BeginRenderOverlays;
             Canvas.externRenderOverlaysBefore = (displayIndex, sortOrder) => RenderOverlaysBeforePriority(displayIndex, sortOrder);
@@ -137,14 +138,22 @@ public static void RepaintOverlayPanels()
                 s_onRepaintOverlayPanels();
         }
 
+        public static void RepaintOffscreenPanels()
+        {
+            foreach (BaseRuntimePanel panel in GetSortedPlayerPanels())
+            {
+                if (panel.targetTexture != null)
+                {
+                    RepaintOverlayPanel(panel);
+                }
+            }
+        }
+
         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);
diff --git a/ModuleOverrides/com.unity.ui/Core/UIElementsUtility.cs b/ModuleOverrides/com.unity.ui/Core/UIElementsUtility.cs
index fcdefaf820..77f4fc6c1f 100644
--- a/ModuleOverrides/com.unity.ui/Core/UIElementsUtility.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UIElementsUtility.cs
@@ -526,11 +526,16 @@ internal static float PixelsPerUnitScaleForElement(VisualElement ve, Sprite spri
             return referencePixelsPerUnit / pixelsPerUnit;
         }
 
-        internal static int m_InMemoryAssetsVersion { get; private set; } = 0;
+        internal static int m_InMemoryAssetsHierarchyVersion { get; private set; } = 0;
+        internal static int m_InMemoryAssetsStyleVersion { get; private set; } = 0;
 
-        internal static void InMemoryAssetsHaveBeenChanged()
+        internal static void InMemoryAssetsHierarchyHaveBeenChanged()
         {
-            m_InMemoryAssetsVersion++;
+            m_InMemoryAssetsHierarchyVersion++;
+        }
+        internal static void InMemoryAssetsStyleHaveBeenChanged()
+        {
+            m_InMemoryAssetsStyleVersion++;
         }
 
     }
diff --git a/ModuleOverrides/com.unity.ui/Core/UQuery.cs b/ModuleOverrides/com.unity.ui/Core/UQuery.cs
index 71d922c471..8c9b6812fe 100644
--- a/ModuleOverrides/com.unity.ui/Core/UQuery.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UQuery.cs
@@ -30,6 +30,7 @@ public override string ToString()
 
     /// <summary>
     /// UQuery is a set of extension methods allowing you to select individual or collection of visualElements inside a complex hierarchy.
+    /// See UQuery [[wiki:UIE-UQuery|manual page]] for further information.
     /// </summary>
     public static class UQuery
     {
@@ -523,7 +524,7 @@ public struct UQueryBuilder<T> : IEquatable<UQueryBuilder<T>> where T : VisualEl
         /// <summary>
         /// Initializes a QueryBuilder.
         /// </summary>
-        /// <param name="visualElement">The root element on which to condfuct the search query.</param>
+        /// <param name="visualElement">The root element on which to conduct the search query.</param>
         public UQueryBuilder(VisualElement visualElement)
             : this()
         {
@@ -710,7 +711,7 @@ public UQueryBuilder<T> NotActive()
         }
 
         /// <summary>
-        /// Selects all elements that are not visible.
+        /// Selects all elements that are visible.
         /// </summary>
         public UQueryBuilder<T> Visible()
         {
@@ -750,7 +751,7 @@ public UQueryBuilder<T> Checked()
         }
 
         /// <summary>
-        /// Selects all elements that npot checked.
+        /// Selects all elements that not checked.
         /// </summary>
         public UQueryBuilder<T> NotChecked()
         {
@@ -792,7 +793,7 @@ public UQueryBuilder<T> NotEnabled()
         }
 
         /// <summary>
-        /// Selects all elements that are enabled.
+        /// Selects all elements that are focused.
         /// </summary>
         public UQueryBuilder<T> Focused()
         {
@@ -1037,7 +1038,7 @@ public static class UQueryExtensions
         /// </summary>
         /// <param name="e">Root VisualElement on which the selector will be applied.</param>
         /// <param name="name">If specified, will select elements with this name.</param>
-        /// <param name="classes">If specified, will select elements with the given class (not to be confused with Type).</param>
+        /// <param name="classes">If specified, will select elements with the given class (case sensitive, not to be confused with Type).</param>
         /// <returns>The first element matching all the criteria, or null if none was found.</returns>
         public static T Q<T>(this VisualElement e, string name = null, params string[] classes) where T : VisualElement
         {
@@ -1049,7 +1050,7 @@ public static T Q<T>(this VisualElement e, string name = null, params string[] c
         /// </summary>
         /// <param name="e">Root VisualElement on which the selector will be applied.</param>
         /// <param name="name">If specified, will select elements with this name.</param>
-        /// <param name="classes">If specified, will select elements with the given class (not to be confused with Type).</param>
+        /// <param name="classes">If specified, will select elements with the given class (case sensitive, not to be confused with Type).</param>
         /// <returns>The first element matching all the criteria, or null if none was found.</returns>
         public static VisualElement Q(this VisualElement e, string name = null, params string[] classes)
         {
@@ -1061,7 +1062,7 @@ public static VisualElement Q(this VisualElement e, string name = null, params s
         /// </summary>
         /// <param name="e">Root VisualElement on which the selector will be applied.</param>
         /// <param name="name">If specified, will select elements with this name.</param>
-        /// <param name="className">If specified, will select elements with the given class (not to be confused with Type).</param>
+        /// <param name="className">If specified, will select elements with the given class (case sensitive, not to be confused with Type).</param>
         /// <returns>The first element matching all the criteria, or null if none was found.</returns>
         public static T Q<T>(this VisualElement e, string name = null, string className = null) where T : VisualElement
         {
@@ -1116,7 +1117,7 @@ internal static T MandatoryQ<T>(this VisualElement e, string name, string classN
         /// </summary>
         /// <param name="e">Root VisualElement on which the selector will be applied.</param>
         /// <param name="name">If specified, will select elements with this name.</param>
-        /// <param name="className">If specified, will select elements with the given class (not to be confused with Type).</param>
+        /// <param name="className">If specified, will select elements with the given class (case sensitive, not to be confused with Type).</param>
         /// <returns>The first element matching all the criteria, or null if none was found.</returns>
         public static VisualElement Q(this VisualElement e, string name = null, string className = null)
         {
@@ -1163,7 +1164,7 @@ internal static VisualElement MandatoryQ(this VisualElement e, string name, stri
         /// </summary>
         /// <param name="e">Root VisualElement on which the selector will be applied.</param>
         /// <param name="name">If specified, will select elements with this name.</param>
-        /// <param name="classes">If specified, will select elements with the given class (not to be confused with Type).</param>
+        /// <param name="classes">If specified, will select elements with the given class (case sensitive, not to be confused with Type).</param>
         /// <returns>QueryBuilder configured with the associated selection rules.</returns>
         public static UQueryBuilder<VisualElement> Query(this VisualElement e, string name = null, params string[] classes)
         {
@@ -1175,7 +1176,7 @@ public static UQueryBuilder<VisualElement> Query(this VisualElement e, string na
         /// </summary>
         /// <param name="e">Root VisualElement on which the selector will be applied.</param>
         /// <param name="name">If specified, will select elements with this name.</param>
-        /// <param name="className">If specified, will select elements with the given class (not to be confused with Type).</param>
+        /// <param name="className">If specified, will select elements with the given class (case sensitive, not to be confused with Type).</param>
         /// <returns>QueryBuilder configured with the associated selection rules.</returns>
         public static UQueryBuilder<VisualElement> Query(this VisualElement e, string name = null, string className = null)
         {
@@ -1187,7 +1188,7 @@ public static UQueryBuilder<VisualElement> Query(this VisualElement e, string na
         /// </summary>
         /// <param name="e">Root VisualElement on which the selector will be applied.</param>
         /// <param name="name">If specified, will select elements with this name.</param>
-        /// <param name="classes">If specified, will select elements with the given class (not to be confused with Type).</param>
+        /// <param name="classes">If specified, will select elements with the given class (case sensitive, not to be confused with Type).</param>
         /// <returns>QueryBuilder configured with the associated selection rules.</returns>
         public static UQueryBuilder<T> Query<T>(this VisualElement e, string name = null, params string[] classes) where T : VisualElement
         {
@@ -1203,7 +1204,7 @@ public static UQueryBuilder<T> Query<T>(this VisualElement e, string name = null
         /// </summary>
         /// <param name="e">Root VisualElement on which the selector will be applied.</param>
         /// <param name="name">If specified, will select elements with this name.</param>
-        /// <param name="className">If specified, will select elements with the given class (not to be confused with Type).</param>
+        /// <param name="className">If specified, will select elements with the given class (case sensitive, not to be confused with Type).</param>
         /// <returns>QueryBuilder configured with the associated selection rules.</returns>
         public static UQueryBuilder<T> Query<T>(this VisualElement e, string name = null, string className = null) where T : VisualElement
         {
diff --git a/ModuleOverrides/com.unity.ui/Core/UXML/UxmlAssetAttributeDescription.cs b/ModuleOverrides/com.unity.ui/Core/UXML/UxmlAssetAttributeDescription.cs
index 45909c6141..8d5e41a04f 100644
--- a/ModuleOverrides/com.unity.ui/Core/UXML/UxmlAssetAttributeDescription.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UXML/UxmlAssetAttributeDescription.cs
@@ -7,7 +7,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// Describes a XML <c>Object</c> attribute referencing an asset in the project. In uxml, this is referenced as a string URI.
+    /// Describes a UXML <c>Object</c> attribute referencing an asset in the project. In UXML, this is referenced as a string URI.
     /// </summary>
     public class UxmlAssetAttributeDescription<T> : TypedUxmlAttributeDescription<T>, IUxmlAssetAttributeDescription where T : Object
     {
@@ -41,12 +41,12 @@ public override T GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
         }
 
         /// <summary>
-        /// Tries to retrieve the value of this attribute from the attribute bag. Returns true if it is found, otherwise returns false.
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
         /// <param name="value">The value of the attribute.</param>
-        /// <returns>True if the value could be retrieved, false otherwise.</returns>
+        /// <returns>True if the value is found, false otherwise.</returns>
         public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, out T value)
         {
             if (TryGetValueFromBagAsString(bag, cc, out var path, out var sourceAsset) && sourceAsset != null)
diff --git a/ModuleOverrides/com.unity.ui/Core/UXML/UxmlAttributeDescription.cs b/ModuleOverrides/com.unity.ui/Core/UXML/UxmlAttributeDescription.cs
index 9c3c439281..23372332c6 100644
--- a/ModuleOverrides/com.unity.ui/Core/UXML/UxmlAttributeDescription.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UXML/UxmlAttributeDescription.cs
@@ -206,7 +206,7 @@ internal bool TryGetValueFromBagAsString(IUxmlAttributes bag, CreationContext cc
         /// <param name="converterFunc">A function to convert a string value to type T.</param>
         /// <param name="defaultValue">The value to return if the attribute is not found in the bag.</param>
         /// <param name="value">If the attribute could be retrieved, the retrieved value converted by the conversion function or the default value if the retrieved value could not de converted.</param>
-        /// <returns>True if the value could be retrieved, false otherwise.</returns>
+        /// <returns>True if the value is found, false otherwise.</returns>
         protected bool TryGetValueFromBag<T>(IUxmlAttributes bag, CreationContext cc, Func<string, T, T> converterFunc, T defaultValue, ref T value)
         {
             string stringValue;
@@ -256,7 +256,7 @@ protected T GetValueFromBag<T>(IUxmlAttributes bag, CreationContext cc, Func<str
     }
 
     /// <summary>
-    /// Base class for all the uxml specific attributes.
+    /// Base class for all the UXML specific attributes.
     /// </summary>
     public abstract class TypedUxmlAttributeDescription<T> : UxmlAttributeDescription
     {
@@ -274,13 +274,13 @@ public abstract class TypedUxmlAttributeDescription<T> : UxmlAttributeDescriptio
         public T defaultValue { get; set; }
 
         /// <summary>
-        /// The string representation of the default value of the uxml attribute.
+        /// The string representation of the default value of the UXML attribute.
         /// </summary>
         public override string defaultValueAsString { get { return defaultValue.ToString(); } }
     }
 
     /// <summary>
-    /// Describes a XML <c>string</c> attribute.
+    /// Describes a UXML <c>string</c> attribute.
     /// </summary>
     public class UxmlStringAttributeDescription : TypedUxmlAttributeDescription<string>
     {
@@ -300,7 +300,7 @@ public UxmlStringAttributeDescription()
         public override string defaultValueAsString { get { return defaultValue; } }
 
         /// <summary>
-        /// Retrieves the value of this attribute from the attribute bag. Returns it if it is found, otherwise return <see cref="defaultValue"/>.
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
@@ -311,12 +311,12 @@ public override string GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
         }
 
         /// <summary>
-        /// Tries to retrieve the value of this attribute from the attribute bag. Returns true if it is found, otherwise returns false.
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
         /// <param name="value">The value of the attribute.</param>
-        /// <returns>True if the value could be retrieved, false otherwise.</returns>
+        /// <returns>True if the value is found, false otherwise.</returns>
         public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref string value)
         {
             return TryGetValueFromBag(bag, cc, (s, t) => s , defaultValue, ref value);
@@ -324,7 +324,7 @@ public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref stri
     }
 
     /// <summary>
-    /// Describes a XML <c>float</c> attribute.
+    /// Describes a UXML <c>float</c> attribute.
     /// </summary>
     public class UxmlFloatAttributeDescription : TypedUxmlAttributeDescription<float>
     {
@@ -344,7 +344,7 @@ public UxmlFloatAttributeDescription()
         public override string defaultValueAsString { get { return defaultValue.ToString(CultureInfo.InvariantCulture.NumberFormat); } }
 
         /// <summary>
-        /// Retrieves the value of this attribute from the attribute bag. Returns it if it is found, otherwise return <see cref="defaultValue"/>.
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
@@ -355,12 +355,12 @@ public override float GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
         }
 
         /// <summary>
-        /// Tries to retrieve the value of this attribute from the attribute bag. Returns true if it is found, otherwise returns false.
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
         /// <param name="value">The value of the attribute.</param>
-        /// <returns>True if the value could be retrieved, false otherwise.</returns>
+        /// <returns>True if the value is found, false otherwise.</returns>
         public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref float value)
         {
             return TryGetValueFromBag(bag, cc, (s, f) => ConvertValueToFloat(s, f), defaultValue, ref value);
@@ -369,14 +369,14 @@ public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref floa
         static float ConvertValueToFloat(string v, float defaultValue)
         {
             float l;
-            if (v == null || !Single.TryParse(v, NumberStyles.Float, CultureInfo.InvariantCulture, out l))
+            if (v == null || !float.TryParse(v, NumberStyles.Float, CultureInfo.InvariantCulture, out l))
                 return defaultValue;
             return l;
         }
     }
 
     /// <summary>
-    /// Describes a XML <c>double</c> attribute.
+    /// Describes a UXML <c>double</c> attribute.
     /// </summary>
     public class UxmlDoubleAttributeDescription : TypedUxmlAttributeDescription<double>
     {
@@ -396,7 +396,7 @@ public UxmlDoubleAttributeDescription()
         public override string defaultValueAsString { get { return defaultValue.ToString(CultureInfo.InvariantCulture.NumberFormat); } }
 
         /// <summary>
-        /// Retrieves the value of this attribute from the attribute bag. Returns it if it is found, otherwise return <see cref="defaultValue"/>.
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
@@ -407,12 +407,12 @@ public override double GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
         }
 
         /// <summary>
-        /// Tries to retrieve the value of this attribute from the attribute bag. Returns true if it is found, otherwise returns false.
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
         /// <param name="value">The value of the attribute.</param>
-        /// <returns>True if the value could be retrieved, false otherwise.</returns>
+        /// <returns>True if the value is found, false otherwise.</returns>
         public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref double value)
         {
             return TryGetValueFromBag(bag, cc, (s, d) => ConvertValueToDouble(s, d), defaultValue, ref value);
@@ -421,14 +421,14 @@ public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref doub
         static double ConvertValueToDouble(string v, double defaultValue)
         {
             double l;
-            if (v == null || !Double.TryParse(v, NumberStyles.Float, CultureInfo.InvariantCulture, out l))
+            if (v == null || !double.TryParse(v, NumberStyles.Float, CultureInfo.InvariantCulture, out l))
                 return defaultValue;
             return l;
         }
     }
 
     /// <summary>
-    /// Describes a XML <c>int</c> attribute.
+    /// Describes a UXML <c>int</c> attribute.
     /// </summary>
     public class UxmlIntAttributeDescription : TypedUxmlAttributeDescription<int>
     {
@@ -448,7 +448,7 @@ public UxmlIntAttributeDescription()
         public override string defaultValueAsString { get { return defaultValue.ToString(CultureInfo.InvariantCulture.NumberFormat); } }
 
         /// <summary>
-        /// Retrieves the value of this attribute from the attribute bag. Returns it if it is found, otherwise return <see cref="defaultValue"/>.
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
@@ -459,12 +459,12 @@ public override int GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
         }
 
         /// <summary>
-        /// Tries to retrieve the value of this attribute from the attribute bag. Returns true if it is found, otherwise returns false.
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
         /// <param name="value">The value of the attribute.</param>
-        /// <returns>True if the value could be retrieved, false otherwise.</returns>
+        /// <returns>True if the value is found, false otherwise.</returns>
         public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref int value)
         {
             return TryGetValueFromBag(bag, cc, (s, i) => ConvertValueToInt(s, i), defaultValue, ref value);
@@ -473,7 +473,7 @@ public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref int
         static int ConvertValueToInt(string v, int defaultValue)
         {
             int l;
-            if (v == null || !Int32.TryParse(v, out l))
+            if (v == null || !int.TryParse(v, out l))
                 return defaultValue;
 
             return l;
@@ -481,7 +481,111 @@ static int ConvertValueToInt(string v, int defaultValue)
     }
 
     /// <summary>
-    /// Describes a XML <c>long</c> attribute.
+    /// Describes a UXML <c>uint</c> attribute.
+    /// </summary>
+    public class UxmlUnsignedIntAttributeDescription : TypedUxmlAttributeDescription<uint>
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public UxmlUnsignedIntAttributeDescription()
+        {
+            type = "unsignedInt";
+            typeNamespace = xmlSchemaNamespace;
+            defaultValue = 0;
+        }
+
+        /// <summary>
+        /// The default value for the attribute, as a string.
+        /// </summary>
+        public override string defaultValueAsString { get { return defaultValue.ToString(CultureInfo.InvariantCulture.NumberFormat); } }
+
+        /// <summary>
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
+        /// </summary>
+        /// <param name="bag">The bag of attributes.</param>
+        /// <param name="cc">The context in which the values are retrieved.</param>
+        /// <returns>The value of the attribute.</returns>
+        public override uint GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
+        {
+            return GetValueFromBag(bag, cc, (s, i) => ConvertValueToUInt(s, i), defaultValue);
+        }
+
+        /// <summary>
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
+        /// </summary>
+        /// <param name="bag">The bag of attributes.</param>
+        /// <param name="cc">The context in which the values are retrieved.</param>
+        /// <param name="value">The value of the attribute.</param>
+        /// <returns>True if the value is found, false otherwise.</returns>
+        public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref uint value)
+        {
+            return TryGetValueFromBag(bag, cc, (s, i) => ConvertValueToUInt(s, i), defaultValue, ref value);
+        }
+
+        static uint ConvertValueToUInt(string v, uint defaultValue)
+        {
+            if (v == null || !uint.TryParse(v, out var l))
+                return defaultValue;
+
+            return l;
+        }
+    }
+
+    /// <summary>
+    /// Describes a UXML <c>ulong</c> attribute.
+    /// </summary>
+    public class UxmlUnsignedLongAttributeDescription : TypedUxmlAttributeDescription<ulong>
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public UxmlUnsignedLongAttributeDescription()
+        {
+            type = "unsignedLong";
+            typeNamespace = xmlSchemaNamespace;
+            defaultValue = 0;
+        }
+
+        /// <summary>
+        /// The default value for the attribute, as a string.
+        /// </summary>
+        public override string defaultValueAsString { get { return defaultValue.ToString(CultureInfo.InvariantCulture.NumberFormat); } }
+
+        /// <summary>
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
+        /// </summary>
+        /// <param name="bag">The bag of attributes.</param>
+        /// <param name="cc">The context in which the values are retrieved.</param>
+        /// <returns>The value of the attribute.</returns>
+        public override ulong GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
+        {
+            return GetValueFromBag(bag, cc, (s, l) => ConvertValueToUlong(s, l), defaultValue);
+        }
+
+        /// <summary>
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
+        /// </summary>
+        /// <param name="bag">The bag of attributes.</param>
+        /// <param name="cc">The context in which the values are retrieved.</param>
+        /// <param name="value">The value of the attribute.</param>
+        /// <returns>True if the value is found, false otherwise.</returns>
+        public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref ulong value)
+        {
+            return TryGetValueFromBag(bag, cc, (s, l) => ConvertValueToUlong(s, l), defaultValue, ref value);
+        }
+
+        static ulong ConvertValueToUlong(string v, ulong defaultValue)
+        {
+            ulong l;
+            if (v == null || !ulong.TryParse(v, out l))
+                return defaultValue;
+            return l;
+        }
+    }
+
+    /// <summary>
+    /// Describes a UXML <c>long</c> attribute.
     /// </summary>
     public class UxmlLongAttributeDescription : TypedUxmlAttributeDescription<long>
     {
@@ -501,7 +605,7 @@ public UxmlLongAttributeDescription()
         public override string defaultValueAsString { get { return defaultValue.ToString(CultureInfo.InvariantCulture.NumberFormat); } }
 
         /// <summary>
-        /// Retrieves the value of this attribute from the attribute bag. Returns it if it is found, otherwise return <see cref="defaultValue"/>.
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
@@ -512,12 +616,12 @@ public override long GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
         }
 
         /// <summary>
-        /// Tries to retrieve the value of this attribute from the attribute bag. Returns true if it is found, otherwise returns false.
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
         /// <param name="value">The value of the attribute.</param>
-        /// <returns>True if the value could be retrieved, false otherwise.</returns>
+        /// <returns>True if the value is found, false otherwise.</returns>
         public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref long value)
         {
             return TryGetValueFromBag(bag, cc, (s, l) => ConvertValueToLong(s, l), defaultValue, ref value);
@@ -533,7 +637,7 @@ static long ConvertValueToLong(string v, long defaultValue)
     }
 
     /// <summary>
-    /// Describes a XML <c>bool</c> attribute.
+    /// Describes a UXML <c>bool</c> attribute.
     /// </summary>
     public class UxmlBoolAttributeDescription : TypedUxmlAttributeDescription<bool>
     {
@@ -553,7 +657,7 @@ public UxmlBoolAttributeDescription()
         public override string defaultValueAsString { get { return defaultValue.ToString().ToLower(); } }
 
         /// <summary>
-        /// Retrieves the value of this attribute from the attribute bag. Returns it if it is found, otherwise return <see cref="defaultValue"/>.
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
@@ -564,12 +668,12 @@ public override bool GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
         }
 
         /// <summary>
-        /// Tries to retrieve the value of this attribute from the attribute bag. Returns true if it is found, otherwise returns false.
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
         /// <param name="value">The value of the attribute.</param>
-        /// <returns>True if the value could be retrieved, false otherwise.</returns>
+        /// <returns>True if the value is found, false otherwise.</returns>
         public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref bool value)
         {
             return TryGetValueFromBag(bag, cc, (s, b) => ConvertValueToBool(s, b), defaultValue, ref value);
@@ -586,7 +690,7 @@ static bool ConvertValueToBool(string v, bool defaultValue)
     }
 
     /// <summary>
-    /// Describes a XML attribute representing a <see cref="Color"/> as a <c>string</c>.
+    /// Describes a UXML attribute representing a <see cref="Color"/> as a <c>string</c>.
     /// </summary>
     public class UxmlColorAttributeDescription : TypedUxmlAttributeDescription<Color>
     {
@@ -606,7 +710,7 @@ public UxmlColorAttributeDescription()
         public override string defaultValueAsString { get { return defaultValue.ToString(); } }
 
         /// <summary>
-        /// Retrieves the value of this attribute from the attribute bag. Returns it if it is found, otherwise return <see cref="defaultValue"/>.
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
@@ -617,12 +721,12 @@ public override Color GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
         }
 
         /// <summary>
-        /// Tries to retrieve the value of this attribute from the attribute bag. Returns true if it is found, otherwise returns false.
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
         /// <param name="value">The value of the attribute.</param>
-        /// <returns>True if the value could be retrieved, false otherwise.</returns>
+        /// <returns>True if the value is found, false otherwise.</returns>
         public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref Color value)
         {
             return TryGetValueFromBag(bag, cc, (s, color) => ConvertValueToColor(s, color), defaultValue, ref value);
@@ -707,7 +811,7 @@ Type ConvertValueToType(string v, Type defaultValue)
     }
 
     /// <summary>
-    /// Describes a XML attribute representing an <c>enum</c> as a <c>string</c>.
+    /// Describes a UXML attribute representing an <c>enum</c> as a <c>string</c>.
     /// </summary>
     public class UxmlEnumAttributeDescription<T> : TypedUxmlAttributeDescription<T> where T : struct, IConvertible
     {
@@ -743,7 +847,7 @@ public UxmlEnumAttributeDescription()
         public override string defaultValueAsString { get { return defaultValue.ToString(CultureInfo.InvariantCulture.NumberFormat); } }
 
         /// <summary>
-        /// Retrieves the value of this attribute from the attribute bag. Returns it if it is found, otherwise return <see cref="defaultValue"/>.
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
@@ -754,12 +858,12 @@ public override T GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
         }
 
         /// <summary>
-        /// Tries to retrieve the value of this attribute from the attribute bag. Returns true if it is found, otherwise returns false.
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
         /// <param name="value">The value of the attribute.</param>
-        /// <returns>True if the value could be retrieved, false otherwise.</returns>
+        /// <returns>True if the value is found, false otherwise.</returns>
         public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref T value)
         {
             return TryGetValueFromBag(bag, cc, (s, convertible) => ConvertValueToEnum(s, convertible), defaultValue, ref value);
@@ -798,7 +902,7 @@ static string GetEnumRangeErrorMessage(string v, Type enumType)
     }
 
     /// <summary>
-    /// Describes a XML <c>Hash128</c> attribute.
+    /// Describes a UXML <c>Hash128</c> attribute.
     /// </summary>
     public class UxmlHash128AttributeDescription : TypedUxmlAttributeDescription<Hash128>
     {
@@ -818,7 +922,7 @@ public UxmlHash128AttributeDescription()
         public override string defaultValueAsString { get { return defaultValue.ToString(); } }
 
         /// <summary>
-        /// Retrieves the value of this attribute from the attribute bag. Returns it if it is found, otherwise return <see cref="defaultValue"/>.
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
@@ -829,12 +933,12 @@ public override Hash128 GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
         }
 
         /// <summary>
-        /// Tries to retrieve the value of this attribute from the attribute bag. Returns true if it is found, otherwise returns false.
+        /// Attempts to retrieve the value of this attribute from the attribute bag and returns true if found, otherwise false.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
         /// <param name="value">The value of the attribute.</param>
-        /// <returns>True if the value could be retrieved, false otherwise.</returns>
+        /// <returns>True if the value is found, false otherwise.</returns>
         public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref Hash128 value)
         {
             return TryGetValueFromBag(bag, cc, (s, i) => i = Hash128.Parse(s), defaultValue, ref value);
@@ -854,7 +958,7 @@ public bool TryGetValueFromBag(IUxmlAttributes bag, CreationContext cc, ref Hash
         public T defaultValue { get; set; }
 
         /// <summary>
-        /// Retrieves the value of this attribute from the attribute bag. Returns it if it is found, otherwise return <see cref="defaultValue"/>.
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
@@ -875,14 +979,14 @@ public virtual T GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
     }
 
     /// <summary>
-    /// Describes a list of UXML objects defined as children in Uxml. Each UXML object then has a set of attributes.
+    /// Describes a list of UXML objects defined as children in UXML. Each UXML object then has a set of attributes.
     /// </summary>
     /// <typeparam name="T">Type of the created UXML objects.</typeparam>
     /// <remarks>UXML objects are defined using <see cref="UxmlObjectFactory{TCreatedType,TTraits}"/> and <see cref="UxmlObjectTraits{T}"/> on a simple class or structure.</remarks>
     internal class UxmlObjectListAttributeDescription<T> : UxmlObjectAttributeDescription<List<T>> where T : new()
     {
         /// <summary>
-        /// Retrieves the value of this attribute from the attribute bag. Returns it if it is found, otherwise return <see cref="defaultValue"/>.
+        /// Retrieves the value of this attribute from the attribute bag. Returns the value if found; otherwise, it returns <see cref="defaultValue"/>.
         /// </summary>
         /// <param name="bag">The bag of attributes.</param>
         /// <param name="cc">The context in which the values are retrieved.</param>
diff --git a/ModuleOverrides/com.unity.ui/Core/UXML/UxmlUtility.cs b/ModuleOverrides/com.unity.ui/Core/UXML/UxmlUtility.cs
new file mode 100644
index 0000000000..5446afd336
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/UXML/UxmlUtility.cs
@@ -0,0 +1,33 @@
+// 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 UnityEngine.UIElements
+{
+    internal static class UxmlUtility
+    {
+        internal static List<string> ParseStringListAttribute(string itemList)
+        {
+            if (string.IsNullOrEmpty(itemList.Trim()))
+                return null;
+
+            // Here the choices is comma separated in the string...
+            var items = itemList.Split(',');
+
+            if (items.Length != 0)
+            {
+                var result = new List<string>();
+                foreach (var item in items)
+                {
+                    result.Add(item.Trim());
+                }
+
+                return result;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementFactoryRegistry.cs b/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementFactoryRegistry.cs
index 99d4cd8966..9eb533dba6 100644
--- a/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementFactoryRegistry.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementFactoryRegistry.cs
@@ -132,6 +132,8 @@ static void RegisterEngineFactories()
                 new Hash128Field.UxmlFactory(),
                 new IntegerField.UxmlFactory(),
                 new LongField.UxmlFactory(),
+                new UnsignedIntegerField.UxmlFactory(),
+                new UnsignedLongField.UxmlFactory(),
                 new RectField.UxmlFactory(),
                 new Vector2Field.UxmlFactory(),
                 new RectIntField.UxmlFactory(),
diff --git a/ModuleOverrides/com.unity.ui/Core/UXML/VisualTreeAsset.cs b/ModuleOverrides/com.unity.ui/Core/UXML/VisualTreeAsset.cs
index c5736f8682..c967c3118b 100644
--- a/ModuleOverrides/com.unity.ui/Core/UXML/VisualTreeAsset.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UXML/VisualTreeAsset.cs
@@ -9,7 +9,7 @@
 namespace UnityEngine.UIElements
 {
     /// <summary>
-    /// An instance of this class holds a tree of `VisualElementAsset`s, created from a UXML file. Each node in the file corresponds to a `VisualElementAsset`. You can clone a `VisualTreeAsset` to yield a tree of `VisualElement`s.
+    /// An instance of this class holds a tree of `VisualElementAsset`s, created from a UXML file. Each node in the file corresponds to a `VisualElementAsset`. You can clone a `VisualTreeAsset` to create a tree of `VisualElement`s.
     /// </summary>
     [Serializable]
     public class VisualTreeAsset : ScriptableObject
@@ -375,7 +375,7 @@ internal UxmlObjectEntry GetUxmlObjectEntry(int id)
             return default;
         }
 
-        IBaseUxmlObjectFactory GetUxmlObjectFactory(UxmlObjectAsset uxmlObjectAsset)
+        internal IBaseUxmlObjectFactory GetUxmlObjectFactory(UxmlObjectAsset uxmlObjectAsset)
         {
             if (!UxmlObjectFactoryRegistry.factories.TryGetValue(uxmlObjectAsset.fullTypeName, out var factories))
             {
@@ -456,7 +456,7 @@ public TemplateContainer Instantiate(string bindingPath)
         /// Build a tree of VisualElements from the asset.
         /// </summary>
         /// <remarks>
-        /// This function will be deprecated. Use <see cref="VisualElement.Instantiate"/> instead.
+        /// This function will be deprecated. Use <see cref="VisualTreeAsset.Instantiate"/> instead.
         /// </remarks>
         /// <returns>The root of the tree of VisualElements that was just cloned.</returns>
         public TemplateContainer CloneTree()
@@ -470,7 +470,7 @@ public TemplateContainer CloneTree()
         /// </summary>
         /// <param name="bindingPath">The path to the property that you want to bind to the root of the cloned tree.</param>
         /// <remarks>
-        /// This function will be deprecated. Use <see cref="VisualElement.Instantiate"/> instead.
+        /// This function will be deprecated. Use <see cref="VisualTreeAsset.Instantiate"/> instead.
         /// </remarks>
         /// <returns>The root of the tree of VisualElements that was just cloned.</returns>
         public TemplateContainer CloneTree(string bindingPath)
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElement.PropertyBag.cs b/ModuleOverrides/com.unity.ui/Core/VisualElement.PropertyBag.cs
deleted file mode 100644
index e40d3c06ed..0000000000
--- a/ModuleOverrides/com.unity.ui/Core/VisualElement.PropertyBag.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 System.Collections.Generic;
-using Unity.Profiling;
-using Unity.Properties;
-using Unity.Properties.Internal;
-
-namespace UnityEngine.UIElements
-{
-    public partial class VisualElement
-    {
-        static readonly ProfilerMarker s_PropertyBagsRegistrationMarker = new ProfilerMarker("UI Toolkit PropertyBags Registration");
-
-        static VisualElement()
-        {
-            using (s_PropertyBagsRegistrationMarker.Auto())
-            {
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<Align>, Align>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<DisplayStyle>, DisplayStyle>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<EasingMode>, EasingMode>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<FlexDirection>, FlexDirection>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<FontStyle>, FontStyle>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<Justify>, Justify>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<Overflow>, Overflow>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<OverflowClipBox>, OverflowClipBox>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<OverflowInternal>, OverflowInternal>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<Position>, Position>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<ScaleMode>, ScaleMode>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<TextAnchor>, TextAnchor>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<TextOverflow>, TextOverflow>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<TextOverflowPosition>, TextOverflowPosition>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<TransformOriginOffset>, TransformOriginOffset>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<Visibility>, Visibility>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<WhiteSpace>, WhiteSpace>());
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleEnum<Wrap>, Wrap>());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleBackground, Background>());
-                PropertyBagStore.AddPropertyBag(new Length.PropertyBag());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleBackgroundPosition, BackgroundPosition>());
-                PropertyBagStore.AddPropertyBag(new BackgroundPosition.PropertyBag());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleBackgroundRepeat, BackgroundRepeat>());
-                PropertyBagStore.AddPropertyBag(new BackgroundRepeat.PropertyBag());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleBackgroundSize, BackgroundSize>());
-                PropertyBagStore.AddPropertyBag(new BackgroundSize.PropertyBag());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleColor, Color>());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleCursor, Cursor>());
-                PropertyBagStore.AddPropertyBag(new Cursor.PropertyBag());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleFloat, float>());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleFont, Font>());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleFontDefinition, FontDefinition>());
-                PropertyBagStore.AddPropertyBag(new FontDefinition.PropertyBag());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleInt, int>());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleLength, Length>());
-                PropertyBagStore.AddPropertyBag(new Background.PropertyBag());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleList<EasingFunction>, List<EasingFunction>>());
-                PropertyBagStore.AddPropertyBag(new EasingFunction.PropertyBag());
-                PropertyBag.RegisterList<StyleList<EasingFunction>, EasingFunction>();
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleList<StylePropertyName>, List<StylePropertyName>>());
-                PropertyBagStore.AddPropertyBag(new StylePropertyName.PropertyBag());
-                PropertyBag.RegisterList<StyleList<StylePropertyName>, StylePropertyName>();
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleList<TimeValue>, List<TimeValue>>());
-                PropertyBagStore.AddPropertyBag(new TimeValue.PropertyBag());
-                PropertyBag.RegisterList<StyleList<TimeValue>, TimeValue>();
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleRotate, Rotate>());
-                PropertyBagStore.AddPropertyBag(new Rotate.PropertyBag());
-                PropertyBagStore.AddPropertyBag(new Angle.PropertyBag());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleScale, Scale>());
-                PropertyBagStore.AddPropertyBag(new Scale.PropertyBag());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleTransformOrigin, TransformOrigin>());
-                PropertyBagStore.AddPropertyBag(new TransformOrigin.PropertyBag());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleTranslate, Translate>());
-                PropertyBagStore.AddPropertyBag(new Translate.PropertyBag());
-
-                PropertyBagStore.AddPropertyBag(new StyleValuePropertyBag<StyleTextShadow, TextShadow>());
-                PropertyBagStore.AddPropertyBag(new TextShadow.PropertyBag());
-            }
-        }
-    }
-}
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElement.cs b/ModuleOverrides/com.unity.ui/Core/VisualElement.cs
index 669ac5e503..7589346c9f 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualElement.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElement.cs
@@ -4,13 +4,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Text;
+using Unity.Properties;
 using JetBrains.Annotations;
 using UnityEngine.Assertions;
-using UnityEngine.Yoga;
+using UnityEngine.UIElements.Layout;
 using UnityEngine.UIElements.StyleSheets;
 using UnityEngine.UIElements.UIR;
 using PropertyBagValue = System.Collections.Generic.KeyValuePair<UnityEngine.PropertyName, object>;
@@ -63,8 +61,11 @@ internal enum VisualElementFlags
         HierarchyDisplayed = 1 << 12,
         // Element style are computed
         StyleInitialized = 1 << 13,
+        // Element is not rendered, but we keep the generated geometry in case it is shown later
+        DisableRendering = 1 << 14,
+
         // Element initial flags
-        Init = WorldTransformDirty | WorldTransformInverseDirty | WorldClipDirty | BoundingBoxDirty | WorldBoundingBoxDirty | EventCallbackParentCategoriesDirty | HierarchyDisplayed
+        Init = WorldTransformDirty | WorldTransformInverseDirty | WorldClipDirty | BoundingBoxDirty | WorldBoundingBoxDirty | EventCallbackParentCategoriesDirty
     }
 
     /// <summary>
@@ -73,15 +74,37 @@ internal enum VisualElementFlags
     public enum PickingMode
     {
         /// <summary>
-        /// Picking enabled. Default Value.
+        /// Picking enabled. Default Value. Performs picking based on the position rectangle. In the VisualElement tree hierarchy,
+        /// the picking process works using a similar logic as the rendering but in reverse order: it starts with the front-most
+        /// elements and proceeds step by step towards background elements. Thus, the child elements are picked before parents,
+        /// and the sibling elements further down the list are picked before their predecessors.
         /// </summary>
         Position, // todo better name
         /// <summary>
-        /// Disables picking.
+        /// Prevents picking as the result of a mouse event.
         /// </summary>
         Ignore
     }
 
+    /// <summary>
+    /// Indicates the directionality of the element's text.
+    /// </summary>
+    public enum LanguageDirection
+    {
+        /// <summary>
+        /// Inherits the directionality from the nearest ancestor with a specified directionality.
+        /// </summary>
+        Inherit,
+        /// <summary>
+        /// Left to right language direction.
+        /// </summary>
+        LTR,
+        /// <summary>
+        /// Right to left language direction.
+        /// </summary>
+        RTL
+    }
+
     internal static class VisualElementListPool
     {
         static ObjectPool<List<VisualElement>> pool = new ObjectPool<List<VisualElement>>(() => new List<VisualElement>(), 20);
@@ -240,10 +263,18 @@ internal bool isCompositeRoot
             }
         }
 
-        internal bool isHierarchyDisplayed
+        // areAncestorsAndSelfDisplayed is a combination of the inherited display state and our own display state.
+        // (See UIRLayoutUpdater::UpdateHierarchyDisplayed() to understand how it is set.)
+        internal bool areAncestorsAndSelfDisplayed
         {
             get => (m_Flags & VisualElementFlags.HierarchyDisplayed) == VisualElementFlags.HierarchyDisplayed;
-            set => m_Flags = value ? m_Flags | VisualElementFlags.HierarchyDisplayed : m_Flags & ~VisualElementFlags.HierarchyDisplayed;
+            set
+            {
+                m_Flags = value ? m_Flags | VisualElementFlags.HierarchyDisplayed : m_Flags & ~VisualElementFlags.HierarchyDisplayed;
+
+                if(value && ( renderChainData.pendingRepaint|| renderChainData.pendingHierarchicalRepaint))
+                    IncrementVersion(VersionChangeType.Repaint);
+            }
         }
 
         private static uint s_NextId;
@@ -268,10 +299,12 @@ internal bool isHierarchyDisplayed
         /// </summary>
         /// <remarks>
         /// This is the key used to save/load the view data from the view data store. Not setting this key will disable persistence for this <see cref="VisualElement"/>.
+        /// For further information on view data persistence, see the [[wiki:UIE-ViewData|Unity Manual]].
         /// </remarks>
+        [CreateProperty]
         public string viewDataKey
         {
-            get { return m_ViewDataKey; }
+            get => m_ViewDataKey;
             set
             {
                 if (m_ViewDataKey != value)
@@ -280,6 +313,8 @@ public string viewDataKey
 
                     if (!string.IsNullOrEmpty(value))
                         IncrementVersion(VersionChangeType.ViewData);
+
+                    NotifyPropertyChanged(viewDataKeyProperty);
                 }
             }
         }
@@ -300,6 +335,7 @@ internal bool enableViewDataPersistence
         /// <summary>
         /// This property can be used to associate application-specific user data with this VisualElement.
         /// </summary>
+        [CreateProperty]
         public object userData
         {
             get
@@ -307,7 +343,14 @@ public object userData
                 TryGetPropertyInternal(userDataPropertyKey, out object value);
                 return value;
             }
-            set { SetPropertyInternal(userDataPropertyKey, value); }
+            set
+            {
+                var previous = userData;
+                SetPropertyInternal(userDataPropertyKey, value);
+
+                if (previous != userData)
+                    NotifyPropertyChanged(userDataProperty);
+            }
         }
 
         public override bool canGrabFocus
@@ -342,6 +385,7 @@ public override FocusController focusController
         /// Note that those hints do not affect behavioral or visual results, but only affect the overall performance of the panel and the elements within.
         /// It's advised to always consider specifying the proper <see cref="UsageHints"/>, but keep in mind that some <see cref="UsageHints"/> might be internally ignored under certain conditions (e.g. due to hardware limitations on the target platform).
         /// </summary>
+        [CreateProperty]
         public UsageHints usageHints
         {
             get
@@ -370,6 +414,8 @@ public UsageHints usageHints
                 if ((value & UsageHints.DynamicColor) != 0)
                     renderHints |= RenderHints.DynamicColor;
                 else renderHints &= ~RenderHints.DynamicColor;
+
+                NotifyPropertyChanged(usageHintsProperty);
             }
         }
 
@@ -484,27 +530,23 @@ internal bool isLayoutManual
         /// Before reading from this property, add it to a panel and wait for one frame to ensure that the element layout is computed.
         /// After the layout is computed, a <see cref="GeometryChangedEvent"/> will be sent on this element.
         /// </remarks>
+        [CreateProperty(ReadOnly = true)]
         public Rect layout
         {
             get
             {
                 var result = m_Layout;
-                if (yogaNode != null && !isLayoutManual)
+                if (!layoutNode.IsUndefined && !isLayoutManual)
                 {
-                    result.x = yogaNode.LayoutX;
-                    result.y = yogaNode.LayoutY;
-                    result.width = yogaNode.LayoutWidth;
-                    result.height = yogaNode.LayoutHeight;
+                    result.x = layoutNode.LayoutX;
+                    result.y = layoutNode.LayoutY;
+                    result.width = layoutNode.LayoutWidth;
+                    result.height = layoutNode.LayoutHeight;
                 }
                 return result;
             }
             internal set
             {
-                if (yogaNode == null)
-                {
-                    yogaNode = new YogaNode();
-                }
-
                 // Same position value while type is already manual should not trigger any layout change, return early
                 if (isLayoutManual && m_Layout == value)
                     return;
@@ -539,6 +581,26 @@ internal set
             }
         }
 
+        internal void ClearManualLayout()
+        {
+            // Mark layout manual false to re-enable layout calculation.
+            isLayoutManual = false;
+
+            // Remove inline values.
+            var styleAccess = style;
+            styleAccess.position = StyleKeyword.Null;
+            styleAccess.marginLeft = StyleKeyword.Null;
+            styleAccess.marginRight = StyleKeyword.Null;
+            styleAccess.marginBottom = StyleKeyword.Null;
+            styleAccess.marginTop = StyleKeyword.Null;
+            styleAccess.left = StyleKeyword.Null;
+            styleAccess.top = StyleKeyword.Null;
+            styleAccess.right = StyleKeyword.Null;
+            styleAccess.bottom = StyleKeyword.Null;
+            styleAccess.width = StyleKeyword.Null;
+            styleAccess.height = StyleKeyword.Null;
+        }
+
         /// <summary>
         /// The rectangle of the content area of the element, in the local space of the element.
         /// </summary>
@@ -546,6 +608,7 @@ internal set
         /// In the box model used by UI Toolkit, the content area refers to the inner rectangle for displaying text and images.
         /// It excludes the borders and the padding.
         /// </remarks>
+        [CreateProperty(ReadOnly = true)]
         public Rect contentRect
         {
             get
@@ -648,11 +711,13 @@ internal void UpdateBoundingBox()
             else
             {
                 m_BoundingBox = rect;
-                if (!ShouldClip())
+                if (!ShouldClip() && resolvedStyle.display == DisplayStyle.Flex)
                 {
                     var childCount = m_Children.Count;
                     for (int i = 0; i < childCount; i++)
                     {
+                        if (!m_Children[i].areAncestorsAndSelfDisplayed)
+                            continue;
                         var childBB = m_Children[i].boundingBoxInParentSpace;
                         m_BoundingBox.xMin = Math.Min(m_BoundingBox.xMin, childBB.xMin);
                         m_BoundingBox.xMax = Math.Max(m_BoundingBox.xMax, childBB.xMax);
@@ -672,8 +737,9 @@ internal void UpdateWorldBoundingBox()
         }
 
         /// <summary>
-        /// AABB after applying the world transform to <c>rect</c>.
+        /// Returns a <see cref="Rect"/> representing the Axis-aligned Bounding Box (AABB) after applying the world transform.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public Rect worldBound
         {
             get
@@ -685,8 +751,9 @@ public Rect worldBound
         }
 
         /// <summary>
-        /// AABB after applying the transform to the rect, but before applying the layout translation.
+        /// Returns a <see cref="Rect"/> representing the Axis-aligned Bounding Box (AABB) after applying the transform, but before applying the layout translation.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public Rect localBound
         {
             get
@@ -738,6 +805,7 @@ internal bool isWorldTransformInverseDirty
         /// <remarks>
         /// Multiplying the <c>layout</c> rect by this matrix is incorrect because it already contains the translation.
         /// </remarks>
+        [CreateProperty(ReadOnly = true)]
         public Matrix4x4 worldTransform
         {
             get
@@ -1040,10 +1108,23 @@ static bool IsPartOfCapturedChain(VisualElement self, in IEventHandler capturing
             return self.Contains(capturingElement as VisualElement);
         }
 
+        private PickingMode m_PickingMode;
+
         /// <summary>
         /// Determines if this element can be pick during mouseEvents or <see cref="IPanel.Pick"/> queries.
         /// </summary>
-        public PickingMode pickingMode { get; set; }
+        [CreateProperty]
+        public PickingMode pickingMode
+        {
+            get => m_PickingMode;
+            set
+            {
+                if (m_PickingMode == value)
+                    return;
+                m_PickingMode = value;
+                NotifyPropertyChanged(pickingModeProperty);
+            }
+        }
 
         /// <summary>
         /// The name of this VisualElement.
@@ -1052,6 +1133,7 @@ static bool IsPartOfCapturedChain(VisualElement self, in IEventHandler capturing
         /// Use this property to write USS selectors that target a specific element.
         /// The standard practice is to give an element a unique name.
         /// </remarks>
+        [CreateProperty]
         public string name
         {
             get { return m_Name; }
@@ -1061,6 +1143,7 @@ public string name
                     return;
                 m_Name = value;
                 IncrementVersion(VersionChangeType.StyleSheet);
+                NotifyPropertyChanged(nameProperty);
             }
         }
 
@@ -1080,8 +1163,16 @@ internal List<string> classList
         internal string fullTypeName => typeData.fullTypeName;
         internal string typeName => typeData.typeName;
 
+        LayoutNode m_LayoutNode;
+
         // Set and pass in values to be used for layout
-        internal YogaNode yogaNode { get; private set; }
+        internal ref LayoutNode layoutNode
+        {
+            get
+            {
+                return ref m_LayoutNode;
+            }
+        }
 
         internal ComputedStyle m_Style = InitialStyle.Acquire();
         internal ref ComputedStyle computedStyle => ref m_Style;
@@ -1147,7 +1238,7 @@ public VisualElement()
             focusable = false;
 
             name = string.Empty;
-            yogaNode = new YogaNode();
+            layoutNode = LayoutManager.SharedManager.CreateNode();
 
             renderHints = RenderHints.None;
 
@@ -1155,6 +1246,11 @@ public VisualElement()
                 out m_DefaultActionAtTargetEventCategories);
         }
 
+        ~VisualElement()
+        {
+            LayoutManager.SharedManager.DestroyNode(ref m_LayoutNode);
+        }
+
         [EventInterest(typeof(MouseOverEvent), typeof(MouseOutEvent), typeof(MouseCaptureOutEvent), typeof(PointerEnterEvent),
             typeof(PointerLeaveEvent), typeof(PointerCaptureEvent), typeof(PointerCaptureOutEvent),
             typeof(BlurEvent), typeof(FocusEvent), typeof(TooltipEvent))]
@@ -1271,6 +1367,8 @@ internal void SetPanel(BaseVisualElementPanel p)
                 using (panelDispatcherGate)
                 {
                     elementPanel?.liveReloadSystem.StopTracking(elements);
+
+                    panel?.dispatcher?.m_ClickDetector.Cleanup(elements);
                     foreach (var e in elements)
                     {
                         e.WillChangePanel(p);
@@ -1311,6 +1409,9 @@ void WillChangePanel(BaseVisualElementPanel destinationPanel)
         {
             if (elementPanel != null)
             {
+                // Better to do some things here before we call the user's callback as some state may be modified during the callback.
+                UnregisterRunningAnimations();
+
                 // Only send this event if the element isn't waiting for an attach event already
                 if ((m_Flags & VisualElementFlags.NeedsAttachToPanelEvent) == 0)
                 {
@@ -1324,6 +1425,7 @@ void WillChangePanel(BaseVisualElementPanel destinationPanel)
                     }
                 }
 
+                // Disable the started animations which have possibly started in the DetachFromPanelEvent callback.
                 UnregisterRunningAnimations();
             }
         }
@@ -1332,12 +1434,18 @@ void HasChangedPanel(BaseVisualElementPanel prevPanel)
         {
             if (elementPanel != null)
             {
-                yogaNode.Config = elementPanel.yogaConfig;
+                layoutNode.Config = elementPanel.layoutConfig;
+                layoutNode.SoftReset();
+
                 RegisterRunningAnimations();
 
-                //We need to reset any visual pseudo state
+                // We need to reset any visual pseudo state
                 pseudoStates &= ~(PseudoStates.Focus | PseudoStates.Active | PseudoStates.Hover);
 
+                // UUM-42891: We must presume that we're not displayed because when it's the case (i.e. when we are not
+                // displayed), the layout updater will not process the children unless there is a display *change* in the ancestors.
+                m_Flags &= ~VisualElementFlags.HierarchyDisplayed;
+
                 // Only send this event if the element hasn't received it yet
                 if ((m_Flags & VisualElementFlags.NeedsAttachToPanelEvent) == VisualElementFlags.NeedsAttachToPanelEvent)
                 {
@@ -1354,10 +1462,9 @@ void HasChangedPanel(BaseVisualElementPanel prevPanel)
             }
             else
             {
-                yogaNode.Config = YogaConfig.Default;
+                layoutNode.Config = LayoutManager.SharedManager.GetDefaultConfig();
             }
 
-
             // styles are dependent on topology
             styleInitialized = false;
             IncrementVersion(VersionChangeType.StyleSheet | VersionChangeType.Layout | VersionChangeType.Transform);
@@ -1471,19 +1578,33 @@ private bool isParentEnabledInHierarchy
         /// <remarks>
         ///  This flag verifies if the element is enabled globally. A parent disabling its child VisualElement affects this variable.
         /// </remarks>
+        [CreateProperty(ReadOnly = true)]
         public bool enabledInHierarchy
         {
             get { return (pseudoStates & PseudoStates.Disabled) != PseudoStates.Disabled; }
         }
 
+        private bool m_EnabledSelf;
         //Returns the local enabled state
         /// <summary>
         /// Returns true if the <see cref="VisualElement"/> is enabled locally.
         /// </summary>
         /// <remarks>
-        /// This flag isn't changed if the VisualElement is disabled implicitely by one of its parents. To verify this, use enabledInHierarchy.
+        /// This flag isn't changed if the VisualElement is disabled implicitly by one of its parents. To verify this, use enabledInHierarchy.
         /// </remarks>
-        public bool enabledSelf { get; private set;}
+        [CreateProperty(ReadOnly = true)]
+        public bool enabledSelf
+        {
+            get => m_EnabledSelf;
+            private set
+            {
+                if (m_EnabledSelf != value)
+                {
+                    m_EnabledSelf = value;
+                    NotifyPropertyChanged(enabledSelfProperty);
+                }
+            }
+        }
 
         /// <summary>
         /// Changes the <see cref="VisualElement"/> enabled state. A disabled VisualElement does not receive most events.
@@ -1513,6 +1634,52 @@ void PropagateEnabledToChildren(bool value)
             }
         }
 
+        LanguageDirection m_LanguageDirection;
+        /// <summary>
+        /// Indicates the directionality of the element's text. The value will propagate to the element's children.
+        /// </summary>
+        /// <remarks>
+        /// Setting the languageDirection to RTL adds basic support for right-to-left (RTL) by reversing the text and handling linebreaking
+        /// and word wrapping appropriately. However, it does not provide comprehensive RTL support, as this would require text shaping,
+        /// which includes the reordering of characters, and OpenType font feature support. Comprehensive RTL support is planned for future updates,
+        /// which will involve additional APIs to handle language, script, and font feature specifications.
+        ///
+        /// To enhance the RTL functionality of this property, users can explore available third-party plugins in the Unity Asset Store and make use of <see cref="ITextElementExperimentalFeatures.renderedText"/>
+        /// </remarks>
+        public LanguageDirection languageDirection
+        {
+            get => m_LanguageDirection;
+            set
+            {
+                if (m_LanguageDirection == value)
+                    return;
+
+                m_LanguageDirection = value;
+                localLanguageDirection = m_LanguageDirection;
+            }
+        }
+
+        LanguageDirection m_LocalLanguageDirection;
+        internal LanguageDirection localLanguageDirection
+        {
+            get => m_LocalLanguageDirection;
+            set
+            {
+                if (m_LocalLanguageDirection == value)
+                    return;
+
+                m_LocalLanguageDirection = value;
+
+                IncrementVersion(VersionChangeType.Layout);
+                var count = m_Children.Count;
+                for (int i = 0; i < count; ++i)
+                {
+                    if(m_Children[i].languageDirection == LanguageDirection.Inherit)
+                        m_Children[i].localLanguageDirection = m_LocalLanguageDirection;
+                }
+            }
+        }
+
         /// <summary>
         /// Indicates whether or not this element should be rendered.
         /// </summary>
@@ -1523,6 +1690,7 @@ void PropagateEnabledToChildren(bool value)
         /// <seealso cref="resolvedStyle"/>
         /// <seealso cref="style"/>
         /// </remarks>
+        [CreateProperty]
         public bool visible
         {
             get
@@ -1531,15 +1699,21 @@ public bool visible
             }
             set
             {
+                var previous = visible;
                 // Note: this could causes an allocation because styles are copy-on-write
                 // we might want to remove this setter altogether
                 // so everything goes through style.visibility (and then it's documented in a single place)
                 style.visibility = value ? Visibility.Visible : Visibility.Hidden;
+                if (previous != visible)
+                    NotifyPropertyChanged(visibleProperty);
             }
         }
 
         /// <summary>
         /// Triggers a repaint of the <see cref="VisualElement"/> on the next frame.
+        /// This method is called internally when a change occurs that requires a repaint, such as when BaseField::ref::value is changed or the text in a <see cref="Label"/>.
+        /// If you are implementing a custom control, you can call this method to trigger a repaint when a change occurs that requires a repaint such as when using
+        /// ::ref::generateVisualContent to render a mesh and the mesh data has now changed.
         /// </summary>
         public void MarkDirtyRepaint()
         {
@@ -1556,7 +1730,7 @@ public void MarkDirtyRepaint()
         /// </remarks>
         public Action<MeshGenerationContext> generateVisualContent { get; set; }
 
-        Unity.Profiling.ProfilerMarker k_GenerateVisualContentMarker = new Unity.Profiling.ProfilerMarker("GenerateVisualContent");
+        static readonly Unity.Profiling.ProfilerMarker k_GenerateVisualContentMarker = new("GenerateVisualContent");
 
         internal void InvokeGenerateVisualContent(MeshGenerationContext mgc)
         {
@@ -1744,15 +1918,15 @@ public enum MeasureMode
             /// <summary>
             /// The element should give its preferred width/height without any constraint.
             /// </summary>
-            Undefined = YogaMeasureMode.Undefined,
+            Undefined = LayoutMeasureMode.Undefined,
             /// <summary>
             /// The element should give the width/height that is passed in and derive the opposite site from this value (for example, calculate text size from a fixed width).
             /// </summary>
-            Exactly = YogaMeasureMode.Exactly,
+            Exactly = LayoutMeasureMode.Exactly,
             /// <summary>
             /// At Most. The element should give its preferred width/height but no more than the value passed.
             /// </summary>
-            AtMost = YogaMeasureMode.AtMost
+            AtMost = LayoutMeasureMode.AtMost
         }
 
         internal bool requireMeasureFunction
@@ -1761,11 +1935,11 @@ internal bool requireMeasureFunction
             set
             {
                 m_Flags = value ? m_Flags | VisualElementFlags.RequireMeasureFunction : m_Flags & ~VisualElementFlags.RequireMeasureFunction;
-                if (value && !yogaNode.IsMeasureDefined)
+                if (value && !layoutNode.IsMeasureDefined)
                 {
                     AssignMeasureFunction();
                 }
-                else if (!value && yogaNode.IsMeasureDefined)
+                else if (!value && layoutNode.IsMeasureDefined)
                 {
                     RemoveMeasureFunction();
                 }
@@ -1774,12 +1948,14 @@ internal bool requireMeasureFunction
 
         private void AssignMeasureFunction()
         {
-            yogaNode.SetMeasureFunction((node, f, mode, f1, heightMode) => Measure(node, f, mode, f1, heightMode));
+            layoutNode.SetOwner(this);
+            layoutNode.Measure = Measure;
         }
 
         private void RemoveMeasureFunction()
         {
-            yogaNode.SetMeasureFunction(null);
+            layoutNode.Measure = null;
+            layoutNode.SetOwner(null);
         }
 
         /// <undoc/>
@@ -1789,12 +1965,13 @@ protected internal virtual Vector2 DoMeasure(float desiredWidth, MeasureMode wid
             return new Vector2(float.NaN, float.NaN);
         }
 
-        internal YogaSize Measure(YogaNode node, float width, YogaMeasureMode widthMode, float height, YogaMeasureMode heightMode)
+        internal static void Measure(VisualElement ve, ref LayoutNode node, float width, LayoutMeasureMode widthMode, float height, LayoutMeasureMode heightMode, out LayoutSize result)
         {
-            Debug.Assert(node == yogaNode, "YogaNode instance mismatch");
-            Vector2 size = DoMeasure(width, (MeasureMode)widthMode, height, (MeasureMode)heightMode);
-            float ppp = scaledPixelsPerPoint;
-            return MeasureOutput.Make(AlignmentUtils.RoundToPixelGrid(size.x, ppp), AlignmentUtils.RoundToPixelGrid(size.y, ppp));
+            result = default;
+            Debug.Assert(node.Equals(ve.layoutNode), "LayoutNode instance mismatch");
+            Vector2 size = ve.DoMeasure(width, (MeasureMode)widthMode, height, (MeasureMode)heightMode);
+            float ppp = ve.scaledPixelsPerPoint;
+            result = new LayoutSize(AlignmentUtils.RoundToPixelGrid(size.x, ppp), AlignmentUtils.RoundToPixelGrid(size.y, ppp));
         }
 
         internal void SetSize(Vector2 size)
@@ -1807,14 +1984,7 @@ internal void SetSize(Vector2 size)
 
         void FinalizeLayout()
         {
-            if (hasInlineStyle || hasRunningAnimations)
-            {
-                computedStyle.SyncWithLayout(yogaNode);
-            }
-            else
-            {
-                yogaNode.CopyStyle(computedStyle.yogaNode);
-            }
+            layoutNode.CopyFromComputedStyle(computedStyle);
         }
 
         internal void SetInlineRule(StyleSheet sheet, StyleRule rule)
@@ -1927,7 +2097,7 @@ public void ClearClassList()
         }
 
         /// <summary>
-        /// Adds a class to the class list of the element in order to assign styles from USS.
+        /// Adds a class to the class list of the element in order to assign styles from USS. Note the class name is case-sensitive.
         /// </summary>
         /// <param name="className">The name of the class to add to the list.</param>
         public void AddToClassList(string className)
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElementBindableProperties.cs b/ModuleOverrides/com.unity.ui/Core/VisualElementBindableProperties.cs
new file mode 100644
index 0000000000..0fb1630117
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElementBindableProperties.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
+
+namespace UnityEngine.UIElements
+{
+    public partial class VisualElement
+    {
+        internal static readonly DataBindingProperty viewDataKeyProperty = nameof(viewDataKey);
+        internal static readonly DataBindingProperty userDataProperty = nameof(userData);
+        internal static readonly DataBindingProperty usageHintsProperty = nameof(usageHints);
+        internal static readonly DataBindingProperty layoutProperty = nameof(layout);
+        internal static readonly DataBindingProperty contentRectProperty = nameof(contentRect);
+        internal static readonly DataBindingProperty worldBoundProperty = nameof(worldBound);
+        internal static readonly DataBindingProperty localBoundProperty = nameof(localBound);
+        internal static readonly DataBindingProperty worldTransformProperty = nameof(worldTransform);
+        internal static readonly DataBindingProperty pickingModeProperty = nameof(pickingMode);
+        internal static readonly DataBindingProperty nameProperty = nameof(name);
+        internal static readonly DataBindingProperty enabledInHierarchyProperty = nameof(enabledInHierarchy);
+        internal static readonly DataBindingProperty enabledSelfProperty = nameof(enabledSelf);
+        internal static readonly DataBindingProperty visibleProperty = nameof(visible);
+        internal static readonly DataBindingProperty panelProperty = nameof(panel);
+        internal static readonly DataBindingProperty visualTreeAssetSourceProperty = nameof(visualTreeAssetSource);
+        internal static readonly DataBindingProperty childCountProperty = nameof(childCount);
+        internal static readonly DataBindingProperty styleSheetsProperty = nameof(styleSheets);
+        internal static readonly DataBindingProperty tooltipProperty = nameof(tooltip);
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElementDataBinding.cs b/ModuleOverrides/com.unity.ui/Core/VisualElementDataBinding.cs
new file mode 100644
index 0000000000..39fb1b19cc
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElementDataBinding.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 System.Collections.Generic;
+using Unity.Properties;
+using UnityEngine.Assertions;
+using UnityEngine.Pool;
+
+namespace UnityEngine.UIElements
+{
+    /// <summary>
+    /// Defines a <see cref="VisualElement"/> property accessible for data binding.
+    /// </summary>
+    internal readonly struct DataBindingProperty
+    {
+        private readonly PropertyPath m_PropertyPath;
+        private readonly string m_Path;
+
+        /// <summary>
+        /// Instantiate a new data binding property.
+        /// </summary>
+        /// <param name="path">The path of the property.</param>
+        public DataBindingProperty(string path)
+        {
+            m_PropertyPath = new PropertyPath(path);
+            m_Path = path;
+        }
+
+        /// <summary>
+        /// Instantiate a new data binding property.
+        /// </summary>
+        /// <param name="path">The path of the property.</param>
+        public DataBindingProperty(PropertyPath path)
+        {
+            m_PropertyPath = path;
+            m_Path = path.ToString();
+        }
+
+        /// <summary>
+        /// Converts a <see cref="DataBindingProperty"/> to a <see cref="PropertyPath"/>.
+        /// </summary>
+        /// <param name="vep">The property.</param>
+        /// <returns>A path for the property.</returns>
+        public static implicit operator PropertyPath(DataBindingProperty vep)
+        {
+            return vep.m_PropertyPath;
+        }
+
+        /// <summary>
+        /// Converts a <see cref="DataBindingProperty"/> to a <see cref="string"/>.
+        /// </summary>
+        /// <param name="vep">The property.</param>
+        /// <returns>A path for the property.</returns>
+        public static implicit operator string(DataBindingProperty vep)
+        {
+            return vep.m_Path;
+        }
+
+        /// <summary>
+        /// Converts a <see cref="string"/> to a <see cref="DataBindingProperty"/>.
+        /// </summary>
+        /// <param name="name">The name of the property.</param>
+        /// <returns>The property.</returns>
+        public static implicit operator DataBindingProperty(string name)
+        {
+            return new DataBindingProperty(name);
+        }
+
+        /// <summary>
+        /// Converts a <see cref="PropertyPath"/> to a <see cref="DataBindingProperty"/>.
+        /// </summary>
+        /// <param name="path">The path to the property.</param>
+        /// <returns>The property.</returns>
+        public static implicit operator DataBindingProperty(PropertyPath path)
+        {
+            return new DataBindingProperty(path);
+        }
+
+        /// <summary>
+        /// Returns the data binding path as a string.
+        /// </summary>
+        /// <returns>The property path.</returns>
+        public override string ToString()
+        {
+            return m_Path;
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElementFocusRing.cs b/ModuleOverrides/com.unity.ui/Core/VisualElementFocusRing.cs
index 40cd5d9271..b2e2c5f5bf 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualElementFocusRing.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElementFocusRing.cs
@@ -271,8 +271,8 @@ void BuildRingForScopeRecursive(VisualElement ve, ref int scopeIndex, List<Focus
                 }
                 else
                 {
-                    // isHierarchyDisplayed is not checked in canGrabFocus to let a hidden VisualElement grab the focus when calling the Focus method.
-                    if (child.canGrabFocus && child.isHierarchyDisplayed && child.tabIndex >= 0)
+                    // areAncestorsAndSelfDisplayed is not checked in canGrabFocus to let a hidden VisualElement grab the focus when calling the Focus method.
+                    if (child.canGrabFocus && child.areAncestorsAndSelfDisplayed && child.tabIndex >= 0)
                     {
                         scopeList.Add(new FocusRingRecord
                         {
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElementHierarchy.cs b/ModuleOverrides/com.unity.ui/Core/VisualElementHierarchy.cs
index 7bd530cc45..b751e78f5f 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualElementHierarchy.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElementHierarchy.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -46,6 +47,20 @@ internal bool ShouldClip()
             return computedStyle.overflow != OverflowInternal.Visible && !disableClipping;
         }
 
+        internal bool disableRendering
+        {
+            get => (m_Flags & VisualElementFlags.DisableRendering) == VisualElementFlags.DisableRendering;
+            set
+            {
+                var oldFlags = m_Flags;
+                m_Flags = value ? m_Flags | VisualElementFlags.DisableRendering : m_Flags & ~VisualElementFlags.DisableRendering;
+                if (oldFlags != m_Flags)
+                {
+                    IncrementVersion(VersionChangeType.DisableRendering);
+                }
+            }
+        }
+
         // parent in visual tree
         private VisualElement m_PhysicalParent;
         private VisualElement m_LogicalParent;
@@ -77,14 +92,14 @@ public VisualElement parent
         /// <summary>
         /// The panel onto which this VisualElement is attached.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public IPanel panel { get { return elementPanel; } }
 
         // Logical container where child elements are added.
         // usually same as this element, but can be overridden by more complex types
         // see ScrollView.contentContainer for an example
         /// <summary>
-        ///  child elements are added to this element, usually this
-        ///
+        /// Child elements are added to it, usually this is the same as the element itself. 
         /// </summary>
         public virtual VisualElement contentContainer
         {
@@ -96,6 +111,7 @@ public virtual VisualElement contentContainer
         /// <summary>
         /// Stores the asset reference, if the generated element is cloned from a VisualTreeAsset.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public VisualTreeAsset visualTreeAssetSource
         {
             get => m_VisualTreeAssetSource;
@@ -154,7 +170,7 @@ public void Insert(int index, VisualElement element)
         }
 
         /// <summary>
-        /// Removes this child from the hierarchy
+        /// Removes this child from the <see cref="contentContainer"/> <see cref="hierarchy"/>.
         /// </summary>
         public void Remove(VisualElement element)
         {
@@ -228,6 +244,7 @@ public VisualElement this[int key]
         ///  Number of child elements in this object's contentContainer.
         ///
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public int childCount
         {
             get
@@ -460,7 +477,7 @@ public void Insert(int index, VisualElement child)
                     m_Owner.m_Children = VisualElementListPool.Get();
                 }
 
-                if (m_Owner.yogaNode.IsMeasureDefined)
+                if (m_Owner.layoutNode.IsMeasureDefined)
                 {
                     m_Owner.RemoveMeasureFunction();
                 }
@@ -476,14 +493,21 @@ public void Insert(int index, VisualElement child)
                 child.hierarchy.SetParent(m_Owner);
                 child.PropagateEnabledToChildren(m_Owner.enabledInHierarchy);
 
+                if (child.languageDirection == LanguageDirection.Inherit)
+                    child.localLanguageDirection = m_Owner.localLanguageDirection;
+
                 child.InvokeHierarchyChanged(HierarchyChangeType.Add);
                 child.IncrementVersion(VersionChangeType.Hierarchy);
                 m_Owner.IncrementVersion(VersionChangeType.Hierarchy);
             }
 
             /// <summary>
-            /// Removes this child from the hierarchy
+            /// Removes this child from the hierarchy.
             /// </summary>
+            /// <remarks>
+            /// This method will first calculate the index of the child, followed by calling the <see cref="RemoveAt(int)"/> method to remove it from the hierarchy.
+            /// If the element is null or not present in the hierarchy, an exception will be thrown.
+            /// </remarks>
             public void Remove(VisualElement child)
             {
                 if (child == null)
@@ -499,6 +523,11 @@ public void Remove(VisualElement child)
             /// <summary>
             /// Remove the child element located at this position from this element's contentContainer
             /// </summary>
+            /// <remarks>
+            /// Removes the element from both the child list and the layout list.
+            /// If the index is out of range, an exception will be thrown.
+            /// Trying to remove an element during a layout pass will trigger an invalid operation exception to prevent unintended consequences.
+            /// </remarks>
             public void RemoveAt(int index)
             {
                 if (m_Owner.elementPanel != null && m_Owner.elementPanel.duringLayoutPhase)
@@ -548,7 +577,7 @@ public void Clear()
                     var elements = VisualElementListPool.Copy(m_Owner.m_Children);
 
                     ReleaseChildList();
-                    m_Owner.yogaNode.Clear();
+                    m_Owner.layoutNode.Clear();
 
                     if (m_Owner.requireMeasureFunction)
                         m_Owner.AssignMeasureFunction();
@@ -728,10 +757,10 @@ public void Sort(Comparison<VisualElement> comp)
                 {
                     m_Owner.m_Children.Sort(comp);
 
-                    m_Owner.yogaNode.Clear();
+                    m_Owner.layoutNode.Clear();
                     for (int i = 0; i < m_Owner.m_Children.Count; i++)
                     {
-                        m_Owner.yogaNode.Insert(i, m_Owner.m_Children[i].yogaNode);
+                        m_Owner.layoutNode.Insert(i, m_Owner.m_Children[i].layoutNode);
                     }
                     m_Owner.InvokeHierarchyChanged(HierarchyChangeType.Move);
                     m_Owner.IncrementVersion(VersionChangeType.Hierarchy);
@@ -744,12 +773,12 @@ private void PutChildAtIndex(VisualElement child, int index)
                 if (index >= childCount)
                 {
                     m_Owner.m_Children.Add(child);
-                    m_Owner.yogaNode.Insert(m_Owner.yogaNode.Count, child.yogaNode);
+                    m_Owner.layoutNode.Insert(m_Owner.layoutNode.Count, child.layoutNode);
                 }
                 else
                 {
                     m_Owner.m_Children.Insert(index, child);
-                    m_Owner.yogaNode.Insert(index, child.yogaNode);
+                    m_Owner.layoutNode.Insert(index, child.layoutNode);
                 }
             }
 
@@ -757,7 +786,7 @@ private void PutChildAtIndex(VisualElement child, int index)
             private void RemoveChildAtIndex(int index)
             {
                 m_Owner.m_Children.RemoveAt(index);
-                m_Owner.yogaNode.RemoveAt(index);
+                m_Owner.layoutNode.RemoveAt(index);
             }
 
             private void ReleaseChildList()
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElementStyleAccess.cs b/ModuleOverrides/com.unity.ui/Core/VisualElementStyleAccess.cs
index 57c4793b12..8b53b0d315 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualElementStyleAccess.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElementStyleAccess.cs
@@ -70,6 +70,7 @@ public ICustomStyle customStyle
         /// <summary>
         /// Returns a <see cref="VisualElementStyleSheetSet"/> that manipulates style sheets attached to this element.
         /// </summary>
+        [CreateProperty(ReadOnly = true)]
         public VisualElementStyleSheetSet styleSheets => new VisualElementStyleSheetSet(this);
 
         internal List<StyleSheet> styleSheetList;
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElementTooltip.cs b/ModuleOverrides/com.unity.ui/Core/VisualElementTooltip.cs
index 2c52708c5a..053fb83e4d 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualElementTooltip.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElementTooltip.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using Unity.Properties;
 
 namespace UnityEngine.UIElements
 {
@@ -19,8 +20,9 @@ public partial class VisualElement
         internal static readonly PropertyName tooltipPropertyKey = new PropertyName("--unity-tooltip");
 
         /// <summary>
-        /// Text to display inside an information box after the user hovers the element for a small amount of time.
+        /// Text to display inside an information box after the user hovers the element for a small amount of time. This is only supported in the Editor UI.
         /// </summary>
+        [CreateProperty]
         public string tooltip
         {
             get
@@ -41,7 +43,11 @@ public string tooltip
                     RegisterCallback<TooltipEvent>(SetTooltip);
                 }
 
+                var tooltipText = GetProperty(tooltipPropertyKey) as string;
+                if (string.CompareOrdinal(tooltipText, value) == 0)
+                    return;
                 SetProperty(tooltipPropertyKey, value);
+                NotifyPropertyChanged(tooltipProperty);
             }
         }
     }
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualTreeHierarchyTracker.cs b/ModuleOverrides/com.unity.ui/Core/VisualTreeHierarchyTracker.cs
index d7f3e8d8b5..4e1b4c622b 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualTreeHierarchyTracker.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualTreeHierarchyTracker.cs
@@ -6,9 +6,9 @@ namespace UnityEngine.UIElements
 {
     internal enum HierarchyChangeType
     {
-        Add,
-        Remove,
-        Move
+        Add, // TODO: Rename to AddedToParent
+        Remove, // TODO: Rename to RemovedFromParent
+        Move // TODO: Rename to ChildrenReordered
     }
 
     internal abstract class BaseVisualTreeHierarchyTrackerUpdater : BaseVisualTreeUpdater
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualTreeViewDataUpdater.cs b/ModuleOverrides/com.unity.ui/Core/VisualTreeViewDataUpdater.cs
index 3eaa22456e..1b8aab85eb 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualTreeViewDataUpdater.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualTreeViewDataUpdater.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;
 using System.Collections.Generic;
 using Unity.Profiling;
 
@@ -21,8 +20,15 @@ internal class VisualTreeViewDataUpdater : BaseVisualTreeUpdater
         private static readonly ProfilerMarker s_ProfilerMarker = new ProfilerMarker(s_Description);
         public override ProfilerMarker profilerMarker => s_ProfilerMarker;
 
+        // Only Editor panels actually do something with the ViewData of VisualElements
+        // Skip the execution of the updater completely for Runtime UI (including when developing in the Editor)
+        public bool enabled => panel.contextType == ContextType.Editor;
+
         public override void OnVersionChanged(VisualElement ve, VersionChangeType versionChangeType)
         {
+            if (!enabled)
+                return;
+
             if ((versionChangeType & VersionChangeType.ViewData) != VersionChangeType.ViewData)
                 return;
 
@@ -34,6 +40,9 @@ public override void OnVersionChanged(VisualElement ve, VersionChangeType versio
 
         public override void Update()
         {
+            if (!enabled)
+                return;
+
             if (m_Version == m_LastVersion)
                 return;
 
diff --git a/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingExtensions.cs b/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingExtensions.cs
index 0288b17965..057359dee8 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingExtensions.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingExtensions.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using Unity.Profiling;
+using Unity.Collections;
 using UnityEngine;
 using UnityEngine.UIElements;
 using Object = UnityEngine.Object;
@@ -110,9 +111,7 @@ internal void BindTree(VisualElement element, SerializedProperty parentProperty)
                 return;
             }
 
-            var field = element as IBindable;
-
-            if (field != null)
+            if (element is IBindable field)
             {
                 if (!string.IsNullOrEmpty(field.bindingPath))
                 {
@@ -174,8 +173,7 @@ internal SerializedProperty BindPropertyRelative(IBindable field, SerializedProp
             if (property == null)
                 property = serializedObject?.FindProperty(field.bindingPath);
 
-            var fieldElement = field as VisualElement;
-            if (property == null || fieldElement == null)
+            if (property == null || field is not VisualElement fieldElement)
             {
                 // Object is null or property was not found, we have nothing to do here
                 return property;
@@ -206,24 +204,17 @@ internal SerializedProperty BindPropertyRelative(IBindable field, SerializedProp
         private void CreateBindingObjectForProperty(VisualElement element, SerializedProperty prop)
         {
             // A bound Foldout (a PropertyField with child properties) is special.
-            if (element is Foldout)
+            if (element is Foldout foldout)
             {
                 // We bind to the given propertyPath but we only bind to its 'isExpanded' state, not its value.
-                var foldout = element as Foldout;
-                SerializedObjectBinding<bool>.CreateBind(
-                    foldout, this, prop,
-                    p => p.isExpanded,
-                    (p, v) => p.isExpanded = v,
-                    SerializedPropertyHelper.ValueEquals<bool>);
-
+                SerializedIsExpandedBinding.CreateBind(foldout, this, prop);
                 return;
             }
-            else if (element is Label && element.GetProperty(PropertyField.foldoutTitleBoundLabelProperty) != null)
+            else if (element is Label label && label.GetProperty(PropertyField.foldoutTitleBoundLabelProperty) != null)
             {
                 // We bind to the given propertyPath but we only bind to its 'localizedDisplayName' state, not its value.
                 // This is a feature from IMGUI where the title of a Foldout will change if one of the child
                 // properties is named "Name" and its value changes.
-                var label = element as Label;
                 SerializedObjectBinding<string>.CreateBind(
                     label, this, prop,
                     p => p.localizedDisplayName,
@@ -232,9 +223,16 @@ private void CreateBindingObjectForProperty(VisualElement element, SerializedPro
 
                 return;
             }
-            if (element is ListView)
+            if (element is ListView listView)
             {
-                BindListView(element as ListView,  prop);
+                BindListView(listView, prop);
+
+                if (listView.headerFoldout != null)
+                {
+                    // The foldout will be bound as hierarchy binding continues.
+                    listView.headerFoldout.bindingPath = prop.propertyPath;
+                }
+
                 return;
             }
 
@@ -249,9 +247,7 @@ private void CreateBindingObjectForProperty(VisualElement element, SerializedPro
                         }
                         else if (element is INotifyValueChanged<ulong>)
                         {
-                            //This is not sustainable, we must fix this
-                            DefaultBind(element,  prop, (x) => (ulong) SerializedPropertyHelper.GetLongPropertyValue(x), (x, v) => SerializedPropertyHelper.SetLongPropertyValue(x, (long)v),
-                                (a, b, c) => SerializedPropertyHelper.ValueEquals((long)a,b, (x) => (long)c(x)));
+                            DefaultBind(element,  prop, SerializedPropertyHelper.GetULongPropertyValue, SerializedPropertyHelper.SetULongPropertyValue, SerializedPropertyHelper.ValueEquals);
                         }
                         else if (element is INotifyValueChanged<int>)
                         {
@@ -268,6 +264,10 @@ private void CreateBindingObjectForProperty(VisualElement element, SerializedPro
                         {
                             DefaultBind(element, prop, SerializedPropertyHelper.GetIntPropertyValue, SerializedPropertyHelper.SetIntPropertyValue, SerializedPropertyHelper.ValueEquals);
                         }
+                        else if (element is INotifyValueChanged<uint>)
+                        {
+                            DefaultBind(element, prop, SerializedPropertyHelper.GetUIntPropertyValue, SerializedPropertyHelper.SetUIntPropertyValue, SerializedPropertyHelper.ValueEquals);
+                        }
                         else if (element is INotifyValueChanged<long>)
                         {
                             DefaultBind(element,  prop, SerializedPropertyHelper.GetLongPropertyValue, SerializedPropertyHelper.SetLongPropertyValue, SerializedPropertyHelper.ValueEquals);
@@ -514,11 +514,14 @@ internal static SerializedObjectBindingContext FindBindingContext(VisualElement
         internal void UpdateRevision()
         {
             var previousRevision = lastRevision;
-            lastRevision = serializedObject.objectVersion;
-
-            if (previousRevision != lastRevision)
+            if (IsValid())
             {
-                OnSerializedObjectChanged();
+                lastRevision = serializedObject.objectVersion;
+
+                if (previousRevision != lastRevision)
+                {
+                    OnSerializedObjectChanged();
+                }
             }
         }
 
@@ -574,12 +577,14 @@ class TrackedValue
 
             public SerializedPropertyType originalPropType;
             public int propertyHash;
+            public string propertyPath;
 
             public TrackedValue(SerializedProperty property, Action<object, SerializedProperty> changeCB, Action<object, SerializedProperty> updateCB)
             {
                 contentHash = property.contentHash;
                 originalPropType = property.propertyType;
                 propertyHash = property.hashCodeForPropertyPath;
+                propertyPath = property.propertyPath;
                 onChangeCallback = changeCB;
                 onUpdateCallback = updateCB;
             }
@@ -657,12 +662,53 @@ public void Remove(int propertyPathHash, object cookie)
                 }
             }
 
+            private HashSet<int> unvisitedProperties = new HashSet<int>();
+            public void BeginUpdate()
+            {
+                unvisitedProperties.Clear();
+                var keys = m_TrackedValues.Keys;
+                foreach (var i in keys)
+                {
+                    unvisitedProperties.Add(i);
+                }
+            }
+
+            public void EndUpdate(SerializedObjectBindingContext context)
+            {
+                // We must check the un-visited properties.
+                // This can happen when objects serialized with SerializedReference are present multiple times and we
+                // happen to track the repeated occurrence instead of the first one. We then must go the slow way of
+                // finding the property iterator and comparing the values there.
+                foreach (var hash in unvisitedProperties)
+                {
+                    if (m_TrackedValues.TryGetValue(hash, out var values))
+                    {
+                        if (values.Count > 0)
+                        {
+                            var propertyPath = values[0].propertyPath;
+
+                            var currentProperty = context.serializedObject.FindProperty(propertyPath);
+
+                            if(currentProperty != null)
+                            {
+                                for (int i = 0; i < values.Count; ++i)
+                                {
+                                    values[i].Update(context, currentProperty);
+                                }
+                            }
+                        }
+                    }
+                }
+                unvisitedProperties.Clear();
+            }
+
             public void Update(SerializedObjectBindingContext context, SerializedProperty currentProperty)
             {
                 var hash = currentProperty.hashCodeForPropertyPath;
 
                 if (m_TrackedValues.TryGetValue(hash, out var values))
                 {
+                    unvisitedProperties.Remove(hash);
                     for (int i = 0; i < values.Count; ++i)
                     {
                         values[i].Update(context, currentProperty);
@@ -763,6 +809,7 @@ void UpdateTrackedProperties()
 
             visited.Clear();
             {
+                m_ValueTracker.BeginUpdate();
                 bool visitChild = true;
                 while (iterator.Next(visitChild))
                 {
@@ -791,6 +838,7 @@ void UpdateTrackedProperties()
 
                     m_ValueTracker.Update(this, iterator);
                 }
+                m_ValueTracker.EndUpdate(this);
             }
 
             visited.Clear();
@@ -1109,10 +1157,7 @@ public static BindingRequest CreateDelayBinding(SerializedObjectBindingContext c
 
             public void Bind(VisualElement element)
             {
-                if (context == null)
-                {
-                    context = FindOrCreateBindingContext(element, obj);
-                }
+                context ??= FindOrCreateBindingContext(element, obj);
 
                 switch (requestType)
                 {
@@ -1120,7 +1165,10 @@ public void Bind(VisualElement element)
                         context.Bind(element);
                         break;
                     case RequestType.DelayBind:
-                        context.ContinueBinding(element, parentProperty);
+                        if (context.IsValid())  // Sometimes our serializedObject might have vanished, after a domain reload
+                        {
+                            context.ContinueBinding(element, parentProperty);
+                        }
                         break;
                     case RequestType.TrackProperty:
                     {
@@ -1237,6 +1285,8 @@ public virtual void ResetUpdate()
             bindingContext?.ResetUpdate();
         }
 
+        internal static readonly PropertyName UndoGroupPropertyKey = "__UnityUndoGroup";
+
         protected IBindable m_Field;
         private SerializedObjectBindingContext m_BindingContext;
 
@@ -1279,6 +1329,13 @@ protected IBindable boundElement
                         ve.RegisterCallback(m_OnFieldAttachedToPanel);
                         ve.RegisterCallback(m_OnFieldDetachedFromPanel);
 
+                        // used to group undo operations (UUM-32599)
+                        if (ve is IEditableElement editableElement)
+                        {
+                            editableElement.editingStarted += SetUndoGroup;
+                            editableElement.editingEnded += UnsetUndoGroup;
+                        }
+
                         if (string.IsNullOrEmpty(ve.tooltip))
                         {
                             ve.tooltip = boundProperty?.tooltip;
@@ -1349,6 +1406,22 @@ private void OnFieldDetached(DetachFromPanelEvent evt)
             isFieldAttached = false;
         }
 
+        void SetUndoGroup()
+        {
+            Undo.IncrementCurrentGroup();
+
+            var field = m_Field as VisualElement;
+            field?.SetProperty(UndoGroupPropertyKey, Undo.GetCurrentGroup());
+        }
+
+        void UnsetUndoGroup()
+        {
+            Undo.IncrementCurrentGroup();
+
+            var field = m_Field as VisualElement;
+            field?.SetProperty(UndoGroupPropertyKey, null);
+        }
+
         protected void UpdateFieldIsAttached()
         {
             if (m_Field is VisualElement ve)
@@ -1524,6 +1597,8 @@ private void FieldValueChanged(ChangeEvent<TValue> evt)
 
             try
             {
+                var undoGroup = Undo.GetCurrentGroup();
+
                 var bindable = evt.target as IBindable;
                 var binding = bindable?.binding;
 
@@ -1545,6 +1620,10 @@ private void FieldValueChanged(ChangeEvent<TValue> evt)
                     }
 
                     BindingsStyleHelpers.UpdateElementStyle(field as VisualElement, boundProperty);
+
+                    var fieldUndoGroup = (int?)(field as VisualElement)?.GetProperty(UndoGroupPropertyKey);
+                    Undo.CollapseUndoOperations(fieldUndoGroup ?? undoGroup);
+
                     return;
                 }
             }
@@ -1561,6 +1640,12 @@ protected override void ResetCachedValues()
         {
             UpdateLastFieldValue();
             UpdateFieldIsAttached();
+
+            if (field is ObjectField objectField)
+            {
+                objectField.SetProperty(ObjectField.serializedPropertyKey, boundProperty);
+                objectField.UpdateDisplay();
+            }
         }
 
         public override void OnPropertyValueChanged(SerializedProperty currentPropertyIterator)
@@ -1579,7 +1664,8 @@ public override void OnPropertyValueChanged(SerializedProperty currentPropertyIt
                     BindingsStyleHelpers.UpdateElementStyle(veField, currentPropertyIterator);
                     return;
                 }
-            }catch (ArgumentNullException)
+            }
+            catch (ArgumentNullException)
             {
                 //this can happen when serializedObject has been disposed of
             }
@@ -1665,6 +1751,13 @@ protected override bool SyncFieldValueToProperty()
             {
                 propSetValue(boundProperty, lastFieldValue);
                 boundProperty.m_SerializedObject.ApplyModifiedProperties();
+
+                // Force the field to update its display as its label is dependent on having an up to date SerializedProperty. (UUM-27629)
+                if (field is ObjectField objectField)
+                {
+                    objectField.UpdateDisplay();
+                }
+
                 return true;
             }
             return false;
@@ -1790,6 +1883,95 @@ protected override void AssignValueToField(TValue lastValue)
             }
         }
     }
+
+    class SerializedIsExpandedBinding : SerializedObjectBindingPropertyToBaseField<bool, bool>
+    {
+        static readonly ObjectPool<SerializedIsExpandedBinding> s_Pool =
+            new ObjectPool<SerializedIsExpandedBinding>(() => new SerializedIsExpandedBinding(), 32);
+
+        const string serializedBindingId = "--unity-serialized-is-expanded-bindings";
+
+        readonly Clickable m_ClickedWithAlt;
+
+        public SerializedIsExpandedBinding()
+        {
+            m_ClickedWithAlt = new Clickable(OnClickWithAlt);
+            m_ClickedWithAlt.activators.Clear();
+            m_ClickedWithAlt.activators.Add(new ManipulatorActivationFilter { button = MouseButton.LeftMouse, modifiers = EventModifiers.Alt });
+        }
+
+        public static void CreateBind(Foldout field, SerializedObjectBindingContext context, SerializedProperty property)
+        {
+            var newBinding = s_Pool.Get();
+            newBinding.isReleased = false;
+            field?.SetProperty(serializedBindingId, newBinding);
+            newBinding.SetBinding(field, context, property);
+            newBinding.AddClickedManipulator();
+        }
+
+        protected void SetBinding(Foldout foldout, SerializedObjectBindingContext context, SerializedProperty property)
+        {
+            property.unsafeMode = true;
+            propGetValue = GetValue;
+            propSetValue = SetValue;
+            propCompareValues = SerializedPropertyHelper.ValueEquals<bool>;
+
+            SetContext(context, property);
+            var originalValue = this.lastFieldValue = foldout.value;
+            BindingsStyleHelpers.RegisterRightClickMenu(foldout, property);
+            field = foldout;
+
+            if (propCompareValues(originalValue, property, propGetValue)) //the value hasn't changed, but we want the binding to send an event no matter what
+            {
+                using (ChangeEvent<bool> evt = ChangeEvent<bool>.GetPooled(originalValue, originalValue))
+                {
+                    evt.target = foldout;
+                    foldout.SendEvent(evt);
+                }
+            }
+        }
+
+        public override void Release()
+        {
+            if (isReleased)
+                return;
+
+            base.Release();
+            RemoveClickedManipulator();
+            s_Pool.Release(this);
+        }
+
+        protected override void UpdateLastFieldValue()
+        {
+            if (field is Foldout foldout)
+                lastFieldValue = foldout.value;
+        }
+
+        protected override void AssignValueToField(bool lastValue)
+        {
+            if (field is Foldout foldout)
+                foldout.value = lastValue;
+        }
+
+        static bool GetValue(SerializedProperty property) => property.isExpanded;
+        static void SetValue(SerializedProperty property, bool value) => property.isExpanded = value;
+
+        void AddClickedManipulator() => ((Foldout)field).toggle.AddManipulator(m_ClickedWithAlt);
+        void RemoveClickedManipulator() => ((Foldout)field).RemoveManipulator(m_ClickedWithAlt);
+
+        void OnClickWithAlt()
+        {
+            EditorGUI.SetExpandedRecurse(boundProperty, !boundProperty.isExpanded);
+
+            // Force all visible field to update
+            foreach (var f in ((Foldout)field).Query<Foldout>().Build())
+            {
+                if (f.GetProperty(serializedBindingId) is SerializedIsExpandedBinding binding)
+                    binding.OnPropertyValueChanged(binding.boundProperty);
+            }
+        }
+    }
+
     // specific enum version that binds on the index property of the BaseField<Enum>
     class SerializedManagedEnumBinding : SerializedObjectBindingToBaseField<Enum, BaseField<Enum>>
     {
@@ -1829,7 +2011,7 @@ private void SetBinding(BaseField<Enum> c, SerializedObjectBindingContext contex
 
             int enumValueAsInt = property.intValue;
 
-            Enum value = GetEnumFromSerializedFromInt(manageType, enumValueAsInt);
+            Enum value = GetEnumFromSerializedFromInt(manageType, ref enumValueAsInt);
 
             if (c is EnumField)
                 (c as EnumField).Init(value);
@@ -1865,24 +2047,41 @@ private void SetBinding(BaseField<Enum> c, SerializedObjectBindingContext contex
             }
         }
 
-        static Enum GetEnumFromSerializedFromInt(Type managedType, int enumValueAsInt)
+        static Enum GetEnumFromSerializedFromInt(Type managedType, ref int enumValueAsInt)
         {
             var enumData = EnumDataUtility.GetCachedEnumData(managedType);
 
             if (enumData.flags)
                 return EnumDataUtility.IntToEnumFlags(managedType, enumValueAsInt);
-            else
+            int valueIndex = Array.IndexOf(enumData.flagValues, enumValueAsInt);
+
+            if (valueIndex != -1)
+                return enumData.values[valueIndex];
+
+            // For binding, return the minimal default value if enumValueAsInt is smaller than the smallest enum value,
+            // especially if no default enum is defined
+            if (enumData.flagValues.Length != 0)
             {
-                int valueIndex = Array.IndexOf(enumData.flagValues, enumValueAsInt);
+                var minIntValue = enumData.flagValues[0];
+                var minIntValueIndex = 0;
+                for (int i = 1; i < enumData.flagValues.Length; i++)
+                {
+                    if (enumData.flagValues[i] < minIntValue)
+                    {
+                        minIntValueIndex = i;
+                        minIntValue = enumData.flagValues[i];
+                    }
+                }
 
-                if (valueIndex != -1)
-                    return enumData.values[valueIndex];
-                else
+                if (enumValueAsInt <= minIntValue || (enumValueAsInt == 0 && minIntValue < 0))
                 {
-                    Debug.LogWarning("Error: invalid enum value " + enumValueAsInt + " for type " + managedType);
-                    return null;
+                    enumValueAsInt = minIntValue;
+                    return enumData.values[minIntValueIndex];
                 }
             }
+
+            Debug.LogWarning("Error: invalid enum value " + enumValueAsInt + " for type " + managedType);
+            return null;
         }
 
         protected override void SyncPropertyToField(BaseField<Enum> c, SerializedProperty p)
@@ -1897,7 +2096,7 @@ protected override void SyncPropertyToField(BaseField<Enum> c, SerializedPropert
             }
 
             int enumValueAsInt = p.intValue;
-            field.value = GetEnumFromSerializedFromInt(managedType, enumValueAsInt);
+            field.value = GetEnumFromSerializedFromInt(managedType, ref enumValueAsInt);
             lastEnumValue = enumValueAsInt;
         }
 
@@ -2024,22 +2223,60 @@ private void SetBinding(PopupField<string> c, SerializedObjectBindingContext con
             else
                 enumIndexToDisplayIndex.Clear();
 
-            Type enumType;
-            ScriptAttributeUtility.GetFieldInfoFromProperty(property, out enumType);
+            ScriptAttributeUtility.GetFieldInfoFromProperty(property, out var enumType);
             if (enumType != null)
             {
-                var enumData = EnumDataUtility.GetCachedEnumData(enumType, true);
+                var enumData = EnumDataUtility.GetCachedEnumData(enumType, UnityEngine.EnumDataUtility.CachedType.ExcludeObsolete);
+                var enumDataOld = EnumDataUtility.GetCachedEnumData(enumType, UnityEngine.EnumDataUtility.CachedType.IncludeAllObsolete);
                 c.choices = new List<string>(enumData.displayNames);
 
-                // 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));
+
+                // Build a name to value lookup. We need this to check for duplicate values.
+                var nameValueDict = UnityEngine.Pool.DictionaryPool<string, int>.Get();
+                for (int i = 0; i < enumDataOld.names.Length; ++i)
+                {
+                    nameValueDict[enumDataOld.names[i]] = enumDataOld.flagValues[i];
+                }
+
+                displayIndexToEnumIndex.Fill(kDefaultValueIndex, enumData.names.Length);
+                enumIndexToDisplayIndex.Fill(kDefaultValueIndex, sortedEnumNames.Length);
+
+                // We need to map the display index to the first occurrence of the value in the serialized property enum names.
+                // The serialized property lacks information about obsolete enum values, so it always maps to the first occurrence of the value,
+                // regardless of its obsolescence and visibility.
+                // Additionally, we must handle obsolete values that are not displayed, as the enumValueIndex encompasses all values,
+                // including those marked as obsolete but not visible. (UUM-36836, UUM-31162)
+                var firstOccurrenceIndexToValueDict = UnityEngine.Pool.DictionaryPool<int, int>.Get();
+                for (int i = 0; i < sortedEnumNames.Length; ++i)
+                {
+                    var value = nameValueDict[sortedEnumNames[i]];
+
+                    var displayIndex = Array.IndexOf(enumData.names, sortedEnumNames[i]);
+                    if (displayIndex != -1)
+                    {
+                        // If we have already encountered this value then we need to use the first index as the serialized property will always map to this one.
+                        if (firstOccurrenceIndexToValueDict.TryGetValue(value, out var firstEnumIndex))
+                        {
+                            displayIndexToEnumIndex[displayIndex] = firstEnumIndex;
+                            enumIndexToDisplayIndex[firstEnumIndex] = displayIndex;
+                        }
+                        else
+                        {
+                            firstOccurrenceIndexToValueDict[value] = i;
+                            displayIndexToEnumIndex[displayIndex] = i;
+                        }
+
+                        enumIndexToDisplayIndex[i] = displayIndex;
+                    }
+                    else
+                    {
+                        firstOccurrenceIndexToValueDict[value] = i;
+                    }
+                }
+
+                UnityEngine.Pool.DictionaryPool<string, int>.Release(nameValueDict);
+                UnityEngine.Pool.DictionaryPool<int, int>.Release(firstOccurrenceIndexToValueDict);
             }
             else
             {
@@ -2108,6 +2345,9 @@ protected override void UpdateLastFieldValue()
 
         protected override bool SyncFieldValueToProperty()
         {
+            if(boundProperty.hasMultipleDifferentValues)            
+                lastFieldValueIndex = default;            
+
             if (lastFieldValueIndex >= 0 && lastFieldValueIndex < displayIndexToEnumIndex.Count
                 && boundProperty.enumValueIndex != displayIndexToEnumIndex[lastFieldValueIndex])
             {
diff --git a/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingStyleHelpers.cs b/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingStyleHelpers.cs
index 80d0194312..30e0e67f38 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingStyleHelpers.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingStyleHelpers.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -168,6 +169,11 @@ internal static void UpdateLivePropertyStyleFromProperty(VisualElement element,
                         // We intentionally re-register this event on the container per element and
                         // never unregister.
                         container.RegisterCallback<GeometryChangedEvent, BarType>(UpdatePrefabOverrideOrLivePropertyBarStyleEvent, BarType.LiveProperty);
+                        element.RegisterCallback<DetachFromPanelEvent>(_ =>
+                        {
+                            element.RemoveFromClassList(BindingExtensions.livePropertyUssClassName);
+                            livePropertyBar.RemoveFromHierarchy();
+                        });
                     }
                 }
             }
@@ -203,6 +209,13 @@ internal static void UpdateLivePropertyStateStyle(VisualElement element, Seriali
             UpdateElementRecursively(element, prop, UpdateLivePropertyStyleFromProperty);
         }
 
+        static bool ComponentIsPrefabOverride(Component comp)
+        {
+            return comp != null &&
+                PrefabUtility.GetCorrespondingConnectedObjectFromSource(comp.gameObject) != null &&
+                PrefabUtility.GetCorrespondingObjectFromSource(comp) == null;
+        }
+
         private static void UpdatePrefabStateStyleFromProperty(VisualElement element, SerializedProperty prop)
         {
             bool handlePrefabState = false;
@@ -212,9 +225,9 @@ private static void UpdatePrefabStateStyleFromProperty(VisualElement element, Se
                 // This can throw if the serialized object changes type under our feet
                 handlePrefabState = prop.serializedObject.targetObjects.Length == 1 &&
                     prop.isInstantiatedPrefab &&
-                    prop.prefabOverride;
+                    (prop.prefabOverride || ComponentIsPrefabOverride(prop.serializedObject.targetObject as Component));
             }
-            catch (Exception)
+            catch
             {
                 return;
             }
@@ -255,6 +268,11 @@ private static void UpdatePrefabStateStyleFromProperty(VisualElement element, Se
                         // We intentionally re-register this event on the container per element and
                         // never unregister.
                         container.RegisterCallback<GeometryChangedEvent, BarType>(UpdatePrefabOverrideOrLivePropertyBarStyleEvent, BarType.PrefabOverride);
+                        element.RegisterCallback<DetachFromPanelEvent>(_ =>
+                        {
+                            element.RemoveFromClassList(BindingExtensions.prefabOverrideUssClassName);
+                            prefabOverrideBar.RemoveFromHierarchy();
+                        });
                     }
                 }
             }
@@ -272,6 +290,12 @@ private static void UpdatePrefabStateStyleFromProperty(VisualElement element, Se
                         prefabOverrideBar.RemoveFromHierarchy();
                 }
             }
+
+            if (PrefabUtility.IsPropertyBeingDrivenByPrefabStage(prop))
+            {
+                element.SetEnabled(false);
+                element.tooltip = PrefabStage.s_PrefabInContextPreviewValuesTooltip;
+            }
         }
 
         private static InspectorElement FindPrefabOverrideOrLivePropertyBarCompatibleParent(VisualElement field)
@@ -306,9 +330,10 @@ private static void UpdatePrefabOverrideOrLivePropertyBarStyle(VisualElement bar
             // bars touch (and it looks like one long bar). They normally wouldn't
             // because most fields have a small margin.
             var bottomOffset = element.resolvedStyle.marginBottom;
+            var topOffset = element.resolvedStyle.marginTop;
 
-            bar.style.top = top;
-            bar.style.height = elementHeight + bottomOffset;
+            bar.style.top = top - topOffset;
+            bar.style.height = elementHeight + bottomOffset + topOffset;
             bar.style.left = 0.0f;
         }
 
@@ -328,6 +353,34 @@ private static void UpdatePrefabOverrideOrLivePropertyBarStyleEvent(GeometryChan
             if (barContainer == null)
                 return;
 
+            // If the userData parent has been removed then we should remove all bars as the component has been removed.
+            for (var i = 0; i < barContainer.childCount; i++)
+            {
+                var element = barContainer[i].userData as VisualElement;
+                if (element == null || FindPrefabOverrideOrLivePropertyBarCompatibleParent(element) != null) continue;
+
+                switch (barType)
+                {
+                    case BarType.PrefabOverride:
+                    {
+                        element.RemoveFromClassList(BindingExtensions.prefabOverrideUssClassName);
+                        var prefabOverridePropertyBar = element.GetProperty(BindingExtensions.prefabOverrideBarName) as VisualElement;
+                        prefabOverridePropertyBar?.RemoveFromHierarchy();
+                        break;
+                    }
+                    case BarType.LiveProperty:
+                    {
+                        element.RemoveFromClassList(BindingExtensions.livePropertyUssClassName);
+                        var livePropertyBar = element.GetProperty(BindingExtensions.livePropertyBarName) as VisualElement;
+                        livePropertyBar?.RemoveFromHierarchy();
+                        break;
+                    }
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(barType), barType, null);
+                }
+                return;
+            }
+
             for (var i = 0; i < barContainer.childCount; i++)
                 UpdatePrefabOverrideOrLivePropertyBarStyle(barContainer[i]);
         }
@@ -343,14 +396,18 @@ private static void ReUpdateLivePropertyBarStyleEvent(GeometryChangedEvent evt,
             UpdatePrefabOverrideOrLivePropertyBarStyle(bar);
         }
 
+        // Stop ContextClickEvent because the context menu in the UITk inspector is shown on PointerUpEvent and not on ContextualMenuPopulateEvent (UUM-11643).
+        static void StopContextClickEvent(ContextClickEvent e)
+        {
+            e.StopImmediatePropagation();
+            e.PreventDefault();
+        }
+
         internal static void RegisterRightClickMenu<TValue>(BaseField<TValue> field, SerializedProperty property)
         {
-            var fieldLabelElement = field.Q<Label>(className: BaseField<TValue>.labelUssClassName);
-            if (fieldLabelElement != null)
-            {
-                fieldLabelElement.userData = property.Copy();
-                fieldLabelElement.RegisterCallback(s_RightClickMenuCallback, InvokePolicy.IncludeDisabled);
-            }
+            field.userData = property.Copy();
+            field.RegisterCallback(s_RightClickMenuCallback, InvokePolicy.IncludeDisabled);
+            field.RegisterCallback<ContextClickEvent>(StopContextClickEvent, TrickleDown.TrickleDown);
         }
 
         internal static void RegisterRightClickMenu(Foldout field, SerializedProperty property)
@@ -360,19 +417,22 @@ internal static void RegisterRightClickMenu(Foldout field, SerializedProperty pr
             {
                 toggle.userData = property.Copy();
                 toggle.RegisterCallback(s_RightClickMenuCallback, InvokePolicy.IncludeDisabled);
+                toggle.RegisterCallback<ContextClickEvent>(StopContextClickEvent, TrickleDown.TrickleDown);
             }
         }
 
         internal static void UnregisterRightClickMenu<TValue>(BaseField<TValue> field)
         {
-            var fieldLabelElement = field.Q<Label>(className: BaseField<TValue>.labelUssClassName);
-            fieldLabelElement?.UnregisterCallback(s_RightClickMenuCallback);
+           field.userData = null;
+           field.UnregisterCallback(s_RightClickMenuCallback);
+           field.UnregisterCallback<ContextClickEvent>(StopContextClickEvent);
         }
 
         internal static void UnregisterRightClickMenu(Foldout field)
         {
             var toggle = field.Q<Toggle>(className: Foldout.toggleUssClassName);
             toggle?.UnregisterCallback(s_RightClickMenuCallback);
+            toggle?.UnregisterCallback<ContextClickEvent>(StopContextClickEvent);
         }
 
         internal static void RightClickFieldMenuEvent(PointerUpEvent evt)
@@ -390,12 +450,13 @@ internal static void RightClickFieldMenuEvent(PointerUpEvent evt)
             if (!element.enabledInHierarchy)
                 GUI.enabled = false;
 
-            var menu = EditorGUI.FillPropertyContextMenu(property);
+            var menu = EditorGUI.FillPropertyContextMenu(property, null, null, element);
             GUI.enabled = wasEnabled;
 
-            var menuPosition = new Vector2(element.layout.xMin, element.layout.height);
-            menuPosition = element.LocalToWorld(menuPosition);
-            var menuRect = new Rect(menuPosition, Vector2.zero);
+            if (menu == null)
+                return;
+
+            var menuRect = new Rect(evt.position, Vector2.zero);
             menu.DropDown(menuRect);
 
             evt.PreventDefault();
diff --git a/ModuleOverrides/com.unity.ui/Editor/Bindings/EditorListViewController.cs b/ModuleOverrides/com.unity.ui/Editor/Bindings/EditorListViewController.cs
index c78fb592de..14a947cf0a 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Bindings/EditorListViewController.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Bindings/EditorListViewController.cs
@@ -75,6 +75,9 @@ public override void RemoveItems(List<int> indices)
         {
             indices.Sort();
 
+            RaiseItemsRemoved(indices);
+
+            var listCount = serializedObjectList.Count;
             for (var i = indices.Count - 1; i >= 0; i--)
             {
                 var index = indices[i];
@@ -85,11 +88,10 @@ public override void RemoveItems(List<int> indices)
                     index--;
                 }
 
-                serializedObjectList.RemoveAt(index);
+                serializedObjectList.RemoveAt(index, listCount);
+                listCount--;
             }
 
-            RaiseItemsRemoved(indices);
-
             serializedObjectList.ApplyChanges();
             RaiseOnSizeChanged();
         }
@@ -102,18 +104,14 @@ public override void RemoveItem(int index)
                 index--;
             }
 
-            serializedObjectList.RemoveAt(index);
-            serializedObjectList.ApplyChanges();
-            var indices = ListPool<int>.Get();
-            try
+            using (ListPool<int>.Get(out var indices))
             {
                 indices.Add(index);
                 RaiseItemsRemoved(indices);
             }
-            finally
-            {
-                ListPool<int>.Release(indices);
-            }
+
+            serializedObjectList.RemoveAt(index);
+            serializedObjectList.ApplyChanges();
 
             RaiseOnSizeChanged();
         }
diff --git a/ModuleOverrides/com.unity.ui/Editor/Bindings/ListViewBindings.cs b/ModuleOverrides/com.unity.ui/Editor/Bindings/ListViewBindings.cs
index b2ddd87e93..fe1296d513 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Bindings/ListViewBindings.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Bindings/ListViewBindings.cs
@@ -6,18 +6,18 @@
 using System.Collections.Generic;
 using UnityEngine.UIElements;
 using System.Collections;
+using UnityEngine;
 
 namespace UnityEditor.UIElements.Bindings
 {
-    class ListViewSerializedObjectBinding : SerializedObjectBindingBase, IInternalListViewBinding
+    class ListViewSerializedObjectBinding : SerializedObjectBindingBase
     {
-        public static ObjectPool<ListViewSerializedObjectBinding> s_Pool =
-            new ObjectPool<ListViewSerializedObjectBinding>(() => new ListViewSerializedObjectBinding(), 32);
+        static ObjectPool<ListViewSerializedObjectBinding> s_Pool = new (() => new ListViewSerializedObjectBinding(), 32);
 
         ListView listView
         {
-            get { return boundElement as ListView; }
-            set { boundElement = value; }
+            get => boundElement as ListView;
+            set => boundElement = value;
         }
 
         SerializedObjectList m_DataList;
@@ -29,8 +29,10 @@ ListView listView
         Func<VisualElement> m_DefaultMakeItem;
         Action<VisualElement, int> m_DefaultBindItem;
         Action<VisualElement, int> m_DefaultUnbindItem;
-        Action<VisualElement> m_DefaultDestroyItem;
+        EventCallback<DragUpdatedEvent> m_DragUpdatedCallback;
+        EventCallback<DragPerformEvent> m_DragPerformCallback;
         EventCallback<SerializedObjectBindEvent> m_SerializedObjectBindEventCallback;
+        EventCallback<SerializedPropertyBindEvent> m_SerializedPropertyBindEventCallback;
 
         public static void CreateBind(ListView listView,
             SerializedObjectBindingContext context,
@@ -41,100 +43,124 @@ public static void CreateBind(ListView listView,
             newBinding.SetBinding(listView, context, prop);
         }
 
-        protected void SetBinding(ListView listView, SerializedObjectBindingContext context,
-            SerializedProperty prop)
+        public ListViewSerializedObjectBinding()
         {
-            m_DataList = new SerializedObjectList(prop, listView.sourceIncludesArraySize);
-            m_ArraySize = m_DataList.ArraySize;
-
             m_DefaultMakeItem = MakeListViewItem;
             m_DefaultBindItem = BindListViewItem;
             m_DefaultUnbindItem = UnbindListViewItem;
-            m_DefaultDestroyItem = DestroyListViewItem;
+            m_DragUpdatedCallback = OnDragUpdated;
+            m_DragPerformCallback = OnDragPerform;
             m_SerializedObjectBindEventCallback = SerializedObjectBindEventCallback;
+            m_SerializedPropertyBindEventCallback = SerializedPropertyBindEventCallback;
+        }
 
+        protected void SetBinding(ListView targetList, SerializedObjectBindingContext context,
+            SerializedProperty prop)
+        {
+            m_DataList = new SerializedObjectList(prop, targetList.sourceIncludesArraySize);
+            m_ArraySize = m_DataList.ArraySize;
             m_ListViewArraySize = m_DataList.ArraySize.intValue;
-            m_LastSourceIncludesArraySize = listView.sourceIncludesArraySize;
-            SetListView(listView);
+            m_LastSourceIncludesArraySize = targetList.sourceIncludesArraySize;
+
+            SetListView(targetList);
             SetContext(context, m_ArraySize);
 
-            listView.RefreshItems();
+            targetList.RefreshItems();
         }
 
         private void SetListView(ListView lv)
         {
             if (listView != null)
             {
-                listView.itemsSource = null;
-                listView.Rebuild();
-
-                if (listView.bindItem == m_DefaultBindItem)
-                    listView.SetBindItemWithoutNotify(null);
-                if (listView.makeItem == m_DefaultMakeItem)
-                    listView.SetMakeItemWithoutNotify(null);
-                if (listView.unbindItem == m_DefaultUnbindItem)
-                    listView.unbindItem = null;
-                if (listView.destroyItem == m_DefaultDestroyItem)
-                    listView.destroyItem = null;
-
-                listView.SetViewController(null);
-                listView.SetDragAndDropController(null);
-
-                var foldoutInput = listView.headerFoldout?.toggle?.visualInput;
-                if (foldoutInput != null)
-                {
-                    foldoutInput.UnregisterCallback<DragUpdatedEvent>(OnDragUpdated);
-                    foldoutInput.UnregisterCallback<DragPerformEvent>(OnDragPerform);
-                }
+                Debug.LogError("[UI Toolkit] Internal ListViewBindings error. Please report this with Help -> Report a bug...");
+                return;
             }
 
             listView = lv;
+            listView.SetProperty(BaseVerticalCollectionView.internalBindingKey, this);
 
-            if (listView != null)
+            if (listView.makeItem == null)
             {
-                if (listView.makeItem == null)
-                {
-                    listView.SetMakeItemWithoutNotify(m_DefaultMakeItem);
-                }
+                listView.SetMakeItemWithoutNotify(m_DefaultMakeItem);
+            }
 
-                if (listView.bindItem == null)
-                {
-                    listView.SetBindItemWithoutNotify(m_DefaultBindItem);
-                }
+            if (listView.bindItem == null)
+            {
+                listView.SetBindItemWithoutNotify(m_DefaultBindItem);
+            }
 
-                if (listView.unbindItem == null)
-                {
-                    listView.unbindItem = m_DefaultUnbindItem;
-                }
+            if (listView.unbindItem == null)
+            {
+                listView.unbindItem = m_DefaultUnbindItem;
+            }
 
-                if (listView.destroyItem == null)
-                {
-                    listView.destroyItem = m_DefaultDestroyItem;
-                }
+            // We prevent hierarchy binding under the contentContainer.
+            listView.scrollView.contentContainer.RegisterCallback(m_SerializedObjectBindEventCallback);
+            listView.scrollView.contentContainer.RegisterCallback(m_SerializedPropertyBindEventCallback);
 
-                listView.SetViewController(new EditorListViewController());
-                listView.SetDragAndDropController(new SerializedObjectListReorderableDragAndDropController(listView));
-                listView.itemsSource = m_DataList;
+            var isReorderable = PropertyHandler.IsArrayReorderable(m_DataList.ArrayProperty);
+            listView.SetViewController(new EditorListViewController());
+            listView.SetDragAndDropController(new SerializedObjectListReorderableDragAndDropController(listView)
+            {
+                enableReordering = isReorderable,
+            });
+            listView.reorderMode = isReorderable ? ListViewReorderMode.Animated : ListViewReorderMode.Simple;
+            listView.itemsSource = m_DataList;
 
-                var foldoutInput = listView.headerFoldout?.toggle?.visualInput;
-                if (foldoutInput != null)
-                {
-                    foldoutInput.RegisterCallback<DragUpdatedEvent>(OnDragUpdated);
-                    foldoutInput.RegisterCallback<DragPerformEvent>(OnDragPerform);
-                }
+            var foldoutInput = listView.headerFoldout?.toggle?.visualInput;
+            if (foldoutInput != null)
+            {
+                foldoutInput.RegisterCallback(m_DragUpdatedCallback);
+                foldoutInput.RegisterCallback(m_DragPerformCallback);
             }
         }
 
-        VisualElement MakeListViewItem()
+        private void ClearListView()
         {
-            var prop = new PropertyField();
-            prop.RegisterCallback(m_SerializedObjectBindEventCallback);
-            return prop;
+            if (listView == null)
+            {
+                Debug.LogError("[UI Toolkit] Internal ListViewBindings error during release. Please report this with Help -> Report a bug...");
+                return;
+            }
+
+            listView.SetProperty(BaseVerticalCollectionView.internalBindingKey, null);
+            listView.itemsSource = null;
+            listView.Rebuild();
+
+            if (listView.bindItem == m_DefaultBindItem)
+            {
+                listView.SetBindItemWithoutNotify(null);
+            }
+
+            if (listView.makeItem == m_DefaultMakeItem)
+            {
+                listView.SetMakeItemWithoutNotify(null);
+            }
+
+            if (listView.unbindItem == m_DefaultUnbindItem)
+            {
+                listView.unbindItem = null;
+            }
+
+            listView.scrollView.contentContainer.UnregisterCallback(m_SerializedObjectBindEventCallback);
+            listView.scrollView.contentContainer.UnregisterCallback(m_SerializedPropertyBindEventCallback);
+
+            listView.SetViewController(null);
+            listView.SetDragAndDropController(null);
+
+            var foldoutInput = listView.headerFoldout?.toggle?.visualInput;
+            if (foldoutInput != null)
+            {
+                foldoutInput.UnregisterCallback(m_DragUpdatedCallback);
+                foldoutInput.UnregisterCallback(m_DragPerformCallback);
+            }
+
+            listView = null;
         }
 
-        void DestroyListViewItem(VisualElement element)
+        VisualElement MakeListViewItem()
         {
-            element.UnregisterCallback(m_SerializedObjectBindEventCallback);
+            return new PropertyField();
         }
 
         void BindListViewItem(VisualElement ve, int index)
@@ -160,13 +186,9 @@ void BindListViewItem(VisualElement ve, int index)
             var item = m_DataList[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;
-
             m_IsBinding = true;
             field.bindingPath = itemProp.propertyPath;
-            bindingContext.ContinueBinding(ve, itemProp);
+            bindingContext.ContinueBinding(ve, null);
             m_IsBinding = false;
         }
 
@@ -196,11 +218,20 @@ void UnbindListViewItem(VisualElement ve, int index)
 
         void SerializedObjectBindEventCallback(SerializedObjectBindEvent evt)
         {
-            if (!m_IsBinding)
-            {
-                evt.PreventDefault();
-                evt.StopPropagation();
-            }
+            if (m_IsBinding || listView.bindItem != m_DefaultBindItem)
+                return;
+
+            evt.PreventDefault();
+            evt.StopPropagation();
+        }
+
+        void SerializedPropertyBindEventCallback(SerializedPropertyBindEvent evt)
+        {
+            if (m_IsBinding || listView.bindItem != m_DefaultBindItem)
+                return;
+
+            evt.PreventDefault();
+            evt.StopPropagation();
         }
 
         void OnDragUpdated(DragUpdatedEvent evt)
@@ -254,13 +285,13 @@ public override void Release()
         {
             isReleased = true;
 
-            SetListView(null);
-
             ResetContext();
             m_DataList = null;
             m_ArraySize = null;
             m_ListViewArraySize = -1;
 
+            ClearListView();
+
             ResetCachedValues();
             s_Pool.Release(this);
         }
@@ -420,7 +451,20 @@ public object this[int index]
 
         public bool IsFixedSize => true;
 
-        public int Count => properties.Count;
+        public int Count
+        {
+            get
+            {
+                if (ArrayProperty.serializedObject.isEditingMultipleObjects)
+                {
+                   if (IsOverMaxMultiEditLimit)
+                        return 0;
+
+                   return ArrayProperty.minArraySize;
+                }
+                return properties != null ? properties.Count : 0;
+            }
+        }
 
         bool ICollection.IsSynchronized
         {
@@ -496,22 +540,28 @@ public void Remove(object value)
             RemoveAt(IndexOf(value));
         }
 
-        public void RemoveAt(int index)
+        public void RemoveAt(int index) => RemoveAt(index, Count);
+
+        public void RemoveAt(int index, int listCount)
         {
-            if (index >= 0 && index < Count)
+            if (index >= 0 && index < listCount)
             {
-                var currentProperty = ArrayProperty.GetArrayElementAtIndex(index);
-                for (var i = index + 1; i < ArraySize.intValue; i++)
+                var newCount = listCount - 1;
+                ArrayProperty.DeleteArrayElementAtIndex(index);
+
+                if (index < newCount - 1)
                 {
-                    var nextProperty = ArrayProperty.GetArrayElementAtIndex(i);
-                    if (nextProperty != null)
+                    var currentProperty = ArrayProperty.GetArrayElementAtIndex(index);
+                    for (var i = index + 1; i < newCount; i++)
                     {
-                        currentProperty.isExpanded = nextProperty.isExpanded;
-                        currentProperty = nextProperty;
+                        var nextProperty = ArrayProperty.GetArrayElementAtIndex(i);
+                        if (nextProperty != null && currentProperty != null)
+                        {
+                            currentProperty.isExpanded = nextProperty.isExpanded;
+                            currentProperty = nextProperty;
+                        }
                     }
                 }
-
-                ArrayProperty.DeleteArrayElementAtIndex(index);
             }
         }
     }
diff --git a/ModuleOverrides/com.unity.ui/Editor/Bindings/SerializedPropertyHelper.cs b/ModuleOverrides/com.unity.ui/Editor/Bindings/SerializedPropertyHelper.cs
index 995d709e52..e43c48890d 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Bindings/SerializedPropertyHelper.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Bindings/SerializedPropertyHelper.cs
@@ -16,6 +16,11 @@ public static int GetIntPropertyValue(SerializedProperty p)
             return p.intValue;
         }
 
+        public static uint GetUIntPropertyValue(SerializedProperty p)
+        {
+            return p.uintValue;
+        }
+
         public static object GetManagedReferenceValue(SerializedProperty p)
         {
             return p.managedReferenceValue;
@@ -26,6 +31,11 @@ public static long GetLongPropertyValue(SerializedProperty p)
             return p.longValue;
         }
 
+        public static ulong GetULongPropertyValue(SerializedProperty p)
+        {
+            return p.ulongValue;
+        }
+
         public static bool GetBoolPropertyValue(SerializedProperty p)
         {
             return p.boolValue;
@@ -164,11 +174,21 @@ public static void SetIntPropertyValue(SerializedProperty p, int v)
             p.intValue = v;
         }
 
+        public static void SetUIntPropertyValue(SerializedProperty p, uint v)
+        {
+            p.uintValue = v;
+        }
+
         public static void SetLongPropertyValue(SerializedProperty p, long v)
         {
             p.longValue = v;
         }
 
+        public static void SetULongPropertyValue(SerializedProperty p, ulong v)
+        {
+            p.ulongValue = v;
+        }
+
         public static void SetBoolPropertyValue(SerializedProperty p, bool v)
         {
             p.boolValue = v;
@@ -317,10 +337,18 @@ public static bool ValueEquals<TValue>(TValue value, SerializedProperty p,
         public static bool ValueEquals(string value, SerializedProperty p,
             Func<SerializedProperty, string> propertyReadFunc)
         {
-            if (p.propertyType == SerializedPropertyType.Enum)
-                return p.enumDisplayNames[p.enumValueIndex] == value;
-            else
-                return p.ValueEquals(value);
+            switch(p.propertyType)
+            {
+                case SerializedPropertyType.Enum:
+                    return p.enumDisplayNames[p.enumValueIndex].Equals(value, StringComparison.OrdinalIgnoreCase);
+                case SerializedPropertyType.Character:
+                    return !String.IsNullOrEmpty(value) &&
+                           value.Length == 1 &&
+                           GetCharacterPropertyValue(p) == value[0];
+                default:
+                    // Will always return false if propertyType is not String
+                    return p.ValueEquals(value);
+            }
         }
 
         public static bool ValueEquals(AnimationCurve value, SerializedProperty p,
diff --git a/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerSearchBar.cs b/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerSearchBar.cs
index eda105f7f1..e27b26acb1 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerSearchBar.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerSearchBar.cs
@@ -75,7 +75,7 @@ public DebuggerSearchBar(DebuggerTreeView parent)
                 var targetField = m_SearchTextField;
                 if (e.keyCode == KeyCode.F3 || e.keyCode == KeyCode.Return || e.keyCode == KeyCode.KeypadEnter)
                 {
-                    if (e.modifiers == EventModifiers.Shift)
+                    if (e.modifiers.HasFlag(EventModifiers.Shift))
                         SelectPrev();
                     else
                         SelectNext();
@@ -181,7 +181,7 @@ private void PerformSearch(ChangeEvent<string> evt)
                     m_FoundItems.Add(new SearchResultItem() {item = treeItem, highlight = SearchHighlight.Type});
                 }
 
-                if ((m_CurrentFilter & DebuggerSearchBarFilter.Name) != 0 &&
+                if ((m_CurrentFilter & DebuggerSearchBarFilter.Name) != 0 && !string.IsNullOrEmpty(element.name) &&
                     element.name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0)
                 {
                     m_FoundItems.Add(new SearchResultItem() {item = treeItem, highlight = SearchHighlight.Name});
diff --git a/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerTreeView.cs b/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerTreeView.cs
index 5dd855f021..e81ae6fe7b 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerTreeView.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerTreeView.cs
@@ -30,6 +30,10 @@ public IEnumerable<TreeViewItemData<VisualElement>> treeItems
         {
             get
             {
+                if (m_TreeView?.viewController == null)
+                {
+                    yield break;
+                }
                 foreach (var itemId in m_TreeView.viewController.GetAllItemIds())
                 {
                     yield return m_TreeViewController.GetTreeViewItemDataForId(itemId);
diff --git a/ModuleOverrides/com.unity.ui/Editor/Debugger/StyleLengthField.cs b/ModuleOverrides/com.unity.ui/Editor/Debugger/StyleLengthField.cs
index d4aef19fb2..4726624ee1 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Debugger/StyleLengthField.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Debugger/StyleLengthField.cs
@@ -44,7 +44,7 @@ protected override string ValueToString(StyleLength value)
             return value.ToString().ToLower();
         }
 
-        private static StyleLength ParseString(string str, StyleLength defaultValue)
+        internal static StyleLength ParseString(string str, StyleLength defaultValue)
         {
             if (string.IsNullOrEmpty(str))
                 return defaultValue;
@@ -84,6 +84,8 @@ private static StyleLength ParseString(string str, StyleLength defaultValue)
                 var unitStr = string.Empty;
                 if (unitIndex > 0)
                     unitStr = str.Substring(unitIndex, str.Length - unitIndex).ToLower();
+                else
+                    unitStr = "px";
 
                 float v;
                 if (float.TryParse(floatStr, out v))
diff --git a/ModuleOverrides/com.unity.ui/Editor/Debugger/StylesDebugger.cs b/ModuleOverrides/com.unity.ui/Editor/Debugger/StylesDebugger.cs
index cd346379c0..42cfa11d44 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Debugger/StylesDebugger.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Debugger/StylesDebugger.cs
@@ -194,8 +194,30 @@ private void DrawProperties()
             }
 
             m_SelectedElement.usageHints = (UsageHints)EditorGUILayout.EnumFlagsField("Usage Hints", m_SelectedElement.usageHints);
+            m_SelectedElement.tabIndex = EditorGUILayout.IntField("Tab Index", m_SelectedElement.tabIndex);
 
             EditorGUILayout.LabelField("Layout", m_SelectedElement.layout.ToString());
+            EditorGUILayout.LabelField("LastLayout", m_SelectedElement.lastLayout.ToString());
+
+            if (GUILayout.Button("Increment Version Change - Repaint"))
+            {
+                m_SelectedElement.IncrementVersion(VersionChangeType.Repaint);
+            }
+
+            if (Unsupported.IsDeveloperBuild())
+            {
+                if (GUILayout.Button("Increment Version Change - Size"))
+                {
+                    m_SelectedElement.IncrementVersion(VersionChangeType.Size);
+                }
+                if (GUILayout.Button("Increment Version Change - Transform"))
+                {
+                    m_SelectedElement.IncrementVersion(VersionChangeType.Transform);
+                }
+            }
+
+            EditorGUILayout.LabelField("Display", (m_SelectedElement.resolvedStyle.display == DisplayStyle.None) ? "None" : "Flex");
+
             EditorGUILayout.LabelField("World Bound", m_SelectedElement.worldBound.ToString());
             EditorGUILayout.LabelField("World Clip", m_SelectedElement.worldClip.ToString());
             EditorGUILayout.LabelField("Bounding Box", m_SelectedElement.boundingBox.ToString());
diff --git a/ModuleOverrides/com.unity.ui/Editor/Delegates/EditorDelegateRegistration.cs b/ModuleOverrides/com.unity.ui/Editor/Delegates/EditorDelegateRegistration.cs
index 0bab0e6dbc..fbdd16f90b 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Delegates/EditorDelegateRegistration.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Delegates/EditorDelegateRegistration.cs
@@ -13,14 +13,25 @@ internal static class EditorDelegateRegistration
         static EditorDelegateRegistration()
         {
             DefaultEventSystem.IsEditorRemoteConnected = () => EditorApplication.isRemoteConnected;
-            PanelTextSettings.EditorGUIUtilityLoad = path => EditorGUIUtility.Load(path);
-            PanelTextSettings.GetCurrentLanguage = () => LocalizationDatabase.currentEditorLanguage;
+
+            TextUtilities.getEditorTextSettings = () => EditorTextSettings.defaultTextSettings;
+            TextUtilities.getEditorTextSharpness = (string fontAssetName) => EditorPrefs.GetFloat($"EditorTextSharpness_{fontAssetName}", 0.0f);
 
             UIDocument.IsEditorPlaying = () => EditorApplication.isPlaying;
             UIDocument.IsEditorPlayingOrWillChangePlaymode = () => EditorApplication.isPlayingOrWillChangePlaymode;
 
             PanelSettings.CreateRuntimePanelDebug = UIElementsEditorRuntimeUtility.CreateRuntimePanelDebug;
             PanelSettings.GetOrCreateDefaultTheme = PanelSettingsCreator.GetOrCreateDefaultTheme;
+            PanelSettings.GetGameViewResolution = (int display) =>
+                {
+                    foreach (var playModeView in PlayModeView.GetAllPlayModeViewWindows())
+                    {
+                        if (playModeView.targetDisplay == display)
+                            return playModeView.targetSize;
+                    }
+                    return new(Display.main.renderingWidth, Display.main.renderingHeight);
+                };
+
             DropdownUtility.MakeDropdownFunc = CreateGenericOSMenu;
             PanelSettings.SetPanelSettingsAssetDirty = EditorUtility.SetDirty;
         }
diff --git a/ModuleOverrides/com.unity.ui/Editor/EditorDragAndDrop.cs b/ModuleOverrides/com.unity.ui/Editor/EditorDragAndDrop.cs
index 88d450dc02..2745f6a1e6 100644
--- a/ModuleOverrides/com.unity.ui/Editor/EditorDragAndDrop.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/EditorDragAndDrop.cs
@@ -6,12 +6,13 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEngine;
 using UnityEngine.UIElements;
 using Object = UnityEngine.Object;
 
 namespace UnityEditor.UIElements
 {
-    internal class EditorDragAndDrop : IDragAndDrop, IDragAndDropData
+    internal class EditorDragAndDrop : DragAndDropData, IDragAndDrop
     {
         [InitializeOnLoadMethod]
         private static void RegisterEditorClient()
@@ -19,28 +20,52 @@ private static void RegisterEditorClient()
             DragAndDropUtility.RegisterMakeClientFunc(() => new EditorDragAndDrop());
         }
 
-        private const string k_UserDataKey = "user_data";
+        public override object source => DragAndDrop.GetGenericData(dragSourceKey);
+        public override IEnumerable<Object> unityObjectReferences => DragAndDrop.objectReferences;
 
-        public object userData => DragAndDrop.GetGenericData(k_UserDataKey);
-        public IEnumerable<Object> unityObjectReferences => DragAndDrop.objectReferences;
+        public override DragVisualMode visualMode
+        {
+            get
+            {
+                return DragAndDrop.visualMode switch
+                {
+                    DragAndDropVisualMode.Copy => DragVisualMode.Copy,
+                    DragAndDropVisualMode.None => DragVisualMode.None,
+                    DragAndDropVisualMode.Move => DragVisualMode.Move,
+                    DragAndDropVisualMode.Rejected => DragVisualMode.Rejected,
+                    _ => throw new ArgumentException($"Visual mode {DragAndDrop.visualMode} is not supported", nameof(visualMode), null)
+                };
+            }
+        }
 
-        public object GetGenericData(string key)
+        public override object GetGenericData(string key)
         {
             return DragAndDrop.GetGenericData(key);
         }
 
-        public void StartDrag(StartDragArgs args)
+        public override void SetGenericData(string key, object data)
+        {
+            DragAndDrop.SetGenericData(key, data);
+        }
+
+        public void StartDrag(StartDragArgs args, Vector3 pointerPosition)
         {
             DragAndDrop.PrepareStartDrag();
 
             if (args.unityObjectReferences != null)
                 DragAndDrop.objectReferences = args.unityObjectReferences.ToArray();
 
-            DragAndDrop.SetGenericData(k_UserDataKey, args.userData);
+            SetVisualMode(args.visualMode);
             foreach (DictionaryEntry entry in args.genericData)
                 DragAndDrop.SetGenericData((string)entry.Key, entry.Value);
 
-            DragAndDrop.StartDrag(args.title);
+            if (Event.current != null)
+                DragAndDrop.StartDrag(args.title);
+        }
+
+        public void UpdateDrag(Vector3 pointerPosition)
+        {
+            // Nothing to do here, DragAndDrop handles the title position.
         }
 
         public void AcceptDrag()
@@ -48,30 +73,23 @@ public void AcceptDrag()
             DragAndDrop.AcceptDrag();
         }
 
-        public void SetVisualMode(DragVisualMode visualMode)
+        public void SetVisualMode(DragVisualMode mode)
         {
-            switch (visualMode)
+            DragAndDrop.visualMode = mode switch
             {
-                case DragVisualMode.Copy:
-                    DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
-                    break;
-                case DragVisualMode.None:
-                    DragAndDrop.visualMode = DragAndDropVisualMode.None;
-                    break;
-                case DragVisualMode.Move:
-                    DragAndDrop.visualMode = DragAndDropVisualMode.Move;
-                    break;
-                case DragVisualMode.Rejected:
-                    DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
-                    break;
-                default:
-                    throw new ArgumentException($"Visual mode {visualMode} is not supported", nameof(visualMode), null);
-            }
+                DragVisualMode.Copy => DragAndDropVisualMode.Copy,
+                DragVisualMode.None => DragAndDropVisualMode.None,
+                DragVisualMode.Move => DragAndDropVisualMode.Move,
+                DragVisualMode.Rejected => DragAndDropVisualMode.Rejected,
+                _ => throw new ArgumentException($"Visual mode {visualMode} is not supported", nameof(visualMode), null)
+            };
         }
 
-        public IDragAndDropData data
+        public void DragCleanup()
         {
-            get { return this; }
+            // Nothing to do here.
         }
+
+        public DragAndDropData data => this;
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Editor/EditorMonitor.cs b/ModuleOverrides/com.unity.ui/Editor/EditorMonitor.cs
index 0f0bc68805..734c9836cc 100644
--- a/ModuleOverrides/com.unity.ui/Editor/EditorMonitor.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/EditorMonitor.cs
@@ -63,19 +63,13 @@ bool CheckForColorSpaceChange()
         RenderTexture m_RenderTexture;
         bool CheckForRenderTexturesTrashed()
         {
-            if (m_RenderTexture == null)
+            if (m_RenderTexture == null || !m_RenderTexture.IsCreated())
             {
                 m_RenderTexture = new RenderTexture(1, 1, 0, RenderTextureFormat.ARGB32) { name = "EditorAtlasMonitorRT" };
                 m_RenderTexture.Create();
                 return true;
             }
 
-            if (!m_RenderTexture.IsCreated())
-            {
-                m_RenderTexture.Create();
-                return true;
-            }
-
             return false;
         }
     }
diff --git a/ModuleOverrides/com.unity.ui/Editor/GameObjects/UIDocumentHierarchyWatcher.cs b/ModuleOverrides/com.unity.ui/Editor/GameObjects/UIDocumentHierarchyWatcher.cs
index b862a31de2..480a0f06f9 100644
--- a/ModuleOverrides/com.unity.ui/Editor/GameObjects/UIDocumentHierarchyWatcher.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/GameObjects/UIDocumentHierarchyWatcher.cs
@@ -27,7 +27,7 @@ static void OnHierarchyChanged()
                 return;
             }
 
-            var uiDocuments = Object.FindObjectsOfType<UIDocument>();
+            var uiDocuments = Object.FindObjectsByType<UIDocument>(FindObjectsSortMode.InstanceID);
 
             // Early exit: no UIDocument to keep track of.
             if (uiDocuments == null || uiDocuments.Length == 0)
diff --git a/ModuleOverrides/com.unity.ui/Editor/UIElementsEditorInitialization.cs b/ModuleOverrides/com.unity.ui/Editor/UIElementsEditorInitialization.cs
new file mode 100644
index 0000000000..67d3c54727
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Editor/UIElementsEditorInitialization.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 Unity.Jobs;
+using Unity.Properties;
+using Unity.Properties.Internal;
+using UnityEngine.Scripting;
+
+namespace UnityEditor.UIElements
+{
+    static class UIElementsEditorInitialization
+    {
+        [RequiredByNativeCode(optional:false)]
+        public static void InitializeUIElementsEditorManaged()
+        {
+            var jobHandle = PropertiesEditorInitialization.GetInitializationJobHandle();
+            var handle = new InitializeUIElementsJob().Schedule(jobHandle);
+            PropertyBag.AddJobToWaitQueue(handle);
+        }
+
+        struct InitializeUIElementsJob : IJob
+        {
+            public void Execute()
+            {
+                UnityEngine.UIElements.UIElementsInitialization.RegisterBuiltInPropertyBags();
+            }
+        }
+    }
+}
+
+
diff --git a/ModuleOverrides/com.unity.ui/Editor/UXMLEditorFactories.cs b/ModuleOverrides/com.unity.ui/Editor/UXMLEditorFactories.cs
index 5dbe4637c8..5145a72052 100644
--- a/ModuleOverrides/com.unity.ui/Editor/UXMLEditorFactories.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/UXMLEditorFactories.cs
@@ -22,24 +22,6 @@ static UXMLEditorFactories()
 
             k_Registered = true;
 
-            // Generic element types cannot be discovered through reflection.
-
-            // TODO: Remove these in 2023.1
-#pragma warning disable 0618
-            IUxmlFactory[] propertyControls =
-            {
-                new PropertyControl<int>.UxmlFactory(),
-                new PropertyControl<long>.UxmlFactory(),
-                new PropertyControl<float>.UxmlFactory(),
-                new PropertyControl<double>.UxmlFactory(),
-                new PropertyControl<string>.UxmlFactory(),
-            };
-            foreach (var uxmlFactory in propertyControls)
-            {
-                RegisterFactory(uxmlFactory);
-            }
-#pragma warning restore
-
             // Discover all factories thanks to the type cache!
             var types = TypeCache.GetTypesDerivedFrom<IUxmlFactory>();
             foreach (var type in types)
diff --git a/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetChangeTrackerUpdater.cs b/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetChangeTrackerUpdater.cs
index ffd6d4d0b6..af5c240e28 100644
--- a/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetChangeTrackerUpdater.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetChangeTrackerUpdater.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Unity.Profiling;
 using UnityEngine;
@@ -46,6 +47,9 @@ public VisualTreeAssetChangeTrackerUpdater()
             TextEventManager.FONT_PROPERTY_EVENT.Add(m_TextAssetChange);
             TextEventManager.SPRITE_ASSET_PROPERTY_EVENT.Add(m_TextAssetChange);
             TextEventManager.COLOR_GRADIENT_PROPERTY_EVENT.Add(m_ColorGradientChange);
+
+            m_PreviousInMemoryAssetsHierarchyVersion = UIElementsUtility.m_InMemoryAssetsHierarchyVersion;
+            m_PreviousInMemoryAssetsStyleVersion = UIElementsUtility.m_InMemoryAssetsStyleVersion;
         }
 
         protected override void Dispose(bool disposing)
@@ -90,7 +94,8 @@ public override void OnVersionChanged(VisualElement ve, VersionChangeType versio
             }
         }
 
-        private int m_PreviousInMemoryAssetsVersion = 0;
+        private int m_PreviousInMemoryAssetsHierarchyVersion = 0;
+        private int m_PreviousInMemoryAssetsStyleVersion = 0;
 
         private const int kMinUpdateDelayMs = 1000; // TODO this should probably be a setting at some point
         private long m_LastUpdateTimeMs = 0;
@@ -162,7 +167,9 @@ public void StartTracking(List<VisualElement> elements)
                         currentAsset = ve.visualTreeAssetSource;
                         tracker = FindTracker(ve);
                     }
-                    StartVisualTreeAssetTracking(tracker, ve.visualTreeAssetSource);
+
+                    if(tracker != null)
+                        StartVisualTreeAssetTracking(tracker, ve.visualTreeAssetSource);
                 }
 
                 if (ve.styleSheetList?.Count > 0)
@@ -220,7 +227,7 @@ public void OnStyleSheetAssetsImported(HashSet<StyleSheet> changedAssets, HashSe
             m_LiveReloadStyleSheetAssetTracker.OnAssetsImported(changedAssets, deletedAssets);
         }
 
-        private void StartVisualTreeAssetTracking(ILiveReloadAssetTracker<VisualTreeAsset> tracker, VisualTreeAsset asset)
+        private void StartVisualTreeAssetTracking([NotNull] ILiveReloadAssetTracker<VisualTreeAsset> tracker, VisualTreeAsset asset)
         {
             int dirtyCount = tracker.StartTrackingAsset(asset);
 
@@ -277,7 +284,8 @@ public void OnVisualTreeAssetsImported(HashSet<VisualTreeAsset> changedAssets, H
             if (m_TrackersToRefresh.Count == 0)
                 return;
 
-            UIElementsUtility.InMemoryAssetsHaveBeenChanged();
+            UIElementsUtility.InMemoryAssetsHierarchyHaveBeenChanged();
+            UIElementsUtility.InMemoryAssetsStyleHaveBeenChanged();
 
             // Player panel require an update here or else it will only update when Unity is focused
             if (panel.contextType == ContextType.Player)
@@ -349,17 +357,22 @@ public override void Update()
                 m_LastUpdateTimeMs = currentTimeMs;
             }
 
+            // InMemoryAssets versions are split into two categories to help track what needs recreating.
+            bool shouldRecreateUI =
+                m_PreviousInMemoryAssetsHierarchyVersion != UIElementsUtility.m_InMemoryAssetsHierarchyVersion;
+            bool shouldRefreshStyles =
+                m_PreviousInMemoryAssetsStyleVersion != UIElementsUtility.m_InMemoryAssetsStyleVersion;
+
             // There's no need to reload anything if there are no changes.
-            if (m_PreviousInMemoryAssetsVersion == UIElementsUtility.m_InMemoryAssetsVersion)
+            if (!shouldRecreateUI && !shouldRefreshStyles)
             {
                 return;
             }
 
             // This value is updated by the UI Builder whenever an asset is changed.
             // We update here to prevent unnecessary checking of asset changes.
-            m_PreviousInMemoryAssetsVersion = UIElementsUtility.m_InMemoryAssetsVersion;
-
-            bool shouldRefreshStyles = false;
+            m_PreviousInMemoryAssetsHierarchyVersion = UIElementsUtility.m_InMemoryAssetsHierarchyVersion;
+            m_PreviousInMemoryAssetsStyleVersion = UIElementsUtility.m_InMemoryAssetsStyleVersion;
 
             // 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
@@ -377,7 +390,6 @@ public override void Update()
                 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)
                 {
diff --git a/Modules/AndroidJNI/AndroidApp.bindings.cs b/Modules/AndroidJNI/AndroidApp.bindings.cs
new file mode 100644
index 0000000000..998ce27922
--- /dev/null
+++ b/Modules/AndroidJNI/AndroidApp.bindings.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;
+using UnityEngine.Bindings;
+
+namespace UnityEngine.Android
+{
+    [NativeHeader("Modules/AndroidJNI/Public/AndroidApp.bindings.h")]
+    [StaticAccessor("AndroidApp", StaticAccessorType.DoubleColon)]
+    [NativeConditional("PLATFORM_ANDROID")]
+    internal static class AndroidApp
+    {
+        private static AndroidJavaObject m_Activity;
+
+        public static AndroidJavaObject Activity
+        {
+            get
+            {
+                if (m_Activity != null)
+                    return m_Activity;
+
+                using (var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
+                {
+                    m_Activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
+                }
+
+                return m_Activity;
+            }
+        }
+
+        public static extern IntPtr UnityPlayerRaw { [ThreadSafe] get; }
+    }
+}
diff --git a/Modules/AndroidJNI/AndroidAssetPacks.bindings.cs b/Modules/AndroidJNI/AndroidAssetPacks.bindings.cs
index 67df6f4cbc..1459f521fa 100644
--- a/Modules/AndroidJNI/AndroidAssetPacks.bindings.cs
+++ b/Modules/AndroidJNI/AndroidAssetPacks.bindings.cs
@@ -148,7 +148,8 @@ public float progress
                         }
                         else
                         {
-                            downloadProgress += info.bytesDownloaded / info.size;
+                            double result = (double)info.bytesDownloaded / (double)info.size;
+                            downloadProgress += (float)result;
                             transferProgress += info.transferProgress;
                         }
                     }
@@ -324,6 +325,7 @@ public static class AndroidAssetPacks
     {
         public static bool coreUnityAssetPacksDownloaded { get { return CoreUnityAssetPacksDownloaded(); } }
 
+        internal static string textureCompressionsPackName { get { return GetTextureCompressionsPackName(); } }
         internal static string dataPackName { get { return GetDataPackName(); } }
         internal static string streamingAssetsPackName { get { return GetStreamingAssetsPackName(); } }
 
@@ -343,6 +345,7 @@ public static void RemoveAssetPack(string assetPackName) {}
 
         // These values must match constants in AndroidAssetPacks.h
         // We can't directly access them since all code in PlatformDependent gets stripped when building source code delivery
+        private static string GetTextureCompressionsPackName() { return "UnityTextureCompressionsAssetPack"; }
         private static string GetDataPackName() { return "UnityDataAssetPack"; }
         private static string GetStreamingAssetsPackName() { return "UnityStreamingAssetsPack"; }
     }
diff --git a/Modules/AndroidJNI/AndroidCommon.cs b/Modules/AndroidJNI/AndroidCommon.cs
deleted file mode 100644
index d500be1f8f..0000000000
--- a/Modules/AndroidJNI/AndroidCommon.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-
-namespace UnityEngine.Android
-{
-    internal static class Common
-    {
-        private static AndroidJavaObject m_Activity;
-
-        public static AndroidJavaObject GetActivity()
-        {
-            if (m_Activity != null)
-                return m_Activity;
-
-            using (var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
-            {
-                m_Activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
-            }
-
-            return m_Activity;
-        }
-    }
-}
diff --git a/Modules/AndroidJNI/AndroidJNI.bindings.cs b/Modules/AndroidJNI/AndroidJNI.bindings.cs
index 5827c4c77d..1d7aa13353 100644
--- a/Modules/AndroidJNI/AndroidJNI.bindings.cs
+++ b/Modules/AndroidJNI/AndroidJNI.bindings.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using UnityEngine;
+using UnityEngine.Android;
 using UnityEngine.Bindings;
 using UnityEngine.Scripting;
 using Unity.Collections;
@@ -106,7 +107,7 @@ public static IntPtr CreateJavaProxy(AndroidJavaProxy proxy)
             var handle = GCHandle.Alloc(proxy);
             try
             {
-                return _AndroidJNIHelper.CreateJavaProxy(GCHandle.ToIntPtr(handle), proxy);
+                return _AndroidJNIHelper.CreateJavaProxy(AndroidApp.UnityPlayerRaw, GCHandle.ToIntPtr(handle), proxy);
             }
             catch
             {
diff --git a/Modules/AndroidJNI/AndroidJava.cs b/Modules/AndroidJNI/AndroidJava.cs
index 044ce7c66a..c586501e33 100644
--- a/Modules/AndroidJNI/AndroidJava.cs
+++ b/Modules/AndroidJNI/AndroidJava.cs
@@ -103,15 +103,80 @@ public virtual AndroidJavaObject Invoke(string methodName, object[] args)
         {
             Exception error = null;
             BindingFlags binderFlags = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic;
-
+            int NullArgs = 0;
             Type[] argTypes = new Type[args.Length];
+
             for (int i = 0; i < args.Length; ++i)
-                argTypes[i] = args[i] == null ? typeof(AndroidJavaObject) : args[i].GetType();
+            {
+                if (args[i] == null)
+                {
+                    argTypes[i] = null;
+                    NullArgs++;
+                }
+                else
+                {
+                    argTypes[i] = args[i].GetType();
+                }
+            }
+
             try
             {
-                MethodInfo method = GetType().GetMethod(methodName, binderFlags, null, argTypes, null);
-                if (method != null)
-                    return _AndroidJNIHelper.Box(method.Invoke(this, args));
+                MethodInfo methodResult = null;
+                if (NullArgs > 0)
+                {
+                    MethodInfo[] methods = this.GetType().GetMethods(binderFlags);
+
+                    var matches = 0;
+
+                    foreach (var method in methods)
+                    {
+                        //exit loop if dont have same name
+                        if (methodName != method.Name)
+                            continue;
+
+                        ParameterInfo[] methodParameters = method.GetParameters();
+
+                        //exit loop of dont have same number of paramters
+                        if (methodParameters.Length != args.Length)
+                            continue;
+
+                        var isOk = true;
+
+                        for (int j = 0; j < methodParameters.Length; j++)
+                        {
+                            if (argTypes[j] == null)
+                            {
+                                if (methodParameters[j].ParameterType.IsValueType)
+                                {
+                                    isOk = false;
+                                    break;
+                                }
+                            }
+                            else if (!methodParameters[j].ParameterType.IsAssignableFrom(argTypes[j]))
+                            {
+                                isOk = false;
+                                break;
+                            }
+                        }
+
+                        if (!isOk)
+                            continue;
+                        else
+                            matches++;
+
+                        methodResult = method;
+                    }
+
+                    if (matches > 1)
+                        throw new Exception($"Ambiguous overloads found for {methodName} with given parameters");
+
+                }
+                else
+                    methodResult = GetType().GetMethod(methodName, binderFlags, null, argTypes, null);
+
+                if (methodResult != null)
+                    return _AndroidJNIHelper.Box(methodResult.Invoke(this, args));
+
             }
             catch (TargetInvocationException invocationError)
             {
@@ -122,16 +187,24 @@ public virtual AndroidJavaObject Invoke(string methodName, object[] args)
                 error = invocationError;
             }
 
-            // Log error
+            //Log Error
             string[] argTypeNames = new string[args.Length];
-            for (int i = 0; i < argTypes.Length; ++i)
-                argTypeNames[i] = argTypes[i].ToString();
+            for (int i = 0; i < argTypeNames.Length; ++i)
+            {
+                if (argTypes[i] == null)
+                    argTypeNames[i] = "null";
+                else
+                    argTypeNames[i] = argTypes[i].ToString();
+            }
 
             if (error != null)
                 throw new TargetInvocationException(GetType() + "." + methodName + "(" + string.Join(",", argTypeNames) + ")", error);
 
             AndroidReflection.SetNativeExceptionOnProxy(GetRawProxy(),
                 new Exception("No such proxy method: " + GetType() + "." + methodName + "(" + string.Join(",", argTypeNames) + ")"), true);
+
+
+
             return null;
         }
 
@@ -1061,7 +1134,7 @@ private static IntPtr GetMethodID(string clazz, string methodName, string signat
         private static readonly IntPtr s_ReflectionHelperGetMethodID         = GetStaticMethodID(RELECTION_HELPER_CLASS_NAME, "getMethodID", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/reflect/Method;");
         private static readonly IntPtr s_ReflectionHelperGetFieldID          = GetStaticMethodID(RELECTION_HELPER_CLASS_NAME, "getFieldID", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/reflect/Field;");
         private static readonly IntPtr s_ReflectionHelperGetFieldSignature   = GetStaticMethodID(RELECTION_HELPER_CLASS_NAME, "getFieldSignature", "(Ljava/lang/reflect/Field;)Ljava/lang/String;");
-        private static readonly IntPtr s_ReflectionHelperNewProxyInstance    = GetStaticMethodID(RELECTION_HELPER_CLASS_NAME, "newProxyInstance", "(JLjava/lang/Class;)Ljava/lang/Object;");
+        private static readonly IntPtr s_ReflectionHelperNewProxyInstance    = GetStaticMethodID(RELECTION_HELPER_CLASS_NAME, "newProxyInstance", "(Lcom/unity3d/player/UnityPlayer;JLjava/lang/Class;)Ljava/lang/Object;");
         private static readonly IntPtr s_ReflectionHelperSetNativeExceptionOnProxy = GetStaticMethodID(RELECTION_HELPER_CLASS_NAME, "setNativeExceptionOnProxy", "(Ljava/lang/Object;JZ)V");
         private static readonly IntPtr s_FieldGetDeclaringClass              = GetMethodID("java/lang/reflect/Field", "getDeclaringClass", "()Ljava/lang/Class;");
 
@@ -1128,11 +1201,12 @@ public static string GetFieldSignature(IntPtr field)
             return AndroidJNISafe.CallStaticStringMethod(s_ReflectionHelperClass, s_ReflectionHelperGetFieldSignature, jniArgs);
         }
 
-        public static IntPtr NewProxyInstance(IntPtr delegateHandle, IntPtr interfaze)
+        public static IntPtr NewProxyInstance(IntPtr player, IntPtr delegateHandle, IntPtr interfaze)
         {
-            jvalue[] jniArgs = new jvalue[2];
-            jniArgs[0].j = delegateHandle.ToInt64();
-            jniArgs[1].l = interfaze;
+            jvalue[] jniArgs = new jvalue[3];
+            jniArgs[0].l = player;
+            jniArgs[1].j = delegateHandle.ToInt64();
+            jniArgs[2].l = interfaze;
             return AndroidJNISafe.CallStaticObjectMethod(s_ReflectionHelperClass, s_ReflectionHelperNewProxyInstance, jniArgs);
         }
 
@@ -1149,9 +1223,9 @@ public static void SetNativeExceptionOnProxy(IntPtr proxy, Exception e, bool met
     [UsedByNativeCode]
     sealed class _AndroidJNIHelper
     {
-        public static IntPtr CreateJavaProxy(IntPtr delegateHandle, AndroidJavaProxy proxy)
+        public static IntPtr CreateJavaProxy(IntPtr player, IntPtr delegateHandle, AndroidJavaProxy proxy)
         {
-            return AndroidReflection.NewProxyInstance(delegateHandle, proxy.javaInterface.GetRawClass());
+            return AndroidReflection.NewProxyInstance(player, delegateHandle, proxy.javaInterface.GetRawClass());
         }
 
         public static IntPtr CreateJavaRunnable(AndroidJavaRunnable jrunnable)
diff --git a/Modules/AndroidJNI/AndroidPermissions.cs b/Modules/AndroidJNI/AndroidPermissions.cs
index 19a8f0b27d..02900a7cad 100644
--- a/Modules/AndroidJNI/AndroidPermissions.cs
+++ b/Modules/AndroidJNI/AndroidPermissions.cs
@@ -18,6 +18,7 @@ enum Result
 
         public event Action<string> PermissionGranted;
         public event Action<string> PermissionDenied;
+        [Obsolete("Unreliable. Query ShouldShowRequestPermissionRationale and use PermissionDenied event.", false)]
         public event Action<string> PermissionDeniedAndDontAskAgain;
         public event Action<string> PermissionRequestDismissed;
 
@@ -87,6 +88,13 @@ private static AndroidJavaObject GetUnityPermissions()
             return m_UnityPermissions;
         }
 
+        public static bool ShouldShowRequestPermissionRationale(string permission)
+        {
+            if (string.IsNullOrWhiteSpace(permission))
+                return false;
+            return true;
+        }
+
         public static bool HasUserAuthorizedPermission(string permission)
         {
             if (permission == null)
diff --git a/Modules/Animation/Managed/StateMachineBehaviour.cs b/Modules/Animation/Managed/StateMachineBehaviour.cs
index d287ca1ead..065760eef5 100644
--- a/Modules/Animation/Managed/StateMachineBehaviour.cs
+++ b/Modules/Animation/Managed/StateMachineBehaviour.cs
@@ -15,7 +15,6 @@ public sealed partial class SharedBetweenAnimatorsAttribute : Attribute
     }
 
     [RequiredByNativeCode]
-    [Icon("cs Script Icon")] // For StateMachineBehaviour we want to show the MonoBehaviour icon instead of the ScriptableObject.
     public abstract class StateMachineBehaviour : ScriptableObject
     {
         // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
diff --git a/Modules/Animation/ScriptBindings/Animation.bindings.cs b/Modules/Animation/ScriptBindings/Animation.bindings.cs
index a96a93427f..2e19baf371 100644
--- a/Modules/Animation/ScriptBindings/Animation.bindings.cs
+++ b/Modules/Animation/ScriptBindings/Animation.bindings.cs
@@ -307,8 +307,13 @@ internal unsafe static void DisposeEvents(IntPtr animationEventBlittableArray, i
             {
                 animationEventsBlittable[i].Dispose();
             }
+
+            FreeEventsInternal(animationEventBlittableArray);
         }
 
+        [FreeFunction(Name = "AnimationClipBindings::FreeEventsInternal")]
+        extern static private void FreeEventsInternal(IntPtr value);
+
         [ThreadStatic]
         static GCHandlePool s_handlePool;
 
diff --git a/Modules/Animation/ScriptBindings/Animator.bindings.cs b/Modules/Animation/ScriptBindings/Animator.bindings.cs
index 0465aeb130..86a8501db9 100644
--- a/Modules/Animation/ScriptBindings/Animator.bindings.cs
+++ b/Modules/Animation/ScriptBindings/Animator.bindings.cs
@@ -65,6 +65,13 @@ public enum AnimatorControllerParameterType
         Trigger = 9,
     }
 
+    internal static class AnimatorControllerParameterTypeConstants
+    {
+        // Users should never have to deal with this type, so exposing it is actually counter-productive.
+        // Instead, we put it into a constant so that we can still reap the readability benefits.
+        public const int InvalidType = 0;
+    }
+
     internal enum TransitionType
     {
         Normal = 1 << 0,
@@ -704,12 +711,15 @@ extern public int parameterCount
             get;
         }
 
+        [FreeFunction(Name = "AnimatorBindings::GetParameterInternal", HasExplicitThis = true)]
+        extern private AnimatorControllerParameter GetParameterInternal(int index);
+
         public AnimatorControllerParameter GetParameter(int index)
         {
-            AnimatorControllerParameter[] param = parameters;
-            if (index < 0 || index >= parameters.Length)
-                throw new IndexOutOfRangeException("Index must be between 0 and " + parameters.Length);
-            return param[index];
+            var parameter = GetParameterInternal(index);
+            if ((int)parameter.m_Type == AnimatorControllerParameterTypeConstants.InvalidType)
+                throw new IndexOutOfRangeException("Index must be between 0 and " + parameterCount);
+            return parameter;
         }
 
         // Blends pivot point between body center of mass and feet pivot. At 0%, the blending point is body center of mass. At 100%, the blending point is feet pivot
@@ -1237,6 +1247,12 @@ extern public bool keepAnimatorStateOnDisable
             set;
         }
 
+        extern public bool writeDefaultValuesOnDisable
+        {
+            get;
+            set;
+        }
+
         [Obsolete("GetVector is deprecated.")]
         public Vector3 GetVector(string name)                     { return Vector3.zero; }
         [Obsolete("GetVector is deprecated.")]
diff --git a/Modules/Animation/ScriptBindings/AnimatorControllerPlayable.bindings.cs b/Modules/Animation/ScriptBindings/AnimatorControllerPlayable.bindings.cs
index bed6eca1f7..ba1cd625a4 100644
--- a/Modules/Animation/ScriptBindings/AnimatorControllerPlayable.bindings.cs
+++ b/Modules/Animation/ScriptBindings/AnimatorControllerPlayable.bindings.cs
@@ -282,10 +282,10 @@ public int GetParameterCount()
 
         public AnimatorControllerParameter GetParameter(int index)
         {
-            AnimatorControllerParameter[] parameters = GetParametersArrayInternal(ref m_Handle);
-            if (index < 0 || index >= parameters.Length)
+            var parameter = GetParameterInternal(ref m_Handle, index);
+            if ((int)parameter.m_Type == AnimatorControllerParameterTypeConstants.InvalidType)
                 throw new IndexOutOfRangeException("Invalid parameter index.");
-            return parameters[index];
+            return parameter;
         }
 
         public void CrossFadeInFixedTime(string stateName, float transitionDuration)
@@ -462,9 +462,8 @@ internal string ResolveHash(int hash)
 
         [NativeThrows]
         extern private static bool IsInTransitionInternal(ref PlayableHandle handle, int layerIndex);
-
         [NativeThrows]
-        extern private static AnimatorControllerParameter[] GetParametersArrayInternal(ref PlayableHandle handle);
+        extern private static AnimatorControllerParameter GetParameterInternal(ref PlayableHandle handle, int index);
 
         [NativeThrows]
         extern private static int GetParameterCountInternal(ref PlayableHandle handle);
diff --git a/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabase.bindings.cs b/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabase.bindings.cs
index 0d56b9223c..984a97a7eb 100644
--- a/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabase.bindings.cs
+++ b/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabase.bindings.cs
@@ -130,7 +130,7 @@ public partial class AssetDatabase
         // rootFolder is true if the path is a registered root folder
         // immutable is true when the root of the path was registered with the immutable flag (e.g. shared package)
         // asset folders marked immutable are not modified by the asset database
-        extern internal static bool GetAssetFolderInfo(string path, out bool rootFolder, out bool immutable);
+        extern public static bool TryGetAssetFolderInfo(string path, out bool rootFolder, out bool immutable);
 
         public static bool Contains(Object obj) { return Contains(obj.GetInstanceID()); }
         extern public static bool Contains(int instanceID);
@@ -348,7 +348,10 @@ public unsafe static void InstanceIDsToGUIDs(NativeArray<int> instanceIDs, Nativ
 
         extern public static System.Type GetMainAssetTypeAtPath(string assetPath);
 
+        extern public static System.Type GetMainAssetTypeFromGUID(GUID guid);
+
         extern public static System.Type GetTypeFromPathAndFileID(string assetPath, long localIdentifierInFile);
+
         extern public static bool IsMainAssetAtPathLoaded(string assetPath);
 
         [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.")]
@@ -725,7 +728,7 @@ public static void ForceReserializeAssets(IEnumerable<string> assetPaths, ForceR
                     continue;
 
                 bool rootFolder, readOnly;
-                bool validPath = GetAssetFolderInfo(path, out rootFolder, out readOnly);
+                bool validPath = TryGetAssetFolderInfo(path, out rootFolder, out readOnly);
                 if (validPath && (rootFolder || readOnly))
                     continue;
 
@@ -987,20 +990,7 @@ private static void OnCacheServerConnectionChanged()
         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);
-        }
+        public static extern Type[] GetImporterTypes(ReadOnlySpan<GUID> guids);
 
         //Since extern method overloads are not supported
         //this is the name we pick, but users end up being able
diff --git a/Modules/AssetDatabase/Editor/ScriptBindings/AssetOrigin.binding.cs b/Modules/AssetDatabase/Editor/ScriptBindings/AssetOrigin.binding.cs
index bb2ed8646f..f75a925bf4 100644
--- a/Modules/AssetDatabase/Editor/ScriptBindings/AssetOrigin.binding.cs
+++ b/Modules/AssetDatabase/Editor/ScriptBindings/AssetOrigin.binding.cs
@@ -8,6 +8,7 @@
 
 namespace UnityEditor
 {
+    [Serializable]
     [StructLayout(LayoutKind.Sequential)]
     [NativeHeader("Modules/AssetDatabase/Editor/Public/AssetOrigin.h")]
     [NativeAsStruct]
@@ -37,5 +38,7 @@ public AssetOrigin(int productId = 0, string packageName = "", string version =
         }
 
         public AssetOrigin() {}
+
+        public bool IsValid() => productId > 0;
     }
 }
diff --git a/Modules/AssetDatabase/Editor/ScriptBindings/CacheServer.bindings.cs b/Modules/AssetDatabase/Editor/ScriptBindings/CacheServer.bindings.cs
new file mode 100644
index 0000000000..31727f9914
--- /dev/null
+++ b/Modules/AssetDatabase/Editor/ScriptBindings/CacheServer.bindings.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 UnityEngine.Bindings;
+
+namespace UnityEditor
+{
+    [NativeHeader("Modules/AssetDatabase/Editor/ScriptBindings/CacheServer.bindings.h")]
+    [StaticAccessor("CacheServerBindings", StaticAccessorType.DoubleColon)]
+    public class CacheServer
+    {
+        private CacheServer() {}
+
+        [PreventExecutionInState(AssetDatabasePreventExecution.kImportingAsset, PreventExecutionSeverity.PreventExecution_ManagedException)]
+        extern public static void UploadArtifacts(GUID[] guids = null, bool uploadAllRevisions = false); 
+
+        [PreventExecutionInState(AssetDatabasePreventExecution.kImportingAsset, PreventExecutionSeverity.PreventExecution_ManagedException)]
+        extern public static void UploadShaderCache();
+    }
+}
diff --git a/Modules/AssetPipelineEditor/ImportSettings/ModelImporterMaterialEditor.cs b/Modules/AssetPipelineEditor/ImportSettings/ModelImporterMaterialEditor.cs
index 39d9a0a38a..8762e9a122 100644
--- a/Modules/AssetPipelineEditor/ImportSettings/ModelImporterMaterialEditor.cs
+++ b/Modules/AssetPipelineEditor/ImportSettings/ModelImporterMaterialEditor.cs
@@ -274,14 +274,9 @@ private void ExtractTexturesGUI()
                             assetPath = FileUtil.NiceWinPath(assetPath);
                             // Destination could be a package. Need to get assetPath instead of relativePath
                             // The GUID isn't known yet so can't find it from that
-                            foreach (var package in PackageManager.PackageInfo.GetAllRegisteredPackages())
-                            {
-                                if (assetPath.StartsWith(package.resolvedPath))
-                                {
-                                    destinationPath = package.assetPath + assetPath.Substring(package.resolvedPath.Length);
-                                    break;
-                                }
-                            }
+                            var packageInfo = PackageManager.PackageInfo.FindForAssetPath(assetPath);
+                            if (packageInfo != null)
+                                destinationPath = packageInfo.assetPath + assetPath.Substring(packageInfo.resolvedPath.Length);
                         }
 
                         try
@@ -379,14 +374,9 @@ private bool ExtractMaterialsGUI()
                             destinationPath = FileUtil.NiceWinPath(destinationPath);
                             // Destination could be a package. Need to get assetPath instead of relativePath
                             // The GUID isn't known yet so can't find it from that
-                            foreach (var package in PackageManager.PackageInfo.GetAllRegisteredPackages())
-                            {
-                                if (destinationPath.StartsWith(package.resolvedPath))
-                                {
-                                    assetPath = package.assetPath + destinationPath.Substring(package.resolvedPath.Length);
-                                    break;
-                                }
-                            }
+                            var packageInfo = PackageManager.PackageInfo.FindForAssetPath(destinationPath);
+                            if (packageInfo != null)
+                                destinationPath = packageInfo.assetPath + destinationPath.Substring(packageInfo.resolvedPath.Length);
                         }
 
                         if (string.IsNullOrEmpty(assetPath))
diff --git a/Modules/AssetPipelineEditor/Public/ModelImporting/ModelImporter.bindings.cs b/Modules/AssetPipelineEditor/Public/ModelImporting/ModelImporter.bindings.cs
index 73037a07fa..65cc55c8ee 100644
--- a/Modules/AssetPipelineEditor/Public/ModelImporting/ModelImporter.bindings.cs
+++ b/Modules/AssetPipelineEditor/Public/ModelImporting/ModelImporter.bindings.cs
@@ -1029,7 +1029,7 @@ public ModelImporterClipAnimation[] clipAnimations
         [FreeFunction("ModelImporterBindings::GetClipAnimations")]
         private extern static ModelImporterClipAnimation[] GetClipAnimations(ModelImporter self);
         [FreeFunction("ModelImporterBindings::SetClipAnimations", ThrowsException = true)]
-        private extern static void SetClipAnimations([Writable, NotNull("NullExceptionObject")] ModelImporter self, ModelImporterClipAnimation[] value);
+        private extern static void SetClipAnimations([Writable, NotNull("NullExceptionObject")] ModelImporter self, [Unmarshalled] ModelImporterClipAnimation[] value);
 
         public ModelImporterClipAnimation[] defaultClipAnimations
         {
diff --git a/Modules/AssetPipelineEditor/Public/VideoImporter.bindings.cs b/Modules/AssetPipelineEditor/Public/VideoImporter.bindings.cs
index d38b67664d..b5f53e6457 100644
--- a/Modules/AssetPipelineEditor/Public/VideoImporter.bindings.cs
+++ b/Modules/AssetPipelineEditor/Public/VideoImporter.bindings.cs
@@ -13,7 +13,7 @@ namespace UnityEditor
 {
 
     // AssetImporter for importing VideoClip
-    [NativeHeader("Editor/Src/Video/VideoClipTranscode.h")]
+    [NativeHeader("Modules/VideoEditor/VideoClipTranscode.h")]
     public enum VideoCodec
     {
         Auto = 0,
@@ -38,7 +38,7 @@ public enum VideoEncodingProfile
         H264High = 2
     }
 
-    [NativeHeader("Editor/Src/Video/VideoClipTranscode.h")]
+    [NativeHeader("Modules/VideoEditor/VideoClipTranscode.h")]
     public enum VideoDeinterlaceMode
     {
         Off = 0,
@@ -46,7 +46,7 @@ public enum VideoDeinterlaceMode
         Odd = 2
     }
 
-    [NativeHeader("Editor/Src/Video/VideoClipTranscode.h")]
+    [NativeHeader("Modules/VideoEditor/VideoClipTranscode.h")]
     internal enum VideoColorSpace
     {
         sRGB = 0,
@@ -66,7 +66,7 @@ public enum VideoResizeMode
         CustomSize = 7
     }
 
-    [NativeHeader("Editor/Src/Video/VideoClipTranscode.h")]
+    [NativeHeader("Modules/VideoEditor/VideoClipTranscode.h")]
     public enum VideoSpatialQuality
     {
         LowSpatialQuality = 0,
diff --git a/Modules/Audio/Public/ScriptBindings/AudioMixer.bindings.cs b/Modules/Audio/Public/ScriptBindings/AudioMixer.bindings.cs
index 90f75422a9..4c244d6e43 100644
--- a/Modules/Audio/Public/ScriptBindings/AudioMixer.bindings.cs
+++ b/Modules/Audio/Public/ScriptBindings/AudioMixer.bindings.cs
@@ -68,5 +68,8 @@ internal void TransitionToSnapshot(AudioMixerSnapshot snapshot, float timeToReac
 
         [NativeMethod("AudioMixerBindings::GetAbsoluteAudibilityFromGroup", HasExplicitThis = true, IsFreeFunction = true)]
         internal extern float GetAbsoluteAudibilityFromGroup(AudioMixerGroup group);
+
+        [NativeMethod]
+        internal extern bool HasValidSnapshots();
     }
 }
diff --git a/Modules/BuildPipeline/Editor/Managed/BuildSettings.cs b/Modules/BuildPipeline/Editor/Managed/BuildSettings.cs
index 3932804ae3..e238fe5fa1 100644
--- a/Modules/BuildPipeline/Editor/Managed/BuildSettings.cs
+++ b/Modules/BuildPipeline/Editor/Managed/BuildSettings.cs
@@ -33,13 +33,25 @@ public TypeDB typeDB
         }
 
         [NativeName("target")]
-        internal BuildTarget m_Target;
-        public BuildTarget target
+        internal BuildTargetSelection m_Target;
+        internal BuildTargetSelection buildTargetSelection
         {
             get { return m_Target; }
             set { m_Target = value; }
         }
 
+        public BuildTarget target
+        {
+            get { return m_Target.platform; }
+            set { m_Target.platform = value; }
+        }
+
+        public int subtarget
+        {
+            get { return m_Target.subTarget; }
+            set { m_Target.subTarget = value; }
+        }
+
         [NativeName("group")]
         internal BuildTargetGroup m_Group;
         public BuildTargetGroup group
diff --git a/Modules/BuildPipeline/Editor/Managed/BuildTargetSelection.cs b/Modules/BuildPipeline/Editor/Managed/BuildTargetSelection.cs
new file mode 100644
index 0000000000..114aa29011
--- /dev/null
+++ b/Modules/BuildPipeline/Editor/Managed/BuildTargetSelection.cs
@@ -0,0 +1,31 @@
+// 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 UnityEngine.Bindings;
+using UnityEngine.Scripting;
+using UnityEditor.Build;
+
+namespace UnityEditor.Build.Content
+{
+    [Serializable]
+    [UsedByNativeCode]
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct BuildTargetSelection
+    {
+        internal BuildTarget platform;
+        internal int subTarget;
+        internal int extendedPlatform;
+        internal int isEditor;
+
+        internal BuildTargetSelection(BuildTarget platform, int subTarget, bool extended = false, bool isEditor = false)
+        {
+            this.platform = platform;
+            this.subTarget = subTarget;
+            this.extendedPlatform = extended ? 1 : 0;
+            this.isEditor = isEditor ? 1 : 0;
+        }
+    }
+}
diff --git a/Modules/BuildPipeline/Editor/Managed/TypeDB.bindings.cs b/Modules/BuildPipeline/Editor/Managed/TypeDB.bindings.cs
index f400f0daef..67e3d9fb4c 100644
--- a/Modules/BuildPipeline/Editor/Managed/TypeDB.bindings.cs
+++ b/Modules/BuildPipeline/Editor/Managed/TypeDB.bindings.cs
@@ -76,7 +76,7 @@ protected virtual void Dispose(bool disposing)
         private static extern IntPtr Internal_Create();
 
         [NativeMethod(IsThreadSafe = true)]
-        internal extern void AddAssemblyInfo(AssemblyInfoManaged[] assemblyInfos, string assembliesPath);
+        internal extern void AddAssemblyInfo([Unmarshalled] AssemblyInfoManaged[] assemblyInfos, string assembliesPath);
 
         [NativeMethod(IsThreadSafe = true)]
         private static extern void Internal_Destroy(IntPtr ptr);
diff --git a/Modules/BuildReportingEditor/Managed/BuildReport.bindings.cs b/Modules/BuildReportingEditor/Managed/BuildReport.bindings.cs
index 10b4fe20cf..63e050f57c 100644
--- a/Modules/BuildReportingEditor/Managed/BuildReport.bindings.cs
+++ b/Modules/BuildReportingEditor/Managed/BuildReport.bindings.cs
@@ -63,7 +63,7 @@ public ScenesUsingAssets[] scenesUsingAssets
         internal extern void DeleteAllFileEntries();
 
         [FreeFunction("BuildReporting::SummarizeErrors", HasExplicitThis = true)]
-        internal extern string SummarizeErrors();
+        public extern string SummarizeErrors();
 
         internal extern void AddMessage(LogType messageType, string message, string exceptionType);
 
@@ -92,6 +92,8 @@ internal TAppendix[] GetAppendicesByType<TAppendix>() where TAppendix : Object
         internal extern Object[] GetAllAppendices();
 
         [FreeFunction("BuildReporting::GetLatestReport")]
-        internal static extern BuildReport GetLatestReport();
+        public static extern BuildReport GetLatestReport();
+
+        internal extern void SetBuildGUID(GUID guid);
     }
 }
diff --git a/Modules/BuildReportingEditor/Managed/BuildSummary.cs b/Modules/BuildReportingEditor/Managed/BuildSummary.cs
index 9af5fd34bd..e45fee10bb 100644
--- a/Modules/BuildReportingEditor/Managed/BuildSummary.cs
+++ b/Modules/BuildReportingEditor/Managed/BuildSummary.cs
@@ -36,6 +36,7 @@ public struct BuildSummary
         public BuildResult result { get; }
 
         internal BuildType buildType { get; }
+        public bool multiProcessEnabled { get; }
 
         private T ParseSubtarget<T, S>() where T : Enum where S : Enum
         {
diff --git a/Modules/CommandStateObserver/AssemblyInfo.cs b/Modules/CommandStateObserver/AssemblyInfo.cs
index ad972a6799..dc55cef81d 100644
--- a/Modules/CommandStateObserver/AssemblyInfo.cs
+++ b/Modules/CommandStateObserver/AssemblyInfo.cs
@@ -15,6 +15,7 @@
 [assembly: InternalsVisibleTo("RecipesEditor")]
 [assembly: InternalsVisibleTo("SimpleMathBook")]
 [assembly: InternalsVisibleTo("VerticalFlow")]
+[assembly: InternalsVisibleTo("TestSample")]
 
 // Animation (@francisb)
 [assembly: InternalsVisibleTo("Unity.Animation.StateMachine.Tests")]
diff --git a/Modules/CommandStateObserver/Commands/CommandHandlerFunctor.cs b/Modules/CommandStateObserver/Commands/CommandHandlerFunctor.cs
index c23876bdc7..d023e60357 100644
--- a/Modules/CommandStateObserver/Commands/CommandHandlerFunctor.cs
+++ b/Modules/CommandStateObserver/Commands/CommandHandlerFunctor.cs
@@ -7,6 +7,11 @@
 
 namespace Unity.CommandStateObserver
 {
+    /// <summary>
+    /// A function to handle a command.
+    /// </summary>
+    /// <param name="command">The command that needs to be handled.</param>
+    /// <typeparam name="TCommand">The command type.</typeparam>
     delegate void CommandHandler<in TCommand>(TCommand command)
         where TCommand : ICommand;
 
@@ -67,6 +72,11 @@ delegate void CommandHandler<in TParam1, in TParam2, in TParam3, in TParam4, in
     /// </summary>
     interface ICommandHandlerFunctor
     {
+        /// <summary>
+        /// Invokes the command handler.
+        /// </summary>
+        /// <param name="command">The command that triggered the invocation.</param>
+        /// <param name="logHandler">Whether to log the invocation.</param>
         void Invoke(ICommand command, bool logHandler);
     }
 
@@ -78,11 +88,19 @@ class CommandHandlerFunctor<TCommand> : ICommandHandlerFunctor
     {
         CommandHandler<TCommand> m_Callback;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommandHandlerFunctor{TCommand}"/> class.
+        /// </summary>
         public CommandHandlerFunctor(CommandHandler<TCommand> callback)
         {
             m_Callback = callback;
         }
 
+        /// <summary>
+        /// Invokes the command handler.
+        /// </summary>
+        /// <param name="command">The command that triggered the invocation.</param>
+        /// <param name="logHandler">Whether to log the invocation.</param>
         public void Invoke(ICommand command, bool logHandler)
         {
             if (logHandler)
@@ -104,12 +122,20 @@ class CommandHandlerFunctor<TParam, TCommand> : ICommandHandlerFunctor
         CommandHandler<TParam, TCommand> m_Callback;
         TParam m_HandlerParam;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommandHandlerFunctor{TParam, TCommand}"/> class.
+        /// </summary>
         public CommandHandlerFunctor(CommandHandler<TParam, TCommand> callback, TParam handlerParam)
         {
             m_Callback = callback;
             m_HandlerParam = handlerParam;
         }
 
+        /// <summary>
+        /// Invokes the command handler.
+        /// </summary>
+        /// <param name="command">The command that triggered the invocation.</param>
+        /// <param name="logHandler">Whether to log the invocation.</param>
         public void Invoke(ICommand command, bool logHandler)
         {
             if (logHandler)
@@ -132,6 +158,9 @@ class CommandHandlerFunctor<TParam1, TParam2, TCommand> : ICommandHandlerFunctor
         TParam1 m_HandlerParam1;
         TParam2 m_HandlerParam2;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommandHandlerFunctor{TParam1, TParam2, TCommand}"/> class.
+        /// </summary>
         public CommandHandlerFunctor(CommandHandler<TParam1, TParam2, TCommand> callback, TParam1 handlerParam1, TParam2 handlerParam2)
         {
             m_Callback = callback;
@@ -139,6 +168,11 @@ public CommandHandlerFunctor(CommandHandler<TParam1, TParam2, TCommand> callback
             m_HandlerParam2 = handlerParam2;
         }
 
+        /// <summary>
+        /// Invokes the command handler.
+        /// </summary>
+        /// <param name="command">The command that triggered the invocation.</param>
+        /// <param name="logHandler">Whether to log the invocation.</param>
         public void Invoke(ICommand command, bool logHandler)
         {
             if (logHandler)
@@ -162,6 +196,9 @@ class CommandHandlerFunctor<TParam1, TParam2, TParam3, TCommand> : ICommandHandl
         TParam2 m_HandlerParam2;
         TParam3 m_HandlerParam3;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommandHandlerFunctor{TParam1, TParam2, TParam3, TCommand}"/> class.
+        /// </summary>
         public CommandHandlerFunctor(CommandHandler<TParam1, TParam2, TParam3, TCommand> callback, TParam1 handlerParam1, TParam2 handlerParam2, TParam3 handlerParam3)
         {
             m_Callback = callback;
@@ -170,6 +207,11 @@ public CommandHandlerFunctor(CommandHandler<TParam1, TParam2, TParam3, TCommand>
             m_HandlerParam3 = handlerParam3;
         }
 
+        /// <summary>
+        /// Invokes the command handler.
+        /// </summary>
+        /// <param name="command">The command that triggered the invocation.</param>
+        /// <param name="logHandler">Whether to log the invocation.</param>
         public void Invoke(ICommand command, bool logHandler)
         {
             if (logHandler)
@@ -194,6 +236,9 @@ class CommandHandlerFunctor<TParam1, TParam2, TParam3, TParam4, TCommand> : ICom
         TParam3 m_HandlerParam3;
         TParam4 m_HandlerParam4;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommandHandlerFunctor{TParam1, TParam2, TParam3, TParam4, TCommand}"/> class.
+        /// </summary>
         public CommandHandlerFunctor(CommandHandler<TParam1, TParam2, TParam3, TParam4, TCommand> callback, TParam1 handlerParam1, TParam2 handlerParam2, TParam3 handlerParam3, TParam4 handlerParam4)
         {
             m_Callback = callback;
@@ -203,6 +248,11 @@ public CommandHandlerFunctor(CommandHandler<TParam1, TParam2, TParam3, TParam4,
             m_HandlerParam4 = handlerParam4;
         }
 
+        /// <summary>
+        /// Invokes the command handler.
+        /// </summary>
+        /// <param name="command">The command that triggered the invocation.</param>
+        /// <param name="logHandler">Whether to log the invocation.</param>
         public void Invoke(ICommand command, bool logHandler)
         {
             if (logHandler)
diff --git a/Modules/CommandStateObserver/Commands/CommandTargetExtensions.cs b/Modules/CommandStateObserver/Commands/CommandTargetExtensions.cs
index c363337347..63ea14589b 100644
--- a/Modules/CommandStateObserver/Commands/CommandTargetExtensions.cs
+++ b/Modules/CommandStateObserver/Commands/CommandTargetExtensions.cs
@@ -6,6 +6,9 @@
 
 namespace Unity.CommandStateObserver
 {
+    /// <summary>
+    /// Extension methods for <see cref="ICommandTarget"/>.
+    /// </summary>
     static class CommandTargetExtensions
     {
         /// <summary>
diff --git a/Modules/CommandStateObserver/Commands/ICommandTarget.cs b/Modules/CommandStateObserver/Commands/ICommandTarget.cs
index 303395e69f..42d51afcf1 100644
--- a/Modules/CommandStateObserver/Commands/ICommandTarget.cs
+++ b/Modules/CommandStateObserver/Commands/ICommandTarget.cs
@@ -7,7 +7,7 @@
 namespace Unity.CommandStateObserver
 {
     /// <summary>
-    /// Interface that defines the target of a command.
+    /// Interface for the target of a command.
     /// </summary>
     interface ICommandTarget
     {
@@ -19,7 +19,7 @@ interface ICommandTarget
         void Dispatch(ICommand command, Diagnostics diagnosticsFlags = Diagnostics.None);
 
         /// <summary>
-        /// Registers a handler for a command type.
+        /// Registers a handler for a command type. Replaces any previously registered handler for the command type.
         /// </summary>
         /// <param name="commandHandlerFunctor">The command handler.</param>
         /// <typeparam name="TCommand">The command type.</typeparam>
diff --git a/Modules/CommandStateObserver/Commands/IHierarchicalCommandTarget.cs b/Modules/CommandStateObserver/Commands/IHierarchicalCommandTarget.cs
index 9d94f81be8..8705307d35 100644
--- a/Modules/CommandStateObserver/Commands/IHierarchicalCommandTarget.cs
+++ b/Modules/CommandStateObserver/Commands/IHierarchicalCommandTarget.cs
@@ -5,7 +5,7 @@
 namespace Unity.CommandStateObserver
 {
     /// <summary>
-    /// A command target that also send the command to its parent.
+    /// A <see cref="ICommandTarget"/> that also send the command to its parent.
     /// </summary>
     interface IHierarchicalCommandTarget : ICommandTarget
     {
diff --git a/Modules/CommandStateObserver/Commands/ModelCommand.cs b/Modules/CommandStateObserver/Commands/ModelCommand.cs
index b823fbf255..e4fd6fc3f3 100644
--- a/Modules/CommandStateObserver/Commands/ModelCommand.cs
+++ b/Modules/CommandStateObserver/Commands/ModelCommand.cs
@@ -4,11 +4,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Unity.CommandStateObserver
 {
     /// <summary>
-    /// Base class for commands that affect models.
+    /// Base class for <see cref="UndoableCommand"/> that affect one or more models that share a common type.
     /// </summary>
     /// <typeparam name="TModel">The type of the affected models.</typeparam>
     abstract class ModelCommand<TModel> : UndoableCommand
@@ -41,7 +42,7 @@ protected ModelCommand(string undoStringSingular, string undoStringPlural, IRead
     }
 
     /// <summary>
-    /// Base class for commands that set a single value on one or many models.
+    /// Base class for <see cref="UndoableCommand"/> that set a single value on one or many models.
     /// </summary>
     /// <typeparam name="TModel">The type of the models.</typeparam>
     /// <typeparam name="TValue">The type of the value to set on the models.</typeparam>
@@ -52,12 +53,20 @@ abstract class ModelCommand<TModel, TValue> : ModelCommand<TModel>
         /// </summary>
         public TValue Value;
 
-        /// <inheritdoc cref="ModelCommand{TModel}(string)"/>
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModelCommand{TModel, TValue}" /> class.
+        /// </summary>
+        /// <param name="undoString">The string to display in the undo menu item.</param>
         protected ModelCommand(string undoString) : base(undoString)
         {
         }
 
-        /// <inheritdoc cref="ModelCommand{TModel}(string, string, IReadOnlyList{TModel})"/>
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModelCommand{TModel, TValue}" /> class.
+        /// </summary>
+        /// <param name="undoStringSingular">The string to display in the undo menu item when there is only one model affected.</param>
+        /// <param name="undoStringPlural">The string to display in the undo menu item when there are many models affected.</param>
+        /// <param name="models">The models affected by the command.</param>
         protected ModelCommand(string undoStringSingular, string undoStringPlural,
                                TValue value,
                                IReadOnlyList<TModel> models)
diff --git a/Modules/CommandStateObserver/CsoTool.cs b/Modules/CommandStateObserver/CsoTool.cs
index f1376b0a0e..cf35e2c2c2 100644
--- a/Modules/CommandStateObserver/CsoTool.cs
+++ b/Modules/CommandStateObserver/CsoTool.cs
@@ -9,29 +9,26 @@
 namespace Unity.CommandStateObserver
 {
     /// <summary>
-    /// Defines a tool that uses a dispatcher and a state.
+    /// Holds and binds together the tool's <see cref="State"/>, its <see cref="Dispatcher"/> and the <see cref="ObserverManager"/>.
     /// </summary>
     abstract class CsoTool : IDisposable, ICommandTarget
     {
         /// <summary>
-        /// Creates and initializes a new tool.
+        /// Creates and initializes a new <see cref="CsoTool"/>.
         /// </summary>
         /// <typeparam name="T">The type of tool to create.</typeparam>
         /// <returns>The newly created tool.</returns>
-        public static T Create<T>(Hash128 windowID) where T : CsoTool, new()
+        public static T Create<T>() where T : CsoTool, new()
         {
             var tool = new T();
-            tool.WindowID = windowID;
             tool.Initialize();
             return tool;
         }
 
-        protected Hash128 WindowID { get; private set; }
-
         /// <summary>
         /// The command dispatcher.
         /// </summary>
-        protected Dispatcher Dispatcher { get; set; }
+        public Dispatcher Dispatcher { get; protected set; }
 
         /// <summary>
         /// The observer manager.
@@ -44,7 +41,7 @@ abstract class CsoTool : IDisposable, ICommandTarget
         public IState State { get; protected set; }
 
         /// <summary>
-        /// Creates and initializes a command dispatcher.
+        /// Creates and initializes the tool's command dispatcher.
         /// </summary>
         protected virtual void InitDispatcher()
         {
@@ -52,7 +49,7 @@ protected virtual void InitDispatcher()
         }
 
         /// <summary>
-        /// Creates and initializes an observer manager.
+        /// Creates and initializes the tool's observer manager.
         /// </summary>
         protected virtual void InitObserverManager()
         {
@@ -60,10 +57,11 @@ protected virtual void InitObserverManager()
         }
 
         /// <summary>
-        /// Creates and initializes the state.
+        /// Creates and initializes the tool's state.
         /// </summary>
         /// <remarks>
-        /// Derived tool classes should override this method to create the tool state components and add them to the <see cref="State"/>
+        /// Derived classes should override this method to create the tool
+        /// state components and add them to the <see cref="State"/>
         /// </remarks>
         protected virtual void InitState()
         {
@@ -115,19 +113,43 @@ protected virtual void Dispose(bool disposing)
             }
         }
 
+        /// <summary>
+        /// Updates the state by running the observers.
+        /// </summary>
+        public virtual void Update()
+        {
+            ObserverManager.NotifyObservers(State);
+        }
+
         /// <inheritdoc />
+        /// <summary>
+        /// Dispatches a command to the tool.
+        /// </summary>
+        /// <param name="command">The command to dispatch.</param>
+        /// <param name="diagnosticsFlags">Diagnostic flags for the dispatch process.</param>
         public virtual void Dispatch(ICommand command, Diagnostics diagnosticsFlags = Diagnostics.None)
         {
             Dispatcher?.Dispatch(command, diagnosticsFlags);
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Registers a handler for a command type. Replaces any previously registered handler for the command type.
+        /// </summary>
+        /// <param name="commandHandlerFunctor">The command handler.</param>
+        /// <typeparam name="TCommand">The command type.</typeparam>
         public void RegisterCommandHandler<TCommand>(ICommandHandlerFunctor commandHandlerFunctor) where TCommand : ICommand
         {
             Dispatcher?.RegisterCommandHandler<TCommand>(commandHandlerFunctor);
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Unregisters the command handler for a command type.
+        /// </summary>
+        /// <remarks>
+        /// Since there is only one command handler registered for a command type, it is not necessary
+        /// to specify the command handler to unregister.
+        /// </remarks>
+        /// <typeparam name="TCommand">The command type.</typeparam>
         public void UnregisterCommandHandler<TCommand>() where TCommand : ICommand
         {
             Dispatcher?.UnregisterCommandHandler<TCommand>();
diff --git a/Modules/CommandStateObserver/Dispatcher.cs b/Modules/CommandStateObserver/Dispatcher.cs
index 5384f536f6..f727e55194 100644
--- a/Modules/CommandStateObserver/Dispatcher.cs
+++ b/Modules/CommandStateObserver/Dispatcher.cs
@@ -56,7 +56,7 @@ class Dispatcher : ICommandTarget
         protected bool IsDispatching => m_CurrentCommand != null;
 
         /// <summary>
-        /// Registers a handler for a command type.
+        /// Registers a handler for a command type. Replaces any previously registered handler for the command type.
         /// </summary>
         /// <param name="commandHandlerFunctor">The command handler.</param>
         public void RegisterCommandHandler<TCommand>(ICommandHandlerFunctor commandHandlerFunctor) where TCommand : ICommand
@@ -73,7 +73,7 @@ public void RegisterCommandHandler<TCommand>(ICommandHandlerFunctor commandHandl
         }
 
         /// <summary>
-        /// Gets a command handler for a command type.
+        /// Gets the command handler for a command type.
         /// </summary>
         /// <typeparam name="TCommand">The type of the command.</typeparam>
         /// <returns>The command handler for the command, or null if there is none.</returns>
@@ -83,7 +83,7 @@ public ICommandHandlerFunctor GetCommandHandler<TCommand>() where TCommand : ICo
         }
 
         /// <summary>
-        /// Gets a command handler for a command type.
+        /// Gets the command handler for a command type.
         /// </summary>
         /// <param name="commandType">The type of the command.</param>
         /// <returns>The command handler for the command, or null if there is none.</returns>
@@ -115,9 +115,6 @@ public void UnregisterCommandHandler<TCommand>() where TCommand : ICommand
         /// <summary>
         /// Registers a method to be called before dispatching a command.
         /// </summary>
-        /// <remarks>
-        /// The callback will be called whenever a command is dispatched.
-        /// </remarks>
         /// <param name="callback">The callback.</param>
         /// <exception cref="InvalidOperationException">Thrown when the callback is already registered.</exception>
         public void RegisterCommandPreDispatchCallback(Action<ICommand> callback)
@@ -151,8 +148,7 @@ public void UnregisterCommandPreDispatchCallback(Action<ICommand> callback)
         }
 
         /// <summary>
-        /// Dispatches a command. This will call all command observers; then the command handler
-        /// registered for this command will be executed.
+        /// Dispatches a command: the command handler registered for this command will be executed.
         /// </summary>
         /// <param name="command">The command to dispatch.</param>
         /// <param name="diagnosticsFlags">Flags to control logging.</param>
@@ -193,7 +189,8 @@ public virtual void Dispatch(ICommand command, Diagnostics diagnosticsFlags = Di
         }
 
         /// <summary>
-        /// Called when a command is dispatched, before the command handler is executed.
+        /// Called when a command is dispatched, before the command handler is executed,
+        /// but after the pre-dispatch callbacks.
         /// </summary>
         /// <param name="command">The command being dispatched.</param>
         protected virtual void PreDispatchCommand(ICommand command)
diff --git a/Modules/CommandStateObserver/ObserverManager.cs b/Modules/CommandStateObserver/ObserverManager.cs
index f609b4c5d7..147cb137fb 100644
--- a/Modules/CommandStateObserver/ObserverManager.cs
+++ b/Modules/CommandStateObserver/ObserverManager.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.Profiling;
 using UnityEngine;
 
 namespace Unity.CommandStateObserver
@@ -24,18 +25,20 @@ class ObserverManager
         readonly HashSet<IStateComponent> m_DirtyComponentSet = new HashSet<IStateComponent>();
         readonly List<IStateObserver> m_NewObservers = new List<IStateObserver>();
 
+        int m_MarkerUniqueId = 0;
+        Dictionary<IStateObserver, ProfilerMarker> m_ProfilerMarkers = new ();
+
         /// <summary>
         /// Returns true if the observers are being notified.
         /// </summary>
         bool IsObserving { get; set; }
 
         /// <summary>
-        /// Registers a state observer.
+        /// Registers a state observer to the manager.
         /// </summary>
         /// <remarks>
-        /// The content of <see cref="StateObserver.ObservedStateComponents"/> and
-        /// <see cref="StateObserver.ModifiedStateComponents"/> should not change once the
-        /// observer is registered.
+        /// If the content of <see cref="StateObserver.ObservedStateComponents"/> is modified after
+        /// the observer is registered, the observer should be unregistered and registered again.
         /// </remarks>
         /// <param name="observer">The observer.</param>
         /// <exception cref="InvalidOperationException">Thrown when the observer is already registered.</exception>
@@ -45,6 +48,7 @@ public void RegisterObserver(IStateObserver observer)
                 return;
 
             m_NewObservers.Add(observer);
+            m_ProfilerMarkers[observer] = new ProfilerMarker($"{observer.GetType()}_{m_MarkerUniqueId++}.Observe");
 
             foreach (var component in observer.ObservedStateComponents)
             {
@@ -63,7 +67,7 @@ public void RegisterObserver(IStateObserver observer)
         }
 
         /// <summary>
-        /// Unregisters a state observer.
+        /// Unregisters a state observer from the manager.
         /// </summary>
         /// <param name="observer">The observer.</param>
         public void UnregisterObserver(IStateObserver observer)
@@ -80,6 +84,7 @@ public void UnregisterObserver(IStateObserver observer)
             }
 
             m_NewObservers.Remove(observer);
+            m_ProfilerMarkers.Remove(observer);
         }
 
         void SortObservers()
@@ -92,6 +97,7 @@ void SortObservers()
         }
 
         // Will modify observersToSort.
+        // Internal for tests.
         internal static void SortObservers_Internal(List<IStateObserver> observersToSort, out List<IStateObserver> sortedObservers)
         {
             sortedObservers = new List<IStateObserver>(observersToSort.Count);
@@ -132,12 +138,9 @@ internal static void SortObservers_Internal(List<IStateObserver> observersToSort
         }
 
         /// <summary>
-        /// Notifies state observers that the state has changed.
+        /// Notifies state observers that the state they observe has changed.
         /// </summary>
-        /// <remarks>
-        /// State observers will only be notified if the state components they are observing have changed.
-        /// </remarks>
-        /// <param name="state">The observed state.</param>
+        /// <param name="state">The state.</param>
         public virtual void NotifyObservers(IState state)
         {
             if (!IsObserving)
@@ -150,31 +153,38 @@ public virtual void NotifyObservers(IState state)
                         SortObservers();
 
                     m_ObserverCallList.Clear();
-                    if (m_SortedObservers.Count > 0)
+                    if (m_SortedObservers!.Count > 0)
                     {
                         m_DirtyComponentSet.Clear();
 
-                        foreach (var component in state.AllStateComponents)
+                        foreach (var observer in m_SortedObservers)
                         {
-                            if (component.HasChanges())
-                            {
-                                m_DirtyComponentSet.Add(component);
-                            }
-                        }
+                            var addToCallList =
+                                m_DirtyComponentSet.Overlaps(observer.ObservedStateComponents) ||
+                                m_NewObservers.Contains(observer);
 
-                        if (m_DirtyComponentSet.Count > 0 || m_NewObservers.Count > 0)
-                        {
-                            foreach (var observer in m_SortedObservers)
+                            if (!addToCallList)
                             {
-                                if (m_DirtyComponentSet.Overlaps(observer.ObservedStateComponents) || m_NewObservers.Contains(observer))
+                                foreach (var observedStateComponent in observer.ObservedStateComponents)
                                 {
-                                    m_ObserverCallList.Add(observer);
-                                    m_DirtyComponentSet.UnionWith(observer.ModifiedStateComponents);
+                                    var lastObservedVersion = (observer as IInternalStateObserver_Internal)?.GetLastObservedComponentVersion_Internal(observedStateComponent) ?? default;
+                                    var updateType = observedStateComponent.GetObserverUpdateType(lastObservedVersion);
+                                    if (updateType != UpdateType.None)
+                                    {
+                                        addToCallList = true;
+                                        break;
+                                    }
                                 }
                             }
 
-                            m_NewObservers.Clear();
+                            if (addToCallList)
+                            {
+                                m_ObserverCallList.Add(observer);
+                                m_DirtyComponentSet.UnionWith(observer.ModifiedStateComponents);
+                            }
                         }
+
+                        m_NewObservers.Clear();
                     }
 
                     if (m_ObserverCallList.Any())
@@ -184,7 +194,10 @@ public virtual void NotifyObservers(IState state)
                             foreach (var observer in m_ObserverCallList)
                             {
                                 StateObserverHelper_Internal.CurrentObserver_Internal = observer;
-                                observer.Observe();
+                                using (m_ProfilerMarkers[observer].Auto())
+                                {
+                                    observer.Observe();
+                                }
                             }
                         }
                         finally
@@ -192,7 +205,7 @@ public virtual void NotifyObservers(IState state)
                             StateObserverHelper_Internal.CurrentObserver_Internal = null;
                         }
 
-                        // If m_ObserverCallSet is empty, observed versions did not change, so changesets do not need to be purged.
+                        // If m_ObserverCallList is empty, observed versions did not change, so changesets do not need to be purged.
 
                         // For each state component, find the earliest observed version in all observers and purge the
                         // changesets that are earlier than this earliest version.
@@ -213,7 +226,7 @@ public virtual void NotifyObservers(IState state)
                                 }
                             }
 
-                            editorStateComponent.PurgeOldChangesets(earliestObservedVersion);
+                            editorStateComponent.PurgeObsoleteChangesets(earliestObservedVersion);
                         }
                     }
                 }
diff --git a/Modules/CommandStateObserver/Observers/IInternalStateObserver_Internal.cs b/Modules/CommandStateObserver/Observers/IInternalStateObserver_Internal.cs
index c003a6fb80..14a55b490f 100644
--- a/Modules/CommandStateObserver/Observers/IInternalStateObserver_Internal.cs
+++ b/Modules/CommandStateObserver/Observers/IInternalStateObserver_Internal.cs
@@ -25,6 +25,9 @@ interface IInternalStateObserver_Internal
 
     static class StateObserverHelper_Internal
     {
+        /// <summary>
+        /// The currently active observer.
+        /// </summary>
         internal static IStateObserver CurrentObserver_Internal { get; set; }
     }
 }
diff --git a/Modules/CommandStateObserver/Observers/IStateObserver.cs b/Modules/CommandStateObserver/Observers/IStateObserver.cs
index 88506106ed..3f0d7c701a 100644
--- a/Modules/CommandStateObserver/Observers/IStateObserver.cs
+++ b/Modules/CommandStateObserver/Observers/IStateObserver.cs
@@ -18,7 +18,7 @@ interface IStateObserver
         IEnumerable<IStateComponent> ObservedStateComponents { get; }
 
         /// <summary>
-        /// The state components modified by the observer.
+        /// The state components that can be modified by the observer.
         /// </summary>
         IEnumerable<IStateComponent> ModifiedStateComponents { get; }
 
diff --git a/Modules/CommandStateObserver/Observers/Observation.cs b/Modules/CommandStateObserver/Observers/Observation.cs
index 032e3dab40..043244b51c 100644
--- a/Modules/CommandStateObserver/Observers/Observation.cs
+++ b/Modules/CommandStateObserver/Observers/Observation.cs
@@ -9,11 +9,11 @@
 namespace Unity.CommandStateObserver
 {
     /// <summary>
-    /// A class used to encompass observations by an <see cref="IStateObserver"/> on an <see cref="IStateComponent"/>.
+    /// A class used to represent observations by an <see cref="IStateObserver"/> on an <see cref="IStateComponent"/>.
     /// </summary>
     /// <remarks>
-    /// Instances of this class fetch the update type from the observed component and optionally update
-    /// the last observed version of the observer. They can be used in a using() context.
+    /// Instances of this class can be used in a using() context. To get an <see cref="Observation"/> object,
+    /// use one of the <see cref="StateObserverExtensions"/> method.
     /// </remarks>
     class Observation : IDisposable
     {
@@ -22,7 +22,7 @@ class Observation : IDisposable
         bool m_UpdateObserverVersion;
 
         /// <summary>
-        /// The update type for the observation. This tells the observer how it should do its update.
+        /// The update type for the observation.
         /// </summary>
         public UpdateType UpdateType { get; }
 
@@ -46,7 +46,7 @@ internal static Observation Create_Internal(IStateObserver observer, IStateCompo
         Observation(IStateObserver observer, IStateComponent observedComponent, bool updateObserverVersion = true)
         {
             Assert.IsTrue(observer.ObservedStateComponents.Contains(observedComponent),
-                $"Observer {observer.GetType().FullName} does not specify that it observes {observedComponent}. Please add the state component to its {nameof(IStateObserver.ObservedStateComponents)}.");
+                $"Observer {observer.GetType().FullName} does not state that it observes {observedComponent}. Please add the state component to its {nameof(IStateObserver.ObservedStateComponents)}.");
 
             m_ObservedComponent = observedComponent;
             m_Observer = observer;
@@ -54,7 +54,7 @@ internal static Observation Create_Internal(IStateObserver observer, IStateCompo
 
             var internalObserver = m_Observer as IInternalStateObserver_Internal;
             var lastObservedVersion = internalObserver?.GetLastObservedComponentVersion_Internal(observedComponent) ?? default;
-            UpdateType = m_ObservedComponent.GetUpdateType(lastObservedVersion);
+            UpdateType = m_ObservedComponent.GetObserverUpdateType(lastObservedVersion);
             LastObservedVersion = lastObservedVersion.Version;
         }
 
diff --git a/Modules/CommandStateObserver/Observers/StateObserver.cs b/Modules/CommandStateObserver/Observers/StateObserver.cs
index 15cf874988..29219984be 100644
--- a/Modules/CommandStateObserver/Observers/StateObserver.cs
+++ b/Modules/CommandStateObserver/Observers/StateObserver.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.Collections;
 
 namespace Unity.CommandStateObserver
 {
@@ -16,10 +17,14 @@ abstract class StateObserver : IInternalStateObserver_Internal, IStateObserver
         List<(IStateComponent, StateComponentVersion)> m_ObservedComponentVersions;
         List<IStateComponent> m_ModifiedStateComponents;
 
-        /// <inheritdoc />
+        /// <summary>
+        /// The state components observed by the observer.
+        /// </summary>
         public IEnumerable<IStateComponent> ObservedStateComponents => m_ObservedComponentVersions.Select(t => t.Item1);
 
-        /// <inheritdoc />
+        /// <summary>
+        /// The state components that can be modified by the observer.
+        /// </summary>
         public IEnumerable<IStateComponent> ModifiedStateComponents => m_ModifiedStateComponents;
 
         /// <summary>
@@ -41,14 +46,22 @@ protected StateObserver(IEnumerable<IStateComponent> observedStateComponents, IE
             m_ModifiedStateComponents = modifiedStateComponents.Distinct().ToList();
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the last observed component version of <paramref name="stateComponent"/>.
+        /// </summary>
+        /// <param name="stateComponent">The state component for which to get the last observed version.</param>
+        /// <returns>Returns the last observed component version of <paramref name="stateComponent"/>.</returns>
         StateComponentVersion IInternalStateObserver_Internal.GetLastObservedComponentVersion_Internal(IStateComponent stateComponent)
         {
             var index = m_ObservedComponentVersions.FindIndex(v => v.Item1 == stateComponent);
             return index >= 0 ? m_ObservedComponentVersions[index].Item2 : default;
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Updates the observed version for component <paramref name="stateComponent"/> to <paramref name="newVersion"/>.
+        /// </summary>
+        /// <param name="stateComponent">The state component for which to update the version.</param>
+        /// <param name="newVersion">The new version.</param>
         void IInternalStateObserver_Internal.UpdateObservedVersion_Internal(IStateComponent stateComponent, StateComponentVersion newVersion)
         {
             var index = m_ObservedComponentVersions.FindIndex(v => v.Item1 == stateComponent);
@@ -56,7 +69,9 @@ void IInternalStateObserver_Internal.UpdateObservedVersion_Internal(IStateCompon
                 m_ObservedComponentVersions[index] = (stateComponent, newVersion);
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Observes the <see cref="IStateObserver.ObservedStateComponents"/> and modifies the <see cref="IStateObserver.ModifiedStateComponents"/>.
+        /// </summary>
         public abstract void Observe();
     }
 }
diff --git a/Modules/CommandStateObserver/Observers/StateObserverExtensions.cs b/Modules/CommandStateObserver/Observers/StateObserverExtensions.cs
index 186c98b145..efb27d6268 100644
--- a/Modules/CommandStateObserver/Observers/StateObserverExtensions.cs
+++ b/Modules/CommandStateObserver/Observers/StateObserverExtensions.cs
@@ -14,7 +14,7 @@ namespace Unity.CommandStateObserver
     static class StateObserverExtensions
     {
         /// <summary>
-        /// Creates a new <see cref="Observation"/> instance that will update the observer's last observed version.
+        /// Creates a new <see cref="Observation"/> instance.
         /// </summary>
         /// <param name="observer">The observer.</param>
         /// <param name="stateComponent">The observed state component.</param>
@@ -25,22 +25,26 @@ public static Observation ObserveState(this IStateObserver observer, IStateCompo
         }
 
         /// <summary>
-        /// Creates new <see cref="Observation"/> instances that will update the observer's last observed version.
+        /// Creates new <see cref="Observation"/> instances for a single observer observing multiple state components.
         /// </summary>
-        /// <param name="observer">The observers.</param>
+        /// <param name="observer">The observer.</param>
         /// <param name="stateComponents">The observed state components.</param>
-        /// <returns>An <see cref="IEnumerable{Observation}"/> object.</returns>
+        /// <returns>The observations as an <see cref="IEnumerable{Observation}"/> object.</returns>
         public static IEnumerable<Observation> ObserveStates(this IStateObserver observer, IEnumerable<IStateComponent> stateComponents)
         {
             return stateComponents.Select(s => Observation.Create_Internal(observer, s));
         }
 
         /// <summary>
-        /// Creates a new <see cref="Observation"/> instance that will not update the observer's last observed version.
+        /// Creates a new <see cref="Observation"/> instance.
         /// </summary>
         /// <param name="observer">The observer.</param>
         /// <param name="stateComponent">The observed state component.</param>
         /// <returns>An <see cref="Observation"/> object.</returns>
+        /// <remarks>The observation returned by this method will not change the observer's
+        /// last observed version of the state component.
+        /// Thus, this method can be used to find out if an observer needs to schedule
+        /// an <see cref="ObserveState"/> to be done at a later time.</remarks>
         public static Observation PeekAtState(this IStateObserver observer, IStateComponent stateComponent)
         {
             return Observation.Create_Internal(observer, stateComponent, false);
diff --git a/Modules/CommandStateObserver/Observers/UpdateType.cs b/Modules/CommandStateObserver/Observers/UpdateType.cs
index e47e36fb69..66a2ab7ebd 100644
--- a/Modules/CommandStateObserver/Observers/UpdateType.cs
+++ b/Modules/CommandStateObserver/Observers/UpdateType.cs
@@ -12,18 +12,18 @@ namespace Unity.CommandStateObserver
     enum UpdateType
     {
         /// <summary>
-        /// The observer is up-to-date with the state and no update is necessary.
+        /// The <see cref="IStateComponent"/> has not changed since the last observation.
         /// </summary>
         None,
 
         /// <summary>
-        /// The state component maintains changesets and the observer is sufficiently up-to-date
-        /// to use them to incrementally update itself.
+        /// The <see cref="IStateComponent"/> can provide a description of what changed since the last observation.
         /// </summary>
         Partial,
 
         /// <summary>
-        /// The observer should do a complete update.
+        /// The <see cref="IStateComponent"/> cannot provide a description of what changed.
+        /// Any data held by the <see cref="IStateComponent"/> may have changed.
         /// </summary>
         Complete,
     }
diff --git a/Modules/CommandStateObserver/Observers/UpdateTypeExtensions.cs b/Modules/CommandStateObserver/Observers/UpdateTypeExtensions.cs
index f3b11f593c..a32c60d2f1 100644
--- a/Modules/CommandStateObserver/Observers/UpdateTypeExtensions.cs
+++ b/Modules/CommandStateObserver/Observers/UpdateTypeExtensions.cs
@@ -13,15 +13,16 @@ namespace Unity.CommandStateObserver
     static class UpdateTypeExtensions
     {
         /// <summary>
-        /// Combines two update types together.
+        /// Combines two <see cref="UpdateType"/> together.
         /// </summary>
         /// <remarks>
-        /// Use this method when an observer observes more than one state component and
-        /// you want to combine the update types returned by each.
+        /// Use this method when an <see cref="IStateObserver"/> observes more
+        /// than one <see cref="IStateComponent"/> and
+        /// you want to combine the <see cref="UpdateType"/> returned by each.
         /// </remarks>
-        /// <param name="self">The first update type.</param>
-        /// <param name="other">The second update type.</param>
-        /// <returns>The combined update type.</returns>
+        /// <param name="self">The first <see cref="UpdateType"/>.</param>
+        /// <param name="other">The second <see cref="UpdateType"/>.</param>
+        /// <returns>The combined <see cref="UpdateType"/>.</returns>
         public static UpdateType Combine(this UpdateType self, UpdateType other)
         {
             if (self == UpdateType.Complete || other == UpdateType.Complete)
@@ -34,14 +35,15 @@ public static UpdateType Combine(this UpdateType self, UpdateType other)
         }
 
         /// <summary>
-        /// Combines update types together.
+        /// Combines <see cref="UpdateType"/> together.
         /// </summary>
         /// <remarks>
-        /// Use this method when an observer observes more than one state component and
-        /// you want to combine the update types returned by each.
+        /// Use this method when an <see cref="IStateObserver"/> observes more
+        /// than one <see cref="IStateComponent"/> and
+        /// you want to combine the <see cref="UpdateType"/> returned by each.
         /// </remarks>
-        /// <param name="updateTypes">The update types to combine.</param>
-        /// <returns>The combined update type.</returns>
+        /// <param name="updateTypes">The <see cref="UpdateType"/>s to combine.</param>
+        /// <returns>The combined <see cref="UpdateType"/>.</returns>
         public static UpdateType Combine(IEnumerable<UpdateType> updateTypes)
         {
             var partialFound = false;
diff --git a/Modules/CommandStateObserver/States/ChangesetManager.cs b/Modules/CommandStateObserver/States/ChangesetManager.cs
index dc347c0fe4..1e508659f4 100644
--- a/Modules/CommandStateObserver/States/ChangesetManager.cs
+++ b/Modules/CommandStateObserver/States/ChangesetManager.cs
@@ -25,68 +25,114 @@ namespace Unity.CommandStateObserver
         /// </summary>
         public TChangeset CurrentChangeset { get; private set; } = new TChangeset();
 
+        // Used by tests.
+        internal TChangeset LastChangeset_Internal
+        {
+            get
+            {
+                if (m_Changesets.Count > 0)
+                {
+                    return m_Changesets[^1].Changeset;
+                }
+
+                return null;
+            }
+        }
+
         IChangeset IChangesetManager.CurrentChangeset => CurrentChangeset;
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Pushes the current changeset in the changeset list, tagging it with <paramref name="version"/>.
+        /// </summary>
+        /// <param name="version">The version number used to tag the current changeset.</param>
         public void PushChangeset(uint version)
         {
             m_Changesets.Add((version, CurrentChangeset));
             CurrentChangeset = new TChangeset();
         }
 
-        /// <inheritdoc />
-        public uint PurgeOldChangesets(uint untilVersion, uint currentVersion)
+        /// <summary>
+        /// Removes changesets tagged with a version number
+        /// lower or equal to <paramref name="upToAndIncludingVersion"/> from the changeset list.
+        /// </summary>
+        /// <param name="upToAndIncludingVersion">Remove changesets up to and including this version.</param>
+        /// <param name="currentVersion">The version associated with the current changeset.</param>
+        public void PurgeChangesets(uint upToAndIncludingVersion, uint currentVersion)
         {
-            int countToRemove = 0;
-            while (countToRemove < m_Changesets.Count && m_Changesets[countToRemove].Version <= untilVersion)
+            if (upToAndIncludingVersion == uint.MaxValue)
             {
-                countToRemove++;
+                m_Changesets.Clear();
+            }
+            else
+            {
+                int countToRemove = 0;
+                while (countToRemove < m_Changesets.Count && m_Changesets[countToRemove].Version <= upToAndIncludingVersion)
+                {
+                    countToRemove++;
+                }
+
+                if (countToRemove > 0)
+                    m_Changesets.RemoveRange(0, countToRemove);
             }
 
-            if (countToRemove > 0)
-                m_Changesets.RemoveRange(0, countToRemove);
-
-            if (untilVersion >= currentVersion)
+            if (upToAndIncludingVersion > currentVersion)
             {
                 CurrentChangeset.Clear();
-                return currentVersion;
             }
+        }
+
+        /// <summary>
+        /// Gets the version number of the earliest changeset.
+        /// </summary>
+        /// <returns>The version number of the earliest changeset, or uint.MaxValue if there is no changeset.</returns>
+        public uint GetEarliestChangesetVersion()
+        {
+            return m_Changesets.Count > 0 ? m_Changesets[0].Version : uint.MaxValue;
+        }
 
-            return m_Changesets.Count > 0 ? m_Changesets[0].Version : currentVersion;
+        /// <summary>
+        /// Gets a changeset that encompasses all changeset having a version larger than <paramref name="afterVersion"/>.
+        /// </summary>
+        /// <param name="afterVersion">The version from which to consider changesets.</param>
+        /// <param name="currentVersion">The version associated with the current changeset. This should be the current version of the state component.</param>
+        /// <returns>The aggregated changeset.</returns>
+        IChangeset IChangesetManager.GetAggregatedChangeset(uint afterVersion, uint currentVersion)
+        {
+            return GetAggregatedChangeset(afterVersion, currentVersion);
         }
 
         /// <summary>
-        /// Gets a changeset that encompasses all changeset having a version larger than <paramref name="sinceVersion"/>.
+        /// Gets a changeset that encompasses all changeset having a version greater than <paramref name="afterVersion"/>.
         /// </summary>
-        /// <param name="sinceVersion">The version from which to consider changesets.</param>
+        /// <param name="afterVersion">The version from which to consider changesets.</param>
         /// <param name="currentVersion">The version associated with the current changeset. This should be the current version of the state component.</param>
         /// <returns>The aggregated changeset.</returns>
-        public TChangeset GetAggregatedChangeset(uint sinceVersion, uint currentVersion)
+        public TChangeset GetAggregatedChangeset(uint afterVersion, uint currentVersion)
         {
-            if (m_AggregatedChangesetCacheVersionFrom != sinceVersion || m_AggregatedChangesetCacheVersionTo != currentVersion)
+            if (m_AggregatedChangesetCacheVersionFrom != afterVersion || m_AggregatedChangesetCacheVersionTo != currentVersion)
                 m_AggregatedChangesetCache = null;
 
             if (m_AggregatedChangesetCache != null)
                 return m_AggregatedChangesetCache;
 
             var changesetList = m_Changesets
-                .Where(c => c.Version > sinceVersion)
+                .Where(c => c.Version > afterVersion)
                 .Select(c => c.Changeset)
                 .ToList();
 
             if (changesetList.Count == 0)
             {
-                return currentVersion > sinceVersion ? CurrentChangeset : null;
+                return currentVersion > afterVersion ? CurrentChangeset : null;
             }
 
-            if (currentVersion > sinceVersion)
+            if (currentVersion > afterVersion)
             {
                 changesetList.Add(CurrentChangeset);
             }
 
             m_AggregatedChangesetCache = new TChangeset();
             m_AggregatedChangesetCache.AggregateFrom(changesetList);
-            m_AggregatedChangesetCacheVersionFrom = sinceVersion;
+            m_AggregatedChangesetCacheVersionFrom = afterVersion;
             m_AggregatedChangesetCacheVersionTo = currentVersion;
 
             return m_AggregatedChangesetCache;
diff --git a/Modules/CommandStateObserver/States/IChangeset.cs b/Modules/CommandStateObserver/States/IChangeset.cs
index d4c3e9c0b4..7f5968c9c3 100644
--- a/Modules/CommandStateObserver/States/IChangeset.cs
+++ b/Modules/CommandStateObserver/States/IChangeset.cs
@@ -26,9 +26,11 @@ interface IChangeset
         /// <summary>
         /// Reverse the direction of the changeset.
         /// </summary>
+        /// <returns>True it the changeset could be reversed, false otherwise.</returns>
         /// <remarks>
-        /// For example, if the changeset contains a list of created objects and a list of deleted objects,
-        /// the two lists should be swapped.
+        /// For example, if the changeset contains a list of created objects, a list of changed objects
+        /// and a list of deleted objects, the created and deleted lists should be swapped, and the
+        /// changed list remains the same.
         /// </remarks>
         bool Reverse();
     }
diff --git a/Modules/CommandStateObserver/States/IChangesetManager.cs b/Modules/CommandStateObserver/States/IChangesetManager.cs
index 13bbfe569d..5a0af9c59e 100644
--- a/Modules/CommandStateObserver/States/IChangesetManager.cs
+++ b/Modules/CommandStateObserver/States/IChangesetManager.cs
@@ -16,6 +16,14 @@ interface IChangesetManager
         /// </summary>
         IChangeset CurrentChangeset { get; }
 
+        /// <summary>
+        /// Gets a changeset that encompasses all changeset having a version larger than <paramref name="afterVersion"/>.
+        /// </summary>
+        /// <param name="afterVersion">The version from which to consider changesets.</param>
+        /// <param name="currentVersion">The version associated with the current changeset. This should be the current version of the state component.</param>
+        /// <returns>The aggregated changeset.</returns>
+        IChangeset GetAggregatedChangeset(uint afterVersion, uint currentVersion);
+
         /// <summary>
         /// Pushes the current changeset in the changeset list, tagging it with <paramref name="version"/>.
         /// </summary>
@@ -23,12 +31,17 @@ interface IChangesetManager
         void PushChangeset(uint version);
 
         /// <summary>
-        /// Removes obsolete changesets from the changeset list. Changesets tagged with a version number
-        /// lower or equal to <paramref name="untilVersion"/> are considered obsolete.
+        /// Removes changesets tagged with a version number
+        /// lower or equal to <paramref name="upToAndIncludingVersion"/> from the changeset list.
         /// </summary>
-        /// <param name="untilVersion">Purge changeset up to and including this version.</param>
-        /// <param name="currentVersion">The version associated with the current changeset. This should be the current version of the state component.</param>
-        /// <returns>The version number of the earliest changeset.</returns>
-        uint PurgeOldChangesets(uint untilVersion, uint currentVersion);
+        /// <param name="upToAndIncludingVersion">Remove changesets up to and including this version.</param>
+        /// <param name="currentVersion">The version associated with the current changeset.</param>
+        void PurgeChangesets(uint upToAndIncludingVersion, uint currentVersion);
+
+        /// <summary>
+        /// Gets the version number of the earliest changeset.
+        /// </summary>
+        /// <returns>The version number of the earliest changeset, or uint.MaxValue if there is no changeset.</returns>
+        uint GetEarliestChangesetVersion();
     }
 }
diff --git a/Modules/CommandStateObserver/States/IState.cs b/Modules/CommandStateObserver/States/IState.cs
index 72aae8b569..9c14438f15 100644
--- a/Modules/CommandStateObserver/States/IState.cs
+++ b/Modules/CommandStateObserver/States/IState.cs
@@ -8,7 +8,7 @@
 namespace Unity.CommandStateObserver
 {
     /// <summary>
-    /// Interface for state.
+    /// Interface for states.
     /// </summary>
     interface IState
     {
diff --git a/Modules/CommandStateObserver/States/IStateComponent.cs b/Modules/CommandStateObserver/States/IStateComponent.cs
index fedeb9da11..09e4d1163c 100644
--- a/Modules/CommandStateObserver/States/IStateComponent.cs
+++ b/Modules/CommandStateObserver/States/IStateComponent.cs
@@ -17,26 +17,20 @@ interface IStateComponent
         uint CurrentVersion { get; }
 
         /// <summary>
-        /// Checks if the state component has any available changesets.
-        /// </summary>
-        /// <returns>Returns true if the state component has any available changesets.</returns>
-        bool HasChanges();
-
-        /// <summary>
-        /// Purges the changesets that track changes up to and including <paramref name="untilVersion"/>.
+        /// Purges the changesets that track changes up to and including <paramref name="upToAndIncludingVersion"/>.
         /// </summary>
         /// <remarks>
         /// The state component can choose to purge more recent changesets.
         /// </remarks>
-        /// <param name="untilVersion">Version up to which we should purge changesets. Pass uint.MaxValue to purge all changesets.</param>
-        void PurgeOldChangesets(uint untilVersion);
+        /// <param name="upToAndIncludingVersion">Version up to which we should purge changesets. Pass uint.MaxValue to purge all changesets.</param>
+        void PurgeObsoleteChangesets(uint upToAndIncludingVersion);
 
         /// <summary>
         /// Gets the type of update an observer should do.
         /// </summary>
-        /// <param name="observerVersion">The last state component observed by the observer.</param>
+        /// <param name="observerVersion">The last state component version observed by the observer.</param>
         /// <returns>Returns the type of update an observer should do.</returns>
-        UpdateType GetUpdateType(StateComponentVersion observerVersion);
+        UpdateType GetObserverUpdateType(StateComponentVersion observerVersion);
 
         /// <summary>
         /// Called when the state component has been added to the state.
diff --git a/Modules/CommandStateObserver/States/IStateComponentUpdater.cs b/Modules/CommandStateObserver/States/IStateComponentUpdater.cs
index 6690887777..f926fcfb5e 100644
--- a/Modules/CommandStateObserver/States/IStateComponentUpdater.cs
+++ b/Modules/CommandStateObserver/States/IStateComponentUpdater.cs
@@ -12,26 +12,28 @@ namespace Unity.CommandStateObserver
     interface IStateComponentUpdater : IDisposable
     {
         /// <summary>
-        /// Initialize the updater with the state to update.
+        /// Initializes the updater with the state to update.
         /// </summary>
         /// <param name="state">The state to update.</param>
         void Initialize(IStateComponent state);
 
         /// <summary>
-        /// Moves the content of another state component into this state component.
+        /// Moves the content of a state component loaded from persistent storage into this state component.
         /// </summary>
         /// <param name="other">The source state component.</param>
-        /// <remarks>The <paramref name="other"/> state components will be discarded after the call to Move.
+        /// <remarks>The <paramref name="other"/> state components will be discarded after the call to
+        /// <see cref="RestoreFromPersistedState"/>.
         /// This means you do not need to make a deep copy of the data: just copying the references is sufficient.
         /// </remarks>
         void RestoreFromPersistedState(IStateComponent other);
 
         /// <summary>
-        /// Moves the content of another state component into this state component.
+        /// Moves the content of a state component obtained from the undo stack into this state component.
         /// </summary>
         /// <param name="other">The source state component.</param>
         /// <param name="changeset"></param>
-        /// <remarks>The <paramref name="other"/> state components will be discarded after the call to Move.
+        /// <remarks>The <paramref name="other"/> state components will be discarded after the call to
+        /// <see cref="RestoreFromUndo"/>.
         /// This means you do not need to make a deep copy of the data: just copying the references is sufficient.
         /// </remarks>
         void RestoreFromUndo(IStateComponent other, IChangeset changeset);
diff --git a/Modules/CommandStateObserver/States/State.cs b/Modules/CommandStateObserver/States/State.cs
index 3603b6fc8d..d90be09c15 100644
--- a/Modules/CommandStateObserver/States/State.cs
+++ b/Modules/CommandStateObserver/States/State.cs
@@ -16,7 +16,9 @@ class State : IState, IDisposable
 
         List<IStateComponent> m_StateComponents;
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Delegate called when state components are added to the state or removed from the state.
+        /// </summary>
         public Action<IState, IStateComponent> OnStateComponentListModified { get; set; } = null;
 
         /// <summary>
@@ -61,7 +63,10 @@ protected virtual void Dispose(bool disposing)
             m_Disposed = true;
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Adds a state component to the state.
+        /// </summary>
+        /// <param name="stateComponent">The state component to add.</param>
         public void AddStateComponent(IStateComponent stateComponent)
         {
             m_StateComponents.Add(stateComponent);
@@ -69,7 +74,10 @@ public void AddStateComponent(IStateComponent stateComponent)
             OnStateComponentListModified?.Invoke(this, stateComponent);
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Removes a state component from the state.
+        /// </summary>
+        /// <param name="stateComponent">The state component to remove.</param>
         public void RemoveStateComponent(IStateComponent stateComponent)
         {
             m_StateComponents.RemoveAll(c => c == stateComponent);
@@ -77,7 +85,9 @@ public void RemoveStateComponent(IStateComponent stateComponent)
             OnStateComponentListModified?.Invoke(this, stateComponent);
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// All the state components.
+        /// </summary>
         public virtual IEnumerable<IStateComponent> AllStateComponents => m_StateComponents;
     }
 }
diff --git a/Modules/CommandStateObserver/States/StateComponent.cs b/Modules/CommandStateObserver/States/StateComponent.cs
index c9bac5a212..4b308b96b5 100644
--- a/Modules/CommandStateObserver/States/StateComponent.cs
+++ b/Modules/CommandStateObserver/States/StateComponent.cs
@@ -15,14 +15,16 @@ namespace Unity.CommandStateObserver
     /// </summary>
     /// <remarks>
     /// <p>
-    /// State components should expose a readonly interface. All updates to a state component
+    /// <see cref="StateComponent{TUpdater}"/> should expose a readonly interface to the data they hold.
+    /// All updates to a <see cref="StateComponent{TUpdater}"/>
     /// should be done through an updater, which is an instance of a class deriving from <see cref="BaseUpdater{T}"/>.
     /// This ensures that change tracking is done properly.
     /// </p>
     /// <p>
-    /// State components are serialized and deserialized on undo/redo. Make sure that their fields behave properly
-    /// under these conditions. Either put the Serialized attribute on them or check that they are initialized
-    /// before accessing them.
+    /// <see cref="StateComponent{TUpdater}"/>s are serialized and deserialized on undo/redo.
+    /// Make sure that their fields behave properly
+    /// under these conditions. Either put the <see cref="SerializeField"/> attribute on them or check that
+    /// they are initialized before accessing them.
     /// </p>
     /// </remarks>
     [Serializable]
@@ -42,7 +44,10 @@ public abstract class BaseUpdater<TStateComponent> : IStateComponentUpdater wher
 
             string m_StackTrace;
 
-            /// <inheritdoc />
+            /// <summary>
+            /// Initializes the updater with the state to update.
+            /// </summary>
+            /// <param name="state">The state to update.</param>
             public void Initialize(IStateComponent state)
             {
                 if (m_State != null)
@@ -51,8 +56,15 @@ public void Initialize(IStateComponent state)
                     m_StackTrace = Environment.StackTrace;
                 }
 
-                m_State = state as TStateComponent;
-                BeginStateChange();
+                m_State = (TStateComponent)state;
+
+                if (StateObserverHelper_Internal.CurrentObserver_Internal != null &&
+                    !StateObserverHelper_Internal.CurrentObserver_Internal.ModifiedStateComponents.Contains(m_State))
+                {
+                    Debug.LogError($"Observer {StateObserverHelper_Internal.CurrentObserver_Internal?.GetType()} does not specify that it modifies {m_State}. Please add the state component to its {nameof(IStateObserver.ModifiedStateComponents)}.");
+                }
+
+                m_State.BeginChangeScope();
             }
 
             ~BaseUpdater()
@@ -77,7 +89,7 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     Assert.IsNotNull(m_State, "Missing Initialize call.");
-                    EndStateChange();
+                    m_State.EndChangeScope();
                     m_State = null;
                 }
             }
@@ -92,28 +104,8 @@ public bool IsUpdaterForState(IStateComponent stateComponent)
                 return m_State == stateComponent;
             }
 
-            void BeginStateChange()
-            {
-                if (StateObserverHelper_Internal.CurrentObserver_Internal != null &&
-                    !StateObserverHelper_Internal.CurrentObserver_Internal.ModifiedStateComponents.Contains(m_State))
-                {
-                    Debug.LogError($"Observer {StateObserverHelper_Internal.CurrentObserver_Internal?.GetType()} does not specify that it modifies {m_State}. Please add the state component to its {nameof(IStateObserver.ModifiedStateComponents)}.");
-                }
-
-                m_State.PushChangeset(m_State.CurrentVersion);
-            }
-
-            void EndStateChange()
-            {
-                // unchecked: wrap around on overflow without exception.
-                unchecked
-                {
-                    m_State.CurrentVersion++;
-                }
-            }
-
             /// <summary>
-            /// Force the state component to ask its observers to do a complete update.
+            /// Force the state component to tell its observers to do a complete update.
             /// </summary>
             public void ForceCompleteUpdate()
             {
@@ -121,10 +113,13 @@ public void ForceCompleteUpdate()
             }
 
             /// <summary>
-            /// Moves data from <paramref name="other"/> into this state component. After the operation,
-            /// <paramref name="other"/> must be in a valid state but does not have to contain its original data.
+            /// Moves the content of a state component loaded from persistent storage into this state component.
             /// </summary>
-            /// <param name="other">The state component from which data is moved.</param>
+            /// <param name="other">The source state component.</param>
+            /// <remarks>The <paramref name="other"/> state components will be discarded after the call to
+            /// <see cref="RestoreFromPersistedState"/>.
+            /// This means you do not need to make a deep copy of the data: just copying the references is sufficient.
+            /// </remarks>
             public void RestoreFromPersistedState(IStateComponent other)
             {
                 m_State.Move(other, null);
@@ -132,11 +127,14 @@ public void RestoreFromPersistedState(IStateComponent other)
             }
 
             /// <summary>
-            /// Moves data from <paramref name="other"/> into this state component. After the operation,
-            /// <paramref name="other"/> must be in a valid state but does not have to contain its original data.
+            /// Moves the content of a state component obtained from the undo stack into this state component.
             /// </summary>
-            /// <param name="other">The state component from which data is moved.</param>
-            /// <param name="changeset">The description of what is changing between the current state and <paramref name="other"/>. If null, assume everything changed.</param>
+            /// <param name="other">The source state component.</param>
+            /// <param name="changeset">A description of what changed between this and <paramref name="other"/>.</param>
+            /// <remarks>The <paramref name="other"/> state components will be discarded after the call to
+            /// <see cref="RestoreFromUndo"/>.
+            /// This means you do not need to make a deep copy of the data: just copying the references is sufficient.
+            /// </remarks>
             public void RestoreFromUndo(IStateComponent other, IChangeset changeset)
             {
                 m_State.Move(other, changeset);
@@ -150,11 +148,13 @@ public void RestoreFromUndo(IStateComponent other, IChangeset changeset)
         [SerializeField]
         uint m_Version;
 
-        UpdateType m_UpdateType = UpdateType.None;
+        UpdateType m_ScopeUpdateType = UpdateType.None;
 
         TUpdater m_Updater;
 
-        /// <inheritdoc />
+        /// <summary>
+        /// A unique id for the state component.
+        /// </summary>
         public Hash128 Guid => m_Guid;
 
         /// <summary>
@@ -173,24 +173,20 @@ public void RestoreFromUndo(IStateComponent other, IChangeset changeset)
         public virtual string ComponentName => GetType().FullName;
 
         /// <summary>
-        /// The earliest changeset version held by this state component.
+        /// The current version of the state component.
         /// </summary>
-        protected uint EarliestChangeSetVersion { get; set; }
-
-        /// <inheritdoc />
         public uint CurrentVersion { get; private set; } = 1;
 
         /// <summary>
         /// The updater for the state component.
         /// </summary>
-        /// <remarks>Since state component expose a read only interfaces, all modifications
+        /// <remarks>Since state component expose a read only interface, all modifications
         /// to a state component need to be done through this Updater.</remarks>
         public TUpdater UpdateScope
         {
             get
             {
-                if (m_Updater == null)
-                    m_Updater = new TUpdater();
+                m_Updater ??= new TUpdater();
 
                 m_Updater.Initialize(this);
                 return m_Updater;
@@ -207,101 +203,139 @@ protected StateComponent()
         }
 
         /// <summary>
-        /// Push the current changeset and tag it with <paramref name="version"/>.
+        /// Prepares the <see cref="StateComponent{TUpdater}"/> to accept changes.
         /// </summary>
-        /// <param name="version">The version number associated with the changeset.</param>
-        protected virtual void PushChangeset(uint version)
+        protected virtual void BeginChangeScope()
         {
-            // If update type is Complete, there is no need to push the changeset, as they cannot be used for an update.
-            if (m_UpdateType != UpdateType.Complete)
-                ChangesetManager?.PushChangeset(version);
+            m_ScopeUpdateType = UpdateType.None;
         }
 
-        /// <inheritdoc />
-        public virtual void PurgeOldChangesets(uint untilVersion)
+        /// <summary>
+        /// Does housekeeping after changes are done on the <see cref="StateComponent{TUpdater}"/>.
+        /// </summary>
+        protected virtual void EndChangeScope()
         {
-            // StateComponent default implementation does not record changesets,
-            // so m_EarliestChangeSetVersion is set to the CurrentVersion.
-            EarliestChangeSetVersion = ChangesetManager?.PurgeOldChangesets(untilVersion, CurrentVersion) ?? CurrentVersion;
-            ResetUpdateType();
-        }
+            if (m_ScopeUpdateType != UpdateType.None)
+            {
+                CurrentVersion++;
 
-        /// <inheritdoc/>
-        public bool HasChanges()
-        {
-            return EarliestChangeSetVersion != CurrentVersion;
+                if (ChangesetManager != null)
+                {
+                    // If update type is Complete, there is no need to push the changeset, as they cannot be used for an update.
+                    if (m_ScopeUpdateType != UpdateType.Complete)
+                    {
+                        ChangesetManager.PushChangeset(CurrentVersion);
+                    }
+                    else
+                    {
+                        ChangesetManager.PurgeChangesets(uint.MaxValue, CurrentVersion);
+                    }
+                }
+            }
         }
 
         /// <summary>
-        /// Clears the update type if there are no pending changes.
+        /// Purges the changesets that track changes up to and including <paramref name="upToAndIncludingVersion"/>.
         /// </summary>
-        protected void ResetUpdateType()
+        /// <remarks>
+        /// The state component can choose to purge more recent changesets.
+        /// </remarks>
+        /// <param name="upToAndIncludingVersion">Version up to which we should purge changesets. Pass uint.MaxValue to purge all changesets.</param>
+        public virtual void PurgeObsoleteChangesets(uint upToAndIncludingVersion)
         {
-            if (EarliestChangeSetVersion == CurrentVersion)
-                m_UpdateType = UpdateType.None;
+            ChangesetManager?.PurgeChangesets(upToAndIncludingVersion, CurrentVersion);
         }
 
         /// <summary>
-        /// Set how the observers should update themselves. Unless <paramref name="force"/> is true,
+        /// Sets the kind of update that was done on the state component. Unless <paramref name="force"/> is true,
         /// if the update type is already set, it will be changed only
         /// if the new update type has a higher value than the current one.
         /// </summary>
         /// <param name="type">The update type.</param>
         /// <param name="force">Set the update type even if the new value is lower than the current one.</param>
-        public virtual void SetUpdateType(UpdateType type, bool force = false)
+        protected internal void SetUpdateType(UpdateType type, bool force = false)
         {
-            if (type > m_UpdateType || force)
-                m_UpdateType = type;
-
-            // If update type is Complete, there is no need to keep the changesets, as they cannot be used for an update.
-            if (m_UpdateType == UpdateType.Complete)
-            {
-                ChangesetManager?.PurgeOldChangesets(CurrentVersion, CurrentVersion);
-            }
+            if (type > m_ScopeUpdateType || force)
+                m_ScopeUpdateType = type;
         }
 
-        /// <inheritdoc/>
-        public UpdateType GetUpdateType(StateComponentVersion observerVersion)
+        /// <summary>
+        /// Gets the type of update an observer should do.
+        /// </summary>
+        /// <param name="observerVersion">The last state component version observed by the observer.</param>
+        /// <returns>Returns the type of update an observer should do.</returns>
+        public UpdateType GetObserverUpdateType(StateComponentVersion observerVersion)
         {
+            // Version does not match the state component.
             if (observerVersion.HashCode != GetHashCode())
             {
                 return UpdateType.Complete;
             }
 
-            // If view is new or too old, tell it to rebuild itself completely.
-            if (observerVersion.Version == 0 || observerVersion.Version < EarliestChangeSetVersion)
+            // If the observer is new, force a complete update.
+            if (observerVersion.Version == 0)
+            {
+                return UpdateType.Complete;
+            }
+
+            if (observerVersion.Version == CurrentVersion)
+            {
+                return UpdateType.None;
+            }
+
+            if (ChangesetManager == null)
             {
                 return UpdateType.Complete;
             }
 
-            // This is safe even if Version wraps around after an overflow.
-            return observerVersion.Version == CurrentVersion ? UpdateType.None : m_UpdateType;
+            var earliestChangeSetVersion = ChangesetManager.GetEarliestChangesetVersion();
+            if (earliestChangeSetVersion == uint.MaxValue)
+            {
+                // observerVersion.Version != CurrentVersion, but ChangesetManager does not have any changeset for us.
+                // Let's do a complete update.
+                return UpdateType.Complete;
+            }
+
+            // If ChangesetManager has changesets to go from observerVersion.Version to CurrentVersion,
+            // do a partial update. Otherwise do a complete update.
+            return observerVersion.Version >= earliestChangeSetVersion - 1 ? UpdateType.Partial : UpdateType.Complete;
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Called when the state component has been added to the state.
+        /// </summary>
+        /// <param name="state">The state to which the state component was added.</param>
         public virtual void OnAddedToState(IState state)
         {
             State = state;
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Called when the state component has been removed from the state.
+        /// </summary>
+        /// <param name="state">The state from which the state component was removed.</param>
         public virtual void OnRemovedFromState(IState state)
         {
             State = null;
-            ChangesetManager?.PurgeOldChangesets(uint.MaxValue, CurrentVersion);
+            ChangesetManager?.PurgeChangesets(uint.MaxValue, CurrentVersion);
         }
 
         /// <summary>
         /// Moves the content of another state component into this state component.
         /// </summary>
         /// <param name="other">The source state component.</param>
-        /// <param name="changeset">Details about what changed between <paramref name="other"/> state (considered the ancestor) and the current state.</param>
-        /// <remarks>This should only be called from <see cref="IStateComponentUpdater.RestoreFromPersistedState"/> or <see cref="IStateComponentUpdater.RestoreFromUndo"/>.
-        ///
+        /// <param name="changeset">Details about what changed between <paramref name="other"/>
+        /// state (considered the ancestor) and the current state.</param>
+        /// <remarks>
+        /// <p>
+        /// This should only be called from <see cref="IStateComponentUpdater.RestoreFromPersistedState"/>
+        /// or <see cref="IStateComponentUpdater.RestoreFromUndo"/>.
+        /// </p><p>
         /// Overrides should call <see cref="SetUpdateType"/> as necessary, since the state updater will not call it.
-        ///
+        /// </p><p>
         /// The <paramref name="other"/> state component will be discarded after the call to Move.
         /// This means you do not need to make a deep copy of the data: just copying the references is sufficient.
+        /// </p>
         /// </remarks>
         protected virtual void Move(IStateComponent other, IChangeset changeset)
         {
@@ -311,7 +345,11 @@ protected virtual void Move(IStateComponent other, IChangeset changeset)
             }
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Called before the state component is pushed on the undo stack.
+        /// Use this to push additional objects on the stack.
+        /// </summary>
+        /// <param name="undoString">The name of the undo operation.</param>
         public virtual void WillPushOnUndoStack(string undoString)
         {
         }
@@ -329,10 +367,11 @@ public virtual void OnAfterDeserialize()
         }
 
         /// <summary>
-        /// Applies undo data to this state component.
+        /// Replaces serialized values of this component by values from <paramref name="undoData"/>.
         /// </summary>
-        /// <param name="undoData">The undo data to apply.</param>
-        /// <param name="changeset"></param>
+        /// <param name="undoData">The state component from which to take the values.</param>
+        /// <param name="changeset">A description of the changes brought in by <paramref name="undoData"/>.
+        /// If null, anything may have change.</param>
         public virtual void ApplyUndoData(IStateComponent undoData, IChangeset changeset)
         {
             if (undoData != null)
@@ -344,7 +383,10 @@ public virtual void ApplyUndoData(IStateComponent undoData, IChangeset changeset
             }
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Called after an undo/redo operation, when the state component can be affected by the operation.
+        /// </summary>
+        /// <param name="isRedo">True if the operation is a redo, false if the operation is an undo.</param>
         public virtual void UndoRedoPerformed(bool isRedo)
         {
         }
diff --git a/Modules/CommandStateObserver/Undo/IUndoableStateComponent.cs b/Modules/CommandStateObserver/Undo/IUndoableStateComponent.cs
index f0df04da0b..c27661cfef 100644
--- a/Modules/CommandStateObserver/Undo/IUndoableStateComponent.cs
+++ b/Modules/CommandStateObserver/Undo/IUndoableStateComponent.cs
@@ -20,6 +20,7 @@ interface IUndoableStateComponent : IStateComponent
         /// <summary>
         /// The changeset manager for this state component.
         /// </summary>
+        /// <remarks>If the state components does not maintain changesets, this should return null.</remarks>
         IChangesetManager ChangesetManager { get; }
 
         /// <summary>
@@ -33,7 +34,8 @@ interface IUndoableStateComponent : IStateComponent
         /// Replaces serialized values of this component by values from <paramref name="undoData"/>.
         /// </summary>
         /// <param name="undoData">The state component from which to take the values.</param>
-        /// <param name="changeset"></param>
+        /// <param name="changeset">A description of the changes brought in by <paramref name="undoData"/>.
+        /// If null, anything may have change.</param>
         void ApplyUndoData(IStateComponent undoData, IChangeset changeset);
 
         /// <summary>
diff --git a/Modules/ContentLoad/Public/ContentLoad.bindings.cs b/Modules/ContentLoad/Public/ContentLoad.bindings.cs
index d6d0c74c25..1c93a84b67 100644
--- a/Modules/ContentLoad/Public/ContentLoad.bindings.cs
+++ b/Modules/ContentLoad/Public/ContentLoad.bindings.cs
@@ -146,7 +146,7 @@ public static class ContentLoadInterface
     {
 
         [NativeThrows]
-        unsafe internal static extern ContentFile LoadContentFileAsync(ContentNamespace nameSpace, string filename, void *dependencies, int dependencyCount, JobHandle dependentFence);
+        unsafe internal static extern ContentFile LoadContentFileAsync(ContentNamespace nameSpace, string filename, void *dependencies, int dependencyCount, JobHandle dependentFence, bool useUnsafe = false);
 
         [NativeThrows]
         internal extern static ContentFileUnloadHandle ContentFile_UnloadAsync(ContentFile handle);
@@ -191,7 +191,7 @@ public static class ContentLoadInterface
         {
             unsafe
             {
-                return ContentLoadInterface.LoadContentFileAsync(nameSpace, filename, dependencies.m_Buffer, dependencies.Length, dependentFence);
+                return ContentLoadInterface.LoadContentFileAsync(nameSpace, filename, dependencies.m_Buffer, dependencies.Length, dependentFence, false);
             }
         }
 
diff --git a/Modules/DeviceSimulatorEditor/DeviceSimulatorMain.cs b/Modules/DeviceSimulatorEditor/DeviceSimulatorMain.cs
index 03071bd278..21aaa0d317 100644
--- a/Modules/DeviceSimulatorEditor/DeviceSimulatorMain.cs
+++ b/Modules/DeviceSimulatorEditor/DeviceSimulatorMain.cs
@@ -120,6 +120,8 @@ public void InitSimulation()
             InitScreenUI();
 
             m_ApplicationSimulation.OnSimulationStart(currentDevice.deviceInfo);
+
+            m_DeviceSimulator.OnDeviceChanged();
         }
 
         private void InitDeviceIndex(SimulatorState serializedState)
diff --git a/Modules/DeviceSimulatorEditor/Plugins/DeviceSimulator.cs b/Modules/DeviceSimulatorEditor/Plugins/DeviceSimulator.cs
index 14b04f6533..26af85930a 100644
--- a/Modules/DeviceSimulatorEditor/Plugins/DeviceSimulator.cs
+++ b/Modules/DeviceSimulatorEditor/Plugins/DeviceSimulator.cs
@@ -39,6 +39,7 @@ internal DeviceSimulator()
         internal ApplicationSimulation applicationSimulation;
 
         public event Action<TouchEvent> touchScreenInput;
+        public event Action deviceChanged;
 
         internal void OnTouchScreenInput(TouchEvent touchEvent)
         {
@@ -58,5 +59,24 @@ internal void OnTouchScreenInput(TouchEvent touchEvent)
                 }
             }
         }
+
+        internal void OnDeviceChanged()
+        {
+            var handlers = deviceChanged?.GetInvocationList();
+            if (handlers == null)
+                return;
+
+            foreach (Action handler in handlers)
+            {
+                try
+                {
+                    handler.Invoke();
+                }
+                catch (Exception e)
+                {
+                    Debug.LogException(e);
+                }
+            }
+        }
     }
 }
diff --git a/Modules/DeviceSimulatorEditor/SimulatorWindow.cs b/Modules/DeviceSimulatorEditor/SimulatorWindow.cs
index 7e394d8e1a..aca9bfac32 100644
--- a/Modules/DeviceSimulatorEditor/SimulatorWindow.cs
+++ b/Modules/DeviceSimulatorEditor/SimulatorWindow.cs
@@ -14,7 +14,7 @@
 namespace UnityEditor.DeviceSimulation
 {
     [EditorWindowTitle(title = "Simulator", useTypeNameAsIconName = true)]
-    internal class SimulatorWindow : PlayModeView, IHasCustomMenu, ISerializationCallbackReceiver, IGameViewOnPlayMenuUser
+    internal class SimulatorWindow : PlayModeView, IHasCustomMenu, ISerializationCallbackReceiver
     {
         private static List<SimulatorWindow> s_SimulatorInstances = new List<SimulatorWindow>();
         private bool m_DeviceListDirty;
@@ -23,8 +23,6 @@ internal class SimulatorWindow : PlayModeView, IHasCustomMenu, ISerializationCal
         private SimulationState m_State = SimulationState.Enabled;
         private DeviceSimulatorMain m_Main;
 
-        private bool m_PlayFocused = false;
-        private bool m_VsyncEnabled = false;
 
         private Vector2 simulatorViewPadding
         {
@@ -59,8 +57,6 @@ private Vector2 simulatorViewPadding
 
         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)]
@@ -141,7 +137,9 @@ private void OnGUI()
             {
                 m_Main.ScreenSimulation.ApplyChanges();
                 targetSize = m_Main.targetSize;
-                m_Main.displayTexture = RenderView(m_Main.mousePositionInUICoordinates, false);
+
+                if (renderViewCallNeededInOnGUI)
+                    m_Main.displayTexture = RenderView(m_Main.mousePositionInUICoordinates, false);
 
                 viewPadding = simulatorViewPadding;
                 viewMouseScale = simulatorViewMouseScale;
@@ -184,25 +182,6 @@ protected override void OnEnterPlayModeBehaviorChange()
             m_Main.userInterface.UpdateEnterPlayModeBehaviorMsg();
         }
 
-        public void OnPlayPopupSelection(int indexClicked, object objectSelected)
-        {
-            playModeBehaviorIdx = indexClicked;
-            if (playModeBehaviorIdx == 0)
-            {
-                if (playFocused)
-                    enterPlayModeBehavior = EnterPlayModeBehavior.PlayFocused;
-                else
-                    enterPlayModeBehavior = EnterPlayModeBehavior.PlayUnfocused;
-                fullscreenMonitorIdx = PlayModeView.kFullscreenNone;
-            }
-            else if (playModeBehaviorIdx == 1)
-            {
-                enterPlayModeBehavior = EnterPlayModeBehavior.PlayMaximized;
-                fullscreenMonitorIdx = PlayModeView.kFullscreenNone;
-            }
-            OnEnterPlayModeBehaviorChange();
-        }
-
         private void OnDevicePackageStatus(DevicePackageStatus status)
         {
             m_Main.userInterface.DeviceButtonState = new DevicePackageInstallButtonState
diff --git a/Modules/DeviceSimulatorEditor/UserInterfaceController.cs b/Modules/DeviceSimulatorEditor/UserInterfaceController.cs
index ba6793b0c2..4d6d606c8d 100644
--- a/Modules/DeviceSimulatorEditor/UserInterfaceController.cs
+++ b/Modules/DeviceSimulatorEditor/UserInterfaceController.cs
@@ -87,9 +87,8 @@ public DevicePackageInstallButtonState DeviceButtonState
         private Label m_ScaleValueLabel;
         private ToolbarToggle m_FitToScreenToggle;
         private ToolbarToggle m_HighlightSafeAreaToggle;
+        private ToolbarMenu m_EnterPlayModeMenu;
         private ToolbarToggle m_ControlPanelToggle;
-        private VisualElement m_OnPlayBehaviorListMenu;
-        private TextElement m_SelectedOnPlayBehaviorName;
 
         // Controls for inactive message.
         private VisualElement m_InactiveMsgContainer;
@@ -159,10 +158,20 @@ public UserInterfaceController(DeviceSimulatorMain deviceSimulatorMain, VisualEl
             m_HighlightSafeAreaToggle.SetValueWithoutNotify(HighlightSafeArea);
 
             // Enter Play Mode popup up
-            m_OnPlayBehaviorListMenu = rootVisualElement.Q<VisualElement>("enter-play-mode-list-menu");
-            m_OnPlayBehaviorListMenu.AddManipulator(new Clickable(ShowOnPlayBehaviorSelector));
-            m_SelectedOnPlayBehaviorName = m_OnPlayBehaviorListMenu.Q<TextElement>("selected-play-mode-name");
-            m_SelectedOnPlayBehaviorName.text = GameViewOnPlayMenu.GetOnPlayBehaviorName(m_Main.playModeView.playModeBehaviorIdx);
+            m_EnterPlayModeMenu = rootVisualElement.Q<ToolbarMenu>("enter-play-mode-menu");
+            UpdateEnterPlayModeBehaviorMsg();
+
+            foreach (var name in Enum.GetNames(typeof(PlayModeView.EnterPlayModeBehavior)))
+            {
+                m_EnterPlayModeMenu.menu.AppendAction(ObjectNames.NicifyVariableName(name),
+                    a => HandleEnterPlayModeBehaviorSelection(name),
+                    a =>
+                    {
+                        return m_Main.playModeView.enterPlayModeBehavior.ToString() == name
+                        ? DropdownMenuAction.Status.Checked
+                        : DropdownMenuAction.Status.Normal;
+                    });
+            }
 
             // Inactive message set up
             m_InactiveMsgContainer = rootVisualElement.Q<VisualElement>("inactive-msg-container");
@@ -351,14 +360,6 @@ private void ShowDeviceInfoList()
             PopupWindow.Show(rect, m_DeviceListPopup);
         }
 
-        private void ShowOnPlayBehaviorSelector()
-        {
-            var rect = new Rect(m_OnPlayBehaviorListMenu.worldBound.position + new Vector2(1, m_OnPlayBehaviorListMenu.worldBound.height), new Vector2());
-            var menuData = new SimulationOnPlayMenuItemProvider();
-            var flexibleMenu = new GameViewOnPlayMenu(menuData, m_Main.playModeView.playModeBehaviorIdx, null, m_Main.playModeView as SimulatorWindow);
-            PopupWindow.Show(rect, flexibleMenu);
-        }
-
         private void OnDeviceSelected(int selectedDeviceIndex)
         {
             if (m_Main.deviceIndex == selectedDeviceIndex)
@@ -394,9 +395,18 @@ private void SetScrollViewTopPadding()
             m_ScrollView.style.paddingTop = scrollViewHeight > m_DeviceView.style.height.value.value ? (scrollViewHeight - m_DeviceView.style.height.value.value) / 2 : 0;
         }
 
+        private void HandleEnterPlayModeBehaviorSelection(string selected)
+        {
+            if (m_Main.playModeView.enterPlayModeBehavior.ToString() != selected)
+            {
+                m_Main.playModeView.enterPlayModeBehavior = (PlayModeView.EnterPlayModeBehavior)Enum.Parse(typeof(PlayModeView.EnterPlayModeBehavior), selected);
+                UpdateEnterPlayModeBehaviorMsg();
+            }
+        }
+
         public void UpdateEnterPlayModeBehaviorMsg()
         {
-            m_SelectedOnPlayBehaviorName.text = GameViewOnPlayMenu.GetOnPlayBehaviorName(m_Main.playModeView.playModeBehaviorIdx);
+            m_EnterPlayModeMenu.text = ObjectNames.NicifyVariableName(m_Main.playModeView.enterPlayModeBehavior.ToString());
         }
     }
 }
diff --git a/Modules/Director/AssemblyInfo.cs b/Modules/Director/AssemblyInfo.cs
index 1705bcecf8..8fd82e5efb 100644
--- a/Modules/Director/AssemblyInfo.cs
+++ b/Modules/Director/AssemblyInfo.cs
@@ -6,3 +6,5 @@
 
 [assembly: InternalsVisibleTo("Unity.Timeline")]
 [assembly: InternalsVisibleTo("Unity.Animation.Timeline")]
+[assembly: InternalsVisibleTo("Unity.Motion.Hybrid")]
+[assembly: InternalsVisibleTo("Unity.Motion.Timeline")]
diff --git a/Modules/EditorToolbar/Controls/EditorToolbarIcon.cs b/Modules/EditorToolbar/Controls/EditorToolbarIcon.cs
new file mode 100644
index 0000000000..d714fe6fcb
--- /dev/null
+++ b/Modules/EditorToolbar/Controls/EditorToolbarIcon.cs
@@ -0,0 +1,88 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Overlays;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Toolbars
+{
+    class EditorToolbarIcon : VisualElement
+    {
+        const string m_IconClassName = "unity-editor-toolbar-icon";
+        const string m_TextIconClassName = EditorToolbar.elementTextIconClassName;
+        const string m_ImageIconClassName = EditorToolbar.elementIconClassName;
+
+        TextElement m_TextIconElement;
+        Image m_IconElement;
+
+        public string textIcon
+        {
+            get => m_TextIconElement?.text;
+
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    m_TextIconElement?.RemoveFromHierarchy();
+                    m_TextIconElement = null;
+                    return;
+                }
+
+                if (m_TextIconElement == null)
+                {
+                    m_IconElement?.RemoveFromHierarchy();
+                    m_IconElement = null;
+
+                    m_TextIconElement = new TextElement();
+                    m_TextIconElement.AddToClassList(m_TextIconClassName);
+                    Add(m_TextIconElement);
+                }
+
+                m_TextIconElement.text = OverlayUtilities.GetSignificantLettersForIcon(value);
+            }
+        }
+
+        public Texture2D icon
+        {
+            get => (Texture2D)m_IconElement?.image;
+            set
+            {
+                if (value == null)
+                {
+                    m_IconElement?.RemoveFromHierarchy();
+                    m_IconElement = null;
+                    return;
+                }
+
+                if (m_IconElement == null)
+                {
+                    m_TextIconElement?.RemoveFromHierarchy();
+                    m_TextIconElement = null;
+
+                    m_IconElement = new Image { scaleMode = ScaleMode.ScaleToFit };
+                    m_IconElement.AddToClassList(m_ImageIconClassName);
+                    Add(m_IconElement);
+                }
+
+                m_IconElement.image = value;
+            }
+        }
+
+        public EditorToolbarIcon() : this(string.Empty, null) {}
+        public EditorToolbarIcon(string text) : this(text, null) {}
+
+        public EditorToolbarIcon(Texture2D icon) : this(string.Empty, icon) {}
+
+        private EditorToolbarIcon(string text, Texture2D icon)
+        {
+            AddToClassList(m_IconClassName);
+
+            if (icon != null)
+                this.icon = icon;
+            else
+                this.textIcon = text;
+        }
+    }
+}
diff --git a/Modules/EditorToolbar/Controls/EditorToolbarToggle.cs b/Modules/EditorToolbar/Controls/EditorToolbarToggle.cs
index f587734d1f..7b9f7b3a61 100644
--- a/Modules/EditorToolbar/Controls/EditorToolbarToggle.cs
+++ b/Modules/EditorToolbar/Controls/EditorToolbarToggle.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using UnityEditor.Overlays;
 using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -10,8 +11,13 @@ namespace UnityEditor.Toolbars
 {
     public class EditorToolbarToggle : ToolbarToggle
     {
+        internal const string textIconClassName = EditorToolbar.elementTextIconClassName;
         internal const string textClassName = EditorToolbar.elementLabelClassName;
         internal const string iconClassName = EditorToolbar.elementIconClassName;
+
+        internal const string k_TextIconElementName = "EditorToolbarToggleTextIcon";
+        internal const string k_TextElementName = "EditorToolbarToggleText";
+
         public new const string ussClassName = "unity-editor-toolbar-toggle";
         internal static readonly string toggleNoIconClassName = ussClassName + "-noicon";
 
@@ -19,12 +25,12 @@ public class EditorToolbarToggle : ToolbarToggle
         Texture2D m_OffIcon;
 
         TextElement m_TextElement;
-        readonly Image m_IconElement;
+        TextElement m_TextIconElement;
+        Image m_IconElement;
 
         public new string text
         {
             get => m_TextElement?.text;
-
             set
             {
                 if (string.IsNullOrEmpty(value))
@@ -36,12 +42,56 @@ public class EditorToolbarToggle : ToolbarToggle
 
                 if (m_TextElement == null)
                 {
-                    Insert(IndexOf(m_IconElement)+1, m_TextElement = new TextElement());
+                    m_TextElement = new TextElement();
+                    m_TextElement.name = k_TextElementName;
                     m_TextElement.AddToClassList(textClassName);
+
+                    var input = this.Q<VisualElement>(className: Toggle.inputUssClassName);
+                    if (m_IconElement != null)
+                        input.Insert(input.IndexOf(m_IconElement) + 1, m_TextElement);
+                    else if (m_TextIconElement != null)
+                        input.Insert(input.IndexOf(m_TextIconElement) + 1, m_TextElement);
+                    else
+                        input.Add(m_TextElement);
                 }
 
                 m_TextElement.text = value;
                 UpdateIconState();
+                UpdateTextIconState();
+            }
+        }
+
+        public string textIcon
+        {
+            get => m_TextIconElement?.text;
+            set
+            {
+                if (m_TextIconElement == null)
+                {
+                    m_IconElement?.RemoveFromHierarchy();
+                    m_IconElement = null;
+                    m_OffIcon = null;
+                    m_OnIcon = null;
+
+                    m_TextIconElement = new TextElement();
+                    m_TextIconElement.name = k_TextIconElementName;
+                    m_TextIconElement.AddToClassList(textIconClassName);
+
+                    var input = this.Q<VisualElement>(className: Toggle.inputUssClassName);
+                    if (m_TextElement != null)
+                    {
+                        m_TextElement.RemoveFromHierarchy();
+                        input.Add(m_TextIconElement);
+                        input.Add(m_TextElement);
+                    }
+                    else
+                    {
+                        input.Add(m_TextIconElement);
+                    }
+                }
+
+                m_TextIconElement.text = OverlayUtilities.GetSignificantLettersForIcon(value);
+                UpdateTextIconState();
             }
         }
 
@@ -50,6 +100,8 @@ public Texture2D icon
             get => offIcon;
             set
             {
+                CreateIconElement();
+
                 offIcon = onIcon = value;
                 UpdateIconState();
             }
@@ -60,6 +112,8 @@ public Texture2D onIcon
             get => m_OnIcon;
             set
             {
+                CreateIconElement();
+
                 m_OnIcon = value;
                 UpdateIconState();
             }
@@ -70,6 +124,8 @@ public Texture2D offIcon
             get => m_OffIcon;
             set
             {
+                CreateIconElement();
+
                 m_OffIcon = value;
                 UpdateIconState();
             }
@@ -84,19 +140,24 @@ public EditorToolbarToggle(Texture2D onIcon, Texture2D offIcon) : this(string.Em
         public EditorToolbarToggle(string text, Texture2D onIcon, Texture2D offIcon)
         {
             AddToClassList(ussClassName);
-            var input = this.Q<VisualElement>(className: Toggle.inputUssClassName);
-
-            m_IconElement = new Image { scaleMode = ScaleMode.ScaleToFit};
-            m_IconElement.AddToClassList(iconClassName);
-            input.Add(m_IconElement);
 
+            this.onIcon = onIcon;
+            this.offIcon = offIcon;
             this.text = text;
-            m_OnIcon = onIcon;
-            m_OffIcon = offIcon;
 
             UpdateIconState();
         }
 
+        public EditorToolbarToggle(string textIcon, string label)
+        {
+            AddToClassList(ussClassName);
+
+            this.textIcon = textIcon;
+            this.text = label;
+
+            UpdateTextIconState();
+        }
+
         public override void SetValueWithoutNotify(bool newValue)
         {
             base.SetValueWithoutNotify(newValue);
@@ -105,20 +166,68 @@ public override void SetValueWithoutNotify(bool newValue)
 
         void UpdateIcon()
         {
+            if (m_IconElement == null)
+                return;
+
             m_IconElement.image = value ? onIcon : offIcon;
         }
 
         void UpdateIconState()
         {
+            if (m_IconElement == null)
+                return;
+
             if (icon == null && (text != null && text != string.Empty))
             {
                 if (!m_IconElement.ClassListContains(toggleNoIconClassName))
                     m_IconElement.AddToClassList(toggleNoIconClassName);
             }
             else if (icon && m_IconElement.ClassListContains(toggleNoIconClassName))
+            {
                 m_IconElement.RemoveFromClassList(toggleNoIconClassName);
+            }
 
             UpdateIcon();
         }
+
+        void UpdateTextIconState()
+        {
+            if (m_TextIconElement == null)
+                return;
+
+            if ((m_TextIconElement == null || string.IsNullOrEmpty(textIcon)) && (text != null && text != string.Empty))
+            {
+                if (!m_TextIconElement.ClassListContains(toggleNoIconClassName))
+                    m_TextIconElement.AddToClassList(toggleNoIconClassName);
+            }
+            else if (m_TextIconElement != null && m_TextIconElement.ClassListContains(toggleNoIconClassName))
+            {
+                m_TextIconElement.RemoveFromClassList(toggleNoIconClassName);
+            }
+        }
+
+        void CreateIconElement()
+        {
+            if (m_IconElement == null)
+            {
+                m_TextIconElement?.RemoveFromHierarchy();
+                m_TextIconElement = null;
+
+                var input = this.Q<VisualElement>(className: Toggle.inputUssClassName);
+                m_IconElement = new Image { scaleMode = ScaleMode.ScaleToFit };
+                m_IconElement.AddToClassList(iconClassName);
+
+                if (m_TextElement != null)
+                {
+                    m_TextElement.RemoveFromHierarchy();
+                    input.Add(m_IconElement);
+                    input.Add(m_TextElement);
+                }
+                else
+                {
+                    input.Add(m_IconElement);
+                }
+            }
+        }
     }
 }
diff --git a/Modules/EditorToolbar/Controls/ToolButton.cs b/Modules/EditorToolbar/Controls/ToolButton.cs
index 36f7d6670f..19ed89f9d6 100644
--- a/Modules/EditorToolbar/Controls/ToolButton.cs
+++ b/Modules/EditorToolbar/Controls/ToolButton.cs
@@ -334,7 +334,15 @@ void UpdateContent()
                 case Tool.Custom:
                     var content = EditorToolUtility.GetToolbarIcon(currentVariant);
                     tooltip = L10n.Tr(content.tooltip);
-                    onIcon = offIcon = content.image as Texture2D;
+                    if (content.image == null && !string.IsNullOrEmpty(content.text))
+                    {
+                        textIcon = content.text;
+                    }
+                    else
+                    {
+                        onIcon = offIcon = content.image as Texture2D;
+                        text = content.text;
+                    }
                     break;
             }
         }
diff --git a/Modules/EditorToolbar/Controls/ToolContextButton.cs b/Modules/EditorToolbar/Controls/ToolContextButton.cs
index 653599b356..c0a4d9ca7e 100644
--- a/Modules/EditorToolbar/Controls/ToolContextButton.cs
+++ b/Modules/EditorToolbar/Controls/ToolContextButton.cs
@@ -117,6 +117,8 @@ void RefreshActiveContext()
             }
 
             var content = EditorToolUtility.GetIcon(activeContextType, true);
+            if (content.image == null)
+                content.image = EditorGUIUtility.IconContent("CustomTool").image;
             icon = content.image as Texture2D;
             var activeContextName = EditorToolUtility.GetToolName(ToolManager.activeContextType)
                                     + (isGOToolContext ? " (Default)" : "");
diff --git a/Modules/EditorToolbar/ToolbarElements/EditorToolsToolbar.cs b/Modules/EditorToolbar/ToolbarElements/EditorToolsToolbar.cs
index 1843dd3499..21f7a45044 100644
--- a/Modules/EditorToolbar/ToolbarElements/EditorToolsToolbar.cs
+++ b/Modules/EditorToolbar/ToolbarElements/EditorToolsToolbar.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 System.Collections.Generic;
+using System.Linq;
 using UnityEditor.EditorTools;
 using UnityEngine.UIElements;
 
@@ -39,7 +41,7 @@ public BuiltinToolsStrip()
             {
                 new VisualElement() { name = "Builtin View and Transform Tools" },
                 new VisualElement() { name = "Custom Global Tools" },
-                new VisualElement() { name = "Component Tools" }
+                new VisualElement()
             };
 
             for (int i = 0; i < k_ToolbarSections; ++i)
@@ -71,25 +73,24 @@ void RebuildAvailableTools()
             foreach (var toolbar in m_Toolbars)
                 toolbar.Clear();
 
-            // Builtin tools are handled as a special case because order needs to be consistent
-            for (int i = (int)Tool.View; i < (int)Tool.Custom; ++i)
-            {
-                var tool = m_AvailableTools.FindIndex(x=> (Tool) x.scope == (Tool) i);
-                if(tool > -1)
-                    defaultToolButtons.Add(new ToolButton((Tool) i, m_AvailableTools[tool].tools));
-            }
-
-            m_AvailableTools.Sort((a, b) =>
-            {
-                if (a.priority == ToolAttribute.defaultPriority && b.priority == ToolAttribute.defaultPriority)
-                    return a.GetHashCode().CompareTo(b.GetHashCode());
-                return a.priority.CompareTo(b.priority);
-            });
+            m_AvailableTools.OrderBy(x => x.scope)
+                .ThenBy(x => x.GetHashCode())
+                .ThenBy(x => x.priority);
 
+            Type currentComponentHeaderType = null;
+            VisualElement componentTools = null;
             foreach (var entry in m_AvailableTools)
             {
                 switch (entry.scope)
                 {
+                    case ToolEntry.Scope.BuiltinView:
+                    case ToolEntry.Scope.BuiltinMove:
+                    case ToolEntry.Scope.BuiltinRotate:
+                    case ToolEntry.Scope.BuiltinScale:
+                    case ToolEntry.Scope.BuiltinRect:
+                    case ToolEntry.Scope.BuiltinTransform:
+                        defaultToolButtons.Add(new ToolButton((Tool)entry.scope, entry.tools));
+                        break;
                     case ToolEntry.Scope.BuiltinAdditional:
                         defaultToolButtons.Add(new ToolButton(entry.tools));
                         break;
@@ -97,13 +98,35 @@ void RebuildAvailableTools()
                         customGlobalToolButtons.Add(new ToolButton(entry.tools));
                         break;
                     case ToolEntry.Scope.Component:
-                        componentToolButtons.Add(new ToolButton(entry.tools));
+                        if (currentComponentHeaderType == null || currentComponentHeaderType != entry.tools[0].target?.GetType())
+                        {
+                            currentComponentHeaderType = entry.tools[0].target?.GetType();
+                            if (currentComponentHeaderType == null)
+                                break;
+
+                            if (componentTools != null)
+                                EditorToolbarUtility.SetupChildrenAsButtonStrip(componentTools);
+
+                            componentTools = new VisualElement() { name = "Component Tools" };
+                            componentTools.AddToClassList("toolbar-contents");
+
+                            var header = new EditorToolbarIcon();
+                            if ((header.icon = EditorGUIUtility.FindTexture(currentComponentHeaderType)) == null)
+                                header.textIcon = currentComponentHeaderType.Name;
+
+                            componentToolButtons.Add(header);
+                            componentToolButtons.Add(componentTools);
+                        }
+                        componentTools.Add(new ToolButton(entry.tools));
                         break;
                 }
             }
 
-            foreach(var toolbar in m_Toolbars)
-                EditorToolbarUtility.SetupChildrenAsButtonStrip(toolbar);
+            if (componentTools != null)
+                EditorToolbarUtility.SetupChildrenAsButtonStrip(componentTools);
+
+            for (var i = 0; i < k_ToolbarSections - 1; i++)
+                EditorToolbarUtility.SetupChildrenAsButtonStrip(m_Toolbars[i]);
         }
     }
 }
diff --git a/Modules/EditorToolbar/ToolbarElements/StoreButton.cs b/Modules/EditorToolbar/ToolbarElements/StoreButton.cs
new file mode 100644
index 0000000000..3fed77b8c4
--- /dev/null
+++ b/Modules/EditorToolbar/ToolbarElements/StoreButton.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
+
+// #define QUICK_SEARCH_STORE
+using UnityEngine.UIElements;
+using UnityEditor.Toolbars;
+using UnityEditor.Connect;
+using UnityEngine;
+
+namespace UnityEditor.Search
+{
+    [EditorToolbarElement("Editor Utility/Store", typeof(DefaultMainToolbar))]
+    sealed class StoreButton : EditorToolbarDropdown
+    {
+        const string k_SearchStoreCommand = "OpenSearchStore";
+        const string k_OpenAssetStoreCommand = "OpenAssetStoreInBrowser";
+
+        public StoreButton()
+        {
+            icon = EditorGUIUtility.FindTexture("AssetStore Icon");
+            text = "Asset Store";
+
+            RegisterCallback<AttachToPanelEvent>(OnAttachedToPanel);
+            RegisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
+
+            clicked += ActivateAssetStoreMenu;
+        }
+
+        void OnAttachedToPanel(AttachToPanelEvent evt)
+        {
+            EditorApplication.delayCall += DelayInitialization;
+        }
+
+        void OnDetachFromPanel(DetachFromPanelEvent evt)
+        {
+            ShortcutManagement.ShortcutManager.instance.shortcutBindingChanged -= UpdateTooltip;
+        }
+
+        private void DelayInitialization()
+        {
+            UpdateTooltip();
+            style.display = CommandService.Exists(k_SearchStoreCommand) ? DisplayStyle.Flex : DisplayStyle.None;
+            ShortcutManagement.ShortcutManager.instance.shortcutBindingChanged += UpdateTooltip;
+        }
+
+        private void UpdateTooltip()
+        {
+            tooltip = GetTooltipText();
+        }
+
+        private void UpdateTooltip(ShortcutManagement.ShortcutBindingChangedEventArgs obj)
+        {
+            UpdateTooltip();
+        }
+
+        private string GetTooltipText()
+        {
+            return L10n.Tr($"Asset Store");
+        }
+
+        private void ActivateAssetStoreMenu()
+        {
+            var menu = new GenericMenu();
+            menu.AddItem(EditorGUIUtility.TrTextContent("Asset Store Web"), false, () => CommandService.Execute(k_OpenAssetStoreCommand));
+            menu.AddItem(EditorGUIUtility.TrTextContent("My Assets"), false, () => PackageManager.UI.PackageManagerWindow.SelectPackageAndFilterStatic("", PackageManager.UI.Internal.PackageFilterTab.AssetStore));
+
+            menu.DropDown(worldBound, true);
+        }
+    }
+}
diff --git a/Modules/GraphToolsFoundation/AssemblyInfo.cs b/Modules/GraphToolsFoundation/AssemblyInfo.cs
index eea34ffc73..6a9e11a8bd 100644
--- a/Modules/GraphToolsFoundation/AssemblyInfo.cs
+++ b/Modules/GraphToolsFoundation/AssemblyInfo.cs
@@ -15,6 +15,7 @@
 [assembly: InternalsVisibleTo("RecipesEditor")]
 [assembly: InternalsVisibleTo("SimpleMathBook")]
 [assembly: InternalsVisibleTo("VerticalFlow")]
+[assembly: InternalsVisibleTo("TestSample")]
 
 // Animation (@francisb)
 [assembly: InternalsVisibleTo("Unity.Animation.StateMachine.Tests")]
diff --git a/Modules/GraphToolsFoundationEditor/AssemblyInfo.cs b/Modules/GraphToolsFoundationEditor/AssemblyInfo.cs
index 98871ddcbb..e1a6aa60c7 100644
--- a/Modules/GraphToolsFoundationEditor/AssemblyInfo.cs
+++ b/Modules/GraphToolsFoundationEditor/AssemblyInfo.cs
@@ -16,6 +16,7 @@
 [assembly: InternalsVisibleTo("RecipesEditor")]
 [assembly: InternalsVisibleTo("SimpleMathBook")]
 [assembly: InternalsVisibleTo("VerticalFlow")]
+[assembly: InternalsVisibleTo("TestSample")]
 
 // Animation (@francisb)
 [assembly: InternalsVisibleTo("Unity.Animation.StateMachine.Tests")]
diff --git a/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/BaseGraphTool.cs b/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/BaseGraphTool.cs
index ea801592c1..595d185c50 100644
--- a/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/BaseGraphTool.cs
+++ b/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/BaseGraphTool.cs
@@ -16,10 +16,26 @@ namespace Unity.GraphToolsFoundation.Editor
     /// </summary>
     class BaseGraphTool : CsoTool, IHierarchicalCommandTarget
     {
+        /// <summary>
+        /// Creates and initializes a new <see cref="BaseGraphTool"/>.
+        /// </summary>
+        /// <param name="windowID">A hash representing the tool's main window.</param>
+        /// <typeparam name="T">The type of tool to create.</typeparam>
+        /// <returns>The newly created tool.</returns>
+        public static T Create<T>(Hash128 windowID) where T : BaseGraphTool, new()
+        {
+            var tool = new T();
+            tool.WindowID = windowID;
+            tool.Initialize();
+            return tool;
+        }
+
         string m_InstantiationStackTrace;
 
         protected Dictionary<string, OverlayToolbarProvider> m_ToolbarProviders;
 
+        protected Hash128 WindowID { get; private set; }
+
         /// <summary>
         /// The name of the tool.
         /// </summary>
@@ -171,10 +187,8 @@ public void DispatchToSelf(ICommand command, Diagnostics diagnosticsFlags = Diag
             Dispatcher.Dispatch(command, diagnosticsFlags);
         }
 
-        /// <summary>
-        /// Updates the state components by running the observers.
-        /// </summary>
-        public void Update()
+        /// <inheritdoc />
+        public override void Update()
         {
             if (Dispatcher is CommandDispatcher commandDispatcher)
             {
@@ -191,7 +205,7 @@ public void Update()
                 commandDispatcher.DiagnosticFlags = diagnosticFlags;
             }
 
-            ObserverManager.NotifyObservers(State);
+            base.Update();
         }
 
         void UndoRedoPerformed(in UndoRedoInfo info)
diff --git a/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/IUndoableCommandMerger.cs b/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/IUndoableCommandMerger.cs
new file mode 100644
index 0000000000..e8a3f13a22
--- /dev/null
+++ b/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/IUndoableCommandMerger.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 Unity.GraphToolsFoundation.Editor;
+
+/// <summary>
+/// Interface for merging multiple commands into a single undo operation.
+/// </summary>
+interface IUndoableCommandMerger
+{
+    /// <summary>
+    /// Indicate that you want to merge the next undoable commands into one undo.
+    /// </summary>
+    void StartMergingUndoableCommands();
+
+    /// <summary>
+    /// Ends the merging of undoables commands into one undo.
+    /// </summary>
+    void StopMergingUndoableCommands();
+}
diff --git a/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/SelectionStateComponent.cs b/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/SelectionStateComponent.cs
index bf3d32ee3f..f8bce07927 100644
--- a/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/SelectionStateComponent.cs
+++ b/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/SelectionStateComponent.cs
@@ -173,6 +173,11 @@ public SimpleChangeset GetAggregatedChangeset(uint sinceVersion)
             return m_ChangesetManager.GetAggregatedChangeset(sinceVersion, CurrentVersion);
         }
 
+        /// <summary>
+        /// Returns true if the selection is empty.
+        /// </summary>
+        public bool IsSelectionEmpty => m_Selection.Count == 0;
+
         /// <summary>
         /// Gets the list of selected graph element models. If not done yet, this
         /// function resolves the list of models from a list of GUID, using the graph.
diff --git a/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/ToolState/UndoStateComponent.cs b/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/ToolState/UndoStateComponent.cs
index acba7b7e98..11822b294f 100644
--- a/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/ToolState/UndoStateComponent.cs
+++ b/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/ToolState/UndoStateComponent.cs
@@ -80,8 +80,7 @@ public void BeginOperation(string undoString)
         /// </summary>
         public void EndOperation()
         {
-            m_UndoStateRecorder.RecordComponent(m_ToolStateComponent);
-            m_UndoStateRecorder.EndRecording();
+            m_UndoStateRecorder.EndRecording(m_ToolStateComponent);
         }
 
         /// <inheritdoc />
diff --git a/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/ToolState/UndoStateRecorder.cs b/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/ToolState/UndoStateRecorder.cs
index a9555ede13..f1dae59220 100644
--- a/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/ToolState/UndoStateRecorder.cs
+++ b/Modules/GraphToolsFoundationEditor/EditorCommon/CommandStateObserver/ToolState/UndoStateRecorder.cs
@@ -209,15 +209,21 @@ public void RecordComponents(IEnumerable<IUndoableStateComponent> stateComponent
         /// <summary>
         /// Signals the end of a recording. Sends the undo data to the editor undo system.
         /// </summary>
-        public void EndRecording()
+        /// <param name="stateComponents">Additional state components to record; they will be recorded only if there already was other recorded state components.</param>
+        public void EndRecording(params IUndoableStateComponent[] stateComponents)
         {
             if (m_StateComponents.Count > 0)
             {
+                if (stateComponents != null)
+                {
+                    RecordComponents(stateComponents);
+                }
+
                 var operation = new OperationRecord(m_OperationId);
                 for (var i = 0; i < m_StateComponents.Count; i++)
                 {
                     var component = m_StateComponents[i];
-                    var changeset = component.ChangesetManager?.CurrentChangeset;
+                    var changeset = component.ChangesetManager?.GetAggregatedChangeset(m_StateComponentVersions[i], component.CurrentVersion);
                     var serializedChangeset = new SerializedChangeset(changeset);
                     s_ToNextVersionChangesets.TryAdd((component.Guid, m_StateComponentVersions[i]), serializedChangeset);
                     s_FromPreviousVersionChangesets.TryAdd((component.Guid, component.CurrentVersion), serializedChangeset);
diff --git a/Modules/GraphToolsFoundationEditor/GraphProcessors/GraphProcessor.cs b/Modules/GraphToolsFoundationEditor/GraphProcessors/GraphProcessor.cs
index 749ecdb1f3..605f15d045 100644
--- a/Modules/GraphToolsFoundationEditor/GraphProcessors/GraphProcessor.cs
+++ b/Modules/GraphToolsFoundationEditor/GraphProcessors/GraphProcessor.cs
@@ -11,6 +11,16 @@ namespace Unity.GraphToolsFoundation.Editor
     /// </summary>
     abstract class GraphProcessor
     {
+        /// <summary>
+        /// Performs tasks that need to be done when the <see cref="GraphModel"/> is enabled.
+        /// </summary>
+        public virtual void OnGraphModelEnabled() { }
+
+        /// <summary>
+        /// Performs tasks that need to be done when the <see cref="GraphModel"/> is disabled.
+        /// </summary>
+        public virtual void OnGraphModelDisabled() { }
+
         /// <summary>
         /// Processes the graph.
         /// </summary>
diff --git a/Modules/GraphToolsFoundationEditor/GraphProcessors/GraphProcessorContainer.cs b/Modules/GraphToolsFoundationEditor/GraphProcessors/GraphProcessorContainer.cs
index f116b03ad1..632f119c9b 100644
--- a/Modules/GraphToolsFoundationEditor/GraphProcessors/GraphProcessorContainer.cs
+++ b/Modules/GraphToolsFoundationEditor/GraphProcessors/GraphProcessorContainer.cs
@@ -24,6 +24,38 @@ public void AddGraphProcessor(GraphProcessor graphProcessor)
             m_GraphProcessors.Add(graphProcessor);
         }
 
+        /// <summary>
+        /// Performs tasks that need to be done when the <see cref="GraphModel"/> is enabled.
+        /// </summary>
+        public void OnGraphModelEnabled()
+        {
+            if (m_GraphProcessors == null)
+            {
+                return;
+            }
+
+            foreach (var processor in m_GraphProcessors)
+            {
+                processor.OnGraphModelEnabled();
+            }
+        }
+
+        /// <summary>
+        /// Performs tasks that need to be done when the <see cref="GraphModel"/> is disabled.
+        /// </summary>
+        public void OnGraphModelDisabled()
+        {
+            if (m_GraphProcessors == null)
+            {
+                return;
+            }
+
+            foreach (var processor in m_GraphProcessors)
+            {
+                processor.OnGraphModelDisabled();
+            }
+        }
+
         /// <summary>
         /// Processes a graph using the container's graph processors.
         /// </summary>
diff --git a/Modules/GraphToolsFoundationEditor/ItemLibrary/ItemLibraryLibrary_Internal.cs b/Modules/GraphToolsFoundationEditor/ItemLibrary/ItemLibraryLibrary_Internal.cs
index 31e829d931..6f8907d30e 100644
--- a/Modules/GraphToolsFoundationEditor/ItemLibrary/ItemLibraryLibrary_Internal.cs
+++ b/Modules/GraphToolsFoundationEditor/ItemLibrary/ItemLibraryLibrary_Internal.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.GraphToolsFoundation.Editor;
 
 namespace Unity.ItemLibrary.Editor
 {
@@ -113,8 +114,9 @@ public ItemLibraryLibrary_Internal(ItemLibraryDatabaseBase database, IItemLibrar
         /// <param name="adapter">An adapter specifying several preferences for the search.</param>
         /// <param name="filter">A filter to ignore certain items.</param>
         /// <param name="context">The name of the context using the library. Used to separate preferences.</param>
-        public ItemLibraryLibrary_Internal(IEnumerable<ItemLibraryDatabaseBase> databases, IItemLibraryAdapter adapter = null, ItemLibraryFilter filter = null, string context = null)
-            : this(databases, null, adapter, filter, context)
+        /// <param name="sourcePort">The port from which the library is created, if any.</param>
+        public ItemLibraryLibrary_Internal(IEnumerable<ItemLibraryDatabaseBase> databases, IItemLibraryAdapter adapter = null, ItemLibraryFilter filter = null, string context = null, PortModel sourcePort = null)
+            : this(databases, null, adapter, filter, context, sourcePort)
         {}
 
         internal ItemLibraryPreferences_Internal Preferences_Internal { get; }
@@ -127,6 +129,12 @@ public ItemLibraryLibrary_Internal(IEnumerable<ItemLibraryDatabaseBase> database
         /// </summary>
         public IReadOnlyList<ItemLibraryItem> CurrentFavorites => m_CachedFavorites;
 
+        /// <summary>
+        /// The <see cref="PortModel"/> from which the library is created, if any.
+        /// </summary>
+        /// <remarks>Not null when the library is created by dragging a wire from a port, null otherwise.</remarks>
+        public PortModel SourcePort { get; }
+
         /// <summary>
         /// Tests whether a <see cref="ItemLibraryItem"/> is a favorite or not.
         /// </summary>
@@ -180,7 +188,7 @@ public void ClearFavorites()
             m_CachedFavorites.Clear();
         }
 
-        ItemLibraryLibrary_Internal(IEnumerable<ItemLibraryDatabaseBase> databases, string title, IItemLibraryAdapter adapter, ItemLibraryFilter filter, string context = null)
+        ItemLibraryLibrary_Internal(IEnumerable<ItemLibraryDatabaseBase> databases, string title, IItemLibraryAdapter adapter, ItemLibraryFilter filter, string context = null, PortModel sourcePort = null)
         {
             m_Databases = new List<ItemLibraryDatabaseBase>();
             var databaseId = 0;
@@ -196,6 +204,7 @@ public void ClearFavorites()
 
             Adapter = adapter ?? new ItemLibraryAdapter(title);
             Preferences_Internal = new ItemLibraryPreferences_Internal(Adapter.LibraryName, string.IsNullOrEmpty(context) ? k_DefaultContext : context);
+            SourcePort = sourcePort;
         }
 
         Dictionary<ItemLibraryItem, ItemLibraryDatabaseBase.SearchData_Internal> m_LastSearchDataPerItem = new Dictionary<ItemLibraryItem, ItemLibraryDatabaseBase.SearchData_Internal>();
diff --git a/Modules/GraphToolsFoundationEditor/ItemLibrary/UI/ItemLibraryControl_Internal.cs b/Modules/GraphToolsFoundationEditor/ItemLibrary/UI/ItemLibraryControl_Internal.cs
index 4568e15159..5f7b07d369 100644
--- a/Modules/GraphToolsFoundationEditor/ItemLibrary/UI/ItemLibraryControl_Internal.cs
+++ b/Modules/GraphToolsFoundationEditor/ItemLibrary/UI/ItemLibraryControl_Internal.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.GraphToolsFoundation.Editor;
 using UnityEditor;
 using UnityEngine;
 using UnityEditor.UIElements;
@@ -50,7 +51,7 @@ class ItemLibraryControl_Internal : VisualElement
         const string k_HideDetailsTooltip = "Hide Preview";
         const string k_ShowDetailsTooltip = "Show Preview";
         const string k_DetailsPanelHiddenClassName = "hidden";
-        const string k_SearchplaceholderlabelHiddenClassName = "searchPlaceholderLabel--hidden";
+        const string k_SearchPlaceholderLabelHiddenClassName = "searchPlaceholderLabel--hidden";
 
         const string k_IndexingDatabaseStatusText = "Indexing Databases...";
 
@@ -62,6 +63,7 @@ class ItemLibraryControl_Internal : VisualElement
         internal Label TitleLabel_Internal => m_TitleLabel;
         internal Toggle DetailsToggle_Internal => m_DetailsToggle;
         internal TextField SearchTextField_Internal => m_SearchTextField;
+        internal LibraryTreeView_Internal TreeView_Internal => m_TreeView;
         internal static string DetailsPanelHiddenClassName_Internal => k_DetailsPanelHiddenClassName;
         internal bool IsIndexing_Internal { get; private set; }
         internal static string IndexingDatabaseStatusText_Internal => k_IndexingDatabaseStatusText;
@@ -150,11 +152,13 @@ public ItemLibraryControl_Internal()
             {
                 m_SearchTextField.focusable = true;
                 m_SearchTextField.RegisterCallback<InputEvent>(OnSearchTextFieldTextChanged);
+                m_SearchTextField.RegisterCallback<KeyDownEvent>(OnSearchTextFieldKeyDown, TrickleDown.TrickleDown);
+                m_SearchTextField.RegisterCallback<NavigationMoveEvent>(OnSearchTextFieldNavigationMove);
+                m_SearchTextField.RegisterCallback<NavigationSubmitEvent>(OnSearchTextFieldNavigationSubmit);
+                m_SearchTextField.RegisterCallback<NavigationCancelEvent>(OnSearchTextFieldNavigationCancel);
+                m_SearchTextField.AddToClassList(TextInputBaseField<string>.ussClassName);
 
                 m_SearchTextInput = m_SearchTextField.Q(TextInputBaseField<string>.textInputUssName);
-                m_SearchTextInput.RegisterCallback<KeyDownEvent>(OnSearchTextFieldKeyDown, TrickleDown.TrickleDown);
-
-                m_SearchTextField.AddToClassList(TextInputBaseField<string>.ussClassName);
             }
 
             m_AutoCompleteLabel = this.Q<Label>(k_WindowAutoCompleteLabelName);
@@ -182,8 +186,45 @@ void OnTreeviewSelectionChange(IReadOnlyList<ITreeItemView_Internal> selection)
             m_Library.Adapter.OnSelectionChanged(selectedItems);
             if (m_Library.Adapter.HasDetailsPanel)
             {
-                m_Library.Adapter.UpdateDetailsPanel(selectedItems.FirstOrDefault());
+                var selectedItem = selectedItems.FirstOrDefault();
+                m_Library.Adapter.UpdateDetailsPanel(selectedItem);
+                if (m_Library.SourcePort != null && selectedItem is GraphNodeModelLibraryItem)
+                    AddPortSubItems(selectedItem);
+            }
+        }
+
+        void AddPortSubItems(ItemLibraryItem selectedItem)
+        {
+            if (selectedItem is not GraphNodeModelLibraryItem nodeItem)
+                return;
+
+            var currentGraphElement = (m_Library.Adapter as GraphNodeLibraryAdapter)?.CurrentElement;
+            if (currentGraphElement == null
+                || m_Library.SourcePort == null
+                || currentGraphElement.Model is not NodeModel nodeModel
+                || nodeModel is ISingleOutputPortNodeModel
+                || nodeModel is ISingleInputPortNodeModel)
+                return;
+
+            var graphModel = nodeModel.GraphModel;
+            var ports = m_Library.SourcePort.Direction == PortDirection.Input ? nodeModel.OutputsByDisplayOrder : nodeModel.InputsByDisplayOrder;
+            var compatiblePorts = graphModel.GetCompatiblePorts(ports, m_Library.SourcePort);
+
+            var portItems = new List<GraphNodeModelLibraryItem>();
+            var portWithEmptyTitleCount = 0;
+            foreach (var portToAdd in compatiblePorts)
+            {
+                var type = nodeModel.GetType();
+                var portEntryName = string.IsNullOrEmpty(portToAdd.DisplayTitle) ? $"Port {portWithEmptyTitleCount++}" : portToAdd.DisplayTitle;
+                var portItem = new GraphNodeModelLibraryItem(new NodeItemLibraryData(type, portToAdd), nodeItem.CreateElement)
+                {
+                    FullName = selectedItem.FullName + "/" + portEntryName,
+                    Help = selectedItem.Help,
+                    StyleName = selectedItem.StyleName
+                };
+                portItems.Add(portItem);
             }
+            m_TreeView.AddPortItemsToVisibleResults_Internal(portItems);
         }
 
         void HackDueToListViewScrollViewStealingFocus()
@@ -326,7 +367,7 @@ void Refresh()
             var query = m_Text;
             var noQuery = string.IsNullOrEmpty(query);
 
-            m_SearchPlaceholderLabel.EnableInClassList(k_SearchplaceholderlabelHiddenClassName, !string.IsNullOrEmpty(query));
+            m_SearchPlaceholderLabel.EnableInClassList(k_SearchPlaceholderLabelHiddenClassName, !string.IsNullOrEmpty(query));
             var results = m_Library.Search(query).ToList();
 
             m_SuggestedCompletion = string.Empty;
@@ -360,11 +401,11 @@ void OnSearchTextFieldTextChanged(InputEvent inputEvent)
         {
             var text = inputEvent.newData;
 
+            // This is necessary due to OnTextChanged(...) being called after user inputs that have no impact on the text.
+            // Ex: Moving the caret.
             if (string.Equals(text, m_Text))
                 return;
 
-            // This is necessary due to OnTextChanged(...) being called after user inputs that have no impact on the text.
-            // Ex: Moving the caret.
             m_Text = text;
 
             // If backspace is pressed and no text remain, clear the suggestion label.
@@ -393,73 +434,150 @@ void OnSearchTextFieldTextChanged(InputEvent inputEvent)
 
         void OnSearchTextFieldKeyDown(KeyDownEvent keyDownEvent)
         {
-            // First, check if we cancelled the search.
-            if (keyDownEvent.keyCode == KeyCode.Escape)
-            {
-                itemChosen_Internal?.Invoke(null);
-                keyDownEvent.StopPropagation();
-                return;
-            }
-
-            // For some reason the KeyDown event is raised twice when entering a character.
+            // KeyDown event is raised twice when entering a character: once with a key code, once with a character.
             // As such, we ignore one of the duplicate event.
-            // This workaround was recommended by the Editor team. The cause of the issue relates to how IMGUI works
-            // and a fix was not in the works at the moment of this writing.
             if (keyDownEvent.character == k_TabCharacter)
             {
                 // Prevent switching focus to another visual element.
+                keyDownEvent.StopPropagation();
                 keyDownEvent.PreventDefault();
-
                 return;
             }
 
-            // If Tab is pressed, complete the query with the suggested term.
-            if (keyDownEvent.keyCode == KeyCode.Tab)
+            switch (keyDownEvent.keyCode)
             {
-                // Used to prevent the TAB input from executing it's default behavior. We're hijacking it for auto-completion.
-                keyDownEvent.PreventDefault();
-
-                if (!string.IsNullOrEmpty(m_SuggestedCompletion))
+                case KeyCode.Escape:
                 {
-                    SelectAndReplaceCurrentWord();
-                    m_AutoCompleteLabel.text = string.Empty;
+                    // Close window with no selection and prevent text field from processing the event.
+                    itemChosen_Internal?.Invoke(null);
+                    keyDownEvent.StopPropagation();
+                    keyDownEvent.PreventDefault();
+                    break;
+                }
+                case KeyCode.Tab:
+                {
+                    // Complete the query with the suggested term and prevent text field from processing the event.
 
-                    // TODO: Revisit, we shouldn't need to do this here.
-                    m_Text = m_SearchTextField.text;
+                    if (!string.IsNullOrEmpty(m_SuggestedCompletion))
+                    {
+                        SelectAndReplaceCurrentWord();
+                        m_AutoCompleteLabel.text = string.Empty;
 
-                    Refresh();
+                        Refresh();
 
-                    m_SuggestedCompletion = string.Empty;
+                        m_SuggestedCompletion = string.Empty;
+                    }
+
+                    keyDownEvent.StopPropagation();
+                    keyDownEvent.PreventDefault();
+                    break;
                 }
-            }
-            else
-            {
-                keyDownEvent.StopPropagation();
-                using (var eKeyDown = KeyDownEvent.GetPooled(keyDownEvent.character, keyDownEvent.keyCode,
-                    keyDownEvent.modifiers))
+                case KeyCode.Home:
+                case KeyCode.End:
+                case KeyCode.PageUp:
+                case KeyCode.PageDown:
+                {
+                    // Forward a copy of the event to the tree view and prevent text field from processing the event.
+                    using (var eKeyDown = KeyDownEvent.GetPooled(keyDownEvent.character, keyDownEvent.keyCode,
+                               keyDownEvent.modifiers))
+                    {
+                        eKeyDown.target = m_TreeView.scrollView.contentContainer;
+                        SendEvent(eKeyDown);
+                    }
+
+                    keyDownEvent.StopPropagation();
+                    keyDownEvent.PreventDefault();
+                    break;
+                }
+                case KeyCode.LeftArrow:
+                case KeyCode.RightArrow:
+                {
+                    // Forward a copy of the event to the tree view and prevent text field from processing the event
+                    // if the tree view handled it. If it was not handled by the tree view, we want the text field
+                    // to move the cursor left or right.
+                    using (var eKeyDown = KeyDownEvent.GetPooled(keyDownEvent.character, keyDownEvent.keyCode,
+                               keyDownEvent.modifiers))
+                    {
+                        eKeyDown.target = m_TreeView;
+                        SendEvent(eKeyDown);
+
+                        if (eKeyDown.isPropagationStopped)
+                        {
+                            keyDownEvent.StopPropagation();
+                            keyDownEvent.PreventDefault();
+                        }
+                    }
+
+                    break;
+                }
+                case KeyCode.UpArrow:
+                case KeyCode.DownArrow:
+                {
+                    // Ignore those events. They will be translated to NavigationMoveEvent.
+                    keyDownEvent.StopPropagation();
+                    keyDownEvent.PreventDefault();
+                    break;
+                }
+                case KeyCode.Space:
                 {
-                    eKeyDown.target = m_TreeView;
-                    SendEvent(eKeyDown);
+                    // We do not want space to trigger a submit event to the tree view.
+                    m_SkipSubmit = true;
+                    break;
                 }
             }
         }
 
+        bool m_SkipSubmit;
+
+        void OnSearchTextFieldNavigationCancel(NavigationCancelEvent evt)
+        {
+            // Forward a copy of the event to the tree view and prevent text field from processing the event.
+            using (var ee = NavigationCancelEvent.GetPooled(evt.deviceType, evt.modifiers))
+            {
+                ee.target = m_TreeView.scrollView.contentContainer;
+                SendEvent(ee);
+            }
+            evt.StopPropagation();
+            evt.PreventDefault();
+        }
+
+        void OnSearchTextFieldNavigationSubmit(NavigationSubmitEvent evt)
+        {
+            if (m_SkipSubmit)
+            {
+                m_SkipSubmit = false;
+                return;
+            }
+
+            // Forward a copy of the event to the tree view and prevent text field from processing the event.
+            using (var ee = NavigationSubmitEvent.GetPooled(evt.deviceType, evt.modifiers))
+            {
+                ee.target = m_TreeView.scrollView.contentContainer;
+                SendEvent(ee);
+            }
+            evt.StopPropagation();
+            evt.PreventDefault();
+        }
+
+        void OnSearchTextFieldNavigationMove(NavigationMoveEvent evt)
+        {
+            // Forward a copy of the event to the tree view and prevent text field from processing the event.
+            using (var ee = NavigationMoveEvent.GetPooled(evt.move, evt.deviceType, evt.modifiers))
+            {
+                ee.target = m_TreeView.scrollView.contentContainer;
+                SendEvent(ee);
+            }
+            evt.StopPropagation();
+            evt.PreventDefault();
+        }
+
         void SelectAndReplaceCurrentWord()
         {
             var newText = m_SearchTextField.value + m_SuggestedCompletion;
-
-            // Wait for SelectRange api to reach trunk
-            //#if UNITY_2018_3_OR_NEWER
-            //            m_SearchTextField.value = newText;
-            //            m_SearchTextField.SelectRange(m_SearchTextField.value.Length, m_SearchTextField.value.Length);
-            //#else
-            // HACK - relies on the textfield moving the caret when being assigned a value and skipping
-            // all low surrogate characters
-            var magicMoveCursorToEndString = new string('\uDC00', newText.Length);
-            m_SearchTextField.value = magicMoveCursorToEndString;
             m_SearchTextField.value = newText;
-
-            //#endif
+            m_Text = newText;
+            m_SearchTextField.textInputBase.textElement.uitkTextHandle.Update();
+            m_SearchTextField.textSelection.MoveTextEnd();
         }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/ItemLibrary/UI/LibraryTreeView_Internal.cs b/Modules/GraphToolsFoundationEditor/ItemLibrary/UI/LibraryTreeView_Internal.cs
index 328991a1b6..b61f690de5 100644
--- a/Modules/GraphToolsFoundationEditor/ItemLibrary/UI/LibraryTreeView_Internal.cs
+++ b/Modules/GraphToolsFoundationEditor/ItemLibrary/UI/LibraryTreeView_Internal.cs
@@ -5,6 +5,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.GraphToolsFoundation;
+using Unity.GraphToolsFoundation.Editor;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -55,6 +57,7 @@ class LibraryTreeView_Internal : ListView
         Stack<ITreeItemView_Internal> m_RootItems;
 
         ItemLibraryItem m_LastFavoriteClicked;
+        ITreeItemView_Internal m_LastItemViewClicked;
 
         double m_LastFavoriteClickTime;
 
@@ -103,6 +106,21 @@ public void Setup(ItemLibraryLibrary_Internal library, Action<ItemLibraryItem> s
             RefreshListView();
         }
 
+        internal void AddPortItemsToVisibleResults_Internal(IEnumerable<GraphNodeModelLibraryItem> portItems)
+        {
+            if (selectedItem is IItemView_Internal selectedItemView)
+            {
+                foreach (var portItem in portItems)
+                {
+                    if (selectedItemView.GetPortToConnect() != null)
+                        selectedItemView.Parent.AddItem(new ItemView_Internal(selectedItemView.Parent, portItem));
+                    else
+                        selectedItemView.AddItem(new ItemView_Internal(selectedItemView, portItem));
+                }
+            }
+            RegenerateVisibleResults();
+        }
+
         void RegenerateVisibleResults()
         {
             m_VisibleItems.Clear();
@@ -118,12 +136,27 @@ void RegenerateVisibleResults()
                 m_RootItems.Push(m_ResultsHierarchy.SubCategories[i]);
             }
 
+            var selectedItemView = selectedItem as IItemView_Internal;
+
             if (ViewMode == ResultsViewMode.Hierarchy)
             {
                 m_FavoriteCategoryView.ClearItems();
                 foreach (var favoriteItem in m_Library.CurrentFavorites.Where(f => m_Results.Contains(f)))
                 {
-                    m_FavoriteCategoryView.AddItem(new ItemView_Internal(m_FavoriteCategoryView, favoriteItem));
+                    IItemView_Internal itemViewToAdd = null;
+                    if (selectedItemView != null && selectedItemView.IsInCategory(m_FavoriteCategoryView))
+                    {
+                        if (selectedItemView.GetPortToConnect() != null)
+                        {
+                            if (selectedItemView.Parent is IItemView_Internal parentItemView && parentItemView.Item == favoriteItem)
+                                itemViewToAdd = parentItemView;
+                        }
+                        else if (selectedItemView.Item == favoriteItem)
+                        {
+                            itemViewToAdd = selectedItemView;
+                        }
+                    }
+                    m_FavoriteCategoryView.AddItem(itemViewToAdd?? new ItemView_Internal(m_FavoriteCategoryView, favoriteItem));
                 }
 
                 m_RootItems.Push(m_FavoriteCategoryView);
@@ -133,6 +166,19 @@ void RegenerateVisibleResults()
             {
                 var item = m_RootItems.Pop();
                 m_VisibleItems.Add(item);
+
+                if (item is IItemView_Internal itemView)
+                {
+                    if (itemView == selectedItemView)
+                        selectedIndex = m_VisibleItems.Count - 1;
+
+                    for (var i = itemView.Items.Count - 1; i >= 0; i--)
+                    {
+                        m_RootItems.Push(itemView.Items[i]);
+                    }
+                    itemView.ClearItems();
+                }
+
                 if (item is ICategoryView_Internal category && !m_Library.IsCollapsed_Internal(category))
                 {
                     for (var i = category.Items.Count - 1; i >= 0; i--)
@@ -168,34 +214,24 @@ internal void SetResults_Internal(IEnumerable<ItemLibraryItem> results)
 
         void OnKeyDownEvent(KeyDownEvent evt)
         {
-            var categoryView = selectedItem as ICategoryView_Internal;
             var itemView = selectedItem as IItemView_Internal;
+            var categoryView = itemView is null ? selectedItem as ICategoryView_Internal : null;
 
             switch (evt.keyCode)
             {
-                case KeyCode.Return:
-                case KeyCode.KeypadEnter:
-                    OnItemChosen(itemView?.Item);
-                    break;
                 case KeyCode.LeftArrow:
                     if (categoryView != null)
+                    {
                         Collapse(categoryView);
+                        evt.StopPropagation();
+                    }
                     break;
                 case KeyCode.RightArrow:
                     if (categoryView != null)
+                    {
                         Expand(categoryView);
-                    break;
-                case KeyCode.UpArrow:
-                    SelectItemInListView(selectedIndex - 1);
-                    break;
-                case KeyCode.DownArrow:
-                    SelectItemInListView(selectedIndex + 1);
-                    break;
-                case KeyCode.PageUp:
-                    SelectItemInListView(0);
-                    break;
-                case KeyCode.PageDown:
-                    SelectItemInListView(itemsSource.Count - 1);
+                        evt.StopPropagation();
+                    }
                     break;
             }
         }
@@ -225,8 +261,8 @@ void Bind(VisualElement target, int index)
         {
             var treeItem = m_VisibleItems[index];
             target.AddToClassList(itemClassName);
-            var categoryView = treeItem as ICategoryView_Internal;
             var itemView = treeItem as IItemView_Internal;
+            var categoryView = itemView is null ? treeItem as ICategoryView_Internal : null;
             target.EnableInClassList(itemCategoryClassName, categoryView != null);
             if (!string.IsNullOrEmpty(treeItem.StyleName))
                 target.AddToClassList(GetItemCustomClassName(treeItem));
@@ -237,7 +273,6 @@ void Bind(VisualElement target, int index)
             var expander = target.Q<VisualElement>("itemChildExpander");
 
             var icon = expander.Query("expanderIcon").First();
-            var iconElement = target.Q<VisualElement>("itemIconVisualElement");
 
             if (categoryView != null)
             {
@@ -245,9 +280,10 @@ void Bind(VisualElement target, int index)
                 icon.EnableInClassList(collapseButtonCollapsedClassName, m_Library.IsCollapsed_Internal(categoryView));
             }
 
+            var iconElement = target.Q<VisualElement>("itemIconVisualElement");
             iconElement.AddToClassList(itemCategoryIconClassName);
 
-            if (!string.IsNullOrEmpty(treeItem.StyleName))
+            if (!TryAddCompatiblePortIcon(iconElement, itemView) && !string.IsNullOrEmpty(treeItem.StyleName))
                 iconElement.AddToClassList(GetItemCustomClassName(treeItem) + CategoryIconSuffix);
 
             var nameLabelsContainer = target.Q<VisualElement>("labelsContainer");
@@ -273,7 +309,7 @@ void Bind(VisualElement target, int index)
             target.name = k_EntryName;
 
             var favButton = target.Q(k_FavoriteButtonname);
-            if (favButton != null && itemView != null)
+            if (favButton != null && itemView != null && itemView.GetPortToConnect() == null)
             {
                 favButton.AddToClassList(favoriteButtonClassName);
 
@@ -298,6 +334,75 @@ void Bind(VisualElement target, int index)
             target.RegisterCallback<MouseDownEvent>(ExpandOrCollapse);
         }
 
+        bool TryAddCompatiblePortIcon(VisualElement iconElement, IItemView_Internal itemView)
+        {
+            var portToConnect = itemView?.GetPortToConnect();
+
+            if (portToConnect != null && m_Library.Adapter is GraphNodeLibraryAdapter nodeLibraryAdapter && nodeLibraryAdapter.PreviewGraphView != null)
+            {
+                if (portToConnect.DataTypeHandle == TypeHandle.ExecutionFlow)
+                {
+                    var portToConnectModelView = portToConnect.GetView_Internal(nodeLibraryAdapter.PreviewGraphView);
+                    if (portToConnectModelView is Port portToConnectUI)
+                    {
+                        iconElement.AddStylesheet_Internal("PortConnectorPart.uss");
+                        iconElement.AddStylesheet_Internal("Port.uss");
+                        iconElement.AddToClassList(Port.ussClassName);
+                        iconElement.AddToClassList(Port.ussClassName.WithUssElement(Port.connectorPartName));
+                        iconElement.AddToClassList(Port.outputModifierUssClassName);
+                        iconElement.AddToClassList(Port.notConnectedModifierUssClassName);
+                        iconElement.AddToClassList(Port.ussClassName.WithUssModifier("data-type-execution-flow"));
+                        iconElement.AddToClassList(Port.ussClassName.WithUssModifier("type-execution"));
+                        if (portToConnectUI.PortModel.Orientation == PortOrientation.Vertical)
+                            iconElement.AddToClassList(Port.verticalModifierUssClassName);
+
+                        var connectorBox = new VisualElement { name = PortConnectorPart.connectorUssName };
+                        connectorBox.AddToClassList(Port.ussClassName.WithUssElement(PortConnectorPart.connectorUssName));
+                        connectorBox.AddToClassList(PortConnectorPart.ussClassName.WithUssElement(PortConnectorPart.connectorUssName));
+                        iconElement.Add(connectorBox);
+
+                        portToConnectUI.RegisterCallback<CustomStyleResolvedEvent>(evt =>
+                        {
+                            if (evt.customStyle.TryGetValue(new CustomStyleProperty<Color>("--port-color"), out var portColorValue))
+                            {
+                                connectorBox.style.borderBottomColor = portColorValue;
+                                connectorBox.style.borderLeftColor = portColorValue;
+                                connectorBox.style.borderRightColor = portColorValue;
+                                connectorBox.style.borderTopColor = portColorValue;
+                            }
+                            if (evt.customStyle.TryGetValue(new CustomStyleProperty<Color>("--port-background"), out var portBackgroundValue))
+                            {
+                                connectorBox.style.backgroundColor = portBackgroundValue;
+                            }
+                        });
+                    }
+                }
+                else
+                {
+                    var imageIcon = new Image();
+                    imageIcon.AddStylesheet_Internal("TypeIcons.uss");
+                    var portToConnectModelView = portToConnect.GetView_Internal(nodeLibraryAdapter.PreviewGraphView);
+                    imageIcon.tintColor = Color.white;
+                    if (portToConnectModelView is Port portToConnectUI)
+                    {
+                        imageIcon.tintColor = portToConnectUI.PortColor;
+
+                        portToConnectUI.RegisterCallback<CustomStyleResolvedEvent>(evt =>
+                        {
+                            if (evt.customStyle.TryGetValue(new CustomStyleProperty<Color>("--port-color"), out var portColorValue))
+                                imageIcon.tintColor = portColorValue;
+                        });
+                    }
+                    imageIcon.PrefixEnableInClassList(Port.dataTypeClassPrefix, Port.GetClassNameSuffixForDataType_Internal(portToConnect.PortDataType));
+                    iconElement.Add(imageIcon);
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Text to display for the path of an item.
         /// Exposed to internal for tests.
@@ -328,6 +433,23 @@ void UnBind(VisualElement target, int index)
             icon.RemoveFromClassList(collapseButtonCollapsedClassName);
 
             iconElement.RemoveFromClassList(itemCategoryIconClassName);
+
+            if (index > 0 && index < m_VisibleItems.Count && m_VisibleItems[index] is IItemView_Internal itemView)
+            {
+                var portToConnect = itemView.GetPortToConnect();
+                if (portToConnect != null)
+                {
+                    iconElement.RemoveFromClassList(Port.dataTypeClassPrefix + Port.GetClassNameSuffixForDataType_Internal(portToConnect.PortDataType));
+                    for (var i = 0; i < iconElement.childCount; i++)
+                    {
+                        if (iconElement[i] is Image)
+                        {
+                            iconElement.RemoveAt(i);
+                            break;
+                        }
+                    }
+                }
+            }
             RemoveCustomClassIfFound(iconElement);
 
             var favButton = target.Q(k_FavoriteButtonname);
@@ -394,6 +516,12 @@ void OnSelectionChanged()
             if (SelectionIsInvalidOrAFavoriteClick())
                 return;
 
+            var selectedItemView = selectedItem as IItemView_Internal;
+            if (m_LastItemViewClicked == selectedItemView)
+                return;
+
+            m_LastItemViewClicked = selectedItemView;
+
             if (!selectedItems.Any())
                 m_ItemChosenCallback(null);
             else
@@ -539,7 +667,7 @@ void ExpandOrCollapse(MouseDownEvent evt)
             if (target.name != expandingItemName)
                 target = itemElement.Q(expandingItemName);
 
-            if (target == null || !(itemElement?.userData is ICategoryView_Internal item))
+            if (target == null || !(itemElement?.userData is ICategoryView_Internal item) || itemElement.userData is IItemView_Internal)
                 return;
 
             if (m_Library.IsCollapsed_Internal(item))
diff --git a/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/CategoryView_Internal.cs b/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/CategoryView_Internal.cs
index 9ea4bac8c4..194f84489b 100644
--- a/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/CategoryView_Internal.cs
+++ b/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/CategoryView_Internal.cs
@@ -16,17 +16,17 @@ class CategoryView_Internal: ICategoryView_Internal
         /// <summary>
         /// Name of the Item.
         /// </summary>
-        public string Name { get; }
+        public virtual string Name { get; }
 
         /// <summary>
         /// Parent of this item in the hierarchy.
         /// </summary>
-        public ICategoryView_Internal Parent { get; }
+        public virtual ICategoryView_Internal Parent { get; }
 
         /// <summary>
         /// Custom name used to generate USS styles when creating UI for this item.
         /// </summary>
-        public string StyleName { get; set; }
+        public virtual string StyleName { get; set; }
 
         /// <summary>
         /// Depth of this item in the hierarchy.
@@ -46,12 +46,12 @@ public int Depth
         /// <summary>
         /// Path in the hierarchy of items.
         /// </summary>
-        public string Path => m_Path ??= this.GetPath();
+        public virtual string Path => m_Path ??= this.GetPath();
 
         /// <summary>
         /// Help content to display about this item.
         /// </summary>
-        public string Help { get; set; }
+        public virtual string Help { get; set; }
 
         /// <summary>
         /// Categories to display as children of this one.
@@ -148,6 +148,24 @@ public static CategoryView_Internal BuildViewModels(IEnumerable<ItemLibraryItem>
             return rootCategory;
         }
 
+        /// <summary>
+        /// Check if this category is part of an other <see cref="ICategoryView_Internal"/>.
+        /// </summary>
+        /// <param name="category">The other <see cref="ICategoryView_Internal"/>.</param>
+        /// <returns>True if it is part of the other <see cref="ICategoryView_Internal"/>, false otherwise.</returns>
+        public bool IsInCategory(ICategoryView_Internal category)
+        {
+            var parent = Parent;
+            while (parent != null)
+            {
+                if (parent == category)
+                    return true;
+                parent = parent.Parent;
+            }
+
+            return false;
+        }
+
         static ICategoryView_Internal RetrieveOrCreatePath(ItemLibraryItem item,
             ICategoryView_Internal rootCategory, IReadOnlyDictionary<string, string> categoryPathStyleNames)
         {
diff --git a/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/ICategoryView_Internal.cs b/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/ICategoryView_Internal.cs
index d0f626f78c..4d119b14be 100644
--- a/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/ICategoryView_Internal.cs
+++ b/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/ICategoryView_Internal.cs
@@ -42,5 +42,12 @@ interface ICategoryView_Internal : ITreeItemView_Internal
         /// Remove every subcategory under this category.
         /// </summary>
         public void ClearSubCategories();
+
+        /// <summary>
+        /// Check if this category is part of an other <see cref="ICategoryView_Internal"/>.
+        /// </summary>
+        /// <param name="category">The other <see cref="ICategoryView_Internal"/>.</param>
+        /// <returns>True if it is part of the other <see cref="ICategoryView_Internal"/>, false otherwise.</returns>
+        public bool IsInCategory(ICategoryView_Internal category);
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/IItemView_Internal.cs b/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/IItemView_Internal.cs
index a864acd1f2..16a2bf2f4d 100644
--- a/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/IItemView_Internal.cs
+++ b/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/IItemView_Internal.cs
@@ -2,16 +2,23 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using Unity.GraphToolsFoundation.Editor;
+
 namespace Unity.ItemLibrary.Editor
 {
     /// <summary>
     /// View model for a <see cref="ItemLibraryItem"/> in the ItemLibrary Tree View.
     /// </summary>
-    interface IItemView_Internal : ITreeItemView_Internal
+    interface IItemView_Internal : ICategoryView_Internal
     {
         /// <summary>
         /// The <see cref="ItemLibraryItem"/> represented by this view.
         /// </summary>
         public ItemLibraryItem Item { get; }
+
+        /// <summary>
+        /// Get the port to which this item will be connected to.
+        /// </summary>
+        public PortModel GetPortToConnect();
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/ItemView_Internal.cs b/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/ItemView_Internal.cs
index 1da88c2172..f009417f88 100644
--- a/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/ItemView_Internal.cs
+++ b/Modules/GraphToolsFoundationEditor/ItemLibrary/ViewModels/ItemView_Internal.cs
@@ -2,60 +2,51 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using Unity.GraphToolsFoundation.Editor;
+
 namespace Unity.ItemLibrary.Editor
 {
     /// <summary>
     /// View model for a <see cref="Item"/> in the library Tree View.
     /// </summary>
     /// <remarks>Basic implementation of <see cref="IItemView_Internal"/>.</remarks>
-    class ItemView_Internal: IItemView_Internal
+    class ItemView_Internal: CategoryView_Internal, IItemView_Internal
     {
         /// <summary>
         /// Name of the Item.
         /// </summary>
-        public string Name => Item.Name;
-
-        /// <summary>
-        /// Parent of this item in the hierarchy.
-        /// </summary>
-        public ICategoryView_Internal Parent { get; }
+        public override string Name => Item.Name;
 
         /// <summary>
         /// The <see cref="Item"/> represented by this view.
         /// </summary>
         public ItemLibraryItem Item { get; }
 
-        /// <summary>
-        /// Depth of this item in the hierarchy.
-        /// </summary>
-        public int Depth
-        {
-            get
-            {
-                if (m_Depth == -1)
-                {
-                    m_Depth = this.GetDepth();
-                }
-                return m_Depth;
-            }
-        }
-
         /// <summary>
         /// Path in the hierarchy of items.
         /// </summary>
-        public string Path => Item.CategoryPath;
+        public override string Path => Item.CategoryPath;
 
         /// <summary>
         /// Help content to display about this item.
         /// </summary>
-        public string Help => Item.Help;
+        public override string Help => Item.Help;
 
         /// <summary>
         /// Custom name used to generate USS styles when creating UI for this item.
         /// </summary>
-        public string StyleName => Item.StyleName;
+        public override string StyleName => Item.StyleName;
 
-        int m_Depth = -1;
+        /// <summary>
+        /// Get the port to which this item will be connected to.
+        /// </summary>
+        public PortModel GetPortToConnect()
+        {
+            if (Item is GraphNodeModelLibraryItem item && item.Data is NodeItemLibraryData data)
+                return data.PortToConnect;
+
+            return null;
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ItemView_Internal"/> class.
@@ -63,8 +54,8 @@ public int Depth
         /// <param name="parent">Category under which to display this item. Can be <c>null</c>.</param>
         /// <param name="item">The Item represented by this view.</param>
         public ItemView_Internal(ICategoryView_Internal parent, ItemLibraryItem item)
+            : base(item.Name, parent)
         {
-            Parent = parent;
             Item = item;
         }
     }
diff --git a/Modules/GraphToolsFoundationEditor/Model/Attributes/ModelSettingAttribute.cs b/Modules/GraphToolsFoundationEditor/Model/Attributes/ModelSettingAttribute.cs
index 42fccc8ad4..0ef66c4854 100644
--- a/Modules/GraphToolsFoundationEditor/Model/Attributes/ModelSettingAttribute.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/Attributes/ModelSettingAttribute.cs
@@ -6,11 +6,8 @@
 
 namespace Unity.GraphToolsFoundation.Editor
 {
-    /// <summary>
-    /// Attribute to mark a field as being a basic setting, one that appear in the Basic Settings section
-    /// of the model inspector.
-    /// </summary>
     [AttributeUsage(AttributeTargets.Field)]
+    [Obsolete("ModelSettingAttribute has been deprecated. Use NodeOptionAttribute instead.")]
     class ModelSettingAttribute : Attribute
     {
     }
diff --git a/Modules/GraphToolsFoundationEditor/Model/Attributes/NodeOptionAttribute.cs b/Modules/GraphToolsFoundationEditor/Model/Attributes/NodeOptionAttribute.cs
new file mode 100644
index 0000000000..a534446cd1
--- /dev/null
+++ b/Modules/GraphToolsFoundationEditor/Model/Attributes/NodeOptionAttribute.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;
+
+namespace Unity.GraphToolsFoundation.Editor
+{
+    /// <summary>
+    /// Attribute to mark a field as being a node option, one that appear in the Node Options section
+    /// of the model inspector.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field)]
+    class NodeOptionAttribute : Attribute
+    {
+    }
+}
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/AbstractNodeModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/AbstractNodeModel.cs
index 4f57052125..2aaafb58df 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/AbstractNodeModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/AbstractNodeModel.cs
@@ -23,6 +23,9 @@ abstract class AbstractNodeModel : GraphElementModel, IHasTitle, IMovable
         [SerializeField, HideInInspector]
         string m_Tooltip;
 
+        [SerializeField, HideInInspector]
+        SpawnFlags m_SpawnFlags;
+
         internal static string titleFieldName_Internal = nameof(m_Title);
         internal static string positionFieldName_Internal = nameof(m_Position);
 
@@ -45,7 +48,13 @@ abstract class AbstractNodeModel : GraphElementModel, IHasTitle, IMovable
         public virtual string Title
         {
             get => m_Title;
-            set => m_Title = value;
+            set
+            {
+                if (m_Title == value)
+                    return;
+                m_Title = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <inheritdoc />
@@ -57,7 +66,13 @@ public virtual string Title
         public virtual string Tooltip
         {
             get => string.IsNullOrEmpty(m_Tooltip)?DisplayTitle:m_Tooltip;
-            set => m_Tooltip = value;
+            set
+            {
+                if (m_Tooltip == value)
+                    return;
+                m_Tooltip = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Style);
+            }
         }
 
         /// <inheritdoc />
@@ -69,10 +84,23 @@ public virtual Vector2 Position
                 if (!this.IsMovable())
                     return;
 
+                if (m_Position == value)
+                    return;
+
                 m_Position = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Layout);
             }
         }
 
+        /// <summary>
+        /// The flags specifying how the node is to be spawned.
+        /// </summary>
+        public virtual SpawnFlags SpawnFlags
+        {
+            get => m_SpawnFlags;
+            set => m_SpawnFlags = value;
+        }
+
         /// <summary>
         /// Whether the object was deleted from the graph.
         /// </summary>
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/Blackboard/GroupModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/Blackboard/GroupModel.cs
index abb23cee4c..00fd564b89 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/Blackboard/GroupModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/Blackboard/GroupModel.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using UnityEngine;
 using UnityEngine.Scripting.APIUpdating;
+using UnityEngine.Serialization;
 
 namespace Unity.GraphToolsFoundation.Editor
 {
@@ -17,9 +18,21 @@ class GroupModel : GraphElementModel, IGroupItemModel, IGraphElementContainer, I
         [SerializeReference]
         List<IGroupItemModel> m_Items = new();
 
+        [SerializeField, FormerlySerializedAs("Title")]
+        string m_Title;
+
         /// <inheritdoc />
-        [field: SerializeField]
-        public virtual string Title { get; set; }
+        public virtual string Title
+        {
+            get => m_Title;
+            set
+            {
+                if (m_Title == value)
+                    return;
+                m_Title = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
+        }
 
         /// <inheritdoc />
         public virtual string DisplayTitle => Title;
@@ -35,6 +48,9 @@ class GroupModel : GraphElementModel, IGroupItemModel, IGraphElementContainer, I
         /// <inheritdoc />
         public IEnumerable<GraphElementModel> GraphElementModels => Items.OfType<GraphElementModel>();
 
+        /// <inheritdoc />
+        public override IEnumerable<GraphElementModel> DependentModels => base.DependentModels.Concat(GraphElementModels);
+
         /// <inheritdoc />
         public override IGraphElementContainer Container => ParentGroup;
 
@@ -62,28 +78,22 @@ public GroupModel()
         /// </summary>
         /// <param name="itemModel">The item.</param>
         /// <param name="index">The index at which insert the item. For index &lt;= 0, The item will be added at the beginning. For index &gt;= Items.Count, items will be added at the end./</param>
-        /// <returns>The graph elements changed by this method.</returns>
-        public virtual IEnumerable<GraphElementModel> InsertItem(IGroupItemModel itemModel, int index = int.MaxValue)
+        public virtual void InsertItem(IGroupItemModel itemModel, int index = int.MaxValue)
         {
-            HashSet<GraphElementModel> changedModels = new HashSet<GraphElementModel>();
-
             GroupModel current = this;
             while (current != null)
             {
                 if (ReferenceEquals(current, itemModel))
-                    return Enumerable.Empty<GraphElementModel>();
+                    return;
                 current = current.ParentGroup;
             }
 
-            if (itemModel.ParentGroup != null)
-                changedModels.UnionWith(itemModel.ParentGroup.RemoveItem(itemModel));
+            itemModel.ParentGroup?.RemoveItem(itemModel);
 
-            changedModels.Add(this);
+            GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Grouping);
             itemModel.ParentGroup = this;
             index = Math.Clamp(index, 0, m_Items.Count);
             m_Items.Insert(index, itemModel);
-
-            return changedModels;
         }
 
         /// <summary>
@@ -91,20 +101,17 @@ public virtual IEnumerable<GraphElementModel> InsertItem(IGroupItemModel itemMod
         /// </summary>
         /// <param name="items">The items.</param>
         /// <param name="insertAfter">The item after which the new items will be added. To add the items at the end, pass null.</param>
-        /// <returns>The graph elements changed by this method.</returns>
-        public virtual IEnumerable<GraphElementModel> MoveItemsAfter(IReadOnlyList<IGroupItemModel> items, IGroupItemModel insertAfter)
+        public virtual void MoveItemsAfter(IReadOnlyList<IGroupItemModel> items, IGroupItemModel insertAfter)
         {
             if (insertAfter != null && !m_Items.Contains(insertAfter))
-                return null;
+                return;
 
             if (items.Contains((insertAfter)))
-                return null;
+                return;
 
-            HashSet<GraphElementModel> changedModels = new HashSet<GraphElementModel>();
             foreach (var model in items)
             {
-                if (model.ParentGroup != null)
-                    changedModels.UnionWith(model.ParentGroup.RemoveItem(model));
+                model.ParentGroup?.RemoveItem(model);
             }
 
             // remove items from m_Items
@@ -122,29 +129,23 @@ public virtual IEnumerable<GraphElementModel> MoveItemsAfter(IReadOnlyList<IGrou
             int insertIndex = m_Items.IndexOf(insertAfter);
 
             foreach (var model in items)
-                changedModels.UnionWith(InsertItem(model, ++insertIndex));
-            return changedModels;
+                InsertItem(model, ++insertIndex);
         }
 
         /// <summary>
         /// Removes an item from the group.
         /// </summary>
         /// <param name="itemModel">The item.</param>
-        /// <returns>The graph elements changed by this method.</returns>
-        public virtual IEnumerable<GraphElementModel> RemoveItem(IGroupItemModel itemModel)
+        public virtual void RemoveItem(IGroupItemModel itemModel)
         {
-            HashSet<GraphElementModel> changedModels = new HashSet<GraphElementModel>();
-
             if (m_Items.Contains(itemModel))
             {
                 itemModel.ParentGroup = null;
 
                 m_Items.Remove(itemModel);
 
-                changedModels.Add(this);
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Grouping);
             }
-
-            return changedModels;
         }
 
         /// <inheritdoc />
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/ConstantNodeModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/ConstantNodeModel.cs
index 991663c099..40119d369f 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/ConstantNodeModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/ConstantNodeModel.cs
@@ -34,7 +34,18 @@ sealed class ConstantNodeModel : NodeModel, ISingleOutputPortNodeModel
         public Constant Value
         {
             get => m_Value;
-            set => m_Value = value;
+            set
+            {
+                if (m_Value == value)
+                    return;
+                // Unregister ourselves as the owner of the old constant.
+                if (m_Value != null)
+                    m_Value.OwnerModel = null;
+                m_Value = value;
+                if (m_Value != null)
+                    m_Value.OwnerModel = this;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <summary>
@@ -57,7 +68,13 @@ public object ObjectValue
         public bool IsLocked
         {
             get => m_IsLocked;
-            set => m_IsLocked = value;
+            set
+            {
+                if (m_IsLocked == value)
+                    return;
+                m_IsLocked = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         public ConstantNodeModel()
@@ -83,7 +100,10 @@ public ConstantNodeModel Clone()
             }
             var clone = Activator.CreateInstance(GetType());
             EditorUtility.CopySerializedManagedFieldsOnly(this, clone);
-            return (ConstantNodeModel)clone;
+            var clonedModel = (ConstantNodeModel)clone;
+            if (clonedModel.Value != null)
+                clonedModel.Value.OwnerModel = clonedModel;
+            return clonedModel;
         }
 
         /// <inheritdoc />
@@ -109,5 +129,13 @@ protected override void OnDefineNode()
         {
             this.AddDataOutputPort(null, Value.GetTypeHandle(), k_OutputPortId);
         }
+
+        public override void OnAfterDeserialize()
+        {
+            base.OnAfterDeserialize();
+
+            if (m_Value != null)
+                m_Value.OwnerModel = this;
+        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/Constant.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/Constant.cs
index 6f84a77aea..0ba4b03d45 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/Constant.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/Constant.cs
@@ -12,6 +12,14 @@ namespace Unity.GraphToolsFoundation.Editor
     [Serializable]
     abstract class Constant
     {
+        GraphElementModel m_OwnerModel;
+
+        public virtual GraphElementModel OwnerModel
+        {
+            get => m_OwnerModel;
+            set => m_OwnerModel = value;
+        }
+
         /// <summary>
         /// The current value.
         /// </summary>
@@ -56,5 +64,15 @@ public virtual TypeHandle GetTypeHandle()
         {
             return Type.GenerateTypeHandle();
         }
+
+        /// <summary>
+        /// Tells whether this constant can accept values to type <paramref name="t"/>.
+        /// </summary>
+        /// <param name="t">The type of value.</param>
+        /// <returns>True if this constant can accept values to type <paramref name="t"/>, false otherwise.</returns>
+        public virtual bool IsAssignableFrom(Type t)
+        {
+            return Type.IsAssignableFrom(t);
+        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/ConstantGeneric.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/ConstantGeneric.cs
index a5ea88282b..ee8d5dc95b 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/ConstantGeneric.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/ConstantGeneric.cs
@@ -23,7 +23,11 @@ abstract class Constant<T> : Constant
         public virtual T Value
         {
             get => m_Value;
-            set => m_Value = value;
+            set
+            {
+                m_Value = value;
+                OwnerModel?.GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(OwnerModel, ChangeHint.Data);
+            }
         }
 
         /// <inheritdoc />
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/EnumConstant.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/EnumConstant.cs
index 9366cb0d58..e1103ed82f 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/EnumConstant.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/Constants/EnumConstant.cs
@@ -83,6 +83,12 @@ protected override EnumValueReference FromObject(object value)
             return base.FromObject(value);
         }
 
+        /// <inheritdoc />
+        public override bool IsAssignableFrom(Type t)
+        {
+            return Type == t;
+        }
+
         public void OnBeforeSerialize()
         {
         }
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/ContextNodeModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/ContextNodeModel.cs
index e4825b7504..fa79545683 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/ContextNodeModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/ContextNodeModel.cs
@@ -39,6 +39,9 @@ public ContextNodeModel()
             this.SetCapability(Editor.Capabilities.Collapsible, false);
         }
 
+        /// <inheritdoc />
+        public override IEnumerable<GraphElementModel> DependentModels => base.DependentModels.Concat(m_Blocks);
+
         /// <summary>
         /// Inserts a block in the context.
         /// </summary>
@@ -51,11 +54,23 @@ public void InsertBlock(BlockNodeModel blockModel, int index = -1, SpawnFlags sp
                 m_BlockPlaceholders.Add(placeholder);
             else
             {
-                if ((spawnFlags & SpawnFlags.Orphan) == 0)
-                    GraphModel.RegisterElement(blockModel);
-
+                // Remove the block model from its former context node model first as it will unregister the block.
+                var wasRemoved = false;
                 if (blockModel.ContextNodeModel != null)
+                {
                     blockModel.ContextNodeModel.RemoveElements(new[] { blockModel });
+                    wasRemoved = true;
+                }
+
+                if ((spawnFlags & SpawnFlags.Orphan) == 0)
+                {
+                    GraphModel.RegisterBlockNode(blockModel);
+
+                    // RemoveElements potentially removed the block from the graph. Since we are inserting it inside this context node
+                    // instead, it is not technically removed.
+                    if (wasRemoved)
+                        GraphModel.CurrentGraphChangeDescription?.RemoveDeletedModels(blockModel);
+                }
 
                 if (index > m_Blocks.Count)
                     throw new ArgumentException(nameof(index));
@@ -77,6 +92,7 @@ public void InsertBlock(BlockNodeModel blockModel, int index = -1, SpawnFlags sp
 
             blockModel.GraphModel = GraphModel;
             blockModel.ContextNodeModel = this;
+            GraphModel.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.GraphTopology);
         }
 
         /// <inheritdoc />
@@ -106,6 +122,9 @@ public BlockNodeModel CreateAndInsertBlock(Type blockType, int index = -1, Seria
 
             InsertBlock(block, index, spawnFlags);
 
+            if (!spawnFlags.IsOrphan())
+                GraphModel.CurrentGraphChangeDescription?.AddNewModels(block);
+
             return block;
         }
 
@@ -124,13 +143,20 @@ public T CreateAndInsertBlock<T>(int index = -1, SerializableGUID guid = default
             return (T)CreateAndInsertBlock(typeof(T), index, guid, initializationCallback, spawnFlags);
         }
 
+        /// <inheritdoc />
         public IEnumerable<GraphElementModel> GraphElementModels => m_Blocks;
 
+        /// <inheritdoc />
         public void RemoveElements(IReadOnlyCollection<GraphElementModel> elementModels)
         {
             foreach (var blockNodeModel in elementModels.OfType<BlockNodeModel>())
             {
-                GraphModel?.UnregisterElement(blockNodeModel);
+                if (GraphModel?.TryGetModelFromGuid(blockNodeModel.Guid, out _) ?? false)
+                {
+                    GraphModel.CurrentGraphChangeDescription?.AddDeletedModels(blockNodeModel);
+                    GraphModel?.UnregisterBlockNode(blockNodeModel);
+                }
+
                 if (!RemoveBlock(blockNodeModel))
                 {
                     throw new ArgumentException(nameof(blockNodeModel));
@@ -140,6 +166,7 @@ public void RemoveElements(IReadOnlyCollection<GraphElementModel> elementModels)
 
             if (!m_BlockPlaceholders.Any())
                 this.SetCapability(Editor.Capabilities.Copiable, true);
+            GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.GraphTopology);
         }
 
         /// <inheritdoc/>
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/DeclarationModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/DeclarationModel.cs
index afa24ef7c8..c2a90459f8 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/DeclarationModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/DeclarationModel.cs
@@ -26,7 +26,13 @@ class DeclarationModel : GraphElementModel, IHasTitle, IRenamable
         public virtual string Title
         {
             get => m_Name;
-            set => m_Name = value;
+            set
+            {
+                if (m_Name == value)
+                    return;
+                m_Name = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <inheritdoc />
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/GraphElementModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/GraphElementModel.cs
index 08427f29d0..73ca18830c 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/GraphElementModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/GraphElementModel.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.Scripting.APIUpdating;
 
@@ -26,6 +27,7 @@ abstract class GraphElementModel : Model, ISerializationCallbackReceiver
         SerializationVersion m_Version;
 
         protected List<Capabilities> m_Capabilities = new();
+        GraphModel m_GraphModel;
 
         /// <summary>
         /// Serialized version, used for backward compatibility
@@ -35,7 +37,24 @@ abstract class GraphElementModel : Model, ISerializationCallbackReceiver
         /// <summary>
         /// The graph model to which the element belongs.
         /// </summary>
-        public virtual GraphModel GraphModel { get; set; }
+        public virtual GraphModel GraphModel
+        {
+            get => m_GraphModel;
+            set
+            {
+                m_GraphModel = value;
+
+                foreach (var subModel in DependentModels.Where(m => m != null))
+                {
+                    subModel.GraphModel = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// The dependent models for this model (for example, ports on a node, blocks in context node).
+        /// </summary>
+        public virtual IEnumerable<GraphElementModel> DependentModels => Enumerable.Empty<GraphElementModel>();
 
         /// <summary>
         /// The list of capabilities of the element.
@@ -63,11 +82,15 @@ public virtual Color Color
             get => HasUserColor ? m_Color : DefaultColor;
             set
             {
-                if (this.IsColorable())
-                {
-                    m_HasUserColor = true;
-                    m_Color = value;
-                }
+                if (!this.IsColorable())
+                    return;
+
+                m_HasUserColor = true;
+                if (m_Color == value)
+                    return;
+
+                m_Color = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Style);
             }
         }
 
@@ -116,7 +139,10 @@ public enum SerializationVersion
         /// </remarks>
         public virtual void ResetColor()
         {
+            if (!m_HasUserColor)
+                return;
             m_HasUserColor = false;
+            GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Style);
         }
 
         /// <inheritdoc />
@@ -129,5 +155,18 @@ public virtual void OnAfterDeserialize()
         {
             GraphModel = null;
         }
+
+        /// <summary>
+        /// Recursively assign a new guid to this model and its <see cref="DependentModels"/>.
+        /// </summary>
+        public void AssignNewGuidRecursively()
+        {
+            AssignNewGuid();
+
+            foreach (var model in DependentModels)
+            {
+                model.AssignNewGuidRecursively();
+            }
+        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/GraphModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/GraphModel.cs
index f470387afa..69bfb8af86 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/GraphModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/GraphModel.cs
@@ -92,6 +92,7 @@ abstract class GraphModel : Model, IGraphElementContainer, ISerializationCallbac
         List<IPlaceholder> m_Placeholders;
 
         [SerializeField]
+        [HideInInspector]
         List<GraphElementMetaData> m_GraphElementMetaData;
 
         SerializedValueDictionary<SerializableGUID, PlaceholderData> m_PlaceholderData;
@@ -217,11 +218,30 @@ public IEnumerable<AbstractNodeModel> NodeAndBlockModels
         /// </summary>
         public virtual string Name => Asset != null ? Asset.Name : "";
 
+        Stack<GraphChangeDescription> m_GraphChangeDescriptionStack;
+
+        /// <summary>
+        /// The current <see cref="GraphChangeDescription"/>. This object contains the current changes applied to the graph up until now. Can be null.
+        /// </summary>
+        public GraphChangeDescription CurrentGraphChangeDescription => m_GraphChangeDescriptionStack.Count > 0 ? m_GraphChangeDescriptionStack.Peek() : null;
+
+        /// <summary>
+        /// A <see cref="GraphChangeDescriptionScope"/>. Use this to gather a <see cref="GraphChangeDescription"/>. <see cref="GraphChangeDescriptionScope"/> can be nested
+        /// and each scope provide the <see cref="GraphChangeDescription"/> related to their scope only. When a scope is disposed, their related <see cref="GraphChangeDescription"/>
+        /// is merged back into the parent scope, if any.
+        /// </summary>
+        public GraphChangeDescriptionScope ChangeDescriptionScope => new(this);
+
         public virtual Type GetSectionModelType()
         {
             return typeof(SectionModel);
         }
 
+        /// <summary>
+        /// Instantiates a new <see cref="SectionModel"/>.
+        /// </summary>
+        /// <param name="sectionName">The name of the section.</param>
+        /// <returns>A new <see cref="SectionModel"/>.</returns>
         protected virtual SectionModel InstantiateSection(string sectionName)
         {
             var section = Instantiate<SectionModel>(GetSectionModelType());
@@ -230,6 +250,11 @@ protected virtual SectionModel InstantiateSection(string sectionName)
             return section;
         }
 
+        /// <summary>
+        /// Creates a new <see cref="SectionModel"/> and adds it to the graph.
+        /// </summary>
+        /// <param name="sectionName">The name of the section.</param>
+        /// <returns>A new <see cref="SectionModel"/>.</returns>
         public virtual SectionModel CreateSection(string sectionName)
         {
             var section = InstantiateSection(sectionName);
@@ -237,10 +262,26 @@ public virtual SectionModel CreateSection(string sectionName)
             return section;
         }
 
+        /// <summary>
+        /// Adds a new <see cref="SectionModel"/> to the graph.
+        /// </summary>
+        /// <param name="section">The section model to add.</param>
         protected virtual void AddSection(SectionModel section)
         {
             RegisterElement(section);
             m_SectionModels.Add(section);
+            CurrentGraphChangeDescription?.AddNewModels(section);
+        }
+
+        /// <summary>
+        /// Removes a <see cref="SectionModel"/> from the graph.
+        /// </summary>
+        /// <param name="section">The section model to remove.</param>
+        protected virtual void RemoveSection(SectionModel section)
+        {
+            UnregisterElement(section);
+            m_SectionModels.Remove(section);
+            CurrentGraphChangeDescription?.AddDeletedModels(section);
         }
 
         /// <summary>
@@ -305,8 +346,6 @@ void RecurseGetReferencedGroupItem<T>(GroupModel root, HashSet<T> result)
         /// </summary>
         protected GraphModel()
         {
-            AssignNewGuid();
-
             m_GraphNodeModels = new List<AbstractNodeModel>();
             m_GraphWireModels = new List<WireModel>();
             m_BadgeModels = new List<BadgeModel>();
@@ -322,6 +361,8 @@ protected GraphModel()
             m_PortWireIndex = new PortWireIndex_Internal(this);
             m_Placeholders = new List<IPlaceholder>();
             m_PlaceholderData = new SerializedValueDictionary<SerializableGUID, PlaceholderData>();
+
+            m_GraphChangeDescriptionStack = new Stack<GraphChangeDescription>();
         }
 
         /// <summary>
@@ -346,6 +387,10 @@ internal void ReorderWire_Internal(WireModel wireModel, ReorderType reorderType)
             {
                 PortWireIndex_Internal.ReorderWire(wireModel, reorderType);
                 ApplyReorderToGraph(fromPort);
+
+                var siblingWires = fromPort.GetConnectedWires().ToList();
+                CurrentGraphChangeDescription?.AddChangedModels(siblingWires, ChangeHint.GraphTopology);
+                CurrentGraphChangeDescription?.AddChangedModel(fromPort, ChangeHint.GraphTopology);
             }
         }
 
@@ -359,6 +404,17 @@ internal void UpdateWire_Internal(WireModel wireModel, PortModel oldPort, PortMo
         {
             PortWireIndex_Internal.UpdateWire(wireModel, oldPort, port);
 
+            if (oldPort != null)
+            {
+                CurrentGraphChangeDescription?.AddChangedModel(oldPort, ChangeHint.GraphTopology);
+                if (oldPort.PortType == PortType.MissingPort && !oldPort.GetConnectedWires().Any())
+                    oldPort.NodeModel?.RemoveUnusedMissingPort(oldPort);
+            }
+            if (port != null)
+                CurrentGraphChangeDescription?.AddChangedModel(port, ChangeHint.GraphTopology);
+            if (wireModel != null)
+                CurrentGraphChangeDescription?.AddChangedModel(wireModel, ChangeHint.GraphTopology);
+
             // when moving a wire to a new node, make sure it gets stored matching its new place.
             if (oldPort != null && port != null
                 && oldPort.NodeModel != port.NodeModel
@@ -377,6 +433,7 @@ internal void UpdateWire_Internal(WireModel wireModel, PortModel oldPort, PortMo
         public virtual void ReorderPlacemats(IReadOnlyList<PlacematModel> models, ZOrderMove reorderType)
         {
             m_GraphPlacematModels.ReorderElements(models, (ReorderType)reorderType);
+            CurrentGraphChangeDescription?.AddChangedModels(models, ChangeHint.Layout);
         }
 
         /// <summary>
@@ -412,6 +469,15 @@ void ApplyReorderToGraph(PortModel fromPort)
             }
         }
 
+        /// <summary>
+        /// Gets all ports in the graph.
+        /// </summary>
+        /// <returns>All ports in the graph.</returns>
+        public IEnumerable<PortModel> GetPortModels()
+        {
+            return GetElementsByGuid().Values.OfType<PortModel>();
+        }
+
         /// <summary>
         /// Determines whether two ports can be connected together by a wire.
         /// </summary>
@@ -479,18 +545,35 @@ protected virtual Dictionary<SerializableGUID, GraphElementModel> GetElementsByG
         /// Registers an element so that the GraphModel can find it through its GUID.
         /// </summary>
         /// <param name="model">The model.</param>
-        public virtual void RegisterElement(GraphElementModel model)
+        protected virtual void RegisterElement(GraphElementModel model)
         {
-            GetElementsByGuid().TryAdd(model.Guid, model);
+            if (model == null)
+                return;
+
+            if (!GetElementsByGuid().TryAdd(model.Guid, model))
+            {
+                if (GetElementsByGuid()[model.Guid] != model)
+                    Debug.LogError("A model is already registered with this GUID");
+            }
+
+            foreach (var subModel in model.DependentModels)
+            {
+                RegisterElement(subModel);
+            }
         }
 
         /// <summary>
         /// Unregisters an element so that the GraphModel can no longer find it through its GUID.
         /// </summary>
         /// <param name="model">The model.</param>
-        public virtual void UnregisterElement(GraphElementModel model)
+        protected virtual void UnregisterElement(GraphElementModel model)
         {
             GetElementsByGuid().Remove(model.Guid);
+
+            foreach (var subModel in model.DependentModels)
+            {
+                UnregisterElement(subModel);
+            }
         }
 
         /// <summary>
@@ -529,6 +612,7 @@ protected virtual void AddNode(AbstractNodeModel nodeModel)
             RegisterElement(nodeModel);
             AddMetaData(nodeModel, m_GraphNodeModels.Count);
             m_GraphNodeModels.Add(nodeModel);
+            CurrentGraphChangeDescription?.AddNewModels(nodeModel);
         }
 
         void AddMetaData(Model model, int index = -1)
@@ -543,12 +627,18 @@ void AddMetaData(Model model, int index = -1)
         /// <param name="nodeModel">The new node model.</param>
         protected virtual void ReplaceNode(int index, AbstractNodeModel nodeModel)
         {
-            UnregisterElement(nodeModel);
+            if (index < 0 || index >= m_GraphNodeModels.Count)
+                throw new ArgumentOutOfRangeException(nameof(index));
+
+            var oldModel = m_GraphNodeModels[index];
+            UnregisterElement(oldModel);
             RegisterElement(nodeModel);
             var indexInMetadata = m_GraphElementMetaData.FindIndex(m => m.Index == index);
 
             m_GraphElementMetaData[indexInMetadata] = new GraphElementMetaData(nodeModel, index);
             m_GraphNodeModels[index] = nodeModel;
+            CurrentGraphChangeDescription?.AddNewModels(nodeModel)
+                ?.AddDeletedModels(oldModel);
         }
 
         /// <summary>
@@ -567,6 +657,7 @@ protected virtual void RemoveNode(AbstractNodeModel nodeModel)
             {
                 RemoveFromMetadata(indexToRemove, PlaceholderModelHelper.ModelToMissingTypeCategory_Internal(nodeModel));
                 m_GraphNodeModels.RemoveAt(indexToRemove);
+                CurrentGraphChangeDescription?.AddDeletedModels(nodeModel);
             }
         }
 
@@ -597,6 +688,28 @@ void RemoveFromMetadata(int index, ManagedMissingTypeModelCategory category)
             }
         }
 
+        public void RegisterBlockNode(BlockNodeModel blockNodeModel)
+        {
+            RegisterElement(blockNodeModel);
+        }
+
+        public void UnregisterBlockNode(BlockNodeModel blockNodeModel)
+        {
+            UnregisterElement(blockNodeModel);
+        }
+
+        public void RegisterPort(PortModel portModel)
+        {
+            if (!portModel?.NodeModel?.SpawnFlags.IsOrphan() ?? false)
+                RegisterElement(portModel);
+        }
+
+        public void UnregisterPort(PortModel portModel)
+        {
+            if (!portModel?.NodeModel?.SpawnFlags.IsOrphan() ?? false)
+                UnregisterElement(portModel);
+        }
+
         /// <inheritdoc />
         public virtual void RemoveElements(IReadOnlyCollection<GraphElementModel> elementModels)
         {
@@ -619,12 +732,27 @@ public virtual void RemoveElements(IReadOnlyCollection<GraphElementModel> elemen
                     case WireModel wireModel:
                         RemoveWire(wireModel);
                         break;
+                    case BlockNodeModel blockNodeModel:
+                        UnregisterBlockNode(blockNodeModel);
+                        break;
                     case AbstractNodeModel nodeModel:
                         RemoveNode(nodeModel);
                         break;
                     case BadgeModel badgeModel:
                         RemoveBadge(badgeModel);
                         break;
+                    case PortModel portModel:
+                        UnregisterPort(portModel);
+                        break;
+                    case SectionModel sectionModel:
+                        RemoveSection(sectionModel);
+                        break;
+                    case GroupModel groupModel:
+                        RemoveGroup(groupModel);
+                        break;
+                    default:
+                        UnregisterElement(element);
+                        break;
                 }
             }
         }
@@ -638,12 +766,14 @@ protected virtual void AddPortal(DeclarationModel declarationModel)
             RegisterElement(declarationModel);
             AddMetaData(declarationModel, m_GraphPortalModels.Count);
             m_GraphPortalModels.Add(declarationModel);
+            CurrentGraphChangeDescription?.AddNewModels(declarationModel);
         }
 
         /// <summary>
         /// Duplicates a portal declaration model and adds it to the graph.
         /// </summary>
         /// <param name="declarationModel">The portal declaration to duplicate.</param>
+        /// <returns>The new portal declaration model.</returns>
         public virtual DeclarationModel DuplicatePortal(DeclarationModel declarationModel)
         {
             var newDeclarationModel = declarationModel.Clone();
@@ -651,6 +781,7 @@ public virtual DeclarationModel DuplicatePortal(DeclarationModel declarationMode
             RegisterElement(newDeclarationModel);
             m_GraphPortalModels.Add(newDeclarationModel);
             newDeclarationModel.GraphModel = this;
+            CurrentGraphChangeDescription?.AddNewModels(newDeclarationModel);
             return newDeclarationModel;
         }
 
@@ -670,6 +801,7 @@ protected virtual void RemovePortal(DeclarationModel declarationModel)
             {
                 m_GraphPortalModels.RemoveAt(indexToRemove);
                 RemoveFromMetadata(indexToRemove, ManagedMissingTypeModelCategory.PortalDeclaration);
+                CurrentGraphChangeDescription?.AddDeletedModels(declarationModel);
             }
         }
 
@@ -683,6 +815,7 @@ protected virtual void AddWire(WireModel wireModel)
             AddMetaData(wireModel, m_GraphWireModels.Count);
             m_GraphWireModels.Add(wireModel);
             m_PortWireIndex.AddWire(wireModel);
+            CurrentGraphChangeDescription?.AddNewModels(wireModel);
         }
 
         /// <summary>
@@ -701,6 +834,7 @@ protected virtual void RemoveWire(WireModel wireModel)
             {
                 m_GraphWireModels.RemoveAt(indexToRemove);
                 RemoveFromMetadata(indexToRemove, ManagedMissingTypeModelCategory.Wire);
+                CurrentGraphChangeDescription?.AddDeletedModels(wireModel);
             }
             m_PortWireIndex.RemoveWire(wireModel);
         }
@@ -714,6 +848,7 @@ public virtual void AddBadge(BadgeModel badgeModel)
             RegisterElement(badgeModel);
             badgeModel.GraphModel = this;
             m_BadgeModels.Add(badgeModel);
+            CurrentGraphChangeDescription?.AddNewModels(badgeModel);
         }
 
         /// <summary>
@@ -725,6 +860,7 @@ public virtual void RemoveBadge(BadgeModel badgeModel)
             UnregisterElement(badgeModel);
             badgeModel.GraphModel = null;
             m_BadgeModels.Remove(badgeModel);
+            CurrentGraphChangeDescription?.AddDeletedModels(badgeModel);
         }
 
         /// <summary>
@@ -735,6 +871,7 @@ protected virtual void AddStickyNote(StickyNoteModel stickyNoteModel)
         {
             RegisterElement(stickyNoteModel);
             m_GraphStickyNoteModels.Add(stickyNoteModel);
+            CurrentGraphChangeDescription?.AddNewModels(stickyNoteModel);
         }
 
         /// <summary>
@@ -745,6 +882,7 @@ protected virtual void RemoveStickyNote(StickyNoteModel stickyNoteModel)
         {
             UnregisterElement(stickyNoteModel);
             m_GraphStickyNoteModels.Remove(stickyNoteModel);
+            CurrentGraphChangeDescription?.AddDeletedModels(stickyNoteModel);
         }
 
         /// <summary>
@@ -755,6 +893,7 @@ protected virtual void AddPlacemat(PlacematModel placematModel)
         {
             RegisterElement(placematModel);
             m_GraphPlacematModels.Add(placematModel);
+            CurrentGraphChangeDescription?.AddNewModels(placematModel);
         }
 
         /// <summary>
@@ -765,6 +904,7 @@ protected virtual void RemovePlacemat(PlacematModel placematModel)
         {
             UnregisterElement(placematModel);
             m_GraphPlacematModels.Remove(placematModel);
+            CurrentGraphChangeDescription?.AddDeletedModels(placematModel);
         }
 
         /// <summary>
@@ -777,6 +917,7 @@ protected virtual void AddVariableDeclaration(VariableDeclarationModel variableD
             AddMetaData(variableDeclarationModel, m_GraphVariableModels.Count);
             m_GraphVariableModels.Add(variableDeclarationModel);
             m_ExistingVariableNames.Add(variableDeclarationModel.Title);
+            CurrentGraphChangeDescription?.AddNewModels(variableDeclarationModel);
         }
 
         /// <summary>
@@ -795,6 +936,7 @@ protected virtual GroupModel RemoveVariableDeclaration(VariableDeclarationModel
             {
                 RemoveFromMetadata(indexToRemove, ManagedMissingTypeModelCategory.VariableDeclaration);
                 m_GraphVariableModels.RemoveAt(indexToRemove);
+                CurrentGraphChangeDescription?.AddDeletedModels(variableDeclarationModel);
             }
             m_ExistingVariableNames.Remove(variableDeclarationModel.Title);
 
@@ -803,20 +945,6 @@ protected virtual GroupModel RemoveVariableDeclaration(VariableDeclarationModel
             return parent;
         }
 
-        void RecursiveBuildElementByGuid(GraphElementModel model)
-        {
-            if (model == null)
-                return;
-
-            GetElementsByGuid().TryAdd(model.Guid, model);
-
-            if (model is IGraphElementContainer container)
-            {
-                foreach (var element in container.GraphElementModels)
-                    RecursiveBuildElementByGuid(element);
-            }
-        }
-
         /// <summary>
         /// Instantiates an object of type <paramref name="type"/>.
         /// </summary>
@@ -852,43 +980,43 @@ protected virtual void BuildElementByGuidDictionary()
 
             foreach (var model in m_GraphNodeModels)
             {
-                RecursiveBuildElementByGuid(model);
+                RegisterElement(model);
             }
 
             foreach (var model in m_BadgeModels)
             {
-                RecursiveBuildElementByGuid(model);
+                RegisterElement(model);
             }
 
             foreach (var model in m_GraphWireModels)
             {
-                RecursiveBuildElementByGuid(model);
+                RegisterElement(model);
             }
 
             foreach (var model in m_GraphStickyNoteModels)
             {
-                RecursiveBuildElementByGuid(model);
+                RegisterElement(model);
             }
 
             foreach (var model in m_GraphPlacematModels)
             {
-                RecursiveBuildElementByGuid(model);
+                RegisterElement(model);
             }
 
             // Some variables may not be under any section.
             foreach (var model in m_GraphVariableModels)
             {
-                RecursiveBuildElementByGuid(model);
+                RegisterElement(model);
             }
 
             foreach (var model in m_GraphPortalModels)
             {
-                RecursiveBuildElementByGuid(model);
+                RegisterElement(model);
             }
 
             foreach (var model in m_SectionModels)
             {
-                RecursiveBuildElementByGuid(model);
+                RegisterElement(model);
             }
         }
 
@@ -905,7 +1033,7 @@ protected virtual void BuildElementByGuidDictionary()
         public virtual AbstractNodeModel CreateNode(Type nodeTypeToCreate, string nodeName, Vector2 position,
             SerializableGUID guid = default, Action<AbstractNodeModel> initializationCallback = null, SpawnFlags spawnFlags = SpawnFlags.None)
         {
-            var nodeModel = InstantiateNode(nodeTypeToCreate, nodeName, position, guid, initializationCallback);
+            var nodeModel = InstantiateNode(nodeTypeToCreate, nodeName, position, guid, initializationCallback, spawnFlags);
 
             if (!spawnFlags.IsOrphan())
             {
@@ -923,9 +1051,10 @@ public virtual AbstractNodeModel CreateNode(Type nodeTypeToCreate, string nodeNa
         /// <param name="position">The position of the node to create.</param>
         /// <param name="guid">The SerializableGUID to assign to the newly created item.</param>
         /// <param name="initializationCallback">An initialization method to be called right after the node is created.</param>
+        /// <param name="spawnFlags">The flags specifying how the node is to be spawned.</param>
         /// <returns>The newly created node.</returns>
         protected virtual AbstractNodeModel InstantiateNode(Type nodeTypeToCreate, string nodeName, Vector2 position,
-            SerializableGUID guid = default, Action<AbstractNodeModel> initializationCallback = null)
+            SerializableGUID guid = default, Action<AbstractNodeModel> initializationCallback = null, SpawnFlags spawnFlags = SpawnFlags.None)
         {
             if (nodeTypeToCreate == null)
                 throw new ArgumentNullException(nameof(nodeTypeToCreate));
@@ -941,6 +1070,7 @@ protected virtual AbstractNodeModel InstantiateNode(Type nodeTypeToCreate, strin
             if (nodeModel is IHasTitle titled)
                 titled.Title = nodeName ?? nodeTypeToCreate.Name;
 
+            nodeModel.SpawnFlags = spawnFlags;
             nodeModel.Position = position;
             if (guid.Valid)
                 nodeModel.SetGuid(guid);
@@ -1033,8 +1163,7 @@ void PreDefineSetup(AbstractNodeModel model)
         /// <summary>
         /// Deletes all badges from the graph.
         /// </summary>
-        /// <returns>The graph elements affected by this operation.</returns>
-        public virtual IReadOnlyCollection<GraphElementModel> DeleteBadges()
+        public virtual void DeleteBadges()
         {
             var deletedBadges = new List<GraphElementModel>(m_BadgeModels);
 
@@ -1044,15 +1173,13 @@ public virtual IReadOnlyCollection<GraphElementModel> DeleteBadges()
             }
 
             m_BadgeModels.Clear();
-
-            return deletedBadges;
+            CurrentGraphChangeDescription?.AddDeletedModels(deletedBadges);
         }
 
         /// <summary>
         /// Deletes all badges of type <typeparamref name="T"/> from the graph.
         /// </summary>
-        /// <returns>The graph elements affected by this operation.</returns>
-        public virtual IReadOnlyCollection<GraphElementModel> DeleteBadgesOfType<T>() where T : BadgeModel
+        public virtual void DeleteBadgesOfType<T>() where T : BadgeModel
         {
             var deletedBadges = m_BadgeModels
                 .Where(b => b is T)
@@ -1067,7 +1194,7 @@ public virtual IReadOnlyCollection<GraphElementModel> DeleteBadgesOfType<T>() wh
                 .Where(b => !(b is T))
                 .ToList();
 
-            return deletedBadges;
+            CurrentGraphChangeDescription?.AddDeletedModels(deletedBadges);
         }
 
         /// <summary>
@@ -1082,32 +1209,14 @@ public virtual AbstractNodeModel DuplicateNode(AbstractNodeModel sourceNode, Vec
 
             // Set graphmodel BEFORE define node as it is commonly use during Define
             pastedNodeModel.GraphModel = this;
-            pastedNodeModel.AssignNewGuid();
             pastedNodeModel.OnDuplicateNode(sourceNode);
 
             AddNode(pastedNodeModel);
             pastedNodeModel.Position += delta;
 
-            if (pastedNodeModel is IGraphElementContainer container)
-            {
-                foreach (var element in container.GraphElementModels)
-                    RecursivelyRegisterAndAssignNewGuid(element);
-            }
-
             return pastedNodeModel;
         }
 
-        protected void RecursivelyRegisterAndAssignNewGuid(GraphElementModel model)
-        {
-            model.AssignNewGuid();
-            RegisterElement(model);
-            if (model is IGraphElementContainer c)
-            {
-                foreach (var element in c.GraphElementModels)
-                    RecursivelyRegisterAndAssignNewGuid(element);
-            }
-        }
-
         /// <summary>
         /// Duplicates a wire and add it to the graph.
         /// </summary>
@@ -1171,10 +1280,13 @@ public virtual InputOutputPortsNodeModel CreateItemizedNode(int nodeOffset, ref
             return null;
         }
 
-        public virtual IReadOnlyCollection<GraphElementModel> DeleteNodes(IReadOnlyCollection<AbstractNodeModel> nodeModels, bool deleteConnections)
+        /// <summary>
+        /// Deletes a collection of nodes from the graph.
+        /// </summary>
+        /// <param name="nodeModels">The nodes to delete.</param>
+        /// <param name="deleteConnections">Whether or not to delete the wires connected to the nodes.</param>
+        public virtual void DeleteNodes(IReadOnlyCollection<AbstractNodeModel> nodeModels, bool deleteConnections)
         {
-            var deletedModels = new List<GraphElementModel>();
-
             var deletedElementsByContainer = new Dictionary<IGraphElementContainer, List<GraphElementModel>>();
 
             foreach (var nodeModel in nodeModels.Where(n => n.IsDeletable()))
@@ -1187,12 +1299,10 @@ public virtual IReadOnlyCollection<GraphElementModel> DeleteNodes(IReadOnlyColle
 
                 deletedElements.Add(nodeModel);
 
-                deletedModels.Add(nodeModel);
-
                 if (deleteConnections)
                 {
                     var connectedWires = nodeModel.GetConnectedWires().ToList();
-                    deletedModels.AddRange(DeleteWires(connectedWires));
+                    DeleteWires(connectedWires);
                 }
 
                 // If this all the portals with the given declaration are deleted, delete the declaration.
@@ -1208,7 +1318,6 @@ public virtual IReadOnlyCollection<GraphElementModel> DeleteNodes(IReadOnlyColle
                     {
                         RemovePortal(wirePortalModel.DeclarationModel);
                     }
-                    deletedModels.Add(wirePortalModel.DeclarationModel);
                 }
 
                 nodeModel.Destroy();
@@ -1218,8 +1327,6 @@ public virtual IReadOnlyCollection<GraphElementModel> DeleteNodes(IReadOnlyColle
             {
                 container.Key.RemoveElements(container.Value);
             }
-
-            return deletedModels;
         }
 
         /// <summary>
@@ -1274,12 +1381,10 @@ protected virtual WireModel InstantiateWire(PortModel toPort, PortModel fromPort
         /// Deletes wires from the graph.
         /// </summary>
         /// <param name="wireModels">The list of wires to delete.</param>
-        /// <returns>A list of graph element models that were deleted by this operation.</returns>
-        public virtual IReadOnlyCollection<GraphElementModel> DeleteWires(IReadOnlyCollection<WireModel> wireModels)
+        public virtual void DeleteWires(IReadOnlyCollection<WireModel> wireModels)
         {
-            var deletedModels = new List<GraphElementModel>();
-
-            foreach (var wireModel in wireModels.Where(e => e != null && e.IsDeletable()))
+            // Call ToList on the collection to prevent iteration over the PortWireIndex.m_WiresByPort
+            foreach (var wireModel in wireModels.Where(e => e != null && e.IsDeletable()).ToList())
             {
                 if (wireModel is WirePlaceholder placeholder)
                 {
@@ -1290,12 +1395,21 @@ public virtual IReadOnlyCollection<GraphElementModel> DeleteWires(IReadOnlyColle
                     wireModel.ToPort?.NodeModel?.OnDisconnection(wireModel.ToPort, wireModel.FromPort);
                     wireModel.FromPort?.NodeModel?.OnDisconnection(wireModel.FromPort, wireModel.ToPort);
 
+                    CurrentGraphChangeDescription?.AddChangedModel(wireModel.ToPort, ChangeHint.GraphTopology);
+                    CurrentGraphChangeDescription?.AddChangedModel(wireModel.FromPort, ChangeHint.GraphTopology);
+
+                    if (wireModel.ToPort?.PortType == PortType.MissingPort && (!wireModel.ToPort?.GetConnectedWires().Any() ?? false))
+                    {
+                        wireModel.ToPort?.NodeModel.RemoveUnusedMissingPort(wireModel.ToPort);
+                    }
+                    if (wireModel.FromPort?.PortType == PortType.MissingPort && (!wireModel.FromPort?.GetConnectedWires().Any() ?? false))
+                    {
+                        wireModel.FromPort?.NodeModel.RemoveUnusedMissingPort(wireModel.FromPort);
+                    }
+
                     RemoveWire(wireModel);
                 }
-                deletedModels.Add(wireModel);
             }
-
-            return deletedModels;
         }
 
         /// <summary>
@@ -1342,19 +1456,13 @@ protected virtual StickyNoteModel InstantiateStickyNote(Rect position)
         /// Removes and destroys sticky notes from the graph.
         /// </summary>
         /// <param name="stickyNoteModels">The sticky notes to remove.</param>
-        /// <returns>The graph elements affected by this operation.</returns>
-        public IReadOnlyCollection<GraphElementModel> DeleteStickyNotes(IReadOnlyCollection<StickyNoteModel> stickyNoteModels)
+        public void DeleteStickyNotes(IReadOnlyCollection<StickyNoteModel> stickyNoteModels)
         {
-            var deletedModels = new List<GraphElementModel>();
-
             foreach (var stickyNoteModel in stickyNoteModels.Where(s => s.IsDeletable()))
             {
                 RemoveStickyNote(stickyNoteModel);
                 stickyNoteModel.Destroy();
-                deletedModels.Add(stickyNoteModel);
             }
-
-            return deletedModels;
         }
 
         protected virtual Type GetPlacematType()
@@ -1390,6 +1498,8 @@ protected virtual PlacematModel InstantiatePlacemat(Rect position, SerializableG
         {
             var placematModelType = GetPlacematType();
             var placematModel = Instantiate<PlacematModel>(placematModelType);
+            placematModel.TitleFontSize = 18;
+            placematModel.TitleAlignment = TextAlignment.Left;
             placematModel.PositionAndSize = position;
             placematModel.GraphModel = this;
             if (guid.Valid)
@@ -1401,19 +1511,13 @@ protected virtual PlacematModel InstantiatePlacemat(Rect position, SerializableG
         /// Deletes placemats from the graph.
         /// </summary>
         /// <param name="placematModels">The list of placemats to delete.</param>
-        /// <returns>A list of graph element models that were deleted by this operation.</returns>
-        public IReadOnlyCollection<GraphElementModel> DeletePlacemats(IReadOnlyCollection<PlacematModel> placematModels)
+        public void DeletePlacemats(IReadOnlyCollection<PlacematModel> placematModels)
         {
-            var deletedModels = new List<GraphElementModel>();
-
             foreach (var placematModel in placematModels.Where(p => p.IsDeletable()))
             {
                 RemovePlacemat(placematModel);
                 placematModel.Destroy();
-                deletedModels.Add(placematModel);
             }
-
-            return deletedModels;
         }
 
         protected virtual Type GetVariableNodeType()
@@ -1589,7 +1693,15 @@ protected virtual GroupModel InstantiateGroup(string title)
 
         protected virtual void AddGroup(GroupModel group)
         {
+            // Group is not added to the graph: it will be added to a section.
             RegisterElement(group);
+            CurrentGraphChangeDescription?.AddNewModels(group);
+        }
+
+        protected virtual void RemoveGroup(GroupModel group)
+        {
+            UnregisterElement(group);
+            CurrentGraphChangeDescription?.AddDeletedModels(group);
         }
 
         /// <summary>
@@ -1651,73 +1763,54 @@ public virtual TDeclType DuplicateGraphVariableDeclaration<TDeclType>(TDeclType
         /// <remarks>If <paramref name="deleteUsages"/> is <c>false</c>, the user has to take care of deleting the corresponding variable models prior to this call.</remarks>
         /// <param name="variableModels">The variable declaration models to delete.</param>
         /// <param name="deleteUsages">Whether or not to delete the corresponding variable models.</param>
-        /// <returns>The list of deleted models.</returns>
-        public virtual GraphChangeDescription DeleteVariableDeclarations(IReadOnlyCollection<VariableDeclarationModel> variableModels, bool deleteUsages = true)
+        public virtual void DeleteVariableDeclarations(IReadOnlyCollection<VariableDeclarationModel> variableModels, bool deleteUsages = true)
         {
-            var changedModelsDict = new Dictionary<GraphElementModel, IReadOnlyList<ChangeHint>>();
-            var deletedModels = new List<GraphElementModel>();
-
             foreach (var variableModel in variableModels.Where(v => v.IsDeletable()))
             {
                 if (variableModel is VariableDeclarationPlaceholder placeholderModel)
                     RemovePlaceholder(placeholderModel);
 
-                var parent = RemoveVariableDeclaration(variableModel);
-
-                changedModelsDict[parent] = s_GroupingChangeHint;
-                deletedModels.Add(variableModel);
+                RemoveVariableDeclaration(variableModel);
 
                 if (deleteUsages)
                 {
                     var nodesToDelete = this.FindReferencesInGraph(variableModel).Cast<AbstractNodeModel>().ToList();
-                    deletedModels.AddRange(DeleteNodes(nodesToDelete, deleteConnections: true));
+                    DeleteNodes(nodesToDelete, deleteConnections: true);
                 }
             }
-
-            return new GraphChangeDescription(null, changedModelsDict, deletedModels);
         }
 
         /// <summary>
         /// Deletes the given group models.
         /// </summary>
         /// <param name="groupModels">The group models to delete.</param>
-        /// <returns>The list of deleted models.</returns>
-        public GraphChangeDescription DeleteGroups(IReadOnlyCollection<GroupModel> groupModels)
+        public void DeleteGroups(IReadOnlyCollection<GroupModel> groupModels)
         {
-            var changedModelsDict = new Dictionary<GraphElementModel, IReadOnlyList<ChangeHint>>();
             var deletedModels = new List<GraphElementModel>();
             var deletedVariables = new List<VariableDeclarationModel>();
 
-            void RecurseAddVariables(GroupModel groupModel)
+            void RecurseRemoveGroup(GroupModel groupModel)
             {
+                RemoveGroup(groupModel);
                 foreach (var item in groupModel.Items)
                 {
-                    deletedModels.Add(item as GraphElementModel);
                     if (item is VariableDeclarationModel variable)
                         deletedVariables.Add(variable);
                     else if (item is GroupModel group)
-                        RecurseAddVariables(group);
+                        RecurseRemoveGroup(group);
+                    else
+                        deletedModels.Add(item as GraphElementModel);
                 }
             }
 
             foreach (var groupModel in groupModels.Where(v => v.IsDeletable()))
             {
-                if (groupModel.ParentGroup != null)
-                {
-                    var changedModels = groupModel.ParentGroup.RemoveItem(groupModel);
-                    foreach (var changedModel in changedModels)
-                    {
-                        changedModelsDict[changedModel] = s_GroupingChangeHint;
-                    }
-                }
-
-                RecurseAddVariables(groupModel);
-                deletedModels.Add(groupModel);
+                groupModel.ParentGroup?.RemoveItem(groupModel);
+                RecurseRemoveGroup(groupModel);
             }
 
-            var result = DeleteVariableDeclarations(deletedVariables);
-            result.Union(null, changedModelsDict, deletedModels);
-            return result;
+            DeleteVariableDeclarations(deletedVariables);
+            CurrentGraphChangeDescription?.AddDeletedModels(deletedModels);
         }
 
         protected virtual Type GetPortalType()
@@ -1806,28 +1899,25 @@ public virtual WirePortalModel CreateOppositePortal(WirePortalModel wirePortalMo
         /// <param name="portalHeight">The desired height of the portals.</param>
         /// <param name="existingPortalEntries">The existing portal entries.</param>
         /// <param name="existingPortalExits">The existing portal exits.</param>
-        /// <returns>The new, changed and/or deleted models.</returns>
-        public virtual GraphChangeDescription CreatePortalsFromWire(WireModel wireModel, Vector2 entryPortalPosition, Vector2 exitPortalPosition, int portalHeight,
+        public virtual void CreatePortalsFromWire(WireModel wireModel, Vector2 entryPortalPosition, Vector2 exitPortalPosition, int portalHeight,
             Dictionary<PortModel, WirePortalModel> existingPortalEntries, Dictionary<PortModel, List<WirePortalModel>> existingPortalExits)
         {
-            var newModels = new List<GraphElementModel>();
             var inputPortModel = wireModel.ToPort;
             var outputPortModel = wireModel.FromPort;
 
             // Only a single portal per output port. Don't recreate if we already created one.
             WirePortalModel portalEntry = null;
 
-            var shouldDeleteWire = false;
             if (outputPortModel != null && !existingPortalEntries.TryGetValue(wireModel.FromPort, out portalEntry))
             {
-                portalEntry = CreateEntryPortalFromPort(outputPortModel, entryPortalPosition, portalHeight, newModels);
+                portalEntry = CreateEntryPortalFromPort(outputPortModel, entryPortalPosition, portalHeight);
                 wireModel.SetPort(WireSide.To, (portalEntry as ISingleInputPortNodeModel)?.InputPort);
                 existingPortalEntries[outputPortModel] = portalEntry;
+                CurrentGraphChangeDescription?.AddChangedModel(wireModel, ChangeHint.Layout);
             }
             else
             {
                 DeleteWires(new[] { wireModel });
-                shouldDeleteWire = true;
             }
 
             // We can have multiple portals on input ports however
@@ -1837,15 +1927,10 @@ public virtual GraphChangeDescription CreatePortalsFromWire(WireModel wireModel,
                 existingPortalExits[wireModel.ToPort] = portalExits;
             }
 
-            var portalExit = CreateExitPortalToPort(inputPortModel, exitPortalPosition, portalHeight, portalEntry, newModels);
+            var portalExit = CreateExitPortalToPort(inputPortModel, exitPortalPosition, portalHeight, portalEntry);
             portalExits.Add(portalExit);
 
-            var newExitWire = CreateWire(inputPortModel, (portalExit as ISingleOutputPortNodeModel)?.OutputPort);
-            newModels.Add(newExitWire);
-
-            return shouldDeleteWire ?
-                new GraphChangeDescription(newModels, null, new[] { wireModel }) :
-                new GraphChangeDescription(newModels, new Dictionary<GraphElementModel, IReadOnlyList<ChangeHint>> { { wireModel, new[] { ChangeHint.Layout } } }, null);
+            CreateWire(inputPortModel, (portalExit as ISingleOutputPortNodeModel)?.OutputPort);
         }
 
         /// <summary>
@@ -1854,9 +1939,8 @@ public virtual GraphChangeDescription CreatePortalsFromWire(WireModel wireModel,
         /// <param name="outputPortModel">The output port model to which the portal will be connected.</param>
         /// <param name="position">The desired position of the entry portal.</param>
         /// <param name="height">The desired height of the entry portal.</param>
-        /// <param name="newModels">On exit, contains the newly created models will have been appended to this list.</param>
         /// <returns>The created entry portal.</returns>
-        public virtual WirePortalModel CreateEntryPortalFromPort(PortModel outputPortModel, Vector2 position, int height, List<GraphElementModel> newModels = null)
+        public virtual WirePortalModel CreateEntryPortalFromPort(PortModel outputPortModel, Vector2 position, int height)
         {
             WirePortalModel portalEntry;
 
@@ -1868,8 +1952,6 @@ public virtual WirePortalModel CreateEntryPortalFromPort(PortModel outputPortMod
             else
                 portalEntry = this.CreateNode<DataWirePortalEntryModel>(initializationCallback: n => n.PortDataTypeHandle = outputPortModel.DataTypeHandle);
 
-            newModels?.Add(portalEntry);
-
             portalEntry.Position = position;
 
             // y offset based on port order. hurgh.
@@ -1888,7 +1970,6 @@ public virtual WirePortalModel CreateEntryPortalFromPort(PortModel outputPortMod
             }
 
             portalEntry.DeclarationModel = CreateGraphPortalDeclaration(portalName);
-            newModels?.Add(portalEntry.DeclarationModel);
 
             return portalEntry;
         }
@@ -1900,9 +1981,8 @@ public virtual WirePortalModel CreateEntryPortalFromPort(PortModel outputPortMod
         /// <param name="position">The desired position of the exit portal.</param>
         /// <param name="height">The desired height of the exit portal.</param>
         /// <param name="entryPortal">The corresponding entry portal.</param>
-        /// <param name="newModels">On exit, contains the newly created models will have been appended to this list.</param>
         /// <returns>The created exit portal.</returns>
-        public virtual WirePortalModel CreateExitPortalToPort(PortModel inputPortModel, Vector2 position, int height, WirePortalModel entryPortal, List<GraphElementModel> newModels = null)
+        public virtual WirePortalModel CreateExitPortalToPort(PortModel inputPortModel, Vector2 position, int height, WirePortalModel entryPortal)
         {
             WirePortalModel portalExit;
 
@@ -1911,8 +1991,6 @@ public virtual WirePortalModel CreateExitPortalToPort(PortModel inputPortModel,
             else
                 portalExit = this.CreateNode<DataWirePortalExitModel>(initializationCallback: n => n.PortDataTypeHandle = inputPortModel.DataTypeHandle);
 
-            newModels?.Add(portalExit);
-
             portalExit.Position = position;
             {
                 if (inputPortModel.NodeModel is InputOutputPortsNodeModel nodeModel)
@@ -1949,12 +2027,17 @@ public virtual void OnEnable()
             MigrateNodes();
 
             CheckGroupConsistency_Internal();
+
+            Stencil.OnGraphModelEnabled();
         }
 
         /// <summary>
         /// Tasks to perform when the <see cref="GraphAsset"/> is disabled.
         /// </summary>
-        public virtual void OnDisable() { }
+        public virtual void OnDisable()
+        {
+            Stencil.OnGraphModelDisabled();
+        }
 
         void RecurseDefineNode(AbstractNodeModel nodeModel)
         {
@@ -1978,7 +2061,11 @@ protected virtual void MigrateNodes() { }
         /// </summary>
         public virtual void UndoRedoPerformed()
         {
-            OnEnable();
+            foreach (var nodeModel in NodeModels)
+            {
+                RecurseDefineNode(nodeModel);
+            }
+
             Asset.Dirty = true;
         }
 
@@ -2184,44 +2271,44 @@ public virtual void OnAfterDeserialize()
                 m_GraphNodeModels = new List<AbstractNodeModel>();
 
             // Set the graph model on all elements.
-            foreach (var model in m_GraphNodeModels)
+            foreach (var model in m_GraphNodeModels.Where(m => m != null))
             {
-                RecursiveSetGraphModel(model);
+                model.GraphModel = this;
             }
 
-            foreach (var model in m_BadgeModels)
+            foreach (var model in m_BadgeModels.Where(m => m != null))
             {
-                RecursiveSetGraphModel(model);
+                model.GraphModel = this;
             }
 
-            foreach (var model in m_GraphWireModels)
+            foreach (var model in m_GraphWireModels.Where(m => m != null))
             {
-                RecursiveSetGraphModel(model);
+                model.GraphModel = this;
             }
 
-            foreach (var model in m_GraphStickyNoteModels)
+            foreach (var model in m_GraphStickyNoteModels.Where(m => m != null))
             {
-                RecursiveSetGraphModel(model);
+                model.GraphModel = this;
             }
 
-            foreach (var model in m_GraphPlacematModels)
+            foreach (var model in m_GraphPlacematModels.Where(m => m != null))
             {
-                RecursiveSetGraphModel(model);
+                model.GraphModel = this;
             }
 
-            foreach (var model in m_GraphVariableModels)
+            foreach (var model in m_GraphVariableModels.Where(m => m != null))
             {
-                RecursiveSetGraphModel(model);
+                model.GraphModel = this;
             }
 
-            foreach (var model in m_GraphPortalModels)
+            foreach (var model in m_GraphPortalModels.Where(m => m != null))
             {
-                RecursiveSetGraphModel(model);
+                model.GraphModel = this;
             }
 
-            foreach (var model in m_SectionModels)
+            foreach (var model in m_SectionModels.Where(m => m != null))
             {
-                RecursiveSetGraphModel(model);
+                model.GraphModel = this;
             }
 
             m_ExistingVariableNames = new HashSet<string>(VariableDeclarations.Count);
@@ -2234,20 +2321,6 @@ public virtual void OnAfterDeserialize()
             ResetCaches();
         }
 
-        protected void RecursiveSetGraphModel(GraphElementModel model)
-        {
-            if (model == null)
-                return;
-
-            model.GraphModel = this;
-
-            if (model is IGraphElementContainer container)
-            {
-                foreach (var element in container.GraphElementModels)
-                    RecursiveSetGraphModel(element);
-            }
-        }
-
         /// <summary>
         /// Resets internal caches.
         /// </summary>
@@ -2269,7 +2342,9 @@ protected virtual void CleanupSections(IEnumerable<string> sectionNames)
             foreach (var section in m_SectionModels.ToList())
             {
                 if (!sectionHash.Contains(section.Title))
-                    m_SectionModels.Remove(section);
+                {
+                    RemoveSection(section);
+                }
             }
 
             foreach (var sectionName in sectionNames)
@@ -2359,29 +2434,9 @@ public virtual void CloneGraph(GraphModel sourceGraphModel)
                 var pastedPlacemat = CreatePlacemat(newPosition);
                 pastedPlacemat.Title = placemat.Title;
                 pastedPlacemat.Color = placemat.Color;
-                pastedPlacemat.Collapsed = placemat.Collapsed;
-                pastedPlacemat.HiddenElementsGuid = placemat.HiddenElementsGuid;
                 pastedPlacemats.Add(pastedPlacemat);
                 elementMapping.Add(placemat.Guid.ToString(), pastedPlacemat);
             }
-
-            // Update hidden content to new node ids.
-            foreach (var pastedPlacemat in pastedPlacemats)
-            {
-                if (pastedPlacemat.Collapsed)
-                {
-                    List<string> pastedHiddenContent = new List<string>();
-                    foreach (var guid in pastedPlacemat.HiddenElementsGuid)
-                    {
-                        if (elementMapping.TryGetValue(guid, out GraphElementModel pastedElement))
-                        {
-                            pastedHiddenContent.Add(pastedElement.Guid.ToString());
-                        }
-                    }
-
-                    pastedPlacemat.HiddenElementsGuid = pastedHiddenContent;
-                }
-            }
         }
 
         void AddGraphPlaceholders()
@@ -2517,7 +2572,10 @@ void RemoveUnmanagedNullElements()
         void RemovePlaceholder(IPlaceholder placeholder)
         {
             if (TryGetModelFromGuid(placeholder.Guid, out var model))
+            {
                 UnregisterElement(model);
+                CurrentGraphChangeDescription?.AddDeletedModels(model);
+            }
 
             // Clear the serialized data related to the null object the user wants to remove.
             SerializationUtility.ClearManagedReferenceWithMissingType(Asset, placeholder.ReferenceId);
@@ -2562,6 +2620,7 @@ internal NodePlaceholder CreateNodePlaceholder_Internal(string nodeName, Vector2
         {
             var node = InstantiateNode(typeof(NodePlaceholder), nodeName, position, guid) as NodePlaceholder;
             RegisterElement(node);
+            CurrentGraphChangeDescription?.AddNewModels(node);
 
             if (node != null && referenceId != -1)
                 node.ReferenceId = referenceId;
@@ -2575,6 +2634,7 @@ internal ContextNodePlaceholder CreateContextNodePlaceholder_Internal(string nod
         {
             var contextNode = InstantiateNode(typeof(ContextNodePlaceholder), nodeName, position, guid) as ContextNodePlaceholder;
             RegisterElement(contextNode);
+            CurrentGraphChangeDescription?.AddNewModels(contextNode);
 
             if (contextNode != null && referenceId != -1)
                 contextNode.ReferenceId = referenceId;
@@ -2613,6 +2673,7 @@ internal BlockNodePlaceholder CreateBlockNodePlaceholder_Internal(string nodeNam
         {
             var node = InstantiateNode(typeof(BlockNodePlaceholder), nodeName, Vector2.zero, guid) as BlockNodePlaceholder;
             RegisterElement(node);
+            CurrentGraphChangeDescription?.AddNewModels(node);
 
             if (node != null && referenceId != -1)
                 node.ReferenceId = referenceId;
@@ -2629,6 +2690,7 @@ internal VariableDeclarationPlaceholder CreateVariableDeclarationPlaceholder_Int
                 variableName, ModifierFlags.None, false, null, guid) as VariableDeclarationPlaceholder;
 
             RegisterElement(variableDeclaration);
+            CurrentGraphChangeDescription?.AddNewModels(variableDeclaration);
 
             if (variableDeclaration != null && referenceId != -1)
                 variableDeclaration.ReferenceId = referenceId;
@@ -2652,6 +2714,7 @@ internal PortalDeclarationPlaceholder CreatePortalDeclarationPlaceholder_Interna
             portalModel.GraphModel = this;
 
             RegisterElement(portalModel);
+            CurrentGraphChangeDescription?.AddNewModels(portalModel);
 
             if (referenceId != -1)
                 portalModel.ReferenceId = referenceId;
@@ -2676,6 +2739,7 @@ internal WirePlaceholder CreateWirePlaceholder_Internal(PortModel toPort, PortMo
             wireModel.SetPorts(toPort, fromPort);
 
             RegisterElement(wireModel);
+            CurrentGraphChangeDescription?.AddNewModels(wireModel);
 
             if (referenceId != -1)
                 wireModel.ReferenceId = referenceId;
@@ -2728,5 +2792,21 @@ public virtual void Repair()
         /// </remarks>
         /// <returns>True if the Asset Graph can be a subgraph, false otherwise.</returns>
         public virtual bool CanBeSubgraph() => !IsContainerGraph();
+
+        internal GraphChangeDescription PushNewGraphChangeDescription_Internal()
+        {
+            var changes = new GraphChangeDescription();
+            m_GraphChangeDescriptionStack.Push(changes);
+            return changes;
+        }
+
+        internal void PopGraphChangeDescription_Internal()
+        {
+            if (!m_GraphChangeDescriptionStack.TryPop(out var currentScopeChange))
+                return;
+            if (!m_GraphChangeDescriptionStack.TryPeek(out var outerScopeChanges))
+                return;
+            outerScopeChanges.Union(currentScopeChange);
+        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/ModelInspector/InspectorModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/ModelInspector/InspectorModel.cs
index dcb7996ba3..e30377542e 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/ModelInspector/InspectorModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/ModelInspector/InspectorModel.cs
@@ -32,6 +32,9 @@ class InspectorModel : Model, IHasTitle
         const string k_AdvancedWirePropertiesTitle = "Advanced Properties";
         const string k_GraphSettingsTitle = "Graph Settings";
         const string k_AdvancedGraphSettingsTitle = "Advanced Settings";
+        const string k_PlacematInspectorTitle = "Placemat Inspector";
+        const string k_PlacematsInspectorTitle = "Placemats Inspector";
+        const string k_PlacematPropertiesTitle = "Placemat Properties";
 
         [SerializeField]
         string m_Title;
@@ -103,7 +106,7 @@ protected virtual void SetSectionsFromModels(IEnumerable<Model> inspectedModels)
                         {
                             Title = null,
                             Collapsible = false,
-                            SectionType = SectionType.Settings
+                            SectionType = SectionType.Options
                         });
                         m_SectionModels.Add(new InspectorSectionModel()
                         {
@@ -123,7 +126,7 @@ protected virtual void SetSectionsFromModels(IEnumerable<Model> inspectedModels)
                         {
                             Title = null,
                             Collapsible = false,
-                            SectionType = SectionType.Settings
+                            SectionType = SectionType.Options
                         });
                         m_SectionModels.Add(new InspectorSectionModel()
                         {
@@ -137,7 +140,7 @@ protected virtual void SetSectionsFromModels(IEnumerable<Model> inspectedModels)
                         {
                             Title = null,
                             Collapsible = false,
-                            SectionType = SectionType.Settings
+                            SectionType = SectionType.Options
                         });
                         m_SectionModels.Add(new InspectorSectionModel()
                         {
@@ -152,12 +155,20 @@ protected virtual void SetSectionsFromModels(IEnumerable<Model> inspectedModels)
                             SectionType = SectionType.Advanced
                         });
                         break;
+                    case PlacematModel _:
+                        m_SectionModels.Add(new InspectorSectionModel()
+                        {
+                            Title = k_PlacematPropertiesTitle,
+                            Collapsed = false,
+                            SectionType = SectionType.Options
+                        });
+                        break;
                     case GraphModel _:
                         m_SectionModels.Add(new InspectorSectionModel()
                         {
                             Title = k_GraphSettingsTitle,
                             Collapsed = false,
-                            SectionType = SectionType.Settings
+                            SectionType = SectionType.Options
                         });
                         m_SectionModels.Add(new InspectorSectionModel()
                         {
@@ -177,7 +188,7 @@ protected virtual void SetSectionsFromModels(IEnumerable<Model> inspectedModels)
                     {
                         Title = null,
                         Collapsible = false,
-                        SectionType = SectionType.Settings
+                        SectionType = SectionType.Options
                     });
                     m_SectionModels.Add(new InspectorSectionModel()
                     {
@@ -198,7 +209,7 @@ protected virtual void SetSectionsFromModels(IEnumerable<Model> inspectedModels)
                     {
                         Title = null,
                         Collapsible = false,
-                        SectionType = SectionType.Settings
+                        SectionType = SectionType.Options
                     });
                     m_SectionModels.Add(new InspectorSectionModel()
                     {
@@ -213,7 +224,7 @@ protected virtual void SetSectionsFromModels(IEnumerable<Model> inspectedModels)
                     {
                         Title = null,
                         Collapsed = false,
-                        SectionType = SectionType.Settings
+                        SectionType = SectionType.Options
                     });
                     m_SectionModels.Add(new InspectorSectionModel()
                     {
@@ -228,13 +239,22 @@ protected virtual void SetSectionsFromModels(IEnumerable<Model> inspectedModels)
                         SectionType = SectionType.Advanced
                     });
                 }
+                else if (typeof(PlacematModel).IsAssignableFrom(type))
+                {
+                    m_SectionModels.Add(new InspectorSectionModel()
+                    {
+                        Title = k_PlacematPropertiesTitle,
+                        Collapsed = false,
+                        SectionType = SectionType.Options
+                    });
+                }
                 else if (typeof(GraphModel).IsAssignableFrom(type))
                 {
                     m_SectionModels.Add(new InspectorSectionModel()
                     {
                         Title = k_GraphSettingsTitle,
                         Collapsed = false,
-                        SectionType = SectionType.Settings
+                        SectionType = SectionType.Options
                     });
                     m_SectionModels.Add(new InspectorSectionModel()
                     {
@@ -274,6 +294,9 @@ bool SetTitleFromModels(IEnumerable<Model> inspectedModels)
                         case GraphModel _:
                             m_Title = k_GraphInspectorTitle;
                             break;
+                        case PlacematModel _:
+                            m_Title = k_PlacematInspectorTitle;
+                            break;
                         default:
                             m_Title = k_InspectorTitle;
                             break;
@@ -286,10 +309,12 @@ bool SetTitleFromModels(IEnumerable<Model> inspectedModels)
 
                 if (typeof(AbstractNodeModel).IsAssignableFrom(type))
                     m_Title = k_NodesInspectorTitle;
-                if (typeof(VariableDeclarationModel).IsAssignableFrom(type))
+                else if (typeof(VariableDeclarationModel).IsAssignableFrom(type))
                     m_Title = k_VariablesInspectorTitle;
-                if (typeof(WireModel).IsAssignableFrom(type))
+                else if (typeof(WireModel).IsAssignableFrom(type))
                     m_Title = k_WiresInspectorTitle;
+                else if (typeof(PlacematModel).IsAssignableFrom(type))
+                    m_Title = k_PlacematsInspectorTitle;
                 else
                     m_Title = k_InspectorTitle;
             }
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/ModelInspector/InspectorSectionModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/ModelInspector/InspectorSectionModel.cs
index 165da8ac34..7f1e4ba674 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/ModelInspector/InspectorSectionModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/ModelInspector/InspectorSectionModel.cs
@@ -15,7 +15,9 @@ namespace Unity.GraphToolsFoundation.Editor
     [MovedFrom(false, "Unity.GraphToolsFoundation.Editor", "Unity.GraphTools.Foundation.Model")]
     enum SectionType
     {
-        Settings,
+        [Obsolete("SectionType.Settings has been deprecated. Use SectionType.Options instead")]
+        Settings = 0,
+        Options = 0,
         Properties,
         Advanced
     }
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/NodeModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/NodeModel.cs
index 296a4ce902..7f0eb3d49f 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/NodeModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/NodeModel.cs
@@ -23,10 +23,10 @@ abstract class NodeModel : InputOutputPortsNodeModel, IHasProgress, ICollapsible
         [SerializeField, HideInInspector]
         ModelState m_State;
 
-        protected OrderedPorts m_InputsById;
-        protected OrderedPorts m_OutputsById;
-        protected OrderedPorts m_PreviousInputs;
-        protected OrderedPorts m_PreviousOutputs;
+        OrderedPorts m_InputsById;
+        OrderedPorts m_OutputsById;
+        OrderedPorts m_PreviousInputs;
+        OrderedPorts m_PreviousOutputs;
 
         [SerializeField, HideInInspector]
         bool m_Collapsed;
@@ -38,7 +38,13 @@ abstract class NodeModel : InputOutputPortsNodeModel, IHasProgress, ICollapsible
         public override ModelState State
         {
             get => m_State;
-            set => m_State = value;
+            set
+            {
+                if (m_State == value)
+                    return;
+                m_State = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <inheritdoc />
@@ -50,6 +56,16 @@ public override ModelState State
         /// <inheritdoc />
         public override IReadOnlyDictionary<string, PortModel> OutputsById => m_OutputsById;
 
+        /// <summary>
+        /// The previous value of <see cref="InputsById"/>.
+        /// </summary>
+        protected IReadOnlyDictionary<string, PortModel> PreviousInputsById => m_PreviousInputs;
+
+        /// <summary>
+        /// The previous value of <see cref="OutputsById"/>.
+        /// </summary>
+        protected IReadOnlyDictionary<string, PortModel> PreviousOutputsById => m_PreviousOutputs;
+
         /// <inheritdoc />
         public override IReadOnlyList<PortModel> InputsByDisplayOrder => m_InputsById;
 
@@ -67,7 +83,10 @@ public virtual bool Collapsed
                 if (!this.IsCollapsible())
                     return;
 
+                if (m_Collapsed == value)
+                    return;
                 m_Collapsed = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Layout);
             }
         }
 
@@ -84,8 +103,20 @@ protected NodeModel()
             m_InputConstantsById = new SerializedReferenceDictionary<string, Constant>();
         }
 
+        // Used in tests.
         internal void ClearPorts_Internal()
         {
+            foreach (var portModel in m_InputsById.Values)
+            {
+                GraphModel.UnregisterPort(portModel);
+            }
+
+            foreach (var portModel in m_OutputsById.Values)
+            {
+                GraphModel.UnregisterPort(portModel);
+            }
+
+            GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.GraphTopology);
             m_InputsById = new OrderedPorts();
             m_OutputsById = new OrderedPorts();
             m_PreviousInputs = null;
@@ -139,18 +170,26 @@ public override void OnDuplicateNode(AbstractNodeModel sourceNode)
 
         void RemoveObsoleteWiresAndConstants()
         {
+            var portsRemoved = false;
             foreach (var kv in m_PreviousInputs
                      .Where<KeyValuePair<string, PortModel>>(kv => !m_InputsById.ContainsKey(kv.Key)))
             {
                 DisconnectPort(kv.Value);
+                GraphModel?.UnregisterPort(kv.Value);
+                portsRemoved = true;
             }
 
             foreach (var kv in m_PreviousOutputs
                      .Where<KeyValuePair<string, PortModel>>(kv => !m_OutputsById.ContainsKey(kv.Key)))
             {
                 DisconnectPort(kv.Value);
+                GraphModel?.UnregisterPort(kv.Value);
+                portsRemoved = true;
             }
 
+            if (portsRemoved)
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.GraphTopology);
+
             // remove input constants that aren't used
             var idsToDeletes = m_InputConstantsById
                 .Select(kv => kv.Key)
@@ -161,7 +200,7 @@ void RemoveObsoleteWiresAndConstants()
             }
         }
 
-        static PortModel ReuseOrCreatePortModel(PortModel model, IReadOnlyDictionary<string, PortModel> previousPorts, OrderedPorts newPorts)
+        PortModel ReuseOrCreatePortModel(PortModel model, IReadOnlyDictionary<string, PortModel> previousPorts, OrderedPorts newPorts)
         {
             // reuse existing ports when ids match, otherwise add port
             if (previousPorts != null && previousPorts.TryGetValue(model.UniqueName, out var portModelToAdd))
@@ -172,10 +211,14 @@ static PortModel ReuseOrCreatePortModel(PortModel model, IReadOnlyDictionary<str
                 }
                 portModelToAdd.DataTypeHandle = model.DataTypeHandle;
                 portModelToAdd.PortType = model.PortType;
+                if (GraphModel != null && !GraphModel.TryGetModelFromGuid(portModelToAdd.Guid, out _))
+                    GraphModel.RegisterPort(portModelToAdd);
             }
             else
             {
+                GraphModel?.RegisterPort(model);
                 portModelToAdd = model;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.GraphTopology);
             }
 
             newPorts.Add(portModelToAdd);
@@ -208,7 +251,7 @@ protected virtual void DisconnectPort(PortModel portModel)
             if (GraphModel != null)
             {
                 var wireModels = GraphModel.GetWiresForPort(portModel);
-                GraphModel.DeleteWires(wireModels.ToList());
+                GraphModel.DeleteWires(wireModels);
             }
         }
 
@@ -261,10 +304,15 @@ protected void UpdateConstantForInput(PortModel inputPort, Action<Constant> init
                     portDefinitionType = inputPort.DataTypeHandle.Resolve();
                 }
 
-                if (!constant.Type.IsAssignableFrom(portDefinitionType) || (constant.Type.IsEnum && constant.Type != portDefinitionType))
+                if (!constant.IsAssignableFrom(portDefinitionType))
                 {
                     m_InputConstantsById.Remove(id);
                 }
+                else
+                {
+                    // We might be reusing a constant for a new compatible port.
+                    constant.OwnerModel = inputPort;
+                }
             }
 
             // Create new constant if needed
@@ -274,6 +322,7 @@ protected void UpdateConstantForInput(PortModel inputPort, Action<Constant> init
                 && GraphModel.Stencil.GetConstantType(inputPort.DataTypeHandle) != null)
             {
                 var embeddedConstant = GraphModel.Stencil.CreateConstantValue(inputPort.DataTypeHandle);
+                embeddedConstant.OwnerModel = inputPort;
                 initializationCallback?.Invoke(embeddedConstant);
                 m_InputConstantsById[id] = embeddedConstant;
                 GraphModel.Asset.Dirty = true;
@@ -293,30 +342,21 @@ public void CloneInputConstants()
             {
                 var inputConstant = m_InputConstantsById[id];
                 var newConstant = inputConstant.Clone();
+                if (m_InputsById.TryGetValue(id, out var portModel))
+                    newConstant.OwnerModel = portModel;
                 m_InputConstantsById[id] = newConstant;
                 GraphModel.Asset.Dirty = true;
             }
         }
 
-        /// <inheritdoc />
-        public override void OnAfterDeserialize()
-        {
-            base.OnAfterDeserialize();
-
-            m_PreviousInputs = null;
-            m_PreviousOutputs = null;
-            m_OutputsById = new OrderedPorts();
-            m_InputsById = new OrderedPorts();
-
-            // DefineNode() will be called by the GraphModel.
-        }
-
         /// <inheritdoc />
         public override bool RemoveUnusedMissingPort(PortModel portModel)
         {
             if (portModel.PortType != PortType.MissingPort || portModel.GetConnectedWires().Any())
                 return false;
 
+            GraphModel.UnregisterPort(portModel);
+            GraphModel.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.GraphTopology);
             return portModel.Direction == PortDirection.Input ? m_InputsById.Remove(portModel) : m_OutputsById.Remove(portModel);
         }
     }
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/PlacematModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/PlacematModel.cs
index 19d050cb86..6f81dbefb0 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/PlacematModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/PlacematModel.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.Scripting.APIUpdating;
 
@@ -15,23 +16,26 @@ namespace Unity.GraphToolsFoundation.Editor
     /// </summary>
     [Serializable]
     [MovedFrom(false, "Unity.GraphToolsFoundation.Editor", "Unity.GraphTools.Foundation.Model")]
-    class PlacematModel : GraphElementModel, IHasTitle, IMovable, ICollapsible, IResizable, IRenamable
+    class PlacematModel : GraphElementModel, IHasTitle, IMovable, IResizable, IRenamable
     {
         const string k_DefaultPlacematName = "Placemat";
+        const int k_MinTitleFontSize = 16;
+        const int k_MaxTitleFontSize = 150;
 
         [SerializeField]
         string m_Title;
 
-        [SerializeField]
-        Rect m_Position;
+        [SerializeField, InspectorUseProperty(nameof(TitleFontSize))]
+        int m_TitleFontSize;
 
         [SerializeField]
-        bool m_Collapsed;
+        TextAlignment m_TitleAlignment;
 
-        [SerializeField]
-        List<string> m_HiddenElements;
+        [SerializeField, HideInInspector]
+        Rect m_Position;
 
-        List<GraphElementModel> m_CachedHiddenElementModels;
+        [SerializeField, Multiline]
+        string m_Comment;
 
         public override Color DefaultColor => new Color(74.0f/255.0f, 88.0f/255.0f, 91.0f / 255.0f);
 
@@ -42,7 +46,31 @@ class PlacematModel : GraphElementModel, IHasTitle, IMovable, ICollapsible, IRes
         public virtual string Title
         {
             get => m_Title;
-            set => m_Title = value;
+            set
+            {
+                if (m_Title == value)
+                    return;
+                m_Title = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
+        }
+
+        public int TitleFontSize
+        {
+            get => m_TitleFontSize;
+            set => m_TitleFontSize = value > k_MaxTitleFontSize ? k_MaxTitleFontSize : (value < k_MinTitleFontSize ? k_MinTitleFontSize : value);
+        }
+
+        public TextAlignment TitleAlignment
+        {
+            get => m_TitleAlignment;
+            set => m_TitleAlignment = value;
+        }
+
+        public string Comment
+        {
+            get => m_Comment;
+            set => m_Comment = value;
         }
 
         /// <inheritdoc />
@@ -61,6 +89,9 @@ public virtual Rect PositionAndSize
                 if (!this.IsMovable())
                     r.position = m_Position.position;
 
+                if (r != m_Position)
+                    GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Layout);
+
                 m_Position = r;
             }
         }
@@ -72,30 +103,6 @@ public virtual Vector2 Position
             set => PositionAndSize = new Rect(value, PositionAndSize.size);
         }
 
-        /// <inheritdoc />
-        public virtual bool Collapsed
-        {
-            get => m_Collapsed;
-            set
-            {
-                if (!this.IsCollapsible())
-                    return;
-
-                m_Collapsed = value;
-                this.SetCapability(Editor.Capabilities.Resizable, !m_Collapsed);
-            }
-        }
-
-        public List<string> HiddenElementsGuid
-        {
-            get => m_HiddenElements;
-            set
-            {
-                m_HiddenElements = value;
-                m_CachedHiddenElementModels = null;
-            }
-        }
-
         /// <summary>
         /// Whether the object was deleted from the graph.
         /// </summary>
@@ -145,64 +152,6 @@ public virtual void Rename(string newName)
             Title = newName;
         }
 
-        /// <summary>
-        /// Elements hidden in the placemat.
-        /// </summary>
-        public virtual IEnumerable<GraphElementModel> HiddenElements
-        {
-            get
-            {
-                if (m_CachedHiddenElementModels == null)
-                {
-                    if (HiddenElementsGuid != null)
-                    {
-                        m_CachedHiddenElementModels = new List<GraphElementModel>();
-                        foreach (var elementModelGuid in HiddenElementsGuid)
-                        {
-                            foreach (var node in GraphModel.NodeModels)
-                            {
-                                if (node != null && node.Guid.ToString() == elementModelGuid)
-                                {
-                                    m_CachedHiddenElementModels.Add(node);
-                                }
-                            }
-
-                            foreach (var sticky in GraphModel.StickyNoteModels)
-                            {
-                                if (sticky.Guid.ToString() == elementModelGuid)
-                                {
-                                    m_CachedHiddenElementModels.Add(sticky);
-                                }
-                            }
-
-                            foreach (var placemat in GraphModel.PlacematModels)
-                            {
-                                if (placemat.Guid.ToString() == elementModelGuid)
-                                {
-                                    m_CachedHiddenElementModels.Add(placemat);
-                                }
-                            }
-                        }
-                    }
-                }
-
-                return m_CachedHiddenElementModels ?? Enumerable.Empty<GraphElementModel>();
-            }
-            set
-            {
-                if (value == null)
-                {
-                    m_HiddenElements = null;
-                }
-                else
-                {
-                    m_HiddenElements = new List<string>(value.Select(e => e.Guid.ToString()));
-                }
-
-                m_CachedHiddenElementModels = null;
-            }
-        }
-
         /// <summary>
         /// Returns the Z-order of the placemat in the graph.
         /// </summary>
@@ -214,8 +163,6 @@ public override void OnAfterDeserialize()
         {
             base.OnAfterDeserialize();
 
-            m_CachedHiddenElementModels = null;
-
             if (Version <= SerializationVersion.GTF_V_0_8_2)
             {
                 if (DefaultColor != SerializedColor_Internal)
@@ -225,5 +172,14 @@ public override void OnAfterDeserialize()
                 }
             }
         }
+
+        public static void CopyPlacematParameters(PlacematModel source, PlacematModel destination)
+        {
+            destination.Title = source.Title;
+            destination.Color = source.Color;
+            destination.TitleFontSize = source.TitleFontSize;
+            destination.TitleAlignment = source.TitleAlignment;
+            destination.Comment = source.Comment;
+        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/PortModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/PortModel.cs
index 3562ac406c..a22f123c31 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/PortModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/PortModel.cs
@@ -97,9 +97,12 @@ public string Title
             get => m_Title;
             set
             {
+                if (m_Title == value)
+                    return;
                 var oldUniqueName = UniqueName;
                 m_Title = value;
                 OnUniqueNameChanged(oldUniqueName, UniqueName);
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
             }
         }
 
@@ -115,9 +118,12 @@ public virtual string UniqueName
             get => m_UniqueId ?? Title ?? Guid.ToString();
             set
             {
+                if (m_UniqueId == value)
+                    return;
                 var oldUniqueName = UniqueName;
                 m_UniqueId = value;
                 OnUniqueNameChanged(oldUniqueName, UniqueName);
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
             }
         }
 
@@ -135,7 +141,13 @@ public override void SetGuid(SerializableGUID value)
         public virtual PortModelOptions Options
         {
             get => m_Options;
-            set => m_Options = value;
+            set
+            {
+                if (m_Options == value)
+                    return;
+                m_Options = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <summary>
@@ -146,9 +158,12 @@ public virtual PortType PortType
             get => m_PortType;
             set
             {
+                if (m_PortType == value)
+                    return;
                 m_PortType = value;
                 // Invalidate cache.
                 m_TooltipCache = null;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
             }
         }
 
@@ -160,9 +175,14 @@ public virtual PortDirection Direction
             get => m_Direction;
             set
             {
+                if (m_Direction == value)
+                    return;
                 var oldDirection = m_Direction;
                 m_Direction = value;
+                // Invalidate cache.
+                m_TooltipCache = null;
                 OnDirectionChanged(oldDirection,value);
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
             }
         }
 
@@ -172,7 +192,13 @@ public virtual PortDirection Direction
         public virtual PortOrientation Orientation
         {
             get => m_Orientation;
-            set => m_Orientation = value;
+            set
+            {
+                if (m_Orientation == value)
+                    return;
+                m_Orientation = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <summary>
@@ -188,7 +214,13 @@ public virtual PortCapacity Capacity
                 // If not set, fallback to default behavior.
                 return PortType == PortType.Data && Direction == PortDirection.Input ? PortCapacity.Single : PortCapacity.Multi;
             }
-            set => m_PortCapacity = value;
+            set
+            {
+                if (m_PortCapacity == value)
+                    return;
+                m_PortCapacity = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <summary>
@@ -199,8 +231,11 @@ public virtual TypeHandle DataTypeHandle
             get => m_DataTypeHandle;
             set
             {
+                if (m_DataTypeHandle == value)
+                    return;
                 m_DataTypeHandle = value;
                 m_PortDataTypeCache = null;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
             }
         }
 
@@ -380,7 +415,13 @@ public virtual string ToolTip
                 return m_TooltipCache;
             }
 
-            set => m_TooltipOverride = value;
+            set
+            {
+                if (m_TooltipOverride == value)
+                    return;
+                m_TooltipOverride = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Style);
+            }
         }
 
         /// <summary>
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/PortNodeModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/PortNodeModel.cs
index aa114bcdf6..778eeb3336 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/PortNodeModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/PortNodeModel.cs
@@ -14,6 +14,9 @@ namespace Unity.GraphToolsFoundation.Editor
     [Serializable]
     abstract class PortNodeModel : AbstractNodeModel
     {
+        /// <inheritdoc />
+        public override IEnumerable<GraphElementModel> DependentModels => base.DependentModels.Concat(Ports);
+
         /// <summary>
         /// Gets all the port models this node has.
         /// </summary>
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/StickyNoteModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/StickyNoteModel.cs
index 7d95b0ac69..659d35df3e 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/StickyNoteModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/StickyNoteModel.cs
@@ -70,7 +70,11 @@ public virtual Rect PositionAndSize
                 if (!this.IsMovable())
                     r.position = m_Position.position;
 
-                m_Position = r;
+                if (r != m_Position)
+                {
+                    GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Layout);
+                    m_Position = r;
+                }
             }
         }
 
@@ -85,7 +89,14 @@ public virtual Vector2 Position
         public virtual string Title
         {
             get => m_Title;
-            set { if (value != null && m_Title != value) m_Title = value; }
+            set
+            {
+                if (value != null && m_Title != value)
+                {
+                    m_Title = value;
+                    GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+                }
+            }
         }
 
         /// <inheritdoc />
@@ -97,7 +108,14 @@ public virtual string Title
         public virtual string Contents
         {
             get => m_Contents;
-            set { if (value != null && m_Contents != value) m_Contents = value; }
+            set
+            {
+                if (value != null && m_Contents != value)
+                {
+                    m_Contents = value;
+                    GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+                }
+            }
         }
 
         /// <summary>
@@ -106,7 +124,13 @@ public virtual string Contents
         public virtual string Theme
         {
             get => m_ThemeName;
-            set => m_ThemeName = value;
+            set
+            {
+                if (m_ThemeName == value)
+                    return;
+                m_ThemeName = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Style);
+            }
         }
 
         /// <summary>
@@ -115,7 +139,13 @@ public virtual string Theme
         public virtual string TextSize
         {
             get => m_TextSizeName;
-            set => m_TextSizeName = value;
+            set
+            {
+                if (m_TextSizeName == value)
+                    return;
+                m_TextSizeName = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Style);
+            }
         }
 
         /// <summary>
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/SubgraphNodeModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/SubgraphNodeModel.cs
index d91f6faa15..e97088df1d 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/SubgraphNodeModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/SubgraphNodeModel.cs
@@ -32,6 +32,9 @@ public GraphModel SubgraphModel
 
             set
             {
+                if ((m_Subgraph == null && value != null) || (m_Subgraph != null && value == null))
+                    GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+
                 if (value != null)
                 {
                     m_Subgraph ??= new Subgraph(value.Asset);
@@ -94,6 +97,8 @@ public List<GraphElementModel> Update()
                 }
             }
 
+            GraphModel.CurrentGraphChangeDescription?.AddChangedModels(elementsToUpdate, ChangeHint.Data);
+
             return elementsToUpdate;
         }
 
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/VariableDeclarationModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/VariableDeclarationModel.cs
index be7f1596d6..a3ecccb527 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/VariableDeclarationModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/VariableDeclarationModel.cs
@@ -71,7 +71,13 @@ class VariableDeclarationModel : DeclarationModel, IGroupItemModel
         public VariableFlags VariableFlags
         {
             get => m_VariableFlags;
-            set => m_VariableFlags = value;
+            set
+            {
+                if (m_VariableFlags == value)
+                    return;
+                m_VariableFlags = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <summary>
@@ -80,7 +86,13 @@ public VariableFlags VariableFlags
         public virtual ModifierFlags Modifiers
         {
             get => (ModifierFlags)m_Modifiers;
-            set => m_Modifiers = (int)value;
+            set
+            {
+                if (m_Modifiers == (int)value)
+                    return;
+                m_Modifiers = (int)value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <inheritdoc />
@@ -90,6 +102,15 @@ public override void Rename(string newName)
                 return;
 
             GraphModel.RenameVariable(this, newName);
+
+            var references = GraphModel.FindReferencesInGraph<VariableNodeModel>(this).OfType<AbstractNodeModel>();
+            GraphModel.CurrentGraphChangeDescription?.AddChangedModels(references.Append<GraphElementModel>(this), ChangeHint.Data);
+
+            if (this.IsInputOrOutput())
+            {
+                foreach (var recursiveSubgraphNode in GraphModel.GetRecursiveSubgraphNodes())
+                    recursiveSubgraphNode.Update();
+            }
         }
 
         /// <summary>
@@ -115,6 +136,17 @@ public virtual TypeHandle DataType
                 m_InitializationValue = null;
                 if (GraphModel.Stencil.RequiresInitialization(this))
                     CreateInitializationValue();
+
+                if (GraphModel != null)
+                {
+                    GraphModel.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+
+                    var variableReferences = GraphModel.FindReferencesInGraph<VariableNodeModel>(this);
+                    foreach (var usage in variableReferences)
+                    {
+                        usage.UpdateTypeFromDeclaration();
+                    }
+                }
             }
         }
 
@@ -124,7 +156,13 @@ public virtual TypeHandle DataType
         public virtual bool IsExposed
         {
             get => m_IsExposed;
-            set => m_IsExposed = value;
+            set
+            {
+                if (m_IsExposed == value)
+                    return;
+                m_IsExposed = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <summary>
@@ -133,7 +171,18 @@ public virtual bool IsExposed
         public virtual string Tooltip
         {
             get => m_Tooltip;
-            set => m_Tooltip = value;
+            set
+            {
+                if (m_Tooltip == value)
+                    return;
+                m_Tooltip = value;
+                if (GraphModel is { CurrentGraphChangeDescription: { } })
+                {
+                    GraphModel.CurrentGraphChangeDescription.AddChangedModel(this, ChangeHint.Style);
+                    var references = GraphModel.FindReferencesInGraph<VariableNodeModel>(this);
+                    GraphModel.CurrentGraphChangeDescription.AddChangedModels(references, ChangeHint.Style);
+                }
+            }
         }
 
         /// <summary>
@@ -142,7 +191,18 @@ public virtual string Tooltip
         public virtual Constant InitializationModel
         {
             get => m_InitializationValue;
-            set => m_InitializationValue = value;
+            set
+            {
+                if (m_InitializationValue == value)
+                    return;
+                // Unregister ourselves as the owner of the old constant.
+                if (m_InitializationValue != null)
+                    m_InitializationValue.OwnerModel = null;
+                m_InitializationValue = value;
+                if (m_InitializationValue != null)
+                    m_InitializationValue.OwnerModel = this;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <inheritdoc />
@@ -215,6 +275,9 @@ public override void OnAfterDeserialize()
                     m_Modifiers = (int)ModifierFlags.ReadWrite;
                 }
             }
+
+            if (InitializationModel != null)
+                InitializationModel.OwnerModel = this;
         }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/VariableNodeModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/VariableNodeModel.cs
index 952f92c34e..37654c09d9 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/VariableNodeModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/VariableNodeModel.cs
@@ -58,8 +58,11 @@ public DeclarationModel DeclarationModel
             }
             set
             {
+                if (ReferenceEquals(m_DeclarationModel, value))
+                    return;
                 m_DeclarationModel = (VariableDeclarationModel)value;
                 m_DeclarationModelGuid = m_DeclarationModel.Guid;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
                 DefineNode();
             }
         }
@@ -94,7 +97,10 @@ public VariableNodeModel()
         public virtual void UpdateTypeFromDeclaration()
         {
             if (DeclarationModel != null && m_MainPortModel != null)
+            {
                 m_MainPortModel.DataTypeHandle = VariableDeclarationModel.DataType;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
 
             // update connected nodes' ports colors/types
             if (m_MainPortModel != null)
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/WireModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/WireModel.cs
index dfa0b9cc2d..30b15972cf 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/WireModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/WireModel.cs
@@ -125,7 +125,13 @@ public virtual PortModel ToPort
         public virtual string WireLabel
         {
             get => string.IsNullOrEmpty(m_WireLabel) ? GetWireOrderLabel() : m_WireLabel;
-            set => m_WireLabel = value;
+            set
+            {
+                if (m_WireLabel == value)
+                    return;
+                m_WireLabel = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         string GetWireOrderLabel()
diff --git a/Modules/GraphToolsFoundationEditor/Model/BasicModel/WirePortalModel.cs b/Modules/GraphToolsFoundationEditor/Model/BasicModel/WirePortalModel.cs
index 342728cf96..fc3c30938b 100644
--- a/Modules/GraphToolsFoundationEditor/Model/BasicModel/WirePortalModel.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/BasicModel/WirePortalModel.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Linq;
 using UnityEngine;
 
 namespace Unity.GraphToolsFoundation.Editor
@@ -45,8 +46,11 @@ public DeclarationModel DeclarationModel
             }
             set
             {
+                if (m_DeclarationModel == value)
+                    return;
                 m_DeclarationModel = value;
                 m_DeclarationModelGuid = m_DeclarationModel.Guid;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
             }
         }
 
@@ -65,7 +69,13 @@ public TypeHandle PortDataTypeHandle
                     m_TypeHandle = TypeHandle.Create_Internal("");
                 return m_TypeHandle;
             }
-            set => m_TypeHandle = value;
+            set
+            {
+                if (m_TypeHandle == value)
+                    return;
+                m_TypeHandle = value;
+                GraphModel?.CurrentGraphChangeDescription?.AddChangedModel(this, ChangeHint.Data);
+            }
         }
 
         /// <inheritdoc />
@@ -95,6 +105,9 @@ public void Rename(string newName)
                 return;
 
             DeclarationModel?.Rename(newName);
+
+            var references = GraphModel.FindReferencesInGraph<WirePortalModel>(DeclarationModel).OfType<AbstractNodeModel>();
+            GraphModel.CurrentGraphChangeDescription?.AddChangedModels(references, ChangeHint.Data);
         }
 
         /// <inheritdoc />
diff --git a/Modules/GraphToolsFoundationEditor/Model/Extensions/CloneHelpers.cs b/Modules/GraphToolsFoundationEditor/Model/Extensions/CloneHelpers.cs
index cd7f2a7284..9b8d24f01f 100644
--- a/Modules/GraphToolsFoundationEditor/Model/Extensions/CloneHelpers.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/Extensions/CloneHelpers.cs
@@ -30,7 +30,7 @@ public static T Clone<T>(this T element) where T : GraphElementModel
             if (element is ICloneable cloneable)
             {
                 T copy = (T)cloneable.Clone();
-                copy.AssignNewGuid();
+                copy.AssignNewGuidRecursively();
                 return copy;
             }
 
@@ -53,14 +53,13 @@ public static T CloneUsingScriptableObjectInstantiate<T>(T element) where T : Gr
             //            EditorUtility.CopySerializedManagedFieldsOnly(element, clone);
             var h2 = Object.Instantiate(h);
             var clone = h2.m_Model;
-            clone.AssignNewGuid();
+            clone.AssignNewGuidRecursively();
 
             if (clone is IGraphElementContainer container)
                 foreach (var subElement in container.GraphElementModels)
                 {
                     if (subElement is ICloneable)
                         Debug.LogError("ICloneable is not supported on elements in IGraphElementsContainer");
-                    subElement.AssignNewGuid();
                 }
 
             Object.DestroyImmediate(h);
diff --git a/Modules/GraphToolsFoundationEditor/Model/Extensions/GraphModelExtensions.cs b/Modules/GraphToolsFoundationEditor/Model/Extensions/GraphModelExtensions.cs
index 08405390e7..15b0679fdd 100644
--- a/Modules/GraphToolsFoundationEditor/Model/Extensions/GraphModelExtensions.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/Extensions/GraphModelExtensions.cs
@@ -26,36 +26,6 @@ public static IEnumerable<T> FindReferencesInGraph<T>(this GraphModel self, Decl
             return self.FindReferencesInGraph(variableDeclarationModel).OfType<T>();
         }
 
-        public static IEnumerable<PortModel> GetPortModels(this GraphModel self)
-        {
-            IEnumerable<PortModel> result = Enumerable.Empty<PortModel>();
-
-            foreach (var element in self.GraphElementModels)
-            {
-                result = result.Concat(RecursivelyGetPortModels(element));
-            }
-
-            return result;
-        }
-
-        static IEnumerable<PortModel> RecursivelyGetPortModels(GraphElementModel model)
-        {
-            IEnumerable<PortModel> result;
-
-            if (model is PortNodeModel portNode)
-                result = portNode.Ports;
-            else
-                result = Enumerable.Empty<PortModel>();
-
-            if (model is IGraphElementContainer container)
-            {
-                foreach (var element in container.GraphElementModels)
-                    result = result.Concat(RecursivelyGetPortModels(element));
-            }
-
-            return result;
-        }
-
         /// <summary>
         /// Creates a new node in a graph.
         /// </summary>
@@ -122,30 +92,30 @@ public static AbstractNodeModel CreateOppositePortal(this GraphModel self, WireP
             return self.CreateOppositePortal(wirePortalModel, currentPos + offset, spawnFlags);
         }
 
-        public static GraphChangeDescription DeleteVariableDeclaration(this GraphModel self,
+        public static void DeleteVariableDeclaration(this GraphModel self,
             VariableDeclarationModel variableDeclarationToDelete, bool deleteUsages)
         {
-            return self.DeleteVariableDeclarations(new[] { variableDeclarationToDelete }, deleteUsages);
+            self.DeleteVariableDeclarations(new[] { variableDeclarationToDelete }, deleteUsages);
         }
 
-        public static IReadOnlyCollection<GraphElementModel> DeleteNode(this GraphModel self, AbstractNodeModel nodeToDelete, bool deleteConnections)
+        public static void DeleteNode(this GraphModel self, AbstractNodeModel nodeToDelete, bool deleteConnections)
         {
-            return self.DeleteNodes(new[] { nodeToDelete }, deleteConnections);
+            self.DeleteNodes(new[] { nodeToDelete }, deleteConnections);
         }
 
-        public static IReadOnlyCollection<GraphElementModel> DeleteWire(this GraphModel self, WireModel wireToDelete)
+        public static void DeleteWire(this GraphModel self, WireModel wireToDelete)
         {
-            return self.DeleteWires(new[] { wireToDelete });
+            self.DeleteWires(new[] { wireToDelete });
         }
 
-        public static IReadOnlyCollection<GraphElementModel> DeleteStickyNote(this GraphModel self, StickyNoteModel stickyNoteToDelete)
+        public static void DeleteStickyNote(this GraphModel self, StickyNoteModel stickyNoteToDelete)
         {
-            return self.DeleteStickyNotes(new[] { stickyNoteToDelete });
+            self.DeleteStickyNotes(new[] { stickyNoteToDelete });
         }
 
-        public static IReadOnlyCollection<GraphElementModel> DeletePlacemat(this GraphModel self, PlacematModel placematToDelete)
+        public static void DeletePlacemat(this GraphModel self, PlacematModel placematToDelete)
         {
-            return self.DeletePlacemats(new[] { placematToDelete });
+            self.DeletePlacemats(new[] { placematToDelete });
         }
 
         struct ElementsByType
@@ -188,7 +158,7 @@ static void RecursiveSortElements(ref ElementsByType elementsByType, IEnumerable
             }
         }
 
-        public static GraphChangeDescription DeleteElements(this GraphModel self,
+        public static void DeleteElements(this GraphModel self,
             IReadOnlyCollection<GraphElementModel> graphElementModels)
         {
             ElementsByType elementsByType;
@@ -210,15 +180,12 @@ public static GraphChangeDescription DeleteElements(this GraphModel self,
             foreach (var portModel in elementsByType.NodeModels.OfType<PortNodeModel>().SelectMany(n => n.Ports))
                 elementsByType.WireModels.UnionWith(allWires.Where(e => e != null && (e.ToPort == portModel || e.FromPort == portModel)));
 
-            var deletedModels = self.DeleteStickyNotes(elementsByType.StickyNoteModels)
-                .Concat(self.DeletePlacemats(elementsByType.PlacematModels))
-                .Concat(self.DeleteWires(elementsByType.WireModels))
-                .Concat(self.DeleteNodes(elementsByType.NodeModels, deleteConnections: false)).ToList();
-
-            var changeDescription = self.DeleteVariableDeclarations(elementsByType.VariableDeclarationsModels, deleteUsages: false);
-            changeDescription.Union(self.DeleteGroups(elementsByType.GroupModels));
-            changeDescription.Union(null, null, deletedModels);
-            return changeDescription;
+            self.DeleteVariableDeclarations(elementsByType.VariableDeclarationsModels, deleteUsages: false);
+            self.DeleteGroups(elementsByType.GroupModels);
+            self.DeleteStickyNotes(elementsByType.StickyNoteModels);
+            self.DeletePlacemats(elementsByType.PlacematModels);
+            self.DeleteWires(elementsByType.WireModels);
+            self.DeleteNodes(elementsByType.NodeModels, deleteConnections: false);
         }
 
         /// <summary>
diff --git a/Modules/GraphToolsFoundationEditor/Model/Extensions/ModelHelpers.cs b/Modules/GraphToolsFoundationEditor/Model/Extensions/ModelHelpers.cs
index ec62edff4a..fa2751f5ee 100644
--- a/Modules/GraphToolsFoundationEditor/Model/Extensions/ModelHelpers.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/Extensions/ModelHelpers.cs
@@ -10,12 +10,29 @@ namespace Unity.GraphToolsFoundation.Editor
 {
     static class ModelHelpers
     {
+        /// <summary>
+        /// Finds a common base type for objects.
+        /// </summary>
+        /// <param name="objects">The objects for which we need to find a common base type.</param>
+        /// <returns>The most specialized common base type for the objects, or null if all objects are null.</returns>
         public static Type GetCommonBaseType(IEnumerable<object> objects)
+        {
+            return GetCommonBaseType(objects.Where(o => o != null).Select(o => o.GetType()));
+        }
+
+        /// <summary>
+        /// Finds a common base type for types.
+        /// </summary>
+        /// <param name="types">The types for which we need to find a common base type.</param>
+        /// <returns>The most specialized common base type for the types, or null if all types are null.</returns>
+        public static Type GetCommonBaseType(IEnumerable<Type> types)
         {
             Type baseType = null;
-            foreach (var obj in objects.Where(t => t != null))
+            foreach (var type in types)
             {
-                var type = obj.GetType();
+                if (type == null)
+                    continue;
+
                 if (baseType == null)
                     baseType = type;
                 else if (type.IsAssignableFrom(baseType))
diff --git a/Modules/GraphToolsFoundationEditor/Model/GraphAsset.cs b/Modules/GraphToolsFoundationEditor/Model/GraphAsset.cs
index 2d2fca7b1c..0bae33a337 100644
--- a/Modules/GraphToolsFoundationEditor/Model/GraphAsset.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/GraphAsset.cs
@@ -101,9 +101,13 @@ public virtual string CreateFile(string path, bool overwriteIfExists)
                     path = AssetDatabase.GenerateUniqueAssetPath(path);
                 }
 
-                Directory.CreateDirectory(Path.GetDirectoryName(path) ?? "");
+                var directory = Path.GetDirectoryName(path);
+                if (!string.IsNullOrEmpty(directory))
+                    Directory.CreateDirectory(directory);
+
                 if (File.Exists(path))
                     AssetDatabase.DeleteAsset(path);
+
                 AssetDatabase.CreateAsset(this, path);
             }
 
diff --git a/Modules/GraphToolsFoundationEditor/Model/GraphChangeDescription.cs b/Modules/GraphToolsFoundationEditor/Model/GraphChangeDescription.cs
index 99b1bf392b..7f30b13076 100644
--- a/Modules/GraphToolsFoundationEditor/Model/GraphChangeDescription.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/GraphChangeDescription.cs
@@ -112,5 +112,139 @@ public void Union(
                 }
             }
         }
+
+        /// <summary>
+        /// Adds new models to the changes.
+        /// </summary>
+        /// <param name="models">The new models.</param>
+        /// <returns>The modified <see cref="GraphChangeDescription"/>.</returns>
+        public GraphChangeDescription AddNewModels(params GraphElementModel[] models)
+        {
+            return AddNewModels(models as IEnumerable<GraphElementModel>);
+        }
+
+        /// <summary>
+        /// Adds new models to the changes.
+        /// </summary>
+        /// <param name="models">The new models.</param>
+        /// <returns>The modified <see cref="GraphChangeDescription"/>.</returns>
+        public GraphChangeDescription AddNewModels(IEnumerable<GraphElementModel> models)
+        {
+            Union(models, null, null);
+            return this;
+        }
+
+        /// <summary>
+        /// Adds deleted models to the changes.
+        /// </summary>
+        /// <param name="models">The deleted models.</param>
+        /// <returns>The modified <see cref="GraphChangeDescription"/>.</returns>
+        public GraphChangeDescription AddDeletedModels(params GraphElementModel[] models)
+        {
+            return AddDeletedModels(models as IEnumerable<GraphElementModel>);
+        }
+
+        /// <summary>
+        /// Adds deleted models to the changes.
+        /// </summary>
+        /// <param name="models">The deleted models.</param>
+        /// <returns>The modified <see cref="GraphChangeDescription"/>.</returns>
+        public GraphChangeDescription AddDeletedModels(IEnumerable<GraphElementModel> models)
+        {
+            Union(null, null, models);
+            return this;
+        }
+
+        /// <summary>
+        /// Removes deleted models from the changes.
+        /// </summary>
+        /// <param name="models">The deleted models.</param>
+        /// <returns>The modified <see cref="GraphChangeDescription"/>.</returns>
+        public GraphChangeDescription RemoveDeletedModels(params GraphElementModel[] models)
+        {
+            DeletedModels = DeletedModels.Except(models);
+            return this;
+        }
+
+        /// <summary>
+        /// Adds a changed model to the changes.
+        /// </summary>
+        /// <param name="model">The changed model.</param>
+        /// <param name="changeHint">The hint about what changed.</param>
+        /// <returns>The modified <see cref="GraphChangeDescription"/>.</returns>
+        public GraphChangeDescription AddChangedModel(GraphElementModel model, ChangeHint changeHint)
+        {
+            Union(null, new Dictionary<GraphElementModel, IReadOnlyList<ChangeHint>>() { { model, new[] { changeHint } } }, null);
+            return this;
+        }
+
+        /// <summary>
+        /// Adds multiple changed models to the changes.
+        /// </summary>
+        /// <param name="models">The changed models.</param>
+        /// <param name="changeHint">The hint about what changed.</param>
+        /// <returns>The modified <see cref="GraphChangeDescription"/>.</returns>
+        public GraphChangeDescription AddChangedModels(IEnumerable<GraphElementModel> models, ChangeHint changeHint)
+        {
+            Union(null, models.ToDictionary<GraphElementModel, GraphElementModel, IReadOnlyList<ChangeHint>>(m => m, m => new[] { changeHint }), null);
+            return this;
+        }
+
+        /// <summary>
+        /// Adds multiple changed models to the changes.
+        /// </summary>
+        /// <param name="changedModels">The changed models and hints.</param>
+        /// <returns>The modified <see cref="GraphChangeDescription"/>.</returns>
+        public GraphChangeDescription AddChangedModels(IReadOnlyDictionary<GraphElementModel, IReadOnlyList<ChangeHint>> changedModels)
+        {
+            Union(null, changedModels, null);
+            return this;
+        }
+    }
+
+    /// <summary>
+    /// Describes a scope to gather a <see cref="GraphChangeDescription"/>. <see cref="GraphChangeDescriptionScope"/>s can be nested
+    /// and each scope provide the <see cref="GraphChangeDescription"/> related to their scope only. When a scope is disposed, their related <see cref="GraphChangeDescription"/>
+    /// is merged back into the parent scope, if any.
+    /// </summary>
+    class GraphChangeDescriptionScope : IDisposable
+    {
+        readonly GraphModel m_GraphModel;
+        readonly GraphChangeDescription m_CurrentChangeDescription;
+
+        /// <summary>
+        /// The current <see cref="GraphChangeDescription"/> for this scope.
+        /// </summary>
+        public GraphChangeDescription ChangeDescription => m_CurrentChangeDescription;
+
+        /// <summary>
+        /// Creates a <see cref="GraphChangeDescriptionScope"/> for the <param name="graphModel"></param>.
+        /// </summary>
+        /// <param name="graphModel">The <see cref="GraphModel"/> on which the scope is applied.</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public GraphChangeDescriptionScope(GraphModel graphModel)
+        {
+            m_GraphModel = graphModel ?? throw new ArgumentNullException(nameof(graphModel));
+            m_CurrentChangeDescription = graphModel.PushNewGraphChangeDescription_Internal();
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        ~GraphChangeDescriptionScope()
+        {
+            Dispose(false);
+        }
+
+        void Dispose(bool disposing)
+        {
+            if (!disposing)
+                return;
+            m_GraphModel.PopGraphChangeDescription_Internal();
+        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/Model/Stencil/StencilBase.cs b/Modules/GraphToolsFoundationEditor/Model/Stencil/StencilBase.cs
index f6d6029223..329cde402f 100644
--- a/Modules/GraphToolsFoundationEditor/Model/Stencil/StencilBase.cs
+++ b/Modules/GraphToolsFoundationEditor/Model/Stencil/StencilBase.cs
@@ -31,6 +31,16 @@ abstract class StencilBase
         /// <returns>The answer to whether it is allowed to have multiple instances of a data output variable.</returns>
         public virtual AllowMultipleDataOutputInstances AllowMultipleDataOutputInstances => AllowMultipleDataOutputInstances.AllowWithWarning;
 
+        /// <summary>
+        /// Performs tasks that need to be done when the <see cref="GraphModel"/> is enabled.
+        /// </summary>
+        public virtual void OnGraphModelEnabled() { }
+
+        /// <summary>
+        /// Performs tasks that need to be done when the <see cref="GraphModel"/> is disabled.
+        /// </summary>
+        public virtual void OnGraphModelDisabled() { }
+
         /// <summary>
         /// Indicates whether a <see cref="VariableDeclarationModel"/> requires initialization.
         /// </summary>
@@ -229,5 +239,10 @@ public virtual bool CanAssignTo(TypeHandle destination, TypeHandle source)
         {
             return destination == TypeHandle.Unknown || source.IsAssignableFrom(destination, this);
         }
+
+        public virtual IEnumerable<GraphElementModel> GetModelsDisplayableInInspector(IEnumerable<GraphElementModel> models)
+        {
+            return models.Where(t => t is AbstractNodeModel || t is VariableDeclarationModel || t is PlacematModel || t is WireModel);
+        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/SmartSearch/GraphNodeLibraryAdapter.cs b/Modules/GraphToolsFoundationEditor/SmartSearch/GraphNodeLibraryAdapter.cs
index d5a1be76dd..789141fc72 100644
--- a/Modules/GraphToolsFoundationEditor/SmartSearch/GraphNodeLibraryAdapter.cs
+++ b/Modules/GraphToolsFoundationEditor/SmartSearch/GraphNodeLibraryAdapter.cs
@@ -3,6 +3,8 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Unity.ItemLibrary.Editor;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -16,17 +18,20 @@ class GraphNodeLibraryAdapter : GraphElementLibraryAdapter
     {
         readonly GraphModel m_GraphModel;
 
-                /// <summary>
+        /// <summary>
         /// The <see cref="GraphView"/> calling the search.
         /// </summary>
         GraphView m_HostGraphView;
 
         /// <summary>
-        /// The <see cref="GraphView"/> displaying the preview in the details panel.
+        /// The <see cref="GraphElement"/> of the current selected item.
         /// </summary>
-        GraphView m_PreviewGraphView;
+        public GraphElement CurrentElement { get; private set; }
 
-        GraphElement m_CurrentElement;
+        /// <summary>
+        /// The <see cref="GraphView"/> displaying the preview in the details panel.
+        /// </summary>
+        public GraphView PreviewGraphView { get; private set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GraphNodeLibraryAdapter"/> class.
@@ -65,8 +70,8 @@ public override void SetHostGraphView(GraphView graphView)
         protected override ScrollView MakeDetailsPreviewContainer()
         {
             var scrollView = base.MakeDetailsPreviewContainer();
-            m_PreviewGraphView = CreatePreviewGraphView();
-            scrollView.Add(m_PreviewGraphView);
+            PreviewGraphView = CreatePreviewGraphView();
+            scrollView.Add(PreviewGraphView);
             return scrollView;
         }
 
@@ -74,17 +79,17 @@ public override void UpdateDetailsPanel(ItemLibraryItem item)
         {
             base.UpdateDetailsPanel(item);
 
-            m_PreviewGraphView.RemoveElement(m_CurrentElement);
+            PreviewGraphView.RemoveElement(CurrentElement);
 
             if (ItemHasPreview(item))
             {
                 var graphItem = item as GraphNodeModelLibraryItem;
                 var model = CreateGraphElementModel(m_GraphModel, graphItem);
-                m_CurrentElement = ModelViewFactory.CreateUI<GraphElement>(m_PreviewGraphView, model);
-                if (m_CurrentElement != null)
+                CurrentElement = ModelViewFactory.CreateUI<GraphElement>(PreviewGraphView, model);
+                if (CurrentElement != null)
                 {
-                    m_CurrentElement.style.position = Position.Relative;
-                    m_PreviewGraphView.AddElement(m_CurrentElement);
+                    CurrentElement.style.position = Position.Relative;
+                    PreviewGraphView.AddElement(CurrentElement);
                 }
             }
         }
diff --git a/Modules/GraphToolsFoundationEditor/SmartSearch/ItemLibraryData.cs b/Modules/GraphToolsFoundationEditor/SmartSearch/ItemLibraryData.cs
index b285a11836..e3c2bea176 100644
--- a/Modules/GraphToolsFoundationEditor/SmartSearch/ItemLibraryData.cs
+++ b/Modules/GraphToolsFoundationEditor/SmartSearch/ItemLibraryData.cs
@@ -54,14 +54,17 @@ public TypeItemLibraryData(TypeHandle type)
     readonly struct NodeItemLibraryData : IItemLibraryData
     {
         public Type Type { get; }
+        public PortModel PortToConnect { get; }
 
         /// <summary>
         /// Initializes a new instance of the NodeItemLibraryData class.
         /// </summary>
         /// <param name="type">Type of the node represented by the item.</param>
-        public NodeItemLibraryData(Type type)
+        /// <param name="portToConnect">The port to which the node will be connected, if created.</param>
+        public NodeItemLibraryData(Type type, PortModel portToConnect = null)
         {
             Type = type;
+            PortToConnect = portToConnect;
         }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/SmartSearch/ItemLibraryService.cs b/Modules/GraphToolsFoundationEditor/SmartSearch/ItemLibraryService.cs
index 3fd7c226bd..4ab56f42fc 100644
--- a/Modules/GraphToolsFoundationEditor/SmartSearch/ItemLibraryService.cs
+++ b/Modules/GraphToolsFoundationEditor/SmartSearch/ItemLibraryService.cs
@@ -45,13 +45,15 @@ public static class Usage
         /// <param name="filter">The search filter.</param>
         /// <param name="adapter">The <see cref="ItemLibraryAdapter"/>.</param>
         /// <param name="usage">The usage string used to identify the <see cref="ItemLibraryLibrary_Internal"/> use.</param>
+        /// <param name="sourcePort">The port from which the library is created, if any.</param>
         internal static ItemLibraryWindow ShowDatabases_Internal(GraphView view,
             Vector2 position,
             Action<ItemLibraryItem> callback,
             IEnumerable<ItemLibraryDatabaseBase> dbs,
             ItemLibraryFilter filter,
             IItemLibraryAdapter adapter,
-            string usage)
+            string usage,
+            PortModel sourcePort = null)
         {
             var preferences = view.GraphTool.Preferences;
             var librarySize = preferences.GetItemLibrarySize(usage);
@@ -65,7 +67,7 @@ void OnItemSelectFunc(ItemLibraryItem item)
                 callback?.Invoke(item);
             }
 
-            var library = new ItemLibraryLibrary_Internal(dbs, adapter, filter, usage);
+            var library = new ItemLibraryLibrary_Internal(dbs, adapter, filter, usage, sourcePort);
 
             var window = library.Show(view.Window, rect);
             window.CloseOnFocusLost = !(preferences?.GetBool( BoolPref.ItemLibraryStaysOpenOnBlur) ?? false);
@@ -114,7 +116,8 @@ public static void ShowInputToGraphNodes(Stencil stencil, GraphView view,
                 .Concat(dbProvider.GetGraphVariablesDatabases(graphModel))
                 .Concat(dbProvider.GetDynamicDatabases(portModels))
                 .ToList();
-            ShowDatabases_Internal(view, worldPosition, callback, dbs, filter, adapter, Usage.CreateNode);
+
+            ShowDatabases_Internal(view, worldPosition, callback, dbs, filter, adapter, Usage.CreateNode, portModels.FirstOrDefault());
         }
 
         public static void ShowOutputToGraphNodes(Stencil stencil, GraphView view,
@@ -131,7 +134,7 @@ public static void ShowOutputToGraphNodes(Stencil stencil, GraphView view,
                 return;
 
             var dbs = dbProvider.GetGraphElementsDatabases(graphModel).ToList();
-            ShowDatabases_Internal(view, worldPosition, callback, dbs, filter, adapter, Usage.CreateNode);
+            ShowDatabases_Internal(view, worldPosition, callback, dbs, filter, adapter, Usage.CreateNode, portModels.FirstOrDefault());
         }
 
         public static void ShowNodesForWire(Stencil stencil, GraphView view,
diff --git a/Modules/GraphToolsFoundationEditor/StateComponents/GraphProcessing/AutomaticGraphProcessingObserver.cs b/Modules/GraphToolsFoundationEditor/StateComponents/GraphProcessing/AutomaticGraphProcessingObserver.cs
index 99c79f2ca1..726a7c9e29 100644
--- a/Modules/GraphToolsFoundationEditor/StateComponents/GraphProcessing/AutomaticGraphProcessingObserver.cs
+++ b/Modules/GraphToolsFoundationEditor/StateComponents/GraphProcessing/AutomaticGraphProcessingObserver.cs
@@ -47,65 +47,69 @@ public AutomaticGraphProcessingObserver(GraphModelStateComponent graphModelState
             m_GraphProcessingStateComponent = graphProcessingState;
         }
 
-        /// <inheritdoc/>
-        public override void Observe()
+        void DoGraphObservation()
         {
-            using (var idleObservation = this.ObserveState(m_ProcessOnIdleStateComponent))
-            {
-                if (!m_Preferences.GetBool(BoolPref.OnlyProcessWhenIdle) || idleObservation.UpdateType != UpdateType.None)
-                {
-                    // Either we should process as soon as there is a change, or the idle timer was triggerred.
+            using var graphObservation = this.ObserveState(m_GraphModelStateComponent);
+            var gvUpdateType = graphObservation.UpdateType;
+            GraphModelStateComponent.Changeset changeset = null;
+            IReadOnlyList<GraphProcessingResult> results = null;
 
-                    using (var gvObservation = this.ObserveState(m_GraphModelStateComponent))
-                    {
-                        var gvUpdateType = gvObservation.UpdateType;
-                        GraphModelStateComponent.Changeset changeset = null;
-                        IReadOnlyList<GraphProcessingResult> results = null;
+            if (gvUpdateType == UpdateType.Partial)
+            {
+                changeset = m_GraphModelStateComponent.GetAggregatedChangeset(graphObservation.LastObservedVersion);
+            }
 
-                        if (gvUpdateType == UpdateType.Partial)
-                        {
-                            changeset = m_GraphModelStateComponent.GetAggregatedChangeset(gvObservation.LastObservedVersion);
-                        }
+            if (gvUpdateType != UpdateType.None)
+            {
+                results = GraphProcessingHelper.ProcessGraph(m_GraphModelStateComponent.GraphModel, changeset, RequestGraphProcessingOptions.Default);
+            }
 
-                        if (gvUpdateType != UpdateType.None)
-                        {
-                            results = GraphProcessingHelper.ProcessGraph(m_GraphModelStateComponent.GraphModel, changeset, RequestGraphProcessingOptions.Default);
-                        }
+            // Avoid using an updater if we do not need to.
+            if (results != null || m_GraphProcessingStateComponent.GraphProcessingPending)
+            {
+                using var updater = m_GraphProcessingStateComponent.UpdateScope;
+                updater.GraphProcessingPending = false;
 
-                        if (results != null || m_GraphProcessingStateComponent.GraphProcessingPending)
-                        {
-                            using (var updater = m_GraphProcessingStateComponent.UpdateScope)
-                            {
-                                updater.GraphProcessingPending = false;
+                if (results != null)
+                    updater.SetResults(results,
+                        GraphProcessingHelper.GetErrors((Stencil)m_GraphModelStateComponent.GraphModel.Stencil, results));
+            }
+        }
 
-                                if (results != null)
-                                    updater.SetResults(results,
-                                        GraphProcessingHelper.GetErrors((Stencil)m_GraphModelStateComponent.GraphModel.Stencil, results));
-                            }
-                        }
-                    }
+        /// <inheritdoc/>
+        public override void Observe()
+        {
+            if (m_Preferences.GetBool(BoolPref.OnlyProcessWhenIdle))
+            {
+                using var idleObservation = this.ObserveState(m_ProcessOnIdleStateComponent);
+                if (idleObservation.UpdateType != UpdateType.None)
+                {
+                    DoGraphObservation();
                 }
-                else if (m_Preferences.GetBool(BoolPref.OnlyProcessWhenIdle) && idleObservation.UpdateType == UpdateType.None)
+                else
                 {
                     // We should only process the graph at idle time, but the idle timer was not triggered yet.
-                    // Thus we only want to display a notification that we will process the graph.
+                    // Thus we only want to display a notification that we will process the graph soon.
 
-                    // We need to check if the state component was modified, but
-                    // without updating our internal version numbers (they will be
+                    // We need to check if the graph was modified, but
+                    // without updating our last observed version number (it will be
                     // updated when we actually process the graph). We use PeekAtState.
-                    using (var gvObservation = this.PeekAtState(m_GraphModelStateComponent))
+                    using var graphObservation = this.PeekAtState(m_GraphModelStateComponent);
+                    var needsProcessing = graphObservation.UpdateType != UpdateType.None;
+                    if (m_GraphProcessingStateComponent.GraphProcessingPending != needsProcessing)
                     {
-                        var shouldRebuild = gvObservation.UpdateType != UpdateType.None;
-                        if (m_GraphProcessingStateComponent.GraphProcessingPending != shouldRebuild)
-                        {
-                            using (var updater = m_GraphProcessingStateComponent.UpdateScope)
-                            {
-                                updater.GraphProcessingPending = shouldRebuild;
-                            }
-                        }
+                        using var updater = m_GraphProcessingStateComponent.UpdateScope;
+                        updater.GraphProcessingPending = needsProcessing;
                     }
                 }
             }
+            else
+            {
+                // Observe m_ProcessOnIdleStateComponent to sync our last observed version.
+                using (this.ObserveState(m_ProcessOnIdleStateComponent)) { }
+
+                DoGraphObservation();
+            }
         }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/Stencil/Stencil.cs b/Modules/GraphToolsFoundationEditor/Stencil/Stencil.cs
index c2ed470d6b..3054528757 100644
--- a/Modules/GraphToolsFoundationEditor/Stencil/Stencil.cs
+++ b/Modules/GraphToolsFoundationEditor/Stencil/Stencil.cs
@@ -41,6 +41,20 @@ public override BlackboardGraphModel CreateBlackboardGraphModel(GraphModel graph
             return new BlackboardGraphModel(){GraphModel = graphModel};
         }
 
+        /// <inheritdoc />
+        public override void OnGraphModelEnabled()
+        {
+            base.OnGraphModelEnabled();
+            GetGraphProcessorContainer().OnGraphModelEnabled();
+        }
+
+        /// <inheritdoc />
+        public override void OnGraphModelDisabled()
+        {
+            GetGraphProcessorContainer().OnGraphModelDisabled();
+            base.OnGraphModelDisabled();
+        }
+
         public override InspectorModel CreateInspectorModel(IEnumerable<Model> inspectedModels)
         {
             return new InspectorModel(){InspectedModels = inspectedModels};
diff --git a/Modules/GraphToolsFoundationEditor/UI/ButtonStrip.cs b/Modules/GraphToolsFoundationEditor/UI/ButtonStrip.cs
new file mode 100644
index 0000000000..64b5825af4
--- /dev/null
+++ b/Modules/GraphToolsFoundationEditor/UI/ButtonStrip.cs
@@ -0,0 +1,140 @@
+// 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 UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Unity.GraphToolsFoundation.Editor
+{
+    //Copied from UIBuilder
+    internal class ButtonStrip : VisualElement
+    {
+        static readonly string s_UssPathNoExt = "ButtonStrip/ButtonStrip";
+
+        static readonly string s_UssPath = s_UssPathNoExt + ".uss";
+        static readonly string s_UssDarkPath = s_UssPathNoExt + "Dark.uss";
+        static readonly string s_UssLightPath = s_UssPathNoExt + "Light.uss";
+
+        static readonly string s_UssClassName = "unity-button-strip";
+        static readonly string s_ButtonClassName = s_UssClassName + "__button";
+        static readonly string s_ButtonLeftClassName = s_ButtonClassName + "--left";
+        static readonly string s_ButtonMidClassName = s_ButtonClassName + "--mid";
+        static readonly string s_ButtonRightClassName = s_ButtonClassName + "--right";
+        static readonly string s_ButtonIconClassName = s_UssClassName + "__button-icon";
+
+        List<string> m_Choices = new List<string>();
+        List<string> m_Labels = new List<string>();
+
+        public IEnumerable<string> choices
+        {
+            get { return m_Choices; }
+            set
+            {
+                m_Choices.Clear();
+
+                if (value == null)
+                    return;
+
+                m_Choices.AddRange(value);
+
+                RecreateButtons();
+            }
+        }
+
+        public IEnumerable<string> labels
+        {
+            get { return m_Labels; }
+            set
+            {
+                m_Labels.Clear();
+
+                if (value == null)
+                    return;
+
+                m_Labels.AddRange(value);
+
+                RecreateButtons();
+            }
+        }
+
+        public Action<EventBase> onButtonClick { get; set; }
+
+        public ButtonStrip() : this(null)
+        {
+        }
+
+        public ButtonStrip(IList<string> choices)
+        {
+            AddToClassList(s_UssClassName);
+
+            this.AddStylesheet_Internal(s_UssPath);
+            if (EditorGUIUtility.isProSkin)
+                this.AddStylesheet_Internal(s_UssDarkPath);
+            else
+                this.AddStylesheet_Internal(s_UssLightPath);
+
+            this.choices = choices;
+        }
+
+        void RecreateButtons()
+        {
+            this.Clear();
+            for (int i = 0; i < m_Choices.Count; ++i)
+            {
+                var choice = m_Choices[i];
+                string label = null;
+                if (m_Labels.Count > i)
+                    label = m_Labels[i];
+
+                var button = new Button();
+                button.AddToClassList(s_ButtonClassName);
+
+                // Set button name for styling.
+                button.name = choice;
+
+                // Set tooltip.
+                button.tooltip = choice;
+
+                if (i == 0)
+                    button.AddToClassList(s_ButtonLeftClassName);
+                else if (i == m_Choices.Count - 1)
+                    button.AddToClassList(s_ButtonRightClassName);
+                else
+                    button.AddToClassList(s_ButtonMidClassName);
+
+                if (onButtonClick != null)
+                    button.clickable.clickedWithEventInfo += onButtonClick;
+                this.Add(button);
+
+                if (string.IsNullOrEmpty(label))
+                {
+                    var icon = new VisualElement();
+                    icon.AddToClassList(s_ButtonIconClassName);
+                    button.Add(icon);
+                }
+                else
+                {
+                    button.text = label;
+                }
+            }
+        }
+
+        void OnOptionChange(EventBase evt)
+        {
+            var button = evt.target as Button;
+            var newValue = button.name;
+
+            ToggleButtonStates(button);
+        }
+
+        protected virtual void ToggleButtonStates(Button button)
+        {
+            button.pseudoStates ^= PseudoStates.Checked;
+            button.IncrementVersion(VersionChangeType.Styles);
+        }
+    }
+}
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/BlackboardCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/BlackboardCommands.cs
index 6baca36fa2..f737da7245 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/BlackboardCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/BlackboardCommands.cs
@@ -69,6 +69,7 @@ public BlackboardGroupCreateCommand(GroupModel containingGroup, IGroupItemModel
         public static void DefaultCommandHandler(UndoStateComponent undoState, BlackboardViewStateComponent blackboardViewState, GraphModelStateComponent graphModelState, SelectionStateComponent selectionState, BlackboardGroupCreateCommand command)
         {
             using var graphUpdater = graphModelState.UpdateScope;
+            using var changeScope = graphModelState.GraphModel.ChangeDescriptionScope;
 
             var selectionHelper = new GlobalSelectionCommandHelper(selectionState);
             using var selectionUpdaters = selectionHelper.UpdateScopes;
@@ -78,7 +79,7 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, Blackboar
 
             using (var undoStateUpdater = undoState.UpdateScope)
             {
-                var undoableStates = selectionHelper.UndoableSelectionStates.Concat(new IUndoableStateComponent[] { graphModelState, blackboardViewState });
+                var undoableStates = selectionHelper.SelectionStates.Concat(new IUndoableStateComponent[] { graphModelState, blackboardViewState });
                 undoStateUpdater.SaveStates(undoableStates);
             }
 
@@ -100,32 +101,21 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, Blackboar
                 selectionUpdater.ClearSelection();
             }
 
-            GroupModel newGroup = command.ContainingGroup.GraphModel.CreateGroup(title);
-            if (command.GroupItemModels != null)
-            {
-                var changedModels = new List<GraphElementModel>();
-                foreach (var subItem in command.GroupItemModels)
-                {
-                    changedModels.AddRange(newGroup.InsertItem(subItem));
-                }
-
-                graphUpdater.MarkChanged(changedModels, ChangeHint.Grouping);
-            }
+            GroupModel newGroup = command.ContainingGroup.GraphModel.CreateGroup(title, command.GroupItemModels);
 
             int index = command.ContainingGroup.Items.IndexOf_Internal(command.InsertAfter);
-            var changedModelsFromInsert = command.ContainingGroup.InsertItem(newGroup, index < 0 ? (command.InsertAfter == null ? 0 : int.MaxValue) : index + 1);
-            graphUpdater.MarkChanged(changedModelsFromInsert, ChangeHint.Grouping);
+            command.ContainingGroup.InsertItem(newGroup, index < 0 ? (command.InsertAfter == null ? 0 : int.MaxValue) : index + 1);
 
             foreach (var recursiveSubgraphNode in graphModelState.GraphModel.GetRecursiveSubgraphNodes())
-                graphUpdater.MarkChanged(recursiveSubgraphNode.Update(), ChangeHint.Data);
+                recursiveSubgraphNode.Update();
 
             using (var bbUpdater = blackboardViewState.UpdateScope)
             {
                 bbUpdater.SetGroupModelExpanded(command.ContainingGroup,true);
             }
 
-            graphUpdater.MarkNew(newGroup);
             graphUpdater.MarkForRename(newGroup);
+            graphUpdater.MarkUpdated(changeScope.ChangeDescription);
 
             selectionUpdaters.MainUpdateScope.SelectElement(newGroup, true);
 
@@ -267,7 +257,7 @@ public ReorderGroupItemsCommand(GroupModel group, IGroupItemModel insertAfter,
         // Copies the original list of Group Items. If the items do not belong in the same section as the target group, duplicate groups and convert variables.
         // So that the resulting copy contains only elements from the target group section.
         // return whether at least one variable was converted.
-        bool TransferOrCopyGroupItemHierarchy(IReadOnlyList<IGroupItemModel> original, List<GroupModel> duplicatedGroups, GraphChangeDescription changeDescription, List<IGroupItemModel> copy)
+        bool TransferOrCopyGroupItemHierarchy(IReadOnlyList<IGroupItemModel> original, List<GroupModel> duplicatedGroups, List<IGroupItemModel> copy)
         {
             bool duplicated = false;
             var sectionName = Group.GetSection().Title;
@@ -282,7 +272,7 @@ bool TransferOrCopyGroupItemHierarchy(IReadOnlyList<IGroupItemModel> original, L
                     {
                         // if the section is different recursively call this method on the content of the group.
                         List<IGroupItemModel> listCopy = new List<IGroupItemModel>();
-                        if (!TransferOrCopyGroupItemHierarchy(group.Items, duplicatedGroups, changeDescription, listCopy))
+                        if (!TransferOrCopyGroupItemHierarchy(group.Items, duplicatedGroups, listCopy))
                             copy.Add(group);
                         else
                         {
@@ -302,8 +292,7 @@ bool TransferOrCopyGroupItemHierarchy(IReadOnlyList<IGroupItemModel> original, L
                         copy.Add(variable);
                     else if(Group.GraphModel.Stencil.CanConvertVariable(variable, sectionName))
                     {
-                        var deleteVarChanges = Group.GraphModel.DeleteVariableDeclarations(new[] {variable});
-                        changeDescription.Union(deleteVarChanges);
+                        Group.GraphModel.DeleteVariableDeclarations(new[] {variable});
 
                         //If the variable can be converted to the new section, convert the variable then mark the original for deletion.
                         var newVariable = Group.GraphModel.Stencil.ConvertVariable(variable, sectionName);
@@ -337,38 +326,20 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
-                var previousGroups = new HashSet<GroupModel>(command.GroupItemModels.Select(t => t.ParentGroup));
-
                 var duplicatedGroups = new List<GroupModel>();
-                var changes = new GraphChangeDescription();
                 var newItems = new List<IGroupItemModel>();
-                command.TransferOrCopyGroupItemHierarchy(command.GroupItemModels, duplicatedGroups, changes, newItems);
-                graphUpdater.MarkNew(changes.NewModels);
-                graphUpdater.MarkChanged(changes.ChangedModels);
-                graphUpdater.MarkDeleted(changes.DeletedModels);
-
-                var changedModels = command.Group.MoveItemsAfter(newItems, command.InsertAfter);
+                command.TransferOrCopyGroupItemHierarchy(command.GroupItemModels, duplicatedGroups, newItems);
 
-                if (changedModels != null)
-                {
-                    graphUpdater.MarkChanged(previousGroups, ChangeHint.Grouping);
-                    graphUpdater.MarkChanged(changedModels, ChangeHint.Grouping);
-                    graphUpdater.MarkChanged(command.Group, ChangeHint.Grouping);
-                }
+                command.Group.MoveItemsAfter(newItems, command.InsertAfter);
 
-                foreach (var duplicatedGroup in duplicatedGroups)
-                {
-                    if (!duplicatedGroup.Items.Any() && duplicatedGroup.IsDeletable())
-                    {
-                        changedModels = duplicatedGroup.ParentGroup.RemoveItem(duplicatedGroup);
-                        graphUpdater.MarkChanged(changedModels, ChangeHint.Grouping);
-                        graphUpdater.MarkDeleted(duplicatedGroup);
-                    }
-                }
+                graphModelState.GraphModel.DeleteGroups(duplicatedGroups.Where(g => !g.Items.Any() && g.IsDeletable()).ToList());
 
                 foreach (var recursiveSubgraphNode in graphModelState.GraphModel.GetRecursiveSubgraphNodes())
-                    graphUpdater.MarkChanged(recursiveSubgraphNode.Update(), ChangeHint.Data);
+                    recursiveSubgraphNode.Update();
+
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
             using (var bbUpdater = blackboardViewState.UpdateScope)
             {
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ContextSearcherCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ContextSearcherCommands.cs
index da39427fea..7258c56f14 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ContextSearcherCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ContextSearcherCommands.cs
@@ -134,12 +134,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
 
             using (var undoStateUpdater = undoState.UpdateScope)
             {
-                var undoableStates = selectionHelper.UndoableSelectionStates.Append(graphModelState);
+                var undoableStates = selectionHelper.SelectionStates.Append<IUndoableStateComponent>(graphModelState);
                 undoStateUpdater.SaveStates(undoableStates);
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
             using (var selectionUpdaters = selectionHelper.UpdateScopes)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 foreach (var selectionUpdater in selectionUpdaters)
                 {
@@ -149,8 +150,8 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 var newModel = command.SelectedItem.CreateElement.Invoke(
                     new GraphBlockCreationData(graphModelState.GraphModel, guid: command.Guid, contextNodeModel: command.ContextNodeModel, orderInContext: command.OrderInContext));
 
-                graphUpdater.MarkNew(newModel);
-                selectionUpdaters.MainUpdateScope.SelectElements(new []{ newModel }, true);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
+                selectionUpdaters.MainUpdateScope.SelectElements(new[] { newModel }, true);
             }
         }
     }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GlobalSelectionCommandHelper.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GlobalSelectionCommandHelper.cs
index 2ac277cde7..80afed49e5 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GlobalSelectionCommandHelper.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GlobalSelectionCommandHelper.cs
@@ -45,9 +45,9 @@ public UpdateScopeList(SelectionStateComponent mainSelectionState, IEnumerable<S
         List<SelectionStateComponent> m_AllSelectionStates;
 
         /// <summary>
-        /// All the <see cref="SelectionStateComponent"/> present in the state cast as <see cref="IUndoableStateComponent"/>.
+        /// All the <see cref="SelectionStateComponent"/> present in the state.
         /// </summary>
-        public IEnumerable<IUndoableStateComponent> UndoableSelectionStates => m_AllSelectionStates;
+        public IEnumerable<SelectionStateComponent> SelectionStates => m_AllSelectionStates;
 
         /// <summary>
         /// The <see cref="SelectionStateComponent.StateUpdater"/> for each of the <see cref="SelectionStateComponent"/> present in the state.
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GraphElementCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GraphElementCommands.cs
index 3331b5772c..2b5e8dd7bb 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GraphElementCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GraphElementCommands.cs
@@ -60,13 +60,14 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 }
 
                 using (var updater = graphModelState.UpdateScope)
+                using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
                 {
-                    foreach (var model in command.Models.Where(c => c.IsColorable()))
+                    var colorableModels = command.Models.Where(c => c.IsColorable());
+                    foreach (var model in colorableModels)
                     {
                         model.ResetColor();
                     }
-
-                    updater.MarkChanged(command.Models, ChangeHint.Style);
+                    updater.MarkUpdated(changeScope.ChangeDescription);
                 }
             }
         }
@@ -98,6 +99,16 @@ public ChangeElementColorCommand(Color color, IReadOnlyList<GraphElementModel> e
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ChangeElementColorCommand" /> class.
+        /// </summary>
+        /// <param name="color">The color to set</param>
+        /// <param name="elementModels">Element models to affect</param>
+        public ChangeElementColorCommand(Color color, IEnumerable<Model> elementModels)
+            : base(k_UndoStringSingular, k_UndoStringPlural, color, elementModels?.OfType<GraphElementModel>().ToList() )
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ChangeElementColorCommand" /> class.
         /// </summary>
@@ -124,13 +135,14 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             if (command.Models != null)
             {
                 using (var updater = graphModelState.UpdateScope)
+                using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
                 {
-                    foreach (var model in command.Models.Where(c => c.IsColorable()))
+                    var colorableModels = command.Models.Where(c => c.IsColorable()).ToList();
+                    foreach (var model in colorableModels)
                     {
                         model.Color = command.Value;
                     }
-
-                    updater.MarkChanged(command.Models, ChangeHint.Style);
+                    updater.MarkUpdated(changeScope.ChangeDescription);
                 }
             }
         }
@@ -207,9 +219,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 }
 
                 using (var stateUpdater = graphModelState.UpdateScope)
+                using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
                 {
-                    var changedModels = command.GraphView.PositionDependenciesManager_Internal.AlignNodes(command.Follow, command.Nodes);
-                    stateUpdater.MarkChanged(changedModels, ChangeHint.Layout);
+                    command.GraphView.PositionDependenciesManager_Internal.AlignNodes(command.Follow, command.Nodes);
+                    stateUpdater.MarkUpdated(changeScope.ChangeDescription);
                 }
             }
         }
@@ -298,9 +311,22 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             {
                 var selectionHelper = new GlobalSelectionCommandHelper(mainSelectionState);
 
+                var currentSelection = new HashSet<GraphElementModel>();
+                foreach (var selectionStateComponent in selectionHelper.SelectionStates)
+                {
+                    currentSelection.UnionWith(selectionStateComponent.GetSelection(graphModelState.GraphModel));
+                }
+
+                currentSelection.SymmetricExceptWith(command.Models);
+                if (currentSelection.Count == 0)
+                {
+                    // currentSelection is already the same as command.Models
+                    return;
+                }
+
                 using (var undoStateUpdater = undoState.UpdateScope)
                 {
-                    undoStateUpdater.SaveStates(selectionHelper.UndoableSelectionStates);
+                    undoStateUpdater.SaveStates(selectionHelper.SelectionStates);
                 }
 
                 using (var updaters = selectionHelper.UpdateScopes)
@@ -315,6 +341,23 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
             else
             {
+                switch (command.Mode)
+                {
+                    case SelectionMode.Add:
+                        if (command.Models.All(mainSelectionState.IsSelected))
+                        {
+                            return;
+                        }
+                        break;
+
+                    case SelectionMode.Remove:
+                        if (command.Models.All(m => !mainSelectionState.IsSelected(m)))
+                        {
+                            return;
+                        }
+                        break;
+                }
+
                 using (var undoStateUpdater = undoState.UpdateScope)
                 {
                     undoStateUpdater.SaveState(mainSelectionState);
@@ -367,9 +410,12 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
         {
             var selectionHelper = new GlobalSelectionCommandHelper(selectionState);
 
+            if (selectionHelper.SelectionStates.All(s => s.IsSelectionEmpty))
+                return;
+
             using (var undoStateUpdater = undoState.UpdateScope)
             {
-                undoStateUpdater.SaveStates(selectionHelper.UndoableSelectionStates);
+                undoStateUpdater.SaveStates(selectionHelper.SelectionStates);
             }
 
             using (var updaters = selectionHelper.UpdateScopes)
@@ -435,9 +481,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 command.Model.PositionAndSize = command.Layout;
-                graphUpdater.MarkChanged(command.Model as GraphElementModel, ChangeHint.Layout);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GraphViewCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GraphViewCommands.cs
index 24f8b1cc8d..edfdb6a47f 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GraphViewCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/GraphViewCommands.cs
@@ -57,13 +57,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 foreach (var movable in command.Models)
                 {
                     movable.Move(command.Value);
                 }
-
-                graphUpdater.MarkChanged(command.Models.OfType<GraphElementModel>(), ChangeHint.Layout);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -117,6 +117,7 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 for (int i = 0; i < command.Models.Count; ++i)
                 {
@@ -124,8 +125,7 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                     Vector2 delta = command.Deltas[i];
                     model.Move(delta);
                 }
-
-                graphUpdater.MarkChanged(command.Models.OfType<GraphElementModel>(), ChangeHint.Layout);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -179,37 +179,17 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 undoStateUpdater.SaveState(graphModelState);
                 undoStateUpdater.SaveState(selectionState);
             }
-
             using (var selectionUpdater = selectionState.UpdateScope)
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
-                var changeDescription = graphModelState.GraphModel.DeleteElements(command.Models);
-                var deletedModels = changeDescription.DeletedModels.ToList();
-
-                foreach (var wiresToDelete in deletedModels.OfType<WireModel>())
-                {
-                    var toPort = wiresToDelete.ToPort;
-                    var fromPort = wiresToDelete.FromPort;
-
-                    graphUpdater.MarkChanged(toPort, ChangeHint.GraphTopology);
-                    graphUpdater.MarkChanged(fromPort, ChangeHint.GraphTopology);
-
-                    if (toPort.PortType == PortType.MissingPort && !toPort.GetConnectedWires().Any())
-                    {
-                        if (toPort.NodeModel.RemoveUnusedMissingPort(toPort))
-                            graphUpdater.MarkChanged(toPort.NodeModel, ChangeHint.GraphTopology);
-                    }
-                    if (fromPort.PortType == PortType.MissingPort && !fromPort.GetConnectedWires().Any())
-                    {
-                        if (fromPort.NodeModel.RemoveUnusedMissingPort(fromPort))
-                            graphUpdater.MarkChanged(fromPort.NodeModel, ChangeHint.GraphTopology);
-                    }
-                }
+                graphModelState.GraphModel.DeleteElements(command.Models);
+                var deletedModels = changeScope.ChangeDescription.DeletedModels.ToList();
 
                 if (deletedModels.Any(model => model is VariableDeclarationModel variable && variable.IsInputOrOutput()))
                 {
                     foreach (var recursiveSubgraphNode in graphModelState.GraphModel.GetRecursiveSubgraphNodes())
-                        graphUpdater.MarkChanged(recursiveSubgraphNode.Update(), ChangeHint.Data);
+                        recursiveSubgraphNode.Update();
                 }
 
                 var selectedModels = deletedModels.Where(selectionState.IsSelected).ToList();
@@ -218,8 +198,7 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                     selectionUpdater.SelectElements(selectedModels, false);
                 }
 
-                graphUpdater.MarkChanged(changeDescription.ChangedModels);
-                graphUpdater.MarkDeleted(deletedModels);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -306,17 +285,17 @@ public PasteSerializedDataCommand(PasteOperation operation, string undoString, V
         /// <param name="command">The command.</param>
         public static void DefaultCommandHandler(UndoStateComponent undoState, GraphModelStateComponent graphModelState, SelectionStateComponent selectionState, PasteSerializedDataCommand command)
         {
-            if (!command.Data.IsEmpty_Internal())
+            if (!command.Data.IsEmpty())
             {
                 var selectionHelper = new GlobalSelectionCommandHelper(selectionState);
 
                 using (var undoStateUpdater = undoState.UpdateScope)
                 {
-                    var undoableStates = selectionHelper.UndoableSelectionStates.Append(graphModelState);
+                    var undoableStates = selectionHelper.SelectionStates.Append<IUndoableStateComponent>(graphModelState);
                     undoStateUpdater.SaveStates(undoableStates);
                 }
 
-                using (var graphViewUpdater = graphModelState.UpdateScope)
+                using (var graphModelStateUpdater = graphModelState.UpdateScope)
                 using (var selectionUpdaters = selectionHelper.UpdateScopes)
                 {
                     foreach (var selectionUpdater in selectionUpdaters)
@@ -324,7 +303,7 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                         selectionUpdater.ClearSelection();
                     }
 
-                    CopyPasteData.PasteSerializedData_Internal(command.Operation, command.Delta, graphViewUpdater,
+                    CopyPasteData.PasteSerializedData(command.Operation, command.Delta, graphModelStateUpdater,
                         null, selectionUpdaters.MainUpdateScope, command.Data, graphModelState.GraphModel, command.SelectedGroup);
                 }
             }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/InsertBlocksInContextCommand.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/InsertBlocksInContextCommand.cs
index 89c4817692..a641b7be1d 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/InsertBlocksInContextCommand.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/InsertBlocksInContextCommand.cs
@@ -2,7 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Unity.CommandStateObserver;
@@ -102,6 +102,7 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 using (var selected = selectionState.UpdateScope)
                 {
@@ -116,7 +117,6 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                                 var context = block.ContextNodeModel;
                                 if (context != null)
                                 {
-                                    graphUpdater.MarkChanged(context, ChangeHint.GraphTopology);
                                     context.RemoveElements(new[] {block});
                                 }
                             }
@@ -130,7 +130,6 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                             {
                                 var blockNodeModel = block.Clone();
 
-                                blockNodeModel.AssignNewGuid();
                                 blockNodeModel.ContextNodeModel = null;
 
                                 duplicatedNodes.Add(blockNodeModel);
@@ -145,7 +144,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                             if (block.IsCompatibleWith(contextData.Context))
                             {
                                 contextData.Context.InsertBlock(block, currentIndex++);
-                                graphUpdater.MarkNew(block);
+
+                                // If the block was duplicated, mark it as new, otherwise remove it from the deleted model
+                                // as the block was only moved, i.e. not deleted nor added.
+                                if (command.Duplicate)
+                                    graphUpdater.MarkNew(block);
+                                else
+                                    changeScope.ChangeDescription.RemoveDeletedModels(block);
                             }
                         }
 
@@ -173,10 +178,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                                 }
                             }
                         }
-
-                        graphUpdater.MarkChanged(contextData.Context, ChangeHint.GraphTopology);
                     }
                 }
+
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ItemLibraryCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ItemLibraryCommands.cs
index 7dde1e5de6..df58a704cf 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ItemLibraryCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ItemLibraryCommands.cs
@@ -211,8 +211,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             var createdElements = new List<GraphElementModel>();
+            var graphModel = graphModelState.GraphModel;
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModel.ChangeDescriptionScope)
             {
                 foreach (var creationData in command.CreationData)
                 {
@@ -241,15 +243,6 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                     }
 
                     var guid = creationData.Guid.Valid ? creationData.Guid : SerializableGUID.Generate();
-                    var graphModel = graphModelState.GraphModel;
-
-                    // Delete previous connections
-                    if (connectionsToMake == ConnectionsToMake.ExistingPort && creationData.PortModel.Capacity != PortCapacity.Multi)
-                    {
-                        var wiresToDelete = creationData.PortModel.GetConnectedWires();
-                        var deletedModels = graphModel.DeleteWires(wiresToDelete.ToList());
-                        graphUpdater.MarkDeleted(deletedModels);
-                    }
 
                     // Create new element
                     GraphElementModel createdElement;
@@ -273,11 +266,11 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
 
                     if (createdElement != null)
                     {
-                        graphUpdater.MarkNew(createdElement);
                         createdElements.Add(createdElement);
                         graphUpdater.MarkForRename(createdElement);
                     }
 
+                    var wiresToDelete = new List<WireModel>();
                     var portNodeModel = createdElement as PortNodeModel;
                     switch (connectionsToMake)
                     {
@@ -288,6 +281,9 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                             var newPortToConnect = portNodeModel?.GetPortFitToConnectTo(existingPortToConnect);
                             if (newPortToConnect != null)
                             {
+                                // Old wires to delete
+                                wiresToDelete = WireCommandHelper_Internal.GetDropWireModelsToDelete(creationData.PortModel).ToList();
+
                                 WireModel newWire;
                                 if (existingPortToConnect.Direction == PortDirection.Output)
                                 {
@@ -296,7 +292,6 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                                     {
                                         var newNode = graphModel.CreateItemizedNode(WireCommandConfig_Internal.nodeOffset,
                                             ref existingPortToConnect);
-                                        graphUpdater.MarkNew(newNode);
                                         createdElements.Add(newNode);
                                     }
 
@@ -307,7 +302,6 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                                     newWire = graphModel.CreateWire(existingPortToConnect, newPortToConnect);
                                 }
 
-                                graphUpdater.MarkNew(newWire);
                                 createdElements.Add(newWire);
 
                                 if (newWire != null && creationData.AutoAlign ||
@@ -323,19 +317,15 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                                 var wireInput = creationData.WireToInsertOn.ToPort;
                                 var wireOutput = creationData.WireToInsertOn.FromPort;
 
-                                // Delete old wire
-                                var deletedModels = graphModel.DeleteWire(creationData.WireToInsertOn);
-                                graphUpdater.MarkDeleted(deletedModels);
+                                // Old wire to delete
+                                wiresToDelete.Add(creationData.WireToInsertOn);
 
                                 // Connect input port
-                                var inputPortModel =
-                                    newModelToConnect.InputsByDisplayOrder.FirstOrDefault(p =>
-                                        p?.PortType == wireOutput?.PortType);
+                                var inputPortModel = newModelToConnect.GetPortFitToConnectTo(wireOutput);
 
                                 if (inputPortModel != null)
                                 {
-                                    var newWire = graphModel.CreateWire(inputPortModel, wireOutput);
-                                    graphUpdater.MarkNew(newWire);
+                                    graphModel.CreateWire(inputPortModel, wireOutput);
                                 }
 
                                 // Connect output port
@@ -343,29 +333,33 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
 
                                 if (outputPortModel != null)
                                 {
-                                    var newWire = graphModel.CreateWire(wireInput, outputPortModel);
-                                    graphUpdater.MarkNew(newWire);
+                                    graphModel.CreateWire(wireInput, outputPortModel);
                                 }
                             }
                             break;
                         case ConnectionsToMake.ExistingWires:
-                            foreach (var wire in creationData.WiresToConnect)
+                            foreach (var wire in creationData.WiresToConnect.ToList())
                             {
                                 var wireModel = wire.model;
-                                var newPort = portNodeModel?.GetPortFitToConnectTo(wire.model.GetOtherPort(wire.side));
+                                var portToConnect = creationData.LibraryItem.Data is NodeItemLibraryData nodeData ? nodeData.PortToConnect : null;
+                                var newPort = portToConnect != null ?
+                                    portNodeModel?.Ports.FirstOrDefault(p => p.UniqueName == portToConnect.UniqueName) :
+                                    portNodeModel?.GetPortFitToConnectTo(wire.model.GetOtherPort(wire.side));
+
                                 if (newPort != null)
                                 {
+                                    // Old wires to delete
+                                    wiresToDelete.AddRange(WireCommandHelper_Internal.GetDropWireModelsToDelete(wireModel.GetOtherPort(wire.side)).Except(new [] { wireModel }));
+
                                     if (wire.model is IGhostWire _)
                                     {
                                         var toPort = wire.side == WireSide.To ? newPort : wire.model.ToPort;
                                         var fromPort = wire.side == WireSide.From ? newPort : wire.model.FromPort;
                                         wireModel = graphModel.CreateWire(toPort, fromPort);
-                                        graphUpdater.MarkNew(wireModel);
                                     }
                                     else
                                     {
                                         wire.model.SetPort(wire.side, newPort);
-                                        graphUpdater.MarkChanged(wireModel);
                                     }
                                 }
                                 graphUpdater.MarkModelToRepositionAtCreation((createdElement, wireModel, wire.side));
@@ -374,7 +368,12 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                         default:
                             throw new ArgumentOutOfRangeException();
                     }
+
+                    // Delete old wires
+                    if (wiresToDelete.Any())
+                        graphModel.DeleteWires(wiresToDelete);
                 }
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
 
             if (createdElements.Any())
@@ -383,7 +382,7 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 using (var undoStateUpdater = undoState.UpdateScope)
                 using (var selectionUpdaters = selectionHelper.UpdateScopes)
                 {
-                    undoStateUpdater.SaveStates(selectionHelper.UndoableSelectionStates);
+                    undoStateUpdater.SaveStates(selectionHelper.SelectionStates);
                     foreach (var updater in selectionUpdaters)
                         updater.ClearSelection();
                     selectionUpdaters.MainUpdateScope.SelectElements(createdElements, true);
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedGraphElementModelFieldCommand.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedGraphElementModelFieldCommand.cs
index 217dae7f3e..f1fd997bcc 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedGraphElementModelFieldCommand.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedGraphElementModelFieldCommand.cs
@@ -39,20 +39,16 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
         {
             if (command.InspectedModels != null && command.InspectedObjects != null && command.Field != null)
             {
+                using var changeScope = graphModelState.GraphModel.ChangeDescriptionScope;
                 using (var undoStateUpdater = undoState.UpdateScope)
                 {
                     undoStateUpdater.SaveState(graphModelState);
                 }
 
-                SetField(command, out var newModels, out var changedModels, out var deletedModels);
-
                 using (var updater = graphModelState.UpdateScope)
                 {
-                    updater.MarkChanged(command.InspectedModels, ChangeHint.Data);
-
-                    updater.MarkNew(newModels);
-                    updater.MarkChanged(changedModels);
-                    updater.MarkDeleted(deletedModels);
+                    SetField(command);
+                    updater.MarkUpdated(changeScope.ChangeDescription);
                 }
             }
         }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedGraphModelFieldCommand.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedGraphModelFieldCommand.cs
index ab1f41b296..3801a98035 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedGraphModelFieldCommand.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedGraphModelFieldCommand.cs
@@ -39,21 +39,17 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
         {
             if (command.InspectedModel != null && command.InspectedObjects != null && command.Field != null && command.InspectedObjects.Any())
             {
+                using var changeScope = graphModelState.GraphModel.ChangeDescriptionScope;
                 using (var undoStateUpdater = undoState.UpdateScope)
                 {
                     undoStateUpdater.SaveState(graphModelState);
                 }
 
-                SetField(command, out var newModels, out var changedModels, out var deletedModels);
-
-                if (newModels != null || changedModels != null || deletedModels != null)
+                using (var updater = graphModelState.UpdateScope)
                 {
-                    using (var updater = graphModelState.UpdateScope)
-                    {
-                        updater.MarkNew(newModels);
-                        updater.MarkChanged(changedModels);
-                        updater.MarkDeleted(deletedModels);
-                    }
+                    SetField(command);
+                    updater.MarkUpdated(changeScope.ChangeDescription);
+					updater.MarkGraphPropertiesChanged();
                 }
             }
         }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedObjectFieldCommand.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedObjectFieldCommand.cs
index 8645e61af0..9afde4bbd5 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedObjectFieldCommand.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/ModelInspector/SetInspectedObjectFieldCommand.cs
@@ -54,19 +54,13 @@ public SetInspectedObjectFieldCommand(object value, IEnumerable<object> inspecte
                 var useMethodAttribute = Field.GetCustomAttribute<InspectorUseSetterMethodAttribute>();
                 if (useMethodAttribute != null)
                 {
-                    m_MethodInfo = baseType.GetMethod(useMethodAttribute.MethodName);
+                    m_MethodInfo = baseType.GetMethod(useMethodAttribute.MethodName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
 
                     if (m_MethodInfo != null)
                     {
                         var parameters = m_MethodInfo.GetParameters();
                         Debug.Assert(parameters[0].ParameterType.IsInstanceOfType(Value));
-                        Debug.Assert(parameters[1].IsOut &&
-                            parameters[1].ParameterType.GetElementType() == typeof(IEnumerable<GraphElementModel>));
-                        Debug.Assert(parameters[2].IsOut &&
-                            parameters[2].ParameterType.GetElementType() == typeof(IEnumerable<GraphElementModel>));
-                        Debug.Assert(parameters[3].IsOut &&
-                            parameters[3].ParameterType.GetElementType() == typeof(IEnumerable<GraphElementModel>));
-                        Debug.Assert(parameters.Length == 4);
+                        Debug.Assert(parameters.Length == 1);
                     }
                 }
 
@@ -82,36 +76,16 @@ public SetInspectedObjectFieldCommand(object value, IEnumerable<object> inspecte
         /// Sets the field on an object according to the data held in <paramref name="command"/>.
         /// </summary>
         /// <param name="command">The command that holds the object, field and new field value.</param>
-        /// <param name="newModels">On exit, contains the models that were added as the result of setting the field.</param>
-        /// <param name="changedModels">On exit, contains the models that were modified as the result of setting the field (excluding the object on which the field is set).</param>
-        /// <param name="deletedModels">On exit, contains the models that were deleted as the result of setting the field.</param>
-        protected static void SetField(SetInspectedObjectFieldCommand command,
-            out IEnumerable<GraphElementModel> newModels,
-            out IEnumerable<GraphElementModel> changedModels,
-            out IEnumerable<GraphElementModel> deletedModels)
+        protected static void SetField(SetInspectedObjectFieldCommand command)
         {
-            newModels = null;
-            changedModels = null;
-            deletedModels = null;
-
             if (command.InspectedObjects != null && command.Field != null && command.InspectedObjects.Any())
             {
                 if (command.m_MethodInfo != null)
                 {
-                    newModels = Enumerable.Empty<GraphElementModel>();
-                    changedModels = Enumerable.Empty<GraphElementModel>();
-                    deletedModels = Enumerable.Empty<GraphElementModel>();
-
-                    var parameters = new[] { command.Value, null, null, null };
+                    var parameters = new[] {command.Value};
                     foreach (var inspectedObject in command.InspectedObjects)
                     {
                         command.m_MethodInfo.Invoke(inspectedObject, parameters);
-                        if (parameters[1] != null)
-                            newModels = newModels.Concat((IEnumerable<GraphElementModel>)parameters[1]);
-                        if (parameters[2] != null)
-                            changedModels = changedModels.Concat((IEnumerable<GraphElementModel>)parameters[2]);
-                        if (parameters[3] != null)
-                            deletedModels = deletedModels.Concat((IEnumerable<GraphElementModel>)parameters[3]);
                     }
                 }
                 else if (command.m_PropertyInfo != null)
@@ -119,18 +93,18 @@ protected static void SetField(SetInspectedObjectFieldCommand command,
                     foreach (var obj in command.InspectedObjects)
                     {
                         command.m_PropertyInfo.SetMethod.Invoke(obj, new[] { command.Value });
+                        if (obj is GraphElementModel gem)
+                            gem.GraphModel?.CurrentGraphChangeDescription.AddChangedModel(gem, ChangeHint.Data);
                     }
-
-                    changedModels = command.InspectedObjects.OfType<GraphElementModel>();
                 }
                 else
                 {
                     foreach (var obj in command.InspectedObjects)
                     {
                         command.Field.SetValue(obj, command.Value);
+                        if (obj is GraphElementModel gem)
+                            gem.GraphModel?.CurrentGraphChangeDescription.AddChangedModel(gem, ChangeHint.Data);
                     }
-
-                    changedModels = command.InspectedObjects.OfType<GraphElementModel>();
                 }
             }
         }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/NodeCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/NodeCommands.cs
index ea9eba044e..0219165275 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/NodeCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/NodeCommands.cs
@@ -62,14 +62,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 foreach (var model in command.Models.OfType<ICollapsible>())
                 {
                     model.Collapsed = command.Value;
                 }
-
-                graphUpdater.MarkChanged(command.Models.OfType<ICollapsible>().OfType<GraphElementModel>(),
-                    ChangeHint.Layout);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -121,44 +120,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 command.Model.Rename(command.ElementName);
-
-                var graphModel = graphModelState.GraphModel;
-
-                if (command.Model is VariableDeclarationModel variableDeclarationModel)
-                {
-                    var references = graphModel.FindReferencesInGraph<VariableNodeModel>(variableDeclarationModel).OfType<AbstractNodeModel>();
-
-                    graphUpdater.MarkChanged(references, ChangeHint.Data);
-                    graphUpdater.MarkChanged(variableDeclarationModel, ChangeHint.Data);
-
-                    if (variableDeclarationModel.IsInputOrOutput())
-                    {
-                        foreach (var recursiveSubgraphNode in graphModel.GetRecursiveSubgraphNodes())
-                            graphUpdater.MarkChanged(recursiveSubgraphNode.Update(), ChangeHint.Data);
-                    }
-                }
-                else if (command.Model is VariableNodeModel variableModel)
-                {
-                    variableDeclarationModel = variableModel.VariableDeclarationModel;
-                    var references = graphModel.FindReferencesInGraph<VariableNodeModel>(variableDeclarationModel).OfType<AbstractNodeModel>();
-
-                    graphUpdater.MarkChanged(references, ChangeHint.Data);
-                    graphUpdater.MarkChanged(variableDeclarationModel, ChangeHint.Data);
-                }
-                else if (command.Model is WirePortalModel wirePortalModel)
-                {
-                    var declarationModel = wirePortalModel.DeclarationModel as GraphElementModel;
-                    var references = graphModel.FindReferencesInGraph<WirePortalModel>(wirePortalModel.DeclarationModel).OfType<AbstractNodeModel>();
-
-                    graphUpdater.MarkChanged(references, ChangeHint.Data);
-                    graphUpdater.MarkChanged(declarationModel, ChangeHint.Data);
-                }
-                else
-                {
-                    graphUpdater.MarkChanged(command.Model as GraphElementModel, ChangeHint.Data);
-                }
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -216,12 +181,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 command.Constant.ObjectValue = command.Value;
-                if (command.OwnerModel != null)
-                {
-                    graphUpdater.MarkChanged(command.OwnerModel, ChangeHint.Data);
-                }
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -281,16 +244,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 }
 
                 using (var graphUpdater = graphModelState.UpdateScope)
+                using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
                 {
                     foreach (var constant in command.Constants)
                     {
                         constant.ObjectValue = command.Value;
                     }
-
-                    if (command.OwnerModels != null)
-                    {
-                        graphUpdater.MarkChanged(command.OwnerModels, ChangeHint.Data);
-                    }
+                    graphUpdater.MarkUpdated(changeScope.ChangeDescription);
                 }
             }
         }
@@ -340,16 +300,16 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 undoStateUpdater.SaveState(graphModelState);
             }
 
+            var graphModel = graphModelState.GraphModel;
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModel.ChangeDescriptionScope)
             {
-                var graphModel = graphModelState.GraphModel;
-
                 foreach (var nodeModel in command.Models)
                 {
                     var connectedWires = nodeModel.GetConnectedWires().ToList();
-                    var deletedModels = graphModel.DeleteWires(connectedWires);
-                    graphUpdater.MarkDeleted(deletedModels);
+                    graphModel.DeleteWires(connectedWires);
                 }
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -400,10 +360,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             var graphModel = graphModelState.GraphModel;
-            IReadOnlyCollection<GraphElementModel> deletedModels;
 
             using (var selectionUpdater = selectionState.UpdateScope)
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModel.ChangeDescriptionScope)
             {
                 foreach (var model in command.NodesToBypass)
                 {
@@ -425,21 +385,18 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                     if (!outputWireModels.Any())
                         continue;
 
-                    deletedModels = graphModel.DeleteWires(inputWireModel);
-                    graphUpdater.MarkDeleted(deletedModels);
-                    deletedModels = graphModel.DeleteWires(outputWireModels);
-                    graphUpdater.MarkDeleted(deletedModels);
+                    graphModel.DeleteWires(inputWireModel);
+                    graphModel.DeleteWires(outputWireModels);
 
-                    var wire = graphModel.CreateWire(outputWireModels[0].ToPort, inputWireModel[0].FromPort);
-                    graphUpdater.MarkNew(wire);
+                    graphModel.CreateWire(outputWireModels[0].ToPort, inputWireModel[0].FromPort);
                 }
 
                 // [GTF-663] We delete nodes with deleteConnection = true because it may happens that one of the newly
                 // added wire is connected to a node that will be deleted.
-                deletedModels = graphModel.DeleteNodes(command.Models, deleteConnections: true);
-                graphUpdater.MarkDeleted(deletedModels);
+                graphModel.DeleteNodes(command.Models, deleteConnections: true);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
 
-                var selectedModels = deletedModels.Where(selectionState.IsSelected).ToList();
+                var selectedModels = changeScope.ChangeDescription.DeletedModels.Where(selectionState.IsSelected).ToList();
                 if (selectedModels.Any())
                 {
                     selectionUpdater.SelectElements(selectedModels, false);
@@ -495,13 +452,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 foreach (var nodeModel in command.Models)
                 {
                     nodeModel.State = command.Value;
                 }
-
-                graphUpdater.MarkChanged(command.Models, ChangeHint.Data);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/PlacematCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/PlacematCommands.cs
index 122b4bd05a..d4f5dfbd6e 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/PlacematCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/PlacematCommands.cs
@@ -42,6 +42,15 @@ public CreatePlacematCommand(Rect position, string title = null) : this()
             Title = title;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreatePlacematCommand"/> class.
+        /// </summary>
+        /// <param name="position">The position of the new placemat.</param>
+        /// <param name="title">The title of the new placemat.</param>
+        public CreatePlacematCommand(Vector2 position, string title = null) : this(new Rect(position, Placemat.DefaultPlacematSize), title)
+        {
+        }
+
         /// <summary>
         /// Default command handler.
         /// </summary>
@@ -58,12 +67,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
 
             PlacematModel placematModel;
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 placematModel = graphModelState.GraphModel.CreatePlacemat(command.Position);
                 if (command.Title != null)
                     placematModel.Title = command.Title;
 
-                graphUpdater.MarkNew(placematModel);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
                 graphUpdater.MarkForRename(placematModel);
             }
 
@@ -147,74 +157,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 graphModelState.GraphModel.ReorderPlacemats(command.Models, command.OrderingAction);
-                graphUpdater.MarkChanged(command.Models, ChangeHint.Layout);
-            }
-        }
-    }
-
-    /// <summary>
-    /// Command to collapse or expand placemats.
-    /// </summary>
-    class CollapsePlacematCommand : UndoableCommand
-    {
-        /// <summary>
-        /// The placemat to collapse or expand.
-        /// </summary>
-        public readonly PlacematModel PlacematModel;
-        /// <summary>
-        /// True if the placemat should be collapsed, false otherwise.
-        /// </summary>
-        public readonly bool Collapse;
-        /// <summary>
-        /// If collapsing the placemat, the elements hidden by the collapsed placemat.
-        /// </summary>
-        public readonly IReadOnlyList<GraphElementModel> CollapsedElements;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollapsePlacematCommand"/> class.
-        /// </summary>
-        public CollapsePlacematCommand()
-        {
-            UndoString = "Collapse Or Expand Placemat";
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollapsePlacematCommand"/> class.
-        /// </summary>
-        /// <param name="placematModel">The placemat to collapse or expand.</param>
-        /// <param name="collapse">True if the placemat should be collapsed, false otherwise.</param>
-        /// <param name="collapsedElements">If collapsing the placemat, the elements hidden by the collapsed placemat.</param>
-        public CollapsePlacematCommand(PlacematModel placematModel, bool collapse,
-                                       IReadOnlyList<GraphElementModel> collapsedElements) : this()
-        {
-            PlacematModel = placematModel;
-            Collapse = collapse;
-            CollapsedElements = collapsedElements;
-
-            UndoString = Collapse ? "Collapse Placemat" : "Expand Placemat";
-        }
-
-        /// <summary>
-        /// Default command handler.
-        /// </summary>
-        /// <param name="undoState">The undo state component.</param>
-        /// <param name="graphModelState">The graph model state component.</param>
-        /// <param name="command">The command.</param>
-        public static void DefaultCommandHandler(UndoStateComponent undoState, GraphModelStateComponent graphModelState, CollapsePlacematCommand command)
-        {
-            using (var undoStateUpdater = undoState.UpdateScope)
-            {
-                undoStateUpdater.SaveState(graphModelState);
-            }
-
-            using (var graphUpdater = graphModelState.UpdateScope)
-            {
-                command.PlacematModel.Collapsed = command.Collapse;
-                command.PlacematModel.HiddenElements = command.PlacematModel.Collapsed ? command.CollapsedElements : null;
-
-                graphUpdater.MarkChanged(command.PlacematModel, ChangeHint.Layout);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/PortalCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/PortalCommands.cs
index f955d80307..7c0a608f75 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/PortalCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/PortalCommands.cs
@@ -60,13 +60,14 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
 
             var createdElements = new List<GraphElementModel>();
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 foreach (var portalModel in portalsToOpen)
                 {
                     var newPortal = graphModelState.GraphModel.CreateOppositePortal(portalModel);
-                    graphUpdater.MarkNew(newPortal);
                     createdElements.Add(newPortal);
                 }
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
 
             if (createdElements.Any())
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/StickyNoteCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/StickyNoteCommands.cs
index 30c324f34b..469102f33e 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/StickyNoteCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/StickyNoteCommands.cs
@@ -53,9 +53,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
 
             StickyNoteModel stickyNote;
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 stickyNote = graphModelState.GraphModel.CreateStickyNote(command.Position);
-                graphUpdater.MarkNew(stickyNote);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
                 graphUpdater.MarkForRename(stickyNote);
             }
 
@@ -128,6 +129,7 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 if (command.Title != null)
                     command.StickyNoteModel.Title = command.Title;
@@ -135,7 +137,7 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 if (command.Contents != null)
                     command.StickyNoteModel.Contents = command.Contents;
 
-                graphUpdater.MarkChanged(command.StickyNoteModel, ChangeHint.Data);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -187,13 +189,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 foreach (var noteModel in command.Models)
                 {
                     noteModel.Theme = command.Value;
                 }
-
-                graphUpdater.MarkChanged(command.Models, ChangeHint.Style);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -245,13 +247,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 foreach (var noteModel in command.Models)
                 {
                     noteModel.TextSize = command.Value;
                 }
-
-                graphUpdater.MarkChanged(command.Models, ChangeHint.Style);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/SubgraphCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/SubgraphCommands.cs
index a363389d29..2e48526007 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/SubgraphCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/SubgraphCommands.cs
@@ -109,6 +109,7 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
 
             SubgraphNodeModel subgraphNodeModel;
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 var elementsToAddToSubgraph = SubgraphCreationHelpers_Internal.GraphElementsToAddToSubgraph_Internal.ConvertToGraphElementsToAdd_Internal(command.ElementsToAddToSubgraph);
 
@@ -162,23 +163,20 @@ bool ValidatePath(string path)
                 SubgraphCreationHelpers_Internal.PopulateSubgraph_Internal(graphAsset.GraphModel, elementsToAddToSubgraph, allWireModels, inputWireConnections, outputWireConnections);
 
                 // Delete the graph elements that will be created in the local subgraph
-                var deletedModels = new List<GraphElementModel>();
-
                 var graphModel = graphModelState.GraphModel;
-                deletedModels.AddRange(graphModel.DeletePlacemats(elementsToAddToSubgraph.PlacematModels));
-                deletedModels.AddRange(graphModel.DeleteStickyNotes(elementsToAddToSubgraph.StickyNoteModels));
-                deletedModels.AddRange(graphModel.DeleteNodes(elementsToAddToSubgraph.NodeModels, true));
-                deletedModels.AddRange(graphModel.DeleteWires(allWireModels));
-
-                graphUpdater.MarkDeleted(deletedModels);
+                graphModel.DeletePlacemats(elementsToAddToSubgraph.PlacematModels);
+                graphModel.DeleteStickyNotes(elementsToAddToSubgraph.StickyNoteModels);
+                graphModel.DeleteNodes(elementsToAddToSubgraph.NodeModels, true);
+                graphModel.DeleteWires(allWireModels);
 
                 // Create the subgraph node
                 var position = SubgraphNode.ComputeSubgraphNodePosition_Internal(command.ElementsToAddToSubgraph, command.GraphView);
                 subgraphNodeModel = graphModel.CreateSubgraphNode(graphAsset.GraphModel, position, command.Guid);
-                graphUpdater.MarkNew(subgraphNodeModel);
 
                 // Create new wires linking the subgraph node to other nodes
-                graphUpdater.MarkNew(SubgraphCreationHelpers_Internal.CreateWiresConnectedToSubgraphNode_Internal(graphModel, subgraphNodeModel, inputWireConnections, outputWireConnections));
+                SubgraphCreationHelpers_Internal.CreateWiresConnectedToSubgraphNode_Internal(graphModel, subgraphNodeModel, inputWireConnections, outputWireConnections);
+
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
 
             if (subgraphNodeModel != null)
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/VariableDeclarationCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/VariableDeclarationCommands.cs
index 6bbd7db8a3..458b245310 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/VariableDeclarationCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/VariableDeclarationCommands.cs
@@ -125,9 +125,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             VariableDeclarationModel newVariableDeclaration;
+            var graphModel = graphModelState.GraphModel;
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModel.ChangeDescriptionScope)
             {
-                var graphModel = graphModelState.GraphModel;
                 if (graphModel.IsContainerGraph() && (command.ModifierFlags == ModifierFlags.Read || command.ModifierFlags == ModifierFlags.Write))
                 {
                     Debug.LogWarning("Cannot create an input or an output variable declaration in a container graph.");
@@ -141,12 +142,12 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                     newVariableDeclaration = graphModel.CreateGraphVariableDeclaration(command.TypeHandle, command.VariableName,
                         command.ModifierFlags, command.IsExposed, command.Group, command.IndexInGroup, null, command.Guid);
 
-                graphUpdater.MarkNew(newVariableDeclaration);
                 graphUpdater.MarkForRename(newVariableDeclaration);
-                graphUpdater.MarkChanged(newVariableDeclaration.ParentGroup, ChangeHint.Grouping);
 
                 foreach (var recursiveSubgraphNode in graphModel.GetRecursiveSubgraphNodes())
-                    graphUpdater.MarkChanged(recursiveSubgraphNode.Update(), ChangeHint.Data);
+                    recursiveSubgraphNode.Update();
+
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
             using (var bbUpdater = blackboardViewState.UpdateScope)
             {
@@ -210,9 +211,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 command.VariableDeclarationModel.CreateInitializationValue();
-                graphUpdater.MarkChanged(command.VariableDeclarationModel, ChangeHint.Data);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -266,22 +268,16 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                     undoStateUpdater.SaveState(graphModelState);
                 }
 
+                var graphModel = graphModelState.GraphModel;
                 using (var graphUpdater = graphModelState.UpdateScope)
+                using (var changeScope = graphModel.ChangeDescriptionScope)
                 {
                     if (command.VariableDeclarationModel.DataType != command.Type)
                         command.VariableDeclarationModel.CreateInitializationValue();
 
                     command.VariableDeclarationModel.DataType = command.Type;
 
-                    var graphModel = graphModelState.GraphModel;
-                    var variableReferences = graphModel.FindReferencesInGraph<VariableNodeModel>(command.VariableDeclarationModel).ToList();
-                    foreach (var usage in variableReferences)
-                    {
-                        usage.UpdateTypeFromDeclaration();
-                    }
-
-                    graphUpdater.MarkChanged(variableReferences, ChangeHint.Data);
-                    graphUpdater.MarkChanged(command.VariableDeclarationModel, ChangeHint.Data);
+                    graphUpdater.MarkUpdated(changeScope.ChangeDescription);
                 }
             }
         }
@@ -345,14 +341,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 foreach (var variable in command.VariableDeclarationModels)
                 {
                     variable.IsExposed = command.Exposed;
                 }
-
-                graphUpdater.MarkChanged(command.VariableDeclarationModels, ChangeHint.Data);
-
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -413,17 +408,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
-                var graphModel = graphModelState.GraphModel;
-
                 foreach (var variable in command.VariableDeclarationModels)
                 {
                     variable.Tooltip = command.Tooltip;
-
-                    var references = graphModel.FindReferencesInGraph<VariableNodeModel>(variable);
-                    graphUpdater.MarkChanged(references, ChangeHint.Style);
                 }
-                graphUpdater.MarkChanged(command.VariableDeclarationModels, ChangeHint.Style);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/VariableNodeCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/VariableNodeCommands.cs
index 8ffb0433e3..ec875674d4 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/VariableNodeCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/VariableNodeCommands.cs
@@ -99,24 +99,21 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 undoStateUpdater.SaveState(selectionState);
             }
 
+            var graphModel = graphModelState.GraphModel;
             using (var graphUpdater = graphModelState.UpdateScope)
             using (var selectionUpdater = selectionState.UpdateScope)
+            using (var changeScope = graphModel.ChangeDescriptionScope)
             {
-                var graphModel = graphModelState.GraphModel;
-
                 foreach (var constantModel in command.ConstantNodeModels ?? Enumerable.Empty<ConstantNodeModel>())
                 {
                     var declarationModel = graphModel.CreateGraphVariableDeclaration(
                         constantModel.Type.GenerateTypeHandle(),
                         constantModel.Type.FriendlyName().CodifyString_Internal(), ModifierFlags.None,
                         true, null, -1, constantModel.Value.Clone());
-                    graphUpdater.MarkNew(declarationModel);
-                    graphUpdater.MarkChanged(declarationModel.ParentGroup, ChangeHint.Grouping);
 
                     var variableModel = graphModel.CreateVariableNode(declarationModel, constantModel.Position);
                     if (variableModel != null)
                     {
-                        graphUpdater.MarkNew(variableModel);
                         selectionUpdater.SelectElement(variableModel, true);
 
                         variableModel.State = constantModel.State;
@@ -124,18 +121,12 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                             variableModel.Color = constantModel.Color;
                         foreach (var wireModel in graphModel.GetWiresForPort(constantModel.OutputPort).ToList())
                         {
-                            var newWire = graphModel.CreateWire(wireModel.ToPort, variableModel.OutputPort);
-                            var deletedModels = graphModel.DeleteWire(wireModel);
-
-                            graphUpdater.MarkNew(newWire);
-                            graphUpdater.MarkDeleted(deletedModels);
-                            selectionUpdater.SelectElements(deletedModels, false);
+                            graphModel.CreateWire(wireModel.ToPort, variableModel.OutputPort);
+                            graphModel.DeleteWire(wireModel);
                         }
                     }
 
-                    var deletedElements = graphModel.DeleteNode(constantModel, deleteConnections: false);
-                    graphUpdater.MarkDeleted(deletedElements);
-                    selectionUpdater.SelectElements(deletedElements, false);
+                    graphModel.DeleteNode(constantModel, deleteConnections: false);
                 }
 
                 foreach (var variableModel in command.VariableNodeModels ?? Enumerable.Empty<VariableNodeModel>())
@@ -147,23 +138,20 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                     constantModel.State = variableModel.State;
                     if (variableModel.HasUserColor)
                         constantModel.Color = variableModel.Color;
-                    graphUpdater.MarkNew(constantModel);
                     selectionUpdater.SelectElement(constantModel, true);
 
                     var wireModels = graphModel.GetWiresForPort(variableModel.OutputPort).ToList();
                     foreach (var wireModel in wireModels)
                     {
-                        var newWire = graphModel.CreateWire(wireModel.ToPort, constantModel.OutputPort);
-                        var deletedModels = graphModel.DeleteWire(wireModel);
-                        graphUpdater.MarkNew(newWire);
-                        graphUpdater.MarkDeleted(deletedModels);
-                        selectionUpdater.SelectElements(deletedModels, false);
+                        graphModel.CreateWire(wireModel.ToPort, constantModel.OutputPort);
+                        graphModel.DeleteWire(wireModel);
                     }
 
-                    var deletedElements = graphModel.DeleteNode(variableModel, deleteConnections: false);
-                    graphUpdater.MarkDeleted(deletedElements);
-                    selectionUpdater.SelectElements(deletedElements, false);
+                    graphModel.DeleteNode(variableModel, deleteConnections: false);
                 }
+
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
+                selectionUpdater.SelectElements(changeScope.ChangeDescription.DeletedModels.ToList(), false);
             }
         }
     }
@@ -208,9 +196,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             bool undoPushed = false;
 
             var createdElements = new List<GraphElementModel>();
+            var graphModel = graphModelState.GraphModel;
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModel.ChangeDescriptionScope)
             {
-                var graphModel = graphModelState.GraphModel;
                 foreach (var model in command.Models.Where(m => m is VariableNodeModel || m is ConstantNodeModel))
                 {
                     var wireModels = graphModel.GetWiresForPort(model.OutputPort).ToList();
@@ -227,15 +216,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                         }
 
                         var newModel = graphModel.DuplicateNode(model as AbstractNodeModel, i * 50 * Vector2.up);
-                        graphUpdater.MarkNew(newModel);
                         createdElements.Add(newModel);
                         var wireModel = wireModels[i];
-                        var newWire = graphModel.CreateWire(wireModel.ToPort, ((ISingleOutputPortNodeModel)newModel).OutputPort);
-                        var deletedModels = graphModel.DeleteWire(wireModel);
-                        graphUpdater.MarkNew(newWire);
-                        graphUpdater.MarkDeleted(deletedModels);
+                        graphModel.CreateWire(wireModel.ToPort, ((ISingleOutputPortNodeModel)newModel).OutputPort);
+                        graphModel.DeleteWire(wireModel);
                     }
                 }
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
 
             if (createdElements.Any())
@@ -290,13 +277,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 foreach (var constantNodeModel in command.Models)
                 {
                     constantNodeModel.IsLocked = command.Value;
                 }
-
-                graphUpdater.MarkChanged(command.Models, ChangeHint.Data);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -347,16 +334,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
             {
                 foreach (var model in command.Models)
                 {
                     model.DeclarationModel = command.Variable;
-
-                    var references = graphModelState.GraphModel.FindReferencesInGraph<VariableNodeModel>(command.Variable);
-                    graphUpdater.MarkChanged(references, ChangeHint.Data);
                 }
-
-                graphUpdater.MarkChanged(command.Models, ChangeHint.Data);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
diff --git a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/WireCommands.cs b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/WireCommands.cs
index d537b42b15..14670a633a 100644
--- a/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/WireCommands.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/CommandDispatch/Commands/WireCommands.cs
@@ -8,6 +8,7 @@
 using Unity.CommandStateObserver;
 using UnityEngine;
 using UnityEngine.Assertions;
+using UnityEngine.UIElements;
 
 namespace Unity.GraphToolsFoundation.Editor
 {
@@ -16,6 +17,92 @@ static class WireCommandConfig_Internal
         public const int nodeOffset = 60;
     }
 
+    static class WireCommandHelper_Internal
+    {
+        public static IEnumerable<WireModel> GetDropWireModelsToDelete(PortModel portModel)
+        {
+            if (portModel == null || portModel.Capacity == PortCapacity.Multi)
+                return Enumerable.Empty<WireModel>();
+            return portModel.GetConnectedWires().Where(e => !(e is IGhostWire));
+        }
+
+        /// <summary>
+        /// Gets the elements to frame during portals creation.
+        /// </summary>
+        /// <remarks>Framing is only necessary when it is not possible to see all created portals on screen.</remarks>
+        public static List<GraphElement> GetElementsToFrameDuringPortalsCreation(IEnumerable<WireModel> wireModels, GraphView graphView)
+        {
+            var outputNodes = new List<GraphElement>();
+            var inputNodes = new List<GraphElement>();
+            var nodesBoundingRect = new Rect
+            {
+                xMin = float.MaxValue,
+                xMax = float.MinValue,
+                yMin = float.MaxValue,
+                yMax = float.MinValue
+            };
+
+            var shouldFrame = false;
+            foreach (var wireModel in wireModels)
+            {
+                var outputNode = wireModel.FromPort.NodeModel.GetView_Internal(graphView) as GraphElement;
+                var inputNode = wireModel.ToPort.NodeModel.GetView_Internal(graphView) as GraphElement;
+
+                if (outputNode != null && inputNode != null)
+                {
+                    outputNodes.Add(outputNode);
+                    inputNodes.Add(inputNode);
+
+                    if (!graphView.boundingBox.Contains(outputNode.worldBoundingBox.center) || !graphView.boundingBox.Contains(inputNode.worldBoundingBox.center))
+                        shouldFrame = true;
+
+                    nodesBoundingRect = RectUtils_Internal.Encompass(nodesBoundingRect, outputNode.layout);
+                    nodesBoundingRect = RectUtils_Internal.Encompass(nodesBoundingRect, inputNode.layout);
+                }
+            }
+
+            // Frame only when it is not possible to see both entry and exit portals on screen.
+            if (!shouldFrame)
+                return new List<GraphElement>();
+
+            // If it is not possible possible to see all portals on screen at the minimal zoom scale out, prioritize entry portals.
+            if (!RectFitInScreenAtMinScale(nodesBoundingRect, graphView))
+            {
+                var outputNodesBoundingRect = new Rect
+                {
+                    xMin = float.MaxValue,
+                    xMax = float.MinValue,
+                    yMin = float.MaxValue,
+                    yMax = float.MinValue
+                };
+
+                foreach (var outputNode in outputNodes)
+                    outputNodesBoundingRect = RectUtils_Internal.Encompass(outputNodesBoundingRect, outputNode.layout);
+
+                // If it is not possible possible to see all entry portals on screen at the minimal zoom scale out, prioritize the first one.
+                return RectFitInScreenAtMinScale(outputNodesBoundingRect, graphView) ? outputNodes : new List<GraphElement> { outputNodes.First() };
+            }
+
+            return outputNodes.Concat(inputNodes).ToList();
+
+            static bool RectFitInScreenAtMinScale(Rect rectToFit, VisualElement graphView)
+            {
+                var screenRect = new Rect
+                {
+                    xMin = GraphView.frameBorder,
+                    xMax = graphView.layout.width - GraphView.frameBorder,
+                    yMin = GraphView.frameBorder,
+                    yMax = graphView.layout.height - GraphView.frameBorder
+                };
+
+                var identity = GUIUtility.ScreenToGUIRect(screenRect);
+                var zoomLevel = Math.Min(identity.width / rectToFit.width, identity.height / rectToFit.height);
+
+                return zoomLevel > ContentZoomer.DefaultMinScale;
+            }
+        }
+    }
+
     /// <summary>
     /// Command to create a new wire.
     /// </summary>
@@ -74,44 +161,24 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             using (var undoStateUpdater = undoState.UpdateScope)
             {
                 undoStateUpdater.SaveState(graphModelState);
-                undoStateUpdater.SaveStates(selectionHelper.UndoableSelectionStates);
+                undoStateUpdater.SaveStates(selectionHelper.SelectionStates);
             }
 
             var createdElements = new List<GraphElementModel>();
+            var graphModel = graphModelState.GraphModel;
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModel.ChangeDescriptionScope)
             {
-                var graphModel = graphModelState.GraphModel;
 
                 var fromPortModel = command.FromPortModel;
                 var toPortModel = command.ToPortModel;
 
-                var wiresToDelete = GetDropWireModelsToDelete(command.FromPortModel)
-                    .Concat(GetDropWireModelsToDelete(command.ToPortModel))
+                var wiresToDelete = WireCommandHelper_Internal.GetDropWireModelsToDelete(command.FromPortModel)
+                    .Concat(WireCommandHelper_Internal.GetDropWireModelsToDelete(command.ToPortModel))
                     .ToList();
 
                 if (wiresToDelete.Count > 0)
-                {
-                    var deletedElements = graphModel.DeleteWires(wiresToDelete);
-
-                    foreach (var wireToDelete in wiresToDelete)
-                    {
-                        var toPort = wireToDelete.ToPort;
-                        var fromPort = wireToDelete.FromPort;
-                        if (toPort.NodeModel is SubgraphNodeModel && toPort.PortType == PortType.MissingPort && !toPort.GetConnectedWires().Any())
-                        {
-                            if (toPort.NodeModel.RemoveUnusedMissingPort(toPort))
-                                graphUpdater.MarkChanged(toPort.NodeModel, ChangeHint.GraphTopology);
-                        }
-
-                        if (fromPort.NodeModel is SubgraphNodeModel && fromPort.PortType == PortType.MissingPort && !fromPort.GetConnectedWires().Any())
-                        {
-                            if (fromPort.NodeModel.RemoveUnusedMissingPort(fromPort))
-                                graphUpdater.MarkChanged(fromPort.NodeModel, ChangeHint.GraphTopology);
-                        }
-                    }
-
-                    graphUpdater.MarkDeleted(deletedElements);
-                }
+                    graphModel.DeleteWires(wiresToDelete);
 
                 WireModel wireModel;
                 // Auto-itemization preferences will determine if a new node is created or not
@@ -121,7 +188,6 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                     var itemizedNode = graphModel.CreateItemizedNode(WireCommandConfig_Internal.nodeOffset, ref fromPortModel);
                     if (itemizedNode != null)
                     {
-                        graphUpdater.MarkNew(itemizedNode);
                         createdElements.Add(itemizedNode);
                     }
                     wireModel = graphModel.CreateWire(toPortModel, fromPortModel);
@@ -131,22 +197,13 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                     wireModel = graphModel.CreateWire(toPortModel, fromPortModel);
                     createdElements.Add(wireModel);
                 }
-                graphUpdater.MarkNew(wireModel);
-
-                if (toPortModel != null)
-                {
-                    graphUpdater.MarkChanged(toPortModel, ChangeHint.GraphTopology);
-                }
-
-                if (fromPortModel != null)
-                {
-                    graphUpdater.MarkChanged(fromPortModel, ChangeHint.GraphTopology);
-                }
 
                 if (command.AlignFromNode)
                 {
                     graphUpdater.MarkModelToAutoAlign(wireModel);
                 }
+
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
 
             if (createdElements.Any())
@@ -159,13 +216,6 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 }
             }
         }
-
-        static IEnumerable<WireModel> GetDropWireModelsToDelete(PortModel portModel)
-        {
-            if (portModel == null || portModel.Capacity == PortCapacity.Multi)
-                return Enumerable.Empty<WireModel>();
-            return portModel.GetConnectedWires().Where(e => !(e is IGhostWire));
-        }
     }
 
     /// <summary>
@@ -262,33 +312,32 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             if (command.Models == null || !command.Models.Any())
                 return;
 
+            if (command.Models.Count > 1 && command.NewPortModel?.Capacity == PortCapacity.Single)
+                return;
+
             using (var undoStateUpdater = undoState.UpdateScope)
             {
                 undoStateUpdater.SaveState(graphModelState);
             }
 
+            var graphModel = graphModelState.GraphModel;
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModel.ChangeDescriptionScope)
             {
-                PortModel oldPort = null;
                 var wiresToMove = command.Models;
                 wiresToMove = wiresToMove.OrderBy(w => w, WiresOrderComparer.Default).ToList();
 
+                var wiresToDelete = WireCommandHelper_Internal.GetDropWireModelsToDelete(command.NewPortModel).Except(wiresToMove).ToList();
+
+                if (wiresToDelete.Count > 0)
+                    graphModel.DeleteWires(wiresToDelete);
+
                 foreach (var wire in wiresToMove)
                 {
-                    oldPort ??= wire.GetPort(command.WireSideToMove);
                     wire.SetPort(command.WireSideToMove, command.NewPortModel);
-
-                    if (oldPort.PortType == PortType.MissingPort)
-                    {
-                        var nodeModel = oldPort.NodeModel;
-                        if (nodeModel != null && nodeModel.RemoveUnusedMissingPort(oldPort))
-                            graphUpdater.MarkChanged(nodeModel, ChangeHint.GraphTopology);
-                    }
-                    graphUpdater.MarkChanged(wire, ChangeHint.GraphTopology);
                 }
 
-                graphUpdater.MarkChanged(oldPort, ChangeHint.GraphTopology);
-                graphUpdater.MarkChanged(command.NewPortModel, ChangeHint.GraphTopology);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
 
@@ -353,23 +402,12 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 undoStateUpdater.SaveState(graphModelState);
             }
 
+            var graphModel = graphModelState.GraphModel;
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModel.ChangeDescriptionScope)
             {
-                foreach (var wire in command.Models)
-                {
-                    if (wire.ToPort != null)
-                    {
-                        graphUpdater.MarkChanged(wire.ToPort, ChangeHint.GraphTopology);
-                    }
-
-                    if (wire.FromPort != null)
-                    {
-                        graphUpdater.MarkChanged(wire.FromPort, ChangeHint.GraphTopology);
-                    }
-                }
-
-                var deletedElements = graphModelState.GraphModel.DeleteWires(command.Models);
-                graphUpdater.MarkDeleted(deletedElements);
+                graphModel.DeleteWires(command.Models);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -444,11 +482,10 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 }
 
                 using (var graphUpdater = graphModelState.UpdateScope)
+                using (var changeScope = graphModelState.GraphModel.ChangeDescriptionScope)
                 {
                     fromPort.ReorderWire(command.WireModel, command.Type);
-
-                    graphUpdater.MarkChanged(siblingWires, ChangeHint.GraphTopology);
-                    graphUpdater.MarkChanged(fromPort.NodeModel, ChangeHint.GraphTopology);
+                    graphUpdater.MarkUpdated(changeScope.ChangeDescription);
                 }
             }
         }
@@ -497,18 +534,17 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                 undoStateUpdater.SaveState(graphModelState);
             }
 
+            var graphModel = graphModelState.GraphModel;
             using (var graphUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModel.ChangeDescriptionScope)
             {
-                var graphModel = graphModelState.GraphModel;
                 var wireInput = command.WireModel.ToPort;
                 var wireOutput = command.WireModel.FromPort;
-                var deletedModels = graphModel.DeleteWire(command.WireModel);
-                var wire1 = graphModel.CreateWire(wireInput, command.NodeModel.OutputsByDisplayOrder.First(p => p?.PortType == wireInput?.PortType));
-                var wire2 = graphModel.CreateWire(command.NodeModel.InputsByDisplayOrder.First(p => p?.PortType == wireOutput?.PortType), wireOutput);
+                graphModel.DeleteWire(command.WireModel);
+                graphModel.CreateWire(wireInput, command.NodeModel.OutputsByDisplayOrder.First(p => p?.PortType == wireInput?.PortType));
+                graphModel.CreateWire(command.NodeModel.InputsByDisplayOrder.First(p => p?.PortType == wireOutput?.PortType), wireOutput);
 
-                graphUpdater.MarkDeleted(deletedModels);
-                graphUpdater.MarkNew(wire1);
-                graphUpdater.MarkNew(wire2);
+                graphUpdater.MarkUpdated(changeScope.ChangeDescription);
             }
         }
     }
@@ -530,6 +566,11 @@ class ConvertWiresToPortalsCommand : UndoableCommand
         /// </summary>
         public List<(WireModel wire, Vector2 startPortPos, Vector2 endPortPos)> WireData;
 
+        /// <summary>
+        /// The <see cref="GraphView"/> that will contain the portals.
+        /// </summary>
+        public GraphView GraphView;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ConvertWiresToPortalsCommand"/> class.
         /// </summary>
@@ -542,9 +583,11 @@ public ConvertWiresToPortalsCommand()
         /// Initializes a new instance of the <see cref="ConvertWiresToPortalsCommand"/> class.
         /// </summary>
         /// <param name="wireData">A list of tuple, each tuple containing the wire to convert, the position of the entry portal node and the position of the exit portal node.</param>
-        public ConvertWiresToPortalsCommand(IReadOnlyList<(WireModel, Vector2, Vector2)> wireData) : this()
+        /// <param name="graphView">The <see cref="GraphView"/> that will contain the portals.</param>
+        public ConvertWiresToPortalsCommand(IReadOnlyList<(WireModel, Vector2, Vector2)> wireData, GraphView graphView) : this()
         {
             WireData = wireData?.ToList();
+            GraphView = graphView;
             UndoString = (WireData?.Count ?? 0) <= 1 ? k_UndoStringSingular : k_UndoStringPlural;
         }
 
@@ -552,10 +595,11 @@ public ConvertWiresToPortalsCommand(IReadOnlyList<(WireModel, Vector2, Vector2)>
         /// Default command handler.
         /// </summary>
         /// <param name="undoState">The undo state component.</param>
+        /// <param name="graphViewState">The graph view state component.</param>
         /// <param name="graphModelState">The graph model state component.</param>
         /// <param name="selectionState">The selection state component.</param>
         /// <param name="command">The command.</param>
-        public static void DefaultCommandHandler(UndoStateComponent undoState, GraphModelStateComponent graphModelState, SelectionStateComponent selectionState, ConvertWiresToPortalsCommand command)
+        public static void DefaultCommandHandler(UndoStateComponent undoState, GraphViewStateComponent graphViewState, GraphModelStateComponent graphModelState, SelectionStateComponent selectionState, ConvertWiresToPortalsCommand command)
         {
             if (command.WireData == null || !command.WireData.Any())
                 return;
@@ -566,39 +610,24 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
             }
 
             var createdElements = new List<GraphElementModel>();
-            using (var updater = graphModelState.UpdateScope)
+            var graphModel = graphModelState.GraphModel;
+
+            var elementsToFrame = new List<GraphElement>();
+            if (command.GraphView != null)
+                elementsToFrame = WireCommandHelper_Internal.GetElementsToFrameDuringPortalsCreation(command.WireData.Select(d => d.wire).ToList(), command.GraphView);
+
+            using (var graphModelUpdater = graphModelState.UpdateScope)
+            using (var changeScope = graphModel.ChangeDescriptionScope)
             {
-                var graphModel = graphModelState.GraphModel;
                 var existingPortalEntries = new Dictionary<PortModel, WirePortalModel>();
                 var existingPortalExits = new Dictionary<PortModel, List<WirePortalModel>>();
 
-                var newModels = new List<GraphElementModel>(command.WireData.Count * 5); // Estimate of the list size to avoid reallocation. There will usually be 5 elements created per wire: two portals, two new wires and a portal declaration model.
-                var modelsToDelete = new List<GraphElementModel>();
-                var modelsToChange = new List<GraphElementModel>();
-                var changeHintList = new List<ChangeHint>();
-
-                foreach (var changeDescription in command.WireData.Select(wireModel =>
+                foreach (var wireModel in command.WireData)
                     graphModel.CreatePortalsFromWire(
                         wireModel.wire,
                         wireModel.startPortPos + k_EntryPortalBaseOffset,
                         wireModel.endPortPos + k_ExitPortalBaseOffset,
-                        k_PortalHeight, existingPortalEntries, existingPortalExits)))
-                {
-                    newModels.AddRange(changeDescription.NewModels);
-
-                    if (changeDescription.DeletedModels != null)
-                        modelsToDelete.AddRange(changeDescription.DeletedModels);
-
-                    if (changeDescription.ChangedModels != null)
-                    {
-                        var (model, changeHints) = changeDescription.ChangedModels.FirstOrDefault();
-                        if (model != null && changeHints != null)
-                        {
-                            modelsToChange.Add(model);
-                            changeHintList.AddRange(changeHints);
-                        }
-                    }
-                }
+                        k_PortalHeight, existingPortalEntries, existingPortalExits);
 
                 // Adjust placement in case of multiple incoming exit portals so they don't overlap
                 foreach (var portalList in existingPortalExits.Values.Where(l => l.Count > 1))
@@ -614,10 +643,18 @@ public static void DefaultCommandHandler(UndoStateComponent undoState, GraphMode
                     }
                 }
 
-                updater.MarkDeleted(modelsToDelete);
-                updater.MarkChanged(modelsToChange, changeHintList);
-                updater.MarkNew(newModels);
-                createdElements.AddRange(newModels.OfType<AbstractNodeModel>());
+                graphModelUpdater.MarkUpdated(changeScope.ChangeDescription);
+                createdElements.AddRange(changeScope.ChangeDescription.NewModels.OfType<AbstractNodeModel>());
+            }
+
+            if (command.GraphView != null && elementsToFrame.Any())
+            {
+                using (var graphViewUpdater = graphViewState.UpdateScope)
+                {
+                    command.GraphView.CalculateFrameTransformToFitElements(elementsToFrame, out var frameTranslation, out var frameScaling, 0.75f);
+                    graphViewUpdater.Position = frameTranslation;
+                    graphViewUpdater.Scale = frameScaling;
+                }
             }
 
             if (createdElements.Any())
diff --git a/Modules/GraphToolsFoundationEditor/UI/Factory/ModelInspectorCreateSectionFactoryExtensions.cs b/Modules/GraphToolsFoundationEditor/UI/Factory/ModelInspectorCreateSectionFactoryExtensions.cs
index 18d283a9c1..e673cdabee 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Factory/ModelInspectorCreateSectionFactoryExtensions.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Factory/ModelInspectorCreateSectionFactoryExtensions.cs
@@ -36,9 +36,9 @@ public static MultipleModelsView CreateSectionInspector(this ElementBuilder elem
             {
                 switch (inspectorSectionContext.Section.SectionType)
                 {
-                    case SectionType.Settings:
+                    case SectionType.Options:
                         {
-                            var inspectorFields = SerializedFieldsInspector.Create(ModelInspector.fieldsPartName, models, ui.RootView, ModelInspector.ussClassName, ModelInspectorView.BasicSettingsFilter);
+                            var inspectorFields = SerializedFieldsInspector.Create(ModelInspector.fieldsPartName, models, ui.RootView, ModelInspector.ussClassName, ModelInspectorView.NodeOptionsFilter);
                             ui.PartList.AppendPart(inspectorFields);
                             break;
                         }
@@ -77,9 +77,9 @@ public static MultipleModelsView CreateSectionInspector(this ElementBuilder elem
             {
                 switch (inspectorSectionContext.Section.SectionType)
                 {
-                    case SectionType.Settings:
+                    case SectionType.Options:
                         {
-                            var inspectorFields = SerializedFieldsInspector.Create(ModelInspector.fieldsPartName, models, ui.RootView, ModelInspector.ussClassName, ModelInspectorView.BasicSettingsFilter);
+                            var inspectorFields = SerializedFieldsInspector.Create(ModelInspector.fieldsPartName, models, ui.RootView, ModelInspector.ussClassName, ModelInspectorView.NodeOptionsFilter);
                             ui.PartList.AppendPart(inspectorFields);
                             break;
                         }
@@ -115,7 +115,7 @@ public static MultipleModelsView CreateSectionInspector(this ElementBuilder elem
                 {
                     case SectionType.Properties:
                         {
-                            var inspectorFields = SerializedFieldsInspector.Create(ModelInspector.fieldsPartName, models, ui.RootView, ModelInspector.ussClassName, ModelInspectorView.BasicSettingsFilter);
+                            var inspectorFields = SerializedFieldsInspector.Create(ModelInspector.fieldsPartName, models, ui.RootView, ModelInspector.ussClassName, ModelInspectorView.NodeOptionsFilter);
                             ui.PartList.AppendPart(inspectorFields);
                             break;
                         }
@@ -151,7 +151,7 @@ public static MultipleModelsView CreateSectionInspector(this ElementBuilder elem
                 {
                     case SectionType.Properties:
                     {
-                        var inspectorFields = WireFieldsInspector.Create(ModelInspector.fieldsPartName, models, ui.RootView, ModelInspector.ussClassName, ModelInspectorView.BasicSettingsFilter);
+                        var inspectorFields = WireFieldsInspector.Create(ModelInspector.fieldsPartName, models, ui.RootView, ModelInspector.ussClassName, ModelInspectorView.NodeOptionsFilter);
                         ui.PartList.AppendPart(inspectorFields);
                         break;
                     }
@@ -163,5 +163,28 @@ public static MultipleModelsView CreateSectionInspector(this ElementBuilder elem
 
             return ui;
         }
+
+        /// <summary>
+        /// Creates a new inspector for some <see cref="PlacematModel"/>s.
+        /// </summary>
+        /// <param name="elementBuilder">The element builder.</param>
+        /// <param name="models">The models for which we want to create an inspector UI.</param>
+        /// <returns>An inspector UI for the node.</returns>
+        public static MultipleModelsView CreateSectionInspector(this ElementBuilder elementBuilder, IEnumerable<PlacematModel> models)
+        {
+            var ui = new ModelInspector();
+            ui.Setup(models, elementBuilder.View as ModelInspectorView, elementBuilder.Context);
+
+            if (elementBuilder.Context is InspectorSectionContext && models.Any())
+            {
+                var inspectorFields = PlacematFieldsInspector.Create(ModelInspector.fieldsPartName, models, ui.RootView, ModelInspector.ussClassName, ModelInspectorView.AdvancedSettingsFilter);
+                ui.PartList.AppendPart(inspectorFields);
+            }
+
+            ui.BuildUI();
+            ui.UpdateFromModel();
+
+            return ui;
+        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/Manipulators/FreehandSelector.cs b/Modules/GraphToolsFoundationEditor/UI/Manipulators/FreehandSelector.cs
index 2bed1e3063..5b3b4e4a50 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Manipulators/FreehandSelector.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Manipulators/FreehandSelector.cs
@@ -22,6 +22,8 @@ class FreehandSelector : MouseManipulator
         bool m_Active;
         GraphView m_GraphView;
 
+        GraphViewPanHelper_Internal m_PanHelper = new GraphViewPanHelper_Internal();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="FreehandSelector"/> class.
         /// </summary>
@@ -78,6 +80,7 @@ protected void OnMouseDown(MouseDownEvent e)
 
             if (CanStartManipulation(e))
             {
+                m_GraphView.StartMergingUndoableCommands();
                 m_GraphView.Dispatch(new ClearSelectionCommand());
 
                 m_GraphView.ContentViewContainer.Add(m_FreehandElement);
@@ -89,6 +92,7 @@ protected void OnMouseDown(MouseDownEvent e)
                 m_Active = true;
                 target.CaptureMouse();
                 e.StopImmediatePropagation();
+                m_PanHelper.OnMouseDown(e, m_GraphView, Pan);
             }
         }
 
@@ -140,12 +144,14 @@ protected void OnMouseUp(MouseUpEvent e)
             }
             else
             {
-                m_GraphView.Dispatch(new SelectElementsCommand(SelectElementsCommand.SelectionMode.Add, selectedModels));
+                m_GraphView.Dispatch(new SelectElementsCommand(SelectElementsCommand.SelectionMode.Replace, selectedModels));
             }
+            m_GraphView.StopMergingUndoableCommands();
 
             m_Active = false;
             target.ReleaseMouse();
             e.StopPropagation();
+            m_PanHelper.OnMouseUp(e);
         }
 
         /// <summary>
@@ -162,6 +168,7 @@ protected void OnMouseMove(MouseMoveEvent e)
             m_FreehandElement.MarkDirtyRepaint();
 
             e.StopPropagation();
+            m_PanHelper.OnMouseMove(e);
         }
 
         /// <summary>
@@ -189,6 +196,12 @@ public void MarkDirtyRepaint()
             m_FreehandElement?.MarkDirtyRepaint();
         }
 
+        void Pan(TimerState obj)
+        {
+            m_FreehandElement.Points.Add(m_GraphView.ChangeCoordinatesTo(m_GraphView.ContentViewContainer, m_PanHelper.LastLocalMousePosition));
+            MarkDirtyRepaint();
+        }
+
         class FreehandElement : VisualElement
         {
             public List<Vector2> Points { get; } = new List<Vector2>();
diff --git a/Modules/GraphToolsFoundationEditor/UI/Manipulators/GraphViewPanHelper_Internal.cs b/Modules/GraphToolsFoundationEditor/UI/Manipulators/GraphViewPanHelper_Internal.cs
new file mode 100644
index 0000000000..91d2850137
--- /dev/null
+++ b/Modules/GraphToolsFoundationEditor/UI/Manipulators/GraphViewPanHelper_Internal.cs
@@ -0,0 +1,80 @@
+// 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;
+
+namespace Unity.GraphToolsFoundation.Editor
+{
+    class GraphViewPanHelper_Internal
+    {
+        IVisualElementScheduledItem m_PanSchedule;
+        GraphView m_GraphView;
+        Action<TimerState> m_OnPan;
+
+        public Vector2 CurrentPanSpeed { get; private set; } = Vector2.zero;
+        public Vector2 LastLocalMousePosition { get; private set; }
+
+        public void OnMouseDown(IMouseEvent e, GraphView graphView, Action<TimerState> onPan)
+        {
+            if (graphView == null)
+                return;
+
+            m_GraphView = graphView;
+            m_OnPan = onPan;
+
+            if (m_PanSchedule == null)
+            {
+                var panInterval = GraphView.panIntervalMs_Internal;
+                m_PanSchedule = m_GraphView.schedule.Execute(Pan).Every(panInterval).StartingIn(panInterval);
+                m_PanSchedule.Pause();
+            }
+
+            LastLocalMousePosition = e.localMousePosition;
+        }
+
+        public void OnMouseMove(IMouseEvent e)
+        {
+            if (m_GraphView == null)
+                return;
+
+            LastLocalMousePosition = e.localMousePosition;
+            CurrentPanSpeed = m_GraphView.GetEffectivePanSpeed_Internal(e.mousePosition);
+            if (CurrentPanSpeed != Vector2.zero)
+            {
+                m_PanSchedule.Resume();
+            }
+            else
+            {
+                m_PanSchedule.Pause();
+            }
+        }
+
+        public void OnMouseUp(IMouseEvent e)
+        {
+            LastLocalMousePosition = e.localMousePosition;
+            Stop();
+        }
+
+        public void Stop()
+        {
+            m_PanSchedule?.Pause();
+            m_OnPan = null;
+        }
+
+        void Pan(TimerState timerState)
+        {
+            if (m_GraphView == null)
+                return;
+
+            var travelThisFrame = CurrentPanSpeed * timerState.deltaTime;
+            var position = m_GraphView.ContentViewContainer.transform.position - (Vector3)travelThisFrame;
+            var scale = m_GraphView.ContentViewContainer.transform.scale;
+            m_GraphView.Dispatch(new ReframeGraphViewCommand(position, scale));
+
+            m_OnPan?.Invoke(timerState);
+        }
+    }
+}
diff --git a/Modules/GraphToolsFoundationEditor/UI/Manipulators/RectangleSelector.cs b/Modules/GraphToolsFoundationEditor/UI/Manipulators/RectangleSelector.cs
index bf361d56d4..a683b3168a 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Manipulators/RectangleSelector.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Manipulators/RectangleSelector.cs
@@ -21,6 +21,8 @@ class RectangleSelector : MouseManipulator
         readonly RectangleSelect m_Rectangle;
         bool m_Active;
 
+        GraphViewPanHelper_Internal m_PanHelper = new GraphViewPanHelper_Internal();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RectangleSelector"/> class.
         /// </summary>
@@ -96,6 +98,7 @@ protected void OnMouseDown(MouseDownEvent e)
 
             if (CanStartManipulation(e))
             {
+                graphView.StartMergingUndoableCommands();
                 if (!e.actionKey)
                 {
                     graphView.Dispatch(new ClearSelectionCommand());
@@ -109,6 +112,7 @@ protected void OnMouseDown(MouseDownEvent e)
                 m_Active = true;
                 target.CaptureMouse(); // We want to receive events even when mouse is not over ourself.
                 e.StopImmediatePropagation();
+                m_PanHelper.OnMouseDown(e, graphView, Pan);
             }
         }
 
@@ -149,7 +153,7 @@ protected void OnMouseUp(MouseUpEvent e)
             }
             k_OnMouseUpAllUIs.Clear();
 
-            var mode = e.actionKey ? SelectElementsCommand.SelectionMode.Toggle : SelectElementsCommand.SelectionMode.Add;
+            var mode = e.actionKey ? SelectElementsCommand.SelectionMode.Toggle : SelectElementsCommand.SelectionMode.Replace;
             var allSelectedModels = newSelection
                 .Select(elem => elem.Model)
                 .OfType<GraphElementModel>()
@@ -171,11 +175,14 @@ protected void OnMouseUp(MouseUpEvent e)
                 .Where(m => m is not WireModel wire
                             || PortIsSelected(wire.FromPort) && PortIsSelected(wire.ToPort))
                 .ToList();
+
             graphView.Dispatch(new SelectElementsCommand(mode, modelsToSelect));
+            graphView.StopMergingUndoableCommands();
 
             m_Active = false;
             target.ReleaseMouse();
             e.StopPropagation();
+            m_PanHelper.OnMouseUp(e);
         }
 
         static void RecurseAddGraphContainerChildren(PortNodeModel node, HashSet<PortNodeModel> nodeModels)
@@ -200,6 +207,7 @@ protected void OnMouseMove(MouseMoveEvent e)
 
             m_Rectangle.End = graphView.ChangeCoordinatesTo(graphView.ContentViewContainer, e.localMousePosition);
             e.StopPropagation();
+            m_PanHelper.OnMouseMove(e);
         }
 
         public void MarkDirtyRepaint()
@@ -207,6 +215,14 @@ public void MarkDirtyRepaint()
             m_Rectangle?.MarkDirtyRepaint();
         }
 
+        void Pan(TimerState timerState)
+        {
+            if (target is not GraphView graphView)
+                return;
+
+            m_Rectangle.End = graphView.ChangeCoordinatesTo(graphView.ContentViewContainer, m_PanHelper.LastLocalMousePosition);
+        }
+
         class RectangleSelect : VisualElement
         {
             static readonly CustomStyleProperty<Color> k_FillColorProperty = new CustomStyleProperty<Color>("--fill-color");
diff --git a/Modules/GraphToolsFoundationEditor/UI/Manipulators/SelectionDragger.cs b/Modules/GraphToolsFoundationEditor/UI/Manipulators/SelectionDragger.cs
index 3ffff72813..26364c8877 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Manipulators/SelectionDragger.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Manipulators/SelectionDragger.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using UnityEditor;
+using Unity.CommandStateObserver;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -21,8 +21,9 @@ class SelectionDragger : MouseManipulator
         ISelectionDraggerTarget m_CurrentSelectionDraggerTarget;
         bool m_Dragging;
         readonly Snapper_Internal m_Snapper = new Snapper_Internal();
-
         bool m_Active;
+        bool m_ElementsToMoveDirty;
+        HashSet<GraphElement> m_ElementsToMove = new HashSet<GraphElement>();
 
         // selectedElement is used to store a unique selection candidate for cases where user clicks on an item not to
         // drag it but just to reset the selection -- we only know this after the manipulation has ended
@@ -38,6 +39,9 @@ class SelectionDragger : MouseManipulator
         Vector2 m_MouseStartInGraph;
         Vector2 m_TotalMouseDelta;
         Vector2 m_LastMousePosition;
+        bool m_MoveOnlyPlacemats;
+
+        List<GraphElementModel> m_PreviousSelection = new List<GraphElementModel>();
 
         /// <summary>
         /// Elements to be dragged and their initial position
@@ -50,6 +54,8 @@ struct MovingElement
             public Vector2 InitialPosition;
         }
 
+        SelectionObserver m_SelectionObserver;
+
         public bool IsActive => m_Active;
 
         ISelectionDraggerTarget GetTargetAt(Vector2 mousePosition, IReadOnlyList<ModelView> exclusionList)
@@ -89,6 +95,27 @@ ISelectionDraggerTarget GetTargetAt(Vector2 mousePosition, IReadOnlyList<ModelVi
             return selectionDraggerTarget;
         }
 
+
+        class SelectionObserver : StateObserver
+        {
+            SelectionDragger m_SelectionDragger;
+            SelectionStateComponent m_SelectionState;
+            public SelectionObserver(GraphView gv,SelectionDragger sd):
+                base(gv?.GraphViewModel?.SelectionState)
+            {
+                m_SelectionDragger = sd;
+                m_SelectionState = gv?.GraphViewModel?.SelectionState;
+            }
+
+            public override void Observe()
+            {
+                using (var selectionObservation = this.ObserveState(m_SelectionState))
+                {
+                    if( selectionObservation.UpdateType != UpdateType.None)
+                        m_SelectionDragger.m_ElementsToMoveDirty = true;
+                }
+            }
+        }
         public SelectionDragger(GraphView graphView)
         {
             activators.Add(new ManipulatorActivationFilter { button = MouseButton.LeftMouse });
@@ -106,6 +133,19 @@ public SelectionDragger(GraphView graphView)
             m_MovingElements = new List<MovingElement>();
             m_SelectedMovingElementIndex = 0;
 
+            m_SelectionObserver = new SelectionObserver(graphView, this);
+        }
+
+        public void RegisterObservers(ObserverManager observerManager)
+        {
+            if( m_SelectionObserver != null)
+                observerManager.RegisterObserver(m_SelectionObserver);
+        }
+
+        public void UnregisterObservers(ObserverManager observerManager)
+        {
+            if( m_SelectionObserver != null)
+                observerManager.UnregisterObserver(m_SelectionObserver);
         }
 
         /// <inheritdoc />
@@ -166,6 +206,12 @@ public void AddSnapStrategy(SnapStrategy strategy)
             m_Snapper.AddSnapStrategy(strategy);
         }
 
+
+        public void SetSelectionDirty()
+        {
+            m_ElementsToMoveDirty = true;
+        }
+
         /// <summary>
         /// Removes a snap strategy to the selection dragger.
         /// </summary>
@@ -213,30 +259,34 @@ protected void OnMouseDown(MouseDownEvent e)
                 if (!clickedElement.IsMovable() || !clickedElement.ContainsPoint(clickedElement.WorldToLocal(e.mousePosition)))
                     return;
 
-                var selection = m_GraphView.GetSelection();
+                // In the case of a drag starting on an unselected element, the m_SelectionObserver notification will be too late, and the selection will indeed probably change.
+                if (!m_PreviousSelection.Contains(clickedElement.Model))
+                {
+                    m_ElementsToMoveDirty = true;
+                }
 
-                var elementsToMove = new HashSet<GraphElement>(selection
-                    .Select(model => model.GetView_Internal(m_GraphView))
-                    .OfType<GraphElement>()
-                    .Where(t=> !(t is Wire) && t.IsMovable()));
+                if (m_ElementsToMoveDirty || e.shiftKey != m_MoveOnlyPlacemats)
+                {
+                    var selection = m_GraphView.GetSelection();
+                    m_ElementsToMoveDirty = false;
+                    m_PreviousSelection.Clear();
+                    m_PreviousSelection.AddRange(selection);
+                    m_MoveOnlyPlacemats = e.shiftKey;
+                    RefreshElementsToMove(selection);
+                }
 
-                if (!elementsToMove.Any())
+                if (!m_ElementsToMove.Any())
                     return;
 
+                m_MovingElements.Clear();
+                if (m_ElementsToMove.Count > m_MovingElements.Capacity)
+                    m_MovingElements.Capacity = m_ElementsToMove.Count;
 
                 m_TotalMouseDelta = Vector2.zero;
                 m_SelectedMovingElementIndex = 0;
                 m_TotalFreePanTravel = Vector2.zero;
 
-                var selectedPlacemats = new HashSet<Placemat>(elementsToMove.OfType<Placemat>());
-                foreach (var placemat in selectedPlacemats)
-                    placemat.GetElementsToMove_Internal(e.shiftKey, elementsToMove);
-
-                m_MovingElements.Clear();
-                if (elementsToMove.Count > m_MovingElements.Capacity)
-                    m_MovingElements.Capacity = elementsToMove.Count;
-
-                foreach (GraphElement ce in elementsToMove)
+                foreach (GraphElement ce in m_ElementsToMove)
                 {
                     ce.PositionIsOverriddenByManipulator = true;
 
@@ -266,6 +316,23 @@ protected void OnMouseDown(MouseDownEvent e)
             }
         }
 
+        void RefreshElementsToMove(IEnumerable<GraphElementModel> selection)
+        {
+            m_ElementsToMove.Clear();
+
+            m_ElementsToMove.UnionWith(selection
+                .Select(model => model.GetView_Internal(m_GraphView))
+                .OfType<GraphElement>()
+                .Where(t => !(t is Wire) && t.IsMovable()));
+
+            if( ! m_ElementsToMove.Any())
+                return;
+
+            var selectedPlacemats = new HashSet<Placemat>(m_ElementsToMove.OfType<Placemat>());
+            foreach (var placemat in selectedPlacemats)
+                placemat.GetElementsToMove_Internal(m_MoveOnlyPlacemats, m_ElementsToMove);
+        }
+
         IVisualElementScheduledItem m_PanSchedule;
         /// <summary>
         /// The offset by which the graphview should be panned based on the last mouse move.
@@ -289,6 +356,8 @@ protected void OnMouseMove(MouseMoveEvent e)
             if (m_GraphView == null)
                 return;
 
+            m_ElementsToMoveDirty = false;
+
             if ((e.pressedButtons & (1 << (int) MouseButton.MiddleMouse)) != 0)
             {
                 OnMouseUp(e);
diff --git a/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireConnector.cs b/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireConnector.cs
index 3e696cc22c..f5ab914468 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireConnector.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireConnector.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;
@@ -40,8 +41,6 @@ internal void SetWireDragHelper_Internal(WireDragHelper helper)
         /// <inheritdoc />
         protected override void RegisterCallbacksOnTarget()
         {
-            target.RegisterCallback<MouseEnterEvent>(OnMouseEnter);
-            target.RegisterCallback<MouseLeaveEvent>(OnMouseLeave);
             target.RegisterCallback<MouseDownEvent>(OnMouseDown);
             target.RegisterCallback<MouseMoveEvent>(OnMouseMove);
             target.RegisterCallback<MouseUpEvent>(OnMouseUp);
@@ -53,8 +52,6 @@ protected override void RegisterCallbacksOnTarget()
         /// <inheritdoc />
         protected override void UnregisterCallbacksFromTarget()
         {
-            target.UnregisterCallback<MouseEnterEvent>(OnMouseEnter);
-            target.UnregisterCallback<MouseLeaveEvent>(OnMouseLeave);
             target.UnregisterCallback<MouseDownEvent>(OnMouseDown);
             target.UnregisterCallback<MouseMoveEvent>(OnMouseMove);
             target.UnregisterCallback<MouseUpEvent>(OnMouseUp);
@@ -82,7 +79,7 @@ protected virtual void OnMouseDown(MouseDownEvent e)
                 return;
             }
 
-            // Check if the mouse is over the port hitbox.
+            // Check if the mouse is over the port hit box.
             if (!Port.GetPortHitBoxBounds(port, true).Contains(e.mousePosition))
             {
                 return;
@@ -95,6 +92,8 @@ protected virtual void OnMouseDown(MouseDownEvent e)
 
             if (WireDragHelper.HandleMouseDown(e))
             {
+                // Disable all wires except the dragged one.
+                WireDragHelper.EnableAllWires_Internal(WireDragHelper.GraphView, false, new List<WireModel> { WireDragHelper.WireCandidateModel });
                 m_Active = true;
                 target.CaptureMouse();
                 e.StopPropagation();
@@ -105,16 +104,6 @@ protected virtual void OnMouseDown(MouseDownEvent e)
             }
         }
 
-        void OnMouseLeave(MouseLeaveEvent e)
-        {
-            SetHoveringOnPortHitBox(e.mousePosition, true);
-        }
-
-        void OnMouseEnter(MouseEnterEvent e)
-        {
-            SetHoveringOnPortHitBox(e.mousePosition);
-        }
-
         void OnCaptureOut(MouseCaptureOutEvent e)
         {
             StopManipulation(true);
@@ -122,8 +111,6 @@ void OnCaptureOut(MouseCaptureOutEvent e)
 
         protected virtual void OnMouseMove(MouseMoveEvent e)
         {
-            SetHoveringOnPortHitBox(e.mousePosition);
-
             if (!m_Active) return;
             WireDragHelper.HandleMouseMove(e);
             e.StopPropagation();
@@ -175,15 +162,6 @@ bool CanPerformConnection(Vector2 mousePosition)
             return Vector2.Distance(m_MouseDownPosition, mousePosition) > connectionDistanceThreshold_Internal;
         }
 
-        void SetHoveringOnPortHitBox(Vector2 mousePosition, bool endHover = false)
-        {
-            var port = target.GetFirstAncestorOfType<Port>();
-            if (port == null || port.PortModel.Capacity == PortCapacity.None)
-                return;
-
-            port.GetPortConnectorPart().Hovering = !endHover && Port.GetPortHitBoxBounds(port, true).Contains(mousePosition);
-        }
-
         void StopManipulation(bool abort)
         {
             if (!m_Active)
diff --git a/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireDragHelper.cs b/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireDragHelper.cs
index d7b27e3ac4..5274118daa 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireDragHelper.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireDragHelper.cs
@@ -19,11 +19,10 @@ class WireDragHelper
         List<PortModel> m_CompatiblePorts;
         GhostWireModel m_GhostWireModel;
         Wire m_GhostWire;
-        GraphView GraphView { get; }
+        public GraphView GraphView { get; }
         readonly Func<GraphModel, GhostWireModel> m_GhostWireViewModelCreator;
 
-        IVisualElementScheduledItem m_PanSchedule;
-        Vector2 m_PanDiff = Vector2.zero;
+        GraphViewPanHelper_Internal m_PanHelper = new GraphViewPanHelper_Internal();
 
         public WireDragHelper(GraphView graphView, Func<GraphModel, GhostWireModel> ghostWireViewModelCreator)
         {
@@ -51,6 +50,8 @@ Wire CreateGhostWire(GraphModel graphModel)
 
         GhostWireModel m_WireCandidateModel;
         Wire m_WireCandidate;
+        PortModel m_PreviousEndPortModel;
+
         public GhostWireModel WireCandidateModel => m_WireCandidateModel;
 
         public void CreateWireCandidate(GraphModel graphModel)
@@ -72,14 +73,12 @@ public void Reset()
         {
             if (m_AllPorts != null)
             {
-                // Reset the highlights.
                 for (var i = 0; i < m_AllPorts.Count; i++)
                 {
                     var pv = m_AllPorts[i].GetView<Port>(GraphView);
                     if (pv != null)
                     {
                         pv.SetEnabled(true);
-                        pv.Highlighted = false;
                     }
                 }
                 m_AllPorts = null;
@@ -96,7 +95,12 @@ public void Reset()
                 GraphView.RemoveElement(m_WireCandidate);
             }
 
-            m_PanSchedule?.Pause();
+            if (WireCandidateModel != null && m_GhostWireModel != null)
+            {
+                ClearWillConnect(m_GhostWireModel, WireCandidateModel.ToPort == null ? WireSide.To : WireSide.From);
+            }
+
+            m_PanHelper.Stop();
 
             if (draggedPort != null)
             {
@@ -106,9 +110,16 @@ public void Reset()
 
             m_GhostWire = null;
             ClearWireCandidate();
+            EnableAllWires_Internal(GraphView);
         }
 
-        public bool HandleMouseDown(MouseDownEvent evt)
+        /// <summary>
+        /// Handles mouse down event.
+        /// </summary>
+        /// <param name="evt">The mouse down event.</param>
+        /// <param name="compatiblePortsFilter">The predicate that filters the compatible ports. Ports that don't match the predicate are discarded.</param>
+        /// <returns></returns>
+        public bool HandleMouseDown(MouseDownEvent evt, Predicate<PortModel> compatiblePortsFilter = null)
         {
             var mousePosition = evt.mousePosition;
 
@@ -141,13 +152,15 @@ public bool HandleMouseDown(MouseDownEvent evt)
                 WireCandidateModel.ToPort = draggedPort;
             }
 
-            var portUI = draggedPort.GetView<Port>(GraphView);
-            if (portUI != null)
-                portUI.WillConnect = true;
-
             m_AllPorts = GraphView.GraphModel.GetPortModels().ToList();
             m_CompatiblePorts = GraphView.GraphModel.GetCompatiblePorts(m_AllPorts, draggedPort);
 
+            // Filter compatible ports
+            if (compatiblePortsFilter != null)
+            {
+                m_CompatiblePorts = m_CompatiblePorts.FindAll(compatiblePortsFilter);
+            }
+
             // Only light compatible anchors when dragging a wire.
             for (var i = 0; i < m_AllPorts.Count; i++)
             {
@@ -155,7 +168,6 @@ public bool HandleMouseDown(MouseDownEvent evt)
                 if (pv != null)
                 {
                     pv.SetEnabled(false);
-                    pv.Highlighted = false;
                 }
             }
 
@@ -165,19 +177,20 @@ public bool HandleMouseDown(MouseDownEvent evt)
                 if (pv != null)
                 {
                     pv.SetEnabled(true);
-                    pv.Highlighted = true;
                 }
             }
 
-            m_WireCandidate.UpdateFromModel();
-
-            if (m_PanSchedule == null)
+            var portUI = draggedPort.GetView<Port>(GraphView);
+            if (portUI != null)
             {
-                var panInterval = GraphView.panIntervalMs_Internal;
-                m_PanSchedule = GraphView.schedule.Execute(Pan).Every(panInterval).StartingIn(panInterval);
-                m_PanSchedule.Pause();
+                portUI.WillConnect = true;
+                portUI.SetEnabled(true);
             }
 
+            m_WireCandidate.UpdateFromModel();
+
+            m_PanHelper.OnMouseDown(evt, GraphView, Pan);
+
             m_WireCandidate.Layer = Int32.MaxValue;
 
             return true;
@@ -185,16 +198,7 @@ public bool HandleMouseDown(MouseDownEvent evt)
 
         public void HandleMouseMove(MouseMoveEvent evt)
         {
-            m_PanDiff = GraphView.GetEffectivePanSpeed_Internal(evt.mousePosition);
-
-            if (m_PanDiff != Vector2.zero)
-            {
-                m_PanSchedule.Resume();
-            }
-            else
-            {
-                m_PanSchedule.Pause();
-            }
+            m_PanHelper.OnMouseMove(evt);
 
             var mousePosition = evt.mousePosition;
 
@@ -204,6 +208,9 @@ public void HandleMouseMove(MouseMoveEvent evt)
             // Draw ghost wire if possible port exists.
             var endPort = GetEndPort(mousePosition);
 
+            if (m_PreviousEndPortModel != null && m_PreviousEndPortModel != endPort?.PortModel)
+                ClearWillConnect(m_PreviousEndPortModel);
+
             if (endPort != null)
             {
                 if (m_GhostWire == null)
@@ -226,6 +233,7 @@ public void HandleMouseMove(MouseMoveEvent evt)
                 m_GhostWireModel.SetPort(otherSide, WireCandidateModel.GetPort(otherSide));
 
                 m_GhostWire.UpdateFromModel();
+                m_PreviousEndPortModel = endPort.PortModel;
             }
             else if (m_GhostWire != null && m_GhostWireModel != null)
             {
@@ -239,6 +247,21 @@ public void HandleMouseMove(MouseMoveEvent evt)
             }
         }
 
+        internal static void EnableAllWires_Internal(GraphView graphView, bool isEnabled = true, List<WireModel> exemptedWires = null)
+        {
+            if (graphView.GraphViewModel == null || graphView.GraphModel == null)
+                return;
+
+            foreach (var otherWire in graphView.GraphModel.WireModels)
+            {
+                if (exemptedWires == null || !exemptedWires.Contains(otherWire))
+                {
+                    var view = otherWire.GetView_Internal(graphView);
+                    view?.SetEnabled(isEnabled);
+                }
+            }
+        }
+
         void ClearWillConnect(WireModel wireModel)
         {
             ClearWillConnect(wireModel, WireSide.From);
@@ -259,11 +282,6 @@ void ClearWillConnect(PortModel portModel)
 
         void Pan(TimerState timerState)
         {
-            var travelThisFrame = m_PanDiff * timerState.deltaTime;
-            var position = GraphView.ContentViewContainer.transform.position - (Vector3)travelThisFrame;
-            var scale = GraphView.ContentViewContainer.transform.scale;
-            GraphView.UpdateViewTransform(position, scale);
-
             WireCandidateModel.GetView<Wire>(GraphView)?.UpdateFromModel();
         }
 
@@ -275,14 +293,12 @@ public void HandleMouseUp(MouseUpEvent evt, bool isFirstWire, IEnumerable<Wire>
             var scale = GraphView.ContentViewContainer.transform.scale;
             GraphView.Dispatch(new ReframeGraphViewCommand(position, scale));
 
-            // Reset the highlights.
             for (var i = 0; i < m_AllPorts.Count; i++)
             {
                 var pv = m_AllPorts[i].GetView<Port>(GraphView);
                 if (pv != null)
                 {
                     pv.SetEnabled(true);
-                    pv.Highlighted = false;
                 }
             }
 
@@ -315,7 +331,7 @@ public void HandleMouseUp(MouseUpEvent evt, bool isFirstWire, IEnumerable<Wire>
                         WireCandidateModel.ToPort = endPort.PortModel;
                 }
             }
-            
+
             // Let the first wire handle the batch command for all wires
             if (isFirstWire)
             {
@@ -357,6 +373,7 @@ public void HandleMouseUp(MouseUpEvent evt, bool isFirstWire, IEnumerable<Wire>
             ClearWireCandidate();
             m_CompatiblePorts = null;
             m_AllPorts = null;
+            m_PanHelper.OnMouseUp(evt);
             Reset();
 
             OriginalWire = null;
@@ -373,7 +390,7 @@ protected virtual void DropWiresOutside(IEnumerable<Wire> wires,
                 .Select(e => (e.wire.WireModel, e.port.Direction == PortDirection.Input ? WireSide.From : WireSide.To))
                 .ToList();
 
-            var wiresToDelete = wires.Where(w => w.IsGhostWire).Select(w => w.WireModel);
+            var wiresToDelete = wires.Where(w => w.IsGhostWire).Select(w => w.WireModel).ToList();
 
             stencil.CreateNodesFromWires(GraphView, wiresToConnect, worldPosition, wiresToDelete);
         }
@@ -399,16 +416,9 @@ Port GetEndPort(Vector2 mousePosition)
                 if (compatiblePortUI == null || compatiblePortUI.resolvedStyle.visibility != Visibility.Visible)
                     continue;
 
-                // Check if the mouse is over the port hitbox.
+                // Check if the mouse is over the port hit box.
                 if (Port.GetPortHitBoxBounds(compatiblePortUI).Contains(mousePosition))
-                {
-                    compatiblePortUI.GetPortConnectorPart().Hovering = true;
                     endPort = compatiblePortUI;
-                }
-                else
-                {
-                    compatiblePortUI.GetPortConnectorPart().Hovering = false;
-                }
             }
 
             return endPort;
diff --git a/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireManipulator.cs b/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireManipulator.cs
index 7fb52725be..0017c86a3d 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireManipulator.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Manipulators/WireManipulator.cs
@@ -145,7 +145,6 @@ protected void OnMouseMove(MouseMoveEvent evt)
                 PortModel connectedPort;
                 Port connectedPortUI;
 
-
                 if (m_DetachedFromInputPort)
                 {
                     connectedPort = m_Wire.Output;
@@ -169,40 +168,34 @@ protected void OnMouseMove(MouseMoveEvent evt)
                 m_ConnectedWireDragHelper.WireCandidateModel.EndPoint = evt.mousePosition;
 
                 // Redirect the last mouse down event to active the drag helper
-
-                if (m_ConnectedWireDragHelper.HandleMouseDown(m_LastMouseDownEvent))
+                var needsSetup = true;
+                if (m_ConnectedWireDragHelper.HandleMouseDown(m_LastMouseDownEvent, compatiblePort =>
+                    {
+                        // We do the setup once here as to avoid getting the additional draggers if HandleMouseDown fails.
+                        if (needsSetup)
+                        {
+                            m_AdditionalWireDragHelpers = GetAdditionalWireDragHelpers(m_DetachedPort, m_Wire, view, connectedPort.GraphModel, evt);
+                            needsSetup = false;
+                        }
+                        return FilterCompatiblePort(compatiblePort);
+                    }))
                 {
                     m_Active = true;
 
-                    if (m_DetachedPort.GetConnectedWires().Count() > 1)
+                    if (m_AdditionalWireDragHelpers != null)
                     {
-                        m_AdditionalWireDragHelpers = new List<WireDragHelper>();
-
-                        foreach (var wire in m_DetachedPort.GetConnectedWires())
-                        {
-                            var wireUI = wire.GetView<Wire>(view);
-                            if (wireUI != null && wireUI != m_Wire && wireUI.IsSelected())
-                            {
-                                var otherPort = m_DetachedPort == wire.ToPort ? wire.FromPort : wire.ToPort;
-
-                                var wireDragHelper = otherPort.GetView<Port>(view)?.WireConnector.WireDragHelper;
-
-                                if (wireDragHelper != null)
-                                {
-                                    wireDragHelper.OriginalWire = wireUI;
-                                    wireDragHelper.draggedPort = otherPort;
-                                    wireDragHelper.CreateWireCandidate(connectedPort.GraphModel);
-                                    wireDragHelper.WireCandidateModel.EndPoint = evt.mousePosition;
-
-                                    m_AdditionalWireDragHelpers.Add(wireDragHelper);
-                                }
-                            }
-                        }
                         foreach (var wireDrag in m_AdditionalWireDragHelpers)
                         {
-                            wireDrag.HandleMouseDown(m_LastMouseDownEvent);
+                            wireDrag.HandleMouseDown(m_LastMouseDownEvent, compatiblePort => FilterCompatiblePort(compatiblePort));
                         }
                     }
+
+                    var draggedWires = new List<WireModel> { m_ConnectedWireDragHelper.OriginalWire.WireModel };
+                    if (m_AdditionalWireDragHelpers != null)
+                        draggedWires.AddRange(m_AdditionalWireDragHelpers.Select(wireDrag => wireDrag.OriginalWire.WireModel));
+
+                    // Disable all wires except the dragged ones.
+                    WireDragHelper.EnableAllWires_Internal(m_ConnectedWireDragHelper.GraphView, false, draggedWires);
                 }
                 else
                 {
@@ -240,9 +233,10 @@ protected void OnMouseUp(MouseUpEvent evt)
                     {
                         m_ConnectedWireDragHelper.HandleMouseUp(evt, true, Enumerable.Empty<Wire>(), Enumerable.Empty<PortModel>());
                     }
+
+                    evt.StopPropagation();
                 }
                 Reset();
-                evt.StopPropagation();
             }
         }
 
@@ -280,13 +274,16 @@ void StopDragging()
             target.ReleaseMouse();
         }
 
-        bool MouseIsNearPorts(Port input, Port output, Vector2 referencePos, out float distanceFromInput, out float distanceFromOutput)
+        bool MouseIsNearPorts(Port input, Port output, Vector2 worldPos, out float distanceFromInput, out float distanceFromOutput)
         {
             distanceFromInput = float.NegativeInfinity;
             distanceFromOutput = float.NegativeInfinity;
 
-            var outputPos = new Vector2(output.GetGlobalCenter().x, output.GetGlobalCenter().y);
-            var inputPos = new Vector2(input.GetGlobalCenter().x, input.GetGlobalCenter().y);
+            var reference = input.GraphView.ContentViewContainer;
+
+            var outputPos = reference.WorldToLocal(output.GetGlobalCenter());
+            var inputPos = reference.WorldToLocal(input.GetGlobalCenter());
+            var referencePos = reference.WorldToLocal(worldPos);
 
             distanceFromOutput = (referencePos - outputPos).sqrMagnitude;
             distanceFromInput = (referencePos - inputPos).sqrMagnitude;
@@ -301,5 +298,44 @@ static void ChangeMouseCursorTo(BaseVisualElementPanel panel, int internalCursor
 
             panel.cursorManager.SetCursor(cursor);
         }
+
+        static List<WireDragHelper> GetAdditionalWireDragHelpers(PortModel detachedPort, Wire targetWire, RootView rootView, GraphModel graphModel, IMouseEvent evt)
+        {
+            var connectedWires = detachedPort.GetConnectedWires().ToList();
+            if (connectedWires.Count == 0)
+                return null;
+
+            var additionalWireDragHelpers = new List<WireDragHelper>();
+
+            foreach (var wire in connectedWires)
+            {
+                var wireUI = wire.GetView<Wire>(rootView);
+                if (wireUI != null && wireUI != targetWire && wireUI.IsSelected())
+                {
+                    var otherPort = detachedPort == wire.ToPort ? wire.FromPort : wire.ToPort;
+
+                    var wireDragHelper = otherPort.GetView<Port>(rootView)?.WireConnector.WireDragHelper;
+
+                    if (wireDragHelper != null)
+                    {
+                        wireDragHelper.OriginalWire = wireUI;
+                        wireDragHelper.draggedPort = otherPort;
+                        wireDragHelper.CreateWireCandidate(graphModel);
+                        wireDragHelper.WireCandidateModel.EndPoint = evt.mousePosition;
+
+                        additionalWireDragHelpers.Add(wireDragHelper);
+                    }
+                }
+            }
+
+            return additionalWireDragHelpers;
+        }
+
+        bool FilterCompatiblePort(PortModel compatiblePort)
+        {
+            if (m_AdditionalWireDragHelpers?.Count > 0)
+                return compatiblePort.Capacity == PortCapacity.Multi;
+            return true;
+        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/Blackboard.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/Blackboard.cs
index a9457efb8f..45ebb4448b 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/Blackboard.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/Blackboard.cs
@@ -16,6 +16,7 @@ class Blackboard : BlackboardElement
         /// The uss class name for this element.
         /// </summary>
         public static new readonly string ussClassName = "ge-blackboard";
+        public static readonly string contentContainerElementName = "content-container";
 
         /// <summary>
         /// The name of the header part.
@@ -28,23 +29,29 @@ class Blackboard : BlackboardElement
         public static readonly string blackboardContentPartName = "content";
 
         /// <summary>
-        /// The element containing the sections.
+        /// The container for the content of the <see cref="BlackboardElement"/>, if any.
         /// </summary>
         protected VisualElement m_ContentContainer;
 
-        /// <inheritdoc />
-        public override VisualElement contentContainer => m_ContentContainer;
-
         /// <summary>
         /// The ScrollView used for the whole blackboard.
         /// </summary>
         public ScrollView ScrollView { get; protected set; }
 
+        /// <summary>
+        /// The container for the content of the <see cref="BlackboardElement"/>.
+        /// </summary>
+        public override VisualElement contentContainer => m_ContentContainer;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Blackboard"/> class.
         /// </summary>
         public Blackboard()
         {
+            m_ContentContainer = new VisualElement { name = contentContainerElementName, pickingMode = PickingMode.Ignore };
+            m_ContentContainer.AddToClassList(ussClassName.WithUssElement(contentContainerElementName));
+            hierarchy.Add(m_ContentContainer);
+
             RegisterCallback<DragUpdatedEvent>(e =>
             {
                 e.StopPropagation();
@@ -78,10 +85,9 @@ protected override void BuildElementUI()
             base.BuildElementUI();
 
             ScrollView = new ScrollView(ScrollViewMode.VerticalAndHorizontal);
-            m_ContentContainer = new VisualElement { name = "content-container" };
 
             hierarchy.Add(ScrollView);
-            ScrollView.Add(m_ContentContainer);
+            ScrollView.Add(contentContainer);
         }
 
         /// <inheritdoc />
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardElement.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardElement.cs
index c4042c1403..755b7e94f3 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardElement.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardElement.cs
@@ -14,6 +14,7 @@ abstract class BlackboardElement : ModelView
     {
         public static readonly string ussClassName = "ge-blackboard-element";
         public static readonly string selectableModifierUssClassName = ussClassName.WithUssModifier("selectable");
+        public static readonly string selectionBorderUssClassName = ussClassName.WithUssElement("selection-border");
 
         ClickSelector m_ClickSelector;
 
@@ -36,10 +37,11 @@ protected ClickSelector ClickSelector
             set => this.ReplaceManipulator(ref m_ClickSelector, value);
         }
 
+
         /// <summary>
         /// Initializes a new instance of the <see cref="BlackboardElement"/> class.
         /// </summary>
-        public BlackboardElement()
+        public BlackboardElement(bool hasContentContainer = false)
         {
             RegisterCallback<KeyDownEvent>(OnRenameKeyDown);
             focusable = true;
@@ -47,6 +49,14 @@ public BlackboardElement()
             ContextualMenuManipulator = new BlackboardContextualMenuManipulator(BuildContextualMenu);
         }
 
+        protected internal virtual VisualElement CreateSelectionBorder()
+        {
+            var selectionBorder = new VisualElement();
+            selectionBorder.pickingMode = PickingMode.Ignore;
+            selectionBorder.AddToClassList(selectionBorderUssClassName);
+            return selectionBorder;
+        }
+
         /// <inheritdoc />
         protected override void PostBuildUI()
         {
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardField.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardField.cs
index 4501b1d80c..4bbb4d88be 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardField.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardField.cs
@@ -63,11 +63,6 @@ class BlackboardField : BlackboardElement
         /// </summary>
         public static readonly string iconExposedModifierUssClassName = iconUssClassName.WithUssModifier("exposed");
 
-        /// <summary>
-        /// The selection border element.
-        /// </summary>
-        public static readonly string selectionBorderElementName = "selection-border";
-
         /// <summary>
         /// The label containing the type name.
         /// </summary>
@@ -100,7 +95,7 @@ protected SelectionDropper SelectionDropper
         /// <summary>
         /// Initializes a new instance of the <see cref="BlackboardField"/> class.
         /// </summary>
-        public BlackboardField()
+        public BlackboardField():base(false)
         {
             SelectionDropper = new SelectionDropper();
         }
@@ -110,13 +105,9 @@ protected override void BuildElementUI()
         {
             base.BuildElementUI();
 
-            var selectionBorder = new SelectionBorder { name = selectionBorderElementName };
-            selectionBorder.AddToClassList(ussClassName.WithUssElement(selectionBorderElementName));
-            Add(selectionBorder);
-
             var capsule = new VisualElement();
             capsule.AddToClassList(capsuleUssClassName);
-            selectionBorder.ContentContainer.Add(capsule);
+            Add(capsule);
 
             m_Icon = new Image();
             m_Icon.AddToClassList(iconUssClassName);
@@ -130,6 +121,9 @@ protected override void BuildElementUI()
             m_TypeLabel = new Label() { name = "type-label" };
             m_TypeLabel.AddToClassList(typeLabelUssClassName);
             Add(m_TypeLabel);
+
+            var selectionBorder = CreateSelectionBorder();
+            capsule.Add(selectionBorder);
         }
 
         /// <inheritdoc />
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardGroup.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardGroup.cs
index 3b0e7a8395..1055593090 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardGroup.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardGroup.cs
@@ -16,11 +16,6 @@ namespace Unity.GraphToolsFoundation.Editor
     /// </summary>
     class BlackboardGroup : BlackboardElement, IModelViewContainer_Internal
     {
-        /// <summary>
-        /// The name for the selection border.
-        /// </summary>
-        public static readonly string selectionBorderElementName = "selection-border";
-
         /// <summary>
         /// The uss class for this element.
         /// </summary>
@@ -41,11 +36,6 @@ class BlackboardGroup : BlackboardElement, IModelViewContainer_Internal
         /// </summary>
         public static readonly string dragIndicatorUssClassName = ussClassName.WithUssElement("drag-indicator");
 
-        /// <summary>
-        /// The uss class for the selection border.
-        /// </summary>
-        public static readonly string selectionBorderUssClassName = ussClassName.WithUssElement(selectionBorderElementName);
-
         /// <summary>
         /// The uss class for the element with the collapsed modifier.
         /// </summary>
@@ -75,11 +65,6 @@ class BlackboardGroup : BlackboardElement, IModelViewContainer_Internal
         /// </summary>
         protected VisualElement m_DragIndicator;
 
-        /// <summary>
-        /// The selection border element.
-        /// </summary>
-        protected SelectionBorder m_SelectionBorder;
-
         /// <summary>
         /// The title element.
         /// </summary>
@@ -87,8 +72,6 @@ class BlackboardGroup : BlackboardElement, IModelViewContainer_Internal
 
         SelectionDropper m_SelectionDropper;
 
-        VisualElement m_ContentContainer;
-
         /// <summary>
         /// The name of the title part.
         /// </summary>
@@ -121,9 +104,6 @@ public IEnumerable<ModelView> ModelViews
             }
         }
 
-        /// <inheritdoc />
-        public override VisualElement contentContainer => m_ContentContainer;
-
         /// <summary>
         /// The element containing all item ui representations
         /// </summary>
@@ -137,15 +117,6 @@ public BlackboardGroup()
             RegisterCallback<DragPerformEvent>(OnDragPerformEvent);
             RegisterCallback<DragUpdatedEvent>(OnDragUpdatedEvent);
             RegisterCallback<DragLeaveEvent>(OnDragLeaveEvent);
-
-            m_SelectionBorder = new SelectionBorder { name = selectionBorderElementName };
-            m_SelectionBorder.AddToClassList(selectionBorderUssClassName);
-
-            m_ContentContainer = new VisualElement();
-
-            hierarchy.Add(m_ContentContainer);
-            hierarchy.Add(m_SelectionBorder);
-
         }
 
         /// <inheritdoc />
@@ -169,6 +140,10 @@ protected override void BuildElementUI()
             m_DragIndicator = new VisualElement { name = "drag-indicator" };
             m_DragIndicator.AddToClassList(dragIndicatorUssClassName);
             Add(m_DragIndicator);
+
+            var selectionBorder = CreateSelectionBorder();
+            if( selectionBorder != null)
+                hierarchy.Add(selectionBorder);
         }
 
         /// <inheritdoc />
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardSection.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardSection.cs
index 13295893ae..e067996a14 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardSection.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Blackboard/ModelView/BlackboardSection.cs
@@ -41,6 +41,8 @@ class BlackboardSection : BlackboardGroup
         /// </summary>
         protected Button m_AddButton;
 
+        Blackboard m_Blackboard;
+
         public SectionModel SectionModel => Model as SectionModel;
 
         /// <inheritdoc />
@@ -89,8 +91,11 @@ protected override void BuildElementUI()
             RegisterCallback<AttachToPanelEvent>(OnAttachToPanel);
             RegisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
         }
-
-        Blackboard m_Blackboard;
+        
+        protected internal override VisualElement CreateSelectionBorder()
+        {
+            return null;
+        }
 
         void OnAttachToPanel(AttachToPanelEvent e)
         {
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/BlockDragInfos_Internal.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/BlockDragInfos_Internal.cs
index a32f87dc5a..e3c6135a87 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/BlockDragInfos_Internal.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/BlockDragInfos_Internal.cs
@@ -84,7 +84,6 @@ public bool OnMouseMove(MouseMoveEvent e)
                             AbstractNodeModel duplicateNodeModel = block.Clone();
 
                             duplicateNodeModel.GraphModel = GraphView.GraphModel;
-                            duplicateNodeModel.AssignNewGuid();
                             duplicateNodeModel.OnDuplicateNode(block);
 
                             m_DraggedHeight += blockUI.layout.height;
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/BlockNode.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/BlockNode.cs
index 2c50e63cf3..27174cdf85 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/BlockNode.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/BlockNode.cs
@@ -186,8 +186,6 @@ protected override void BuildElementUI()
             m_EtchColor = new VisualElement() { name = k_EtchColorName };
             m_EtchColor.AddToClassList(etchColorUssClassName);
             m_Etch.Add(m_EtchColor);
-
-            Border.BringToFront();
         }
 
         /// <inheritdoc/>
@@ -232,7 +230,7 @@ public override void SetPositionOverride(Vector2 position)
         /// <inheritdoc/>
         public override bool HandlePasteOperation(PasteOperation operation, string operationName, Vector2 delta, CopyPasteData copyPasteData)
         {
-            if (!copyPasteData.m_Nodes_Internal.All(t => t is BlockNodeModel))
+            if (!copyPasteData.Nodes.All(t => t is BlockNodeModel))
                 return false;
 
             if (operation == PasteOperation.Duplicate)
@@ -266,7 +264,7 @@ public override bool HandlePasteOperation(PasteOperation operation, string opera
                 var selectedBlocksInSameContext = selection.OfType<BlockNodeModel>().Where(t => t.ContextNodeModel == BlockNodeModel.ContextNodeModel);
                 var index = selectedBlocksInSameContext.Max(t => t.GetIndex()) + 1;
 
-                var nodesToPaste = copyPasteData.m_Nodes_Internal.OfType<BlockNodeModel>();
+                var nodesToPaste = copyPasteData.Nodes.OfType<BlockNodeModel>();
 
                 GraphView.Dispatch(new InsertBlocksInContextCommand(BlockNodeModel.ContextNodeModel, index, nodesToPaste, true, operationName));
             }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/CollapsibleInOutNode.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/CollapsibleInOutNode.cs
index f4a56738d6..d82a2d0647 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/CollapsibleInOutNode.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/CollapsibleInOutNode.cs
@@ -46,7 +46,7 @@ protected override void BuildPartList()
             PartList.AppendPart(VerticalPortContainerPart.Create(topPortContainerPartName, PortDirection.Input, Model, this, ussClassName));
 
             PartList.AppendPart(IconTitleProgressPart.Create(titleIconContainerPartName, Model, this, ussClassName, true));
-            PartList.AppendPart(SerializedFieldsInspector.Create(nodeSettingsContainerPartName, new[] {Model}, RootView, ussClassName, ModelInspectorView.BasicSettingsFilter));
+            PartList.AppendPart(SerializedFieldsInspector.Create(nodeOptionsContainerPartName, new[] {Model}, RootView, ussClassName, ModelInspectorView.NodeOptionsFilter));
             PartList.AppendPart(InOutPortContainerPart.Create(portContainerPartName, Model, this, ussClassName));
 
             PartList.AppendPart(VerticalPortContainerPart.Create(bottomPortContainerPartName, PortDirection.Output, Model, this, ussClassName));
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/ContextNode.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/ContextNode.cs
index 8359a1b7c1..36f94e18d6 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/ContextNode.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/ContextNode.cs
@@ -70,21 +70,9 @@ protected override void BuildElementUI()
         {
             base.BuildElementUI();
 
-            var selectionBorder = this.SafeQ(selectionBorderElementName);
-            var selectionBorderParent = selectionBorder.parent;
-
-            //Move the selection border from being the entire container for the node to being on top of the context-border
-            int cpt = 0;
-            while (selectionBorder.childCount > 0)
-            {
-                var elementAt = selectionBorder.ElementAt(0);
-                selectionBorderParent.hierarchy.Insert(cpt++, elementAt); // use hierarchy because selectionBorderParent has a content container defined
-            }
-
             m_ContextBorder = new VisualElement { name = k_ContextBorderName };
             m_ContextBorder.AddToClassList(contextBorderUssClassName);
             contentContainer.Insert(0, m_ContextBorder);
-            m_ContextBorder.Add(selectionBorder);
 
             m_ContextTitleBkgnd = new VisualElement() { name = k_ContextBorderTitleName };
             m_ContextTitleBkgnd.AddToClassList(contextBorderTitleUssClassName);
@@ -266,12 +254,12 @@ internal bool ShowItemLibrary_Internal(Vector2 mousePosition, int index)
         /// <inheritdoc/>
         public override bool HandlePasteOperation(PasteOperation operation, string operationName, Vector2 delta, CopyPasteData copyPasteData)
         {
-            if (!copyPasteData.m_Nodes_Internal.All(t => t is BlockNodeModel))
+            if (!copyPasteData.Nodes.All(t => t is BlockNodeModel))
                 return false;
 
             GraphView.Dispatch(new InsertBlocksInContextCommand(ContextNodeModel,
                 -1,
-                copyPasteData.m_Nodes_Internal.OfType<BlockNodeModel>().ToList(), true, operationName));
+                copyPasteData.Nodes.OfType<BlockNodeModel>().ToList(), true, operationName));
 
             return true;
         }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/ErrorBadge.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/ErrorBadge.cs
index d8980e4014..830214c800 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/ErrorBadge.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/ErrorBadge.cs
@@ -29,12 +29,20 @@ class ErrorBadge : Badge
 
         static readonly string k_DefaultStylePath = "ErrorBadge.uss";
 
+        private static CustomStyleProperty<float> s_TextSizeProperty = new CustomStyleProperty<float>("--error-text-size");
+        private static CustomStyleProperty<float> s_TextMaxWidthProperty = new CustomStyleProperty<float>("--error-text-max-width");
+
         protected Image m_TipElement;
         protected Image m_IconElement;
         protected Label m_TextElement;
 
         protected string m_BadgeType;
 
+        float m_LastZoom;
+
+        float ErrorTextSize { get; set; } = 12;
+        float ErrorTextMaxWidth { get; set; } = 240;
+
         protected string VisualStyle
         {
             set
@@ -50,6 +58,29 @@ protected string VisualStyle
             }
         }
 
+        /// <inheritdoc />
+        protected override void OnCustomStyleResolved(CustomStyleResolvedEvent e)
+        {
+            base.OnCustomStyleResolved(e);
+
+            var changed = false;
+            if (e.customStyle.TryGetValue(s_TextSizeProperty, out float textSize))
+            {
+                ErrorTextSize = textSize;
+                changed = true;
+            }
+
+            if (e.customStyle.TryGetValue(s_TextMaxWidthProperty, out float maxWidth))
+            {
+                ErrorTextMaxWidth = maxWidth;
+                changed = true;
+            }
+
+            if (changed && m_LastZoom != 0.0f)
+                // recompute text scale next frame when the localBound is known.
+                schedule.Execute(() => SetElementLevelOfDetail(m_LastZoom, GraphViewZoomMode.Unknown, GraphViewZoomMode.Unknown)).ExecuteLater(0);
+        }
+
         /// <inheritdoc />
         protected override void BuildElementUI()
         {
@@ -157,6 +188,18 @@ void OnMouseLeave(MouseLeaveEvent evt)
             HideText();
         }
 
+        /// <inheritdoc />
+        public override void SetElementLevelOfDetail(float zoom, GraphViewZoomMode newZoomMode, GraphViewZoomMode oldZoomMode)
+        {
+            base.SetElementLevelOfDetail(zoom, newZoomMode, oldZoomMode);
+
+            var scale = 1.0f / zoom;
+
+            m_TextElement.style.fontSize = ErrorTextSize * scale;
+            m_TextElement.style.maxWidth = ErrorTextMaxWidth * scale;
+            m_LastZoom = zoom;
+        }
+
         void PerformTipLayout()
         {
             RemoveFromClassList(arrowHiddenModifierUssClassName);
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/GraphElement.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/GraphElement.cs
index 08e3b04916..25db8b0dcd 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/GraphElement.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/GraphElement.cs
@@ -32,6 +32,7 @@ static Color DefaultMinimapColor
 
         public static readonly string ussClassName = "ge-graph-element";
         public static readonly string selectableModifierUssClassName = ussClassName.WithUssModifier("selectable");
+        public static readonly string contentContainerElementName = "content-container";
 
         int m_Layer;
 
@@ -39,6 +40,11 @@ static Color DefaultMinimapColor
 
         ClickSelector m_ClickSelector;
 
+        /// <summary>
+        /// The container for the content of the <see cref="GraphElement"/>, if any.
+        /// </summary>
+        VisualElement m_ContentContainer;
+
         public GraphElementModel GraphElementModel => Model as GraphElementModel;
 
         public GraphView GraphView => RootView as GraphView;
@@ -63,15 +69,30 @@ protected ClickSelector ClickSelector
             set => this.ReplaceManipulator(ref m_ClickSelector, value);
         }
 
+        /// <summary>
+        /// The container for the content of the <see cref="GraphElement"/>.
+        /// </summary>
+        public override VisualElement contentContainer => m_ContentContainer ?? this;
+
+        /// The <see cref="DynamicBorder"/> used to display selection, hover and highlight. Can be null.
+        protected DynamicBorder Border { get; private set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="GraphElement"/> class.
         /// </summary>
-        protected GraphElement()
+        protected GraphElement(bool hasContentContainer = false)
         {
             RegisterCallback<KeyDownEvent>(OnRenameKeyDown_Internal);
             focusable = true;
 
             ContextualMenuManipulator = new GraphViewContextualMenuManipulator(BuildContextualMenu);
+
+            if (hasContentContainer)
+            {
+                m_ContentContainer = new VisualElement { name = contentContainerElementName, pickingMode = PickingMode.Ignore };
+                m_ContentContainer.AddToClassList(ussClassName.WithUssElement(contentContainerElementName));
+                hierarchy.Add(m_ContentContainer);
+            }
         }
 
         public void ResetLayer()
@@ -92,10 +113,27 @@ void UpdateLayer(int prevLayer)
         /// <inheritdoc />
         protected override void PostBuildUI()
         {
+            // added here because it should be added last.
+            Border = CreateDynamicBorder();
+            if (Border != null)
+            {
+                Border.AddToClassList(ussClassName.WithUssElement("dynamic-border"));
+                hierarchy.Add(Border);
+            }
+
             AddToClassList(ussClassName);
             this.AddStylesheet_Internal("GraphElement.uss");
         }
 
+        /// <summary>
+        /// Creates a <see cref="DynamicBorder"/> for this graph element.
+        /// </summary>
+        /// <returns>A <see cref="DynamicBorder"/> for this graph element.</returns>
+        protected virtual DynamicBorder CreateDynamicBorder()
+        {
+            return new DynamicBorder(this);
+        }
+
         /// <summary>
         /// Creates a <see cref="ClickSelector" /> for this element.
         /// </summary>
@@ -123,6 +161,9 @@ protected override void UpdateElementFromModel()
             {
                 pseudoStates &= ~PseudoStates.Checked;
             }
+
+            if (Border != null)
+                Border.Selected = IsSelected();
         }
 
         /// <summary>
@@ -139,6 +180,9 @@ public void SetLevelOfDetail(float zoom, GraphViewZoomMode newZoomMode, GraphVie
                 var component = PartList.Parts[i];
                 (component as GraphElementPart)?.SetLevelOfDetail(zoom, newZoomMode, oldZoomMode);
             }
+
+            if (Border != null)
+                Border.Zoom = zoom;
         }
 
 
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Node.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Node.cs
index 08c686d583..6534803be5 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Node.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Node.cs
@@ -24,10 +24,12 @@ class Node : GraphElement
         public static readonly string readOnlyModifierUssClassName = ussClassName.WithUssModifier("read-only");
         public static readonly string writeOnlyModifierUssClassName = ussClassName.WithUssModifier("write-only");
 
-        public static readonly string selectionBorderElementName = "selection-border";
         public static readonly string disabledOverlayElementName = "disabled-overlay";
         public static readonly string titleContainerPartName = "title-container";
-        public static readonly string nodeSettingsContainerPartName = "node-settings";
+
+        public static readonly string nodeOptionsContainerPartName = "node-options";
+        [Obsolete("nodeSettingsContainerPartName has been deprecated. Use nodeOptionsContainerPartName instead.")]
+        public static readonly string nodeSettingsContainerPartName = "node-options";
 
         /// <summary>
         /// The name of the port container part.
@@ -39,49 +41,27 @@ class Node : GraphElement
         /// </summary>
         public static readonly string nodeCachePartName = "cache";
 
-        protected VisualElement m_ContentContainer;
-
         public AbstractNodeModel NodeModel => Model as AbstractNodeModel;
 
-        /// <inheritdoc />
-        public override VisualElement contentContainer => m_ContentContainer ?? this;
 
-        /// The <see cref="DynamicBorder"/> used to display selection, hover and highlight.
-        protected DynamicBorder Border { get; private set; }
+        public Node():base(true)
+        {}
 
         /// <inheritdoc />
         protected override void BuildPartList()
         {
             PartList.AppendPart(EditableTitlePart.Create(titleContainerPartName, Model, this, ussClassName));
-            PartList.AppendPart(SerializedFieldsInspector.Create(nodeSettingsContainerPartName, new[] {Model}, RootView, ussClassName, ModelInspectorView.BasicSettingsFilter));
+            PartList.AppendPart(SerializedFieldsInspector.Create(nodeOptionsContainerPartName, new[] {Model}, RootView, ussClassName, ModelInspectorView.NodeOptionsFilter));
             PartList.AppendPart(PortContainerPart.Create(portContainerPartName, Model, this, ussClassName));
         }
 
         /// <inheritdoc />
         protected override void BuildElementUI()
         {
-            var selectionBorder = new SelectionBorder { name = selectionBorderElementName };
-            selectionBorder.AddToClassList(ussClassName.WithUssElement(selectionBorderElementName));
-            Add(selectionBorder);
-            m_ContentContainer = selectionBorder.ContentContainer;
-
             base.BuildElementUI();
 
             var disabledOverlay = new VisualElement { name = disabledOverlayElementName, pickingMode = PickingMode.Ignore };
             hierarchy.Add(disabledOverlay);
-
-            Border = CreateDynamicBorder();
-            Border.AddToClassList(ussClassName.WithUssElement("dynamic-border"));
-            hierarchy.Add(Border);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="DynamicBorder"/> for this node.
-        /// </summary>
-        /// <returns>A <see cref="DynamicBorder"/> for this node.</returns>
-        protected virtual DynamicBorder CreateDynamicBorder()
-        {
-            return new DynamicBorder(this);
         }
 
         /// <inheritdoc />
@@ -117,8 +97,6 @@ protected override void UpdateElementFromModel()
             }
 
             tooltip = NodeModel.Tooltip;
-
-            Border.Selected = IsSelected();
         }
 
         public override void ActivateRename()
@@ -128,13 +106,5 @@ public override void ActivateRename()
 
             label.BeginEditing();
         }
-
-        /// <inheritdoc />
-        public override void SetElementLevelOfDetail(float zoom, GraphViewZoomMode newZoomMode, GraphViewZoomMode oldZoomMode)
-        {
-            base.SetElementLevelOfDetail(zoom, newZoomMode, oldZoomMode);
-
-            Border.Zoom = zoom;
-        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Placemat/Placemat.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Placemat/Placemat.cs
index 543b989402..bb7a0e75e3 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Placemat/Placemat.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Placemat/Placemat.cs
@@ -15,51 +15,25 @@ namespace Unity.GraphToolsFoundation.Editor
     /// </summary>
     class Placemat : GraphElement
     {
-        enum MinSizePolicy
-        {
-            EnsureMinSize,
-            DoNotEnsureMinSize
-        }
-
-        protected internal static readonly Vector2 k_DefaultCollapsedSize_Internal = new Vector2(200, 42);
-
-        /// <summary>
-        /// The offset added when computing if a <see cref="GraphElement"/> is in the placemat.
-        /// </summary>
-        protected static readonly int k_SelectRectOffset = 3;
+        Vector2 m_LastModelSize;
 
         /// <summary>
         /// The uss class name added to <see cref="Placemat"/>.
         /// </summary>
         public new static readonly string ussClassName = "ge-placemat";
 
-        /// <summary>
-        /// The uss class name of a <see cref="Placemat"/> when collapsed.
-        /// </summary>
-        public static readonly string collapsedModifierUssClassName = ussClassName.WithUssModifier("collapsed");
-
-        /// <summary>
-        /// The name of the <see cref="SelectionBorder"/>.
-        /// </summary>
-        public static readonly string selectionBorderElementName = "selection-border";
-
         /// <summary>
         /// The name of the <see cref="VisualElement"/> for the title container.
         /// </summary>
         public static readonly string titleContainerPartName = "title-container";
 
-        /// <summary>
-        /// The name of the <see cref="Button"/> for collapsing the <see cref="Placemat"/>.
-        /// </summary>
-        public static readonly string collapseButtonPartName = "collapse-button";
-
         /// <summary>
         /// The name for the <see cref="ResizableElement"/>
         /// </summary>
         public static readonly string resizerPartName = "resizer";
 
         protected internal static readonly float k_Bounds_Internal = 9.0f;
-        protected internal static readonly float k_BoundTop_Internal = 44.0f; // Current height of Title
+        protected internal static readonly float k_BoundTop_Internal = 64.0f; // Current height of Title
 
         // The next two values need to be the same as USS... however, we can't get the values from there as we need them in a static
         // methods used to create new placemats
@@ -67,89 +41,26 @@ enum MinSizePolicy
         protected static readonly float k_MinHeight = 100;
 
         /// <summary>
-        /// The container for the content of the <see cref="Placemat"/>.
-        /// </summary>
-        protected VisualElement m_ContentContainer;
-
-        /// <summary>
-        /// The elements that are collapsed within the element, if the <see cref="Placemat"/> is collapsed.
+        /// The default placemat size.
         /// </summary>
-        protected HashSet<GraphElement> m_CollapsedElements = new HashSet<GraphElement>();
+        public static readonly Vector2 DefaultPlacematSize = new Vector2(600,300);
 
         /// <summary>
         /// The model that this <see cref="Placemat"/> displays.
         /// </summary>
         public PlacematModel PlacematModel => Model as PlacematModel;
 
-        /// <summary>
-        /// The container for the content of the <see cref="Placemat"/>.
-        /// </summary>
-        public override VisualElement contentContainer => m_ContentContainer ?? this;
-
         /// <summary>
         /// The container for the title of the <see cref="Placemat"/>.
         /// </summary>
         public VisualElement TitleContainer { get; private set; }
 
-        /// <summary>
-        /// The size of the placemat in its uncollapsed state.
-        /// </summary>
-        protected Vector2 UncollapsedSize => PlacematModel.PositionAndSize.size;
-
-        /// <summary>
-        /// The size of the placemat in its collapsed state.
-        /// </summary>
-        protected Vector2 CollapsedSize
-        {
-            get
-            {
-                var actualCollapsedSize = k_DefaultCollapsedSize_Internal;
-                if (UncollapsedSize.x < k_DefaultCollapsedSize_Internal.x)
-                    actualCollapsedSize.x = UncollapsedSize.x;
-
-                return actualCollapsedSize;
-            }
-        }
-
-        /// <summary>
-        /// The area where the <see cref="Placemat"/> acts, that is its uncollapsed area even if the <see cref="Placemat"/> is collapsed.
-        /// </summary>
-        protected Rect EffectArea => PlacematModel.Collapsed ? new Rect(layout.position, UncollapsedSize) : layout;
-
-        /// <summary>
-        /// The graph elements that are currently being hidden by the placemat.
-        /// </summary>
-        protected IEnumerable<GraphElement> CollapsedElements
-        {
-            get => m_CollapsedElements;
-            set
-            {
-                foreach (var collapsedElement in m_CollapsedElements)
-                {
-                    collapsedElement.style.visibility = StyleKeyword.Null;
-                }
-
-                m_CollapsedElements.Clear();
-
-                if (value == null)
-                    return;
-
-                foreach (var collapsedElement in value)
-                {
-                    collapsedElement.style.visibility = Visibility.Hidden;
-                    m_CollapsedElements.Add(collapsedElement);
-                }
-            }
-        }
-
         /// <summary>
         /// Creates an instance of the <see cref="Placemat"/> class.
         /// </summary>
-        public Placemat()
+        public Placemat():base(true)
         {
             focusable = true;
-
-            RegisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
         }
 
         /// <inheritdoc />
@@ -157,19 +68,12 @@ protected override void BuildPartList()
         {
             var editableTitlePart = PlacematTitlePart.Create(titleContainerPartName, Model, this, ussClassName, false, true, false);
             PartList.AppendPart(editableTitlePart);
-            var collapseButtonPart = CollapseButtonPart.Create(collapseButtonPartName, Model, this, ussClassName);
-            editableTitlePart.PartList.AppendPart(collapseButtonPart);
             PartList.AppendPart(FourWayResizerPart.Create(resizerPartName, Model, this, ussClassName));
         }
 
         /// <inheritdoc />
         protected override void BuildElementUI()
         {
-            var selectionBorder = new SelectionBorder { name = selectionBorderElementName };
-            selectionBorder.AddToClassList(ussClassName.WithUssElement(selectionBorderElementName));
-            Add(selectionBorder);
-            m_ContentContainer = selectionBorder.ContentContainer;
-
             base.BuildElementUI();
 
             usageHints = UsageHints.DynamicTransform;
@@ -202,9 +106,6 @@ protected override void PostBuildUI()
         {
             base.PostBuildUI();
 
-            var collapseButton = this.SafeQ(collapseButtonPartName);
-            collapseButton?.RegisterCallback<ChangeEvent<bool>>(OnCollapseChangeEvent);
-
             TitleContainer = PartList.GetPart(titleContainerPartName)?.Root;
 
             this.AddStylesheet_Internal("Placemat.uss");
@@ -220,29 +121,6 @@ protected override void UpdateElementFromModel()
             style.backgroundColor = color;
 
             SetPositionAndSize(PlacematModel.PositionAndSize);
-
-            EnableInClassList(collapsedModifierUssClassName, PlacematModel.Collapsed);
-
-            if (PlacematModel.Collapsed)
-            {
-                var collapsedElements = new List<GraphElement>();
-                if (PlacematModel.HiddenElements != null)
-                {
-                    foreach (var elementModel in PlacematModel.HiddenElements)
-                    {
-                        var graphElement = elementModel.GetView<GraphElement>(RootView);
-                        if (graphElement != null)
-                            collapsedElements.Add(graphElement);
-                    }
-                }
-
-                GatherCollapsedWires(collapsedElements);
-                CollapsedElements = collapsedElements;
-            }
-            else
-            {
-                CollapsedElements = null;
-            }
         }
 
         // PF FIXME: we can probably improve the performance of this.
@@ -250,23 +128,9 @@ protected override void UpdateElementFromModel()
         // PF TODO: also revisit Placemat other recursive functions for perf improvements.
         protected static void GatherDependencies(Placemat currentPlacemat, IList<ModelView> graphElements, ICollection<ModelView> dependencies)
         {
-            if (currentPlacemat.PlacematModel.Collapsed)
-            {
-                foreach (var cge in currentPlacemat.CollapsedElements)
-                {
-                    dependencies.Add(cge);
-                    if (cge is Placemat placemat)
-                        GatherDependencies(placemat, graphElements, dependencies);
-                }
-
-                return;
-            }
-
             // We want gathering dependencies to work even if the placemat layout is not up to date, so we use the
             // currentPlacemat.PlacematModel.PositionAndSize to do our overlap test.
-            var currRect = currentPlacemat.PlacematModel.PositionAndSize;
-            var currentActivePlacematRect = RectUtils_Internal.Inflate(currRect, -k_SelectRectOffset, -k_SelectRectOffset,
-                -k_SelectRectOffset, -k_SelectRectOffset);
+            var currentActivePlacematRect = currentPlacemat.PlacematModel.PositionAndSize;
 
             var currentPlacematZOrder = currentPlacemat.PlacematModel.GetZOrder();
             foreach (var elem in graphElements)
@@ -306,27 +170,8 @@ public override void AddForwardDependencies()
             var dependencies = new List<ModelView>();
             GatherDependencies(this, k_AddForwardDependenciesAllUIs, dependencies);
             k_AddForwardDependenciesAllUIs.Clear();
-
-            var nodeModels = dependencies.Select(e => e.Model).OfType<AbstractNodeModel>();
-            foreach (var wireModel in nodeModels.SelectMany(n => n.GetConnectedWires()))
-            {
-                var ui = wireModel.GetView_Internal(RootView);
-                if (ui != null)
-                {
-                    // Wire models endpoints need to be updated when the placemat is collapsed/uncollapsed.
-                    Dependencies.AddForwardDependency(ui, DependencyTypes.Geometry | DependencyTypes.Removal);
-                }
-            }
         }
 
-        /// <summary>
-        /// Called when the collapsed button changes value.
-        /// </summary>
-        /// <param name="evt"></param>
-        protected void OnCollapseChangeEvent(ChangeEvent<bool> evt)
-        {
-            this.CollapsePlacemat(evt.newValue);
-        }
 
         /// <summary>
         /// Sets the position and the size of the placemat.
@@ -334,146 +179,19 @@ protected void OnCollapseChangeEvent(ChangeEvent<bool> evt)
         /// <param name="positionAndSize">The position and size.</param>
         public void SetPositionAndSize(Rect positionAndSize)
         {
-            if (PlacematModel.Collapsed)
-                positionAndSize.size = CollapsedSize;
-
             SetPosition(positionAndSize.position);
             if (!PositionIsOverriddenByManipulator)
             {
-                style.height = positionAndSize.height;
-                style.width = positionAndSize.width;
-            }
-        }
-
-        /// <summary>
-        /// Recursively finds all the elements actually collapsed within this <see cref="Placemat"/>.
-        /// </summary>
-        /// <param name="collapsedElements">The directly collapsed elements.</param>
-        /// <returns>The elements actually collapsed within this <see cref="Placemat"/>.</returns>
-        protected static IEnumerable<GraphElement> AllCollapsedElements(IEnumerable<GraphElement> collapsedElements)
-        {
-            if (collapsedElements != null)
-            {
-                foreach (var element in collapsedElements)
+                if (m_LastModelSize.x != positionAndSize.width || m_LastModelSize.y != positionAndSize.height)
                 {
-                    switch (element)
-                    {
-                        case Placemat placemat when placemat.PlacematModel.Collapsed:
-                        {
-                            // TODO: evaluate performance of this recursive call.
-                            foreach (var subElement in AllCollapsedElements(placemat.CollapsedElements))
-                                yield return subElement;
-                            yield return element;
-                            break;
-                        }
-                        case Placemat placemat when !placemat.PlacematModel.Collapsed:
-                            yield return element;
-                            break;
-                        case {} e when e.IsMovable():
-                            yield return element;
-                            break;
-                    }
+                    GraphView.SelectionDragger.SetSelectionDirty();
+                    m_LastModelSize = new Vector2(positionAndSize.width, positionAndSize.height);
                 }
+                style.height = positionAndSize.height;
+                style.width = positionAndSize.width;
             }
         }
 
-        /// <summary>
-        /// Gathers all the wires that are collapsed by this <see cref="Placemat"/>. That is the wires that starts and ends in nodes collapsed by this <see cref="Placemat"/>.
-        /// </summary>
-        /// <param name="collapsedElements"></param>
-        protected void GatherCollapsedWires(ICollection<GraphElement> collapsedElements)
-        {
-            var allCollapsedNodes = AllCollapsedElements(collapsedElements)
-                .Select(e => e.Model)
-                .OfType<AbstractNodeModel>()
-                .ToList();
-            foreach (var wireModel in PlacematModel.GraphModel.WireModels)
-            {
-                if (AnyNodeIsConnectedToPort(allCollapsedNodes, wireModel.ToPort) && AnyNodeIsConnectedToPort(allCollapsedNodes, wireModel.FromPort))
-                {
-                    var wireView = wireModel.GetView<GraphElement>(RootView);
-                    if (!collapsedElements.Contains(wireView))
-                    {
-                        collapsedElements.Add(wireView);
-                    }
-                }
-            }
-        }
-
-        static readonly List<ModelView> k_GatherCollapsedElementsAllUIs = new List<ModelView>();
-
-        protected internal List<GraphElementModel> GatherCollapsedElements_Internal()
-        {
-            List<GraphElement> collapsedElements = new List<GraphElement>();
-
-            var graphView = GraphView;
-            graphView.GraphModel.GraphElementModels
-                .Where(ge => ge.IsSelectable() && !(ge is WireModel))
-                .GetAllViewsInList_Internal(GraphView, e => e.parent is GraphView.Layer, k_GatherCollapsedElementsAllUIs);
-
-            var collapsedElementsElsewhere = new List<GraphElement>();
-            RecurseGatherCollapsedElements(this, k_GatherCollapsedElementsAllUIs.OfType<GraphElement>(), collapsedElementsElsewhere);
-            k_GatherCollapsedElementsAllUIs.Clear();
-
-            var nodes = new HashSet<AbstractNodeModel>(AllCollapsedElements(collapsedElements).Select(e => e.Model).OfType<AbstractNodeModel>());
-
-            for (var index = 0; index < graphView.GraphModel.WireModels.Count; index++)
-            {
-                var wireModel = graphView.GraphModel.WireModels[index];
-                if (AnyNodeIsConnectedToPort(nodes, wireModel.ToPort) && AnyNodeIsConnectedToPort(nodes, wireModel.FromPort))
-                    collapsedElements.Add(wireModel.GetView<Wire>(graphView));
-            }
-
-            foreach (var ge in collapsedElementsElsewhere)
-                collapsedElements.Remove(ge);
-
-            return collapsedElements.Select(e => e.GraphElementModel).ToList();
-
-            void RecurseGatherCollapsedElements(Placemat currentPlacemat, IEnumerable<GraphElement> graphElementsParam,
-                List<GraphElement> collapsedElementsElsewhereParam)
-            {
-                var currRect = currentPlacemat.EffectArea;
-                var currentActivePlacematRect = RectUtils_Internal.Inflate(currRect, -k_SelectRectOffset, -k_SelectRectOffset, -k_SelectRectOffset, -k_SelectRectOffset);
-
-                var currentPlacematZOrder = currentPlacemat.PlacematModel.GetZOrder();
-                foreach (var elem in graphElementsParam)
-                {
-                    if (elem.layout.Overlaps(currentActivePlacematRect))
-                    {
-                        var placemat = elem as Placemat;
-                        if (placemat != null && placemat.PlacematModel.GetZOrder() > currentPlacematZOrder)
-                        {
-                            if (placemat.PlacematModel.Collapsed)
-                                foreach (var cge in placemat.CollapsedElements)
-                                    collapsedElementsElsewhereParam.Add(cge);
-                            else
-                                RecurseGatherCollapsedElements(placemat, graphElementsParam, collapsedElementsElsewhereParam);
-                        }
-
-                        if (placemat == null || placemat.PlacematModel.GetZOrder() > currentPlacematZOrder)
-                            if (elem.resolvedStyle.visibility == Visibility.Visible)
-                                collapsedElements.Add(elem);
-                    }
-                }
-            }
-        }
-
-        static bool AnyNodeIsConnectedToPort(IEnumerable<AbstractNodeModel> nodes, PortModel port)
-        {
-            if (port.NodeModel == null)
-            {
-                return false;
-            }
-
-            foreach (var node in nodes)
-            {
-                if (node == port.NodeModel)
-                    return true;
-            }
-
-            return false;
-        }
-
         /// <inheritdoc />
         [EventInterest(typeof(PointerDownEvent))]
         protected override void ExecuteDefaultActionAtTarget(EventBase evt)
@@ -483,9 +201,10 @@ protected override void ExecuteDefaultActionAtTarget(EventBase evt)
                 if (mde.clickCount == 2 && mde.button == (int)MouseButton.LeftMouse)
                 {
                     var models = new List<GraphElementModel>();
-                    ActOnGraphElementsOver(e =>
+                    ActOnGraphElementsInside_Internal(e =>
                     {
                         models.Add(e.GraphElementModel);
+                        return true;
                     });
                     GraphView.Dispatch(new SelectElementsCommand(SelectElementsCommand.SelectionMode.Replace, models));
                 }
@@ -497,7 +216,7 @@ protected override void ExecuteDefaultActionAtTarget(EventBase evt)
         /// Executes an <see cref="Action"/> on each <see cref="GraphElement"/> within this <see cref="Placemat"/>.
         /// </summary>
         /// <param name="act">The action that will be executed.</param>
-        protected void ActOnGraphElementsOver(Action<GraphElement> act)
+        protected internal void ActOnGraphElementsOver_Internal(Action<GraphElement> act)
         {
             GraphView.GraphModel.GraphElementModels
                 .Where(ge => ge.IsSelectable() && !(ge is WireModel))
@@ -513,98 +232,33 @@ protected void ActOnGraphElementsOver(Action<GraphElement> act)
         }
 
         static readonly List<ModelView> k_ActOnGraphElementsOver2AllUIs = new List<ModelView>();
-        protected internal bool ActOnGraphElementsOver_Internal(Func<GraphElement, bool> act, bool includePlacemats)
+        protected internal bool ActOnGraphElementsInside_Internal(Func<GraphElement, bool> act)
         {
             GraphView.GraphModel.GraphElementModels
                 .Where(ge => ge.IsSelectable() && !(ge is WireModel) && ge is not IPlaceholder)
                 .GetAllViewsInList_Internal(GraphView, e => e.parent is GraphView.Layer, k_ActOnGraphElementsOver2AllUIs);
 
-            var retVal = RecurseActOnGraphElementsOver(this);
-            k_ActOnGraphElementsOver2AllUIs.Clear();
-            return retVal;
+            var currentActivePlacematRect = layout;
 
-            bool RecurseActOnGraphElementsOver(Placemat currentPlacemat)
+            foreach (var elem in k_ActOnGraphElementsOver2AllUIs.OfType<GraphElement>())
             {
-                if (currentPlacemat.PlacematModel.Collapsed)
-                {
-                    var currentPlacematZOrder = currentPlacemat.PlacematModel.GetZOrder();
-                    foreach (var elem in currentPlacemat.CollapsedElements)
-                    {
-                        var placemat = elem as Placemat;
-                        if (placemat != null && placemat.PlacematModel.GetZOrder() > currentPlacematZOrder)
-                            if (RecurseActOnGraphElementsOver(placemat))
-                                return true;
-
-                        if (placemat == null || (includePlacemats && placemat.PlacematModel.GetZOrder() > currentPlacematZOrder))
-                            if (act(elem))
-                                return true;
-                    }
-                }
-                else
+                var elemLayout = elem.layout;
+                if (currentActivePlacematRect.Contains(elemLayout.position) && currentActivePlacematRect.Contains(elemLayout.position + elemLayout.size))
                 {
-                    var currRect = currentPlacemat.EffectArea;
-                    var currentActivePlacematRect = new Rect(
-                        currRect.x + k_SelectRectOffset,
-                        currRect.y + k_SelectRectOffset,
-                        currRect.width - 2 * k_SelectRectOffset,
-                        currRect.height - 2 * k_SelectRectOffset);
-
-                    var currentPlacematZOrder = currentPlacemat.PlacematModel.GetZOrder();
-                    foreach (var elem in k_ActOnGraphElementsOver2AllUIs.OfType<GraphElement>())
-                    {
-                        if (elem.layout.Overlaps(currentActivePlacematRect))
-                        {
-                            var placemat = elem as Placemat;
-                            if (placemat != null && placemat.PlacematModel.GetZOrder() > currentPlacematZOrder)
-                                if (RecurseActOnGraphElementsOver(placemat))
-                                    return true;
-
-                            if (placemat == null || (includePlacemats && placemat.PlacematModel.GetZOrder() > currentPlacematZOrder))
-                                if (elem.resolvedStyle.visibility != Visibility.Hidden)
-                                    if (act(elem))
-                                        return true;
-                        }
-                    }
+                    if (elem.resolvedStyle.visibility != Visibility.Hidden)
+                        if (act(elem))
+                            return true;
                 }
-
-                return false;
             }
-        }
 
-        protected internal bool WillDragNode_Internal(GraphElement node)
-        {
-            if (PlacematModel.Collapsed)
-                return AllCollapsedElements(CollapsedElements).Contains(node);
+            k_ActOnGraphElementsOver2AllUIs.Clear();
 
-            return ActOnGraphElementsOver_Internal(t => node == t, true);
+            return false;
         }
 
-        internal Rect ComputeGrowToFitElementsRect_Internal(List<GraphElement> elements = null)
+        protected internal bool WillDragNode_Internal(GraphElement node)
         {
-            if (elements == null)
-                elements = GetNodesOverThisPlacemat();
-
-            var pos = new Rect();
-            if (elements.Count > 0 && ComputeElementBounds(ref pos, elements, MinSizePolicy.DoNotEnsureMinSize))
-            {
-                // We don't resize to be snug. In other words: we don't ever decrease in size.
-                Rect currentRect = layout;
-                if (pos.xMin > currentRect.xMin)
-                    pos.xMin = currentRect.xMin;
-
-                if (pos.xMax < currentRect.xMax)
-                    pos.xMax = currentRect.xMax;
-
-                if (pos.yMin > currentRect.yMin)
-                    pos.yMin = currentRect.yMin;
-
-                if (pos.yMax < currentRect.yMax)
-                    pos.yMax = currentRect.yMax;
-
-                MakeRectAtLeastMinimalSize(ref pos);
-            }
-
-            return pos;
+            return ActOnGraphElementsInside_Internal(t => node == t);
         }
 
         internal Rect ComputeShrinkToFitElementsRect_Internal()
@@ -615,54 +269,14 @@ internal Rect ComputeShrinkToFitElementsRect_Internal()
             return pos;
         }
 
-        Rect ComputeResizeToIncludeSelectedNodesRect()
-        {
-            var nodes = GraphView.GetSelection().
-                OfType<AbstractNodeModel>().
-                Select(n => n.GetView<GraphElement>(RootView)).
-                ToList();
-
-            // Now include the selected nodes
-            var pos = new Rect();
-            if (ComputeElementBounds(ref pos, nodes, MinSizePolicy.DoNotEnsureMinSize))
-            {
-                // We don't resize to be snug: we only resize enough to contain the selected nodes.
-                var currentRect = layout;
-                if (pos.xMin > currentRect.xMin)
-                    pos.xMin = currentRect.xMin;
-
-                if (pos.xMax < currentRect.xMax)
-                    pos.xMax = currentRect.xMax;
-
-                if (pos.yMin > currentRect.yMin)
-                    pos.yMin = currentRect.yMin;
-
-                if (pos.yMax < currentRect.yMax)
-                    pos.yMax = currentRect.yMax;
-
-                MakeRectAtLeastMinimalSize(ref pos);
-            }
-
-            return pos;
-        }
-
         internal void GetElementsToMove_Internal(bool moveOnlyPlacemat, HashSet<GraphElement> collectedElementsToMove)
-        {
-            if (PlacematModel.Collapsed)
-            {
-                var collapsedElements = AllCollapsedElements(CollapsedElements);
-                foreach (var element in collapsedElements)
-                {
-                    collectedElementsToMove.Add(element);
-                }
-            }
-            else if (!moveOnlyPlacemat)
+        {if (!moveOnlyPlacemat)
             {
-                ActOnGraphElementsOver_Internal(e =>
+                ActOnGraphElementsInside_Internal(e =>
                 {
                     collectedElementsToMove.Add(e);
                     return false;
-                }, true);
+                });
             }
         }
 
@@ -679,9 +293,17 @@ protected override void BuildContextualMenu(ContextualMenuPopulateEvent evt)
 
             if (!selectedPlacemats.Skip(1).Any()) // If there is only one placemat selected
             {
-                evt.menu.AppendAction("Select Placemat Contents",
-                    _ => GraphView.Dispatch(new SelectElementsCommand(SelectElementsCommand.SelectionMode.Replace, GatherCollapsedElements_Internal()))
-                );
+                evt.menu.AppendAction("Select All Placemat Contents",
+                    _ =>
+                    {
+                        var elements = new List<GraphElementModel>();
+                        ActOnGraphElementsInside_Internal(element =>
+                        {
+                            elements.Add(element.GraphElementModel);
+                            return true;
+                        });
+                        GraphView.Dispatch(new SelectElementsCommand(SelectElementsCommand.SelectionMode.Replace, elements));
+                    });
             }
 
             var placemats = GraphView.GraphModel.PlacematModels;
@@ -730,45 +352,27 @@ protected override void BuildContextualMenu(ContextualMenuPopulateEvent evt)
         protected List<GraphElement> GetNodesOverThisPlacemat()
         {
             var potentialElements = new List<ModelView>();
-            ActOnGraphElementsOver(e => potentialElements.Add(e));
+            ActOnGraphElementsOver_Internal(e => potentialElements.Add(e));
 
             return potentialElements.OfType<GraphElement>().Where(e => e.Model is AbstractNodeModel).ToList();
         }
 
-        void OnDetachFromPanel(DetachFromPanelEvent evt)
-        {
-            CollapsedElements = null;
-        }
-
         protected internal bool GetPortCenterOverride_Internal(PortModel port, out Vector2 overriddenPosition)
         {
-            if (!PlacematModel.Collapsed || parent == null)
-            {
                 overriddenPosition = Vector2.zero;
                 return false;
             }
 
-            const int xOffset = 6;
-            const int yOffset = 3;
-            var halfSize = CollapsedSize * 0.5f;
-            var offset = port.Orientation == PortOrientation.Horizontal
-                ? new Vector2(port.Direction == PortDirection.Input ? -halfSize.x + xOffset : halfSize.x - xOffset, 0)
-                : new Vector2(0, port.Direction == PortDirection.Input ? -halfSize.y + yOffset : halfSize.y - yOffset);
-
-            overriddenPosition = parent.LocalToWorld(layout.center + offset);
-            return true;
-        }
-
         // Helper method that calculates how big a Placemat should be to fit the nodes on top of it currently.
         // Returns false if bounds could not be computed.
         protected internal static bool ComputeElementBounds_Internal(ref Rect pos, IEnumerable<GraphElement> elements)
         {
-            return ComputeElementBounds(ref pos, elements, MinSizePolicy.EnsureMinSize);
+            return ComputeElementBounds(ref pos, elements);
         }
 
         // Helper method that calculates how big a Placemat should be to fit the nodes on top of it currently.
         // Returns false if bounds could not be computed.
-        static bool ComputeElementBounds(ref Rect pos, IEnumerable<GraphElement> elements, MinSizePolicy ensureMinSize)
+        static bool ComputeElementBounds(ref Rect pos, IEnumerable<GraphElement> elements)
         {
             if (elements == null || !elements.Any())
                 return false;
@@ -802,8 +406,7 @@ static bool ComputeElementBounds(ref Rect pos, IEnumerable<GraphElement> element
                 width,
                 height);
 
-            if (ensureMinSize == MinSizePolicy.EnsureMinSize)
-                MakeRectAtLeastMinimalSize(ref pos);
+            MakeRectAtLeastMinimalSize(ref pos);
 
             return true;
         }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Placemat/PlacematCommandsExtension_Internal.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Placemat/PlacematCommandsExtension_Internal.cs
deleted file mode 100644
index 1251c945d4..0000000000
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Placemat/PlacematCommandsExtension_Internal.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 System;
-
-namespace Unity.GraphToolsFoundation.Editor
-{
-    /// <summary>
-    /// Extension methods to help dispatching commands for a placemat.
-    /// </summary>
-    static class PlacematCommandsExtension_Internal
-    {
-        public static void CollapsePlacemat(this Placemat self, bool value)
-        {
-            var collapsedModels = value ? self.GatherCollapsedElements_Internal() : null;
-            self.GraphView.Dispatch(new CollapsePlacematCommand(self.PlacematModel, value, collapsedModels));
-        }
-    }
-}
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Placemat/PlacematContainer.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Placemat/PlacematContainer.cs
index 341b8196b7..491d74f72c 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Placemat/PlacematContainer.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Placemat/PlacematContainer.cs
@@ -32,30 +32,6 @@ public PlacematContainer(GraphView graphView)
             pickingMode = PickingMode.Ignore;
         }
 
-        public bool GetPortCenterOverride(Port port, out Vector2 overriddenPosition)
-        {
-            var rootNode = port.PortModel.NodeModel.GetView<GraphElement>(port.RootView);
-            if (m_GraphView.GraphModel != null && rootNode != null)
-            {
-                //Find the furthest placemat containing the rootNode and that is collapsed (if any)
-                for (var i = 0; i < m_GraphView.GraphModel.PlacematModels.Count; i++)
-                {
-                    var placematModel = m_GraphView.GraphModel.PlacematModels[i];
-                    if (placematModel.Collapsed)
-                    {
-                        var placemat = placematModel.GetView<Placemat>(m_GraphView);
-                        if (placemat?.WillDragNode_Internal(rootNode) ?? false)
-                        {
-                            return placemat.GetPortCenterOverride_Internal(port.PortModel, out overriddenPosition);
-                        }
-                    }
-                }
-            }
-
-            overriddenPosition = Vector3.zero;
-            return false;
-        }
-
         /// <summary>
         /// Sort the placemat visual elements by their model Z order.
         /// </summary>
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Port.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Port.cs
index c80e51500d..30c7c82a3a 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Port.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Port.cs
@@ -22,7 +22,6 @@ namespace Unity.GraphToolsFoundation.Editor
     class Port : ModelView, ISelectionDraggerTarget
     {
         public static readonly string ussClassName = "ge-port";
-        public static readonly string highlightedModifierUssClassName = ussClassName.WithUssModifier("highlighted");
         public static readonly string willConnectModifierUssClassName = ussClassName.WithUssModifier("will-connect");
         public static readonly string connectedModifierUssClassName = ussClassName.WithUssModifier("connected");
         public static readonly string notConnectedModifierUssClassName = ussClassName.WithUssModifier("not-connected");
@@ -53,6 +52,18 @@ class Port : ModelView, ISelectionDraggerTarget
         static readonly Vector2 k_HitBoxSize = new Vector2(40, 20);
         int m_ConnectedWiresCount = Int32.MinValue;
 
+        protected string m_CurrentDropHighlightClass = dropHighlightAcceptedClass;
+
+        string m_CurrentDataClassName;
+        string m_CurrentTypeClassName;
+
+        bool m_Hovering;
+        bool m_WillConnect;
+
+        WireConnector m_WireConnector;
+
+        VisualElement m_ConnectorCache;
+
         static Color DefaultPortColor
         {
             get
@@ -66,9 +77,10 @@ static Color DefaultPortColor
             }
         }
 
-        GraphView GraphView => RootView as GraphView;
-
-        WireConnector m_WireConnector;
+        /// <summary>
+        /// The <see cref="GraphView"/> this port belongs to.
+        /// </summary>
+        public GraphView GraphView => RootView as GraphView;
 
         public PortModel PortModel => Model as PortModel;
 
@@ -87,33 +99,22 @@ public VisualElement ConnectorElement
             private set;
         }
 
+        /// <summary>
+        /// Whether the port will be connected during an edge drag if the mouse is released where it is.
+        /// </summary>
         public bool WillConnect
         {
-            set => EnableInClassList(willConnectModifierUssClassName, value);
-        }
-
-        public bool Highlighted
-        {
+            get => m_WillConnect;
             set
-            {
-                EnableInClassList(highlightedModifierUssClassName, value);
-                var connectedWires = PortModel.GetConnectedWires();
-                for (int i = 0; i < connectedWires.Count; i++)
-                {
-                    var wireView = connectedWires[i].GetView<Wire>(RootView);
-                    if (wireView != null)
-                        wireView.UpdateFromModel();
-                }
+        {
+                m_WillConnect = value;
+                EnableInClassList(willConnectModifierUssClassName, value);
+                GetConnector()?.MarkDirtyRepaint();
             }
         }
 
         public Color PortColor { get; protected set; } = DefaultPortColor;
 
-        protected string m_CurrentDropHighlightClass = dropHighlightAcceptedClass;
-
-        string m_CurrentDataClassName;
-        string m_CurrentTypeClassName;
-
         /// <inheritdoc />
         public virtual bool CanAcceptDrop(IReadOnlyList<GraphElementModel> droppedElements)
         {
@@ -340,6 +341,14 @@ void EnableClass(string className, bool condition)
             tooltip = PortModel.Orientation == PortOrientation.Horizontal ? PortModel.ToolTip :
                 string.IsNullOrEmpty(PortModel.ToolTip) ? PortModel.UniqueName :
                 PortModel.UniqueName + "\n" + PortModel.ToolTip;
+
+            var connector = GetConnector();
+            if (connector != null)
+            {
+                connector.generateVisualContent = PortModel.PortType == PortType.Execution ? OnGenerateExecutionConnectorVisualContent : OnGenerateDataConnectorVisualContent;
+                connector.MarkDirtyRepaint();
+            }
+
         }
 
         static readonly Dictionary<Type, string> k_TypeClassNameSuffix = new Dictionary<Type, string>();
@@ -376,11 +385,6 @@ internal static string GetClassNameSuffixForDataType_Internal(Type thisPortType)
 
         public Vector3 GetGlobalCenter()
         {
-            if (GraphView != null && GraphView.GetPortCenterOverride(this, out var overriddenPosition))
-            {
-                return overriddenPosition;
-            }
-
             var connector = GetConnector();
             var localCenter = new Vector2(connector.layout.width * .5f, connector.layout.height * .5f);
             return connector.LocalToWorld(localCenter);
@@ -388,15 +392,33 @@ public Vector3 GetGlobalCenter()
 
         public VisualElement GetConnector()
         {
-            var portConnector = PartList.GetPart(connectorPartName) as PortConnectorPart;
-            return portConnector?.Connector ?? portConnector?.Root ?? this;
+            if (m_ConnectorCache == null)
+            {
+                var portConnector = PartList.GetPart(connectorPartName) as PortConnectorPart;
+                m_ConnectorCache = portConnector?.Connector ?? portConnector?.Root ?? this;
+            }
+
+            return m_ConnectorCache;
         }
 
-        public PortConnectorPart GetPortConnectorPart()
+        /// <summary>
+        /// Whether the mouse is Hovering the port.
+        /// </summary>
+        public bool Hovering
         {
-            return PartList.GetPart(connectorPartName) as PortConnectorPart;
+            get => m_Hovering;
+            set
+            {
+                m_Hovering = value;
+                GetConnector()?.MarkDirtyRepaint();
+            }
         }
 
+        /// <summary>
+        /// Whether the port cap should actually be visible.
+        /// </summary>
+        public bool IsCapVisible => Hovering || WillConnect || PortModel.IsConnected();
+
         /// <summary>
         /// Gets the port hit box.
         /// </summary>
@@ -460,5 +482,76 @@ PortModel GetPortToConnect(GraphElementModel selectable)
         {
             return (selectable as PortNodeModel)?.GetPortFitToConnectTo(PortModel);
         }
+
+        void OnGenerateExecutionConnectorVisualContent(MeshGenerationContext mgc)
+        {
+            mgc.painter2D.strokeColor = PortColor;
+            mgc.painter2D.lineJoin = LineJoin.Round;
+
+            var paintRect = GetConnector().localBound;
+            paintRect.position = Vector2.zero;
+
+            MakeTriangle(mgc.painter2D, paintRect);
+            mgc.painter2D.lineWidth = 1.0f;
+            mgc.painter2D.Stroke();
+
+            if (IsCapVisible)
+            {
+                paintRect.position += PortModel?.Orientation == PortOrientation.Horizontal ? new Vector2(1.33f, 2) : new Vector2(2, 1.33f);
+                paintRect.size -= Vector2.one * 4;
+                mgc.painter2D.fillColor = PortColor;
+                MakeTriangle(mgc.painter2D, paintRect);
+                mgc.painter2D.Fill();
+            }
+        }
+
+        void OnGenerateDataConnectorVisualContent(MeshGenerationContext mgc)
+        {
+            mgc.painter2D.strokeColor = PortColor;
+            mgc.painter2D.lineJoin = LineJoin.Round;
+
+            var paintRect = GetConnector().localBound;
+            paintRect.position = Vector2.zero;
+
+            MakeCircle(mgc.painter2D, paintRect);
+            mgc.painter2D.lineWidth = 1.0f;
+            mgc.painter2D.Stroke();
+
+            if (IsCapVisible)
+            {
+                paintRect.position += Vector2.one * 2;
+                paintRect.size -= Vector2.one * 4;
+                mgc.painter2D.fillColor = PortColor;
+                MakeCircle(mgc.painter2D, paintRect);
+                mgc.painter2D.Fill();
+            }
+        }
+
+        void MakeTriangle(Painter2D painter2D, Rect paintRect)
+        {
+            painter2D.BeginPath();
+            if (PortModel?.Orientation == PortOrientation.Horizontal)
+            {
+                painter2D.MoveTo(new Vector2(paintRect.xMin, paintRect.yMin));
+                painter2D.LineTo(new Vector2(paintRect.xMax, paintRect.center.y));
+                painter2D.LineTo(new Vector2(paintRect.xMin, paintRect.yMax));
+                painter2D.LineTo(new Vector2(paintRect.xMin, paintRect.yMin));
+            }
+            else
+            {
+                painter2D.MoveTo(new Vector2(paintRect.xMin, paintRect.yMin));
+                painter2D.LineTo(new Vector2(paintRect.xMax, paintRect.yMin));
+                painter2D.LineTo(new Vector2(paintRect.center.x, paintRect.yMax));
+                painter2D.LineTo(new Vector2(paintRect.xMin, paintRect.yMin));
+            }
+            painter2D.ClosePath();
+        }
+
+        void MakeCircle(Painter2D painter2D, Rect paintRect)
+        {
+            painter2D.BeginPath();
+            painter2D.Arc(paintRect.center, paintRect.width * 0.5f, 0, Angle.Turns(1));
+            painter2D.ClosePath();
+        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/StickyNote.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/StickyNote.cs
index 8102e898fa..a841b73434 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/StickyNote.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/StickyNote.cs
@@ -22,22 +22,21 @@ class StickyNote : GraphElement
         public static readonly string themeClassNamePrefix = ussClassName.WithUssModifier("theme-");
         public static readonly string sizeClassNamePrefix = ussClassName.WithUssModifier("size-");
 
-        public static readonly string selectionBorderElementName = "selection-border";
-        public static readonly string disabledOverlayElementName = "disabled-overlay";
         public static readonly string titleContainerPartName = "title-container";
         public static readonly string contentContainerPartName = "text-container";
         public static readonly string resizerPartName = "resizer";
 
-        protected VisualElement m_ContentContainer;
-
         string m_CurrentThemeClassName;
         string m_CurrentSizeClassName;
 
-        /// <inheritdoc />
-        public override VisualElement contentContainer => m_ContentContainer ?? this;
-
         public StickyNoteModel StickyNoteModel => Model as StickyNoteModel;
 
+        /// <summary>
+        /// Creates an instance of the <see cref="StickyNote"/> class.
+        /// </summary>
+        public StickyNote():base(true)
+        {}
+
         /// <inheritdoc />
         protected override void BuildPartList()
         {
@@ -46,20 +45,6 @@ protected override void BuildPartList()
             PartList.AppendPart(FourWayResizerPart.Create(resizerPartName, Model, this, ussClassName));
         }
 
-        /// <inheritdoc />
-        protected override void BuildElementUI()
-        {
-            var selectionBorder = new SelectionBorder { name = selectionBorderElementName };
-            selectionBorder.AddToClassList(ussClassName.WithUssElement(selectionBorderElementName));
-            Add(selectionBorder);
-            m_ContentContainer = selectionBorder.ContentContainer;
-
-            base.BuildElementUI();
-
-            var disabledOverlay = new VisualElement { name = disabledOverlayElementName, pickingMode = PickingMode.Ignore };
-            hierarchy.Add(disabledOverlay);
-        }
-
         /// <inheritdoc />
         protected override void PostBuildUI()
         {
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Wire.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Wire.cs
index 634756ee60..dd01dd7d98 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Wire.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelView/Wire.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;
@@ -213,6 +214,34 @@ public override bool ContainsPoint(Vector2 localPoint)
             return WireControl.ContainsPoint(this.ChangeCoordinatesTo(WireControl, localPoint));
         }
 
+        /// <summary>
+        /// Gets the wire data required to create portals.
+        /// </summary>
+        /// <param name="wires">The wires that will be converted to portals.</param>
+        /// <param name="rootView">The <paramref name="RootView"/> that contains the portals.</param>
+        internal static List<(WireModel, Vector2, Vector2)> GetPortalsWireData(IEnumerable<WireModel> wires, RootView rootView)
+        {
+            var wireData = wires.Select(
+                wireModel =>
+                {
+                    var outputPort = wireModel.FromPort.GetView<Port>(rootView);
+                    var inputPort = wireModel.ToPort.GetView<Port>(rootView);
+                    var outputNode = wireModel.FromPort.NodeModel.GetView<Node>(rootView);
+                    var inputNode = wireModel.ToPort.NodeModel.GetView<Node>(rootView);
+                    var wire = wireModel.GetView<Wire>(rootView);
+
+                    if (outputNode == null || inputNode == null || outputPort == null || inputPort == null || wire == null)
+                        return (null, Vector2.zero, Vector2.zero);
+
+                    return (wireModel,
+                        outputPort.ChangeCoordinatesTo(wire.contentContainer, outputPort.layout.center),
+                        inputPort.ChangeCoordinatesTo(wire.contentContainer, inputPort.layout.center));
+                }
+            ).Where(tuple => tuple.Item1 != null).ToList();
+
+            return wireData;
+        }
+
         /// <inheritdoc />
         protected override void BuildContextualMenu(ContextualMenuPopulateEvent evt)
         {
@@ -227,7 +256,7 @@ protected override void BuildContextualMenu(ContextualMenuPopulateEvent evt)
             var selection = GraphView.GetSelection().ToList();
 
             // If any element in the selection is not a wire, the graph view context menu is opened instead.
-            if (selection.Any(ge => !ge.GetType().IsAssignableFrom(typeof(WireModel))))
+            if (selection.Any(ge => !typeof(WireModel).IsInstanceOfType(ge)))
                 return;
 
             evt.menu.AppendAction("Insert Node on Wire", menuAction =>
@@ -240,26 +269,10 @@ protected override void BuildContextualMenu(ContextualMenuPopulateEvent evt)
             var wires = selection.OfType<WireModel>().ToList();
             if (wires.Count > 0)
             {
-                var wireData = wires.Select(
-                    wireModel =>
-                    {
-                        var outputPort = wireModel.FromPort.GetView<Port>(GraphView);
-                        var inputPort = wireModel.ToPort.GetView<Port>(GraphView);
-                        var outputNode = wireModel.FromPort.NodeModel.GetView<Node>(GraphView);
-                        var inputNode = wireModel.ToPort.NodeModel.GetView<Node>(GraphView);
-
-                        if (outputNode == null || inputNode == null || outputPort == null || inputPort == null)
-                            return (null, Vector2.zero, Vector2.zero);
-
-                        return (wireModel,
-                            outputPort.ChangeCoordinatesTo(contentContainer, outputPort.layout.center),
-                            inputPort.ChangeCoordinatesTo(contentContainer, inputPort.layout.center));
-                    }
-                ).Where(tuple => tuple.Item1 != null).ToList();
-
+                var wireData = GetPortalsWireData(wires, GraphView);
                 evt.menu.AppendAction("Add Portals", _ =>
                 {
-                    GraphView.Dispatch(new ConvertWiresToPortalsCommand(wireData));
+                    GraphView.Dispatch(new ConvertWiresToPortalsCommand(wireData, GraphView));
                 });
             }
 
@@ -317,6 +330,12 @@ public virtual bool ShowItemLibrary(Vector2 mousePosition)
             return true;
         }
 
+        /// <inheritdoc/>
+        protected override DynamicBorder CreateDynamicBorder()
+        {
+            return null;
+        }
+
         /// <inheritdoc/>
         public override void SetElementLevelOfDetail(float zoom, GraphViewZoomMode newZoomMode, GraphViewZoomMode oldZoomMode)
         {
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/ContextBlocksPart.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/ContextBlocksPart.cs
index bd3a185571..f67640fc8f 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/ContextBlocksPart.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/ContextBlocksPart.cs
@@ -124,7 +124,7 @@ void MouseUpOnAddBlock()
         /// <inheritdoc/>
         protected override void UpdatePartFromModel()
         {
-            Dictionary<int, BlockNodeModel> blockModels = ContextNodeModel.GraphElementModels.Cast<BlockNodeModel>()
+            Dictionary<int, BlockNodeModel> blockModels = ContextNodeModel.GraphElementModels.OfType<BlockNodeModel>()
                 .Where(t => t != null && t is not IPlaceholder).Select((t, i) => new { index = i, value = t })
                 .ToDictionary(t => t.index, t => t.value);
 
@@ -134,7 +134,9 @@ protected override void UpdatePartFromModel()
             {
                 if (!(block.Model is BlockNodeModel blockModel) || blockModels.ContainsValue(blockModel))
                     continue;
-                block.RemoveFromRootView();
+                // Only remove it from the root view if the block is not part of another context node.
+                if (blockModel.ContextNodeModel == null || blockModel.ContextNodeModel == ContextNodeModel)
+                    block.RemoveFromRootView();
                 block.RemoveFromHierarchy();
             }
             if (blockModels.Count == 0)
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/EditableTitlePart.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/EditableTitlePart.cs
index ce43f7696f..e1be64dffd 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/EditableTitlePart.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/EditableTitlePart.cs
@@ -20,8 +20,8 @@ class EditableTitlePart : GraphElementPart
         public static readonly string ussClassName = "ge-editable-title-part";
         public static readonly string titleLabelName = "title";
 
-        static readonly CustomStyleProperty<float> k_LodMinTextSize = new CustomStyleProperty<float>("--lod-min-text-size");
-        static readonly CustomStyleProperty<float> k_WantedTextSize = new CustomStyleProperty<float>("--wanted-text-size");
+        protected static readonly CustomStyleProperty<float> k_LodMinTextSize = new CustomStyleProperty<float>("--lod-min-text-size");
+        protected static readonly CustomStyleProperty<float> k_WantedTextSize = new CustomStyleProperty<float>("--wanted-text-size");
 
         static UnityEngine.TextCore.Text.TextGenerationSettings s_TextGenerationSettings = new();
 
@@ -75,7 +75,7 @@ static float GetTextWidthWithFontSize(TextElement element, float fontSize)
             s_TextGenerationSettings.screenRect = new Rect(0, 0, 32000, 32000);
             s_TextGenerationSettings.fontSize = fontSize;
 
-            var size = TextGenerator.GetPreferredValues(s_TextGenerationSettings, TextHandle.layoutTextInfo);
+            var size = TextGenerator.GetPreferredValues(s_TextGenerationSettings, TextHandle.textInfoCommon);
 
             return size.x;
         }
@@ -85,7 +85,11 @@ static float GetTextWidthWithFontSize(TextElement element, float fontSize)
         bool m_SetWidth;
 
         string m_PreviousTitle;
-        float m_CurrentZoom;
+
+        /// <summary>
+        /// The current zoom level of the graph.
+        /// </summary>
+        protected float m_CurrentZoom;
 
         /// <summary>
         /// The root element of the part.
@@ -100,12 +104,12 @@ static float GetTextWidthWithFontSize(TextElement element, float fontSize)
         /// <summary>
         /// The minimum readable size of the text, lod will try to make the text at least this size.
         /// </summary>
-        public float LodMinTextSize { get; private set; } = 12;
+        public float LodMinTextSize { get; protected internal set; } = 12;
 
         /// <summary>
         /// The wanted text size at 100% zoom.
         /// </summary>
-        public float WantedTextSize { get; private set; }
+        public float WantedTextSize { get; protected set; }
 
         /// <inheritdoc />
         public override VisualElement Root => TitleContainer;
@@ -178,19 +182,33 @@ protected void CreateTitleLabel()
         /// <inheritdoc />
         protected override void UpdatePartFromModel()
         {
-            if (TitleLabel != null)
-            {
-                var value = (m_Model as IHasTitle)?.DisplayTitle ?? String.Empty;
+            if (TitleLabel == null)
+                return;
 
-                if (value == m_PreviousTitle)
-                    return;
-                m_PreviousTitle = value;
-                if (TitleLabel is EditableLabel editableLabel)
-                    editableLabel.SetValueWithoutNotify(value);
-                else if (TitleLabel is Label label)
-                    label.text = value;
-                SetupWidthFromOriginalSize();
+            bool labelTypeChanged = false;
+            if ((TitleLabel is EditableLabel && !HasEditableLabel) ||
+                (TitleLabel is Label && HasEditableLabel))
+
+            {
+                TitleContainer.Remove(m_UseEllipsis ? TitleLabel.parent : TitleLabel);
+                CreateTitleLabel();
+                labelTypeChanged = true;
             }
+
+            var value = (m_Model as IHasTitle)?.DisplayTitle ?? String.Empty;
+
+            if (value == m_PreviousTitle && !labelTypeChanged)
+                return;
+
+            m_PreviousTitle = value;
+            if (TitleLabel is EditableLabel editableLabel)
+                editableLabel.SetValueWithoutNotify(value);
+            else if (TitleLabel is Label label)
+                label.text = value;
+            SetupWidthFromOriginalSize();
+
+            if (labelTypeChanged)
+                SetupLod();
         }
 
         /// <inheritdoc />
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/PlacematTitlePart.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/PlacematTitlePart.cs
index 1a2872a97a..4dcbf221ed 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/PlacematTitlePart.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/PlacematTitlePart.cs
@@ -3,13 +3,20 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using Cursor = UnityEngine.UIElements.Cursor;
 
 namespace Unity.GraphToolsFoundation.Editor;
 
 class PlacematTitlePart : EditableTitlePart
 {
+    const float k_TitleToHeight = 4;
+    const float k_MinHeightAt12pt = 57;
+
     /// <summary>
-    /// Creates a new instance of the <see cref="EditableTitlePart"/> class.
+    /// Creates a new instance of the <see cref="PlacematTitlePart"/> class.
     /// </summary>
     /// <param name="name">The name of the part.</param>
     /// <param name="model">The model displayed in this part.</param>
@@ -28,7 +35,7 @@ class PlacematTitlePart : EditableTitlePart
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="EditableTitlePart"/> class.
+    /// Initializes a new instance of the <see cref="PlacematTitlePart"/> class.
     /// </summary>
     /// <param name="name">The name of the part.</param>
     /// <param name="model">The model displayed in this part.</param>
@@ -40,6 +47,22 @@ protected PlacematTitlePart(string name, Model model, ModelView ownerElement, st
     {
     }
 
+    static readonly string s_PlatformPath = (Application.platform == RuntimePlatform.WindowsEditor) ? "Windows/" : "macOS/";
+    static readonly Cursor s_MoveTitle = new Cursor{texture = EditorGUIUtility.Load("Cursors/" + s_PlatformPath + "Grid.MoveTool.png") as Texture2D,
+        hotspot = new Vector2(7, 6), defaultCursorId = (int)MouseCursor.CustomCursor};
+
+    public static readonly string leftAlignClassName = ussClassName.WithUssModifier("left-align");
+    public static readonly string rightAlignClassName = ussClassName.WithUssModifier("right-align");
+
+    GraphViewZoomMode m_CurrentMode;
+
+    protected override void BuildPartUI(VisualElement container)
+    {
+        base.BuildPartUI(container);
+
+        TitleContainer.Q<Label>().style.cursor = TitleContainer.style.cursor = s_MoveTitle;
+    }
+
     /// <inheritdoc />
     protected override void UpdatePartFromModel()
     {
@@ -47,9 +70,49 @@ protected override void UpdatePartFromModel()
 
         if (m_Model is PlacematModel placematModel)
         {
-            var color = placematModel.Color;
-            color.a = 0.5f;
-            TitleContainer.style.backgroundColor = color;
+            WantedTextSize = placematModel.TitleFontSize;
+
+            TitleLabel.EnableInClassList(leftAlignClassName,placematModel.TitleAlignment == TextAlignment.Left );
+            TitleLabel.EnableInClassList(rightAlignClassName,placematModel.TitleAlignment == TextAlignment.Right );
+
+            if (m_CurrentZoom != 0)
+                base.SetLevelOfDetail(m_CurrentZoom, m_CurrentMode, GraphViewZoomMode.Normal);
+
+            TitleContainer.tooltip = placematModel.Title;
+        }
+    }
+
+    /// <inheritdoc />
+    protected override void OnCustomStyleResolved(CustomStyleResolvedEvent e)
+    {
+        if (e.customStyle.TryGetValue(k_LodMinTextSize, out var value))
+            LodMinTextSize = value;
+    }
+
+    bool m_UpdateHeightRegistered;
+
+    /// <inheritdoc />
+    public override void SetLevelOfDetail(float zoom, GraphViewZoomMode newZoomMode, GraphViewZoomMode oldZoomMode)
+    {
+        m_CurrentMode = newZoomMode;
+        base.SetLevelOfDetail(zoom, newZoomMode, oldZoomMode);
+
+        float height = TitleContainer.layout.height;
+
+        if (float.IsFinite(height))
+            TitleContainer.style.marginTop = -height;
+
+        if (!m_UpdateHeightRegistered)
+        {
+            TitleContainer.RegisterCallback<GeometryChangedEvent>(UpdateHeight);
+            m_UpdateHeightRegistered = true;
         }
     }
+
+    void UpdateHeight(GeometryChangedEvent e)
+    {
+        float height = TitleContainer.layout.height;
+        if (float.IsFinite(height) && TitleContainer.resolvedStyle.marginTop != height)
+            TitleContainer.style.marginTop = -height;
+    }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/PortConnectorPart.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/PortConnectorPart.cs
index c8886bd5b8..eb11c271e1 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/PortConnectorPart.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/ModelViewParts/PortConnectorPart.cs
@@ -15,7 +15,6 @@ class PortConnectorPart : BaseModelViewPart
     {
         public static readonly string ussClassName = "ge-port-connector-part";
         public static readonly string connectorUssName = "connector";
-        public static readonly string connectorCapUssName = "cap";
         public static readonly string labelName = "label";
 
         /// <summary>
@@ -40,27 +39,13 @@ public static PortConnectorPart Create(string name, Model model, ModelView owner
 
         protected VisualElement m_ConnectorBox;
 
-        protected VisualElement m_ConnectorBoxCap;
-
         protected VisualElement m_Root;
 
-        bool m_Hovering;
-
         /// <inheritdoc />
         public override VisualElement Root => m_Root;
 
         public VisualElement Connector => m_ConnectorBox;
 
-        public bool Hovering
-        {
-            get => m_Hovering;
-            set
-            {
-                m_Hovering = value;
-                ShowCap();
-            }
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="PortConnectorPart"/> class.
         /// </summary>
@@ -69,7 +54,9 @@ public bool Hovering
         /// <param name="ownerElement">The owner of the part.</param>
         /// <param name="parentClassName">The class name of the parent.</param>
         protected PortConnectorPart(string name, Model model, ModelView ownerElement, string parentClassName)
-            : base(name, model, ownerElement, parentClassName) {}
+            : base(name, model, ownerElement, parentClassName)
+        {
+        }
 
         /// <inheritdoc />
         protected override void BuildPartUI(VisualElement container)
@@ -83,11 +70,6 @@ protected override void BuildPartUI(VisualElement container)
             m_ConnectorBox.AddToClassList(m_ParentClassName.WithUssElement(connectorUssName));
             m_Root.Add(m_ConnectorBox);
 
-            m_ConnectorBoxCap = new VisualElement { name = connectorCapUssName };
-            m_ConnectorBoxCap.AddToClassList(ussClassName.WithUssElement(connectorCapUssName));
-            m_ConnectorBoxCap.AddToClassList(m_ParentClassName.WithUssElement(connectorCapUssName));
-            m_ConnectorBox.Add(m_ConnectorBoxCap);
-
             if (m_Model is IHasTitle)
             {
                 m_ConnectorLabel = new Label { name = labelName };
@@ -97,6 +79,26 @@ protected override void BuildPartUI(VisualElement container)
             }
 
             container.Add(m_Root);
+            container.RegisterCallback<MouseLeaveEvent>(OnMouseLeave);
+            container.RegisterCallback<MouseMoveEvent>(OnMouseMove);
+        }
+
+        void OnMouseMove(MouseMoveEvent evt)
+        {
+            if (m_OwnerElement is not Port port)
+                return;
+
+            var mouseIsOnHitBox = Port.GetPortHitBoxBounds(port, true).Contains(evt.mousePosition);
+            if (mouseIsOnHitBox != port.Hovering)
+                port.Hovering = mouseIsOnHitBox;
+        }
+
+        void OnMouseLeave(MouseLeaveEvent evt)
+        {
+            if (m_OwnerElement is not Port port)
+                return;
+
+            port.Hovering = false;
         }
 
         /// <inheritdoc />
@@ -112,24 +114,7 @@ protected override void UpdatePartFromModel()
             if (m_ConnectorLabel != null)
                 m_ConnectorLabel.text = (m_Model as IHasTitle)?.DisplayTitle ?? String.Empty;
 
-            ShowCap();
-        }
-
-        protected void ShowCap()
-        {
-            if (m_ConnectorBoxCap != null)
-            {
-                bool showCap = Hovering || (m_OwnerElement?.ClassListContains(Port.willConnectModifierUssClassName) ?? false);
-
-                if ((m_Model is PortModel portModel && portModel.IsConnected()) || showCap)
-                {
-                    m_ConnectorBoxCap.style.visibility = StyleKeyword.Null;
-                }
-                else
-                {
-                    m_ConnectorBoxCap.style.visibility = Visibility.Hidden;
-                }
-            }
+            m_ConnectorBox.MarkDirtyRepaint();
         }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/SubgraphCustomPropertyField.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/SubgraphCustomPropertyField.cs
index 23689662ec..6098385498 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/SubgraphCustomPropertyField.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/SubgraphCustomPropertyField.cs
@@ -41,25 +41,23 @@ public bool UpdateDisplayedValue(SubgraphPropertiesField value)
             if (m_Toggle != null)
             {
                 m_Toggle.SetValueWithoutNotify(value.ShouldShowInLibrary);
-                DisplayElement(m_WarningBox, m_Toggle.value && !m_GraphModel.CanBeSubgraph());
+                DisplayElement(m_WarningBox, value.ShouldShowInLibrary && !m_GraphModel.CanBeSubgraph());
 
                 if (m_WarningBox != null)
                     m_WarningBox.text = m_WarningMessage?? "The conditions for this graph to be usable as a subgraph are not met.";
 
                 if (m_PathTextField != null && m_DescriptionTextField != null)
                 {
-                    DisplayElement(m_ToggleContainer, m_Toggle.value);
+                    DisplayElement(m_ToggleContainer, value.ShouldShowInLibrary);
                     m_PathTextField.SetValueWithoutNotify(value.DisplayedPath);
 
                     var description = string.IsNullOrEmpty(value.Description)? k_Placeholder : value.Description;
                     m_DescriptionTextField.EnableInClassList(placeholderUssClassName, string.IsNullOrEmpty(value.Description) || value.Description == k_Placeholder);
                     m_DescriptionTextField.SetValueWithoutNotify(description);
                 }
-
-                return true;
             }
 
-            return false;
+            return true;
         }
 
 
@@ -159,9 +157,6 @@ void OnToggleChanged(ChangeEvent<bool> e)
                 Description = m_DescriptionTextField.value
             };
 
-            DisplayElement(m_WarningBox, e.newValue && !m_GraphModel.CanBeSubgraph());
-            DisplayElement(m_ToggleContainer, e.newValue);
-
             using (var ee = ChangeEvent<SubgraphPropertiesField>.GetPooled(oldPropertiesField, newPropertiesField))
             {
                 ee.target = m_Container;
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/UIElements/SelectionBorder.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/UIElements/SelectionBorder.cs
deleted file mode 100644
index 1afa045082..0000000000
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/GraphView/UIElements/SelectionBorder.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;
-using UnityEngine.UIElements;
-
-namespace Unity.GraphToolsFoundation.Editor
-{
-    /// <summary>
-    /// Class to add a border to its parent. The border is highlighted when the element is selected.
-    /// </summary>
-    class SelectionBorder : VisualElement
-    {
-        public static readonly string ussClassName = "ge-selection-border";
-        public static readonly string contentContainerElementName = "content-container";
-
-        public VisualElement ContentContainer { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SelectionBorder"/> class.
-        /// </summary>
-        public SelectionBorder()
-        {
-            // [VSB-695]
-            // Setting pickingMode to Ignore so that our clumsy drag and drop implementation work for placemats.
-            // Dnd is handled by the graph view and it looks at the event target. This means the event target
-            // should be the placemat (in general, the element having the border), not the border or the content container.
-            // This would be unneeded if the placemat handled DnD itself.
-            pickingMode = PickingMode.Ignore;
-            AddToClassList(ussClassName);
-
-            ContentContainer = new VisualElement { name = contentContainerElementName, pickingMode = PickingMode.Ignore };
-            ContentContainer.AddToClassList(ussClassName.WithUssElement(contentContainerElementName));
-            Add(ContentContainer);
-
-            this.AddStylesheet_Internal("SelectionBorder.uss");
-        }
-    }
-}
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/InlineValueEditor/InlineValueEditor.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/InlineValueEditor/InlineValueEditor.cs
index 5a2d6a6700..f357f2bac7 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/InlineValueEditor/InlineValueEditor.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/InlineValueEditor/InlineValueEditor.cs
@@ -33,6 +33,12 @@ public static BaseModelPropertyField CreateEditorForConstants(
             RootView uiContext, IEnumerable<GraphElementModel> ownerModels, IEnumerable<Constant> constants,
             bool modelIsLocked, string label = null)
         {
+            // PF FIXME the extension method mechanism is not really useful to select a method on a per constant-type
+            // basis, since `constants` is always of type IEnumerable<Constant>.
+
+            if (constants == null || !constants.Any())
+                return null;
+
             var ext = ExtensionMethodCache<ConstantEditorBuilder>.GetExtensionMethod(
                 uiContext.GetType(), constants.GetType(),
                 ConstantEditorBuilder.FilterMethods, ConstantEditorBuilder.KeySelector);
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/FieldsInspector.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/FieldsInspector.cs
index 746383a150..c9647061b2 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/FieldsInspector.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/FieldsInspector.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace Unity.GraphToolsFoundation.Editor
@@ -58,11 +59,7 @@ protected override void UpdatePartFromModel()
         {
             foreach (var modelField in m_Fields)
             {
-                if (!modelField.UpdateDisplayedValue())
-                {
-                    BuildFields();
-                    break;
-                }
+                modelField.UpdateDisplayedValue();
             }
         }
 
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/NodePortsInspector.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/NodePortsInspector.cs
index 355c329521..df52254462 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/NodePortsInspector.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/NodePortsInspector.cs
@@ -38,21 +38,11 @@ protected override void UpdatePartFromModel()
             if (ShouldRebuildFields())
             {
                 BuildFields();
-                foreach (var modelField in m_Fields)
-                {
-                    modelField.UpdateDisplayedValue();
-                }
             }
-            else
+
+            foreach (var modelField in m_Fields)
             {
-                foreach (var modelField in m_Fields)
-                {
-                    if (!modelField.UpdateDisplayedValue())
-                    {
-                        BuildFields();
-                        break;
-                    }
-                }
+                modelField.UpdateDisplayedValue();
             }
         }
 
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/PlacematFieldsInspector.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/PlacematFieldsInspector.cs
new file mode 100644
index 0000000000..570776062c
--- /dev/null
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/PlacematFieldsInspector.cs
@@ -0,0 +1,58 @@
+// 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 System.Reflection;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Unity.GraphToolsFoundation.Editor
+{
+    /// <summary>
+    /// Inspector for <see cref="VariableDeclarationModel"/>.
+    /// </summary>
+    class PlacematFieldsInspector : SerializedFieldsInspector
+    {
+        /// <summary>
+        /// Creates a new instance of the <see cref="VariableFieldsInspector"/> class.
+        /// </summary>
+        /// <param name="name">The name of the part.</param>
+        /// <param name="models">The models displayed in this part.</param>
+        /// <param name="rootView">The root view.</param>
+        /// <param name="parentClassName">The class name of the parent.</param>
+        /// <param name="filter">A filter function to select which fields are displayed in the inspector. If null, defaults to <see cref="SerializedFieldsInspector.CanBeInspected"/>.</param>
+        /// <returns>A new instance of <see cref="VariableFieldsInspector"/>.</returns>
+        public static PlacematFieldsInspector Create(string name, IEnumerable<PlacematModel> models, RootView rootView, string parentClassName, Func<FieldInfo, bool> filter = null)
+        {
+            if (models.Any())
+                return new PlacematFieldsInspector(name, models, rootView, parentClassName, filter);
+            return null;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VariableFieldsInspector"/> class.
+        /// </summary>
+        protected PlacematFieldsInspector(string name, IEnumerable<PlacematModel> models, RootView rootView, string parentClassName, Func<FieldInfo, bool> filter)
+            : base(name, models, rootView, parentClassName, filter)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override List<BaseModelPropertyField> GetCustomFields()
+        {
+            List<BaseModelPropertyField> result = new List<BaseModelPropertyField>(1);
+            // Color field
+            var colorPropertyField = new ModelPropertyField<Color>(RootView, m_Models, nameof(PlacematModel.Color), nameof(PlacematModel.Color), "",typeof(ChangeElementColorCommand));
+            var colorField = colorPropertyField.Query<ColorField>().First();
+            if (colorField != null)
+                colorField.showAlpha = false;
+            result.Add(colorPropertyField);
+
+            return result;
+        }
+    }
+}
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/TextAlignmentFieldBuilder.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/TextAlignmentFieldBuilder.cs
new file mode 100644
index 0000000000..532681a988
--- /dev/null
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/TextAlignmentFieldBuilder.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 System.Collections.Generic;
+
+using Unity.CommandStateObserver;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Unity.GraphToolsFoundation.Editor
+{
+    class TextAlignmentFieldBuilder : ICustomPropertyFieldBuilder<TextAlignment>
+    {
+        /// <summary>
+        /// The class name for this TextAlignment Fields.
+        /// </summary>
+        public static readonly string ussClassName = "ge-text-alignment-field";
+
+        ToggleButtonStrip m_ToggleButtonStrip;
+
+        /// <inheritdoc />
+        public bool UpdateDisplayedValue(TextAlignment value)
+        {
+            m_ToggleButtonStrip.SetValueWithoutNotify(value.ToString());
+
+            return true;
+        }
+
+        public void SetMixed()
+        {
+            m_ToggleButtonStrip.showMixedValue = true;
+        }
+
+        void OnValueChanged(ChangeEvent<string> e)
+        {
+            Enum.TryParse(e.previousValue, out TextAlignment previous);
+            Enum.TryParse(e.newValue, out TextAlignment newValue);
+
+            using (var ee = ChangeEvent<TextAlignment>.GetPooled(previous, newValue))
+            {
+                ee.target = m_ToggleButtonStrip;
+                m_ToggleButtonStrip.SendEvent(ee);
+            }
+
+            e.StopPropagation();
+        }
+
+        /// <inheritdoc />
+        public VisualElement Build(ICommandTarget commandTargetView, string label, string fieldTooltip, IEnumerable<object> objs, string propertyName)
+        {
+            m_ToggleButtonStrip = new ToggleButtonStrip() { label = ObjectNames.NicifyVariableName(propertyName), choices = Enum.GetNames(typeof(TextAlignment)) };
+            m_ToggleButtonStrip.RegisterCallback<ChangeEvent<string>>(OnValueChanged);
+            m_ToggleButtonStrip.AddToClassList(ussClassName);
+
+            return m_ToggleButtonStrip;
+        }
+    }
+}
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/BaseModelPropertyField.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/BaseModelPropertyField.cs
index d7bdd2b855..5a809790de 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/BaseModelPropertyField.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/BaseModelPropertyField.cs
@@ -28,6 +28,6 @@ protected BaseModelPropertyField(ICommandTarget commandTarget)
         /// Updates the value displayed by the custom UI.
         /// </summary>
         /// <returns>True if the value was updated.</returns>
-        public abstract bool UpdateDisplayedValue();
+        public abstract void UpdateDisplayedValue();
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ConstantField.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ConstantField.cs
index 77d04d6922..a56edc03db 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ConstantField.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ConstantField.cs
@@ -41,7 +41,7 @@ class ConstantField : CustomizableModelPropertyField
 
         public ConstantField(IEnumerable<Constant> constantModels, IEnumerable<GraphElementModel> owners,
             ICommandTarget commandTarget, string label = null)
-            : base(commandTarget, label)
+            : base(commandTarget, label, null)
         {
             ConstantModels = constantModels;
             Owners = owners;
@@ -57,11 +57,34 @@ public ConstantField(IEnumerable<Constant> constantModels, IEnumerable<GraphElem
             }
         }
 
+        void OnLabelMouseCapture(MouseCaptureEvent e)
+        {
+            (CommandTarget as IUndoableCommandMerger)?.StartMergingUndoableCommands();
+        }
+
+        void OnLabelMouseRelease(MouseCaptureOutEvent e)
+        {
+            (CommandTarget as IUndoableCommandMerger)?.StopMergingUndoableCommands();
+        }
+
         void SetFieldChangedCallback()
         {
             if (m_Field == null)
                 return;
 
+            foreach (var numericField in m_Field.Query<FloatField>().ToList().Cast<VisualElement>()
+                                .Concat(m_Field.Query<IntegerField>().ToList())
+                                .Concat(m_Field.Query<LongField>().ToList())
+                                .Concat(m_Field.Query<DoubleField>().ToList()))
+            {
+                var label = numericField.Q<Label>();
+                if (label != null)
+                {
+                    label.RegisterCallback<MouseCaptureEvent>(OnLabelMouseCapture);
+                    label.RegisterCallback<MouseCaptureOutEvent>(OnLabelMouseRelease);
+                }
+            }
+
             var registerCallbackMethod = GetRegisterCallback_Internal();
             if (registerCallbackMethod != null)
             {
@@ -104,7 +127,9 @@ internal MethodInfo GetRegisterCallback_Internal()
             if (registerCallbackMethod == null)
                 return null;
 
-            var t = ConstantModels.First().Type == typeof(EnumValueReference) ? typeof(Enum) : ModelHelpers.GetCommonBaseType(ConstantModels.Select(t => t.ObjectValue));
+            var t = ConstantModels.First().Type == typeof(EnumValueReference) ? typeof(Enum) :
+                ModelHelpers.GetCommonBaseType(ConstantModels.Select(
+                    t => t.ObjectValue != null ? t.ObjectValue.GetType() : t.Type));
 
             // Fix for: https://jira.unity3d.com/projects/GTF/issues/GTF-748
             // objects such as Texture2D that inherit from UnityEngine.Object send a ChangeEvent<UnityEngine.Object>
@@ -116,12 +141,13 @@ internal MethodInfo GetRegisterCallback_Internal()
         }
 
         bool m_IgnoreEventBecauseMixedIsBuggish = false;
+        bool m_LogUpdateException = true;
 
         /// <inheritdoc />
-        public override bool UpdateDisplayedValue()
+        public override void UpdateDisplayedValue()
         {
             if (m_Field == null)
-                return false;
+                return;
 
 
             bool isConnected = false;
@@ -204,12 +230,14 @@ public override bool UpdateDisplayedValue()
                     setValueMethod?.Invoke(field, new[] { value });
                 }
             }
-            catch (Exception)
+            catch (Exception exception)
             {
-                return false;
+                if (m_LogUpdateException)
+                {
+                    Debug.Log($"Exception caught while updating constant field {Label}: {exception.Message}");
+                    m_LogUpdateException = false;
+                }
             }
-
-            return true;
         }
 
         VisualElement CreateField()
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/CustomizableModelPropertyField.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/CustomizableModelPropertyField.cs
index 5863f94eaf..26c14c3b21 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/CustomizableModelPropertyField.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/CustomizableModelPropertyField.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Unity.CommandStateObserver;
 using UnityEditor;
 using UnityEditor.UIElements;
@@ -21,13 +22,17 @@ abstract class CustomizableModelPropertyField : BaseModelPropertyField
     {
         static CustomStyleProperty<float> s_LabelWidthRatioProperty = new CustomStyleProperty<float>("--unity-property-field-label-width-ratio");
         static CustomStyleProperty<float> s_LabelExtraPaddingProperty = new CustomStyleProperty<float>("--unity-property-field-label-extra-padding");
+        public static readonly string multilineModifier = "multiline";
 
         public static readonly string ussClassName = "ge-model-property-field";
         public static readonly string labelUssClassName = ussClassName + "__label";
         public static readonly string inputUssClassName = ussClassName + "__input";
+        public static readonly string multilineUssClassName = ussClassName.WithUssModifier(multilineModifier);
 
         static Dictionary<Type, Type> s_CustomPropertyFieldBuilders;
 
+        protected FieldInfo InspectedField { get; }
+
         /// <summary>
         /// Tries to create an instance of a custom property field builder provided by an implementation of <see cref="ICustomPropertyFieldBuilder{T}"/>.
         /// </summary>
@@ -95,11 +100,14 @@ protected static void TryCreateCustomPropertyFieldBuilder(Type propertyType, out
         /// </summary>
         /// <param name="commandTarget">The view to use to dispatch commands when the field is edited.</param>
         /// <param name="label">The label for the field.</param>
-        protected CustomizableModelPropertyField(ICommandTarget commandTarget, string label)
+        /// <param name="inspectedField">The inspected <see cref="FieldInfo"/> or null.</param>
+        protected CustomizableModelPropertyField(ICommandTarget commandTarget, string label, FieldInfo inspectedField)
         : base(commandTarget)
         {
             Label = label ?? "";
 
+            InspectedField = inspectedField;
+
             AddToClassList(ussClassName);
         }
 
@@ -139,7 +147,17 @@ protected virtual VisualElement CreateDefaultFieldForType(Type type, string fiel
 
             if (type == typeof(string))
             {
-                return ConfigureField(new TextField { isDelayed = true, tooltip = fieldTooltip });
+                TextField field;
+                if (InspectedField != null && InspectedField.FieldType == typeof(string) && InspectedField.GetCustomAttribute<MultilineAttribute>() != null)
+                {
+                    AddToClassList(multilineUssClassName);
+                    field = new TextField() { isDelayed = true, tooltip = fieldTooltip, multiline = true };
+                }
+                else
+                {
+                    field = new TextField { isDelayed = true, tooltip = fieldTooltip };
+                }
+                return ConfigureField(field);
             }
 
             if (type == typeof(Color))
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/InspectorFieldOrderAttribute.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/InspectorFieldOrderAttribute.cs
new file mode 100644
index 0000000000..fec23d3067
--- /dev/null
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/InspectorFieldOrderAttribute.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;
+using UnityEngine.Assertions;
+
+namespace Unity.GraphToolsFoundation.Editor
+{
+    /// <summary>
+    /// Field attribute to control the order of fields in the inspector.
+    /// Fields without InspectorFieldOrderAttribute will always be displayed first.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field, Inherited = true, AllowMultiple = false)]
+    class InspectorFieldOrderAttribute : PropertyAttribute
+    {
+        public int Order { get; }
+
+        /// <summary>
+        /// Create an instance of the <see cref="InspectorFieldOrderAttribute"/> class.
+        /// </summary>
+        /// <param name="order">The order in the inspector.</param>
+        public InspectorFieldOrderAttribute(int order = 0)
+        {
+            Assert.IsTrue(order >= 0, "The order can't be a negative number");
+            Order = order;
+        }
+    }
+}
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/MissingFieldEditor.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/MissingFieldEditor.cs
index a4b67f6cab..55a7e3d8dc 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/MissingFieldEditor.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/MissingFieldEditor.cs
@@ -26,9 +26,8 @@ public MissingFieldEditor(ICommandTarget commandTarget, string fieldLabel)
         }
 
         /// <inheritdoc />
-        public override bool UpdateDisplayedValue()
+        public override void UpdateDisplayedValue()
         {
-            return true;
         }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ModelPropertyField.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ModelPropertyField.cs
index be524aa057..47c683afd6 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ModelPropertyField.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ModelPropertyField.cs
@@ -5,10 +5,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Unity.CommandStateObserver;
 using UnityEditor;
+using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
+using Object = UnityEngine.Object;
 
 namespace Unity.GraphToolsFoundation.Editor
 {
@@ -53,6 +56,8 @@ class ModelPropertyField<TValue> : CustomizableModelPropertyField
         /// </summary>
         protected Func<TValue> m_ValueGetter;
 
+        bool m_LogUpdateError = true;
+
         /// <summary>
         /// The model that owns the property.
         /// </summary>
@@ -65,15 +70,17 @@ class ModelPropertyField<TValue> : CustomizableModelPropertyField
         /// <param name="models">The models that owns the field.</param>
         /// <param name="propertyName">The name of the property to edit.</param>
         /// <param name="label">The label for the field. If null, the <paramref name="propertyName"/> will be used.</param>
+        /// <param name="inspectedField">The inspected <see cref="FieldInfo"/> or null.</param>
         /// <param name="fieldTooltip">The tooltip for the field.</param>
         protected ModelPropertyField(
             ICommandTarget commandTarget,
             IEnumerable<Model> models,
             string propertyName,
             string label,
+            FieldInfo inspectedField,
             string fieldTooltip
         )
-            : base(commandTarget, label ?? ObjectNames.NicifyVariableName(propertyName))
+            : base(commandTarget, label ?? ObjectNames.NicifyVariableName(propertyName), inspectedField)
         {
             Models = models;
             m_Field = CreateFieldFromProperty(propertyName, fieldTooltip);
@@ -99,7 +106,7 @@ public ModelPropertyField(
             string fieldTooltip,
             Action<TValue, ModelPropertyField<TValue>> onValueChanged = null,
             Func<Model, TValue> valueGetter = null)
-            : this(commandTarget, models, propertyName, label, fieldTooltip)
+            : this(commandTarget, models, propertyName, label, null, fieldTooltip)
         {
             SetValueGetterOrDefault(propertyName, valueGetter);
 
@@ -107,7 +114,8 @@ public ModelPropertyField(
             {
                 switch (m_Field)
                 {
-                    case PopupField<string> _:
+                    case PopupField<string>:
+                        Debug.Assert(typeof(Enum).IsAssignableFrom(typeof(TValue)), $"Unexpected type for field {Label}.");
                         m_Field.RegisterCallback<ChangeEvent<string>, ModelPropertyField<TValue>>(
                             (e, f) =>
                             {
@@ -116,11 +124,31 @@ public ModelPropertyField(
                             }, this);
                         break;
 
-                    case BaseField<Enum> _:
+                    case BaseField<Enum>:
+                        Debug.Assert(typeof(Enum).IsAssignableFrom(typeof(TValue)), $"Unexpected type for field {Label}.");
                         m_Field.RegisterCallback<ChangeEvent<Enum>, ModelPropertyField<TValue>>(
                             (e, f) => onValueChanged((TValue)(object)e.newValue, f), this);
                         break;
 
+                    case ObjectField:
+                        Debug.Assert(typeof(Object).IsAssignableFrom(typeof(TValue)), $"Unexpected type for field {Label}.");
+                        m_Field.RegisterCallback<ChangeEvent<Object>, ModelPropertyField<TValue>>(
+                            (e, f) => onValueChanged((TValue)(object)e.newValue, f), this);
+                        break;
+
+                    case LayerMaskField:
+                        Debug.Assert(typeof(TValue) == typeof(LayerMask), $"Unexpected type for field {Label}.");
+                        m_Field.RegisterCallback<ChangeEvent<int>, ModelPropertyField<TValue>>(
+                            (e, f) => onValueChanged((TValue)(object)e.newValue, f), this);
+                        break;
+
+                    case TextField { maxLength: 1 }:
+                        Debug.Assert(typeof(TValue) == typeof(char), $"Unexpected type for field {Label}.");
+                        m_Field.RegisterCallback<ChangeEvent<string>, ModelPropertyField<TValue>>(
+                            (e, f) => onValueChanged((TValue)(object)e.newValue[0], f), this);
+                        break;
+
+                    // For BaseField<TValue> and fields build by ICustomPropertyFieldBuilder.
                     default:
                         m_Field.RegisterCallback<ChangeEvent<TValue>, ModelPropertyField<TValue>>(
                             (e, f) => onValueChanged(e.newValue, f), this);
@@ -191,7 +219,8 @@ protected void SetOnChangeDispatchCommand(Type commandType)
 
             switch (m_Field)
             {
-                case PopupField<string> _:
+                case PopupField<string>:
+                    Debug.Assert(typeof(Enum).IsAssignableFrom(typeof(TValue)), $"Unexpected type for field {Label}.");
                     m_Field.RegisterCallback<ChangeEvent<string>, ModelPropertyField<TValue>>((e, f) =>
                     {
                         var value = (TValue)Enum.Parse(typeof(TValue), e.newValue);
@@ -200,14 +229,44 @@ protected void SetOnChangeDispatchCommand(Type commandType)
                     }, this);
                     break;
 
-                case BaseField<Enum> _:
+                case BaseField<Enum>:
+                    Debug.Assert(typeof(Enum).IsAssignableFrom(typeof(TValue)), $"Unexpected type for field {Label}.");
                     m_Field.RegisterCallback<ChangeEvent<Enum>, ModelPropertyField<TValue>>((e, f) =>
                     {
-                        if (Activator.CreateInstance(commandType, e.newValue, f.Models) is ICommand command)
+                        if (Activator.CreateInstance(commandType, (TValue)(object)e.newValue, f.Models) is ICommand command)
+                            f.CommandTarget.Dispatch(command);
+                    }, this);
+                    break;
+
+                case ObjectField:
+                    Debug.Assert(typeof(Object).IsAssignableFrom(typeof(TValue)), $"Unexpected type for field {Label}.");
+                    m_Field.RegisterCallback<ChangeEvent<Object>, ModelPropertyField<TValue>>((e, f) =>
+                    {
+                        if (Activator.CreateInstance(commandType, (TValue)(object)e.newValue, f.Models) is ICommand command)
+                            f.CommandTarget.Dispatch(command);
+                    }, this);
+                    break;
+
+                case LayerMaskField:
+                    Debug.Assert(typeof(TValue) == typeof(LayerMask), $"Unexpected type for field {Label}.");
+                    m_Field.RegisterCallback<ChangeEvent<int>, ModelPropertyField<TValue>>((e, f) =>
+                    {
+                        LayerMask mask = e.newValue;
+                        if (Activator.CreateInstance(commandType, mask, f.Models) is ICommand command)
                             f.CommandTarget.Dispatch(command);
                     }, this);
                     break;
 
+                case TextField { maxLength: 1 }:
+                    Debug.Assert(typeof(TValue) == typeof(char), $"Unexpected type for field {Label}.");
+                    m_Field.RegisterCallback<ChangeEvent<string>, ModelPropertyField<TValue>>((e, f) =>
+                    {
+                        if (Activator.CreateInstance(commandType, e.newValue[0], f.Models) is ICommand command)
+                            f.CommandTarget.Dispatch(command);
+                    }, this);
+                    break;
+
+                // For BaseField<TValue> and fields build by ICustomPropertyFieldBuilder.
                 default:
                     m_Field.RegisterCallback<ChangeEvent<TValue>, ModelPropertyField<TValue>>((e, f) =>
                     {
@@ -246,7 +305,7 @@ static Func<TValue> MakePropertyValueGetter(IEnumerable<Model> models, string pr
         }
 
         /// <inheritdoc />
-        public override bool UpdateDisplayedValue()
+        public override void UpdateDisplayedValue()
         {
             if (m_ValueGetter != null)
             {
@@ -255,50 +314,102 @@ public override bool UpdateDisplayedValue()
                     if (m_CustomFieldBuilder != null)
                     {
                         m_CustomFieldBuilder.SetMixed();
-                        return true;
+                        return;
                     }
 
-                    switch (m_Field)
+                    if (m_Field is BaseField<TValue> baseField)
                     {
-                        case PopupField<string> popupField:
-                            popupField.showMixedValue = true;
-                            return true;
-
-                        case BaseField<Enum> baseField:
-                            baseField.showMixedValue = true;
-                            return true;
-
-                        case BaseField<TValue> baseField:
-                            baseField.showMixedValue = true;
-                            return true;
+                        baseField.showMixedValue = true;
+                        return;
                     }
                 }
                 else
                 {
+                    var newValue = m_ValueGetter.Invoke();
+
                     if (m_CustomFieldBuilder != null)
                     {
-                        return m_CustomFieldBuilder.UpdateDisplayedValue(m_ValueGetter.Invoke());
+                        if (m_CustomFieldBuilder.UpdateDisplayedValue(newValue))
+                            return;
                     }
-
-                    switch (m_Field)
+                    else
                     {
-                        case PopupField<string> popupField:
-                            popupField.SetValueWithoutNotify(m_ValueGetter.Invoke().ToString());
-                            return true;
+                        switch (m_Field)
+                        {
+                            case PopupField<string> popupField:
+                            {
+                                if (newValue is Enum value)
+                                {
+                                    popupField.SetValueWithoutNotify(value.ToString());
+                                    return;
+                                }
 
-                        case BaseField<Enum> baseField:
-                            baseField.SetValueWithoutNotify(m_ValueGetter.Invoke() as Enum);
-                            return true;
+                                break;
+                            }
 
-                        case BaseField<TValue> baseField:
-                            baseField.SetValueWithoutNotify(m_ValueGetter.Invoke());
-                            return true;
+                            case BaseField<Enum> baseField:
+                            {
+                                if (newValue is Enum value)
+                                {
+                                    baseField.SetValueWithoutNotify(value);
+                                    return;
+                                }
+
+                                break;
+                            }
+
+                            case ObjectField objectField:
+                            {
+                                if (newValue is Object value)
+                                {
+                                    objectField.SetValueWithoutNotify(value);
+                                    return;
+                                }
+
+                                if (newValue == null)
+                                {
+                                    objectField.SetValueWithoutNotify(null);
+                                    return;
+                                }
+
+                                break;
+                            }
+
+                            case LayerMaskField layerMaskField:
+                            {
+                                if (newValue is LayerMask value)
+                                {
+                                    layerMaskField.SetValueWithoutNotify(value);
+                                    return;
+                                }
+
+                                break;
+                            }
+
+                            case TextField { maxLength: 1 } charField:
+                            {
+                                if (newValue is char value)
+                                {
+                                    charField.SetValueWithoutNotify($"{value}");
+                                    return;
+                                }
+
+                                break;
+                            }
+
+                            case BaseField<TValue> baseField:
+                                baseField.SetValueWithoutNotify(newValue);
+                                return;
+                        }
                     }
                 }
-
             }
 
-            return false;
+            if (m_LogUpdateError)
+            {
+                Debug.Log($"Could not update field {Label}");
+                m_LogUpdateError = false;
+            }
         }
 
         VisualElement CreateFieldFromProperty(string propertyName, string fieldTooltip)
@@ -308,7 +419,8 @@ VisualElement CreateFieldFromProperty(string propertyName, string fieldTooltip)
                 TryCreateCustomPropertyFieldBuilder(out m_CustomFieldBuilder);
             }
 
-            return m_CustomFieldBuilder?.Build(CommandTarget, Label, fieldTooltip, Models, propertyName) ?? CreateDefaultFieldForType(typeof(TValue), fieldTooltip);
+            return m_CustomFieldBuilder?.Build(CommandTarget, Label, fieldTooltip, Models, propertyName) ??
+                CreateDefaultFieldForType(typeof(TValue), fieldTooltip);
         }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ModelSerializedFieldField_Internal.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ModelSerializedFieldField_Internal.cs
index f69313aeea..0cd38d28fa 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ModelSerializedFieldField_Internal.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/ModelSerializedFieldField_Internal.cs
@@ -7,8 +7,10 @@
 using System.Linq;
 using System.Reflection;
 using Unity.CommandStateObserver;
+using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
+using Object = UnityEngine.Object;
 
 namespace Unity.GraphToolsFoundation.Editor
 {
@@ -32,7 +34,7 @@ public ModelSerializedFieldField_Internal(
             IEnumerable<object> inspectedObjects,
             FieldInfo inspectedField,
             string fieldTooltip)
-            : base(commandTarget, models, inspectedField.Name, null, fieldTooltip)
+            : base(commandTarget, models, inspectedField.Name, null, inspectedField, fieldTooltip)
         {
             m_ValueGetter = MakeFieldValueGetter(inspectedField, inspectedObjects);
 
@@ -41,15 +43,33 @@ public ModelSerializedFieldField_Internal(
                 case null:
                     break;
 
-                case PopupField<string> _:
+                case PopupField<string>:
+                    Debug.Assert(typeof(Enum).IsAssignableFrom(typeof(TValue)), $"Unexpected type for field {Label}.");
                     RegisterChangedCallback<string>(evt => Enum.Parse(typeof(TValue), evt.newValue),
                         inspectedObjects, inspectedField);
                     break;
 
-                case BaseField<Enum> _:
+                case BaseField<Enum>:
+                    Debug.Assert(typeof(Enum).IsAssignableFrom(typeof(TValue)), $"Unexpected type for field {Label}.");
                     RegisterChangedCallback<Enum>(evt => evt.newValue, inspectedObjects, inspectedField);
                     break;
 
+                case ObjectField:
+                    Debug.Assert(typeof(Object).IsAssignableFrom(typeof(TValue)), $"Unexpected type for field {Label}.");
+                    RegisterChangedCallback<Object>(evt => evt.newValue, inspectedObjects, inspectedField);
+                    break;
+
+                case LayerMaskField:
+                    Debug.Assert(typeof(TValue) == typeof(LayerMask), $"Unexpected type for field {Label}.");
+                    RegisterChangedCallback<int>(evt => (LayerMask)evt.newValue, inspectedObjects, inspectedField);
+                    break;
+
+                case TextField { maxLength: 1 }:
+                    Debug.Assert(typeof(TValue) == typeof(char), $"Unexpected type for field {Label}.");
+                    RegisterChangedCallback<string>(evt => evt.newValue[0], inspectedObjects, inspectedField);
+                    break;
+
+                // For BaseField<TValue> and fields build by ICustomPropertyFieldBuilder.
                 default:
                     RegisterChangedCallback<TValue>(evt => evt.newValue, inspectedObjects, inspectedField);
                     break;
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/SerializedFieldsInspector.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/SerializedFieldsInspector.cs
index ddaf74a627..5b8bd7b083 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/SerializedFieldsInspector.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/Inspector/UIElements/SerializedFieldsInspector.cs
@@ -12,6 +12,10 @@ namespace Unity.GraphToolsFoundation.Editor
 {
     /// <summary>
     /// Inspector for the serializable fields of a <see cref="GraphElementModel"/> or its surrogate, if it implements <see cref="IHasInspectorSurrogate"/>.
+    /// Will Display in this order:
+    /// - Fields without [MoveAfterInspectorAttribute] matching m_Filter.
+    /// - Fields from GetCustomFields.
+    /// - Ordered Fields With [MoveAfterInspectorAttribute] matching m_Filter.
     /// </summary>
     class SerializedFieldsInspector : FieldsInspector
     {
@@ -87,6 +91,15 @@ public IEnumerable<object> GetInspectedObjects()
             return m_Models.Select(t => t is IHasInspectorSurrogate surrogate ? surrogate.Surrogate: t);
         }
 
+        /// <summary>
+        /// Allow adding field to display between the default fields and the default field with a <see cref="InspectorFieldOrderAttribute"/>.
+        /// </summary>
+        /// <returns>An optional list of <see cref="BaseModelPropertyField"/>.</returns>
+        protected virtual List<BaseModelPropertyField> GetCustomFields()
+        {
+            return null;
+        }
+
         /// <inheritdoc />
         protected override IEnumerable<BaseModelPropertyField> GetFields()
         {
@@ -108,22 +121,59 @@ protected override IEnumerable<BaseModelPropertyField> GetFields()
                 type = type.BaseType;
             }
 
+            SortedDictionary<int, List<FieldInfo>> inspectorOrderAttributeFields = new SortedDictionary<int, List<FieldInfo>>();
+
+            BaseModelPropertyField GetFieldFromFieldInfo(FieldInfo fieldInfo1)
+            {
+                var tooltip = "";
+                var tooltipAttribute = fieldInfo1.GetCustomAttribute<TooltipAttribute>();
+                if (tooltipAttribute != null)
+                {
+                    tooltip = tooltipAttribute.tooltip;
+                }
+
+                var modelFieldFieldType = typeof(ModelSerializedFieldField_Internal<>).MakeGenericType(fieldInfo1.FieldType);
+                var baseModelPropertyField = Activator.CreateInstance(
+                        modelFieldFieldType, RootView, m_Models, targets, fieldInfo1, tooltip)
+                    as BaseModelPropertyField;
+                return baseModelPropertyField;
+            }
+
             foreach (var t in typeList)
             {
                 var fields = t.GetFields(k_FieldFlags);
                 foreach (var fieldInfo in fields.Where(m_Filter))
                 {
-                    var tooltip = "";
-                    var tooltipAttribute = fieldInfo.GetCustomAttribute<TooltipAttribute>();
-                    if (tooltipAttribute != null)
+                    var moveAfter = fieldInfo.GetCustomAttribute<InspectorFieldOrderAttribute>();
+
+                    if (moveAfter != null)
                     {
-                        tooltip = tooltipAttribute.tooltip;
+                        if (!inspectorOrderAttributeFields.TryGetValue(moveAfter.Order, out var fieldInfosAtPosition))
+                        {
+                            fieldInfosAtPosition = new List<FieldInfo>();
+                            inspectorOrderAttributeFields[moveAfter.Order] = fieldInfosAtPosition;
+                        }
+                        fieldInfosAtPosition.Add(fieldInfo);
+
+                        continue;
                     }
 
-                    var modelFieldFieldType = typeof(ModelSerializedFieldField_Internal<>).MakeGenericType(fieldInfo.FieldType);
-                    yield return Activator.CreateInstance(
-                            modelFieldFieldType, RootView, m_Models, targets, fieldInfo, tooltip)
-                        as BaseModelPropertyField;
+                    yield return GetFieldFromFieldInfo(fieldInfo);
+                }
+            }
+
+            var customFields = GetCustomFields();
+            if (customFields != null)
+            {
+                foreach (var field in customFields)
+                    yield return field;
+            }
+
+            foreach (var fieldInfosAtPosition in inspectorOrderAttributeFields.Values)
+            {
+                foreach (var fieldInfo in fieldInfosAtPosition)
+                {
+                    yield return GetFieldFromFieldInfo(fieldInfo);
                 }
             }
         }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/UIElements/DynamicBlockBorder.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/UIElements/DynamicBlockBorder.cs
index 16f4613287..fe04bc1b7e 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/UIElements/DynamicBlockBorder.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/UIElements/DynamicBlockBorder.cs
@@ -67,11 +67,17 @@ protected override void DrawBorder(MeshGenerationContext mgc, Rect r, float want
 
             painter.lineWidth = wantedWidth;
 
+            r.position += Vector2.one * wantedWidth * 0.5f;
+            r.size -= Vector2.one * wantedWidth;
+
             var bounds = Node.Etch_Internal.worldBound;
             var rectEtch = this.WorldToLocal(bounds);
             rectEtch.y -= wantedWidth * 0.5f;
-            rectEtch.height += wantedWidth * 0.5f;
+            rectEtch.height += wantedWidth;
+            rectEtch.x -= wantedWidth * 0.5f;
+            rectEtch.width += wantedWidth;
 
+            const float etchRadius = 4;
 
             painter.BeginPath();
             painter.strokeColor = colors[0];
@@ -82,10 +88,10 @@ protected override void DrawBorder(MeshGenerationContext mgc, Rect r, float want
             painter.LineTo(new Vector2(r.xMax, r.yMax - corners[2].y));
             painter.ArcTo(new Vector2(r.xMax, r.yMax), new Vector2(r.xMax - corners[2].x, r.yMax), corners[2].x);
             painter.LineTo(new Vector2(rectEtch.xMax, r.yMax));
-            painter.LineTo(new Vector2(rectEtch.xMax, rectEtch.yMax - 3.0f));
-            painter.ArcTo(new Vector2(rectEtch.xMax, rectEtch.yMax), new Vector2(rectEtch.xMax - 3, rectEtch.yMax), 3);
-            painter.LineTo(new Vector2(rectEtch.xMin + 3.0f, rectEtch.yMax));
-            painter.ArcTo(new Vector2(rectEtch.xMin, rectEtch.yMax), new Vector2(rectEtch.xMin, rectEtch.yMax - 3), 3);
+            painter.LineTo(new Vector2(rectEtch.xMax, rectEtch.yMax - etchRadius));
+            painter.ArcTo(new Vector2(rectEtch.xMax, rectEtch.yMax), new Vector2(rectEtch.xMax - etchRadius, rectEtch.yMax), etchRadius);
+            painter.LineTo(new Vector2(rectEtch.xMin + etchRadius, rectEtch.yMax));
+            painter.ArcTo(new Vector2(rectEtch.xMin, rectEtch.yMax), new Vector2(rectEtch.xMin, rectEtch.yMax - etchRadius), etchRadius);
             painter.LineTo(new Vector2(rectEtch.xMin, r.yMax));
             painter.LineTo(new Vector2(r.xMin + corners[3].y,  r.yMax));
             painter.ArcTo(new Vector2(r.xMin , r.yMax), new Vector2(r.xMin, r.yMax - corners[3].y),corners[3].y);
diff --git a/Modules/GraphToolsFoundationEditor/UI/ModelView/UIElements/DynamicBorder.cs b/Modules/GraphToolsFoundationEditor/UI/ModelView/UIElements/DynamicBorder.cs
index e08dbb4379..30f35b9408 100644
--- a/Modules/GraphToolsFoundationEditor/UI/ModelView/UIElements/DynamicBorder.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/ModelView/UIElements/DynamicBorder.cs
@@ -24,7 +24,6 @@ class DynamicBorder : VisualElement
         static readonly CustomStyleProperty<float> k_HoverWidthProperty = new CustomStyleProperty<float>("--hover-width");
         static readonly CustomStyleProperty<float> k_SmallWidthThresholdProperty = new CustomStyleProperty<float>("--small-width-threshold");
         static readonly CustomStyleProperty<float> k_CornersThresholdProperty = new CustomStyleProperty<float>("--corners-threshold");
-        static readonly CustomStyleProperty<float> k_SelectionBorderMarginProperty = new CustomStyleProperty<float>("--selection-border-margin");
 
         static readonly CustomStyleProperty<Color> k_SelectionColorProperty = new CustomStyleProperty<Color>("--selection-color");
         static readonly CustomStyleProperty<Color> k_HoverOnlyColorProperty = new CustomStyleProperty<Color>("--hover-only-color");
@@ -67,11 +66,6 @@ class DynamicBorder : VisualElement
         /// </summary>
         public float CornersThreshold { get; private set; } = 0.33f;
 
-        /// <summary>
-        /// The margin of the selection border.
-        /// </summary>
-        public float SelectionBorderMargin { get; private set; } = 3;
-
         /// <summary>
         /// The color of the outline when the <see cref="GraphElement"/> is selected.
         /// </summary>
@@ -171,7 +165,7 @@ public DynamicBorder(ModelView view)
             view.RegisterCallback<MouseLeaveEvent>(OnLeave);
             RegisterCallback<CustomStyleResolvedEvent>(OnCustomStyleResolved);
 
-            float maxMargin = (SmallSelectionWidth+HoverWidth) / k_MinZoom + SelectionBorderMargin;
+            float maxMargin = (SmallSelectionWidth+HoverWidth) / k_MinZoom;
             style.left = -maxMargin;
             style.right = -maxMargin;
             style.bottom = -maxMargin;
@@ -206,8 +200,6 @@ protected virtual void OnCustomStyleResolved(CustomStyleResolvedEvent e)
                 SmallWidthThreshold = value;
             if (e.customStyle.TryGetValue(k_CornersThresholdProperty, out value))
                 CornersThreshold = value;
-            if (e.customStyle.TryGetValue(k_SelectionBorderMarginProperty, out value))
-                SelectionBorderMargin = value;
 
             if (e.customStyle.TryGetValue(k_SelectionColorProperty, out var colorValue))
                 SelectionColor = colorValue;
@@ -216,7 +208,7 @@ protected virtual void OnCustomStyleResolved(CustomStyleResolvedEvent e)
             if (e.customStyle.TryGetValue(k_HighlightColorProperty, out colorValue))
                 HighlightColor = colorValue;
 
-            float maxMargin = (SmallSelectionWidth+HoverWidth) / k_MinZoom + SelectionBorderMargin;
+            float maxMargin = (SmallSelectionWidth+HoverWidth) / k_MinZoom;
             style.left = -maxMargin;
             style.right = -maxMargin;
             style.bottom = -maxMargin;
@@ -230,7 +222,7 @@ void OnGenerateVisualContent(MeshGenerationContext mgc)
 
             var bound = localBound;
             bound.position -= layout.position;
-            float maxMargin = (SmallSelectionWidth+HoverWidth) / k_MinZoom + SelectionBorderMargin;
+            float maxMargin = (SmallSelectionWidth+HoverWidth) / k_MinZoom;
 
             float zoomLevel = Zoom;
             float wantedWidth;
@@ -272,8 +264,8 @@ void OnGenerateVisualContent(MeshGenerationContext mgc)
             s_Colors[2] = s_Colors[0];
             s_Colors[3] = s_Colors[0];
 
-            bound.position += Vector2.one * (maxMargin - width -1);
-            bound.size -= Vector2.one * (maxMargin - width - 1)* 2 ;
+            bound.position += Vector2.one * (maxMargin - width);
+            bound.size -= Vector2.one * (maxMargin - width)* 2 ;
 
             DrawBorder(mgc, bound, wantedWidth / zoomLevel, s_Colors, corners);
         }
diff --git a/Modules/GraphToolsFoundationEditor/UI/ToggleButtonStrip.cs b/Modules/GraphToolsFoundationEditor/UI/ToggleButtonStrip.cs
new file mode 100644
index 0000000000..ed5546b3d5
--- /dev/null
+++ b/Modules/GraphToolsFoundationEditor/UI/ToggleButtonStrip.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 UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Unity.GraphToolsFoundation.Editor
+{
+    //Copied from UIBuilder
+    interface IToggleButtonStrip : INotifyValueChanged<string>
+    {
+        IEnumerable<string> choices { get; set; }
+
+        IEnumerable<string> labels { get; set; }
+
+        Type enumType { get; set; }
+    }
+
+    class ToggleButtonStrip : BaseField<string>, IToggleButtonStrip
+    {
+        static readonly string s_UssPath = "ToggleButtonStrip/ToggleButtonStrip.uss";
+
+        static readonly string s_UssClassName = "unity-toggle-button-strip";
+
+        ButtonStrip m_ButtonStrip;
+
+        public IEnumerable<string> choices
+        {
+            get { return m_ButtonStrip.choices; }
+            set { m_ButtonStrip.choices = value; }
+        }
+
+        public IEnumerable<string> labels
+        {
+            get { return m_ButtonStrip.labels; }
+            set { m_ButtonStrip.labels = value; }
+        }
+
+        public Type enumType { get; set; }
+
+        public ToggleButtonStrip() : this(null, null) {}
+
+        public ToggleButtonStrip(string label, IList<string> choices) : base(label)
+        {
+            AddToClassList(s_UssClassName);
+
+            this.AddStylesheet_Internal(s_UssPath);
+
+            m_ButtonStrip = new ButtonStrip();
+            m_ButtonStrip.onButtonClick = OnOptionChange;
+            visualInput = m_ButtonStrip;
+
+            this.choices = choices;
+        }
+
+        protected override void UpdateMixedValueContent()
+        {
+            if (showMixedValue)
+            {
+                m_ButtonStrip.Query<Button>().ForEach((b) =>
+                {
+                    b.pseudoStates &= ~(PseudoStates.Checked);
+                });
+            }
+            else
+            {
+                SetValueWithoutNotify(value);
+            }
+        }
+
+        public override void SetValueWithoutNotify(string newValue)
+        {
+            var button = m_ButtonStrip.Q<Button>(newValue);
+            if (button == null)
+                return;
+
+            base.SetValueWithoutNotify(newValue);
+
+            ToggleButtonStates(button);
+        }
+
+        void OnOptionChange(EventBase evt)
+        {
+            var button = evt.target as Button;
+            var newValue = button.name;
+            value = newValue;
+
+            ToggleButtonStates(button);
+        }
+
+        void ToggleButtonStates(Button button)
+        {
+            m_ButtonStrip.Query<Button>().ForEach((b) =>
+            {
+                b.pseudoStates &= ~(PseudoStates.Checked);
+            });
+            button.pseudoStates |= PseudoStates.Checked;
+            button.IncrementVersion(VersionChangeType.Styles);
+        }
+    }
+}
diff --git a/Modules/GraphToolsFoundationEditor/UI/Toolbars/OverlayToolbar.cs b/Modules/GraphToolsFoundationEditor/UI/Toolbars/OverlayToolbar.cs
index 13540bf7b9..05dcdbb7d9 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Toolbars/OverlayToolbar.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Toolbars/OverlayToolbar.cs
@@ -27,7 +27,7 @@ class OverlayToolbar : Overlay, ICreateToolbar
         /// <inheritdoc />
         public override VisualElement CreatePanelContent()
         {
-            return new EditorToolbar(toolbarElements, containerWindow).rootVisualElement;
+            return EditorToolbar.CreateOverlay(toolbarElements, containerWindow);
         }
 
         /// <summary>
diff --git a/Modules/GraphToolsFoundationEditor/UI/Utils/GraphAssetCreationHelpers.cs b/Modules/GraphToolsFoundationEditor/UI/Utils/GraphAssetCreationHelpers.cs
index 8ba89f8d70..412bc23046 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Utils/GraphAssetCreationHelpers.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Utils/GraphAssetCreationHelpers.cs
@@ -13,20 +13,19 @@ namespace Unity.GraphToolsFoundation.Editor
 {
     class DoCreateAsset_Internal : EndNameEditAction
     {
-        ICommandTarget m_CommandTarget;
         GraphAsset m_Asset;
         GraphTemplate m_Template;
-        Action m_Callback;
+        Action<GraphAsset> m_Callback;
 
-        public void SetUp(ICommandTarget target, GraphAsset asset, GraphTemplate template, Action callback = null)
+        public void SetUp(GraphAsset asset, GraphTemplate template, Action<GraphAsset> callback = null)
         {
-            m_CommandTarget = target;
             m_Template = template;
             m_Asset = asset;
             m_Callback = callback;
         }
 
-        internal void CreateAndLoadAsset_Internal(string pathName)
+        // internal for tests
+        internal void CreateAsset_Internal(string pathName)
         {
             m_Asset.CreateGraph(m_Template.StencilType);
 
@@ -34,14 +33,12 @@ internal void CreateAndLoadAsset_Internal(string pathName)
             m_Template?.InitBasicGraph(m_Asset.GraphModel);
             m_Asset.Save();
             m_Asset = m_Asset.Import();
-
-            m_CommandTarget?.Dispatch(new LoadGraphCommand(m_Asset.GraphModel));
         }
 
         public override void Action(int instanceId, string pathName, string resourceFile)
         {
-            CreateAndLoadAsset_Internal(pathName);
-            m_Callback?.Invoke();
+            CreateAsset_Internal(pathName);
+            m_Callback?.Invoke(m_Asset);
         }
 
         public override void Cancelled(int instanceId, string pathName, string resourceFile)
@@ -55,13 +52,20 @@ public override void Cancelled(int instanceId, string pathName, string resourceF
     /// </summary>
     static class GraphAssetCreationHelpers
     {
-        public static void CreateInProjectWindow<TGraphAssetType>(GraphTemplate template, ICommandTarget target, string path, Action endActionCallback = null)
+        /// <summary>
+        /// Creates a new graph asset and starts the process of renaming it in the Project window.
+        /// </summary>
+        /// <param name="template">The <see cref="GraphTemplate"/> to use.</param>
+        /// <param name="path">The path at which to create the graph.</param>
+        /// <param name="endActionCallback">Action to call after asset renaming is finished. Typically used to open the new graph in an EditorWindow.</param>
+        /// <typeparam name="TGraphAssetType">The graph asset type to create.</typeparam>
+        public static void CreateInProjectWindow<TGraphAssetType>(GraphTemplate template, string path, Action<GraphAsset> endActionCallback = null)
             where TGraphAssetType : GraphAsset
         {
             var asset = ScriptableObject.CreateInstance<TGraphAssetType>();
 
             var endAction = ScriptableObject.CreateInstance<DoCreateAsset_Internal>();
-            endAction.SetUp(target, asset, template, endActionCallback);
+            endAction.SetUp(asset, template, endActionCallback);
 
             ProjectWindowUtil.StartNameEditingIfProjectWindowExists(
                 asset.GetInstanceID(),
diff --git a/Modules/GraphToolsFoundationEditor/UI/Utils/ShortcutBlocker_Internal.cs b/Modules/GraphToolsFoundationEditor/UI/Utils/ShortcutBlocker_Internal.cs
new file mode 100644
index 0000000000..8be293339e
--- /dev/null
+++ b/Modules/GraphToolsFoundationEditor/UI/Utils/ShortcutBlocker_Internal.cs
@@ -0,0 +1,145 @@
+// 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 UnityEditor.ShortcutManagement;
+using UnityEngine.UIElements;
+
+namespace Unity.GraphToolsFoundation.Editor
+{
+    class ShortcutBlocker_Internal
+    {
+        VisualElement m_RegistrationTarget;
+        VisualElement m_DragTarget;
+
+        Dictionary<string, HashSet<KeyCombination>> m_ForbiddenShortcuts = new();
+
+        public void Enable(VisualElement dragTarget)
+        {
+            if (dragTarget == null)
+                return;
+
+            m_DragTarget = dragTarget;
+
+            // It's possible that the target has not been attached to the panel yet. In that case,
+            // delay the initialization of the registration target.
+            if (dragTarget.panel == null)
+            {
+                dragTarget.RegisterCallback<AttachToPanelEvent>(OnAttachToPanel);
+            }
+            else
+            {
+                InitRegistrationTarget();
+            }
+
+            var shortcutIds = ShortcutManager.instance.GetAvailableShortcutIds();
+            foreach (var shortcutId in shortcutIds)
+            {
+                var binding = ShortcutManager.instance.GetShortcutBinding(shortcutId);
+                m_ForbiddenShortcuts.TryAdd(shortcutId, new HashSet<KeyCombination>(binding.keyCombinationSequence));
+            }
+
+            ShortcutManager.instance.shortcutBindingChanged += OnShortcutBindingChanged;
+
+            m_DragTarget.RegisterCallback<PointerDownEvent>(OnPointerDownEvent, TrickleDown.TrickleDown);
+            m_DragTarget.RegisterCallback<PointerUpEvent>(OnPointerUpEvent, TrickleDown.TrickleDown);
+        }
+
+        public void Disable()
+        {
+            if (m_DragTarget == null)
+                return;
+
+            // Remove all possible bindings
+            ShortcutManager.instance.shortcutBindingChanged -= OnShortcutBindingChanged;
+            m_DragTarget.UnregisterCallback<AttachToPanelEvent>(OnAttachToPanel);
+            m_DragTarget.UnregisterCallback<PointerDownEvent>(OnPointerDownEvent, TrickleDown.TrickleDown);
+            m_DragTarget.UnregisterCallback<PointerUpEvent>(OnPointerUpEvent, TrickleDown.TrickleDown);
+            UnregisterShortcutBlockingHandlers();
+        }
+
+        void OnAttachToPanel(AttachToPanelEvent evt)
+        {
+            m_DragTarget.UnregisterCallback<AttachToPanelEvent>(OnAttachToPanel);
+            InitRegistrationTarget();
+        }
+
+        void InitRegistrationTarget()
+        {
+            // Get the top most VisualElement of the target so we can catch the keyboard events as soon
+            // as possible. GetRoot is not enough to get the panel element.
+            m_RegistrationTarget = m_DragTarget.GetFirstAncestorWhere(v => v.hierarchy.parent == null);
+        }
+
+        void OnShortcutBindingChanged(ShortcutBindingChangedEventArgs args)
+        {
+            if (!m_ForbiddenShortcuts.ContainsKey(args.shortcutId))
+                return;
+            m_ForbiddenShortcuts[args.shortcutId] = new HashSet<KeyCombination>(args.newBinding.keyCombinationSequence);
+        }
+
+        public void StartBlocking()
+        {
+            m_RegistrationTarget?.RegisterCallback<KeyDownEvent>(OnKeyDownEvent, TrickleDown.TrickleDown);
+        }
+
+        public void StopBlocking()
+        {
+            UnregisterShortcutBlockingHandlers();
+        }
+
+        void OnPointerDownEvent(PointerDownEvent evt)
+        {
+            // Don't stop the propagation of the event
+            if (evt.button == (int)MouseButton.LeftMouse)
+            {
+                m_RegistrationTarget?.RegisterCallback<PointerCaptureEvent>(OnPointerCaptureEvent, TrickleDown.TrickleDown);
+                StartBlocking();
+            }
+        }
+
+        void OnPointerCaptureEvent(PointerCaptureEvent evt)
+        {
+            // PointerDown captured the pointer, so we are not going
+            // to receive a PointerUp event. Register PointerCaptureOut event instead.
+            m_RegistrationTarget?.RegisterCallback<PointerCaptureOutEvent>(OnPointerCaptureOutEvent, TrickleDown.TrickleDown);
+        }
+
+        void OnPointerUpEvent(PointerUpEvent evt)
+        {
+            // Don't stop the propagation of the event
+            if (evt.button == (int)MouseButton.LeftMouse)
+            {
+                StopBlocking();
+            }
+        }
+
+        void OnPointerCaptureOutEvent(PointerCaptureOutEvent evt)
+        {
+            // Don't stop the propagation of the event
+            StopBlocking();
+        }
+
+        void OnKeyDownEvent(KeyDownEvent evt)
+        {
+            var currentCombination = KeyCombination.FromKeyboardInput(evt.keyCode, evt.modifiers);
+
+            if (m_ForbiddenShortcuts.Values.Any(set => set.Contains(currentCombination)))
+            {
+                evt.StopPropagation();
+            }
+        }
+
+        void UnregisterShortcutBlockingHandlers()
+        {
+            if (m_RegistrationTarget == null)
+                return;
+
+            m_RegistrationTarget.UnregisterCallback<KeyDownEvent>(OnKeyDownEvent, TrickleDown.TrickleDown);
+            m_RegistrationTarget.UnregisterCallback<PointerCaptureEvent>(OnPointerCaptureEvent, TrickleDown.TrickleDown);
+            m_RegistrationTarget.UnregisterCallback<PointerCaptureOutEvent>(OnPointerCaptureOutEvent, TrickleDown.TrickleDown);
+        }
+    }
+}
diff --git a/Modules/GraphToolsFoundationEditor/UI/Utils/SubgraphCreationHelpers_Internal.cs b/Modules/GraphToolsFoundationEditor/UI/Utils/SubgraphCreationHelpers_Internal.cs
index a51a106929..b3a9f70afa 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Utils/SubgraphCreationHelpers_Internal.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Utils/SubgraphCreationHelpers_Internal.cs
@@ -110,17 +110,13 @@ internal static void PopulateSubgraph_Internal(GraphModel graphModel,
         /// <param name="subgraphNode">The selected graph elements to be recreated in the subgraph.</param>
         /// <param name="inputWireConnections">A dictionary of input wire connections to their corresponding subgraph node port's unique name.</param>
         /// <param name="outputWireConnections">A dictionary of output wire connections to their corresponding subgraph node port's unique name.</param>
-        internal static IEnumerable<WireModel> CreateWiresConnectedToSubgraphNode_Internal(GraphModel graphModel, SubgraphNodeModel subgraphNode, Dictionary<WireModel, string> inputWireConnections, Dictionary<WireModel, string> outputWireConnections)
+        internal static void CreateWiresConnectedToSubgraphNode_Internal(GraphModel graphModel, SubgraphNodeModel subgraphNode, Dictionary<WireModel, string> inputWireConnections, Dictionary<WireModel, string> outputWireConnections)
         {
-            var newWires = new List<WireModel>();
-
             var subgraphNodeInputPorts = subgraphNode.DataInputPortToVariableDeclarationDictionary.Keys.Concat(subgraphNode.ExecutionInputPortToVariableDeclarationDictionary.Keys).ToList();
             var subgraphNodeOutputPorts = subgraphNode.DataOutputPortToVariableDeclarationDictionary.Keys.Concat(subgraphNode.ExecutionOutputPortToVariableDeclarationDictionary.Keys).ToList();
 
-            CreateWiresConnectedToSubgraphNode_Internal(newWires, graphModel, subgraphNodeInputPorts, inputWireConnections, true);
-            CreateWiresConnectedToSubgraphNode_Internal(newWires, graphModel, subgraphNodeOutputPorts, outputWireConnections, false);
-
-            return newWires;
+            CreateWiresConnectedToSubgraphNode_Internal(graphModel, subgraphNodeInputPorts, inputWireConnections, true);
+            CreateWiresConnectedToSubgraphNode_Internal(graphModel, subgraphNodeOutputPorts, outputWireConnections, false);
         }
 
         internal static void CreateVariableDeclaration_Internal(GraphModel graphModel, Dictionary<WireModel, string> wireConnections, bool isInput)
@@ -262,27 +258,10 @@ internal static void AddGraphElementsToSubgraph_Internal(GraphModel graphModel,
                 {
                     var newPosition = new Rect(placemat.PositionAndSize.position, placemat.PositionAndSize.size);
                     var pastedPlacemat = graphModel.CreatePlacemat(newPosition);
-                    pastedPlacemat.Title = placemat.Title;
-                    pastedPlacemat.Color = placemat.Color;
-                    pastedPlacemat.Collapsed = placemat.Collapsed;
-                    pastedPlacemat.HiddenElements = (placemat).HiddenElements;
+                    PlacematModel.CopyPlacematParameters(placemat, pastedPlacemat);
                     pastedPlacemats.Add(pastedPlacemat);
                     elementMapping.Add(placemat.Guid.ToString(), pastedPlacemat);
                 }
-                // Update hidden content to new node ids.
-                foreach (var pastedPlacemat in pastedPlacemats)
-                {
-                    if (pastedPlacemat.Collapsed)
-                    {
-                        foreach (var hiddenElement in pastedPlacemat.HiddenElements)
-                        {
-                            if (elementMapping.TryGetValue(hiddenElement.Guid.ToString(), out var pastedElement))
-                            {
-                                hiddenElement.SetGuid(pastedElement.Guid);
-                            }
-                        }
-                    }
-                }
             }
         }
 
@@ -298,14 +277,17 @@ internal static Vector2 GetNewVariablePosition_Internal(List<Vector2> existingPo
             return position;
         }
 
-        internal static void CreateWiresConnectedToSubgraphNode_Internal(List<WireModel> newWires, GraphModel graphModel, List<PortModel> portsOnSubgraphNode, Dictionary<WireModel, string> wireConnections, bool isInput)
+        internal static void CreateWiresConnectedToSubgraphNode_Internal(GraphModel graphModel, List<PortModel> portsOnSubgraphNode, Dictionary<WireModel, string> wireConnections, bool isInput)
         {
             foreach (var wireConnection in wireConnections)
             {
                 var portOnSubgraphNode = portsOnSubgraphNode.FirstOrDefault(p => p.UniqueName == wireConnection.Value);
                 var wire = wireConnection.Key;
 
-                newWires.Add(isInput ? graphModel.CreateWire(portOnSubgraphNode, wire.FromPort) : graphModel.CreateWire(wire.ToPort, portOnSubgraphNode));
+                if (isInput)
+                    graphModel.CreateWire(portOnSubgraphNode, wire.FromPort);
+                else
+                    graphModel.CreateWire(wire.ToPort, portOnSubgraphNode);
             }
         }
     }
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/Blackboard/BlackboardView.cs b/Modules/GraphToolsFoundationEditor/UI/Views/Blackboard/BlackboardView.cs
index 0a4cec31df..409f9faf51 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/Blackboard/BlackboardView.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/Blackboard/BlackboardView.cs
@@ -38,8 +38,9 @@ class BlackboardView : RootView, IDragSource
         /// </summary>
         /// <param name="window">The <see cref="EditorWindow"/> containing this view.</param>
         /// <param name="parentGraphView">The <see cref="GraphView"/> linked to this blackboard.</param>
-        /// <param name="viewSelection">An object that handles <see cref="ExecuteCommandEvent"/>s on the view. If null, an instance of <see cref="BlackboardViewSelection"/> will be created and used.</param>
-        public BlackboardView(EditorWindow window, GraphView parentGraphView, ViewSelection viewSelection = null)
+        /// <param name="viewSelectionProvider">A delegate to create the <see cref="ViewSelection"/> for this view. If null, an instance of <see cref="BlackboardViewSelection"/> will be created and used.</param>
+        public BlackboardView(EditorWindow window, GraphView parentGraphView,
+            Func<BlackboardView, BlackboardViewModel, ViewSelection> viewSelectionProvider = null)
             : base(window, parentGraphView.GraphTool)
         {
             Model = new BlackboardViewModel(parentGraphView, GraphTool.HighlighterState);
@@ -51,8 +52,8 @@ public BlackboardView(EditorWindow window, GraphView parentGraphView, ViewSelect
 
             RegisterCallback<KeyDownEvent>(OnRenameKeyDown);
 
-            ViewSelection = viewSelection;
-            ViewSelection ??= new BlackboardViewSelection(this, BlackboardViewModel);
+            viewSelectionProvider ??= (view, model) => new BlackboardViewSelection(view, model);
+            ViewSelection = viewSelectionProvider(this, BlackboardViewModel);
             ViewSelection.AttachToView();
         }
 
@@ -67,7 +68,7 @@ protected override void RegisterObservers()
 
             if (m_UpdateObserver == null)
             {
-                m_UpdateObserver = new ModelViewUpdater(this, BlackboardViewModel.GraphModelState, BlackboardViewModel.SelectionState, BlackboardViewModel.ViewState, GraphTool.ToolState, GraphTool.HighlighterState);
+                m_UpdateObserver = new ModelViewUpdater(this, BlackboardViewModel.GraphModelState, BlackboardViewModel.SelectionState, BlackboardViewModel.ViewState, GraphTool.HighlighterState);
                 GraphTool.ObserverManager.RegisterObserver(m_UpdateObserver);
             }
 
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/Blackboard/BlackboardViewCommandHandlers.cs b/Modules/GraphToolsFoundationEditor/UI/Views/Blackboard/BlackboardViewCommandHandlers.cs
index b76a4869a5..1e8580531b 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/Blackboard/BlackboardViewCommandHandlers.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/Blackboard/BlackboardViewCommandHandlers.cs
@@ -19,14 +19,14 @@ static class BlackboardViewCommandHandlers
         public static void PasteSerializedDataCommandHandler(UndoStateComponent undoState, GraphModelStateComponent graphModelState,
             SelectionStateComponent selectionState, BlackboardViewStateComponent blackboardState, PasteSerializedDataCommand command)
         {
-            if (!command.Data.IsEmpty_Internal())
+            if (!command.Data.IsEmpty())
             {
                 var selectionHelper = new GlobalSelectionCommandHelper(selectionState);
 
                 using (var undoStateUpdater = undoState.UpdateScope)
                 {
                     undoStateUpdater.SaveState(graphModelState);
-                    undoStateUpdater.SaveStates(selectionHelper.UndoableSelectionStates);
+                    undoStateUpdater.SaveStates(selectionHelper.SelectionStates);
                 }
 
                 using (var graphViewUpdater = graphModelState.UpdateScope)
@@ -38,7 +38,7 @@ public static void PasteSerializedDataCommandHandler(UndoStateComponent undoStat
                         selectionUpdater.ClearSelection();
                     }
 
-                    CopyPasteData.PasteSerializedData_Internal(command.Operation, command.Delta, graphViewUpdater,
+                    CopyPasteData.PasteSerializedData(command.Operation, command.Delta, graphViewUpdater,
                         blackboardUpdater, selectionUpdaters.MainUpdateScope, command.Data, graphModelState.GraphModel, command.SelectedGroup);
                 }
             }
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/CopyPasteData.cs b/Modules/GraphToolsFoundationEditor/UI/Views/CopyPasteData.cs
index b878de3ebc..c6d17bbe00 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/CopyPasteData.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/CopyPasteData.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
-using UnityEngine.Serialization;
 
 namespace Unity.GraphToolsFoundation.Editor
 {
@@ -17,10 +16,10 @@ namespace Unity.GraphToolsFoundation.Editor
     class CopyPasteData
     {
         [SerializeReference]
-        internal List<AbstractNodeModel> m_Nodes_Internal;
+        List<AbstractNodeModel> m_Nodes;
 
-        [SerializeReference, FormerlySerializedAs("edges")]
-        internal List<WireModel> m_Wires_Internal;
+        [SerializeReference]
+        List<WireModel> m_Wires;
 
         [Serializable]
         internal struct VariableDeclaration_Internal
@@ -55,26 +54,65 @@ internal struct GroupPath_Internal
         List<GroupPath_Internal> m_VariableGroupPaths;
 
         [SerializeField]
-        internal List<VariableDeclaration_Internal> m_VariableDeclarations_Internal;
+        List<VariableDeclaration_Internal> m_VariableDeclarations;
 
         [SerializeReference]
-        internal List<VariableDeclarationModel> m_ImplicitVariableDeclarations_Internal;
+        List<VariableDeclarationModel> m_ImplicitVariableDeclarations;
 
         [SerializeField]
-        internal Vector2 m_TopLeftNodePosition_Internal;
+        Vector2 m_TopLeftNodePosition;
 
         [SerializeReference]
-        internal List<StickyNoteModel> m_StickyNotes_Internal;
+        List<StickyNoteModel> m_StickyNotes;
 
         [SerializeReference]
-        internal List<PlacematModel> m_Placemats_Internal;
-
-        internal bool IsEmpty_Internal() => (!m_Nodes_Internal.Any() && !m_Wires_Internal.Any() &&
-            !m_VariableDeclarations_Internal.Any() && !m_StickyNotes_Internal.Any() && !m_Placemats_Internal.Any() && !m_VariableGroupPaths.Any());
+        List<PlacematModel> m_Placemats;
+
+        /// <summary>
+        /// The position where the top-left-most node will be created.
+        /// </summary>
+        public Vector2 TopLeftNodePosition => m_TopLeftNodePosition;
+
+        /// <summary>
+        /// The <see cref="AbstractNodeModel"/>s to paste.
+        /// </summary>
+        public IReadOnlyList<AbstractNodeModel> Nodes => m_Nodes;
+
+        /// <summary>
+        /// The <see cref="WireModel"/>s to paste.
+        /// </summary>
+        public IReadOnlyList<WireModel> Wires => m_Wires;
+
+        /// <summary>
+        /// The <see cref="StickyNoteModel"/>s to paste.
+        /// </summary>
+        public IReadOnlyList<StickyNoteModel> StickyNotes => m_StickyNotes;
+
+        /// <summary>
+        /// The <see cref="PlacematModel"/>s to paste.
+        /// </summary>
+        public IReadOnlyList<PlacematModel> Placemats => m_Placemats;
+
+        /// <summary>
+        /// The explicitly selected <see cref="VariableDeclarationModel"/>s to paste.
+        /// </summary>
+        public IReadOnlyList<VariableDeclarationModel> VariableDeclarations => m_VariableDeclarations.Select(v => v.m_Model).ToList();
+
+        /// <summary>
+        /// The implicitly selected <see cref="VariableDeclarationModel"/>s to paste, usually from <see cref="VariableNodeModel"/>s.
+        /// </summary>
+        public IReadOnlyList<VariableDeclarationModel> ImplicitVariableDeclarations => m_ImplicitVariableDeclarations;
+
+        /// <summary>
+        /// Whether there is any model to paste.
+        /// </summary>
+        /// <returns></returns>
+        public bool IsEmpty() => (!m_Nodes.Any() && !m_Wires.Any() &&
+            !m_VariableDeclarations.Any() && !m_StickyNotes.Any() && !m_Placemats.Any() && !m_VariableGroupPaths.Any());
 
         internal bool HasVariableContent_Internal()
         {
-            return m_VariableDeclarations_Internal.Any() || m_VariableGroupPaths.Any();
+            return m_VariableDeclarations.Any() || m_VariableGroupPaths.Any();
         }
 
         internal static CopyPasteData GatherCopiedElementsData_Internal(BlackboardViewStateComponent bbState, IReadOnlyCollection<Model> graphElementModels)
@@ -213,14 +251,14 @@ internal static CopyPasteData GatherCopiedElementsData_Internal(BlackboardViewSt
 
             var copyPasteData = new CopyPasteData
             {
-                m_TopLeftNodePosition_Internal = topLeftNodePosition,
-                m_Nodes_Internal = originalNodes,
-                m_Wires_Internal = wiresToCopy,
-                m_VariableDeclarations_Internal = declarations,
-                m_ImplicitVariableDeclarations_Internal = implicitVariableDeclarations,
+                m_TopLeftNodePosition = topLeftNodePosition,
+                m_Nodes = originalNodes,
+                m_Wires = wiresToCopy,
+                m_VariableDeclarations = declarations,
+                m_ImplicitVariableDeclarations = implicitVariableDeclarations,
                 m_VariableGroupPaths = groupPaths,
-                m_StickyNotes_Internal = stickyNotesToCopy,
-                m_Placemats_Internal = placematsToCopy
+                m_StickyNotes = stickyNotesToCopy,
+                m_Placemats = placematsToCopy
             };
 
             return copyPasteData;
@@ -249,8 +287,21 @@ static void RecurseAddMapping(Dictionary<string, GraphElementModel> elementMappi
                 }
         }
 
-        internal static void PasteSerializedData_Internal(PasteOperation operation, Vector2 delta,
-            GraphModelStateComponent.StateUpdater graphViewUpdater,
+        /// <summary>
+        /// Paste the data into a graph.
+        /// </summary>
+        /// <param name="operation">The kind of operation.</param>
+        /// <param name="delta">The position delta to apply to new elements.</param>
+        /// <param name="graphModelStateUpdater">The graph model updater.</param>
+        /// <param name="bbUpdater">The blackboard updater.</param>
+        /// <param name="selectionStateUpdater">The selection updater.</param>
+        /// <param name="copyPasteData">The data to paste.</param>
+        /// <param name="graphModel">The graph model.</param>
+        /// <param name="selectedGroup">The currently selected group, which will receive pasted variables.</param>
+        /// <returns>A dictionary that maps original element guids to newly pasted models.</returns>
+        public static Dictionary<string, GraphElementModel> PasteSerializedData(
+            PasteOperation operation, Vector2 delta,
+            GraphModelStateComponent.StateUpdater graphModelStateUpdater,
             BlackboardViewStateComponent.StateUpdater bbUpdater,
             SelectionStateComponent.StateUpdater selectionStateUpdater,
             CopyPasteData copyPasteData, GraphModel graphModel, GroupModel selectedGroup)
@@ -261,6 +312,8 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
 
             List<GroupModel> createdGroups = new List<GroupModel>();
 
+            using var changeScope = graphModel.ChangeDescriptionScope;
+
             if (copyPasteData.m_VariableGroupPaths != null)
             {
                 for (int i = 0; i < copyPasteData.m_VariableGroupPaths.Count; ++i)
@@ -275,18 +328,18 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
                             if (originalGroup != null) // If we duplicate try to put the new group next to the duplicated one.
                             {
                                 var parentGroup = originalGroup.ParentGroup;
-                                graphViewUpdater.MarkChanged(parentGroup.InsertItem(newGroup, parentGroup.Items.IndexOf_Internal(originalGroup) + 1));
+                                parentGroup.InsertItem(newGroup, parentGroup.Items.IndexOf_Internal(originalGroup) + 1);
                             }
                             else
                             {
                                 var parentGroup = selectedGroup ?? graphModel.GetSectionModel(groupPath.m_Path[0]) ?? graphModel.SectionModels.First();
-                                graphViewUpdater.MarkChanged(parentGroup.InsertItem(newGroup));
+                                parentGroup.InsertItem(newGroup);
                             }
                         }
                         else
                         {
                             var parentGroup = selectedGroup ?? graphModel.GetSectionModel(groupPath.m_Path[0]) ?? graphModel.SectionModels.First();
-                            graphViewUpdater.MarkChanged(parentGroup.InsertItem(newGroup));
+                            parentGroup.InsertItem(newGroup);
                             bbUpdater?.SetGroupModelExpanded(parentGroup, true);
                         }
                     }
@@ -294,20 +347,19 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
                     {
                         int j = copyPasteData.m_VariableGroupPaths.FindLastIndex(i - 1, t => t.m_Path.Length == groupPath.m_Path.Length - 1); // our parent group is always the first item above us that have one less path element.
                         var parentGroup = createdGroups[j];
-                        graphViewUpdater.MarkChanged(parentGroup.InsertItem(newGroup));
+                        parentGroup.InsertItem(newGroup);
                     }
 
-                    graphViewUpdater.MarkNew(newGroup);
                     bbUpdater?.SetGroupModelExpanded(newGroup, groupPath.m_Expanded);
                     createdGroups.Add(newGroup);
                     selectionStateUpdater.SelectElement(newGroup, true);
                 }
             }
 
-            if (copyPasteData.m_VariableDeclarations_Internal.Any())
+            if (copyPasteData.m_VariableDeclarations.Any())
             {
                 List<VariableDeclaration_Internal> variableDeclarationModels =
-                    copyPasteData.m_VariableDeclarations_Internal.ToList();
+                    copyPasteData.m_VariableDeclarations.ToList();
                 List<VariableDeclarationModel> duplicatedModels = new List<VariableDeclarationModel>();
 
                 foreach (var source in variableDeclarationModels)
@@ -333,7 +385,6 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
 
                 var duplicatedParents = new HashSet<GroupModel>(duplicatedModels.Select(t => t.ParentGroup));
 
-                graphViewUpdater.MarkChanged(duplicatedParents, ChangeHint.Grouping);
                 foreach (var duplicatedParent in duplicatedParents)
                 {
                     var current = duplicatedParent;
@@ -343,14 +394,13 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
                         current = current.ParentGroup;
                     }
                 }
-                graphViewUpdater.MarkNew(duplicatedModels);
                 selectionStateUpdater?.SelectElements(duplicatedModels, true);
             }
 
-            if (copyPasteData.m_ImplicitVariableDeclarations_Internal.Any())
+            if (copyPasteData.m_ImplicitVariableDeclarations.Any())
             {
                 List<VariableDeclarationModel> variableDeclarationModels =
-                    copyPasteData.m_ImplicitVariableDeclarations_Internal.ToList();
+                    copyPasteData.m_ImplicitVariableDeclarations.ToList();
                 List<VariableDeclarationModel> duplicatedModels = new List<VariableDeclarationModel>();
 
                 foreach (var source in variableDeclarationModels)
@@ -368,10 +418,6 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
                         declarationMapping[source.Guid.ToString()] = variable;
                     }
                 }
-
-                graphViewUpdater.MarkChanged(duplicatedModels.Select(t => t.ParentGroup),
-                    ChangeHint.Grouping);
-                graphViewUpdater.MarkNew(duplicatedModels);
                 selectionStateUpdater?.SelectElements(duplicatedModels, true);
             }
 
@@ -379,7 +425,7 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
             List<WirePortalModel> portalModels = new List<WirePortalModel>();
             List<WirePortalModel> existingPortalNodes = graphModel.NodeModels.OfType<WirePortalModel>().ToList();
 
-            foreach (var originalModel in copyPasteData.m_Nodes_Internal)
+            foreach (var originalModel in copyPasteData.m_Nodes)
             {
                 if (!graphModel.Stencil.CanPasteNode(originalModel, graphModel))
                     continue;
@@ -406,7 +452,7 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
                     }
                     else if (!portalNodeModel.CanHaveAnotherPortalWithSameDirectionAndDeclaration() ||
                              (portalNodeModel is ISingleInputPortNodeModel &&
-                                 copyPasteData.m_Nodes_Internal.Any(t=> t is ISingleOutputPortNodeModel and WirePortalModel exit &&
+                                 copyPasteData.m_Nodes.Any(t=> t is ISingleOutputPortNodeModel and WirePortalModel exit &&
                                      ReferenceEquals(exit.DeclarationModel, portalNodeModel.DeclarationModel))))
                     {
                         var declaration = graphModel.DuplicatePortal(portalNodeModel.DeclarationModel);
@@ -425,7 +471,6 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
                     ((VariableNodeModel)pastedNode).VariableDeclarationModel = declarationModel;
                 }
 
-                graphViewUpdater?.MarkNew(pastedNode);
                 selectionStateUpdater?.SelectElements(new[] { pastedNode }, true);
                 RecurseAddMapping(elementMapping, originalModel, pastedNode);
             }
@@ -454,7 +499,7 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
 
             // Avoid using sourceWire.FromPort and sourceWire.ToPort since the wire does not have sufficient context
             // to resolve the PortModel from the PortReference (the wire is not in a GraphModel).
-            foreach (var wire in copyPasteData.m_Wires_Internal)
+            foreach (var wire in copyPasteData.m_Wires)
             {
                 elementMapping.TryGetValue(wire.ToNodeGuid.ToString(), out var newInput);
                 elementMapping.TryGetValue(wire.FromNodeGuid.ToString(), out var newOutput);
@@ -463,12 +508,11 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
                 if (copiedWire != null)
                 {
                     elementMapping.Add(wire.Guid.ToString(), copiedWire);
-                    graphViewUpdater?.MarkNew(copiedWire);
                     selectionStateUpdater?.SelectElements(new[] { copiedWire }, true);
                 }
             }
 
-            foreach (var stickyNote in copyPasteData.m_StickyNotes_Internal)
+            foreach (var stickyNote in copyPasteData.m_StickyNotes)
             {
                 var newPosition = new Rect(stickyNote.PositionAndSize.position + delta, stickyNote.PositionAndSize.size);
                 var pastedStickyNote = graphModel.CreateStickyNote(newPosition);
@@ -476,46 +520,24 @@ internal static void PasteSerializedData_Internal(PasteOperation operation, Vect
                 pastedStickyNote.Contents = stickyNote.Contents;
                 pastedStickyNote.Theme = stickyNote.Theme;
                 pastedStickyNote.TextSize = stickyNote.TextSize;
-                graphViewUpdater?.MarkNew(pastedStickyNote);
                 selectionStateUpdater?.SelectElements(new[] { pastedStickyNote }, true);
                 elementMapping.Add(stickyNote.Guid.ToString(), pastedStickyNote);
             }
 
-            List<PlacematModel> pastedPlacemats = new List<PlacematModel>();
-
             // Keep placemats relative order
-            foreach (var placemat in copyPasteData.m_Placemats_Internal)
+            foreach (var placemat in copyPasteData.m_Placemats)
             {
                 var newPosition = new Rect(placemat.PositionAndSize.position + delta, placemat.PositionAndSize.size);
                 var newTitle = "Copy of " + placemat.Title;
                 var pastedPlacemat = graphModel.CreatePlacemat(newPosition);
+                PlacematModel.CopyPlacematParameters(placemat,pastedPlacemat);
                 pastedPlacemat.Title = newTitle;
-                pastedPlacemat.Color = placemat.Color;
-                pastedPlacemat.Collapsed = placemat.Collapsed;
-                pastedPlacemat.HiddenElements = placemat.HiddenElements;
-                graphViewUpdater?.MarkNew(pastedPlacemat);
                 selectionStateUpdater?.SelectElements(new[] { pastedPlacemat }, true);
-                pastedPlacemats.Add(pastedPlacemat);
                 elementMapping.Add(placemat.Guid.ToString(), pastedPlacemat);
             }
 
-            // Update hidden content to new node ids.
-            foreach (var pastedPlacemat in pastedPlacemats)
-            {
-                if (pastedPlacemat.Collapsed)
-                {
-                    List<GraphElementModel> pastedHiddenContent = new List<GraphElementModel>();
-                    foreach (var elementGuid in pastedPlacemat.HiddenElements.Select(t => t.Guid.ToString()))
-                    {
-                        if (elementMapping.TryGetValue(elementGuid, out var pastedElement))
-                        {
-                            pastedHiddenContent.Add(pastedElement);
-                        }
-                    }
-
-                    pastedPlacemat.HiddenElements = pastedHiddenContent;
-                }
-            }
+            graphModelStateUpdater?.MarkUpdated(changeScope.ChangeDescription);
+            return elementMapping;
         }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphModelStateComponent.cs b/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphModelStateComponent.cs
index 066a1f9b72..7dd412174c 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphModelStateComponent.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphModelStateComponent.cs
@@ -218,6 +218,25 @@ public void AssetChangedOnDisk()
             {
                 m_State.SetUpdateType(UpdateType.Complete);
             }
+
+            /// <summary>
+            /// Mark all the models as added, deleted or changed.
+            /// </summary>
+            /// <param name="changes">The <see cref="GraphChangeDescription"/> that contains the updated models.</param>
+            public void MarkUpdated(GraphChangeDescription changes)
+            {
+                var somethingChanged = m_State.CurrentChangeset.AddNewModels(changes.NewModels);
+                somethingChanged |= m_State.CurrentChangeset.AddChangedModels(changes.ChangedModels);
+                somethingChanged |= m_State.CurrentChangeset.AddDeletedModels(changes.DeletedModels);
+                SetDirty(somethingChanged);
+            }
+
+            public void MarkGraphPropertiesChanged()
+            {
+                m_State.SetUpdateType(UpdateType.Partial);
+                m_State.CurrentChangeset.AddChangedModels(new[] { m_State.GraphModel }, ChangeHint.Data);
+                SetDirty(true);
+            }
         }
 
         /// <summary>
@@ -346,11 +365,11 @@ public Changeset()
             /// </summary>
             /// <param name="models">The models to add.</param>
             /// <returns>True if at least one model was added to the list of new models, false otherwise.</returns>
-            public bool AddNewModels(IEnumerable<GraphElementModel> models)
+            public bool AddNewModels(IEnumerable<Model> models)
             {
                 var somethingChanged = false;
 
-                foreach (var model in models ?? Enumerable.Empty<GraphElementModel>())
+                foreach (var model in models ?? Enumerable.Empty<Model>())
                 {
                     if (model == null || m_DeletedModels.Contains(model.Guid))
                         continue;
@@ -394,12 +413,12 @@ public bool AddChangedModels(IReadOnlyDictionary<GraphElementModel, IReadOnlyLis
             /// <param name="models">The models to add.</param>
             /// <param name="changeHint">A hint about what changed on the models.</param>
             /// <returns>True if at least one model was added to the list of changed models, false otherwise.</returns>
-            public bool AddChangedModels(IEnumerable<GraphElementModel> models, ChangeHint changeHint = null)
+            public bool AddChangedModels(IEnumerable<Model> models, ChangeHint changeHint = null)
             {
                 var somethingChanged = false;
                 changeHint ??= ChangeHint.Unspecified;
 
-                foreach (var model in models ?? Enumerable.Empty<GraphElementModel>())
+                foreach (var model in models ?? Enumerable.Empty<Model>())
                 {
                     if (model == null ||
                         m_NewModels.Contains(model.Guid) ||
@@ -421,12 +440,12 @@ public bool AddChangedModels(IEnumerable<GraphElementModel> models, ChangeHint c
             /// <param name="models">The models to add.</param>
             /// <param name="changeHints">Hints about what changed on the models. The hints apply to all models.</param>
             /// <returns>True if at least one model was added to the list of changed models, false otherwise.</returns>
-            public bool AddChangedModels(IEnumerable<GraphElementModel> models, List<ChangeHint> changeHints)
+            public bool AddChangedModels(IEnumerable<Model> models, IReadOnlyList<ChangeHint> changeHints)
             {
                 var somethingChanged = false;
                 changeHints ??= k_DefaultChangeHints;
 
-                foreach (var model in models ?? Enumerable.Empty<GraphElementModel>())
+                foreach (var model in models ?? Enumerable.Empty<Model>())
                 {
                     if (model == null ||
                         m_NewModels.Contains(model.Guid) ||
@@ -483,10 +502,10 @@ void AddChangedModel(SerializableGUID modelGuid, IReadOnlyList<ChangeHint> chang
             /// </summary>
             /// <param name="models">The models to add.</param>
             /// <returns>True if at least one model was added to the list of deleted models, false otherwise.</returns>
-            public bool AddDeletedModels(IEnumerable<GraphElementModel> models)
+            public bool AddDeletedModels(IEnumerable<Model> models)
             {
                 var somethingChanged = false;
-                foreach (var model in models ?? Enumerable.Empty<GraphElementModel>())
+                foreach (var model in models ?? Enumerable.Empty<Model>())
                 {
                     if (model == null)
                         continue;
@@ -558,27 +577,60 @@ public void AggregateFrom(IEnumerable<IChangeset> changesets)
             {
                 Clear();
 
-                foreach (var changeset in changesets.OfType<Changeset>())
+                // The pattern of how changes should be accumulated is the following:
+                // Legend: N=New model, C=Changed model, D=Deleted model, 0=No change
+                //
+                // N + N = N
+                // N + C = N
+                // N + D = 0
+                // C + N = N
+                // C + C = C
+                // C + D = D
+                // D + N = N
+                // D + C = D
+                // D + D = D
+                //
+                // Notice D + N = N. This prevents any changes happening before hand to not get completely lost, for example C + D + N will become N instead
+                // of 0 if D + N had equal 0. Furthermore, we are applying the pairwise comparison in reverse to handle some special cases, like D + N + D = D.
+                // When doing a forward comparison, (D + N) + D => N + D => 0, but in reverse it becomes D + (N + D) => D + 0 => D.
+
+                foreach (var changeset in changesets.OfType<Changeset>().Reverse())
                 {
-                    m_NewModels.UnionWith(changeset.m_NewModels);
-                    m_DeletedModels.UnionWith(changeset.m_DeletedModels);
-                    m_ModelsToAutoAlign.UnionWith(changeset.m_ModelsToAutoAlign);
-                    m_ModelsToRepositionAtCreation.UnionWith(changeset.m_ModelsToRepositionAtCreation);
+                    foreach (var newModel in changeset.m_NewModels)
+                    {
+                        // N + D = 0
+                        if (m_DeletedModels.Contains(newModel))
+                            m_DeletedModels.Remove(newModel);
+                        else
+                        {
+                            // N + N/C = N
+                            if (m_ChangedModelsAndHints.ContainsKey(newModel))
+                                m_ChangedModelsAndHints.Remove(newModel);
+                            m_NewModels.Add(newModel);
+                        }
+                    }
 
+                    // C + N/D = N/D
                     foreach (var kv in changeset.m_ChangedModelsAndHints)
                     {
-                        AddChangedModel(kv.Key, kv.Value);
+                        if (!m_NewModels.Contains(kv.Key) && !m_DeletedModels.Contains(kv.Key))
+                            AddChangedModel(kv.Key, kv.Value);
                     }
-                }
 
-                m_NewModels.RemoveWhere(m => m_DeletedModels.Contains(m));
-
-                foreach (var model in m_ChangedModelsAndHints.Keys.ToList())
-                {
-                    if (m_NewModels.Contains(model) || m_DeletedModels.Contains(model))
+                    foreach (var deletedModel in changeset.m_DeletedModels)
                     {
-                        m_ChangedModelsAndHints.Remove(model);
+                        // D + N = N
+                        if (m_NewModels.Contains(deletedModel))
+                            continue;
+
+                        // D + C/D = D
+                        if (m_ChangedModelsAndHints.ContainsKey(deletedModel))
+                            m_ChangedModelsAndHints.Remove(deletedModel);
+                        m_DeletedModels.Add(deletedModel);
                     }
+
+                    m_ModelsToAutoAlign.UnionWith(changeset.m_ModelsToAutoAlign);
+                    m_ModelsToRepositionAtCreation.UnionWith(changeset.m_ModelsToRepositionAtCreation);
                 }
 
                 m_ModelsToAutoAlign.RemoveWhere(m => m_DeletedModels.Contains(m));
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphView.cs b/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphView.cs
index 092b5b59a0..60023b7b7f 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphView.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphView.cs
@@ -457,6 +457,11 @@ public void UpdateViewTransform(Vector3 pan, Vector3 zoom)
                         graphElement.SetLevelOfDetail(zoom.x, m_ZoomMode, oldMode);
                     }
 
+                    foreach (var badge in m_BadgesParent.Children().OfType<Badge>())
+                    {
+                        badge.SetLevelOfDetail(zoom.x, m_ZoomMode, oldMode);
+                    }
+
                     k_UpdateAllUIs.Clear();
                 }
             }
@@ -556,15 +561,6 @@ protected virtual IDragAndDropHandler GetDragAndDropHandler()
             return null;
         }
 
-        public bool GetPortCenterOverride(Port port, out Vector2 overriddenPosition)
-        {
-            if (PlacematContainer.GetPortCenterOverride(port, out overriddenPosition))
-                return true;
-
-            overriddenPosition = Vector3.zero;
-            return false;
-        }
-
         void AddLayer(Layer layer, int index)
         {
             m_ContainerLayers.Add(index, layer);
@@ -673,12 +669,12 @@ protected virtual void BuildContextualMenu(ContextualMenuPopulateEvent evt)
                         }
                         else
                         {
-                            Dispatch(new CreatePlacematCommand(new Rect(graphPosition.x, graphPosition.y, 200, 200)));
+                            Dispatch(new CreatePlacematCommand(graphPosition));
                         }
                     }
                     else
                     {
-                        Dispatch(new CreatePlacematCommand(new Rect(graphPosition.x, graphPosition.y, 200, 200)));
+                        Dispatch(new CreatePlacematCommand(graphPosition));
                     }
                 });
 
@@ -860,26 +856,10 @@ void ChangeNodesColor(Color pickedColor)
                     {
                         evt.menu.AppendSeparator();
 
-                        var wireData = wires.Select(
-                            wireModel =>
-                            {
-                                var outputPort = wireModel.FromPort.GetView<Port>(this);
-                                var inputPort = wireModel.ToPort.GetView<Port>(this);
-                                var outputNode = wireModel.FromPort.NodeModel.GetView<Node>(this);
-                                var inputNode = wireModel.ToPort.NodeModel.GetView<Node>(this);
-
-                                if (outputNode == null || inputNode == null || outputPort == null || inputPort == null)
-                                    return (null, Vector2.zero, Vector2.zero);
-
-                                return (wireModel,
-                                    outputPort.ChangeCoordinatesTo(contentContainer, outputPort.layout.center),
-                                    inputPort.ChangeCoordinatesTo(contentContainer, inputPort.layout.center));
-                            }
-                        ).Where(tuple => tuple.Item1 != null).ToList();
-
+                        var wireData = Wire.GetPortalsWireData(wires, this);
                         evt.menu.AppendAction("Add Portals", _ =>
                         {
-                            Dispatch(new ConvertWiresToPortalsCommand(wireData));
+                            Dispatch(new ConvertWiresToPortalsCommand(wireData, this));
                         });
                     }
 
@@ -1026,6 +1006,8 @@ protected override void RegisterObservers()
                     model => model is IHasDeclarationModel hasDeclarationModel ? hasDeclarationModel.DeclarationModel : null);
                 GraphTool.ObserverManager.RegisterObserver(m_DeclarationHighlighter);
             }
+
+            SelectionDragger?.RegisterObservers(GraphTool.ObserverManager);
         }
 
         /// <inheritdoc />
@@ -1034,6 +1016,8 @@ protected override void UnregisterObservers()
             if (GraphTool?.ObserverManager == null)
                 return;
 
+            SelectionDragger?.UnregisterObservers(GraphTool.ObserverManager);
+
             if (m_GraphViewGraphLoadedObserver != null)
             {
                 GraphTool?.ObserverManager?.UnregisterObserver(m_GraphViewGraphLoadedObserver);
@@ -1214,7 +1198,7 @@ public Rect CalculateRectToFitAll()
             return rectToFit;
         }
 
-        public void CalculateFrameTransform(Rect rectToFit, Rect clientRect, int border, out Vector3 frameTranslation, out Vector3 frameScaling)
+        public void CalculateFrameTransform(Rect rectToFit, Rect clientRect, int border, out Vector3 frameTranslation, out Vector3 frameScaling, float maxZoomLevel = -1.0f)
         {
             // bring slightly smaller screen rect into GUI space
             var screenRect = new Rect
@@ -1233,7 +1217,7 @@ public void CalculateFrameTransform(Rect rectToFit, Rect clientRect, int border,
             float zoomLevel = Math.Min(identity.width / rectToFit.width, identity.height / rectToFit.height);
 
             // clamp
-            zoomLevel = Mathf.Clamp(zoomLevel, m_MinScale, Math.Min(m_MaxScale, m_MaxScaleOnFrame));
+            zoomLevel = Mathf.Clamp(zoomLevel, m_MinScale, Math.Min(m_MaxScale, maxZoomLevel > 0 ? maxZoomLevel : m_MaxScaleOnFrame));
 
             var trs = Matrix4x4.TRS(Vector3.zero, Quaternion.identity, new Vector3(zoomLevel, zoomLevel, 1.0f));
 
@@ -1578,9 +1562,6 @@ protected virtual UpdateType DoUpdate(Observation graphModelObservation, Observa
 
             if (rebuildType == UpdateType.Complete)
             {
-                // This happens on undo, amongst other cases.
-                // Undo replaces the GraphModel object by a new object.
-                // We need to recreate the all the UI so it does not reference the old graph model.
 
                 // Sad. We lose the focused element.
                 Focus();
@@ -1659,8 +1640,9 @@ protected virtual void PartialUpdate(Observation graphModelObservation, Observat
                 var changeset = GraphTool.HighlighterState.GetAggregatedChangeset(highlighterObservation.LastObservedVersion);
                 changedModels.UnionWith(changeset.ChangedModels.SelectMany(guid =>
                 {
+                    var declarations = GraphModel.VariableDeclarations.Union(GraphModel.PortalDeclarations);
                     var variableDeclarationPlaceholders = GraphModel.Placeholders.OfType<VariableDeclarationModel>();
-                    var declarationModel = GraphModel.VariableDeclarations.Union(variableDeclarationPlaceholders).FirstOrDefault(d => d != null && d.Guid == guid);
+                    var declarationModel = declarations.Union(variableDeclarationPlaceholders).FirstOrDefault(d => d != null && d.Guid == guid);
                     return declarationModel != null ? GraphModel.FindReferencesInGraph(declarationModel) : Enumerable.Empty<IHasDeclarationModel>();
                 }).OfType<AbstractNodeModel>().Select(m => m.Guid));
             }
@@ -1682,10 +1664,11 @@ protected virtual void PartialUpdate(Observation graphModelObservation, Observat
                 schedule.Execute(() =>
                 {
                     using (var graphUpdater = GraphViewModel.GraphModelState.UpdateScope)
+                    using (var changeScope = GraphModel.ChangeDescriptionScope)
                     {
                         var models = elementsToAlign.Select(GraphModel.GetModel).Where(m => m != null).ToList();
-                        var alignedModels = PositionDependenciesManager_Internal.AlignNodes(true, models);
-                        graphUpdater.MarkChanged(alignedModels, ChangeHint.Layout);
+                        PositionDependenciesManager_Internal.AlignNodes(true, models);
+                        graphUpdater.MarkUpdated(changeScope.ChangeDescription);
                     }
                 });
             }
@@ -2147,17 +2130,18 @@ public virtual void BuildOptionMenu(GenericMenu menu)
 
         void RepositionModelsAtCreation(IEnumerable<GraphModelStateComponent.Changeset.ModelToReposition> modelsToReposition, GraphModelStateComponent.StateUpdater graphUpdater)
         {
+            using var changeScope = GraphModel.ChangeDescriptionScope;
             foreach (var modelToReposition in modelsToReposition)
             {
                 GraphModel.TryGetModelFromGuid(modelToReposition.Model, out AbstractNodeModel nodeModel);
                 GraphModel.TryGetModelFromGuid(modelToReposition.WireModel, out WireModel wireModel);
 
-                if (nodeModel != null && wireModel != null)
-                {
-                    var nodeUI = nodeModel.GetView<Node>(this);
-                    if (nodeUI == null)
-                        continue;
+                var nodeUI = nodeModel?.GetView<Node>(this);
+                if (nodeUI == null)
+                    continue;
 
+                if (wireModel != null)
+                {
                     var portModel = modelToReposition.WireSide == WireSide.From ? wireModel.FromPort : wireModel.ToPort;
 
                     // Get the orientation of the connection
@@ -2195,19 +2179,18 @@ void RepositionModelsAtCreation(IEnumerable<GraphModelStateComponent.Changeset.M
 
                     nodeModel.Position = new Vector2(newPosX, newPosY);
 
-                    // The node and wire's visibility was set to hidden before the first layout pass. Now, they should be set to visible.
-                    nodeUI.visible = true;
-
+                    // The wire's visibility was set to hidden before the first layout pass. Now, it should be set to visible.
                     var wireUI = wireModel.GetView<Wire>(this);
                     if (wireUI != null)
                     {
                         wireUI.visible = true;
                         graphUpdater.MarkChanged(wireModel, ChangeHint.Layout);
                     }
-
-                    graphUpdater.MarkChanged(nodeModel, ChangeHint.Layout);
                 }
+                // The node was set to hidden before the first layout pass. Now, it should be set to visible.
+                nodeUI.visible = true;
             }
+            graphUpdater.MarkUpdated(changeScope.ChangeDescription);
         }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewCommandsExtensions.cs b/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewCommandsExtensions.cs
index cd3fd7884a..f1d15d3b7e 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewCommandsExtensions.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewCommandsExtensions.cs
@@ -180,11 +180,24 @@ public static void DispatchFrameAndSelectElementsCommand(this GraphView self, bo
             if (!graphElements.Any())
                 return;
 
-            var rectToFit = CalculateRectToFitElements(self, graphElements);
-            self.CalculateFrameTransform(rectToFit, self.layout, GraphView.frameBorder, out var frameTranslation, out var frameScaling);
+            self.CalculateFrameTransformToFitElements(graphElements, out var frameTranslation, out var frameScaling);
 
             self.Dispatch(new ReframeGraphViewCommand(frameTranslation, frameScaling,
                 select ? graphElements.Select(e => e.GraphElementModel).ToList() : null));
         }
+
+        /// <summary>
+        /// Computes the frame transform needed to fit a list of graph elements.
+        /// </summary>
+        /// <param name="self">The GraphView.</param>
+        /// <param name="graphElements">The list of elements to frame.</param>
+        /// <param name="frameTranslation">The translation needed to frame the graph elements.</param>
+        /// <param name="frameScaling">The scaling needed to frame the graph elements.</param>
+        /// <param name="maxZoomLevel">The maximum zoom level permitted.</param>
+        public static void CalculateFrameTransformToFitElements(this GraphView self, IReadOnlyList<GraphElement> graphElements, out Vector3 frameTranslation, out Vector3 frameScaling, float maxZoomLevel = -1.0f)
+        {
+            var rectToFit = CalculateRectToFitElements(self, graphElements);
+            self.CalculateFrameTransform(rectToFit, self.layout, GraphView.frameBorder, out frameTranslation, out frameScaling, maxZoomLevel);
+        }
     }
 }
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewCommandsRegistrar.cs b/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewCommandsRegistrar.cs
index e85c31ce53..fee614f8dc 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewCommandsRegistrar.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewCommandsRegistrar.cs
@@ -70,8 +70,11 @@ void RegisterCommandHandlers()
             RegisterCommandHandler<MoveWireCommand>(MoveWireCommand.DefaultCommandHandler);
             RegisterCommandHandler<ReorderWireCommand>(ReorderWireCommand.DefaultCommandHandler);
             RegisterCommandHandler<SplitWireAndInsertExistingNodeCommand>(SplitWireAndInsertExistingNodeCommand.DefaultCommandHandler);
-            RegisterCommandHandler<ConvertWiresToPortalsCommand>(ConvertWiresToPortalsCommand.DefaultCommandHandler);
             RegisterCommandHandler<DisconnectNodeCommand>(DisconnectNodeCommand.DefaultCommandHandler);
+            
+            m_CommandTarget.RegisterCommandHandler<UndoStateComponent, GraphViewStateComponent, GraphModelStateComponent, SelectionStateComponent, ConvertWiresToPortalsCommand>(
+                ConvertWiresToPortalsCommand.DefaultCommandHandler, m_GraphTool.UndoStateComponent, m_GraphViewState, m_GraphModelState, m_SelectionState);
+
             RegisterCommandHandler<ChangeNodeStateCommand>(ChangeNodeStateCommand.DefaultCommandHandler);
             RegisterCommandHandler<CollapseNodeCommand>(CollapseNodeCommand.DefaultCommandHandler);
             RegisterCommandHandler<UpdateConstantValueCommand>(UpdateConstantValueCommand.DefaultCommandHandler);
@@ -91,7 +94,6 @@ void RegisterCommandHandlers()
             RegisterCommandHandler<ChangeElementLayoutCommand>(ChangeElementLayoutCommand.DefaultCommandHandler);
             RegisterCommandHandler<CreatePlacematCommand>(CreatePlacematCommand.DefaultCommandHandler);
             RegisterCommandHandler<ChangePlacematOrderCommand>(ChangePlacematOrderCommand.DefaultCommandHandler);
-            RegisterCommandHandler<CollapsePlacematCommand>(CollapsePlacematCommand.DefaultCommandHandler);
             RegisterCommandHandler<CreateStickyNoteCommand>(CreateStickyNoteCommand.DefaultCommandHandler);
             RegisterCommandHandler<UpdateStickyNoteCommand>(UpdateStickyNoteCommand.DefaultCommandHandler);
             RegisterCommandHandler<UpdateStickyNoteThemeCommand>(UpdateStickyNoteThemeCommand.DefaultCommandHandler);
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewSelection.cs b/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewSelection.cs
index cf58b16fbb..c8fd3e8ea4 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewSelection.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/GraphView/GraphViewSelection.cs
@@ -26,7 +26,7 @@ protected override Vector2 GetPasteDelta(CopyPasteData data)
         {
             var mousePosition = PointerDeviceState.GetPointerPosition(PointerId.mousePointerId, ContextType.Editor);
             mousePosition = ((GraphView)m_View).ContentViewContainer.WorldToLocal(mousePosition);
-            return mousePosition - data.m_TopLeftNodePosition_Internal;
+            return mousePosition - data.TopLeftNodePosition;
         }
 
         /// <inheritdoc />
@@ -66,7 +66,7 @@ protected override HashSet<GraphElementModel> CollectCopyableGraphElements(IEnum
             foreach (var placemat in elementList.OfType<PlacematModel>())
             {
                 var placematUI = placemat.GetView<Placemat>(m_View);
-                placematUI?.ActOnGraphElementsOver_Internal(
+                placematUI?.ActOnGraphElementsInside_Internal(
                     el =>
                     {
                         if (el.Model is AbstractNodeModel node)
@@ -75,8 +75,7 @@ protected override HashSet<GraphElementModel> CollectCopyableGraphElements(IEnum
                             elementsToCopySet,
                             IsCopiable);
                         return false;
-                    },
-                    true);
+                    });
             }
 
             // copying wires between nodes in placemats
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/ModelInspector/InspectorSelectionObserver_Internal.cs b/Modules/GraphToolsFoundationEditor/UI/Views/ModelInspector/InspectorSelectionObserver_Internal.cs
index 56bc6a1ac1..108216e980 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/ModelInspector/InspectorSelectionObserver_Internal.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/ModelInspector/InspectorSelectionObserver_Internal.cs
@@ -43,7 +43,8 @@ public override void Observe()
                     {
                         var graphModel = m_GraphModelStateComponent.GraphModel;
                         var selection = m_SelectionStates.SelectMany(s => s.GetSelection(graphModel));
-                        var selectedModels = selection.OfType<Model>().Where(t => t is AbstractNodeModel || t is VariableDeclarationModel || t is WireModel).Distinct().ToList();
+                        var selectedModels = m_ToolState.CurrentGraph.GetGraphModel().Stencil.GetModelsDisplayableInInspector(selection).Distinct().ToList();
+
                         using (var updater = m_ModelInspectorState.UpdateScope)
                         {
                             updater.SetInspectedModels(selectedModels, graphModel);
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/ModelInspector/ModelInspectorView.cs b/Modules/GraphToolsFoundationEditor/UI/Views/ModelInspector/ModelInspectorView.cs
index 480dc16c95..2662db95f2 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/ModelInspector/ModelInspectorView.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/ModelInspector/ModelInspectorView.cs
@@ -20,13 +20,21 @@ namespace Unity.GraphToolsFoundation.Editor
     class ModelInspectorView : RootView, IMultipleModelPartContainer
     {
         /// <summary>
-        /// Determines if a field should be displayed in the basic settings section of the inspector.
+        /// Determines if a field should be displayed in the node options section of the inspector.
         /// </summary>
         /// <param name="f">The field to inspect.</param>
-        /// <returns>True if a field should be displayed in the basic settings section of the inspector. False otherwise.</returns>
+        /// <returns>True if a field should be displayed in the node options section of the inspector. False otherwise.</returns>
+        public static bool NodeOptionsFilter(FieldInfo f)
+        {
+#pragma warning disable 618
+            return SerializedFieldsInspector.CanBeInspected(f) && f.CustomAttributes.Any(a => a.AttributeType == typeof(NodeOptionAttribute) || a.AttributeType == typeof(ModelSettingAttribute));
+#pragma warning restore 618
+        }
+
+        [Obsolete("BasicSettingsFilter has been deprecated. Use NodeOptionsFilter instead.")]
         public static bool BasicSettingsFilter(FieldInfo f)
         {
-            return SerializedFieldsInspector.CanBeInspected(f) && f.CustomAttributes.Any(a => a.AttributeType == typeof(ModelSettingAttribute));
+            return NodeOptionsFilter(f);
         }
 
         /// <summary>
@@ -36,7 +44,9 @@ public static bool BasicSettingsFilter(FieldInfo f)
         /// <returns>True if a field should be displayed in the advanced settings section of the inspector. False otherwise.</returns>
         public static bool AdvancedSettingsFilter(FieldInfo f)
         {
-            return SerializedFieldsInspector.CanBeInspected(f) && f.CustomAttributes.All(a => a.AttributeType != typeof(ModelSettingAttribute));
+#pragma warning disable 618
+            return SerializedFieldsInspector.CanBeInspected(f) && f.CustomAttributes.All(a => a.AttributeType != typeof(NodeOptionAttribute) && a.AttributeType != typeof(ModelSettingAttribute));
+#pragma warning restore 618
         }
 
         static readonly List<ModelView> k_UpdateAllUIs = new List<ModelView>();
@@ -73,6 +83,7 @@ public ModelInspectorView(EditorWindow window, GraphView parentGraphView)
             this.RegisterCommandHandler<UndoStateComponent, GraphModelStateComponent, SetInspectedGraphModelFieldCommand>(SetInspectedGraphModelFieldCommand.DefaultCommandHandler, GraphTool.UndoStateComponent, ModelInspectorViewModel.GraphModelState);
 
             this.RegisterCommandHandler<UndoStateComponent, GraphModelStateComponent, SetInspectedGraphElementModelFieldCommand>(SetInspectedGraphElementModelFieldCommand.DefaultCommandHandler, GraphTool.UndoStateComponent, ModelInspectorViewModel.GraphModelState);
+            this.RegisterCommandHandler<UndoStateComponent, GraphModelStateComponent, ChangeElementColorCommand>(ChangeElementColorCommand.DefaultCommandHandler, GraphTool.UndoStateComponent, ModelInspectorViewModel.GraphModelState);
 
             this.RegisterCommandHandler<UndoStateComponent, GraphModelStateComponent, UpdateConstantValueCommand>(UpdateConstantValueCommand.DefaultCommandHandler, GraphTool.UndoStateComponent, ModelInspectorViewModel.GraphModelState);
             this.RegisterCommandHandler<UndoStateComponent, GraphModelStateComponent, UpdateConstantsValueCommand>(UpdateConstantsValueCommand.DefaultCommandHandler, GraphTool.UndoStateComponent, ModelInspectorViewModel.GraphModelState);
@@ -304,7 +315,7 @@ public override void BuildUI()
 
             // We need to recreate the m_InspectorContainer to be able to set the scroll offset to any value.
             // If we reuse the existing m_InspectorContainer, offset will be clamped according to the last layout of the scrollView.
-            m_InspectorContainer = new ScrollView(ScrollViewMode.VerticalAndHorizontal);
+            m_InspectorContainer = new ScrollView(ScrollViewMode.Vertical);
             m_InspectorContainer.AddToClassList(containerUssClassName);
 
             if (ModelInspectorViewModel == null)
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/RootView.cs b/Modules/GraphToolsFoundationEditor/UI/Views/RootView.cs
index 8e764309be..d47c49b67a 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/RootView.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/RootView.cs
@@ -13,11 +13,13 @@ namespace Unity.GraphToolsFoundation.Editor
     /// Base class for root views.
     /// </summary>
     /// <remarks>Root views are model views that can receive commands. They are also usually being updated by an observer.</remarks>
-    abstract class RootView : BaseModelView, IHierarchicalCommandTarget
+    abstract class RootView : BaseModelView, IHierarchicalCommandTarget, IUndoableCommandMerger
     {
         public static readonly string ussClassName = "ge-view";
         public static readonly string focusedViewModifierUssClassName = ussClassName.WithUssModifier("focused");
 
+        int m_StartMergeGroup;
+
         /// <summary>
         /// The graph tool.
         /// </summary>
@@ -83,6 +85,22 @@ public virtual void Dispatch(ICommand command, Diagnostics diagnosticsFlags = Di
             }
         }
 
+        /// <summary>
+        /// Indicate that you want to merge the next undoable commands into one undo.
+        /// </summary>
+        public virtual void StartMergingUndoableCommands()
+        {
+            m_StartMergeGroup = Undo.GetCurrentGroup();
+        }
+
+        /// <summary>
+        /// Ends the merging of undoables commands into one undo.
+        /// </summary>
+        public virtual void StopMergingUndoableCommands()
+        {
+            Undo.CollapseUndoOperations(m_StartMergeGroup);
+        }
+
         public void DispatchToSelf(ICommand command, Diagnostics diagnosticsFlags = Diagnostics.None)
         {
             Dispatcher.Dispatch(command, diagnosticsFlags);
diff --git a/Modules/GraphToolsFoundationEditor/UI/Views/ViewSelection.cs b/Modules/GraphToolsFoundationEditor/UI/Views/ViewSelection.cs
index 68e942cfda..8e40074e3b 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Views/ViewSelection.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Views/ViewSelection.cs
@@ -161,7 +161,7 @@ protected virtual void OnExecuteCommand(ExecuteCommandEvent evt)
             }
             else if (evt.commandName == EventCommandNames.SelectAll)
             {
-                m_View.Dispatch(new SelectElementsCommand(SelectElementsCommand.SelectionMode.Add, SelectableModels.ToList()));
+                m_View.Dispatch(new SelectElementsCommand(SelectElementsCommand.SelectionMode.Replace, SelectableModels.ToList()));
                 evt.StopPropagation();
             }
             else if (evt.commandName == EventCommandNames.DeselectAll)
@@ -212,8 +212,9 @@ public IReadOnlyList<GraphElementModel> GetSelection()
 
         /// <summary>
         /// Serializes the selection and related elements to the clipboard.
+        /// <returns>The copied elements</returns>
         /// </summary>
-        protected virtual void CopySelection()
+        protected virtual IEnumerable<GraphElementModel> CopySelection()
         {
             var elementsToCopySet = CollectCopyableGraphElements(GetSelection());
             var copyPasteData = BuildCopyPasteData(elementsToCopySet);
@@ -222,6 +223,8 @@ protected virtual void CopySelection()
             {
                 Clipboard_Internal = k_SerializedDataMimeType + " " + serializedData;
             }
+
+            return elementsToCopySet;
         }
 
         /// <summary>
@@ -229,8 +232,8 @@ protected virtual void CopySelection()
         /// </summary>
         protected virtual void CutSelection()
         {
-            CopySelection();
-            m_View.Dispatch(new DeleteElementsCommand(GetSelection()) { UndoString = "Cut" });
+            var copiedElements = CopySelection();
+            m_View.Dispatch(new DeleteElementsCommand(copiedElements.ToList()) { UndoString = "Cut" });
         }
 
         /// <summary>
diff --git a/Modules/GraphToolsFoundationEditor/UI/Windows/GraphViewEditorWindow.cs b/Modules/GraphToolsFoundationEditor/UI/Windows/GraphViewEditorWindow.cs
index 61c1293348..15f32f92c5 100644
--- a/Modules/GraphToolsFoundationEditor/UI/Windows/GraphViewEditorWindow.cs
+++ b/Modules/GraphToolsFoundationEditor/UI/Windows/GraphViewEditorWindow.cs
@@ -25,23 +25,33 @@ abstract class GraphViewEditorWindow : EditorWindow, ISupportsOverlays
         bool m_HasMultipleWindowsForSameGraph;
         bool m_UnsavedChangesWindowIsEnabled;
 
+        /// <summary>
+        /// Finds an empty window of type <typeparamref name="TWindow"/>. If none is found, creates a new one.
+        /// </summary>
+        /// <typeparam name="TWindow">The type of the window to find or create.</typeparam>
+        /// <returns>The window.</returns>
+        public static TWindow FindOrCreateGraphWindow<TWindow>() where TWindow : GraphViewEditorWindow
+        {
+            return ShowGraphInExistingOrNewWindow<TWindow>(null);
+        }
+
         /// <summary>
         /// Finds a graph asset's opened window of type <typeparamref name="TWindow"/>. If no window is found, create a new one.
         /// The window is then opened and focused.
         /// </summary>
-        /// <param name="assetPath">The path of the graph asset to open.</param>
+        /// <param name="graphAsset">The graph asset to display in the window. Pass null if you are looking for an empty window of type <typeparamref name="TWindow"/>.</param>
         /// <typeparam name="TWindow">The window type, which should derive from <see cref="GraphViewEditorWindow"/>.</typeparam>
         /// <returns>A window.</returns>
-        public static TWindow FindOrCreateGraphWindow<TWindow>(string assetPath = null) where TWindow : GraphViewEditorWindow
+        public static TWindow ShowGraphInExistingOrNewWindow<TWindow>(GraphAsset graphAsset) where TWindow : GraphViewEditorWindow
         {
             TWindow window = null;
 
             var windowList = Resources.FindObjectsOfTypeAll<TWindow>();
-            if (assetPath != null)
+            if (graphAsset != null)
             {
                 window = windowList.FirstOrDefault(w =>
-                        w.GraphTool.ToolState.CurrentGraph.GetGraphAssetPath() == assetPath ||
-                        w.GraphTool.ToolState.SubGraphStack.FirstOrDefault().GetGraphAssetPath() == assetPath);
+                        w.GraphTool.ToolState.CurrentGraph.GetGraphAsset() == graphAsset ||
+                        w.GraphTool.ToolState.SubGraphStack.FirstOrDefault().GetGraphAsset() == graphAsset);
             }
 
             if (window == null)
@@ -49,33 +59,25 @@ public static TWindow FindOrCreateGraphWindow<TWindow>(string assetPath = null)
                 window = windowList.FirstOrDefault(w => w.GraphTool.ToolState.CurrentGraph.GetGraphModel() == null);
             }
 
+            bool isAssetOfSameTypeOpened = windowList.FirstOrDefault(w => w is TWindow) != null;
+
             if (window == null)
             {
-                window = CreateWindow<TWindow>(desiredDockNextTo: typeof(TWindow));
+                window = CreateWindow<TWindow>(isAssetOfSameTypeOpened ? typeof(TWindow) : typeof(SceneView));
             }
 
             window.Show();
+
+            if (graphAsset != null)
+            {
+                window.GraphTool.Dispatch(new LoadGraphCommand(graphAsset.GraphModel));
+            }
+
             window.Focus();
 
             return window;
         }
 
-        /// <summary>
-        /// Ways of opening a graph when selection changes.
-        /// </summary>
-        public enum OpenMode
-        {
-            /// <summary>
-            /// Just open the graph in the window.
-            /// </summary>
-            Open,
-
-            /// <summary>
-            /// Show the graph and focus the window.
-            /// </summary>
-            OpenAndFocus
-        }
-
         public static readonly string graphProcessingPendingUssClassName = "graph-processing-pending";
 
         static int s_LastFocusedEditor = -1;
@@ -92,6 +94,7 @@ public enum OpenMode
         protected BlankPage m_BlankPage;
         protected Label m_GraphProcessingPendingLabel;
         List<string> m_DisplayedOverlays;
+        protected ShortcutBlocker_Internal m_ShortcutBlocker;
 
         AutomaticGraphProcessingObserver m_AutomaticGraphProcessingObserver;
         GraphProcessingStatusObserver_Internal m_GraphProcessingStatusObserver;
@@ -126,7 +129,7 @@ protected GraphViewEditorWindow()
 
         protected virtual BaseGraphTool CreateGraphTool()
         {
-            return CsoTool.Create<BaseGraphTool>(WindowID);
+            return BaseGraphTool.Create<BaseGraphTool>(WindowID);
         }
 
         protected virtual BlankPage CreateBlankPage()
@@ -294,6 +297,9 @@ protected virtual void OnEnable()
             }
 
             m_UnsavedChangesWindowIsEnabled = IsUnsavedChangesWindowEnabled();
+
+            m_ShortcutBlocker = new ShortcutBlocker_Internal();
+            m_ShortcutBlocker.Enable(baseRootVisualElement);
         }
 
         protected virtual void OnDisable()
@@ -314,6 +320,9 @@ protected virtual void OnDisable()
             m_GraphContainer = null;
             m_GraphView = null;
             m_BlankPage = null;
+
+            m_ShortcutBlocker.Disable();
+            m_ShortcutBlocker = null;
         }
 
         protected virtual void OnFocus()
@@ -493,46 +502,6 @@ protected virtual void UpdateOverlays()
             }
         }
 
-        public void SetCurrentSelection(GraphAsset graphAsset, OpenMode mode, GameObject boundObject = null)
-        {
-            var windows = (GraphViewEditorWindow[])Resources.FindObjectsOfTypeAll(typeof(GraphViewEditorWindow));
-
-            // Only the last focused editor should try to answer a change to the current selection.
-            if (s_LastFocusedEditor != GetInstanceID() && windows.Length > 1)
-                return;
-
-            var currentOpenedGraph = GraphTool?.ToolState.CurrentGraph ?? default;
-            // don't load if same graph and same bound object
-            if (GraphTool?.ToolState.GraphModel != null &&
-                graphAsset == currentOpenedGraph.GetGraphAsset() &&
-                currentOpenedGraph.BoundObject == boundObject)
-                return;
-
-            // If there is no graph asset, unload the current one.
-            if (graphAsset.GraphModel == null)
-            {
-                return;
-            }
-
-            // Load this graph asset.
-            GraphTool?.Dispatch(new LoadGraphCommand(graphAsset.GraphModel, boundObject));
-
-            UpdateWindowTitle_Internal();
-
-            if (mode != OpenMode.OpenAndFocus)
-                return;
-
-            // Check if an existing window already has this asset, if yes give it the focus.
-            foreach (var window in windows)
-            {
-                if (window.GraphTool.ToolState.GraphModel == graphAsset.GraphModel)
-                {
-                    window.Focus();
-                    return;
-                }
-            }
-        }
-
         /// <summary>
         /// Indicates if the graphview window can handle the given <paramref name="asset"/>.
         /// </summary>
diff --git a/Modules/GraphViewEditor/Elements/Scope.cs b/Modules/GraphViewEditor/Elements/Scope.cs
index d62327c8fc..5ac2751921 100644
--- a/Modules/GraphViewEditor/Elements/Scope.cs
+++ b/Modules/GraphViewEditor/Elements/Scope.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UIElements;
-using UnityEngine.Yoga;
+using UnityEngine.UIElements.Layout;
 
 namespace UnityEditor.Experimental.GraphView
 {
@@ -234,13 +234,13 @@ protected void ScheduleUpdateGeometryFromContent()
             schedule.Execute(t => UpdateGeometryFromContent());
         }
 
-        void MarkYogaNodeSeen(YogaNode node)
+        void MarkLayoutNodeSeen(LayoutNode node)
         {
             node.MarkLayoutSeen();
 
             for (int i = 0; i < node.Count; i++)
             {
-                MarkYogaNodeSeen(node[i]);
+                MarkLayoutNodeSeen(node[i]);
             }
         }
 
@@ -292,12 +292,12 @@ public void UpdateGeometryFromContent()
             try
             {
                 // Dirty the layout of the content container to recompute the content bounding rect
-                m_ContentContainer.yogaNode.MarkDirty();
+                m_ContentContainer.layoutNode.MarkDirty();
 
                 // Force the layout to be computed right away
-                this.yogaNode.CalculateLayout();
+                this.layoutNode.CalculateLayout();
 
-                MarkYogaNodeSeen(yogaNode);
+                MarkLayoutNodeSeen(layoutNode);
 
                 // Need to mark actual children as dirty repaint so they properly move with the changes in size/position of the scope.
                 // The number of actual children should be low given the Scope (and Group) nodes do not parent their child nodes.
diff --git a/Modules/GridAndSnap/LinkedVector3Field.cs b/Modules/GridAndSnap/LinkedVector3Field.cs
index a9e2db7231..a02aff5ee5 100644
--- a/Modules/GridAndSnap/LinkedVector3Field.cs
+++ b/Modules/GridAndSnap/LinkedVector3Field.cs
@@ -15,6 +15,7 @@ class LinkedVector3Field : Vector3Field
 
         bool m_Linked;
         readonly VisualElement m_LinkedToggle;
+        readonly FloatField m_XField;
         readonly FloatField m_YField;
         readonly FloatField m_ZField;
 
@@ -49,7 +50,7 @@ public LinkedVector3Field(string label) : base(label)
                 ? "StyleSheets/SceneViewToolbarElements/LinkedVector3FieldDark.uss"
                 : "StyleSheets/SceneViewToolbarElements/LinkedVector3FieldLight.uss"));
 
-            var xField = this.Q<FloatField>("unity-x-input");
+            m_XField = this.Q<FloatField>("unity-x-input");
             m_YField = this.Q<FloatField>("unity-y-input");
             m_ZField = this.Q<FloatField>("unity-z-input");
 
@@ -60,6 +61,17 @@ public LinkedVector3Field(string label) : base(label)
             UpdateLinkedState();
         }
 
+        public bool isDelayed
+        {
+            get => m_XField.isDelayed;
+            set
+            {
+                m_XField.isDelayed = value;
+                m_YField.isDelayed = value;
+                m_ZField.isDelayed = value;
+            }
+        }
+
         void UpdateLinkedState()
         {
             if (linked)
diff --git a/Modules/GridAndSnap/SnapSettingsWindow.cs b/Modules/GridAndSnap/SnapSettingsWindow.cs
index 6c5a3d0aca..24306383a8 100644
--- a/Modules/GridAndSnap/SnapSettingsWindow.cs
+++ b/Modules/GridAndSnap/SnapSettingsWindow.cs
@@ -51,7 +51,7 @@ protected override void OnEnable()
 
             rootVisualElement.Add(new SnapSettingsHeader(L10n.Tr("Grid Snapping"), ResetValues));
 
-            m_GridSize = new LinkedVector3Field(L10n.Tr("Grid Size")) { name = "GridSize" };
+            m_GridSize = new LinkedVector3Field(L10n.Tr("Grid Size")) { name = "GridSize", isDelayed = true};
             m_GridSize.value = GridSettings.size;
             m_GridSize.linked = Mathf.Approximately(m_GridSize.value.x, m_GridSize.value.y) && Mathf.Approximately(m_GridSize.value.x, m_GridSize.value.z);
             GridSettings.sizeChanged += (value) => m_GridSize.SetValueWithoutNotify(value);
diff --git a/Modules/IMGUI/AssemblyInfo.cs b/Modules/IMGUI/AssemblyInfo.cs
index ef119be4c0..ec85f01bbf 100644
--- a/Modules/IMGUI/AssemblyInfo.cs
+++ b/Modules/IMGUI/AssemblyInfo.cs
@@ -10,3 +10,5 @@
 [assembly: InternalsVisibleTo("Unity.UIElements.Editor")]
 [assembly: InternalsVisibleTo("Unity.UIElements.EditorTests")]
 [assembly: InternalsVisibleTo("Unity.UIElements.Tests")]
+[assembly: InternalsVisibleTo("UnityEngine.UI.Tests")]
+[assembly: InternalsVisibleTo("Unity.Motion.Editor.AnimationWindow")]
diff --git a/Modules/IMGUI/DrawStates.cs b/Modules/IMGUI/DrawStates.cs
index 4dc821949a..a7f613b41d 100644
--- a/Modules/IMGUI/DrawStates.cs
+++ b/Modules/IMGUI/DrawStates.cs
@@ -22,19 +22,19 @@ public DrawStates(int controlId, bool isHover, bool isActive, bool on, bool hasK
 
             hasTextInput = false;
             drawSelectionAsComposition = false;
-            cursorFirst = cursorLast = -1;
+            cursorFirstPosition = cursorLastPosition = Vector2.zero;
             selectionColor = cursorColor = Color.red;
         }
 
         public DrawStates(int controlId, bool isHover, bool isActive, bool on, bool hasKeyboardFocus,
-                          bool drawSelectionAsComposition, int cursorFirst, int cursorLast,
+                          bool drawSelectionAsComposition, Vector2 cursorFirstPosition, Vector2 cursorLastPosition,
                           Color cursorColor, Color selectionColor)
             : this(controlId, isHover, isActive, on, hasKeyboardFocus)
         {
             hasTextInput = true;
             this.drawSelectionAsComposition = drawSelectionAsComposition;
-            this.cursorFirst = cursorFirst;
-            this.cursorLast = cursorLast;
+            this.cursorFirstPosition = cursorFirstPosition;
+            this.cursorLastPosition = cursorLastPosition;
             this.cursorColor = cursorColor;
             this.selectionColor = selectionColor;
         }
@@ -47,8 +47,8 @@ public DrawStates(int controlId, bool isHover, bool isActive, bool on, bool hasK
 
         public readonly bool hasTextInput;
         public readonly bool drawSelectionAsComposition;
-        public readonly int cursorFirst;
-        public readonly int cursorLast;
+        public readonly Vector2 cursorFirstPosition;
+        public readonly Vector2 cursorLastPosition;
         public readonly Color cursorColor;
         public readonly Color selectionColor;
     }
diff --git a/Modules/IMGUI/EventCommandNames.cs b/Modules/IMGUI/EventCommandNames.cs
index 0dc65449aa..633c83d779 100644
--- a/Modules/IMGUI/EventCommandNames.cs
+++ b/Modules/IMGUI/EventCommandNames.cs
@@ -10,7 +10,8 @@ namespace UnityEngine
 {
     internal static class EventCommandNames
     {
-        //Some of these strings are also hardcoded on the native side. Change them at your own risk!
+        // Some of these strings are also hardcoded on the native side. Change them at your own risk!
+        // For end users, please document relevant commands in UIE-Command-Events.md.
         public const string Cut = "Cut";
         public const string Copy = "Copy";
         public const string Paste = "Paste";
@@ -28,11 +29,11 @@ internal static class EventCommandNames
         public const string UndoRedoPerformed = "UndoRedoPerformed";
         public const string OnLostFocus = "OnLostFocus";
 
-        //Used by IMGUIContainer to force editing textfield when focus is changed with tab
+        // Used by IMGUIContainer to force editing textfield when focus is changed with tab
         public const string NewKeyboardFocus = "NewKeyboardFocus";
         public const string ModifierKeysChanged = "ModifierKeysChanged";
 
-        //Used by ColorPicker
+        // Used by ColorPicker
         public const string EyeDropperUpdate = "EyeDropperUpdate";
         public const string EyeDropperClicked = "EyeDropperClicked";
         public const string EyeDropperCancelled = "EyeDropperCancelled";
@@ -41,13 +42,5 @@ internal static class EventCommandNames
 
         public const string FrameSelected = "FrameSelected";
         public const string FrameSelectedWithLock = "FrameSelectedWithLock";
-
-
-        /*
-                 public const string  = "";
-                 public const string  = "";
-                 public const string  = "";
-                 public const string  = "";
-*/
     }
 }
diff --git a/Modules/IMGUI/GUI.cs b/Modules/IMGUI/GUI.cs
index 416cf7f22a..0643213521 100644
--- a/Modules/IMGUI/GUI.cs
+++ b/Modules/IMGUI/GUI.cs
@@ -603,15 +603,11 @@ internal static void DoTextField(Rect position, int id, GUIContent content, bool
             editor.SaveBackup();
             editor.position = position;
             editor.style = style;
-            editor.multiline = multiline;
+            editor.isMultiline = multiline;
             editor.controlID = id;
             editor.DetectFocusChange();
 
-            if (TouchScreenKeyboard.isRequiredToForceOpen)
-            {
-                HandleTextFieldEventForDesktopWithForcedKeyboard(position, id, content, multiline, maxLength, style, secureText, editor);
-            }
-            else if (TouchScreenKeyboard.isSupported && !TouchScreenKeyboard.isInPlaceEditingAllowed)
+            if (TouchScreenKeyboard.isSupported && !TouchScreenKeyboard.isInPlaceEditingAllowed)
             {
                 HandleTextFieldEventForTouchscreen(position, id, content, multiline, maxLength, style, secureText, maskChar, editor);
             }
@@ -789,6 +785,7 @@ private static void HandleTextFieldEventForDesktop(Rect position, int id, GUICon
                 case EventType.Repaint:
                     // If we have keyboard focus, draw the cursor
                     // TODO:    check if this OpenGL view has keyboard focus
+                    editor.UpdateTextHandle();
                     if (GUIUtility.keyboardControl != id)
                     {
                         style.Draw(position, content, id, false);
@@ -813,62 +810,6 @@ private static void HandleTextFieldEventForDesktop(Rect position, int id, GUICon
             }
         }
 
-        private static void HandleTextFieldEventForDesktopWithForcedKeyboard(Rect position, int id, GUIContent content, bool multiline, int maxLength, GUIStyle style, string secureText, TextEditor editor)
-        {
-            // On certain platforms, the TouchScreenKeyboard must always be "open" in order to receive text events. The keyboard.active state signals
-            // the platform to switch between "text input" and "key input" modes; unlike other platforms only one of these modes is active at a time.
-            // Therefore, TextField must open the keyboard when it has focus and deactivate it when it loses focus.
-
-            bool openKeyboard = false;
-
-            // Due to the asynchronous behavior of the platform's APIs (race conditions) we cannot guarantee the keyboard will land in the correct state
-            // simply by responding to mouse and keyboard events. Instead we must check the keyboard state matches the UI focus state every
-            // frame and make changes when necessary.
-            if (Event.current.type == EventType.Repaint)
-            {
-                // Disable keyboard for previously active text field, if any
-                if (s_HotTextField != -1 && s_HotTextField != id)
-                {
-                    TextEditor currentEditor = (TextEditor)GUIUtility.GetStateObject(typeof(TextEditor), s_HotTextField);
-                    currentEditor.keyboardOnScreen.active = false;
-                    currentEditor.keyboardOnScreen = null;
-                }
-
-                if (editor.keyboardOnScreen != null)
-                {
-                    if (GUIUtility.keyboardControl != id || !Application.isFocused)
-                    {
-                        // Text field isn't focused; reset keyboard reference
-                        editor.keyboardOnScreen.active = false;
-                        editor.keyboardOnScreen = null;
-                    }
-                    else if (!editor.keyboardOnScreen.active)
-                    {
-                        // UI is focused and keyboard is valid, but it's inactive for some reason; need to re-open it
-                        openKeyboard = true;
-                    }
-                }
-                else if (GUIUtility.keyboardControl == id && Application.isFocused)
-                {
-                    // Text field is focused but don't have a valid Keyboard; need to open it
-                    openKeyboard = true;
-                }
-            }
-
-            if (openKeyboard)
-            {
-                editor.keyboardOnScreen = TouchScreenKeyboard.Open(
-                            secureText ?? content.text,
-                            TouchScreenKeyboardType.Default,
-                            true,
-                            multiline,
-                            (secureText != null));
-            }
-
-            // Continue processing the event normally for Desktop
-            HandleTextFieldEventForDesktop(position, id, content, multiline, maxLength, style, editor);
-        }
-
         public static bool Toggle(Rect position, bool value, string text)
         {
             return Toggle(position, value, GUIContent.Temp(text), s_Skin.toggle);
@@ -951,12 +892,17 @@ public static int Toolbar(Rect position, int selected, GUIContent[] contents, GU
 
         internal static int Toolbar(Rect position, int selected, GUIContent[] contents, string[] controlNames, GUIStyle style, ToolbarButtonSize buttonSize, bool[] contentsEnabled = null)
         {
-            GUIUtility.CheckOnGUI();
-
             // Get the styles here
             GUIStyle firstStyle, midStyle, lastStyle;
             FindStyles(ref style, out firstStyle, out midStyle, out lastStyle, "left", "mid", "right");
 
+            return Toolbar(position, selected, contents, controlNames, style, firstStyle, midStyle, lastStyle, buttonSize, contentsEnabled);
+        }
+
+        internal static int Toolbar(Rect position, int selected, GUIContent[] contents, string[] controlNames, GUIStyle style, GUIStyle firstStyle, GUIStyle midStyle, GUIStyle lastStyle, ToolbarButtonSize buttonSize, bool[] contentsEnabled = null)
+        {
+            GUIUtility.CheckOnGUI();
+
             return DoButtonGrid(position, selected, contents, controlNames, contents.Length, style, firstStyle, midStyle, lastStyle, buttonSize, contentsEnabled);
         }
 
diff --git a/Modules/IMGUI/GUIContent.cs b/Modules/IMGUI/GUIContent.cs
index a2b8f2e5da..913f8875f3 100644
--- a/Modules/IMGUI/GUIContent.cs
+++ b/Modules/IMGUI/GUIContent.cs
@@ -23,6 +23,8 @@ public class GUIContent
         Texture m_Image;
         [SerializeField]
         string m_Tooltip = string.Empty;
+        [SerializeField]
+        string m_TextWithWhitespace = string.Empty;
 
         internal event Action OnTextChanged;
 
@@ -30,18 +32,41 @@ public class GUIContent
         private static readonly GUIContent s_Image     = new GUIContent();
         private static readonly GUIContent s_TextImage = new GUIContent();
 
+        internal static string k_ZeroWidthSpace = "\u200B";
+
         // The text contained.
         public string text
         {
             get { return m_Text; }
-            set {
-                if (value == m_Text)
+            set
+            {
+                if (m_Text == value)
                     return;
+
                 m_Text = value;
+                textWithWhitespace = value;
                 OnTextChanged?.Invoke();
             }
         }
 
+        internal string textWithWhitespace
+        {
+            get
+            {
+                return string.IsNullOrEmpty(m_TextWithWhitespace) ? k_ZeroWidthSpace : m_TextWithWhitespace;
+            }
+            set =>
+
+                //The NoWidthSpace unicode is added at the end of the string to make sure LineFeeds update the layout of the text.
+                m_TextWithWhitespace = value + k_ZeroWidthSpace;
+        }
+
+        internal void SetTextWithoutNotify(string value)
+        {
+            m_Text = value;
+            textWithWhitespace = value;
+        }
+
         // The icon image contained.
         public Texture image
         {
@@ -118,6 +143,7 @@ internal int hash
         internal static GUIContent Temp(string t)
         {
             s_Text.m_Text = t;
+            s_Text.textWithWhitespace = t;
             s_Text.m_Tooltip = string.Empty;
             return s_Text;
         }
@@ -125,6 +151,7 @@ internal static GUIContent Temp(string t)
         internal static GUIContent Temp(string t, string tooltip)
         {
             s_Text.m_Text = t;
+            s_Text.textWithWhitespace = t;
             s_Text.m_Tooltip = tooltip;
             return s_Text;
         }
@@ -146,6 +173,7 @@ internal static GUIContent Temp(Texture i, string tooltip)
         internal static GUIContent Temp(string t, Texture i)
         {
             s_TextImage.m_Text = t;
+            s_Text.textWithWhitespace = t;
             s_TextImage.m_Image = i;
             return s_TextImage;
         }
@@ -153,11 +181,14 @@ internal static GUIContent Temp(string t, Texture i)
         internal static void ClearStaticCache()
         {
             s_Text.m_Text = null;
+            s_Text.m_TextWithWhitespace = null;
             s_Text.m_Tooltip = string.Empty;
             s_Image.m_Image = null;
             s_Image.m_Tooltip = string.Empty;
+            s_Image.m_TextWithWhitespace = null;
             s_TextImage.m_Text = null;
             s_TextImage.m_Image = null;
+            s_TextImage.m_TextWithWhitespace = null;
         }
 
         internal static GUIContent[] Temp(string[] texts)
diff --git a/Modules/IMGUI/GUILayout.cs b/Modules/IMGUI/GUILayout.cs
index ddc009c618..064699e9d7 100644
--- a/Modules/IMGUI/GUILayout.cs
+++ b/Modules/IMGUI/GUILayout.cs
@@ -121,12 +121,18 @@ static bool DoToggle(bool value, GUIContent content, GUIStyle style, GUILayoutOp
         public static int Toolbar(int selected, GUIContent[] contents, GUIStyle style, params GUILayoutOption[] options) { return Toolbar(selected, contents, style, GUI.ToolbarButtonSize.Fixed, options); }
         public static int Toolbar(int selected, GUIContent[] contents, GUIStyle style, GUI.ToolbarButtonSize buttonSize, params GUILayoutOption[] options) { return Toolbar(selected, contents, null, style, buttonSize, options); }
         public static int Toolbar(int selected, GUIContent[] contents, bool[] enabled, GUIStyle style, params GUILayoutOption[] options) { return Toolbar(selected, contents, enabled, style, GUI.ToolbarButtonSize.Fixed, options); }
+        internal static int Toolbar(int selected, GUIContent[] contents, bool[] enabled, GUIStyle style, GUIStyle firstStyle, GUIStyle midStyle, GUIStyle lastStyle, params GUILayoutOption[] options) { return Toolbar(selected, contents, enabled, style, firstStyle, midStyle, lastStyle, GUI.ToolbarButtonSize.Fixed, options); }
 
         public static int Toolbar(int selected, GUIContent[] contents, bool[] enabled, GUIStyle style, GUI.ToolbarButtonSize buttonSize, params GUILayoutOption[] options)
         {
             GUIStyle firstStyle, midStyle, lastStyle;
             GUI.FindStyles(ref style, out firstStyle, out midStyle, out lastStyle, "left", "mid", "right");
 
+            return Toolbar(selected, contents, enabled, style, firstStyle, midStyle, lastStyle, buttonSize, options);
+        }
+
+        internal static int Toolbar(int selected, GUIContent[] contents, bool[] enabled, GUIStyle style, GUIStyle firstStyle, GUIStyle midStyle, GUIStyle lastStyle, GUI.ToolbarButtonSize buttonSize, params GUILayoutOption[] options)
+        {
             Vector2 size = new Vector2();
             int count = contents.Length;
             GUIStyle currentStyle = count > 1 ? firstStyle : style;
@@ -173,7 +179,7 @@ public static int Toolbar(int selected, GUIContent[] contents, bool[] enabled, G
                     break;
             }
 
-            return GUI.Toolbar(GUILayoutUtility.GetRect(size.x, size.y, style, options), selected, contents, null, style, buttonSize, enabled);
+            return GUI.Toolbar(GUILayoutUtility.GetRect(size.x, size.y, style, options), selected, contents, null, style, firstStyle, midStyle, lastStyle, buttonSize, enabled);
         }
 
         public static int SelectionGrid(int selected, string[] texts, int xCount, params GUILayoutOption[] options)                    { return SelectionGrid(selected, GUIContent.Temp(texts), xCount, GUI.skin.button, options); }
@@ -320,10 +326,9 @@ static public void BeginArea(Rect screenRect, GUIContent content, GUIStyle style
         static public void EndArea()
         {
             GUIUtility.CheckOnGUI();
+            GUILayoutUtility.EndLayoutArea();
             if (Event.current.type == EventType.Used)
                 return;
-            GUILayoutUtility.current.layoutGroups.Pop();
-            GUILayoutUtility.current.topLevel = (GUILayoutGroup)GUILayoutUtility.current.layoutGroups.Peek();
             GUI.EndGroup();
         }
 
diff --git a/Modules/IMGUI/GUILayoutUtility.cs b/Modules/IMGUI/GUILayoutUtility.cs
index d992a3f4ac..9008377169 100644
--- a/Modules/IMGUI/GUILayoutUtility.cs
+++ b/Modules/IMGUI/GUILayoutUtility.cs
@@ -367,6 +367,7 @@ internal static void EndLayoutGroup()
         // Generic helper - use this when creating a layout group. It will make sure everything is wired up correctly.
         internal static GUILayoutGroup BeginLayoutArea(GUIStyle style, Type layoutType)
         {
+            unbalancedgroupscount++;
             GUILayoutGroup g;
             switch (Event.current.type)
             {
@@ -389,6 +390,13 @@ internal static GUILayoutGroup BeginLayoutArea(GUIStyle style, Type layoutType)
             return g;
         }
 
+        internal static void EndLayoutArea()
+        {
+            unbalancedgroupscount--;
+            GUILayoutUtility.current.layoutGroups.Pop();
+            GUILayoutUtility.current.topLevel = (GUILayoutGroup)GUILayoutUtility.current.layoutGroups.Peek();
+        }
+
         // Trampoline for Editor stuff
         internal static GUILayoutGroup DoBeginLayoutArea(GUIStyle style, Type layoutType)
         {
diff --git a/Modules/IMGUI/GUIStyle.bindings.cs b/Modules/IMGUI/GUIStyle.bindings.cs
index 71d57a81ae..df326cfddc 100644
--- a/Modules/IMGUI/GUIStyle.bindings.cs
+++ b/Modules/IMGUI/GUIStyle.bindings.cs
@@ -3,8 +3,10 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Runtime.InteropServices;
 using UnityEngine.Bindings;
 using UnityEngine.Scripting;
+using UnityEngine.TextCore.Text;
 
 namespace UnityEngine
 {
@@ -60,9 +62,6 @@ partial class GUIStyle
         [FreeFunction(Name = "GUIStyle_Bindings::AssignRectOffset", HasExplicitThis = true)]
         private extern void AssignRectOffset(int idx, IntPtr srcRectOffset);
 
-        [FreeFunction(Name = "GUIStyle_Bindings::Internal_GetLineHeight")]
-        private static extern float Internal_GetLineHeight(IntPtr target);
-
         [FreeFunction(Name = "GUIStyle_Bindings::Internal_Draw", HasExplicitThis = true)]
         private extern void Internal_Draw(Rect screenRect, GUIContent content, bool isHover, bool isActive, bool on, bool hasKeyboardFocus);
 
@@ -70,29 +69,13 @@ partial class GUIStyle
         private extern void Internal_Draw2(Rect position, GUIContent content, int controlID, bool on);
 
         [FreeFunction(Name = "GUIStyle_Bindings::Internal_DrawCursor", HasExplicitThis = true)]
-        private extern void Internal_DrawCursor(Rect position, GUIContent content, int pos, Color cursorColor);
+        private extern void Internal_DrawCursor(Rect position, GUIContent content, Vector2 pos, Color cursorColor);
 
         [FreeFunction(Name = "GUIStyle_Bindings::Internal_DrawWithTextSelection", HasExplicitThis = true)]
         private extern void Internal_DrawWithTextSelection(Rect screenRect, GUIContent content, bool isHover, bool isActive,
-            bool on, bool hasKeyboardFocus, bool drawSelectionAsComposition, int cursorFirst, int cursorLast, Color cursorColor,
+            bool on, bool hasKeyboardFocus, bool drawSelectionAsComposition, Vector2 cursorFirstPosition, Vector2 cursorLastPosition, Color cursorColor,
             Color selectionColor);
 
-        [FreeFunction(Name = "GUIStyle_Bindings::Internal_GetCursorPixelPosition", HasExplicitThis = true)]
-        internal extern Vector2 Internal_GetCursorPixelPosition(Rect position, GUIContent content, int cursorStringIndex);
-
-        [FreeFunction(Name = "GUIStyle_Bindings::Internal_GetCursorStringIndex", HasExplicitThis = true)]
-        internal extern int Internal_GetCursorStringIndex(Rect position, GUIContent content, Vector2 cursorPixelPosition);
-
-        [FreeFunction(Name = "GUIStyle_Bindings::Internal_GetSelectedRenderedText", HasExplicitThis = true)]
-        internal extern string Internal_GetSelectedRenderedText(Rect localPosition, GUIContent mContent,
-            int selectIndex, int cursorIndex);
-
-        [FreeFunction(Name = "GUIStyle_Bindings::Internal_GetHyperlinksRect", HasExplicitThis = true)]
-        internal extern Rect[] Internal_GetHyperlinksRect(Rect localPosition, GUIContent mContent);
-
-        [FreeFunction(Name = "GUIStyle_Bindings::Internal_GetNumCharactersThatFitWithinWidth", HasExplicitThis = true)]
-        internal extern int Internal_GetNumCharactersThatFitWithinWidth(string text, float width);
-
         [FreeFunction(Name = "GUIStyle_Bindings::Internal_CalcSize", HasExplicitThis = true)]
         internal extern Vector2 Internal_CalcSize(GUIContent content);
 
@@ -107,15 +90,21 @@ internal extern string Internal_GetSelectedRenderedText(Rect localPosition, GUIC
 
         [FreeFunction(Name = "GUIStyle_Bindings::Internal_DrawPrefixLabel", HasExplicitThis = true)]
         private extern void Internal_DrawPrefixLabel(Rect position, GUIContent content, int controlID, bool on);
-
         [FreeFunction(Name = "GUIStyle_Bindings::Internal_DrawContent", HasExplicitThis = true)]
         internal extern void Internal_DrawContent(Rect screenRect, GUIContent content, bool isHover, bool isActive, bool on, bool hasKeyboardFocus,
-            bool hasTextInput, bool drawSelectionAsComposition, int cursorFirst, int cursorLast, Color cursorColor, Color selectionColor,
+            bool hasTextInput, bool drawSelectionAsComposition, Vector2 cursorFirst, Vector2 cursorLast, Color cursorColor, Color selectionColor,
             Color imageColor, float textOffsetX, float textOffsetY, float imageTopOffset, float imageLeftOffset, bool overflowX, bool overflowY);
 
+        [FreeFunction(Name = "GUIStyle_Bindings::Internal_GetTextRectOffset", HasExplicitThis = true)]
+        internal extern Vector2 Internal_GetTextRectOffset(Rect screenRect, GUIContent content, Vector2 textSize);
         [FreeFunction(Name = "GUIStyle_Bindings::SetMouseTooltip")] internal static extern void SetMouseTooltip(string tooltip, Rect screenRect);
         [FreeFunction(Name = "GUIStyle_Bindings::IsTooltipActive")] internal static extern bool IsTooltipActive(string tooltip);
         [FreeFunction(Name = "GUIStyle_Bindings::Internal_GetCursorFlashOffset")] private static extern float Internal_GetCursorFlashOffset();
         [FreeFunction(Name = "GUIStyle::SetDefaultFont")] internal static extern void SetDefaultFont(Font font);
+
+        [FreeFunction(Name = "GUIStyle_Bindings::Internal_DestroyTextGenerator")]
+        internal static extern void Internal_DestroyTextGenerator(int meshInfoId);
+        [FreeFunction(Name = "GUIStyle_Bindings::Internal_CleanupAllTextGenerator")]
+        internal static extern void Internal_CleanupAllTextGenerator();
     }
 }
diff --git a/Modules/IMGUI/GUIStyle.cs b/Modules/IMGUI/GUIStyle.cs
index 97ac13b1b9..3a623affdf 100644
--- a/Modules/IMGUI/GUIStyle.cs
+++ b/Modules/IMGUI/GUIStyle.cs
@@ -3,7 +3,10 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using UnityEngine.Scripting;
+using UnityEngine.TextCore.Text;
 
 namespace UnityEngine
 {
@@ -235,7 +238,7 @@ public RectOffset overflow
         }
 
         // The height of one line of text with this style, measured in pixels.
-        public float lineHeight => Mathf.Round(Internal_GetLineHeight(m_Ptr));
+        public float lineHeight => Mathf.Round(IMGUITextHandle.GetLineHeight(this));
 
         // Draw plain GUIStyle without text nor image.
         public void Draw(Rect position, bool isHover, bool isActive, bool on, bool hasKeyboardFocus)
@@ -308,7 +311,7 @@ internal void DrawPrefixLabel(Rect position, GUIContent content, int controlID)
                 var drawStates = new DrawStates(controlID, position.Contains(Event.current.mousePosition), false, false,
                     GUIUtility.HasKeyFocus(controlID));
                 if (onDraw == null || !onDraw(this, position, content, drawStates))
-                Internal_DrawPrefixLabel(position, content, controlID, false);
+                    Internal_DrawPrefixLabel(position, content, controlID, false);
             }
             else
                 Debug.LogError("Style.DrawPrefixLabel may not be called with GUIContent that is null.");
@@ -331,7 +334,7 @@ public void DrawCursor(Rect position, GUIContent content, int controlID, int cha
                 if (cursorFlashSpeed == 0 || cursorFlashRel < .5f)
                     cursorColor = GUI.skin.settings.cursorColor;
 
-                Internal_DrawCursor(position, content, character, cursorColor);
+                Internal_DrawCursor(position, content, GetCursorPixelPosition(position, content, character), cursorColor);
             }
         }
 
@@ -344,6 +347,21 @@ internal void DrawWithTextSelection(Rect position, GUIContent content, bool isAc
                 return;
             }
 
+            if (firstSelectedCharacter > lastSelectedCharacter)
+            {
+                var temp = lastSelectedCharacter;
+                lastSelectedCharacter = firstSelectedCharacter;
+                firstSelectedCharacter = temp;
+            }
+
+            Vector2 firstSelectedCharacterPosition = GetCursorPixelPosition(position, content, firstSelectedCharacter);
+            Vector2 lastSelectedCharacterPosition = GetCursorPixelPosition(position, content, lastSelectedCharacter);
+
+            // This offset is only required for IMGUI, so the change from TextNative->TextCore doesn't change the rendering
+            var imguiOffset = new Vector2(string.IsNullOrEmpty(content.text) ? 0f : 1f, 0f);
+            firstSelectedCharacterPosition -= imguiOffset;
+            lastSelectedCharacterPosition -= imguiOffset;
+
             // Figure out the cursor color...
             Color cursorColor = new Color(0, 0, 0, 0);
             float cursorFlashSpeed = GUI.skin.settings.cursorFlashSpeed;
@@ -353,11 +371,11 @@ internal void DrawWithTextSelection(Rect position, GUIContent content, bool isAc
 
             bool hovered = position.Contains(Event.current.mousePosition);
             var drawStates = new DrawStates(-1, hovered, isActive, false, hasKeyboardFocus,
-                drawSelectionAsComposition, firstSelectedCharacter, lastSelectedCharacter, cursorColor, selectionColor);
+                drawSelectionAsComposition, firstSelectedCharacterPosition, lastSelectedCharacterPosition, cursorColor, selectionColor);
             if (onDraw == null || !onDraw(this, position, content, drawStates))
             {
                 Internal_DrawWithTextSelection(position, content, hovered, isActive, false, hasKeyboardFocus,
-                    drawSelectionAsComposition, firstSelectedCharacter, lastSelectedCharacter, cursorColor, selectionColor);
+                    drawSelectionAsComposition, firstSelectedCharacterPosition, lastSelectedCharacterPosition, cursorColor, selectionColor);
             }
         }
 
@@ -393,19 +411,29 @@ public static implicit operator GUIStyle(string str)
         // Get the pixel position of a given string index.
         public Vector2 GetCursorPixelPosition(Rect position, GUIContent content, int cursorStringIndex)
         {
-            return Internal_GetCursorPixelPosition(position, content, cursorStringIndex);
+            var handle = IMGUITextHandle.GetTextHandle(this, padding.Remove(position), content.textWithWhitespace, Color.white);
+            var cursorPos = handle.GetCursorPositionFromStringIndexUsingLineHeight(cursorStringIndex);
+            cursorPos = new Vector2(Mathf.Max(0.0f, cursorPos.x), cursorPos.y);
+            var rectOffset = Internal_GetTextRectOffset(position, content, new Vector2(handle.preferredSize.x, handle.preferredSize.y > 0 ? handle.preferredSize.y : lineHeight));
+            return cursorPos + rectOffset - contentOffset - new Vector2(0, lineHeight);
+        }
+
+        internal Rect[] GetHyperlinkRects(IMGUITextHandle handle, Rect content)
+        {
+            content = padding.Remove(content);
+            return handle.GetHyperlinkRects(content);
         }
 
         // Get the cursor position (indexing into contents.text) when the user clicked at cursorPixelPosition
         public int GetCursorStringIndex(Rect position, GUIContent content, Vector2 cursorPixelPosition)
         {
-            return Internal_GetCursorStringIndex(position, content, cursorPixelPosition);
+            return IMGUITextHandle.GetTextHandle(this, position, content.textWithWhitespace, Color.white).GetCursorIndexFromPosition(cursorPixelPosition);
         }
 
         // Returns number of characters that can fit within width, returns -1 if fails due to missing font
         internal int GetNumCharactersThatFitWithinWidth(string text, float width)
         {
-            return Internal_GetNumCharactersThatFitWithinWidth(text, width);
+            return IMGUITextHandle.GetTextHandle(this, new Rect(0, 0, width, 1), text, Color.white).GetNumCharactersThatFitWithinWidth(width);
         }
 
         // Calculate the size of a some content if it is rendered with this style.
@@ -417,7 +445,12 @@ public Vector2 CalcSize(GUIContent content)
         // Calculate the size of a some content if it is rendered with this style.
         internal Vector2 CalcSizeWithConstraints(GUIContent content, Vector2 constraints)
         {
-            return Internal_CalcSizeWithConstraints(content, constraints);
+            var size = Internal_CalcSizeWithConstraints(content, constraints);
+            if (constraints.x > 0)
+                size.x = Mathf.Min(size.x, constraints.x);
+            if (constraints.y > 0)
+                size.y = Mathf.Min(size.y, constraints.y);
+            return size;
         }
 
         // Calculate the size of an element formatted with this style, and a given space to content.
@@ -432,7 +465,13 @@ public Vector2 CalcScreenSize(Vector2 contentSize)
         // How tall this element will be when rendered with /content/ and a specific /width/.
         public float CalcHeight(GUIContent content, float width)
         {
-            return Internal_CalcHeight(content, width);
+            var height = Internal_CalcHeight(content, width);
+            return height;
+        }
+
+        internal Vector2 GetPreferredSize(string content, Rect rect)
+        {
+            return IMGUITextHandle.GetTextHandle(this, padding.Remove(rect), content, Color.white).GetPreferredSize();
         }
 
         public bool isHeightDependantOnWidth => fixedHeight == 0 && (wordWrap && imagePosition != ImagePosition.ImageOnly);
@@ -449,6 +488,46 @@ public override string ToString()
         {
             return UnityString.Format("GUIStyle '{0}'", name);
         }
+
+        [RequiredByNativeCode]
+        internal static void GetMeshInfo(GUIStyle style, Color color, string content, Rect rect, ref MeshInfoBindings[] meshInfos, ref Vector2 dimensions, ref int generationId)
+        {
+            bool isCached = false;
+            var textHandle = IMGUITextHandle.GetTextHandle(style, rect, content, color, ref isCached);
+            generationId = TextHandle.s_Settings.GetHashCode();
+            // If not already cached on the native side, we must send the meshInfo
+            if (!isCached)
+            {
+                var textInfo = textHandle.textInfo;
+                meshInfos = new MeshInfoBindings[textInfo.materialCount];
+                for (int i = 0; i < textInfo.materialCount; i++)
+                {
+                    meshInfos[i].vertexData = new TextCoreVertex[textInfo.meshInfo[i].vertexCount];
+                    meshInfos[i].vertexCount = textInfo.meshInfo[i].vertexCount;
+                    meshInfos[i].material = textInfo.meshInfo[i].material;
+                    Array.Copy(textInfo.meshInfo[i].vertexData, meshInfos[i].vertexData, textInfo.meshInfo[i].vertexCount);
+                }
+            }
+            dimensions = textHandle.preferredSize;
+        }
+
+        [RequiredByNativeCode]
+        internal static void GetDimensions(GUIStyle style, Color color, string content, Rect rect, ref Vector2 dimensions)
+        {
+            dimensions = style.GetPreferredSize(content, rect);
+        }
+
+        [RequiredByNativeCode]
+        internal static void GetLineHeight(GUIStyle style, ref float lineHeight)
+        {
+            lineHeight = style.lineHeight;
+        }
+
+        [RequiredByNativeCode]
+        internal static void EmptyManagedCache()
+        {
+            IMGUITextHandle.EmptyManagedCache();
+        }
     }
 
 
@@ -459,8 +538,7 @@ public enum TextClipping
         Overflow = 0,
         // Text gets clipped to be inside the element.
         Clip = 1,
-
         // Text gets truncated with dots to show it is too long
-        //  Truncate = 2
+        Ellipsis = 2,
     }
 }
diff --git a/Modules/IMGUI/GUIUtility.cs b/Modules/IMGUI/GUIUtility.cs
index 32063badb0..991371c92a 100644
--- a/Modules/IMGUI/GUIUtility.cs
+++ b/Modules/IMGUI/GUIUtility.cs
@@ -2,18 +2,19 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System;
-using System.Reflection;
-using UnityEngine.Scripting;
 // Use this define to debug who grabs and releases hotcontrol
 //#define DEBUG_HOTCONTROL
-
 // Use this define to debug controlID consistency together with 's_LogControlID' (default false) to enable logging in
 // a codepath thats needs tested for consistency. E.g:
 //  if (Event.current.rawType == EventType.MouseUp)
 //      GUIUtility.s_LogControlID = true;
 // And remember to set s_LogControlID to false at end of section of interest.
 //#define DEBUG_CONTROLID
+using System;
+using System.Reflection;
+using UnityEngine.Scripting;
+
+
 
 namespace UnityEngine
 {
@@ -159,12 +160,13 @@ internal static void ProcessEvent(int instanceID, IntPtr nativeEventPtr, out boo
             result = false;
             if (processEvent != null)
             {
-                object[] parameters = { instanceID, nativeEventPtr};
                 // call manually so that the result is true if any of the invocation return true.
                 // Otherwise only the return from the last invocation is used.
                 foreach( var invocation in processEvent.GetInvocationList())
                 {
-                    result = invocation.DynamicInvoke(parameters) is bool b && b || result;
+                    if (invocation is not Func<int, IntPtr, bool> typed)
+                        continue;
+                    result |= typed.Invoke(instanceID, nativeEventPtr);
                 }
             }
         }
diff --git a/Modules/IMGUI/IMGUITextHandle.cs b/Modules/IMGUI/IMGUITextHandle.cs
new file mode 100644
index 0000000000..975e58acb9
--- /dev/null
+++ b/Modules/IMGUI/IMGUITextHandle.cs
@@ -0,0 +1,275 @@
+// 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.TextCore.Text;
+
+namespace UnityEngine
+{
+    internal class IMGUITextHandle : TextHandle
+    {
+        internal LinkedListNode<TextHandleTuple> tuple;
+
+        const float sFallbackFontSize = 13;
+        const float sTimeToFlush = 1.0f;
+        const string kDefaultFontName = "LegacyRuntime.ttf";
+
+        internal static Func<Object> GetEditorTextSettings;
+        private static TextSettings s_EditorTextSettings;
+
+        private static Dictionary<int, IMGUITextHandle> textHandles = new Dictionary<int, IMGUITextHandle>();
+        private static LinkedList<TextHandleTuple> textHandlesTuple = new LinkedList<TextHandleTuple>();
+        private static float lastCleanupTime;
+
+        internal bool isCachedOnNative = false;
+
+        internal class TextHandleTuple
+        {
+            public TextHandleTuple(float lastTimeUsed, int hashCode)
+            {
+                this.hashCode = hashCode;
+                this.lastTimeUsed = lastTimeUsed;
+            }
+
+            public float lastTimeUsed;
+            public int hashCode;
+        }
+
+        // This cleans both the managed and the native cache
+        internal static void EmptyCache()
+        {
+            GUIStyle.Internal_CleanupAllTextGenerator();
+            textHandles.Clear();
+            textHandlesTuple.Clear();
+        }
+
+        // This only cleans up the cache on the managed side. We assume it is already cleaned on the native side to avoid calls.
+        internal static void EmptyManagedCache()
+        {
+            textHandles.Clear();
+            textHandlesTuple.Clear();
+        }
+
+        internal static IMGUITextHandle GetTextHandle(GUIStyle style, Rect position, string content, Color32 textColor)
+        {
+            bool isCached = false;
+            ConvertGUIStyleToGenerationSettings(s_Settings, style, textColor, content, position);
+            return GetTextHandle(s_Settings, false, ref isCached);
+        }
+
+        internal static IMGUITextHandle GetTextHandle(GUIStyle style, Rect position, string content, Color32 textColor, ref bool isCached)
+        {
+            ConvertGUIStyleToGenerationSettings(s_Settings, style, textColor, content, position);
+            return GetTextHandle(s_Settings, true, ref isCached);
+        }
+
+        private static void ClearUnusedTextHandles()
+        {
+            var currentTime = Time.realtimeSinceStartup;
+            while (textHandlesTuple.Count > 0)
+            {
+                var tuple = textHandlesTuple.First();
+                if (currentTime - tuple.lastTimeUsed > sTimeToFlush)
+                {
+                    GUIStyle.Internal_DestroyTextGenerator(tuple.hashCode);
+                    textHandles.Remove(tuple.hashCode);
+                    textHandlesTuple.RemoveFirst();
+                }
+                else
+                    break;
+            }
+        }
+
+        private static IMGUITextHandle GetTextHandle(TextCore.Text.TextGenerationSettings settings, bool isCalledFromNative, ref bool isCached)
+        {
+            isCached = false;
+            var currentTime = Time.realtimeSinceStartup;
+            if (currentTime - lastCleanupTime > sTimeToFlush)
+            {
+                ClearUnusedTextHandles();
+                lastCleanupTime = currentTime;
+            }
+
+            int hash = settings.GetHashCode();
+
+            if (textHandles.TryGetValue(hash, out IMGUITextHandle textHandleCached))
+            {
+                textHandlesTuple.Remove(textHandleCached.tuple);
+                textHandlesTuple.AddLast(textHandleCached.tuple);
+
+                isCached = isCalledFromNative ? textHandleCached.isCachedOnNative : true;
+                if (!textHandleCached.isCachedOnNative && isCalledFromNative)
+                {
+                    textHandleCached.Update(settings);
+                    textHandleCached.UpdatePreferredSize(settings);
+                    textHandleCached.isCachedOnNative = true;
+                }
+                return textHandleCached;
+            }
+
+            var handle = new IMGUITextHandle();
+            var tuple = new TextHandleTuple(currentTime, hash);
+            var listNode = new LinkedListNode<TextHandleTuple>(tuple);
+            handle.tuple = listNode;
+            textHandles[hash] = handle;
+            handle.Update(settings);
+            handle.UpdatePreferredSize(settings);
+            textHandlesTuple.AddLast(listNode);
+            handle.isCachedOnNative = isCalledFromNative;
+            return handle;
+        }
+
+        internal static float GetLineHeight(GUIStyle style)
+        {
+            ConvertGUIStyleToGenerationSettings(s_Settings, style, Color.white, "", Rect.zero);
+            return GetLineHeightDefault(s_Settings);
+        }
+
+        internal Vector2 GetPreferredSize()
+        {
+            return preferredSize;
+        }
+
+        internal int GetNumCharactersThatFitWithinWidth(float width)
+        {
+            AddTextInfoToCache();
+            int characterCount = textInfo.lineInfo[0].characterCount;
+            int charCount;
+            float currentSize = 0;
+
+            for (charCount = 0; charCount < characterCount; charCount++)
+            {
+                currentSize += textInfo.textElementInfo[charCount].xAdvance - textInfo.textElementInfo[charCount].origin;
+                if (currentSize > width)
+                {
+                    break;
+                }
+            }
+
+            return charCount;
+        }
+
+        public Rect[] GetHyperlinkRects(Rect content)
+        {
+            AddTextInfoToCache();
+
+            List<Rect> rects = new List<Rect>();
+
+            for (int i = 0; i < textInfo.linkCount; i++)
+            {
+                var minPos = GetCursorPositionFromStringIndexUsingLineHeight(textInfo.linkInfo[i].linkTextfirstCharacterIndex) + new Vector2(content.x, content.y);
+                var maxPos = GetCursorPositionFromStringIndexUsingLineHeight(textInfo.linkInfo[i].linkTextLength + textInfo.linkInfo[i].linkTextfirstCharacterIndex) + new Vector2(content.x, content.y);
+                var lineHeight = textInfo.lineInfo[0].lineHeight;
+
+                if (minPos.y == maxPos.y)
+                {
+                    rects.Add(new Rect(minPos.x, minPos.y - lineHeight, maxPos.x - minPos.x, lineHeight));
+                }
+                else
+                {
+                    // Rect for the first line - including end part
+                    rects.Add(new Rect(minPos.x, minPos.y - lineHeight, textInfo.lineInfo[0].width - minPos.x, lineHeight));
+                    // Rect for the middle part
+                    rects.Add(new Rect(content.x, minPos.y, textInfo.lineInfo[0].width, maxPos.y - minPos.y - lineHeight));
+                    // Rect for the bottom line - up to selection
+                    if (maxPos.x != 0f)
+                        rects.Add(new Rect(content.x, maxPos.y - lineHeight, maxPos.x, lineHeight));
+                }
+            }
+            return rects.ToArray();
+        }
+
+        private static void ConvertGUIStyleToGenerationSettings(UnityEngine.TextCore.Text.TextGenerationSettings settings, GUIStyle style, Color textColor, string text, Rect rect)
+        {
+            if (s_EditorTextSettings == null)
+            {
+                s_EditorTextSettings = (TextSettings)GetEditorTextSettings();
+            }
+            settings.textSettings = s_EditorTextSettings;
+
+            if (settings.textSettings == null)
+                return;
+
+            Font font = style.font;
+
+            if (!font)
+            {
+                font = settings.textSettings.GetEditorFont();
+            }
+
+            settings.fontAsset = settings.textSettings.GetCachedFontAsset(font, TextShaderUtilities.ShaderRef_MobileSDF_IMGUI);
+            if (settings.fontAsset == null)
+                return;
+         
+            settings.material = settings.fontAsset.material;
+            
+            // We only want to update the sharpness of the text in the editor with those preferences
+            settings.fontAsset.material.SetFloat("_Sharpness", settings.textSettings.GetEditorTextSharpness());
+
+            settings.screenRect = new Rect(0, 0, rect.width, rect.height);
+            settings.text = text;
+            TextAnchor anchor = style.alignment;
+            if (style.imagePosition == ImagePosition.ImageAbove)
+            {
+                switch (style.alignment)
+                {
+                    case TextAnchor.MiddleRight:
+                    case TextAnchor.LowerRight:
+                        anchor = TextAnchor.UpperRight;
+                        break;
+                    case TextAnchor.MiddleCenter:
+                    case TextAnchor.LowerCenter:
+                        anchor = TextAnchor.UpperCenter;
+                        break;
+                    case TextAnchor.MiddleLeft:
+                    case TextAnchor.LowerLeft:
+                        anchor = TextAnchor.UpperLeft;
+                        break;
+                }
+            }
+            settings.fontStyle = TextGeneratorUtilities.LegacyStyleToNewStyle(style.fontStyle);
+            settings.textAlignment = TextGeneratorUtilities.LegacyAlignmentToNewAlignment(anchor);
+            settings.overflowMode = LegacyClippingToNewOverflow(style.clipping);
+            settings.wordWrap = rect.width > 0 ? style.wordWrap : false;
+            settings.wordWrappingRatio = 0.4f;
+            settings.richText = style.richText;
+            settings.parseControlCharacters = false;
+            settings.isPlaceholder = false;
+            settings.isRightToLeft = false;
+
+
+            if (style.fontSize > 0)
+                settings.fontSize = style.fontSize;
+            else if (style.font)
+                settings.fontSize = style.font.fontSize;
+            else
+                settings.fontSize = sFallbackFontSize;
+
+            settings.characterSpacing = 0;
+            settings.wordSpacing = 0;
+            settings.paragraphSpacing = 0;
+            settings.color = textColor;
+
+            settings.inverseYAxis = true;
+            settings.isIMGUI = true;
+            settings.shouldConvertToLinearSpace = false;
+        }
+
+        static TextOverflowMode LegacyClippingToNewOverflow(TextClipping clipping)
+        {
+            switch (clipping)
+            {
+                case TextClipping.Clip:
+                    return TextOverflowMode.Masking;
+                case TextClipping.Ellipsis:
+                    return TextOverflowMode.Ellipsis;
+                case TextClipping.Overflow:
+                default:
+                    return TextOverflowMode.Overflow;
+            }
+        }
+    }
+}
diff --git a/Modules/IMGUI/RuntimeTextSettings.cs b/Modules/IMGUI/RuntimeTextSettings.cs
new file mode 100644
index 0000000000..27d378e897
--- /dev/null
+++ b/Modules/IMGUI/RuntimeTextSettings.cs
@@ -0,0 +1,31 @@
+// 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.TextCore.Text;
+
+namespace UnityEngine
+{
+    /// <summary>
+    /// Represents text rendering settings for IMGUI runtime
+    /// </summary>
+    internal class RuntimeTextSettings : TextSettings
+    {
+        private static RuntimeTextSettings s_DefaultTextSettings;
+
+        internal static RuntimeTextSettings defaultTextSettings
+        {
+            get
+            {
+                if (s_DefaultTextSettings == null)
+                {
+                    s_DefaultTextSettings = ScriptableObject.CreateInstance<RuntimeTextSettings>();
+                }
+
+                return s_DefaultTextSettings;
+            }
+        }
+    }
+}
diff --git a/Modules/IMGUI/TextEditingUtilities.cs b/Modules/IMGUI/TextEditingUtilities.cs
index 1dfe9e3acf..e391179c07 100644
--- a/Modules/IMGUI/TextEditingUtilities.cs
+++ b/Modules/IMGUI/TextEditingUtilities.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using UnityEngine.Bindings;
 using UnityEngine.TextCore.Text;
 
@@ -29,48 +30,71 @@ enum TextSelectOp
     internal class TextEditingUtilities
     {
         private TextSelectingUtilities m_TextSelectingUtility;
-        TextHandle m_TextHandle;
+        internal TextHandle textHandle;
         private bool hasSelection => m_TextSelectingUtility.hasSelection;
         private string SelectedText => m_TextSelectingUtility.selectedText;
         private int m_iAltCursorPos => m_TextSelectingUtility.iAltCursorPos;
         int m_CursorIndexSavedState = -1;
         internal bool isCompositionActive;
         bool m_UpdateImeWindowPosition;
+        internal Action OnTextChanged;
 
         public bool multiline = false;
         internal bool revealCursor
         {
-            get { return m_TextSelectingUtility.revealCursor; }
-            set { m_TextSelectingUtility.revealCursor = value; }
+            get => m_TextSelectingUtility.revealCursor;
+            set => m_TextSelectingUtility.revealCursor = value;
         }
+
+        //Used by automated tests
+        internal int stringCursorIndex
+        {
+            get => textHandle.GetCorrespondingStringIndex(cursorIndex);
+            set => cursorIndex = textHandle.GetCorrespondingCodePointIndex(value);
+        }
+
         private int cursorIndex
         {
-            get { return m_TextSelectingUtility.cursorIndex; }
-            set { m_TextSelectingUtility.cursorIndex = value; }
+            get => m_TextSelectingUtility.cursorIndex;
+            set => m_TextSelectingUtility.cursorIndex = value;
         }
+
+        //Used by automated tests
+        internal int stringSelectIndex
+        {
+            get => textHandle.GetCorrespondingStringIndex(selectIndex);
+            set => selectIndex = textHandle.GetCorrespondingCodePointIndex(value);
+        }
+
         private int selectIndex
         {
-            get { return m_TextSelectingUtility.selectIndex; }
-            set { m_TextSelectingUtility.selectIndex = value; }
+            get => m_TextSelectingUtility.selectIndex;
+            set => m_TextSelectingUtility.selectIndex = value;
         }
 
         string m_Text;
         public string text
         {
-            get { return m_Text; }
+            get => m_Text;
             set
             {
                 if (value == m_Text)
                     return;
 
                 m_Text = value ?? string.Empty;
+                OnTextChanged?.Invoke();
             }
         }
 
+        internal void SetTextWithoutNotify(string value)
+        {
+            m_Text = value;
+        }
+
         public TextEditingUtilities(TextSelectingUtilities selectingUtilities, TextHandle textHandle, string text)
         {
             m_TextSelectingUtility = selectingUtilities;
-            m_TextHandle = textHandle;
+            this.textHandle = textHandle;
             m_Text = text;
         }
 
@@ -104,7 +128,7 @@ public bool ShouldUpdateImeWindowPosition()
 
         public void SetImeWindowPosition(Vector2 worldPosition)
         {
-            var cursorPos = m_TextHandle.GetCursorPositionFromStringIndexUsingCharacterHeight(cursorIndex, true);
+            var cursorPos = textHandle.GetCursorPositionFromStringIndexUsingCharacterHeight(cursorIndex, true);
             GUIUtility.compositionCursorPos = worldPosition + cursorPos;
         }
 
@@ -114,7 +138,7 @@ public string GeneratePreviewString(bool richText)
             var compositionString = GUIUtility.compositionString;
             if (isCompositionActive)
             {
-                return richText ? text.Insert(cursorIndex, $"<u>{compositionString}</u>") : text.Insert(cursorIndex, compositionString);
+                return richText ? text.Insert(stringCursorIndex, $"<u>{compositionString}</u>") : text.Insert(stringCursorIndex, compositionString);
             }
             return text;
         }
@@ -311,22 +335,18 @@ public bool DeleteLineBack()
                 DeleteSelection();
                 return true;
             }
-            int p = cursorIndex;
-            int i = p;
-            while (i-- != 0)
-                if (text[i] == '\n')
-                {
-                    p = i + 1;
-                    break;
-                }
-            if (i == -1)
-                p = 0;
-            if (cursorIndex != p)
+
+            var currentLineInfo = textHandle.GetLineInfoFromCharacterIndex(cursorIndex);
+            var startIndex = currentLineInfo.firstCharacterIndex;
+            var stringStartIndex = textHandle.GetCorrespondingStringIndex(startIndex);
+
+            if (startIndex != cursorIndex)
             {
-                text = text.Remove(p, cursorIndex - p);
-                m_TextSelectingUtility.selectIndex = cursorIndex = p;
+                text = text.Remove(stringStartIndex, stringCursorIndex - stringStartIndex);
+                cursorIndex = selectIndex = startIndex;
                 return true;
             }
+
             return false;
         }
 
@@ -344,7 +364,8 @@ public bool DeleteWordBack()
             int prevWordEnd = m_TextSelectingUtility.FindEndOfPreviousWord(cursorIndex);
             if (cursorIndex != prevWordEnd)
             {
-                text = text.Remove(prevWordEnd, cursorIndex - prevWordEnd);
+                int prevWordEndString = textHandle.GetCorrespondingStringIndex(prevWordEnd);
+                text = text.Remove(prevWordEndString, stringCursorIndex - prevWordEndString);
                 selectIndex = cursorIndex = prevWordEnd;
                 return true;
             }
@@ -365,7 +386,8 @@ public bool DeleteWordForward()
             int nextWordStart = m_TextSelectingUtility.FindStartOfNextWord(cursorIndex);
             if (cursorIndex < text.Length)
             {
-                text = text.Remove(cursorIndex, nextWordStart - cursorIndex);
+                int nextWordStartString = textHandle.GetCorrespondingStringIndex(nextWordStart);
+                text = text.Remove(stringCursorIndex, nextWordStartString - stringCursorIndex);
                 return true;
             }
             return false;
@@ -381,9 +403,10 @@ public bool Delete()
                 DeleteSelection();
                 return true;
             }
-            else if (cursorIndex < text.Length)
+            else if (stringCursorIndex < text.Length)
             {
-                text = text.Remove(cursorIndex, m_TextSelectingUtility.NextCodePointIndex(cursorIndex) - cursorIndex);
+                var count = textHandle.textInfo.textElementInfo[cursorIndex].stringLength;
+                text = text.Remove(stringCursorIndex, count);
                 return true;
             }
             return false;
@@ -402,9 +425,10 @@ public bool Backspace()
             else if (cursorIndex > 0)
             {
                 var startIndex = m_TextSelectingUtility.PreviousCodePointIndex(cursorIndex);
-                text = text.Remove(startIndex, cursorIndex - startIndex);
-                m_TextSelectingUtility.SetCursorIndexWithoutNotify(startIndex);
-                m_TextSelectingUtility.SetSelectIndexWithoutNotify(startIndex);
+                var count = textHandle.textInfo.textElementInfo[cursorIndex - 1].stringLength;
+                text = text.Remove(stringCursorIndex - count, count);
+                cursorIndex = startIndex;
+                selectIndex = startIndex;
                 m_TextSelectingUtility.ClearCursorPos();
                 return true;
             }
@@ -418,13 +442,13 @@ public bool DeleteSelection()
                 return false;
             if (cursorIndex < selectIndex)
             {
-                text = text.Substring(0, cursorIndex) + text.Substring(selectIndex, text.Length - selectIndex);
-                m_TextSelectingUtility.SetSelectIndexWithoutNotify(cursorIndex);
+                text = text.Substring(0, stringCursorIndex) + text.Substring(stringSelectIndex, text.Length - stringSelectIndex);
+                selectIndex = cursorIndex;
             }
             else
             {
-                text = text.Substring(0, selectIndex) + text.Substring(cursorIndex, text.Length - cursorIndex);
-                m_TextSelectingUtility.SetCursorIndexWithoutNotify(selectIndex);
+                text = text.Substring(0, stringSelectIndex) + text.Substring(stringCursorIndex, text.Length - stringCursorIndex);
+                cursorIndex = selectIndex;
             }
             m_TextSelectingUtility.ClearCursorPos();
 
@@ -438,9 +462,9 @@ public void ReplaceSelection(string replace)
             DeleteSelection();
             text = text.Insert(cursorIndex, replace);
 
-            var newIndex = cursorIndex + replace.Length;
-            m_TextSelectingUtility.SetCursorIndexWithoutNotify(newIndex);
-            m_TextSelectingUtility.SetSelectIndexWithoutNotify(newIndex);
+            var newIndex = cursorIndex + new StringInfo(replace).LengthInTextElements;
+            cursorIndex = newIndex;
+            selectIndex = newIndex;
             m_TextSelectingUtility.ClearCursorPos();
         }
 
diff --git a/Modules/IMGUI/TextEditor.cs b/Modules/IMGUI/TextEditor.cs
index cca86b79a2..8c68de132b 100644
--- a/Modules/IMGUI/TextEditor.cs
+++ b/Modules/IMGUI/TextEditor.cs
@@ -6,517 +6,308 @@
 using UnityEngine.Bindings;
 using UnityEngine.Scripting;
 using System.Collections.Generic;
+using UnityEngine.TextCore.Text;
 
 namespace UnityEngine
 {
     public class TextEditor
     {
+        private readonly GUIContent m_Content = new GUIContent();
+        private TextSelectingUtilities m_TextSelecting;
+
+        //Used in automated tests
+        internal TextEditingUtilities m_TextEditing;
+
+        //Used in automated tests
+        internal IMGUITextHandle m_TextHandle;
+
         public TouchScreenKeyboard keyboardOnScreen = null;
         public int controlID = 0;
-        public GUIStyle style = GUIStyle.none;
-        public bool multiline = false;
+
+        public GUIStyle style;
+
+        [Obsolete("'multiline' has been deprecated. Changes to this member will not be observed. Use 'isMultiline' instead.", true)]
+        public bool multiline;
+        public bool isMultiline
+        { get => m_TextEditing.multiline; set => m_TextEditing.multiline = value; }
+
+        [Obsolete("'hasHorizontalCursorPos' has been deprecated. Changes to this member will not be observed. Use 'hasHorizontalCursor' instead.", true)]
         public bool hasHorizontalCursorPos = false;
+        public bool hasHorizontalCursor
+        {
+            get => m_TextSelecting.hasHorizontalCursorPos;
+            set => m_TextSelecting.hasHorizontalCursorPos = value;
+        }
+
         public bool isPasswordField = false;
 
-        internal bool m_HasFocus;
-        public Vector2 scrollOffset = Vector2.zero; // The text field can have a scroll offset in order to display its contents
+        // The text field can have a scroll offset in order to display its contents
+        public Vector2 scrollOffset;
 
-        private GUIContent m_Content = new GUIContent();
-        private Rect m_Position;
-        private int m_CursorIndex = 0;
-        private int m_SelectIndex = 0;
-        private bool m_RevealCursor = false;
+        [Obsolete("'revealCursor' has been deprecated. Changes to this member will not be observed. Use 'showCursor' instead.", true)]
+        public bool revealCursor;
 
-        [Obsolete("Please use 'text' instead of 'content'", false)]
+        public bool showCursor
+        {
+            get => m_TextSelecting.revealCursor;
+            set => m_TextSelecting.revealCursor = value;
+        }
+
+        private bool focus;
+        internal bool m_HasFocus { get { return focus; } set { focus = value; } }
+
+        [Obsolete("Please use 'text' instead of 'content'", true)]
         public GUIContent content
         {
-            get { return m_Content; }
-            set { m_Content = value; }
+            get => throw new NotImplementedException("Please use 'text' instead of 'content'");
+            set => throw new NotImplementedException("Please use 'text' instead of 'content'");
         }
 
         public string text
         {
-            get { return m_Content.text; }
+            get => m_TextEditing.text;
             set
             {
-                m_Content.text = value ?? string.Empty;
-                EnsureValidCodePointIndex(ref m_CursorIndex);
-                EnsureValidCodePointIndex(ref m_SelectIndex);
+                var newValue = value ?? "";
+                if (m_TextEditing.text == newValue)
+                    return;
+                m_TextEditing.SetTextWithoutNotify(newValue);
+                m_Content.SetTextWithoutNotify(newValue);
+                textWithWhitespace = newValue;
+                // TODO: Change this call to only do the parsing of the text, to update the characterCount properly.
+                UpdateTextHandle();
             }
         }
 
-        public Rect position
+        string m_TextWithWhitespace;
+        internal string textWithWhitespace
         {
-            get { return m_Position; }
-            set
-            {
-                if (m_Position == value)
-                    return;
-
-                // Reset the scrollOffset to force its recomputation.
-                scrollOffset = Vector2.zero;
-
-                m_Position = value;
-
-                UpdateScrollOffset();
-            }
+            get => string.IsNullOrEmpty(m_TextWithWhitespace) ? GUIContent.k_ZeroWidthSpace : m_TextWithWhitespace;
+            set =>
+                //The NoWidthSpace unicode is added at the end of the string to make sure LineFeeds update the layout of the text.
+                m_TextWithWhitespace = value + GUIContent.k_ZeroWidthSpace;
         }
 
+        public Rect position { get; set; }
+
         internal virtual Rect localPosition
         {
-            get { return position; }
+            get => style.padding.Remove(position);
         }
 
         public int cursorIndex
         {
-            get { return m_CursorIndex; }
-            set
-            {
-                int oldCursorIndex = m_CursorIndex;
-                m_CursorIndex = value;
-                EnsureValidCodePointIndex(ref m_CursorIndex);
+            get => m_TextSelecting.cursorIndex;
+            set => m_TextSelecting.cursorIndex = value;
+        }
 
-                if (m_CursorIndex != oldCursorIndex)
-                {
-                    m_RevealCursor = true;
-                    OnCursorIndexChange();
-                }
-            }
+        internal int stringCursorIndex
+        {
+            get => m_TextEditing.stringCursorIndex;
+            set => m_TextEditing.stringCursorIndex = value;
         }
 
         public int selectIndex
         {
-            get { return m_SelectIndex; }
-            set
-            {
-                int oldSelectIndex = m_SelectIndex;
-                m_SelectIndex = value;
-                EnsureValidCodePointIndex(ref m_SelectIndex);
+            get => m_TextSelecting.selectIndex;
+            set => m_TextSelecting.selectIndex = value;
+        }
 
-                if (m_SelectIndex != oldSelectIndex)
-                    OnSelectIndexChange();
-            }
+        internal int stringSelectIndex
+        {
+            get => m_TextEditing.stringSelectIndex;
+            set => m_TextEditing.stringSelectIndex = value;
         }
 
         // are we up/downing?
         public Vector2 graphicalCursorPos;
-        public Vector2 graphicalSelectCursorPos;
 
-        // Clear the cursor position for vertical movement...
-        void ClearCursorPos() {hasHorizontalCursorPos = false; m_iAltCursorPos = -1; }
+        public Vector2 graphicalSelectCursorPos;
 
-        // selection
-        bool m_MouseDragSelectsWholeWords = false;
-        int m_DblClickInitPos = 0;
-        DblClickSnapping m_DblClickSnap = DblClickSnapping.WORDS;
-        public DblClickSnapping doubleClickSnapping { get { return m_DblClickSnap; } set { m_DblClickSnap = value; } }
-        bool m_bJustSelected = false;
+        public DblClickSnapping doubleClickSnapping
+        {
+            get => m_TextSelecting.dblClickSnap;
+            set => m_TextSelecting.dblClickSnap = value;
+        }
 
-        int m_iAltCursorPos = -1;
-        public int altCursorPosition { get { return m_iAltCursorPos; } set { m_iAltCursorPos = value; } }
+        public int altCursorPosition
+        {
+            get => m_TextSelecting.iAltCursorPos;
+            set => m_TextSelecting.iAltCursorPos = value;
+        }
 
         public enum DblClickSnapping : byte { WORDS, PARAGRAPHS }
 
         [RequiredByNativeCode]
         public TextEditor()
         {
+            var style = GUIStyle.none;
+            m_TextHandle = IMGUITextHandle.GetTextHandle(style, position, textWithWhitespace, Color.white);
+            m_TextHandle.AddTextInfoToCache();
+            m_TextSelecting = new TextSelectingUtilities(m_TextHandle);
+            m_TextEditing = new TextEditingUtilities(m_TextSelecting, m_TextHandle, m_Content.text);
+            m_Content.OnTextChanged += OnContentTextChangedHandle;
+            m_TextEditing.OnTextChanged += OnTextChangedHandle;
+            this.style = style;
+
+            m_TextSelecting.OnCursorIndexChange += OnCursorIndexChange;
+            m_TextSelecting.OnSelectIndexChange += OnSelectIndexChange;
         }
 
-        public void OnFocus()
+        private void OnTextChangedHandle()
         {
-            if (multiline)
-                cursorIndex = selectIndex = 0;
-            else
-                SelectAll();
-            m_HasFocus = true;
+            m_Content.SetTextWithoutNotify(text);
+            textWithWhitespace = text;
         }
 
-        public void OnLostFocus()
+        private void OnContentTextChangedHandle()
         {
-            m_HasFocus = false;
-            scrollOffset = Vector2.zero;
+            text = m_Content.text;
+            textWithWhitespace = text;
         }
 
-        void GrabGraphicalCursorPos()
+        public void OnFocus()
         {
-            if (!hasHorizontalCursorPos)
-            {
-                graphicalCursorPos = style.GetCursorPixelPosition(localPosition, m_Content, cursorIndex);
-                graphicalSelectCursorPos = style.GetCursorPixelPosition(localPosition, m_Content, selectIndex);
-                hasHorizontalCursorPos = false;
-            }
+            m_HasFocus = true;
+            m_TextSelecting.OnFocus();
         }
 
-        // Handle a key event.
-        // Looks up the platform-dependent key-action table & performs the event
-        // return true if the event was recognized.
-        public bool HandleKeyEvent(Event e)
+        public void OnLostFocus()
         {
-            return HandleKeyEvent(e, false);
+            m_HasFocus = false;
         }
 
-        [VisibleToOtherModules]
-        internal bool HandleKeyEvent(Event e, bool textIsReadOnly)
+        public bool HasClickedOnLink(Vector2 mousePosition, out string linkData)
         {
-            InitKeyActions();
-            EventModifiers m = e.modifiers;
-            e.modifiers &= ~EventModifiers.CapsLock;
-            if (s_Keyactions.ContainsKey(e))
+            linkData = "";
+            var intersectingLink = m_TextHandle.FindIntersectingLink(mousePosition - new Vector2(position.x, position.y));
+            if (intersectingLink < 0)
+                return false;
+
+            var link = m_TextHandle.textInfo.linkInfo[intersectingLink];
+            if (link.linkId != null && link.linkIdLength > 0)
             {
-                TextEditOp op = (TextEditOp)s_Keyactions[e];
-                PerformOperation(op, textIsReadOnly);
-                e.modifiers = m;
+                linkData = new string(link.linkId);
                 return true;
             }
-            e.modifiers = m;
             return false;
         }
 
-        // Deletes previous text on the line
-        public bool DeleteLineBack()
+        public bool HasClickedOnHREF(Vector2 mousePosition, out string href)
         {
-            if (hasSelection)
+            href = "";
+            var intersectingLink = m_TextHandle.FindIntersectingLink(mousePosition - new Vector2(position.x, position.y));
+            if (intersectingLink < 0)
+                return false;
+
+            var link = m_TextHandle.textInfo.linkInfo[intersectingLink];
+            if (link.hashCode == (int)MarkupTag.HREF)
             {
-                DeleteSelection();
-                return true;
-            }
-            int p = cursorIndex;
-            int i = p;
-            while (i-- != 0)
-                if (text[i] == '\n')
+                if (link.linkId != null && link.linkIdLength > 0)
                 {
-                    p = i + 1;
-                    break;
+                    href = new string(link.linkId);
+                    if (!href.StartsWith("href"))
+                        return false;
+                    // Removes href="..."
+                    href = href.Substring(6, href.Length - 7);
+                    if (Uri.IsWellFormedUriString(href, UriKind.Absolute))
+                    {
+                        return true;
+                    }
                 }
-            if (i == -1)
-                p = 0;
-            if (cursorIndex != p)
-            {
-                m_Content.text = text.Remove(p, cursorIndex - p);
-                selectIndex = cursorIndex = p;
-                return true;
             }
             return false;
         }
 
-        // Deletes the previous word
-        public bool DeleteWordBack()
+        // Handle a key event.
+        // Looks up the platform-dependent key-action table & performs the event
+        // return true if the event was recognized.
+        public bool HandleKeyEvent(Event e)
         {
-            if (hasSelection)
-            {
-                DeleteSelection();
-                return true;
-            }
-
-            int prevWordEnd = FindEndOfPreviousWord(cursorIndex);
-            if (cursorIndex != prevWordEnd)
-            {
-                m_Content.text = text.Remove(prevWordEnd, cursorIndex - prevWordEnd);
-                selectIndex = cursorIndex = prevWordEnd;
-                return true;
-            }
-            return false;
+            return m_TextEditing.HandleKeyEvent(e) || m_TextSelecting.HandleKeyEvent(e);
         }
 
-        // Deletes the following word
-        public bool DeleteWordForward()
-        {
-            if (hasSelection)
-            {
-                DeleteSelection();
-                return true;
-            }
+        // Deletes previous text on the line
+        public bool DeleteLineBack() => m_TextEditing.DeleteLineBack();
 
-            int nextWordStart = FindStartOfNextWord(cursorIndex);
-            if (cursorIndex < text.Length)
-            {
-                m_Content.text = text.Remove(cursorIndex, nextWordStart - cursorIndex);
-                return true;
-            }
-            return false;
-        }
+        // Deletes the previous word
+        public bool DeleteWordBack() => m_TextEditing.DeleteWordBack();
+
+        // Deletes the following word
+        public bool DeleteWordForward() => m_TextEditing.DeleteWordForward();
 
         // perform a right-delete
-        public bool Delete()
-        {
-            if (hasSelection)
-            {
-                DeleteSelection();
-                return true;
-            }
-            else if (cursorIndex < text.Length)
-            {
-                m_Content.text = text.Remove(cursorIndex, NextCodePointIndex(cursorIndex) - cursorIndex);
-                return true;
-            }
-            return false;
-        }
+        public bool Delete() => m_TextEditing.Delete();
 
-        public bool CanPaste()
-        {
-            return GUIUtility.systemCopyBuffer.Length != 0;
-        }
+        public bool CanPaste() => m_TextEditing.CanPaste();
 
         // Perform a left-delete
-        public bool Backspace()
-        {
-            if (hasSelection)
-            {
-                DeleteSelection();
-                return true;
-            }
-            else if (cursorIndex > 0)
-            {
-                var startIndex = PreviousCodePointIndex(cursorIndex);
-                m_Content.text = text.Remove(startIndex, cursorIndex - startIndex);
-                selectIndex = cursorIndex = startIndex;
-                ClearCursorPos();
-                return true;
-            }
-            return false;
-        }
+        public bool Backspace() => m_TextEditing.Backspace();
 
         /// Select all the text
-        public void SelectAll()
-        {
-            cursorIndex = 0; selectIndex = text.Length;
-            ClearCursorPos();
-        }
+        public void SelectAll() => m_TextSelecting.SelectAll();
 
         /// Select none of the text
-        public void SelectNone()
-        {
-            selectIndex = cursorIndex;
-            ClearCursorPos();
-        }
+        public void SelectNone() => m_TextSelecting.SelectNone();
+
 
         /// Does this text field has a selection
-        public bool hasSelection { get { return cursorIndex != selectIndex; } }
+        public bool hasSelection => m_TextSelecting.hasSelection;
 
         /// Returns the selected text
-        public string SelectedText
-        {
-            get
-            {
-                if (cursorIndex == selectIndex)
-                    return "";
-                if (cursorIndex < selectIndex)
-                    return text.Substring(cursorIndex, selectIndex - cursorIndex);
-                else
-                    return text.Substring(selectIndex, cursorIndex - selectIndex);
-            }
-        }
+        public string SelectedText => m_TextSelecting.selectedText;
 
         /// Delete the current selection. If there is no selection, this function does not do anything...
-        public bool DeleteSelection()
-        {
-            if (cursorIndex == selectIndex)
-                return false;
-            if (cursorIndex < selectIndex)
-            {
-                m_Content.text = text.Substring(0, cursorIndex) + text.Substring(selectIndex, text.Length - selectIndex);
-                selectIndex = cursorIndex;
-            }
-            else
-            {
-                m_Content.text = text.Substring(0, selectIndex) + text.Substring(cursorIndex, text.Length - cursorIndex);
-                cursorIndex = selectIndex;
-            }
-            ClearCursorPos();
-
-            return true;
-        }
+        public bool DeleteSelection() => m_TextEditing.DeleteSelection();
 
         /// Replace the selection with /replace/. If there is no selection, /replace/ is inserted at the current cursor point.
-        public void ReplaceSelection(string replace)
-        {
-            DeleteSelection();
-            m_Content.text = text.Insert(cursorIndex, replace);
-            selectIndex = cursorIndex += replace.Length;
-            ClearCursorPos();
-        }
+        public void ReplaceSelection(string replace) => m_TextEditing.ReplaceSelection(replace);
 
-        /// Replacted the selection with /c/
+        /// Replaced the selection with /c/
         public void Insert(char c)
         {
-            ReplaceSelection(c.ToString());
+            m_TextEditing.Insert(c);
+            UpdateTextHandle();
         }
 
         /// Move selection to alt cursor /position/
-        public void MoveSelectionToAltCursor()
-        {
-            if (m_iAltCursorPos == -1)
-                return;
-            int p = m_iAltCursorPos;
-            string tmp = SelectedText;
-            m_Content.text = text.Insert(p, tmp);
-
-            if (p < cursorIndex)
-            {
-                cursorIndex += tmp.Length;
-                selectIndex += tmp.Length;
-            }
-
-            DeleteSelection();
-
-            selectIndex = cursorIndex = p;
-            ClearCursorPos();
-        }
+        public void MoveSelectionToAltCursor() => m_TextEditing.MoveSelectionToAltCursor();
 
         /// Move the cursor one character to the right and deselect.
-        public void MoveRight()
-        {
-            ClearCursorPos();
-            if (selectIndex == cursorIndex)
-            {
-                cursorIndex = NextCodePointIndex(cursorIndex);
-                DetectFocusChange(); // TODO: Is this necessary?
-                selectIndex = cursorIndex;
-            }
-            else
-            {
-                if (selectIndex > cursorIndex)
-                    cursorIndex = selectIndex;
-                else
-                    selectIndex = cursorIndex;
-            }
-        }
+        public void MoveRight() => m_TextSelecting.MoveRight();
 
         /// Move the cursor one character to the left and deselect.
-        public void MoveLeft()
-        {
-            if (selectIndex == cursorIndex)
-            {
-                cursorIndex = PreviousCodePointIndex(cursorIndex);
-                selectIndex = cursorIndex;
-            }
-            else
-            {
-                if (selectIndex > cursorIndex)
-                    selectIndex = cursorIndex;
-                else
-                    cursorIndex = selectIndex;
-            }
-            ClearCursorPos();
-        }
+        public void MoveLeft() => m_TextSelecting.MoveLeft();
 
         /// Move the cursor up and deselects.
-        public void MoveUp()
-        {
-            if (selectIndex < cursorIndex)
-                selectIndex = cursorIndex;
-            else
-                cursorIndex = selectIndex;
-            GrabGraphicalCursorPos();
-            graphicalCursorPos.y -=  1;
-            cursorIndex = selectIndex = style.GetCursorStringIndex(localPosition, m_Content, graphicalCursorPos);
-            if (cursorIndex <= 0)
-                ClearCursorPos();
-        }
+        public void MoveUp() => m_TextSelecting.MoveUp();
 
         /// Move the cursor down and deselects.
-        public void MoveDown()
-        {
-            if (selectIndex > cursorIndex)
-                selectIndex = cursorIndex;
-            else
-                cursorIndex = selectIndex;
-            GrabGraphicalCursorPos();
-            graphicalCursorPos.y += style.lineHeight + 5;
-            cursorIndex = selectIndex = style.GetCursorStringIndex(localPosition, m_Content, graphicalCursorPos);
-            if (cursorIndex == text.Length)
-                ClearCursorPos();
-        }
+        public void MoveDown() => m_TextSelecting.MoveDown();
 
         /// Moves the cursor to the start of the current line.
-        public void MoveLineStart()
-        {
-            // we start from the left-most selected character
-            int p = selectIndex < cursorIndex ? selectIndex : cursorIndex;
-            // then we scan back to find the first newline
-            int i = p;
-            while (i-- != 0)
-                if (text[i] == '\n')
-                {
-                    selectIndex = cursorIndex = i + 1;
-                    return;
-                }
-            selectIndex = cursorIndex = 0;
-        }
+        public void MoveLineStart() => m_TextSelecting.MoveLineStart();
 
         /// Moves the selection to the end of the current line
-        public void MoveLineEnd()
-        {
-            // we start from the right-most selected character
-            int p = selectIndex > cursorIndex ? selectIndex : cursorIndex;
-            // then we scan forward to find the first newline
-            int i = p;
-            int strlen = text.Length;
-            while (i < strlen)
-            {
-                if (text[i] == '\n')
-                {
-                    selectIndex = cursorIndex = i;
-                    return;
-                }
-                i++;
-            }
-            selectIndex = cursorIndex = strlen;
-        }
+        public void MoveLineEnd() => m_TextSelecting.MoveLineEnd();
 
         /// Move to the start of the current graphical line. This takes word-wrapping into consideration.
-        public void MoveGraphicalLineStart()
-        {
-            cursorIndex = selectIndex = GetGraphicalLineStart(cursorIndex < selectIndex ? cursorIndex : selectIndex);
-        }
+        public void MoveGraphicalLineStart() => m_TextSelecting.MoveGraphicalLineStart();
 
         /// Move to the end of the current graphical line. This takes word-wrapping into consideration.
-        public void MoveGraphicalLineEnd()
-        {
-            cursorIndex = selectIndex = GetGraphicalLineEnd(cursorIndex > selectIndex ? cursorIndex : selectIndex);
-        }
+        public void MoveGraphicalLineEnd() => m_TextSelecting.MoveGraphicalLineEnd();
 
         /// Moves the cursor to the beginning of the text
-        public void MoveTextStart()
-        {
-            selectIndex = cursorIndex = 0;
-        }
+        public void MoveTextStart() => m_TextSelecting.MoveTextStart();
 
         /// Moves the cursor to the end of the text
-        public void MoveTextEnd()
-        {
-            selectIndex = cursorIndex = text.Length;
-        }
-
-        private int IndexOfEndOfLine(int startIndex)
-        {
-            int index = text.IndexOf('\n', startIndex);
-            return (index != -1 ? index : text.Length);
-        }
+        public void MoveTextEnd() => m_TextSelecting.MoveTextEnd();
 
         /// Move to the next paragraph
-        public void MoveParagraphForward()
-        {
-            cursorIndex = cursorIndex > selectIndex ? cursorIndex : selectIndex;
-            if (cursorIndex < text.Length)
-            {
-                selectIndex = cursorIndex = IndexOfEndOfLine(cursorIndex + 1);
-            }
-        }
+        public void MoveParagraphForward() => m_TextSelecting.MoveParagraphForward();
 
         /// Move to the previous paragraph
-        public void MoveParagraphBackward()
-        {
-            cursorIndex = cursorIndex < selectIndex ? cursorIndex : selectIndex;
-            if (cursorIndex > 1)
-            {
-                selectIndex = cursorIndex = text.LastIndexOf('\n', cursorIndex - 2) + 1;
-            }
-            else
-                selectIndex = cursorIndex =  0;
-        }
-
-        //
+        public void MoveParagraphBackward() => m_TextSelecting.MoveParagraphBackward();
 
         // Move the cursor to a graphical position. Used for moving the cursor on MouseDown events.
         public void MoveCursorToPosition(Vector2 cursorPosition)
@@ -525,256 +316,53 @@ public void MoveCursorToPosition(Vector2 cursorPosition)
         }
 
         // Move the cursor to a graphical position. Used for moving the cursor on MouseDown events.
-        protected internal void MoveCursorToPosition_Internal(Vector2 cursorPosition, bool shift)
-        {
-            selectIndex = style.GetCursorStringIndex(localPosition, m_Content, cursorPosition + scrollOffset);
-
-            if (!shift)
-            {
-                cursorIndex = selectIndex;
-            }
-
-            DetectFocusChange(); // TODO: Is this necessary?
-        }
+        protected internal void MoveCursorToPosition_Internal(Vector2 cursorPosition, bool shift) =>  m_TextSelecting.MoveCursorToPosition_Internal(GetLocalCursorPosition(cursorPosition), shift);
 
-        public void MoveAltCursorToPosition(Vector2 cursorPosition)
-        {
-            int index = style.GetCursorStringIndex(localPosition, m_Content, cursorPosition + scrollOffset);
-            m_iAltCursorPos = Mathf.Min(text.Length, index);
-            DetectFocusChange(); // TODO: Is this necessary?
-        }
+        public void MoveAltCursorToPosition(Vector2 cursorPosition) => m_TextSelecting.MoveAltCursorToPosition(GetLocalCursorPosition(cursorPosition));
 
-        public bool IsOverSelection(Vector2 cursorPosition)
-        {
-            int p = style.GetCursorStringIndex(localPosition, m_Content, cursorPosition + scrollOffset);
-            return ((p < Mathf.Max(cursorIndex, selectIndex)) && (p > Mathf.Min(cursorIndex, selectIndex)));
-        }
+        public bool IsOverSelection(Vector2 cursorPosition)=> m_TextSelecting.IsOverSelection(GetLocalCursorPosition(cursorPosition));
 
         // Do a drag selection. Used to expand the selection in MouseDrag events.
-        public void SelectToPosition(Vector2 cursorPosition)
-        {
-            if (!m_MouseDragSelectsWholeWords)
-                cursorIndex = style.GetCursorStringIndex(localPosition, m_Content, cursorPosition + scrollOffset);
-            else // snap to words/paragraphs
-            {
-                int p = style.GetCursorStringIndex(localPosition, m_Content, cursorPosition + scrollOffset);
-
-                EnsureValidCodePointIndex(ref p);
-                EnsureValidCodePointIndex(ref m_DblClickInitPos);
-
-                if (m_DblClickSnap == DblClickSnapping.WORDS)
-                {
-                    if (p < m_DblClickInitPos)
-                    {
-                        cursorIndex = FindEndOfClassification(p, Direction.Backward);
-                        selectIndex = FindEndOfClassification(m_DblClickInitPos, Direction.Forward);
-                    }
-                    else
-                    {
-                        cursorIndex = FindEndOfClassification(p, Direction.Forward);
-                        selectIndex = FindEndOfClassification(m_DblClickInitPos, Direction.Backward);
-                    }
-                } // paragraph
-                else
-                {
-                    if (p < m_DblClickInitPos)
-                    {
-                        if (p > 0)
-                            cursorIndex = text.LastIndexOf('\n', Mathf.Max(0, p - 2)) + 1;
-                        else
-                            cursorIndex = 0;
-
-                        selectIndex = text.LastIndexOf('\n', Mathf.Min(text.Length - 1, m_DblClickInitPos));
-                    }
-                    else
-                    {
-                        if (p < text.Length)
-                        {
-                            cursorIndex = IndexOfEndOfLine(p);
-                        }
-                        else
-                            cursorIndex = text.Length;
-
-                        selectIndex = text.LastIndexOf('\n', Mathf.Max(0, m_DblClickInitPos - 2)) + 1;
-                    }
-                }
-            }
-        }
+        public void SelectToPosition(Vector2 cursorPosition) => m_TextSelecting.SelectToPosition(GetLocalCursorPosition(cursorPosition));
 
-        /// Expand the selection to the left
-        public void SelectLeft()
+        private Vector2 GetLocalCursorPosition(Vector2 cursorPosition)
         {
-            if (m_bJustSelected)
-                if (cursorIndex > selectIndex)
-                { // swap
-                    int tmp = cursorIndex;
-                    cursorIndex = selectIndex;
-                    selectIndex = tmp;
-                }
-            m_bJustSelected = false;
-
-            cursorIndex = PreviousCodePointIndex(cursorIndex);
+            return cursorPosition - style.Internal_GetTextRectOffset(position, m_Content, new Vector2(m_TextHandle.preferredSize.x, m_TextHandle.preferredSize.y > 0 ? m_TextHandle.preferredSize.y : style.lineHeight)) + scrollOffset;
         }
 
-        public void SelectRight()
-        {
-            if (m_bJustSelected)
-                if (cursorIndex < selectIndex)
-                { // swap
-                    int tmp = cursorIndex;
-                    cursorIndex = selectIndex;
-                    selectIndex = tmp;
-                }
-            m_bJustSelected = false;
+        /// Expand the selection to the left
+        public void SelectLeft() => m_TextSelecting.SelectLeft();
 
-            cursorIndex = NextCodePointIndex(cursorIndex);
-        }
+        public void SelectRight() => m_TextSelecting.SelectRight();
 
-        public void SelectUp()
-        {
-            GrabGraphicalCursorPos();
-            graphicalCursorPos.y -= 1;
-            cursorIndex = style.GetCursorStringIndex(localPosition, m_Content, graphicalCursorPos);
-        }
+        public void SelectUp() => m_TextSelecting.SelectUp();
 
-        public void SelectDown()
-        {
-            GrabGraphicalCursorPos();
-            graphicalCursorPos.y += style.lineHeight + 5;
-            cursorIndex = style.GetCursorStringIndex(localPosition, m_Content, graphicalCursorPos);
-        }
+        public void SelectDown() => m_TextSelecting.SelectDown();
 
         /// Select to the end of the text
-        public void SelectTextEnd()
-        {
-            // This is not quite like the mac - there, when you select to end of text, the position of the cursor becomes somewhat i'll defined
-            // Hard to explain. In textedit, try: CMD-SHIFT-down, SHIFT-LEFT for case 1. then do CMD-SHIFT-down, SHIFT-RIGHT, SHIFT-LEFT for case 2.
-            // Anyways, it's wrong so we won't do that
-            cursorIndex = text.Length;
-        }
+        public void SelectTextEnd() => m_TextSelecting.SelectTextEnd();
 
         /// Select to the start of the text
-        public void SelectTextStart()
-        {
-            // Same thing as SelectTextEnd...
-            cursorIndex = 0;
-        }
+        public void SelectTextStart() => m_TextSelecting.SelectTextStart();
 
         /// sets whether the text selection is done by dbl click or not
-        public void MouseDragSelectsWholeWords(bool on)
-        {
-            m_MouseDragSelectsWholeWords = on;
-            m_DblClickInitPos = cursorIndex;
-        }
+        public void MouseDragSelectsWholeWords(bool on) => m_TextSelecting.MouseDragSelectsWholeWords(on);
 
-        public void DblClickSnap(DblClickSnapping snapping)
-        {
-            m_DblClickSnap = snapping;
-        }
-
-        int GetGraphicalLineStart(int p)
-        {
-            Vector2 point = style.GetCursorPixelPosition(localPosition, m_Content, p);
-            point.y += 1.0f / GUIUtility.pixelsPerPoint; // we make sure no floating point errors can make us land on another line
-            point.x = 0;
-            return style.GetCursorStringIndex(localPosition, m_Content, point);
-        }
-
-        int GetGraphicalLineEnd(int p)
-        {
-            Vector2 point = style.GetCursorPixelPosition(localPosition, m_Content, p);
-            point.y += 1.0f / GUIUtility.pixelsPerPoint; // we make sure no floating point errors can make us land on another line
-            point.x += 5000;
-            return style.GetCursorStringIndex(localPosition, m_Content, point);
-        }
-
-        int FindNextSeperator(int startPos)
-        {
-            int textLen = text.Length;
-            while (startPos < textLen && ClassifyChar(startPos) != CharacterType.LetterLike)
-                startPos = NextCodePointIndex(startPos);
-            while (startPos < textLen && ClassifyChar(startPos) == CharacterType.LetterLike)
-                startPos = NextCodePointIndex(startPos);
-            return startPos;
-        }
-
-        int FindPrevSeperator(int startPos)
-        {
-            startPos = PreviousCodePointIndex(startPos);
-            while (startPos > 0 && ClassifyChar(startPos) != CharacterType.LetterLike)
-                startPos = PreviousCodePointIndex(startPos);
-
-            if (startPos == 0)
-                return 0;
-
-            while (startPos > 0 && ClassifyChar(startPos) == CharacterType.LetterLike)
-                startPos = PreviousCodePointIndex(startPos);
-
-            if (ClassifyChar(startPos) == CharacterType.LetterLike)
-                return startPos;
-            return NextCodePointIndex(startPos);
-        }
+        public void DblClickSnap(DblClickSnapping snapping) => m_TextSelecting.DblClickSnap(snapping);
 
         /// Move to the end of the word.
         /// If the cursor is over some space characters, these are skipped
         /// Then, the cursor moves to the end of the following word.
         /// This corresponds to Alt-RightArrow on a Mac
-        public void MoveWordRight()
-        {
-            cursorIndex = cursorIndex > selectIndex ? cursorIndex : selectIndex;
-            cursorIndex = selectIndex = FindNextSeperator(cursorIndex);
-            ClearCursorPos();
-        }
-
-        public void MoveToStartOfNextWord()
-        {
-            ClearCursorPos();
-            if (cursorIndex != selectIndex)
-            {
-                MoveRight();
-                return;
-            }
-            cursorIndex = selectIndex = FindStartOfNextWord(cursorIndex);
-        }
-
-        public void MoveToEndOfPreviousWord()
-        {
-            ClearCursorPos();
-            if (cursorIndex != selectIndex)
-            {
-                MoveLeft();
-                return;
-            }
-            cursorIndex = selectIndex = FindEndOfPreviousWord(cursorIndex);
-        }
+        public void MoveWordRight() => m_TextSelecting.MoveWordRight();
 
-        public void SelectToStartOfNextWord()
-        {
-            ClearCursorPos();
-            cursorIndex = FindStartOfNextWord(cursorIndex);
-        }
+        public void MoveToStartOfNextWord() => m_TextSelecting.MoveToStartOfNextWord();
 
-        public void SelectToEndOfPreviousWord()
-        {
-            ClearCursorPos();
-            cursorIndex = FindEndOfPreviousWord(cursorIndex);
-        }
+        public void MoveToEndOfPreviousWord() => m_TextSelecting.MoveToEndOfPreviousWord();
 
-        enum CharacterType
-        {
-            LetterLike,
-            Symbol, Symbol2,
-            WhiteSpace
-        }
+        public void SelectToStartOfNextWord() => m_TextSelecting.SelectToStartOfNextWord();
 
-        CharacterType ClassifyChar(int index)
-        {
-            if (char.IsWhiteSpace(text, index))
-                return CharacterType.WhiteSpace;
-            if (char.IsLetterOrDigit(text, index) || text[index] == '\'')
-                return CharacterType.LetterLike;
-            return CharacterType.Symbol;
-        }
+        public void SelectToEndOfPreviousWord() => m_TextSelecting.SelectToEndOfPreviousWord();
 
         /// Move to start of next word.
         /// This corresponds to Ctrl-RightArrow on Windows
@@ -782,244 +370,39 @@ CharacterType ClassifyChar(int index)
         /// If the cursor is over an alphanumeric character, it''s moved forward 'till it encounters space or a punctuation mark.
         /// If the stopping character is a space, this is skipped as well.
         /// If the cursor is over an punctuation mark, it's moved forward ''till it a letter or a space of a punctuation mark. If the stopping character is a space, this is skipped as well
-        public int FindStartOfNextWord(int p)
-        {
-            int textLen = text.Length;
-            if (p == textLen)
-                return p;
-
-            // Find out which char type we're at...
-            CharacterType t = ClassifyChar(p);
-            if (t != CharacterType.WhiteSpace)
-            {
-                p = NextCodePointIndex(p);
-                while (p < textLen && ClassifyChar(p) == t)
-                    p = NextCodePointIndex(p);
-            }
-            else
-            {
-                if (text[p] == '\t' || text[p] == '\n')
-                    return NextCodePointIndex(p);
-            }
-
-            if (p == textLen)
-                return p;
-
-            // Skip spaces
-            if (text[p] == ' ') // If we're at a space, skip over any number of spaces
-            {
-                while (p < textLen && ClassifyChar(p) == CharacterType.WhiteSpace)
-                    p = NextCodePointIndex(p);
-            }
-            else if (text[p] == '\t' || text[p] == '\n') // If we're at a tab or a newline, just step one char ahead
-            {
-                return p;
-            }
-            return p;
-        }
-
-        int FindEndOfPreviousWord(int p)
-        {
-            if (p == 0)
-                return p;
-            p = PreviousCodePointIndex(p);
+        public int FindStartOfNextWord(int p) => m_TextSelecting.FindStartOfNextWord(p);
 
-            // Skip spaces
-            while (p > 0 && text[p] == ' ')
-                p = PreviousCodePointIndex(p);
+        public void MoveWordLeft() => m_TextSelecting.MoveWordLeft();
 
-            CharacterType t = ClassifyChar(p);
-            if (t != CharacterType.WhiteSpace)
-            {
-                while (p >  0 && ClassifyChar(PreviousCodePointIndex(p)) == t)
-                    p = PreviousCodePointIndex(p);
-            }
-            return p;
-        }
-
-        public void MoveWordLeft()
-        {
-            cursorIndex = cursorIndex < selectIndex ? cursorIndex : selectIndex;
-            cursorIndex = FindPrevSeperator(cursorIndex);
-            selectIndex = cursorIndex;
-        }
+        public void SelectWordRight() => m_TextSelecting.SelectWordRight();
 
-        public void SelectWordRight()
-        {
-            ClearCursorPos();
-            int cachedPos = selectIndex;
-            if (cursorIndex < selectIndex)
-            {
-                selectIndex = cursorIndex;
-                MoveWordRight();
-                selectIndex = cachedPos;
-                cursorIndex = cursorIndex < selectIndex ? cursorIndex : selectIndex;
-                return;
-            }
-            selectIndex = cursorIndex;
-            MoveWordRight();
-            selectIndex = cachedPos;
-        }
-
-        public void SelectWordLeft()
-        {
-            ClearCursorPos();
-            int cachedPos = selectIndex;
-            if (cursorIndex > selectIndex)
-            {
-                selectIndex = cursorIndex;
-                MoveWordLeft();
-                selectIndex = cachedPos;
-                cursorIndex = cursorIndex > selectIndex ? cursorIndex : selectIndex;
-                return;
-            }
-            selectIndex = cursorIndex;
-            MoveWordLeft();
-            selectIndex = cachedPos;
-        }
+        public void SelectWordLeft() => m_TextSelecting.SelectWordLeft();
 
         /// Expand the selection to the start of the line
         /// Used on a mac for CMD-SHIFT-LEFT
-        public void ExpandSelectGraphicalLineStart()
-        {
-            ClearCursorPos();
-            if (cursorIndex < selectIndex)
-                cursorIndex = GetGraphicalLineStart(cursorIndex);
-            else
-            {
-                int temp = cursorIndex;
-                cursorIndex = GetGraphicalLineStart(selectIndex);
-                selectIndex = temp;
-            }
-        }
+        public void ExpandSelectGraphicalLineStart() => m_TextSelecting.ExpandSelectGraphicalLineStart();
 
         /// Expand the selection to the end of the line
         /// Used on a mac for CMD-SHIFT-RIGHT
-        public void ExpandSelectGraphicalLineEnd()
-        {
-            ClearCursorPos();
-            if (cursorIndex > selectIndex)
-                cursorIndex = GetGraphicalLineEnd(cursorIndex);
-            else
-            {
-                int temp = cursorIndex;
-                cursorIndex = GetGraphicalLineEnd(selectIndex);
-                selectIndex = temp;
-            }
-        }
+        public void ExpandSelectGraphicalLineEnd() => m_TextSelecting.ExpandSelectGraphicalLineEnd();
 
         /// Move the selection point to the start of the line
         /// Used on a Windows for SHIFT-Home
-        public void SelectGraphicalLineStart()
-        {
-            ClearCursorPos();
-            cursorIndex = GetGraphicalLineStart(cursorIndex);
-        }
+        public void SelectGraphicalLineStart() => m_TextSelecting.SelectGraphicalLineStart();
 
         /// Expand the selection to the end of the line
         /// Used on a mac for SHIFT-End
-        public void SelectGraphicalLineEnd()
-        {
-            ClearCursorPos();
-            cursorIndex = GetGraphicalLineEnd(cursorIndex);
-        }
+        public void SelectGraphicalLineEnd() => m_TextSelecting.SelectGraphicalLineEnd();
 
-        public void SelectParagraphForward()
-        {
-            ClearCursorPos();
-            bool wasBehind = cursorIndex < selectIndex;
-            if (cursorIndex < text.Length)
-            {
-                cursorIndex = IndexOfEndOfLine(cursorIndex + 1);
-                if (wasBehind && cursorIndex > selectIndex)
-                    cursorIndex = selectIndex;
-            }
-        }
+        public void SelectParagraphForward() => m_TextSelecting.SelectParagraphForward();
 
-        public void SelectParagraphBackward()
-        {
-            ClearCursorPos();
-            bool wasInFront = cursorIndex > selectIndex;
-            if (cursorIndex > 1)
-            {
-                cursorIndex = text.LastIndexOf('\n', cursorIndex - 2) + 1;
-                if (wasInFront && cursorIndex < selectIndex)
-                    cursorIndex = selectIndex;
-            }
-            else
-                selectIndex = cursorIndex =  0;
-        }
+        public void SelectParagraphBackward() => m_TextSelecting.SelectParagraphBackward();
 
         /// Select the word under the cursor
-        public void SelectCurrentWord()
-        {
-            var index = cursorIndex;
-            if (cursorIndex < selectIndex)
-            {
-                cursorIndex = FindEndOfClassification(index, Direction.Backward);
-                selectIndex = FindEndOfClassification(index, Direction.Forward);
-            }
-            else
-            {
-                cursorIndex = FindEndOfClassification(index, Direction.Forward);
-                selectIndex = FindEndOfClassification(index, Direction.Backward);
-            }
-
-            ClearCursorPos();
-            m_bJustSelected = true;
-        }
-
-        enum Direction
-        {
-            Forward,
-            Backward,
-        }
-
-        int FindEndOfClassification(int p, Direction dir)
-        {
-            if (text.Length == 0)
-                return 0;
-
-            if (p == text.Length)
-                p = PreviousCodePointIndex(p);
-
-            var t = ClassifyChar(p);
-            do
-            {
-                switch (dir)
-                {
-                    case Direction.Backward:
-                        p = PreviousCodePointIndex(p);
-                        if (p == 0)
-                            return ClassifyChar(0) == t ? 0 : NextCodePointIndex(0);
-                        break;
-
-                    case Direction.Forward:
-                        p = NextCodePointIndex(p);
-                        if (p == text.Length)
-                            return text.Length;
-                        break;
-                }
-            }
-            while (ClassifyChar(p) == t);
-            if (dir == Direction.Forward)
-                return p;
-            return NextCodePointIndex(p);
-        }
+        public void SelectCurrentWord() => m_TextSelecting.SelectCurrentWord();
 
         // Select the entire paragraph the cursor is on (separated by \n)
-        public void SelectCurrentParagraph()
-        {
-            ClearCursorPos();
-            int textLen = text.Length;
-
-            if (cursorIndex < textLen)
-            {
-                cursorIndex = IndexOfEndOfLine(cursorIndex) + 1;
-            }
-            if (selectIndex != 0)
-                selectIndex = text.LastIndexOf('\n', selectIndex - 1) + 1;
-        }
+        public void SelectCurrentParagraph() => m_TextSelecting.SelectCurrentParagraph();
 
         public void UpdateScrollOffsetIfNeeded(Event evt)
         {
@@ -1029,11 +412,26 @@ public void UpdateScrollOffsetIfNeeded(Event evt)
             }
         }
 
+        internal void UpdateTextHandle()
+        {
+            m_TextHandle = IMGUITextHandle.GetTextHandle(style, style.padding.Remove(position), textWithWhitespace, Color.white);
+            m_TextHandle.AddTextInfoToCache();
+            m_TextEditing.textHandle = m_TextHandle;
+            m_TextSelecting.textHandle = m_TextHandle;
+        }
+
+        Vector2 lastCursorPos = Vector2.zero;
+        Vector2 previousContentSize = Vector2.zero;
         [VisibleToOtherModules]
         internal void UpdateScrollOffset()
         {
-            int cursorPos = cursorIndex;
-            graphicalCursorPos = style.GetCursorPixelPosition(new Rect(0, 0, position.width, position.height), m_Content, cursorPos);
+            const int kCursorWidth = 1;
+            const float epsilon = 0.05f;
+
+            var newXOffset = scrollOffset.x;
+            var newYOffset = scrollOffset.y;
+
+            graphicalCursorPos = style.GetCursorPixelPosition(new Rect(0, 0, position.width, position.height), m_Content, m_TextSelecting.cursorIndexNoValidation);
 
             // The rectangle inside which the text is displayed.
             Rect viewRect = style.padding.Remove(position);
@@ -1044,56 +442,47 @@ internal void UpdateScrollOffset()
             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);
+            Vector2 contentSize = previousContentSize = style.GetPreferredSize(m_Content.textWithWhitespace, position);
 
             // If there is plenty of room, simply show entire string
             if (contentSize.x < viewRect.width)
             {
-                scrollOffset.x = 0;
+                newXOffset = 0;
             }
-            else if (m_RevealCursor)
+            else if (showCursor)
             {
                 //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;
+                if (localGraphicalCursorPos.x > scrollOffset.x + viewRect.width - kCursorWidth)
+                    newXOffset = localGraphicalCursorPos.x - viewRect.width + kCursorWidth;
                 //go left
-                if (localGraphicalCursorPos.x < scrollOffset.x)
-                    scrollOffset.x = localGraphicalCursorPos.x;
+                else if (localGraphicalCursorPos.x < scrollOffset.x)
+                    newXOffset = Mathf.Max(localGraphicalCursorPos.x, 0);
+                //go left - applies when deleting from the string
+                else if (previousContentSize.x != contentSize.x && localGraphicalCursorPos.x < viewRect.x + Math.Abs(contentSize.x + kCursorWidth - viewRect.width))
+                    newXOffset = Mathf.Max(viewRect.width - localGraphicalCursorPos.x, 0);
             }
+
             // ... 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 (m_RevealCursor)
+            if (Mathf.Round(contentSize.y) <= Mathf.Round(viewRect.height) || viewRect.height == 0)
+                newYOffset = 0;
+            else if (showCursor && Math.Abs(lastCursorPos.y - localGraphicalCursorPos.y) > epsilon)
             {
                 //go down
                 if (localGraphicalCursorPos.y + style.lineHeight > scrollOffset.y + viewRect.height)
-                    scrollOffset.y = localGraphicalCursorPos.y - viewRect.height + style.lineHeight;
+                    newYOffset = localGraphicalCursorPos.y - viewRect.height + style.lineHeight;
                 //go up
-                if (localGraphicalCursorPos.y < scrollOffset.y)
-                    scrollOffset.y = localGraphicalCursorPos.y;
+                else if (localGraphicalCursorPos.y < style.lineHeight + scrollOffset.y)
+                    newYOffset = localGraphicalCursorPos.y - style.lineHeight;
             }
 
-            // 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;
+            if (scrollOffset.x != newXOffset || scrollOffset.y != newYOffset)
+                scrollOffset = new Vector2(newXOffset, newYOffset < 0 ? 0 : newYOffset);
 
-            scrollOffset.y = scrollOffset.y < 0 ? 0 : scrollOffset.y;
-
-            m_RevealCursor = false;
+            lastCursorPos = localGraphicalCursorPos;
         }
 
         // TODO: get the height from the font
-
         public void DrawCursor(string newText)
         {
             string realText = text;
@@ -1106,16 +495,12 @@ public void DrawCursor(string newText)
             else
                 m_Content.text = newText;
 
-            graphicalCursorPos = style.GetCursorPixelPosition(new Rect(0, 0, position.width, position.height), m_Content, cursorPos);
-
-            //Debug.Log("Cursor pos: " + graphicalCursorPos);
+            graphicalCursorPos = style.GetCursorPixelPosition(position, m_Content, cursorPos);
 
             Vector2 originalContentOffset = style.contentOffset;
             style.contentOffset -= scrollOffset;
             style.Internal_clipOffset = scrollOffset;
 
-            // Debug.Log ("ScrollOffset : " + scrollOffset);
-
             GUIUtility.compositionCursorPos = GUIClip.UnclipToWindow(graphicalCursorPos + new Vector2(position.x, position.y + style.lineHeight) - scrollOffset);
 
             if (GUIUtility.compositionString.Length > 0)
@@ -1123,8 +508,8 @@ public void DrawCursor(string newText)
             else
                 style.DrawWithTextSelection(position, m_Content, controlID, cursorIndex, selectIndex);
 
-            if (m_iAltCursorPos != -1)
-                style.DrawCursor(position, m_Content, controlID, m_iAltCursorPos);
+            if (m_TextSelecting.iAltCursorPos != -1)
+                style.DrawCursor(position, m_Content, controlID, m_TextSelecting.iAltCursorPos);
 
             // reset
             style.contentOffset = originalContentOffset;
@@ -1133,100 +518,6 @@ public void DrawCursor(string newText)
             m_Content.text = realText;
         }
 
-        bool PerformOperation(TextEditOp operation, bool textIsReadOnly)
-        {
-            m_RevealCursor = true;
-
-            switch (operation)
-            {
-                // NOTE the TODOs below:
-                case TextEditOp.MoveLeft:           MoveLeft(); break;
-                case TextEditOp.MoveRight:          MoveRight(); break;
-                case TextEditOp.MoveUp:             MoveUp(); break;
-                case TextEditOp.MoveDown:           MoveDown(); break;
-                case TextEditOp.MoveLineStart:      MoveLineStart(); break;
-                case TextEditOp.MoveLineEnd:        MoveLineEnd(); break;
-                case TextEditOp.MoveWordRight:      MoveWordRight(); break;
-                case TextEditOp.MoveToStartOfNextWord:      MoveToStartOfNextWord(); break;
-                case TextEditOp.MoveToEndOfPreviousWord:        MoveToEndOfPreviousWord(); break;
-                case TextEditOp.MoveWordLeft:       MoveWordLeft(); break;
-                case TextEditOp.MoveTextStart:      MoveTextStart(); break;
-                case TextEditOp.MoveTextEnd:        MoveTextEnd(); break;
-                case TextEditOp.MoveParagraphForward:   MoveParagraphForward(); break;
-                case TextEditOp.MoveParagraphBackward:  MoveParagraphBackward(); break;
-                //      case TextEditOp.MovePageUp:     return MovePageUp (); break;
-                //      case TextEditOp.MovePageDown:       return MovePageDown (); break;
-                case TextEditOp.MoveGraphicalLineStart: MoveGraphicalLineStart(); break;
-                case TextEditOp.MoveGraphicalLineEnd: MoveGraphicalLineEnd(); break;
-                case TextEditOp.SelectLeft:         SelectLeft(); break;
-                case TextEditOp.SelectRight:            SelectRight(); break;
-                case TextEditOp.SelectUp:           SelectUp(); break;
-                case TextEditOp.SelectDown:         SelectDown(); break;
-                case TextEditOp.SelectWordRight:        SelectWordRight(); break;
-                case TextEditOp.SelectWordLeft:     SelectWordLeft(); break;
-                case TextEditOp.SelectToEndOfPreviousWord:  SelectToEndOfPreviousWord(); break;
-                case TextEditOp.SelectToStartOfNextWord:    SelectToStartOfNextWord(); break;
-
-                case TextEditOp.SelectTextStart:        SelectTextStart(); break;
-                case TextEditOp.SelectTextEnd:      SelectTextEnd(); break;
-                case TextEditOp.ExpandSelectGraphicalLineStart: ExpandSelectGraphicalLineStart(); break;
-                case TextEditOp.ExpandSelectGraphicalLineEnd: ExpandSelectGraphicalLineEnd(); break;
-                case TextEditOp.SelectParagraphForward:     SelectParagraphForward(); break;
-                case TextEditOp.SelectParagraphBackward:    SelectParagraphBackward(); break;
-                case TextEditOp.SelectGraphicalLineStart: SelectGraphicalLineStart(); break;
-                case TextEditOp.SelectGraphicalLineEnd: SelectGraphicalLineEnd(); break;
-                //      case TextEditOp.SelectPageUp:                   return SelectPageUp (); break;
-                //      case TextEditOp.SelectPageDown:             return SelectPageDown (); break;
-                case TextEditOp.Delete:
-                    if (textIsReadOnly) return false;
-                    else return Delete();
-                case TextEditOp.Backspace:
-                    if (textIsReadOnly) return false;
-                    else return Backspace();
-                case TextEditOp.Cut:
-                    if (textIsReadOnly) return false;
-                    else return Cut();
-                case TextEditOp.Copy:                               Copy(); break;
-                case TextEditOp.Paste:
-                    if (textIsReadOnly) return false;
-                    else return Paste();
-                case TextEditOp.SelectAll:                          SelectAll(); break;
-                case TextEditOp.SelectNone:                     SelectNone(); break;
-                //      case TextEditOp.ScrollStart:            return ScrollStart (); break;
-                //      case TextEditOp.ScrollEnd:          return ScrollEnd (); break;
-                //      case TextEditOp.ScrollPageUp:       return ScrollPageUp (); break;
-                //      case TextEditOp.ScrollPageDown:     return ScrollPageDown (); break;
-                case TextEditOp.DeleteWordBack:
-                    if (textIsReadOnly) return false;
-                    else return DeleteWordBack();
-                case TextEditOp.DeleteLineBack:
-                    if (textIsReadOnly) return false;
-                    else return DeleteLineBack();
-                case TextEditOp.DeleteWordForward:
-                    if (textIsReadOnly) return false;
-                    else return DeleteWordForward();
-                default:
-                    Debug.Log("Unimplemented: " + operation);
-                    break;
-            }
-
-            return false;
-        }
-
-        enum TextEditOp
-        {
-            MoveLeft, MoveRight, MoveUp, MoveDown, MoveLineStart, MoveLineEnd, MoveTextStart, MoveTextEnd, MovePageUp, MovePageDown,
-            MoveGraphicalLineStart, MoveGraphicalLineEnd, MoveWordLeft, MoveWordRight,
-            MoveParagraphForward, MoveParagraphBackward,  MoveToStartOfNextWord, MoveToEndOfPreviousWord,
-            SelectLeft, SelectRight, SelectUp, SelectDown, SelectTextStart, SelectTextEnd, SelectPageUp, SelectPageDown,
-            ExpandSelectGraphicalLineStart, ExpandSelectGraphicalLineEnd, SelectGraphicalLineStart, SelectGraphicalLineEnd,
-            SelectWordLeft, SelectWordRight, SelectToEndOfPreviousWord, SelectToStartOfNextWord,
-            SelectParagraphBackward, SelectParagraphForward,
-            Delete, Backspace, DeleteWordBack, DeleteWordForward, DeleteLineBack,
-            Cut, Copy, Paste, SelectAll, SelectNone,
-            ScrollStart, ScrollEnd, ScrollPageUp, ScrollPageDown
-        }
-
         string oldText;
         int oldPos, oldSelectPos;
 
@@ -1246,185 +537,28 @@ public void Undo()
 
         public bool Cut()
         {
-            //Debug.Log ("Cut");
             if (isPasswordField)
                 return false;
-            Copy();
-            return DeleteSelection();
+
+            return m_TextEditing.Cut();
         }
 
         public void Copy()
         {
-            //Debug.Log ("Copy");
-            if (selectIndex == cursorIndex)
-                return;
-
             if (isPasswordField)
                 return;
 
-            string selectedRenderedText = style.Internal_GetSelectedRenderedText(localPosition, m_Content, selectIndex, cursorIndex);
-
-            GUIUtility.systemCopyBuffer = selectedRenderedText;
+            m_TextSelecting.Copy();
         }
 
         internal Rect[] GetHyperlinksRect()
         {
-            return style.Internal_GetHyperlinksRect(localPosition, m_Content);
-        }
-
-        static string ReplaceNewlinesWithSpaces(string value)
-        {
-            // First get rid of Windows style new lines and then *nix so we don't leave '\r' around.
-            value = value.Replace("\r\n", " ");
-            value = value.Replace('\n', ' ');
-            // This probably won't happen, but just in case...
-            value = value.Replace('\r', ' ');
-            return value;
+            return style.GetHyperlinkRects(m_TextHandle, localPosition);
         }
 
         public bool Paste()
         {
-            //Debug.Log ("Paste");
-            string pasteval = GUIUtility.systemCopyBuffer;
-            if (pasteval != "")
-            {
-                if (!multiline)
-                    pasteval = ReplaceNewlinesWithSpaces(pasteval);
-                ReplaceSelection(pasteval);
-                return true;
-            }
-            return false;
-        }
-
-        static void MapKey(string key, TextEditOp action)
-        {
-            s_Keyactions[Event.KeyboardEvent(key)] = action;
-        }
-
-        static Dictionary<Event, TextEditOp> s_Keyactions;
-        /// Set up a platform independant keyboard->Edit action map. This varies depending on whether we are on mac or windows.
-        void InitKeyActions()
-        {
-            if (s_Keyactions != null)
-                return;
-            s_Keyactions = new Dictionary<Event, TextEditOp>();
-
-            // key mappings shared by the platforms
-            MapKey("left", TextEditOp.MoveLeft);
-            MapKey("right", TextEditOp.MoveRight);
-            MapKey("up", TextEditOp.MoveUp);
-            MapKey("down", TextEditOp.MoveDown);
-
-            MapKey("#left", TextEditOp.SelectLeft);
-            MapKey("#right", TextEditOp.SelectRight);
-            MapKey("#up", TextEditOp.SelectUp);
-            MapKey("#down", TextEditOp.SelectDown);
-
-            MapKey("delete", TextEditOp.Delete);
-            MapKey("backspace", TextEditOp.Backspace);
-            MapKey("#backspace", TextEditOp.Backspace);
-
-            // OSX is the special case for input shortcuts
-            if (SystemInfo.operatingSystemFamily == OperatingSystemFamily.MacOSX)
-            {
-                // Keyboard mappings for mac
-                // TODO     MapKey ("home", TextEditOp.ScrollStart);
-                // TODO     MapKey ("end", TextEditOp.ScrollEnd);
-                // TODO     MapKey ("page up", TextEditOp.ScrollPageUp);
-                // TODO     MapKey ("page down", TextEditOp.ScrollPageDown);
-
-                MapKey("^left", TextEditOp.MoveGraphicalLineStart);
-                MapKey("^right", TextEditOp.MoveGraphicalLineEnd);
-                // TODO     MapKey ("^up", TextEditOp.ScrollPageUp);
-                // TODO     MapKey ("^down", TextEditOp.ScrollPageDown);
-
-                MapKey("&left", TextEditOp.MoveWordLeft);
-                MapKey("&right", TextEditOp.MoveWordRight);
-                MapKey("&up", TextEditOp.MoveParagraphBackward);
-                MapKey("&down", TextEditOp.MoveParagraphForward);
-
-                MapKey("%left", TextEditOp.MoveGraphicalLineStart);
-                MapKey("%right", TextEditOp.MoveGraphicalLineEnd);
-                MapKey("%up", TextEditOp.MoveTextStart);
-                MapKey("%down", TextEditOp.MoveTextEnd);
-
-                MapKey("#home", TextEditOp.SelectTextStart);
-                MapKey("#end", TextEditOp.SelectTextEnd);
-                // TODO         MapKey ("#page up", TextEditOp.SelectPageUp);
-                // TODO         MapKey ("#page down", TextEditOp.SelectPageDown);
-
-                MapKey("#^left", TextEditOp.ExpandSelectGraphicalLineStart);
-                MapKey("#^right", TextEditOp.ExpandSelectGraphicalLineEnd);
-                MapKey("#^up", TextEditOp.SelectParagraphBackward);
-                MapKey("#^down", TextEditOp.SelectParagraphForward);
-
-                MapKey("#&left", TextEditOp.SelectWordLeft);
-                MapKey("#&right", TextEditOp.SelectWordRight);
-                MapKey("#&up", TextEditOp.SelectParagraphBackward);
-                MapKey("#&down", TextEditOp.SelectParagraphForward);
-
-                MapKey("#%left", TextEditOp.ExpandSelectGraphicalLineStart);
-                MapKey("#%right", TextEditOp.ExpandSelectGraphicalLineEnd);
-                MapKey("#%up", TextEditOp.SelectTextStart);
-                MapKey("#%down", TextEditOp.SelectTextEnd);
-
-                MapKey("%a", TextEditOp.SelectAll);
-                MapKey("%x", TextEditOp.Cut);
-                MapKey("%c", TextEditOp.Copy);
-                MapKey("%v", TextEditOp.Paste);
-
-                // emacs-like keybindings
-                MapKey("^d", TextEditOp.Delete);
-                MapKey("^h", TextEditOp.Backspace);
-                MapKey("^b", TextEditOp.MoveLeft);
-                MapKey("^f", TextEditOp.MoveRight);
-                MapKey("^a", TextEditOp.MoveLineStart);
-                MapKey("^e", TextEditOp.MoveLineEnd);
-
-                MapKey("&delete", TextEditOp.DeleteWordForward);
-                MapKey("&backspace", TextEditOp.DeleteWordBack);
-                MapKey("%backspace", TextEditOp.DeleteLineBack);
-            }
-            else
-            {
-                // Windows/Linux keymappings
-                MapKey("home", TextEditOp.MoveGraphicalLineStart);
-                MapKey("end", TextEditOp.MoveGraphicalLineEnd);
-                // TODO     MapKey ("page up", TextEditOp.MovePageUp);
-                // TODO     MapKey ("page down", TextEditOp.MovePageDown);
-
-                MapKey("%left", TextEditOp.MoveWordLeft);
-                MapKey("%right", TextEditOp.MoveWordRight);
-                MapKey("%up", TextEditOp.MoveParagraphBackward);
-                MapKey("%down", TextEditOp.MoveParagraphForward);
-
-                MapKey("^left", TextEditOp.MoveToEndOfPreviousWord);
-                MapKey("^right", TextEditOp.MoveToStartOfNextWord);
-                MapKey("^up", TextEditOp.MoveParagraphBackward);
-                MapKey("^down", TextEditOp.MoveParagraphForward);
-
-                MapKey("#^left", TextEditOp.SelectToEndOfPreviousWord);
-                MapKey("#^right", TextEditOp.SelectToStartOfNextWord);
-                MapKey("#^up", TextEditOp.SelectParagraphBackward);
-                MapKey("#^down", TextEditOp.SelectParagraphForward);
-
-                MapKey("#home", TextEditOp.SelectGraphicalLineStart);
-                MapKey("#end", TextEditOp.SelectGraphicalLineEnd);
-                // TODO         MapKey ("#page up", TextEditOp.SelectPageUp);
-                // TODO         MapKey ("#page down", TextEditOp.SelectPageDown);
-
-                MapKey("^delete", TextEditOp.DeleteWordForward);
-                MapKey("^backspace", TextEditOp.DeleteWordBack);
-                MapKey("%backspace", TextEditOp.DeleteLineBack);
-
-                MapKey("^a", TextEditOp.SelectAll);
-                MapKey("^x", TextEditOp.Cut);
-                MapKey("^c", TextEditOp.Copy);
-                MapKey("^v", TextEditOp.Paste);
-                MapKey("#delete", TextEditOp.Cut);
-                MapKey("^insert", TextEditOp.Copy);
-                MapKey("#insert", TextEditOp.Paste);
-            }
+            return m_TextEditing.Paste();
         }
 
         public void DetectFocusChange()
@@ -1442,49 +576,12 @@ internal virtual void OnDetectFocusChange()
 
         internal virtual void OnCursorIndexChange()
         {
+            UpdateScrollOffset();
         }
 
         internal virtual void OnSelectIndexChange()
         {
-        }
-
-        private void ClampTextIndex(ref int index)
-        {
-            index = Mathf.Clamp(index, 0, text.Length);
-        }
-
-        void EnsureValidCodePointIndex(ref int index)
-        {
-            ClampTextIndex(ref index);
-            if (!IsValidCodePointIndex(index))
-                index = NextCodePointIndex(index);
-        }
-
-        bool IsValidCodePointIndex(int index)
-        {
-            if (index < 0 || index > text.Length)
-                return false;
-            if (index == 0 || index == text.Length)
-                return true;
-            return !char.IsLowSurrogate(text[index]);
-        }
-
-        int PreviousCodePointIndex(int index)
-        {
-            if (index > 0)
-                index--;
-            while (index > 0 && char.IsLowSurrogate(text[index]))
-                index--;
-            return index;
-        }
-
-        int NextCodePointIndex(int index)
-        {
-            if (index < text.Length)
-                index++;
-            while (index < text.Length && char.IsLowSurrogate(text[index]))
-                index++;
-            return index;
+            UpdateScrollOffset();
         }
     }
 } // namespace
diff --git a/Modules/IMGUI/TextSelectingUtilities.cs b/Modules/IMGUI/TextSelectingUtilities.cs
index f8539d6144..4c05697dc3 100644
--- a/Modules/IMGUI/TextSelectingUtilities.cs
+++ b/Modules/IMGUI/TextSelectingUtilities.cs
@@ -18,7 +18,7 @@ internal class TextSelectingUtilities
         private bool m_bJustSelected = false;
         private bool m_MouseDragSelectsWholeWords = false;
         private int m_DblClickInitPos = 0;
-        TextHandle m_TextHandle;
+        public TextHandle textHandle;
         private const int kMoveDownHeight = 5;
         private const char kNewLineChar = '\n';
 
@@ -39,14 +39,26 @@ public bool revealCursor
             }
         }
 
-        int m_CharacterCount => m_TextHandle.textInfo.characterCount;
-        int characterCount => (m_CharacterCount > 0 && m_TextHandle.textInfo.textElementInfo[m_CharacterCount - 1].character == 0x200B) ? m_CharacterCount - 1 : m_CharacterCount;
-        TextElementInfo[] m_TextElementInfos => m_TextHandle.textInfo.textElementInfo;
+        int m_CharacterCount => textHandle.textInfo.characterCount;
+        int characterCount => (m_CharacterCount > 0 && textHandle.textInfo.textElementInfo[m_CharacterCount - 1].character == 0x200B) ? m_CharacterCount - 1 : m_CharacterCount;
+        TextElementInfo[] m_TextElementInfos => textHandle.textInfo.textElementInfo;
 
         int m_CursorIndex = 0;
         public int cursorIndex
         {
-            get => m_TextHandle.IsPlaceholder ? 0 : EnsureValidCodePointIndex(m_CursorIndex);
+            get => textHandle.IsPlaceholder ? 0 : EnsureValidCodePointIndex(m_CursorIndex);
+            set
+            {
+                if (m_CursorIndex != value)
+                {
+                    m_CursorIndex = value;
+                    OnCursorIndexChange?.Invoke();
+                }
+            }
+        }
+        internal int cursorIndexNoValidation
+        {
+            get { return m_CursorIndex; }
             set
             {
                 if (m_CursorIndex != value)
@@ -65,7 +77,7 @@ internal void SetCursorIndexWithoutNotify(int index)
         internal int m_SelectIndex = 0;
         public int selectIndex
         {
-            get => m_TextHandle.IsPlaceholder ? 0 : EnsureValidCodePointIndex(m_SelectIndex);
+            get => textHandle.IsPlaceholder ? 0 : EnsureValidCodePointIndex(m_SelectIndex);
             set
             {
 
@@ -90,16 +102,16 @@ public string selectedText
                     return "";
 
                 if (cursorIndex < selectIndex)
-                    return m_TextHandle.Substring(cursorIndex, selectIndex - cursorIndex);
+                    return textHandle.Substring(cursorIndex, selectIndex - cursorIndex);
                 else
-                    return m_TextHandle.Substring(selectIndex, cursorIndex - selectIndex);
+                    return textHandle.Substring(selectIndex, cursorIndex - selectIndex);
             }
         }
 
 
         public TextSelectingUtilities(TextHandle textHandle)
         {
-            m_TextHandle = textHandle;
+            this.textHandle = textHandle;
         }
 
         internal bool HandleKeyEvent(Event e)
@@ -269,12 +281,12 @@ public void SelectRight()
 
         public void SelectUp()
         {
-            cursorIndex = m_TextHandle.LineUpCharacterPosition(cursorIndex);
+            cursorIndex = textHandle.LineUpCharacterPosition(cursorIndex);
         }
 
         public void SelectDown()
         {
-            cursorIndex = m_TextHandle.LineDownCharacterPosition(cursorIndex);
+            cursorIndex = textHandle.LineDownCharacterPosition(cursorIndex);
         }
 
         /// Select to the end of the text
@@ -373,7 +385,7 @@ public void SelectParagraphBackward()
             bool wasInFront = cursorIndex > selectIndex;
             if (cursorIndex > 1)
             {
-                cursorIndex = m_TextHandle.LastIndexOf(kNewLineChar, cursorIndex - 2) + 1;
+                cursorIndex = textHandle.LastIndexOf(kNewLineChar, cursorIndex - 2) + 1;
                 if (wasInFront && cursorIndex < selectIndex)
                     cursorIndex = selectIndex;
             }
@@ -409,7 +421,7 @@ public void SelectCurrentParagraph()
             if (cursorIndex < textLen)
                 cursorIndex = IndexOfEndOfLine(cursorIndex);
             if (selectIndex != 0)
-                selectIndex = m_TextHandle.LastIndexOf(kNewLineChar, selectIndex - 1) + 1;
+                selectIndex = textHandle.LastIndexOf(kNewLineChar, selectIndex - 1) + 1;
         }
 
         /// Move the cursor one character to the right and deselect.
@@ -455,7 +467,7 @@ public void MoveUp()
                 selectIndex = cursorIndex;
             else
                 cursorIndex = selectIndex;
-            cursorIndex = selectIndex = m_TextHandle.LineUpCharacterPosition(cursorIndex);
+            cursorIndex = selectIndex = textHandle.LineUpCharacterPosition(cursorIndex);
             if (cursorIndex <= 0)
                 ClearCursorPos();
         }
@@ -467,7 +479,7 @@ public void MoveDown()
                 selectIndex = cursorIndex;
             else
                 cursorIndex = selectIndex;
-            cursorIndex = selectIndex = m_TextHandle.LineDownCharacterPosition(cursorIndex);
+            cursorIndex = selectIndex = textHandle.LineDownCharacterPosition(cursorIndex);
             if (cursorIndex == characterCount)
                 ClearCursorPos();
         }
@@ -548,7 +560,7 @@ public void MoveParagraphBackward()
             cursorIndex = cursorIndex < selectIndex ? cursorIndex : selectIndex;
             if (cursorIndex > 1)
             {
-                selectIndex = cursorIndex = m_TextHandle.LastIndexOf(kNewLineChar, cursorIndex - 2) + 1;
+                selectIndex = cursorIndex = textHandle.LastIndexOf(kNewLineChar, cursorIndex - 2) + 1;
             }
             else
                 selectIndex = cursorIndex = 0;
@@ -638,7 +650,7 @@ public void DblClickSnap(DblClickSnapping snapping)
 
         protected internal void MoveCursorToPosition_Internal(Vector2 cursorPosition, bool shift)
         {
-            selectIndex = m_TextHandle.GetCursorIndexFromPosition(cursorPosition);
+            selectIndex = textHandle.GetCursorIndexFromPosition(cursorPosition);
 
             if (!shift)
             {
@@ -646,15 +658,26 @@ protected internal void MoveCursorToPosition_Internal(Vector2 cursorPosition, bo
             }
         }
 
+        protected internal void MoveAltCursorToPosition(Vector2 cursorPosition)
+        {
+            int index = textHandle.GetCursorIndexFromPosition(cursorPosition);
+            iAltCursorPos = Mathf.Min(characterCount, index);
+        }
+
+        protected internal bool IsOverSelection(Vector2 cursorPosition)
+        {
+            int p = textHandle.GetCursorIndexFromPosition(cursorPosition);
+            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);
+                cursorIndex = textHandle.GetCursorIndexFromPosition(cursorPosition);
             else // snap to words/paragraphs
             {
-                int p = m_TextHandle.GetCursorIndexFromPosition(cursorPosition);
-
+                int p = textHandle.GetCursorIndexFromPosition(cursorPosition);
                 p = EnsureValidCodePointIndex(p);
                 m_DblClickInitPos = EnsureValidCodePointIndex(m_DblClickInitPos);
 
@@ -676,11 +699,11 @@ public void SelectToPosition(Vector2 cursorPosition)
                     if (p < m_DblClickInitPos)
                     {
                         if (p > 0)
-                            cursorIndex = m_TextHandle.LastIndexOf(kNewLineChar, Mathf.Max(0, p - 2)) + 1;
+                            cursorIndex = textHandle.LastIndexOf(kNewLineChar, Mathf.Max(0, p - 2)) + 1;
                         else
                             cursorIndex = 0;
 
-                        selectIndex = m_TextHandle.LastIndexOf(kNewLineChar, Mathf.Min(characterCount - 1, m_DblClickInitPos));
+                        selectIndex = textHandle.LastIndexOf(kNewLineChar, Mathf.Min(characterCount - 1, m_DblClickInitPos));
                     }
                     else
                     {
@@ -691,7 +714,7 @@ public void SelectToPosition(Vector2 cursorPosition)
                         else
                             cursorIndex = characterCount;
 
-                        selectIndex = m_TextHandle.LastIndexOf(kNewLineChar, Mathf.Max(0, m_DblClickInitPos - 2)) + 1;
+                        selectIndex = textHandle.LastIndexOf(kNewLineChar, Mathf.Max(0, m_DblClickInitPos - 2)) + 1;
                     }
                 }
             }
@@ -817,11 +840,6 @@ int FindEndOfClassification(int p, Direction dir)
         internal Action OnSelectIndexChange;
         internal Action OnRevealCursorChange;
 
-        int ClampTextIndex(int index)
-        {
-            return Mathf.Clamp(index, 0, characterCount);
-        }
-
         internal int EnsureValidCodePointIndex(int index)
         {
             index = ClampTextIndex(index);
@@ -839,9 +857,14 @@ bool IsValidCodePointIndex(int index)
             return !char.IsLowSurrogate(m_TextElementInfos[index].character);
         }
 
+        int ClampTextIndex(int index)
+        {
+            return Mathf.Clamp(index, 0, characterCount);
+        }
+
         int IndexOfEndOfLine(int startIndex)
         {
-            int index = m_TextHandle.IndexOf(kNewLineChar, startIndex);
+            int index = textHandle.IndexOf(kNewLineChar, startIndex);
             return (index != -1 ? index : characterCount);
         }
 
@@ -851,6 +874,7 @@ public int PreviousCodePointIndex(int index)
                 index--;
             while (index > 0 && char.IsLowSurrogate(m_TextElementInfos[index].character))
                 index--;
+
             return index;
         }
 
@@ -860,23 +884,24 @@ public int NextCodePointIndex(int index)
                 index++;
             while (index < characterCount && char.IsLowSurrogate(m_TextElementInfos[index].character))
                 index++;
+
             return index;
         }
 
         int GetGraphicalLineStart(int p)
         {
-            Vector2 point = m_TextHandle.GetCursorPositionFromStringIndexUsingLineHeight(p);
+            Vector2 point = textHandle.GetCursorPositionFromStringIndexUsingLineHeight(p);
             point.y -= 1.0f / GUIUtility.pixelsPerPoint; // we make sure no floating point errors can make us land on another line
             point.x = 0;
-            return m_TextHandle.GetCursorIndexFromPosition(point);
+            return textHandle.GetCursorIndexFromPosition(point);
         }
 
         int GetGraphicalLineEnd(int p)
         {
-            Vector2 point = m_TextHandle.GetCursorPositionFromStringIndexUsingLineHeight(p);
+            Vector2 point = textHandle.GetCursorPositionFromStringIndexUsingLineHeight(p);
             point.y -= 1.0f / GUIUtility.pixelsPerPoint; // we make sure no floating point errors can make us land on another line
             point.x += 5000;
-            return m_TextHandle.GetCursorIndexFromPosition(point);
+            return textHandle.GetCursorIndexFromPosition(point);
         }
 
         public void Copy()
diff --git a/Modules/InputLegacy/Input.bindings.cs b/Modules/InputLegacy/Input.bindings.cs
index b1c519f4aa..35287d5c71 100644
--- a/Modules/InputLegacy/Input.bindings.cs
+++ b/Modules/InputLegacy/Input.bindings.cs
@@ -298,43 +298,76 @@ internal static class InputUnsafeUtility
             internal extern static bool GetKeyString(string name);
             // Burst shadow
             [NativeThrows]
+            // This will only be referenced from Burst-generated code, in place of the version without the
+            // __Managed suffix. So we need to make sure it will not get stripped.
+            [RequiredMember]
+
             internal extern static unsafe bool GetKeyString__Unmanaged(byte* name, int nameLen);
             [NativeThrows]
             internal extern static bool GetKeyUpString(string name);
             // Burst shadow
             [NativeThrows]
+            // This will only be referenced from Burst-generated code, in place of the version without the
+            // __Managed suffix. So we need to make sure it will not get stripped.
+            [RequiredMember]
+
             internal extern static unsafe bool GetKeyUpString__Unmanaged(byte* name, int nameLen);
             [NativeThrows]
             internal extern static bool GetKeyDownString(string name);
             // Burst shadow
             [NativeThrows]
+            // This will only be referenced from Burst-generated code, in place of the version without the
+            // __Managed suffix. So we need to make sure it will not get stripped.
+            [RequiredMember]
+
             internal extern static unsafe bool GetKeyDownString__Unmanaged(byte* name, int nameLen);
             [NativeThrows]
             internal extern static float GetAxis(string axisName);
             // Burst shadow
             [NativeThrows]
+            // This will only be referenced from Burst-generated code, in place of the version without the
+            // __Managed suffix. So we need to make sure it will not get stripped.
+            [RequiredMember]
             internal extern static unsafe float GetAxis__Unmanaged(byte* axisName, int axisNameLen);
             [NativeThrows]
             internal extern static float GetAxisRaw(string axisName);
             // Burst shadow
             [NativeThrows]
+            // This will only be referenced from Burst-generated code, in place of the version without the
+            // __Managed suffix. So we need to make sure it will not get stripped.
+            [RequiredMember]
+
             internal extern static unsafe float GetAxisRaw__Unmanaged(byte* axisName, int axisNameLen);
             [NativeThrows]
             internal extern static bool GetButton(string buttonName);
             // Burst shadow
             [NativeThrows]
+            // This will only be referenced from Burst-generated code, in place of the version without the
+            // __Managed suffix. So we need to make sure it will not get stripped.
+            [RequiredMember]
+
             internal extern static unsafe bool GetButton__Unmanaged(byte* buttonName, int buttonNameLen);
             [NativeThrows]
             internal extern static bool GetButtonDown(string buttonName);
             // Burst shadow
             [NativeThrows]
+            // This will only be referenced from Burst-generated code, in place of the version without the
+            // __Managed suffix. So we need to make sure it will not get stripped.
+            [RequiredMember]
+
             internal extern static unsafe byte GetButtonDown__Unmanaged(byte* buttonName, int buttonNameLen);
             [NativeThrows]
             internal extern static bool GetButtonUp(string buttonName);
             // Burst shadow
             [NativeThrows]
+            // This will only be referenced from Burst-generated code, in place of the version without the
+            // __Managed suffix. So we need to make sure it will not get stripped.
+            [RequiredMember]
             internal extern static unsafe bool GetButtonUp__Unmanaged(byte* buttonName, int buttonNameLen);
             internal extern static bool IsJoystickPreconfigured(string joystickName);
+            // This will only be referenced from Burst-generated code, in place of the version without the
+            // __Managed suffix. So we need to make sure it will not get stripped.
+            [RequiredMember]
             internal extern static unsafe bool IsJoystickPreconfigured__Unmanaged(byte* joystickName, int joystickNameLen);
         }
     }
diff --git a/Modules/Licensing/Public/LicensingUtility.bindings.cs b/Modules/Licensing/Public/LicensingUtility.bindings.cs
index 88a64330c2..b3261f06c3 100644
--- a/Modules/Licensing/Public/LicensingUtility.bindings.cs
+++ b/Modules/Licensing/Public/LicensingUtility.bindings.cs
@@ -88,6 +88,10 @@ public static class LicensingUtility
 
         [NativeMethod("HasEntitlementsExtended")]
         public extern static EntitlementInfo[] HasEntitlementsExtended(string[] entitlements, bool includeCustomData);
+
+        public static extern void InvokeLicenseUpdateCallbacks();
+
+        public static extern bool UpdateLicense();
     }
 
 }
diff --git a/Modules/Licensing/UI/Data/Events/Base/Notification.cs b/Modules/Licensing/UI/Data/Events/Base/Notification.cs
new file mode 100644
index 0000000000..bc1fa0be42
--- /dev/null
+++ b/Modules/Licensing/UI/Data/Events/Base/Notification.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;
+using System.Diagnostics.CodeAnalysis;
+
+namespace UnityEditor.Licensing.UI.Data.Events.Base;
+
+[Serializable]
+class Notification
+{
+    public NotificationType NotificationTypeAsEnum => Enum.TryParse<NotificationType>(
+        notificationType, true, out var targetType)
+        ? targetType
+        : Events.NotificationType.Unknown;
+
+    public string message;
+    public string messageType;
+    public string notificationType;
+    public string sentDate;
+    public string title;
+
+    public override string ToString()
+    {
+        return $"[{notificationType}] {title}: {message}. Sent at: {sentDate}";
+    }
+}
diff --git a/Modules/Licensing/UI/Data/Events/Base/NotificationReasons.cs b/Modules/Licensing/UI/Data/Events/Base/NotificationReasons.cs
new file mode 100644
index 0000000000..c7f42b6671
--- /dev/null
+++ b/Modules/Licensing/UI/Data/Events/Base/NotificationReasons.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
+
+namespace UnityEditor.Licensing.UI.Data.Events.Base;
+
+struct NotificationReasons
+{
+    // applicable to LicenseUpdateNotification
+    public const string k_EntitlementGroupAdded = "EntitlementGroupAdded";
+    public const string k_EntitlementGroupRemoved = "EntitlementGroupRemoved";
+    public const string k_EntitlementGroupRevoked = "EntitlementGroupRevoked";
+    public const string k_EntitlementGroupReturned = "EntitlementGroupReturned";
+
+    // applicable to LicenseExpiredNotification
+    public const string k_UpdateDateExpired = "EntitlementGroupUpdateDateExpired";
+    public const string k_EndDateExpired = "EntitlementGroupEndDateExpired";
+}
diff --git a/Modules/Licensing/UI/Data/Events/Base/NotificationType.cs b/Modules/Licensing/UI/Data/Events/Base/NotificationType.cs
new file mode 100644
index 0000000000..dcf2fbe5d3
--- /dev/null
+++ b/Modules/Licensing/UI/Data/Events/Base/NotificationType.cs
@@ -0,0 +1,13 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace UnityEditor.Licensing.UI.Data.Events;
+
+enum NotificationType
+{
+    Unknown,
+    LicenseUpdate,
+    LicenseExpired,
+    LicenseOfflineValidityEnding,
+}
diff --git a/Modules/Licensing/UI/Data/Events/Base/NotificationWithDetails.cs b/Modules/Licensing/UI/Data/Events/Base/NotificationWithDetails.cs
new file mode 100644
index 0000000000..3a953a1b1a
--- /dev/null
+++ b/Modules/Licensing/UI/Data/Events/Base/NotificationWithDetails.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.Diagnostics.CodeAnalysis;
+
+namespace UnityEditor.Licensing.UI.Data.Events.Base;
+
+[ExcludeFromCodeCoverage]
+[Serializable]
+class NotificationWithDetails<TDetails> : Notification
+{
+    public TDetails details;
+}
diff --git a/Modules/Licensing/UI/Data/Events/LicenseExpiredNotification.cs b/Modules/Licensing/UI/Data/Events/LicenseExpiredNotification.cs
new file mode 100644
index 0000000000..7b6ba71408
--- /dev/null
+++ b/Modules/Licensing/UI/Data/Events/LicenseExpiredNotification.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;
+using UnityEditor.Licensing.UI.Data.Events.Base;
+
+namespace UnityEditor.Licensing.UI.Data.Events;
+
+[Serializable]
+class LicenseExpiredNotification : NotificationWithDetails<LicenseExpiredNotificationDetails[]>
+{
+    public bool HasAnyEndDateExpired()
+    {
+        return HasAnyReason(NotificationReasons.k_EndDateExpired);
+    }
+
+    public bool HasAnyUpdateDateExpired()
+    {
+        return HasAnyReason(NotificationReasons.k_UpdateDateExpired);
+    }
+
+    bool HasAnyReason(string reason)
+    {
+        foreach (var detail in details)
+        {
+            if (detail.reason == reason)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public IList<string> GetProductNamesWithReason(string theReason)
+    {
+        var productNames = new List<string>();
+        foreach (var detail in details)
+        {
+            if (detail.reason == theReason)
+            {
+                productNames.Add(detail.productName);
+            }
+        }
+
+        return productNames;
+    }
+}
+
+[Serializable]
+class LicenseExpiredNotificationDetails
+{
+    public string entitlementGroupId;
+    public string productName;
+    public string reason;
+    public string endDate;
+}
diff --git a/Modules/Licensing/UI/Data/Events/LicenseOfflineValidityEndingNotification.cs b/Modules/Licensing/UI/Data/Events/LicenseOfflineValidityEndingNotification.cs
new file mode 100644
index 0000000000..a4581ece64
--- /dev/null
+++ b/Modules/Licensing/UI/Data/Events/LicenseOfflineValidityEndingNotification.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 System;
+using UnityEditor.Licensing.UI.Data.Events.Base;
+
+namespace UnityEditor.Licensing.UI.Data.Events;
+
+[Serializable]
+class LicenseOfflineValidityEndingNotification : NotificationWithDetails<LicenseOfflineValidityEndingNotificationDetails[]> { }
+
+[Serializable]
+class LicenseOfflineValidityEndingNotificationDetails
+{
+    public string entitlementGroupId;
+    public string productName;
+    public string endDate;
+}
diff --git a/Modules/Licensing/UI/Data/Events/LicenseUpdateNotification.cs b/Modules/Licensing/UI/Data/Events/LicenseUpdateNotification.cs
new file mode 100644
index 0000000000..c0fbcd9725
--- /dev/null
+++ b/Modules/Licensing/UI/Data/Events/LicenseUpdateNotification.cs
@@ -0,0 +1,49 @@
+// 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 UnityEditor.Licensing.UI.Data.Events.Base;
+
+namespace UnityEditor.Licensing.UI.Data.Events;
+
+[Serializable]
+class LicenseUpdateNotification : NotificationWithDetails<LicenseUpdateNotificationDetails[]>
+{
+    public bool HasAnyReason(string reason)
+    {
+        foreach (var detail in details)
+        {
+            if (detail.reason == reason)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public IList<string> GetProductNamesWithReason(string theReason)
+    {
+        var productNames = new List<string>();
+        foreach (var detail in details)
+        {
+            if (detail.reason == theReason)
+            {
+                productNames.Add(detail.productName);
+            }
+        }
+
+        return productNames;
+    }
+}
+
+[Serializable]
+class LicenseUpdateNotificationDetails
+{
+    public string entitlementGroupId;
+    public string productName;
+    public string updateType;
+    public string reason;
+}
diff --git a/Modules/Licensing/UI/Events/Buttons/CloseButton.cs b/Modules/Licensing/UI/Events/Buttons/CloseButton.cs
new file mode 100644
index 0000000000..0da011d22f
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Buttons/CloseButton.cs
@@ -0,0 +1,24 @@
+// 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.Licensing.UI.Events.Text;
+
+namespace UnityEditor.Licensing.UI.Events.Buttons;
+
+sealed class CloseButton : TemplateEventsButton
+{
+    Action m_CloseAction;
+
+    public CloseButton(Action closeAction, Action additionalClickAction)
+        : base(LicenseTrStrings.BtnClose, additionalClickAction)
+    {
+        m_CloseAction = closeAction;
+    }
+
+    protected override void Click()
+    {
+        m_CloseAction?.Invoke();
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Buttons/CloseProjectButton.cs b/Modules/Licensing/UI/Events/Buttons/CloseProjectButton.cs
new file mode 100644
index 0000000000..6484d69dc2
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Buttons/CloseProjectButton.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 UnityEditor.Licensing.UI.Events.Text;
+
+namespace UnityEditor.Licensing.UI.Events.Buttons;
+
+sealed class CloseProjectButton : TemplateEventsButton
+{
+    INativeApiWrapper m_NativeApiWrapper;
+    Action m_CloseAction;
+
+    public CloseProjectButton(Action additionalClickEvent, Action closeAction, INativeApiWrapper nativeApiWrapper)
+        : base(LicenseTrStrings.BtnCloseProject, additionalClickEvent)
+    {
+        m_CloseAction = closeAction;
+        m_NativeApiWrapper = nativeApiWrapper;
+    }
+
+    protected override void Click()
+    {
+        m_CloseAction?.Invoke();
+        m_NativeApiWrapper.ExitEditor();
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Buttons/EventsButtonFactory.cs b/Modules/Licensing/UI/Events/Buttons/EventsButtonFactory.cs
new file mode 100644
index 0000000000..3a0bcd9dbc
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Buttons/EventsButtonFactory.cs
@@ -0,0 +1,48 @@
+// 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.Licensing.UI.Events.Buttons;
+
+class EventsButtonFactory : IEventsButtonFactory
+{
+    INativeApiWrapper m_NativeApiWrapper;
+    Action m_CloseModalAction;
+
+    public EventsButtonFactory(INativeApiWrapper nativeApiWrapper,
+        Action closeModalAction)
+    {
+        m_CloseModalAction = closeModalAction;
+        m_NativeApiWrapper = nativeApiWrapper;
+    }
+
+    public VisualElement Create(EventsButtonType buttonType, Action additionalCustomClickAction)
+    {
+        var visualElement = buttonType switch
+        {
+            EventsButtonType.Ok => new OkButton(m_CloseModalAction, additionalCustomClickAction, m_NativeApiWrapper),
+            EventsButtonType.ManageLicense => new ManageLicenseButton(m_CloseModalAction, additionalCustomClickAction, m_NativeApiWrapper),
+            EventsButtonType.SaveAndQuit => BuildSaveAndCloseBundle(additionalCustomClickAction),
+            EventsButtonType.UpdateLicense => new UpdateLicenseButton(m_CloseModalAction, additionalCustomClickAction, m_NativeApiWrapper),
+            EventsButtonType.OpenUnityHub => new OpenUnityHubButton(m_CloseModalAction, additionalCustomClickAction, m_NativeApiWrapper),
+            _ => throw new ArgumentException($"Unknown button type: {buttonType}")
+        };
+
+        return visualElement;
+    }
+
+    VisualElement BuildSaveAndCloseBundle(Action additionalCustomAction)
+    {
+        VisualElement visualElement = new VisualElement();
+        visualElement.Add(new CloseProjectButton(additionalCustomAction, m_CloseModalAction, m_NativeApiWrapper));
+        if (m_NativeApiWrapper.HasUnsavedScenes())
+        {
+            visualElement.Add(new SaveAndQuitButton(m_CloseModalAction, additionalCustomAction, m_NativeApiWrapper));
+        }
+
+        return visualElement;
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Buttons/EventsButtonType.cs b/Modules/Licensing/UI/Events/Buttons/EventsButtonType.cs
new file mode 100644
index 0000000000..0cbc464d87
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Buttons/EventsButtonType.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;
+
+namespace UnityEditor.Licensing.UI.Events.Buttons;
+
+enum EventsButtonType
+{
+    Ok,
+    ManageLicense,
+    SaveAndQuit,
+    Quit,
+    UpdateLicense,
+    OpenUnityHub
+}
diff --git a/Modules/Licensing/UI/Events/Buttons/IEventsButtonFactory.cs b/Modules/Licensing/UI/Events/Buttons/IEventsButtonFactory.cs
new file mode 100644
index 0000000000..20e3c16acf
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Buttons/IEventsButtonFactory.cs
@@ -0,0 +1,13 @@
+// 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.Licensing.UI.Events.Buttons;
+
+interface IEventsButtonFactory
+{
+    public VisualElement Create(EventsButtonType buttonType, Action additionalCustomClickAction = null);
+}
diff --git a/Modules/Licensing/UI/Events/Buttons/ManageLicenseButton.cs b/Modules/Licensing/UI/Events/Buttons/ManageLicenseButton.cs
new file mode 100644
index 0000000000..7b4b102902
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Buttons/ManageLicenseButton.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;
+using UnityEditor.Licensing.UI.Events.Text;
+
+namespace UnityEditor.Licensing.UI.Events.Buttons;
+
+sealed class ManageLicenseButton : TemplateEventsButton
+{
+    INativeApiWrapper m_NativeApiWrapper;
+    Action m_CloseAction;
+
+    public ManageLicenseButton(Action closeAction, Action additionalClickAction, INativeApiWrapper nativeApiWrapper)
+        : base(LicenseTrStrings.BtnManageLicense, additionalClickAction)
+    {
+        m_NativeApiWrapper = nativeApiWrapper;
+        m_CloseAction = closeAction;
+    }
+
+    protected override void Click()
+    {
+        m_CloseAction?.Invoke();
+
+        m_NativeApiWrapper.OpenHubLicenseManagementWindow();
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Buttons/OkButton.cs b/Modules/Licensing/UI/Events/Buttons/OkButton.cs
new file mode 100644
index 0000000000..452010a472
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Buttons/OkButton.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;
+using UnityEditor.Licensing.UI.Events.Text;
+
+namespace UnityEditor.Licensing.UI.Events.Buttons;
+
+sealed class OkButton : TemplateEventsButton
+{
+    INativeApiWrapper m_NativeApiWrapper;
+    Action m_CloseAction;
+
+    public OkButton(Action closeAction, Action additionalClickAction, INativeApiWrapper nativeApiWrapper)
+        : base(LicenseTrStrings.BtnOk, additionalClickAction)
+    {
+        m_NativeApiWrapper = nativeApiWrapper;
+        m_CloseAction = closeAction;
+    }
+
+    protected override void Click()
+    {
+        m_CloseAction?.Invoke();
+
+        m_NativeApiWrapper.InvokeLicenseUpdateCallbacks();
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Buttons/OpenUnityHubButton.cs b/Modules/Licensing/UI/Events/Buttons/OpenUnityHubButton.cs
new file mode 100644
index 0000000000..6596b4b02b
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Buttons/OpenUnityHubButton.cs
@@ -0,0 +1,29 @@
+// 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.Licensing.UI.Events.Text;
+
+namespace UnityEditor.Licensing.UI.Events.Buttons;
+
+class OpenUnityHubButton : TemplateEventsButton
+{
+    INativeApiWrapper m_NativeApiWrapper;
+    Action m_CloseAction;
+
+    public OpenUnityHubButton(Action closeAction, Action additionalClickAction, INativeApiWrapper nativeApiWrapper)
+        : base(LicenseTrStrings.BtnOpenUnityHub, additionalClickAction)
+    {
+        m_NativeApiWrapper = nativeApiWrapper;
+        m_CloseAction = closeAction;
+    }
+
+    protected override void Click()
+    {
+        m_CloseAction?.Invoke();
+
+        m_NativeApiWrapper.InvokeLicenseUpdateCallbacks();
+        m_NativeApiWrapper.OpenHubLicenseManagementWindow();
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Buttons/SaveAndQuitButton.cs b/Modules/Licensing/UI/Events/Buttons/SaveAndQuitButton.cs
new file mode 100644
index 0000000000..a9cdbb5415
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Buttons/SaveAndQuitButton.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;
+using UnityEditor.Licensing.UI.Events.Text;
+
+namespace UnityEditor.Licensing.UI.Events.Buttons;
+
+sealed class SaveAndQuitButton : TemplateEventsButton
+{
+    INativeApiWrapper m_NativeApiWrapper;
+    Action m_CloseAction;
+
+    public SaveAndQuitButton(Action closeAction, Action additionalClickAction, INativeApiWrapper nativeApiWrapper)
+        : base(LicenseTrStrings.BtnSaveAndQuit, additionalClickAction)
+    {
+        m_NativeApiWrapper = nativeApiWrapper;
+        m_CloseAction = closeAction;
+    }
+
+    protected override void Click()
+    {
+        m_CloseAction?.Invoke();
+        var _ = m_NativeApiWrapper.SaveUnsavedChanges();
+        m_NativeApiWrapper.ExitEditor();
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Buttons/TemplateEventsButton.cs b/Modules/Licensing/UI/Events/Buttons/TemplateEventsButton.cs
new file mode 100644
index 0000000000..ecb638f463
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Buttons/TemplateEventsButton.cs
@@ -0,0 +1,45 @@
+// 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.Licensing.UI.Events.Buttons;
+
+abstract class TemplateEventsButton : Button
+{
+    Action m_AdditionalClickAction;
+
+    protected TemplateEventsButton(string labelText, Action additionalClickAction)
+    {
+        m_AdditionalClickAction = additionalClickAction;
+
+        text = labelText;
+        name = string.Empty;
+
+        foreach (var c in text)
+        {
+            if (!char.IsWhiteSpace(c))
+            {
+                name += c;
+            }
+        }
+
+        // For guidelines refer to:
+        // https://www.figma.com/file/GdibV2c1v5vP8kgBEraDgj/%E2%9D%96-Editor-Foundations-%E2%80%93%E2%80%93-Figma-Toolkit-(Community)?node-id=4159-111248&t=Uuszom0SMChZTRHQ-0
+        style.marginRight = 0;
+        style.marginLeft = 3;
+
+        clicked += OnClicked;
+    }
+
+    void OnClicked()
+    {
+        m_AdditionalClickAction?.Invoke();
+
+        Click();
+    }
+
+    protected abstract void Click();
+}
diff --git a/Modules/Licensing/UI/Events/Buttons/UpdateLicenseButton.cs b/Modules/Licensing/UI/Events/Buttons/UpdateLicenseButton.cs
new file mode 100644
index 0000000000..88c6055672
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Buttons/UpdateLicenseButton.cs
@@ -0,0 +1,29 @@
+// 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.Licensing.UI.Events.Text;
+
+namespace UnityEditor.Licensing.UI.Events.Buttons;
+
+sealed class UpdateLicenseButton : TemplateEventsButton
+{
+    INativeApiWrapper m_NativeApiWrapper;
+    Action m_CloseAction;
+
+    public UpdateLicenseButton(Action closeAction, Action additionalClickAction, INativeApiWrapper nativeApiWrapper)
+        : base(LicenseTrStrings.BtnConnect, additionalClickAction)
+    {
+        m_NativeApiWrapper = nativeApiWrapper;
+        m_CloseAction = closeAction;
+    }
+
+    protected override void Click()
+    {
+        if (m_NativeApiWrapper.UpdateLicense())
+        {
+            m_CloseAction?.Invoke();
+        }
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Handlers/INotificationHandler.cs b/Modules/Licensing/UI/Events/Handlers/INotificationHandler.cs
new file mode 100644
index 0000000000..a10550107e
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Handlers/INotificationHandler.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;
+
+namespace UnityEditor.Licensing.UI.Events.Handlers;
+
+interface INotificationHandler
+{
+    public void Handle(bool isHumanControllingUs)
+    {
+        if (isHumanControllingUs)
+        {
+            HandleUI();
+        }
+        else
+        {
+            HandleBatchmode();
+        }
+    }
+
+    public void HandleUI();
+
+    public void HandleBatchmode();
+
+}
diff --git a/Modules/Licensing/UI/Events/Handlers/LicenseExpiredHandler.cs b/Modules/Licensing/UI/Events/Handlers/LicenseExpiredHandler.cs
new file mode 100644
index 0000000000..266a697121
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Handlers/LicenseExpiredHandler.cs
@@ -0,0 +1,82 @@
+// 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.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Data.Events.Base;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Events.Handlers;
+
+class LicenseExpiredHandler : INotificationHandler
+{
+    readonly INativeApiWrapper m_NativeApiWrapper;
+    readonly ILicenseLogger m_LicenseLogger;
+    readonly IModalWrapper m_ModalWrapper;
+    LicenseExpiredNotification m_Notification;
+
+    public LicenseExpiredHandler(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, IModalWrapper modalWrapper, string jsonNotification)
+    {
+        m_NativeApiWrapper = nativeApiWrapper;
+        m_LicenseLogger = licenseLogger;
+        m_ModalWrapper = modalWrapper;
+        m_Notification = m_NativeApiWrapper.CreateObjectFromJson<LicenseExpiredNotification>(jsonNotification);
+    }
+
+    public void HandleUI()
+    {
+        // offline validity period expired
+        if (m_Notification.HasAnyUpdateDateExpired())
+        {
+            m_ModalWrapper.ShowLicenseOfflineValidityEndedWindow(m_NativeApiWrapper, m_LicenseLogger, m_Notification);
+        }
+
+        // license actually expired
+        if (m_Notification.HasAnyEndDateExpired())
+        {
+            m_ModalWrapper.ShowLicenseExpiredWindow(m_NativeApiWrapper, m_LicenseLogger, m_Notification);
+        }
+    }
+
+    public void HandleBatchmode()
+    {
+        // offline validity period expired
+        if (m_Notification.HasAnyUpdateDateExpired())
+        {
+            var log = BuildLicenseOfflineValidityEndedText(m_Notification);
+            m_LicenseLogger.DebugLogNoStackTrace(log, LogType.Error, LicenseTrStrings.LicenseUpdateDateExpiredTag);
+        }
+
+        if (m_Notification.HasAnyEndDateExpired())
+        {
+            var log = BuildLicenseExpiredText(m_NativeApiWrapper.HasUiEntitlement(), m_Notification);
+            m_LicenseLogger.DebugLogNoStackTrace(log, LogType.Error, LicenseTrStrings.LicenseExpiredTag);
+        }
+    }
+
+    public static string BuildLicenseOfflineValidityEndedText(LicenseExpiredNotification notification)
+    {
+        return Helper.Utils.GetDescriptionMessageForProducts(notification.GetProductNamesWithReason(NotificationReasons.k_UpdateDateExpired),
+            LicenseTrStrings.OfflineValidityEndedDescriptionOneLicense,
+            LicenseTrStrings.OfflineValidityEndedDescriptionManyLicenses);
+    }
+
+    public static string BuildLicenseExpiredText(bool hasUiEntitlement, LicenseExpiredNotification notification)
+    {
+        var strProduct = notification.GetProductNamesWithReason(NotificationReasons.k_EndDateExpired);
+
+        if (hasUiEntitlement)
+        {
+            return Helper.Utils.GetDescriptionMessageForProducts(strProduct,
+                LicenseTrStrings.ExpiredDescriptionOneLicenseWithUiEntitlement,
+                LicenseTrStrings.ExpiredDescriptionManyLicensesWithUiEntitlement);
+        }
+
+        return Helper.Utils.GetDescriptionMessageForProducts(strProduct,
+            LicenseTrStrings.ExpiredDescriptionOneLicenseNoUiEntitlement,
+            LicenseTrStrings.ExpiredDescriptionManyLicensesNoUiEntitlement);
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Handlers/LicenseOfflineValidityEndingHandler.cs b/Modules/Licensing/UI/Events/Handlers/LicenseOfflineValidityEndingHandler.cs
new file mode 100644
index 0000000000..c6be001588
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Handlers/LicenseOfflineValidityEndingHandler.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 UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Events.Handlers;
+
+class LicenseOfflineValidityEndingHandler : INotificationHandler
+{
+    readonly INativeApiWrapper m_NativeApiWrapper;
+    readonly ILicenseLogger m_LicenseLogger;
+    readonly IModalWrapper m_ModalWrapper;
+    LicenseOfflineValidityEndingNotification m_Notification;
+
+    public LicenseOfflineValidityEndingHandler(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, IModalWrapper modalWrapper, string jsonNotification)
+    {
+        m_NativeApiWrapper = nativeApiWrapper;
+        m_LicenseLogger = licenseLogger;
+        m_ModalWrapper = modalWrapper;
+        m_Notification = m_NativeApiWrapper.CreateObjectFromJson<LicenseOfflineValidityEndingNotification>(jsonNotification);
+    }
+
+    public void HandleUI()
+    {
+        m_ModalWrapper.ShowLicenseOfflineValidityEndingWindow(m_NativeApiWrapper, m_LicenseLogger, m_Notification);
+    }
+
+    public void HandleBatchmode()
+    {
+        BuildOfflineValidityEndingText(m_Notification.details, out _, out var description);
+        m_LicenseLogger.DebugLogNoStackTrace(description, tag: LicenseTrStrings.LicenseOfflineValidityEndingTag);
+    }
+
+    public static void BuildOfflineValidityEndingText(IEnumerable<LicenseOfflineValidityEndingNotificationDetails> details,
+        out string shortTitle, out string description)
+    {
+        var remainingDays = CalculateRemainingDays(details);
+
+        var productNames = new List<string>();
+        foreach (var detail in details)
+        {
+            productNames.Add(detail.productName);
+        }
+
+        var oxfordFormattedProductNames = Helper.Utils.GetOxfordCommaString(productNames);
+
+        if (remainingDays > 1)
+        {
+            shortTitle = string.Format(LicenseTrStrings.OfflineValidityEndingShortTitleManyDays, remainingDays);
+            description = string.Format(
+                productNames.Count == 1
+                    ? LicenseTrStrings.OfflineValidityEndingDescriptionOneLicenseManyDays
+                    : LicenseTrStrings.OfflineValidityEndingDescriptionManyLicensesManyDays,
+                oxfordFormattedProductNames, remainingDays);
+        }
+        else
+        {
+            shortTitle = LicenseTrStrings.OfflineValidityEndingShortTitleOneDay;
+            description =
+                string.Format(
+                    productNames.Count == 1
+                        ? LicenseTrStrings.OfflineValidityEndingDescriptionOneLicenseOneDay
+                        : LicenseTrStrings.OfflineValidityEndingDescriptionManyLicensesOneDay,
+                    oxfordFormattedProductNames, remainingDays);
+        }
+
+        shortTitle = string.Format(shortTitle, remainingDays);
+        description = string.Format(description, remainingDays);
+    }
+
+    static int CalculateRemainingDays(IEnumerable<LicenseOfflineValidityEndingNotificationDetails> details)
+    {
+        var endDates = new List<DateTime>();
+
+        foreach (var detail in details)
+        {
+            if (DateTime.TryParse(detail.endDate, out var parsed))
+            {
+                endDates.Add(parsed.ToUniversalTime());
+            }
+        }
+
+        if (endDates.Count < 1)
+        {
+            return -1;
+        }
+
+        endDates.Sort();
+
+        // Notification times are not exactly 1, 2,... days ahead the end datetimes,
+        // but adjusted to some specific local times. To always get the days number we are interested in,
+        // calculation should be made with only Date component and in local time.
+        return endDates[0].ToLocalTime().Date.Subtract(DateTime.Now.Date).Days;
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Handlers/LicenseUpdateHandler.cs b/Modules/Licensing/UI/Events/Handlers/LicenseUpdateHandler.cs
new file mode 100644
index 0000000000..5028289c49
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Handlers/LicenseUpdateHandler.cs
@@ -0,0 +1,140 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Data.Events.Base;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Events.Handlers;
+
+class LicenseUpdateHandler : INotificationHandler
+{
+    readonly INativeApiWrapper m_NativeApiWrapper;
+    readonly ILicenseLogger m_LicenseLogger;
+    readonly IModalWrapper m_ModalWrapper;
+    LicenseUpdateNotification m_Notification;
+
+    public LicenseUpdateHandler(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, IModalWrapper modalWrapper, string jsonNotification)
+    {
+        m_NativeApiWrapper = nativeApiWrapper;
+        m_LicenseLogger = licenseLogger;
+        m_ModalWrapper = modalWrapper;
+        m_Notification = m_NativeApiWrapper.CreateObjectFromJson<LicenseUpdateNotification>(jsonNotification);
+    }
+
+    public void HandleUI()
+    {
+        // revoke
+        if (m_Notification.HasAnyReason(NotificationReasons.k_EntitlementGroupRevoked))
+        {
+            m_ModalWrapper.ShowLicenseRevokedWindow(m_NativeApiWrapper, m_LicenseLogger, m_Notification);
+        }
+
+        // assigned
+        if (m_Notification.HasAnyReason(NotificationReasons.k_EntitlementGroupAdded))
+        {
+            LogMessage(NotificationReasons.k_EntitlementGroupAdded);
+        }
+
+        // removed
+        if (m_Notification.HasAnyReason(NotificationReasons.k_EntitlementGroupRemoved))
+        {
+            m_ModalWrapper.ShowLicenseRemovedWindow(m_NativeApiWrapper, m_LicenseLogger, m_Notification);
+        }
+
+        // returned
+        if (m_Notification.HasAnyReason(NotificationReasons.k_EntitlementGroupReturned))
+        {
+            m_ModalWrapper.ShowLicenseReturnedWindow(m_NativeApiWrapper, m_LicenseLogger, m_Notification);
+        }
+    }
+
+    public void HandleBatchmode()
+    {
+        // revoke
+        if (m_Notification.HasAnyReason(NotificationReasons.k_EntitlementGroupRevoked))
+        {
+            LogMessage(NotificationReasons.k_EntitlementGroupRevoked);
+        }
+
+        // assigned
+        if (m_Notification.HasAnyReason(NotificationReasons.k_EntitlementGroupAdded))
+        {
+            LogMessage(NotificationReasons.k_EntitlementGroupAdded);
+        }
+
+        // removed
+        if (m_Notification.HasAnyReason(NotificationReasons.k_EntitlementGroupRemoved))
+        {
+            LogMessage(NotificationReasons.k_EntitlementGroupRemoved);
+        }
+
+        // returned
+        if (m_Notification.HasAnyReason(NotificationReasons.k_EntitlementGroupReturned))
+        {
+            LogMessage(NotificationReasons.k_EntitlementGroupReturned);
+        }
+    }
+
+    void LogMessage(string reason)
+    {
+        var productNames = m_Notification.GetProductNamesWithReason(reason);
+
+        var message = string.Empty;
+        var tag = string.Empty;
+        switch (reason)
+        {
+            case NotificationReasons.k_EntitlementGroupAdded:
+                message = Helper.Utils.GetDescriptionMessageForProducts(productNames,
+                    LicenseTrStrings.LicenseAddedDescription,
+                    LicenseTrStrings.LicensesAddedDescription);
+                tag = LicenseTrStrings.LicenseAddedTag;
+                break;
+            case NotificationReasons.k_EntitlementGroupRemoved:
+            {
+                message = BuildLicenseRemovedText(m_NativeApiWrapper.HasUiEntitlement(), m_Notification);
+                tag = LicenseTrStrings.LicenseRemovedTag;
+                break;
+            }
+            case NotificationReasons.k_EntitlementGroupRevoked:
+                message = Helper.Utils.GetDescriptionMessageForProducts(productNames,
+                    LicenseTrStrings.LicenseRevokedDescription,
+                    LicenseTrStrings.LicensesRevokedDescription);
+                tag = LicenseTrStrings.LicenseRevokedTag;
+                break;
+            case NotificationReasons.k_EntitlementGroupReturned:
+                message = BuildLicenseReturnedText(m_NativeApiWrapper.HasUiEntitlement(), m_Notification);
+                tag = LicenseTrStrings.LicenseReturnedTag;
+                break;
+        }
+
+        m_LicenseLogger.DebugLogNoStackTrace(message, tag: tag);
+    }
+
+    public static string BuildLicenseRemovedText(bool hasUiEntitlement, LicenseUpdateNotification notification)
+    {
+        var productNames = notification.GetProductNamesWithReason(NotificationReasons.k_EntitlementGroupRemoved);
+        return hasUiEntitlement
+            ? Helper.Utils.GetDescriptionMessageForProducts(productNames,
+                LicenseTrStrings.RemovedDescriptionOneLicenseWithUiEntitlement,
+                LicenseTrStrings.RemovedDescriptionManyLicensesWithUiEntitlement)
+            : Helper.Utils.GetDescriptionMessageForProducts(productNames,
+                LicenseTrStrings.RemovedDescriptionOneLicenseNoUiEntitlement,
+                LicenseTrStrings.RemovedDescriptionManyLicensesNoUiEntitlement);
+    }
+
+    public static string BuildLicenseReturnedText(bool hasUiEntitlement, LicenseUpdateNotification notification)
+    {
+        var productNames = notification.GetProductNamesWithReason(NotificationReasons.k_EntitlementGroupReturned);
+        return hasUiEntitlement
+            ? Helper.Utils.GetDescriptionMessageForProducts(productNames,
+                LicenseTrStrings.ReturnedDescriptionOneLicenseWithUiEntitlement,
+                LicenseTrStrings.ReturnedDescriptionManyLicensesWithUiEntitlement)
+            : Helper.Utils.GetDescriptionMessageForProducts(productNames,
+                LicenseTrStrings.ReturnedDescriptionOneLicenseNoUiEntitlement,
+                LicenseTrStrings.ReturnedDescriptionManyLicensesNoUiEntitlement);
+    }
+}
diff --git a/Modules/Licensing/UI/Events/ILicenseNotificationHandlerFactory.cs b/Modules/Licensing/UI/Events/ILicenseNotificationHandlerFactory.cs
new file mode 100644
index 0000000000..646ed8a559
--- /dev/null
+++ b/Modules/Licensing/UI/Events/ILicenseNotificationHandlerFactory.cs
@@ -0,0 +1,13 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Handlers;
+
+namespace UnityEditor.Licensing.UI.Events;
+
+interface ILicenseNotificationHandlerFactory
+{
+    public INotificationHandler GetHandler(NotificationType notificationType, string jsonNotification);
+}
diff --git a/Modules/Licensing/UI/Events/IModalWrapper.cs b/Modules/Licensing/UI/Events/IModalWrapper.cs
new file mode 100644
index 0000000000..1b3e9ea478
--- /dev/null
+++ b/Modules/Licensing/UI/Events/IModalWrapper.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 UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Helper;
+
+namespace UnityEditor.Licensing.UI.Events;
+
+interface IModalWrapper
+{
+    void ShowLicenseExpiredWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseExpiredNotification notification);
+    void ShowLicenseRemovedWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseUpdateNotification notification);
+    void ShowLicenseReturnedWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseUpdateNotification notification);
+    void ShowLicenseRevokedWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseUpdateNotification notification);
+    void ShowLicenseOfflineValidityEndingWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseOfflineValidityEndingNotification notification);
+    void ShowLicenseOfflineValidityEndedWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseExpiredNotification notification);
+}
diff --git a/Modules/Licensing/UI/Events/INotificationDispatcher.cs b/Modules/Licensing/UI/Events/INotificationDispatcher.cs
new file mode 100644
index 0000000000..d189a9ecf2
--- /dev/null
+++ b/Modules/Licensing/UI/Events/INotificationDispatcher.cs
@@ -0,0 +1,10 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace UnityEditor.Licensing.UI.Events;
+
+interface INotificationDispatcher
+{
+    public void Dispatch(string jsonNotification);
+}
diff --git a/Modules/Licensing/UI/Events/LicenseNotificationDispatcher.cs b/Modules/Licensing/UI/Events/LicenseNotificationDispatcher.cs
new file mode 100644
index 0000000000..2cd27ac52e
--- /dev/null
+++ b/Modules/Licensing/UI/Events/LicenseNotificationDispatcher.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 UnityEditor.Licensing.UI.Data.Events.Base;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Events;
+
+class LicenseNotificationDispatcher : INotificationDispatcher
+{
+    ILicenseNotificationHandlerFactory m_NotificationHandlerFactory;
+    ILicenseLogger m_LicenseLogger;
+    readonly INativeApiWrapper m_NativeApiWrapper;
+
+    public LicenseNotificationDispatcher(ILicenseNotificationHandlerFactory notificationHandlerFactory,
+        ILicenseLogger licenseLogger, INativeApiWrapper nativeApiWrapper)
+    {
+        m_NotificationHandlerFactory = notificationHandlerFactory;
+        m_LicenseLogger = licenseLogger;
+        m_NativeApiWrapper = nativeApiWrapper;
+    }
+
+    public void Dispatch(string jsonNotification)
+    {
+        var notificationBase = m_NativeApiWrapper.CreateObjectFromJson<Notification>(jsonNotification);
+
+        if (notificationBase.messageType != "Notification")
+        {
+            m_LicenseLogger.LogError($"Unintended message type: \"{notificationBase.messageType}\" is received!");
+            return;
+        }
+
+        try
+        {
+            var notificationHandler = m_NotificationHandlerFactory.GetHandler(notificationBase.NotificationTypeAsEnum, jsonNotification);
+            notificationHandler.Handle(m_NativeApiWrapper.IsHumanControllingUs());
+        }
+        catch (ArgumentException)
+        {
+            // log that received an unknown notification
+            m_LicenseLogger.DebugLogNoStackTrace($"There is no handler for: " +
+                $"notificationType: \"{notificationBase.notificationType}\", " +
+                $"title: \"{notificationBase.title}\", " +
+                $"message: \"{notificationBase.message}\", " +
+                $"sentDate: \"{notificationBase.sentDate}\""
+            );
+        }
+    }
+}
diff --git a/Modules/Licensing/UI/Events/LicenseNotificationHandlerFactory.cs b/Modules/Licensing/UI/Events/LicenseNotificationHandlerFactory.cs
new file mode 100644
index 0000000000..88038b7b47
--- /dev/null
+++ b/Modules/Licensing/UI/Events/LicenseNotificationHandlerFactory.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;
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Handlers;
+using UnityEditor.Licensing.UI.Helper;
+
+namespace UnityEditor.Licensing.UI.Events;
+
+class LicenseNotificationHandlerFactory : ILicenseNotificationHandlerFactory
+{
+    readonly ILicenseLogger m_LicenseLogger;
+    readonly INativeApiWrapper m_NativeApiWrapper;
+    readonly IModalWrapper m_ModalWrapper;
+
+    public LicenseNotificationHandlerFactory(ILicenseLogger licenseLogger, INativeApiWrapper nativeApiWrapper, IModalWrapper modalWrapper)
+    {
+        m_LicenseLogger = licenseLogger;
+        m_NativeApiWrapper = nativeApiWrapper;
+        m_ModalWrapper = modalWrapper;
+    }
+
+    public INotificationHandler GetHandler(NotificationType notificationType, string jsonNotification)
+    {
+        switch (notificationType)
+        {
+            case NotificationType.LicenseUpdate:
+                return new LicenseUpdateHandler(m_NativeApiWrapper, m_LicenseLogger, m_ModalWrapper, jsonNotification);
+            case NotificationType.LicenseOfflineValidityEnding:
+                return new LicenseOfflineValidityEndingHandler(m_NativeApiWrapper, m_LicenseLogger, m_ModalWrapper, jsonNotification);
+            case NotificationType.LicenseExpired:
+                return new LicenseExpiredHandler(m_NativeApiWrapper, m_LicenseLogger, m_ModalWrapper, jsonNotification);
+            case NotificationType.Unknown:
+            default:
+                throw new ArgumentException("Cannot create handler for unknown notification type.");
+        }
+    }
+}
diff --git a/Modules/Licensing/UI/Events/ModalWrapper.cs b/Modules/Licensing/UI/Events/ModalWrapper.cs
new file mode 100644
index 0000000000..d0178c2e73
--- /dev/null
+++ b/Modules/Licensing/UI/Events/ModalWrapper.cs
@@ -0,0 +1,42 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Windows;
+using UnityEditor.Licensing.UI.Helper;
+
+namespace UnityEditor.Licensing.UI.Events;
+
+class ModalWrapper : IModalWrapper
+{
+    public void ShowLicenseExpiredWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseExpiredNotification notification)
+    {
+        LicenseExpiredWindow.ShowWindow(nativeApiWrapper, licenseLogger, notification);
+    }
+
+    public void ShowLicenseRemovedWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseUpdateNotification notification)
+    {
+        LicenseRemovedWindow.ShowWindow(nativeApiWrapper, licenseLogger, notification);
+    }
+
+    public void ShowLicenseReturnedWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseUpdateNotification notification)
+    {
+        LicenseReturnedWindow.ShowWindow(nativeApiWrapper, licenseLogger, notification);
+    }
+
+    public void ShowLicenseRevokedWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseUpdateNotification notification)
+    {
+        LicenseRevokedWindow.ShowWindow(nativeApiWrapper, licenseLogger, notification);
+    }
+
+    public void ShowLicenseOfflineValidityEndingWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseOfflineValidityEndingNotification notification)
+    {
+        LicenseOfflineValidityEndingWindow.ShowWindow(nativeApiWrapper, licenseLogger, notification);
+    }
+
+    public void ShowLicenseOfflineValidityEndedWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, LicenseExpiredNotification notification)
+    {
+        LicenseOfflineValidityEndedWindow.ShowWindow(nativeApiWrapper, licenseLogger, notification);
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Text/LicenseTrStrings.cs b/Modules/Licensing/UI/Events/Text/LicenseTrStrings.cs
new file mode 100644
index 0000000000..c1b7c858fe
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Text/LicenseTrStrings.cs
@@ -0,0 +1,80 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace UnityEditor.Licensing.UI.Events.Text;
+
+static class LicenseTrStrings
+{
+    // Buttons
+    public static readonly string BtnCloseProject = L10n.Tr("Quit");
+    public static readonly string BtnSaveAndQuit = L10n.Tr("Save and Quit");
+    public static readonly string BtnManageLicense = L10n.Tr("Manage License");
+    public static readonly string BtnOk = L10n.Tr("OK");
+    public static readonly string BtnClose = L10n.Tr("Close");
+    public static readonly string BtnConnect = L10n.Tr("Connect");
+    public static readonly string BtnOpenUnityHub = L10n.Tr("Open Unity Hub");
+
+    // LicenseRevokedWindowContents
+    public static readonly string RevokedWindowTitle = L10n.Tr("License revoked");
+    public static readonly string RevokedDescriptionNoUiEntitlement = L10n.Tr("Your license is revoked and your project will close. Contact your organization manager if you think your license was revoked by mistake.");
+    public static readonly string RevokedDescriptionWithUiEntitlement = L10n.Tr("You can continue to work in the Unity Editor, but you'll lose access to the features or packages associated with this license. Contact your organization manager if you think your license was revoked by mistake.");
+    public static readonly string RevokedShortTitleOneLicense = L10n.Tr("Your {0} license has been revoked.");
+    public static readonly string RevokedShortTitleManyLicenses = L10n.Tr("Your {0} licenses have been revoked.");
+    public static readonly string RemovedWindowTitle = L10n.Tr("License removed");
+    public static readonly string RemovedDescriptionOneLicenseNoUiEntitlement = L10n.Tr("Your license for {0} has been removed and your project will close. To reactivate the license, use the Unity Hub to resolve or contact your administrator.");
+    public static readonly string RemovedDescriptionManyLicensesNoUiEntitlement = L10n.Tr("Your licenses for {0} have been removed and your project will close. To reactivate the license, use the Unity Hub to resolve or contact your administrator.");
+    public static readonly string RemovedDescriptionOneLicenseWithUiEntitlement = L10n.Tr("Your license for {0} has been removed. You can continue to use the Unity Editor, but some features might be unavailable. To reactivate the license, use the Unity Hub to resolve or contact your administrator.");
+    public static readonly string RemovedDescriptionManyLicensesWithUiEntitlement = L10n.Tr("Your licenses for {0} have been removed. You can continue to use the Unity Editor, but some features might be unavailable. To reactivate the license, use the Unity Hub to resolve or contact your administrator.");
+
+    // LicenseReturnedWindowContents
+    public static string ReturnedWindowTitle = L10n.Tr("License returned");
+    public static readonly string ReturnedDescriptionOneLicenseNoUiEntitlement = L10n.Tr("Your license for {0} has been returned and your project will close. Activate your license again if you want to continue working with the Unity Editor.");
+    public static readonly string ReturnedDescriptionManyLicensesNoUiEntitlement = L10n.Tr("Your licenses for {0} have been returned and your project will close. Activate your license again if you want to continue working with the Unity Editor.");
+    public static readonly string ReturnedDescriptionOneLicenseWithUiEntitlement = L10n.Tr("Your license for {0} has been returned. You can continue to use the Unity Editor, but some features might be unavailable. To reactivate the license, use the Unity Hub to resolve or contact your administrator.");
+    public static readonly string ReturnedDescriptionManyLicensesWithUiEntitlement = L10n.Tr("Your licenses for {0} have been returned. You can continue to use the Unity Editor, but some features might be unavailable. To reactivate the license, use the Unity Hub to resolve or contact your administrator.");
+
+    // LicenseExpiredWindowContents
+    public static string ExpiredWindowTitle = L10n.Tr("License expired");
+    public static readonly string ExpiredDescriptionOneLicenseNoUiEntitlement = L10n.Tr("Your license for {0} has been expired and your project will close. To reactivate the license, contact your administrator or use the Unity Hub to resolve.");
+    public static readonly string ExpiredDescriptionManyLicensesNoUiEntitlement = L10n.Tr("Your licenses for {0} have been expired and your project will close. To reactivate the license, contact your administrator or use the Unity Hub to resolve.");
+    public static readonly string ExpiredDescriptionOneLicenseWithUiEntitlement = L10n.Tr("Your license for {0} has been expired. You can continue to use the Unity Editor, but some features might be unavailable. To reactivate the license, use the Unity Hub to resolve or contact your administrator.");
+    public static readonly string ExpiredDescriptionManyLicensesWithUiEntitlement = L10n.Tr("Your licenses for {0} have been expired. You can continue to use the Unity Editor, but some features might be unavailable. To reactivate the license, use the Unity Hub to resolve or contact your administrator.");
+
+    // LicenseOfflineValidityEndingWindowContents
+    public static readonly string OfflineValidityEndingWindowTitle = L10n.Tr("Are you online?");
+    public static readonly string OfflineValidityEndingShortTitleOneDay = L10n.Tr("Connect to the internet and confirm your license. Your license will become invalid if you stay offline for more than {0} day.");
+    public static readonly string OfflineValidityEndingShortTitleManyDays = L10n.Tr("Connect to the internet and confirm your license. Your license will become invalid if you stay offline for more than {0} days.");
+    public static readonly string OfflineValidityEndingDescriptionOneLicenseOneDay = L10n.Tr("You seem to be offline while using a {0} license. Connect to the internet to confirm your license. Your offline grace period ends in 1 day.");
+    public static readonly string OfflineValidityEndingDescriptionOneLicenseManyDays = L10n.Tr("You seem to be offline while using a {0} license. Connect to the internet to confirm your license. Your offline grace period ends in {1} days.");
+    public static readonly string OfflineValidityEndingDescriptionManyLicensesOneDay = L10n.Tr("You seem to be offline while using {0} licenses. Connect to the internet to confirm your license. Your offline grace period ends in 1 day.");
+    public static readonly string OfflineValidityEndingDescriptionManyLicensesManyDays = L10n.Tr("You seem to be offline while using {0} licenses. Connect to the internet to confirm your license. Your offline grace period ends in {1} days.");
+
+    // LicenseOfflineValidityEndedWindowContents
+    public static readonly string OfflineValidityEndedWindowTitle = L10n.Tr("Are you online?");
+    public static readonly string OfflineValidityEndedDescriptionOneLicense = L10n.Tr("You seem to be offline while using a {0} license. Your offline grace period has ended and your project will close unless you connect to the internet and confirm your license.");
+    public static readonly string OfflineValidityEndedDescriptionManyLicenses = L10n.Tr("You seem to be offline while using {0} licenses. Your offline grace period has ended and your project will close unless you connect to the internet and confirm your licenses.");
+
+    // EntitlementGroupAdded
+    public static readonly string LicenseAddedTag = L10n.Tr("License added");
+    public static readonly string LicenseAddedDescription = L10n.Tr("New {0} license has been added.");
+    public static readonly string LicensesAddedDescription = L10n.Tr("New {0} licenses have been added.");
+
+    // EntitlementGroupRemoved
+    public static readonly string LicenseRemovedTag = L10n.Tr("License removed");
+
+    // EntitlementGroupRevoked
+    public static readonly string LicenseRevokedTag = L10n.Tr("License revoked");
+    public static readonly string LicenseRevokedDescription = L10n.Tr("{0} license has been revoked.");
+    public static readonly string LicensesRevokedDescription = L10n.Tr("{0} licenses have been revoked.");
+
+    // EntitlementGroupReturned
+    public static readonly string LicenseReturnedTag = L10n.Tr("License returned");
+
+    // LicenseOfflineValidityPeriodEnding
+    public static readonly string LicenseOfflineValidityEndingTag = L10n.Tr("License offline grace period ends soon");
+
+    // LicenseExpired
+    public static readonly string LicenseUpdateDateExpiredTag = L10n.Tr("License offline grace period expired");
+    public static readonly string LicenseExpiredTag = L10n.Tr("License expired");
+}
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseExpiredWindow.cs b/Modules/Licensing/UI/Events/Windows/LicenseExpiredWindow.cs
new file mode 100644
index 0000000000..ffe5242d9e
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseExpiredWindow.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 UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseExpiredWindow : TemplateLicenseEventWindow
+{
+    public static void ShowWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, object notification)
+    {
+        s_NativeApiWrapper = nativeApiWrapper;
+        s_Notification = notification as LicenseExpiredNotification;
+        s_LicenseLogger = licenseLogger;
+
+        TemplateLicenseEventWindow.ShowWindow<LicenseExpiredWindow>(LicenseTrStrings.ExpiredWindowTitle, true);
+    }
+
+    public void CreateGUI()
+    {
+        s_Root = new LicenseExpiredWindowContents(s_NativeApiWrapper.HasUiEntitlement(),
+            (LicenseExpiredNotification)s_Notification,
+            new EventsButtonFactory(s_NativeApiWrapper, Close),
+            s_LicenseLogger);
+        rootVisualElement.Add(s_Root);
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseExpiredWindowContents.cs b/Modules/Licensing/UI/Events/Windows/LicenseExpiredWindowContents.cs
new file mode 100644
index 0000000000..2acfa8fb5c
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseExpiredWindowContents.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;
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Handlers;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseExpiredWindowContents : TemplateLicenseEventWindowContents
+{
+    LicenseExpiredNotification m_Notification;
+    bool m_HasUiEntitlement;
+
+    public LicenseExpiredWindowContents(bool hasUiEntitlement, LicenseExpiredNotification notification, IEventsButtonFactory eventsButtonFactory, ILicenseLogger licenseLogger)
+        : base(eventsButtonFactory, licenseLogger)
+    {
+        m_HasUiEntitlement = hasUiEntitlement;
+        m_Notification = notification;
+
+        OnEnable();
+    }
+
+    void OnEnable()
+    {
+        m_Description = LicenseExpiredHandler.BuildLicenseExpiredText(m_HasUiEntitlement, m_Notification);
+
+        m_Buttons.Add(m_HasUiEntitlement ? EventsButtonType.OpenUnityHub : EventsButtonType.SaveAndQuit);
+
+        m_LogTag = LicenseTrStrings.ExpiredWindowTitle;
+        m_LogType = LogType.Error;
+
+        CreateContents();
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndedWindow.cs b/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndedWindow.cs
new file mode 100644
index 0000000000..18b09f5fa8
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndedWindow.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 UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseOfflineValidityEndedWindow : TemplateLicenseEventWindow
+{
+    public static void ShowWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, object notification)
+    {
+        s_NativeApiWrapper = nativeApiWrapper;
+        s_Notification = notification as LicenseExpiredNotification;
+        s_LicenseLogger = licenseLogger;
+
+        TemplateLicenseEventWindow.ShowWindow<LicenseOfflineValidityEndedWindow>(LicenseTrStrings.OfflineValidityEndedWindowTitle, true);
+    }
+
+    public void CreateGUI()
+    {
+        s_Root = new LicenseOfflineValidityEndedWindowContents(
+            (LicenseExpiredNotification)s_Notification,
+            new EventsButtonFactory(s_NativeApiWrapper, Close),
+            s_LicenseLogger);
+        rootVisualElement.Add(s_Root);
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndedWindowContents.cs b/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndedWindowContents.cs
new file mode 100644
index 0000000000..da8e696879
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndedWindowContents.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;
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Handlers;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseOfflineValidityEndedWindowContents : TemplateLicenseEventWindowContents
+{
+    LicenseExpiredNotification m_Notification;
+
+    public LicenseOfflineValidityEndedWindowContents(LicenseExpiredNotification notification, IEventsButtonFactory eventsButtonFactory, ILicenseLogger licenseLogger)
+        : base(eventsButtonFactory, licenseLogger)
+    {
+        m_Notification = notification;
+
+        OnEnable();
+    }
+
+    void OnEnable()
+    {
+        m_Description = LicenseExpiredHandler.BuildLicenseOfflineValidityEndedText(m_Notification);
+
+        m_LogTag = LicenseTrStrings.OfflineValidityEndedWindowTitle;
+        m_LogType = LogType.Error;
+        m_LogMessage = m_Description;
+
+        m_Buttons.Add(EventsButtonType.SaveAndQuit);
+        m_Buttons.Add(EventsButtonType.UpdateLicense);
+
+        CreateContents();
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndingWindow.cs b/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndingWindow.cs
new file mode 100644
index 0000000000..a88e7fae64
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndingWindow.cs
@@ -0,0 +1,31 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseOfflineValidityEndingWindow : TemplateLicenseEventWindow
+{
+    public static void ShowWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, object notification)
+    {
+        s_NativeApiWrapper = nativeApiWrapper;
+        s_Notification = notification as LicenseOfflineValidityEndingNotification;
+        s_LicenseLogger = licenseLogger;
+
+        TemplateLicenseEventWindow.ShowWindow<LicenseOfflineValidityEndingWindow>(LicenseTrStrings.OfflineValidityEndingWindowTitle, true);
+    }
+
+    public void CreateGUI()
+    {
+        s_Root = new LicenseOfflineValidityEndingWindowContents(
+            (LicenseOfflineValidityEndingNotification)s_Notification,
+            new EventsButtonFactory(s_NativeApiWrapper, Close),
+            s_LicenseLogger);
+        rootVisualElement.Add(s_Root);
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndingWindowContents.cs b/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndingWindowContents.cs
new file mode 100644
index 0000000000..eafe62682b
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseOfflineValidityEndingWindowContents.cs
@@ -0,0 +1,38 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Handlers;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseOfflineValidityEndingWindowContents : TemplateLicenseEventWindowContents
+{
+    LicenseOfflineValidityEndingNotification m_Notification;
+
+    public LicenseOfflineValidityEndingWindowContents(LicenseOfflineValidityEndingNotification notification, IEventsButtonFactory eventsButtonFactory, ILicenseLogger licenseLogger)
+        : base(eventsButtonFactory, licenseLogger)
+    {
+        m_Notification = notification;
+
+        OnEnable();
+    }
+
+    void OnEnable()
+    {
+        LicenseOfflineValidityEndingHandler.BuildOfflineValidityEndingText(m_Notification.details, out var shortTitle, out var description);
+        m_Description = description;
+
+        m_LogTag = LicenseTrStrings.OfflineValidityEndingWindowTitle;
+        m_LogMessage = shortTitle;
+
+        m_Buttons.Add(EventsButtonType.UpdateLicense);
+
+        CreateContents();
+    }
+}
+
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseRemovedWindow.cs b/Modules/Licensing/UI/Events/Windows/LicenseRemovedWindow.cs
new file mode 100644
index 0000000000..0bef8433b8
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseRemovedWindow.cs
@@ -0,0 +1,31 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseRemovedWindow : TemplateLicenseEventWindow
+{
+    public static void ShowWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, object notification)
+    {
+        s_NativeApiWrapper = nativeApiWrapper;
+        s_Notification = notification as LicenseUpdateNotification;
+        s_LicenseLogger = licenseLogger;
+
+        TemplateLicenseEventWindow.ShowWindow<LicenseRemovedWindow>(LicenseTrStrings.RemovedWindowTitle, true);
+    }
+
+    public void CreateGUI()
+    {
+        s_Root = new LicenseRemovedWindowContents(s_NativeApiWrapper.HasUiEntitlement(),
+            (LicenseUpdateNotification)s_Notification,
+            new EventsButtonFactory(s_NativeApiWrapper, Close),
+            s_LicenseLogger);
+        rootVisualElement.Add(s_Root);
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseRemovedWindowContents.cs b/Modules/Licensing/UI/Events/Windows/LicenseRemovedWindowContents.cs
new file mode 100644
index 0000000000..4016904943
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseRemovedWindowContents.cs
@@ -0,0 +1,39 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Handlers;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseRemovedWindowContents : TemplateLicenseEventWindowContents
+{
+    LicenseUpdateNotification m_Notification;
+    bool m_HasUiEntitlement;
+
+    public LicenseRemovedWindowContents(bool hasUiEntitlement, LicenseUpdateNotification notification, IEventsButtonFactory eventsButtonFactory, ILicenseLogger licenseLogger)
+        : base(eventsButtonFactory, licenseLogger)
+    {
+        m_HasUiEntitlement = hasUiEntitlement;
+        m_Notification = notification;
+
+        OnEnable();
+    }
+
+    void OnEnable()
+    {
+        m_Description = LicenseUpdateHandler.BuildLicenseRemovedText(m_HasUiEntitlement, m_Notification);
+
+        m_Buttons.Add(m_HasUiEntitlement ? EventsButtonType.OpenUnityHub : EventsButtonType.SaveAndQuit);
+
+        m_LogTag = LicenseTrStrings.LicenseRemovedTag;
+        m_LogType = LogType.Error;
+
+        CreateContents();
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseReturnedWindow.cs b/Modules/Licensing/UI/Events/Windows/LicenseReturnedWindow.cs
new file mode 100644
index 0000000000..35d8c13ac6
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseReturnedWindow.cs
@@ -0,0 +1,31 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseReturnedWindow: TemplateLicenseEventWindow
+{
+    public static void ShowWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, object notification)
+    {
+        s_NativeApiWrapper = nativeApiWrapper;
+        s_LicenseLogger = licenseLogger;
+        s_Notification = notification as LicenseUpdateNotification;
+
+        TemplateLicenseEventWindow.ShowWindow<LicenseReturnedWindow>(LicenseTrStrings.ReturnedWindowTitle, true);
+    }
+
+    public void CreateGUI()
+    {
+        s_Root = new LicenseReturnedWindowContents(s_NativeApiWrapper.HasUiEntitlement(),
+            (LicenseUpdateNotification)s_Notification,
+            new EventsButtonFactory(s_NativeApiWrapper, Close),
+            s_LicenseLogger);
+        rootVisualElement.Add(s_Root);
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseReturnedWindowContents.cs b/Modules/Licensing/UI/Events/Windows/LicenseReturnedWindowContents.cs
new file mode 100644
index 0000000000..a231cd7fc7
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseReturnedWindowContents.cs
@@ -0,0 +1,41 @@
+// 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.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Data.Events.Base;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Handlers;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseReturnedWindowContents : TemplateLicenseEventWindowContents
+{
+    bool m_HasUiEntitlement;
+    LicenseUpdateNotification m_Notification;
+
+    public LicenseReturnedWindowContents(bool hasUiEntitlement, LicenseUpdateNotification notification,
+        IEventsButtonFactory eventsButtonFactory, ILicenseLogger licenseLogger)
+        : base(eventsButtonFactory, licenseLogger)
+    {
+        m_Notification = notification;
+        m_HasUiEntitlement = hasUiEntitlement;
+        OnEnable();
+    }
+
+    void OnEnable()
+    {
+        m_Description = LicenseUpdateHandler.BuildLicenseReturnedText(m_HasUiEntitlement, m_Notification);
+
+        m_Buttons.Add(m_HasUiEntitlement ? EventsButtonType.Ok : EventsButtonType.SaveAndQuit);
+
+        m_LogTag = LicenseTrStrings.LicenseReturnedTag;
+        m_LogType = LogType.Error;
+
+        CreateContents();
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseRevokedWindow.cs b/Modules/Licensing/UI/Events/Windows/LicenseRevokedWindow.cs
new file mode 100644
index 0000000000..03e1a22cd4
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseRevokedWindow.cs
@@ -0,0 +1,31 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseRevokedWindow : TemplateLicenseEventWindow
+{
+    public static void ShowWindow(INativeApiWrapper nativeApiWrapper, ILicenseLogger licenseLogger, object notification)
+    {
+        s_NativeApiWrapper = nativeApiWrapper;
+        s_LicenseLogger = licenseLogger;
+        s_Notification = notification as LicenseUpdateNotification;
+
+        TemplateLicenseEventWindow.ShowWindow<LicenseRevokedWindow>(LicenseTrStrings.RevokedWindowTitle, true);
+    }
+
+    public void CreateGUI()
+    {
+        s_Root = new LicenseRevokedWindowContents(s_NativeApiWrapper.HasUiEntitlement(),
+            (LicenseUpdateNotification)s_Notification,
+            new EventsButtonFactory(s_NativeApiWrapper, Close),
+            s_LicenseLogger);
+        rootVisualElement.Add(s_Root);
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/LicenseRevokedWindowContents.cs b/Modules/Licensing/UI/Events/Windows/LicenseRevokedWindowContents.cs
new file mode 100644
index 0000000000..ba77cdb3e4
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/LicenseRevokedWindowContents.cs
@@ -0,0 +1,55 @@
+// 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.Licensing.UI.Data.Events;
+using UnityEditor.Licensing.UI.Data.Events.Base;
+using UnityEditor.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Events.Text;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class LicenseRevokedWindowContents : TemplateLicenseEventWindowContents
+{
+    bool m_HasUiEntitlement;
+    LicenseUpdateNotification m_Notification;
+
+    public LicenseRevokedWindowContents(bool hasUiEntitlement, LicenseUpdateNotification notification,
+        IEventsButtonFactory eventsButtonFactory, ILicenseLogger licenseLogger)
+        : base(eventsButtonFactory, licenseLogger)
+    {
+        m_Notification = notification;
+        m_HasUiEntitlement = hasUiEntitlement;
+        OnEnable();
+    }
+
+    void OnEnable()
+    {
+        var productNames = m_Notification.GetProductNamesWithReason(NotificationReasons.k_EntitlementGroupRevoked);
+
+        var shortTitle = Helper.Utils.GetDescriptionMessageForProducts(productNames,
+            LicenseTrStrings.RevokedShortTitleOneLicense,
+            LicenseTrStrings.RevokedShortTitleManyLicenses);
+
+        m_LogTag = LicenseTrStrings.RevokedWindowTitle;
+        m_LogType = LogType.Error;
+
+        m_LogMessage = shortTitle;
+
+        if (!m_HasUiEntitlement)
+        {
+            m_Description = shortTitle + " " + LicenseTrStrings.RevokedDescriptionNoUiEntitlement;
+            m_Buttons.Add(EventsButtonType.SaveAndQuit);
+        }
+        else
+        {
+            m_Description = shortTitle + " " + LicenseTrStrings.RevokedDescriptionWithUiEntitlement;
+            m_Buttons.Add(EventsButtonType.Ok);
+        }
+
+        CreateContents();
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/TemplateLicenseEventWindow.cs b/Modules/Licensing/UI/Events/Windows/TemplateLicenseEventWindow.cs
new file mode 100644
index 0000000000..105f2a9533
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/TemplateLicenseEventWindow.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 UnityEditor.Licensing.UI.Data.Events.Base;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+abstract class TemplateLicenseEventWindow : EditorWindow
+{
+    protected static INativeApiWrapper s_NativeApiWrapper;
+    protected static ILicenseLogger s_LicenseLogger;
+
+    protected static Notification s_Notification;
+
+    protected static TemplateLicenseEventWindowContents s_Root;
+
+    // UX designer fixes the width to preference
+    const float k_ContentWidth = 334f;
+
+    protected static void ShowWindow<T>(string txtWindowTitle, bool enableWindowTrapping = false) where T : EditorWindow
+    {
+        // trap user until user clicks on a button and not 'x' in the title bar
+        // trapping is only required if there is no more ui entitlement
+        while (Render<T>(txtWindowTitle) && !s_NativeApiWrapper.HasUiEntitlement())
+        {
+            if (!enableWindowTrapping)
+            {
+                break;
+            }
+        }
+    }
+
+    static bool Render<T>(string txtWindowTitle) where T : EditorWindow
+    {
+        var window = CreateInstance<T>();
+
+        window.titleContent = new GUIContent(txtWindowTitle);
+
+        window.ShowModal();
+
+        // returns true: if and only if user has clicked on 'x' icon in titlebar
+        return s_Root.UserClosedModalFromTitleBar;
+    }
+
+    public void OnEnable()
+    {
+        rootVisualElement.RegisterCallback<GeometryChangedEvent>(GeometryChangedCallback);
+    }
+
+    void GeometryChangedCallback(GeometryChangedEvent evt)
+    {
+        // set the size of the window according to the content description and elements
+        var mainContainer = rootVisualElement.Q<VisualElement>("MainContainer");
+
+        if (mainContainer == null)
+        {
+            return;
+        }
+
+        minSize = new Vector2(
+            k_ContentWidth,
+            mainContainer.resolvedStyle.height + 1 // for some reason this 1 pixel fixes the resizing glitch
+        );
+        maxSize = minSize;
+    }
+}
diff --git a/Modules/Licensing/UI/Events/Windows/TemplateLicenseEventWindowContents.cs b/Modules/Licensing/UI/Events/Windows/TemplateLicenseEventWindowContents.cs
new file mode 100644
index 0000000000..933f0820ae
--- /dev/null
+++ b/Modules/Licensing/UI/Events/Windows/TemplateLicenseEventWindowContents.cs
@@ -0,0 +1,88 @@
+// 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.Licensing.UI.Events.Buttons;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Licensing.UI.Events.Windows;
+
+class TemplateLicenseEventWindowContents : VisualElement
+{
+    const string k_ElementNameDescription = "Description";
+    const string k_ElementNameButtonsContainer = "ButtonsContainer";
+    const string k_UxmlFileName = "GenericLicenseEventWindow";
+
+    ILicenseLogger m_LicenseLogger;
+    protected LogType m_LogType = LogType.Log;
+    protected string m_LogTag;
+    protected string m_LogMessage;
+
+    protected string m_Description;
+
+    protected IList<EventsButtonType> m_Buttons = new List<EventsButtonType>();
+
+    public bool UserClosedModalFromTitleBar { get; private set; } = true;
+
+    IEventsButtonFactory m_EventsButtonFactory;
+
+    void AdditionalCustomClickAction()
+    {
+        UserClosedModalFromTitleBar = false;
+    }
+
+    protected TemplateLicenseEventWindowContents(IEventsButtonFactory eventsButtonFactory, ILicenseLogger licenseLogger)
+    {
+        m_EventsButtonFactory = eventsButtonFactory;
+        m_LicenseLogger = licenseLogger;
+    }
+
+    protected void CreateContents()
+    {
+        // Loads and clones our VisualTree (eg. our UXML structure) inside the root.
+        var visualTree = LoadTemplateAndStylesheet(k_UxmlFileName);
+
+        visualTree.CloneTree(this);
+
+        SetText();
+
+        SetButtons();
+
+        if (string.IsNullOrEmpty(m_LogMessage))
+        {
+            m_LogMessage = m_Description;
+        }
+        m_LicenseLogger.DebugLogNoStackTrace(m_LogMessage, m_LogType, tag: m_LogTag);
+    }
+
+    static VisualTreeAsset LoadTemplateAndStylesheet(string uxmlName)
+    {
+        var tpl = EditorGUIUtility.Load($"UXML/Licensing/{uxmlName}.uxml") as VisualTreeAsset;
+        if (tpl == null)
+        {
+            Debug.Log("Failed to load template " + uxmlName);
+        }
+
+        return tpl;
+    }
+
+    void SetText()
+    {
+        this.Q<Label>(k_ElementNameDescription).text = m_Description;
+    }
+
+    void SetButtons()
+    {
+        var buttonsContainer = this.Q<VisualElement>(k_ElementNameButtonsContainer);
+
+        foreach (var button in m_Buttons)
+        {
+            // For the case of Save and Close factory might return two buttons and visual element object that contains two buttons will sort
+            // them in column format instead of row when this components are rendered
+            m_EventsButtonFactory.Create(button, AdditionalCustomClickAction).Query().ForEach(buttonsContainer.Add);
+        }
+    }
+}
diff --git a/Modules/Licensing/UI/Helper/Constants.cs b/Modules/Licensing/UI/Helper/Constants.cs
new file mode 100644
index 0000000000..493b915db3
--- /dev/null
+++ b/Modules/Licensing/UI/Helper/Constants.cs
@@ -0,0 +1,10 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace UnityEditor.Licensing.UI.Helper;
+
+static class Constants
+{
+    public const string UiEntitlement = "com.unity.editor.ui";
+}
diff --git a/Modules/Licensing/UI/Helper/ILicenseLogger.cs b/Modules/Licensing/UI/Helper/ILicenseLogger.cs
new file mode 100644
index 0000000000..a134cc7b9f
--- /dev/null
+++ b/Modules/Licensing/UI/Helper/ILicenseLogger.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 UnityEngine;
+
+namespace UnityEditor.Licensing.UI.Helper;
+
+interface ILicenseLogger
+{
+    const string tag = "License";
+
+    public void DebugLogNoStackTrace(string message, LogType logType = LogType.Log, string tag = tag);
+
+    public void LogError(string message);
+}
diff --git a/Modules/Licensing/UI/Helper/LicenseLogger.cs b/Modules/Licensing/UI/Helper/LicenseLogger.cs
new file mode 100644
index 0000000000..af4ddee1b6
--- /dev/null
+++ b/Modules/Licensing/UI/Helper/LicenseLogger.cs
@@ -0,0 +1,24 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine;
+
+namespace UnityEditor.Licensing.UI;
+
+class LicenseLogger : ILicenseLogger
+{
+    const string k_Tag = "License";
+    const string k_TagFormat = "{0}: {1}";
+
+    public void DebugLogNoStackTrace(string message, LogType logType, string tag = k_Tag)
+    {
+        Debug.LogFormat(logType, LogOption.NoStacktrace, null, k_TagFormat, tag, message);
+    }
+
+    public void LogError(string message)
+    {
+        Debug.LogError(message);
+    }
+}
diff --git a/Modules/Licensing/UI/Helper/Utils.cs b/Modules/Licensing/UI/Helper/Utils.cs
new file mode 100644
index 0000000000..c96ca4c310
--- /dev/null
+++ b/Modules/Licensing/UI/Helper/Utils.cs
@@ -0,0 +1,42 @@
+// 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.Licensing.UI.Helper;
+
+static class Utils
+{
+    public static string GetOxfordCommaString(IList<string> words)
+    {
+        if (words == null || words.Count == 0)
+        {
+            return "";
+        }
+
+        switch (words.Count)
+        {
+            case 1:
+                return words[0];
+            case 2:
+                return words[0] + " and " + words[1];
+            default:
+            {
+                var oxfordString = "";
+                for (var i = 0; i < words.Count - 1; i++)
+                {
+                    oxfordString += words[i] + ", ";
+                }
+
+                oxfordString += "and " + words[^1];
+                return oxfordString;
+            }
+        }
+    }
+
+    public static string GetDescriptionMessageForProducts(IList<string> productNames, string singularPhrase, string pluralPhrase)
+    {
+        return string.Format(productNames.Count == 1 ? singularPhrase : pluralPhrase, GetOxfordCommaString(productNames));
+    }
+}
diff --git a/Modules/Licensing/UI/INativeApiWrapper.cs b/Modules/Licensing/UI/INativeApiWrapper.cs
new file mode 100644
index 0000000000..36af9c46f3
--- /dev/null
+++ b/Modules/Licensing/UI/INativeApiWrapper.cs
@@ -0,0 +1,22 @@
+// 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.SceneManagement;
+
+namespace UnityEditor.Licensing.UI;
+
+interface INativeApiWrapper
+{
+    T CreateObjectFromJson<T>(string jsonString);
+    void ExitEditor();
+    bool HasUiEntitlement();
+    bool SaveUnsavedChanges();
+    Scene[] GetAllScenes();
+    bool HasUnsavedScenes();
+    void InvokeLicenseUpdateCallbacks();
+    void OpenHubLicenseManagementWindow();
+    bool UpdateLicense();
+    bool IsHumanControllingUs();
+}
diff --git a/Modules/Licensing/UI/LicenseManagedWrapper.cs b/Modules/Licensing/UI/LicenseManagedWrapper.cs
new file mode 100644
index 0000000000..14d088d166
--- /dev/null
+++ b/Modules/Licensing/UI/LicenseManagedWrapper.cs
@@ -0,0 +1,31 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Licensing.UI.Events;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEngine.Internal;
+using UnityEngine.Scripting;
+
+namespace UnityEditor.Licensing.UI;
+
+class LicenseManagedWrapper
+{
+    static readonly ILicenseLogger k_LicenseLogger = new LicenseLogger();
+    static readonly INativeApiWrapper k_NativeApiWrapper = new NativeApiWrapper(k_LicenseLogger);
+    static readonly IModalWrapper k_ModalWrapper = new ModalWrapper();
+
+    // made it public for testing purposes
+    public static INotificationDispatcher notificationDispatcher =
+        new LicenseNotificationDispatcher(
+            new LicenseNotificationHandlerFactory(k_LicenseLogger, k_NativeApiWrapper, k_ModalWrapper),
+            k_LicenseLogger,
+            k_NativeApiWrapper);
+
+    [ExcludeFromDocs]
+    [RequiredByNativeCode]
+    public static void HandleNotification(string jsonNotification)
+    {
+        notificationDispatcher.Dispatch(jsonNotification);
+    }
+}
diff --git a/Modules/Licensing/UI/NativeApiWrapper.cs b/Modules/Licensing/UI/NativeApiWrapper.cs
new file mode 100644
index 0000000000..7c96e84170
--- /dev/null
+++ b/Modules/Licensing/UI/NativeApiWrapper.cs
@@ -0,0 +1,109 @@
+// 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.Experimental.Licensing;
+using UnityEditor.Licensing.UI.Helper;
+using UnityEditor.SceneManagement;
+using UnityEditorInternal;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace UnityEditor.Licensing.UI;
+
+class NativeApiWrapper : INativeApiWrapper
+{
+    readonly ILicenseLogger m_LicenseLogger;
+
+    public NativeApiWrapper(ILicenseLogger licenseLogger)
+    {
+        m_LicenseLogger = licenseLogger;
+    }
+
+    // Added for support of mocking in Licensing Tests
+    // ERROR: System.ArgumentException : Can not instantiate proxy of class: UnityEditor.Licensing.UI.NativeApiWrapper.
+    // Could not find a parameterless constructor.
+    protected NativeApiWrapper() { }
+
+    public virtual T CreateObjectFromJson<T>(string jsonString)
+    {
+        return JsonUtility.FromJson<T>(jsonString);
+    }
+
+    public virtual void ExitEditor()
+    {
+        EditorApplication.Exit(0);
+    }
+
+    public virtual bool HasUiEntitlement()
+    {
+        var entitlementInfos = LicensingUtility.HasEntitlementsExtended(new[] { Constants.UiEntitlement }, false);
+        return entitlementInfos.Length > 0;
+    }
+
+    public virtual Scene[] GetAllScenes()
+    {
+        var scenes = new Scene[SceneManager.sceneCount];
+        for (var index = 0; index < SceneManager.sceneCount; ++index)
+        {
+            scenes[index] = SceneManager.GetSceneAt(index);
+        }
+
+        return scenes;
+    }
+
+    public virtual bool HasUnsavedScenes()
+    {
+        var unsavedScenes = new List<Scene>();
+        for (var index = 0; index < SceneManager.sceneCount; ++index)
+        {
+            var scene = SceneManager.GetSceneAt(index);
+            if (scene.isDirty)
+            {
+                unsavedScenes.Add(scene);
+            }
+        }
+
+        return unsavedScenes.Count > 0;
+    }
+
+    public virtual void InvokeLicenseUpdateCallbacks()
+    {
+        LicensingUtility.InvokeLicenseUpdateCallbacks();
+    }
+
+    public virtual void OpenHubLicenseManagementWindow()
+    {
+        HomeWindow.Show(HomeWindow.HomeMode.ManageLicense);
+    }
+
+    public virtual bool SaveUnsavedChanges()
+    {
+        // Notify to Save and close
+        // Editor native code will check if there is a dirty(unsaved scene) scene and saves it
+        // no need to filter the scenes in managed code
+        return EditorSceneManager.SaveScenes(GetAllScenes());
+    }
+
+    public virtual bool UpdateLicense()
+    {
+        var isSucceed = LicensingUtility.UpdateLicense();
+
+        if (isSucceed)
+        {
+            m_LicenseLogger.DebugLogNoStackTrace("Successfully updated licenses.");
+        }
+        else
+        {
+            m_LicenseLogger.DebugLogNoStackTrace("Failed to update licenses.", LogType.Error);
+        }
+
+        return isSucceed;
+    }
+
+    public virtual bool IsHumanControllingUs()
+    {
+        return InternalEditorUtility.isHumanControllingUs;
+    }
+}
diff --git a/Modules/Marshalling/MarshallingTests.bindings.cs b/Modules/Marshalling/MarshallingTests.bindings.cs
index 4569965cae..5698124429 100644
--- a/Modules/Marshalling/MarshallingTests.bindings.cs
+++ b/Modules/Marshalling/MarshallingTests.bindings.cs
@@ -70,12 +70,16 @@ internal struct StructCoreStringVector
     [ExcludeFromDocs]
     internal class StringTests
     {
+        public static extern void SetTestOutString(string testString);
+
         [NativeThrows] public static extern void ParameterICallString(string param);
         [NativeThrows] public static extern void ParameterICallNullString(string param);
 
         [NativeThrows] public static extern void ParameterCoreString(string param);
 
         [NativeThrows] public static extern void ParameterConstCharPtr(string param);
+        [NativeThrows] public static extern void ParameterConstCharPtrNull(string param);
+        [NativeThrows] public static extern void ParameterConstCharPtrEmptyString(string param);
 
         [NativeThrows] public static extern void ParameterCoreStringVector(string[] param);
 
@@ -85,6 +89,9 @@ internal class StringTests
 
         [NativeThrows] public static extern void ParameterStructCoreStringVector(StructCoreStringVector param);
 
+        [NativeThrows] public static extern void ParameterOutString(out string param);
+        [NativeThrows] public static extern void ParameterRefString(ref string param);
+
         public static extern string ReturnCoreString();
 
         public static extern string ReturnConstCharPtr();
@@ -101,8 +108,6 @@ internal class StringTests
         public static extern string FalseConditional();
 
         public static extern StructCoreStringVector ReturnStructCoreStringVector();
-        public static extern void ParameterOutString(out string param);
-        [NativeThrows] public static extern void ParameterRefString(ref string param);
     }
 
     // --------------------------------------------------------------------
@@ -272,6 +277,17 @@ public extern int FieldBoundMemberProperty
         public extern static MarshallingTestObject Create();
 
         extern private static void Internal_CreateMarshallingTestObject([Writable] MarshallingTestObject notSelf);
+
+        [RequiredByNativeCode]
+        private int TestField;
+    }
+
+    [NativeHeader("Modules/Marshalling/MarshallingTests.h")]
+    [ExcludeFromDocs]
+    [StructLayout(LayoutKind.Sequential)]
+    internal class DifferentMarshallingTestObject : Object
+    {
+
     }
 
     [MarshalUnityObjectAs(typeof(MonoBehaviour))]
@@ -341,6 +357,8 @@ internal class UnityObjectTests
 
         public static extern MarshallingTestObject ReturnUnityObjectFakeNull();
 
+        public static extern MarshallingTestObject ReturnUnassignedErrorObject();
+
         public static extern MarshallingTestObject ReturnUnityObjectPPtr();
 
         public static extern MarshallingTestObject[] ReturnUnityObjectDynamicArray();
@@ -832,4 +850,53 @@ internal class BoolStructTests
         [NativeThrows] public static extern void ParameterStructWith8ByteAndBoolFields(StructWith8ByteAndBoolFields param);
         [NativeThrows] public static extern void ParameterStructWith8ByteAndBoolFieldsArray(StructWith8ByteAndBoolFields[] param);
     }
+
+    struct BlittableCornerCases
+    {
+        public char cVal;
+        public bool bVal;
+        public SomeEnum eVal;
+    }
+
+    // --------------------------------------------------------------------
+    // System.Array tests
+    [NativeType("Runtime/Scripting/Marshalling/Test/MarshallingTests.h")]
+    internal class ValueTypeArrayTests
+    {
+        [NativeThrows] public static extern void ParameterIntArrayReadOnly(int[] param);
+        [NativeThrows] public static extern void ParameterIntArrayWritable(int[] param);
+        [NativeThrows] public static extern void ParameterIntArrayEmpty(int[] param, int[] param2);
+        public static extern void ParameterIntArrayNullExceptioins([NotNull] int[] param, [NotNull("NullReferenceException")] int[] param2);
+        [NativeThrows] public static extern void ParameterIntMultidimensionalArray(int[,] param);
+        public static extern void ParameterIntMultidimensionalArrayNullExceptions([NotNull] int[,] param, [NotNull("NullReferenceException")] int[,] param2);
+        [NativeThrows] public static extern void ParameterCharArrayReadOnly(char[] param);
+        [NativeThrows] public static extern void ParameterBlittableCornerCaseStructArrayReadOnly(BlittableCornerCases[] param);
+        [NativeThrows] public static extern void ParameterIntArrayOutAttr([Out] int[] param);
+        [NativeThrows] public static extern void ParameterCharArrayOutAttr([Out]char[] param);
+        [NativeThrows] public static extern void ParameterBlittableCornerCaseStructArrayOutAttr([Out]BlittableCornerCases[] param);
+        public static extern int[] ParameterIntArrayReturn();
+        public static extern int[] ParameterIntArrayReturnEmpty();
+        public static extern int[] ParameterIntArrayReturnNull();
+        public static extern char[] ParameterCharArrayReturn();
+        public static extern BlittableCornerCases[] ParameterBlittableCornerCaseStructArrayReturn();
+    }
+
+    // --------------------------------------------------------------------
+    // System.Span tests
+    [NativeType("Runtime/Scripting/Marshalling/Test/MarshallingTests.h")]
+    internal class ValueTypeSpanTests
+    {
+        [NativeThrows] public static extern void ParameterIntReadOnlySpan(ReadOnlySpan<int> param);
+        [NativeThrows] public static extern void ParameterIntSpan(Span<int> param);
+        [NativeThrows] public static extern void ParameterBoolReadOnlySpan(ReadOnlySpan<bool> param);
+        [NativeThrows] public static extern void ParameterCharReadOnlySpan(ReadOnlySpan<char> param);
+        [NativeThrows] public static extern void ParameterEnumReadOnlySpan(ReadOnlySpan<SomeEnum> param);
+        [NativeThrows] public static extern void ParameterBlittableCornerCaseStructReadOnlySpan(ReadOnlySpan<BlittableCornerCases> param);
+    }
+
+    internal static class MarshallingTests
+    {
+        [FreeFunction("MarshallingTest::DisableMarshallingTestsVerification")]
+        public static extern void DisableMarshallingTestsVerification();
+    }
 }
diff --git a/Modules/PackageManager/Editor/Managed/CachedPackageInfo.cs b/Modules/PackageManager/Editor/Managed/CachedPackageInfo.cs
deleted file mode 100644
index c2636fa867..0000000000
--- a/Modules/PackageManager/Editor/Managed/CachedPackageInfo.cs
+++ /dev/null
@@ -1,79 +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 UnityEngine;
-using UnityEngine.Bindings;
-using RequiredByNativeCodeAttribute = UnityEngine.Scripting.RequiredByNativeCodeAttribute;
-
-namespace UnityEditor.PackageManager
-{
-    [Serializable]
-    [StructLayout(LayoutKind.Sequential)]
-    [RequiredByNativeCode]
-    [NativeAsStruct]
-    internal class CachedPackageInfo
-    {
-        [SerializeField]
-        [NativeName("name")]
-        private string m_Name = "";
-
-        [SerializeField]
-        [NativeName("displayName")]
-        private string m_DisplayName = "";
-
-        [SerializeField]
-        [NativeName("description")]
-        private string m_Description = "";
-
-        [SerializeField]
-        [NativeName("latest")]
-        private string m_Latest = "";
-
-        [SerializeField]
-        [NativeName("versions")]
-        private string[] m_Versions;
-
-        public string name
-        {
-            get
-            {
-                return m_Name;
-            }
-        }
-
-        public string displayName
-        {
-            get
-            {
-                return m_DisplayName;
-            }
-        }
-
-        public string description
-        {
-            get
-            {
-                return m_Description;
-            }
-        }
-
-        public string latest
-        {
-            get
-            {
-                return m_Latest;
-            }
-        }
-
-        public string[] versions
-        {
-            get
-            {
-                return m_Versions;
-            }
-        }
-    }
-}
diff --git a/Modules/PackageManager/Editor/Managed/Client.cs b/Modules/PackageManager/Editor/Managed/Client.cs
index 1fdfaf4a1b..1073b79e0c 100644
--- a/Modules/PackageManager/Editor/Managed/Client.cs
+++ b/Modules/PackageManager/Editor/Managed/Client.cs
@@ -83,12 +83,9 @@ public static EmbedRequest Embed(string packageName)
             if (string.IsNullOrWhiteSpace(packageName))
                 throw new ArgumentException("Package name cannot be null, empty or whitespace", nameof(packageName));
 
-            var packageInfo = PackageInfo.GetAllRegisteredPackages().FirstOrDefault(p => p.name == packageName);
-            if (packageInfo == null)
+            if (!PackageInfo.IsPackageRegistered(packageName))
                 throw new InvalidOperationException($"Cannot embed package [{packageName}] because it is not registered in the Asset Database.");
 
-            Debug.Assert(packageInfo.entitlements.isAllowed, "Expected [entitlements.isAllowed] flag to be true.");
-
             long operationId;
             var status = Embed(out operationId, packageName);
             return new EmbedRequest(operationId, status);
@@ -101,16 +98,6 @@ internal static GetRegistriesRequest GetRegistries()
             return new GetRegistriesRequest(operationId, status);
         }
 
-        internal static GetCachedPackagesRequest GetCachedPackages(string registryId)
-        {
-            if (string.IsNullOrWhiteSpace(registryId))
-                throw new ArgumentException("Registry id cannot be null, empty or whitespace", nameof(registryId));
-
-            long operationId;
-            var status = GetCachedPackages(out operationId, registryId);
-            return new GetCachedPackagesRequest(operationId, status);
-        }
-
         internal static GetCacheRootRequest GetCacheRoot()
         {
             long operationId;
diff --git a/Modules/PackageManager/Editor/Managed/PackageInfo.cs b/Modules/PackageManager/Editor/Managed/PackageInfo.cs
index 5b7afcce6a..32e602f1ec 100644
--- a/Modules/PackageManager/Editor/Managed/PackageInfo.cs
+++ b/Modules/PackageManager/Editor/Managed/PackageInfo.cs
@@ -234,12 +234,23 @@ public static PackageInfo FindForAssetPath(string assetPath)
             if (string.IsNullOrEmpty(assetPath))
                 throw new ArgumentException("Asset path cannot be null or empty.", "assetPath");
 
-            var packageInfo = GetPackageByAssetPath(assetPath);
+            var result = GetPackageByAssetPath(assetPath); // PackageInfo is marshalled as a struct, so use a private array to avoid marshalling anything when the query fails (returns an empty array)
+            if (result != null && result.Length > 0)
+                return result[0];
 
-            // We assume the package is found only if the name field is set.
-            // This is because there is no straightforward way to make this nullable in native and,
-            // returning extra arguments with the [Out] attribute has expensive unmarshalling costs.
-            return string.IsNullOrEmpty(packageInfo.name) ? null : packageInfo;
+            return null;
+        }
+
+        public static PackageInfo FindForPackageName(string name)
+        {
+            if (string.IsNullOrEmpty(name))
+                throw new ArgumentException("Package name cannot be null or empty.", "name");
+
+            var result = GetPackageByName(name); // PackageInfo is marshalled as a struct, so use a private array to avoid marshalling anything when the query fails (returns an empty array)
+            if (result != null && result.Length > 0)
+                return result[0];
+
+            return null;
         }
 
         public static PackageInfo FindForAssembly(Assembly assembly)
diff --git a/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs b/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs
index ed2df5d036..3101b8df5d 100644
--- a/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs
+++ b/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs
@@ -32,9 +32,6 @@ public static partial class Client
         [FreeFunction("PackageManager::Embed::StartOperation")]
         private static extern NativeStatusCode Embed([Out] out long operationId, string packageId);
 
-        [FreeFunction("PackageManager::GetCachedPackages::StartOperation")]
-        private static extern NativeStatusCode GetCachedPackages([Out] out long operationId, string registryId);
-
         [FreeFunction("PackageManager::GetCacheRoot::StartOperation")]
         private static extern NativeStatusCode GetCacheRoot([Out] out long operationId, ConfigSource source);
 
@@ -101,14 +98,13 @@ public partial class PackageInfo
     {
         [NativeName("GetAllPackages")]
         public static extern PackageInfo[] GetAllRegisteredPackages();
+        public static extern bool IsPackageRegistered(string name);
 
-        [NativeName("GetPredefinedPackageTypes")]
-        internal static extern string[] GetPredefinedPackageTypes();
-
-        [NativeName("GetPredefinedHiddenByDefaultPackageTypes")]
-        internal static extern string[] GetPredefinedHiddenByDefaultPackageTypes();
+        [NativeName("GetPackageByAssetPathFromScript")]
+        private static extern PackageInfo[] GetPackageByAssetPath(string assetPath);
 
-        private static extern PackageInfo GetPackageByAssetPath(string assetPath);
+        [NativeName("GetPackageByNameFromScript")]
+        private static extern PackageInfo[] GetPackageByName(string name);
     }
 
     [NativeHeader("Modules/PackageManager/Editor/PackageManagerImmutableAssets.h")]
diff --git a/Modules/PackageManager/Editor/Managed/RequestProgress.cs b/Modules/PackageManager/Editor/Managed/RequestProgress.cs
index 0cea9c2733..db68dff578 100644
--- a/Modules/PackageManager/Editor/Managed/RequestProgress.cs
+++ b/Modules/PackageManager/Editor/Managed/RequestProgress.cs
@@ -4,6 +4,7 @@
 
 using System;
 using UnityEngine.Bindings;
+using RequiredByNativeCodeAttribute = UnityEngine.Scripting.RequiredByNativeCodeAttribute;
 
 namespace UnityEditor.PackageManager
 {
@@ -11,11 +12,9 @@ namespace UnityEditor.PackageManager
     [StaticAccessor("PackageManager::Api", StaticAccessorType.DoubleColon)]
     internal class RequestProgress
     {
-        private protected delegate void RequestProgressCallback(IntPtr progressUpdatesPtr);
+        private static extern void SetProgressHandler(long operationId, RequestProgress requestProgress);
 
-        private protected static extern void SetProgressDelegate(long operationId, RequestProgressCallback progressDelegate);
-
-        private protected static extern void ClearProgressDelegate(long operationId);
+        private static extern void ClearProgressHandler(long operationId);
 
         private Action<ProgressUpdateEventArgs>  m_ProgressUpdate;
 
@@ -34,7 +33,7 @@ public event Action<ProgressUpdateEventArgs> progressUpdated
                 {
                     if (m_ProgressUpdate == null)
                     {
-                        SetProgressDelegate(m_OperationId, OnNativeProgress);
+                        SetProgressHandler(m_OperationId, this);
                     }
 
                     m_ProgressUpdate += value;
@@ -49,7 +48,7 @@ public event Action<ProgressUpdateEventArgs> progressUpdated
 
                     if (m_ProgressUpdate == null)
                     {
-                        ClearProgressDelegate(m_OperationId);
+                        ClearProgressHandler(m_OperationId);
                     }
                 }
             }
@@ -59,11 +58,12 @@ public event Action<ProgressUpdateEventArgs> progressUpdated
         [StaticAccessor("PackageManager::PackageProgress", StaticAccessorType.DoubleColon)]
         private static extern PackageProgress[] Internal_GetPackageProgressArray(IntPtr nativeHandle);
 
-        private void OnNativeProgress(IntPtr progressUpdatesPtr)
+        [RequiredByNativeCode]
+        internal static void OnNativeProgress(RequestProgress requestProgress, IntPtr progressUpdatesPtr)
         {
             var progressUpdates = Internal_GetPackageProgressArray(progressUpdatesPtr);
 
-            InvokeProgressUpdated(new ProgressUpdateEventArgs(progressUpdates));
+            requestProgress.InvokeProgressUpdated(new ProgressUpdateEventArgs(progressUpdates));
         }
 
         private void InvokeProgressUpdated(ProgressUpdateEventArgs e)
diff --git a/Modules/PackageManager/Editor/Managed/Requests/GetCachedPackagesRequest.cs b/Modules/PackageManager/Editor/Managed/Requests/GetCachedPackagesRequest.cs
deleted file mode 100644
index 8bfa6b6f5c..0000000000
--- a/Modules/PackageManager/Editor/Managed/Requests/GetCachedPackagesRequest.cs
+++ /dev/null
@@ -1,31 +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;
-
-namespace UnityEditor.PackageManager.Requests
-{
-    [Serializable]
-    internal sealed partial class GetCachedPackagesRequest : Request<CachedPackageInfo[]>
-    {
-        /// <summary>
-        /// Constructor to support serialization
-        /// </summary>
-        private GetCachedPackagesRequest()
-            : base()
-        {
-        }
-
-        internal GetCachedPackagesRequest(long operationId, NativeStatusCode initialStatus)
-            : base(operationId, initialStatus)
-        {
-        }
-
-        protected override CachedPackageInfo[] GetResult()
-        {
-            return GetOperationData(Id);
-        }
-    }
-}
diff --git a/Modules/PackageManager/Editor/Managed/Requests/Requests.bindings.cs b/Modules/PackageManager/Editor/Managed/Requests/Requests.bindings.cs
index c9b244f8a3..45a5f705b7 100644
--- a/Modules/PackageManager/Editor/Managed/Requests/Requests.bindings.cs
+++ b/Modules/PackageManager/Editor/Managed/Requests/Requests.bindings.cs
@@ -54,13 +54,6 @@ public partial class EmbedRequest
         private static extern PackageInfo GetOperationData(long operationId);
     }
 
-    internal partial class GetCachedPackagesRequest
-    {
-        [NativeHeader("Modules/PackageManager/Editor/Public/PackageManager.h")]
-        [StaticAccessor("PackageManager::GetCachedPackages", StaticAccessorType.DoubleColon)]
-        private static extern CachedPackageInfo[] GetOperationData(long operationId);
-    }
-
     internal partial class GetCacheRootRequest
     {
         [NativeHeader("Modules/PackageManager/Editor/Public/PackageManager.h")]
diff --git a/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerWindowAnalytics.cs b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerWindowAnalytics.cs
index ebf07e08d7..503ba1d855 100644
--- a/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerWindowAnalytics.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerWindowAnalytics.cs
@@ -16,7 +16,9 @@ internal struct PackageManagerWindowAnalytics
 
         public string action;
         public string package_id;
+        public string package_tag;
         public string[] package_ids;
+        public string[] package_tags;
         public string search_text;
         public string filter_name;
         public string details_tab;
@@ -24,6 +26,23 @@ internal struct PackageManagerWindowAnalytics
         public bool dependencies_visible;
         public bool preview_visible;
 
+        public static void SendEvent(string action, IPackageVersion version)
+        {
+            SendEvent(action, GetAnalyticsPackageId(version), packageTag: version?.GetAnalyticsTags());
+        }
+
+        public static void SendEvent(string action, IEnumerable<IPackageVersion> versions)
+        {
+            SendEvent(action, packageIds: versions?.Select(GetAnalyticsPackageId), packageTags: versions?.Select(v => v.GetAnalyticsTags()));
+        }
+
+        // Our current analytics backend expects package_id to match product id for legacy asset store packages.
+        // Hence we are doing the special handling here. If we want to change this in the future, we need to also make changes in the backend accordingly.
+        private static string GetAnalyticsPackageId(IPackageVersion version)
+        {
+            return version?.HasTag(PackageTag.LegacyFormat) == true ? version.package.uniqueId : version?.uniqueId;
+        }
+
         public static string GetFilterNameWithSubPage(PackageManagerPrefs packageManagerPrefs, PageManager pageManager)
         {
             var filterName = packageManagerPrefs.currentFilterTab.ToString();
@@ -35,7 +54,7 @@ public static string GetFilterNameWithSubPage(PackageManagerPrefs packageManager
             return filterName;
         }
 
-        public static void SendEvent(string action, string packageId = null, IEnumerable<string> packageIds = null)
+        public static void SendEvent(string action, string packageId = null, IEnumerable<string> packageIds = null, string packageTag = null, IEnumerable<string> packageTags = null)
         {
             var servicesContainer = ServicesContainer.instance;
             var editorAnalyticsProxy = servicesContainer.Resolve<EditorAnalyticsProxy>();
@@ -54,7 +73,9 @@ public static void SendEvent(string action, string packageId = null, IEnumerable
             {
                 action = action,
                 package_id = packageId ?? string.Empty,
+                package_tag = packageTag ?? string.Empty,
                 package_ids = packageIds?.ToArray() ?? new string[0],
+                package_tags = packageTags?.ToArray() ?? new string[0],
                 search_text = packageManagerPrefs.searchText,
                 filter_name = filterName,
                 details_tab = packageManagerPrefs.selectedPackageDetailsTabIdentifier ?? string.Empty,
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/Asset.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/Asset.cs
new file mode 100644
index 0000000000..913015fc95
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/Asset.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;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    [Serializable]
+    internal class Asset
+    {
+        public string guid;
+        public AssetOrigin origin;
+
+        public string importedPath;
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetSelectionHandler.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetSelectionHandler.cs
new file mode 100644
index 0000000000..a5cb0f90e6
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetSelectionHandler.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;
+using System.Collections.Generic;
+
+namespace UnityEditor.PackageManager.UI.Internal;
+
+internal class AssetSelectionHandler
+{
+    public event Action<IEnumerable<Asset>> onRemoveSelectionDone = delegate {};
+
+    private SelectionWindowProxy m_SelectionWindowProxy;
+
+    public void ResolveDependencies(SelectionWindowProxy selectionWindowProxy)
+    {
+        m_SelectionWindowProxy = selectionWindowProxy;
+    }
+
+    public void OnEnable()
+    {
+        m_SelectionWindowProxy.onRemoveSelectionDone += OnRemoveSelectionDone;
+    }
+
+    public void OnDisable()
+    {
+        m_SelectionWindowProxy.onRemoveSelectionDone -= OnRemoveSelectionDone;
+    }
+
+    internal virtual void Remove(IEnumerable<Asset> assets, string packageName, string versionString)
+    {
+        m_SelectionWindowProxy.Open(new SelectionWindowData(assets, packageName, versionString));
+    }
+
+    private void OnRemoveSelectionDone(IEnumerable<Asset> selections)
+    {
+        onRemoveSelectionDone?.Invoke(selections);
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCache.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCache.cs
index f8dd475725..04defcd1df 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCache.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCache.cs
@@ -22,6 +22,10 @@ internal class AssetStoreCache : ISerializationCallbackReceiver
 
         private Dictionary<long, AssetStoreUpdateInfo> m_UpdateInfos = new Dictionary<long, AssetStoreUpdateInfo>();
 
+        // We use the path string as the key for each imported asset
+        private Dictionary<string, Asset> m_ImportedAssets = new Dictionary<string, Asset>();
+        private Dictionary<long, AssetStoreImportedPackage> m_ImportedPackages = new Dictionary<long, AssetStoreImportedPackage>();
+
         [SerializeField]
         private string[] m_SerializedCategories = new string[0];
 
@@ -40,13 +44,20 @@ internal class AssetStoreCache : ISerializationCallbackReceiver
         [SerializeField]
         private AssetStoreUpdateInfo[] m_SerializedUpdateInfos = new AssetStoreUpdateInfo[0];
 
+        [SerializeField]
+        private Asset[] m_SerializedImportedAssets = new Asset[0];
+
         public virtual event Action<IEnumerable<AssetStoreLocalInfo> /*addedOrUpdated*/, IEnumerable<AssetStoreLocalInfo> /*removed*/> onLocalInfosChanged;
         public virtual event Action<AssetStoreProductInfo> onProductInfoChanged;
         public virtual event Action<IEnumerable<AssetStorePurchaseInfo>> onPurchaseInfosChanged;
         public virtual event Action<IEnumerable<AssetStoreUpdateInfo>> onUpdateInfosChanged;
+        public virtual event Action<IEnumerable<AssetStoreImportedPackage> /*addedOrUpdated*/, IEnumerable<AssetStoreImportedPackage> /*removed*/> onImportedPackagesChanged;
 
         public virtual IEnumerable<AssetStoreLocalInfo> localInfos => m_LocalInfos.Values;
 
+        public virtual IEnumerable<AssetStoreImportedPackage> importedPackages => m_ImportedPackages.Values;
+        public virtual IEnumerable<Asset> importedAssets => m_ImportedAssets.Values;
+
         [NonSerialized]
         private ApplicationProxy m_Application;
         [NonSerialized]
@@ -75,6 +86,8 @@ public void OnBeforeSerialize()
             m_SerializedProductInfos = m_ProductInfos.Values.ToArray();
             m_SerializedLocalInfos = m_LocalInfos.Values.ToArray();
             m_SerializedUpdateInfos = m_UpdateInfos.Values.ToArray();
+
+            m_SerializedImportedAssets = m_ImportedAssets.Values.ToArray();
         }
 
         public void OnAfterDeserialize()
@@ -86,6 +99,20 @@ public void OnAfterDeserialize()
             m_ProductInfos = m_SerializedProductInfos.ToDictionary(info => info.productId, info => info);
             m_LocalInfos = m_SerializedLocalInfos.ToDictionary(info => info.productId, info => info);
             m_UpdateInfos = m_SerializedUpdateInfos.ToDictionary(info => info.productId, info => info);
+
+            m_ImportedAssets = m_SerializedImportedAssets.ToDictionary(asset => asset.importedPath, asset => asset);
+
+            // We don't serialize imported packages, because the list of imported packages can be constructed from imported assets
+            foreach (var asset in m_SerializedImportedAssets)
+            {
+                if (m_ImportedPackages.TryGetValue(asset.origin.productId, out var importedPackage))
+                {
+                    importedPackage.AddImportedAsset(asset);
+                    continue;
+                }
+
+                m_ImportedPackages[asset.origin.productId] = new AssetStoreImportedPackage(new List<Asset>() { asset });
+            }
         }
 
         public virtual void SetCategory(string category, long count)
@@ -192,6 +219,11 @@ public virtual AssetStoreUpdateInfo GetUpdateInfo(long? productId)
             return productId > 0 ? m_UpdateInfos.Get(productId.Value) : null;
         }
 
+        public virtual AssetStoreImportedPackage GetImportedPackage(long? productId)
+        {
+            return productId > 0 ? m_ImportedPackages.Get(productId.Value) : null;
+        }
+
         public virtual void SetPurchaseInfos(IEnumerable<AssetStorePurchaseInfo> purchaseInfos)
         {
             var updatedPurcahseInfos = new List<AssetStorePurchaseInfo>();
@@ -278,5 +310,63 @@ public virtual void SetUpdateInfos(IEnumerable<AssetStoreUpdateInfo> updateInfos
             if (updateInfosChanged.Any())
                 onUpdateInfosChanged?.Invoke(updateInfosChanged);
         }
+
+        public virtual void UpdateImportedAssets(IEnumerable<Asset> addedOrUpdatedAssets, IEnumerable<string> removedAssetPaths)
+        {
+            var modifiedProductIds = new HashSet<long>();
+            foreach (var path in removedAssetPaths ?? Enumerable.Empty<string>())
+            {
+                if (!m_ImportedAssets.ContainsKey(path))
+                    continue;
+
+                modifiedProductIds.Add(m_ImportedAssets[path].origin.productId);
+                m_ImportedAssets.Remove(path);
+            }
+            foreach (var asset in addedOrUpdatedAssets ?? Enumerable.Empty<Asset>())
+            {
+                modifiedProductIds.Add(asset.origin.productId);
+                m_ImportedAssets[asset.importedPath] = asset;
+            }
+
+            if (modifiedProductIds.Any())
+                RefreshImportedPackageList(modifiedProductIds);
+        }
+
+        private void RefreshImportedPackageList(HashSet<long> modifiedProductIds)
+        {
+            var addedOrUpdatedPackages = new Dictionary<long, AssetStoreImportedPackage>();
+            foreach (var asset in m_ImportedAssets.Values)
+            {
+                var productId = asset.origin.productId;
+                if (!modifiedProductIds.Contains(productId))
+                    continue;
+
+                if (addedOrUpdatedPackages.TryGetValue(asset.origin.productId, out var package))
+                {
+                    package.AddImportedAsset(asset);
+                    continue;
+                }
+                addedOrUpdatedPackages[asset.origin.productId] = new AssetStoreImportedPackage(new List<Asset>() { asset });
+            }
+
+            var removedPackages = new List<AssetStoreImportedPackage>();
+            foreach (var productId in modifiedProductIds)
+            {
+                if (addedOrUpdatedPackages.TryGetValue(productId, out var package))
+                {
+                    m_ImportedPackages[productId] = package;
+                    continue;
+                }
+
+                if (m_ImportedPackages.TryGetValue(productId, out var removedPackage))
+                {
+                    m_ImportedPackages.Remove(productId);
+                    removedPackages.Add(removedPackage);
+                }
+            }
+
+            if (addedOrUpdatedPackages.Any() || removedPackages.Any())
+                onImportedPackagesChanged?.Invoke(addedOrUpdatedPackages.Values, removedPackages);
+        }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCallQueue.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCallQueue.cs
index 4d3bdd3201..0331cd8299 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCallQueue.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCallQueue.cs
@@ -150,6 +150,7 @@ private void OnUserLoginStateChange(bool isUserInfoReady, bool isUserLoggedIn)
                 CheckUpdateForUncheckedLocalInfos();
             }
         }
+
         public virtual void AddToFetchProductInfoQueue(long productId)
         {
             m_FetchProductInfoQueue.Enqueue(productId);
@@ -184,6 +185,7 @@ private void FetchProductInfoFromQueue()
                 m_AssetStoreClient.FetchProductInfo(productId, () => m_CurrentFetchProductInfo.Remove(productId));
             }
         }
+
         private void CheckUpdateFromStack()
         {
             if (!m_UnityConnect.isUserLoggedIn || m_CheckUpdateInProgress || !m_CheckUpdateStack.Any())
@@ -249,7 +251,14 @@ public virtual void CancelCheckUpdates()
 
         public virtual void CheckUpdateForUncheckedLocalInfos()
         {
-            InsertToCheckUpdateQueue(m_AssetStoreCache.localInfos.Where(info => m_AssetStoreCache.GetUpdateInfo(info?.productId) == null).Select(info => info.productId));
+            var missingLocalInfos = m_AssetStoreCache.localInfos
+                .Where(info => m_AssetStoreCache.GetUpdateInfo(info?.productId) == null)
+                .Select(info => info.productId).ToArray();
+
+            if (!missingLocalInfos.Any())
+                return;
+
+            InsertToCheckUpdateQueue(missingLocalInfos);
             m_RefreshAfterCheckUpdates = true;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreClientV2.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreClientV2.cs
index 397514156b..1ab2617c55 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreClientV2.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreClientV2.cs
@@ -33,13 +33,13 @@ internal class AssetStoreClientV2
         [NonSerialized]
         private FetchStatusTracker m_FetchStatusTracker;
         [NonSerialized]
-        private UpmCache m_UpmCache;
+        private AssetDatabaseProxy m_AssetDatabase;
         public void ResolveDependencies(UnityConnectProxy unityConnect,
             AssetStoreCache assetStoreCache,
             AssetStoreUtils assetStoreUtils,
             AssetStoreRestAPI assetStoreRestAPI,
             FetchStatusTracker fetchStatusTracker,
-            UpmCache upmCache)
+            AssetDatabaseProxy assetDatabase)
         {
             m_UnityConnect = unityConnect;
             m_AssetStoreCache = assetStoreCache;
@@ -47,7 +47,7 @@ public void ResolveDependencies(UnityConnectProxy unityConnect,
             m_AssetStoreRestAPI = assetStoreRestAPI;
 
             m_FetchStatusTracker = fetchStatusTracker;
-            m_UpmCache = upmCache;
+            m_AssetDatabase = assetDatabase;
 
             m_ListOperation?.ResolveDependencies(unityConnect, assetStoreRestAPI, assetStoreCache);
         }
@@ -60,7 +60,7 @@ public virtual void ExtraFetch(long productId)
             {
                 // If a list operation is still in progress when extra fetch returns, we'll wait until the list operation results
                 // are processed, such that the extra fetch result won't be overwritten by the list result.
-                if (m_ListOperation.isInProgress)
+                if (m_ListOperation?.isInProgress == true)
                     m_ListOperation.onOperationFinalized += op => onProductExtraFetched?.Invoke(productId);
                 else
                     onProductExtraFetched?.Invoke(productId);
@@ -75,7 +75,7 @@ public void FetchPurchaseInfoWithRetry(long productId, bool checkHiddenPurchases
             if (m_AssetStoreCache.GetPurchaseInfo(productId) != null)
                 return;
 
-            if (m_ListOperation.isInProgress)
+            if (m_ListOperation?.isInProgress == true)
             {
                 m_ListOperation.onOperationFinalized += op => FetchPurchaseInfoWithRetry(productId, checkHiddenPurchases);
                 return;
@@ -175,5 +175,56 @@ public virtual void FetchUpdateInfos(IEnumerable<long> productIds, Action doneCa
                     doneCallback?.Invoke();
                 });
         }
+
+        public virtual IEnumerable<Asset> ListImportedAssets()
+        {
+            // We need to manually create the SearchFilter so that we look for assetorigins
+            var filter = new SearchFilter { searchArea = SearchFilter.SearchArea.AllAssets };
+            filter.ClearSearch();
+            filter.originalText = "assetorigin:";
+            filter.anyWithAssetOrigin = true;
+
+            var guidsWithOrigin = m_AssetDatabase.FindAssets(filter);
+            return guidsWithOrigin.Select(guid =>
+            {
+                var assetOrigin = m_AssetDatabase.GetAssetOrigin(guid);
+                var assetPath = m_AssetDatabase.GUIDToAssetPath(guid);
+                return new Asset
+                {
+                    guid = guid,
+                    importedPath = assetPath,
+                    origin = assetOrigin
+                };
+            });
+        }
+
+        public virtual void OnPostProcessAllAssets(string[] importedAssetPaths, string[] deletedAssetPaths, string[] movedAssetPaths, string[] movedFromAssetPaths)
+        {
+            var addedOrUpdatedAssets = new List<Asset>();
+            var removedAssetPaths = deletedAssetPaths.Union(movedFromAssetPaths).ToHashSet();
+
+            var pathsToCheckForOrigin = importedAssetPaths.Union(movedAssetPaths).ToArray();
+            foreach (var path in pathsToCheckForOrigin)
+            {
+                var guid = m_AssetDatabase.AssetPathToGUID(path);
+                var assetOrigin = m_AssetDatabase.GetAssetOrigin(guid);
+                if (assetOrigin?.IsValid() == true)
+                    addedOrUpdatedAssets.Add(new Asset
+                    {
+                        guid = guid,
+                        importedPath = path,
+                        origin = assetOrigin
+                    });
+                else
+                    removedAssetPaths.Add(path);
+            }
+
+            m_AssetStoreCache.UpdateImportedAssets(addedOrUpdatedAssets, removedAssetPaths);
+        }
+
+        public virtual void RefreshImportedAssets()
+        {
+            m_AssetStoreCache.UpdateImportedAssets(ListImportedAssets(), m_AssetStoreCache.importedAssets.Select(a => a.importedPath));
+        }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadManager.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadManager.cs
index 920fe311c6..cc6aebbb5e 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadManager.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadManager.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditorInternal;
+using UnityEditor.Utils;
 using UnityEngine;
 
 namespace UnityEditor.PackageManager.UI.Internal
@@ -195,9 +196,8 @@ private void SetupDownloadOperation(AssetStoreDownloadOperation operation)
         private void OnDownloadFinalized(AssetStoreDownloadOperation operation)
         {
             onDownloadFinalized?.Invoke(operation);
-
             if (operation.state == DownloadState.Completed &&
-                !string.IsNullOrEmpty(operation.packageOldPath) && operation.packageNewPath != operation.packageOldPath)
+                !string.IsNullOrEmpty(operation.packageOldPath) && operation.packageNewPath.NormalizePath() != operation.packageOldPath.NormalizePath())
             {
                 m_IOProxy.DeleteFile(operation.packageOldPath);
             }
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreImportedPackage.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreImportedPackage.cs
new file mode 100644
index 0000000000..212cf2f2a3
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreImportedPackage.cs
@@ -0,0 +1,69 @@
+// 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 System.Linq;
+using UnityEngine;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    [Serializable]
+    internal class AssetStoreImportedPackage : IEnumerable<Asset>
+    {
+        public long productId => latestAssetOrigin?.productId ?? 0;
+        public string displayName => latestAssetOrigin?.packageName ?? "";
+        public string versionString => latestAssetOrigin?.packageVersion ?? "";
+        public long uploadId => latestAssetOrigin?.uploadId ?? 0;
+
+        // Used in UI. Highest/latest asset origin found amongst importedAssets. This is set
+        // as part of the List function
+        [SerializeField]
+        private AssetOrigin m_LatestAssetOrigin;
+        public AssetOrigin latestAssetOrigin
+        {
+            get
+            {
+                if (m_LatestAssetOrigin == null)
+                    CalculateLatestAssetOrigin();
+                return m_LatestAssetOrigin;
+            }
+        }
+
+        [SerializeField]
+        private List<Asset> m_ImportedAssets;
+
+        public AssetStoreImportedPackage(List<Asset> importedAssets)
+        {
+            m_ImportedAssets = importedAssets ?? new List<Asset>();
+            CalculateLatestAssetOrigin();
+        }
+
+        private void CalculateLatestAssetOrigin()
+        {
+            m_LatestAssetOrigin = m_ImportedAssets.OrderByDescending(x => x.origin.uploadId).FirstOrDefault().origin;
+        }
+
+        public void AddImportedAsset(Asset importedAsset)
+        {
+            if (importedAsset.origin == null)
+                return;
+
+            m_ImportedAssets.Add(importedAsset);
+            if (importedAsset.origin.uploadId > m_LatestAssetOrigin.uploadId)
+                m_LatestAssetOrigin = importedAsset.origin;
+        }
+
+        public IEnumerator<Asset> GetEnumerator()
+        {
+            return m_ImportedAssets.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return m_ImportedAssets.GetEnumerator();
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreListOperation.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreListOperation.cs
index b3c40fec78..b54facfca2 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreListOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreListOperation.cs
@@ -16,6 +16,7 @@ internal class AssetStoreListOperation : IOperation
         private static readonly string k_UserNotLoggedInErrorMessage = L10n.Tr("User not logged in.");
 
         public string packageUniqueId => string.Empty;
+        public long productId => 0;
 
         [SerializeField]
         protected long m_Timestamp;
@@ -51,7 +52,8 @@ internal class AssetStoreListOperation : IOperation
 
         [SerializeField]
         private bool m_DownloadedAssetsOnly;
-
+        [SerializeField]
+        private bool m_ImportedAssetsOnly;
         [SerializeField]
         private bool m_UpdateAvailableOnly;
 
@@ -117,7 +119,7 @@ public void Start(PurchasesQueryArgs queryArgs)
             }
 
             m_Result = new AssetStorePurchases(m_OriginalQueryArgs);
-            if ((m_DownloadedAssetsOnly || m_UpdateAvailableOnly) && !m_AdjustedQueryArgs.productIds.Any())
+            if ((m_DownloadedAssetsOnly || m_UpdateAvailableOnly || m_ImportedAssetsOnly) && !m_AdjustedQueryArgs.productIds.Any())
             {
                 m_Result.total = 0;
                 onOperationSuccess?.Invoke(this);
@@ -142,6 +144,7 @@ private void SetQueryArgs(PurchasesQueryArgs queryArgs)
             m_OriginalQueryArgs = queryArgs;
 
             m_DownloadedAssetsOnly = m_OriginalQueryArgs.downloadedOnly;
+            m_ImportedAssetsOnly = m_OriginalQueryArgs.importedOnly;
             m_UpdateAvailableOnly = m_OriginalQueryArgs.updateAvailableOnly;
             // The GetPurchases API has a limit of maximum 1000 items (to avoid performance issues)
             // therefore we do some adjustments to the original query args enforce that limit and split
@@ -154,6 +157,11 @@ private void SetQueryArgs(PurchasesQueryArgs queryArgs)
                 m_AdjustedQueryArgs.status = string.Empty;
                 m_AdjustedQueryArgs.productIds = m_AssetStoreCache.localInfos.Select(info => info.productId).ToList();
             }
+            else if (m_ImportedAssetsOnly)
+            {
+                m_AdjustedQueryArgs.status = string.Empty;
+                m_AdjustedQueryArgs.productIds = m_AssetStoreCache.importedPackages.Select(p => p.productId).ToList();
+            }
             else if (m_UpdateAvailableOnly)
             {
                 m_AdjustedQueryArgs.status = string.Empty;
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreLocalInfo.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreLocalInfo.cs
index 7e0f13b9ff..c64399edf5 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreLocalInfo.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreLocalInfo.cs
@@ -13,6 +13,7 @@ internal class AssetStoreLocalInfo
         public long productId;
         public long uploadId;
         public long versionId;
+        public string title;
         public string versionString;
         public string publishedDate;
         public string supportedVersion;
@@ -36,6 +37,7 @@ public static AssetStoreLocalInfo ParseLocalInfo(UnityEditor.PackageInfo localIn
                 {
                     productId = productId,
                     packagePath = localInfo.packagePath ?? string.Empty,
+                    title = jsonInfo.GetString("title") ?? string.Empty,
                     versionString = jsonInfo.GetString("version") ?? string.Empty,
                     versionId = jsonInfo.GetStringAsLong("version_id"),
                     uploadId = jsonInfo.GetStringAsLong("upload_id"),
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreOAuth.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreOAuth.cs
index 47c3b078b8..cb0b152caa 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreOAuth.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreOAuth.cs
@@ -13,172 +13,65 @@ namespace UnityEditor.PackageManager.UI.Internal
     internal class AssetStoreOAuth
     {
         [Serializable]
-        public class AssetStoreToken
+        public class AccessToken
         {
-            private const long k_BufferTime = 15L; // We make sure we still have 15 seconds with the token
+            public const long k_ExpirationBufferTime = 15L;
 
             public string accessToken;
-            public string expiresIn
-            {
-                get
-                {
-                    return m_ExpirationIn.ToString();
-                }
-                set
-                {
-                    m_ExpirationIn = long.Parse(value);
-                    m_ExpirationStart = EpochSeconds;
-                }
-            }
-
-            [SerializeField]
-            private double m_ExpirationStart;
-            [SerializeField]
-            private long m_ExpirationIn;
-
-            private static double EpochSeconds => (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-
-            public AssetStoreToken()
-            {
-                m_ExpirationIn = 0;
-                m_ExpirationStart = EpochSeconds;
-            }
-
-            public bool IsValid(long bufferTime = k_BufferTime)
-            {
-                return m_ExpirationIn > 0 && (EpochSeconds - m_ExpirationStart) < (m_ExpirationIn - bufferTime);
-            }
-        }
 
-        [Serializable]
-        public class AccessToken : AssetStoreToken
-        {
-            public string tokenType;
             public string refreshToken;
-            public string user;
-            public string displayName;
 
-            public AccessToken(Dictionary<string, object> rawData)
+            [SerializeField]
+            private long m_ExpirationTimeTicks;
+
+            public AccessToken(DateTime creationTime, Dictionary<string, object> rawData)
             {
                 accessToken = rawData.GetString("access_token");
-                tokenType = rawData.GetString("token_type");
-                expiresIn = rawData.GetString("expires_in");
                 refreshToken = rawData.GetString("refresh_token");
-                user = rawData.GetString("user");
-                displayName = rawData.GetString("display_name");
-            }
-        }
 
-        [Serializable]
-        public class TokenInfo : AssetStoreToken
-        {
-            public string sub;
-            public string scopes;
-            public string clientId;
-            public string ipAddress;
-
-            public TokenInfo(Dictionary<string, object> rawData)
-            {
-                sub = rawData.GetString("sub");
-                scopes = rawData.GetString("scopes");
-                expiresIn = rawData.GetString("expires_in");
-                clientId = rawData.GetString("client_id");
-                ipAddress = rawData.GetString("ip_address");
-                accessToken = rawData.GetString("access_token");
+                var expiresInSeconds = rawData.GetStringAsLong("expires_in");
+                m_ExpirationTimeTicks = creationTime.AddSeconds(expiresInSeconds - k_ExpirationBufferTime).Ticks;
             }
-        }
-
-        [Serializable]
-        public class UserInfo
-        {
-            public string id;
-            public string username;
-            public string defaultOrganization;
-
-            [SerializeField]
-            private TokenInfo m_TokenInfo;
 
-            public bool isValid => m_TokenInfo?.IsValid() ?? false;
-
-            public string accessToken => m_TokenInfo?.accessToken;
-
-            public UserInfo(Dictionary<string, object> rawData, TokenInfo tokenInfo)
+            public bool IsValid(DateTime currentTime)
             {
-                id = rawData.GetString("id");
-                username = rawData.GetString("username");
-                defaultOrganization = rawData.GetDictionary("extendedProperties")?.GetString("UNITY_DEFAULT_ORGANIZATION");
-
-                m_TokenInfo = tokenInfo;
+                return m_ExpirationTimeTicks > 0 && !string.IsNullOrEmpty(accessToken) && currentTime.Ticks < m_ExpirationTimeTicks;
             }
         }
 
         private const string k_OAuthUri = "/v1/oauth2/token";
-        private const string k_TokenInfoUri = "/v1/oauth2/tokeninfo";
-        private const string k_UserInfoUri = "/v1/users";
         private const string k_ServiceId = "packman";
 
-        private IAsyncHTTPClient m_UserInfoRequest;
         private IAsyncHTTPClient m_AccessTokenRequest;
-        private IAsyncHTTPClient m_TokenRequest;
 
         // if the OAuth singleton does go through serialization, all events are destroyed and callbacks won't be triggered
         // therefore we choose not to serialize this filed so that we'll request auth code again
         [NonSerialized]
         private bool m_AuthCodeRequested;
 
-        [SerializeField]
-        private UserInfo m_UserInfo;
-
         [SerializeField]
         private string m_AuthCode;
 
         [SerializeField]
         private AccessToken m_AccessToken;
 
-        [SerializeField]
-        private TokenInfo m_TokenInfo;
-
-        private event Action<string> m_OnAuthCodeFetched;
-        private event Action<AccessToken> m_OnAccessTokenFetched;
-        private event Action<TokenInfo> m_OnTokenInfoFetched;
-        private event Action<UserInfo> m_OnUserInfoFetched;
-
-        // this onError callback is shared between all steps in this process, no matter which step has the error, we'll call this event
-        private event Action<UIError> m_OnError;
-
-        private string m_Host;
-        private string host
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(m_Host))
-                    m_Host = m_UnityConnect.GetConfigurationURL(CloudConfigUrl.CloudIdentity);
-                return m_Host;
-            }
-        }
-
-        private string m_Secret;
-        private string secret
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(m_Secret))
-                    m_Secret = m_UnityConnect.GetConfigurationURL(CloudConfigUrl.CloudPackagesKey);
-                return m_Secret;
-            }
-        }
-
+        private event Action<AccessToken> onAccessTokenFetched;
+        private event Action<UIError> onError;
 
+        [NonSerialized]
+        private DateTimeProxy m_DateTime;
         [NonSerialized]
         private UnityConnectProxy m_UnityConnect;
         [NonSerialized]
         private UnityOAuthProxy m_UnityOAuth;
         [NonSerialized]
         private HttpClientFactory m_HttpClientFactory;
-        public void ResolveDependencies(UnityConnectProxy unityConnect,
+        public void ResolveDependencies(DateTimeProxy dateTime,
+            UnityConnectProxy unityConnect,
             UnityOAuthProxy unityOAuth,
             HttpClientFactory httpClientFactory)
         {
+            m_DateTime = dateTime;
             m_UnityConnect = unityConnect;
             m_UnityOAuth = unityOAuth;
             m_HttpClientFactory = httpClientFactory;
@@ -202,114 +95,75 @@ private void OnUserLoginStateChange(bool userInfoReady, bool loggedIn)
         public virtual void ClearCache()
         {
             m_AuthCodeRequested = false;
-            m_TokenRequest?.Abort();
-            m_UserInfoRequest?.Abort();
             m_AccessTokenRequest?.Abort();
-
-            m_TokenRequest = null;
-            m_UserInfoRequest = null;
             m_AccessTokenRequest = null;
 
-            m_UserInfo = null;
             m_AuthCode = null;
             m_AccessToken = null;
-            m_TokenInfo = null;
-        }
 
-        // Fetching UserInfo is a 4 step process
-        // GetAuthCode -> GetAccessToken -> GetTokenInfo -> GetUserInfo
-        // These 4 steps are chained together by async callbacks
-        public virtual void FetchUserInfo(Action<UserInfo> doneCallback, Action<UIError> errorCallback)
-        {
-            m_OnError += errorCallback;
-            GetUserInfo(doneCallback);
+            ClearAccessTokenCallbacks();
         }
 
-        private void GetAuthCode(Action<string> doneCallback)
+        public virtual void FetchAccessToken(Action<AccessToken> doneCallback, Action<UIError> errorCallback)
         {
-            if (!string.IsNullOrEmpty(m_AuthCode))
+            if (m_AccessToken?.IsValid(m_DateTime.utcNow) ?? false)
             {
-                doneCallback?.Invoke(m_AuthCode);
+                doneCallback?.Invoke(m_AccessToken);
                 return;
             }
 
-            // if the result is not cached already, we will register the callback to be called later async
-            // this is needed because we only want to have one request going at a time and don't want to lose any callback events
-            // because of early `return`s
-            m_OnAuthCodeFetched += doneCallback;
+            onAccessTokenFetched += doneCallback;
+            onError += errorCallback;
 
+            var authorization = GetAuthorization();
+            if (!string.IsNullOrEmpty(authorization))
+                GetAccessToken(authorization);
+            else
+                GetAuthCodeAndAccessToken();
+        }
+
+        private void GetAuthCodeAndAccessToken()
+        {
             if (m_AuthCodeRequested)
                 return;
 
             m_AuthCodeRequested = true;
-            try
-            {
-                m_UnityOAuth.GetAuthorizationCodeAsync(k_ServiceId, authCodeResponse =>
-                {
-                    m_AuthCode = string.Empty;
-                    m_AuthCodeRequested = false;
-                    if (!string.IsNullOrEmpty(authCodeResponse.AuthCode))
-                    {
-                        m_AuthCode = authCodeResponse.AuthCode;
-                        m_OnAuthCodeFetched?.Invoke(m_AuthCode);
-                        m_OnAuthCodeFetched = null;
-                    }
-                    else
-                    {
-                        OnOperationError(string.Format(L10n.Tr("Error while getting auth code: {0}"), authCodeResponse.Exception.ToString()));
-                    }
-                });
-            }
-            catch (Exception e)
+            m_UnityOAuth.GetAuthorizationCodeAsync(k_ServiceId, authCodeResponse =>
             {
-                m_AuthCode = string.Empty;
                 m_AuthCodeRequested = false;
-                OnOperationError(string.Format(L10n.Tr("Error while getting auth code: {0}"), e.Message));
-            }
+                if (!string.IsNullOrEmpty(authCodeResponse.AuthCode))
+                {
+                    m_AuthCode = authCodeResponse.AuthCode;
+                    GetAccessToken(GetAuthorization());
+                }
+                else
+                {
+                    OnOperationError(string.Format(L10n.Tr("Error while getting auth code: {0}"), authCodeResponse.Exception));
+                }
+            });
         }
 
-        private void GetAccessToken(Action<AccessToken> doneCallback)
+        private string GetAuthorization()
         {
-            if (m_AccessToken?.IsValid() ?? false)
-            {
-                doneCallback?.Invoke(m_AccessToken);
-                return;
-            }
-
-            // Use refresh token if any
-            if (!string.IsNullOrEmpty(m_AccessToken?.refreshToken))
-            {
-                GetAccessToken(doneCallback, refreshToken: m_AccessToken.refreshToken);
-                return;
-            }
-
-            GetAuthCode(authCode =>
-            {
-                GetAccessToken(doneCallback, authCode: authCode);
-            });
+            var refreshToken = m_AccessToken?.refreshToken;
+            if (!string.IsNullOrEmpty(refreshToken))
+                return $"grant_type=refresh_token&refresh_token={refreshToken}";
+            return !string.IsNullOrEmpty(m_AuthCode) ? $"grant_type=authorization_code&code={m_AuthCode}" : string.Empty;
         }
 
-        private void GetAccessToken(Action<AccessToken> doneCallback, string authCode = null, string refreshToken = null)
+        private void GetAccessToken(string authorization)
         {
-            m_OnAccessTokenFetched += doneCallback;
-
             if (m_AccessTokenRequest != null)
                 return;
 
+            var secret = m_UnityConnect.GetConfigurationURL(CloudConfigUrl.CloudPackagesKey);
             if (string.IsNullOrEmpty(secret))
             {
-                OnGetAccessTokenError(L10n.Tr("Error while getting access token: invalid configuration from Unity Connect"));
+                OnOperationError(L10n.Tr("Error while getting access token: invalid configuration from Unity Connect"));
                 return;
             }
 
-            var authorization = string.Empty;
-            if (!string.IsNullOrEmpty(authCode))
-                authorization = $"grant_type=authorization_code&code={authCode}";
-            else if (!string.IsNullOrEmpty(refreshToken))
-                authorization = $"grant_type=refresh_token&refresh_token={refreshToken}";
-            else
-                return;
-
+            var host = m_UnityConnect.GetConfigurationURL(CloudConfigUrl.CloudIdentity);
             m_AccessTokenRequest = m_HttpClientFactory.PostASyncHTTPClient($"{host}{k_OAuthUri}", $"{authorization}&client_id={k_ServiceId}&client_secret={secret}");
             m_AccessTokenRequest.header["Content-Type"] = "application/x-www-form-urlencoded";
             m_AccessTokenRequest.doneCallback = httpClient =>
@@ -317,137 +171,45 @@ private void GetAccessToken(Action<AccessToken> doneCallback, string authCode =
                 m_AccessTokenRequest = null;
                 m_AccessToken = null;
 
-                var response = AssetStoreUtils.ParseResponseAsDictionary(httpClient);
-                if (response != null)
+                var response = m_HttpClientFactory.ParseResponseAsDictionary(httpClient);
+                var errorMessage = response == null ? L10n.Tr("Unable to parse http response.") : response.GetString("errorMessage");
+                if (!string.IsNullOrEmpty(errorMessage))
                 {
-                    if (response.ContainsKey("errorMessage"))
-                    {
-                        OnGetAccessTokenError(string.Format(L10n.Tr("Error while getting access token: {0}"), response.GetString("errorMessage")));
-                        return;
-                    }
-
-                    var accessToken = new AccessToken(response);
-                    if (accessToken.IsValid())
-                    {
-                        m_AccessToken = accessToken;
-                        m_OnAccessTokenFetched?.Invoke(m_AccessToken);
-                        m_OnAccessTokenFetched = null;
-                    }
-                    else
-                        OnGetAccessTokenError(L10n.Tr("Access token invalid"));
-                }
-            };
-            m_AccessTokenRequest.Begin();
-        }
-
-        private void GetTokenInfo(Action<TokenInfo> doneCallback)
-        {
-            GetAccessToken(accessToken =>
-            {
-                if (m_TokenInfo?.IsValid() ?? false)
-                {
-                    doneCallback?.Invoke(m_TokenInfo);
+                    OnOperationError(string.Format(L10n.Tr("Error while getting access token: {0}"), errorMessage));
                     return;
                 }
 
-                m_OnTokenInfoFetched += doneCallback;
-
-                if (m_TokenRequest != null)
-                    return;
-
-                m_TokenRequest = m_HttpClientFactory.GetASyncHTTPClient($"{host}{k_TokenInfoUri}?access_token={accessToken.accessToken}");
-                m_TokenRequest.doneCallback = httpClient =>
+                var utcNow = m_DateTime.utcNow;
+                var accessToken = new AccessToken(utcNow, response);
+                if (accessToken.IsValid(utcNow))
                 {
-                    m_TokenRequest = null;
-                    m_TokenInfo = null;
-
-                    var response = AssetStoreUtils.ParseResponseAsDictionary(httpClient);
-                    if (response != null)
-                    {
-                        if (response.ContainsKey("errorMessage"))
-                        {
-                            OnOperationError(string.Format(L10n.Tr("Error while getting token info: {0}"), response.GetString("errorMessage")));
-                            return;
-                        }
-
-                        var tokenInfo = new TokenInfo(response);
-                        if (tokenInfo.IsValid())
-                        {
-                            m_TokenInfo = tokenInfo;
-                            m_OnTokenInfoFetched?.Invoke(m_TokenInfo);
-                            m_OnTokenInfoFetched = null;
-                        }
-                        else
-                            OnOperationError(L10n.Tr("Token info invalid"));
-                    }
-                };
-                m_TokenRequest.Begin();
-            });
-        }
-
-        private void GetUserInfo(Action<UserInfo> doneCallback)
-        {
-            GetTokenInfo(tokenInfo =>
-            {
-                if (m_UserInfo?.isValid ?? false)
-                {
-                    doneCallback?.Invoke(m_UserInfo);
-                    m_OnError = null;
-                    return;
+                    m_AccessToken = accessToken;
+                    onAccessTokenFetched?.Invoke(m_AccessToken);
+                    ClearAccessTokenCallbacks();
                 }
-
-                m_OnUserInfoFetched += doneCallback;
-
-                if (m_UserInfoRequest != null)
-                    return;
-
-                m_UserInfoRequest = m_HttpClientFactory.GetASyncHTTPClient($"{host}{k_UserInfoUri}/{tokenInfo.sub}");
-                m_UserInfoRequest.header["Authorization"] = "Bearer " + tokenInfo.accessToken;
-                m_UserInfoRequest.doneCallback = httpClient =>
-                {
-                    m_UserInfoRequest = null;
-                    m_UserInfo = null;
-
-                    var response = AssetStoreUtils.ParseResponseAsDictionary(httpClient);
-                    if (response != null)
-                    {
-                        if (response.ContainsKey("errorMessage"))
-                        {
-                            OnOperationError(string.Format(L10n.Tr("Error while getting user info: {0}"), response.GetString("errorMessage")));
-                            return;
-                        }
-
-                        var userInfo = new UserInfo(response, tokenInfo);
-                        if (userInfo.isValid)
-                        {
-                            m_UserInfo = userInfo;
-                            m_OnUserInfoFetched?.Invoke(m_UserInfo);
-                            m_OnUserInfoFetched = null;
-                            // note that we only clear error callbacks on the when user info is fetched
-                            // as we need the error callback to be present for the whole process.
-                            m_OnError = null;
-                        }
-                        else
-                            OnOperationError(L10n.Tr("User info invalid"));
-                    }
-                };
-                m_UserInfoRequest.Begin();
-            });
+                else
+                    OnOperationError(L10n.Tr("Access token invalid"));
+            };
+            m_AccessTokenRequest.Begin();
         }
 
-        private void OnGetAccessTokenError(string errorMessage)
+        private void OnOperationError(string errorMessage)
         {
+            Debug.LogError(string.Format(L10n.Tr("[Package Manager Window] {0}"), errorMessage));
+            onError?.Invoke(new UIError(UIErrorCode.AssetStoreAuthorizationError, errorMessage, UIError.Attribute.IsDetailInConsole));
+
             // when we have trouble getting access token, it's most likely because the auth code is no longer valid.
             // therefore we want to clear the auth code in the case of error, such that new auth code will be fetched in the next refresh
             m_AuthCode = string.Empty;
-            OnOperationError(errorMessage);
+            m_AuthCodeRequested = false;
+
+            ClearAccessTokenCallbacks();
         }
 
-        private void OnOperationError(string errorMessage)
+        private void ClearAccessTokenCallbacks()
         {
-            Debug.LogError(string.Format(L10n.Tr("[Package Manager Window] {0}"), errorMessage));
-            m_OnError?.Invoke(new UIError(UIErrorCode.AssetStoreAuthorizationError, errorMessage, UIError.Attribute.IsDetailInConsole));
-            m_OnError = null;
+            onAccessTokenFetched = delegate {};
+            onError = delegate {};
         }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageFactory.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageFactory.cs
index 8ccb9a6a9f..8a02b1aa85 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageFactory.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageFactory.cs
@@ -53,6 +53,7 @@ public void OnEnable()
             m_AssetStoreCache.onPurchaseInfosChanged += OnPurchaseInfosChanged;
             m_AssetStoreCache.onProductInfoChanged += OnProductInfoChanged;
             m_AssetStoreCache.onUpdateInfosChanged += OnUpdateInfosChanged;
+            m_AssetStoreCache.onImportedPackagesChanged += OnImportedPackagesChanged;
 
             m_AssetStoreDownloadManager.onDownloadProgress += OnDownloadProgress;
             m_AssetStoreDownloadManager.onDownloadFinalized += OnDownloadFinalized;
@@ -71,6 +72,7 @@ public void OnDisable()
             m_AssetStoreCache.onPurchaseInfosChanged -= OnPurchaseInfosChanged;
             m_AssetStoreCache.onProductInfoChanged -= OnProductInfoChanged;
             m_AssetStoreCache.onUpdateInfosChanged -= OnUpdateInfosChanged;
+            m_AssetStoreCache.onImportedPackagesChanged -= OnImportedPackagesChanged;
 
             m_AssetStoreDownloadManager.onDownloadProgress -= OnDownloadProgress;
             m_AssetStoreDownloadManager.onDownloadFinalized -= OnDownloadFinalized;
@@ -189,6 +191,14 @@ private void OnLocalInfosChanged(IEnumerable<AssetStoreLocalInfo> addedOrUpdated
             GeneratePackagesAndTriggerChangeEvent(productIds);
         }
 
+        private void OnImportedPackagesChanged(IEnumerable<AssetStoreImportedPackage> addedOrUpdated, IEnumerable<AssetStoreImportedPackage> removed)
+        {
+            // Since users could have way more locally downloaded .unitypackages than what's in their purchase list
+            // we don't want to trigger change events for all of them, only the ones we already checked before (the ones with productInfos)
+            var productIds = addedOrUpdated?.Select(info => info.productId).Concat(removed.Select(info => info.productId) ?? new long[0]);
+            GeneratePackagesAndTriggerChangeEvent(productIds);
+        }
+
         private void OnUpdateInfosChanged(IEnumerable<AssetStoreUpdateInfo> updateInfos)
         {
             // Right now updateInfo goes hands in hands with localInfo, so we handle it the same way as localInfo changes
@@ -243,7 +253,8 @@ public void GeneratePackagesAndTriggerChangeEvent(IEnumerable<long> productIds)
                 var isDeprecated = productInfo.state.Equals("deprecated", StringComparison.InvariantCultureIgnoreCase);
                 var localInfo = m_AssetStoreCache.GetLocalInfo(productId);
                 var updateInfo = m_AssetStoreCache.GetUpdateInfo(productId);
-                var versionList = new AssetStoreVersionList(m_IOProxy, productInfo, localInfo, updateInfo);
+                var importedPackage = m_AssetStoreCache.GetImportedPackage(productId);
+                var versionList = new AssetStoreVersionList(m_IOProxy, productInfo, localInfo, updateInfo, importedPackage);
                 var package = CreatePackage(string.Empty, versionList, new Product(productId, purchaseInfo, productInfo), isDeprecated: isDeprecated);
                 if (m_AssetStoreDownloadManager.GetDownloadOperation(productId)?.isInProgress == true)
                     SetProgress(package, PackageProgress.Downloading);
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageInstaller.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageInstaller.cs
new file mode 100644
index 0000000000..ca3ab56933
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageInstaller.cs
@@ -0,0 +1,141 @@
+// 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.PackageManager.UI.Internal
+{
+    internal class AssetStorePackageInstaller
+    {
+        [NonSerialized]
+        private IOProxy m_IOProxy;
+        [NonSerialized]
+        private AssetStoreCache m_AssetStoreCache;
+        [NonSerialized]
+        private AssetDatabaseProxy m_AssetDatabase;
+        [NonSerialized]
+        private AssetSelectionHandler m_AssetSelectionHandler;
+        public void ResolveDependencies(IOProxy ioProxy,
+            AssetStoreCache assetStoreCache,
+            AssetDatabaseProxy assetDatabaseProxy,
+            AssetSelectionHandler assetSelectionHandler)
+        {
+            m_IOProxy = ioProxy;
+            m_AssetStoreCache = assetStoreCache;
+            m_AssetDatabase = assetDatabaseProxy;
+            m_AssetSelectionHandler = assetSelectionHandler;
+        }
+
+        public void OnEnable()
+        {
+            m_AssetSelectionHandler.onRemoveSelectionDone += OnRemoveSelectionDone;
+        }
+
+        public void OnDisable()
+        {
+            m_AssetSelectionHandler.onRemoveSelectionDone -= OnRemoveSelectionDone;
+        }
+
+        public virtual void Install(long productId, bool interactiveInstall = false)
+        {
+            var localInfo = m_AssetStoreCache.GetLocalInfo(productId);
+            if (localInfo == null)
+                return;
+
+            var assetOrigin = new AssetOrigin((int)localInfo.productId, localInfo.title, localInfo.versionString, (int)localInfo.uploadId);
+            m_AssetDatabase.ImportPackage(localInfo.packagePath, assetOrigin, interactiveInstall);
+        }
+
+        private void RemoveAssetsAndCleanUpEmptyFolders(IEnumerable<Asset> assets)
+        {
+            const string assetsPath = "Assets";
+            var foldersToRemove = new HashSet<string>();
+            foreach (var asset in assets)
+            {
+                var path = m_IOProxy.GetParentDirectory(asset.importedPath);
+                // We want to add an asset's parent folders all the way up to the `Assets` folder, because we don't want to leave behind
+                // empty folders after the assets are removed process.
+                while (!foldersToRemove.Contains(path) && path.StartsWith(assetsPath) && path.Length > assetsPath.Length)
+                {
+                    foldersToRemove.Add(path);
+                    path = m_IOProxy.GetParentDirectory(path);
+                }
+            }
+            var searchInFoldersFilter = new SearchFilter
+            {
+                folders = foldersToRemove.ToArray(),
+                searchArea = SearchFilter.SearchArea.SelectedFolders
+            };
+
+            var leftOverAssetsGuids = m_AssetDatabase.FindAssets(searchInFoldersFilter).ToHashSet();
+            foreach (var guid in assets.Select(i => i.guid).Concat(foldersToRemove.Select(i => m_AssetDatabase.AssetPathToGUID(i))))
+                leftOverAssetsGuids.Remove(guid);
+
+            foreach (var assetPath in leftOverAssetsGuids.Select(i => m_AssetDatabase.GUIDToAssetPath(i)))
+            {
+                var path = m_IOProxy.GetParentDirectory(assetPath);
+                // If after the removal process, there will still be some assets left behind, we want to make sure the folders containing
+                // left over assets are not removed
+                while (foldersToRemove.Contains(path))
+                {
+                    foldersToRemove.Remove(path);
+                    path = m_IOProxy.GetParentDirectory(path);
+                }
+            }
+
+            // We order the folders to be removed so that child folders always come before their parent folders
+            // This way m_AssetDatabase.DeleteAssets call won't try to remove parent folders first and fail to remove child folders
+            var orderedFoldersToRemove = foldersToRemove.OrderByDescending(i => i);
+            var assetAndFoldersToRemove = assets.Select(i => i.importedPath).Concat(orderedFoldersToRemove).ToArray();
+            var pathsFailedToRemove = new List<string>();
+            m_AssetDatabase.DeleteAssets(assetAndFoldersToRemove, pathsFailedToRemove);
+
+            if (pathsFailedToRemove.Any())
+            {
+                var errorMessage = L10n.Tr("[Package Manager Window] Failed to remove the following asset(s) and/or folder(s):");
+                foreach (var path in pathsFailedToRemove)
+                    errorMessage += "\n" + path;
+                Debug.LogError(errorMessage);
+            }
+        }
+
+        public virtual void Uninstall(long productId, bool interactiveUninstall = false)
+        {
+            if (interactiveUninstall)
+            {
+                var importedPackage = m_AssetStoreCache.GetImportedPackage(productId);
+                m_AssetSelectionHandler.Remove(importedPackage, importedPackage.displayName, importedPackage.versionString);
+            }
+            else
+            {
+                var importedPackage = m_AssetStoreCache.GetImportedPackage(productId);
+                if (importedPackage != null)
+                    RemoveAssetsAndCleanUpEmptyFolders(importedPackage);
+            }
+        }
+
+        public virtual void Uninstall(IEnumerable<long> productIds)
+        {
+            var assetsToRemove = new List<Asset>();
+            foreach (var productId in productIds ?? Enumerable.Empty<long>())
+            {
+                var importedPackage = m_AssetStoreCache.GetImportedPackage(productId);
+                if (importedPackage != null)
+                    assetsToRemove.AddRange(importedPackage);
+            }
+
+            if (assetsToRemove.Any())
+                RemoveAssetsAndCleanUpEmptyFolders(assetsToRemove);
+        }
+
+        private void OnRemoveSelectionDone(IEnumerable<Asset> selections)
+        {
+            if (selections.Any())
+                RemoveAssetsAndCleanUpEmptyFolders(selections);
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageVersion.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageVersion.cs
index 45203b948d..7cf4970a83 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageVersion.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageVersion.cs
@@ -31,6 +31,8 @@ internal class AssetStorePackageVersion : BasePackageVersion, ISerializationCall
         private long m_VersionId;
         [SerializeField]
         private List<SemVersion> m_SupportedUnityVersions;
+        [SerializeField]
+        private AssetStoreImportedPackage m_ImportedPackage;
 
         [SerializeField]
         private string m_SupportedUnityVersionString;
@@ -71,6 +73,8 @@ internal class AssetStorePackageVersion : BasePackageVersion, ISerializationCall
 
         public override IEnumerable<PackageSizeInfo> sizes => m_SizeInfos;
 
+        public override IEnumerable<Asset> importedAssets => m_ImportedPackage;
+
         public void SetLocalPath(IOProxy ioProxy, string path)
         {
             m_LocalPath = path ?? string.Empty;
@@ -85,7 +89,7 @@ public void SetLocalPath(IOProxy ioProxy, string path)
             }
         }
 
-        public AssetStorePackageVersion(IOProxy ioProxy, AssetStoreProductInfo productInfo, AssetStoreLocalInfo localInfo = null)
+        public AssetStorePackageVersion(IOProxy ioProxy, AssetStoreProductInfo productInfo, AssetStoreLocalInfo localInfo = null, AssetStoreImportedPackage importedPackage = null)
         {
             if (productInfo == null)
                 throw new ArgumentNullException(nameof(productInfo));
@@ -105,6 +109,8 @@ public AssetStorePackageVersion(IOProxy ioProxy, AssetStoreProductInfo productIn
             m_VersionId = localInfo?.versionId ?? productInfo.versionId;
             SemVersionParser.TryParse(m_VersionString.Trim(), out m_Version);
 
+            m_ImportedPackage = importedPackage;
+
             var publishDateString = localInfo?.publishedDate ?? productInfo.publishedDate ?? string.Empty;
             m_PublishedDateTicks = !string.IsNullOrEmpty(publishDateString) ? DateTime.Parse(publishDateString).Ticks : 0;
             m_DisplayName = !string.IsNullOrEmpty(productInfo.displayName) ? productInfo.displayName : $"Package {productInfo.productId}@{m_VersionId}";
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreRestAPI.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreRestAPI.cs
index 03976b2ff9..c0b3932024 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreRestAPI.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreRestAPI.cs
@@ -50,7 +50,8 @@ internal class AssetStoreRestAPI
             "Essentials",
             "Templates",
             "Tools",
-            "VFX"
+            "VFX",
+            "Decentralization"
         };
 
         private string m_Host;
@@ -164,8 +165,8 @@ private void HandleHttpRequest(string urlWithoutHost, Action<Dictionary<string,
             if (abortPreviousRequest && !string.IsNullOrEmpty(tag))
                 m_HttpClientFactory.AbortByTag(tag);
 
-            m_AssetStoreOAuth.FetchUserInfo(
-                userInfo =>
+            m_AssetStoreOAuth.FetchAccessToken(
+                token =>
                 {
                     var maxRetryCount = k_MaxRetries;
 
@@ -176,7 +177,7 @@ void DoHttpRequest(Action<int> retryCallbackAction)
                         httpRequest.tag = tag ?? httpRequest.tag;
 
                         httpRequest.header["Content-Type"] = "application/json";
-                        httpRequest.header["Authorization"] = "Bearer " + userInfo.accessToken;
+                        httpRequest.header["Authorization"] = "Bearer " + token.accessToken;
                         httpRequest.doneCallback = request =>
                         {
                             // Ignore if aborted
@@ -204,7 +205,7 @@ void DoHttpRequest(Action<int> retryCallbackAction)
                                 return;
                             }
 
-                            var parsedResult = AssetStoreUtils.ParseResponseAsDictionary(request);
+                            var parsedResult = m_HttpClientFactory.ParseResponseAsDictionary(request);
                             if (parsedResult == null)
                                 retryCallbackAction?.Invoke(responseCode);
                             else
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreUtils.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreUtils.cs
index 8394d1e52c..9460a38453 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreUtils.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreUtils.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.Collections.Generic;
 using UnityEngine;
 using UnityAssetStoreUtils = UnityEditor.AssetStoreUtils;
 using UnityAssetStorePackageInfo = UnityEditor.PackageInfo;
@@ -12,43 +10,6 @@ namespace UnityEditor.PackageManager.UI.Internal
 {
     internal class AssetStoreUtils
     {
-        public static readonly string k_InvalidJSONErrorMessage = L10n.Tr("Server response is not a valid JSON");
-        public static readonly string k_ServerErrorMessage = L10n.Tr("Server response is");
-
-        public static Dictionary<string, object> ParseResponseAsDictionary(IAsyncHTTPClient request)
-        {
-            string errorMessage;
-            if (request.IsSuccess() && request.responseCode == 200)
-            {
-                if (string.IsNullOrEmpty(request.text))
-                    return null;
-
-                try
-                {
-                    var response = Json.Deserialize(request.text) as Dictionary<string, object>;
-                    if (response != null)
-                        return response;
-
-                    errorMessage = k_InvalidJSONErrorMessage;
-                }
-                catch (Exception e)
-                {
-                    errorMessage = $"{k_InvalidJSONErrorMessage} {e.Message}";
-                }
-            }
-            else
-            {
-                if (request.responseCode == 0 &&
-                    (string.IsNullOrEmpty(request.text) || request.text.ToLower().Contains("timeout")))
-                    return null;
-
-                var text = request.text.Length <= 128 ? request.text : request.text.Substring(0, 128) + "...";
-                errorMessage = $"{k_ServerErrorMessage} \"{text}\" [Code {request.responseCode}]";
-            }
-
-            return string.IsNullOrEmpty(errorMessage) ? null : new Dictionary<string, object> { ["errorMessage"] = errorMessage };
-        }
-
         public virtual string BuildBaseDownloadPath(string publisher, string category)
         {
             return UnityAssetStoreUtils.BuildBaseDownloadPath(publisher, category);
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreVersionList.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreVersionList.cs
index ee06e1e105..736aa37466 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreVersionList.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreVersionList.cs
@@ -16,7 +16,7 @@ internal class AssetStoreVersionList : IVersionList
         [SerializeField]
         private List<AssetStorePackageVersion> m_Versions;
 
-        public IEnumerable<IPackageVersion> key => m_Versions.Cast<IPackageVersion>();
+        public IEnumerable<IPackageVersion> key => m_Versions;
 
         public IPackageVersion installed => null;
 
@@ -46,7 +46,7 @@ public AssetStoreVersionList()
             m_Versions = new List<AssetStorePackageVersion>();
         }
 
-        public AssetStoreVersionList(IOProxy ioProxy, AssetStoreProductInfo productInfo, AssetStoreLocalInfo localInfo = null, AssetStoreUpdateInfo updateInfo = null)
+        public AssetStoreVersionList(IOProxy ioProxy, AssetStoreProductInfo productInfo, AssetStoreLocalInfo localInfo = null, AssetStoreUpdateInfo updateInfo = null, AssetStoreImportedPackage importedPackage = null)
         {
             m_Versions = new List<AssetStorePackageVersion>();
 
@@ -59,18 +59,21 @@ public AssetStoreVersionList(IOProxy ioProxy, AssetStoreProductInfo productInfo,
             // result in a case where localInfo and productInfo have different version numbers but no update is available
             // Because of this, we prefer showing version from the server (even when localInfo version is different)
             // and we only want to show the localInfo version when `localInfo.canUpdate` is set to true
-            var latestVersion = new AssetStorePackageVersion(ioProxy, productInfo);
-            if (localInfo != null)
+            if (localInfo != null && updateInfo?.canUpdate == true)
             {
-                if (updateInfo?.canUpdate == true)
-                    m_Versions.Add(new AssetStorePackageVersion(ioProxy, productInfo, localInfo));
-                else
+                m_Versions.Add(new AssetStorePackageVersion(ioProxy, productInfo, localInfo, importedPackage));
+                m_Versions.Add(new AssetStorePackageVersion(ioProxy, productInfo));
+            }
+            else
+            {
+                var version = new AssetStorePackageVersion(ioProxy, productInfo, importedPackage: importedPackage);
+                if (localInfo != null)
                 {
-                    latestVersion.SetLocalPath(ioProxy, localInfo.packagePath);
-                    latestVersion.AddDowngradeWarningIfApplicable(localInfo, updateInfo);
+                    version.SetLocalPath(ioProxy, localInfo.packagePath);
+                    version.AddDowngradeWarningIfApplicable(localInfo, updateInfo);
                 }
+                m_Versions.Add(version);
             }
-            m_Versions.Add(latestVersion);
         }
 
         public IEnumerator<IPackageVersion> GetEnumerator()
diff --git a/Modules/PackageManagerUI/Editor/Services/Common/BasePackageVersion.cs b/Modules/PackageManagerUI/Editor/Services/Common/BasePackageVersion.cs
index 14461177a1..f5899a5946 100644
--- a/Modules/PackageManagerUI/Editor/Services/Common/BasePackageVersion.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Common/BasePackageVersion.cs
@@ -45,9 +45,7 @@ internal abstract class BasePackageVersion : IPackageVersion, ISerializationCall
         public virtual DependencyInfo[] resolvedDependencies => null;
         public virtual EntitlementsInfo entitlements => null;
 
-        public virtual bool isRegistryPackage => false;
-
-        public virtual bool isFromScopedRegistry => false;
+        public virtual IEnumerable<Asset> importedAssets => null;
 
         [NonSerialized]
         private IPackage m_Package;
@@ -65,6 +63,20 @@ public virtual bool HasTag(PackageTag tag)
             return (m_Tag & tag) != 0;
         }
 
+        // Analytics tags are different from the package tags we use.
+        // We need them to identify different situations that we don't necessarily have tags for
+        public string GetAnalyticsTags()
+        {
+            var tags = new List<string>();
+            if (m_Tag != PackageTag.None)
+                tags.Add(m_Tag.ToString());
+            if (m_Package.isDeprecated)
+                tags.Add("PackageDeprecation");
+            return string.Join(", ", tags);
+        }
+
+        public virtual RegistryType availableRegistry => RegistryType.None;
+
         // Currently we don't consider Upm Packages with EntitlementLicensingModel.AssetStore as having entitlements
         // and it is only used right now to check if a package is from Asset Store. This is also to be consistent with
         // other Asset Store packages (as in, if Upm Packages on Asset Store are considered with entitlements, then every
@@ -93,7 +105,6 @@ public virtual bool HasTag(PackageTag tag)
         public abstract string localPath { get; }
         public abstract string versionString { get; }
         public abstract long versionId { get; }
-        public virtual bool isUnityPackage => false;
 
         public bool IsDifferentVersionThanRequested
             => !string.IsNullOrEmpty(versionInManifest) && !HasTag(PackageTag.Git | PackageTag.Local | PackageTag.Custom) &&
diff --git a/Modules/PackageManagerUI/Editor/Services/Common/Package.cs b/Modules/PackageManagerUI/Editor/Services/Common/Package.cs
index 11a7d9d8c7..c1da573949 100644
--- a/Modules/PackageManagerUI/Editor/Services/Common/Package.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Common/Package.cs
@@ -26,7 +26,6 @@ internal class Package : IPackage, ISerializationCallbackReceiver
 
         [SerializeField]
         private bool m_IsDiscoverable;
-        public bool isDiscoverable => m_IsDiscoverable;
 
         public string displayName => !string.IsNullOrEmpty(m_Product?.displayName) ? m_Product?.displayName : versions.FirstOrDefault()?.displayName ?? string.Empty;
         public PackageState state
@@ -65,6 +64,9 @@ public PackageState state
                 if (primary != recommended && ((primary.isInstalled && primary != latestKeyVersion) || primary.HasTag(PackageTag.LegacyFormat)) && !primary.HasTag(PackageTag.Local))
                     return PackageState.UpdateAvailable;
 
+                if (primary.importedAssets?.Any() == true)
+                    return PackageState.Imported;
+
                 if (versions.importAvailable != null)
                     return PackageState.ImportAvailable;
 
@@ -105,9 +107,9 @@ private IEnumerable<UIError> GetAllErrorsInPackageAndVersions()
                     yield return versionError;
         }
 
-        public bool hasEntitlements => versions.Any(version => version.HasTag(PackageTag.Unity) && version.hasEntitlements);
+        public bool hasEntitlements => versions.Any(v => v.HasTag(PackageTag.Unity) && v.hasEntitlements);
 
-        public bool hasEntitlementsError => m_Errors.Any(error => error.errorCode == UIErrorCode.UpmError_Forbidden) || versions.Any(version => version.hasEntitlementsError);
+        public bool hasEntitlementsError => m_Errors.Any(e => e.errorCode == UIErrorCode.UpmError_Forbidden) || versions.Any(v => v.hasEntitlementsError);
 
         private IVersionList m_VersionList;
         public IVersionList versions => m_VersionList;
@@ -160,7 +162,7 @@ private Package(string name, IVersionList versionList, Product product = null, b
             m_Errors = new List<UIError>();
             m_Progress = PackageProgress.None;
 
-            m_IsDeprecated = isDeprecated;
+            m_IsDeprecated = versionList.primary?.HasTag(PackageTag.InstalledFromPath) == false && isDeprecated;
             m_DeprecationMessage = deprecationMessage;
 
             LinkPackageAndVersions();
@@ -168,17 +170,16 @@ private Package(string name, IVersionList versionList, Product product = null, b
 
         public virtual bool IsInTab(PackageFilterTab tab)
         {
-            var version = versions.primary;
             switch (tab)
             {
                 case PackageFilterTab.BuiltIn:
-                    return version.HasTag(PackageTag.BuiltIn);
+                    return versions.All(v => v.HasTag(PackageTag.BuiltIn));
                 case PackageFilterTab.UnityRegistry:
-                    return !version.HasTag(PackageTag.BuiltIn) && version.HasTag(PackageTag.UpmFormat) && version.HasTag(PackageTag.Unity) && (isDiscoverable || (versions.installed?.isDirectDependency ?? false));
+                    return versions.Any(v => v.availableRegistry == RegistryType.UnityRegistry) && !versions.All(v => v.HasTag(PackageTag.BuiltIn)) && (m_IsDiscoverable || versions.installed?.isDirectDependency == true);
                 case PackageFilterTab.MyRegistries:
-                    return version.HasTag(PackageTag.UpmFormat) && version.HasTag(PackageTag.ScopedRegistry | PackageTag.MainNotUnity) && (isDiscoverable || (versions.installed?.isDirectDependency ?? false));
+                    return versions.Any(v => v.availableRegistry == RegistryType.MyRegistries) && (m_IsDiscoverable || versions.installed?.isDirectDependency == true);
                 case PackageFilterTab.InProject:
-                    return !version.HasTag(PackageTag.BuiltIn) && (progress == PackageProgress.Installing || versions.installed != null);
+                    return !versions.All(v => v.HasTag(PackageTag.BuiltIn)) && (progress == PackageProgress.Installing || versions.installed != null);
                 case PackageFilterTab.AssetStore:
                     return product != null;
                 default:
diff --git a/Modules/PackageManagerUI/Editor/Services/Common/PlaceholderVersionList.cs b/Modules/PackageManagerUI/Editor/Services/Common/PlaceholderVersionList.cs
index d15a80c69f..3eff96c062 100644
--- a/Modules/PackageManagerUI/Editor/Services/Common/PlaceholderVersionList.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Common/PlaceholderVersionList.cs
@@ -22,8 +22,6 @@ internal class PlaceholderVersionList : IVersionList
 
         public IPackageVersion latest => m_Versions[0];
 
-        public IPackageVersion latestPatch => m_Versions[0];
-
         public IPackageVersion importAvailable => null;
 
         public IPackageVersion recommended => m_Versions[0];
diff --git a/Modules/PackageManagerUI/Editor/Services/Common/ResourceLoader.cs b/Modules/PackageManagerUI/Editor/Services/Common/ResourceLoader.cs
index 539b4a98c2..92b419f5a4 100644
--- a/Modules/PackageManagerUI/Editor/Services/Common/ResourceLoader.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Common/ResourceLoader.cs
@@ -33,7 +33,8 @@ internal static class StyleSheetPath
             "StyleSheets/Extensions/base/light.uss";
 
             internal static readonly string packageManagerCommon = "StyleSheets/PackageManager/Common.uss";
-            internal static readonly string[] packageManagerComponents = {
+            internal static readonly string[] packageManagerComponents =
+            {
                 "StyleSheets/PackageManager/PackageDetailsDependenciesTab.uss",
                 "StyleSheets/PackageManager/PackageDetails.uss",
                 "StyleSheets/PackageManager/PackageItem.uss",
@@ -42,6 +43,7 @@ internal static class StyleSheetPath
                 "StyleSheets/PackageManager/PackageDetailsSamplesTab.uss",
                 "StyleSheets/PackageManager/PackageDetailsReleasesTab.uss",
                 "StyleSheets/PackageManager/PackageDetailsVersionsTab.uss",
+                "StyleSheets/PackageManager/PackageDetailsInstalledAssetsTab.uss",
                 "StyleSheets/PackageManager/PackageStatusBar.uss",
                 "StyleSheets/PackageManager/PackageToolbar.uss",
                 "StyleSheets/PackageManager/ProgressBar.uss",
@@ -52,6 +54,11 @@ internal static class StyleSheetPath
             internal static readonly string filtersDropdown = "StyleSheets/PackageManager/Filters.uss";
             internal static readonly string inputDropdown = "StyleSheets/PackageManager/InputDropdown.uss";
             internal static readonly string inProgressDropdown = "StyleSheets/PackageManager/InProgressDropdown.uss";
+
+            internal static readonly string selectionWindowCommon = "StyleSheets/PackageManager/SelectionWindow.uss";
+            internal static string selectionWindowVariables => EditorGUIUtility.isProSkin ?
+                "StyleSheets/PackageManager/SelectionWindowDark.uss" :
+                "StyleSheets/PackageManager/SelectionWindowLight.uss";
         }
 
         private enum StyleSheetType : int
@@ -61,6 +68,7 @@ private enum StyleSheetType : int
             InputDropdown,
             FiltersDropdown,
             InProgressDropdown,
+            SelectionWindow,
 
             Count
         }
@@ -100,7 +108,6 @@ public void OnAfterDeserialize()
             }
         }
 
-
         private StyleSheet FindResolvedStyleSheetFromType(StyleSheetType styleSheetType)
         {
             var styleSheetId = resolvedStyleSheetIds[(int)styleSheetType];
@@ -177,6 +184,19 @@ public StyleSheet inProgressDropdownStyleSheet
             }
         }
 
+        public StyleSheet selectionWindowStyleSheet
+        {
+            get
+            {
+                var styleSheet = FindResolvedStyleSheetFromType(StyleSheetType.SelectionWindow);
+                if (styleSheet == null)
+                    styleSheet = ResolveStyleSheets(StyleSheetType.SelectionWindow,
+                        StyleSheetPath.selectionWindowCommon,
+                        StyleSheetPath.selectionWindowVariables);
+                return styleSheet;
+            }
+        }
+
         private StyleSheet ResolveStyleSheets(StyleSheetType styleSheetType, params string[] styleSheetPaths)
         {
             return ResolveStyleSheets(styleSheetType, styleSheetPaths.Select(p =>
@@ -248,7 +268,7 @@ public virtual void LocalizeVisualElement(VisualElement visualElement, Func<stri
         public void Reset()
         {
             foreach (var styleSheetId in s_ResolvedDarkStyleSheetIds.Concat(s_ResolvedLightStyleSheetIds).Where(id => id != 0))
-                UnityEngine.Object.Destroy(UnityEngine.Object.FindObjectFromInstanceID(styleSheetId));
+                UnityEngine.Object.DestroyImmediate(UnityEngine.Object.FindObjectFromInstanceID(styleSheetId));
 
             for (var i = 0; i < (int)StyleSheetType.Count; i++)
             {
diff --git a/Modules/PackageManagerUI/Editor/Services/Common/VersionsFilter.cs b/Modules/PackageManagerUI/Editor/Services/Common/VersionsFilter.cs
index 6cbc07f0ff..66df3c8673 100644
--- a/Modules/PackageManagerUI/Editor/Services/Common/VersionsFilter.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Common/VersionsFilter.cs
@@ -9,15 +9,15 @@ namespace UnityEditor.PackageManager.UI.Internal
 {
     internal static class VersionsFilter
     {
-        public static UpmVersionList GetFilteredVersionList(UpmVersionList versonList, bool seeAllVersions, bool showPreRelease)
+        public static UpmVersionList GetFilteredVersionList(UpmVersionList versionList, bool seeAllVersions, bool showPreRelease)
         {
             // Only filter on Lifecycle tags if is a Unity package and the `seeAllVersions` option is not checked
-            if (seeAllVersions || !versonList.Any(v => v.isUnityPackage))
-                return versonList;
+            if (seeAllVersions || versionList.Any(v => v.availableRegistry != RegistryType.UnityRegistry))
+                return versionList;
 
             var packageTagsToExclude = PackageTag.PreRelease | PackageTag.Experimental;
 
-            var installedVersion = versonList.installed;
+            var installedVersion = versionList.installed;
             if (showPreRelease || installedVersion?.HasTag(PackageTag.PreRelease | PackageTag.Experimental) == true)
                 packageTagsToExclude &= ~PackageTag.PreRelease;
 
@@ -27,7 +27,7 @@ public static UpmVersionList GetFilteredVersionList(UpmVersionList versonList, b
 
             var numVersionsFilteredOut = 0;
             var filteredVersions = new List<UpmPackageVersion>();
-            foreach (var version in versonList.Cast<UpmPackageVersion>())
+            foreach (var version in versionList.Cast<UpmPackageVersion>())
             {
                 if (version.isInstalled || !version.HasTag(packageTagsToExclude))
                     filteredVersions.Add(version);
@@ -35,22 +35,22 @@ public static UpmVersionList GetFilteredVersionList(UpmVersionList versonList, b
                     ++numVersionsFilteredOut;
             }
             if (numVersionsFilteredOut <= 0)
-                return versonList;
-            return new UpmVersionList(filteredVersions, versonList.lifecycleVersionString, versonList.lifecycleNextVersion);
+                return versionList;
+            return new UpmVersionList(filteredVersions, versionList.lifecycleVersionString, versionList.lifecycleNextVersion);
         }
 
-        public static UpmVersionList UnloadVersionsIfNeeded(UpmVersionList versonList, bool loadAllVersions)
+        public static UpmVersionList UnloadVersionsIfNeeded(UpmVersionList versionList, bool loadAllVersions)
         {
             if (loadAllVersions)
-                return versonList;
-            var numTotalVersions = versonList.Count();
+                return versionList;
+            var numTotalVersions = versionList.Count();
             if (numTotalVersions == 0)
-                return versonList;
-            var keyVersions = versonList.key.Cast<UpmPackageVersion>().ToArray();
+                return versionList;
+            var keyVersions = versionList.key.Cast<UpmPackageVersion>().ToArray();
             var numVersionsToUnload = numTotalVersions - keyVersions.Length;
             if (numVersionsToUnload <= 0)
-                return versonList;
-            return new UpmVersionList(keyVersions, versonList.lifecycleVersionString, versonList.lifecycleNextVersion, numVersionsToUnload);
+                return versionList;
+            return new UpmVersionList(keyVersions, versionList.lifecycleVersionString, versionList.lifecycleNextVersion, numVersionsToUnload);
         }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/Interfaces/IOperation.cs b/Modules/PackageManagerUI/Editor/Services/Interfaces/IOperation.cs
index a06b9c8d04..987c78e5aa 100644
--- a/Modules/PackageManagerUI/Editor/Services/Interfaces/IOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Interfaces/IOperation.cs
@@ -16,6 +16,7 @@ internal interface IOperation
         event Action<IOperation> onOperationProgress;
 
         string packageUniqueId { get; }
+        long productId { get; }
 
         // a timestamp is added to keep track of how `fresh` the result is
         // in the case of an online operation, it is the time when the operation starts
diff --git a/Modules/PackageManagerUI/Editor/Services/Interfaces/IPackage.cs b/Modules/PackageManagerUI/Editor/Services/Interfaces/IPackage.cs
index 4b058a8e3d..f8b2d64e40 100644
--- a/Modules/PackageManagerUI/Editor/Services/Interfaces/IPackage.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Interfaces/IPackage.cs
@@ -31,8 +31,6 @@ internal interface IPackage : UI.IPackage
 
         PackageProgress progress { get; }
 
-        bool isDiscoverable { get; }
-
         // package level errors (for upm this refers to operation errors that are separate from the package info)
         IEnumerable<UIError> errors { get; }
 
diff --git a/Modules/PackageManagerUI/Editor/Services/Interfaces/IPackageVersion.cs b/Modules/PackageManagerUI/Editor/Services/Interfaces/IPackageVersion.cs
index 8cf2ab4dee..e7e6ed0749 100644
--- a/Modules/PackageManagerUI/Editor/Services/Interfaces/IPackageVersion.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Interfaces/IPackageVersion.cs
@@ -68,8 +68,14 @@ internal interface IPackageVersion : UI.IPackageVersion
 
         DependencyInfo[] resolvedDependencies { get; }
 
+        IEnumerable<Asset> importedAssets { get; }
+
         bool HasTag(PackageTag tag);
 
+        string GetAnalyticsTags();
+
+        RegistryType availableRegistry { get; }
+
         // A version is fully fetched when the information isn't derived from another version (therefore may be inaccurate)
         bool isFullyFetched { get; }
 
@@ -77,8 +83,6 @@ internal interface IPackageVersion : UI.IPackageVersion
 
         bool isDirectDependency { get; }
 
-        bool isUnityPackage { get; }
-
         string localPath { get; }
 
         SemVersion? supportedVersion { get; }
@@ -93,10 +97,6 @@ internal interface IPackageVersion : UI.IPackageVersion
 
         bool IsRequestedButOverriddenVersion { get; }
 
-        bool isRegistryPackage { get; }
-
-        bool isFromScopedRegistry { get; }
-
         string deprecationMessage { get; }
 
         string GetDescriptor(bool isFirstLetterCapitalized = false);
diff --git a/Modules/PackageManagerUI/Editor/Services/Packages/PackageOperationDispatcher.cs b/Modules/PackageManagerUI/Editor/Services/Packages/PackageOperationDispatcher.cs
index f32b7da8e8..d8df6b9b0e 100644
--- a/Modules/PackageManagerUI/Editor/Services/Packages/PackageOperationDispatcher.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Packages/PackageOperationDispatcher.cs
@@ -12,7 +12,7 @@ namespace UnityEditor.PackageManager.UI.Internal
     internal class PackageOperationDispatcher
     {
         [NonSerialized]
-        private AssetDatabaseProxy m_AssetDatabase;
+        private AssetStorePackageInstaller m_AssetStorePackageInstaller;
         [NonSerialized]
         private AssetStoreDownloadManager m_AssetStoreDownloadManager;
         [NonSerialized]
@@ -20,12 +20,12 @@ internal class PackageOperationDispatcher
         [NonSerialized]
         private IOProxy m_IOProxy;
 
-        public void ResolveDependencies(AssetDatabaseProxy assetDatabase,
+        public void ResolveDependencies(AssetStorePackageInstaller assetStorePackageInstaller,
             AssetStoreDownloadManager assetStoreDownloadManager,
             UpmClient upmClient,
             IOProxy ioProxy)
         {
-            m_AssetDatabase = assetDatabase;
+            m_AssetStorePackageInstaller = assetStorePackageInstaller;
             m_AssetStoreDownloadManager = assetStoreDownloadManager;
             m_UpmClient = upmClient;
             m_IOProxy = ioProxy;
@@ -157,12 +157,28 @@ public virtual void Import(IPackage package)
             try
             {
                 if (m_IOProxy.FileExists(path))
-                    m_AssetDatabase.ImportPackage(path, true);
+                    m_AssetStorePackageInstaller.Install(package.product.id, true);
             }
             catch (System.IO.IOException e)
             {
                 Debug.Log($"[Package Manager Window] Cannot import package {package.displayName}: {e.Message}");
             }
         }
+
+        public virtual void RemoveImportedAssets(IPackage package)
+        {
+            if (package?.versions.primary?.importedAssets?.Any() != true)
+                return;
+
+            m_AssetStorePackageInstaller.Uninstall(package.product.id, true);
+        }
+
+        public virtual void RemoveImportedAssets(IEnumerable<IPackageVersion> versions)
+        {
+            if (versions?.Any() != true)
+                return;
+
+            m_AssetStorePackageInstaller.Uninstall(versions.Select(v => v.package.product.id));
+        }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/Packages/PackageState.cs b/Modules/PackageManagerUI/Editor/Services/Packages/PackageState.cs
index 7ced74b324..1637810a77 100644
--- a/Modules/PackageManagerUI/Editor/Services/Packages/PackageState.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Packages/PackageState.cs
@@ -11,6 +11,7 @@ internal enum PackageState
         InstalledAsDependency,
         DownloadAvailable,
         ImportAvailable,
+        Imported,
         InDevelopment,
         UpdateAvailable,
         InProgress,
diff --git a/Modules/PackageManagerUI/Editor/Services/Packages/PackageTag.cs b/Modules/PackageManagerUI/Editor/Services/Packages/PackageTag.cs
index b77e51c2a6..d6607002cf 100644
--- a/Modules/PackageManagerUI/Editor/Services/Packages/PackageTag.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Packages/PackageTag.cs
@@ -12,22 +12,21 @@ internal enum PackageTag : uint
         None                = 0,
 
         InDevelopment       = Custom, // Used by UPM develop package
+        InstalledFromPath   = Local | Git | Custom,
+
         Custom              = 1 << 0,
         Local               = 1 << 1,
         Git                 = 1 << 2,
-        Bundled             = 1 << 3,
-        BuiltIn             = 1 << 4,
-        Feature             = 1 << 5,
-        Placeholder         = 1 << 6,
-        SpecialInstall      = 1 << 7,
-        VersionLocked       = 1 << 8,
+        BuiltIn             = 1 << 3,
+        Feature             = 1 << 4,
+        Placeholder         = 1 << 5,
+        SpecialInstall      = 1 << 6,
+        VersionLocked       = 1 << 7,
 
         LegacyFormat        = 1 << 10,   // legacy .unitypackage format
         UpmFormat           = 1 << 11,
 
         Unity               = 1 << 15,
-        ScopedRegistry      = 1 << 16,
-        MainNotUnity        = 1 << 17,
 
         Disabled            = 1 << 20,
         Published           = 1 << 21,
diff --git a/Modules/PackageManagerUI/Editor/Services/Packages/RefreshOptions.cs b/Modules/PackageManagerUI/Editor/Services/Packages/RefreshOptions.cs
index 3d0d8bd213..b53ccac2a8 100644
--- a/Modules/PackageManagerUI/Editor/Services/Packages/RefreshOptions.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Packages/RefreshOptions.cs
@@ -17,7 +17,6 @@ internal enum RefreshOptions : uint
         UpmSearch        = 1 << 3,
         Purchased        = 1 << 4,
         PurchasedOffline = 1 << 5,
-
-        UpmAny = UpmList | UpmListOffline | UpmSearch | UpmSearchOffline
+        ImportedAssets   = 1 << 6
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/Packages/RegistryType.cs b/Modules/PackageManagerUI/Editor/Services/Packages/RegistryType.cs
new file mode 100644
index 0000000000..43f41cf724
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/Services/Packages/RegistryType.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 enum RegistryType
+    {
+        None,
+        UnityRegistry,
+        MyRegistries,
+        AssetStore
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/Services/ProjectSettings/RegistryInfoDraft.cs b/Modules/PackageManagerUI/Editor/Services/ProjectSettings/RegistryInfoDraft.cs
index 0d58fe69b0..3f884b464d 100644
--- a/Modules/PackageManagerUI/Editor/Services/ProjectSettings/RegistryInfoDraft.cs
+++ b/Modules/PackageManagerUI/Editor/Services/ProjectSettings/RegistryInfoDraft.cs
@@ -66,8 +66,11 @@ public string errorMessage
 
         public void OnBeforeSerialize()
         {
-            m_UserModificationsInstanceId = m_UserModifications.GetInstanceID();
-            m_OriginalInstanceId = m_Original.GetInstanceID();
+            if (m_UserModifications != null)
+                m_UserModificationsInstanceId = m_UserModifications.GetInstanceID();
+
+            if (m_Original != null)
+                m_OriginalInstanceId = m_Original.GetInstanceID();
         }
 
         // do nothing
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/AssetDatabaseProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/AssetDatabaseProxy.cs
index c56445aabc..40ed13600b 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/AssetDatabaseProxy.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/AssetDatabaseProxy.cs
@@ -2,37 +2,76 @@
 // 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.CodeAnalysis;
 using UnityEngine;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
     [ExcludeFromCodeCoverage]
-    internal class AssetDatabaseProxy
+    internal class AssetDatabaseProxy : AssetPostprocessor
     {
+        public virtual event Action<string[] /*importedAssets*/, string[] /*deletedAssets*/, string[] /*movedAssets*/, string[] /*movedFromAssetPaths*/> onPostprocessAllAssets = delegate {};
+
+        static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
+        {
+            ServicesContainer.instance.Resolve<AssetDatabaseProxy>().onPostprocessAllAssets?.Invoke(importedAssets, deletedAssets, movedAssets, movedFromAssetPaths);
+        }
+
         public virtual void ImportPackage(string packagePath, bool interactive)
         {
             AssetDatabase.ImportPackage(packagePath, interactive);
         }
 
+        public virtual void ImportPackage(string packagePath, AssetOrigin origin, bool interactive)
+        {
+            AssetDatabase.ImportPackage(packagePath, origin, interactive);
+        }
+
+        public virtual bool DeleteAssets(string[] paths, List<string> outFailedPaths)
+        {
+            return AssetDatabase.DeleteAssets(paths, outFailedPaths);
+        }
+
         public virtual void Refresh()
         {
             AssetDatabase.Refresh();
         }
 
-        public virtual T LoadAssetAtPath<T>(string assetPath) where T : Object
+        public virtual T LoadAssetAtPath<T>(string assetPath) where T : UnityEngine.Object
         {
             return AssetDatabase.LoadAssetAtPath<T>(assetPath);
         }
 
-        public virtual Object LoadMainAssetAtPath(string assetPath)
+        public virtual UnityEngine.Object LoadMainAssetAtPath(string assetPath)
         {
             return AssetDatabase.LoadMainAssetAtPath(assetPath);
         }
 
-        public virtual bool GetAssetFolderInfo(string path, out bool rootFolder, out bool immutable)
+        public virtual bool TryGetAssetFolderInfo(string path, out bool rootFolder, out bool immutable)
+        {
+            return AssetDatabase.TryGetAssetFolderInfo(path, out rootFolder, out immutable);
+        }
+
+        public virtual AssetOrigin GetAssetOrigin(string guid)
+        {
+            return AssetDatabase.GetAssetOrigin(guid);
+        }
+
+        public virtual string GUIDToAssetPath(string guid)
+        {
+            return AssetDatabase.GUIDToAssetPath(guid);
+        }
+
+        public virtual string AssetPathToGUID(string path)
+        {
+            return AssetDatabase.AssetPathToGUID(path);
+        }
+
+        public virtual string[] FindAssets(SearchFilter filter)
         {
-            return AssetDatabase.GetAssetFolderInfo(path, out rootFolder, out immutable);
+            return AssetDatabase.FindAssets(filter);
         }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/DateTimeProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/DateTimeProxy.cs
new file mode 100644
index 0000000000..0f133349c1
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/DateTimeProxy.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.Diagnostics.CodeAnalysis;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    [ExcludeFromCodeCoverage]
+    internal class DateTimeProxy
+    {
+        public virtual DateTime utcNow => DateTime.UtcNow;
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/HttpClientFactory.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/HttpClientFactory.cs
index 0a001a28f9..17660276c3 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/HttpClientFactory.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/HttpClientFactory.cs
@@ -2,26 +2,67 @@
 // 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.CodeAnalysis;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
-    [ExcludeFromCodeCoverage]
     internal class HttpClientFactory
     {
+        public static readonly string k_InvalidJSONErrorMessage = L10n.Tr("Server response is not a valid JSON");
+        public static readonly string k_ServerErrorMessage = L10n.Tr("Server response is");
+
+        [ExcludeFromCodeCoverage]
         public virtual IAsyncHTTPClient GetASyncHTTPClient(string url)
         {
             return new AsyncHTTPClient(url);
         }
 
+        [ExcludeFromCodeCoverage]
         public virtual IAsyncHTTPClient PostASyncHTTPClient(string url, string postData)
         {
             return new AsyncHTTPClient(url, "POST") { postData = postData };
         }
 
+        [ExcludeFromCodeCoverage]
         public virtual void AbortByTag(string tag)
         {
             AsyncHTTPClient.AbortByTag(tag);
         }
+
+        public virtual Dictionary<string, object> ParseResponseAsDictionary(IAsyncHTTPClient request)
+        {
+            string errorMessage;
+            if (request.IsSuccess() && request.responseCode == 200)
+            {
+                if (string.IsNullOrEmpty(request.text))
+                    return null;
+
+                try
+                {
+                    var response = Json.Deserialize(request.text) as Dictionary<string, object>;
+                    if (response != null)
+                        return response;
+
+                    errorMessage = k_InvalidJSONErrorMessage;
+                }
+                catch (Exception e)
+                {
+                    errorMessage = $"{k_InvalidJSONErrorMessage} {e.Message}";
+                }
+            }
+            else
+            {
+                if (request.responseCode == 0 &&
+                    (string.IsNullOrEmpty(request.text) || request.text.ToLower().Contains("timeout")))
+                    return null;
+
+                var text = request.text.Length <= 128 ? request.text : request.text.Substring(0, 128) + "...";
+                errorMessage = $"{k_ServerErrorMessage} \"{text}\" [Code {request.responseCode}]";
+            }
+
+            return string.IsNullOrEmpty(errorMessage) ? null : new Dictionary<string, object> { ["errorMessage"] = errorMessage };
+        }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/PackageManagerProjectSettingsProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/PackageManagerProjectSettingsProxy.cs
index 6fd1e2c86c..b55cd59006 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/PackageManagerProjectSettingsProxy.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/PackageManagerProjectSettingsProxy.cs
@@ -18,7 +18,7 @@ internal class PackageManagerProjectSettingsProxy
         public event Action<long> onLoadAssetsChanged = delegate {};
         public event Action onInitializationFinished = delegate {};
 
-        public bool dismissPreviewPackagesInUse
+        public virtual bool dismissPreviewPackagesInUse
         {
             get => PackageManagerProjectSettings.instance.dismissPreviewPackagesInUse;
             set => PackageManagerProjectSettings.instance.dismissPreviewPackagesInUse = value;
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/UnityOAuthProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/UnityOAuthProxy.cs
index 036525471b..1098821ba4 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/UnityOAuthProxy.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/UnityOAuthProxy.cs
@@ -13,7 +13,14 @@ internal class UnityOAuthProxy
     {
         public virtual void GetAuthorizationCodeAsync(string clientId, Action<UnityOAuth.AuthCodeResponse> callback)
         {
-            UnityOAuth.GetAuthorizationCodeAsync(clientId, callback);
+            try
+            {
+                UnityOAuth.GetAuthorizationCodeAsync(clientId, callback);
+            }
+            catch (Exception e)
+            {
+                callback?.Invoke(new UnityOAuth.AuthCodeResponse { Exception = e});
+            }
         }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/ServicesContainer.cs b/Modules/PackageManagerUI/Editor/Services/ServicesContainer.cs
index c5e016a881..2800a6041d 100644
--- a/Modules/PackageManagerUI/Editor/Services/ServicesContainer.cs
+++ b/Modules/PackageManagerUI/Editor/Services/ServicesContainer.cs
@@ -26,6 +26,8 @@ internal sealed class ServicesContainer : ScriptableSingleton<ServicesContainer>
 
         private IOProxy m_IOProxy;
 
+        private DateTimeProxy m_DateTimeProxy;
+
         private PackageManagerProjectSettingsProxy m_SettingsProxy;
 
         private ClientProxy m_ClientProxy;
@@ -65,6 +67,12 @@ internal sealed class ServicesContainer : ScriptableSingleton<ServicesContainer>
 
         private AssetStoreRestAPI m_AssetStoreRestAPI;
 
+        private AssetStorePackageInstaller m_AssetStorePackageInstaller;
+
+        private AssetSelectionHandler m_AssetSelectionHandler;
+
+        private SelectionWindowProxy m_SelectionWindowProxy;
+
         [SerializeField]
         private AssetStoreDownloadManager m_AssetStoreDownloadManager;
 
@@ -137,8 +145,10 @@ public void Reload()
             m_ApplicationProxy = new ApplicationProxy();
             m_EditorAnalyticsProxy = new EditorAnalyticsProxy();
             m_IOProxy = new IOProxy();
+            m_DateTimeProxy = new DateTimeProxy();
             m_SettingsProxy = new PackageManagerProjectSettingsProxy();
             m_ClientProxy = new ClientProxy();
+            m_SelectionWindowProxy = new SelectionWindowProxy();
 
             if (m_ResourceLoader != null)
                 m_ResourceLoader.Reset();
@@ -154,9 +164,11 @@ public void Reload()
             m_AssetStoreUtils = new AssetStoreUtils();
             m_JsonParser = new JsonParser();
             m_AssetStoreRestAPI = new AssetStoreRestAPI();
+            m_AssetStorePackageInstaller = new AssetStorePackageInstaller();
             m_AssetStoreDownloadManager = new AssetStoreDownloadManager();
             m_AssetStoreCallQueue = new AssetStoreCallQueue();
             m_AssetStoreCachePathProxy = new AssetStoreCachePathProxy();
+            m_AssetSelectionHandler = new AssetSelectionHandler();
 
             m_UpmCache = new UpmCache();
             m_UpmClient = new UpmClient();
@@ -191,11 +203,13 @@ private void ResolveDependencies()
             m_ResourceLoader.ResolveDependencies(m_ApplicationProxy);
 
             m_AssetStoreCache.ResolveDependencies(m_ApplicationProxy, m_HttpClientFactory, m_IOProxy, m_UniqueIdMapper);
-            m_AssetStoreClient.ResolveDependencies(m_UnityConnectProxy, m_AssetStoreCache, m_AssetStoreUtils, m_AssetStoreRestAPI, m_FetchStatusTracker, m_UpmCache);
-            m_AssetStoreOAuth.ResolveDependencies(m_UnityConnectProxy, m_UnityOAuthProxy, m_HttpClientFactory);
+            m_AssetStoreClient.ResolveDependencies(m_UnityConnectProxy, m_AssetStoreCache, m_AssetStoreUtils, m_AssetStoreRestAPI, m_FetchStatusTracker, m_AssetDatabaseProxy);
+            m_AssetStoreOAuth.ResolveDependencies(m_DateTimeProxy, m_UnityConnectProxy, m_UnityOAuthProxy, m_HttpClientFactory);
             m_AssetStoreRestAPI.ResolveDependencies(m_UnityConnectProxy, m_AssetStoreOAuth, m_JsonParser, m_HttpClientFactory);
+            m_AssetStorePackageInstaller.ResolveDependencies(m_IOProxy, m_AssetStoreCache, m_AssetDatabaseProxy, m_AssetSelectionHandler);
             m_AssetStoreDownloadManager.ResolveDependencies(m_ApplicationProxy, m_HttpClientFactory, m_UnityConnectProxy, m_IOProxy, m_AssetStoreCache, m_AssetStoreUtils, m_AssetStoreRestAPI, m_AssetStoreCachePathProxy);
             m_AssetStoreCallQueue.ResolveDependencies(m_ApplicationProxy, m_UnityConnectProxy, m_PackageManagerPrefs, m_AssetStoreClient, m_AssetStoreCache, m_PageManager, m_PageRefreshHandler);
+            m_AssetSelectionHandler.ResolveDependencies(m_SelectionWindowProxy);
 
             m_UpmCache.ResolveDependencies(m_UniqueIdMapper);
             m_UpmClient.ResolveDependencies(m_UpmCache, m_FetchStatusTracker, m_IOProxy, m_SettingsProxy, m_ClientProxy, m_ApplicationProxy);
@@ -203,10 +217,10 @@ private void ResolveDependencies()
             m_UpmCacheRootClient.ResolveDependencies(m_ClientProxy, m_ApplicationProxy);
 
             m_PackageDatabase.ResolveDependencies(m_UniqueIdMapper, m_AssetDatabaseProxy, m_UpmCache, m_IOProxy);
-            m_OperationDispatcher.ResolveDependencies(m_AssetDatabaseProxy, m_AssetStoreDownloadManager, m_UpmClient, m_IOProxy);
+            m_OperationDispatcher.ResolveDependencies(m_AssetStorePackageInstaller, m_AssetStoreDownloadManager, m_UpmClient, m_IOProxy);
             m_InspectorSelectionHandler.ResolveDependencies(m_SelectionProxy, m_PackageManagerPrefs, m_PackageDatabase, m_PageManager);
             m_PageManager.ResolveDependencies(m_UnityConnectProxy, m_PackageManagerPrefs, m_AssetStoreClient, m_PackageDatabase, m_SettingsProxy);
-            m_PageRefreshHandler.ResolveDependencies(m_PageManager, m_ApplicationProxy, m_UnityConnectProxy, m_PackageManagerPrefs, m_UpmClient, m_UpmRegistryClient, m_AssetStoreClient);
+            m_PageRefreshHandler.ResolveDependencies(m_PageManager, m_ApplicationProxy, m_UnityConnectProxy, m_AssetDatabaseProxy, m_PackageManagerPrefs, m_UpmClient, m_UpmRegistryClient, m_AssetStoreClient);
 
             m_AssetStorePackageFactory.ResolveDependencies(m_UniqueIdMapper, m_UnityConnectProxy, m_AssetStoreCache, m_AssetStoreClient, m_AssetStoreDownloadManager, m_PackageDatabase, m_FetchStatusTracker, m_IOProxy);
             m_UpmPackageFactory.ResolveDependencies(m_UniqueIdMapper, m_UpmCache, m_UpmClient, m_PackageDatabase, m_SettingsProxy);
@@ -235,6 +249,7 @@ private void Initialize()
             m_UnityConnectProxy.OnEnable();
             m_ApplicationProxy.OnEnable();
             m_SettingsProxy.OnEnable();
+            m_SelectionWindowProxy.OnEnable();
 
             m_AssetStoreOAuth.OnEnable();
             m_AssetStoreDownloadManager.OnEnable();
@@ -250,6 +265,9 @@ private void Initialize()
             m_UpmPackageFactory.OnEnable();
             m_UpmOnAssetStorePackageFactory.OnEnable();
 
+            m_AssetStorePackageInstaller.OnEnable();
+            m_AssetSelectionHandler.OnEnable();
+
             m_InitializeState = State.Initialized;
         }
 
@@ -258,6 +276,7 @@ public void OnDisable()
             m_UnityConnectProxy.OnDisable();
             m_ApplicationProxy.OnDisable();
             m_SettingsProxy.OnDisable();
+            m_SelectionWindowProxy.OnDisable();
 
             m_AssetStoreOAuth.OnDisable();
             m_AssetStoreDownloadManager.OnDisable();
@@ -272,6 +291,9 @@ public void OnDisable()
             m_AssetStorePackageFactory.OnDisable();
             m_UpmPackageFactory.OnDisable();
             m_UpmOnAssetStorePackageFactory.OnDisable();
+
+            m_AssetStorePackageInstaller.OnDisable();
+            m_AssetSelectionHandler.OnDisable();
         }
 
         public void RegisterDefaultServices()
@@ -286,8 +308,10 @@ public void RegisterDefaultServices()
             Register(m_ExtensionManager);
             Register(m_EditorAnalyticsProxy);
             Register(m_IOProxy);
+            Register(m_DateTimeProxy);
             Register(m_SettingsProxy);
             Register(m_ClientProxy);
+            Register(m_SelectionWindowProxy);
 
             Register(m_FetchStatusTracker);
             Register(m_UniqueIdMapper);
@@ -299,6 +323,7 @@ public void RegisterDefaultServices()
             Register(m_AssetStoreRestAPI);
             Register(m_AssetStoreCallQueue);
             Register(m_AssetStoreCachePathProxy);
+            Register(m_AssetSelectionHandler);
 
             Register(m_UpmCache);
             Register(m_UpmClient);
@@ -317,6 +342,7 @@ public void RegisterDefaultServices()
             Register(m_UpmPackageFactory);
             Register(m_UpmOnAssetStorePackageFactory);
 
+            Register(m_AssetStorePackageInstaller);
             Register(m_AssetStoreDownloadManager);
         }
 
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmBaseOperation.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmBaseOperation.cs
index 189522ac54..2ddec877d8 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmBaseOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmBaseOperation.cs
@@ -30,6 +30,7 @@ public virtual string packageName
         protected string m_PackageIdOrName = string.Empty;
         public virtual string packageIdOrName => m_PackageIdOrName;
 
+        public virtual long productId => 0;
         public string packageUniqueId => packageName;
 
         [SerializeField]
@@ -82,7 +83,7 @@ internal abstract class UpmBaseOperation<T> : UpmBaseOperation where T : Request
         public override event Action<IOperation> onOperationFinalized = delegate {};
         public override event Action<IOperation> onOperationSuccess = delegate {};
         public override event Action<IOperation> onOperationProgress = delegate {};
-        public Action<T> onProcessResult = delegate {};
+        public virtual event Action<T> onProcessResult = delegate {};
 
         [SerializeField]
         protected T m_Request;
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmCache.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmCache.cs
index bd37f87ffa..9fef90365c 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmCache.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmCache.cs
@@ -136,6 +136,9 @@ public void OnAfterDeserialize()
 
         public virtual void AddExtraPackageInfo(PackageInfo packageInfo)
         {
+            if (packageInfo == null)
+                return;
+
             if (!m_ExtraPackageInfo.TryGetValue(packageInfo.name, out var dict))
             {
                 dict = new Dictionary<string, PackageInfo>();
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmClient.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmClient.cs
index 8a3a7dfc87..f6de3d45f7 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmClient.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmClient.cs
@@ -46,15 +46,18 @@ internal class UpmClient : ISerializationCallbackReceiver
         private UpmRemoveOperation m_RemoveOperation;
         private UpmRemoveOperation removeOperation => CreateOperation(ref m_RemoveOperation);
 
+        [SerializeField]
+        private UpmSearchOperation[] m_SerializedInProgressExtraFetchOperations = Array.Empty<UpmSearchOperation>();
+
         private readonly Dictionary<string, UpmSearchOperation> m_ExtraFetchOperations = new Dictionary<string, UpmSearchOperation>();
 
         [SerializeField]
         private string[] m_SerializedRegistryUrlsKeys;
 
         [SerializeField]
-        private bool[] m_SerializedRegistryUrlsValues;
+        private RegistryType[] m_SerializedRegistryUrlsValues;
 
-        internal Dictionary<string, bool> m_RegistryUrls = new Dictionary<string, bool>();
+        internal Dictionary<string, RegistryType> m_RegistryUrls = new Dictionary<string, RegistryType>();
 
         [NonSerialized]
         private UpmCache m_UpmCache;
@@ -96,7 +99,9 @@ public virtual bool IsAnyExperimentalPackagesInUse()
         public void OnBeforeSerialize()
         {
             m_SerializedRegistryUrlsKeys = m_RegistryUrls?.Keys.ToArray() ?? new string[0];
-            m_SerializedRegistryUrlsValues = m_RegistryUrls?.Values.ToArray() ?? new bool[0];
+            m_SerializedRegistryUrlsValues = m_RegistryUrls?.Values.ToArray() ?? new RegistryType[0];
+
+            m_SerializedInProgressExtraFetchOperations = m_ExtraFetchOperations?.Values.Where(i => i.isInProgress).ToArray() ?? new UpmSearchOperation[0];
         }
 
         public void OnAfterDeserialize()
@@ -181,19 +186,7 @@ public virtual bool AddByPath(string path, out string tempPackageId)
 
             try
             {
-                path = path.Replace('\\', '/');
-                var projectPath = m_IOProxy.GetProjectDirectory().Replace('\\', '/') + '/';
-                if (path.StartsWith(projectPath))
-                {
-                    var packageFolderPrefix = "Packages/";
-                    var relativePathToProjectRoot = path.Substring(projectPath.Length);
-                    if (relativePathToProjectRoot.StartsWith(packageFolderPrefix, StringComparison.InvariantCultureIgnoreCase))
-                        path = relativePathToProjectRoot.Substring(packageFolderPrefix.Length);
-                    else
-                        path = $"../{relativePathToProjectRoot}";
-                }
-
-                tempPackageId = $"file:{path}";
+                tempPackageId = GetTempPackageIdFromPath(path);
                 addOperation.AddByUrlOrPath(tempPackageId, PackageTag.Local);
                 SetupAddOperation();
                 return true;
@@ -205,6 +198,21 @@ public virtual bool AddByPath(string path, out string tempPackageId)
             }
         }
 
+        public string GetTempPackageIdFromPath(string path)
+        {
+            path = path.Replace('\\', '/');
+            var projectPath = m_IOProxy.GetProjectDirectory().Replace('\\', '/') + '/';
+            if (!path.StartsWith(projectPath))
+                return $"file:{path}";
+
+            const string packageFolderPrefix = "Packages/";
+            var relativePathToProjectRoot = path.Substring(projectPath.Length);
+            if (relativePathToProjectRoot.StartsWith(packageFolderPrefix, StringComparison.InvariantCultureIgnoreCase))
+                return $"file:{relativePathToProjectRoot.Substring(packageFolderPrefix.Length)}";
+            else
+                return $"file:../{relativePathToProjectRoot}";
+        }
+
         public virtual void AddByUrl(string url)
         {
             if (isAddOrRemoveInProgress)
@@ -329,20 +337,21 @@ public virtual void RemoveEmbeddedByName(string packageName)
                 return;
 
             var packageInfo = m_UpmCache.GetInstalledPackageInfo(packageName);
-            if (packageInfo != null)
+            var resolvedPath = packageInfo?.resolvedPath;
+            if (string.IsNullOrEmpty(resolvedPath))
+                return;
+
+            try
             {
-                try
-                {
-                    // Fix case 1237777, make files writable first
-                    foreach (var file in m_IOProxy.DirectoryGetFiles(packageInfo.resolvedPath, "*", System.IO.SearchOption.AllDirectories))
-                        m_IOProxy.MakeFileWritable(file, true);
-                    m_IOProxy.DeleteDirectory(packageInfo.resolvedPath);
-                    Resolve();
-                }
-                catch (System.IO.IOException e)
-                {
-                    Debug.Log($"[Package Manager Window] Cannot remove embedded package {packageName}: {e.Message}");
-                }
+                // Fix case 1237777, make files writable first
+                foreach (var file in m_IOProxy.DirectoryGetFiles(resolvedPath, "*", System.IO.SearchOption.AllDirectories))
+                    m_IOProxy.MakeFileWritable(file, true);
+                m_IOProxy.DeleteDirectory(resolvedPath);
+                Resolve();
+            }
+            catch (System.IO.IOException e)
+            {
+                Debug.Log($"[Package Manager Window] Cannot remove embedded package {packageName}: {e.Message}");
             }
         }
 
@@ -409,7 +418,7 @@ private UpmSearchOperation ExtraFetchInternal(string packageIdOrName, long produ
                 return null;
             var operation = new UpmSearchOperation();
             operation.ResolveDependencies(m_ClientProxy, m_ApplicationProxy);
-            operation.Search(packageIdOrName);
+            operation.Search(packageIdOrName, productId);
             operation.onProcessResult += (requst) => OnProcessExtraFetchResult(requst, productId);
             operation.onOperationFinalized += (op) => m_ExtraFetchOperations.Remove(packageIdOrName);
             m_ExtraFetchOperations[packageIdOrName] = operation;
@@ -479,6 +488,9 @@ private void RestoreInProgressOperations()
 
             if (m_SearchOperation?.isInProgress ?? false)
                 SearchAll();
+
+            foreach (var operation in m_SerializedInProgressExtraFetchOperations)
+                ExtraFetchInternal(operation.packageIdOrName, operation.productId);
         }
 
         public void OnEnable()
@@ -502,25 +514,30 @@ public virtual void Resolve()
             m_ClientProxy.Resolve();
         }
 
-        public virtual bool IsUnityPackage(PackageInfo packageInfo)
+        public virtual RegistryType GetAvailableRegistryType(PackageInfo packageInfo)
         {
+            // Special handling for packages that's built in/bundled with unity, we always consider them from the Unity registry
             if (packageInfo?.source == PackageSource.BuiltIn)
-                return true;
+                return RegistryType.UnityRegistry;
 
-            if (packageInfo == null
-                || packageInfo.source != PackageSource.Registry
-                || packageInfo.registry?.isDefault != true
-                || string.IsNullOrEmpty(packageInfo.registry?.url)
-                || !packageInfo.versions.all.Any()
-                || packageInfo.entitlements?.licensingModel == EntitlementLicensingModel.AssetStore)
-                return false;
+            if (string.IsNullOrEmpty(packageInfo?.registry?.url))
+                return RegistryType.None;
 
-            if (m_RegistryUrls.TryGetValue(packageInfo.registry.url, out var isUnityRegistry))
-                return isUnityRegistry;
+            if (packageInfo.entitlements?.licensingModel == EntitlementLicensingModel.AssetStore)
+                return RegistryType.AssetStore;
 
-            isUnityRegistry = IsUnityUrl(packageInfo.registry.url);
-            m_RegistryUrls[packageInfo.registry.url] = isUnityRegistry;
-            return isUnityRegistry;
+            if (m_RegistryUrls.TryGetValue(packageInfo.registry.url, out var result))
+                return result;
+
+            result = packageInfo.registry.isDefault && IsUnityUrl(packageInfo.registry.url) ? RegistryType.UnityRegistry : RegistryType.MyRegistries;
+            m_RegistryUrls[packageInfo.registry.url] = result;
+            return result;
+        }
+
+        public virtual bool IsUnityPackage(PackageInfo packageInfo)
+        {
+            return packageInfo is { source: PackageSource.BuiltIn or PackageSource.Registry } &&
+                   GetAvailableRegistryType(packageInfo) == RegistryType.UnityRegistry;
         }
 
         public static bool IsUnityUrl(string url)
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageDocs.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageDocs.cs
index 63459f8c3f..afba983ddf 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageDocs.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageDocs.cs
@@ -72,6 +72,13 @@ public static void HandleInvalidOrUnreachableOnlineUrl(string onlineUrl,  string
 
         public static void OpenWebUrl(string onlineUrl, IPackageVersion version, ApplicationProxy applicationProxy, string analyticsEvent, Action errorCallback)
         {
+            if (!version.HasTag(PackageTag.Unity))
+            {
+                applicationProxy.OpenURL(onlineUrl);
+                PackageManagerWindowAnalytics.SendEvent($"{analyticsEvent}NonUnityPackageUrl", version?.uniqueId);
+                return;
+            }
+
             var request = UnityWebRequest.Head(onlineUrl);
             try
             {
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageFactory.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageFactory.cs
index c1cca08804..1f8ddc3683 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageFactory.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageFactory.cs
@@ -162,9 +162,9 @@ public void GeneratePackagesAndTriggerChangeEvent(IEnumerable<string> packageNam
                     packagesToRemove.Add(packageName);
                 else
                 {
-                    var isUnityPackage = m_UpmClient.IsUnityPackage(searchInfo ?? installedInfo);
+                    var availableRegistry = m_UpmClient.GetAvailableRegistryType(searchInfo ?? installedInfo);
                     var extraVersions = m_UpmCache.GetExtraPackageInfos(packageName);
-                    var versionList = new UpmVersionList(searchInfo, installedInfo, isUnityPackage, extraVersions);
+                    var versionList = new UpmVersionList(searchInfo, installedInfo, availableRegistry, extraVersions);
                     versionList = VersionsFilter.GetFilteredVersionList(versionList, seeAllVersions, showPreRelease);
                     versionList = VersionsFilter.UnloadVersionsIfNeeded(versionList, m_UpmCache.IsLoadAllVersions(packageName));
                     if (!versionList.Any())
@@ -325,8 +325,8 @@ public void GeneratePackagesAndTriggerChangeEvent(IEnumerable<long> productIds)
                         productIdAndNamesToSearch.Add((productId: productId, packageName: packageName));
 
                     var extraVersions = m_UpmCache.GetExtraPackageInfos(packageName);
-                    var isUnityPackage = m_UpmClient.IsUnityPackage(productSearchInfo ?? installedPackageInfo);
-                    var versionList = new UpmVersionList(productSearchInfo, installedPackageInfo, isUnityPackage, extraVersions);
+                    var availableRegistry = m_UpmClient.GetAvailableRegistryType(productSearchInfo ?? installedPackageInfo);
+                    var versionList = new UpmVersionList(productSearchInfo, installedPackageInfo, availableRegistry, extraVersions);
                     versionList = VersionsFilter.UnloadVersionsIfNeeded(versionList, m_UpmCache.IsLoadAllVersions(productId.ToString()));
                     package = CreatePackage(packageName, versionList, new Product(productId, purchaseInfo, productInfo), isDeprecated: isDeprecated, deprecationMessage: deprecationMessage);
                     if (productInfoFetchError != null)
@@ -352,14 +352,16 @@ public void GeneratePackagesAndTriggerChangeEvent(IEnumerable<long> productIds)
                         productIdAndNamesToSearch.Add((productId: productId, packageName: packageName));
                 }
 
+                if (package == null)
+                    continue;
+
                 // if the primary version is not fully fetched, trigger an extra fetch automatically right away to get results early
                 // since the primary version's display name is used in the package list
                 var primaryVersion = package.versions.primary;
                 if (primaryVersion?.isFullyFetched == false)
                     m_UpmClient.ExtraFetch(primaryVersion.packageId);
 
-                if (package != null)
-                    packagesChanged.Add(package);
+                packagesChanged.Add(package);
             }
             if (packagesChanged.Any())
                 m_PackageDatabase.UpdatePackages(packagesChanged);
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageVersion.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageVersion.cs
index d94cb62137..b1482b5d86 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageVersion.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageVersion.cs
@@ -22,7 +22,6 @@ internal class UpmPackageVersion : BasePackageVersion
         private string m_Category;
         public override string category => m_Category;
 
-
         [SerializeField]
         private bool m_IsFullyFetched;
         public override bool isFullyFetched => m_IsFullyFetched;
@@ -45,16 +44,11 @@ internal class UpmPackageVersion : BasePackageVersion
         public override string author => m_Author;
 
         [SerializeField]
-        private bool m_IsUnityPackage;
-        public override bool isUnityPackage => m_IsUnityPackage;
+        private RegistryType m_AvailableRegistry;
+        public override RegistryType availableRegistry => m_AvailableRegistry;
 
         [SerializeField]
         private PackageSource m_Source;
-        public override bool isRegistryPackage => m_Source == PackageSource.Registry;
-
-        [SerializeField]
-        private bool m_IsFromScopedRegistry;
-        public override bool isFromScopedRegistry => isRegistryPackage && m_IsFromScopedRegistry;
 
         [SerializeField]
         private DependencyInfo[] m_Dependencies;
@@ -86,8 +80,6 @@ public string sourcePath
         private bool m_IsInstalled;
         public override bool isInstalled => m_IsInstalled;
 
-        public bool installedFromPath => HasTag(PackageTag.Local | PackageTag.Custom | PackageTag.Git);
-
         public override bool isAvailableOnDisk => m_IsFullyFetched && !string.IsNullOrEmpty(m_ResolvedPath);
 
         [SerializeField]
@@ -98,7 +90,12 @@ public string sourcePath
         private string m_VersionInManifest;
         public override string versionInManifest => m_VersionInManifest;
 
-        public override string versionString => m_Version.ToString();
+
+        public override string versionString => isInvalidSemVerInManifest ? versionInManifest : m_VersionString;
+
+        // When packages are installed from path (git, local, custom) versionInManifest behaves differently so we don't consider them to have invalid SemVer
+        public bool isInvalidSemVerInManifest => !string.IsNullOrEmpty(versionInManifest) && !HasTag(PackageTag.InstalledFromPath) &&
+                                                 (!SemVersionParser.TryParse(versionInManifest, out var semVersion) || semVersion?.ToString() != versionInManifest);
 
         public override long versionId => 0;
 
@@ -107,34 +104,33 @@ public string sourcePath
         public override string deprecationMessage => m_DeprecationMessage;
 
 
-        public UpmPackageVersion(PackageInfo packageInfo, bool isInstalled, SemVersion? version, string displayName, bool isUnityPackage)
+        public UpmPackageVersion(PackageInfo packageInfo, bool isInstalled, SemVersion? version, string displayName, RegistryType availableRegistry)
         {
             m_Version = version;
             m_VersionString = m_Version?.ToString();
             m_DisplayName = displayName;
             m_IsInstalled = isInstalled;
 
-            UpdatePackageInfo(packageInfo, isUnityPackage);
+            UpdatePackageInfo(packageInfo, availableRegistry);
         }
 
-        public UpmPackageVersion(PackageInfo packageInfo, bool isInstalled, bool isUnityPackage)
+        public UpmPackageVersion(PackageInfo packageInfo, bool isInstalled, RegistryType availableRegistry)
         {
             SemVersionParser.TryParse(packageInfo.version, out m_Version);
             m_VersionString = m_Version?.ToString();
             m_DisplayName = packageInfo.displayName;
             m_IsInstalled = isInstalled;
 
-            UpdatePackageInfo(packageInfo, isUnityPackage);
+            UpdatePackageInfo(packageInfo, availableRegistry);
         }
 
-        internal void UpdatePackageInfo(PackageInfo packageInfo, bool isUnityPackage)
+        internal void UpdatePackageInfo(PackageInfo packageInfo, RegistryType availableRegistry)
         {
             m_IsFullyFetched = m_Version?.ToString() == packageInfo.version;
-            m_IsUnityPackage = isUnityPackage;
+            m_AvailableRegistry = availableRegistry;
             m_Source = packageInfo.source;
             m_Category = packageInfo.category;
             m_IsDirectDependency = packageInfo.isDirectDependency;
-            m_IsFromScopedRegistry = packageInfo.registry?.isDefault == false;
             m_Name = packageInfo.name;
             m_VersionInManifest = packageInfo.projectDependenciesEntry;
 
@@ -142,16 +138,16 @@ internal void UpdatePackageInfo(PackageInfo packageInfo, bool isUnityPackage)
 
             // For core packages, or packages that are bundled with Unity without being published, use Unity's build date
             m_PublishedDateTicks = packageInfo.datePublished?.Ticks ?? 0;
-            if (HasTag(PackageTag.Bundled) && packageInfo.datePublished == null)
+            if (m_PublishedDateTicks == 0 && packageInfo.source == PackageSource.BuiltIn)
                 m_PublishedDateTicks = new DateTime(1970, 1, 1).Ticks + InternalEditorUtility.GetUnityVersionDate() * TimeSpan.TicksPerSecond;
 
-            m_Author = this.isUnityPackage ? k_UnityAuthor : packageInfo.author?.name ?? string.Empty;
+            m_Author = HasTag(PackageTag.Unity) ? k_UnityAuthor : packageInfo.author?.name ?? string.Empty;
 
             if (m_IsFullyFetched)
             {
                 m_DisplayName = GetDisplayName(packageInfo);
                 m_PackageId = packageInfo.packageId;
-                if (installedFromPath)
+                if (HasTag(PackageTag.InstalledFromPath))
                     m_PackageId = m_PackageId.Replace("\\", "/");
 
                 ProcessErrors(packageInfo);
@@ -173,8 +169,8 @@ internal void UpdatePackageInfo(PackageInfo packageInfo, bool isUnityPackage)
 
                 m_HasErrorWithEntitlementMessage = false;
                 m_Errors.Clear();
-                m_Dependencies = new DependencyInfo[0];
-                m_ResolvedDependencies = new DependencyInfo[0];
+                m_Dependencies = Array.Empty<DependencyInfo>();
+                m_ResolvedDependencies = Array.Empty<DependencyInfo>();
                 m_Entitlements = new EntitlementsInfo();
                 m_ResolvedPath = string.Empty;
                 m_Description = string.Empty;
@@ -189,11 +185,8 @@ public void SetInstalled(bool value)
 
         private void RefreshTagsForLocalAndGit(PackageSource source)
         {
-            if (source == PackageSource.BuiltIn || source == PackageSource.Registry)
-                return;
-
             m_Tag &= ~(PackageTag.Custom | PackageTag.VersionLocked | PackageTag.Local | PackageTag.Git);
-            if (!m_IsInstalled)
+            if (!m_IsInstalled || source is PackageSource.BuiltIn or PackageSource.Registry)
                 return;
 
             switch (source)
@@ -208,8 +201,6 @@ private void RefreshTagsForLocalAndGit(PackageSource source)
                 case PackageSource.Git:
                     m_Tag |= PackageTag.Git | PackageTag.VersionLocked;
                     break;
-                default:
-                    break;
             }
         }
 
@@ -218,47 +209,36 @@ private void RefreshTags(PackageInfo packageInfo)
             m_Tag = PackageTag.UpmFormat;
 
             // in the case of git/local packages, we always assume that the non-installed versions are from the registry
-            var source = packageInfo.source == PackageSource.BuiltIn || m_IsInstalled ? packageInfo.source : PackageSource.Registry;
-            if (source == PackageSource.BuiltIn)
+            if (packageInfo.source == PackageSource.BuiltIn)
             {
-                m_Tag |= PackageTag.Bundled | PackageTag.VersionLocked;
-                if (packageInfo.type == "module")
-                    m_Tag |= PackageTag.BuiltIn;
-                else if (packageInfo.type == "feature")
-                    m_Tag |= PackageTag.Feature;
+                m_Tag |= PackageTag.Unity | PackageTag.VersionLocked;
+                switch (packageInfo.type)
+                {
+                    case "module":
+                        m_Tag |= PackageTag.BuiltIn;
+                        break;
+                    case "feature":
+                        m_Tag |= PackageTag.Feature;
+                        break;
+                }
             }
             else
                 RefreshTagsForLocalAndGit(packageInfo.source);
 
-            if (isFromScopedRegistry)
-                m_Tag |= PackageTag.ScopedRegistry;
-
-            // The following logic means that if we see a Unity package on a scoped registry, we will consider it NOT from the scoped registry
-            // We'll also mark any non unity packages from any registry as `main not unity`
-            if (isRegistryPackage)
-            {
-                if (isUnityPackage)
-                    m_Tag &= ~PackageTag.ScopedRegistry;
-                else
-                    m_Tag |= PackageTag.MainNotUnity;
-            }
+            // We only tag a package as `Unity` when it's directly installed from registry. A package available on Unity registry can be installed
+            // through git or local file system but in those cases it is not considered a `Unity` package.
+            if (m_Source == PackageSource.Registry && m_AvailableRegistry == RegistryType.UnityRegistry)
+                m_Tag |= PackageTag.Unity;
 
             // We use the logic below instead packageInfo.isDeprecated, since we don't do an extra fetch when we want to tag deprecated version in version history
             // We want to know if a version is deprecated before we do the extra fetch
-            var isDeprecated = packageInfo.versions.deprecated.Contains(m_VersionString);
-            if (isDeprecated)
+            if (!HasTag(PackageTag.InstalledFromPath) && packageInfo.versions.deprecated.Contains(m_VersionString))
                 m_Tag |= PackageTag.Deprecated;
 
-            if (isUnityPackage)
-                m_Tag |= PackageTag.Unity;
-
-            if (!isUnityPackage || isDeprecated)
+            if (!HasTag(PackageTag.Unity) || HasTag(PackageTag.Deprecated) || isInvalidSemVerInManifest)
                 return;
 
-            const string previewTagString = "Preview";
-            SemVersion? lifecycleVersionParsed;
-            var isLifecycleVersionValid = SemVersionParser.TryParse(packageInfo.unityLifecycle?.version, out lifecycleVersionParsed);
-
+            var isLifecycleVersionValid = SemVersionParser.TryParse(packageInfo.unityLifecycle?.version, out var lifecycleVersionParsed);
             if (m_Version?.HasPreReleaseVersionTag() == true)
             {
                 // must match exactly to be release candidate
@@ -269,9 +249,9 @@ private void RefreshTags(PackageInfo packageInfo)
             }
             else if ((version?.Major == 0 && string.IsNullOrEmpty(version?.Prerelease)) ||
                         m_Version?.IsExperimental() == true ||
-                        previewTagString.Equals(version?.Prerelease.Split('.')[0], StringComparison.InvariantCultureIgnoreCase))
+                        "Preview".Equals(version?.Prerelease.Split('.')[0], StringComparison.InvariantCultureIgnoreCase))
                 m_Tag |= PackageTag.Experimental;
-            else if (isLifecycleVersionValid && m_Version.Value.IsEqualOrPatchOf(lifecycleVersionParsed))
+            else if (isLifecycleVersionValid && m_Version?.IsEqualOrPatchOf(lifecycleVersionParsed) == true)
             {
                 m_Tag |= PackageTag.Release;
             }
@@ -280,7 +260,7 @@ private void RefreshTags(PackageInfo packageInfo)
         public override string GetDescriptor(bool isFirstLetterCapitalized = false)
         {
             if (HasTag(PackageTag.Feature))
-                return isFirstLetterCapitalized? L10n.Tr("Feature") : L10n.Tr("feature");
+                return isFirstLetterCapitalized ? L10n.Tr("Feature") : L10n.Tr("feature");
             if (HasTag(PackageTag.BuiltIn))
                 return isFirstLetterCapitalized ? L10n.Tr("Built-in package") : L10n.Tr("built-in package");
             return isFirstLetterCapitalized ? L10n.Tr("Package") : L10n.Tr("package");
@@ -288,20 +268,16 @@ public override string GetDescriptor(bool isFirstLetterCapitalized = false)
 
         private static string GetDisplayName(PackageInfo info)
         {
-            if (!string.IsNullOrEmpty(info.displayName))
-                return info.displayName;
-            return ExtractDisplayName(info.name);
+            return !string.IsNullOrEmpty(info.displayName) ? info.displayName : ExtractDisplayName(info.name);
         }
 
         public static string ExtractDisplayName(string packageName)
         {
-            if (packageName.StartsWith(k_UnityPrefix))
-            {
-                var displayName = packageName.Substring(k_UnityPrefix.Length).Replace("modules.", "");
-                displayName = string.Join(" ", displayName.Split('.'));
-                return new CultureInfo("en-US").TextInfo.ToTitleCase(displayName);
-            }
-            return packageName;
+            if (!packageName.StartsWith(k_UnityPrefix))
+                return packageName;
+            var displayName = packageName.Substring(k_UnityPrefix.Length).Replace("modules.", "");
+            displayName = string.Join(" ", displayName.Split('.'));
+            return new CultureInfo("en-US").TextInfo.ToTitleCase(displayName);
         }
 
         public static string FormatPackageId(string name, string version)
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmSearchOperation.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmSearchOperation.cs
index fa036195e3..ababb146c9 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmSearchOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmSearchOperation.cs
@@ -4,6 +4,7 @@
 
 using System;
 using UnityEditor.PackageManager.Requests;
+using UnityEngine;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
@@ -14,10 +15,15 @@ internal class UpmSearchOperation : UpmBaseOperation<SearchRequest>
 
         protected override string operationErrorMessage => isOfflineMode ? L10n.Tr("Error searching for packages offline.") : L10n.Tr("Error searching for packages.");
 
+        [SerializeField]
+        private long m_ProductId;
+        public override long productId => m_ProductId;
+
         public void SearchAll()
         {
             m_OfflineMode = false;
             m_PackageIdOrName = string.Empty;
+            m_ProductId = 0;
             Start();
         }
 
@@ -26,13 +32,15 @@ public void SearchAllOffline(long timestamp)
             m_OfflineMode = true;
             m_Timestamp = timestamp;
             m_PackageIdOrName = string.Empty;
+            m_ProductId = 0;
             Start();
         }
 
-        public void Search(string packageIdOrName)
+        public void Search(string packageIdOrName, long productId)
         {
             m_OfflineMode = false;
             m_PackageIdOrName = packageIdOrName;
+            m_ProductId = productId;
             Start();
         }
 
@@ -41,6 +49,7 @@ public void SearchOffline(string packageIdOrName, long timestamp)
             m_OfflineMode = true;
             m_Timestamp = timestamp;
             m_PackageIdOrName = packageIdOrName;
+            m_ProductId = 0;
             Start();
         }
 
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmVersionList.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmVersionList.cs
index ccd9ddef32..4c1ef4f78e 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmVersionList.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmVersionList.cs
@@ -149,8 +149,6 @@ public void OnAfterDeserialize()
             SemVersionParser.TryParse(m_LifecycleNextVersionString, out m_LifecycleNextVersion);
         }
 
-        private bool isUnityPackage => m_Versions.All(v => v.isUnityPackage);
-
         public IPackageVersion latest => m_Versions.LastOrDefault();
 
         public IPackageVersion recommended
@@ -158,16 +156,15 @@ public IPackageVersion recommended
             get
             {
                 var installed = this.installed;
-
                 if (installed != null && installed.HasTag(PackageTag.VersionLocked))
                     return installed;
 
-                if (!isUnityPackage)
+                if (m_Versions.Any(v => v.availableRegistry != RegistryType.UnityRegistry))
                     return latest;
 
-                // for Unity packages, we should only recommend versions that have been tested with
-                //  the Editor; this means they have to be either version or nextVersion in the manifest
-                // version will take precedence over nextVersion
+                // for Unity packages, we should only recommend versions that have been tested with the Editor;
+                // this means they have to be either the lifecycle version or nextVersion in the manifest
+                // lifecycle version will take precedence over nextVersion
                 var resolvedLifecycleVersion = this.resolvedLifecycleVersion;
                 var resolvedLifecycleNextVersion = this.resolvedLifecycleNextVersion;
 
@@ -215,7 +212,7 @@ public void AddInstalledVersion(UpmPackageVersion newVersion)
             if (m_InstalledIndex >= 0)
             {
                 m_Versions[m_InstalledIndex].SetInstalled(false);
-                if (m_Versions[m_InstalledIndex].installedFromPath)
+                if (m_Versions[m_InstalledIndex].HasTag(PackageTag.InstalledFromPath))
                     m_Versions.RemoveAt(m_InstalledIndex);
             }
             newVersion.SetInstalled(true);
@@ -242,35 +239,35 @@ private static int AddToSortedVersions(List<UpmPackageVersion> sortedVersions, U
             return sortedVersions.Count - 1;
         }
 
-        public UpmVersionList(PackageInfo searchInfo, PackageInfo installedInfo, bool isUnityPackage, Dictionary<string, PackageInfo> extraVersions = null)
+        public UpmVersionList(PackageInfo searchInfo, PackageInfo installedInfo, RegistryType availableRegistry, Dictionary<string, PackageInfo> extraVersions = null)
         {
             // We prioritize searchInfo over installedInfo, because searchInfo is fetched from the server
             // while installedInfo sometimes only contain local data
             var mainInfo = searchInfo ?? installedInfo;
             if (mainInfo != null)
             {
-                var mainVersion = new UpmPackageVersion(mainInfo, mainInfo == installedInfo, isUnityPackage);
+                var mainVersion = new UpmPackageVersion(mainInfo, mainInfo == installedInfo, availableRegistry);
                 m_Versions = mainInfo.versions.compatible.Select(v =>
                 {
                     SemVersion? version;
                     SemVersionParser.TryParse(v, out version);
-                    return new UpmPackageVersion(mainInfo, false, version, mainVersion.displayName, isUnityPackage);
+                    return new UpmPackageVersion(mainInfo, false, version, mainVersion.displayName, availableRegistry);
                 }).ToList();
                 AddToSortedVersions(m_Versions, mainVersion);
 
                 if (mainInfo != installedInfo && installedInfo != null)
-                    AddInstalledVersion(new UpmPackageVersion(installedInfo, true, isUnityPackage));
+                    AddInstalledVersion(new UpmPackageVersion(installedInfo, true, availableRegistry));
             }
             m_InstalledIndex = m_Versions.FindIndex(v => v.isInstalled);
             var recommendedVersion = mainInfo?.unityLifecycle?.recommendedVersion;
             if (string.IsNullOrEmpty(recommendedVersion))
                 recommendedVersion = mainInfo?.unityLifecycle?.version;
             SetLifecycleVersions(recommendedVersion, mainInfo?.unityLifecycle?.nextVersion);
-            UpdateExtraPackageInfos(extraVersions, isUnityPackage);
+            UpdateExtraPackageInfos(extraVersions, availableRegistry);
             m_NumUnloadedVersions = 0;
         }
 
-        public UpmVersionList(IEnumerable<UpmPackageVersion> versions = null, string unityLifecycleInfoVersion = null, string unityLifecycleInfoNextVersion = null, int numUnloadedVersions = 0)
+        public UpmVersionList(IEnumerable<UpmPackageVersion> versions, string unityLifecycleInfoVersion = null, string unityLifecycleInfoNextVersion = null, int numUnloadedVersions = 0)
         {
             m_Versions = versions?.ToList() ?? new List<UpmPackageVersion>();
             m_InstalledIndex = m_Versions.FindIndex(v => v.isInstalled);
@@ -278,13 +275,13 @@ public UpmVersionList(IEnumerable<UpmPackageVersion> versions = null, string uni
             m_NumUnloadedVersions = numUnloadedVersions;
         }
 
-        private void UpdateExtraPackageInfos(Dictionary<string, PackageInfo> extraVersions, bool isUnityPackage)
+        private void UpdateExtraPackageInfos(Dictionary<string, PackageInfo> extraVersions, RegistryType availableRegistry)
         {
             if (extraVersions?.Any() != true)
                 return;
             foreach (var version in m_Versions.Where(v => !v.isFullyFetched))
                 if (extraVersions.TryGetValue(version.version.ToString(), out var packageInfo))
-                    version.UpdatePackageInfo(packageInfo, isUnityPackage);
+                    version.UpdatePackageInfo(packageInfo, availableRegistry);
         }
 
         private void SetLifecycleVersions(string unityLifecycleInfoVersion, string unityLifecycleInfoNextVersion)
diff --git a/Modules/PackageManagerUI/Editor/Services/UserSettings/PackageManagerUserSettingsProvider.cs b/Modules/PackageManagerUI/Editor/Services/UserSettings/PackageManagerUserSettingsProvider.cs
index f5b80025a9..400784b05d 100644
--- a/Modules/PackageManagerUI/Editor/Services/UserSettings/PackageManagerUserSettingsProvider.cs
+++ b/Modules/PackageManagerUI/Editor/Services/UserSettings/PackageManagerUserSettingsProvider.cs
@@ -241,7 +241,7 @@ private void GetAssetStoreCacheConfig()
         private void RefreshAssetStoreCachePathConfig(CachePathConfig config)
         {
             m_CurrentAssetStoreConfig = config;
-            assetsCachePath.text = currentAssetStoreNormalizedPath.EscapeBackslashes();
+            assetsCachePath.text = currentAssetStoreNormalizedPath;
             UIUtils.SetElementDisplay(assetsCacheErrorBox, false);
 
             if (m_CurrentAssetStoreConfig.source == ConfigSource.Environment)
@@ -306,7 +306,7 @@ private void OnPackagesClearCacheRootOperationResult(CacheRootConfig config)
         private void RefreshCurrentPackagesConfig(CacheRootConfig config)
         {
             m_CurrentPackagesConfig = config;
-            packagesCachePath.text = currentPackagesNormalizedPath.EscapeBackslashes();
+            packagesCachePath.text = currentPackagesNormalizedPath;
             packagesCacheDropdown.SetEnabled(true);
             UIUtils.SetElementDisplay(packagesCacheErrorBox, false);
         }
diff --git a/Modules/PackageManagerUI/Editor/UI/AddPackageByNameDropdown.cs b/Modules/PackageManagerUI/Editor/UI/AddPackageByNameDropdown.cs
index f371418847..583111992e 100644
--- a/Modules/PackageManagerUI/Editor/UI/AddPackageByNameDropdown.cs
+++ b/Modules/PackageManagerUI/Editor/UI/AddPackageByNameDropdown.cs
@@ -103,25 +103,23 @@ internal override void OnDropdownClosed()
             submitButton.clickable.clicked -= SubmitClicked;
         }
 
-        private void SetError(string errorMessage, bool isNameError = false, bool isVersionError = false)
+        private void SetError(bool isNameError = false, bool isVersionError = false)
         {
             packageVersionField.RemoveFromClassList("error");
             packageNameField.RemoveFromClassList("error");
 
-            if (string.IsNullOrEmpty(errorMessage))
+            AddToClassList("inputError");
+            if (isNameError)
             {
-                RemoveFromClassList("inputError");
-                errorInfoBox.text = string.Empty;
+                errorInfoBox.text = L10n.Tr("Unable to find the package with the specified name.\nPlease check the name and try again.");
+                packageNameField.AddToClassList("error");
             }
-            else
+            if (isVersionError)
             {
-                AddToClassList("inputError");
-                errorInfoBox.text = errorMessage;
-                if (isNameError)
-                    packageNameField.AddToClassList("error");
-                if (isVersionError)
-                    packageVersionField.AddToClassList("error");
+                errorInfoBox.text = L10n.Tr("Unable to find the package with the specified version.\nPlease check the version and try again.");
+                packageVersionField.AddToClassList("error");
             }
+            ShowWithNewWindowSize();
         }
 
         internal void SubmitClicked()
@@ -182,18 +180,15 @@ private void OnExtraFetchOperation(IOperation operation)
         private void OnExtraFetchResult(SearchRequest request)
         {
             var packageInfo = request.Result.FirstOrDefault();
-            if (packageInfo.name == packageNameField.value.Trim())
+            if (packageInfo == null)
+                SetError(isNameError: true);
+            else if (packageInfo.name == packageNameField.value.Trim())
             {
                 var version = packageVersionField.value;
-                if (string.IsNullOrEmpty(version))
-                    InstallByNameAndVersion(packageInfo.name);
-                else if (packageInfo.versions.all.Contains(version))
+                if (string.IsNullOrEmpty(version) || packageInfo.versions.all.Contains(version))
                     InstallByNameAndVersion(packageInfo.name, version);
                 else
-                {
-                    SetError(L10n.Tr("Unable to find the package with the specified version.\nPlease check the version and try again."), false, true);
-                    ShowWithNewWindowSize();
-                }
+                    SetError(isVersionError: true);
             }
         }
 
@@ -201,10 +196,7 @@ private void OnExtraFetchError(IOperation operation, UIError error)
         {
             var searchOperation = operation as UpmSearchOperation;
             if (searchOperation.packageName == packageNameField.value.Trim())
-            {
-                SetError(L10n.Tr("Unable to find the package with the specified name.\nPlease check the name and try again."), true, false);
-                ShowWithNewWindowSize();
-            }
+                SetError(isNameError: true);
         }
 
         private void OnTextFieldChange(ChangeEvent<string> evt)
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/BasePage.cs b/Modules/PackageManagerUI/Editor/UI/Common/BasePage.cs
index 1b9d1216e3..a2b55e29c3 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/BasePage.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/BasePage.cs
@@ -223,7 +223,7 @@ public virtual bool SetNewSelection(PackageAndVersionIdPair packageAndVersionId,
 
         public virtual bool SetNewSelection(IEnumerable<PackageAndVersionIdPair> packageAndVersionIds, bool isExplicitUserSelection = false)
         {
-            if (!m_Selection.SetNewSelection(packageAndVersionIds))
+            if (!m_Selection.SetNewSelection(packageAndVersionIds) && !isExplicitUserSelection)
                 return false;
 
             TriggerOnSelectionChanged(isExplicitUserSelection);
@@ -240,7 +240,7 @@ public virtual void RemoveSelection(IEnumerable<PackageAndVersionIdPair> toRemov
 
         public virtual bool AmendSelection(IEnumerable<PackageAndVersionIdPair> toAddOrUpdate, IEnumerable<PackageAndVersionIdPair> toRemove, bool isExplicitUserSelection = false)
         {
-            if (!m_Selection.AmendSelection(toAddOrUpdate, toRemove))
+            if (!m_Selection.AmendSelection(toAddOrUpdate, toRemove) && !isExplicitUserSelection)
                 return false;
 
             TriggerOnSelectionChanged(isExplicitUserSelection);
@@ -249,7 +249,7 @@ public virtual bool AmendSelection(IEnumerable<PackageAndVersionIdPair> toAddOrU
 
         public virtual bool ToggleSelection(string packageUniqueId, bool isExplicitUserSelection = false)
         {
-            if (!m_Selection.ToggleSelection(packageUniqueId))
+            if (!m_Selection.ToggleSelection(packageUniqueId) && !isExplicitUserSelection)
                 return false;
 
             TriggerOnSelectionChanged(isExplicitUserSelection);
@@ -260,27 +260,27 @@ public virtual bool UpdateSelectionIfCurrentSelectionIsInvalid()
         {
             var selection = GetSelection();
 
-            var toAddOrUpdate = new List<PackageAndVersionIdPair>();
-            var toRemove = new List<PackageAndVersionIdPair>();
+            var invalidSelectionsToRemove = new List<PackageAndVersionIdPair>();
             foreach (var item in selection)
             {
                 m_PackageDatabase.GetPackageAndVersion(item, out var package, out var version);
                 var visualState = visualStates.Get(item.packageUniqueId);
                 if (package == null || visualState?.visible != true)
-                    toRemove.Add(item);
+                    invalidSelectionsToRemove.Add(item);
             }
 
-            if (selection.Count > 0 && toAddOrUpdate.Count + toRemove.Count == 0)
+            if (selection.Count > 0 && invalidSelectionsToRemove.Count == 0)
                 return false;
 
-            if (toRemove.Count == selection.Count)
+            var newSelectionToAdd = new List<PackageAndVersionIdPair>();
+            if (invalidSelectionsToRemove.Count == selection.Count)
             {
                 var firstVisible = visualStates.FirstOrDefault(v => v.visible && !selection.Contains(v.packageUniqueId));
                 if (firstVisible != null)
-                    toAddOrUpdate.Add(new PackageAndVersionIdPair(firstVisible.packageUniqueId));
+                    newSelectionToAdd.Add(new PackageAndVersionIdPair(firstVisible.packageUniqueId));
             }
 
-            return AmendSelection(toAddOrUpdate, toRemove);
+            return AmendSelection(newSelectionToAdd, invalidSelectionsToRemove);
         }
 
         public bool IsGroupExpanded(string groupName)
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/PageFilters.cs b/Modules/PackageManagerUI/Editor/UI/Common/PageFilters.cs
index 2062b2e620..b282db0703 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/PageFilters.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/PageFilters.cs
@@ -13,6 +13,7 @@ internal class PageFilters : IEquatable<PageFilters>
     {
         internal const string k_UnlabeledStatus = "Unlabeled";
         internal const string k_DownloadedStatus = "Downloaded";
+        internal const string k_ImportedStatus = "Imported";
         internal const string k_UpdateAvailableStatus = "Update available";
         internal const string k_SubscriptionBasedStatus = "Subscription based";
 
@@ -29,6 +30,7 @@ public string status
         }
 
         public bool downloadedOnly => k_DownloadedStatus.Equals(status, StringComparison.OrdinalIgnoreCase);
+        public bool importedOnly => k_ImportedStatus.Equals(status, StringComparison.OrdinalIgnoreCase);
         public bool updateAvailableOnly => k_UpdateAvailableStatus.Equals(status, StringComparison.OrdinalIgnoreCase);
         public bool subscriptionBasedOnly => k_SubscriptionBasedStatus.Equals(status, StringComparison.OrdinalIgnoreCase);
 
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/PageManager.cs b/Modules/PackageManagerUI/Editor/UI/Common/PageManager.cs
index 1741bf4c89..3226a22326 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/PageManager.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/PageManager.cs
@@ -86,10 +86,10 @@ private IPage CreatePageFromTab(PackageFilterTab filterTab)
                     supportFilters = true,
                     orderingValues = new[]
                     {
-                        new PageCapability.Ordering("Name (asc)", "name", PageCapability.Order.Ascending),
-                        new PageCapability.Ordering("Name (desc)", "name", PageCapability.Order.Descending),
                         new PageCapability.Ordering("Purchased date", "purchased_date", PageCapability.Order.Descending),
-                        new PageCapability.Ordering("Recently updated", "update_date", PageCapability.Order.Descending)
+                        new PageCapability.Ordering("Recently updated", "update_date", PageCapability.Order.Descending),
+                        new PageCapability.Ordering("Name (asc)", "name", PageCapability.Order.Ascending),
+                        new PageCapability.Ordering("Name (desc)", "name", PageCapability.Order.Descending)
                     }
                 });
             }
@@ -176,7 +176,7 @@ public virtual IPage FindPage(IEnumerable<IPackageVersion> packageVersions)
             if (packageVersions.All(v => v.package.versions.installed != null || (v.package.progress == PackageProgress.Installing && v.package.versions.primary.HasTag(PackageTag.Placeholder))))
                 return GetPage(PackageFilterTab.InProject);
 
-            if (packageVersions.All(v => v.HasTag(PackageTag.Unity)))
+            if (packageVersions.All(v => v.availableRegistry == RegistryType.UnityRegistry))
                 return GetPage(PackageFilterTab.UnityRegistry);
 
             if (packageVersions.All(v => v.HasTag(PackageTag.LegacyFormat)))
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/PageRefreshHandler.cs b/Modules/PackageManagerUI/Editor/UI/Common/PageRefreshHandler.cs
index 1130805307..a16f75bf79 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/PageRefreshHandler.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/PageRefreshHandler.cs
@@ -10,14 +10,14 @@
 namespace UnityEditor.PackageManager.UI.Internal
 {
     [Serializable]
-    internal class PageRefreshHandler : ISerializationCallbackReceiver
+    internal class PageRefreshHandler: ISerializationCallbackReceiver
     {
         private static readonly RefreshOptions[] k_RefreshOptionsByTab =
         {
             RefreshOptions.UpmList | RefreshOptions.UpmSearch,                  // PackageFilterTab.UnityRegistry
             RefreshOptions.UpmList,                                             // PackageFilterTab.InProject
             RefreshOptions.UpmListOffline | RefreshOptions.UpmSearchOffline,    // PackageFilterTab.BuiltIn
-            RefreshOptions.Purchased,                                           // PackageFilterTab.AssetStore
+            RefreshOptions.Purchased | RefreshOptions.ImportedAssets,           // PackageFilterTab.AssetStore
             RefreshOptions.UpmList | RefreshOptions.UpmSearch,                  // PackageFilterTab.MyRegistries
         };
 
@@ -55,6 +55,8 @@ internal class PageRefreshHandler : ISerializationCallbackReceiver
         [NonSerialized]
         private UnityConnectProxy m_UnityConnect;
         [NonSerialized]
+        private AssetDatabaseProxy m_AssetDatabase;
+        [NonSerialized]
         private PackageManagerPrefs m_PackageManagerPrefs;
         [NonSerialized]
         private AssetStoreClientV2 m_AssetStoreClient;
@@ -62,6 +64,7 @@ internal class PageRefreshHandler : ISerializationCallbackReceiver
         public void ResolveDependencies(PageManager pageManager,
             ApplicationProxy application,
             UnityConnectProxy unityConnect,
+            AssetDatabaseProxy assetDatabase,
             PackageManagerPrefs packageManagerPrefs,
             UpmClient upmClient,
             UpmRegistryClient upmRegistryClient,
@@ -72,6 +75,7 @@ public void ResolveDependencies(PageManager pageManager,
             m_UpmClient = upmClient;
             m_UpmRegistryClient = upmRegistryClient;
             m_UnityConnect = unityConnect;
+            m_AssetDatabase = assetDatabase;
             m_PackageManagerPrefs = packageManagerPrefs;
             m_AssetStoreClient = assetStoreClient;
         }
@@ -95,7 +99,7 @@ public void OnAfterDeserialize()
 
         private void OnFilterChanged(PackageFilterTab filterTab)
         {
-            if (GetRefreshTimestamp(filterTab) == 0)
+            if (!IsInitialFetchingDone(filterTab))
                 Refresh(filterTab);
         }
 
@@ -117,7 +121,7 @@ public virtual void Refresh(RefreshOptions options)
                 m_UpmClient.SearchAll();
                 // Since the SearchAll online call now might return error and an empty list, we want to trigger a `SearchOffline` call if
                 // we detect that SearchOffline has not been called before. That way we will have some offline result to show to the user instead of nothing
-                if (!m_RefreshTimestamps.TryGetValue(RefreshOptions.UpmSearchOffline, out var value) || value == 0)
+                if (GetRefreshTimestampSingleFlag(RefreshOptions.UpmSearchOffline) == 0)
                     options |= RefreshOptions.UpmSearchOffline;
             }
             if ((options & RefreshOptions.UpmSearchOffline) != 0)
@@ -126,7 +130,7 @@ public virtual void Refresh(RefreshOptions options)
             {
                 m_UpmClient.List();
                 // Do the same logic for the List operations as the Search operations
-                if (!m_RefreshTimestamps.TryGetValue(RefreshOptions.UpmListOffline, out var value) || value == 0)
+                if (GetRefreshTimestampSingleFlag(RefreshOptions.UpmListOffline) == 0)
                     options |= RefreshOptions.UpmListOffline;
             }
             if ((options & RefreshOptions.UpmListOffline) != 0)
@@ -140,6 +144,31 @@ public virtual void Refresh(RefreshOptions options)
             }
             if ((options & RefreshOptions.PurchasedOffline) != 0)
                 m_AssetStoreClient.RefreshLocal();
+            if ((options & RefreshOptions.ImportedAssets) != 0)
+                RefreshImportedAssets();
+        }
+
+        private void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
+        {
+            // if a full scan was never done, it needs to be done now
+            // otherwise, we want to avoid doing a full scan on every OnPostprocessAllAssets trigger for performance, so
+            //  if a full scan was done already, just modify the cached assets according to the parameters passed by the event
+            if (RefreshImportedAssets())
+                return;
+
+            m_AssetStoreClient.OnPostProcessAllAssets(importedAssets, deletedAssets, movedAssets, movedFromAssetPaths);
+        }
+
+        // returns true if a full scan was done, false if not
+        private bool RefreshImportedAssets()
+        {
+            if (GetRefreshTimestampSingleFlag(RefreshOptions.ImportedAssets) == 0)
+            {
+                m_AssetStoreClient.RefreshImportedAssets();
+                m_RefreshTimestamps[RefreshOptions.ImportedAssets] = DateTime.Now.Ticks;
+                return true;
+            }
+            return false;
         }
 
         public virtual void CancelRefresh(PackageFilterTab? tab = null)
@@ -157,9 +186,10 @@ private void OnUserLoginStateChange(bool userInfoReady, bool loggedIn)
         {
             if (!loggedIn)
             {
-                // We also want to clear the refresh time stamp here so that the next time users visit the Asset Store page, we'll call
-                // refresh properly
+                // We also want to clear the refresh time stamp here so that the next time users visit the Asset Store page,
+                // we'll call refresh properly
                 m_RefreshTimestamps[RefreshOptions.Purchased] = 0;
+                m_RefreshErrors.Remove(RefreshOptions.Purchased);
             }
             else if (m_PackageManagerPrefs.currentFilterTab == PackageFilterTab.AssetStore &&
                 m_Application.isInternetReachable &&
@@ -172,6 +202,8 @@ public void OnEnable()
         {
             InitializeRefreshTimestamps();
 
+            m_AssetDatabase.onPostprocessAllAssets += OnPostprocessAllAssets;
+
             m_UpmClient.onListOperation += OnRefreshOperation;
             m_UpmClient.onSearchAllOperation += OnRefreshOperation;
             m_AssetStoreClient.onListOperation += OnRefreshOperation;
@@ -183,6 +215,8 @@ public void OnEnable()
 
         public void OnDisable()
         {
+            m_AssetDatabase.onPostprocessAllAssets -= OnPostprocessAllAssets;
+
             m_UpmClient.onListOperation -= OnRefreshOperation;
             m_UpmClient.onSearchAllOperation -= OnRefreshOperation;
             m_AssetStoreClient.onListOperation -= OnRefreshOperation;
@@ -197,10 +231,7 @@ public void InitializeRefreshTimestamps()
         {
             foreach (RefreshOptions filter in Enum.GetValues(typeof(RefreshOptions)))
             {
-                if (filter == RefreshOptions.None || filter == RefreshOptions.UpmAny)
-                    continue;
-
-                if (m_RefreshTimestamps.ContainsKey(filter))
+                if (filter == RefreshOptions.None || m_RefreshTimestamps.ContainsKey(filter))
                     continue;
                 m_RefreshTimestamps[filter] = 0;
             }
@@ -229,13 +260,13 @@ private void OnRefreshOperationSuccess(IOperation operation)
             {
                 // when an online operation successfully returns with a timestamp newer than the offline timestamp, we update the offline timestamp as well
                 // since we merge the online & offline result in the PackageDatabase and it's the newer ones that are being shown
-                if (!m_RefreshTimestamps.TryGetValue(RefreshOptions.UpmSearchOffline, out var value) || value < operation.timestamp)
+                if (GetRefreshTimestampSingleFlag(RefreshOptions.UpmSearchOffline) < operation.timestamp)
                     m_RefreshTimestamps[RefreshOptions.UpmSearchOffline] = operation.timestamp;
             }
             else if (operation.refreshOptions == RefreshOptions.UpmList)
             {
                 // Do the same logic for the List operations as the Search operations
-                if (!m_RefreshTimestamps.TryGetValue(RefreshOptions.UpmListOffline, out var value) || value < operation.timestamp)
+                if (GetRefreshTimestampSingleFlag(RefreshOptions.UpmListOffline) < operation.timestamp)
                     m_RefreshTimestamps[RefreshOptions.UpmListOffline] = operation.timestamp;
             }
             if (m_RefreshErrors.ContainsKey(operation.refreshOptions))
@@ -288,6 +319,14 @@ public virtual long GetRefreshTimestamp(RefreshOptions option)
             return result;
         }
 
+        // This function only work with single flag (e.g. `RefreshOption.UpmList`) refresh option.
+        // If a refresh option with multiple flags (e.g. `RefreshOption.UpmList | RefreshOption.UpmSearch`)
+        // is passed, the result won't be correct.
+        private long GetRefreshTimestampSingleFlag(RefreshOptions option)
+        {
+            return m_RefreshTimestamps.TryGetValue(option, out var value) ? value : 0;
+        }
+
         public virtual UIError GetRefreshError(RefreshOptions option)
         {
             // only return the first one when there are multiple errors
diff --git a/Modules/PackageManagerUI/Editor/UI/Filters/AssetStoreFiltersWindow.cs b/Modules/PackageManagerUI/Editor/UI/Filters/AssetStoreFiltersWindow.cs
index b8a36d2d50..7600959017 100644
--- a/Modules/PackageManagerUI/Editor/UI/Filters/AssetStoreFiltersWindow.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Filters/AssetStoreFiltersWindow.cs
@@ -15,6 +15,7 @@ internal class AssetStoreFiltersWindow : PackageManagerFiltersWindow
         internal static readonly string[] k_Statuses =
         {
             PageFilters.k_DownloadedStatus,
+            PageFilters.k_ImportedStatus,
             PageFilters.k_UpdateAvailableStatus,
             PageFilters.k_UnlabeledStatus,
             "Hidden",
diff --git a/Modules/PackageManagerUI/Editor/UI/MultiSelect/MultiSelectDetails.cs b/Modules/PackageManagerUI/Editor/UI/MultiSelect/MultiSelectDetails.cs
index 01cfd2c3aa..24b7af43cc 100644
--- a/Modules/PackageManagerUI/Editor/UI/MultiSelect/MultiSelectDetails.cs
+++ b/Modules/PackageManagerUI/Editor/UI/MultiSelect/MultiSelectDetails.cs
@@ -49,6 +49,7 @@ private void ResolveDependencies()
 
         private DownloadFoldoutGroup m_DownloadFoldoutGroup;
         private DownloadUpdateFoldoutGroup m_DownloadUpdateFoldoutGroup;
+        private RemoveImportedFoldoutGroup m_RemoveImportedFoldoutGroup;
 
         private MultiSelectFoldoutGroup[] m_UpmFoldoutGroups;
         private MultiSelectFoldoutGroup[] m_AssetStoreFoldoutGroups;
@@ -116,10 +117,13 @@ private void InitializeFoldouts()
             m_DownloadUpdateFoldoutGroup.mainButton.SetGlobalDisableConditions(disableIfCompiling, disableIfNoNetwork);
             m_DownloadUpdateFoldoutGroup.cancelButton.SetGlobalDisableConditions(disableIfCompiling);
 
+            m_RemoveImportedFoldoutGroup = new RemoveImportedFoldoutGroup(m_Application, m_OperationDispatcher);
+            m_RemoveImportedFoldoutGroup.mainButton.SetGlobalDisableConditions(disableIfCompiling);
+
             m_UpmFoldoutGroups = new MultiSelectFoldoutGroup[] { m_InstallFoldoutGroup, m_RemoveFoldoutGroup, m_UpdateFoldoutGroup };
 
             // Now that Upm packages can live on Asset Store, we want to show Upm foldout groups on asset store too
-            m_AssetStoreFoldoutGroups = new MultiSelectFoldoutGroup[] { m_DownloadFoldoutGroup, m_DownloadUpdateFoldoutGroup, m_InstallFoldoutGroup, m_RemoveFoldoutGroup, m_UpdateFoldoutGroup };
+            m_AssetStoreFoldoutGroups = new MultiSelectFoldoutGroup[] { m_DownloadFoldoutGroup, m_DownloadUpdateFoldoutGroup, m_RemoveImportedFoldoutGroup, m_InstallFoldoutGroup, m_RemoveFoldoutGroup, m_UpdateFoldoutGroup };
 
             // Add foldouts to the UI in the correct order. Note that the order here is not the same as the initialization order from above.
             foldoutsContainer.Add(m_UnlockFoldout);
@@ -136,6 +140,9 @@ private void InitializeFoldouts()
             foldoutsContainer.Add(m_DownloadUpdateFoldoutGroup.mainFoldout);
             foldoutsContainer.Add(m_DownloadUpdateFoldoutGroup.inProgressFoldout);
 
+            foldoutsContainer.Add(m_RemoveImportedFoldoutGroup.mainFoldout);
+            foldoutsContainer.Add(m_RemoveImportedFoldoutGroup.inProgressFoldout);
+
             foldoutsContainer.Add(m_CheckUpdateFoldout);
             foldoutsContainer.Add(m_NoActionFoldout);
         }
diff --git a/Modules/PackageManagerUI/Editor/UI/MultiSelect/RemoveFoldoutGroup.cs b/Modules/PackageManagerUI/Editor/UI/MultiSelect/RemoveFoldoutGroup.cs
index ee472ab026..d13925bc7b 100644
--- a/Modules/PackageManagerUI/Editor/UI/MultiSelect/RemoveFoldoutGroup.cs
+++ b/Modules/PackageManagerUI/Editor/UI/MultiSelect/RemoveFoldoutGroup.cs
@@ -34,9 +34,7 @@ public override void Refresh()
 
         public override bool AddPackageVersion(IPackageVersion version)
         {
-            if (!version.HasTag(PackageTag.UpmFormat))
-                return false;
-            return base.AddPackageVersion(version);
+            return version.HasTag(PackageTag.UpmFormat) && base.AddPackageVersion(version);
         }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/MultiSelect/RemoveImportedFoldoutGroup.cs b/Modules/PackageManagerUI/Editor/UI/MultiSelect/RemoveImportedFoldoutGroup.cs
new file mode 100644
index 0000000000..c714745d8a
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/MultiSelect/RemoveImportedFoldoutGroup.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.Linq;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class RemoveImportedFoldoutGroup : MultiSelectFoldoutGroup
+    {
+        public RemoveImportedFoldoutGroup(ApplicationProxy applicationProxy, PackageOperationDispatcher operationDispatcher)
+            : base(new PackageRemoveImportedButton(applicationProxy,operationDispatcher), null)
+        {
+        }
+
+        public override void Refresh()
+        {
+            mainFoldout.headerTextTemplate = L10n.Tr("Remove imported assets from {0}");
+            inProgressFoldout.headerTextTemplate = L10n.Tr("Removing imported assets from {0}");
+            base.Refresh();
+        }
+
+        public override bool AddPackageVersion(IPackageVersion version)
+        {
+            return version.importedAssets?.Any() == true && base.AddPackageVersion(version);
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetails.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetails.cs
index 2cb42553b8..a00235a10b 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetails.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetails.cs
@@ -103,6 +103,10 @@ private void RecalculateFillerHeight(GeometryChangedEvent evt)
 
             var featureDependencies = tabView.GetTab<FeatureDependenciesTab>(FeatureDependenciesTab.k_Id);
             featureDependencies?.RecalculateFillerHeight(detail.layout.height, scrollView.layout.height);
+            var importedAssets = tabView.GetTab<PackageDetailsImportedAssetsTab>(PackageDetailsImportedAssetsTab.k_Id);
+            importedAssets?.RecalculateTabHeight(detail.layout.height, scrollView.layout.height, header.layout.height,
+                tabViewHeaderContainer.layout.height, customContainer.layout.height,
+                extensionContainer.layout.height);
         }
 
         private void OnDetailScroll(float offset)
@@ -229,5 +233,6 @@ private void RefreshDetailError(IPackage package, IPackageVersion version)
         internal VisualElement extensionContainer => cache.Get<VisualElement>("detailExtensionContainer");
 
         private PackageDetailsTabView tabView => cache.Get<PackageDetailsTabView>("packageDetailsTabView");
+        private VisualElement tabViewHeaderContainer => cache.Get<VisualElement>("packageDetailsTabViewHeaderContainer");
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsBody.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsBody.cs
index 6b27cea43a..a0392612cb 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetailsBody.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsBody.cs
@@ -66,6 +66,7 @@ public void AddTabs()
             m_TabView.AddTab(new PackageDetailsDescriptionTab(m_ResourceLoader, m_PackageManagerPrefs));
             m_TabView.AddTab(new PackageDetailsOverviewTab(m_ResourceLoader));
             m_TabView.AddTab(new PackageDetailsReleasesTab());
+            m_TabView.AddTab(new PackageDetailsImportedAssetsTab(m_IOProxy, m_PackageManagerPrefs));
             m_TabView.AddTab(new PackageDetailsVersionsTab(m_ResourceLoader, m_Application, m_PackageManagerPrefs, m_PackageDatabase, m_OperationDispatcher, m_PageManager, m_SettingsProxy, m_UpmCache, 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));
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsHeader.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsHeader.cs
index 16db699c9a..5f624af0d8 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetailsHeader.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsHeader.cs
@@ -76,12 +76,12 @@ public PackageDetailsHeader()
 
         private void CreateTags()
         {
-            versionContainer.Add(new PackageSimpleTagLabel(PackageTag.Git, L10n.Tr("git")));
-            versionContainer.Add(new PackageSimpleTagLabel(PackageTag.Local, L10n.Tr("local")));
+            versionContainer.Add(new PackageSimpleTagLabel(PackageTag.Git, L10n.Tr("Git")));
+            versionContainer.Add(new PackageSimpleTagLabel(PackageTag.Local, L10n.Tr("Local")));
             versionContainer.Add(new PackageAssetStoreTagLabel());
             versionContainer.Add(new PackageDeprecatedTagLabel());
-            versionContainer.Add(new PackageSimpleTagLabel(PackageTag.Disabled, L10n.Tr("disabled")));
-            versionContainer.Add(new PackageSimpleTagLabel(PackageTag.Custom, L10n.Tr("custom")));
+            versionContainer.Add(new PackageSimpleTagLabel(PackageTag.Disabled, L10n.Tr("Disabled")));
+            versionContainer.Add(new PackageSimpleTagLabel(PackageTag.Custom, L10n.Tr("Custom")));
             versionContainer.Add(new PackageSimpleTagLabel(PackageTag.PreRelease, L10n.Tr("Pre-Release")));
             versionContainer.Add(new PackageReleaseTagLabel(m_PackageDatabase));
             versionContainer.Add(new PackageSimpleTagLabel(PackageTag.ReleaseCandidate, L10n.Tr("Release Candidate")));
@@ -106,7 +106,7 @@ public void Refresh(IPackage package, IPackageVersion version)
             RefreshTags();
             RefreshVersionLabel();
             RefreshVersionInfoIcon();
-            RefreshRegistry();
+            RefreshDetailRegistry();
             RefreshEntitlement();
             RefreshDeprecationHelpBox();
             RefreshEmbeddedFeatureSetWarningBox();
@@ -170,7 +170,7 @@ private void RefreshLockIcons(IEnumerable<IPackageVersion> featureSets, VisualSt
             var showLockedIcon = featureSets?.Any() == true;
             if (showLockedIcon)
             {
-                visualState = visualState ?? m_PageManager.GetPage().visualStates.Get(m_Package?.uniqueId);
+                visualState ??= m_PageManager.GetPage().visualStates.Get(m_Package?.uniqueId);
                 if (visualState?.isLocked == true)
                 {
                     lockedIcon.RemoveFromClassList("unlocked");
@@ -192,7 +192,7 @@ private void OnVisualStateChange(VisualStateChangeArgs args)
             if (!args.page.isActivePage)
                 return;
 
-            var visualState = args.visualStates.FirstOrDefault(vs => vs.packageUniqueId == m_Package.uniqueId);
+            var visualState = args.visualStates.FirstOrDefault(vs => vs.packageUniqueId == m_Package?.uniqueId);
             if (visualState != null)
                 RefreshFeatureSetElements(visualState);
         }
@@ -395,38 +395,40 @@ private void RefreshVersionInfoIcon()
             UIUtils.SetElementDisplay(versionInfoIcon, false);
         }
 
-        private void RefreshRegistry()
+        private void RefreshDetailRegistry()
         {
             var packageInfo = m_UpmCache.GetBestMatchPackageInfo(m_Version.name, m_Version.isInstalled, m_Version.versionString);
             var registry = packageInfo?.registry;
             var showRegistry = registry != null && m_Version.package.product == null;
             UIUtils.SetElementDisplay(detailRegistry, showRegistry);
-            UIUtils.SetElementDisplay(scopedRegistryInfoBox, showRegistry);
+
             if (showRegistry)
             {
-                scopedRegistryInfoBox.text = k_InfoBoxReadMoreText[(int)InfoBoxState.ScopedRegistry];
-                UIUtils.SetElementDisplay(scopedRegistryInfoBox, !registry.isDefault);
+                var isByUnity = packageInfo.versions.all.Length > 0 && registry.isDefault && !m_Version.HasTag(PackageTag.InstalledFromPath);
 
-                var detailRegistryName = L10n.Tr("Unknown");
-                detailRegistry.tooltip = string.Empty;
-                if (packageInfo.versions.all.Any())
-                {
-                    detailRegistryName = registry.isDefault ? "Unity Technologies Inc." : registry.name;
-                    detailRegistry.tooltip = registry.url;
-                }
+                var detailRegistryName = isByUnity ? "Unity Registry" : registry.name;
+                var detailRegistryAuthor = isByUnity ? "Unity Technologies Inc." : m_Version?.author;
+                detailRegistry.tooltip = isByUnity ? registry.url : string.Empty;
                 detailRegistry.enableRichText = true;
-                if(registry.isDefault)
-                {
-                    detailRegistry.text = string.Format(L10n.Tr("From <b>Unity Registry</b> by {0}"), detailRegistryName);
-                }
+
+                if (!string.IsNullOrEmpty(detailRegistryName) && !string.IsNullOrEmpty(detailRegistryAuthor))
+                    detailRegistry.text = string.Format(L10n.Tr("From <b>{0}</b> by {1}"), detailRegistryName, detailRegistryAuthor);
+                else if (!string.IsNullOrEmpty(detailRegistryName))
+                    detailRegistry.text = string.Format(L10n.Tr("From <b>{0}</b>"), detailRegistryName);
+                else if (!string.IsNullOrEmpty(detailRegistryAuthor))
+                    detailRegistry.text = string.Format(L10n.Tr("By {0}"), detailRegistryAuthor);
                 else
-                {
-                    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>");
-                }
+                    detailRegistry.text = L10n.Tr("Author unknown");
             }
+
+            RefreshScopedRegistryInfoBox(showRegistry, registry);
+        }
+
+        private void RefreshScopedRegistryInfoBox(bool showRegistry, RegistryInfo registry)
+        {
+            UIUtils.SetElementDisplay(scopedRegistryInfoBox, showRegistry);
+
+            // To be reworked in PAX-2547
             if (m_Version.HasTag(PackageTag.Experimental))
             {
                 scopedRegistryInfoBox.text = k_InfoBoxReadMoreText[(int)InfoBoxState.Experimental];
@@ -442,6 +444,11 @@ private void RefreshRegistry()
                 scopedRegistryInfoBox.text = k_InfoBoxReadMoreText[(int)InfoBoxState.ReleaseCandidate];
                 UIUtils.SetElementDisplay(scopedRegistryInfoBox, true);
             }
+            else if (showRegistry)
+            {
+                scopedRegistryInfoBox.text = k_InfoBoxReadMoreText[(int)InfoBoxState.ScopedRegistry];
+                UIUtils.SetElementDisplay(scopedRegistryInfoBox, !registry.isDefault);
+            }
         }
 
         private void RefreshEmbeddedFeatureSetWarningBox()
@@ -449,15 +456,16 @@ private void RefreshEmbeddedFeatureSetWarningBox()
             UIUtils.SetElementDisplay(embeddedFeatureSetWarningBox, m_Version.HasTag(PackageTag.Feature) && m_Version.HasTag(PackageTag.Custom));
         }
 
+        // To be reworked in PAX-2547
         private void OnInfoBoxClickMore()
         {
-            if (m_Version.HasTag(PackageTag.PreRelease))
-                m_Application.OpenURL($"{infoBoxUrl}{k_InfoBoxReadMoreUrl[(int)InfoBoxState.PreRelease]}");
-            else if (m_Version.HasTag(PackageTag.Experimental))
+            if (m_Version.HasTag(PackageTag.Experimental))
                 m_Application.OpenURL($"{infoBoxUrl}{k_InfoBoxReadMoreUrl[(int)InfoBoxState.Experimental]}");
+            else if (m_Version.HasTag(PackageTag.PreRelease))
+                m_Application.OpenURL($"{infoBoxUrl}{k_InfoBoxReadMoreUrl[(int)InfoBoxState.PreRelease]}");
             else if (m_Version.HasTag(PackageTag.ReleaseCandidate))
                 m_Application.OpenURL($"{infoBoxUrl}{k_InfoBoxReadMoreUrl[(int)InfoBoxState.ReleaseCandidate]}");
-            else if (m_Version.HasTag(PackageTag.ScopedRegistry))
+            else
                 m_Application.OpenURL($"{infoBoxUrl}{k_InfoBoxReadMoreUrl[(int)InfoBoxState.ScopedRegistry]}");
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsLinks.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsLinks.cs
index 8298418233..36fde53bd1 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetailsLinks.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsLinks.cs
@@ -162,7 +162,7 @@ private void AddToParentWithSeparator(VisualElement parent, VisualElement item)
             if (packageInfo == null || version.HasTag(PackageTag.Feature))
                 return (LinkState.NotVisible, "");
 
-            if (UpmPackageDocs.GetDocumentationUrl(packageInfo, version.isUnityPackage).Any() ||
+            if (UpmPackageDocs.GetDocumentationUrl(packageInfo, version.HasTag(PackageTag.Unity)).Any() ||
                 !string.IsNullOrEmpty(UpmPackageDocs.GetOfflineDocumentation(m_IOProxy, packageInfo)) ||
                 version.HasTag(PackageTag.BuiltIn))
                 return (LinkState.Enabled, "");
@@ -179,7 +179,7 @@ private void AddToParentWithSeparator(VisualElement parent, VisualElement item)
             if (packageInfo == null || version.HasTag(PackageTag.Feature | PackageTag.BuiltIn))
                 return (LinkState.NotVisible, "");
 
-            if (!string.IsNullOrEmpty(UpmPackageDocs.GetChangelogUrl(packageInfo, version.isUnityPackage)) ||
+            if (!string.IsNullOrEmpty(UpmPackageDocs.GetChangelogUrl(packageInfo, version.HasTag(PackageTag.Unity))) ||
                 !string.IsNullOrEmpty(UpmPackageDocs.GetOfflineChangelog(m_IOProxy, packageInfo)))
                 return (LinkState.Enabled, "");
 
@@ -195,7 +195,7 @@ private void AddToParentWithSeparator(VisualElement parent, VisualElement item)
             if (packageInfo == null || version.HasTag(PackageTag.Feature | PackageTag.BuiltIn))
                 return (LinkState.NotVisible, "");
 
-            if (!string.IsNullOrEmpty(UpmPackageDocs.GetLicensesUrl(packageInfo, version.isUnityPackage)) ||
+            if (!string.IsNullOrEmpty(UpmPackageDocs.GetLicensesUrl(packageInfo, version.HasTag(PackageTag.Unity))) ||
                 !string.IsNullOrEmpty(UpmPackageDocs.GetOfflineLicenses(m_IOProxy, packageInfo)))
                 return (LinkState.Enabled, "");
 
@@ -229,21 +229,21 @@ private void ViewUrl(string[] onlineUrls, string offlineDocPath, string docType,
         private void ViewDocClick()
         {
             var packageInfo = m_Version != null ? m_UpmCache.GetBestMatchPackageInfo(m_Version.name, m_Version.isInstalled, m_Version.versionString) : null;
-            var isUnityPackage = m_Version?.isUnityPackage == true;
+            var isUnityPackage = m_Version?.HasTag(PackageTag.Unity) == true;
             ViewUrl(UpmPackageDocs.GetDocumentationUrl(packageInfo, isUnityPackage), UpmPackageDocs.GetOfflineDocumentation(m_IOProxy, packageInfo), L10n.Tr("documentation"), "viewDocs");
         }
 
         private void ViewChangelogClick()
         {
             var packageInfo = m_Version != null ? m_UpmCache.GetBestMatchPackageInfo(m_Version.name, m_Version.isInstalled, m_Version.versionString) : null;
-            var isUnityPackage = m_Version?.isUnityPackage == true;
+            var isUnityPackage = m_Version?.HasTag(PackageTag.Unity) == true;
             UpmPackageDocs.ViewUrl(UpmPackageDocs.GetChangelogUrl(packageInfo, isUnityPackage), UpmPackageDocs.GetOfflineChangelog(m_IOProxy, packageInfo), L10n.Tr("changelog"), "viewChangelog", m_Version, m_Package, m_Application);
         }
 
         private void ViewLicensesClick()
         {
             var packageInfo = m_Version != null ? m_UpmCache.GetBestMatchPackageInfo(m_Version.name, m_Version.isInstalled, m_Version.versionString) : null;
-            var isUnityPackage = m_Version?.isUnityPackage == true;
+            var isUnityPackage = m_Version?.HasTag(PackageTag.Unity) == true;
             UpmPackageDocs.ViewUrl(UpmPackageDocs.GetLicensesUrl(packageInfo, isUnityPackage), UpmPackageDocs.GetOfflineLicenses(m_IOProxy, packageInfo), L10n.Tr("license documentation"), "viewLicense", m_Version, m_Package, m_Application);
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsImportedAssetsTab.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsImportedAssetsTab.cs
new file mode 100644
index 0000000000..9a8e27733d
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsImportedAssetsTab.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.Linq;
+using UnityEditorInternal;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class PackageDetailsImportedAssetsTab : PackageDetailsTabElement
+    {
+        internal const string k_Id = "importedassets";
+        internal const int k_LabelColumnId = 0;
+        internal const int k_LocationColumnId = 1;
+        internal const int k_VersionColumnId = 2;
+        private const int k_MinColumnWidth = 70;
+
+        private static readonly string k_LabelColumnTitle = L10n.Tr("Asset name");
+        private static readonly string k_LocationColumnTitle = L10n.Tr("Location in project");
+        private static readonly string k_VersionColumnTitle = L10n.Tr("Version");
+
+        private MultiColumnListView m_ListView;
+        private IOProxy m_IOProxy;
+        private PackageManagerPrefs m_PackageManagerPrefs;
+
+        private IList<Asset> assets => m_ListView.itemsSource as IList<Asset>;
+
+        public override bool IsValid(IPackageVersion version)
+        {
+            return version?.importedAssets?.Any() == true;
+        }
+
+        public PackageDetailsImportedAssetsTab(IOProxy iOProxy, PackageManagerPrefs packageManagerPrefs)
+        {
+            m_IOProxy = iOProxy;
+            m_PackageManagerPrefs = packageManagerPrefs;
+
+            m_Id = k_Id;
+            m_DisplayName = L10n.Tr("Imported Assets");
+
+            name = "importedAssetsDetailsContainer";
+            m_ListView = new MultiColumnListView
+            {
+                sortingEnabled = true,
+                name = "InstalledAssetsList",
+                scrollView = { verticalScrollerVisibility = ScrollerVisibility.Auto},
+                selectionType = SelectionType.None,
+                itemsSource = Array.Empty<Asset>(),
+                columns = { reorderable = false }
+            };
+            Add(m_ListView);
+            AddColumnsAndRestoreSorting();
+
+            m_ListView.columnSortingChanged += OnColumnSortingChanged;
+        }
+
+        public override void Refresh(IPackageVersion version)
+        {
+            SortAssetsAndRefreshItems(version.importedAssets);
+        }
+
+        private void AddColumnsAndRestoreSorting()
+        {
+            var columns = new Column[3];
+            columns[k_LabelColumnId] = new Column
+            {
+                name = "label",
+                makeHeader = () => new Label
+                {
+                    name = "columnHeader",
+                    text = k_LabelColumnTitle,
+                    tooltip = k_LabelColumnTitle
+                },
+                makeCell = () =>
+                {
+                    var ve = new VisualElement { name = "iconAndLabelContainer" };
+                    ve.Add(new Image());
+                    ve.Add(new Label());
+                    return ve;
+                },
+                bindCell = (ve, index) =>
+                {
+                    var image = ve.Q<Image>();
+                    image.image = InternalEditorUtility.GetIconForFile(assets[index].importedPath);
+                    var label = ve.Q<Label>();
+                    var labelText = m_IOProxy.GetFileName(assets[index].importedPath);
+                    label.text = labelText;
+                    ve.tooltip = labelText;
+                },
+                stretchable = true,
+                minWidth = k_MinColumnWidth
+            };
+
+            columns[k_LocationColumnId] = new Column
+            {
+                name = "location",
+                makeHeader = () => new Label
+                {
+                    name = "columnHeader",
+                    text = k_LocationColumnTitle,
+                    tooltip = k_LocationColumnTitle
+                },
+                bindCell = (ve, index) =>
+                {
+                    ((Label)ve).text = m_IOProxy.GetParentDirectory(assets[index].importedPath);
+                },
+                stretchable = true,
+                minWidth = k_MinColumnWidth
+            };
+
+            columns[k_VersionColumnId] = new Column
+            {
+                name = "version",
+                makeHeader = () => new Label
+                {
+                    name = "columnHeader",
+                    text = k_VersionColumnTitle,
+                    tooltip = k_VersionColumnTitle
+                },
+                bindCell = (ve, index) =>
+                {
+                    var versionString = assets[index].origin.packageVersion;
+                    if (!string.IsNullOrEmpty(versionString))
+                    {
+                        ((Label)ve).text = versionString;
+                        ve.tooltip = string.Empty;
+                    }
+                    else
+                    {
+                        ((Label)ve).text = "-";
+                        ve.tooltip = L10n.Tr("This asset's version is unknown because it was imported with an older version of Unity. For accurate version tracking, import the asset again or update it.");
+                    }
+
+                },
+                stretchable = true,
+                resizable = false,
+                minWidth = k_MinColumnWidth
+            };
+
+            foreach (var column in columns)
+                m_ListView.columns.Add(column);
+
+            foreach (var column in m_PackageManagerPrefs.importedAssetsSortedColumns)
+                m_ListView.sortColumnDescriptions.Add(new SortColumnDescription(column.columnIndex, column.sortDirection));
+        }
+
+        private void OnColumnSortingChanged()
+        {
+            m_PackageManagerPrefs.importedAssetsSortedColumns = m_ListView.sortedColumns.Select(c => new SortedColumn(c)).ToArray();
+            SortAssetsAndRefreshItems(assets);
+        }
+
+        private void SortAssetsAndRefreshItems(IEnumerable<Asset> assets)
+        {
+            if (m_ListView.sortedColumns?.Any() != true)
+                m_ListView.itemsSource = assets != null ? assets.ToArray() : Array.Empty<Asset>();
+            else
+                m_ListView.itemsSource = assets.OrderBy(a => a, new AssetComparer(m_IOProxy, m_ListView.sortedColumns)).ToArray();
+
+            m_ListView.RefreshItems();
+        }
+
+        public void RecalculateTabHeight(float detailHeight, float scrollViewHeight, float detailsHeaderHeight, float tabViewHeaderContainerHeight, float customContainerHeight, float extensionContainerHeight)
+        {
+            if (!UIUtils.IsElementVisible(this))
+                return;
+            var headerTotalHeight = detailsHeaderHeight + tabViewHeaderContainerHeight + customContainerHeight + extensionContainerHeight;
+            var leftOverHeight = detailHeight - headerTotalHeight - layout.height;
+            style.height = scrollViewHeight -  headerTotalHeight - leftOverHeight;
+        }
+
+        private class AssetComparer : IComparer<Asset>
+        {
+            private IEnumerable<SortColumnDescription> m_SortColumnDescriptions;
+            private IOProxy m_IOProxy;
+
+            public AssetComparer(IOProxy ioProxy, IEnumerable<SortColumnDescription> sortColumnDescriptions)
+            {
+                m_SortColumnDescriptions = sortColumnDescriptions;
+                m_IOProxy = ioProxy;
+            }
+
+            public int Compare(Asset x, Asset y)
+            {
+                return m_SortColumnDescriptions.Select(c => CompareByColumn(c, x, y)).FirstOrDefault(result => result != 0);
+            }
+
+            private int CompareByColumn(SortColumnDescription description, Asset x, Asset y)
+            {
+                var result = 0;
+                if (description.column.index == k_LabelColumnId)
+                    result = string.Compare(m_IOProxy.GetFileName(x.importedPath), m_IOProxy.GetFileName(y.importedPath));
+                else if (description.column.index == k_LocationColumnId)
+                    result = string.Compare(m_IOProxy.GetParentDirectory(x.importedPath), m_IOProxy.GetParentDirectory(y.importedPath));
+                else
+                    result = string.Compare(x.origin.packageVersion, y.origin.packageVersion);
+
+                return description.direction == SortDirection.Ascending ? result : -result;
+            }
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsOverviewTabContent.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsOverviewTabContent.cs
index be1727be98..bc0dd00965 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsOverviewTabContent.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsOverviewTabContent.cs
@@ -72,7 +72,7 @@ private void RefreshSizeInfo(IPackageVersion version)
 
         private void RefreshPurchasedDate(IPackageVersion version)
         {
-            detailPurchasedDate.SetValueWithoutNotify(version.package.product.purchasedTime?.ToString("MMMM dd, yyyy", CultureInfo.CreateSpecificCulture("en-US")) ?? string.Empty);
+            detailPurchasedDate.SetValueWithoutNotify(version.package.product?.purchasedTime?.ToString("MMMM dd, yyyy", CultureInfo.CreateSpecificCulture("en-US")) ?? string.Empty);
             UIUtils.SetElementDisplay(detailPurchasedDateContainer, !string.IsNullOrEmpty(detailPurchasedDate.text));
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionHistoryItem.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionHistoryItem.cs
index 2425a9eeac..92c13c8f9f 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionHistoryItem.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionHistoryItem.cs
@@ -79,7 +79,7 @@ public void StopSpinner()
         private void VersionHistoryItemChangeLogClicked()
         {
             var packageInfo = m_Version != null ? m_UpmCache.GetBestMatchPackageInfo(m_Version.name, m_Version.isInstalled, m_Version.versionString) : null;
-            var isUnityPackage = m_Version?.isUnityPackage == true;
+            var isUnityPackage = m_Version?.HasTag(PackageTag.Unity) == true;
             UpmPackageDocs.ViewUrl(UpmPackageDocs.GetChangelogUrl(packageInfo, isUnityPackage), UpmPackageDocs.GetOfflineChangelog(m_IOProxy, packageInfo), L10n.Tr("changelog"), "viewChangelog", m_Version, m_Version.package, m_ApplicationProxy);
         }
 
@@ -97,7 +97,7 @@ private void Refresh(bool multipleVersionsVisible, bool isLatestVersion)
 
         private void RefreshHeader(bool multipleVersionsVisible, bool isLatestVersion)
         {
-            versionHistoryItemToggle.text = m_Version?.version?.ToString() ?? m_Version?.versionString;
+            versionHistoryItemToggle.text = m_Version?.versionString;
             m_VersionHistoryItemTag.Refresh(m_Version);
 
             RefreshState(multipleVersionsVisible, isLatestVersion);
@@ -120,16 +120,16 @@ private void RefreshState(bool multipleVersionsVisible, bool isLatestVersion)
             {
                 if (m_Version.isInstalled)
                     stateText = L10n.Tr(m_Version.isDirectDependency ? "Installed" : "Installed as dependency");
-                else if (m_Version == recommended && multipleVersionsVisible && m_Version.isUnityPackage)
+                else if (m_Version == recommended && multipleVersionsVisible && m_Version.HasTag(PackageTag.Unity))
                     stateText = L10n.Tr("Recommended");
-                else if (!m_Version.isUnityPackage && multipleVersionsVisible && isLatestVersion)
+                else if (!m_Version.HasTag(PackageTag.Unity) && multipleVersionsVisible && isLatestVersion)
                     stateText = L10n.Tr("Latest");
             }
             else if (versionInManifest == m_Version.versionString)
                 stateText = L10n.Tr("Requested");
-            else if (m_Version == recommended && m_Version.isUnityPackage)
+            else if (m_Version == recommended && m_Version.HasTag(PackageTag.Unity))
                 stateText = L10n.Tr("Recommended");
-            else if ((primary.isInstalled || !m_Version.isUnityPackage) && isLatestVersion)
+            else if ((primary.isInstalled || !m_Version.HasTag(PackageTag.Unity)) && isLatestVersion)
                 stateText = L10n.Tr("Latest");
 
             versionHistoryItemState.text = stateText;
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionsTab.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionsTab.cs
index da98ef4bad..3c11ac073c 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionsTab.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionsTab.cs
@@ -109,7 +109,7 @@ public override void Refresh(IPackageVersion version)
                 return;
             }
 
-            var seeVersionsToolbar = versions.numUnloadedVersions > 0 && (m_Version.HasTag(PackageTag.ScopedRegistry) || m_SettingsProxy.seeAllPackageVersions || m_Version.package.versions.installed?.HasTag(PackageTag.Experimental) == true);
+            var seeVersionsToolbar = versions.numUnloadedVersions > 0 && (m_SettingsProxy.seeAllPackageVersions || m_Version.availableRegistry != RegistryType.UnityRegistry || m_Version.package.versions.installed?.HasTag(PackageTag.Experimental) == true);
             UIUtils.SetElementDisplay(m_VersionsToolbar, seeVersionsToolbar);
 
             var latestVersion = m_Version.package?.versions.latest;
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/SortedColumn.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/SortedColumn.cs
new file mode 100644
index 0000000000..cddb46a871
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/SortedColumn.cs
@@ -0,0 +1,29 @@
+// 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;
+
+// This class is being used to replace the SortColumnDescription class that is owned by UIToolkit. We need it to be serialized
+// to keep the sorting in the imported assets tab through domain reload
+[Serializable]
+internal class SortedColumn
+{
+    public int columnIndex;
+    public SortDirection sortDirection;
+
+    public SortedColumn(int columnIndex, SortDirection sortDirection)
+    {
+        this.columnIndex = columnIndex;
+        this.sortDirection = sortDirection;
+    }
+
+    public SortedColumn(SortColumnDescription sortColumnDescription)
+    {
+        columnIndex = sortColumnDescription.column.index;
+        sortDirection = sortColumnDescription.direction;
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageItem.cs b/Modules/PackageManagerUI/Editor/UI/PackageItem.cs
index 8c40261a82..faf5480b36 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageItem.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageItem.cs
@@ -326,6 +326,7 @@ private void StopSpinner()
             L10n.Tr("This {0} is installed."),
             L10n.Tr("This {0} is available for download."),
             L10n.Tr("This {0} is available for import."),
+            L10n.Tr("There are assets in your project that are imported from this {0}."),
             L10n.Tr("This {0} is in development."),
             L10n.Tr("A newer version of this {0} is available."),
             "",
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageList.cs b/Modules/PackageManagerUI/Editor/UI/PackageList.cs
index ade44dd0a1..644c2b4251 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageList.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageList.cs
@@ -257,6 +257,12 @@ private void HideEmptyAreaShowList(bool skipListRebuild)
             UIUtils.SetElementDisplay(scrollView, scrollView == currentView);
 
             packageLoadBar.UpdateVisibility();
+
+            var page = m_PageManager.GetPage();
+            var selection = page.GetSelection();
+            if (!selection.Any() && selection.previousSelections.Any())
+                page.SetNewSelection(selection.previousSelections);
+
             if (rebuild)
                 currentView.OnListRebuild(m_PageManager.GetPage());
         }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageListScrollView.cs b/Modules/PackageManagerUI/Editor/UI/PackageListScrollView.cs
index 8b29a90c66..19e039410c 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageListScrollView.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageListScrollView.cs
@@ -408,12 +408,19 @@ public void OnKeyDownShortcut(KeyDownEvent evt)
             if (!UIUtils.IsElementVisible(this))
                 return;
 
-            if (evt.keyCode == KeyCode.A && evt.actionKey)
+            switch (evt.keyCode)
             {
-                SelectAllVisible();
+                case KeyCode.A when evt.actionKey:
+                    SelectAllVisible();
+                    evt.StopPropagation();
+                    break;
+                // On mac moving up and down will trigger the sound of an incorrect key being pressed
+                // This should be fixed in UUM-26264 by the UIToolkit team
+                case KeyCode.DownArrow:
+                case KeyCode.UpArrow:
+                    evt.StopPropagation();
+                    break;
             }
-
-            evt.StopPropagation();
         }
 
         public void OnNavigationMoveShortcut(NavigationMoveEvent evt)
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageListView.cs b/Modules/PackageManagerUI/Editor/UI/PackageListView.cs
index 1fba98baf9..e0f8f3e043 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageListView.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageListView.cs
@@ -247,22 +247,30 @@ public void OnKeyDownShortcut(KeyDownEvent evt)
             {
                 case KeyCode.A when evt.actionKey:
                     SelectAll();
+                    evt.StopPropagation();
                     break;
                 case KeyCode.PageUp:
                     if (!selectedIndices.Any()) return;
                     index = Mathf.Max(0, selectedIndices.Max() - (virtualizationController.visibleItemCount - 1));
                     HandleSelectionAndScroll(index, evt.shiftKey);
+                    evt.StopPropagation();
                     break;
                 case KeyCode.PageDown:
                     if (!selectedIndices.Any()) return;
                     index = Mathf.Min(viewController.itemsSource.Count - 1,
                         selectedIndices.Max() + (virtualizationController.visibleItemCount - 1));
                     HandleSelectionAndScroll(index, evt.shiftKey);
+                    evt.StopPropagation();
+                    break;
+                // On mac moving up and down will trigger the sound of an incorrect key being pressed
+                // This should be fixed in UUM-26264 by the UIToolkit team
+                case KeyCode.DownArrow:
+                case KeyCode.UpArrow:
+                    evt.StopPropagation();
                     break;
             }
 
             Focus();
-            evt.StopPropagation();
         }
 
         public void OnNavigationMoveShortcut(NavigationMoveEvent evt)
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageManagerPrefs.cs b/Modules/PackageManagerUI/Editor/UI/PackageManagerPrefs.cs
index 9e579322d0..bb76436805 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageManagerPrefs.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageManagerPrefs.cs
@@ -18,8 +18,8 @@ internal class PackageManagerPrefs
         private const string k_SplitterFlexGrowPrefs = "PackageManager.SplitterFlexGrowPrefs";
         private const string k_LastUsedFilterPrefsPrefix = "PackageManager.Filter_";
 
-        public virtual event Action<PackageFilterTab> onFilterTabChanged = delegate { };
-        public virtual event Action<string> onTrimmedSearchTextChanged = delegate { };
+        public virtual event Action<PackageFilterTab> onFilterTabChanged = delegate {};
+        public virtual event Action<string> onTrimmedSearchTextChanged = delegate {};
 
         public const PackageFilterTab k_DefaultFilterTab = PackageFilterTab.InProject;
         public const int k_DefaultPageSize = 25;
@@ -189,6 +189,15 @@ public string selectedPackageDetailsTabIdentifier
             set => m_SelectedPackageDetailsTabIdentifier = value;
         }
 
+        [SerializeField]
+        private SortedColumn[] m_ImportedAssetsSortedColumns = Array.Empty<SortedColumn>();
+
+        public virtual SortedColumn[] importedAssetsSortedColumns
+        {
+            get => m_ImportedAssetsSortedColumns;
+            set => m_ImportedAssetsSortedColumns = value ?? Array.Empty<SortedColumn>();
+        }
+
         [SerializeField]
         private List<string> m_ExpandedDetailsExtensions = new List<string>();
         public virtual bool IsDetailsExtensionExpanded(string extensionTitle)
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageManagerToolbar.cs b/Modules/PackageManagerUI/Editor/UI/PackageManagerToolbar.cs
index b03e37033f..c1631d6dbf 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageManagerToolbar.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageManagerToolbar.cs
@@ -122,10 +122,10 @@ private void OnPackagesChanged(PackagesChangeArgs args)
             {
                 // We can skip the whole database scan to save some time if non of the packages changed are related to scoped registry
                 // Note that we also check `preUpdate` to catch the cases where packages are move from ScopedRegistry to UnityRegistry
-                if (!args.added.Concat(args.removed).Concat(args.updated).Concat(args.preUpdate).Any(p => p.versions.primary.HasTag(PackageTag.ScopedRegistry)))
+                if (!args.added.Concat(args.removed).Concat(args.updated).Concat(args.preUpdate).Any(p => p.versions.primary.availableRegistry == RegistryType.MyRegistries))
                     return;
 
-                if (!m_PackageDatabase.allPackages.Any(p => p.versions.primary.HasTag(PackageTag.ScopedRegistry)))
+                if (!m_PackageDatabase.allPackages.Any(p => p.versions.primary.availableRegistry == RegistryType.MyRegistries))
                     SetFilter(PackageFilterTab.UnityRegistry);
             }
 
@@ -405,6 +405,9 @@ private void SetupAddMenu()
                     },
                     windowSize = new Vector2(resolvedStyle.width, 50)
                 };
+                // If a background GUI painted before, the coordinates got could be different. 
+                // Repaint the package manager to ensure the coordinates retrieved is from packmanager. 
+                PackageManagerWindow.GetWindow<PackageManagerWindow>().RepaintImmediately();
                 addMenu.ShowInputDropdown(args);
             };
 
@@ -413,6 +416,9 @@ private void SetupAddMenu()
             dropdownItem.userData = "AddByName";
             dropdownItem.action = () =>
             {
+                // If a background GUI painted before, the coordinates got could be different. 
+                // Repaint the package manager to ensure the coordinates retrieved is from packmanager. 
+                PackageManagerWindow.GetWindow<PackageManagerWindow>().RepaintImmediately();
                 // Same as above, the worldBound of the toolbar is used rather than the addMenu
                 var rect = GUIUtility.GUIToScreenRect(worldBound);
                 var dropdown = new AddPackageByNameDropdown(m_ResourceLoader, m_PackageManagerPrefs, m_UpmClient, m_PackageDatabase, m_PageManager, PackageManagerWindow.instance) { position = rect };
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageManagerWindowRoot.cs b/Modules/PackageManagerUI/Editor/UI/PackageManagerWindowRoot.cs
index 8a45c55149..bc35a9fc26 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageManagerWindowRoot.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageManagerWindowRoot.cs
@@ -21,6 +21,9 @@ internal class PackageManagerWindowRoot : VisualElement, IWindow
 
         private string m_SubPageToSelectAfterLoad;
 
+        private const string k_SelectedInInspectorClassName = "selectedInInspector";
+        public const string k_FocusedClassName = "focus";
+
         private ResourceLoader m_ResourceLoader;
         private ExtensionManager m_ExtensionManager;
         private SelectionProxy m_Selection;
@@ -33,6 +36,7 @@ internal class PackageManagerWindowRoot : VisualElement, IWindow
         private UpmClient m_UpmClient;
         private AssetStoreCachePathProxy m_AssetStoreCachePathProxy;
         private PageRefreshHandler m_PageRefreshHandler;
+
         private void ResolveDependencies(ResourceLoader resourceLoader,
             ExtensionManager extensionManager,
             SelectionProxy selection,
@@ -307,20 +311,20 @@ void OnFilterTabChangedSelectSubPage(PackageFilterTab filterTab)
 
         public void OnFocus()
         {
-            AddToClassList("focus");
+            AddToClassList(k_FocusedClassName);
         }
 
         public void OnLostFocus()
         {
-            RemoveFromClassList("focus");
+            RemoveFromClassList(k_FocusedClassName);
         }
 
         private void RefreshSelectedInInspectorClass()
         {
             if (m_Selection.activeObject is PackageSelectionObject)
-                AddToClassList("selectedInInspector");
+                AddToClassList(k_SelectedInInspectorClassName);
             else
-                RemoveFromClassList("selectedInInspector");
+                RemoveFromClassList(k_SelectedInInspectorClassName);
         }
 
         public void SelectFilterSubPage(string filterTabOrSubPage = "")
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageManifestImporterEditor.cs b/Modules/PackageManagerUI/Editor/UI/PackageManifestImporterEditor.cs
index 8dc29bc20b..e6b8527e49 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageManifestImporterEditor.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageManifestImporterEditor.cs
@@ -198,6 +198,9 @@ public override void OnEnable()
         {
             base.OnEnable();
 
+            //Ensure UIElements handles the IMGUI container with margins
+            alwaysAllowExpansion = true;
+
             errorMessages = new List<string>();
             warningMessages = new List<string>();
 
@@ -261,7 +264,7 @@ private void DrawDependencyListElement(Rect rect, int index, bool isActive, bool
                 rect.width = w / 3 * 2 - 2;
             }
             rect.height -= EditorGUIUtility.standardVerticalSpacing;
-            packageName.stringValue = EditorGUI.DelayedTextField(rect, packageName.stringValue);
+            packageName.stringValue = EditorGUI.TextField(rect, packageName.stringValue);
 
             if (!string.IsNullOrWhiteSpace(packageName.stringValue) && !PackageValidation.ValidateName(packageName.stringValue))
                 errorMessages.Add($"Invalid Dependency Package Name '{packageName.stringValue}'");
@@ -273,7 +276,7 @@ private void DrawDependencyListElement(Rect rect, int index, bool isActive, bool
             {
                 rect.x += w / 3 * 2;
                 rect.width = w / 3 - 4;
-                version.stringValue = EditorGUI.DelayedTextField(rect, version.stringValue);
+                version.stringValue = EditorGUI.TextField(rect, version.stringValue);
 
                 if (!string.IsNullOrWhiteSpace(version.stringValue))
                     ValidateVersion(packageName.stringValue, version.stringValue, errorMessages, warningMessages);
@@ -311,10 +314,10 @@ private void DoPackageInformationLayout()
         {
             using (new EditorGUILayout.VerticalScope(GUI.skin.box, GUILayout.ExpandWidth(true)))
             {
-                EditorGUILayout.DelayedTextField(m_Name, Styles.name);
-                m_OrganizationName.stringValue = EditorGUILayout.DelayedTextFieldDropDown(Styles.organizationName, m_OrganizationName.stringValue.ToLower(), Connect.UnityConnect.instance.userInfo.organizationNames);
-                EditorGUILayout.DelayedTextField(m_DisplayName, Styles.displayName);
-                EditorGUILayout.DelayedTextField(m_Version, Styles.version);
+                EditorGUILayout.PropertyField(m_Name, Styles.name);
+                m_OrganizationName.stringValue = EditorGUILayout.TextFieldDropDown(Styles.organizationName, m_OrganizationName.stringValue.ToLower(), Connect.UnityConnect.instance.userInfo.organizationNames);
+                EditorGUILayout.PropertyField(m_DisplayName, Styles.displayName);
+                EditorGUILayout.PropertyField(m_Version, Styles.version);
 
                 if (isFeatureSet)
                     return;
@@ -323,33 +326,50 @@ private void DoPackageInformationLayout()
                 if (m_UnityVersionEnabled.boolValue)
                 {
                     EditorGUI.showMixedValue = m_UnityMajor.hasMultipleDifferentValues;
-                    m_UnityMajor.stringValue = EditorGUILayout.DelayedTextFieldDropDown(Styles.unityMajor,
+                    m_UnityMajor.stringValue = EditorGUILayout.TextFieldDropDown(Styles.unityMajor,
                         m_UnityMajor.stringValue, MajorUnityVersions.ToArray());
 
                     EditorGUI.showMixedValue = m_UnityMinor.hasMultipleDifferentValues;
-                    m_UnityMinor.stringValue = EditorGUILayout.DelayedTextFieldDropDown(Styles.unityMinor,
+                    m_UnityMinor.stringValue = EditorGUILayout.TextFieldDropDown(Styles.unityMinor,
                         m_UnityMinor.stringValue, MinorUnityVersions.ToArray());
 
                     EditorGUI.showMixedValue = m_UnityRelease.hasMultipleDifferentValues;
                     m_UnityRelease.stringValue =
-                        EditorGUILayout.DelayedTextField(Styles.unityRelease, m_UnityRelease.stringValue);
+                        EditorGUILayout.TextField(Styles.unityRelease, m_UnityRelease.stringValue);
                     EditorGUI.showMixedValue = false;
                 }
             }
         }
 
+        private void DoPackageDescriptionLabel()
+        {
+            var descriptionStyle = EditorStyles.textArea;
+            var description = m_Description.stringValue ?? "";
+            var descriptionRect = GUILayoutUtility.GetRect(EditorGUIUtility.TempContent(description), descriptionStyle, GUILayout.ExpandHeight(true), GUILayout.ExpandWidth(true));
+            EditorGUI.SelectableLabel(descriptionRect, description, descriptionStyle);
+        }
+
         private void DoPackageDescriptionLayout()
         {
+            var previousEnabled = GUI.enabled;
+            GUI.enabled = true;
+
             using (new EditorGUILayout.VerticalScope(GUI.skin.box, GUILayout.ExpandWidth(true)))
             {
-                using (var scrollView = new EditorGUILayout.VerticalScrollViewScope(descriptionScrollViewPosition,
-                    GUILayout.MinHeight(kMinHeightDescriptionScrollView)))
+                using (var scrollView = new EditorGUILayout.VerticalScrollViewScope(descriptionScrollViewPosition, GUILayout.MinHeight(kMinHeightDescriptionScrollView)))
                 {
                     descriptionScrollViewPosition = scrollView.scrollPosition;
-                    m_Description.stringValue = EditorGUILayout.TextArea(m_Description.stringValue ?? "" ,
+
+                    // We want to have text we can edit instead of selectable label when it's in Edit mode
+                    if (previousEnabled == true)
+                        m_Description.stringValue = EditorGUILayout.TextArea(m_Description.stringValue ?? "",
                         GUILayout.ExpandHeight(true), GUILayout.ExpandWidth(true));
+                    else
+                        DoPackageDescriptionLabel();
                 }
             }
+
+            GUI.enabled = previousEnabled;
         }
 
         private void PerformValidation()
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageSelectionEditor.cs b/Modules/PackageManagerUI/Editor/UI/PackageSelectionEditor.cs
index 3be86e4c06..6c3fb577e2 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageSelectionEditor.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageSelectionEditor.cs
@@ -133,7 +133,7 @@ public override void OnInspectorGUI()
 
                 var immutable = true;
                 m_ShouldBeEnabled = true;
-                if (!m_Version.isInstalled || m_AssetDatabase.GetAssetFolderInfo("Packages/" + m_Package.name, out var rootFolder, out immutable))
+                if (!m_Version.isInstalled || m_AssetDatabase.TryGetAssetFolderInfo("Packages/" + m_Package.name, out var rootFolder, out immutable))
                     m_ShouldBeEnabled = !immutable;
             }
 
@@ -148,7 +148,7 @@ public override void OnInspectorGUI()
             };
 
             var previousEnabled = GUI.enabled;
-            GUI.enabled = m_ShouldBeEnabled;
+            GUI.enabled = true;
 
             // Package information
             GUILayout.Label(Styles.information, EditorStyles.boldLabel);
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageStatusBar.cs b/Modules/PackageManagerUI/Editor/UI/PackageStatusBar.cs
index b811c2f6ba..697ea17d19 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageStatusBar.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageStatusBar.cs
@@ -91,7 +91,6 @@ public void DisableRefresh()
 
         private void OnInternetReachabilityChange(bool value)
         {
-            refreshButton.SetEnabled(value);
             UpdateStatusMessage();
         }
 
@@ -151,7 +150,7 @@ private void SetStatusMessage(StatusType status, string message)
             if (status == StatusType.Loading)
             {
                 loadingSpinner.Start();
-                UIUtils.SetElementDisplay(refreshButton,false);
+                UIUtils.SetElementDisplay(refreshButton, false);
             }
             else
             {
@@ -189,7 +188,7 @@ private void RefreshCheckUpdateMenuOption(PackageFilterTab tab)
                 menu.AppendAction(L10n.Tr("Check for updates"), a =>
                 {
                     m_AssetStoreCallQueue.ForceCheckUpdateForAllLocalInfos();
-                },action => m_AssetStoreCallQueue.isCheckUpdateInProgress ? DropdownMenuAction.Status.Disabled : DropdownMenuAction.Status.Normal);
+                }, action => m_AssetStoreCallQueue.isCheckUpdateInProgress ? DropdownMenuAction.Status.Disabled : DropdownMenuAction.Status.Normal);
                 refreshButton.menu = menu;
             }
             else
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageAssetStoreTagLabel.cs b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageAssetStoreTagLabel.cs
index 29615b582b..06dfef6ff0 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageAssetStoreTagLabel.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageAssetStoreTagLabel.cs
@@ -11,7 +11,7 @@ internal class PackageAssetStoreTagLabel : PackageBaseTagLabel
         public PackageAssetStoreTagLabel()
         {
             name = "tagAssetStore";
-            text = L10n.Tr("asset store");
+            text = L10n.Tr("Asset Store");
         }
 
         public override void Refresh(IPackageVersion version)
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageDeprecatedTagLabel.cs b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageDeprecatedTagLabel.cs
index 67eb8e052c..5a68e5afa8 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageDeprecatedTagLabel.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageDeprecatedTagLabel.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.UIElements;
-
 namespace UnityEditor.PackageManager.UI.Internal
 {
     internal class PackageDeprecatedTagLabel : PackageBaseTagLabel
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageDynamicTagLabel.cs b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageDynamicTagLabel.cs
index 6d724592a6..26a75ea585 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageDynamicTagLabel.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageDynamicTagLabel.cs
@@ -36,6 +36,14 @@ private void UpdateTag(PackageTag newTag)
                     text = L10n.Tr("Custom");
                     tooltip = string.Empty;
                     break;
+                case PackageTag.Local:
+                    text = L10n.Tr("Local");
+                    tooltip = string.Empty;
+                    break;
+                case PackageTag.Git:
+                    text = L10n.Tr("Git");
+                    tooltip = string.Empty;
+                    break;
                 case PackageTag.Deprecated:
                     text = L10n.Tr("D");
                     tooltip = L10n.Tr("Deprecated");
@@ -70,6 +78,10 @@ public override void Refresh(IPackageVersion version)
                 UpdateTag(PackageTag.None);
             else if (version.HasTag(PackageTag.Custom))
                 UpdateTag(PackageTag.Custom);
+            else if (version.HasTag(PackageTag.Local))
+                UpdateTag(PackageTag.Local);
+            else if (version.HasTag(PackageTag.Git))
+                UpdateTag(PackageTag.Git);
             else if (version.HasTag(PackageTag.Deprecated))
                 // We don't want to see the Deprecated tag in the packageItem, but we also want to hide any other tags
                 UpdateTag(m_IsVersionItem ? PackageTag.Deprecated : PackageTag.None);
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageScopedRegistryTagLabel.cs b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageScopedRegistryTagLabel.cs
index f237ea73bc..58f4c8f044 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageScopedRegistryTagLabel.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageScopedRegistryTagLabel.cs
@@ -15,7 +15,7 @@ public PackageScopedRegistryTagLabel()
 
         private bool IsVisible(IPackageVersion version)
         {
-            return (version as UpmPackageVersion)?.isUnityPackage == false && !string.IsNullOrEmpty(version.version?.Prerelease);
+            return (version as UpmPackageVersion)?.HasTag(PackageTag.Unity) == false && !string.IsNullOrEmpty(version.version?.Prerelease);
         }
 
         public override void Refresh(IPackageVersion version)
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageSimpleTagLabel.cs b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageSimpleTagLabel.cs
index 7bae16e8c2..68e2bf3ff1 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageSimpleTagLabel.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel/PackageSimpleTagLabel.cs
@@ -12,7 +12,7 @@ internal class PackageSimpleTagLabel : PackageBaseTagLabel
         public PackageSimpleTagLabel(PackageTag tag, string text)
         {
             m_Tag = tag;
-            name = "tag" + tag.ToString();
+            name = "tag" + tag;
             this.text = text;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ScopedRegistriesSettings.cs b/Modules/PackageManagerUI/Editor/UI/ScopedRegistriesSettings.cs
index 765bad5a3f..1047c27510 100644
--- a/Modules/PackageManagerUI/Editor/UI/ScopedRegistriesSettings.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ScopedRegistriesSettings.cs
@@ -57,7 +57,7 @@ public ScopedRegistriesSettings()
 
             scopedRegistriesInfoBox.Q<Button>().clickable.clicked += () =>
             {
-                m_ApplicationProxy.OpenURL($"https://docs.unity3d.com/{m_ApplicationProxy.shortUnityVersion}/Documentation/Manual/upm-scoped.html");
+                m_ApplicationProxy.OpenURL($"https://docs.unity3d.com/{m_ApplicationProxy.shortUnityVersion}/Documentation/Manual/upm-scoped.html#security");
             };
             applyRegistriesButton.clickable.clicked += ApplyChanges;
             revertRegistriesButton.clickable.clicked += RevertChanges;
diff --git a/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindow.cs b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindow.cs
new file mode 100644
index 0000000000..ede4210652
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindow.cs
@@ -0,0 +1,64 @@
+// 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.PackageManager.UI.Internal;
+
+internal class SelectionWindow : EditorWindow
+{
+    public static void Open(SelectionWindowData data)
+    {
+        var window = GetWindow<SelectionWindow>(true, data.actionLabel);
+        window.SetData(data);
+        window.minSize = new Vector2(415, 250);
+        window.Show();
+    }
+
+    public static event Action<IEnumerable<Asset>> onRemoveSelectionDone = delegate {};
+
+    private SelectionWindowRoot m_Root;
+    private bool m_SelectionCompleted;
+
+    [SerializeField]
+    private SelectionWindowData m_Data;
+
+    public void OnEnable()
+    {
+        var container = ServicesContainer.instance;
+        m_Root = new SelectionWindowRoot(container.Resolve<ResourceLoader>(), container.Resolve<ApplicationProxy>());
+        m_Root.onSelectionCompleted += OnSelectionCompleted;
+        rootVisualElement.Add(m_Root);
+
+        if (m_Data != null)
+            m_Root.SetData(m_Data, false);
+    }
+
+    internal void SetData(SelectionWindowData data)
+    {
+        // We're storing a reference to "data" because we need to serialize it for domain reload.
+        m_Data = data;
+        m_SelectionCompleted = false;
+        m_Root.SetData(m_Data, true);
+    }
+
+    public void OnDestroy()
+    {
+        // This function is called every time the window is closed, whether user clicks confirm, cancel or force quit (i.e. clicking the X button or ALT+F4).
+        // In the case when user's force quit the window, m_SelectionCompleted will be false and onRemoveSelectionDone will not have been called yet.
+        // This is a special handling to catch that case.
+        if (!m_SelectionCompleted)
+            onRemoveSelectionDone?.Invoke(Enumerable.Empty<Asset>());
+    }
+
+    private void OnSelectionCompleted(IEnumerable<Asset> selections)
+    {
+        m_SelectionCompleted = true;
+        onRemoveSelectionDone?.Invoke(selections);
+        Close();
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowData.cs b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowData.cs
new file mode 100644
index 0000000000..7e986ba96c
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowData.cs
@@ -0,0 +1,193 @@
+// 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.PackageManager.UI.Internal;
+
+[Serializable]
+internal class SelectionWindowData : ISerializationCallbackReceiver
+{
+    private static readonly string k_RemoveText = L10n.Tr("Remove");
+
+    [Serializable]
+    internal class Node
+    {
+        public int parentIndex;
+        public int index;
+        public List<int> childIndexes = new();
+
+        public Asset asset;
+        public string name;
+        public bool isFolder;
+
+        public string path => asset?.importedPath;
+
+        public bool isMoved => !isFolder && asset != null && asset.importedPath != asset.origin.assetPath;
+    }
+
+    public string headerTitle;
+    public string headerDescription;
+    public string actionLabel;
+    public List<Node> nodes = new();
+
+    // This node is not created through the SelectionWindowData.CreateNode function, because we don't want it to be
+    // part of the final visible tree. We set the index to `-1` such that if it accidentally end up in the final tree,
+    // we will get an InvalidIndexException. This hidden node is only used when we construct trees.
+    public Node hiddenRootNode = new() { index = -1, parentIndex = -1};
+
+    private HashSet<int> m_SelectedIndexes = new();
+    [SerializeField]
+    private int[] m_SerializedSelectedIndexes = Array.Empty<int>();
+
+    public IEnumerable<Asset> selectedAssets => m_SelectedIndexes
+        .Where(index => !nodes[index].isFolder)
+        .Select(index => nodes[index].asset);
+
+    // This constructor only constructs an instance of SelectionWindowData for the remove case.
+    public SelectionWindowData(IEnumerable<Asset> assetsList, string packageName, string description)
+    {
+        headerTitle = packageName;
+        headerDescription = description;
+        actionLabel = k_RemoveText;
+
+        foreach (var asset in assetsList.OrderBy(a => a.importedPath))
+        {
+            // We don't support removing assets that are outside of the "Assets" folder.
+            // The only known case of that is when a .unitypackage injects a UPM package in the "Packages" folder.
+            // In that case, it will be handle as an embedded package.
+            if (!asset.importedPath.StartsWith("Assets/"))
+            {
+                Debug.Log($"[Package Manager Window] Cannot remove the asset at {asset.importedPath}: This asset is outside of the Assets folder.");
+                continue;
+            }
+
+            // Every imported assets with an AssetOrigin should be in the "Assets/" folder.
+            // We skip 1 because we don't want to show "Assets/" as the root node in the selection window.
+            var pathParts = asset.importedPath.Split('/').Skip(1).ToArray();
+
+            var currentNode = hiddenRootNode;
+            for (var i = 0; i < pathParts.Length; ++i)
+            {
+                var isLeafNode = i == pathParts.Length - 1;
+                var nodeToCreate = pathParts[i];
+                var matchingChildNode = GetChildren(currentNode).FirstOrDefault(c => c.name == nodeToCreate);
+
+                if (matchingChildNode == null)
+                {
+                    var newNode = isLeafNode ? AddFileNode(currentNode, asset, nodeToCreate) : AddFolderNode(currentNode, nodeToCreate);
+                    // Move one step down the tree to the newly created node.
+                    currentNode = newNode;
+                    continue;
+                }
+
+                // This handles the case where the package contains duplicate file paths.
+                // It should not be possible, but if it ever happens, it will be treated as if it was the same file.
+                if (isLeafNode)
+                    continue;
+
+                currentNode = matchingChildNode;
+            }
+        }
+    }
+
+    public void AddSelection(int id) => AddSelection(id, true, true);
+
+    private void AddSelection(int id, bool selectChildren, bool selectParent)
+    {
+        if (id < 0 || id >= nodes.Count)
+            return;
+        m_SelectedIndexes.Add(id);
+
+        var node = nodes[id];
+        if (selectChildren)
+            foreach (var childId in node.childIndexes)
+                AddSelection(childId, true, false);
+
+        if (selectParent)
+            AddSelection(node.parentIndex, false, true);
+    }
+
+    public void RemoveSelection(int id) => RemoveSelection(id, true, true);
+
+    private void RemoveSelection(int id, bool deselectChildren, bool refreshParentSelection)
+    {
+        if (id < 0 || id >= nodes.Count)
+            return;
+        m_SelectedIndexes.Remove(id);
+        var node = nodes[id];
+        if (deselectChildren)
+            foreach (var childId in node.childIndexes)
+                RemoveSelection(childId, true, false);
+
+        if (refreshParentSelection && AllChildrenAreDeselected(node.parentIndex))
+            RemoveSelection(node.parentIndex, false, true);
+    }
+
+    private bool AllChildrenAreDeselected(int id)
+    {
+        if (id < 0 || id >= nodes.Count)
+            return false;
+        return nodes[id].childIndexes.All(childId => !IsSelected(childId));
+    }
+
+    public bool IsSelected(int id) => m_SelectedIndexes.Contains(id);
+    public void ClearSelection() => m_SelectedIndexes.Clear();
+    public void SelectAll() => m_SelectedIndexes = nodes.Select(n => n.index).ToHashSet();
+
+    private Node AddNode(Node parentNode, string name)
+    {
+        var newNode = new Node
+        {
+            index = nodes.Count,
+            name = name,
+        };
+
+        nodes.Add(newNode);
+        m_SelectedIndexes.Add(newNode.index);
+        parentNode.childIndexes.Add(newNode.index);
+        newNode.parentIndex = parentNode.index;
+        return newNode;
+    }
+
+    private Node AddFileNode(Node parentNode, Asset asset, string name)
+    {
+        var node = AddNode(parentNode, name);
+        node.asset = asset;
+        return node;
+    }
+
+    private Node AddFolderNode(Node parentNode, string name)
+    {
+        var node = AddNode(parentNode, name);
+        node.asset = null;
+        node.isFolder = true;
+        return node;
+    }
+
+    public IEnumerable<Node> GetChildren(Node node, bool recursive = false)
+    {
+        foreach (var id in node.childIndexes)
+        {
+            yield return nodes[id];
+            if (!recursive)
+                continue;
+            foreach (var childNode in GetChildren(nodes[id], true))
+                yield return childNode;
+        }
+    }
+
+    public void OnBeforeSerialize()
+    {
+        m_SerializedSelectedIndexes = m_SelectedIndexes.ToArray();
+    }
+
+    public void OnAfterDeserialize()
+    {
+        m_SelectedIndexes = m_SerializedSelectedIndexes.ToHashSet();
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowFooter.cs b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowFooter.cs
new file mode 100644
index 0000000000..97eaf75554
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowFooter.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 UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal;
+
+internal class SelectionWindowFooter : VisualElement
+{
+    public event Action onAllButtonClicked = delegate {};
+    public event Action onNoneButtonClicked = delegate {};
+    public event Action onActionButtonClicked = delegate {};
+    public event Action onCancelButtonClicked = delegate {};
+
+    private Button m_ActionButton;
+
+    public SelectionWindowFooter()
+    {
+        var separator = new VisualElement { name = "separator", classList = { "separator" } };
+        Add(separator);
+
+        var footer = new VisualElement { name = "footer", classList = { "footer" } };
+        Add(footer);
+
+        var leftSection = new VisualElement { name = "leftSection", classList = { "left-section" } };
+        footer.Add(leftSection);
+
+        var allButton = new Button { name = "allButton", text = "All", tabIndex = -1, displayTooltipWhenElided = true };
+        allButton.clicked += () => onAllButtonClicked?.Invoke();
+        leftSection.Add(allButton);
+
+        var noneButton = new Button { name = "noneButton", text = "None", tabIndex = -1, displayTooltipWhenElided = true };
+        noneButton.clicked += () => onNoneButtonClicked?.Invoke();
+        leftSection.Add(noneButton);
+
+        var rightSection = new VisualElement { name = "rightSection", classList = { "right-section" } };
+        footer.Add(rightSection);
+
+        m_ActionButton = new Button { name = "actionButton", text = "Action", tabIndex = -1, displayTooltipWhenElided = true };
+        m_ActionButton.clicked += () => onActionButtonClicked?.Invoke();
+        rightSection.Add(m_ActionButton);
+
+        var cancelButton = new Button { name = "cancelButton", text = "Cancel", tabIndex = -1, displayTooltipWhenElided = true };
+        cancelButton.clicked += () => onCancelButtonClicked?.Invoke();
+        rightSection.Add(cancelButton);
+    }
+
+    public void SetData(string actionName)
+    {
+        m_ActionButton.text = actionName;
+    }
+
+    public void SetActionEnabled(bool isEnabled)
+    {
+        m_ActionButton.SetEnabled(isEnabled);
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowHeader.cs b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowHeader.cs
new file mode 100644
index 0000000000..35e8358487
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowHeader.cs
@@ -0,0 +1,48 @@
+// 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;
+
+namespace UnityEditor.PackageManager.UI.Internal;
+
+internal class SelectionWindowHeader : VisualElement
+{
+    private static Texture2D defaultHeaderIcon => EditorGUIUtility.FindTexture("UnityLogo");
+
+    private readonly Label m_Title;
+    private readonly Label m_Description;
+
+    public SelectionWindowHeader()
+    {
+        var header = new VisualElement { name = "header", classList = { "header" } };
+        Add(header);
+
+        var headerIcon = new VisualElement
+        {
+            name = "headerIcon",
+            classList = { "header-icon" },
+            style = { backgroundImage = new StyleBackground(defaultHeaderIcon) }
+        };
+        header.Add(headerIcon);
+
+        var headerText = new VisualElement { name = "headerText", classList = { "header-text" } };
+        header.Add(headerText);
+
+        m_Title = new Label { name = "title", text = "Title", tabIndex = -1, displayTooltipWhenElided = true };
+        headerText.Add(m_Title);
+
+        m_Description = new Label { name = "description", text = "description", tabIndex = -1, displayTooltipWhenElided = true };
+        headerText.Add(m_Description);
+
+        var separator = new VisualElement { name = "separator", classList = { "separator" } };
+        Add(separator);
+    }
+
+    public void SetData(string title, string description)
+    {
+        m_Title.text = title;
+        m_Description.text = description;
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowProxy.cs b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowProxy.cs
new file mode 100644
index 0000000000..a62d439c8f
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowProxy.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;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace UnityEditor.PackageManager.UI.Internal;
+
+[ExcludeFromCodeCoverage]
+internal class SelectionWindowProxy
+{
+    public event Action<IEnumerable<Asset>> onRemoveSelectionDone = delegate {};
+
+    public virtual void Open(SelectionWindowData data)
+    {
+        SelectionWindow.Open(data);
+    }
+
+    public void OnEnable()
+    {
+        SelectionWindow.onRemoveSelectionDone += OnRemoveSelectionDone;
+    }
+
+    public void OnDisable()
+    {
+        SelectionWindow.onRemoveSelectionDone -= OnRemoveSelectionDone;
+    }
+
+    private void OnRemoveSelectionDone(IEnumerable<Asset> selections)
+    {
+        onRemoveSelectionDone?.Invoke(selections);
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowRoot.cs b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowRoot.cs
new file mode 100644
index 0000000000..f38c538967
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowRoot.cs
@@ -0,0 +1,136 @@
+// 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.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal;
+
+internal class SelectionWindowRoot : VisualElement
+{
+    public event Action<IEnumerable<Asset>> onSelectionCompleted = delegate {};
+
+    private SelectionWindowData m_WindowData;
+
+    // The rows' height must be set in code, not in uss
+    private const int k_ItemHeight = 25;
+
+    private readonly SelectionWindowHeader m_Header;
+    private readonly SelectionWindowTreeView m_TreeView;
+    private readonly SelectionWindowFooter m_Footer;
+
+    private readonly ApplicationProxy m_ApplicationProxy;
+
+    public SelectionWindowRoot(ResourceLoader resourceLoader, ApplicationProxy applicationProxy)
+    {
+        m_ApplicationProxy = applicationProxy;
+
+        m_Header = new SelectionWindowHeader();
+        Add(m_Header);
+
+        m_TreeView = new SelectionWindowTreeView(k_ItemHeight, MakeItem, BindItem);
+        Add(m_TreeView);
+
+        m_Footer = new SelectionWindowFooter();
+        m_Footer.onAllButtonClicked += OnClickAll;
+        m_Footer.onNoneButtonClicked += OnClickNone;
+        m_Footer.onActionButtonClicked += OnAction;
+        m_Footer.onCancelButtonClicked += OnCancel;
+        Add(m_Footer);
+
+        styleSheets.Add(resourceLoader.selectionWindowStyleSheet);
+    }
+
+    public void SetData(SelectionWindowData data, bool resetExpansion)
+    {
+        m_WindowData = data;
+
+        m_Header.SetData(data.headerTitle, data.headerDescription);
+        m_TreeView.SetData(data, resetExpansion);
+        m_Footer.SetData(data.actionLabel);
+
+        RefreshItems();
+    }
+
+    private void RefreshItems()
+    {
+        m_TreeView.RefreshItems();
+        m_Footer.SetActionEnabled(m_WindowData.selectedAssets.Any());
+    }
+
+    private VisualElement MakeItem()
+    {
+        var rowElement = new SelectionWindowRow();
+        rowElement.toggle.RegisterValueChangedCallback(ToggleChanged);
+        return rowElement;
+    }
+
+    private void BindItem(VisualElement item, int index)
+    {
+        var selectionWindowRow = item as SelectionWindowRow;
+        if (selectionWindowRow == null)
+            return;
+
+        var node = m_TreeView.GetItemDataForIndex<SelectionWindowData.Node>(index);
+        selectionWindowRow.SetData(m_WindowData, node, m_TreeView.IsExpanded(node.index));
+    }
+
+    private void OnClickAll()
+    {
+        m_WindowData.SelectAll();
+        RefreshItems();
+    }
+
+    private void OnClickNone()
+    {
+        m_WindowData.ClearSelection();
+        RefreshItems();
+    }
+
+    private void OnCancel()
+    {
+        onSelectionCompleted?.Invoke(Array.Empty<Asset>()); // We consider an empty list as a cancellation.
+    }
+
+    private void OnAction()
+    {
+        if (!m_ApplicationProxy.DisplayDialog("removeImported", L10n.Tr("Removing imported assets"),
+                L10n.Tr("Remove the selected assets?\nAny changes you made to the assets will be lost."),
+                L10n.Tr("Remove"), L10n.Tr("Cancel")))
+            return;
+        onSelectionCompleted?.Invoke(m_WindowData.selectedAssets);
+    }
+
+    private void ToggleChanged(ChangeEvent<bool> evt)
+    {
+        var node = GetNodeFromElement(evt.currentTarget as VisualElement);
+        if (node == null)
+            return;
+
+        if (evt.newValue)
+        {
+            m_TreeView.ExpandItem(node.index, true);
+            m_WindowData.AddSelection(node.index);
+        }
+        else
+        {
+            m_WindowData.RemoveSelection(node.index);
+        }
+        RefreshItems();
+    }
+
+    private static SelectionWindowData.Node GetNodeFromElement(VisualElement element)
+    {
+        var parentElement = element?.parent;
+        while (parentElement != null)
+        {
+            if (parentElement is SelectionWindowRow)
+                return parentElement.userData as SelectionWindowData.Node;
+            parentElement = parentElement.parent;
+        }
+        return null;
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowRow.cs b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowRow.cs
new file mode 100644
index 0000000000..954393bcf1
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowRow.cs
@@ -0,0 +1,95 @@
+// 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 UnityEditor.Experimental;
+using UnityEditorInternal;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal;
+
+internal class SelectionWindowRow : VisualElement
+{
+    private static Texture2D s_FolderIcon;
+    internal static Texture2D folderIcon => s_FolderIcon ??= EditorGUIUtility.FindTexture(EditorResources.folderIconName);
+
+    private static readonly string k_RemoveIconTooltip = L10n.Tr("Remove");
+    internal static readonly string k_InfoLabel = L10n.Tr("moved");
+    internal static readonly string k_InfoLabelTooltip = L10n.Tr("This asset was moved. The original location is {0}.");
+
+    private readonly Label m_RemoveIcon;
+    private readonly Label m_InfoLabel;
+    private readonly Label m_NameLabel;
+    private readonly VisualElement m_FileIcon;
+    private readonly Toggle m_Toggle;
+    public Toggle toggle => m_Toggle;
+
+    public SelectionWindowRow()
+    {
+        var rowContainer = new VisualElement { classList = { "row-container" } };
+        Add(rowContainer);
+
+        var toggleRow = new VisualElement { classList = { "toggle-row" } };
+        rowContainer.Add(toggleRow);
+
+        m_Toggle = new Toggle { name = "toggle", classList = { "toggle" }, label = "Toggle" };
+        toggleRow.Add(m_Toggle);
+
+        m_NameLabel = m_Toggle.Q<Label>();
+        m_NameLabel.name = "name";
+
+        m_InfoLabel = new Label { name = "info", classList = { "text", "label" } };
+        m_Toggle.hierarchy.Insert(0, m_InfoLabel);
+
+        m_FileIcon = new VisualElement { name = "icon" };
+        m_Toggle.hierarchy.Insert(2, m_FileIcon);
+
+        var labels = new VisualElement { classList = { "labels" } };
+        rowContainer.Add(labels);
+
+        m_RemoveIcon = new Label { name = "remove", classList = { "icon", "label" }, tooltip = k_RemoveIconTooltip, displayTooltipWhenElided = true};
+        labels.Add(m_RemoveIcon);
+    }
+
+    public void SetData(SelectionWindowData windowData, SelectionWindowData.Node node, bool isExpanded)
+    {
+        userData = node;
+        var selected = windowData.IsSelected(node.index);
+
+        m_NameLabel.text = node.name;
+        m_Toggle.SetValueWithoutNotify(selected);
+
+        RefreshFileIcon(node);
+        RefreshInfoLabel(node);
+
+        var removeIconVisible = (!node.isFolder && selected) || (node.isFolder && !isExpanded &&
+            windowData.GetChildren(node, true).Any(n => !n.isFolder && windowData.IsSelected(n.index)));
+        UIUtils.SetElementDisplay(m_RemoveIcon, removeIconVisible);
+    }
+
+    private void RefreshFileIcon(SelectionWindowData.Node node)
+    {
+        var icon = node.isFolder
+            ? folderIcon
+            : InternalEditorUtility.GetIconForFile(!string.IsNullOrEmpty(node.path)
+                ? node.path
+                : "unknown.txt");
+        m_FileIcon.style.backgroundImage = new StyleBackground(icon);
+    }
+
+    private void RefreshInfoLabel(SelectionWindowData.Node node)
+    {
+        if (node?.isMoved == true)
+        {
+            m_InfoLabel.text = k_InfoLabel;
+            m_InfoLabel.tooltip = string.Format(k_InfoLabelTooltip, node.asset.origin.assetPath);
+        }
+        else
+        {
+            m_InfoLabel.text = string.Empty;
+            m_InfoLabel.tooltip = string.Empty;
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowTreeView.cs b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowTreeView.cs
new file mode 100644
index 0000000000..7ec8481ad2
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/SelectionWindow/SelectionWindowTreeView.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;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal;
+
+internal class SelectionWindowTreeView : TreeView
+{
+    private bool m_ViewDataReady;
+    private bool m_ResetExpansionAndScrollOnViewDataReady;
+    public SelectionWindowTreeView(int itemHeight, Func<VisualElement> makeItem, Action<VisualElement, int> bindItem)
+        : base(itemHeight, makeItem, bindItem)
+    {
+        selectionType = SelectionType.None;
+    }
+
+    internal override void OnViewDataReady()
+    {
+        base.OnViewDataReady();
+        m_ViewDataReady = true;
+        if (m_ResetExpansionAndScrollOnViewDataReady)
+        {
+            ResetExpansionAndScroll();
+            m_ResetExpansionAndScrollOnViewDataReady = false;
+        }
+    }
+
+    private void ResetExpansionAndScroll()
+    {
+        // If the view data is not ready, calling ExpandAll will not work because the expansions will be overriden
+        // on view data ready. As a workaround, when we know that the view data is not ready, we delay the reset
+        // expansion and scroll code to when the view data is ready
+        if (!m_ViewDataReady)
+        {
+            m_ResetExpansionAndScrollOnViewDataReady = true;
+            return;
+        }
+        ExpandAll();
+        // We need to do a delay call because there's a bug with UI toolkit that causes the scrollView
+        // to be set back to the saved position even after the OnViewDataReady is called.
+        EditorApplication.delayCall += () => scrollView.scrollOffset = Vector2.zero;
+    }
+
+    private static List<TreeViewItemData<SelectionWindowData.Node>> CreateTreeViewData(SelectionWindowData data, SelectionWindowData.Node parentNode)
+    {
+        if (data.nodes?.Any() != true)
+            return new List<TreeViewItemData<SelectionWindowData.Node>>();
+
+        var results = new List<TreeViewItemData<SelectionWindowData.Node>>();
+        foreach (var node in data.GetChildren(parentNode))
+        {
+            var treeViewItemData = new TreeViewItemData<SelectionWindowData.Node>(node.index, node);
+            treeViewItemData.AddChildren(CreateTreeViewData(data, node));
+            results.Add(treeViewItemData);
+        }
+        return results;
+    }
+
+    public void SetData(SelectionWindowData data, bool resetExpansion)
+    {
+        SetRootItems(CreateTreeViewData(data, data.hiddenRootNode));
+        if (resetExpansion)
+            ResetExpansionAndScroll();
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageAddButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageAddButton.cs
index 8eb938ed42..b6830b6707 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageAddButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageAddButton.cs
@@ -32,7 +32,7 @@ protected override bool TriggerAction(IList<IPackageVersion> versions)
             m_OperationDispatcher.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));
+            PackageManagerWindowAnalytics.SendEvent("installNewRecommended", versions);
             return true;
         }
 
@@ -67,7 +67,7 @@ protected override bool TriggerAction(IPackageVersion version)
             if (packageToUninstall?.Any() == true)
             {
                 m_OperationDispatcher.InstallAndResetDependencies(version, packageToUninstall);
-                PackageManagerWindowAnalytics.SendEvent("installAndReset", version.uniqueId);
+                PackageManagerWindowAnalytics.SendEvent("installAndReset", version);
             }
             else
             {
@@ -79,7 +79,7 @@ protected override bool TriggerAction(IPackageVersion version)
 
                 m_OperationDispatcher.Install(version);
 
-                PackageManagerWindowAnalytics.SendEvent(eventName, version.uniqueId);
+                PackageManagerWindowAnalytics.SendEvent(eventName, version);
             }
             return true;
         }
@@ -115,7 +115,7 @@ protected override string GetText(IPackageVersion version, bool isInProgress)
 
         protected override IEnumerable<ButtonDisableCondition> GetDisableConditions(IPackageVersion version)
         {
-            yield return new ButtonDisableCondition(() => version != null && !version.HasTag(PackageTag.ScopedRegistry) && version.HasTag(PackageTag.Deprecated),
+            yield return new ButtonDisableCondition(() => version != null && version.HasTag(PackageTag.Deprecated) && version.availableRegistry != RegistryType.MyRegistries,
                 L10n.Tr("This version is deprecated."));
 
             yield return new ButtonDisableCondition(() => version?.package.hasEntitlementsError ?? false,
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageCancelDownloadButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageCancelDownloadButton.cs
index 234a545e60..b6521b6139 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageCancelDownloadButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageCancelDownloadButton.cs
@@ -27,14 +27,14 @@ public PackageCancelDownloadButton(AssetStoreDownloadManager assetStoreDownloadM
         protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
             m_OperationDispatcher.AbortDownload(versions.Select(v => v.package));
-            PackageManagerWindowAnalytics.SendEvent("abortDownload", packageIds: versions.Select(v => v.package.uniqueId));
+            PackageManagerWindowAnalytics.SendEvent("abortDownload", versions);
             return true;
         }
 
         protected override bool TriggerAction(IPackageVersion version)
         {
             m_OperationDispatcher.AbortDownload(version.package);
-            PackageManagerWindowAnalytics.SendEvent("abortDownload", version.package.uniqueId);
+            PackageManagerWindowAnalytics.SendEvent("abortDownload", version);
             return true;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDeselectButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDeselectButton.cs
index d5339f39e6..50bf68ded6 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDeselectButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDeselectButton.cs
@@ -22,7 +22,7 @@ protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
             m_PageManager.GetPage().RemoveSelection(versions.Select(v => new PackageAndVersionIdPair(v.package.uniqueId, v.uniqueId)));
             if (!string.IsNullOrEmpty(m_AnalyticsEventName))
-                PackageManagerWindowAnalytics.SendEvent(m_AnalyticsEventName, packageIds: versions.Select(v => v.package.uniqueId));
+                PackageManagerWindowAnalytics.SendEvent(m_AnalyticsEventName, versions);
             return true;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDowngradeButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDowngradeButton.cs
index 5079c18e6c..7528d6f176 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDowngradeButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDowngradeButton.cs
@@ -24,7 +24,7 @@ protected override bool TriggerAction(IPackageVersion version)
         {
             var canDownload = m_OperationDispatcher.Download(version.package);
             if (canDownload)
-                PackageManagerWindowAnalytics.SendEvent("startDownloadDowngrade", version.package.uniqueId);
+                PackageManagerWindowAnalytics.SendEvent("startDownloadDowngrade", version);
             return canDownload;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadButton.cs
index 39767f2cf5..6918784a24 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadButton.cs
@@ -23,7 +23,7 @@ protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
             var canDownload = m_OperationDispatcher.Download(versions.Select(v => v.package));
             if (canDownload)
-                PackageManagerWindowAnalytics.SendEvent("startDownloadNew", packageIds: versions.Select(v => v.package.uniqueId));
+                PackageManagerWindowAnalytics.SendEvent("startDownloadNew", versions);
             return canDownload;
         }
 
@@ -31,7 +31,7 @@ protected override bool TriggerAction(IPackageVersion version)
         {
             var canDownload = m_OperationDispatcher.Download(version.package);
             if (canDownload)
-                PackageManagerWindowAnalytics.SendEvent("startDownloadNew", version.package.uniqueId);
+                PackageManagerWindowAnalytics.SendEvent("startDownloadNew", version);
             return canDownload;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadUpdateButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadUpdateButton.cs
index 0dbc635941..c8a10d58a1 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadUpdateButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadUpdateButton.cs
@@ -23,7 +23,7 @@ protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
             var canDownload = m_OperationDispatcher.Download(versions.Select(v => v.package));
             if (canDownload)
-                PackageManagerWindowAnalytics.SendEvent("startDownloadUpdate", packageIds: versions.Select(v => v.package.uniqueId));
+                PackageManagerWindowAnalytics.SendEvent("startDownloadUpdate", versions);
             return true;
         }
 
@@ -31,7 +31,7 @@ protected override bool TriggerAction(IPackageVersion version)
         {
             var canDownload = m_OperationDispatcher.Download(version.package);
             if (canDownload)
-                PackageManagerWindowAnalytics.SendEvent("startDownloadUpdate", version.package.uniqueId);
+                PackageManagerWindowAnalytics.SendEvent("startDownloadUpdate", version);
             return canDownload;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageImportButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageImportButton.cs
index 53ed94ebd1..0fc7520ebc 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageImportButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageImportButton.cs
@@ -19,7 +19,7 @@ public PackageImportButton(AssetStoreDownloadManager assetStoreDownloadManager,
         protected override bool TriggerAction(IPackageVersion version)
         {
             m_OperationDispatcher.Import(version.package);
-            PackageManagerWindowAnalytics.SendEvent("import", version.package.uniqueId);
+            PackageManagerWindowAnalytics.SendEvent("import", version);
             return true;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackagePauseDownloadButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackagePauseDownloadButton.cs
index 04a7e931ab..d813f3fe07 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackagePauseDownloadButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackagePauseDownloadButton.cs
@@ -24,7 +24,7 @@ public PackagePauseDownloadButton(AssetStoreDownloadManager assetStoreDownloadMa
         protected override bool TriggerAction(IPackageVersion version)
         {
             m_OperationDispatcher.PauseDownload(version.package);
-            PackageManagerWindowAnalytics.SendEvent("pauseDownload", version.package.uniqueId);
+            PackageManagerWindowAnalytics.SendEvent("pauseDownload", version);
             return true;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRedownloadButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRedownloadButton.cs
index 5578fc79ee..ff270873a1 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRedownloadButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRedownloadButton.cs
@@ -22,7 +22,7 @@ protected override bool TriggerAction(IPackageVersion version)
         {
             var canDownload = m_OperationDispatcher.Download(version.package);
             if (canDownload)
-                PackageManagerWindowAnalytics.SendEvent("startReDownload", version.package.uniqueId);
+                PackageManagerWindowAnalytics.SendEvent("startReDownload", version);
             return canDownload;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveButton.cs
index 10aad406fa..3758903209 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveButton.cs
@@ -49,7 +49,7 @@ protected override bool TriggerAction(IList<IPackageVersion> versions)
                 m_PackageManagerPrefs.skipMultiSelectRemoveConfirmation = true;
 
             m_OperationDispatcher.Uninstall(versions.Select(v => v.package));
-            PackageManagerWindowAnalytics.SendEvent("uninstall", packageIds: versions.Select(v => v.uniqueId));
+            PackageManagerWindowAnalytics.SendEvent("uninstall", versions);
             // After a bulk removal, we want to deselect them to avoid installing them back by accident.
             DeselectVersions(versions);
             return true;
@@ -109,7 +109,7 @@ protected override bool TriggerAction(IPackageVersion version)
 
             // Remove
             m_OperationDispatcher.Uninstall(version.package);
-            PackageManagerWindowAnalytics.SendEvent("uninstall", version?.uniqueId);
+            PackageManagerWindowAnalytics.SendEvent("uninstall", version);
             return true;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveImportedButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveImportedButton.cs
new file mode 100644
index 0000000000..20187ab8d8
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveImportedButton.cs
@@ -0,0 +1,58 @@
+// 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 PackageRemoveImportedButton : PackageToolBarRegularButton
+    {
+        private ApplicationProxy m_ApplicationProxy;
+        private PackageOperationDispatcher m_OperationDispatcher;
+        public PackageRemoveImportedButton(ApplicationProxy applicationProxy, PackageOperationDispatcher operationDispatcher)
+        {
+            m_ApplicationProxy = applicationProxy;
+            m_OperationDispatcher = operationDispatcher;
+        }
+
+        protected override bool TriggerAction(IList<IPackageVersion> versions)
+        {
+            if (!m_ApplicationProxy.DisplayDialog("removeMultiImported", L10n.Tr("Removing imported packages"),
+                    L10n.Tr("Remove all assets from these packages?\nAny changes you made to the assets will be lost."),
+                    L10n.Tr("Remove"), L10n.Tr("Cancel")))
+                return false;
+
+            m_OperationDispatcher.RemoveImportedAssets(versions);
+            PackageManagerWindowAnalytics.SendEvent("removeImported", versions);
+            return true;
+        }
+
+        protected override bool TriggerAction(IPackageVersion version)
+        {
+            m_OperationDispatcher.RemoveImportedAssets(version.package);
+            PackageManagerWindowAnalytics.SendEvent("removeImported", version);
+            return true;
+        }
+
+        protected override bool IsVisible(IPackageVersion version)
+        {
+            return version?.importedAssets?.Any() == true;
+        }
+
+        protected override string GetTooltip(IPackageVersion version, bool isInProgress)
+        {
+            if (isInProgress)
+                return k_InProgressGenericTooltip;
+            return string.Format(L10n.Tr("Remove this {0}'s imported assets from your project."), version.GetDescriptor());
+        }
+
+        protected override string GetText(IPackageVersion version, bool isInProgress)
+        {
+            return L10n.Tr("Remove");
+        }
+
+        protected override bool IsInProgress(IPackageVersion version) => false;
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResumeDownloadButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResumeDownloadButton.cs
index 08d16c4324..2036e81246 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResumeDownloadButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResumeDownloadButton.cs
@@ -24,7 +24,7 @@ public PackageResumeDownloadButton(AssetStoreDownloadManager assetStoreDownloadM
         protected override bool TriggerAction(IPackageVersion version)
         {
             m_OperationDispatcher.ResumeDownload(version.package);
-            PackageManagerWindowAnalytics.SendEvent("resumeDownload", version.package.uniqueId);
+            PackageManagerWindowAnalytics.SendEvent("resumeDownload", version);
             return true;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBar.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBar.cs
index b93b3eee62..d3ddd2be09 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBar.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBar.cs
@@ -53,6 +53,7 @@ private void ResolveDependencies()
         private PackageCancelDownloadButton m_CancelButton;
 
         private PackageImportButton m_ImportButton;
+        private PackageRemoveImportedButton m_RemoveImportedButton;
         private PackageRedownloadButton m_RedownloadButton;
         private PackageDownloadButton m_DownloadButton;
         private PackageDownloadUpdateButton m_DownloadUpdateButton;
@@ -149,6 +150,11 @@ private void InitializeButtons()
             m_ImportButton.onAction += RefreshBuiltInButtons;
             m_BuiltInActions.Add(m_ImportButton.element);
 
+            m_RemoveImportedButton = new PackageRemoveImportedButton(m_Application, m_OperationDispatcher);
+            m_RemoveImportedButton.SetGlobalDisableConditions(m_DisableIfCompiling);
+            m_RemoveImportedButton.onAction += RefreshBuiltInButtons;
+            m_BuiltInActions.Add(m_RemoveImportedButton.element);
+
             m_RedownloadButton = new PackageRedownloadButton(m_AssetStoreDownloadManager, m_AssetStoreCache, m_OperationDispatcher);
             m_RedownloadButton.SetGlobalDisableConditions(m_DisableIfNoNetwork, m_DisableIfCompiling);
             m_RedownloadButton.onAction += RefreshBuiltInButtons;
@@ -262,6 +268,7 @@ private void RefreshBuiltInButtons()
             m_ResetButton.Refresh(m_Version);
 
             m_ImportButton.Refresh(m_Version);
+            m_RemoveImportedButton.Refresh(m_Version);
             m_RedownloadButton.Refresh(m_Version);
             m_DownloadButton.Refresh(m_Version);
             m_DownloadUpdateButton.Refresh(m_Version);
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUpdateButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUpdateButton.cs
index b2b6a3f831..1b0f956c47 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUpdateButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUpdateButton.cs
@@ -38,7 +38,7 @@ protected override bool TriggerAction(IList<IPackageVersion> versions)
             m_OperationDispatcher.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));
+            PackageManagerWindowAnalytics.SendEvent("installUpdateRecommended", versions);
             return true;
         }
 
@@ -96,7 +96,7 @@ protected override bool TriggerAction(IPackageVersion version)
             if (packageToUninstall?.Any() == true)
             {
                 m_OperationDispatcher.InstallAndResetDependencies(targetVersion, packageToUninstall);
-                PackageManagerWindowAnalytics.SendEvent("installAndReset", targetVersion?.uniqueId);
+                PackageManagerWindowAnalytics.SendEvent("installAndReset", targetVersion);
             }
             else
             {
@@ -104,7 +104,7 @@ protected override bool TriggerAction(IPackageVersion version)
 
                 var installRecommended = version.package.versions.recommended == targetVersion ? "Recommended" : "NonRecommended";
                 var eventName = $"installUpdate{installRecommended}";
-                PackageManagerWindowAnalytics.SendEvent(eventName, targetVersion?.uniqueId);
+                PackageManagerWindowAnalytics.SendEvent(eventName, targetVersion);
             }
             return true;
         }
@@ -148,7 +148,7 @@ protected override IEnumerable<ButtonDisableCondition> GetDisableConditions(IPac
             yield return new ButtonDisableCondition(() =>
             {
                 var targetVersion = version?.package.versions.GetUpdateTarget(version);
-                return version != null && targetVersion.HasTag(PackageTag.Deprecated) && !targetVersion.HasTag(PackageTag.ScopedRegistry);
+                return targetVersion != null && targetVersion.HasTag(PackageTag.Deprecated) && targetVersion.availableRegistry != RegistryType.MyRegistries;
             }, L10n.Tr("This version is deprecated."));
 
             yield return new ButtonDisableCondition(() => version?.package.hasEntitlementsError ?? false,
diff --git a/Modules/ParticleSystem/Managed/ParticleSystemEnums.cs b/Modules/ParticleSystem/Managed/ParticleSystemEnums.cs
index ffb2b2ff75..f316a7bdc1 100644
--- a/Modules/ParticleSystem/Managed/ParticleSystemEnums.cs
+++ b/Modules/ParticleSystem/Managed/ParticleSystemEnums.cs
@@ -301,7 +301,14 @@ public enum ParticleSystemVertexStream
         NoiseImpulseX,
         NoiseImpulseXY,
         NoiseImpulseXYZ,
-        MeshIndex
+        MeshIndex,
+        ParticleIndex,
+        ColorPackedAsTwoFloats,
+        MeshAxisOfRotation,
+        NextTrailCenter,
+        PreviousTrailCenter,
+        PercentageAlongTrail,
+        TrailWidth,
     }
 
     // The available vertex streams
@@ -400,6 +407,29 @@ public enum ParticleSystemForceFieldShape
         Cylinder = 2,
         Box = 3
     }
+	
+    // Mesh baking options
+    [Flags]
+    public enum ParticleSystemBakeMeshOptions
+    {
+        BakeRotationAndScale = 1 << 0,
+        BakePosition = 1 << 1,
+
+        Default = 0
+    }
+
+    // Texture baking options
+    [Flags]
+    public enum ParticleSystemBakeTextureOptions
+    {
+        BakeRotationAndScale = 1 << 0,
+        BakePosition = 1 << 1,
+        PerVertex = 1 << 2,                 // Bake each vertex of each particle (i.e. 4 vertices per billboard)
+        PerParticle = 1 << 3,               // Only bake each particle (i.e. 1 vertex per billboard) Useful if not using any per-vertex data such as UVs or Positions.
+        IncludeParticleIndices = 1 << 4,    // Instead of baking triangle indices for rendering, bake a 2 channel index texture containing triangle indices and particle indices
+
+        Default = PerVertex
+    }
 }
 
 namespace UnityEngine.Rendering
diff --git a/Modules/ParticleSystem/Managed/ParticleSystemRenderer.deprecated.cs b/Modules/ParticleSystem/Managed/ParticleSystemRenderer.deprecated.cs
index 23ccf5629b..42673f89fa 100644
--- a/Modules/ParticleSystem/Managed/ParticleSystemRenderer.deprecated.cs
+++ b/Modules/ParticleSystem/Managed/ParticleSystemRenderer.deprecated.cs
@@ -30,16 +30,16 @@ public enum ParticleSystemVertexStreams
 
     partial class ParticleSystemRenderer
     {
-        [Obsolete("EnableVertexStreams is deprecated.Use SetActiveVertexStreams instead.", false)]
+        [Obsolete("EnableVertexStreams is deprecated. Use SetActiveVertexStreams instead.", false)]
         public void EnableVertexStreams(ParticleSystemVertexStreams streams) { Internal_SetVertexStreams(streams, true); }
-        [Obsolete("DisableVertexStreams is deprecated.Use SetActiveVertexStreams instead.", false)]
+        [Obsolete("DisableVertexStreams is deprecated. Use SetActiveVertexStreams instead.", false)]
         public void DisableVertexStreams(ParticleSystemVertexStreams streams) { Internal_SetVertexStreams(streams, false); }
-        [Obsolete("AreVertexStreamsEnabled is deprecated.Use GetActiveVertexStreams instead.", false)]
+        [Obsolete("AreVertexStreamsEnabled is deprecated. Use GetActiveVertexStreams instead.", false)]
         public bool AreVertexStreamsEnabled(ParticleSystemVertexStreams streams) { return Internal_GetEnabledVertexStreams(streams) == streams; }
-        [Obsolete("GetEnabledVertexStreams is deprecated.Use GetActiveVertexStreams instead.", false)]
+        [Obsolete("GetEnabledVertexStreams is deprecated. Use GetActiveVertexStreams instead.", false)]
         public ParticleSystemVertexStreams GetEnabledVertexStreams(ParticleSystemVertexStreams streams) { return Internal_GetEnabledVertexStreams(streams); }
 
-        [Obsolete("Internal_SetVertexStreams is deprecated.Use SetActiveVertexStreams instead.", false)]
+        [Obsolete("Internal_SetVertexStreams is deprecated. Use SetActiveVertexStreams instead.", false)]
         internal void Internal_SetVertexStreams(ParticleSystemVertexStreams streams, bool enabled)
         {
             List<ParticleSystemVertexStream> streamList = new List<ParticleSystemVertexStream>(activeVertexStreamsCount);
@@ -83,7 +83,7 @@ internal void Internal_SetVertexStreams(ParticleSystemVertexStreams streams, boo
             SetActiveVertexStreams(streamList);
         }
 
-        [Obsolete("Internal_GetVertexStreams is deprecated.Use GetActiveVertexStreams instead.", false)]
+        [Obsolete("Internal_GetVertexStreams is deprecated. Use GetActiveVertexStreams instead.", false)]
         internal ParticleSystemVertexStreams Internal_GetEnabledVertexStreams(ParticleSystemVertexStreams streams)
         {
             List<ParticleSystemVertexStream> streamList = new List<ParticleSystemVertexStream>(activeVertexStreamsCount);
@@ -107,5 +107,15 @@ internal ParticleSystemVertexStreams Internal_GetEnabledVertexStreams(ParticleSy
 
             return (deprecatedStreams & streams);
         }
+
+        [Obsolete("BakeMesh with useTransform is deprecated. Use BakeMesh with ParticleSystemBakeMeshOptions instead.", false)]
+        public void BakeMesh(Mesh mesh, bool useTransform = false) { BakeMesh(mesh, Camera.main, useTransform); }
+        [Obsolete("BakeMesh with useTransform is deprecated. Use BakeMesh with ParticleSystemBakeMeshOptions instead.", false)]
+        public void BakeMesh(Mesh mesh, Camera camera, bool useTransform = false) { BakeMesh(mesh, camera, useTransform ? ParticleSystemBakeMeshOptions.BakeRotationAndScale : ParticleSystemBakeMeshOptions.Default); }
+
+        [Obsolete("BakeTrailsMesh with useTransform is deprecated. Use BakeTrailsMesh with ParticleSystemBakeMeshOptions instead.", false)]
+        public void BakeTrailsMesh(Mesh mesh, bool useTransform = false) { BakeTrailsMesh(mesh, Camera.main, useTransform); }
+        [Obsolete("BakeTrailsMesh with useTransform is deprecated. Use BakeTrailsMesh with ParticleSystemBakeMeshOptions instead.", false)]
+        public void BakeTrailsMesh(Mesh mesh, Camera camera, bool useTransform = false) { BakeTrailsMesh(mesh, camera, useTransform ? ParticleSystemBakeMeshOptions.BakeRotationAndScale : ParticleSystemBakeMeshOptions.Default); }
     }
 }
diff --git a/Modules/ParticleSystem/ScriptBindings/ParticleSystem.bindings.cs b/Modules/ParticleSystem/ScriptBindings/ParticleSystem.bindings.cs
index dd65b8b1e1..5c0682532d 100644
--- a/Modules/ParticleSystem/ScriptBindings/ParticleSystem.bindings.cs
+++ b/Modules/ParticleSystem/ScriptBindings/ParticleSystem.bindings.cs
@@ -221,6 +221,9 @@ public void TriggerSubEmitter(int subEmitterIndex, ref ParticleSystem.Particle p
         [NativeName("SetUsesCustomData")]
         extern public void AllocateCustomDataAttribute(ParticleSystemCustomData stream);
 
+        extern public bool has3DParticleRotations { [NativeName("Has3DParticleRotations")] get; }
+        extern public bool hasNonUniformParticleSizes { [NativeName("HasNonUniformParticleSizes")] get; }
+
         unsafe extern internal void* GetManagedJobData();
         extern internal JobHandle GetManagedJobHandle();
         extern internal void SetManagedJobHandle(JobHandle handle);
@@ -233,7 +236,7 @@ public void TriggerSubEmitter(int subEmitterIndex, ref ParticleSystem.Particle p
         [FreeFunction(Name = "ParticleSystemEditor::SetupDefaultParticleSystemType", HasExplicitThis = true)]
         extern internal void SetupDefaultType(ParticleSystemSubEmitterType type);
 
-        [NativeProperty("GetState().localToWorld", TargetType = TargetType.Field)]
+        [NativeProperty("GetState()->localToWorld", TargetType = TargetType.Field)]
         extern internal Matrix4x4 localToWorldMatrix { get; }
 
         [NativeName("GetNoiseModule().GeneratePreviewTexture")]
diff --git a/Modules/ParticleSystem/ScriptBindings/ParticleSystemRenderer.bindings.cs b/Modules/ParticleSystem/ScriptBindings/ParticleSystemRenderer.bindings.cs
index c3dee6cfca..57c9e58686 100644
--- a/Modules/ParticleSystem/ScriptBindings/ParticleSystemRenderer.bindings.cs
+++ b/Modules/ParticleSystem/ScriptBindings/ParticleSystemRenderer.bindings.cs
@@ -66,11 +66,58 @@ extern public Mesh mesh
 
         extern public int meshCount { get; }
 
-        public void BakeMesh(Mesh mesh, bool useTransform = false) { BakeMesh(mesh, Camera.main, useTransform); }
-        extern public void BakeMesh([NotNull] Mesh mesh, [NotNull] Camera camera, bool useTransform = false);
+        public void BakeMesh(Mesh mesh, ParticleSystemBakeMeshOptions options) { BakeMesh(mesh, Camera.main, options); }
+        extern public void BakeMesh([NotNull] Mesh mesh, [NotNull] Camera camera, ParticleSystemBakeMeshOptions options);
 
-        public void BakeTrailsMesh(Mesh mesh, bool useTransform = false) { BakeTrailsMesh(mesh, Camera.main, useTransform); }
-        extern public void BakeTrailsMesh([NotNull] Mesh mesh, [NotNull] Camera camera, bool useTransform = false);
+        public void BakeTrailsMesh(Mesh mesh, ParticleSystemBakeMeshOptions options) { BakeTrailsMesh(mesh, Camera.main, options); }
+        extern public void BakeTrailsMesh([NotNull] Mesh mesh, [NotNull] Camera camera, ParticleSystemBakeMeshOptions options);
+
+        internal struct BakeTextureOutput
+        {
+            [NativeName("first")] internal Texture2D vertices;
+            [NativeName("second")] internal Texture2D indices;
+        }
+
+        public int BakeTexture(ref Texture2D verticesTexture, ParticleSystemBakeTextureOptions options) { return BakeTexture(ref verticesTexture, Camera.main, options); }
+        public int BakeTexture(ref Texture2D verticesTexture, Camera camera, ParticleSystemBakeTextureOptions options)
+        {
+            if (renderMode == ParticleSystemRenderMode.Mesh)
+                throw new System.InvalidOperationException("Baking mesh particles to texture requires supplying an indices texture");
+
+            int indexCount;
+            verticesTexture = BakeTextureNoIndicesInternal(verticesTexture, camera, options, out indexCount);
+            return indexCount;
+        }
+
+        [FreeFunction(Name = "ParticleSystemRendererScriptBindings::BakeTextureNoIndices", HasExplicitThis = true)]
+        extern private Texture2D BakeTextureNoIndicesInternal(Texture2D verticesTexture, [NotNull] Camera camera, ParticleSystemBakeTextureOptions options, out int indexCount);
+
+        public int BakeTexture(ref Texture2D verticesTexture, ref Texture2D indicesTexture, ParticleSystemBakeTextureOptions options) { return BakeTexture(ref verticesTexture, ref indicesTexture, Camera.main, options); }
+        public int BakeTexture(ref Texture2D verticesTexture, ref Texture2D indicesTexture, Camera camera, ParticleSystemBakeTextureOptions options)
+        {
+            int indexCount;
+            var output = BakeTextureInternal(verticesTexture, indicesTexture, camera, options, out indexCount);
+            verticesTexture = output.vertices;
+            indicesTexture = output.indices;
+            return indexCount;
+        }
+
+        [FreeFunction(Name = "ParticleSystemRendererScriptBindings::BakeTexture", HasExplicitThis = true)]
+        extern private BakeTextureOutput BakeTextureInternal(Texture2D verticesTexture, Texture2D indicesTexture, [NotNull] Camera camera, ParticleSystemBakeTextureOptions options, out int indexCount);
+
+        public int BakeTrailsTexture(ref Texture2D verticesTexture, ref Texture2D indicesTexture, ParticleSystemBakeTextureOptions options) { return BakeTrailsTexture(ref verticesTexture, ref indicesTexture, Camera.main, options); }
+
+        public int BakeTrailsTexture(ref Texture2D verticesTexture, ref Texture2D indicesTexture, Camera camera, ParticleSystemBakeTextureOptions options)
+        {
+            int indexCount;
+            var output = BakeTrailsTextureInternal(verticesTexture, indicesTexture, camera, options, out indexCount);
+            verticesTexture = output.vertices;
+            indicesTexture = output.indices;
+            return indexCount;
+        }
+
+        [FreeFunction(Name = "ParticleSystemRendererScriptBindings::BakeTrailsTexture", HasExplicitThis = true)]
+        extern private BakeTextureOutput BakeTrailsTextureInternal(Texture2D verticesTexture, Texture2D indicesTexture, [NotNull] Camera camera, ParticleSystemBakeTextureOptions options, out int indexCount);
 
         // Vertex streams
         extern public int activeVertexStreamsCount { get; }
@@ -78,6 +125,11 @@ extern public Mesh mesh
         extern public void SetActiveVertexStreams([NotNull] List<ParticleSystemVertexStream> streams);
         [FreeFunction(Name = "ParticleSystemRendererScriptBindings::GetActiveVertexStreams", HasExplicitThis = true)]
         extern public void GetActiveVertexStreams([NotNull] List<ParticleSystemVertexStream> streams);
+        extern public int activeTrailVertexStreamsCount { get; }
+        [FreeFunction(Name = "ParticleSystemRendererScriptBindings::SetActiveTrailVertexStreams", HasExplicitThis = true)]
+        extern public void SetActiveTrailVertexStreams([NotNull] List<ParticleSystemVertexStream> streams);
+        [FreeFunction(Name = "ParticleSystemRendererScriptBindings::GetActiveTrailVertexStreams", HasExplicitThis = true)]
+        extern public void GetActiveTrailVertexStreams([NotNull] List<ParticleSystemVertexStream> streams);
 
         extern internal bool editorEnabled { get; set; }
         extern public bool supportsMeshInstancing { get; }
diff --git a/Modules/ParticleSystemEditor/ParticleEffectUI.cs b/Modules/ParticleSystemEditor/ParticleEffectUI.cs
index 4badcfcead..9c7cbe3dbe 100644
--- a/Modules/ParticleSystemEditor/ParticleEffectUI.cs
+++ b/Modules/ParticleSystemEditor/ParticleEffectUI.cs
@@ -192,7 +192,7 @@ private bool ShouldManagePlaybackState(ParticleSystem root)
             bool active = false;
             if (root != null)
                 active = root.gameObject.activeInHierarchy;
-            return !EditorApplication.isPlaying && active;
+            return active && !Application.IsPlaying(root.gameObject);
         }
 
         static Color GetDisabledColor()
@@ -346,18 +346,7 @@ public bool InitializeIfNeeded(IEnumerable<ParticleSystem> systems)
 
                 if (ShouldManagePlaybackState(mainSystem))
                 {
-                    // Restore lastPlayBackTime if available in session cache
-                    Vector3 simulationState = SessionState.GetVector3(k_SimulationStateId + mainSystem.GetInstanceID(), Vector3.zero);
-                    if (mainSystem.GetInstanceID() == (int)simulationState.x)
-                    {
-                        float lastPlayBackTime = simulationState.z;
-                        if (lastPlayBackTime > 0f)
-                        {
-                            if (m_MainPlaybackSystem != mainSystem)
-                                ParticleSystemEditorUtils.PerformCompleteResimulation();
-                            ParticleSystemEditorUtils.playbackTime = lastPlayBackTime;
-                        }
-                    }
+                    TryRestorePlayState(mainSystem);
 
                     // Play when selecting a new particle effect
                     if (m_MainPlaybackSystem != mainSystem)
@@ -370,6 +359,61 @@ public bool InitializeIfNeeded(IEnumerable<ParticleSystem> systems)
             return initializeRequired;
         }
 
+        void SavePlayState(ParticleSystem particleSystem)
+        {
+            if (particleSystem == null)
+                return;
+
+            // Store simulation state of current effect as Vector3 (rootInstanceID, PlayState, playBackTime) in Session cache
+            int rootInstanceId = particleSystem.GetInstanceID();
+            Vector3 state = new Vector3(rootInstanceId, (int)GetCurrentPlayState(), ParticleSystemEditorUtils.playbackTime);
+            SessionState.SetVector3(k_SimulationStateId + rootInstanceId, state);
+        }
+
+        void TryRestorePlayState(ParticleSystem particleSystem)
+        {
+            if (particleSystem == null)
+                return;
+
+            Vector3 simulationState = SessionState.GetVector3(k_SimulationStateId + particleSystem.GetInstanceID(), Vector3.zero);
+            if (particleSystem.GetInstanceID() == (int)simulationState.x)
+            {
+                float lastPlayBackTime = simulationState.z;
+                if (lastPlayBackTime > 0f)
+                {
+                    if (m_MainPlaybackSystem != particleSystem)
+                        ParticleSystemEditorUtils.PerformCompleteResimulation();
+                    ParticleSystemEditorUtils.playbackTime = lastPlayBackTime;
+                }
+
+                PlayState playState = (PlayState)simulationState.y;
+                switch (playState)
+                {
+                    case PlayState.Stopped:
+                        Stop();
+                        break;
+                    case PlayState.Playing:
+                        Play();
+                        break;
+                    case PlayState.Paused:
+                        Pause();
+                        break;
+                }
+            }
+        }
+
+        PlayState GetCurrentPlayState()
+        {
+            PlayState playState;
+            if (IsPlaying())
+                playState = PlayState.Playing;
+            else if (IsPaused())
+                playState = PlayState.Paused;
+            else
+                playState = PlayState.Stopped;
+            return playState;
+        }
+
         internal void UndoRedoPerformed(in UndoRedoInfo info)
         {
             Refresh();
@@ -387,27 +431,42 @@ internal void UndoRedoPerformed(in UndoRedoInfo info)
                 }
             }
 
+            // Undo will deactivate the ParticleSystem and therefore stop it, here we resume the playback state for the user (UUM-28514)
+            RestorePlayBackStateForCurrentSelectedParticleSystem();
+
             m_Owner.Repaint();
         }
 
+        internal void PrefabInstanceUpdated(GameObject instance)
+        {
+            // Any update to prefab instances will have stopped the play back here we resume the playback state for the user (UUM-28514)
+            RestorePlayBackStateForCurrentSelectedParticleSystem();
+        }
+
+        internal void PrefabInstanceReverted(GameObject instance)
+        {
+            // Any update to prefab instances will have stopped the play back here we resume the playback state for the user (UUM-28514)
+            RestorePlayBackStateForCurrentSelectedParticleSystem();
+        }
+
+        void RestorePlayBackStateForCurrentSelectedParticleSystem()
+        {
+            if (m_SelectedParticleSystems == null || m_SelectedParticleSystems.Count == 0)
+                return;
+
+            ParticleSystem root = ParticleSystemEditorUtils.GetRoot(m_SelectedParticleSystems[0]);
+            if (ShouldManagePlaybackState(root))
+            {
+                TryRestorePlayState(root);
+            }
+        }
+
         public void Clear()
         {
             ParticleSystem root = ParticleSystemEditorUtils.GetRoot(m_SelectedParticleSystems[0]); // root can have been deleted
             if (ShouldManagePlaybackState(root))
             {
-                // Store simulation state of current effect as Vector3 (rootInstanceID, isPlaying, playBackTime)
-                if (root != null)
-                {
-                    PlayState playState;
-                    if (IsPlaying())
-                        playState = PlayState.Playing;
-                    else if (IsPaused())
-                        playState = PlayState.Paused;
-                    else
-                        playState = PlayState.Stopped;
-                    int rootInstanceId = root.GetInstanceID();
-                    SessionState.SetVector3(k_SimulationStateId + rootInstanceId, new Vector3(rootInstanceId, (int)playState, ParticleSystemEditorUtils.playbackTime));
-                }
+                SavePlayState(root);
 
                 // Stop the ParticleSystem here (prevents it being frozen on screen)
                 //Stop();
@@ -1130,6 +1189,16 @@ public void OnGUI()
                 return;
             }
 
+            // Cache play state so we can resume play after undo'ing and updating prefab instances (UUM-28514)
+            if (Event.current.type ==  EventType.Repaint)
+            {
+                ParticleSystem root = ParticleSystemEditorUtils.GetRoot(m_SelectedParticleSystems[0]);
+                if (ShouldManagePlaybackState(root))
+                {
+                    SavePlayState(root);
+                }
+            }
+
             // Grab the latest data from the object
             UpdateProperties();
 
diff --git a/Modules/ParticleSystemEditor/ParticleSystemEditor.cs b/Modules/ParticleSystemEditor/ParticleSystemEditor.cs
index dee52fc9f9..c5aa1359e7 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemEditor.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemEditor.cs
@@ -65,24 +65,26 @@ public void OnEnable()
             EditorApplication.projectChanged += HierarchyOrProjectWindowWasChanged;
             SceneView.duringSceneGui += OnSceneViewGUI;
             Undo.undoRedoEvent += UndoRedoPerformed;
-
+            PrefabUtility.prefabInstanceUpdated += PrefabInstanceUpdated;
+            PrefabUtility.prefabInstanceReverted += PrefabInstanceReverted;
             ShortcutIntegration.instance.contextManager.RegisterToolContext(m_ShortcutContext);
         }
 
         public void OnDisable()
         {
-            SceneView.duringSceneGui -= OnSceneViewGUI;
             EditorApplication.projectChanged -= HierarchyOrProjectWindowWasChanged;
             EditorApplication.hierarchyChanged -= HierarchyOrProjectWindowWasChanged;
+            SceneView.duringSceneGui -= OnSceneViewGUI;
             Undo.undoRedoEvent -= UndoRedoPerformed;
+            PrefabUtility.prefabInstanceUpdated -= PrefabInstanceUpdated;
+            PrefabUtility.prefabInstanceReverted -= PrefabInstanceReverted;
+            ShortcutIntegration.instance.contextManager.DeregisterToolContext(m_ShortcutContext);
 
             if (m_ParticleEffectUI != null)
             {
                 m_ParticleEffectUI.Clear();
                 m_ParticleEffectUI.ClearSelectedSystems();
             }
-
-            ShortcutIntegration.instance.contextManager.DeregisterToolContext(m_ShortcutContext);
         }
 
         private void HierarchyOrProjectWindowWasChanged()
@@ -106,6 +108,20 @@ void UndoRedoPerformed(in UndoRedoInfo info)
                 m_ParticleEffectUI.UndoRedoPerformed(info);
         }
 
+        private void PrefabInstanceUpdated(GameObject instance)
+        {
+            Init(forceInit : false);
+            if (m_ParticleEffectUI != null)
+                m_ParticleEffectUI.PrefabInstanceUpdated(instance);
+        }
+
+        private void PrefabInstanceReverted(GameObject instance)
+        {
+            Init(forceInit: false);
+            if (m_ParticleEffectUI != null)
+                m_ParticleEffectUI.PrefabInstanceReverted(instance);
+        }
+
         private void Init(bool forceInit)
         {
             IEnumerable<ParticleSystem> systems = from p in targets.OfType<ParticleSystem>() where (p != null) select p;
diff --git a/Modules/ParticleSystemEditor/ParticleSystemModules/InitialModuleUI.cs b/Modules/ParticleSystemEditor/ParticleSystemModules/InitialModuleUI.cs
index 4fe256db98..59a82b6cf8 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemModules/InitialModuleUI.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemModules/InitialModuleUI.cs
@@ -76,7 +76,7 @@ class Texts
             public GUIContent cullingMode = EditorGUIUtility.TrTextContent("Culling Mode", "Choose whether to continue simulating the Particle System when offscreen. Catch-up mode pauses offscreen simulations but performs a large simulation step when they become visible, giving the appearance that they were never paused. Automatic uses Pause mode for looping systems, and AlwaysSimulate if not looping.");
             public GUIContent ringBufferMode = EditorGUIUtility.TrTextContent("Ring Buffer Mode", "Rather than dying when their lifetime has elapsed, particles will remain alive until the Max Particles buffer is full, at which point new particles will replace the oldest.");
             public GUIContent ringBufferLoopRange = EditorGUIUtility.TrTextContent("Loop Range", "Particle lifetimes may loop between a fade-in and fade-out time, in order to use curves for the entire time they are alive. Values are in the 0-1 range.");
-            public GUIContent prewarmingSubEmitterWarning = EditorGUIUtility.TrTextContent("Pre-warming a sub-emitter it not necessary and wastes resources. You only need to pre-warm the root Particle System component.");
+            public GUIContent prewarmingSubEmitterWarning = EditorGUIUtility.TrTextContent("Pre-warming a sub-emitter is not necessary and wastes resources. You only need to pre-warm the root Particle System component.");
             public GUIContent x = EditorGUIUtility.TextContent("X");
             public GUIContent y = EditorGUIUtility.TextContent("Y");
             public GUIContent z = EditorGUIUtility.TextContent("Z");
diff --git a/Modules/ParticleSystemEditor/ParticleSystemModules/RendererModuleUI.cs b/Modules/ParticleSystemEditor/ParticleSystemModules/RendererModuleUI.cs
index 02c0701a10..0e4602fdc5 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemModules/RendererModuleUI.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemModules/RendererModuleUI.cs
@@ -7,6 +7,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine.Rendering;
+using UnityEngine.UIElements;
+using System;
 
 namespace UnityEditor
 {
@@ -52,19 +54,28 @@ internal class RendererModuleUI : ModuleUI
         SerializedProperty m_Pivot;
         SerializedProperty m_Flip;
         SerializedProperty m_UseCustomVertexStreams;
+        SerializedProperty m_UseCustomTrailVertexStreams;
         SerializedProperty m_VertexStreams;
+        SerializedProperty m_TrailVertexStreams;
         SerializedProperty m_MaskInteraction;
         SerializedProperty m_EnableGPUInstancing;
         SerializedProperty m_ApplyActiveColorSpace;
 
         ReorderableList m_VertexStreamsList;
+        ReorderableList m_TrailVertexStreamsList;
 
-        int m_NumTexCoords;
-        int m_TexCoordChannelIndex;
-        int m_NumInstancedStreams;
-        bool m_HasTangent;
-        bool m_HasColor;
-        bool m_HasGPUInstancing;
+        private class VertexStreamsStats
+        {
+            public int m_NumTexCoords;
+            public int m_TexCoordChannelIndex;
+            public int m_NumInstancedStreams;
+            public bool m_HasTangent;
+            public bool m_HasColor;
+            public bool m_HasGPUInstancing;
+        }
+
+        VertexStreamsStats m_VertexStreamsStats;
+        VertexStreamsStats m_TrailVertexStreamsStats;
 
         static PrefColor s_PivotColor = new PrefColor("Particle System/Pivot", 0.0f, 1.0f, 0.0f, 1.0f);
         static bool s_VisualizePivot = false;
@@ -80,6 +91,30 @@ enum RenderMode
             None = 5
         }
 
+        private struct VertexStreamInfo
+        {
+            [Flags]
+            public enum Mode
+            {
+                Particles = 1 << 0,
+                Trails = 1 << 1,
+
+                All = Particles | Trails
+            };
+
+            public static implicit operator VertexStreamInfo(string n)
+            {
+                return new VertexStreamInfo
+                {
+                    name = n,
+                    mode = Mode.All
+                };
+            }
+
+            public string name;
+            public Mode mode;
+        };
+
         class Texts
         {
             public GUIContent renderMode = EditorGUIUtility.TrTextContent("Render Mode", "Defines the render mode of the particle renderer.");
@@ -115,6 +150,7 @@ class Texts
             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)");
             public GUIContent visualizePivot = EditorGUIUtility.TrTextContent("Visualize Pivot", "Render the pivot positions of the particles.");
             public GUIContent useCustomVertexStreams = EditorGUIUtility.TrTextContent("Custom Vertex Streams", "Choose whether to send custom particle data to the shader.");
+            public GUIContent useCustomTrailVertexStreams = EditorGUIUtility.TrTextContent("Custom Trail Vertex Streams", "Choose whether to send custom particle trail data to the shader.");
             public GUIContent enableGPUInstancing = EditorGUIUtility.TrTextContent("Enable Mesh GPU Instancing", "When rendering mesh particles, use GPU Instancing on platforms where it is supported, and when using shaders that contain a Procedural Instancing pass (#pragma instancing_options procedural).");
             public GUIContent applyActiveColorSpace = EditorGUIUtility.TrTextContent("Apply Active Color Space", "When using Linear Rendering, particle colors will be converted appropriately before being passed to the GPU.");
 
@@ -181,10 +217,13 @@ class Texts
                 EditorGUIUtility.TrTextContent("Non-uniform Random")
             };
 
-            private string[] vertexStreamsMenu = { "Position", "Normal", "Tangent", "Color", "UV/UV1", "UV/UV2", "UV/UV3", "UV/UV4", "UV/AnimBlend", "UV/AnimFrame", "Center", "VertexID", "Size/Size.x", "Size/Size.xy", "Size/Size.xyz", "Rotation/Rotation", "Rotation/Rotation3D", "Rotation/RotationSpeed", "Rotation/RotationSpeed3D", "Velocity", "Speed", "Lifetime/AgePercent", "Lifetime/InverseStartLifetime", "Random/Stable.x", "Random/Stable.xy", "Random/Stable.xyz", "Random/Stable.xyzw", "Random/Varying.x", "Random/Varying.xy", "Random/Varying.xyz", "Random/Varying.xyzw", "Custom/Custom1.x", "Custom/Custom1.xy", "Custom/Custom1.xyz", "Custom/Custom1.xyzw", "Custom/Custom2.x", "Custom/Custom2.xy", "Custom/Custom2.xyz", "Custom/Custom2.xyzw", "Noise/Sum.x", "Noise/Sum.xy", "Noise/Sum.xyz", "Noise/Impulse.x", "Noise/Impulse.xy", "Noise/Impulse.xyz", "MeshIndex" };
-            public string[] vertexStreamsPacked = { "Position", "Normal", "Tangent", "Color", "UV", "UV2", "UV3", "UV4", "AnimBlend", "AnimFrame", "Center", "VertexID", "Size", "Size.xy", "Size.xyz", "Rotation", "Rotation3D", "RotationSpeed", "RotationSpeed3D", "Velocity", "Speed", "AgePercent", "InverseStartLifetime", "StableRandom.x", "StableRandom.xy", "StableRandom.xyz", "StableRandom.xyzw", "VariableRandom.x", "VariableRandom.xy", "VariableRandom.xyz", "VariableRandom.xyzw", "Custom1.x", "Custom1.xy", "Custom1.xyz", "Custom1.xyzw", "Custom2.x", "Custom2.xy", "Custom2.xyz", "Custom2.xyzw", "NoiseSum.x", "NoiseSum.xy", "NoiseSum.xyz", "NoiseImpulse.x", "NoiseImpulse.xy", "NoiseImpulse.xyz", "MeshIndex" }; // Keep in sync with enums in ParticleSystemRenderer.h and ParticleSystemEnums.cs
+            private static VertexStreamInfo ParticleVertexStream(string n) { return new VertexStreamInfo { name = n, mode = VertexStreamInfo.Mode.Particles }; }
+            private static VertexStreamInfo TrailVertexStream(string n) { return new VertexStreamInfo { name = n, mode = VertexStreamInfo.Mode.Trails }; }
+
+            private string[] vertexStreamsMenu = { "Position", "Normal", "Tangent", "Color", "UV/UV1", "UV/UV2", "UV/UV3", "UV/UV4", "UV/AnimBlend", "UV/AnimFrame", "Center", "VertexID", "Size/Size.x", "Size/Size.xy", "Size/Size.xyz", "Rotation/Rotation", "Rotation/Rotation3D", "Rotation/RotationSpeed", "Rotation/RotationSpeed3D", "Velocity", "Speed", "Lifetime/AgePercent", "Lifetime/InverseStartLifetime", "Random/Stable.x", "Random/Stable.xy", "Random/Stable.xyz", "Random/Stable.xyzw", "Random/Varying.x", "Random/Varying.xy", "Random/Varying.xyz", "Random/Varying.xyzw", "Custom/Custom1.x", "Custom/Custom1.xy", "Custom/Custom1.xyz", "Custom/Custom1.xyzw", "Custom/Custom2.x", "Custom/Custom2.xy", "Custom/Custom2.xyz", "Custom/Custom2.xyzw", "Noise/Sum.x", "Noise/Sum.xy", "Noise/Sum.xyz", "Noise/Impulse.x", "Noise/Impulse.xy", "Noise/Impulse.xyz", "MeshIndex", "ParticleIndex", "ColorPackedAsTwoFloats", "MeshAxisOfRotation", "Trails/NextCenter", "Trails/PreviousCenter", "Trails/PercentageAlongTrail", "Trails/Width" };
+            public VertexStreamInfo[] vertexStreamsPacked = { "Position", "Normal", "Tangent", "Color", "UV", ParticleVertexStream("UV2"), ParticleVertexStream("UV3"), ParticleVertexStream("UV4"), "AnimBlend", "AnimFrame", "Center", "VertexID", "Size", "Size.xy", "Size.xyz", "Rotation", "Rotation3D", "RotationSpeed", "RotationSpeed3D", "Velocity", "Speed", "AgePercent", "InverseStartLifetime", "StableRandom.x", "StableRandom.xy", "StableRandom.xyz", "StableRandom.xyzw", "VariableRandom.x", "VariableRandom.xy", "VariableRandom.xyz", "VariableRandom.xyzw", "Custom1.x", "Custom1.xy", "Custom1.xyz", "Custom1.xyzw", "Custom2.x", "Custom2.xy", "Custom2.xyz", "Custom2.xyzw", "NoiseSum.x", "NoiseSum.xy", "NoiseSum.xyz", "NoiseImpulse.x", "NoiseImpulse.xy", "NoiseImpulse.xyz", ParticleVertexStream("MeshIndex"), "ParticleIndex", "ColorPackedAsTwoFloats", "MeshAxisOfRotation", TrailVertexStream("NextCenter"), TrailVertexStream("PreviousCenter"), TrailVertexStream("PercentageAlongTrail"), TrailVertexStream("TrailWidth") }; // Keep in sync with enums in ParticleSystemRenderer.h and ParticleSystemEnums.cs
             public string[] vertexStreamPackedTypes = { "POSITION.xyz", "NORMAL.xyz", "TANGENT.xyzw", "COLOR.xyzw" }; // all other types are floats
-            public int[] vertexStreamTexCoordChannels = { 0, 0, 0, 0, 2, 2, 2, 2, 1, 1, 3, 1, 1, 2, 3, 1, 3, 1, 3, 3, 1, 1, 1, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 1, 2, 3, 1 };
+            public int[] vertexStreamTexCoordChannels = { 0, 0, 0, 0, 2, 2, 2, 2, 1, 1, 3, 1, 1, 2, 3, 1, 3, 1, 3, 3, 1, 1, 1, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 1, 2, 3, 1, 1, 2, 3, 3, 3, 1, 1 };
             public string channels = "xyzw|xyz";
             public int vertexStreamsInstancedStart = 8;
 
@@ -272,13 +311,23 @@ protected override void Init()
             m_ApplyActiveColorSpace = GetProperty0("m_ApplyActiveColorSpace");
 
             m_UseCustomVertexStreams = GetProperty0("m_UseCustomVertexStreams");
+            m_UseCustomTrailVertexStreams = GetProperty0("m_UseCustomTrailVertexStreams");
+
             m_VertexStreams = GetProperty0("m_VertexStreams");
             m_VertexStreamsList = new ReorderableList(serializedObject, m_VertexStreams, true, true, true, true);
             m_VertexStreamsList.elementHeight = kReorderableListElementHeight;
             m_VertexStreamsList.headerHeight = 0;
             m_VertexStreamsList.onAddDropdownCallback = OnVertexStreamListAddDropdownCallback;
             m_VertexStreamsList.onCanRemoveCallback = OnVertexStreamListCanRemoveCallback;
-            m_VertexStreamsList.drawElementCallback = DrawVertexStreamListElementCallback;
+            m_VertexStreamsList.drawElementCallback = DrawParticleVertexStreamListElementCallback;
+
+            m_TrailVertexStreams = GetProperty0("m_TrailVertexStreams");
+            m_TrailVertexStreamsList = new ReorderableList(serializedObject, m_TrailVertexStreams, true, true, true, true);
+            m_TrailVertexStreamsList.elementHeight = kReorderableListElementHeight;
+            m_TrailVertexStreamsList.headerHeight = 0;
+            m_TrailVertexStreamsList.onAddDropdownCallback = OnTrailVertexStreamListAddDropdownCallback;
+            m_TrailVertexStreamsList.onCanRemoveCallback = OnVertexStreamListCanRemoveCallback;
+            m_TrailVertexStreamsList.drawElementCallback = DrawTrailVertexStreamListElementCallback;
 
             s_VisualizePivot = EditorPrefs.GetBool("VisualizePivot", false);
         }
@@ -338,8 +387,8 @@ override public void OnInspectorGUI(InitialModuleUI initial)
             // Ensure material count is set appropriately (handled in ParticleSystem.cpp BeginUpdate for instances, and handled here for prefabs, because prefabs don't necessarily get updated when viewing their inspectors (UUM-10035)
             foreach (ParticleSystem ps in m_ParticleSystemUI.m_ParticleSystems)
             {
-                if (ps.TryGetComponent<ParticleSystemRenderer>(out var psRrenderer))
-                    psRrenderer.ConfigureTrailMaterialSlot(ps.trails.enabled);
+                if (ps.TryGetComponent<ParticleSystemRenderer>(out var psr))
+                    psr.ConfigureTrailMaterialSlot(ps.trails.enabled);
             }
 
             var trailMaterial = serializedObject.FindProperty("m_Materials.Array.data[1]"); // Optional - may fail
@@ -439,7 +488,15 @@ override public void OnInspectorGUI(InitialModuleUI initial)
             if (renderMode != RenderMode.None)
             {
                 if (GUIToggle(s_Texts.useCustomVertexStreams, m_UseCustomVertexStreams))
-                    DoVertexStreamsGUI(renderMode);
+                {
+                    DoVertexStreamsGUI(m_VertexStreamsList, ref m_VertexStreamsStats, m_Material, renderMode);
+                }
+            }
+
+            if (trailMaterial != null) // Only show if the system has a second material slot
+            {
+                if (GUIToggle(s_Texts.useCustomTrailVertexStreams, m_UseCustomTrailVertexStreams))
+                    DoVertexStreamsGUI(m_TrailVertexStreamsList, ref m_TrailVertexStreamsStats, trailMaterial, renderMode);
             }
 
             EditorGUILayout.Space();
@@ -545,7 +602,7 @@ public StreamCallbackData(UnityEditorInternal.ReorderableList l, SerializedPrope
             public int stream;
         }
 
-        void SelectVertexStreamCallback(object obj)
+        private void SelectVertexStreamCallback(object obj)
         {
             StreamCallbackData data = (StreamCallbackData)obj;
 
@@ -557,18 +614,17 @@ void SelectVertexStreamCallback(object obj)
             m_ParticleSystemUI.m_RendererSerializedObject.ApplyModifiedProperties();
         }
 
-        private void DoVertexStreamsGUI(RenderMode renderMode)
+        private void DoVertexStreamsGUI(ReorderableList list, ref VertexStreamsStats stats, SerializedProperty serializedMaterial, RenderMode renderMode)
         {
             ParticleSystemRenderer renderer = m_ParticleSystemUI.m_ParticleSystems[0].GetComponent<ParticleSystemRenderer>();
+            bool hasGPUInstancing = false;
+            if (renderMode == RenderMode.Mesh && list == m_VertexStreamsList)
+                hasGPUInstancing = renderer.supportsMeshInstancing;
 
             // render list
-            m_NumTexCoords = 0;
-            m_TexCoordChannelIndex = 0;
-            m_NumInstancedStreams = 0;
-            m_HasTangent = false;
-            m_HasColor = false;
-            m_HasGPUInstancing = (renderMode == RenderMode.Mesh) ? renderer.supportsMeshInstancing : false;
-            m_VertexStreamsList.DoLayoutList();
+            stats = new VertexStreamsStats();
+            stats.m_HasGPUInstancing = hasGPUInstancing;
+            list.DoLayoutList();
 
             if (!m_ParticleSystemUI.multiEdit)
             {
@@ -576,12 +632,12 @@ private void DoVertexStreamsGUI(RenderMode renderMode)
                 string errors = "";
 
                 // check we have the same streams as the assigned shader
-                if (m_Material != null)
+                if (serializedMaterial != null)
                 {
-                    Material material = m_Material.objectReferenceValue as Material;
-                    int totalChannelCount = m_NumTexCoords * 4 + m_TexCoordChannelIndex;
+                    Material material = serializedMaterial.objectReferenceValue as Material;
+                    int totalChannelCount = stats.m_NumTexCoords * 4 + stats.m_TexCoordChannelIndex;
                     bool tangentError = false, colorError = false, uvError = false;
-                    bool anyErrors = ParticleSystem.CheckVertexStreamsMatchShader(m_HasTangent, m_HasColor, totalChannelCount, material, ref tangentError, ref colorError, ref uvError);
+                    bool anyErrors = ParticleSystem.CheckVertexStreamsMatchShader(stats.m_HasTangent, stats.m_HasColor, totalChannelCount, material, ref tangentError, ref colorError, ref uvError);
                     if (anyErrors)
                     {
                         errors += "Vertex streams do not match the shader inputs. Particle systems may not render correctly. Ensure your streams match and are used by the shader.";
@@ -596,7 +652,7 @@ private void DoVertexStreamsGUI(RenderMode renderMode)
 
                 // check we aren't using too many texcoords
                 int maxTexCoords = ParticleSystem.GetMaxTexCoordStreams();
-                if (m_NumTexCoords > maxTexCoords || (m_NumTexCoords == maxTexCoords && m_TexCoordChannelIndex > 0))
+                if (stats.m_NumTexCoords > maxTexCoords || (stats.m_NumTexCoords == maxTexCoords && stats.m_TexCoordChannelIndex > 0))
                 {
                     if (errors != "")
                         errors += "\n\n";
@@ -604,7 +660,7 @@ private void DoVertexStreamsGUI(RenderMode renderMode)
                 }
 
                 // check input meshes aren't using too many UV streams
-                if (renderMode == RenderMode.Mesh)
+                if (renderMode == RenderMode.Mesh && list == m_VertexStreamsList)
                 {
                     Mesh[] meshes = new Mesh[k_MaxNumMeshes];
                     int numMeshes = renderer.GetMeshes(meshes);
@@ -627,77 +683,107 @@ private void DoVertexStreamsGUI(RenderMode renderMode)
             }
         }
 
-        private void OnVertexStreamListAddDropdownCallback(Rect rect, UnityEditorInternal.ReorderableList list)
+        private void OnVertexStreamListAddDropdownCallback(Rect rect, ReorderableList list)
+        {
+            OnVertexStreamListAddDropdownCallbackInternal(rect, list, VertexStreamInfo.Mode.Particles);
+
+        }
+
+        private void OnTrailVertexStreamListAddDropdownCallback(Rect rect, ReorderableList list)
         {
-            List<int> notEnabled = new List<int>();
+            OnVertexStreamListAddDropdownCallbackInternal(rect, list, VertexStreamInfo.Mode.Trails);
+        }
+
+        private void OnVertexStreamListAddDropdownCallbackInternal(Rect rect, ReorderableList list, VertexStreamInfo.Mode mode)
+        {
+            SerializedProperty vertexStreams = list.serializedProperty;
+
+            var notEnabled = new List<int>();
             for (int i = 0; i < s_Texts.vertexStreamsPacked.Length; ++i)
             {
-                bool exists = false;
-                for (int j = 0; j < m_VertexStreams.arraySize; ++j)
+                if ((s_Texts.vertexStreamsPacked[i].mode & mode) != 0)
                 {
-                    if (m_VertexStreams.GetArrayElementAtIndex(j).intValue == i)
+                    bool exists = false;
+                    for (int j = 0; j < vertexStreams.arraySize; ++j)
                     {
-                        exists = true;
-                        break;
+                        if (vertexStreams.GetArrayElementAtIndex(j).intValue == i)
+                        {
+                            exists = true;
+                            break;
+                        }
                     }
-                }
 
-                if (!exists)
-                    notEnabled.Add(i);
+                    if (!exists)
+                        notEnabled.Add(i);
+                }
             }
 
             GenericMenu menu = new GenericMenu();
             for (int i = 0; i < notEnabled.Count; ++i)
-                menu.AddItem(s_Texts.vertexStreamsMenuContent[notEnabled[i]], false, SelectVertexStreamCallback, new StreamCallbackData(list, m_VertexStreams, notEnabled[i]));
+                menu.AddItem(s_Texts.vertexStreamsMenuContent[notEnabled[i]], false, SelectVertexStreamCallback, new StreamCallbackData(list, vertexStreams, notEnabled[i]));
             menu.ShowAsContext();
             Event.current.Use();
         }
 
-        private bool OnVertexStreamListCanRemoveCallback(ReorderableList list)
+        private static bool OnVertexStreamListCanRemoveCallback(ReorderableList list)
         {
+            SerializedProperty vertexStreams = list.serializedProperty;
+
             // dont allow position stream to be removed
-            SerializedProperty vertexStream = m_VertexStreams.GetArrayElementAtIndex(list.index);
-            return (s_Texts.vertexStreamsPacked[vertexStream.intValue] != "Position");
+            SerializedProperty vertexStream = vertexStreams.GetArrayElementAtIndex(list.index);
+            return (s_Texts.vertexStreamsPacked[vertexStream.intValue].name != "Position");
+        }
+
+        private void DrawParticleVertexStreamListElementCallback(Rect rect, int index, bool isActive, bool isFocused)
+        {
+            DrawVertexStreamListElementCallback(rect, index, isActive, isFocused, m_VertexStreamsList, m_VertexStreamsStats, isWindowView);
         }
 
-        private void DrawVertexStreamListElementCallback(Rect rect, int index, bool isActive, bool isFocused)
+        private void DrawTrailVertexStreamListElementCallback(Rect rect, int index, bool isActive, bool isFocused)
         {
-            SerializedProperty vertexStream = m_VertexStreams.GetArrayElementAtIndex(index);
+            DrawVertexStreamListElementCallback(rect, index, isActive, isFocused, m_TrailVertexStreamsList, m_TrailVertexStreamsStats, isWindowView);
+        }
+
+        private static void DrawVertexStreamListElementCallback(Rect rect, int index, bool isActive, bool isFocused, ReorderableList list, VertexStreamsStats stats, bool windowed)
+        {
+            SerializedProperty vertexStreams = list.serializedProperty;
+
+            SerializedProperty vertexStream = vertexStreams.GetArrayElementAtIndex(index);
             int vertexStreamValue = vertexStream.intValue;
-            string tcName = isWindowView ? "TEX" : "TEXCOORD";
-            string instancedName = isWindowView ? "INST" : "INSTANCED";
+            string tcName = windowed ? "TEX" : "TEXCOORD";
+            string instancedName = windowed ? "INST" : "INSTANCED";
 
             int numChannels = s_Texts.vertexStreamTexCoordChannels[vertexStreamValue];
-            if (m_HasGPUInstancing && (vertexStreamValue >= s_Texts.vertexStreamsInstancedStart || s_Texts.vertexStreamsPacked[vertexStream.intValue] == "Color"))
+            if (stats.m_HasGPUInstancing && (vertexStreamValue >= s_Texts.vertexStreamsInstancedStart || s_Texts.vertexStreamsPacked[vertexStream.intValue].name == "Color"))
             {
-                if (s_Texts.vertexStreamsPacked[vertexStream.intValue] == "Color")
+                if (s_Texts.vertexStreamsPacked[vertexStream.intValue].name == "Color")
                 {
                     numChannels = 4;
-                    m_HasColor = true;
+                    stats.m_HasColor = true;
                 }
                 string swizzle = s_Texts.channels.Substring(0, numChannels);
-                GUI.Label(rect, s_Texts.vertexStreamsPacked[vertexStreamValue] + " (" + instancedName + m_NumInstancedStreams + "." + swizzle + ")", ParticleSystemStyles.Get().label);
-                m_NumInstancedStreams++;
+                GUI.Label(rect, s_Texts.vertexStreamsPacked[vertexStreamValue].name + " (" + instancedName + stats.m_NumInstancedStreams + "." + swizzle + ")", ParticleSystemStyles.Get().label);
+                stats.m_NumInstancedStreams++;
             }
             else if (numChannels != 0)
             {
-                int swizzleLength = (m_TexCoordChannelIndex + numChannels > 4) ? numChannels + 1 : numChannels;
-                string swizzle = s_Texts.channels.Substring(m_TexCoordChannelIndex, swizzleLength);
-                GUI.Label(rect, s_Texts.vertexStreamsPacked[vertexStreamValue] + " (" + tcName + m_NumTexCoords + "." + swizzle + ")", ParticleSystemStyles.Get().label);
-                m_TexCoordChannelIndex += numChannels;
-                if (m_TexCoordChannelIndex >= 4)
+                int swizzleLength = (stats.m_TexCoordChannelIndex + numChannels > 4) ? numChannels + 1 : numChannels;
+                string swizzle = s_Texts.channels.Substring(stats.m_TexCoordChannelIndex, swizzleLength);
+                GUI.Label(rect, s_Texts.vertexStreamsPacked[vertexStreamValue].name + " (" + tcName + stats.m_NumTexCoords + "." + swizzle + ")", ParticleSystemStyles.Get().label);
+                stats.m_TexCoordChannelIndex += numChannels;
+                if (stats.m_TexCoordChannelIndex >= 4)
                 {
-                    m_TexCoordChannelIndex -= 4;
-                    m_NumTexCoords++;
+                    stats.m_TexCoordChannelIndex -= 4;
+                    stats.m_NumTexCoords++;
                 }
             }
             else
             {
-                GUI.Label(rect, s_Texts.vertexStreamsPacked[vertexStreamValue] + " (" + s_Texts.vertexStreamPackedTypes[vertexStreamValue] + ")", ParticleSystemStyles.Get().label);
-                if (s_Texts.vertexStreamsPacked[vertexStreamValue] == "Tangent")
-                    m_HasTangent = true;
-                if (s_Texts.vertexStreamsPacked[vertexStreamValue] == "Color")
-                    m_HasColor = true;
+                GUI.Label(rect, s_Texts.vertexStreamsPacked[vertexStreamValue].name + " (" + s_Texts.vertexStreamPackedTypes[vertexStreamValue] + ")", ParticleSystemStyles.Get().label);
+                if (s_Texts.vertexStreamsPacked[vertexStreamValue].name == "Tangent")
+                    stats.m_HasTangent = true;
+                if (s_Texts.vertexStreamsPacked[vertexStreamValue].name == "Color")
+                    stats.m_HasColor = true;
             }
         }
 
diff --git a/Modules/ParticleSystemEditor/ParticleSystemUI.cs b/Modules/ParticleSystemEditor/ParticleSystemUI.cs
index b4bdb5c107..ac998580a5 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemUI.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemUI.cs
@@ -45,12 +45,7 @@ public void Init(ParticleEffectUI owner, ParticleSystem[] systems)
 
             m_ParticleEffectUI = owner;
             m_ParticleSystems = systems;
-            // keep the same serializedObject here as it is already created and the PresetEditor will expect it to be the same.
-            // When the full editor is opened, customEditor is null and we need to create our own serialized object.
-            // No presets are involved in that case so it is safe to do so.
-            m_ParticleSystemSerializedObject = owner.m_Owner.customEditor == null
-                ? new SerializedObject(m_ParticleSystems)
-                : owner.m_Owner.customEditor.serializedObject;
+            m_ParticleSystemSerializedObject = new SerializedObject(m_ParticleSystems);
             m_RendererSerializedObject = null;
 
             m_SupportsCullingText = null;
diff --git a/Modules/Physics/ScriptBindings/Dynamics.bindings.cs b/Modules/Physics/ScriptBindings/Dynamics.bindings.cs
index a3b8ed4b9b..f3dc84d4c3 100644
--- a/Modules/Physics/ScriptBindings/Dynamics.bindings.cs
+++ b/Modules/Physics/ScriptBindings/Dynamics.bindings.cs
@@ -339,6 +339,13 @@ public partial class Collider : Component
         // Get/Set the Include Layers,
         extern public LayerMask includeLayers { get; set; }
 
+        extern public LowLevelPhysics.GeometryHolder GeometryHolder { get; }
+
+        public T GetGeometry<T>() where T : struct, LowLevelPhysics.IGeometry
+        {
+            return GeometryHolder.As<T>();
+        }
+
         [NativeMethod("Material")]
         extern public PhysicMaterial sharedMaterial { get; set; }
 
@@ -805,7 +812,7 @@ public int CapsuleCast(Vector3 point1, Vector3 point2, float radius, Vector3 dir
 
         [NativeName("OverlapCapsuleNonAlloc")]
         [StaticAccessor("GetPhysicsManager().GetPhysicsQuery()")]
-        extern private static int OverlapCapsuleNonAlloc_Internal(PhysicsScene physicsScene, Vector3 point0, Vector3 point1, float radius, Collider[] results, int layerMask, QueryTriggerInteraction queryTriggerInteraction);
+        extern private static int OverlapCapsuleNonAlloc_Internal(PhysicsScene physicsScene, Vector3 point0, Vector3 point1, float radius, [Unmarshalled] Collider[] results, int layerMask, QueryTriggerInteraction queryTriggerInteraction);
 
         public int OverlapCapsule(Vector3 point0, Vector3 point1, float radius, Collider[] results, [DefaultValue("AllLayers")] int layerMask = Physics.AllLayers, [DefaultValue("QueryTriggerInteraction.UseGlobal")] QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal)
         {
@@ -855,7 +862,7 @@ public int SphereCast(Vector3 origin, float radius, Vector3 direction, RaycastHi
 
         [NativeName("OverlapSphereNonAlloc")]
         [StaticAccessor("GetPhysicsManager().GetPhysicsQuery()")]
-        extern private static int OverlapSphereNonAlloc_Internal(PhysicsScene physicsScene, Vector3 position, float radius, Collider[] results, int layerMask, QueryTriggerInteraction queryTriggerInteraction);
+        extern private static int OverlapSphereNonAlloc_Internal(PhysicsScene physicsScene, Vector3 position, float radius, [Unmarshalled] Collider[] results, int layerMask, QueryTriggerInteraction queryTriggerInteraction);
 
         public int OverlapSphere(Vector3 position, float radius, Collider[] results, [DefaultValue("AllLayers")] int layerMask, [DefaultValue("QueryTriggerInteraction.UseGlobal")] QueryTriggerInteraction queryTriggerInteraction)
         {
@@ -893,7 +900,7 @@ public bool BoxCast(Vector3 center, Vector3 halfExtents, Vector3 direction, out
 
         [NativeName("OverlapBoxNonAlloc")]
         [StaticAccessor("GetPhysicsManager().GetPhysicsQuery()")]
-        extern private static int OverlapBoxNonAlloc_Internal(PhysicsScene physicsScene, Vector3 center, Vector3 halfExtents, Collider[] results, Quaternion orientation, int mask, QueryTriggerInteraction queryTriggerInteraction);
+        extern private static int OverlapBoxNonAlloc_Internal(PhysicsScene physicsScene, Vector3 center, Vector3 halfExtents, [Unmarshalled] Collider[] results, Quaternion orientation, int mask, QueryTriggerInteraction queryTriggerInteraction);
 
         public int OverlapBox(Vector3 center, Vector3 halfExtents, Collider[] results, [DefaultValue("Quaternion.identity")] Quaternion orientation, [DefaultValue("DefaultRaycastLayers")] int layerMask = Physics.DefaultRaycastLayers, [DefaultValue("QueryTriggerInteraction.UseGlobal")] QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal)
         {
@@ -1930,25 +1937,6 @@ public static int OverlapCapsuleNonAlloc(Vector3 point0, Vector3 point1, float r
             return OverlapCapsuleNonAlloc(point0, point1, radius, results, AllLayers, QueryTriggerInteraction.UseGlobal);
         }
 
-        [NativeName("RebuildBroadphaseRegions")]
-        [StaticAccessor("GetPhysicsManager()")]
-        private static extern void Internal_RebuildBroadphaseRegions(Bounds bounds, int subdivisions);
-
-        public static void RebuildBroadphaseRegions(Bounds worldBounds, int subdivisions)
-        {
-            if (subdivisions < 1 || subdivisions > 16)
-            {
-                throw new ArgumentException("Physics.RebuildBroadphaseRegions requires the subdivisions to be greater than zero and less than 17.");
-            }
-
-            if (worldBounds.extents.x <= 0 || worldBounds.extents.y <= 0 || worldBounds.extents.z <= 0)
-            {
-                throw new ArgumentException("Physics.RebuildBroadphaseRegions requires the world bounds to be non-empty, and have positive extents.");
-            }
-
-            Internal_RebuildBroadphaseRegions(worldBounds, subdivisions);
-        }
-
         [StaticAccessor("GetPhysicsManager()")]
         [ThreadSafe]
         public static extern void BakeMesh(int meshID, bool convex, MeshColliderCookingOptions cookingOptions);
diff --git a/Modules/Physics/ScriptBindings/Dynamics.deprecated.cs b/Modules/Physics/ScriptBindings/Dynamics.deprecated.cs
index 41749f0d25..45f4f0889d 100644
--- a/Modules/Physics/ScriptBindings/Dynamics.deprecated.cs
+++ b/Modules/Physics/ScriptBindings/Dynamics.deprecated.cs
@@ -151,6 +151,12 @@ public static bool autoSimulation
             get { return simulationMode != SimulationMode.Script; }
             set { simulationMode = value ? SimulationMode.FixedUpdate : SimulationMode.Script; }
         }
+
+        [Obsolete("Physics.RebuildBroadphaseRegions has been deprecated alongside Multi Box Pruning. Use Automatic Box Pruning instead.", false)]
+        public static void RebuildBroadphaseRegions(Bounds worldBounds, int subdivisions)
+        {
+            return;
+        }
     }
 
     // The [[ConfigurableJoint]] attempts to attain position / velocity targets based on this flag
diff --git a/Modules/Physics/ScriptBindings/ImmediatePhysics.bindings.cs b/Modules/Physics/ScriptBindings/ImmediatePhysics.bindings.cs
new file mode 100644
index 0000000000..4b393bccb0
--- /dev/null
+++ b/Modules/Physics/ScriptBindings/ImmediatePhysics.bindings.cs
@@ -0,0 +1,80 @@
+// 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.Runtime.InteropServices;
+using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
+
+namespace UnityEngine.LowLevelPhysics
+{
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ImmediateTransform
+    {
+        private Quaternion m_Rotation;
+        private Vector3 m_Position;
+
+        public Quaternion Rotation { get { return m_Rotation; } set { m_Rotation = value; } }
+        public Vector3 Position { get { return m_Position; } set { m_Position = value; } }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ImmediateContact
+    {
+        private Vector3 m_Normal;
+        private float m_Separation;
+        private Vector3 m_Point;
+
+        private float m_MaxImpulse;
+        private Vector3 m_TargetVel;
+        private float m_StaticFriction;
+        private byte m_MaterialFlags;
+        private byte m_Pad;
+        private ushort m_InternalUse;
+        private uint m_InternalFaceIndex1;
+        private float m_DynamicFriction;
+        private float m_Restitution;
+
+        public Vector3 Normal { get { return m_Normal; } set { m_Normal = value; } }
+        public float Separation { get { return m_Separation; } set { m_Separation = value; } }
+        public Vector3 Point { get { return m_Point; } set { m_Point = value; } }
+    }
+
+    [NativeHeader("Modules/Physics/ImmediatePhysics.h")]
+    public static class ImmediatePhysics
+    {
+        [FreeFunction("Unity::Physics::GenerateContacts", isThreadSafe: true)]
+        private static unsafe extern int GenerateContacts_Native(void* geom1, void* geom2, void* xform1, void* xform2, int numPairs, void* contacts, int contactArrayLength, void* sizes, int sizesArrayLength, float contactDistance);
+
+        public unsafe static int GenerateContacts(NativeArray<GeometryHolder>.ReadOnly geom1, NativeArray<GeometryHolder>.ReadOnly geom2,
+            NativeArray<ImmediateTransform>.ReadOnly xform1, NativeArray<ImmediateTransform>.ReadOnly xform2, int pairCount,
+            NativeArray<ImmediateContact> outContacts, NativeArray<int> outContactCounts, float contactDistance = 0.01f)
+        {
+            if (geom1.Length < pairCount ||
+                geom2.Length < pairCount ||
+                xform1.Length < pairCount ||
+                xform2.Length < pairCount)
+                throw new ArgumentException("Provided geometry or transform arrays are not large enough to fit the count of pairs.");
+
+            if (pairCount > outContactCounts.Length)
+                throw new ArgumentException("The output contact counts array is not big enough. The size of the array needs to match or exceed the amount of pairs.");
+
+            if (contactDistance <= 0)
+                throw new ArgumentException("Contact distance must be positive and not equal to zero.");
+
+            return GenerateContacts_Native(
+                geom1.GetUnsafeReadOnlyPtr(),
+                geom2.GetUnsafeReadOnlyPtr(),
+                xform1.GetUnsafeReadOnlyPtr(),
+                xform2.GetUnsafeReadOnlyPtr(),
+                pairCount,
+                outContacts.GetUnsafePtr(),
+                outContacts.Length,
+                outContactCounts.GetUnsafePtr(),
+                outContactCounts.Length,
+                contactDistance);
+        }
+    }
+}
diff --git a/Modules/Physics/ScriptBindings/PhysicsGeometry.bindings.cs b/Modules/Physics/ScriptBindings/PhysicsGeometry.bindings.cs
new file mode 100644
index 0000000000..a52cf0a4b4
--- /dev/null
+++ b/Modules/Physics/ScriptBindings/PhysicsGeometry.bindings.cs
@@ -0,0 +1,171 @@
+// 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.LowLevel.Unsafe;
+
+namespace UnityEngine.LowLevelPhysics
+{
+    public interface IGeometry
+    {
+        GeometryType GeometryType { get; }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct BoxGeometry : IGeometry
+    {
+        private Vector3 m_HalfExtents;
+
+        public Vector3 HalfExtents { get { return m_HalfExtents; } set { m_HalfExtents = value; } }
+
+        public BoxGeometry(Vector3 halfExtents)
+        {
+            m_HalfExtents = halfExtents;
+        }
+
+        public GeometryType GeometryType => GeometryType.Box;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct SphereGeometry : IGeometry
+    {
+        private float m_Radius;
+
+        public float Radius { get { return m_Radius; } set { m_Radius = value; } }
+
+        public SphereGeometry(float radius)
+        {
+            m_Radius = radius;
+        }
+
+        public GeometryType GeometryType => GeometryType.Sphere;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct CapsuleGeometry : IGeometry
+    {
+        private float m_Radius;
+        private float m_HalfLength;
+
+        public float Radius { get { return m_Radius; } set { m_Radius = value; } }
+        public float HalfLength { get { return m_HalfLength; } set { m_HalfLength = value; } }
+
+        public CapsuleGeometry(float radius, float halfLength)
+        {
+            m_Radius = radius;
+            m_HalfLength = halfLength;
+        }
+
+        public GeometryType GeometryType => GeometryType.Capsule;
+    }
+
+    // From PxConvexMeshGeometry.h
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ConvexMeshGeometry : IGeometry
+    {
+        private Vector3 m_Scale;
+        private Quaternion m_Rotation;
+        private IntPtr m_ConvexMesh;
+        private byte m_MeshFlags;
+        private byte pad1;
+        private short pad2;
+        private uint pad3;
+
+        public Vector3 Scale { get { return m_Scale; } set { m_Scale = value; } }
+        public Quaternion ScaleAxisRotation { get { return m_Rotation; } set { m_Rotation = value; } }
+
+        public GeometryType GeometryType => GeometryType.ConvexMesh;
+    }
+
+    // From PxTriangleMeshGeometry.h
+    [StructLayout(LayoutKind.Sequential)]
+    public struct TriangleMeshGeometry : IGeometry
+    {
+        private Vector3 m_Scale;
+        private Quaternion m_Rotation;
+        private byte m_MeshFlags;
+        private byte pad1;
+        private short pad2;
+        private IntPtr m_TriangleMesh;
+        private uint pad3;
+
+        public Vector3 Scale { get { return m_Scale; } set { m_Scale = value; } }
+        public Quaternion ScaleAxisRotation { get { return m_Rotation; } set { m_Rotation = value; } }
+
+        public GeometryType GeometryType => GeometryType.TriangleMesh;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct TerrainGeometry : IGeometry
+    {
+        private IntPtr m_TerrainData;
+        private float m_HeightScale;
+        private float m_RowScale;
+        private float m_ColumnScale;
+        private byte m_TerrainFlags;
+        private byte pad1;
+        private short pad2;
+        private uint pad3;
+
+        public GeometryType GeometryType => GeometryType.Terrain;
+    }
+
+    public enum GeometryType : int
+    {
+        Sphere = 0,
+        Capsule = 2,
+        Box = 3,
+        ConvexMesh = 4,
+        TriangleMesh = 5,
+        Terrain = 6,
+        Invalid = -1
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct GeometryHolder
+    {
+                                                //   32  |   64
+        private GeometryType m_Type;            //  0-4  |  0-4
+        private UInt32 m_DataStart;             //  4-8  |  4-8
+        private IntPtr m_FakePointer0;          //  8-12 |  8-16
+        private IntPtr m_FakePointer1;          // 12-16 | 16-24
+        private fixed UInt32 m_Blob[6];         // 16-40 | 24-48
+
+        public GeometryHolder()
+        {
+            m_DataStart = 0;
+            m_Type = GeometryType.Invalid;
+            m_FakePointer0 = new IntPtr(0xDEADBEEF);
+            m_FakePointer1 = new IntPtr(0xDEADBEEF);
+        }
+
+        private void SetGeometry<T>(T geometry) where T : struct, IGeometry
+        {
+            m_Type = geometry.GeometryType;
+            UnsafeUtility.CopyStructureToPtr(ref geometry, UnsafeUtility.AddressOf(ref m_DataStart));
+        }
+
+        public T As<T>() where T : struct, IGeometry
+        {
+            T geometry = default(T);
+
+            if (geometry.GeometryType != m_Type)
+                throw new InvalidOperationException($"Unable to get geometry of type {geometry.GeometryType} from a geometry holder that stores {m_Type}.");
+
+            UnsafeUtility.CopyPtrToStructure(UnsafeUtility.AddressOf(ref m_DataStart), out geometry);
+
+            return geometry;
+        }
+
+        public static GeometryHolder Create<T>(T geometry) where T : struct, IGeometry
+        {
+            GeometryHolder holder = new GeometryHolder();
+            holder.SetGeometry<T>(geometry);
+            return holder;
+        }
+
+        public GeometryType Type { get { return m_Type; } }
+    }
+}
diff --git a/Modules/Physics2D/ScriptBindings/Physics2D.bindings.cs b/Modules/Physics2D/ScriptBindings/Physics2D.bindings.cs
index bd9931502d..55950533c9 100644
--- a/Modules/Physics2D/ScriptBindings/Physics2D.bindings.cs
+++ b/Modules/Physics2D/ScriptBindings/Physics2D.bindings.cs
@@ -366,7 +366,7 @@ public int OverlapPoint(Vector2 point, ContactFilter2D contactFilter, List<Colli
 
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("OverlapPointArray_Binding")]
-        extern private static int OverlapPointArray_Internal(PhysicsScene2D physicsScene, Vector2 point, ContactFilter2D contactFilter, [NotNull] Collider2D[] results);
+        extern private static int OverlapPointArray_Internal(PhysicsScene2D physicsScene, Vector2 point, ContactFilter2D contactFilter, [NotNull][Unmarshalled] Collider2D[] results);
 
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("OverlapPointList_Binding")]
@@ -409,7 +409,7 @@ public int OverlapCircle(Vector2 point, float radius, ContactFilter2D contactFil
 
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("OverlapCircleArray_Binding")]
-        extern private static int OverlapCircleArray_Internal(PhysicsScene2D physicsScene, Vector2 point, float radius, ContactFilter2D contactFilter, [NotNull] Collider2D[] results);
+        extern private static int OverlapCircleArray_Internal(PhysicsScene2D physicsScene, Vector2 point, float radius, ContactFilter2D contactFilter, [NotNull][Unmarshalled] Collider2D[] results);
 
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("OverlapCircleList_Binding")]
@@ -452,7 +452,7 @@ public int OverlapBox(Vector2 point, Vector2 size, float angle, ContactFilter2D
 
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("OverlapBoxArray_Binding")]
-        extern private static int OverlapBoxArray_Internal(PhysicsScene2D physicsScene, Vector2 point, Vector2 size, float angle, ContactFilter2D contactFilter, [NotNull] Collider2D[] results);
+        extern private static int OverlapBoxArray_Internal(PhysicsScene2D physicsScene, Vector2 point, Vector2 size, float angle, ContactFilter2D contactFilter, [NotNull][Unmarshalled] Collider2D[] results);
 
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("OverlapBoxList_Binding")]
@@ -547,7 +547,7 @@ public int OverlapCapsule(Vector2 point, Vector2 size, CapsuleDirection2D direct
 
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("OverlapCapsuleArray_Binding")]
-        extern private static int OverlapCapsuleArray_Internal(PhysicsScene2D physicsScene, Vector2 point, Vector2 size, CapsuleDirection2D direction, float angle, ContactFilter2D contactFilter, [NotNull] Collider2D[] results);
+        extern private static int OverlapCapsuleArray_Internal(PhysicsScene2D physicsScene, Vector2 point, Vector2 size, CapsuleDirection2D direction, float angle, ContactFilter2D contactFilter, [NotNull] [Unmarshalled] Collider2D[] results);
 
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("OverlapCapsuleList_Binding")]
@@ -595,7 +595,7 @@ public static int OverlapCollider(Vector2 position, float angle, Collider2D coll
 
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("OverlapColliderFilteredArray_Binding")]
-        extern private static int OverlapColliderFilteredArray_Internal([NotNull] Collider2D collider, ContactFilter2D contactFilter, [NotNull] Collider2D[] results);
+        extern private static int OverlapColliderFilteredArray_Internal([NotNull] Collider2D collider, ContactFilter2D contactFilter, [NotNull] [Unmarshalled] Collider2D[] results);
 
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("OverlapColliderList_Binding")]
@@ -1486,7 +1486,7 @@ public static Collider2D OverlapPoint(Vector2 point, [DefaultValue("DefaultRayca
         }
 
         // Returns all colliders overlapping the point (limited by the size of the array) but filters using ContactFilter2D.  This does not produce any garbage.
-        public static int OverlapPoint(Vector2 point, ContactFilter2D contactFilter, Collider2D[] results)
+        public static int OverlapPoint(Vector2 point, ContactFilter2D contactFilter, [Unmarshalled] Collider2D[] results)
         {
             return defaultPhysicsScene.OverlapPoint(point, contactFilter, results);
         }
@@ -1918,12 +1918,12 @@ public static int GetContacts(Rigidbody2D rigidbody, ContactFilter2D contactFilt
         // Gets contacting colliders for the specified collider (non-allocating) - Colliders Only.
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("GetColliderContactsCollidersOnlyArray_Binding")]
-        extern private static int GetColliderContactsCollidersOnlyArray([NotNull] Collider2D collider, ContactFilter2D contactFilter, [NotNull] Collider2D[] results);
+        extern private static int GetColliderContactsCollidersOnlyArray([NotNull] Collider2D collider, ContactFilter2D contactFilter, [NotNull] [Unmarshalled] Collider2D[] results);
 
         // Gets contacting colliders for the specified rigidbody (non-allocating) - Colliders Only.
         [StaticAccessor("PhysicsQuery2D", StaticAccessorType.DoubleColon)]
         [NativeMethod("GetRigidbodyContactsCollidersOnlyArray_Binding")]
-        extern private static int GetRigidbodyContactsCollidersOnlyArray([NotNull] Rigidbody2D rigidbody, ContactFilter2D contactFilter, [NotNull] Collider2D[] results);
+        extern private static int GetRigidbodyContactsCollidersOnlyArray([NotNull] Rigidbody2D rigidbody, ContactFilter2D contactFilter, [NotNull] [Unmarshalled] Collider2D[] results);
 
         #endregion
 
@@ -3789,7 +3789,7 @@ public int Overlap(Vector2 position, float angle, ContactFilter2D contactFilter,
         }
 
         [NativeMethod("GetAttachedCollidersArray_Binding")]
-        extern private int GetAttachedCollidersArray_Internal([NotNull] Collider2D[] results, bool findTriggers);
+        extern private int GetAttachedCollidersArray_Internal([NotNull] [Unmarshalled] Collider2D[] results, bool findTriggers);
 
         [NativeMethod("GetAttachedCollidersList_Binding")]
         extern private int GetAttachedCollidersList_Internal([NotNull] List<Collider2D> results, bool findTriggers);
@@ -3816,7 +3816,7 @@ public int Overlap(Vector2 position, float angle, ContactFilter2D contactFilter,
         extern private int CastFromFiltered_Internal(Vector2 position, float angle, Vector2 direction, float distance, ContactFilter2D contactFilter, [NotNull] List<RaycastHit2D> results);
 
         [NativeMethod("OverlapArray_Binding")]
-        extern private int OverlapArray_Internal(ContactFilter2D contactFilter, [NotNull] Collider2D[] results);
+        extern private int OverlapArray_Internal(ContactFilter2D contactFilter, [NotNull][Unmarshalled] Collider2D[] results);
 
         [NativeMethod("OverlapList_Binding")]
         extern private int OverlapList_Internal([NotNull] List<Collider2D> results);
@@ -3840,6 +3840,9 @@ public int Overlap(Vector2 position, float angle, ContactFilter2D contactFilter,
     [RequiredByNativeCode(Optional = true)]
     public partial class Collider2D : Behaviour
     {
+        // The composition operation.
+        public enum CompositeOperation { None = 0, Merge = 1, Intersect = 2, Difference = 3, Flip = 4 };
+
         // The density of the collider.
         extern public float density { get; set; }
 
@@ -3849,8 +3852,11 @@ public partial class Collider2D : Behaviour
         // Whether the collider is used by an attached effector or not.
         extern public bool usedByEffector { get; set; }
 
-        // Whether the collider can be used by an attached composite collider or not.
-        extern public bool usedByComposite { get; set; }
+        // Set the composite operation to be used by an attached composite collider.
+        extern public CompositeOperation compositeOperation { get; set; }
+
+        // The composite operation order. Lower values are executed earlier than higher values. Same values result in an undefined composite operation order.
+        extern public int compositeOrder { get; set; }
 
         // Gets the attached composite.
         extern public CompositeCollider2D composite { get; }
@@ -3912,7 +3918,7 @@ public int GetShapes(PhysicsShapeGroup2D physicsShapeGroup, int shapeIndex, [Def
         extern public ColliderErrorState2D errorState { get; }
 
         // Is the collider capable of being composited?
-        extern internal bool compositeCapable {[NativeMethod("GetCompositeCapable_Binding")] get; }
+        extern public bool compositeCapable {[NativeMethod("GetCompositeCapable_Binding")] get; }
 
         // The shared physics material of this collider.
         extern public PhysicsMaterial2D sharedMaterial
@@ -4582,6 +4588,10 @@ public enum GenerationType { Synchronous = 0, Manual = 1 }
         // Generates the geometry if using manual generation type.
         extern public void GenerateGeometry();
 
+        // Get a list of composited colliders.
+        [NativeMethod("GetCompositedColliders_Binding")]
+        extern public int GetCompositedColliders([NotNull] List<Collider2D> colliders);
+
         // Gets the count of points in the specified path.
         public int GetPathPointCount(int index)
         {
diff --git a/Modules/Physics2D/ScriptBindings/Physics2D.deprecated.cs b/Modules/Physics2D/ScriptBindings/Physics2D.deprecated.cs
index 738602ebf4..fbfbc3646f 100644
--- a/Modules/Physics2D/ScriptBindings/Physics2D.deprecated.cs
+++ b/Modules/Physics2D/ScriptBindings/Physics2D.deprecated.cs
@@ -38,6 +38,11 @@ partial class Collider2D
         [Obsolete("OverlapCollider has been renamed to Overlap (UnityUpgradable) -> Overlap(*)", false)]
         [ExcludeFromDocs]
         public int OverlapCollider(ContactFilter2D contactFilter, List<Collider2D> results) { return Overlap(contactFilter, results); }
+
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        [Obsolete("usedByComposite has been deprecated. Use Collider2D.compositeOperation instead", false)]
+        [ExcludeFromDocs]
+        public bool usedByComposite { get { return compositeOperation != CompositeOperation.None; } set { compositeOperation = value ? CompositeOperation.Merge : CompositeOperation.None; } }
     }
 
     partial class CircleCollider2D
@@ -596,3 +601,4 @@ public static int OverlapCapsuleNonAlloc(Vector2 point, Vector2 size, CapsuleDir
         #endregion
     }
 }
+
diff --git a/Modules/Physics2DEditor/Managed/Colliders/BoxCollider2DEditor.cs b/Modules/Physics2DEditor/Managed/Colliders/BoxCollider2DEditor.cs
index 655cd0cb98..f3f6a0aa04 100644
--- a/Modules/Physics2DEditor/Managed/Colliders/BoxCollider2DEditor.cs
+++ b/Modules/Physics2DEditor/Managed/Colliders/BoxCollider2DEditor.cs
@@ -14,7 +14,6 @@ class BoxCollider2DEditor : Collider2DEditorBase
     {
         SerializedProperty m_Size;
         SerializedProperty m_EdgeRadius;
-        SerializedProperty m_UsedByComposite;
         readonly AnimBool m_ShowCompositeRedundants = new AnimBool();
 
         public override void OnEnable()
@@ -23,9 +22,8 @@ public override void OnEnable()
 
             m_Size = serializedObject.FindProperty("m_Size");
             m_EdgeRadius = serializedObject.FindProperty("m_EdgeRadius");
-            m_UsedByComposite = serializedObject.FindProperty("m_UsedByComposite");
             m_AutoTiling = serializedObject.FindProperty("m_AutoTiling");
-            m_ShowCompositeRedundants.value = !m_UsedByComposite.boolValue;
+            m_ShowCompositeRedundants.value = !isUsedByComposite;
             m_ShowCompositeRedundants.valueChanged.AddListener(Repaint);
         }
 
@@ -57,7 +55,7 @@ public override void OnInspectorGUI()
 
             EditorGUILayout.PropertyField(m_Size);
 
-            m_ShowCompositeRedundants.target = !m_UsedByComposite.boolValue;
+            m_ShowCompositeRedundants.target = !isUsedByComposite;
             if (EditorGUILayout.BeginFadeGroup(m_ShowCompositeRedundants.faded))
                 EditorGUILayout.PropertyField(m_EdgeRadius);
             EditorGUILayout.EndFadeGroup();
diff --git a/Modules/Physics2DEditor/Managed/Colliders/BoxCollider2DTool.cs b/Modules/Physics2DEditor/Managed/Colliders/BoxCollider2DTool.cs
index 4d06c806b2..1f236473dc 100644
--- a/Modules/Physics2DEditor/Managed/Colliders/BoxCollider2DTool.cs
+++ b/Modules/Physics2DEditor/Managed/Colliders/BoxCollider2DTool.cs
@@ -33,7 +33,7 @@ public override void OnToolGUI(EditorWindow window)
                 handleMatrix.SetRow(1, Vector4.Scale(handleMatrix.GetRow(1), new Vector4(1f, 1f, 0f, 1f)));
                 handleMatrix.SetRow(2, new Vector4(0f, 0f, 1f, collider.transform.position.z));
 
-                if (collider.usedByComposite && collider.composite != null)
+                if (collider.compositeOperation != Collider2D.CompositeOperation.None && collider.composite != null)
                 {
                     // composite offset is rotated by composite's transformation matrix and projected back onto 2D plane
                     var compositeOffset = collider.composite.transform.rotation * collider.composite.offset;
diff --git a/Modules/Physics2DEditor/Managed/Colliders/CircleCollider2DEditor.cs b/Modules/Physics2DEditor/Managed/Colliders/CircleCollider2DEditor.cs
index 62a7a455f6..745dc8dabe 100644
--- a/Modules/Physics2DEditor/Managed/Colliders/CircleCollider2DEditor.cs
+++ b/Modules/Physics2DEditor/Managed/Colliders/CircleCollider2DEditor.cs
@@ -2,8 +2,6 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using UnityEditor.EditorTools;
-using UnityEditor.IMGUI.Controls;
 using UnityEngine;
 
 namespace UnityEditor
diff --git a/Modules/Physics2DEditor/Managed/Colliders/Collider2DEditorBase.cs b/Modules/Physics2DEditor/Managed/Colliders/Collider2DEditorBase.cs
index 575ae972b6..d71614c6f7 100644
--- a/Modules/Physics2DEditor/Managed/Colliders/Collider2DEditorBase.cs
+++ b/Modules/Physics2DEditor/Managed/Colliders/Collider2DEditorBase.cs
@@ -34,7 +34,8 @@ protected class Styles
         private SerializedProperty m_Material;
         private SerializedProperty m_IsTrigger;
         private SerializedProperty m_UsedByEffector;
-        private SerializedProperty m_UsedByComposite;
+        private SerializedProperty m_CompositeOperation;
+        private SerializedProperty m_CompositeOrder;
         private SerializedProperty m_Offset;
         protected SerializedProperty m_AutoTiling;
         private SerializedProperty m_LayerOverridePriority;
@@ -70,7 +71,8 @@ public virtual void OnEnable()
             m_Material = serializedObject.FindProperty("m_Material");
             m_IsTrigger = serializedObject.FindProperty("m_IsTrigger");
             m_UsedByEffector = serializedObject.FindProperty("m_UsedByEffector");
-            m_UsedByComposite = serializedObject.FindProperty("m_UsedByComposite");
+            m_CompositeOperation = serializedObject.FindProperty("m_CompositeOperation");
+            m_CompositeOrder = serializedObject.FindProperty("m_CompositeOrder");
             m_Offset = serializedObject.FindProperty("m_Offset");
             m_AutoTiling = serializedObject.FindProperty("m_AutoTiling");
             m_LayerOverridePriority = serializedObject.FindProperty("m_LayerOverridePriority");
@@ -81,12 +83,14 @@ public virtual void OnEnable()
             m_ContactCaptureLayers = serializedObject.FindProperty("m_ContactCaptureLayers");
             m_CallbackLayers = serializedObject.FindProperty("m_CallbackLayers");
 
-            m_ShowCompositeRedundants.value = !m_UsedByComposite.boolValue;
+            m_ShowCompositeRedundants.value = !isUsedByComposite;
             m_ShowCompositeRedundants.valueChanged.AddListener(Repaint);
 
             m_RequiresConstantRepaint = false;
         }
 
+        protected bool isUsedByComposite => ((Collider2D.CompositeOperation)m_CompositeOperation.enumValueIndex) != Collider2D.CompositeOperation.None;
+
         public virtual void OnDisable()
         {
             m_ShowDensity.valueChanged.RemoveListener(Repaint);
@@ -101,7 +105,7 @@ public virtual void OnDisable()
 
         public override void OnInspectorGUI()
         {
-            m_ShowCompositeRedundants.target = !m_UsedByComposite.boolValue;
+            m_ShowCompositeRedundants.target = !isUsedByComposite;
             if (EditorGUILayout.BeginFadeGroup(m_ShowCompositeRedundants.faded))
             {
                 // Density property.
@@ -116,13 +120,19 @@ public override void OnInspectorGUI()
             }
             EditorGUILayout.EndFadeGroup();
 
-            // Only show 'Used By Composite' if all targets are capable of being composited.
-            if (targets.Count(x => (x as Collider2D).compositeCapable == false) == 0)
-                EditorGUILayout.PropertyField(m_UsedByComposite);
-
             if (m_AutoTiling != null)
                 EditorGUILayout.PropertyField(m_AutoTiling, Styles.s_AutoTilingLabel);
 
+            // Only show 'Composite Operation' if all targets are capable of being composited.
+            if (targets.Count(x => (x as Collider2D).compositeCapable == false) == 0)
+            {
+                EditorGUILayout.PropertyField(m_CompositeOperation);
+                if (isUsedByComposite)
+                {
+                    EditorGUILayout.PropertyField(m_CompositeOrder);
+                }
+            }
+
             EditorGUILayout.PropertyField(m_Offset);
         }
 
@@ -138,7 +148,7 @@ public void FinalizeInspectorGUI()
             if (targets.Length == 1)
             {
                 var collider = target as Collider2D;
-                if (collider.isActiveAndEnabled && collider.composite == null && m_UsedByComposite.boolValue)
+                if (collider.isActiveAndEnabled && collider.composite == null && isUsedByComposite)
                     EditorGUILayout.HelpBox("This collider will not function with a composite until there is a CompositeCollider2D on the GameObject that the attached Rigidbody2D is on.", MessageType.Warning);
             }
 
diff --git a/Editor/Mono/Inspector/LineHandle.cs b/Modules/Physics2DEditor/Managed/Colliders/EditableLineHandle2D.cs
similarity index 97%
rename from Editor/Mono/Inspector/LineHandle.cs
rename to Modules/Physics2DEditor/Managed/Colliders/EditableLineHandle2D.cs
index be35a3253d..ef0ebac054 100644
--- a/Editor/Mono/Inspector/LineHandle.cs
+++ b/Modules/Physics2DEditor/Managed/Colliders/EditableLineHandle2D.cs
@@ -8,7 +8,7 @@
 
 namespace UnityEditor
 {
-    class LineHandle
+    class EditableLineHandle2D
     {
         public enum LineIntersectionHighlight
         {
@@ -42,7 +42,7 @@ public Vector3[] points
             set => m_Points = value;
         }
 
-        public LineHandle(IList<Vector2> points, bool loop, int minPointCount, LineIntersectionHighlight intersectionHighlight = LineIntersectionHighlight.None)
+        public EditableLineHandle2D(IList<Vector2> points, bool loop, int minPointCount, LineIntersectionHighlight intersectionHighlight = LineIntersectionHighlight.None)
         {
             int count = points.Count;
             m_Points = new Vector3[count];
@@ -53,7 +53,7 @@ public LineHandle(IList<Vector2> points, bool loop, int minPointCount, LineInter
             m_IntersectionHighlight = intersectionHighlight;
         }
 
-        public LineHandle(IList<Vector3> points, bool loop, int minPointCount, LineIntersectionHighlight intersectionHighlight = LineIntersectionHighlight.None)
+        public EditableLineHandle2D(IList<Vector3> points, bool loop, int minPointCount, LineIntersectionHighlight intersectionHighlight = LineIntersectionHighlight.None)
         {
             int count = points.Count;
             m_Points = new Vector3[count];
diff --git a/Modules/Physics2DEditor/Managed/Colliders/EditablePath2D.cs b/Modules/Physics2DEditor/Managed/Colliders/EditablePath2D.cs
index 2fca34ccfa..732952ac58 100644
--- a/Modules/Physics2DEditor/Managed/Colliders/EditablePath2D.cs
+++ b/Modules/Physics2DEditor/Managed/Colliders/EditablePath2D.cs
@@ -11,8 +11,8 @@ namespace UnityEditor
 {
     abstract class EditablePath2D
     {
-        LineHandle m_Handle;
-        public LineHandle handle => m_Handle;
+        EditableLineHandle2D m_Handle;
+        public EditableLineHandle2D handle => m_Handle;
 
         public abstract IList<Vector2> GetPoints();
         public abstract void SetPoints(Vector3[] points);
@@ -20,7 +20,7 @@ abstract class EditablePath2D
 
         protected EditablePath2D(bool loop, int pointCount, int minPointCount)
         {
-            m_Handle = new LineHandle(new Vector3[pointCount], loop, minPointCount, LineHandle.LineIntersectionHighlight.Always);
+            m_Handle = new EditableLineHandle2D(new Vector3[pointCount], loop, minPointCount, EditableLineHandle2D.LineIntersectionHighlight.Always);
         }
 
         public void Update()
diff --git a/Modules/Physics2DEditor/Managed/Colliders/PolygonCollider2DTool.cs b/Modules/Physics2DEditor/Managed/Colliders/PolygonCollider2DTool.cs
index 1f1f36f089..6117937f38 100644
--- a/Modules/Physics2DEditor/Managed/Colliders/PolygonCollider2DTool.cs
+++ b/Modules/Physics2DEditor/Managed/Colliders/PolygonCollider2DTool.cs
@@ -35,7 +35,7 @@ class PolygonColliderPath : EditablePath2D
     {
         public PolygonCollider2D m_Collider;
         int m_PathIndex;
-        public LineHandle[] handles;
+        public EditableLineHandle2D[] handles;
         List<Vector2> m_Points2D;
 
         public override Matrix4x4 localToWorldMatrix => m_Collider.transform.localToWorldMatrix;
diff --git a/Modules/Physics2DEditor/Managed/Effectors/Effector2DEditor.cs b/Modules/Physics2DEditor/Managed/Effectors/Effector2DEditor.cs
index 6c1446287b..de498a1440 100644
--- a/Modules/Physics2DEditor/Managed/Effectors/Effector2DEditor.cs
+++ b/Modules/Physics2DEditor/Managed/Effectors/Effector2DEditor.cs
@@ -68,7 +68,7 @@ public override void OnInspectorGUI()
         public static void CheckEffectorWarnings(Collider2D collider)
         {
             // Finish if the collider is not used by the effector.
-            if (!collider.usedByEffector || collider.usedByComposite)
+            if (!collider.usedByEffector || collider.compositeOperation != Collider2D.CompositeOperation.None)
                 return;
 
             // Fetch the effector.
diff --git a/Modules/Physics2DEditor/Managed/Joints/HingeJoint2DEditor.cs b/Modules/Physics2DEditor/Managed/Joints/HingeJoint2DEditor.cs
index a9cabc96f8..834d37330d 100644
--- a/Modules/Physics2DEditor/Managed/Joints/HingeJoint2DEditor.cs
+++ b/Modules/Physics2DEditor/Managed/Joints/HingeJoint2DEditor.cs
@@ -2,11 +2,8 @@
 // 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 UnityEditorInternal;
+using System.Linq;
 using UnityEngine;
-using UnityObject = UnityEngine.Object;
 
 namespace UnityEditor
 {
@@ -14,153 +11,19 @@ namespace UnityEditor
     [CanEditMultipleObjects]
     internal class HingeJoint2DEditor : AnchoredJoint2DEditor
     {
-        new protected static class Styles
-        {
-            public static readonly GUIContent editAngularLimitsButton = new GUIContent(EditorGUIUtility.IconContent("JointAngularLimits"));
-            public static readonly string editAngularLimitsUndoMessage = EditorGUIUtility.TrTextContent("Change Joint Angular Limits").text;
-            public static readonly Color handleColor = new Color(0f, 1f, 0f, 0.7f);
-            public static readonly float handleRadius = 0.8f;
-
-            static Styles()
-            {
-                editAngularLimitsButton.tooltip = EditorGUIUtility.TrTextContent("Edit joint angular limits.").text;
-            }
-        }
-
-        private JointAngularLimitHandle m_AngularLimitHandle = new JointAngularLimitHandle();
-
-        new public void OnEnable()
-        {
-            base.OnEnable();
-
-            m_AngularLimitHandle.xHandleColor = Color.white;
-            m_AngularLimitHandle.yHandleColor = Color.clear;
-            m_AngularLimitHandle.zHandleColor = Color.clear;
-
-            m_AngularLimitHandle.yMotion = ConfigurableJointMotion.Locked;
-            m_AngularLimitHandle.zMotion = ConfigurableJointMotion.Locked;
-
-            // +/-PHYSICS_2D_LARGE_RANGE_CLAMP, which is currently used in JointAngleLimits2D.CheckConsistency()
-            m_AngularLimitHandle.xRange = new Vector2(-1e+6f, 1e+6f);
-        }
+        private JointAngularLimitHandle2D m_AngularLimitHandle = new JointAngularLimitHandle2D();
 
         public override void OnInspectorGUI()
         {
-            EditMode.DoEditModeInspectorModeButton(
-                EditMode.SceneViewEditMode.JointAngularLimits,
-                "Edit Joint Angular Limits",
-                Styles.editAngularLimitsButton,
-                this
-            );
-
-            base.OnInspectorGUI();
-        }
-
-        internal override Bounds GetWorldBoundsOfTarget(UnityObject targetObject)
-        {
-            var bounds = base.GetWorldBoundsOfTarget(targetObject);
-            // ensure joint's anchor point is included in bounds
-            var joint = (HingeJoint2D)targetObject;
-            bounds.Encapsulate(TransformPoint(joint.transform, joint.anchor));
-            return bounds;
-        }
-
-        private static readonly Quaternion s_RightHandedHandleOrientationOffset =
-            Quaternion.AngleAxis(180f, Vector3.right) * Quaternion.AngleAxis(90f, Vector3.up);
-        private static readonly Quaternion s_LeftHandedHandleOrientationOffset =
-            Quaternion.AngleAxis(180f, Vector3.forward) * Quaternion.AngleAxis(90f, Vector3.up);
-
-        new public void OnSceneGUI()
-        {
-            if (!target)
-                return;
-            var hingeJoint2D = (HingeJoint2D)target;
+            serializedObject.Update();
 
-            // Ignore disabled joint.
-            if (!hingeJoint2D.enabled)
-                return;
-
-            // Fetch the reference angle which acts as an offset to the absolute angles this gizmo is displaying/editing.
-            var referenceAngle = hingeJoint2D.referenceAngle;
-
-            m_AngularLimitHandle.xMotion = hingeJoint2D.useLimits ? ConfigurableJointMotion.Limited : ConfigurableJointMotion.Free;
-
-            JointAngleLimits2D limit = hingeJoint2D.limits;
-            m_AngularLimitHandle.xMin = limit.min + referenceAngle;
-            m_AngularLimitHandle.xMax = limit.max + referenceAngle;
-
-            // only display control handles on manipulator if in edit mode
-            var editMode = EditMode.editMode == EditMode.SceneViewEditMode.JointAngularLimits && EditMode.IsOwner(this);
-            if (editMode)
-                m_AngularLimitHandle.angleHandleDrawFunction = ArcHandle.DefaultAngleHandleDrawFunction;
-            else
-                m_AngularLimitHandle.angleHandleDrawFunction = null;
-
-            // Fetch if we're using the connected anchor.
-            // NOTE: If we're not then we want to draw the gizmo at the body position.
-            var usingConnectedAnchor = hingeJoint2D.useConnectedAnchor;
-
-            // to enhance usability, orient the manipulator to best illustrate its affects on the dynamic body in the system
-            var dynamicBody = hingeJoint2D.attachedRigidbody;
-            var dynamicBodyLocalReferencePosition = Vector3.right;
-            var dynamicAnchor = usingConnectedAnchor ? hingeJoint2D.anchor : Vector2.zero;
-            var connectedBody = usingConnectedAnchor ? hingeJoint2D.connectedBody : null;
-            var handleOrientationOffset = s_RightHandedHandleOrientationOffset;
-            if (
-                dynamicBody.bodyType != RigidbodyType2D.Dynamic
-                && hingeJoint2D.connectedBody != null
-                && hingeJoint2D.connectedBody.bodyType == RigidbodyType2D.Dynamic
-            )
-            {
-                dynamicBody = hingeJoint2D.connectedBody;
-                dynamicBodyLocalReferencePosition = Vector3.left;
-                dynamicAnchor = usingConnectedAnchor ? hingeJoint2D.connectedAnchor : Vector2.zero;
-                connectedBody = usingConnectedAnchor ? hingeJoint2D.connectedBody : null;
-                handleOrientationOffset = s_LeftHandedHandleOrientationOffset;
-            }
-
-            var handlePosition = TransformPoint(dynamicBody.transform, dynamicAnchor);
-            var handleOrientation = (
-                connectedBody == null ?
-                Quaternion.identity :
-                Quaternion.LookRotation(Vector3.forward, connectedBody.transform.rotation * Vector3.up)
-                ) * handleOrientationOffset;
-            var dynamicActorReferencePosition =
-                handlePosition
-                + Quaternion.LookRotation(Vector3.forward, dynamicBody.transform.rotation * Vector3.up)
-                * dynamicBodyLocalReferencePosition;
-
-            var handleMatrix = Matrix4x4.TRS(handlePosition, handleOrientation, Vector3.one);
-
-            EditorGUI.BeginChangeCheck();
-
-            using (new Handles.DrawingScope(Styles.handleColor, handleMatrix))
-            {
-                var radius = HandleUtility.GetHandleSize(Vector3.zero) * Styles.handleRadius;
-                m_AngularLimitHandle.radius = radius;
-
-                // reference line within arc to illustrate affected local axis
-                Handles.DrawLine(
-                    Vector3.zero,
-                    handleMatrix.inverse.MultiplyPoint3x4(dynamicActorReferencePosition).normalized * radius
-                );
-
-                m_AngularLimitHandle.DrawHandle();
-            }
-
-            if (EditorGUI.EndChangeCheck())
+            using (new EditorGUI.DisabledScope(!targets.Any(x => (x as HingeJoint2D).gameObject.activeInHierarchy)))
             {
-                Undo.RecordObject(hingeJoint2D, Styles.editAngularLimitsUndoMessage);
-
-                limit = hingeJoint2D.limits;
-                limit.min = m_AngularLimitHandle.xMin - referenceAngle;
-                limit.max = m_AngularLimitHandle.xMax - referenceAngle;
-                hingeJoint2D.limits = limit;
-
-                dynamicBody.WakeUp();
+                EditorGUILayout.EditorToolbarForTarget(EditorGUIUtility.TrTempContent("Edit Angular Limits"), this);
+                GUILayout.Space(5);
             }
 
-            base.OnSceneGUI();
+            base.OnInspectorGUI();
         }
     }
 }
diff --git a/Modules/Physics2DEditor/Managed/Joints/HingeJoint2DTool.cs b/Modules/Physics2DEditor/Managed/Joints/HingeJoint2DTool.cs
new file mode 100644
index 0000000000..cd0d9c7cfd
--- /dev/null
+++ b/Modules/Physics2DEditor/Managed/Joints/HingeJoint2DTool.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 UnityEditor.EditorTools;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+namespace UnityEditor
+{
+    [EditorTool("Edit Hinge Joint 2D", typeof(HingeJoint2D))]
+    class HingeJoint2DTool : EditorTool, IDrawSelectedHandles
+    {
+        protected static class Styles
+        {
+            public static readonly string editAngularLimitsUndoMessage = EditorGUIUtility.TrTextContent("Change Joint Angular Limits").text;
+            public static readonly Color handleColor = new Color(0f, 1f, 0f, 0.7f);
+            public static readonly float handleRadius = 0.8f;
+        }
+
+        private JointAngularLimitHandle2D m_AngularLimitHandle = new JointAngularLimitHandle2D();
+
+        private static readonly Quaternion s_RightHandedHandleOrientationOffset =
+            Quaternion.AngleAxis(180f, Vector3.right) * Quaternion.AngleAxis(90f, Vector3.up);
+
+        private static readonly Quaternion s_LeftHandedHandleOrientationOffset =
+            Quaternion.AngleAxis(180f, Vector3.forward) * Quaternion.AngleAxis(90f, Vector3.up);
+
+        static Matrix4x4 GetAnchorSpaceMatrix(Transform transform)
+        {
+            // Anchor space transformation matrix.
+            return Matrix4x4.TRS(transform.position, Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z), transform.lossyScale);
+        }
+
+        protected static Vector3 TransformPoint(Transform transform, Vector3 position)
+        {
+            // Local to World.
+            return GetAnchorSpaceMatrix(transform).MultiplyPoint(position);
+        }
+
+        protected static Vector3 InverseTransformPoint(Transform transform, Vector3 position)
+        {
+            // World to Local.
+            return GetAnchorSpaceMatrix(transform).inverse.MultiplyPoint(position);
+        }
+
+        void OnEnable()
+        {
+            m_AngularLimitHandle.handleColor = Color.white;
+
+            // +/-PHYSICS_2D_LARGE_RANGE_CLAMP, which is currently used in JointAngleLimits2D.CheckConsistency().
+            m_AngularLimitHandle.range = new Vector2(-1e+6f, 1e+6f);
+        }
+
+        public override GUIContent toolbarIcon
+        {
+            get { return EditorGUIUtility.IconContent("JointAngularLimits"); }
+        }
+
+        public override void OnToolGUI(EditorWindow window)
+        {
+            foreach (var obj in targets)
+            {
+                if (obj is HingeJoint2D)
+                {
+                    // Ignore disabled joint.
+                    var hingeJoint2D = obj as HingeJoint2D;
+                    if (hingeJoint2D.enabled)
+                    {
+                        DrawHandle(true, hingeJoint2D, m_AngularLimitHandle);
+                    }
+                }
+            }
+        }
+
+        public void OnDrawHandles()
+        {
+            foreach (var obj in targets)
+            {
+                if (obj is HingeJoint2D)
+                {
+                    // Ignore disabled joint.
+                    var hingeJoint2D = obj as HingeJoint2D;
+                    if (hingeJoint2D.enabled)
+                    {
+                        DrawHandle(false, hingeJoint2D, m_AngularLimitHandle);
+                    }
+                }
+            }        }
+
+        public static void DrawHandle(bool editMode, HingeJoint2D hingeJoint2D, JointAngularLimitHandle2D angularLimitHandle)
+        {
+            // Only display control handles on manipulator if in edit mode.
+            if (editMode)
+                angularLimitHandle.angleHandleDrawFunction = ArcHandle.DefaultAngleHandleDrawFunction;
+            else
+                angularLimitHandle.angleHandleDrawFunction = null;
+
+            // Fetch the reference angle which acts as an offset to the absolute angles this gizmo is displaying/editing.
+            var referenceAngle = hingeJoint2D.referenceAngle;
+
+            // Fetch the joint limits.
+            var limit = hingeJoint2D.limits;
+
+            // Set the limit handle.
+            angularLimitHandle.jointMotion = hingeJoint2D.useLimits ? JointAngularLimitHandle2D.JointMotion.Limited : JointAngularLimitHandle2D.JointMotion.Free;
+            angularLimitHandle.min = limit.min + referenceAngle;
+            angularLimitHandle.max = limit.max + referenceAngle;
+
+            // Fetch if we're using the connected anchor.
+            // NOTE: If we're not then we want to draw the gizmo at the body position.
+            var usingConnectedAnchor = hingeJoint2D.useConnectedAnchor;
+
+            // To enhance usability, orient the manipulator to best illustrate its affects on the dynamic body in the system.
+            var dynamicBody = hingeJoint2D.attachedRigidbody;
+            var dynamicBodyLocalReferencePosition = Vector3.right;
+            var dynamicAnchor = usingConnectedAnchor ? hingeJoint2D.anchor : Vector2.zero;
+            var connectedBody = usingConnectedAnchor ? hingeJoint2D.connectedBody : null;
+            var handleOrientationOffset = s_RightHandedHandleOrientationOffset;
+
+            if (dynamicBody.bodyType != RigidbodyType2D.Dynamic
+                && hingeJoint2D.connectedBody != null
+                && hingeJoint2D.connectedBody.bodyType == RigidbodyType2D.Dynamic)
+            {
+                dynamicBody = hingeJoint2D.connectedBody;
+                dynamicBodyLocalReferencePosition = Vector3.left;
+                dynamicAnchor = usingConnectedAnchor ? hingeJoint2D.connectedAnchor : Vector2.zero;
+                connectedBody = usingConnectedAnchor ? hingeJoint2D.connectedBody : null;
+                handleOrientationOffset = s_LeftHandedHandleOrientationOffset;
+            }
+
+            var handlePosition = TransformPoint(dynamicBody.transform, dynamicAnchor);
+            var handleOrientation = (
+                connectedBody == null ?
+                Quaternion.identity :
+                Quaternion.LookRotation(Vector3.forward, connectedBody.transform.rotation * Vector3.up)
+                ) * handleOrientationOffset;
+
+            var dynamicActorReferencePosition =
+                handlePosition
+                + Quaternion.LookRotation(Vector3.forward, dynamicBody.transform.rotation * Vector3.up)
+                * dynamicBodyLocalReferencePosition;
+
+            var handleMatrix = Matrix4x4.TRS(handlePosition, handleOrientation, Vector3.one);
+
+            EditorGUI.BeginChangeCheck();
+
+            using (new Handles.DrawingScope(Styles.handleColor, handleMatrix))
+            {
+                var radius = HandleUtility.GetHandleSize(Vector3.zero) * Styles.handleRadius;
+
+                angularLimitHandle.radius = radius;
+
+                // Reference line within arc to illustrate affected local axis.
+                Handles.DrawLine(
+                    Vector3.zero,
+                    handleMatrix.inverse.MultiplyPoint3x4(dynamicActorReferencePosition).normalized * radius
+                );
+
+                angularLimitHandle.DrawHandle();
+            }
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                Undo.RecordObject(hingeJoint2D, Styles.editAngularLimitsUndoMessage);
+
+                limit = hingeJoint2D.limits;
+                limit.min = angularLimitHandle.min - referenceAngle;
+                limit.max = angularLimitHandle.max - referenceAngle;
+                hingeJoint2D.limits = limit;
+
+                dynamicBody.WakeUp();
+            }
+        }
+    }
+}
diff --git a/Modules/Physics2DEditor/Managed/Joints/JointAngularLimitHandle2D.cs b/Modules/Physics2DEditor/Managed/Joints/JointAngularLimitHandle2D.cs
new file mode 100644
index 0000000000..9e5ac6a9d4
--- /dev/null
+++ b/Modules/Physics2DEditor/Managed/Joints/JointAngularLimitHandle2D.cs
@@ -0,0 +1,262 @@
+// 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 UnityEditor.IMGUI.Controls;
+
+namespace UnityEditor
+{
+    internal class JointAngularLimitHandle2D
+    {
+        public enum JointMotion
+        {
+            Locked = 0,
+            Limited = 1,
+            Free = 2
+        }
+
+        private enum ArcType
+        {
+            Solid = 0,
+            Wire = 1
+        }
+
+        private static readonly Matrix4x4 s_HandleOffset = Matrix4x4.TRS(Vector3.zero, Quaternion.AngleAxis(90f, Vector3.forward), Vector3.one);
+        private static readonly float s_LockedColorAmount = 0.5f;
+        private static readonly Color s_LockedColor = new Color(0.5f, 0.5f, 0.5f, 0f);
+
+        private List<KeyValuePair<Action, float>> m_HandleFunctionDistances = new List<KeyValuePair<Action, float>>(6);
+        private ArcHandle m_MinHandle;
+        private ArcHandle m_MaxHandle;
+        private bool m_HandleColorInitialized = false;
+
+        // When primary axis is limited, secondary and tertiary manipulators are reoriented about its average
+        private Matrix4x4 m_SecondaryAxesMatrix;
+
+        public float min
+        {
+            get
+            {
+                switch (jointMotion)
+                {
+                    case JointMotion.Free:
+                        return range.x;
+
+                    case JointMotion.Locked:
+                        return 0f;
+
+                    default:
+                        return Mathf.Clamp(m_MinHandle.angle, range.x, m_MaxHandle.angle);
+                }
+            }
+            set { m_MinHandle.angle = value; }
+        }
+
+        public float max
+        {
+            get
+            {
+                switch (jointMotion)
+                {
+                    case JointMotion.Free:
+                        return range.y;
+
+                    case JointMotion.Locked:
+                        return 0f;
+
+                    default:
+                        return Mathf.Clamp(m_MaxHandle.angle, m_MinHandle.angle, range.y);
+                }
+            }
+            set { m_MaxHandle.angle = value; }
+        }
+
+        public Vector2 range { get; set; }
+
+        public JointMotion jointMotion { get; set; }
+
+        public Color handleColor
+        {
+            get
+            {
+                if (!m_HandleColorInitialized)
+                    handleColor = Handles.xAxisColor;
+
+                return m_MinHandle.angleHandleColor;
+            }
+            set
+            {
+                m_MinHandle.SetColorWithoutRadiusHandle(value, fillAlpha);
+                m_MaxHandle.SetColorWithoutRadiusHandle(value, fillAlpha);
+                m_HandleColorInitialized = true;
+            }
+        }
+
+        public float radius
+        {
+            get { return m_MinHandle.radius; }
+            set { m_MinHandle.radius = m_MaxHandle.radius = value; }
+        }
+
+        public float fillAlpha { get; set; }
+
+        public float wireframeAlpha { get; set; }
+
+        public Handles.CapFunction angleHandleDrawFunction
+        {
+            get { return m_MinHandle.angleHandleDrawFunction; }
+            set { m_MinHandle.angleHandleDrawFunction = m_MaxHandle.angleHandleDrawFunction = value; }
+        }
+
+        public Handles.SizeFunction angleHandleSizeFunction
+        {
+            get { return m_MinHandle.angleHandleSizeFunction; }
+            set { m_MinHandle.angleHandleSizeFunction = m_MaxHandle.angleHandleSizeFunction = value; }
+        }
+
+        // Handle functions need to be manually sorted
+        private static float GetSortingDistance(ArcHandle handle)
+        {
+            Vector3 worldPosition = Handles.matrix.MultiplyPoint3x4(Quaternion.AngleAxis(handle.angle, Vector3.up) * Vector3.forward * handle.radius);
+
+            Vector3 toHandle = Camera.current == null
+                ? worldPosition
+                : worldPosition - Camera.current.transform.position;
+
+            if (Camera.current == null || Camera.current.orthographic)
+            {
+                Vector3 lookVector = Camera.current == null ? Vector3.forward : Camera.current.transform.forward;
+                toHandle = lookVector * Vector3.Dot(lookVector, toHandle);
+            }
+
+            return toHandle.sqrMagnitude;
+        }
+
+        private static int CompareHandleFunctionsByDistance(KeyValuePair<Action, float> func1, KeyValuePair<Action, float> func2)
+        {
+            return func2.Value.CompareTo(func1.Value);
+        }
+
+        public JointAngularLimitHandle2D()
+        {
+            m_MinHandle = new ArcHandle();
+            m_MaxHandle = new ArcHandle();
+            jointMotion = JointMotion.Limited;
+            radius = 1f;
+            fillAlpha = 0.1f;
+            wireframeAlpha = 1f;
+            range = new Vector2(-180f, 180f);
+        }
+
+        public void DrawHandle()
+        {
+            m_SecondaryAxesMatrix = Handles.matrix;
+
+            // Ensure handle colors are up to date
+            handleColor = handleColor;
+            m_MinHandle.fillColor = m_MinHandle.wireframeColor = Color.clear;
+            m_MaxHandle.fillColor = m_MaxHandle.wireframeColor = Color.clear;
+
+            // Draw fill shapes as needed
+            Color fillScalar = new Color(1f, 1f, 1f, fillAlpha);
+            bool draw = false;
+
+            switch (jointMotion)
+            {
+                case JointMotion.Free:
+                    using (new Handles.DrawingScope(Handles.color * handleColor))
+                    {
+                        Handles.DrawWireDisc(Vector3.zero, Vector3.right, radius);
+                        Handles.color *= fillScalar;
+                        Handles.DrawSolidDisc(Vector3.zero, Vector3.right, radius);
+                    }
+                    break;
+
+                case JointMotion.Limited:
+                    draw = true;
+                    m_SecondaryAxesMatrix *= Matrix4x4.TRS(Vector3.zero, Quaternion.AngleAxis((min + max) * 0.5f, Vector3.left), Vector3.one);
+
+                    using (new Handles.DrawingScope(Handles.matrix * s_HandleOffset))
+                    {
+                        DrawArc(m_MinHandle, m_MaxHandle, handleColor * fillScalar, ArcType.Solid);
+                    }
+                    break;
+
+                case JointMotion.Locked:
+                    using (new Handles.DrawingScope(Handles.color * Color.Lerp(handleColor, s_LockedColor, s_LockedColorAmount)))
+                    {
+                        Handles.DrawWireDisc(Vector3.zero, Vector3.right, radius);
+                    }
+                    break;
+            }
+
+            // Collect and sort handle drawing functions for all enabled axes
+            m_HandleFunctionDistances.Clear();
+            m_MinHandle.GetControlIDs();
+            m_MaxHandle.GetControlIDs();
+
+            if (draw)
+            {
+                using (new Handles.DrawingScope(Handles.matrix * s_HandleOffset))
+                {
+                    DrawArc(m_MinHandle, m_MaxHandle, handleColor, ArcType.Wire);
+
+                    m_HandleFunctionDistances.Add(new KeyValuePair<Action, float>(DrawMinHandle, GetSortingDistance(m_MinHandle)));
+                    m_HandleFunctionDistances.Add(new KeyValuePair<Action, float>(DrawMaxHandle, GetSortingDistance(m_MaxHandle)));
+                }
+            }
+            m_HandleFunctionDistances.Sort(CompareHandleFunctionsByDistance);
+
+            // Draw handles
+            foreach (var handleFunction in m_HandleFunctionDistances)
+                handleFunction.Key();
+        }
+
+        private void DrawArc(ArcHandle minHandle, ArcHandle maxHandle, Color color, ArcType arcType)
+        {
+            float angle = maxHandle.angle - minHandle.angle;
+            Vector3 forward = Quaternion.AngleAxis(minHandle.angle, Vector3.up) * Vector3.forward;
+
+            using (new Handles.DrawingScope(Handles.color * color))
+            {
+                if (arcType == ArcType.Solid)
+                {
+                    for (int i = 0, revolutions = (int)Mathf.Abs(angle) / 360; i < revolutions; ++i)
+                    {
+                        Handles.DrawSolidArc(Vector3.zero, Vector3.up, Vector3.forward, 360f, radius);
+                    }
+                    Handles.DrawSolidArc(Vector3.zero, Vector3.up, forward, angle % 360f, radius);
+                }
+                else
+                {
+                    for (int i = 0, revolutions = (int)Mathf.Abs(angle) / 360; i < revolutions; ++i)
+                    {
+                        Handles.DrawWireArc(Vector3.zero, Vector3.up, Vector3.forward, 360f, radius);
+                    }
+                    Handles.DrawWireArc(Vector3.zero, Vector3.up, forward, angle % 360f, radius);
+                }
+            }
+        }
+
+        private void DrawMinHandle()
+        {
+            using (new Handles.DrawingScope(Handles.matrix * s_HandleOffset))
+            {
+                m_MinHandle.DrawHandle();
+                m_MinHandle.angle = Mathf.Clamp(m_MinHandle.angle, range.x, m_MaxHandle.angle);
+            }
+        }
+
+        private void DrawMaxHandle()
+        {
+            using (new Handles.DrawingScope(Handles.matrix * s_HandleOffset))
+            {
+                m_MaxHandle.DrawHandle();
+                m_MaxHandle.angle = Mathf.Clamp(m_MaxHandle.angle, m_MinHandle.angle, range.y);
+            }
+        }
+    }
+}
diff --git a/Modules/Physics2DEditor/Managed/Settings/Physics2DPreferences.cs b/Modules/Physics2DEditor/Managed/Settings/Physics2DPreferences.cs
index ef2028b9bb..4c82e8b0d3 100644
--- a/Modules/Physics2DEditor/Managed/Settings/Physics2DPreferences.cs
+++ b/Modules/Physics2DEditor/Managed/Settings/Physics2DPreferences.cs
@@ -17,6 +17,7 @@ public class SettingsContent
             public static readonly GUIContent ColliderAwakeFilledContent = EditorGUIUtility.TrTextContent("Awake Color (Filled)");
             public static readonly GUIContent ColliderAsleepFilledContent = EditorGUIUtility.TrTextContent("Asleep Color (Filled)");
             public static readonly GUIContent ColliderBoundsContent = EditorGUIUtility.TrTextContent("Bounds Color");
+            public static readonly GUIContent CompositedColorContent = EditorGUIUtility.TrTextContent("Composited Color");
             public static readonly GUIContent ColliderContactContent = EditorGUIUtility.TrTextContent("Contact Color");
             public static readonly GUIContent ContactArrowScaleContent = EditorGUIUtility.TrTextContent("Contact Arrow Scale");
 
@@ -32,7 +33,8 @@ public class SettingsContent
         const string ColliderAsleepFilledColorKey = UniqueSettingsKey + "ColliderAsleepFilledColor";
         const string ColliderBoundsColorKey = UniqueSettingsKey + "ColliderBoundsColor";
         const string ColliderContactColorKey = UniqueSettingsKey + "ColliderContactColor";
-        const string ContactArrowScaleKey = UniqueSettingsKey + "ContactArrowScaleKey";
+        const string CompositedColorKey = UniqueSettingsKey + "CompositedColor";
+        const string ContactArrowScaleKey = UniqueSettingsKey + "ContactArrowScale";
 
         // These must match "GizmoDrawing.cpp" for the Physics2DEditor!
         static readonly Color DefaultColliderAwakeOutlineColor = new Color(0.568f, 0.956f, 0.545f, 1.0f);
@@ -41,6 +43,7 @@ public class SettingsContent
         static readonly Color DefaultColliderAsleepFilledColor = new Color(0.254f, 0.501f, 0.243f, 0.2f);
         static readonly Color DefaultColliderBoundsColor = new Color(1.0f, 1.0f, 0.0f, 0.75f);
         static readonly Color DefaultColliderContactColor = new Color(1.0f, 0.0f, 1.0f, 1.0f);
+        static readonly Color DefaultCompositedColor = new Color(1.0f, 1.0f, 1.0f, 0.1f);
         static readonly float DefaultContactArrowScale = 0.2f;
 
         // Preference state.
@@ -50,6 +53,7 @@ public class SettingsContent
         public Color colliderAsleepFilledColor;
         public Color colliderBoundsColor;
         public Color colliderContactColor;
+        public Color compositedColor;
         public float contactArrowScale;
 
         void OnEnable()
@@ -86,6 +90,7 @@ private void ReadPreferenceState()
             colliderAsleepFilledColor = GetColor(ColliderAsleepFilledColorKey, DefaultColliderAsleepFilledColor);
             colliderBoundsColor = GetColor(ColliderBoundsColorKey, DefaultColliderBoundsColor);
             colliderContactColor = GetColor(ColliderContactColorKey, DefaultColliderContactColor);
+            compositedColor = GetColor(CompositedColorKey, DefaultCompositedColor);
             contactArrowScale = EditorPrefs.GetFloat(ContactArrowScaleKey, DefaultContactArrowScale);
         }
 
@@ -98,6 +103,7 @@ private void WritePreferenceState()
             SetColor(ColliderAsleepFilledColorKey, colliderAsleepFilledColor);
             SetColor(ColliderBoundsColorKey, colliderBoundsColor);
             SetColor(ColliderContactColorKey, colliderContactColor);
+            SetColor(CompositedColorKey, compositedColor);
             EditorPrefs.SetFloat(ContactArrowScaleKey, contactArrowScale);
         }
 
@@ -164,6 +170,17 @@ public void HandleUI(string searchContext)
                         SetColor(ColliderBoundsColorKey, colliderBoundsColor = color);
                     }
                 }
+
+                // Composited Color.
+                {
+                    EditorGUI.BeginChangeCheck();
+                    var color = EditorGUILayout.ColorField(SettingsContent.CompositedColorContent, compositedColor);
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        Undo.RecordObject(this, SettingsContent.CompositedColorContent.text);
+                        SetColor(CompositedColorKey, compositedColor = color);
+                    }
+                }
             }
 
             EditorGUILayout.Space();
@@ -205,6 +222,7 @@ public void HandleUI(string searchContext)
                 SetColor(ColliderAsleepFilledColorKey, colliderAsleepFilledColor = DefaultColliderAsleepFilledColor);
                 SetColor(ColliderBoundsColorKey, colliderBoundsColor = DefaultColliderBoundsColor);
                 SetColor(ColliderContactColorKey, colliderContactColor = DefaultColliderContactColor);
+                SetColor(CompositedColorKey, compositedColor = DefaultCompositedColor);
                 EditorPrefs.SetFloat(ContactArrowScaleKey, contactArrowScale = DefaultContactArrowScale);
             }
 
diff --git a/Modules/Physics2DEditor/Managed/Settings/Physics2DSettingsEditor.cs b/Modules/Physics2DEditor/Managed/Settings/Physics2DSettingsEditor.cs
index fb9b0f84d6..634862812b 100644
--- a/Modules/Physics2DEditor/Managed/Settings/Physics2DSettingsEditor.cs
+++ b/Modules/Physics2DEditor/Managed/Settings/Physics2DSettingsEditor.cs
@@ -43,7 +43,7 @@ class Styles
         SerializedProperty m_UseSubStepContacts;
         SerializedProperty m_MinSubStepFPS;
         SerializedProperty m_MaxSubStepCount;
-        
+
         public void OnEnable()
         {
             m_ReuseCollisionCallbacks = serializedObject.FindProperty("m_ReuseCollisionCallbacks");
@@ -156,7 +156,7 @@ public override void OnInspectorGUI()
                 {
                     EditorGUI.indentLevel++;
                     EditorGUILayout.PropertyField(m_UseSubStepping);
-                    EditorGUILayout.PropertyField(m_UseSubStepContacts);                    
+                    EditorGUILayout.PropertyField(m_UseSubStepContacts);
                     EditorGUILayout.PropertyField(m_MaxSubStepCount);
 
                     GUILayout.BeginHorizontal();
diff --git a/Modules/PhysicsEditor/PhysicsDebugWindow.cs b/Modules/PhysicsEditor/PhysicsDebugWindow.cs
index 8b7437f97f..50930bf27e 100644
--- a/Modules/PhysicsEditor/PhysicsDebugWindow.cs
+++ b/Modules/PhysicsEditor/PhysicsDebugWindow.cs
@@ -28,7 +28,6 @@ private enum Tabs
             Rendering = 2,
             Contacts = 3,
             Queries = 4,
-            Other = 5
         }
 
         [SerializeField] Vector2 m_MainScrollPos = Vector2.zero;
@@ -147,13 +146,6 @@ private static class Style
             public static readonly GUIContent maxNumberOfQueries = EditorGUIUtility.TrTextContent("Max Queries", "Maximum number of queries that will be visualized");
             #endregion
 
-            #region Other
-            public static readonly GUIContent devOptions = EditorGUIUtility.TrTextContent("devOptions");
-            public static readonly GUIContent forceDot = EditorGUIUtility.TrTextContent("Force Dot");
-            public static readonly GUIContent dotAlpha = EditorGUIUtility.TrTextContent("DotAlpha");
-            public static readonly GUIContent toolsHidden = EditorGUIUtility.TrTextContent("Hide tools");
-            #endregion
-
             #region Overlay
             public static readonly GUIContent showCollisionGeometry = EditorGUIUtility.TrTextContent("Collision Geometry");
             public static readonly GUIContent enableMouseSelect = EditorGUIUtility.TrTextContent("Mouse Select");
@@ -192,8 +184,7 @@ private static class Style
             #endregion
 
             public static readonly GUIStyle tabBarStyle             = GUI.skin.button;
-            public static readonly string[] tabs                    = new string[] { "Info", "Filtering", "Rendering", "Contacts", "Queries", "Other" };
-            public static readonly string[] tabsDev                 = new string[] { "Info", "Filtering", "Rendering", "Contacts", "Queries" };
+            public static readonly string[] tabs                    = new string[] { "Info", "Filtering", "Rendering", "Contacts", "Queries" };
 
             static Style()
             {
@@ -415,9 +406,7 @@ void OnGUI()
 
             EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
 
-            m_CurrentTab.value = GUILayout.Toolbar(m_CurrentTab.value
-                , (Unsupported.IsDeveloperMode() || PhysicsVisualizationSettings.devOptions) ? Style.tabsDev : Style.tabs
-                , Style.tabBarStyle);
+            m_CurrentTab.value = GUILayout.Toolbar(m_CurrentTab.value, Style.tabs, Style.tabBarStyle);
 
             if (GUILayout.Button(Style.resetButton, EditorStyles.toolbarButton, Style.maxWidth75))
             {
@@ -447,9 +436,6 @@ void OnGUI()
                 case Tabs.Queries:
                     DrawQueriesTab();
                     break;
-                case Tabs.Other:
-                    DrawMiscTab();
-                    break;
             }
 
             GUILayout.EndScrollView();
@@ -668,27 +654,6 @@ private void DrawInfoTab()
             RemoveLockedObjects();
         }
 
-        private void DrawMiscTab()
-        {
-            if (Unsupported.IsDeveloperMode() || PhysicsVisualizationSettings.devOptions)
-            {
-                PhysicsVisualizationSettings.devOptions = EditorGUILayout.Toggle(Style.devOptions
-                    , PhysicsVisualizationSettings.devOptions);
-            }
-
-            if (PhysicsVisualizationSettings.devOptions)
-            {
-                PhysicsVisualizationSettings.dotAlpha = EditorGUILayout.Slider(Style.dotAlpha
-                    , PhysicsVisualizationSettings.dotAlpha, -1f, 1f);
-
-                PhysicsVisualizationSettings.forceDot = EditorGUILayout.Toggle(Style.forceDot
-                    , PhysicsVisualizationSettings.forceDot);
-
-                Tools.hidden = EditorGUILayout.Toggle(Style.toolsHidden
-                    , Tools.hidden);
-            }
-        }
-
         [Overlay(typeof(SceneView), k_OverlayId, k_DisplayName)]
         class SceneViewPhysicsDebuggerOverlay : TransientSceneViewOverlay
         {
@@ -710,12 +675,6 @@ public override void OnGUI()
                 if (EditorGUI.EndChangeCheck())
                     SetPickingEnabled(PhysicsVisualizationSettings.showCollisionGeometry && PhysicsVisualizationSettings.enableMouseSelect);
 
-                if (PhysicsVisualizationSettings.devOptions)
-                {
-                    PhysicsVisualizationSettings.useSceneCam = EditorGUILayout.Toggle(Style.useSceneCam
-                        , PhysicsVisualizationSettings.useSceneCam);
-                }
-
                 if (dirtyCount != PhysicsVisualizationSettings.dirtyCount)
                     RepaintSceneAndGameViews();
             }
diff --git a/Modules/PresetsUIEditor/PresetEditor.cs b/Modules/PresetsUIEditor/PresetEditor.cs
index cc74414972..9d155bfbbc 100644
--- a/Modules/PresetsUIEditor/PresetEditor.cs
+++ b/Modules/PresetsUIEditor/PresetEditor.cs
@@ -45,6 +45,7 @@ class ReferenceCount
 
         Editor m_InternalEditor = null;
         ICoupledEditor m_CoupledEditor = null;
+        VisualElement m_Root;
 
         string m_PresetTypeName;
         string m_HeaderTitle;
@@ -86,6 +87,7 @@ void UpdateInvalidReferences()
         public override VisualElement CreateInspectorGUI()
         {
             var root = new VisualElement();
+            m_Root = root;
 
             if (target is Preset p && !p.IsValid())
             {
@@ -139,7 +141,7 @@ public override VisualElement CreateInspectorGUI()
 
                 innerRoot.Add(internalInspector);
                 internalInspector.TrackSerializedObjectValue(m_InternalEditor.serializedObject, SaveTargetChangesToPreset);
-                if (m_CoupledEditor != null)
+                if (m_CoupledEditor != null && m_CoupledEditor.coupledComponent != null)
                 {
                     var hiddenElement = new VisualElement();
                     hiddenElement.style.display = DisplayStyle.None;
@@ -278,6 +280,7 @@ void OnEnable()
 
         void OnDisable()
         {
+            m_Root?.Clear();
             DestroyInternalEditor();
 
             EditorGUIUtility.beginProperty -= BeginProperty;
@@ -405,7 +408,7 @@ internal override void OnHeaderControlsGUI()
                     var defaultList = Preset.GetDefaultPresetsForType(preset.GetPresetType()).Where(d => d.preset == preset);
                     if (defaultList.Any())
                     {
-                        if (GUILayout.Button(GUIContent.Temp(string.Format(Style.removeFromDefault.text, preset.GetTargetTypeName()), Style.removeFromDefault.tooltip), EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
+                        if (GUILayout.Button(GUIContent.Temp(string.Format(Style.removeFromDefault.text, ObjectNames.NicifyVariableName(preset.GetTargetTypeName())), Style.removeFromDefault.tooltip), EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
                         {
                             Undo.RecordObject(Resources.FindObjectsOfTypeAll<PresetManager>().First(), "Preset Manager");
                             Preset.RemoveFromDefault(preset);
@@ -414,7 +417,7 @@ internal override void OnHeaderControlsGUI()
                     }
                     else
                     {
-                        if (GUILayout.Button(GUIContent.Temp(string.Format(Style.addToDefault.text, preset.GetTargetTypeName()), Style.addToDefault.tooltip), EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
+                        if (GUILayout.Button(GUIContent.Temp(string.Format(Style.addToDefault.text, ObjectNames.NicifyVariableName(preset.GetTargetTypeName())), Style.addToDefault.tooltip), EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
                         {
                             Undo.RecordObject(Resources.FindObjectsOfTypeAll<PresetManager>().First(), "Preset Manager");
                             var list = Preset.GetDefaultPresetsForType(preset.GetPresetType()).ToList();
diff --git a/Modules/PresetsUIEditor/PresetSearchProvider.cs b/Modules/PresetsUIEditor/PresetSearchProvider.cs
index ae4d19fb7b..f58bf96e36 100644
--- a/Modules/PresetsUIEditor/PresetSearchProvider.cs
+++ b/Modules/PresetsUIEditor/PresetSearchProvider.cs
@@ -23,9 +23,14 @@ class PresetContext
         public readonly bool CreateNewAllowed;
         public readonly bool RevertOnNullSelection;
 
-        public PresetContext(Object[] targets, bool createNewAllowed) : this(targets, null, createNewAllowed) {}
+        public readonly Action<Preset> OnSelectionChanged;
+        public readonly Action<Preset, bool> OnSelectionClosed;
 
-        public PresetContext(Object[] targets, Preset currentSelection, bool createNewAllowed)
+        public PresetContext(Object[] targets, bool createNewAllowed) : this(targets, null, createNewAllowed, null, null) {}
+
+        public PresetContext(Object[] targets, Preset currentSelection, bool createNewAllowed) : this(targets, currentSelection, createNewAllowed, null, null) {}
+
+        public PresetContext(Object[] targets, Preset currentSelection, bool createNewAllowed, Action<Preset> onSelectionChanged, Action<Preset, bool> onSelectionClosed)
         {
             Targets = targets.Where(t => t != null).ToArray();
             Target = Targets.FirstOrDefault();
@@ -35,6 +40,8 @@ public PresetContext(Object[] targets, Preset currentSelection, bool createNewAl
             CurrentSelection = currentSelection;
             CreateNewAllowed = createNewAllowed;
             RevertOnNullSelection = true;
+            OnSelectionChanged = onSelectionChanged;
+            OnSelectionClosed = onSelectionClosed;
         }
 
         public PresetContext(PresetType presetType, Preset currentSelection, SerializedProperty presetProperty, bool createNewAllowed)
@@ -47,6 +54,8 @@ public PresetContext(PresetType presetType, Preset currentSelection, SerializedP
             CurrentSelection = currentSelection;
             CreateNewAllowed = createNewAllowed;
             RevertOnNullSelection = false;
+            OnSelectionChanged = null;
+            OnSelectionClosed = null;
         }
     }
 
@@ -144,7 +153,7 @@ static string GetNewPresetString(PresetType presetType)
             var targetTypeName = presetType.GetManagedTypeName();
             if (!string.IsNullOrEmpty(targetTypeName))
             {
-                targetTypeName = targetTypeName.Substring(targetTypeName.LastIndexOf('.') + 1);
+                targetTypeName = ObjectNames.NicifyVariableName(targetTypeName.Substring(targetTypeName.LastIndexOf('.') + 1));
                 return $"<b>Create New {targetTypeName} Preset...</b>";
             }
 
diff --git a/Modules/PresetsUIEditor/PresetSelector.cs b/Modules/PresetsUIEditor/PresetSelector.cs
index c8edf4e241..7c550bbc96 100644
--- a/Modules/PresetsUIEditor/PresetSelector.cs
+++ b/Modules/PresetsUIEditor/PresetSelector.cs
@@ -154,6 +154,11 @@ public static void ShowSelector(Object[] targets, Preset currentSelection, bool
             ShowSelector(new PresetContext(targets, currentSelection, createNewAllowed));
         }
 
+        public static void ShowSelector(Object[] targets, Preset currentSelection, bool createNewAllowed, Action<Preset> onSelectionChanged, Action<Preset, bool> onSelectionClosed)
+        {
+            ShowSelector(new PresetContext(targets, currentSelection, createNewAllowed, onSelectionChanged, onSelectionClosed));
+        }
+
         [Obsolete("The PresetSelectorReceiver is deprecated. Please use ShowSelector(Object[], Preset, bool).", false)]
         public static void ShowSelector(Object target, Preset currentSelection, bool createNewAllowed, PresetSelectorReceiver eventReceiver)
         {
@@ -229,15 +234,27 @@ internal static ISearchView ShowSelector(PresetContext presetContext)
                 filterHandler = item => OnPresetFilter(presetContext, provider, item),
                 selectHandler = (item, canceled) =>
                 {
+                    Preset preset = null;
                     if (item?.id == PresetSearchProvider.CreateItemID)
-                        CreatePreset(presetContext.Target);
+                        preset = CreatePreset(presetContext.Target);
                     else
-                        OnPresetSelected(presetContext, item?.ToObject<Preset>(), canceled);
+                    {
+                        preset = item?.ToObject<Preset>();
+                        OnPresetSelected(presetContext, preset, canceled);
+                    }
+
+                    presetContext.OnSelectionClosed?.Invoke(preset, canceled);
 
                     PresetEditorHelper.presetEditorOpen = false;
                 },
 
-                trackingHandler = item => OnPresetSelected(in presetContext, item?.ToObject<Preset>(), false),
+                trackingHandler = item =>
+                {
+                    var preset = item?.ToObject<Preset>();
+                    OnPresetSelected(in presetContext, preset, false);
+
+                    presetContext.OnSelectionChanged?.Invoke(preset);
+                },
                 selectedIds = presetContext.CurrentSelection != null ? new []{ presetContext.CurrentSelection.GetInstanceID() } : null
             };
             PresetEditorHelper.presetEditorOpen = true;
@@ -309,7 +326,7 @@ static void ApplyValues(in PresetContext presetContext, Preset selection)
                     selection.ApplyTo(target);
                 }
             }
-            else if (presetContext.PresetProperty != null)
+            else if (presetContext.PresetProperty != null && presetContext.PresetProperty.isValid)
             {
                 presetContext.PresetProperty.objectReferenceValue = selection;
                 presetContext.PresetProperty.serializedObject.ApplyModifiedProperties();
@@ -328,13 +345,13 @@ static string CreatePresetDialog(ref Preset preset, Object target)
                 ProjectWindowUtil.GetActiveFolderPath());
         }
 
-        static void CreatePreset(Object target)
+        static Preset CreatePreset(Object target)
         {
             // The preset picker will apply the selection when the window is disposed.
             // However, when creating a new preset, the preset window is closed as the save file dialog opens.
             // This triggers a second selection callback invocation, which we do not want.
             if (PresetEditorHelper.presetEditorOpen == false)
-                return;
+                return null;
 
             // Set the preset popup closed before triggering the save file dialog
             PresetEditorHelper.presetEditorOpen = false;
@@ -363,6 +380,7 @@ static void CreatePreset(Object target)
                     });
                     foreach (var pe in propertyEditors)
                         pe.tracker.ForceRebuild();
+                    preset = oldPreset;
                 }
                 else
                 {
@@ -370,6 +388,8 @@ static void CreatePreset(Object target)
                 }
             }
             GUIUtility.ExitGUI();
+
+            return preset;
         }
 
         void OnBeforeAssemblyReload()
diff --git a/Modules/ProfilerEditor/ProfilerOutOfProcess/ProfilerRoleProvider.cs b/Modules/ProfilerEditor/ProfilerOutOfProcess/ProfilerRoleProvider.cs
index d89eb4ab5c..62fa4d4b0b 100644
--- a/Modules/ProfilerEditor/ProfilerOutOfProcess/ProfilerRoleProvider.cs
+++ b/Modules/ProfilerEditor/ProfilerOutOfProcess/ProfilerRoleProvider.cs
@@ -65,7 +65,7 @@ static void InitializeProfilerProcess()
                         System.IO.Directory.CreateDirectory(parentDir);
                     File.Copy(systemProfilerLayoutPath, userPrefProfilerLayoutPath, true);
                 }
-                WindowLayout.LoadWindowLayout(userPrefProfilerLayoutPath, false);
+                WindowLayout.TryLoadWindowLayout(userPrefProfilerLayoutPath, false);
 
                 SessionState.SetBool("OOPP.Initialized", true);
                 EditorApplication.CallDelayed(InitializeProfilerProcessDomain);
diff --git a/Modules/ProfilerEditor/ProfilerWindow/Analytics/EditorAnalyticsService.cs b/Modules/ProfilerEditor/ProfilerWindow/Analytics/EditorAnalyticsService.cs
new file mode 100644
index 0000000000..5ff387997d
--- /dev/null
+++ b/Modules/ProfilerEditor/ProfilerWindow/Analytics/EditorAnalyticsService.cs
@@ -0,0 +1,29 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEngine.Analytics;
+
+namespace UnityEditor.Profiling.Analytics
+{
+    internal class EditorAnalyticsService : IAnalyticsService
+    {
+        bool IAnalyticsService.RegisterEventWithLimit(string eventName, int maxEventPerHour, int maxItems, string vendorKey)
+        {
+            var result = EditorAnalytics.RegisterEventWithLimit(eventName, maxEventPerHour, maxItems, vendorKey);
+            switch (result)
+            {
+                case AnalyticsResult.Ok:
+                case AnalyticsResult.TooManyRequests:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        bool IAnalyticsService.SendEventWithLimit(string eventName, object parameters)
+        {
+            return EditorAnalytics.SendEventWithLimit(eventName, parameters) == AnalyticsResult.Ok;
+        }
+    }
+}
diff --git a/Modules/ProfilerEditor/ProfilerWindow/Analytics/IAnalyticsService.cs b/Modules/ProfilerEditor/ProfilerWindow/Analytics/IAnalyticsService.cs
new file mode 100644
index 0000000000..6eac22df80
--- /dev/null
+++ b/Modules/ProfilerEditor/ProfilerWindow/Analytics/IAnalyticsService.cs
@@ -0,0 +1,12 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace UnityEditor.Profiling.Analytics
+{
+    internal interface IAnalyticsService
+    {
+        bool RegisterEventWithLimit(string eventName, int maxEventPerHour, int maxItems, string vendorKey);
+        bool SendEventWithLimit(string eventName, object parameters);
+    }
+}
diff --git a/Modules/ProfilerEditor/ProfilerWindow/Analytics/ProfilerWindowAnalytics.cs b/Modules/ProfilerEditor/ProfilerWindow/Analytics/ProfilerWindowAnalytics.cs
new file mode 100644
index 0000000000..cfa09769c9
--- /dev/null
+++ b/Modules/ProfilerEditor/ProfilerWindow/Analytics/ProfilerWindowAnalytics.cs
@@ -0,0 +1,287 @@
+// 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 UnityEditor.Profiling;
+using UnityEditorInternal;
+using UnityEngine;
+using UnityEngine.Profiling;
+using UnityEngine.Scripting;
+
+namespace UnityEditor.Profiling.Analytics
+{
+    [RequiredByNativeCode(GenerateProxy = true)]
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ProfilerAnalyticsSaveLoadData
+    {
+        public string extension;
+        public long duration;
+        public long size;
+        public uint frameCount;
+        public bool customFrameRange;
+        public string details;
+        public bool success;
+        public bool isLoad;
+        public bool isSave;
+    }
+
+    [RequiredByNativeCode(GenerateProxy = true)]
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ProfilerAnalyticsConnectionData
+    {
+        public bool success;
+        public string connectionDetail;
+        public string details;
+    }
+
+    [Serializable]
+    internal struct ProfilerAnalyticsViewUsability
+    {
+        public string element;
+        public uint mouseEvents;
+        public uint keyboardEvents;
+        public double time;
+    }
+
+    [Serializable]
+    internal struct ProfilerAnalyticsViewUsabilitySession
+    {
+        public ProfilerAnalyticsViewUsability[] session;
+        public uint mouseEvents;
+        public uint keyboardEvents;
+        public double time;
+    }
+
+    [Serializable]
+    internal struct ProfilerAnalyticsCapture
+    {
+        public bool deepProfileEnabled;
+        public bool callStacksEnabled;
+        public string platformName; // Editor is platform
+        public string connectionName;
+    }
+
+    internal static class ProfilerWindowAnalytics
+    {
+        const int k_MaxEventsPerHour = 1000; // Max Events send per hour.
+        const int k_MaxNumberOfElements = 1000; //Max number of elements sent.
+        const string k_VendorKey = "unity.profiler";
+        const string k_ProfilerSaveLoad = "profilerSaveLoad";
+        const string k_ProfilerConnection = "profilerConnection";
+        const string k_ProfilerElementUsability = "profilerSessionElementUsability";
+        const string k_ProfilerCapture = "profilerCapture";
+
+        static IAnalyticsService s_AnalyticsService;
+
+        // events registered
+        static bool s_ProfilerElementUsabilityRegistered;
+        static bool s_ProfilerCaptureRegistered;
+        static bool s_ProfilerSaveLoadRegistered;
+        static bool s_ProfilerConnectionRegistered;
+
+        static ProfilerAnalyticsViewUsabilitySession s_ProfilerSession;
+        static List<ProfilerAnalyticsViewUsability> s_Views;
+        static int s_CurrentViewIndex;
+
+        static ProfilerWindowAnalytics()
+        {
+            // Instantiate default editor analytics, but only for user sessions when analytics is enabled.
+            if (!InternalEditorUtility.inBatchMode && EditorAnalytics.enabled)
+                SetAnalyticsService(new EditorAnalyticsService());
+        }
+
+        static bool RegisterEvent(ref bool eventRegisteredFlag, string eventName)
+        {
+            if (s_AnalyticsService == null)
+                return false;
+
+            if (!eventRegisteredFlag)
+                eventRegisteredFlag = s_AnalyticsService.RegisterEventWithLimit(eventName, k_MaxEventsPerHour, k_MaxNumberOfElements, k_VendorKey);
+
+            return eventRegisteredFlag;
+        }
+
+        public static IAnalyticsService SetAnalyticsService(IAnalyticsService service)
+        {
+            var oldService = s_AnalyticsService;
+            s_AnalyticsService = service;
+
+            // Reset events registration
+            s_ProfilerElementUsabilityRegistered = false;
+            s_ProfilerCaptureRegistered = false;
+            s_ProfilerSaveLoadRegistered = false;
+            s_ProfilerConnectionRegistered = false;
+
+            return oldService;
+        }
+
+        /// <summary>
+        /// Reset analytics tracking on profiler window open and record the session start time.
+        /// </summary>
+        public static void OnProfilerWindowAwake()
+        {
+            ClearElementUsabilityQueue(EditorApplication.timeSinceStartup);
+        }
+
+        /// <summary>
+        /// Sent out all accumulated view change events and reset analytics tracking.
+        /// </summary>
+        public static void OnProfilerWindowDestroy()
+        {
+            SendElementUsabilityEventsAndClearQueue();
+        }
+
+        /// <summary>
+        /// Increment mouse event count for the current session and view.
+        /// </summary>
+        public static void RecordMouseDownUsabilityEvent()
+        {
+            if (s_Views == null || s_CurrentViewIndex == -1)
+                return;
+
+            s_ProfilerSession.mouseEvents++;
+
+            var view = s_Views[s_CurrentViewIndex];
+            view.mouseEvents++;
+            s_Views[s_CurrentViewIndex] = view;
+        }
+
+        /// <summary>
+        /// Increment key event count for the current session and view.
+        /// </summary>
+        public static void RecordKeyDownUsabilityEvent()
+        {
+            if (s_Views == null || s_CurrentViewIndex == -1)
+                return;
+
+            s_ProfilerSession.keyboardEvents++;
+
+            var view = s_Views[s_CurrentViewIndex];
+            view.keyboardEvents++;
+            s_Views[s_CurrentViewIndex] = view;
+        }
+
+        /// <summary>
+        /// The function will accumulate a sequence of view changes and will send out an event once we get into the view switch cycles.
+        /// E.g. when user goes through CPU Hierarchy view, CPU Timeline view and then Memory module we will send an array of ["CPU;Hierarchy", "CPU;Timeline", "Memory"].
+        /// But for the sequence CPU View, Memory View, CPU View we will send 2 events - ["CPU;Hierarchy", "Memory"] and ["CPU;Hierarchy"].
+        /// This way we can track individual views usage as well as detect view flows.
+        /// </summary>
+        /// <param name="element">View name</param>
+        public static void SwitchActiveView(string element)
+        {
+            if (string.IsNullOrEmpty(element))
+                throw new ArgumentNullException(nameof(element));
+
+            // Selecting the same element
+            if (s_Views != null && s_CurrentViewIndex >= 0 && s_CurrentViewIndex < s_Views.Count && s_Views[s_CurrentViewIndex].element == element)
+                return;
+
+            if (!RegisterEvent(ref s_ProfilerElementUsabilityRegistered, k_ProfilerElementUsability))
+                return;
+
+            // Check if we start a new sequence or continuing the old one
+            s_Views ??= new List<ProfilerAnalyticsViewUsability>();
+            var idx = s_Views.FindIndex(x => x.element == element);
+            if (idx != -1)
+            {
+                // Views looped, send data out and start a new sequence.
+                // This way we are able to track sequences and bundle events together to avoid frequent sends.
+                SendElementUsabilityEventsAndClearQueue();
+            }
+            // New element has been selected.
+            // Update time of the current view
+            var currentTime = EditorApplication.timeSinceStartup;
+            if (s_CurrentViewIndex != -1 && s_CurrentViewIndex < s_Views.Count)
+            {
+                var view = s_Views[s_CurrentViewIndex];
+                view.time = currentTime - view.time;
+                s_Views[s_CurrentViewIndex] = view;
+            }
+
+            // Add new view to the array and record the activation time.
+            s_Views.Add(new ProfilerAnalyticsViewUsability()
+            {
+                element = element,
+                mouseEvents = 0,
+                keyboardEvents = 0,
+                time = currentTime,
+            });
+            s_CurrentViewIndex = s_Views.Count - 1;
+        }
+
+        static void SendElementUsabilityEventsAndClearQueue()
+        {
+            // Check if there is anything to send
+            if (s_Views == null || s_Views.Count == 0)
+                return;
+
+            if (!RegisterEvent(ref s_ProfilerElementUsabilityRegistered, k_ProfilerElementUsability))
+                return;
+
+            // Update duration for the current view and send all accumulated events.
+            var view = s_Views[s_CurrentViewIndex];
+            view.time = EditorApplication.timeSinceStartup - view.time;
+            s_Views[s_CurrentViewIndex] = view;
+
+            var currentTime = EditorApplication.timeSinceStartup;
+            s_ProfilerSession.session = s_Views.ToArray();
+            s_ProfilerSession.time = currentTime - s_ProfilerSession.time;
+            s_AnalyticsService.SendEventWithLimit(k_ProfilerElementUsability, s_ProfilerSession);
+
+            ClearElementUsabilityQueue(currentTime);
+        }
+
+        static void ClearElementUsabilityQueue(double startTime)
+        {
+            s_ProfilerSession = new ProfilerAnalyticsViewUsabilitySession()
+            {
+                session = null,
+                mouseEvents = 0,
+                keyboardEvents = 0,
+                time = EditorApplication.timeSinceStartup,
+            };
+            s_Views?.Clear();
+            s_CurrentViewIndex = -1;
+        }
+
+        /// <summary>
+        /// Send event when we start getting data from the stream
+        /// </summary>
+        public static void StartCapture()
+        {
+            if (!RegisterEvent(ref s_ProfilerCaptureRegistered, k_ProfilerCapture))
+                return;
+
+            var captureEvt = new ProfilerAnalyticsCapture
+            {
+                callStacksEnabled = ProfilerDriver.memoryRecordMode != 0,
+                deepProfileEnabled = ProfilerDriver.deepProfiling,
+                // Includes platform name or Editor is profiling Editor
+                connectionName = ProfilerDriver.GetConnectionIdentifier(ProfilerDriver.connectedProfiler),
+                // Editor platform name
+                platformName = Application.platform.ToString()
+            };
+            s_AnalyticsService.SendEventWithLimit(k_ProfilerCapture, captureEvt);
+        }
+
+        public static void SendSaveLoadEvent(ProfilerAnalyticsSaveLoadData data)
+        {
+            if (!RegisterEvent(ref s_ProfilerSaveLoadRegistered, k_ProfilerSaveLoad))
+                return;
+
+            s_AnalyticsService.SendEventWithLimit(k_ProfilerSaveLoad, data);
+        }
+
+        public static void SendConnectionEvent(ProfilerAnalyticsConnectionData data)
+        {
+            if (!RegisterEvent(ref s_ProfilerConnectionRegistered, k_ProfilerConnection))
+                return;
+
+            s_AnalyticsService.SendEventWithLimit(k_ProfilerConnection, data);
+        }
+    }
+}
diff --git a/Modules/ProfilerEditor/ProfilerWindow/Chart.cs b/Modules/ProfilerEditor/ProfilerWindow/Chart.cs
index 63b2b6da0b..d5123b7e99 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/Chart.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/Chart.cs
@@ -842,7 +842,12 @@ private void DrawChartItemStacked(Rect r, int index, ChartViewData cdata, float[
             float rangeScale = cdata.series[0].rangeAxis.sqrMagnitude == 0f ?
                 0f : 1f / (cdata.series[0].rangeAxis.y - cdata.series[0].rangeAxis.x) * r.height;
             float rectBottom = r.y + r.height;
+            float rangeStart = cdata.series[0].rangeAxis.x;
             bool passedFirstValidValue = false;
+
+            const int vertexBufferSize = 512;
+            Span<Vector3> vertexBuffer = stackalloc Vector3[vertexBufferSize];
+            int vertexBufferOffset = 0;
             for (int i = 0; i < numSamples; i++, x += step)
             {
                 float y = rectBottom - stackedSampleSums[i];
@@ -862,15 +867,34 @@ private void DrawChartItemStacked(Rect r, int index, ChartViewData cdata, float[
 
                 value *= serie.yScale;
 
-                float val = (value - cdata.series[0].rangeAxis.x) * rangeScale;
+                float val = (value - rangeStart) * rangeScale;
                 if (y - val < r.yMin)
                     val = y - r.yMin; // Clamp the values to be inside drawrect
 
-                GL.Vertex3(x, y - val, 0f); // clip chart top
-                GL.Vertex3(x, y, 0f);
+                vertexBuffer[vertexBufferOffset++] = new Vector3(x, y - val, 0); // clip chart top
+                vertexBuffer[vertexBufferOffset++] = new Vector3(x, y, 0);
+                if (vertexBufferOffset >= vertexBufferSize)
+                {
+                    unsafe
+                    {
+                        fixed (Vector3* p = vertexBuffer)
+                            GL.Vertices(p, null, null, vertexBufferOffset);
+                    }
+
+                    vertexBufferOffset -= vertexBufferSize;
+                }
 
                 stackedSampleSums[i] += val;
             }
+
+            if (vertexBufferOffset > 0)
+            {
+                unsafe
+                {
+                    fixed (Vector3* p = vertexBuffer)
+                        GL.Vertices(p, null, null, vertexBufferOffset);
+                }
+            }
             GL.End();
         }
 
@@ -887,12 +911,18 @@ private void DrawChartItemStackedOverlay(Rect r, int index, ChartViewData cdata,
             Color color = cdata.series[orderIdx].color;
 
             GL.Begin(GL.TRIANGLE_STRIP);
+            GL.Color(color);
 
             float x = r.x + step * 0.5f;
             float rangeScale = cdata.series[0].rangeAxis.sqrMagnitude == 0f ?
                 0f : 1f / (cdata.series[0].rangeAxis.y - cdata.series[0].rangeAxis.x) * r.height;
+            float rangeStart = cdata.series[0].rangeAxis.x;
             float rectBottom = r.y + r.height;
             bool passedFirstValidValue = false;
+
+            const int vertexBufferSize = 512;
+            Span<Vector3> vertexBuffer = stackalloc Vector3[vertexBufferSize];
+            int vertexBufferOffset = 0;
             for (int i = 0; i < numSamples; i++, x += step)
             {
                 float y = rectBottom - stackedSampleSums[i];
@@ -912,10 +942,28 @@ private void DrawChartItemStackedOverlay(Rect r, int index, ChartViewData cdata,
 
                 value *= overlay.yScale;
 
-                float val = (value - cdata.series[0].rangeAxis.x) * rangeScale;
-                GL.Color(color);
-                GL.Vertex3(x, y - val, 0f);
-                GL.Vertex3(x, y, 0f);
+                float val = (value - rangeStart) * rangeScale;
+                vertexBuffer[vertexBufferOffset++] = new Vector3(x, y - val, 0);
+                vertexBuffer[vertexBufferOffset++] = new Vector3(x, y, 0);
+                if (vertexBufferOffset >= vertexBufferSize)
+                {
+                    unsafe
+                    {
+                        fixed (Vector3* p = vertexBuffer)
+                            GL.Vertices(p, null, null, vertexBufferOffset);
+                    }
+
+                    vertexBufferOffset -= vertexBufferSize;
+                }
+            }
+
+            if (vertexBufferOffset > 0)
+            {
+                unsafe
+                {
+                    fixed (Vector3* p = vertexBuffer)
+                        GL.Vertices(p, null, null, vertexBufferOffset);
+                }
             }
             GL.End();
         }
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerFrameHierarchyView.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerFrameHierarchyView.cs
index 47c692f708..c007a2d604 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerFrameHierarchyView.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerFrameHierarchyView.cs
@@ -638,10 +638,6 @@ public void DoGUI(HierarchyFrameDataView frameDataView, bool fetchData, ref bool
         void DrawSearchBar()
         {
             var rect = GUILayoutUtility.GetRect(50f, 300f, EditorGUI.kSingleLineHeight, EditorGUI.kSingleLineHeight, EditorStyles.toolbarSearchField);
-            if (Event.current.isMouse && Event.current.button == 0 && rect.Contains(Event.current.mousePosition))
-            {
-                ProfilerWindowAnalytics.SwitchActiveView(ProfilerWindowAnalytics.profilerCPUModuleSearch);
-            }
             treeView.searchString = m_SearchField.OnToolbarGUI(rect, treeView.searchString);
         }
 
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPU/CPUProfilerModule.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPU/CPUProfilerModule.cs
index 857a2c6dc4..6aa6a75ccb 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPU/CPUProfilerModule.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPU/CPUProfilerModule.cs
@@ -74,6 +74,7 @@ internal override void OnEnable()
             m_TimelineGUI.viewTypeChanged += CPUOrGPUViewTypeChanged;
             m_TimelineGUI.selectionChanged -= SetSelectionWithoutIntegrityChecksOnSelectionChangeInDetailedView;
             m_TimelineGUI.selectionChanged += SetSelectionWithoutIntegrityChecksOnSelectionChangeInDetailedView;
+            TryRestoringSelection();
             UpdateSelectionHighlightLabel();
         }
 
@@ -124,19 +125,11 @@ public override void DrawDetailsView(Rect position)
         {
             if (m_TimelineGUI != null && m_ViewType == ProfilerViewType.Timeline)
             {
-                if (Event.current.isKey)
-                    ProfilerWindowAnalytics.RecordViewKeyboardEvent(ProfilerWindowAnalytics.profilerCPUModuleTimeline);
-                if (Event.current.isMouse && position.Contains(Event.current.mousePosition))
-                    ProfilerWindowAnalytics.RecordViewMouseEvent(ProfilerWindowAnalytics.profilerCPUModuleTimeline);
                 CurrentFrameIndex = (int)ProfilerWindow.selectedFrameIndex;
                 m_TimelineGUI.DoGUI(CurrentFrameIndex, position, fetchData, ref updateViewLive);
             }
             else
             {
-                if (Event.current.isKey)
-                    ProfilerWindowAnalytics.RecordViewKeyboardEvent(ProfilerWindowAnalytics.profilerCPUModuleHierarchy);
-                if (Event.current.isMouse && position.Contains(Event.current.mousePosition))
-                    ProfilerWindowAnalytics.RecordViewMouseEvent(ProfilerWindowAnalytics.profilerCPUModuleHierarchy);
                 base.DrawDetailsView(position);
             }
         }
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPU/ProfilerTimelineGUI.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPU/ProfilerTimelineGUI.cs
index 05f889d3b2..633e61e87c 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPU/ProfilerTimelineGUI.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPU/ProfilerTimelineGUI.cs
@@ -241,7 +241,7 @@ class EntryInfo
         {
             public int frameId = FrameDataView.invalidOrCurrentFrameIndex;
             public int threadIndex = FrameDataView.invalidThreadIndex;
-            public int nativeIndex = TimelineIndexHelper.invalidNativeTimelineEntryIndex; // Uniquely identifies the sample for the thread and frame.
+            public int sampleIndex = RawFrameDataView.invalidSampleIndex; // Uniquely identifies the sample for the thread and frame in a sense of RawFrameDataView.
             public float relativeYPos = 0.0f;
             public float time = 0.0f;
             public float duration = 0.0f;
@@ -252,16 +252,16 @@ public bool IsValid()
                 return this.name.Length > 0;
             }
 
-            public bool Equals(int frameId, int threadIndex, int nativeIndex)
+            public bool Equals(int frameId, int threadIndex, int sampleIndex)
             {
-                return frameId == this.frameId && threadIndex == this.threadIndex && nativeIndex == this.nativeIndex;
+                return frameId == this.frameId && threadIndex == this.threadIndex && sampleIndex == this.sampleIndex;
             }
 
             public virtual void Reset()
             {
                 this.frameId = FrameDataView.invalidOrCurrentFrameIndex;
                 this.threadIndex = FrameDataView.invalidThreadIndex;
-                this.nativeIndex = TimelineIndexHelper.invalidNativeTimelineEntryIndex;
+                this.sampleIndex = RawFrameDataView.invalidSampleIndex;
                 this.relativeYPos = 0.0f;
                 this.time = 0.0f;
                 this.duration = 0.0f;
@@ -319,32 +319,11 @@ public override void Reset()
 
         struct TimelineIndexHelper
         {
-            int m_SampleIndex;
-            // m_NativeTimelineEntryIndex is m_SampleIndex -1 because the root sample is not considered as an entry in the Native timeline code
-            int m_NativeTimelineEntryIndex;
-            public const int invalidNativeTimelineEntryIndex = -1;
+            public static TimelineIndexHelper invalidIndex => new TimelineIndexHelper() { sampleIndex = RawFrameDataView.invalidSampleIndex };
 
-            public static TimelineIndexHelper invalidIndex => new TimelineIndexHelper() { m_NativeTimelineEntryIndex = invalidNativeTimelineEntryIndex, m_SampleIndex = RawFrameDataView.invalidSampleIndex };
+            public int sampleIndex { get; set; }
 
-            public int sampleIndex
-            {
-                get { return m_SampleIndex; }
-                set
-                {
-                    m_SampleIndex = value;
-                    m_NativeTimelineEntryIndex = value > 0 ? value - 1 : RawFrameDataView.invalidSampleIndex;
-                }
-            }
-            public int nativeTimelineEntryIndex
-            {
-                get { return m_NativeTimelineEntryIndex; }
-                set
-                {
-                    m_NativeTimelineEntryIndex = value;
-                    m_SampleIndex = value >= 0 ? value + 1 : invalidNativeTimelineEntryIndex;
-                }
-            }
-            public bool valid => m_NativeTimelineEntryIndex >= 0 && m_SampleIndex >= 0;
+            public bool valid => sampleIndex >= 0;
         }
 
         // a local cache of the marker Id path, which is modified in frames other than the one originally selected, in case the marker ids changed
@@ -837,8 +816,8 @@ void DrawNativeProfilerTimeline(Rect threadRect, int frameIndex, int threadIndex
             // cull text that would otherwise draw over the bottom scrollbar
             drawArgs.threadRect.yMax = Mathf.Min(drawArgs.threadRect.yMax, m_TimeArea.shownArea.height - m_TimeArea.hSliderHeight);
             drawArgs.shownAreaRect = m_TimeArea.shownArea;
-            drawArgs.selectedEntryIndex = hasSelection ? m_SelectedEntry.nativeIndex : TimelineIndexHelper.invalidNativeTimelineEntryIndex;
-            drawArgs.mousedOverEntryIndex = TimelineIndexHelper.invalidNativeTimelineEntryIndex;
+            drawArgs.selectedEntryIndex = hasSelection ? m_SelectedEntry.sampleIndex : RawFrameDataView.invalidSampleIndex;
+            drawArgs.mousedOverEntryIndex = RawFrameDataView.invalidSampleIndex;
 
             NativeProfilerTimeline.Draw(ref drawArgs);
         }
@@ -988,7 +967,7 @@ void HandleNativeProfilerTimelineInput(Rect threadRect, int frameIndex, int thre
                     posArgs.position = Event.current.mousePosition;
                     NativeProfilerTimeline.GetEntryAtPosition(ref posArgs);
 
-                    indexHelper.nativeTimelineEntryIndex = posArgs.out_EntryIndex;
+                    indexHelper.sampleIndex = posArgs.out_EntryIndex;
                     relativeYPosition = posArgs.out_EntryYMaxPos + topMargin;
                     name = posArgs.out_EntryName;
                     fireSelectionChanged = true;
@@ -997,7 +976,7 @@ void HandleNativeProfilerTimelineInput(Rect threadRect, int frameIndex, int thre
 
                 if (indexHelper.valid)
                 {
-                    bool selectedChanged = !m_SelectedEntry.Equals(frameData.frameIndex, frameData.threadIndex, indexHelper.nativeTimelineEntryIndex);
+                    bool selectedChanged = !m_SelectedEntry.Equals(frameData.frameIndex, frameData.threadIndex, indexHelper.sampleIndex);
                     if (selectedChanged)
                     {
                         // Read out timing info
@@ -1005,7 +984,7 @@ void HandleNativeProfilerTimelineInput(Rect threadRect, int frameIndex, int thre
                         timingInfoArgs.Reset();
                         timingInfoArgs.frameIndex = frameData.frameIndex;
                         timingInfoArgs.threadIndex = frameData.threadIndex;
-                        timingInfoArgs.entryIndex = indexHelper.nativeTimelineEntryIndex;
+                        timingInfoArgs.entryIndex = indexHelper.sampleIndex;
                         timingInfoArgs.calculateFrameData = true;
                         NativeProfilerTimeline.GetEntryTimingInfo(ref timingInfoArgs);
 
@@ -1014,7 +993,7 @@ void HandleNativeProfilerTimelineInput(Rect threadRect, int frameIndex, int thre
                         instanceInfoArgs.Reset();
                         instanceInfoArgs.frameIndex = frameData.frameIndex;
                         instanceInfoArgs.threadIndex = frameData.threadIndex;
-                        instanceInfoArgs.entryIndex = indexHelper.nativeTimelineEntryIndex;
+                        instanceInfoArgs.entryIndex = indexHelper.sampleIndex;
                         NativeProfilerTimeline.GetEntryInstanceInfo(ref instanceInfoArgs);
 
                         if (fireSelectionChanged)
@@ -1028,7 +1007,7 @@ void HandleNativeProfilerTimelineInput(Rect threadRect, int frameIndex, int thre
                         m_SelectedEntry.Reset();
                         m_SelectedEntry.frameId = frameData.frameIndex;
                         m_SelectedEntry.threadIndex = frameData.threadIndex;
-                        m_SelectedEntry.nativeIndex = indexHelper.nativeTimelineEntryIndex;
+                        m_SelectedEntry.sampleIndex = indexHelper.sampleIndex;
                         m_SelectedEntry.instanceId = instanceInfoArgs.out_Id;
                         m_SelectedEntry.time = timingInfoArgs.out_LocalStartTime;
                         m_SelectedEntry.duration = timingInfoArgs.out_Duration;
@@ -1324,8 +1303,7 @@ internal void GetSelectedSampleIdsForCurrentFrameAndView(ref List<int> ids)
         {
             if (m_SelectedEntry.IsValid())
             {
-                // the native index is one lower than the raw index, because the thread root sample is not counted
-                ids.Add(m_SelectedEntry.nativeIndex + 1);
+                ids.Add(m_SelectedEntry.sampleIndex);
             }
         }
 
@@ -1935,7 +1913,7 @@ void DoSelectionTooltip(int frameIndex, Rect fullRect)
 
                 // Calculate total time of the sample across visible frames
                 var selectedThreadIndex = m_SelectedEntry.threadIndex;
-                int selectedSampleIndex = m_SelectedEntry.nativeIndex + 1;
+                int selectedSampleIndex = m_SelectedEntry.sampleIndex;
                 string selectedThreadName;
                 ulong totalAsyncDurationNs;
                 int totalAsyncFramesCount;
@@ -2000,7 +1978,7 @@ void DoSelectionTooltip(int frameIndex, Rect fullRect)
                         if (hasCallStack)
                         {
                             var callStack = new List<ulong>();
-                            frameData.GetSampleCallstack(m_SelectedEntry.nativeIndex + 1, callStack);
+                            frameData.GetSampleCallstack(m_SelectedEntry.sampleIndex, callStack);
                             CompileCallStack(text, callStack, frameData);
                         }
                     }
@@ -2020,7 +1998,7 @@ void DoSelectionTooltip(int frameIndex, Rect fullRect)
 
             float x = m_TimeArea.TimeToPixel(m_SelectedEntry.time + m_SelectedEntry.duration * 0.5f, fullRect);
             ShowLargeTooltip(new Vector2(x, selectedY), fullRect, m_SelectedEntry.cachedSelectionTooltipContent, m_SelectedEntry.sampleStack, selectedLineHeightVisible,
-                frameIndex, m_SelectedEntry.threadIndex, hasCallStack, ref m_SelectedEntry.downwardsZoomableAreaSpaceNeeded, m_SelectedEntry.nonProxyDepthDifference != 0 ? m_SelectedEntry.nativeIndex + 1 : RawFrameDataView.invalidSampleIndex);
+                frameIndex, m_SelectedEntry.threadIndex, hasCallStack, ref m_SelectedEntry.downwardsZoomableAreaSpaceNeeded, m_SelectedEntry.nonProxyDepthDifference != 0 ? m_SelectedEntry.sampleIndex : RawFrameDataView.invalidSampleIndex);
         }
 
         void PrepareTicks()
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPUorGPUProfilerModule.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPUorGPUProfilerModule.cs
index ea214efb70..bb57378bbf 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPUorGPUProfilerModule.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/CPUorGPUProfilerModule.cs
@@ -4,14 +4,15 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Profiling;
 using Unity.Profiling.Editor;
 using Unity.Profiling.LowLevel;
-using UnityEngine;
 using UnityEditor;
-using UnityEditor.Profiling;
 using UnityEditor.IMGUI.Controls;
-using Unity.Profiling;
+using UnityEditor.Profiling;
+using UnityEditor.Profiling.Analytics;
 using UnityEditorInternal;
+using UnityEngine;
 
 namespace UnityEditor.Profiling
 {
@@ -84,11 +85,23 @@ protected CPUOrGPUProfilerModule() : base(ProfilerModuleChartType.StackedTimeAre
                 m_Selection = null;
         }
 
+        internal override void LegacyModuleInitialize()
+        {
+            base.LegacyModuleInitialize();
+            k_HierarchyViewAnalyticsName = DisplayName + ".Hierarchy";
+            k_RawHierarchyViewAnalyticsName = DisplayName + ".RawHierarchy";
+            k_TimelineViewAnalyticsName = DisplayName + ".Timeline";
+        }
+
         protected bool fetchData
         {
             get { return !(ProfilerWindow == null || ProfilerWindow.ProfilerWindowOverheadIsAffectingProfilingRecordingData()) || updateViewLive; }
         }
 
+        string k_HierarchyViewAnalyticsName { get; set; }
+        string k_RawHierarchyViewAnalyticsName { get; set; }
+        string k_TimelineViewAnalyticsName { get; set; }
+
         protected const string k_MainThreadName = "Main Thread";
 
         const string k_ViewTypeSettingsKey = "ViewType";
@@ -276,14 +289,14 @@ internal override void OnEnable()
 
             m_ViewType = (ProfilerViewType)EditorPrefs.GetInt(ViewTypeSettingsKey, (int)DefaultViewTypeSetting);
             m_ProfilerViewFilteringOptions = SessionState.GetInt(ProfilerViewFilteringOptionsKey, m_ProfilerViewFilteringOptions);
-
-            TryRestoringSelection();
         }
 
         private protected override void OnSelected()
         {
             base.OnSelected();
             TryRestoringSelection();
+
+            SendViewTypeAnalytics(m_ViewType);
         }
 
         internal override void SaveViewSettings()
@@ -393,11 +406,9 @@ protected void CPUOrGPUViewTypeChanged(ProfilerViewType viewtype)
         {
             if (m_ViewType == viewtype)
                 return;
-            m_ViewType = viewtype;
 
-            ProfilerWindowAnalytics.SwitchActiveView(m_ViewType == ProfilerViewType.Timeline
-                ? ProfilerWindowAnalytics.profilerCPUModuleTimeline
-                : ProfilerWindowAnalytics.profilerCPUModuleHierarchy);
+            m_ViewType = viewtype;
+            SendViewTypeAnalytics(viewtype);
 
             // reset the hierarchy overruling if the user leaves the Hierarchy space
             // otherwise, switching back and forth between hierarchy views and Timeline feels inconsistent once you overruled the thread selection
@@ -645,7 +656,7 @@ protected virtual void ClearSelectedPropertyPath()
             // Only CPU view currently supports Chart filtering by property path
         }
 
-        void TryRestoringSelection()
+        protected void TryRestoringSelection()
         {
             if (selection != null)
             {
@@ -1034,5 +1045,12 @@ public string GetItemName(RawFrameDataView frameData, int itemId)
                 return name;
             }
         }
+
+        void SendViewTypeAnalytics(ProfilerViewType viewtype)
+        {
+            ProfilerWindowAnalytics.SwitchActiveView(viewtype == ProfilerViewType.Timeline
+                ? k_TimelineViewAnalyticsName
+                : viewtype == ProfilerViewType.Hierarchy ? k_HierarchyViewAnalyticsName : k_RawHierarchyViewAnalyticsName);
+        }
     }
 }
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/GPU/GPUProfilerModule.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/GPU/GPUProfilerModule.cs
index 1f7a23704b..b77ddf186e 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/GPU/GPUProfilerModule.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/GPU/GPUProfilerModule.cs
@@ -112,6 +112,8 @@ internal override void OnEnable()
             m_FrameDataHierarchyView.dataAvailabilityMessage = null;
             if (m_ViewType == ProfilerViewType.Timeline)
                 m_ViewType = ProfilerViewType.Hierarchy;
+
+            TryRestoringSelection();
         }
 
         public override void DrawDetailsView(Rect position)
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/Memory/MemoryProfilerModule.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/Memory/MemoryProfilerModule.cs
index 9100238bb7..f4a38568e7 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/Memory/MemoryProfilerModule.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/Memory/MemoryProfilerModule.cs
@@ -610,14 +610,7 @@ bool InitiateMemoryProfilerPackageAvailabilityCheck()
 
         bool IsMemoryProfilerPackageInstalled()
         {
-            var installedPackages = UnityEditor.PackageManager.PackageInfo.GetAllRegisteredPackages();
-            foreach (var package in installedPackages)
-            {
-                if (package.name == m_MemoryProfilerPackageName)
-                    return true;
-            }
-
-            return false;
+            return UnityEditor.PackageManager.PackageInfo.IsPackageRegistered(m_MemoryProfilerPackageName);
         }
 
         bool MemoryProfilerPackageAvailabilityCheckMoveNext()
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindow.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindow.cs
index bd7fcdb3cc..00fd378a29 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindow.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindow.cs
@@ -7,8 +7,10 @@
 using System.Collections.ObjectModel;
 using Unity.Profiling.Editor;
 using UnityEditor.Accessibility;
+using UnityEditor.MPE;
 using UnityEditor.Networking.PlayerConnection;
 using UnityEditor.Profiling;
+using UnityEditor.Profiling.Analytics;
 using UnityEditor.Profiling.ModuleEditor;
 using UnityEditor.StyleSheets;
 using UnityEditorInternal;
@@ -19,7 +21,6 @@
 using UnityEngine.Scripting;
 using UnityEngine.UIElements;
 using Debug = UnityEngine.Debug;
-using UnityEditor.MPE;
 
 namespace UnityEditor
 {
@@ -71,7 +72,7 @@ internal static class Styles
             public static readonly GUIContent saveWindowTitle = EditorGUIUtility.TrTextContent("Save Window");
             public static readonly GUIContent saveProfilingData = EditorGUIUtility.TrIconContent("SaveAs", "Save current profiling information to a binary file");
             public static readonly GUIContent loadWindowTitle = EditorGUIUtility.TrTextContent("Load Window");
-            public static readonly GUIContent loadProfilingData = EditorGUIUtility.TrIconContent("Profiler.Open", "Load binary profiling information from a file. Shift click to append to the existing data");
+            public static readonly GUIContent loadProfilingData = EditorGUIUtility.TrIconContent("Import", "Load binary profiling information from a file. Shift click to append to the existing data");
             public static readonly string[] loadProfilingDataFileFilters = new string[] { L10n.Tr("Profiler files"), "data,raw", L10n.Tr("All files"), "*" };
 
             public static readonly GUIContent optionsButtonContent = EditorGUIUtility.TrIconContent("_Menu", "Additional Options");
@@ -552,7 +553,7 @@ void SubscribeToGlobalEvents()
             ProfilerDriver.profilerCaptureSaved += ProfilerWindowAnalytics.SendSaveLoadEvent;
             ProfilerDriver.profilerCaptureLoaded += ProfilerWindowAnalytics.SendSaveLoadEvent;
             ProfilerDriver.profilerConnected += ProfilerWindowAnalytics.SendConnectionEvent;
-            ProfilerDriver.profilingStateChange += ProfilerWindowAnalytics.ProfilingStateChange;
+            ProfilerDriver.profilerCaptureStarted += ProfilerWindowAnalytics.StartCapture;
         }
 
         void UnsubscribeFromGlobalEvents()
@@ -566,7 +567,7 @@ void UnsubscribeFromGlobalEvents()
             ProfilerDriver.profilerCaptureSaved -= ProfilerWindowAnalytics.SendSaveLoadEvent;
             ProfilerDriver.profilerCaptureLoaded -= ProfilerWindowAnalytics.SendSaveLoadEvent;
             ProfilerDriver.profilerConnected -= ProfilerWindowAnalytics.SendConnectionEvent;
-            ProfilerDriver.profilingStateChange -= ProfilerWindowAnalytics.ProfilingStateChange;
+            ProfilerDriver.profilerCaptureStarted -= ProfilerWindowAnalytics.StartCapture;
         }
 
         void OnSettingsChanged()
@@ -727,7 +728,6 @@ internal void ClearFramesOnPlayOrPlayerConnectionChange()
 
         void OnDestroy()
         {
-            ProfilerWindowAnalytics.OnProfilerWindowDestroy();
             // We're being temporary "hidden" on maximize, do nothing
             if (WindowLayout.GetMaximizedWindow() != null)
                 return;
@@ -735,6 +735,9 @@ void OnDestroy()
             // When window is destroyed, we disable profiling
             if (Profiler.supported)
                 ProfilerDriver.enabled = false;
+
+            // Report window and session shutdown
+            ProfilerWindowAnalytics.OnProfilerWindowDestroy();
         }
 
         void OnFocus()
@@ -841,7 +844,7 @@ static void RecordToggle()
                     if (ProfilerDriver.enabled)
                         Debug.LogFormat(LogType.Log, LogOption.NoStacktrace, null, $"Recording {GetRecordingStateName(connectionName)} has started...");
                     else
-                        Debug.LogFormat(LogType.Log, LogOption.NoStacktrace, null, "Recording has ended.\r\nClick <a openprofiler=\"true\">here</a> to open the profiler window.");
+                        Debug.LogFormat(LogType.Log, LogOption.NoStacktrace, null, "Recording has ended.\r\nClick <color=#40a0ff><link=\"openprofiler='true'\">here</link></color> to open the profiler window.");
                 }
             }
         }
@@ -1065,10 +1068,16 @@ internal void SetRecordingEnabled(bool profilerEnabled)
         {
             ProfilerDriver.enabled = profilerEnabled;
             m_Recording = profilerEnabled;
+
             SessionState.SetBool(kProfilerEnabledSessionKey, profilerEnabled);
             if (ProfilerUserSettings.rememberLastRecordState)
                 EditorPrefs.SetBool(kProfilerEnabledSessionKey, profilerEnabled);
+
+            if (profilerEnabled)
+                ProfilerWindowAnalytics.StartCapture();
+
             recordingStateChanged?.Invoke(m_Recording);
+
             Repaint();
         }
 
@@ -1151,7 +1160,6 @@ float DrawMainToolbar()
             if (GUI.Button(overflowMenuRect, Styles.optionsButtonContent, EditorStyles.toolbarButtonRight))
             {
                 GenericMenu menu = new GenericMenu();
-                menu.AddItem(Styles.accessibilityModeLabel, UserAccessiblitySettings.colorBlindCondition != ColorBlindCondition.Default, OnToggleColorBlindMode);
                 menu.AddItem(Styles.showStatsLabelsOnCurrentFrameLabel, ProfilerUserSettings.showStatsLabelsOnCurrentFrame, OnToggleShowStatsLabelsOnCurrentFrame);
                 menu.AddSeparator("");
                 menu.AddItem(Styles.preferencesButtonContent, false, OpenProfilerPreferences);
@@ -1306,11 +1314,11 @@ internal void SetActiveVisibleFrameIndex(int frame)
 
         void DoLegacyGUI_ToolbarAndCharts()
         {
-            if (Event.current.isMouse)
-                ProfilerWindowAnalytics.RecordProfilerSessionMouseEvent();
-
-            if (Event.current.isKey)
-                ProfilerWindowAnalytics.RecordProfilerSessionKeyboardEvent();
+            EventType eventType = Event.current.type;
+            if (eventType == EventType.MouseDown)
+                ProfilerWindowAnalytics.RecordMouseDownUsabilityEvent();
+            else if (eventType == EventType.KeyDown)
+                ProfilerWindowAnalytics.RecordKeyDownUsabilityEvent();
 
             CheckForPlatformModuleChange(); // TODO Move this to an update loop or a callback.
 
@@ -1752,6 +1760,9 @@ void SelectModuleWithIndexAndDeselectSelectedModuleIfNecessary(ProfilerModule mo
                     moduleToSelect.active = true;
                 }
 
+                // Send module selection analytics event
+                ProfilerWindowAnalytics.SwitchActiveView(moduleToSelect.DisplayName);
+
                 try
                 {
                     // Create the module's details view and add it to the hierarchy.
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindowAnalytics.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindowAnalytics.cs
deleted file mode 100644
index a0cbcedf40..0000000000
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindowAnalytics.cs
+++ /dev/null
@@ -1,260 +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 System.Runtime.InteropServices;
-using UnityEditorInternal;
-using UnityEngine;
-using UnityEngine.Analytics;
-using UnityEngine.Profiling;
-using UnityEngine.Scripting;
-
-namespace UnityEditor
-{
-    [RequiredByNativeCode(GenerateProxy = true)]
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ProfilerAnalyticsSaveLoadData
-    {
-        public string extension;
-        public long duration;
-        public long size;
-        public uint frameCount;
-        public bool customFrameRange;
-        public string details;
-        public bool success;
-        public bool isLoad;
-        public bool isSave;
-    }
-
-    [RequiredByNativeCode(GenerateProxy = true)]
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ProfilerAnalyticsConnectionData
-    {
-        public bool success;
-        public string connectionDetail;
-        public string details;
-    }
-
-    [Serializable]
-    internal struct ProfilerAnalyticsViewUsability
-    {
-        public string element;
-        public uint mouseEvents;
-        public uint keyboardEvents;
-        public double time;
-    }
-
-    [Serializable]
-    internal struct ProfilerAnalyticsViewUsabilitySession
-    {
-        public ProfilerAnalyticsViewUsability[] session;
-        public uint mouseEvents;
-        public uint keyboardEvents;
-        public double time;
-    }
-
-    internal struct ProfilerAnalyticsCapture
-    {
-        public bool deepProfileEnabled;
-        public bool callStacksEnabled;
-        public string platformName; // Editor is platform
-        public string connectionName;
-    }
-
-
-    internal class ProfilerWindowAnalytics
-    {
-        const int k_MaxEventsPerHour = 1000; // Max Events send per hour.
-        const int k_MaxNumberOfElements = 1000; //Max number of elements sent.
-        const string k_VendorKey = "unity.profiler";
-        const string k_ProfilerSaveLoad = "profilerSaveLoad";
-        const string k_ProfilerConnection = "profilerConnection";
-        const string k_ProfilerElementUsability = "profilerSessionElementUsability";
-        const string k_ProfilerCapture = "profilerCapture";
-
-        // events registered
-        static bool profilerElementUsabilityRegistered;
-        static bool profilerCaptureRegistered;
-        static bool profilerSaveLoadRegistered;
-        static bool profilerConnectionRegistered;
-
-        // known elements
-        public static string profilerWindowElement = "profilerwindow";
-        public static string profilerCPUModule = profilerWindowElement + ".cpu";
-        public static string profilerCPUModuleTimeline = profilerCPUModule + ".timeline";
-        public static string profilerCPUModuleHierarchy = profilerCPUModule + ".hierarchy";
-        public static string profilerCPUModuleSearch = profilerCPUModule + ".search";
-
-        static ProfilerAnalyticsViewUsabilitySession ProfilerSession;
-        static ProfilerAnalyticsViewUsability CurrentView;
-        static List<ProfilerAnalyticsViewUsability> Views;
-
-        static ProfilerAnalyticsCapture Capture;
-        static bool Capturing;
-
-        public static void OnProfilerWindowAwake()
-        {
-            Views = new List<ProfilerAnalyticsViewUsability>();
-            CurrentView = new ProfilerAnalyticsViewUsability();
-            ProfilerSession = new ProfilerAnalyticsViewUsabilitySession();
-        }
-
-        static bool RegisterEvent(string eventName)
-        {
-            var analyticsResult = EditorAnalytics.RegisterEventWithLimit(eventName, k_MaxEventsPerHour, k_MaxNumberOfElements, k_VendorKey);
-            return analyticsResult == AnalyticsResult.Ok;
-        }
-
-        public static void OnProfilerWindowDestroy()
-        {
-            ProfilerSession.time = EditorApplication.timeSinceStartup - ProfilerSession.time;
-            if (!EditorAnalytics.enabled)
-                return;
-
-            if (!profilerElementUsabilityRegistered)
-                profilerElementUsabilityRegistered = RegisterEvent(k_ProfilerElementUsability);
-
-            // no interaction during session
-            if (ProfilerSession.keyboardEvents == 0 && ProfilerSession.mouseEvents == 0)
-                return;
-
-            SwitchActiveView(CurrentView.element);
-            ProfilerSession.session = Views.ToArray();
-
-            EditorAnalytics.SendEventWithLimit(k_ProfilerElementUsability, ProfilerSession);
-        }
-
-        public static void SendSaveLoadEvent(ProfilerAnalyticsSaveLoadData data)
-        {
-            if (!EditorAnalytics.enabled)
-                return;
-
-            if (!profilerSaveLoadRegistered)
-                profilerSaveLoadRegistered = RegisterEvent(k_ProfilerSaveLoad);
-
-            EditorAnalytics.SendEventWithLimit(k_ProfilerSaveLoad, data);
-        }
-
-        public static void SendConnectionEvent(ProfilerAnalyticsConnectionData data)
-        {
-            if (!EditorAnalytics.enabled)
-                return;
-
-            if (data.success)
-                data.connectionDetail = ProfilerDriver.GetConnectionIdentifier(ProfilerDriver.connectedProfiler);
-
-            if (!profilerConnectionRegistered)
-                profilerConnectionRegistered = RegisterEvent(k_ProfilerConnection);
-
-            EditorAnalytics.SendEventWithLimit(k_ProfilerConnection, data);
-        }
-
-        public static void RecordProfilerSessionMouseEvent()
-        {
-            ProfilerSession.mouseEvents++;
-        }
-
-        public static void RecordProfilerSessionKeyboardEvent()
-        {
-            ProfilerSession.keyboardEvents++;
-        }
-
-        public static void RecordViewMouseEvent(string element)
-        {
-            if (CurrentView.element == element)
-            {
-                CurrentView.mouseEvents++;
-                return;
-            }
-
-            SwitchActiveView(element);
-            CurrentView.mouseEvents++;
-        }
-
-        public static void RecordViewKeyboardEvent(string element)
-        {
-            if (CurrentView.element == element)
-            {
-                CurrentView.keyboardEvents++;
-                return;
-            }
-
-            SwitchActiveView(element);
-            CurrentView.keyboardEvents++;
-        }
-
-        public static void SwitchActiveView(string element)
-        {
-            if (!EditorAnalytics.enabled)
-                return;
-
-            if (Views == null)
-                Views = new List<ProfilerAnalyticsViewUsability>();
-
-            var idx = Views.FindIndex(x => x.element == element);
-
-            if (idx == -1)
-            {
-                Views.Add(new ProfilerAnalyticsViewUsability()
-                {
-                    time = 0,
-                    element = element
-                });
-            }
-            else
-            {
-                idx = Views.FindIndex(x => x.element == CurrentView.element);
-                CurrentView.time = EditorApplication.timeSinceStartup - CurrentView.time;
-                var view = Views[idx];
-                view.keyboardEvents += CurrentView.keyboardEvents;
-                view.mouseEvents += CurrentView.mouseEvents;
-                view.time += CurrentView.time;
-                Views[idx] = view;
-            }
-
-            CurrentView = new ProfilerAnalyticsViewUsability();
-            CurrentView.time = EditorApplication.timeSinceStartup;
-            CurrentView.element = element;
-        }
-
-        public static void ProfilingStateChange(bool state)
-        {
-            if (state == Capturing) return;
-
-            if (state)
-                StartCapture();
-            else
-            {
-                StopCapture();
-            }
-        }
-
-        public static void StartCapture()
-        {
-            Capturing = true;
-            Capture = new ProfilerAnalyticsCapture();
-
-            Capture.callStacksEnabled = Profiler.enableAllocationCallstacks;
-            Capture.deepProfileEnabled = ProfilerDriver.deepProfiling;
-            Capture.connectionName = ProfilerDriver.GetConnectionIdentifier(ProfilerDriver.connectedProfiler);
-            Capture.platformName = ProfilerDriver.profileEditor ? "Editor" : "";
-        }
-
-        public static void StopCapture()
-        {
-            if (!Capturing)
-                return;
-            if (!EditorAnalytics.enabled)
-                return;
-            Capturing = false;
-
-            if (!profilerCaptureRegistered)
-                profilerCaptureRegistered = RegisterEvent(k_ProfilerCapture);
-
-            EditorAnalytics.SendEventWithLimit(k_ProfilerCapture, Capture);
-        }
-    }
-}
diff --git a/Modules/ProfilerEditor/Public/FrameDataView.bindings.cs b/Modules/ProfilerEditor/Public/FrameDataView.bindings.cs
index 231e58c874..3325220130 100644
--- a/Modules/ProfilerEditor/Public/FrameDataView.bindings.cs
+++ b/Modules/ProfilerEditor/Public/FrameDataView.bindings.cs
@@ -177,12 +177,12 @@ public extern int maxDepth
             get;
         }
 
-        // the current runtime (Editor or Player) session id. This is different from the  
+        // the current runtime (Editor or Player) session id. This is different from the
         internal extern uint runtimeSessionId
         {
             [ThreadSafe]
             get;
-        } 
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         [RequiredByNativeCode]
@@ -232,7 +232,7 @@ public struct MarkerInfo
         internal static extern UnityEngine.Color32 GetMarkerCategoryColor(ushort category);
 
         [StructLayout(LayoutKind.Sequential)]
-        struct Data
+        internal struct Data
         {
             public IntPtr ptr;
             public int size;
@@ -389,7 +389,7 @@ public struct GfxResourceInfo
         {
             [NativeName("rootId")]
             readonly ulong m_RootId;
-            [NativeName("rootId")]
+            [NativeName("instanceId")]
             readonly int m_InstanceId;
 
             public ulong relatedAllocationRootId => m_RootId;
diff --git a/Modules/ProfilerEditor/Public/ProfilerAPI.bindings.cs b/Modules/ProfilerEditor/Public/ProfilerAPI.bindings.cs
index 6b71b141bc..2006259f71 100644
--- a/Modules/ProfilerEditor/Public/ProfilerAPI.bindings.cs
+++ b/Modules/ProfilerEditor/Public/ProfilerAPI.bindings.cs
@@ -7,6 +7,7 @@
 using UnityEditor;
 using UnityEditor.MPE;
 using UnityEditor.Profiling;
+using UnityEditor.Profiling.Analytics;
 using UnityEngine.Bindings;
 using UnityEngine.Profiling;
 using UnityEngine.Scripting;
@@ -183,7 +184,6 @@ static public bool enabled
 
             set
             {
-                ProfilerWindowAnalytics.ProfilingStateChange(value);
                 SetProfilingEnabled(value);
             }
         }
@@ -403,11 +403,12 @@ static void InvokeProfilerConnected(ProfilerAnalyticsConnectionData data)
             profilerConnected?.Invoke(data);
         }
 
-        internal static event Action<bool> profilingStateChange;
+        internal static event Action profilerCaptureStarted;
+
         [RequiredByNativeCode]
-        static void InvokeProfilingStateChange(bool state)
+        static void InvokeProfilerCaptureStarted()
         {
-            profilingStateChange?.Invoke(state);
+            profilerCaptureStarted?.Invoke();
         }
 
         [Obsolete("ResetHistory is deprecated, use ClearAllFrames instead.")]
diff --git a/Modules/ProfilerEditor/Public/RawFrameDataView.bindings.cs b/Modules/ProfilerEditor/Public/RawFrameDataView.bindings.cs
index 0bd24d7355..16cb6d0927 100644
--- a/Modules/ProfilerEditor/Public/RawFrameDataView.bindings.cs
+++ b/Modules/ProfilerEditor/Public/RawFrameDataView.bindings.cs
@@ -7,8 +7,10 @@
 using System.Runtime.InteropServices;
 using Unity.Profiling;
 using Unity.Profiling.LowLevel;
+using Unity.Collections;
 using UnityEngine.Bindings;
 using UnityEngine.Scripting;
+using Unity.Collections.LowLevel.Unsafe;
 
 namespace UnityEditor.Profiling
 {
@@ -77,6 +79,21 @@ internal RawFrameDataView(int frameIndex, int threadIndex)
         [NativeMethod(IsThreadSafe = true, ThrowsException = true)]
         public extern double GetSampleMetadataAsDouble(int sampleIndex, int metadataIndex);
 
+        [NativeMethod(IsThreadSafe = true, ThrowsException = true)]
+        private unsafe extern FrameDataView.Data GetSampleMetadataAsSpanInternal(int sampleIndex, int metadataIndex);
+
+        public Span<T> GetSampleMetadataAsSpan<T>(int sampleIndex, int metadataIndex) where T : unmanaged
+        {
+            unsafe
+            {
+                var data = GetSampleMetadataAsSpanInternal(sampleIndex, metadataIndex);
+                int sizeT = UnsafeUtility.SizeOf<T>();
+                // As len is given with size in bytes and we want number of elments in span
+                // we need to divide by the size of the type
+                return new Span<T>((void*)data.ptr, data.size / sizeT);
+            }
+        }
+
         public void GetSampleCallstack(int sampleIndex, List<ulong> outCallstack)
         {
             if (outCallstack == null)
diff --git a/Modules/Progress/ProgressWindow.cs b/Modules/Progress/ProgressWindow.cs
index ef2510740c..ed265a1c85 100644
--- a/Modules/Progress/ProgressWindow.cs
+++ b/Modules/Progress/ProgressWindow.cs
@@ -107,7 +107,7 @@ void OnEnable()
             m_DismissAllBtn = new ToolbarButton(ClearInactive)
             {
                 name = "DismissAllBtn",
-                text = L10n.Tr("Clear inactive"),
+                text = L10n.Tr("Clear Inactive"),
             };
             toolbar.Add(m_DismissAllBtn);
 
@@ -209,7 +209,8 @@ int GetIndentationLevel(int index)
 
         internal static void ClearInactive()
         {
-            var finishedItems = Progress.EnumerateItems().Where(item => item.finished);
+            // When using synchronous progresses, calling remove will alter the progress items immediately.
+            var finishedItems = Progress.EnumerateItems().Where(item => item.finished).ToList();
             foreach (var item in finishedItems)
             {
                 item.Remove();
diff --git a/Modules/Properties/Runtime/Attributes.cs b/Modules/Properties/Runtime/Attributes.cs
index 80f0f5d51d..6c0dd388bf 100644
--- a/Modules/Properties/Runtime/Attributes.cs
+++ b/Modules/Properties/Runtime/Attributes.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using UnityEngine.Scripting;
 
 namespace Unity.Properties
 {
@@ -23,9 +24,17 @@ public class GeneratePropertyBagsForAssemblyAttribute : Attribute
     /// </remarks>
     /// <see cref="DontCreatePropertyAttribute"/>
     [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-    public class CreatePropertyAttribute : Attribute
+    [RequireAttributeUsages]
+    public class CreatePropertyAttribute : RequiredMemberAttribute
     {
-
+        /// <summary>
+        /// Indicates if the property should generate a setter.
+        /// </summary>
+        /// <remarks>
+        /// Setting this to <see langword="false"/> will not generate a setter for a readonly field or
+        /// a get only property.
+        /// </remarks>
+        public bool ReadOnly { get; set; } = false;
     }
 
     /// <summary>
diff --git a/Modules/Properties/Runtime/Properties/Property.cs b/Modules/Properties/Runtime/Properties/Property.cs
index c8a6ad0ab8..1ee6c9c9a9 100644
--- a/Modules/Properties/Runtime/Properties/Property.cs
+++ b/Modules/Properties/Runtime/Properties/Property.cs
@@ -194,7 +194,7 @@ void IAttributes.AddAttributes(IEnumerable<Attribute> attributes)
 
             foreach (var attribute in attributes)
             {
-                if (null == attribute || attribute.GetType() == typeof(CreatePropertyAttribute))
+                if (null == attribute)
                     continue;
 
                 m_Attributes.Add(attribute);
diff --git a/Modules/Properties/Runtime/Properties/PropertyPath.cs b/Modules/Properties/Runtime/Properties/PropertyPath.cs
index 78ec57dbbd..bea35c298d 100644
--- a/Modules/Properties/Runtime/Properties/PropertyPath.cs
+++ b/Modules/Properties/Runtime/Properties/PropertyPath.cs
@@ -667,7 +667,7 @@ static void GetParts(in PropertyPath path, List<PropertyPathPart> parts)
 
         static PropertyPath ConstructFromPath(string path)
         {
-            if (string.IsNullOrEmpty(path))
+            if (string.IsNullOrWhiteSpace(path))
                 return default;
 
             const int matchAny = 0;
@@ -857,6 +857,18 @@ void ReadNext()
             }
         }
 
+        /// <undoc/>
+        public static bool operator==(PropertyPath lhs, PropertyPath rhs)
+        {
+            return lhs.Equals(rhs);
+        }
+
+        /// <undoc/>
+        public static bool operator !=(PropertyPath lhs, PropertyPath rhs)
+        {
+            return !(lhs == rhs);
+        }
+
         /// <summary>
         /// Indicates whether this instance and a specified object are equal.
         /// </summary>
diff --git a/Modules/Properties/Runtime/Properties/ReflectedMemberProperty.cs b/Modules/Properties/Runtime/Properties/ReflectedMemberProperty.cs
index f826e0505f..f854bc3122 100644
--- a/Modules/Properties/Runtime/Properties/ReflectedMemberProperty.cs
+++ b/Modules/Properties/Runtime/Properties/ReflectedMemberProperty.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Unity.Collections;
 
 using System.Reflection.Emit;
 
@@ -174,7 +173,13 @@ internal ReflectedMemberProperty(IMemberInfo info, string name)
             m_IsStructContainerType = TypeTraits<TContainer>.IsValueType;
 
             AddAttributes(info.GetCustomAttributes());
-            var isReadOnly = m_Info.IsReadOnly || HasAttribute<ReadOnlyAttribute>();
+            var isReadOnly = m_Info.IsReadOnly;
+            if (HasAttribute<CreatePropertyAttribute>())
+            {
+                var createProperty = GetAttribute<CreatePropertyAttribute>();
+                isReadOnly |= createProperty.ReadOnly;
+            }
+
             IsReadOnly = isReadOnly;
 
             if (m_Info is FieldMember fieldMember)
@@ -198,7 +203,7 @@ internal ReflectedMemberProperty(IMemberInfo info, string name)
                 else
                     m_GetClassValueAction = (GetClassValueAction)dynamicMethod.CreateDelegate(typeof(GetClassValueAction));
 
-                // settter
+                // setter
                 if (!isReadOnly)
                 {
                     dynamicMethod = new DynamicMethod(string.Empty, typeof(void), new Type[]
diff --git a/Modules/Properties/Runtime/PropertyBags/Internal/DefaultPropertyBags.cs b/Modules/Properties/Runtime/PropertyBags/Internal/PropertiesInitialization.cs
similarity index 98%
rename from Modules/Properties/Runtime/PropertyBags/Internal/DefaultPropertyBags.cs
rename to Modules/Properties/Runtime/PropertyBags/Internal/PropertiesInitialization.cs
index c5729d980f..87d5f2404f 100644
--- a/Modules/Properties/Runtime/PropertyBags/Internal/DefaultPropertyBags.cs
+++ b/Modules/Properties/Runtime/PropertyBags/Internal/PropertiesInitialization.cs
@@ -3,13 +3,16 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using UnityEngine;
+using UnityEngine.Scripting;
 
 namespace Unity.Properties.Internal
 {
-    static class DefaultPropertyBagInitializer
+    static class PropertiesInitialization
     {
-        internal static void Initialize()
+        [RequiredByNativeCode(optional:false)]
+        internal static void InitializeProperties()
         {
+            PropertyBagStore.CreatePropertyBagProvider();
             PropertyBag.Register(new ColorPropertyBag());
             PropertyBag.Register(new Vector2PropertyBag());
             PropertyBag.Register(new Vector3PropertyBag());
diff --git a/Modules/Properties/Runtime/PropertyBags/Internal/PropertyBagStore.cs b/Modules/Properties/Runtime/PropertyBags/Internal/PropertyBagStore.cs
index b3048cb25c..c0f838e435 100644
--- a/Modules/Properties/Runtime/PropertyBags/Internal/PropertyBagStore.cs
+++ b/Modules/Properties/Runtime/PropertyBags/Internal/PropertyBagStore.cs
@@ -3,9 +3,11 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Unity.Jobs;
 
 namespace Unity.Properties.Internal
 {
@@ -25,30 +27,32 @@ interface IPropertyBagRegister
     /// </remarks>
     static class PropertyBagStore
     {
-        static PropertyBagStore()
-        {
-            s_PropertyBagProvider = new ReflectedPropertyBagProvider();
-            DefaultPropertyBagInitializer.Initialize();
-        }
+        private static ConcurrentQueue<JobHandle> s_Handles = new ConcurrentQueue<JobHandle>();
 
         internal struct TypedStore<TContainer>
         {
             public static IPropertyBag<TContainer> PropertyBag;
         }
 
-        static readonly System.Collections.Concurrent.ConcurrentDictionary<Type, IPropertyBag> s_PropertyBags = new System.Collections.Concurrent.ConcurrentDictionary<Type, IPropertyBag>();
+        static readonly ConcurrentDictionary<Type, IPropertyBag> s_PropertyBags = new ConcurrentDictionary<Type, IPropertyBag>();
         static readonly List<Type> s_RegisteredTypes = new List<Type>();
-        internal static event Action<Type, IPropertyBag> NewTypeRegistered;
 
         /// <summary>
         /// Instance of the dynamic property bag provider. This is used to allow an external assembly to generate property bags for us.
         /// </summary>
         static ReflectedPropertyBagProvider s_PropertyBagProvider = null;
 
-        internal static bool HasProvider => null != s_PropertyBagProvider;
+        // The reflected property bag provider is created inside of a job to lessen the impact on domain reload.
+        // If it is queried before the job finishes, we go through the slower path.
+        static ReflectedPropertyBagProvider ReflectedPropertyBagProvider => s_PropertyBagProvider ??= new ReflectedPropertyBagProvider();
 
         internal static List<Type> AllTypes => s_RegisteredTypes;
 
+        internal static void CreatePropertyBagProvider()
+        {
+            s_PropertyBagProvider = new ReflectedPropertyBagProvider();
+        }
+
         /// <summary>
         /// Adds a <see cref="ContainerPropertyBag{TContainer}"/> to the store.
         /// </summary>
@@ -81,7 +85,6 @@ internal static void AddPropertyBag<TContainer>(IPropertyBag<TContainer> propert
             }
 
             s_PropertyBags[typeof(TContainer)] = propertyBag;
-            NewTypeRegistered?.Invoke(typeof(TContainer), propertyBag);
         }
 
         /// <summary>
@@ -146,21 +149,15 @@ internal static IPropertyBag GetPropertyBag(Type type)
                 return null;
             }
 
-            if (null != s_PropertyBagProvider)
+            propertyBag = ReflectedPropertyBagProvider.CreatePropertyBag(type);
+            if (null == propertyBag)
             {
-                propertyBag = s_PropertyBagProvider.CreatePropertyBag(type);
-
-                if (null == propertyBag)
-                {
-
-                    s_PropertyBags.TryAdd(type, null);
-
-                }
-                else
-                {
-                    (propertyBag as IPropertyBagRegister)?.Register();
-                    return propertyBag;
-                }
+                s_PropertyBags.TryAdd(type, null);
+            }
+            else
+            {
+                (propertyBag as IPropertyBagRegister)?.Register();
+                return propertyBag;
             }
 
             return null;
@@ -239,5 +236,25 @@ internal static bool TryGetPropertyBagForValue<TValue>(ref TValue value, out IPr
             propertyBag = GetPropertyBag(value.GetType());
             return null != propertyBag;
         }
+
+        internal static void AddJobToWaitQueue(JobHandle handle)
+        {
+            var handles = s_Handles ??= new ConcurrentQueue<JobHandle>();
+            handles.Enqueue(handle);
+        }
+
+        static void WaitForJobs()
+        {
+            if (s_Handles is not {Count: > 0})
+                return;
+
+            foreach (var handle in s_Handles)
+            {
+                if (!handle.IsCompleted)
+                    handle.Complete();
+            }
+
+            s_Handles.Clear();
+        }
     }
 }
diff --git a/Modules/Properties/Runtime/PropertyBags/PropertyBag.cs b/Modules/Properties/Runtime/PropertyBags/PropertyBag.cs
index 37334ede8f..d115be89b1 100644
--- a/Modules/Properties/Runtime/PropertyBags/PropertyBag.cs
+++ b/Modules/Properties/Runtime/PropertyBags/PropertyBag.cs
@@ -4,6 +4,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Unity.Jobs;
 using Unity.Properties.Internal;
 
 namespace Unity.Properties
@@ -76,6 +78,17 @@ public static IEnumerable<Type> GetAllTypesWithAPropertyBag()
         {
             return PropertyBagStore.AllTypes;
         }
+
+        /// <summary>
+        /// Allows for <see cref="IPropertyBag"/> to be registered on a background thread while ensuring that the jobs will be completed before
+        /// the next call to <see cref="GetPropertyBag"/>.
+        /// </summary>
+        /// <param name="handle">The job handle to wait on.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static void AddJobToWaitQueue(JobHandle handle)
+        {
+            PropertyBagStore.AddJobToWaitQueue(handle);
+        }
     }
 
     /// <summary>
diff --git a/Modules/Properties/Runtime/Reflection/Internal/ReflectedPropertyBagProvider.cs b/Modules/Properties/Runtime/Reflection/Internal/ReflectedPropertyBagProvider.cs
index 114fc8c9ad..d87b87571b 100644
--- a/Modules/Properties/Runtime/Reflection/Internal/ReflectedPropertyBagProvider.cs
+++ b/Modules/Properties/Runtime/Reflection/Internal/ReflectedPropertyBagProvider.cs
@@ -180,6 +180,7 @@ static IEnumerable<MemberInfo> GetPropertyMembers(Type type)
                     var hasCreatePropertyAttribute = member.GetCustomAttribute<CreatePropertyAttribute>() != null;
                     var hasNonSerializedAttribute = member.GetCustomAttribute<NonSerializedAttribute>() != null;
                     var hasSerializedFieldAttribute = member.GetCustomAttribute<SerializeField>() != null;
+                    var hasSerializeReferenceAttribute = member.GetCustomAttribute<SerializeReference>() != null;
 
                     if (hasDontCreatePropertyAttribute)
                     {
@@ -207,6 +208,13 @@ static IEnumerable<MemberInfo> GetPropertyMembers(Type type)
                         continue;
                     }
 
+                    if (hasSerializeReferenceAttribute)
+                    {
+                        // If property generation was not explicitly specified lets keep behaviour consistent with Unity.
+                        yield return member;
+                        continue;
+                    }
+
                     // No attributes were specified, if this is a public field we will generate one by implicitly.
                     if (member is FieldInfo field && field.IsPublic)
                     {
diff --git a/Modules/Properties/Runtime/Utility/TypeUtility.cs b/Modules/Properties/Runtime/Utility/TypeUtility.cs
index 29553a5b4c..dc3d95e65b 100644
--- a/Modules/Properties/Runtime/Utility/TypeUtility.cs
+++ b/Modules/Properties/Runtime/Utility/TypeUtility.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.Text;
 using UnityEngine.Scripting;
@@ -265,16 +266,19 @@ public void Visit<TContainer>()
         /// <remarks>
         /// Any types in this set are also present in the <see cref="Cache{T}"/>.
         /// </remarks>
-        static readonly Dictionary<Type, ITypeConstructor> s_TypeConstructors = new Dictionary<Type, ITypeConstructor>();
+        static readonly ConcurrentDictionary<Type, ITypeConstructor> s_TypeConstructors = new ConcurrentDictionary<Type, ITypeConstructor>();
 
         static readonly System.Reflection.MethodInfo s_CreateTypeConstructor;
 
-        static readonly Dictionary<Type, string> s_CachedResolvedName;
+        static readonly ConcurrentDictionary<Type, string> s_CachedResolvedName;
+
         static readonly UnityEngine.Pool.ObjectPool<StringBuilder> s_Builders;
+        private static readonly object syncedPoolObject = new object();
+
 
         static TypeUtility()
         {
-            s_CachedResolvedName = new Dictionary<Type, string>();
+            s_CachedResolvedName = new ConcurrentDictionary<Type, string>();
             s_Builders = new UnityEngine.Pool.ObjectPool<StringBuilder>(()=> new StringBuilder(), null, sb => sb.Clear());
 
             SetExplicitInstantiationMethod(() => string.Empty);
@@ -359,7 +363,12 @@ static string GetTypeDisplayName(Type type, IReadOnlyList<Type> args, ref int ar
                 name = name.Remove(tickIndex);
             }
 
-            var genericTypeNames = s_Builders.Get();
+            var genericTypeNames = default(StringBuilder);
+            lock (syncedPoolObject)
+            {
+                genericTypeNames = s_Builders.Get();
+            }
+
             try
             {
                 for (var i = 0; i < count && argIndex < args.Count; i++, argIndex++)
@@ -375,7 +384,10 @@ static string GetTypeDisplayName(Type type, IReadOnlyList<Type> args, ref int ar
             }
             finally
             {
-                s_Builders.Release(genericTypeNames);
+                lock (syncedPoolObject)
+                {
+                    s_Builders.Release(genericTypeNames);
+                }
             }
 
             return name;
diff --git a/Modules/PropertiesEditor/Module/PropertiesEditorInitialization.cs b/Modules/PropertiesEditor/Module/PropertiesEditorInitialization.cs
new file mode 100644
index 0000000000..46a6e1b3f9
--- /dev/null
+++ b/Modules/PropertiesEditor/Module/PropertiesEditorInitialization.cs
@@ -0,0 +1,39 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using Unity.Jobs;
+using UnityEngine.Scripting;
+
+namespace Unity.Properties.Internal
+{
+    static class PropertiesEditorInitialization
+    {
+        private static bool s_Initialized;
+        static JobHandle s_InitializeJobHandle;
+
+        public static JobHandle GetInitializationJobHandle()
+        {
+            InitializePropertiesEditor();
+            return s_InitializeJobHandle;
+        }
+
+        [RequiredByNativeCode(optional:false)]
+        public static void InitializePropertiesEditor()
+        {
+            if (s_Initialized)
+                return;
+            s_InitializeJobHandle = new InitializePropertiesJob().Schedule();
+            PropertyBag.AddJobToWaitQueue(s_InitializeJobHandle);
+            s_Initialized = true;
+        }
+
+        struct InitializePropertiesJob : IJob
+        {
+            public void Execute()
+            {
+                Internal.PropertiesInitialization.InitializeProperties();
+            }
+        }
+    }
+}
diff --git a/Modules/PropertiesEditor/Module/PropertiesEditorModule.cs b/Modules/PropertiesEditor/Module/PropertiesEditorModule.cs
deleted file mode 100644
index 1099270b0d..0000000000
--- a/Modules/PropertiesEditor/Module/PropertiesEditorModule.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-namespace Unity.Properties.Editor
-{
-    [UnityEditor.InitializeOnLoad]
-    static class PropertiesEditorModule
-    {
-        static PropertiesEditorModule()
-        {
-            UnityEditor.Build.BuildDefines.getScriptCompilationDefinesDelegates += AddPropertiesBuildDefines;
-        }
-
-        static void AddPropertiesBuildDefines(UnityEditor.BuildTarget target,
-            System.Collections.Generic.HashSet<string> defines)
-        {
-            defines.Add("USE_PROPERTIES_MODULE");
-        }
-    }
-}
diff --git a/Modules/QuickSearch/Editor/ISearchView.cs b/Modules/QuickSearch/Editor/ISearchView.cs
index 82341cff0e..2dca1d3516 100644
--- a/Modules/QuickSearch/Editor/ISearchView.cs
+++ b/Modules/QuickSearch/Editor/ISearchView.cs
@@ -234,6 +234,7 @@ public interface ISearchView : IDisposable
         /// <returns></returns>
         bool IsPicker();
 
+        internal int GetViewId();
         internal int totalCount { get; }
         internal bool syncSearch { get; set; }
         internal SearchPreviewManager previewManager { get; }
diff --git a/Modules/QuickSearch/Editor/Indexing/AssetIndexer.cs b/Modules/QuickSearch/Editor/Indexing/AssetIndexer.cs
index 41717be322..afffeab18a 100644
--- a/Modules/QuickSearch/Editor/Indexing/AssetIndexer.cs
+++ b/Modules/QuickSearch/Editor/Indexing/AssetIndexer.cs
@@ -7,7 +7,9 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Unity.Profiling;
 using UnityEditor.SceneManagement;
+using UnityEditor.Utils;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -15,6 +17,9 @@ namespace UnityEditor.Search
 {
     class AssetIndexer : ObjectIndexer
     {
+        static readonly ProfilerMarker k_IndexGameObjectMarker = new($"{nameof(AssetIndexer)}.{nameof(IndexGameObject)}");
+        static readonly ProfilerMarker k_IndexCustomGameObjectPropertiesMarker = new($"{nameof(AssetIndexer)}.{nameof(IndexCustomGameObjectProperties)}");
+
         static string[] s_AssetDabaseRoots;
         static AssetIndexer()
         {
@@ -68,11 +73,11 @@ public string GetPartialPath(string path)
             return path;
         }
 
-        public void IndexTypes(Type objType, int documentIndex, string name = "t", bool exact = false)
+        public void IndexTypes(Type objType, int documentIndex, bool isPrefabDocument, string name = "t", bool exact = false)
         {
-            while (objType != null && objType != typeof(Object))
+            while (objType != null && objType != typeof(Object) && objType != typeof(MonoBehaviour) && objType != typeof(Behaviour))
             {
-                if (objType == typeof(GameObject))
+                if (isPrefabDocument && objType == typeof(GameObject))
                     IndexProperty(documentIndex, name, "prefab", saveKeyword: true, exact: true);
                 if (objType == typeof(MonoScript))
                     IndexProperty(documentIndex, name, "script", saveKeyword: true, exact: true);
@@ -94,15 +99,18 @@ private void IndexSubAsset(Object subObj, string containerPath, bool checkIfDocu
             var gid = GlobalObjectId.GetGlobalObjectIdSlow(subObj);
             var id = gid.ToString();
             var containerName = Path.GetFileNameWithoutExtension(containerPath);
+            var isPrefabDocument = containerPath.EndsWith(".prefab");
             var objPathName = Utils.RemoveInvalidCharsFromPath($"{containerName}/{subObj.name}", ' ');
             var subObjDocumentIndex = AddDocument(id, objPathName, containerPath, checkIfDocumentExists, SearchDocumentFlags.Nested | SearchDocumentFlags.Asset);
 
-            IndexTypes(subObj.GetType(), subObjDocumentIndex, exact: true);
+            IndexTypes(subObj.GetType(), subObjDocumentIndex, isPrefabDocument, exact: true);
             IndexProperty(subObjDocumentIndex, "is", "nested", saveKeyword: true, exact: true);
             IndexProperty(subObjDocumentIndex, "is", "subasset", saveKeyword: true, exact: true);
             if (settings.options.dependencies)
                 AddProperty("ref", containerPath.ToLowerInvariant(), subObjDocumentIndex);
 
+            IndexLabels(subObjDocumentIndex, subObj);
+
             if (hasCustomIndexers)
                 IndexCustomProperties(id, subObjDocumentIndex, subObj);
 
@@ -121,10 +129,7 @@ public override void IndexDocument(string path, bool checkIfDocumentExists)
                 return;
 
             AddSourceDocument(path, GetDocumentHash(path));
-
-            var fileName = Path.GetFileName(path);
-            IndexWordComponents(documentIndex, fileName);
-            IndexProperty(documentIndex, "name", Path.GetFileNameWithoutExtension(fileName), saveKeyword: true, exact: true);
+            IndexFileName(documentIndex, path);
 
             if (path.StartsWith("Packages/", StringComparison.Ordinal))
                 IndexProperty(documentIndex, "a", "packages", saveKeyword: true, exact: true);
@@ -138,9 +143,11 @@ public override void IndexDocument(string path, bool checkIfDocumentExists)
                 IndexProperty(documentIndex, "ext", fi.Extension.Replace(".", ""), saveKeyword: false, exact: true);
                 IndexNumber(documentIndex, "age", (DateTime.Now - fi.LastWriteTime).TotalDays);
 
-                foreach (var dir in Path.GetDirectoryName(path).Split(new[] { '/', '\\' }).Skip(1).Reverse().Take(3))
+                var dirPath = Paths.ConvertSeparatorsToUnity(Path.GetDirectoryName(path));
+                foreach (var dir in dirPath.Split('/').Skip(1).Reverse().Take(3))
                     IndexProperty(documentIndex, "dir", dir, saveKeyword: false, exact: true);
 
+                IndexProperty(documentIndex, "dir", dirPath, saveKeyword: false, exact: true);
                 IndexProperty(documentIndex, "t", "file", saveKeyword: true, exact: true);
             }
             else if (Directory.Exists(path))
@@ -167,7 +174,7 @@ public override void IndexDocument(string path, bool checkIfDocumentExists)
             if (at != null)
             {
                 IndexWordComponents(documentIndex, at.Name);
-                IndexTypes(at, documentIndex);
+                IndexTypes(at, documentIndex, isPrefab);
 
                 if (settings.options.types)
                 {
@@ -179,7 +186,7 @@ public override void IndexDocument(string path, bool checkIfDocumentExists)
                     {
                         if (AssetDatabase.IsSubAsset(obj))
                         {
-                            IndexTypes(obj.GetType(), documentIndex, "has", exact: true);
+                            IndexTypes(obj.GetType(), documentIndex, isPrefab, "has", exact: true);
                             IndexSubAsset(obj, path, checkIfDocumentExists, hasCustomIndexers);
                         }
                         else if (!string.IsNullOrEmpty(obj.name))
@@ -197,7 +204,7 @@ public override void IndexDocument(string path, bool checkIfDocumentExists)
                                 var c = gocs[componentIndex];
                                 if (!c || (c.hideFlags & (HideFlags.DontSave | HideFlags.HideInInspector)) != 0)
                                     continue;
-                                IndexType(c.GetType(), documentIndex);
+                                IndexTypes(c.GetType(), documentIndex, false);
                             }
                         }
                     }
@@ -217,6 +224,56 @@ public override void IndexDocument(string path, bool checkIfDocumentExists)
                 IndexDependencies(documentIndex, path);
         }
 
+        internal void IndexFileName(in int documentIndex, string filePath)
+        {
+            var fileName = Path.GetFileName(filePath);
+            var extension = Path.GetExtension(fileName);
+            if (!string.IsNullOrEmpty(extension))
+            {
+                extension = extension.Substring(1).ToLowerInvariant();
+            }
+            var components = SearchUtils.SplitFileEntryComponents(fileName, SearchUtils.entrySeparators, 1).ToArray();
+            int scoreModifier = 0;
+            double number = 0;
+            var minIndexationLength = minWordIndexationLength;
+            minWordIndexationLength = 1;
+            foreach (var c in components)
+            {
+                // Skip indexing variations on extension
+                if (c == extension)
+                    continue;
+
+                var score = settings.baseScore + scoreModifier++;
+                IndexWord(documentIndex, c, exact: false, scoreModifier: scoreModifier);
+
+                if (Utils.TryParse(c, out number))
+                {
+                    AddNumber("name", number, score, documentIndex);
+                }
+                else
+                {
+                    AddProperty("name", c, score, documentIndex, saveKeyword: false, exact: false);
+                }
+            }
+
+            fileName = fileName.ToLowerInvariant();
+            var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileName);
+            if (components.Length > 1)
+            {
+                AddProperty("name", fileNameWithoutExtension, fileNameWithoutExtension.Length, fileNameWithoutExtension.Length, scoreModifier, documentIndex, saveKeyword: false, exact: true);
+                IndexWord(documentIndex, fileNameWithoutExtension, fileNameWithoutExtension.Length, fileNameWithoutExtension.Length, exact: true, scoreModifier: scoreModifier);
+            }
+
+            if (!string.IsNullOrEmpty(extension))
+            {
+                AddProperty("name", fileName, fileName.Length, fileName.Length, scoreModifier, documentIndex, saveKeyword: false, exact: true);
+                IndexWord(documentIndex, fileName, fileName.Length, fileName.Length, exact: true, scoreModifier: scoreModifier);
+                IndexWord(documentIndex, extension, extension.Length, extension.Length, exact: true, scoreModifier: scoreModifier);
+            }
+
+            minWordIndexationLength = minIndexationLength;
+        }
+
         private void IndexProperties(in int documentIndex, in string path, in bool hasCustomIndexers)
         {
             bool wasLoaded = AssetDatabase.IsMainAssetAtPathLoaded(path);
@@ -225,9 +282,6 @@ private void IndexProperties(in int documentIndex, in string path, in bool hasCu
             if (!mainAsset)
                 return;
 
-            if (hasCustomIndexers)
-                IndexCustomProperties(path, documentIndex, mainAsset);
-
             if (settings.options.properties)
             {
                 IndexObject(documentIndex, mainAsset, settings.options.dependencies);
@@ -250,6 +304,9 @@ private void IndexProperties(in int documentIndex, in string path, in bool hasCu
                     IndexObject(documentIndex, importSettings, dependencies: settings.options.dependencies, recursive: true);
             }
 
+            if (hasCustomIndexers)
+                IndexCustomProperties(path, documentIndex, mainAsset);
+
             if (!wasLoaded)
             {
                 if (mainAsset && !mainAsset.hideFlags.HasFlag(HideFlags.DontUnloadUnusedAsset) &&
@@ -288,6 +345,13 @@ private void IndexLabels(in int documentIndex, in string path)
                 IndexPropertyComponents(documentIndex, "l", label);
         }
 
+        private void IndexLabels(in int documentIndex, in UnityEngine.Object obj)
+        {
+            var labels = AssetDatabase.GetLabels(obj);
+            foreach (var label in labels)
+                IndexPropertyComponents(documentIndex, "l", label);
+        }
+
         public bool IndexSceneDocument(string scenePath, bool checkIfDocumentExists)
         {
             if (scenePath.EndsWith(".unity", StringComparison.OrdinalIgnoreCase))
@@ -407,6 +471,7 @@ private void IndexScene(string scenePath, bool checkIfDocumentExists)
 
         private void IndexGameObject(in int documentIndex, in GameObject go, in SearchDatabase.Options options)
         {
+            using var _ = k_IndexGameObjectMarker.Auto();
             if (options.types)
             {
                 if (go.transform.root != go.transform)
@@ -460,6 +525,7 @@ private void IndexGameObject(in int documentIndex, in GameObject go, in SearchDa
 
         private void IndexCustomGameObjectProperties(string id, int documentIndex, GameObject go)
         {
+            using var _ = k_IndexCustomGameObjectPropertiesMarker.Auto();
             if (HasCustomIndexers(go.GetType()))
                 IndexCustomProperties(id, documentIndex, go);
 
diff --git a/Modules/QuickSearch/Editor/Indexing/CustomIndexers.cs b/Modules/QuickSearch/Editor/Indexing/CustomIndexers.cs
index 5d78d159a4..5d0e220fac 100644
--- a/Modules/QuickSearch/Editor/Indexing/CustomIndexers.cs
+++ b/Modules/QuickSearch/Editor/Indexing/CustomIndexers.cs
@@ -89,24 +89,37 @@ public CustomObjectIndexerAttribute(Type type)
         }
     }
 
+    [InitializeOnLoad]
     static class CustomIndexers
     {
         private static readonly Dictionary<Type, List<CustomIndexerHandler>> s_CustomObjectIndexers = new Dictionary<Type, List<CustomIndexerHandler>>();
 
-        public static IEnumerable<Type> types => s_CustomObjectIndexers.Keys;
+        public static IEnumerable<Type> types
+        {
+            get
+            {
+                LoadCustomObjectIndexers();
+                return s_CustomObjectIndexers.Keys;
+            }
+        }
+
+        static bool s_Initialized;
 
         static CustomIndexers()
         {
-            LoadCustomObjectIndexers();
+            // Wait next update to make sure all CustomObjectIndexerAttribute are loaded.
+            EditorApplication.delayCall += LoadCustomObjectIndexers;
         }
 
         public static IList<CustomIndexerHandler> GetHandlers(Type type)
         {
+            LoadCustomObjectIndexers();
             return s_CustomObjectIndexers[type];
         }
 
         public static bool HasCustomIndexers(Type type, bool multiLevel = true)
         {
+            LoadCustomObjectIndexers();
             if (!multiLevel)
                 return s_CustomObjectIndexers.ContainsKey(type);
 
@@ -121,10 +134,11 @@ public static bool HasCustomIndexers(Type type, bool multiLevel = true)
 
         public static bool TryGetValue(Type objectType, out List<CustomIndexerHandler> customIndexers)
         {
+            LoadCustomObjectIndexers();
             return s_CustomObjectIndexers.TryGetValue(objectType, out customIndexers);
         }
 
-        public static Hash128 RefreshCustomIndexers()
+        static Hash128 RefreshCustomIndexers()
         {
             Hash128 globalIndexersHash = default;
             foreach (var customIndexerMethodInfo in TypeCache.GetMethodsWithAttribute<CustomObjectIndexerAttribute>())
@@ -166,9 +180,13 @@ public static Hash128 RefreshCustomIndexers()
 
         static void LoadCustomObjectIndexers()
         {
+            if (s_Initialized)
+                return;
+
             var globalIndexersHash = RefreshCustomIndexers();
             if (!AssetDatabaseAPI.IsAssetImportWorkerProcess())
                 EditorApplication.delayCall += () => AssetDatabaseAPI.RegisterCustomDependency(nameof(CustomObjectIndexerAttribute), globalIndexersHash);
+            s_Initialized = true;
         }
 
         static bool ValidateCustomIndexerMethodSignature(MethodInfo methodInfo)
diff --git a/Modules/QuickSearch/Editor/Indexing/IndexManager.cs b/Modules/QuickSearch/Editor/Indexing/IndexManager.cs
index 8aa3215a10..3c2d0c6878 100644
--- a/Modules/QuickSearch/Editor/Indexing/IndexManager.cs
+++ b/Modules/QuickSearch/Editor/Indexing/IndexManager.cs
@@ -996,7 +996,7 @@ private void BindIndexItem(VisualElement element, int index)
                             var settings = m_IndexSettingsAssets[index].settings;
                             var indexImporterType = SearchIndexEntryImporter.GetIndexImporterType(settings.options.GetHashCode());
                             AssetDatabaseAPI.RegisterCustomDependency(indexImporterType.GUID.ToString("N"), Hash128.Parse(Guid.NewGuid().ToString("N")));
-                            SearchDatabase.ImportAsset(m_IndexSettingsFilePaths[index]);
+                            SearchDatabase.ImportAsset(m_IndexSettingsFilePaths[index], true);
                         });
                         menu.ShowAsContext();
                     }
diff --git a/Modules/QuickSearch/Editor/Indexing/IndexerExtensions.cs b/Modules/QuickSearch/Editor/Indexing/IndexerExtensions.cs
index 3e3893a311..4c86a3f3b5 100644
--- a/Modules/QuickSearch/Editor/Indexing/IndexerExtensions.cs
+++ b/Modules/QuickSearch/Editor/Indexing/IndexerExtensions.cs
@@ -2,17 +2,42 @@
 // 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.Concurrent;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using UnityEditor;
+using Unity.Profiling;
 using UnityEditor.Search.Providers;
 using UnityEngine;
 using UnityEngine.Rendering;
 
 namespace UnityEditor.Search
 {
+    readonly struct PrefabPropertyIndexKey
+    {
+        public readonly int documentIndex;
+        public readonly int instanceId;
+
+        public PrefabPropertyIndexKey(int documentIndex, int instanceId)
+        {
+            this.documentIndex = documentIndex;
+            this.instanceId = instanceId;
+        }
+    }
+
+    struct PrefabPropertyIndexData
+    {
+        public bool isModified;
+        public bool isAltered;
+    }
+
     static class IndexerExtensions
     {
+        static readonly ProfilerMarker k_IndexPrefabPropertiesMarker = new($"{nameof(IndexerExtensions)}.{nameof(IndexPrefabProperties)}");
+
+        static ConcurrentDictionary<ObjectIndexer, HashSet<PrefabPropertyIndexKey>> s_PrefabIndexCaches = new();
+        static ConcurrentDictionary<ObjectIndexer, Dictionary<int, PrefabPropertyIndexData>> s_PrefabInstanceRootCaches = new();
+
         [CustomObjectIndexer(typeof(GameObject), version = 2)]
         internal static void IndexPrefabTypes(CustomObjectIndexerTarget context, ObjectIndexer indexer)
         {
@@ -23,6 +48,13 @@ internal static void IndexPrefabTypes(CustomObjectIndexerTarget context, ObjectI
 
         internal static void IndexPrefabProperties(int documentIndex, GameObject prefab, ObjectIndexer indexer)
         {
+            using var _ = k_IndexPrefabPropertiesMarker.Auto();
+
+            var prefabIndexCache = s_PrefabIndexCaches.GetOrAdd(indexer, _ => new HashSet<PrefabPropertyIndexKey>());
+            var key = new PrefabPropertyIndexKey(documentIndex, prefab.GetInstanceID());
+            if (prefabIndexCache.Contains(key))
+                return; // Already indexed
+
             var prefabType = PrefabUtility.GetPrefabAssetType(prefab);
             indexer.IndexProperty(documentIndex, "prefab", prefabType.ToString(), saveKeyword: true, exact: true);
 
@@ -42,11 +74,40 @@ internal static void IndexPrefabProperties(int documentIndex, GameObject prefab,
                 indexer.IndexProperty(documentIndex, "prefab", "base", saveKeyword: true, exact: true);
             }
 
-            if (PrefabUtility.HasPrefabInstanceAnyOverrides(prefab, false))
-                indexer.IndexProperty(documentIndex, "prefab", "modified", saveKeyword: true, exact: true);
+            var instanceRoot = PrefabUtility.GetPrefabInstanceHandle(prefab);
+            var instanceRootId = instanceRoot != null ? instanceRoot.GetInstanceID() : 0;
+            var indexerDictionary = s_PrefabInstanceRootCaches.GetOrAdd(indexer, _ => new Dictionary<int, PrefabPropertyIndexData>());
 
-            if (PrefabUtility.HasPrefabInstanceAnyOverrides(prefab, true))
-                indexer.IndexProperty(documentIndex, "prefab", "altered", saveKeyword: true, exact: true);
+            if (instanceRoot != null && indexerDictionary.TryGetValue(instanceRootId, out var data))
+            {
+                if (data.isModified)
+                    indexer.IndexProperty(documentIndex, "prefab", "modified", saveKeyword: true, exact: true);
+                if (data.isAltered)
+                    indexer.IndexProperty(documentIndex, "prefab", "altered", saveKeyword: true, exact: true);
+            }
+            else
+            {
+                var newData = new PrefabPropertyIndexData
+                {
+                    isModified = PrefabUtility.HasPrefabInstanceAnyOverrides(prefab, false),
+                    isAltered = PrefabUtility.HasPrefabInstanceAnyOverrides(prefab, true)
+                };
+                if (newData.isModified)
+                    indexer.IndexProperty(documentIndex, "prefab", "modified", saveKeyword: true, exact: true);
+                if (newData.isAltered)
+                    indexer.IndexProperty(documentIndex, "prefab", "altered", saveKeyword: true, exact: true);
+
+                if (instanceRoot != null)
+                    indexerDictionary.TryAdd(instanceRootId, newData);
+            }
+
+            prefabIndexCache.Add(key);
+        }
+
+        internal static void ClearIndexerCaches(ObjectIndexer indexer)
+        {
+            s_PrefabIndexCaches.TryRemove(indexer, out _);
+            s_PrefabInstanceRootCaches.TryRemove(indexer, out _);
         }
 
         [SearchSelector("prefabtype", provider: "scene")]
@@ -327,7 +388,7 @@ internal static void IndexVector(string propertyName, in Vector4 v, ObjectIndexe
                 indexer.MapProperty(propertyName, label ?? propertyName, null, "Vector4", ownerType?.AssemblyQualifiedName, removeNestedKeys: true);
         }
 
-        [SceneQueryEngineFilter("material", supportedOperators = new[] { ":" })]
+        [SceneQueryEngineFilter("material", new[] { ":" }, "material:<$object:none,Material$>")]
         [System.ComponentModel.Description("Check if a MeshRenderer uses a specific material")]
         internal static bool FilterMeshRendererMaterials(GameObject go, string op, string value)
         {
@@ -340,6 +401,19 @@ internal static bool FilterMeshRendererMaterials(GameObject go, string op, strin
                 var mname = m.name.Replace(" (Instance)", "");
                 if (mname.IndexOf(value, System.StringComparison.OrdinalIgnoreCase) != -1)
                     return true;
+
+                // Try with the asset path of the material.
+                var path = AssetDatabase.GetAssetPath(m);
+                if (!string.IsNullOrEmpty(path) && path.IndexOf(value, StringComparison.OrdinalIgnoreCase) != -1)
+                    return true;
+
+                // Try with the GlobalObjectId of the material.
+                if (value.StartsWith("GlobalObjectId", StringComparison.Ordinal))
+                {
+                    var goid = GlobalObjectId.GetGlobalObjectIdSlow(m);
+                    if (goid.ToString().Equals(value, StringComparison.OrdinalIgnoreCase))
+                        return true;
+                }
             }
 
             return false;
diff --git a/Modules/QuickSearch/Editor/Indexing/ObjectIndexer.cs b/Modules/QuickSearch/Editor/Indexing/ObjectIndexer.cs
index 0af646dfd2..6bae06a490 100644
--- a/Modules/QuickSearch/Editor/Indexing/ObjectIndexer.cs
+++ b/Modules/QuickSearch/Editor/Indexing/ObjectIndexer.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Unity.Profiling;
 using UnityEditor;
 using UnityEditor.Search.Providers;
 using UnityEngine;
@@ -28,6 +29,18 @@ internal enum FilePattern
     /// </summary>
     public abstract class ObjectIndexer : SearchIndexer
     {
+        static readonly ProfilerMarker k_IndexWordMarker = new($"{nameof(ObjectIndexer)}.{nameof(IndexWord)}");
+        static readonly ProfilerMarker k_IndexObjectMarker = new($"{nameof(ObjectIndexer)}.{nameof(IndexObject)}");
+        static readonly ProfilerMarker k_IndexPropertiesMarker = new($"{nameof(ObjectIndexer)}.{nameof(IndexProperties)}");
+        static readonly ProfilerMarker k_IndexPropertyMarker = new($"{nameof(ObjectIndexer)}.{nameof(IndexProperty)}");
+        static readonly ProfilerMarker k_IndexSerializedPropertyMarker = new($"{nameof(ObjectIndexer)}.IndexSerializedProperty");
+        static readonly ProfilerMarker k_IndexPropertyComponentsMarker = new($"{nameof(ObjectIndexer)}.IndexPropertyComponents");
+        static readonly ProfilerMarker k_IndexPropertyStringComponentsMarker = new($"{nameof(ObjectIndexer)}.{nameof(IndexPropertyStringComponents)}");
+        static readonly ProfilerMarker k_LogPropertyMarker = new($"{nameof(ObjectIndexer)}.{nameof(LogProperty)}");
+        static readonly ProfilerMarker k_IndexCustomPropertiesMarker = new($"{nameof(ObjectIndexer)}.{nameof(IndexCustomProperties)}");
+        static readonly ProfilerMarker k_AddReferenceMarker = new($"{nameof(ObjectIndexer)}.{nameof(AddReference)}");
+        static readonly ProfilerMarker k_AddObjectReferenceMarker = new($"{nameof(ObjectIndexer)}.AddObjectReference");
+
         // Define a list of patterns that will automatically skip path entries if they start with it.
         readonly static string[] BuiltInTransientFilePatterns = new[]
         {
@@ -82,18 +95,19 @@ internal override IEnumerable<SearchResult> SearchWord(string word, SearchIndexO
                 foreach (var r in base.SearchWord(word, op, subset))
                     yield return r;
 
-                var baseScore = settings.baseScore;
-                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))
+                if (SearchSettings.findProviderIndexHelper)
                 {
-                    if (m_IndexByDocuments.TryGetValue(r.id, out var documentIndex))
-                        yield return new SearchResult(r.id, documentIndex, baseScore + r.score + 5);
+                    var baseScore = settings.baseScore;
+                    var options = FindOptions.Words | FindOptions.Glob | FindOptions.Regex | FindOptions.FileName;
+                    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))
+                    {
+                        if (m_IndexByDocuments.TryGetValue(r.id, out var documentIndex))
+                            yield return new SearchResult(r.id, documentIndex, baseScore + r.score + 5);
+                    }
                 }
             }
         }
@@ -192,9 +206,21 @@ public void IndexWordComponents(int documentIndex, in string word)
         /// <param name="value">Value to add to the index.</param>
         public void IndexPropertyComponents(int documentIndex, string name, string value)
         {
+            using var _ = k_IndexPropertyComponentsMarker.Auto();
             int scoreModifier = 0;
+            double number = 0;
             foreach (var c in GetEntryComponents(value, documentIndex))
-                AddProperty(name, c, settings.baseScore + scoreModifier++, documentIndex, saveKeyword: false, exact: false);
+            {
+                var score = settings.baseScore + scoreModifier++;
+                if (Utils.TryParse(c, out number))
+                {
+                    AddNumber(name, number, score, documentIndex);
+                }
+                else
+                {
+                    AddProperty(name, c, score, documentIndex, saveKeyword: false, exact: false);
+                }
+            }
             AddProperty(name, value.ToLowerInvariant(), settings.baseScore - 5, documentIndex, saveKeyword: false, exact: true);
         }
 
@@ -220,9 +246,15 @@ public virtual IEnumerable<string> GetEntryComponents(in string entry, int docum
         /// <param name="scoreModifier">Modified to apply to the base score for a specific word.</param>
         public void IndexWord(int documentIndex, in string word, int maxVariations, bool exact, int scoreModifier = 0)
         {
+            IndexWord(documentIndex, word, minWordIndexationLength, maxVariations, exact, scoreModifier);
+        }
+
+        internal void IndexWord(int documentIndex, in string word, int minVariations, int maxVariations, bool exact, int scoreModifier = 0)
+        {
+            using var _ = k_IndexWordMarker.Auto();
             var lword = word.ToLowerInvariant();
             var modifiedScore = settings.baseScore + scoreModifier;
-            AddWord(lword, minWordIndexationLength, maxVariations, modifiedScore, documentIndex);
+            AddWord(lword, minVariations, maxVariations, modifiedScore, documentIndex);
             if (exact)
                 AddExactWord(lword, modifiedScore, documentIndex);
         }
@@ -249,6 +281,7 @@ public void IndexWord(int documentIndex, in string word, bool exact = false, int
         /// <param name="exact">If exact is true, only the exact match of the value will be stored in the index (not the variations).</param>
         public void IndexProperty(int documentIndex, string name, string value, bool saveKeyword, bool exact = false)
         {
+            using var _ = k_IndexPropertyMarker.Auto();
             if (string.IsNullOrEmpty(value))
                 return;
             var valueLower = value.ToLowerInvariant();
@@ -320,6 +353,7 @@ protected void IndexObject(int documentIndex, Object obj, bool dependencies = fa
 
         internal void IndexObject(int documentIndex, Object obj, bool dependencies, bool recursive)
         {
+            using var _ = k_IndexObjectMarker.Auto();
             using (var so = new SerializedObject(obj))
             {
                 var p = so.GetIterator();
@@ -370,6 +404,7 @@ internal void IndexProperties(int documentIndex, in SerializedProperty p, bool r
 
         internal void IndexProperties(int documentIndex, in SerializedProperty p, bool recursive, int maxDepth, Func<SerializedProperty, bool> shouldContinueIterating)
         {
+            using var _ = k_IndexPropertiesMarker.Auto();
             var next = p.NextVisible(true);
             while (next)
             {
@@ -386,6 +421,7 @@ internal void IndexProperties(int documentIndex, in SerializedProperty p, bool r
 
         internal void IndexProperty(in int documentIndex, in string fieldName, in SerializedProperty p, int maxDepth)
         {
+            using var _ = k_IndexSerializedPropertyMarker.Auto();
             if (ignoredProperties.Contains(fieldName))
                 return;
 
@@ -485,9 +521,10 @@ internal void IndexProperty(in int documentIndex, in string fieldName, in Serial
 
         bool IndexPropertyStringComponents(in int documentIndex, in string fieldName, in string sv)
         {
+            using var _ = k_IndexPropertyStringComponentsMarker.Auto();
             if (string.IsNullOrEmpty(sv) || sv.Length > 64)
                 return false;
-            if (sv.Length > 4 && sv.Length < 32 && char.IsLetter(sv[0]) && sv.IndexOf(' ') == -1)
+            if (sv.Length >= minWordIndexationLength && sv.Length < 32)
                 IndexPropertyComponents(documentIndex, fieldName, sv);
             else
                 IndexProperty(documentIndex, fieldName, sv, saveKeyword: false, exact: true);
@@ -496,6 +533,7 @@ bool IndexPropertyStringComponents(in int documentIndex, in string fieldName, in
 
         void LogProperty(in string fieldName, in SerializedProperty p, object value = null)
         {
+            using var _ = k_LogPropertyMarker.Auto();
             var propertyType = SearchUtils.GetPropertyManagedTypeString(p);
             if (propertyType != null)
                 MapProperty(fieldName, p.displayName, p.tooltip, propertyType, p.serializedObject?.targetObject?.GetType().AssemblyQualifiedName, removeNestedKeys: true);
@@ -503,6 +541,7 @@ void LogProperty(in string fieldName, in SerializedProperty p, object value = nu
 
         internal void AddReference(int documentIndex, string assetPath, bool saveKeyword = false)
         {
+            using var _ = k_AddReferenceMarker.Auto();
             if (string.IsNullOrEmpty(assetPath))
                 return;
 
@@ -517,6 +556,7 @@ internal void AddReference(int documentIndex, string assetPath, bool saveKeyword
 
         internal void AddReference(int documentIndex, string propertyName, Object objRef, in string label = null, in Type ownerPropertyType = null)
         {
+            using var _ = k_AddObjectReferenceMarker.Auto();
             if (!objRef)
                 return;
 
@@ -549,6 +589,7 @@ internal void AddReference(int documentIndex, string propertyName, Object objRef
         /// <param name="obj">Object to index.</param>
         internal void IndexCustomProperties(string documentId, int documentIndex, Object obj)
         {
+            using var _ = k_IndexCustomPropertiesMarker.Auto();
             using (var so = new SerializedObject(obj))
             {
                 CallCustomIndexers(documentId, documentIndex, obj, so);
@@ -593,7 +634,14 @@ private void CallCustomIndexers(string documentId, int documentIndex, Object obj
 
             foreach (var customIndexer in customIndexers)
             {
-                customIndexer(indexerTarget, this);
+                try
+                {
+                    customIndexer(indexerTarget, this);
+                }
+                catch(System.Exception e)
+                {
+                    Debug.LogError($"Error while using custom asset indexer: {e}");
+                }
             }
         }
 
@@ -607,5 +655,10 @@ internal bool HasCustomIndexers(Type type, bool multiLevel = true)
         {
             return CustomIndexers.HasCustomIndexers(type, multiLevel);
         }
+
+        private protected override void OnFinish()
+        {
+            IndexerExtensions.ClearIndexerCaches(this);
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/Indexing/SearchDatabase.cs b/Modules/QuickSearch/Editor/Indexing/SearchDatabase.cs
index 6bfa41f87e..b3f31bc2ca 100644
--- a/Modules/QuickSearch/Editor/Indexing/SearchDatabase.cs
+++ b/Modules/QuickSearch/Editor/Indexing/SearchDatabase.cs
@@ -50,7 +50,8 @@ class SearchDatabase : ScriptableObject, ITaskReporter, ISearchDatabase
         // 5- Fix asset has= property indexing.
         // 6- Use produce artifacts async
         // 7- Update how keywords are encoded
-        public const int version = (7 << 8) ^ SearchIndexEntryImporter.version;
+        // 8- Update t:prefab
+        public const int version = (8 << 8) ^ SearchIndexEntryImporter.version;
         private const string k_QuickSearchLibraryPath = "Library/Search";
         public const string defaultSearchDatabaseIndexPath = "UserSettings/Search.index";
 
@@ -174,6 +175,57 @@ public bool Equals(IndexArtifact other)
             }
         }
 
+        readonly struct ReadLockScope : IDisposable
+        {
+            readonly ReaderWriterLockSlim m_Lock;
+
+            public ReadLockScope(ReaderWriterLockSlim _lock)
+            {
+                m_Lock = _lock;
+                m_Lock.EnterReadLock();
+            }
+
+            public void Dispose()
+            {
+                m_Lock.ExitReadLock();
+            }
+        }
+
+        readonly struct WriteLockScope : IDisposable
+        {
+            readonly ReaderWriterLockSlim m_Lock;
+
+            public WriteLockScope(ReaderWriterLockSlim _lock)
+            {
+                m_Lock = _lock;
+                m_Lock.EnterWriteLock();
+            }
+
+            public void Dispose()
+            {
+                m_Lock.ExitWriteLock();
+            }
+        }
+
+        readonly struct TryWriteLockScope : IDisposable
+        {
+            readonly ReaderWriterLockSlim m_Lock;
+            readonly bool m_Locked;
+            public bool locked => m_Locked;
+
+            public TryWriteLockScope(ReaderWriterLockSlim _lock)
+            {
+                m_Lock = _lock;
+                m_Locked = m_Lock.TryEnterWriteLock(0);
+            }
+
+            public void Dispose()
+            {
+                if (m_Locked)
+                    m_Lock.ExitWriteLock();
+            }
+        }
+
         public IReadOnlyCollection<string> roots => settings.roots;
         public IReadOnlyCollection<string> includePatterns => settings.includes;
         public IReadOnlyCollection<string> excludePatterns => settings.excludes;
@@ -189,11 +241,13 @@ public bool Equals(IndexArtifact other)
         [NonSerialized] private int m_UpdateTasks = 0;
         [NonSerialized] private string m_IndexSettingsPath;
         [NonSerialized] private ConcurrentBag<AssetIndexChangeSet> m_UpdateQueue = new ConcurrentBag<AssetIndexChangeSet>();
+        [NonSerialized] private ReaderWriterLockSlim m_ImmutableLock = new(LockRecursionPolicy.SupportsRecursion);
 
         public ObjectIndexer index { get; internal set; }
         public bool loaded { get; private set; }
         public bool ready => this && loaded && index != null && index.IsReady();
         public bool updating => m_UpdateTasks > 0 || !loaded || m_CurrentResolveTask != null || !ready;
+        public bool needsUpdate => !m_UpdateQueue.IsEmpty;
         public string path => m_IndexSettingsPath ?? AssetDatabase.GetAssetPath(this);
 
         internal static event Action<SearchDatabase> indexLoaded;
@@ -215,6 +269,15 @@ public SearchDatabase Reload(string settingsPath)
 
         public SearchDatabase Reload(Settings settings)
         {
+            loaded = false;
+
+            using var writeLockScope = new TryWriteLockScope(m_ImmutableLock);
+            if (!writeLockScope.locked)
+            {
+                Dispatcher.Enqueue(() => Reload(settings));
+                return this;
+            }
+
             this.settings = settings;
             index = CreateIndexer(settings);
             name = settings.name;
@@ -370,13 +433,13 @@ private static SearchDatabase Find(string path)
             return EnumerateAll().Where(db => string.Equals(db.path, path, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
         }
 
-        public static SearchDatabase ImportAsset(string settingsPath)
+        public static SearchDatabase ImportAsset(string settingsPath, bool forceUpdate = false)
         {
             var currentDb = Find(settingsPath);
             if (currentDb)
                 currentDb.DeleteBackupIndex();
 
-            AssetDatabase.ImportAsset(settingsPath);
+            AssetDatabase.ImportAsset(settingsPath, forceUpdate ? ImportAssetOptions.ForceUpdate : ImportAssetOptions.Default);
             if (currentDb)
                 currentDb.Reload(settingsPath);
             else
@@ -470,33 +533,37 @@ private void Load()
             if (!this)
                 return;
 
-            var loadTask = new Task("Load", $"Reading {name.ToLowerInvariant()} search index", (task, data) => Setup(), this);
+            loaded = false;
+            var loadTask = new Task("Load", $"Reading {name.ToLowerInvariant()} search index", (task, data) => WaitForReadComplete(task, data, AssignNewIndexAndSetup), this);
             loadTask.RunThread(() =>
             {
                 var step = 0;
                 loadTask.Report($"Reading {bytes.Length} bytes...");
-                if (!index.LoadBytes(bytes))
+                var newIndex = new SearchIndexer();
+                if (!newIndex.LoadBytes(bytes))
                     Debug.LogError($"Failed to load {name} index. Please re-import it.", this);
 
                 loadTask.Report(++step, step + 1);
 
-                Dispatcher.Enqueue(() => loadTask.Resolve(new TaskData(bytes, index)));
+                Dispatcher.Enqueue(() => loadTask.Resolve(new TaskData(bytes, newIndex)));
             });
         }
 
         private void IncrementalLoad(string indexPath)
         {
-            var loadTask = new Task("Read", $"Loading {name.ToLowerInvariant()} search index", (task, data) => Setup(task, data), this);
+            loaded = false;
+            var loadTask = new Task("Read", $"Loading {name.ToLowerInvariant()} search index", (task, data) => WaitForReadComplete(task, data, AssignNewIndexAndSetup), this);
             loadTask.RunThread(() =>
             {
                 loadTask.Report($"Loading {indexPath}...", -1);
                 var fileBytes = File.ReadAllBytes(indexPath);
 
-                if (!index.LoadBytes(fileBytes))
+                var newIndex = new AssetIndexer(settings);
+                if (!newIndex.LoadBytes(fileBytes))
                     throw new Exception($"Failed to load {indexPath}.");
 
                 var deletedAssets = new HashSet<string>();
-                foreach (var d in index.GetDocuments())
+                foreach (var d in newIndex.GetDocuments())
                 {
                     if (d.valid && (!File.Exists(d.source) && !Directory.Exists(d.source)))
                         deletedAssets.Add(d.source);
@@ -510,23 +577,21 @@ private void IncrementalLoad(string indexPath)
                         return;
                     }
 
-                    bytes = fileBytes;
-
                     loadTask.Report($"Checking for changes...", -1);
-                    var diff = SearchMonitor.GetDiff(index.timestamp, deletedAssets, path =>
+                    var diff = SearchMonitor.GetDiff(newIndex.timestamp, deletedAssets, path =>
                     {
-                        if (index.SkipEntry(path, true))
+                        if (newIndex.SkipEntry(path, true))
                             return false;
 
-                        if (!index.TryGetHash(path, out var hash) || !hash.isValid)
+                        if (!newIndex.TryGetHash(path, out var hash) || !hash.isValid)
                             return true;
 
-                        return hash != index.GetDocumentHash(path);
+                        return hash != newIndex.GetDocumentHash(path);
                     });
                     if (!diff.empty)
                         IncrementalUpdate(diff);
 
-                    loadTask.Resolve(new TaskData(fileBytes, index));
+                    loadTask.Resolve(new TaskData(fileBytes, newIndex));
                 });
             });
         }
@@ -621,7 +686,7 @@ private Task ResolveArtifacts(string taskName, string title, Task.ResolveHandler
 
         private void ProduceArtifacts(Task resolveTask, in IList<string> paths)
         {
-            if (resolveTask?.Canceled() ?? false)
+            if (paths == null || (resolveTask?.Canceled() ?? false))
                 return;
 
             resolveTask.Report("Producing artifacts...");
@@ -738,14 +803,16 @@ private void Build()
         {
             m_CurrentResolveTask?.Cancel();
             m_CurrentResolveTask?.Dispose();
-            m_CurrentResolveTask = ResolveArtifacts("Build", $"Building {name.ToLowerInvariant()} search index", OnArtifactsResolved);
+            m_CurrentResolveTask = ResolveArtifacts("Build", $"Building {name.ToLowerInvariant()} search index", (task, data) => WaitForReadComplete(task, data, OnArtifactsResolved));
         }
 
+        // To be used with WaitForReadComplete.
         private void OnArtifactsResolved(Task task, TaskData data)
         {
             m_CurrentResolveTask = null;
             if (task.canceled || task.error != null)
                 return;
+
             index.ApplyFrom(data.combinedIndex);
             bytes = data.bytes;
             // Do not cache indexes while running tests
@@ -755,14 +822,11 @@ private void OnArtifactsResolved(Task task, TaskData data)
                 Setup();
         }
 
-        private void Setup(Task task, TaskData data)
+        // To be used with WaitForReadComplete.
+        private void AssignNewIndexAndSetup(Task task, TaskData data)
         {
-            if (task.error != null)
-            {
-                Debug.LogException(task.error);
-                return;
-            }
-
+            index.ApplyFrom(data.combinedIndex);
+            bytes = data.bytes;
             Setup();
         }
 
@@ -857,7 +921,7 @@ private void IncrementalUpdate(AssetIndexChangeSet changeset)
 
         private void ProcessIncrementalUpdates()
         {
-            if (ready && !updating)
+            if (ready && !updating && !m_ImmutableLock.IsReadLockHeld)
             {
                 if (m_UpdateQueue.TryTake(out var diff))
                     ProcessIncrementalUpdate(diff);
@@ -874,10 +938,25 @@ private void ProcessIncrementalUpdate(AssetIndexChangeSet changeset)
             var taskName = $"Updating {settings.name.ToLowerInvariant()} search index";
 
             Interlocked.Increment(ref m_UpdateTasks);
-            m_CurrentUpdateTask = new Task("Update", taskName, (task, data) => MergeDocuments(task, data, changeset), updates.Length, this);
+            m_CurrentUpdateTask = new Task("Update", taskName, (task, data) =>
+            {
+                WaitForReadComplete(task, data, (t, d) => MergeDocuments(t, d, changeset));
+            }, updates.Length, this);
             ResolveArtifacts(updates, null, m_CurrentUpdateTask, false);
         }
 
+        private void WaitForReadComplete(Task task, TaskData data, Action<Task, TaskData> callback)
+        {
+            using var tryWriteLockScope = new TryWriteLockScope(m_ImmutableLock);
+            if (tryWriteLockScope.locked)
+                callback(task, data);
+            else
+            {
+                task.Report("Waiting for read completion...");
+                Dispatcher.Enqueue(() => WaitForReadComplete(task, data, callback));
+            }
+        }
+
         private void MergeDocuments(Task task, TaskData data, AssetIndexChangeSet changeset)
         {
             if (task.canceled || task.error != null)
@@ -894,6 +973,7 @@ private void MergeDocuments(Task task, TaskData data, AssetIndexChangeSet change
             task.Report("Merging changes to index...");
             task.RunThread(() =>
             {
+                using var writeScope = new WriteLockScope(m_ImmutableLock);
                 index.Merge(changeset.removed, data.combinedIndex, baseScore,
                     (di, indexer, count) => OnDocumentMerged(task, indexer, indexName, di, count));
                 if (saveIndexCache)
@@ -972,5 +1052,11 @@ internal static SearchDatabase CreateDefaultIndex()
             var defaultDbIndexPath = SearchDatabaseImporter.CreateTemplateIndex("_Default", defaultIndexFolder, defaultIndexFilename);
             return ImportAsset(defaultDbIndexPath);
         }
+
+        // Don't use on the main thread!
+        public IDisposable GetImmutableScope()
+        {
+            return new ReadLockScope(m_ImmutableLock);
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/Indexing/SearchIndexer.cs b/Modules/QuickSearch/Editor/Indexing/SearchIndexer.cs
index 7bca6fbde7..f9de6b62e7 100644
--- a/Modules/QuickSearch/Editor/Indexing/SearchIndexer.cs
+++ b/Modules/QuickSearch/Editor/Indexing/SearchIndexer.cs
@@ -10,6 +10,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
+using Unity.Profiling;
 using UnityEngine;
 
 namespace UnityEditor.Search
@@ -376,11 +377,26 @@ internal int indexCount
         /// </summary>
         public Func<string, string> resolveDocumentHandler { get; set; }
 
+        Func<IEnumerable<string>> m_FetchDefaultFilter;
+        internal Func<IEnumerable<string>> fetchDefaultFiler {
+            get => m_FetchDefaultFilter;
+            set
+            {
+                if (m_FetchDefaultFilter != value)
+                {
+                    m_RebuildFilters = true;
+                    m_FetchDefaultFilter = value;
+                }
+            }
+        }
+
         /// <summary>
         /// Minimal indexed word size.
         /// </summary>
         public int minWordIndexationLength { get; set; } = 2;
 
+        public int minQueryLength { get; set; } = 1;
+
         internal IEnumerable<SearchIndexEntry> indexes => m_Indexes;
 
         private long m_Timestamp;
@@ -409,12 +425,20 @@ internal int indexCount
         private ConcurrentDictionary<string, string> m_MetaInfo;
         internal ConcurrentDictionary<string, int> m_IndexByDocuments;
 
+        static readonly ProfilerMarker k_MapPropertyMarker = new($"{nameof(SearchIndexer)}.{nameof(MapProperty)}");
+        static readonly ProfilerMarker k_AddWordMarker = new($"{nameof(SearchIndexer)}.{nameof(AddWord)}");
+        static readonly ProfilerMarker k_AddExactWordMarker = new($"{nameof(SearchIndexer)}.{nameof(AddExactWord)}");
+        static readonly ProfilerMarker k_AddNumberMarker = new($"{nameof(SearchIndexer)}.{nameof(AddNumber)}");
+        static readonly ProfilerMarker k_AddPropertyMarker = new($"{nameof(SearchIndexer)}.{nameof(AddProperty)}");
+        static readonly ProfilerMarker k_AddExactPropertyMarker = new($"{nameof(SearchIndexer)}.{nameof(AddExactProperty)}");
+
         /// <summary>
         /// Create a new default SearchIndexer.
         /// </summary>
         public SearchIndexer()
             : this(String.Empty)
         {
+            minWordIndexationLength = SearchSettings.minIndexVariations;
         }
 
         /// <summary>
@@ -437,6 +461,7 @@ public SearchIndexer(string name)
             m_FixedRanges = new Dictionary<RangeSet, IndexRange>();
             m_SourceDocuments = new ConcurrentDictionary<string, Hash128>();
             m_MetaInfo = new ConcurrentDictionary<string, string>();
+            minWordIndexationLength = SearchSettings.minIndexVariations;
         }
 
         private ParsedQuery<SearchResult, object> BuildQuery(string searchQuery)
@@ -446,7 +471,7 @@ private ParsedQuery<SearchResult, object> BuildQuery(string searchQuery)
                 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_QueryEngine.SetSearchDataCallback(e => null, s => s.Length < minQueryLength ? null : s, StringComparison.Ordinal);
                     m_QueryPool = new ConcurrentDictionary<string, ParsedQuery<SearchResult, object>>();
                 }
 
@@ -957,6 +982,7 @@ public bool Read(Stream stream, bool checkVersionOnly)
 
         internal void MapProperty(in string name, in string label, in string help, in string propertyType, in string ownerTypeName, bool removeNestedKeys = false)
         {
+            using var _ = k_MapPropertyMarker.Auto();
             MapKeyword(name + ":", $"{label}|{help}|{propertyType}|{ownerTypeName}");
             if (removeNestedKeys)
             {
@@ -1251,6 +1277,14 @@ private void BuildDocumentIndexTable()
 
         void AddFilters()
         {
+            if (fetchDefaultFiler != null)
+            {
+                var defaultFilters = fetchDefaultFiler();
+                foreach (var f in defaultFilters)
+                    if (!m_QueryEngine.HasFilter(f))
+                        m_QueryEngine.AddFilter(f);
+            }
+
             foreach (var kw in m_Keywords)
             {
                 var filter = kw;
@@ -1379,11 +1413,13 @@ public string GetMetaInfo(string documentId)
 
         internal void AddExactWord(string word, int score, int documentIndex, List<SearchIndexEntry> indexes)
         {
+            using var _ = k_AddExactWordMarker.Auto();
             indexes.Add(new SearchIndexEntry(word.GetHashCode(), int.MaxValue, SearchIndexEntry.Type.Word, documentIndex, score));
         }
 
         internal void AddWord(string word, int minVariations, int maxVariations, int score, int documentIndex, List<SearchIndexEntry> indexes)
         {
+            using var _ = k_AddWordMarker.Auto();
             if (word == null || word.Length == 0)
                 return;
 
@@ -1413,6 +1449,7 @@ internal void AddExactProperty(string name, string value, int score, int documen
 
         internal void AddExactProperty(string name, string value, int score, int documentIndex, List<SearchIndexEntry> indexes, bool saveKeyword)
         {
+            using var _ = k_AddExactPropertyMarker.Auto();
             var nameHash = name.GetHashCode();
             var valueHash = value.GetHashCode();
 
@@ -1429,6 +1466,7 @@ internal void AddExactProperty(string name, string value, int score, int documen
 
         internal void AddProperty(string name, string value, int minVariations, int maxVariations, int score, int documentIndex, List<SearchIndexEntry> indexes, bool exact, bool saveKeyword)
         {
+            using var _ = k_AddPropertyMarker.Auto();
             var nameHash = name.GetHashCode();
             var valueHash = value.GetHashCode();
             maxVariations = Math.Min(maxVariations, value.Length);
@@ -1461,6 +1499,7 @@ internal void AddProperty(string name, string value, int minVariations, int maxV
 
         internal void AddNumber(string key, double value, int score, int documentIndex, List<SearchIndexEntry> indexes)
         {
+            using var _ = k_AddNumberMarker.Auto();
             var keyHash = key.GetHashCode();
             var longNumber = BitConverter.DoubleToInt64Bits(value);
             indexes.Add(new SearchIndexEntry(longNumber, keyHash, SearchIndexEntry.Type.Number, documentIndex, score));
@@ -1586,8 +1625,16 @@ public void Finish(string[] removedDocuments)
                 UpdateIndexes(m_BatchIndexes, null);
                 m_BatchIndexes.Clear();
             }
+
+            if (UnityEditorInternal.InternalEditorUtility.CurrentThreadIsMainThread())
+                OnFinish();
+            else
+                Dispatcher.Enqueue(OnFinish);
         }
 
+        private protected virtual void OnFinish()
+        {}
+
         internal string Print(IEnumerable<SearchIndexEntry> indexes)
         {
             var sb = new StringBuilder();
@@ -1687,7 +1734,7 @@ private IEnumerable<SearchResult> SearchTerm(
                 else if (value is string)
                 {
                     var valueString = (string)value;
-                    if (Utils.TryParse(valueString, out number))
+                    if (Utils.TryParse(valueString, out number, false))
                     {
                         if (!exclude && op != SearchIndexOperator.NotEqual)
                             matches = SearchNumber(name, number, op, subset);
diff --git a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabase.cs b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabase.cs
index 4960172afc..73bf4e3c0b 100644
--- a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabase.cs
+++ b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabase.cs
@@ -5,6 +5,7 @@
 // #define USE_PERFORMANCE_TRACKER
 using System;
 using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -46,6 +47,8 @@ public interface IPropertyDatabaseView : IDisposable
 
     class PropertyDatabaseLock : IDisposable
     {
+        static Dictionary<string, SharedCounter> s_DatabaseFiles = new Dictionary<string, SharedCounter>();
+
         class SharedCounter
         {
             public int value;
@@ -57,25 +60,17 @@ public SharedCounter(int value)
         }
 
         string m_Path;
-        SharedCounter m_Counter;
-        FileStream m_Fs;
         bool m_Disposed;
 
-        const string k_TempFolderPath = "Temp/";
-
         PropertyDatabaseLock(string propertyDatabasePath, SharedCounter counter)
         {
-            m_Path = $"{k_TempFolderPath}PropertyDatabase_{propertyDatabasePath.GetHashCode()}";
-            m_Fs = File.Open(m_Path, FileMode.CreateNew, FileAccess.Write, FileShare.None);
-            m_Counter = counter;
+            m_Path = propertyDatabasePath;
         }
 
         PropertyDatabaseLock(PropertyDatabaseLock other)
         {
             this.m_Path = other.m_Path;
-            this.m_Counter = other.m_Counter;
             this.m_Disposed = other.m_Disposed;
-            this.m_Fs = other.m_Fs;
         }
 
         public static bool TryOpen(string propertyDatabasePath, out PropertyDatabaseLock pdbl)
@@ -83,10 +78,20 @@ public static bool TryOpen(string propertyDatabasePath, out PropertyDatabaseLock
             pdbl = null;
             try
             {
-                pdbl = new PropertyDatabaseLock(propertyDatabasePath, new SharedCounter(1));
-                return true;
+                lock (s_DatabaseFiles)
+                {
+                    if (s_DatabaseFiles.TryGetValue(propertyDatabasePath, out var _))
+                    {
+                        return false;
+                    }
+
+                    var counter = new SharedCounter(1);
+                    s_DatabaseFiles.Add(propertyDatabasePath, counter);
+                    pdbl = new PropertyDatabaseLock(propertyDatabasePath, counter);
+                    return true;
+                }
             }
-            catch (IOException)
+            catch (Exception)
             {
                 pdbl = null;
                 return false;
@@ -95,11 +100,14 @@ public static bool TryOpen(string propertyDatabasePath, out PropertyDatabaseLock
 
         public PropertyDatabaseLock Share()
         {
-            lock (m_Counter)
+            lock(s_DatabaseFiles)
             {
                 if (m_Disposed)
                     throw new ObjectDisposedException(m_Path, "Trying to share a lock that has already been disposed.");
-                ++m_Counter.value;
+
+                if (!s_DatabaseFiles.TryGetValue(m_Path, out var counter))
+                    throw new System.Exception($"Data base {m_Path} is not opened.");
+                ++counter.value;
                 return new PropertyDatabaseLock(this);
             }
         }
@@ -117,18 +125,19 @@ public void Dispose()
 
         void Dispose(bool disposed)
         {
-            lock (m_Counter)
+            lock (s_DatabaseFiles)
             {
                 if (m_Disposed)
                     return;
-                --m_Counter.value;
-                if (m_Counter.value == 0)
+
+                m_Disposed = true;
+                if (s_DatabaseFiles.TryGetValue(m_Path, out var counter))
                 {
-                    m_Fs.Dispose();
-                    m_Fs = null;
-                    m_Disposed = true;
-                    if (File.Exists(m_Path))
-                        File.Delete(m_Path);
+                    --counter.value;
+                    if (counter.value == 0)
+                    {
+                        s_DatabaseFiles.Remove(m_Path);
+                    }
                 }
             }
         }
@@ -164,6 +173,8 @@ public PropertyDatabase(string filePath)
 
         public PropertyDatabase(string filePath, bool autoFlush, double backgroundUpdateDebounceInSeconds = k_DefaultBackgroundUpdateDebounceInSeconds)
         {
+            if (string.IsNullOrEmpty(filePath))
+                throw new System.ArgumentNullException(nameof(filePath));
             this.filePath = filePath;
             stringTableFilePath = GetStringTablePath(filePath);
 
@@ -672,6 +683,7 @@ public void Dispose()
             m_FileStoreView.Dispose();
             m_StringTableView.Dispose();
             m_Lock.Dispose();
+            m_Lock = null;
             m_DelayedSync = false;
             m_Disposed = true;
         }
@@ -754,14 +766,20 @@ public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabase
             {
                 if (m_PropertyDatabase.disposed)
                     return m_PropertyDatabase.disposedView.TryLoad(recordKey, out data);
-                if (m_MemoryStoreView.TryLoad(recordKey, out data))
-                    return true;
-                if (!m_FileStoreView.TryLoad(recordKey, out data))
+                data = PropertyDatabaseRecordValue.invalid;
+                if (m_MemoryStoreView.TryLoad(recordKey, out PropertyDatabaseRecord memoryRecord, true))
+                {
+                    // If data is invalid, it was deliberately made invalid, so it should be invalid in the
+                    // filestore too.
+                    data = memoryRecord.recordValue;
+                    return memoryRecord.IsValid();
+                }
+                if (!m_FileStoreView.TryLoad(recordKey, out PropertyDatabaseRecord fileRecord))
                     return false;
 
                 // Cache loaded value into memory store.
-                var record = CreateRecord(recordKey, data);
-                m_MemoryStoreView.Store(record, !m_DelayedSync);
+                data = fileRecord.recordValue;
+                m_MemoryStoreView.Store(fileRecord, !m_DelayedSync);
                 return true;
             }
         }
@@ -771,8 +789,11 @@ public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabas
             {
                 if (m_PropertyDatabase.disposed)
                     return m_PropertyDatabase.disposedView.TryLoad(recordKey, out data);
-                if (m_VolatileMemoryStoreView.TryLoad(recordKey, out data))
+                if (m_VolatileMemoryStoreView.TryLoad(recordKey, out IPropertyDatabaseRecord volatileRecord))
+                {
+                    data = volatileRecord.value;
                     return true;
+                }
 
                 var success = TryLoad(recordKey, out PropertyDatabaseRecordValue recordValue);
                 data = recordValue;
@@ -844,7 +865,7 @@ public void Invalidate(ulong documentKey)
                 }
                 m_VolatileMemoryStoreView.Invalidate(documentKey, !m_DelayedSync);
                 m_MemoryStoreView.Invalidate(documentKey, !m_DelayedSync);
-                m_FileStoreView.Invalidate(documentKey, !m_DelayedSync);
+                m_FileStoreView.InvalidateInMemory(documentKey, !m_DelayedSync);
                 m_PropertyDatabase.StoresChanged();
             }
         }
@@ -859,7 +880,7 @@ public void Invalidate(in PropertyDatabaseRecordKey recordKey)
                 }
                 m_VolatileMemoryStoreView.Invalidate(recordKey, !m_DelayedSync);
                 m_MemoryStoreView.Invalidate(recordKey, !m_DelayedSync);
-                m_FileStoreView.Invalidate(recordKey, !m_DelayedSync);
+                m_FileStoreView.InvalidateInMemory(m_MemoryStoreView, recordKey, !m_DelayedSync);
                 m_PropertyDatabase.StoresChanged();
             }
         }
@@ -874,7 +895,7 @@ internal void Invalidate(uint documentKeyHiWord)
                 }
                 m_VolatileMemoryStoreView.Invalidate(documentKeyHiWord, !m_DelayedSync);
                 m_MemoryStoreView.Invalidate(documentKeyHiWord, !m_DelayedSync);
-                m_FileStoreView.Invalidate(documentKeyHiWord, !m_DelayedSync);
+                m_FileStoreView.InvalidateInMemory(documentKeyHiWord, !m_DelayedSync);
                 m_PropertyDatabase.StoresChanged();
             }
         }
@@ -889,7 +910,7 @@ public void InvalidateMask(ulong documentKeyMask)
                 }
                 m_VolatileMemoryStoreView.InvalidateMask(documentKeyMask, !m_DelayedSync);
                 m_MemoryStoreView.InvalidateMask(documentKeyMask, !m_DelayedSync);
-                m_FileStoreView.InvalidateMask(documentKeyMask, !m_DelayedSync);
+                m_FileStoreView.InvalidateMaskInMemory(documentKeyMask, !m_DelayedSync);
                 m_PropertyDatabase.StoresChanged();
             }
         }
@@ -904,7 +925,7 @@ internal void InvalidateMask(uint documentKeyHiWordMask)
                 }
                 m_VolatileMemoryStoreView.InvalidateMask(documentKeyHiWordMask, !m_DelayedSync);
                 m_MemoryStoreView.InvalidateMask(documentKeyHiWordMask, !m_DelayedSync);
-                m_FileStoreView.InvalidateMask(documentKeyHiWordMask, !m_DelayedSync);
+                m_FileStoreView.InvalidateMaskInMemory(documentKeyHiWordMask, !m_DelayedSync);
                 m_PropertyDatabase.StoresChanged();
             }
         }
@@ -1095,15 +1116,16 @@ internal void MergeStores()
             using (new RaceConditionDetector(m_PropertyDatabase))
             {
                 // Merge both stores
-                newMemoryStoreView.MergeWith(m_FileStoreView);
-                newMemoryStoreView.MergeWith(m_MemoryStoreView);
+                newMemoryStoreView.MergeWith(m_FileStoreView, false);
+                newMemoryStoreView.MergeWith(m_MemoryStoreView, false);
 
                 // Write new memory store to file.
                 var tempFilePath = GetTempFilePath(m_FileStore.filePath);
                 newMemoryStoreView.SaveToFile(tempFilePath);
 
-                // Swap file store with new one
+                // Swap file store with new one, and clear the invalidated documents (since the invalid records were not saved)
                 m_FileStore.SwapFile(tempFilePath);
+                m_FileStore.ClearInvalidatedDocuments();
 
                 // Clear the memory store after file was swapped. If you do it before, you risk
                 // entering a state where another thread could try to read between the moment the clear is done
diff --git a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseRecord.cs b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseRecord.cs
index 09f2475b01..58aaea5d8b 100644
--- a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseRecord.cs
+++ b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseRecord.cs
@@ -850,7 +850,7 @@ public int CompareTo(PropertyDatabaseRecordKey other)
 
         public bool IsValid()
         {
-            return valid == 1;
+            return validRecord;
         }
 
         public void ToBinary(BinaryWriter bw)
diff --git a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseStore.cs b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseStore.cs
index 3a190f0a18..a7849f107a 100644
--- a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseStore.cs
+++ b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseStore.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -20,24 +21,30 @@ interface IPropertyLockable
 
     interface IPropertyDatabaseStore : IPropertyLockable
     {
-        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);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecord data, bool loadInvalid);
+        bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records, bool loadInvalid);
         void Invalidate(ulong documentKey);
         void Invalidate(in PropertyDatabaseRecordKey recordKey);
         void Invalidate(uint documentKeyHiWord);
         void InvalidateMask(ulong documentKeyMask);
         void InvalidateMask(uint documentKeyHiWordMask);
-        IEnumerable<IPropertyDatabaseRecord> EnumerateAll();
+        IEnumerable<IPropertyDatabaseRecord> EnumerateAll(bool enumerateInvalid);
         void Clear();
         IPropertyDatabaseStoreView GetView();
     }
 
+    interface IPropertyDatabaseSerializableStore : IPropertyDatabaseStore
+    {
+        bool Store(in PropertyDatabaseRecord record);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecord data, bool loadInvalid);
+        IEnumerable<PropertyDatabaseRecord> EnumerateAllSerializableRecords(bool enumerateInvalid);
+        IPropertyDatabaseSerializableStoreView GetSerializableStoreView();
+    }
+
     interface IPropertyDatabaseVolatileStore : IPropertyDatabaseStore
     {
         bool Store(in PropertyDatabaseRecordKey recordKey, object value);
-        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data, bool loadInvalid);
     }
 
     interface IPropertyDatabaseStoreView : IDisposable, IPropertyLockable
@@ -45,27 +52,34 @@ interface IPropertyDatabaseStoreView : IDisposable, IPropertyLockable
         long length { get; }
         long byteSize { get; }
 
-        PropertyDatabaseRecord this[long index] { get; }
+        IPropertyDatabaseRecord this[long index] { get; }
 
-        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);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecord data, bool loadInvalid);
+        bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records, bool loadInvalid);
         void Invalidate(ulong documentKey, 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();
+        IEnumerable<IPropertyDatabaseRecord> EnumerateAll(bool enumerateInvalid);
         void Clear();
         void Sync();
         bool Find(in PropertyDatabaseRecordKey recordKey, out long index);
     }
 
+    interface IPropertyDatabaseSerializableStoreView : IPropertyDatabaseStoreView
+    {
+        new PropertyDatabaseRecord this[long index] { get; }
+
+        bool Store(in PropertyDatabaseRecord record, bool sync);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecord data, bool loadInvalid);
+        IEnumerable<PropertyDatabaseRecord> EnumerateAllSerializableRecords(bool enumerateInvalid);
+    }
+
     interface IPropertyDatabaseVolatileStoreView : IPropertyDatabaseStoreView
     {
         bool Store(in PropertyDatabaseRecordKey recordKey, object value, bool sync);
-        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data, bool loadInvalid);
     }
 
     readonly struct PropertyDatabaseDocumentKeyRange : IBinarySearchRange<PropertyDatabaseRecordKey>
@@ -112,6 +126,11 @@ public static ulong GetULongFromHiWord(uint hiWord)
         {
             return (ulong)hiWord << 32;
         }
+
+        public static uint ToHiWord(ulong documentKey)
+        {
+            return (uint)((documentKey & k_HighMask) >> 32);
+        }
     }
 
     readonly struct PropertyDatabaseDocumentKeyMaskRange : IBinarySearchRange<PropertyDatabaseRecordKey>
@@ -138,6 +157,16 @@ public bool EndIsInRange(PropertyDatabaseRecordKey end)
             // Always return true, since we want to go to the end of records
             return true;
         }
+
+        public static bool KeyMatchesMask(PropertyDatabaseRecordKey key, ulong mask)
+        {
+            return DocumentKeyMatchesMask(key.documentKey, mask);
+        }
+
+        public static bool DocumentKeyMatchesMask(ulong documentKey, ulong mask)
+        {
+            return (documentKey & mask) != 0;
+        }
     }
 
     static class PropertyDatabaseRecordFinder
@@ -276,28 +305,16 @@ abstract class BasePropertyDatabaseStore : IPropertyDatabaseStore
     {
         ReaderWriterLockSlim m_Lock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
-        public bool Store(in PropertyDatabaseRecord record)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecord data, bool loadInvalid = false)
         {
             using (var view = GetView())
-                return view.Store(record, true);
+                return view.TryLoad(recordKey, out data, loadInvalid);
         }
 
-        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
+        public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records, bool loadInvalid = false)
         {
             using (var view = GetView())
-                return view.TryLoad(recordKey, out data);
-        }
-
-        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
-        {
-            using (var view = GetView())
-                return view.TryLoad(recordKey, out data);
-        }
-
-        public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records)
-        {
-            using (var view = GetView())
-                return view.TryLoad(documentKey, out records);
+                return view.TryLoad(documentKey, out records, loadInvalid);
         }
 
         public void Invalidate(ulong documentKey)
@@ -330,10 +347,10 @@ public void InvalidateMask(uint documentKeyHiWordMask)
                 view.InvalidateMask(documentKeyHiWordMask, true);
         }
 
-        public IEnumerable<IPropertyDatabaseRecord> EnumerateAll()
+        public IEnumerable<IPropertyDatabaseRecord> EnumerateAll(bool enumerateInvalid = false)
         {
             using (var view = GetView())
-                return view.EnumerateAll();
+                return view.EnumerateAll(enumerateInvalid);
         }
 
         public void Clear()
@@ -360,48 +377,144 @@ public IDisposable LockWrite()
         }
     }
 
-    abstract class BasePropertyDatabaseMemoryStore<T> : BasePropertyDatabaseStore
-        where T : struct
+    abstract class BasePropertyDatabaseSerializableStore : BasePropertyDatabaseStore, IPropertyDatabaseSerializableStore
+    {
+        public bool Store(in PropertyDatabaseRecord record)
+        {
+            using (var view = GetSerializableStoreView())
+                return view.Store(record, true);
+        }
+
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecord data, bool loadInvalid = false)
+        {
+            using (var view = GetSerializableStoreView())
+                return view.TryLoad(recordKey, out data, loadInvalid);
+        }
+
+        public IEnumerable<PropertyDatabaseRecord> EnumerateAllSerializableRecords(bool enumerateInvalid = false)
+        {
+            using (var view = GetSerializableStoreView())
+                return view.EnumerateAllSerializableRecords(enumerateInvalid);
+        }
+
+        public abstract IPropertyDatabaseSerializableStoreView GetSerializableStoreView();
+    }
+
+    class MemoryDataStore<T> : IList<T>
     {
-        protected List<T> m_Store;
+        List<T> m_Data;
+
+        public int Count => m_Data.Count;
+        public bool IsReadOnly => false;
 
-        public List<T> data => m_Store;
+        public T this[int index]
+        {
+            get => m_Data[index];
+            set => m_Data[index] = value;
+        }
 
-        public BasePropertyDatabaseMemoryStore()
+        public MemoryDataStore()
         {
-            m_Store = new List<T>();
+            m_Data = new List<T>();
         }
 
-        public BasePropertyDatabaseMemoryStore(List<T> initialStore)
+        public MemoryDataStore(IEnumerable<T> initialData)
         {
-            m_Store = initialStore;
+            m_Data = initialData.ToList();
+        }
+
+        public void Add(T item)
+        {
+            m_Data.Add(item);
+        }
+
+        public void Clear()
+        {
+            m_Data.Clear();
+        }
+
+        public void Resize(int capacity)
+        {
+            m_Data.Capacity = capacity;
+        }
+
+        public bool Contains(T item)
+        {
+            return m_Data.Contains(item);
+        }
+
+        public void CopyTo(T[] array, int arrayIndex)
+        {
+            m_Data.CopyTo(array, arrayIndex);
+        }
+
+        public bool Remove(T item)
+        {
+            return m_Data.Remove(item);
+        }
+
+        public void Assign(List<T> newData)
+        {
+            m_Data = newData;
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            return m_Data.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        public int IndexOf(T item)
+        {
+            return m_Data.IndexOf(item);
+        }
+
+        public void Insert(int index, T item)
+        {
+            m_Data.Insert(index, item);
+        }
+
+        public void RemoveAt(int index)
+        {
+            m_Data.RemoveAt(index);
         }
     }
 
-    class PropertyDatabaseMemoryStore : BasePropertyDatabaseMemoryStore<PropertyDatabaseRecord>
+    class PropertyDatabaseMemoryStore : BasePropertyDatabaseSerializableStore, IPropertyDatabaseSerializableStore
     {
+        protected MemoryDataStore<PropertyDatabaseRecord> m_Store;
+
         public PropertyDatabaseMemoryStore()
-        {}
+        {
+            m_Store = new MemoryDataStore<PropertyDatabaseRecord>();
+        }
 
-        public PropertyDatabaseMemoryStore(List<PropertyDatabaseRecord> initialStore)
-            : base(initialStore)
-        {}
+        public PropertyDatabaseMemoryStore(IEnumerable<PropertyDatabaseRecord> initialStore)
+        {
+            m_Store = new MemoryDataStore<PropertyDatabaseRecord>(initialStore);
+        }
 
-        public override IPropertyDatabaseStoreView GetView()
+        public override IPropertyDatabaseStoreView GetView() => GetSerializableStoreView();
+
+        public override IPropertyDatabaseSerializableStoreView GetSerializableStoreView()
         {
             return new PropertyDatabaseMemoryStoreView(m_Store, this);
         }
     }
 
-    struct PropertyDatabaseMemoryStoreView : IPropertyDatabaseStoreView, IBinarySearchRangeData<PropertyDatabaseRecordKey>
+    struct PropertyDatabaseMemoryStoreView : IPropertyDatabaseSerializableStoreView, IBinarySearchRangeData<PropertyDatabaseRecordKey>
     {
         bool m_Disposed;
-        List<PropertyDatabaseRecord> m_StoreData;
+        MemoryDataStore<PropertyDatabaseRecord> m_MemoryDataStore;
         PropertyDatabaseMemoryStore m_Store;
 
-        public PropertyDatabaseMemoryStoreView(List<PropertyDatabaseRecord> storeData, PropertyDatabaseMemoryStore store)
+        public PropertyDatabaseMemoryStoreView(MemoryDataStore<PropertyDatabaseRecord> memoryDataStore, PropertyDatabaseMemoryStore store)
         {
-            m_StoreData = storeData;
+            m_MemoryDataStore = memoryDataStore;
             m_Store = store;
             m_Disposed = false;
         }
@@ -411,7 +524,7 @@ public void Dispose()
             if (m_Disposed)
                 return;
             m_Store = null;
-            m_StoreData = null;
+            m_MemoryDataStore = null;
             m_Disposed = true;
         }
 
@@ -425,40 +538,36 @@ public bool Store(in PropertyDatabaseRecord record, bool sync)
                 using (LockWrite())
                 {
                     if (insert)
-                        m_StoreData.Insert((int)index, record);
+                        m_MemoryDataStore.Insert((int)index, record);
                     else
-                        m_StoreData[(int)index] = record;
+                        m_MemoryDataStore[(int)index] = record;
                     return true;
                 }
             }
         }
 
-        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecord data, bool loadInvalid = false)
         {
-            data = PropertyDatabaseRecordValue.invalid;
+            data = PropertyDatabaseRecord.invalid;
             using (LockRead())
             {
                 var foundRecord = Find(recordKey, out var index);
                 if (!foundRecord)
                     return false;
 
-                var record = m_StoreData[(int)index];
-                if (!record.IsValid())
-                    return false;
-
-                data = record.recordValue;
-                return true;
+                data = m_MemoryDataStore[(int)index];
+                return data.IsValid() || loadInvalid;
             }
         }
 
-        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecord data, bool loadInvalid = false)
         {
-            var success = TryLoad(recordKey, out PropertyDatabaseRecordValue record);
+            var success = TryLoad(recordKey, out PropertyDatabaseRecord record, loadInvalid);
             data = record;
             return success;
         }
 
-        public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records)
+        public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records, bool loadInvalid = false)
         {
             records = null;
             using (LockRead())
@@ -467,12 +576,11 @@ public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord>
                 if (binarySearchRange == BinarySearchRange.invalid)
                     return false;
 
-
                 var result = new List<IPropertyDatabaseRecord>();
                 for (var i = binarySearchRange.startOffset; i < binarySearchRange.endOffset; ++i)
                 {
-                    var record = m_StoreData[(int)i];
-                    if (record.IsValid())
+                    var record = m_MemoryDataStore[(int)i];
+                    if (record.IsValid() || loadInvalid)
                         result.Add(record);
                 }
 
@@ -527,9 +635,9 @@ public void Invalidate(in PropertyDatabaseRecordKey recordKey, bool sync)
 
                 using (LockWrite())
                 {
-                    var record = m_StoreData[(int)index];
+                    var record = m_MemoryDataStore[(int)index];
                     var newRecord = new PropertyDatabaseRecord(record.recordKey, record.recordValue, false);
-                    m_StoreData[(int)index] = newRecord;
+                    m_MemoryDataStore[(int)index] = newRecord;
                 }
             }
         }
@@ -564,57 +672,118 @@ public void InvalidateMask(uint documentKeyHiWordMask, bool sync)
             InvalidateMask(documentKeyMask, sync);
         }
 
-        public IEnumerable<IPropertyDatabaseRecord> EnumerateAll()
+        public IEnumerable<IPropertyDatabaseRecord> EnumerateAll(bool enumerateInvalid = false)
+        {
+            return EnumerateAllSerializableRecords(enumerateInvalid).Cast<IPropertyDatabaseRecord>();
+        }
+
+        public IEnumerable<PropertyDatabaseRecord> EnumerateAllSerializableRecords(bool enumerateInvalid = false)
         {
             using (LockRead())
             {
-                return m_StoreData.Where(p => p.IsValid()).Cast<IPropertyDatabaseRecord>().ToList();
+                return m_MemoryDataStore.Where(p => p.IsValid() || enumerateInvalid).ToList();
             }
         }
 
-        public long length => m_StoreData.Count;
+        public long length => m_MemoryDataStore.Count;
         public long byteSize => length * PropertyDatabaseRecord.size;
 
-        public PropertyDatabaseRecordKey this[long index] => m_StoreData[(int)index].recordKey;
+        public PropertyDatabaseRecordKey this[long index] => m_MemoryDataStore[(int)index].recordKey;
 
-        PropertyDatabaseRecord IPropertyDatabaseStoreView.this[long index] => m_StoreData[(int)index];
+        IPropertyDatabaseRecord IPropertyDatabaseStoreView.this[long index] => m_MemoryDataStore[(int)index];
+        PropertyDatabaseRecord IPropertyDatabaseSerializableStoreView.this[long index] => m_MemoryDataStore[(int)index];
 
-        public void MergeWith(IPropertyDatabaseStore store)
+        public void MergeWith(IPropertyDatabaseSerializableStore store, bool overrideWithInvalid)
         {
-            using (var otherView = store.GetView())
-                MergeWith(otherView);
+            using (var otherView = store.GetSerializableStoreView())
+                MergeWith(otherView, overrideWithInvalid);
         }
 
-        public void MergeWith(IPropertyDatabaseStoreView view)
+        public void MergeWith(IPropertyDatabaseSerializableStoreView view, bool overrideWithInvalid)
         {
             using (LockWrite())
             using (view.LockRead())
             {
-                for (var i = 0; i < view.length; ++i)
-                {
-                    var record = view[i];
-                    if (record.IsValid())
-                        Store(record, true);
-                }
+                MergeWith(view.EnumerateAllSerializableRecords(overrideWithInvalid), overrideWithInvalid);
             }
         }
 
-        public void MergeWith(IEnumerable<PropertyDatabaseRecord> records)
+        public void MergeWith(IEnumerable<PropertyDatabaseRecord> records, bool overrideWithInvalid)
         {
+            var newRecordsList = records.ToList();
+            var newRecordsCount = newRecordsList.Count;
+
             using (LockWrite())
             {
-                foreach (var record in records)
+                if (m_MemoryDataStore.Count == 0)
+                {
+                    m_MemoryDataStore.Resize(newRecordsCount);
+                    foreach (var record in newRecordsList)
+                    {
+                        if (record.IsValid() || overrideWithInvalid)
+                            m_MemoryDataStore.Add(record); // Assume already in order
+                    }
+                }
+                else
                 {
-                    if (record.IsValid())
-                        Store(record, true);
+                    var existingRecordsCount = m_MemoryDataStore.Count;
+
+                    var newData = new List<PropertyDatabaseRecord>(existingRecordsCount + newRecordsCount);
+
+                    var existingRecordsIndex = 0;
+                    var newRecordsIndex = 0;
+                    while (existingRecordsIndex < existingRecordsCount && newRecordsIndex < newRecordsCount)
+                    {
+                        var existingRecord = m_MemoryDataStore[existingRecordsIndex];
+                        var newRecord = newRecordsList[newRecordsIndex];
+
+                        var compare = existingRecord.CompareTo(newRecord);
+                        if (compare < 0)
+                        {
+                            newData.Add(existingRecord);
+                            ++existingRecordsIndex;
+                        }
+                        else if (compare > 0)
+                        {
+                            if (newRecord.IsValid() || overrideWithInvalid)
+                                newData.Add(newRecord);
+                            ++newRecordsIndex;
+                        }
+                        else
+                        {
+                            if (newRecord.IsValid() || overrideWithInvalid)
+                                newData.Add(newRecord);
+                            else
+                                newData.Add(existingRecord);
+                            ++existingRecordsIndex;
+                            ++newRecordsIndex;
+                        }
+                    }
+
+                    // Either the existing records or the new records have not finished merging. Try them both
+                    while (existingRecordsIndex < existingRecordsCount)
+                    {
+                        newData.Add(m_MemoryDataStore[existingRecordsIndex]);
+                        ++existingRecordsIndex;
+                    }
+
+                    while (newRecordsIndex < newRecordsCount)
+                    {
+                        var newRecord = newRecordsList[newRecordsIndex];
+                        if (newRecord.IsValid() || overrideWithInvalid)
+                            newData.Add(newRecord);
+                        ++newRecordsIndex;
+                    }
+
+                    m_MemoryDataStore.Assign(newData);
                 }
             }
         }
 
         public void Clear()
         {
-            using (m_Store.LockWrite())
-                m_StoreData.Clear();
+            using (LockWrite())
+                m_MemoryDataStore.Clear();
         }
 
         public void SaveToFile(string filePath)
@@ -628,7 +797,7 @@ public void SaveToFile(string filePath)
                 {
                     var bw = new BinaryWriter(fs);
                     bw.Write(PropertyDatabase.version);
-                    foreach (var databaseRecord in m_StoreData)
+                    foreach (var databaseRecord in m_MemoryDataStore)
                     {
                         databaseRecord.ToBinary(bw);
                     }
@@ -643,9 +812,9 @@ void InvalidateRange(BinarySearchRange binarySearchRange)
             {
                 for (var i = binarySearchRange.startOffset; i < binarySearchRange.endOffset; ++i)
                 {
-                    var record = m_StoreData[(int)i];
+                    var record = m_MemoryDataStore[(int)i];
                     var newRecord = new PropertyDatabaseRecord(record.recordKey, record.recordValue, false);
-                    m_StoreData[(int)i] = newRecord;
+                    m_MemoryDataStore[(int)i] = newRecord;
                 }
             }
         }
@@ -656,38 +825,44 @@ void InvalidateMaskRange(BinarySearchRange binarySearchRange, ulong documentKeyM
             {
                 for (var i = binarySearchRange.startOffset; i < binarySearchRange.endOffset; ++i)
                 {
-                    var record = m_StoreData[(int)i];
-                    if ((record.key.documentKey & documentKeyMask) != 0)
+                    var record = m_MemoryDataStore[(int)i];
+                    if (PropertyDatabaseDocumentKeyMaskRange.KeyMatchesMask(record.key, documentKeyMask))
                     {
                         var newRecord = new PropertyDatabaseRecord(record.recordKey, record.recordValue, false);
-                        m_StoreData[(int)i] = newRecord;
+                        m_MemoryDataStore[(int)i] = newRecord;
                     }
                 }
             }
         }
     }
 
-    class PropertyDatabaseFileStore : BasePropertyDatabaseStore
+    class PropertyDatabaseFileStore : BasePropertyDatabaseSerializableStore
     {
         public string filePath { get; }
 
         event Action<string> m_FileStoreChanged;
         event Action m_FileStoreAboutToChange;
 
+        HashSet<ulong> m_InvalidatedDocumentKeys;
+        HashSet<uint> m_InvalidatedDocumentKeyHiWords;
+        HashSet<ulong> m_InvalidatedDocumentKeyMasks;
+
         public PropertyDatabaseFileStore(string filePath)
         {
             this.filePath = filePath;
+            m_InvalidatedDocumentKeys = new HashSet<ulong>();
+            m_InvalidatedDocumentKeyHiWords = new HashSet<uint>();
+            m_InvalidatedDocumentKeyMasks = new HashSet<ulong>();
         }
 
         public override IPropertyDatabaseStoreView GetView()
         {
-            return new PropertyDatabaseFileStoreView(filePath, this);
+            return GetSerializableStoreView();
         }
 
-        public PropertyDatabaseMemoryStore ToMemoryStore()
+        public override IPropertyDatabaseSerializableStoreView GetSerializableStoreView()
         {
-            using (var view = new PropertyDatabaseFileStoreView(filePath, this))
-                return view.ToMemoryStore();
+            return new PropertyDatabaseFileStoreView(filePath, this, m_InvalidatedDocumentKeys, m_InvalidatedDocumentKeyHiWords, m_InvalidatedDocumentKeyMasks);
         }
 
         public void SwapFile(string filePathToSwap)
@@ -709,6 +884,16 @@ public void SwapFile(string filePathToSwap)
             }
         }
 
+        public void ClearInvalidatedDocuments()
+        {
+            using (LockWrite())
+            {
+                m_InvalidatedDocumentKeys.Clear();
+                m_InvalidatedDocumentKeyHiWords.Clear();
+                m_InvalidatedDocumentKeyMasks.Clear();
+            }
+        }
+
         public void RegisterFileStoreChangedHandler(Action<string> handler)
         {
             using (LockWrite())
@@ -748,15 +933,20 @@ public void NotifyFileStoreAboutToChange()
 
     // This needs to be a class, since it registers a itself for changes and the event modifies the filestream.
     // With a struct only the copy would get modified.
-    class PropertyDatabaseFileStoreView : IPropertyDatabaseStoreView, IBinarySearchRangeData<PropertyDatabaseRecordKey>
+    class PropertyDatabaseFileStoreView : IPropertyDatabaseSerializableStoreView, IBinarySearchRangeData<PropertyDatabaseRecordKey>
     {
         bool m_Disposed;
         FileStream m_Fs;
         BinaryReader m_Br;
         BinaryWriter m_Bw;
         PropertyDatabaseFileStore m_Store;
+        bool m_NeedsSync;
 
-        public PropertyDatabaseFileStoreView(string filePath, PropertyDatabaseFileStore store)
+        HashSet<ulong> m_InvalidatedDocumentKeys;
+        HashSet<uint> m_InvalidatedDocumentKeyHiWords;
+        HashSet<ulong> m_InvalidatedDocumentKeyMasks;
+
+        public PropertyDatabaseFileStoreView(string filePath, PropertyDatabaseFileStore store, HashSet<ulong> invalidatedDocumentKeys, HashSet<uint> invalidatedDocumentKeyHiWords, HashSet<ulong> invalidatedDocumentKeyMasks)
         {
             length = 0;
             m_Disposed = false;
@@ -764,6 +954,9 @@ public PropertyDatabaseFileStoreView(string filePath, PropertyDatabaseFileStore
             m_Br = null;
             m_Bw = null;
             m_Store = store;
+            m_InvalidatedDocumentKeys = invalidatedDocumentKeys;
+            m_InvalidatedDocumentKeyHiWords = invalidatedDocumentKeyHiWords;
+            m_InvalidatedDocumentKeyMasks = invalidatedDocumentKeyMasks;
             // All fields must be assigned before calling any functions.
             store.RegisterFileStoreChangedHandler(HandleFileStoreChanged);
             store.RegisterFileStoreAboutToChangeHandler(HandleFileStoreAboutToChange);
@@ -810,39 +1003,33 @@ public bool Store(in PropertyDatabaseRecord record, bool sync)
             throw new NotSupportedException();
         }
 
-        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecord data, bool loadInvalid = false)
         {
-            data = PropertyDatabaseRecordValue.invalid;
+            data = PropertyDatabaseRecord.invalid;
             using (LockRead())
             {
                 var foundRecord = Find(recordKey, out var index);
                 if (!foundRecord)
                     return false;
 
-                var record = GetRecord(index);
-                if (!record.IsValid())
-                    return false;
-
-                data = record.recordValue;
-                return true;
+                data = GetRecord(index);
+                return data.IsValid() || loadInvalid;
             }
         }
 
-        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecord data, bool loadInvalid = false)
         {
-            var success = TryLoad(recordKey, out PropertyDatabaseRecordValue record);
+            var success = TryLoad(recordKey, out PropertyDatabaseRecord record, loadInvalid);
             data = record;
             return success;
         }
 
-        public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records)
+        public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records, bool loadInvalid = false)
         {
             records = null;
             using (LockRead())
             {
-                if (m_Fs == null)
-                    return false;
-                var binarySearchRange = PropertyDatabaseRecordFinder.FindRange(this, documentKey);
+                var binarySearchRange = FindRange(documentKey);
                 if (binarySearchRange == BinarySearchRange.invalid)
                     return false;
 
@@ -850,7 +1037,7 @@ public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord>
                 for (var i = binarySearchRange.startOffset; i < binarySearchRange.endOffset; ++i)
                 {
                     var record = GetRecord(i);
-                    if (record.IsValid())
+                    if (record.IsValid() || loadInvalid)
                         result.Add(record);
                 }
 
@@ -863,9 +1050,7 @@ public void Invalidate(ulong documentKey, bool sync)
         {
             using (LockUpgradeableRead())
             {
-                if (m_Fs == null)
-                    return;
-                var binarySearchRange = PropertyDatabaseRecordFinder.FindRange(this, documentKey);
+                var binarySearchRange = FindRange(documentKey);
                 if (binarySearchRange == BinarySearchRange.invalid)
                     return;
 
@@ -873,12 +1058,18 @@ public void Invalidate(ulong documentKey, bool sync)
             }
         }
 
+        public void InvalidateInMemory(ulong documentKey, bool sync)
+        {
+            using (LockWrite())
+            {
+                m_InvalidatedDocumentKeys.Add(documentKey);
+            }
+        }
+
         public void Invalidate(in PropertyDatabaseRecordKey recordKey, bool sync)
         {
             using (LockUpgradeableRead())
             {
-                if (m_Fs == null)
-                    return;
                 var foundRecord = Find(recordKey, out var index);
                 if (!foundRecord)
                     return;
@@ -892,13 +1083,25 @@ public void Invalidate(in PropertyDatabaseRecordKey recordKey, bool sync)
             }
         }
 
+        public void InvalidateInMemory(PropertyDatabaseMemoryStoreView memoryView, in PropertyDatabaseRecordKey recordKey, bool sync)
+        {
+            using (LockRead())
+            {
+                var foundRecord = Find(recordKey, out var index);
+                if (!foundRecord)
+                    return;
+
+                var record = GetRecord(index);
+                var newRecord = new PropertyDatabaseRecord(record.recordKey, record.recordValue, false);
+                memoryView.Store(newRecord, sync);
+            }
+        }
+
         public void Invalidate(uint documentKeyHiWord, bool sync)
         {
             using (LockUpgradeableRead())
             {
-                if (m_Fs == null)
-                    return;
-                var binarySearchRange = PropertyDatabaseRecordFinder.FindHiWordRange(this, documentKeyHiWord);
+                var binarySearchRange = FindRange(documentKeyHiWord);
                 if (binarySearchRange == BinarySearchRange.invalid)
                     return;
 
@@ -906,13 +1109,19 @@ public void Invalidate(uint documentKeyHiWord, bool sync)
             }
         }
 
+        public void InvalidateInMemory(uint documentKeyHiWord, bool sync)
+        {
+            using (LockWrite())
+            {
+                m_InvalidatedDocumentKeyHiWords.Add(documentKeyHiWord);
+            }
+        }
+
         public void InvalidateMask(ulong documentKeyMask, bool sync)
         {
             using (LockUpgradeableRead())
             {
-                if (m_Fs == null)
-                    return;
-                var binarySearchRange = PropertyDatabaseRecordFinder.FindMaskRange(this, documentKeyMask);
+                var binarySearchRange = FindMaskRange(documentKeyMask);
                 if (binarySearchRange == BinarySearchRange.invalid)
                     return;
 
@@ -920,28 +1129,44 @@ public void InvalidateMask(ulong documentKeyMask, bool sync)
             }
         }
 
+        public void InvalidateMaskInMemory(ulong documentKeyMask, bool sync)
+        {
+            using (LockRead())
+            {
+                m_InvalidatedDocumentKeyMasks.Add(documentKeyMask);
+            }
+        }
+
         public void InvalidateMask(uint documentKeyHiWordMask, bool sync)
         {
             var documentKeyMask = PropertyDatabaseDocumentKeyHiWordRange.GetULongFromHiWord(documentKeyHiWordMask);
             InvalidateMask(documentKeyMask, sync);
         }
 
-        public IEnumerable<IPropertyDatabaseRecord> EnumerateAll()
+        public void InvalidateMaskInMemory(uint documentKeyHiWordMask, bool sync)
+        {
+            var documentKeyMask = PropertyDatabaseDocumentKeyHiWordRange.GetULongFromHiWord(documentKeyHiWordMask);
+            InvalidateMaskInMemory(documentKeyMask, sync);
+        }
+
+        public IEnumerable<IPropertyDatabaseRecord> EnumerateAll(bool enumerateInvalid = false)
+        {
+            return EnumerateAllSerializableRecords(enumerateInvalid).Cast<IPropertyDatabaseRecord>();
+        }
+
+        public IEnumerable<PropertyDatabaseRecord> EnumerateAllSerializableRecords(bool enumerateInvalid = false)
         {
             using (LockRead())
             {
                 if (m_Fs == null)
-                    return Enumerable.Empty<IPropertyDatabaseRecord>();
+                    yield break;
 
-                var allRecords = new List<IPropertyDatabaseRecord>((int)length);
                 for (var i = 0; i < length; ++i)
                 {
                     var record = GetRecord(i);
-                    if (record.IsValid())
-                        allRecords.Add(record);
+                    if (record.IsValid() || enumerateInvalid)
+                        yield return record;
                 }
-
-                return allRecords;
             }
         }
 
@@ -955,12 +1180,16 @@ public void Clear()
                 m_Fs.Seek(0, SeekOrigin.Begin);
                 m_Bw.Write(PropertyDatabase.version);
                 m_Fs.Flush(true);
+                m_Store.ClearInvalidatedDocuments();
                 m_Store.NotifyFileStoreChanged();
             }
         }
 
         public void Sync()
         {
+            if (!m_NeedsSync)
+                return;
+            m_NeedsSync = false;
             using (LockWrite())
             {
                 if (m_Fs == null)
@@ -971,6 +1200,9 @@ public void Sync()
 
         public bool Find(in PropertyDatabaseRecordKey recordKey, out long index)
         {
+            index = -1;
+            if (m_Fs == null)
+                return false;
             using (LockRead())
                 return PropertyDatabaseRecordFinder.Find(this, recordKey, out index);
         }
@@ -990,32 +1222,13 @@ public IDisposable LockWrite()
             return m_Store.LockWrite();
         }
 
-        public PropertyDatabaseMemoryStore ToMemoryStore()
-        {
-            using (LockRead())
-            {
-                if (length == 0)
-                    return new PropertyDatabaseMemoryStore();
-
-                var localStore = new List<PropertyDatabaseRecord>((int)length);
-
-                for (var i = 0; i < length; ++i)
-                {
-                    m_Fs.Seek(GetFileOffset(i), SeekOrigin.Begin);
-                    var record = PropertyDatabaseRecord.FromBinary(m_Br);
-                    localStore.Add(record);
-                }
-
-                return new PropertyDatabaseMemoryStore(localStore);
-            }
-        }
-
         public long length { get; private set; }
         public long byteSize => length * PropertyDatabaseRecord.size + sizeof(int);
 
         public PropertyDatabaseRecordKey this[long index] => GetRecordKey(index);
 
-        PropertyDatabaseRecord IPropertyDatabaseStoreView.this[long index] => GetRecord(index);
+        IPropertyDatabaseRecord IPropertyDatabaseStoreView.this[long index] => GetRecord(index);
+        PropertyDatabaseRecord IPropertyDatabaseSerializableStoreView.this[long index] => GetRecord(index);
 
         void OpenFileStream(string path)
         {
@@ -1061,7 +1274,8 @@ PropertyDatabaseRecord GetRecord(long index)
 
             var fileOffset = GetFileOffset((int)index);
             m_Fs.Seek(fileOffset, SeekOrigin.Begin);
-            return PropertyDatabaseRecord.FromBinary(m_Br);
+            var record = PropertyDatabaseRecord.FromBinary(m_Br);
+            return IsRecordKeyValid(record.recordKey) ? record : new PropertyDatabaseRecord(record.recordKey, record.recordValue, false);
         }
 
         PropertyDatabaseRecordKey GetRecordKey(long index)
@@ -1076,7 +1290,20 @@ PropertyDatabaseRecordKey GetRecordKey(long index)
             return PropertyDatabaseRecordKey.FromBinary(m_Br);
         }
 
-        void WriteRecord(in PropertyDatabaseRecord record, long index, bool flush = true)
+        bool IsRecordKeyValid(PropertyDatabaseRecordKey recordKey)
+        {
+            var documentKey = recordKey.documentKey;
+            if (m_InvalidatedDocumentKeys.Contains(documentKey))
+                return false;
+            var documentKeyHiWord = PropertyDatabaseDocumentKeyHiWordRange.ToHiWord(documentKey);
+            if (m_InvalidatedDocumentKeyHiWords.Contains(documentKeyHiWord))
+                return false;
+            if (m_InvalidatedDocumentKeyMasks.Any(mask => PropertyDatabaseDocumentKeyMaskRange.DocumentKeyMatchesMask(documentKey, mask)))
+                return false;
+            return true;
+        }
+
+        void WriteRecord(in PropertyDatabaseRecord record, long index, bool sync = true)
         {
             if (m_Fs == null)
                 return;
@@ -1086,9 +1313,10 @@ void WriteRecord(in PropertyDatabaseRecord record, long index, bool flush = true
             var fileOffset = GetFileOffset((int)index);
             m_Bw.Seek(fileOffset, SeekOrigin.Begin);
             record.ToBinary(m_Bw);
+            m_NeedsSync = true;
 
-            if (flush)
-                m_Fs.Flush(true);
+            if (sync)
+                Sync();
         }
 
         int GetFileOffset(int recordIndex)
@@ -1118,7 +1346,7 @@ void InvalidateMaskRange(BinarySearchRange binarySearchRange, ulong documentKeyM
                 for (var i = binarySearchRange.startOffset; i < binarySearchRange.endOffset; ++i)
                 {
                     var record = GetRecord(i);
-                    if ((record.key.documentKey & documentKeyMask) != 0)
+                    if (PropertyDatabaseDocumentKeyMaskRange.KeyMatchesMask(record.key, documentKeyMask))
                     {
                         var newRecord = new PropertyDatabaseRecord(record.recordKey, record.recordValue, false);
                         WriteRecord(newRecord, i, false);
@@ -1128,6 +1356,49 @@ void InvalidateMaskRange(BinarySearchRange binarySearchRange, ulong documentKeyM
                     Sync();
             }
         }
+
+        public IEnumerable<PropertyDatabaseRecord> EnumerateRange(BinarySearchRange range)
+        {
+            using (LockRead())
+            {
+                for (var i = range.startOffset; i < range.endOffset; ++i)
+                    yield return GetRecord(i);
+            }
+        }
+
+        public IEnumerable<PropertyDatabaseRecord> EnumerateMaskRange(BinarySearchRange range, ulong documentKeyMask)
+        {
+            using (LockRead())
+            {
+                for (var i = range.startOffset; i < range.endOffset; ++i)
+                {
+                    var record = GetRecord(i);
+                    if (PropertyDatabaseDocumentKeyMaskRange.KeyMatchesMask(record.key, documentKeyMask))
+                        yield return record;
+                }
+            }
+        }
+
+        public BinarySearchRange FindRange(ulong documentKey)
+        {
+            return m_Fs == null ? BinarySearchRange.invalid : PropertyDatabaseRecordFinder.FindRange(this, documentKey);
+        }
+
+        public BinarySearchRange FindRange(uint documentKeyHiWord)
+        {
+            return m_Fs == null ? BinarySearchRange.invalid : PropertyDatabaseRecordFinder.FindHiWordRange(this, documentKeyHiWord);
+        }
+
+        public BinarySearchRange FindMaskRange(ulong documentKeyMask)
+        {
+            return m_Fs == null ? BinarySearchRange.invalid : PropertyDatabaseRecordFinder.FindMaskRange(this, documentKeyMask);
+        }
+
+        public BinarySearchRange FindMaskRange(uint documentKeyHiWordMask)
+        {
+            var documentKeyMask = PropertyDatabaseDocumentKeyHiWordRange.GetULongFromHiWord(documentKeyHiWordMask);
+            return FindMaskRange(documentKeyMask);
+        }
     }
 
     struct PropertyDatabaseVolatileRecordValue : IPropertyDatabaseRecordValue
@@ -1155,6 +1426,8 @@ public PropertyDatabaseVolatileRecordValue(object value)
 
         public static int size => PropertyDatabaseRecordKey.size + sizeof(bool) + PropertyDatabaseVolatileRecordValue.size;
 
+        public static PropertyDatabaseVolatileRecord invalid => new();
+
         public PropertyDatabaseVolatileRecord(in PropertyDatabaseRecordKey key, object value)
         {
             this.recordKey = key;
@@ -1170,8 +1443,20 @@ public PropertyDatabaseVolatileRecord(in PropertyDatabaseRecordKey key, object v
         }
     }
 
-    class PropertyDatabaseVolatileMemoryStore : BasePropertyDatabaseMemoryStore<PropertyDatabaseVolatileRecord>, IPropertyDatabaseVolatileStore
+    class PropertyDatabaseVolatileMemoryStore : BasePropertyDatabaseStore, IPropertyDatabaseVolatileStore
     {
+        protected MemoryDataStore<PropertyDatabaseVolatileRecord> m_Store;
+
+        public PropertyDatabaseVolatileMemoryStore()
+        {
+            m_Store = new MemoryDataStore<PropertyDatabaseVolatileRecord>();
+        }
+
+        public PropertyDatabaseVolatileMemoryStore(IEnumerable<PropertyDatabaseVolatileRecord> initialStore)
+        {
+            m_Store = new MemoryDataStore<PropertyDatabaseVolatileRecord>(initialStore);
+        }
+
         public override IPropertyDatabaseStoreView GetView()
         {
             return new PropertyDatabaseVolatileMemoryStoreView(this, m_Store);
@@ -1183,10 +1468,10 @@ public bool Store(in PropertyDatabaseRecordKey recordKey, object value)
                 return view.Store(recordKey, value, true);
         }
 
-        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data, bool loadInvalid = false)
         {
             using (var view = (PropertyDatabaseVolatileMemoryStoreView)GetView())
-                return view.TryLoad(recordKey, out data);
+                return view.TryLoad(recordKey, out data, loadInvalid);
         }
     }
 
@@ -1194,12 +1479,12 @@ struct PropertyDatabaseVolatileMemoryStoreView : IPropertyDatabaseVolatileStoreV
     {
         bool m_Disposed;
         PropertyDatabaseVolatileMemoryStore m_VolatileStore;
-        List<PropertyDatabaseVolatileRecord> m_StoreData;
+        MemoryDataStore<PropertyDatabaseVolatileRecord> m_MemoryDataStore;
 
-        public PropertyDatabaseVolatileMemoryStoreView(PropertyDatabaseVolatileMemoryStore volatileStore, List<PropertyDatabaseVolatileRecord> storeData)
+        public PropertyDatabaseVolatileMemoryStoreView(PropertyDatabaseVolatileMemoryStore volatileStore, MemoryDataStore<PropertyDatabaseVolatileRecord> memoryDataStore)
         {
             m_VolatileStore = volatileStore;
-            m_StoreData = storeData;
+            m_MemoryDataStore = memoryDataStore;
             m_Disposed = false;
         }
 
@@ -1209,7 +1494,7 @@ public void Dispose()
                 return;
 
             m_VolatileStore = null;
-            m_StoreData = null;
+            m_MemoryDataStore = null;
             m_Disposed = true;
         }
 
@@ -1228,32 +1513,32 @@ public IDisposable LockWrite()
             return m_VolatileStore.LockWrite();
         }
 
-        public long length => m_StoreData.Count;
+        public long length => m_MemoryDataStore.Count;
 
         public long byteSize => length * PropertyDatabaseVolatileRecord.size;
 
-        PropertyDatabaseRecordKey IBinarySearchRangeData<PropertyDatabaseRecordKey>.this[long index] => m_StoreData[(int)index].key;
+        PropertyDatabaseRecordKey IBinarySearchRangeData<PropertyDatabaseRecordKey>.this[long index] => m_MemoryDataStore[(int)index].key;
 
-        public PropertyDatabaseRecord this[long index] => throw new NotSupportedException();
+        public IPropertyDatabaseRecord this[long index] => throw new NotSupportedException();
 
         public bool Store(in PropertyDatabaseRecord record, bool sync)
         {
             throw new NotSupportedException();
         }
 
-        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecord data, bool loadInvalid = false)
         {
             throw new NotSupportedException();
         }
 
-        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecord data, bool loadInvalid = false)
         {
-            var success = TryLoad(recordKey, out PropertyDatabaseVolatileRecordValue record);
+            var success = TryLoad(recordKey, out PropertyDatabaseVolatileRecord record, loadInvalid);
             data = record;
             return success;
         }
 
-        public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records)
+        public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records, bool loadInvalid = false)
         {
             records = null;
             using (LockRead())
@@ -1265,8 +1550,8 @@ public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord>
                 var result = new List<IPropertyDatabaseRecord>();
                 for (var i = binarySearchRange.startOffset; i < binarySearchRange.endOffset; ++i)
                 {
-                    var record = m_StoreData[(int)i];
-                    if (record.valid)
+                    var record = m_MemoryDataStore[(int)i];
+                    if (record.validRecord || loadInvalid)
                         result.Add(record);
                 }
 
@@ -1297,9 +1582,9 @@ public void Invalidate(in PropertyDatabaseRecordKey recordKey, bool sync)
 
                 using (LockWrite())
                 {
-                    var record = m_StoreData[(int)index];
+                    var record = m_MemoryDataStore[(int)index];
                     var newRecord = new PropertyDatabaseVolatileRecord(record.key, record.recordValue.value, false);
-                    m_StoreData[(int)index] = newRecord;
+                    m_MemoryDataStore[(int)index] = newRecord;
                 }
             }
         }
@@ -1334,18 +1619,18 @@ public void InvalidateMask(uint documentKeyHiWordMask, bool sync)
             InvalidateMask(documentKeyMask, sync);
         }
 
-        public IEnumerable<IPropertyDatabaseRecord> EnumerateAll()
+        public IEnumerable<IPropertyDatabaseRecord> EnumerateAll(bool enumerateInvalid = false)
         {
             using (LockRead())
             {
-                return m_StoreData.Where(p => p.valid).Cast<IPropertyDatabaseRecord>().ToList();
+                return m_MemoryDataStore.Where(p => p.valid || enumerateInvalid).Cast<IPropertyDatabaseRecord>().ToList();
             }
         }
 
         public void Clear()
         {
             using (LockWrite())
-                m_StoreData.Clear();
+                m_MemoryDataStore.Clear();
         }
 
         public void Sync()
@@ -1368,36 +1653,32 @@ public bool Store(in PropertyDatabaseRecordKey recordKey, object value, bool syn
                 using (LockWrite())
                 {
                     if (insert)
-                        m_StoreData.Insert((int)index, newRecord);
+                        m_MemoryDataStore.Insert((int)index, newRecord);
                     else
-                        m_StoreData[(int)index] = newRecord;
+                        m_MemoryDataStore[(int)index] = newRecord;
                     return true;
                 }
             }
         }
 
-        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data, bool loadInvalid = false)
         {
-            var success = TryLoad(recordKey, out PropertyDatabaseVolatileRecordValue record);
-            data = record.value;
+            var success = TryLoad(recordKey, out PropertyDatabaseVolatileRecord record, loadInvalid);
+            data = record.recordValue.value;
             return success;
         }
 
-        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseVolatileRecordValue data)
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseVolatileRecord data, bool loadInvalid = false)
         {
-            data = new PropertyDatabaseVolatileRecordValue();
+            data = PropertyDatabaseVolatileRecord.invalid;
             using (LockRead())
             {
                 var foundRecord = Find(recordKey, out var index);
                 if (!foundRecord)
                     return false;
 
-                var record = m_StoreData[(int)index];
-                if (!record.valid)
-                    return false;
-
-                data = record.recordValue;
-                return true;
+                data = m_MemoryDataStore[(int)index];
+                return data.valid || loadInvalid;
             }
         }
 
@@ -1407,9 +1688,9 @@ void InvalidateRange(BinarySearchRange binarySearchRange)
             {
                 for (var i = binarySearchRange.startOffset; i < binarySearchRange.endOffset; ++i)
                 {
-                    var record = m_StoreData[(int)i];
+                    var record = m_MemoryDataStore[(int)i];
                     var newRecord = new PropertyDatabaseVolatileRecord(record.key, record.recordValue.value, false);
-                    m_StoreData[(int)i] = newRecord;
+                    m_MemoryDataStore[(int)i] = newRecord;
                 }
             }
         }
@@ -1420,11 +1701,11 @@ void InvalidateMaskRange(BinarySearchRange binarySearchRange, ulong documentKeyM
             {
                 for (var i = binarySearchRange.startOffset; i < binarySearchRange.endOffset; ++i)
                 {
-                    var record = m_StoreData[(int)i];
-                    if ((record.key.documentKey & documentKeyMask) != 0)
+                    var record = m_MemoryDataStore[(int)i];
+                    if (PropertyDatabaseDocumentKeyMaskRange.KeyMatchesMask(record.key, documentKeyMask))
                     {
                         var newRecord = new PropertyDatabaseVolatileRecord(record.key, record.recordValue.value, false);
-                        m_StoreData[(int)i] = newRecord;
+                        m_MemoryDataStore[(int)i] = newRecord;
                     }
                 }
             }
diff --git a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyStringTable.cs b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyStringTable.cs
index 2edb21565f..0674add93a 100644
--- a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyStringTable.cs
+++ b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyStringTable.cs
@@ -201,6 +201,7 @@ class PropertyStringTableView : IDisposable, IPropertyLockable
         BinaryWriter m_Bw;
         PropertyStringTableHeader m_Header;
         PropertyStringTable m_StringTable;
+        bool m_NeedsSync;
 
         public int version
         {
@@ -513,6 +514,7 @@ public void Grow(int newStringCount)
 
                 WriteHeader(false);
 
+                m_NeedsSync = true;
                 if (!m_DelayedSync)
                     Sync();
             }
@@ -537,6 +539,8 @@ public void Clear()
                 m_Fs.Seek(0, SeekOrigin.Begin);
                 WriteHeader(false);
                 m_Fs.SetLength(newFileSize);
+
+                m_NeedsSync = true;
                 Sync();
             }
         }
@@ -605,6 +609,7 @@ void WriteHeader(bool notify)
                 m_Fs.Seek(0, SeekOrigin.Begin);
                 m_Header.ToBinary(m_Bw);
 
+                m_NeedsSync = true;
                 if (notify && !m_DelayedSync)
                     Sync();
             }
@@ -630,6 +635,7 @@ void WriteSymbol(int symbolIndex, int symbol)
             {
                 m_Fs.Seek(GetSymbolsOffset() + symbolIndex * PropertyStringTable.symbolByteSize, SeekOrigin.Begin);
                 WriteInt32(symbol);
+                m_NeedsSync = true;
             }
         }
 
@@ -647,6 +653,7 @@ void WriteStringAtSymbol(int symbolIndex, int symbol, string str, PropertyString
 
                 // Notify other views that the
                 WriteHeader(false);
+                m_NeedsSync = true;
                 if (!m_DelayedSync)
                     Sync();
             }
@@ -679,6 +686,9 @@ void FlushFile()
 
         public void Sync()
         {
+            if (!m_NeedsSync)
+                return;
+            m_NeedsSync = false;
             using (LockWrite())
             {
                 FlushFile();
diff --git a/Modules/QuickSearch/Editor/Providers/AdbProvider.cs b/Modules/QuickSearch/Editor/Providers/AdbProvider.cs
index 49cfca4f2e..c000c41090 100644
--- a/Modules/QuickSearch/Editor/Providers/AdbProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/AdbProvider.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
+using System.IO;
 
 namespace UnityEditor.Search.Providers
 {
@@ -14,7 +15,7 @@ static class AdbProvider
 
         static ObjectQueryEngine<UnityEngine.Object> m_ResourcesQueryEngine;
 
-        public static IEnumerable<string> EnumeratePaths(in string searchQuery, in Type filterType, in SearchFlags flags)
+        public static IEnumerable<int> EnumerateInstanceIDs(in string searchQuery, in Type filterType, in SearchFlags flags)
         {
             var searchFilter = new SearchFilter
             {
@@ -26,7 +27,8 @@ public static IEnumerable<string> EnumeratePaths(in string searchQuery, in Type
                 SearchUtility.ParseSearchString(searchQuery, searchFilter);
             if (filterType != null && searchFilter.classNames.Length == 0)
                 searchFilter.classNames = new[] { filterType.Name };
-            return EnumeratePaths(searchFilter);
+            searchFilter.filterByTypeIntersection = true;
+            return EnumerateInstanceIDs(searchFilter);
         }
 
 
@@ -37,24 +39,33 @@ static SearchFilter.SearchArea GetSearchArea(in SearchFlags searchFlags)
             return SearchFilter.SearchArea.InAssetsOnly;
         }
 
-        static IEnumerable<string> EnumeratePaths(SearchFilter searchFilter)
+        static IEnumerable<int> EnumerateInstanceIDs(SearchFilter searchFilter)
         {
             var rIt = AssetDatabase.EnumerateAllAssets(searchFilter);
             while (rIt.MoveNext())
             {
                 if (rIt.Current.pptrValue)
-                    yield return AssetDatabase.GetAssetPath(rIt.Current.instanceID);
+                    yield return rIt.Current.instanceID;
             }
         }
 
 
-        public static IEnumerable<string> EnumeratePaths(SearchContext context)
+        public static IEnumerable<int> EnumerateInstanceIDs(SearchContext context)
         {
             if (context.filterType == null && context.empty)
-                return Enumerable.Empty<string>();
+                return Enumerable.Empty<int>();
             if (context.userData is SearchFilter legacySearchFilter)
-                return EnumeratePaths(legacySearchFilter);
-            return EnumeratePaths(context.searchQuery, context.filterType, context.options);
+            {
+                legacySearchFilter.filterByTypeIntersection = true;
+                return EnumerateInstanceIDs(legacySearchFilter);
+            }
+            return EnumerateInstanceIDs(context.searchQuery, context.filterType, context.options);
+        }
+
+        public static IEnumerable<string> EnumeratePaths(SearchContext context)
+        {
+            foreach (var id in EnumerateInstanceIDs(context))
+                yield return AssetDatabase.GetAssetPath(id);
         }
 
         static Dictionary<string, UnityEngine.Object[]> s_BundleResourceObjects = new Dictionary<string, UnityEngine.Object[]>();
@@ -70,15 +81,39 @@ public static IEnumerable<string> EnumeratePaths(SearchContext context)
 
         static IEnumerable<SearchItem> FetchItems(SearchContext context, SearchProvider provider)
         {
-            if (context.empty && context.filterType == null)
+            if (string.IsNullOrEmpty(context.searchQuery) && context.filterType == null)
                 yield break;
 
             if (m_ResourcesQueryEngine == null)
-                m_ResourcesQueryEngine = new ObjectQueryEngine();
+            {
+                m_ResourcesQueryEngine = new ObjectQueryEngine()
+                {
+                    reportError = false
+                };
+            }
 
             // Search asset database
-            foreach (var path in EnumeratePaths(context))
-                yield return AssetProvider.CreateItem("ADB", context, provider, context.filterType, null, path, 998, SearchDocumentFlags.Asset);
+            foreach (var id in EnumerateInstanceIDs(context))
+            {
+                var path = AssetDatabase.GetAssetPath(id);
+                var gid = GlobalObjectId.GetGlobalObjectIdSlow(id).ToString();
+                string label = null;
+                var flags = SearchDocumentFlags.Asset;
+                if (AssetDatabase.IsSubAsset(id))
+                {
+                    var obj = UnityEngine.Object.FindObjectFromInstanceID(id);
+                    var filename = Path.GetFileNameWithoutExtension(path);
+                    label = obj?.name ?? filename;
+                    path = Utils.RemoveInvalidCharsFromPath($"{filename}/{label}", ' ');
+                    flags |= SearchDocumentFlags.Nested;
+                }
+                var item = AssetProvider.CreateItem("ADB", context, provider, context.filterType, gid, path, 998, flags);
+                if (label != null)
+                {
+                    item.label = label;
+                }
+                yield return item;
+            }
 
             // Search builtin resources
             var resources = GetAllResourcesAtPath("library/unity default resources")
diff --git a/Modules/QuickSearch/Editor/Providers/AssetProvider.cs b/Modules/QuickSearch/Editor/Providers/AssetProvider.cs
index 77bcb8af43..0098f98efc 100644
--- a/Modules/QuickSearch/Editor/Providers/AssetProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/AssetProvider.cs
@@ -166,7 +166,7 @@ internal static SearchProvider CreateProvider()
                 fetchLabel = (item, context) => FetchLabel(item),
                 fetchDescription = (item, context) => FetchDescription(item),
                 fetchThumbnail = (item, context) => FetchThumbnail(item),
-                fetchPreview = (item, context, size, options) => FetchPreview(item, size, options),
+                fetchPreview = (item, context, size, options) => FetchPreview(item, context, size, options),
                 startDrag = (item, context) => StartDrag(item, context),
                 trackSelection = (item, context) => EditorGUIUtility.PingObject(GetInstanceId(item)),
                 fetchPropositions = (context, options) => FetchPropositions(context, options),
@@ -187,7 +187,7 @@ private static ulong GetDocumentKey(SearchItem item)
             return GetInfo(item).guid.GetHashCode64();
         }
 
-        private static Texture2D FetchPreview(SearchItem item, Vector2 size, FetchPreviewOptions options)
+        private static Texture2D FetchPreview(SearchItem item, SearchContext context, Vector2 size, FetchPreviewOptions options)
         {
             var info = GetInfo(item);
             if (info.gid.assetGUID == default)
@@ -199,23 +199,26 @@ private static Texture2D FetchPreview(SearchItem item, Vector2 size, FetchPrevie
             if (info.gid.identifierType == (int)IdentifierType.kSceneObject)
                 return AssetDatabase.GetCachedIcon(info.source) as Texture2D;
 
+            var objInstanceId = info.obj ? info.obj.GetInstanceID() : 0;
+            var clientId = context.searchView != null ? context.searchView.GetViewId() : 0;
+
             if (info.gid.identifierType == (int)IdentifierType.kBuiltInAsset)
-                return AssetPreview.GetAssetPreview(info.obj) ?? AssetPreview.GetMiniThumbnail(info.obj);
+                return AssetPreview.GetAssetPreview(objInstanceId, clientId) ?? AssetPreview.GetMiniThumbnail(info.obj);
 
             var obj = GlobalObjectId.GlobalObjectIdentifierToObjectSlow(info.gid);
             if (obj is GameObject go)
-                return Utils.GetSceneObjectPreview(go, size, options, item.thumbnail);
+                return Utils.GetSceneObjectPreview(context, go, size, options, item.thumbnail);
             else if (obj && options.HasAny(FetchPreviewOptions.Normal))
             {
-                var p = AssetPreview.GetAssetPreview(obj);
+                var p = AssetPreview.GetAssetPreview(obj.GetInstanceID(), clientId);
                 if (p)
                     return p;
 
-                if (AssetPreview.IsLoadingAssetPreview(obj.GetInstanceID()))
+                if (AssetPreview.IsLoadingAssetPreview(obj.GetInstanceID(), clientId))
                     return null;
             }
 
-            return Utils.GetAssetPreviewFromPath(info.source, size, options);
+            return Utils.GetAssetPreviewFromPath(context, info.source, size, options);
         }
 
         private static Texture2D FetchThumbnail(in SearchItem item)
@@ -381,8 +384,16 @@ private static IEnumerable<SearchProposition> FetchPropositions(SearchContext co
                 .Select(kw => new SearchProposition(category: null, label: kw));
         }
 
+        static string[] s_DefaultFilters = new[] { "t", "a", "l", "prefab", "b", "is", "tag", "dir", "size", "ext", "age", "name", "ref", "tagstring" };
+        private static IEnumerable<string> PopulateDefaultFilters()
+        {
+            return s_DefaultFilters;
+        }
+
         private static IEnumerable<SearchProposition> FetchQueryBuilderPropositions()
         {
+            foreach (var p in QueryAndOrBlock.BuiltInQueryBuilderPropositions())
+                yield return p;
             foreach (var p in SearchUtils.FetchTypePropositions<Object>())
                 yield return p;
             foreach (var p in FetchIndexPropositions())
@@ -390,10 +401,8 @@ private static IEnumerable<SearchProposition> FetchQueryBuilderPropositions()
 
             foreach (var l in QueryListBlockAttribute.GetPropositions(typeof(QueryLabelBlock)))
                 yield return l;
-
             foreach (var l in QueryListBlockAttribute.GetPropositions(typeof(QueryPrefabFilterBlock)))
                 yield return l;
-
             foreach (var f in QueryListBlockAttribute.GetPropositions(typeof(QueryBundleFilterBlock)))
                 yield return f;
 
@@ -429,7 +438,7 @@ private static IEnumerable<SearchProposition> FetchIndexPropositions()
                     Dispatcher.ProcessOne();
 
                 yield return new SearchProposition(
-                    category: "Area",
+                    category: "Area (Index)",
                     label: db.name,
                     replacement: $"a:{db.name}",
                     help: $"Search assets index by {db.name}.index",
@@ -544,10 +553,12 @@ private static IEnumerator SearchIndexes(string searchQuery, SearchContext conte
             }
 
             var index = db.index;
+            index.fetchDefaultFiler = PopulateDefaultFilters;
             var results = new System.Collections.Concurrent.ConcurrentBag<SearchResult>();
             var searchTask = System.Threading.Tasks.Task.Run(() =>
             {
                 // Search index
+                using var immutableScope = db.GetImmutableScope();
                 foreach (var r in index.Search(searchQuery.ToLowerInvariant(), context, provider))
                     results.Add(r);
             }, context.sessions.cancelToken);
diff --git a/Modules/QuickSearch/Editor/Providers/AssetStoreProvider.cs b/Modules/QuickSearch/Editor/Providers/AssetStoreProvider.cs
index d187521d45..caf680ba4e 100644
--- a/Modules/QuickSearch/Editor/Providers/AssetStoreProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/AssetStoreProvider.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+// #define QUICK_SEARCH_STORE
 using System.Collections.Generic;
 using UnityEngine;
 using System;
@@ -10,12 +11,124 @@
 using System.Linq;
 using Debug = UnityEngine.Debug;
 using UnityEditor.Connect;
+using System.Globalization;
 
 namespace UnityEditor.Search.Providers
 {
     static class AssetStoreProvider
     {
-        #pragma warning disable CS0649
+#pragma warning disable CS0649
+        class AssetDocumentWrapper : UnityEngine.ScriptableObject
+        {
+            public SearchItem item;
+        }
+
+        [CustomEditor(typeof(AssetDocumentWrapper))]
+        class AssetDocumentWrapperEditor : UnityEditor.Editor
+        {
+
+            static class Styles
+            {
+                static Styles()
+                {
+                    SetupMargin(label);
+                    SetupMargin(nameLabel);
+                    SetupMargin(linkButton);
+                    SetupMargin(separator);
+                    SetupMargin(button);
+                }
+
+                public static GUIStyle label = new GUIStyle("label")
+                {
+                    richText = true,
+                    wordWrap = true,
+                };
+
+                public static GUIStyle nameLabel = new GUIStyle(label)
+                {
+                    fontSize = label.fontSize + 2
+                };
+
+                public static GUIStyle separator = new GUIStyle("AnimLeftPaneSeparator");
+
+                public static GUIStyle linkButton = new GUIStyle(EditorStyles.linkLabel);
+                public static GUIStyle button = new GUIStyle(GUI.skin.button);
+
+                public static GUIContent viewMyAsset = new GUIContent(L10n.Tr("View in My Assets"));
+                public static GUIContent addToMyAsset = new GUIContent(L10n.Tr("Add to My Assets"));
+                public static GUIContent viewOnWeb = new GUIContent(L10n.Tr("View on Web"));
+                public static GUIContent eula = new GUIContent(L10n.Tr("Standard Unity Asset Store EULA"));
+
+                static void SetupMargin(GUIStyle style)
+                {
+                    style.margin = new RectOffset(8, 8, style.margin.top, style.margin.bottom);
+                }
+            }
+
+
+            private void OnEnable()
+            {
+            }
+
+            public override bool UseDefaultMargins()
+            {
+                return false;
+            }
+
+            public override void OnInspectorGUI()
+            {
+                var wrapper = (AssetDocumentWrapper)target;
+                var item = wrapper.item;
+                var desc = (AssetDocument)item.data;
+                if (desc != null)
+                {
+                    GUILayout.Label($"<b>{desc.name_en_US}</b>", Styles.nameLabel);
+                    GUILayout.Label($"by {desc.publisher}", Styles.label);
+                    var isOwned = IsItemOwned(item);
+                    var price = GetPrice(desc);
+                    string priceStr;
+                    if (isOwned)
+                        priceStr = "Owned";
+                    else if (price == 0)
+                        priceStr = "Free";
+                    else
+                        priceStr = $"{currencySymbol}{price} ({currency})";
+                    GUILayout.Label(priceStr, Styles.label);
+                    var lastRect = GUILayoutUtility.GetLastRect();
+                    if (desc.productDetail != null && !string.IsNullOrEmpty(desc.productDetail.elevatorPitch))
+                        GUILayout.Label(desc.productDetail.elevatorPitch, Styles.label);
+
+                    GUILayout.Space(10);
+                    var sepRect = GUILayoutUtility.GetRect(lastRect.width, lastRect.height);
+                    if (Event.current.type == EventType.Repaint)
+                    {
+                        Styles.separator.Draw(sepRect, false, false, false, false);
+                    }
+                    GUILayout.Space(15);
+
+                    if (isOwned)
+                    {
+                        if (GUILayout.Button(Styles.viewMyAsset, Styles.button))
+                            OpenPackageManager(item);
+                    }
+                    if (GUILayout.Button(Styles.viewOnWeb, Styles.button))
+                    {
+                        BrowseAssetStoreItem(item);
+                    }
+
+                    if (GUILayout.Button(Styles.eula, Styles.linkButton))
+                    {
+                        Application.OpenURL("https://unity.com/legal/as-terms");
+                    }
+                }
+                else
+                {
+                    EditorGUILayout.LabelField($"Name", item.label);
+                }
+
+            }
+        }
+
         [Serializable]
         class StoreSearchRequest
         {
@@ -50,23 +163,24 @@ class AssetDocument
             public string id;
             public string name_en_US;
             public float price_USD;
+            public float price_EUR;
             public string publisher;
             public string[] icon;
             public string url;
             public string category_slug;
-            // public string type;
+            public string type;
             // public string name_ja-JP;
             // public string name_ko-KR;
             // public string name_zh-CN;
-            // public int avg_rating;
+            public int avg_rating;
             // public int ratings;
             // public int publisher_id;
-            // public string on_sale;
+            public string on_sale;
             // public string plus_pro;
             public string[] key_images;
             // public float original_price_USD;
             // public float original_price_EUR;
-            // public int age;
+            public int age;
             // public string new;
             // public string partner;
 
@@ -159,6 +273,11 @@ class PurchaseDetailMainImage
             public string small;
             public string url;
             public string facebook;
+
+            public override string ToString()
+            {
+                return $"{big} - {icon} - {small}";
+            }
         }
 
         [Serializable]
@@ -173,7 +292,6 @@ class PurchaseDetail
             public PurchaseDetailMainImage mainImage;
         }
 
-
         [Serializable]
         class ProductListResponse
         {
@@ -188,6 +306,11 @@ class ImageDesc
             public string imageUrl;
             public string thumbnailUrl;
             public string type;
+
+            public override string ToString()
+            {
+                return $"{type} - ({width},{height})";
+            }
         }
 
         [Serializable]
@@ -196,10 +319,49 @@ class ProductDetails
             // public string id;
             // public string packageId;
             // public string slug;
+            public string displayName;
+            public string description;
+            public string elevatorPitch;
+            public string keyFeatures;
             public PurchaseDetailMainImage mainImage;
             public ImageDesc[] images;
+
+            public override string ToString()
+            {
+                return displayName;
+            }
+        }
+
+        const string k_OpenBrowserFromToolbar = "unity-editor-toolbar";
+        const string k_OpenBrowserFromSearch = "unity-editor-search";
+
+        struct QueryValue
+        {
+            public QueryValue(string displayName, string queryToken = null, object value = null, object value2 = null)
+            {
+                this.displayName = displayName;
+                if (queryToken != null)
+                {
+                    this.queryToken = queryToken.ToLowerInvariant();
+                }
+                else
+                {
+                    this.queryToken = displayName.Replace(" ", "-").ToLowerInvariant();
+                }
+                this.value = value ?? this.queryToken;
+                this.value2 = value2;
+            }
+
+            public string displayName;
+            public string queryToken;
+            public object value;
+            public object value2;
+
+            public override string ToString()
+            {
+                return $"{displayName} - {queryToken}";
+            }
         }
-        #pragma warning restore CS0649
 
         class PreviewData
         {
@@ -208,30 +370,58 @@ class PreviewData
             public UnityWebRequestAsyncOperation requestOp;
         }
 
-        enum QueryParamType
+        class AssetsLoadingPage : IComparable<AssetsLoadingPage>
         {
-            kString,
-            kFloat,
-            kBoolean,
-            kStringArray,
-            kInteger
+            public AssetsLoadingPage(int startIndex, int endIndex)
+            {
+                this.startIndex = startIndex;
+                this.endIndex = endIndex;
+                items = new List<SearchItem>(size);
+            }
+
+            public List<SearchItem> items;
+            public int startIndex;
+            public int endIndex;
+            public int size => endIndex - startIndex;
+            public UnityWebRequest request;
+            public bool isLoaded;
+
+            public int CompareTo(AssetsLoadingPage other)
+            {
+                return startIndex.CompareTo(other.startIndex);
+            }
         }
 
-        class QueryParam
+        class QueryDescriptor
         {
-            public QueryParamType type;
-            public string name;
-            public string keyword;
-            public string queryName;
-
-            public QueryParam(QueryParamType type, string name, string queryName = null)
+            public QueryDescriptor()
             {
-                this.type = type;
-                this.name = name;
-                keyword = name + ":";
-                this.queryName = queryName ?? name;
+                max_price = min_price = 0;
+                publisher = "";
+                unity_version = "2022";
+                free = false;
+                on_sale = false;
+                category = "";
+                min_rating = 0;
+                release = ReleaseDate.OneYearAgo;
+                platform = "ios";
+                sort = SortOrder.Relevance;
+                currency = 0; // 1: Euro
             }
+            public float min_price;
+            public float max_price;
+            public string publisher;
+            public string unity_version;
+            public bool free;
+            public bool on_sale;
+            public string category;
+            public int min_rating;
+            public int currency;
+            public ReleaseDate release;
+            public string platform;
+            public SortOrder sort;
         }
+#pragma warning restore CS0649
 
         private const string kSearchEndPoint = "https://assetstore.unity.com/api/search";
         private const string kProductDetailsEndPoint = "https://api.unity.com/v1/products/list";
@@ -245,40 +435,289 @@ public QueryParam(QueryParamType type, string name, string queryName = null)
         private static AccessToken s_AccessTokenData;
         private static TokenInfo s_TokenInfo;
         private static UserInfo s_UserInfo;
+        const string k_MultiValueQueryParameter = "multivalue";
+        private static QueryEngine<QueryDescriptor> s_QueryEngine;
+        private static List<AssetsLoadingPage> s_AssetsPage;
+        private static Dictionary<string, object> s_QueryParams;
+        private static ISearchView s_CurrentSearchView;
+        const int kAssetsPerPage = 100;
+
+        private static readonly HashSet<string> k_EuroCountries = new HashSet<string>(new[] { "AT", "BE", "ES", "FI", "FR", "DE", "GR", "IE", "IT", "LV", "LT", "LU", "MT", "NL", "PT", "SK", "SI", "ES", "BG", "HR", "CZ", "HU", "PL", "RO", "SE" });
 
-        private static readonly List<QueryParam> k_QueryParams = new List<QueryParam>
-        {
-            new QueryParam(QueryParamType.kFloat, "min_price"),
-            new QueryParam(QueryParamType.kFloat, "max_price"),
-            new QueryParam(QueryParamType.kStringArray, "publisher"),
-            new QueryParam(QueryParamType.kString, "version", "unity_version"),
-            new QueryParam(QueryParamType.kBoolean, "free"),
-            new QueryParam(QueryParamType.kBoolean, "on_sale"),
-            new QueryParam(QueryParamType.kBoolean, "plus_pro_sale"),
-            new QueryParam(QueryParamType.kStringArray, "category"),
-            new QueryParam(QueryParamType.kInteger, "min_rating"),
-            new QueryParam(QueryParamType.kInteger, "sort"),
-            new QueryParam(QueryParamType.kBoolean, "reverse"),
-            new QueryParam(QueryParamType.kInteger, "start"),
-            new QueryParam(QueryParamType.kInteger, "rows"),
-            new QueryParam(QueryParamType.kString, "lang"),
+        static QueryValue[] k_Categories =
+        {
+            new QueryValue("3D/All 3D", "3d"),
+            new QueryValue("3D/Animations"),
+            new QueryValue("3D/Characters"),
+            new QueryValue("3D/Environments"),
+            new QueryValue("3D/GUI"),
+            new QueryValue("3D/Props"),
+            new QueryValue("3D/Vegetation"),
+            new QueryValue("3D/Vehicules"),
+            new QueryValue("2D/All 2D", "2d"),
+            new QueryValue("2D/Characters"),
+            new QueryValue("2D/Environments"),
+            new QueryValue("2D/Fonts"),
+            new QueryValue("2D/GUI"),
+            new QueryValue("2D/Textures & materials", "2d/textures-materials"),
+            new QueryValue("Add Ons/All Add Ons", "Add Ons"),
+            new QueryValue("Add Ons/Machine Learning", "add-ons/machinelearning"),
+            new QueryValue("Add Ons/Services"),
+            new QueryValue("Audio/All Audio", "Audio"),
+            new QueryValue("Audio/Ambient"),
+            new QueryValue("Audio/Music"),
+            new QueryValue("Audio/Sound FX"),
+            new QueryValue("Essentials/All Essentials", "Essentials"),
+            new QueryValue("Essentials/Asset Packs"),
+            new QueryValue("Essentials/Tutorial Projects"),
+            new QueryValue("Templates"),
+            new QueryValue("Tools"),
+            new QueryValue("Vfx"),
         };
 
+        [QueryListBlock("Category", "Category", "category", "=", 1)]
+        class QueryCategoryBlock : QueryListBlock
+        {
+            public QueryCategoryBlock(IQuerySource source, string id, string value, QueryListBlockAttribute attr)
+                 : base(source, id, value, attr)
+            {
+                var labelValue = k_Categories.FirstOrDefault(c => (string)c.value == value);
+                if (labelValue.displayName != null)
+                    label = labelValue.displayName.Split("/").Last();
+            }
+
+            public override void Apply(in SearchProposition searchProposition)
+            {
+                label = searchProposition.label.Split("/").Last();
+                base.Apply(searchProposition);
+            }
+
+            public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags)
+            {
+                foreach (var cat in k_Categories)
+                {
+                    yield return CreateProposition(flags, cat.displayName, cat.queryToken, $"Assets in category: {cat.displayName}");
+                }
+            }
+        }
+
+        static QueryValue[] k_UnityVersions =
+        {
+            new QueryValue("2022"),
+            new QueryValue("2021"),
+            new QueryValue("2020"),
+            new QueryValue("2019"),
+            new QueryValue("2018"),
+            new QueryValue("2017"),
+            new QueryValue("Unity 5.x", "5"),
+        };
+
+        [QueryListBlock("Unity Version", "Unity Version", "unity_version", "=", 1)]
+        class QueryVersionBlock : QueryListBlock
+        {
+            public QueryVersionBlock(IQuerySource source, string id, string value, QueryListBlockAttribute attr)
+                 : base(source, id, value, attr)
+            {
+            }
+
+            public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags)
+            {
+                foreach (var cat in k_UnityVersions)
+                {
+                    yield return CreateProposition(flags, cat.displayName, cat.queryToken, $"Assets for Unity version: {cat.displayName}");
+                }
+            }
+        }
+
+        static QueryValue[] k_Platforms =
+        {
+            new QueryValue("Windows", "standalonewindows64"),
+            new QueryValue("Mac OS X", "standaloneosxuniversal"),
+            new QueryValue("Linux", "standalonelinuxuniversal"),
+            new QueryValue("iOS"),
+            new QueryValue("Android"),
+            new QueryValue("Web GL", "webgl")
+        };
+
+        [QueryListBlock("Platform", "Platform", "platform", "=", 1)]
+        class QueryPlatformBlock : QueryListBlock
+        {
+            public QueryPlatformBlock(IQuerySource source, string id, string value, QueryListBlockAttribute attr)
+                 : base(source, id, value, attr)
+            {
+            }
+
+            public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags)
+            {
+                foreach (var cat in k_Platforms)
+                {
+                    yield return CreateProposition(flags, cat.displayName, cat.queryToken, $"Assets for Platform: {cat.displayName}");
+                }
+            }
+        }
+
+        enum ReleaseDate
+        {
+            OneDayAgo = 1,
+            OneWeekAgo = 7,
+            OneMonthAgo = 31,
+            SixMonthsAgo = 180,
+            OneYearAgo = 365
+        }
+
+        [QueryListBlock("Release", "Release since (days)", "release", "=", 1)]
+        class QueryReleaseBlock : QueryListBlock
+        {
+            public QueryReleaseBlock(IQuerySource source, string id, string value, QueryListBlockAttribute attr)
+                 : base(source, id, value, attr)
+            {
+            }
+
+            public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags)
+            {
+                return GetEnumPropositions<ReleaseDate>(flags, "Find Asset by Release day:");
+            }
+        }
+
+        enum SortOrder
+        {
+            Relevance = 0,
+            Popularity = 1,
+            Name = 2,
+            Price = 4,
+            Rating = 5
+        }
+
+        [QueryListBlock("Sorting order", "Sorting order", "sort", "=", 1)]
+        class QuerySortOrderBlock : QueryListBlock
+        {
+            public QuerySortOrderBlock(IQuerySource source, string id, string value, QueryListBlockAttribute attr)
+                 : base(source, id, value, attr)
+            {
+            }
+
+            public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags)
+            {
+                return GetEnumPropositions<SortOrder>(flags, "Set item sorting by:");
+            }
+        }
+
+
+        static QueryValue[] k_MinRating =
+        {
+            new QueryValue("5", null, 5),
+            new QueryValue("4", null, 4),
+            new QueryValue("3", null, 3),
+            new QueryValue("2", null, 2),
+            new QueryValue("1", null, 1),
+        };
+
+        [QueryListBlock("Star Rating", "Star Rating", "min_rating", "=", 5)]
+        class QueryMinRatingBlock : QueryListBlock
+        {
+            public QueryMinRatingBlock(IQuerySource source, string id, string value, QueryListBlockAttribute attr)
+                 : base(source, id, value, attr)
+            {
+            }
+
+            public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags)
+            {
+                foreach (var cat in k_MinRating)
+                {
+                    yield return CreateProposition(flags, cat.displayName, cat.value, $"Minimum star rating for assets: {cat.displayName}");
+                }
+            }
+        }
+
+        static QueryValue[] k_PriceRange =
+        {
+            new QueryValue($"Free", null, 0),
+            new QueryValue($"1-5 {currencySymbol}", null, 5, 1),
+            new QueryValue($"6-10 {currencySymbol}", null, 10, 6),
+            new QueryValue($"11-20 {currencySymbol}", null, 20, 11),
+            new QueryValue($"21-50 {currencySymbol}", null, 50, 21),
+            new QueryValue($"51-100 {currencySymbol}", null, 100, 51),
+            new QueryValue($"101-250 {currencySymbol}", null, 250, 101),
+            new QueryValue($"251-500 {currencySymbol}", null, 500, 251),
+            new QueryValue("No limit", null, 100000, 1),
+        };
+
+        [QueryListBlock("Price Range", "Price Range", "price", "=", 1)]
+        class QueryPriceBlock : QueryListBlock
+        {
+            public QueryPriceBlock(IQuerySource source, string id, string value, QueryListBlockAttribute attr)
+                 : base(source, id, value, attr)
+            {
+                int valueInt = Convert.ToInt32(value);
+                var labelValue = k_PriceRange.FirstOrDefault(c => (int)c.value == valueInt);
+                if (labelValue.displayName != null)
+                    label = labelValue.displayName;
+            }
+
+            public override void Apply(in SearchProposition searchProposition)
+            {
+                label = searchProposition.label;
+                base.Apply(searchProposition);
+            }
+
+            public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags)
+            {
+                var category = flags.HasAny(SearchPropositionFlags.NoCategory) ? null : $"Price Range ({currencySymbol})";
+                int priority = 0;
+                foreach (var p in k_PriceRange)
+                {
+                    yield return new SearchProposition(category: category, label: p.displayName, help: $"Price range ({currencySymbol}) for assets: {p.displayName}",
+                                data: p.value, priority: priority++, icon: icon, type: GetType(), color: GetBackgroundColor());
+                }
+            }
+        }
+
+        enum Currency
+        {
+            None,
+            Euro,
+            USD
+        }
+
+        static Currency s_Currency;
+        private static Currency currency
+        {
+            get
+            {
+                if (s_Currency == Currency.None)
+                {
+                    var c = CultureInfo.CurrentUICulture;
+                    s_Currency = Currency.USD;
+                    if (k_EuroCountries.Contains(c.TwoLetterISOLanguageName))
+                    {
+                        s_Currency = Currency.Euro;
+                    }
+                }
+                return s_Currency;
+            }
+        }
+
+        private static string currencySymbol => currency == Currency.USD ? "$" : "€";
+
         private static IEnumerable<SearchItem> SearchStore(SearchContext context, SearchProvider provider)
         {
+            ClearSearchSession();
             if (s_RequestCheckPurchases)
                 CheckPurchases(null);
 
             if (string.IsNullOrEmpty(context.searchQuery))
                 yield break;
 
-            var requestQuery = new Dictionary<string, object>()
+            var query = s_QueryEngine.ParseQuery(context.searchQuery);
+            if (!query.valid)
             {
-                { "q", string.Join(" ", context.searchWords).Trim() }
-            };
-            ProcessFilter(context, requestQuery);
+                Debug.LogError(string.Join(" ", query.errors.Select(e => e.reason)));
+                yield break;
+            }
+
+            s_CurrentSearchView = context.searchView;
 
-            var requestStr = Utils.JsonSerialize(requestQuery);
+            var requestStr = FormatQuery(query, context, 0);
             using (var webRequest = Post(kSearchEndPoint, requestStr))
             {
                 var rao = webRequest.SendWebRequest();
@@ -287,7 +726,7 @@ private static IEnumerable<SearchItem> SearchStore(SearchContext context, Search
 
                 if (webRequest.result != UnityWebRequest.Result.Success)
                 {
-                    Debug.Log($"Asset store request error: {webRequest.error}");
+                    // Debug.LogError($"Asset store request error: {webRequest.error}");
                 }
                 else
                 {
@@ -305,86 +744,168 @@ private static IEnumerable<SearchItem> SearchStore(SearchContext context, Search
                     }
                     else
                     {
-                        var scoreIndex = 1;
+                        
+                        // Use score Index as an unofficial ids for items:
+                        var scoreIndex = 0;
                         foreach (var doc in response.response.docs)
                         {
                             yield return CreateItem(context, provider, doc, scoreIndex++);
                         }
+
+                        // Create pages:
+                        var totalNbItems = response.response.numFound;
+                        var nbPages = (int)(totalNbItems / kAssetsPerPage) + 1;
+                        if (s_AssetsPage.Capacity < nbPages)
+                            s_AssetsPage.Capacity = nbPages;
+
+                        var startIndex = scoreIndex;
+                        for(var pageIndex = 0; pageIndex < nbPages; ++pageIndex)
+                        {
+                            var endIndex = startIndex + kAssetsPerPage;
+                            var page = new AssetsLoadingPage(startIndex, endIndex);
+                            s_AssetsPage.Add(page);
+                            for(var itemIndex = startIndex; itemIndex < endIndex && itemIndex < totalNbItems; ++itemIndex)
+                            {
+                                var id = $"store_item_{itemIndex}";
+                                var item = provider.CreateItem(context, id, itemIndex, label: null, description: null, Icons.store, null);
+                                page.items.Add(item);
+                                yield return item;
+                            }
+                            startIndex = endIndex;
+                        }
                     }
                 }
             }
         }
 
-        static void ProcessFilter(SearchContext context, Dictionary<string, object> request)
+        static void ClearSearchSession()
+        {
+            s_AssetsPage?.Clear();
+            s_QueryParams?.Clear();
+            s_CurrentSearchView = null;
+        }
+
+        static void GetQueryParts(IQueryNode n, List<IFilterNode> filters, List<ISearchNode> searches)
+        {
+            if (n == null)
+                return;
+            if (n is IFilterNode filterNode)
+            {
+                filters.Add(filterNode);
+            }
+            else if (n is ISearchNode searchNode)
+            {
+                searches.Add(searchNode);
+            }
+
+            if (n.children != null)
+            {
+                foreach (var child in n.children)
+                {
+                    GetQueryParts(child, filters, searches);
+                }
+            }
+        }
+
+        static string FormatQuery(ParsedQuery<QueryDescriptor> query, SearchContext context, int startIndex)
         {
-            foreach (var filter in context.textFilters)
+            List<IFilterNode> filters = new();
+            List<ISearchNode> searches = new();
+            GetQueryParts(query.queryGraph.root, filters, searches);
+
+            var searchStr = string.Join(" ", searches.Select(s => s.searchValue)).Trim();
+            s_QueryParams = new Dictionary<string, object>()
             {
-                var filterTokens = filter.Split(':');
-                var qp = k_QueryParams.Find(p => p.name == filterTokens[0]);
-                if (qp == null || (filterTokens.Length != 2 && qp.type != QueryParamType.kBoolean))
+                { "q", searchStr },
+                { "rows", kAssetsPerPage },
+                { "currency", currency == Currency.USD ? 0 : 1 }
+            };
+
+            SetQueryStartIndex(s_QueryParams, startIndex);
+
+            foreach (var f in filters)
+            {
+                var filter = s_QueryEngine.GetFilter(f.filterId);
+                if (filter == null)
                     continue;
-                switch (qp.type)
+
+                if (f.filterId == "price")
                 {
-                    case QueryParamType.kBoolean:
-                    {
-                        var isOn = false;
-                        if (filterTokens.Length == 2)
-                        {
-                            isOn = TryConvert.ToBool(filterTokens[1]);
-                        }
-                        else
-                        {
-                            isOn = true;
-                        }
-                        request.Add(qp.queryName, isOn);
-                        break;
-                    }
-                    case QueryParamType.kInteger:
-                    {
-                        var value = TryConvert.ToInt(filterTokens[1]);
-                        request.Add(qp.queryName, value);
-                        break;
-                    }
-                    case QueryParamType.kFloat:
-                    {
-                        var value = TryConvert.ToFloat(filterTokens[1]);
-                        request.Add(qp.queryName, value);
-                        break;
-                    }
-                    case QueryParamType.kString:
+                    var queryvalue = k_PriceRange.FirstOrDefault(qv => qv.value.ToString() == f.filterValue);
+                    if (queryvalue.value == null)
+                        continue;
+                    s_QueryParams.Add("max_price", queryvalue.value);
+                    if (queryvalue.value2 != null)
+                        s_QueryParams.Add("min_price", queryvalue.value2);
+                }
+                if (filter.metaInfo.ContainsKey(k_MultiValueQueryParameter))
+                {
+                    if (!s_QueryParams.TryGetValue(f.filterId, out var values))
                     {
-                        request.Add(qp.queryName, filterTokens[1]);
-                        break;
+                        values = new List<string>();
+                        s_QueryParams.TryAdd(f.filterId, values);
                     }
-                    case QueryParamType.kStringArray:
+                    (values as List<string>).Add(f.filterValue);
+                }
+                else if (filter.type == typeof(bool))
+                {
+                    s_QueryParams.TryAdd(f.filterId, Convert.ToBoolean(f.filterValue));
+                }
+                else if (filter.type == typeof(float))
+                {
+                    s_QueryParams.TryAdd(f.filterId, Convert.ToSingle(f.filterValue));
+                }
+                else if (filter.type == typeof(int))
+                {
+                    s_QueryParams.TryAdd(f.filterId, Convert.ToInt32(f.filterValue));
+                }
+                else if (filter.type.IsEnum)
+                {
+                    foreach(var e in Enum.GetValues(filter.type))
                     {
-                        request.Add(qp.queryName, new object[] { filterTokens[1] });
-                        break;
+                        if (e.ToString().ToLowerInvariant() == f.filterValue.ToLowerInvariant())
+                        {
+                            s_QueryParams.TryAdd(f.filterId, (int)e);
+                            break;
+                        }
                     }
                 }
+                else
+                {
+                    s_QueryParams.TryAdd(f.filterId, f.filterValue);
+                }
             }
+
+            if (!s_QueryParams.ContainsKey("sort"))
+            {
+                s_QueryParams.TryAdd("sort", 0);
+            }
+
+            var requestStr = Json.Serialize(s_QueryParams, true);
+            // Debug.Log($"query: {requestStr}");
+            return requestStr;
+        }
+
+        static void SetQueryStartIndex(Dictionary<string, object> queryParams, int startIndex)
+        {
+            queryParams["start"] = startIndex;
         }
 
         static SearchItem CreateItem(SearchContext context, SearchProvider provider, AssetDocument doc, int score)
         {
-            var label = doc.name_en_US;
-            if (purchasePackageIds != null && purchasePackageIds.Contains(doc.id))
-            {
-                label += " (Owned)";
-            }
-            else if (doc.price_USD == 0)
-            {
-                label += " (Free)";
-            }
+            var item = provider.CreateItem(context, doc.id);
+            item.score = score;
+            UpdateItem(item, doc);
+            return item;
+        }
 
-            var description = $"{doc.name_en_US} - {doc.publisher} - {doc.category_slug}";
-            var item = provider.CreateItem(context, doc.id, score, label, description, null, doc);
+        static void UpdateItem(SearchItem item, AssetDocument doc)
+        {
+            item.data = doc;
             item.options &= ~SearchItemOptions.FuzzyHighlight;
             item.options &= ~SearchItemOptions.Highlight;
-
             doc.productDetail = null;
             doc.url = $"https://assetstore.unity.com/packages/{doc.category_slug}/{doc.id}";
-            return item;
         }
 
         static UnityWebRequest Post(string url, string jsonData)
@@ -399,13 +920,41 @@ static UnityWebRequest Post(string url, string jsonData)
 
         static void OnEnable()
         {
+            s_QueryEngine = new();
+            s_QueryEngine.SetSearchDataCallback(data =>
+            {
+                return new[] { "dummy" };
+            });
+
+            s_QueryEngine.SetFilter("free", data => data.free, new[] { "=" })
+                .AddOrUpdatePropositionData(category: null, label: "Free", replacement: "free=true", help: "Search for free asset");
+            s_QueryEngine.SetFilter("on_sale", data => data.on_sale, new[] { "=" })
+                .AddOrUpdatePropositionData(category: null, label: "On Sale", replacement: "on_sale=true", help: "Search for free asset");
+            s_QueryEngine.SetFilter("publisher", data => data.publisher, new[] { "=", ":" })
+                .AddOrUpdatePropositionData(category: null, label: "Publisher", replacement: "publisher=Unity", help: "Search Assets from Publisher")
+                .AddOrUpdateMetaInfo(k_MultiValueQueryParameter, k_MultiValueQueryParameter);
+
+            // ListBlock
+            s_QueryEngine.SetFilter("category", data => data.category, new[] { "=" })
+                .AddOrUpdateMetaInfo(k_MultiValueQueryParameter, k_MultiValueQueryParameter);
+            s_QueryEngine.SetFilter("unity_version", data => data.unity_version, new[] { "=" });
+            s_QueryEngine.SetFilter("platform", data => data.platform, new[] { "=" });
+            s_QueryEngine.SetFilter("release", data => data.release, new[] { "=" });
+            s_QueryEngine.SetFilter("sort", data => data.sort, new[] { "=" });
+            s_QueryEngine.SetFilter("price", data => data.max_price, new[] { "=" });
+            s_QueryEngine.SetFilter("min_rating", data => data.min_rating, new[] { "=" });
+
             s_RequestCheckPurchases = true;
+
+            s_AssetsPage = new();
+
             UnityConnect.instance.UserStateChanged -= OnUserStateChanged;
             UnityConnect.instance.UserStateChanged += OnUserStateChanged;
         }
 
         static void OnDisable()
         {
+            ClearSearchSession();
             UnityConnect.instance.UserStateChanged -= OnUserStateChanged;
         }
 
@@ -473,6 +1022,7 @@ static void CheckPurchases(Action done)
         }
 
         const string k_ProviderId = "store";
+        const string k_FilterId = "store:";
 
         [SearchItemProvider]
         internal static SearchProvider CreateProvider()
@@ -481,23 +1031,165 @@ internal static SearchProvider CreateProvider()
             {
                 active = true,
                 isExplicitProvider = true,
-                filterId = "store:",
+                filterId = k_FilterId,
                 onEnable = OnEnable,
                 onDisable = OnDisable,
-                showDetails = true,
                 fetchItems = (context, items, provider) => SearchStore(context, provider),
-                fetchThumbnail = (item, context) => FetchImage(((AssetDocument)item.data).icon, false, s_Previews) ?? Icons.store,
-                fetchPreview = FetchPreview
+                fetchThumbnail = (item, context) => FetchIcons(item, animateCarrousel: false, s_Previews) ?? Icons.store,
+                fetchPropositions = (context, options) => FetchPropositions(context, options),
+                fetchPreview = FetchPreview,
+                fetchDescription = FetchDescription,
+                fetchLabel = FetchLabel,
+                showDetails = true,
+                trackSelection = OnTrackSelection,
+                showDetailsOptions = ShowDetailsOptions.Preview | ShowDetailsOptions.Inspector | ShowDetailsOptions.InspectorWithoutHeader,
+                toObject = (item, type) =>
+                {            
+                    var wrapper = AssetDocumentWrapper.CreateInstance<AssetDocumentWrapper>();
+                    wrapper.item = item;
+                    return wrapper;
+                },
+            
+                tableConfig = GetDefaultTableConfig
             };
         }
 
-        private static Texture2D FetchPreview(SearchItem item, SearchContext context, Vector2 size, FetchPreviewOptions options)
+        [SearchTemplate(description = "Find all free assets", providerId = k_ProviderId)] internal static string ST1() => @"free=true";
+        [SearchTemplate(description = "Find on sale assets", providerId = k_ProviderId)] internal static string ST2() => @"on_sale=true";
+        [SearchTemplate(description = "Find 3D assets", providerId = k_ProviderId)] internal static string ST3() => @"category=3d";
+        [SearchTemplate(description = "Find 2D assets", providerId = k_ProviderId)] internal static string ST4() => @"category=2d";
+
+        private static IEnumerable<SearchProposition> FetchPropositions(SearchContext ctx, SearchPropositionOptions flags)
+        {
+            foreach (var p in QueryListBlockAttribute.GetPropositions(typeof(QueryCategoryBlock)))
+                yield return p;
+
+            foreach (var p in QueryListBlockAttribute.GetPropositions(typeof(QueryVersionBlock)))
+                yield return p;
+
+            foreach (var p in QueryListBlockAttribute.GetPropositions(typeof(QueryPlatformBlock)))
+                yield return p;
+
+            foreach (var p in QueryListBlockAttribute.GetPropositions(typeof(QueryReleaseBlock)))
+                yield return p;
+
+            foreach (var p in QueryListBlockAttribute.GetPropositions(typeof(QuerySortOrderBlock)))
+                yield return p;
+
+            foreach (var p in QueryListBlockAttribute.GetPropositions(typeof(QueryMinRatingBlock)))
+                yield return p;
+
+            foreach (var p in QueryListBlockAttribute.GetPropositions(typeof(QueryPriceBlock)))
+                yield return p;
+
+            foreach (var p in s_QueryEngine.GetPropositions())
+                yield return p;
+        }
+
+        [SearchColumnProvider(nameof(AssetDocument))]
+        internal static void AssetDocumentColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var data = args.item.data as AssetDocument;
+                if (data != null)
+                {
+                    switch (column.selector)
+                    {
+                        case "id": return data.id;
+                        case "publisher": return data.publisher;
+                        case "category": return data.category_slug;
+                        case "avg_rating": return data.avg_rating;
+                        case "on_sale": return data.on_sale;
+                        case "price": return GetPrice(data);
+                        case "free": return IsFree(data);
+                        case "age": return data.age;
+                    }
+                }
+                return null;
+            };
+        }
+
+        static float GetPrice(AssetDocument doc)
+        {
+            return currency == Currency.USD ? doc.price_USD : doc.price_EUR;
+        }
+
+        static bool IsFree(AssetDocument doc)
+        {
+            return doc != null && GetPrice(doc) == 0;
+        }
+
+        static void OnTrackSelection(SearchItem item, SearchContext context)
+        {
+            var win = context.searchView as SearchWindow;
+            if (win != null && !win.state.flags.HasFlag(UnityEngine.Search.SearchViewFlags.OpenInspectorPreview))
+            {
+                win.TogglePanelView(UnityEngine.Search.SearchViewFlags.OpenInspectorPreview);
+            }
+        }
+
+        static IEnumerable<SearchColumn> FetchColumns(SearchContext context, IEnumerable<SearchItem> items)
+        {
+            yield return new SearchColumn("Asset Store/Publisher", "publisher", nameof(AssetDocument));
+            yield return new SearchColumn("Asset Store/Category", "category", nameof(AssetDocument));
+            yield return new SearchColumn("Asset Store/Rating", "avg_rating", nameof(AssetDocument));
+            yield return new SearchColumn("Asset Store/Price", "price", nameof(AssetDocument));
+            yield return new SearchColumn("Asset Store/On Sale", "on_sale", nameof(AssetDocument));
+            yield return new SearchColumn("Asset Store/Age (in days)", "age", nameof(AssetDocument));
+            yield return new SearchColumn("Asset Store/Id", "id", nameof(AssetDocument));
+        }
+
+        static SearchTable GetDefaultTableConfig(SearchContext context)
+        {
+            return new SearchTable(k_ProviderId, new[] { new SearchColumn("Name", "label") }.Concat(FetchColumns(context, null)));
+        }
+
+        static string FetchDescription(SearchItem item, SearchContext context)
+        {
+            if (item.data == null)
+                return null;
+            var doc = (AssetDocument)item.data;
+            return $"{doc.name_en_US} - {doc.publisher} - {doc.category_slug}";
+        }
+
+        static string FetchLabel(SearchItem item, SearchContext context)
+        {
+            if (item.data == null)
+            {
+                // Found page for asset:
+                var page = s_AssetsPage.FirstOrDefault(p => p.startIndex <= item.score && item.score < p.endIndex);
+                if (page == null)
+                {
+                    // Can this happen?
+                    Debug.LogError($"Cannot find page to load for item: {item.score} {item.id}");
+                    return null;
+                }
+                LoadPage(page, item);
+                return null;
+            }
+
+            var doc = (AssetDocument)item.data;
+            var label = doc.name_en_US;
+            if (purchasePackageIds != null && purchasePackageIds.Contains(doc.id))
+            {
+                label += " (Owned)";
+            }
+            else if (IsFree(doc))
+            {
+                label += " (Free)";
+            }
+
+            return label;
+        }
+
+        static Texture2D FetchPreview(SearchItem item, SearchContext context, Vector2 size, FetchPreviewOptions options)
         {
             if (!options.HasFlag(FetchPreviewOptions.Large))
                 return null;
 
             var doc = (AssetDocument)item.data;
-            if (s_PackagesKey != null)
+            if (doc != null && s_PackagesKey != null)
             {
                 if (doc.productDetail == null)
                 {
@@ -514,12 +1206,75 @@ private static Texture2D FetchPreview(SearchItem item, SearchContext context, Ve
             }
 
             if (doc.productDetail?.images.Length > 0)
-                return (doc.lastPreview = FetchImage(doc.images, true, s_Previews) ?? doc.lastPreview);
+                return (doc.lastPreview = FetchImage(doc.images, false, s_Previews) ?? doc.lastPreview);
+
+            return null;
+        }
+
+        static void LoadPage(AssetsLoadingPage page, SearchItem item)
+        {
+            if (page.isLoaded)
+            {
+                // Can this happen?
+                Debug.LogError($"Page already loaded: {page.startIndex}");
+                return;
+            }
+
+            if (page.request != null)
+            {
+                // Request already started
+                return;
+            }
+
+            // Load the page:
+            SetQueryStartIndex(s_QueryParams, page.startIndex);
+            var requestStr = Json.Serialize(s_QueryParams, true);
+            // Debug.Log($"LoadPage: {page.startIndex} from {item.score} {item.id} {requestStr}");
 
-            if (doc.key_images.Length > 0)
-                return (doc.lastPreview = FetchImage(doc.key_images, true, s_Previews) ?? doc.lastPreview);
+            var request = Post(kSearchEndPoint, requestStr);
+            page.request = request;
+            var asyncOp = page.request.SendWebRequest();
+            asyncOp.completed += op =>
+            {
+                if (!s_AssetsPage.Contains(page))
+                {
+                    // Debug.LogError($"Page does not exists: {page.startIndex}");
+                    request.Dispose();
+                    return;
+                }
 
-            return (doc.lastPreview = FetchImage(doc.icon, true, s_Previews) ?? doc.lastPreview);
+                if (request.result != UnityWebRequest.Result.Success)
+                {
+                    // What to do?
+                    // Debug.LogError($"Error while loading page {page.startIndex}. {request.error}");
+                }
+                else
+                {
+                    var saneJsonStr = request.downloadHandler.text.Replace("name_en-US\"", "name_en_US\"");
+                    var response = JsonUtility.FromJson<StoreSearchResponse>(saneJsonStr);
+                    var nbUpdate = Mathf.Min(response.response.docs.Length, page.items.Count);
+                    // Go over all items in this page and update them according to the fetched data:
+                    for (var i = 0; i < nbUpdate; ++i)
+                    {
+                        var assetDoc = response.response.docs[i];
+                        var item = page.items[i];
+                        UpdateItem(item, assetDoc);
+                    }
+
+                    // TODO FetchItemProperties(DOTSE - 1994): keep this unless the view can tick all activeitems for all async properties (label, desc, thumbnail)
+                    s_CurrentSearchView?.Refresh(RefreshFlags.DisplayModeChanged);
+                    s_AssetsPage.Remove(page);
+                }
+                request.Dispose();
+            };
+        }
+
+        static Texture2D FetchIcons(SearchItem item, bool animateCarrousel, Dictionary<string, PreviewData> imageDb)
+        {
+            var doc = item.data as AssetDocument;
+            if (doc == null)
+                return null;
+            return FetchImage(doc.icon, animateCarrousel, imageDb);
         }
 
         static Texture2D FetchImage(string[] imageUrls, bool animateCarrousel, Dictionary<string, PreviewData> imageDb)
@@ -556,17 +1311,23 @@ static Texture2D FetchImage(string[] imageUrls, bool animateCarrousel, Dictionar
             return newPreview.preview;
         }
 
-        static bool IsItemOwned(IReadOnlyCollection<SearchItem> items)
+        static bool CanShowInPackageManager(SearchItem item)
+        {
+            var doc = item.data as AssetDocument;
+            return IsItemOwned(item);
+        }
+
+        static bool CanShowInPackageManager(IReadOnlyCollection<SearchItem> items)
         {
             if (items.Count > 1)
                 return false;
-            return IsItemOwned(items.First());
+            return CanShowInPackageManager(items.First());
         }
 
         static bool IsItemOwned(SearchItem item)
         {
             var doc = (AssetDocument)item.data;
-            return purchasePackageIds != null && purchasePackageIds.Contains(doc.id);
+            return doc != null && purchasePackageIds != null && purchasePackageIds.Contains(doc.id);
         }
 
         [SearchActionsProvider]
@@ -580,16 +1341,16 @@ internal static IEnumerable<SearchAction> ActionHandlers()
                     {
                         foreach (var item in items)
                             BrowseAssetStoreItem(item);
-                    }
+                    },
+                    closeWindowAfterExecution = false
                 },
                 new SearchAction(k_ProviderId, "open", new GUIContent("Show in Package Manager"))
                 {
                     handler = (item) =>
                     {
-                        if (IsItemOwned(item))
+                        if (CanShowInPackageManager(item))
                         {
-                            var doc = (AssetDocument)item.data;
-                            Utils.OpenPackageManager(doc.id);
+                            OpenPackageManager(item);
                         }
                         else
                         {
@@ -597,16 +1358,34 @@ internal static IEnumerable<SearchAction> ActionHandlers()
                         }
 
                     },
-                    enabled = IsItemOwned
+                    closeWindowAfterExecution = false,
+                    enabled = CanShowInPackageManager
                 }
             };
         }
 
+        static void OpenPackageManager(SearchItem item)
+        {
+            var doc = (AssetDocument)item.data;
+            Utils.OpenPackageManager(doc.id);
+        }
+
         static void BrowseAssetStoreItem(SearchItem item)
         {
             var doc = (AssetDocument)item.data;
-            Utils.OpenInBrowser(doc.url);
-            CheckPurchases(null);
+            if (doc != null)
+            {
+                var url = MakeAssetStoreURL(doc.url, k_OpenBrowserFromSearch);
+                Utils.OpenInBrowser(url);
+                CheckPurchases(null);
+            }
+        }
+
+        static string MakeAssetStoreURL(string url, string source)
+        {
+            // These params helps google analytics track when the asset store is opened and which source opened it.
+            url += $"?utm_source={source}&utm_medium=desktop-app";
+            return url;
         }
 
         static void GetAuthCode(Action<string, Exception> done)
@@ -785,7 +1564,7 @@ static void GetAllPurchases(Action<List<PurchaseInfo>, string> done, Action canc
             });
         }
 
-        #region Requests
+#region Requests
         static void RequestUserInfo(string accessToken, string userId, Action<UserInfo, string> done)
         {
             var url = $"https://api.unity.com/v1/users/{userId}";
@@ -897,17 +1676,46 @@ static void RequestPurchases(string accessToken, Action<PurchaseResponse, string
             };
         }
 
-        #endregion
+#endregion
 
         [MenuItem("Window/Search/Asset Store", priority = 1270)]
-        internal static void SearchAssetStoreMenu()
+        static void SearchAssetStoreMenu()
+        {
+            SearchStore();
+        }
+
+        [CommandHandler("OpenSearchStore")]
+        internal static void OpenStoreCommand(CommandExecuteContext c)
+        {
+            SearchStore();
+        }
+
+        [CommandHandler("OpenAssetStoreInBrowser")]
+        private static void OpenAssetStoreInBrowser(CommandExecuteContext c)
+        {
+            SearchAnalytics.SendEvent(null, SearchAnalytics.GenericEventType.BrowseAssetStoreWeb);
+            string assetStoreUrl = MakeAssetStoreURL(UnityConnect.instance.GetConfigurationURL(CloudConfigUrl.CloudAssetStoreUrl), k_OpenBrowserFromToolbar);
+            if (UnityEditor.Connect.UnityConnect.instance.loggedIn)
+            {
+                UnityEditor.Connect.UnityConnect.instance.OpenAuthorizedURLInWebBrowser(assetStoreUrl);
+            }
+            else
+            {
+                Application.OpenURL(assetStoreUrl);
+            }
+        }
+
+        static void SearchStore()
         {
             SearchAnalytics.SendEvent(null, SearchAnalytics.GenericEventType.QuickSearchOpen, "SearchAssetStore");
             var storeContext = SearchService.CreateContext(SearchService.GetProvider(k_ProviderId));
-            var qs = SearchWindow.Create(storeContext, topic: "asset store");
-            qs.itemIconSize = (int)DisplayMode.Grid;
-            qs.SetSearchText(string.Empty);
-            qs.ShowWindow();
+            var viewState = SearchViewState.LoadDefaults();
+            viewState.flags &= ~UnityEngine.Search.SearchViewFlags.OpenInspectorPreview;
+            viewState.flags |= UnityEngine.Search.SearchViewFlags.DisableNoResultTips;
+            viewState.context = storeContext;
+            viewState.itemSize = (int)DisplayMode.Grid;
+            viewState.queryBuilderEnabled = true;
+            SearchService.ShowWindow(viewState);
         }
 
         static void Refresh()
diff --git a/Modules/QuickSearch/Editor/Providers/BasePerformanceProvider.cs b/Modules/QuickSearch/Editor/Providers/BasePerformanceProvider.cs
new file mode 100644
index 0000000000..67ca1240fa
--- /dev/null
+++ b/Modules/QuickSearch/Editor/Providers/BasePerformanceProvider.cs
@@ -0,0 +1,725 @@
+// 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 UnityEditorInternal;
+using UnityEngine;
+using UnityEngine.Profiling;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Search.Providers
+{
+    abstract class BasePerformanceProvider : SearchProvider
+    {
+        internal readonly struct PerformanceLimit
+        {
+            public readonly int key;
+            public readonly double warningLimit;
+            public readonly double errorLimit;
+
+            public static PerformanceLimit invalid = new(-1, -1, -1);
+
+            public PerformanceLimit(int key, double warningLimit, double errorLimit)
+            {
+                this.key = key;
+                this.warningLimit = warningLimit;
+                this.errorLimit = errorLimit;
+            }
+        }
+
+        internal readonly struct UnitTypeHandle : IEquatable<UnitTypeHandle>, IComparable<UnitTypeHandle>
+        {
+            public readonly int value;
+
+            public UnitTypeHandle(int value)
+            {
+                this.value = value;
+            }
+
+            public bool Equals(UnitTypeHandle other)
+            {
+                return value == other.value;
+            }
+
+            public override bool Equals(object obj)
+            {
+                return obj is UnitTypeHandle other && Equals(other);
+            }
+
+            public override int GetHashCode()
+            {
+                return value;
+            }
+
+            public int CompareTo(UnitTypeHandle other)
+            {
+                return value.CompareTo(other.value);
+            }
+        }
+
+        internal readonly struct ValueWithUnit : IComparable<ValueWithUnit>, IComparable
+        {
+            public readonly double value;
+            public readonly UnitTypeHandle unityTypeHandle;
+            public readonly UnitPowerType powerType;
+
+            public ValueWithUnit(double value, UnitTypeHandle unityTypeHandle, UnitPowerType unitPowerType)
+            {
+                this.value = value;
+                this.unityTypeHandle = unityTypeHandle;
+                this.powerType = unitPowerType;
+            }
+
+            public int CompareTo(ValueWithUnit other)
+            {
+                var compare = unityTypeHandle.CompareTo(other.unityTypeHandle);
+                if (compare != 0)
+                    return compare;
+                var convertedValue = ConvertToPower(value, powerType);
+                var otherConvertedValue = ConvertToPower(other.value, other.powerType);
+                var tolerance = ConvertToPower(0.0001, GetSmallestPower(powerType, other.powerType));
+                if (Math.Abs(convertedValue - otherConvertedValue) < tolerance)
+                    return 0;
+                if (convertedValue < otherConvertedValue)
+                    return -1;
+                return 1;
+            }
+
+            public int CompareTo(object obj)
+            {
+                if (obj is ValueWithUnit vwu)
+                    return CompareTo(vwu);
+                return -1;
+            }
+        }
+
+        // Keep them ordered from smallest to largest
+        internal enum UnitPowerType
+        {
+            Nano,
+            Micro,
+            Milli,
+            Centi,
+            Deci,
+            One,
+            Deca,
+            Hecto,
+            Kilo,
+            Mega,
+            Giga,
+            Tera,
+            Peta,
+        }
+
+        internal readonly struct UnitPower
+        {
+            public readonly string[] symbols;
+            public readonly UnitPowerType type;
+
+            public UnitPower(UnitPowerType powerType, params string[] symbols)
+            {
+                this.type = powerType;
+                this.symbols = symbols;
+            }
+        }
+
+        internal readonly struct UnitType
+        {
+            public readonly string suffix;
+            public readonly UnitPowerType[] supportedPowers;
+
+            public readonly UnitTypeHandle handle;
+
+            public bool unitless => string.IsNullOrEmpty(suffix);
+
+            public static UnitType unsupported = new("unsupported");
+
+            public UnitType(string suffix, params UnitPowerType[] supportedPowers)
+                : this(suffix, GetHandle(suffix), supportedPowers)
+            {}
+
+            public UnitType(string suffix, UnitTypeHandle unitTypeHandle, params UnitPowerType[] supportedPowers)
+            {
+                this.suffix = suffix ?? string.Empty;
+                this.supportedPowers = supportedPowers;
+                this.handle = unitTypeHandle;
+            }
+
+            public static UnitTypeHandle GetHandle(string typeSuffix)
+            {
+                return new UnitTypeHandle(string.IsNullOrEmpty(typeSuffix) ? 0 : typeSuffix.GetHashCode());
+            }
+        }
+
+        static class Styles
+        {
+            public static readonly bool isDarkTheme = EditorGUIUtility.isProSkin;
+            public static readonly Color normalColor = isDarkTheme ? new Color(196 / 255f, 196 / 255f, 196 / 255f) : new Color(32 / 255f, 32 / 255f, 32 / 255f);
+            public static readonly Color warningColor = isDarkTheme ? new Color(255 / 255f, 204 / 255f, 0 / 255f) : new Color(240 / 255f, 105 / 255f, 53 / 255f);
+            public static readonly Color criticalColor = new Color(204 / 255f, 51 / 255f, 0 / 255f);
+        }
+
+        public const string sampleCountSelector = "count";
+        public const string samplePeakSelector = "peak";
+        public const string sampleAvgSelector = "avg";
+        public const string sampleTotalSelector = "total";
+
+        protected Dictionary<int, PerformanceLimit> m_PerformanceLimits = new();
+
+        protected static readonly UnitTypeHandle k_UnitlessTypeHandle = UnitType.GetHandle(null);
+        protected Dictionary<UnitTypeHandle, UnitType> m_UnitTypes;
+        protected Dictionary<UnitPowerType, UnitPower> m_UnitPowers;
+
+        protected List<UnitType> m_SortedUnitTypes = null;
+
+        protected BasePerformanceProvider(string id, string displayName)
+            : base(id, displayName)
+        {
+            AddDefaultPerformanceLimit(samplePeakSelector, 0.5, 2);
+            AddDefaultPerformanceLimit(sampleAvgSelector, 0.5, 2);
+
+            m_UnitTypes = new Dictionary<UnitTypeHandle, UnitType>();
+            m_UnitPowers = new Dictionary<UnitPowerType, UnitPower>();
+
+            AddUnitPower(UnitPowerType.Nano, "n");
+            AddUnitPower(UnitPowerType.Micro, "u", "µ");
+            AddUnitPower(UnitPowerType.Milli, "m");
+            AddUnitPower(UnitPowerType.Centi, "c");
+            AddUnitPower(UnitPowerType.Deci, "d");
+            AddUnitPower(UnitPowerType.One);
+            AddUnitPower(UnitPowerType.Deca, "da", "d");
+            AddUnitPower(UnitPowerType.Hecto, "h");
+            AddUnitPower(UnitPowerType.Kilo, "k");
+            AddUnitPower(UnitPowerType.Mega, "m");
+            AddUnitPower(UnitPowerType.Giga, "g");
+            AddUnitPower(UnitPowerType.Tera, "t");
+            AddUnitPower(UnitPowerType.Peta, "p");
+
+            // Add unitless types
+            AddUnitType(null, k_UnitlessTypeHandle, UnitPowerType.One, UnitPowerType.Kilo, UnitPowerType.Mega, UnitPowerType.Giga, UnitPowerType.Tera, UnitPowerType.Peta);
+        }
+
+        public abstract void Initialize();
+
+        protected virtual IEnumerable<SearchAction> GetActions()
+        {
+            return new List<SearchAction>(new[]
+            {
+                new SearchAction("open", "Profile...", item => StartProfilerRecording(item.id, true, deepProfile: false), _ => !ProfilerDriver.deepProfiling && !ProfilerDriver.enabled),
+                new SearchAction("select", "Stop profiling", (SearchItem item) => StopProfilerRecordingAndOpenProfiler(), _ => ProfilerDriver.enabled),
+                new SearchAction("enable_deep", "Enable Deep Profiling...", _ => SetProfilerDeepProfile(true), _ => !ProfilerDriver.deepProfiling),
+                new SearchAction("start_deep", "Deep Profile...", item => StartProfilerRecording(item.id, true, deepProfile: true), _ => ProfilerDriver.deepProfiling && !ProfilerDriver.enabled),
+                new SearchAction("disable_deep", "Disable Deep Profiling...", _ => SetProfilerDeepProfile(false), _ => ProfilerDriver.deepProfiling),
+                new SearchAction("reset", "Reset", ResetItems),
+            });
+        }
+
+        protected abstract void ResetItems(SearchItem[] items);
+
+        protected abstract string FetchDescription(SearchItem item, SearchContext context);
+
+        protected abstract IEnumerable<SearchProposition> FetchPropositions(SearchContext context, SearchPropositionOptions options);
+
+        protected abstract IEnumerable<SearchItem> FetchItem(SearchContext context, SearchProvider provider);
+
+        protected virtual SearchTable GetDefaultTableConfig(SearchContext context)
+        {
+            return new SearchTable(id, new[] { new SearchColumn("Name", "label") }.Concat(FetchColumns(context, null)));
+        }
+
+        protected virtual IEnumerable<SearchColumn> FetchColumns(SearchContext context, IEnumerable<SearchItem> items)
+        {
+            yield return new SearchColumn("Performance/Sample Count", sampleCountSelector, nameof(PerformanceMetric));
+            yield return new SearchColumn("Performance/Peak", samplePeakSelector, nameof(PerformanceMetric));
+            yield return new SearchColumn("Performance/Average", sampleAvgSelector, nameof(PerformanceMetric));
+            yield return new SearchColumn("Performance/Total", sampleTotalSelector, nameof(PerformanceMetric));
+        }
+
+        protected virtual string FormatColumnValue(SearchColumnEventArgs args)
+        {
+            return DefaultFormatColumnValue(args);
+        }
+
+        [SearchColumnProvider(nameof(PerformanceMetric))]
+        public static void PerformanceMetric(SearchColumn column)
+        {
+            column.binder = (SearchColumnEventArgs args, VisualElement ve) =>
+            {
+                var label = (TextElement)ve;
+                if (args.item.provider is BasePerformanceProvider perfProvider)
+                {
+                    label.text = perfProvider.FormatColumnValue(args) ?? string.Empty;
+                }
+                else
+                {
+                    label.text = DefaultFormatColumnValue(args);
+                }
+            };
+        }
+
+        public static string DefaultFormatColumnValue(in SearchColumnEventArgs args)
+        {
+            if (args.value == null)
+                return string.Empty;
+
+            if (args.column.selector == sampleCountSelector)
+                return args.value.ToString();
+
+            if (Utils.TryGetNumber(args.value, out var d))
+                return GetTimeLabel(d, 0.5d, 2.0d);
+            return string.Empty;
+
+        }
+
+        protected static string ColorToHexCode(in Color color)
+        {
+            var r = (int)(color.r * 255);
+            var g = (int)(color.g * 255);
+            var b = (int)(color.b * 255);
+            return $"#{r:X2}{g:X2}{b:X2}";
+        }
+
+        protected static Color GetPerformanceLimitColor(double time, double warningLimit, double errorLimit)
+        {
+            if (double.IsPositiveInfinity(time))
+                return Styles.criticalColor;
+
+            if (time >= errorLimit)
+                return Styles.criticalColor;
+
+            if (time >= warningLimit)
+                return Styles.warningColor;
+
+            return Styles.normalColor;
+        }
+
+        protected static string GetPerformanceLimitLabel(double value, double warningLimit, double errorLimit, Func<double, string> valueConverter)
+        {
+            var isInfinity = double.IsPositiveInfinity(value);
+            var infinityPrefix = isInfinity ? ">" : "";
+            if (isInfinity)
+                value = long.MaxValue;
+            if (warningLimit < 0 || errorLimit < 0)
+                return $"{infinityPrefix}{valueConverter(value)}";
+            return $"<color={ColorToHexCode(GetPerformanceLimitColor(value, warningLimit, errorLimit))}>{infinityPrefix}{valueConverter(value)}</color>";
+        }
+
+        protected static string GetPerformanceLimitLabel(double value, in PerformanceLimit performanceLimit, Func<double, string> valueConverter)
+        {
+            return GetPerformanceLimitLabel(value, performanceLimit.warningLimit, performanceLimit.errorLimit, valueConverter);
+        }
+
+        protected static string GetTimeLabel(double time, double warningLimit, double errorLimit)
+        {
+            return GetPerformanceLimitLabel(time, warningLimit, errorLimit, v => $"{ToEngineeringNotation(v)}s");
+        }
+
+        protected static string GetTimeLabel(double time, in PerformanceLimit performanceLimit)
+        {
+            return GetPerformanceLimitLabel(time, performanceLimit, v => $"{ToEngineeringNotation(v)}s");
+        }
+
+        protected static string ToEngineeringNotation(double d, bool printSign = false)
+        {
+            var sign = !printSign || d < 0 ? "" : "+";
+            if (Math.Abs(d) >= 1)
+                return $"{sign}{d.ToString("###.0", System.Globalization.CultureInfo.InvariantCulture)}";
+
+            if (Math.Abs(d) > 0)
+            {
+                double exponent = Math.Log10(Math.Abs(d));
+                switch ((int)Math.Floor(exponent))
+                {
+                    case -1: case -2: case -3: return $"{sign}{(d * 1e3):###.0} m";
+                    case -4: case -5: case -6: return $"{sign}{(d * 1e6):###.0} µ";
+                    case -7: case -8: case -9: return $"{sign}{(d * 1e9):###.0} n";
+                    case -10: case -11: case -12: return $"{sign}{(d * 1e12):###.0} p";
+                    case -13: case -14: case -15: return $"{sign}{(d * 1e15):###.0} f";
+                    case -16: case -17: case -18: return $"{sign}{(d * 1e15):###.0} a";
+                    case -19: case -20: case -21: return $"{sign}{(d * 1e15):###.0} z";
+                    default: return $"{sign}{(d * 1e15):###.0} y";
+                }
+            }
+
+            return "0";
+        }
+
+        protected static bool StartProfilerRecording(string markerFilter, bool editorProfile, bool deepProfile)
+        {
+            if (ProfilerDriver.deepProfiling != deepProfile)
+            {
+                if (deepProfile)
+                    Debug.LogWarning("Enabling deep profiling. Domain reload will occur. Please restart Profiling.");
+                else
+                    Debug.LogWarning("Disabling deep profiling. Domain reload will occur. Please restart Profiling.");
+
+                SetProfilerDeepProfile(deepProfile);
+                return false;
+            }
+
+            var editorProfileStr = editorProfile ? "editor" : "playmode";
+            var deepProfileStr = deepProfile ? " - deep profile" : "";
+            var hasMarkerFilter = !string.IsNullOrEmpty(markerFilter);
+            var markerStr = hasMarkerFilter ? $"- MarkerFilter: {markerFilter}" : "";
+            Debug.Log($"Start profiler recording: {editorProfileStr} {deepProfileStr} {markerStr}...");
+
+            EnableProfiler(false);
+
+            EditorApplication.delayCall += () =>
+            {
+                ProfilerDriver.ClearAllFrames();
+                ProfilerDriver.profileEditor = editorProfile;
+                ProfilerDriver.deepProfiling = deepProfile;
+                if (hasMarkerFilter)
+                    SetMarkerFiltering(markerFilter);
+
+                EditorApplication.delayCall += () => EnableProfiler(true);
+            };
+
+            return true;
+        }
+
+        protected static void StopProfilerRecording(Action toProfilerStopped = null)
+        {
+            SetMarkerFiltering("");
+            EnableProfiler(false);
+            Debug.Log($"Stop profiler recording.");
+
+            if (toProfilerStopped != null)
+                EditorApplication.delayCall += () => toProfilerStopped();
+        }
+
+        protected static void StopProfilerRecordingAndOpenProfiler()
+        {
+            StopProfilerRecording(() => OpenProfilerWindow());
+        }
+
+        protected static void EnableProfiler(in bool enable)
+        {
+            ProfilerDriver.enabled = enable;
+            SessionState.SetBool("ProfilerEnabled", enable);
+        }
+
+        protected static EditorWindow OpenProfilerWindow()
+        {
+            var profilerWindow = EditorWindow.CreateWindow<ProfilerWindow>();
+            var cpuProfilerModule = profilerWindow.GetProfilerModule<UnityEditorInternal.Profiling.CPUOrGPUProfilerModule>(ProfilerArea.CPU);
+            cpuProfilerModule.ViewType = ProfilerViewType.Hierarchy;
+            profilerWindow.Show();
+            return profilerWindow;
+        }
+
+        protected static void SetProfilerDeepProfile(in bool deepProfile)
+        {
+            ProfilerWindow.SetEditorDeepProfiling(deepProfile);
+        }
+
+        protected static void SetMarkerFiltering(in string markerName)
+        {
+            ProfilerDriver.SetMarkerFiltering(markerName);
+        }
+
+        protected static int GetDefaultPerformanceLimitKey(in string selector)
+        {
+            return selector.GetHashCode();
+        }
+
+        protected void AddPerformanceLimit(in PerformanceLimit performanceLimit)
+        {
+            m_PerformanceLimits.TryAdd(performanceLimit.key, performanceLimit);
+        }
+
+        protected void AddPerformanceLimit(int key, double warningLimit, double errorLimit)
+        {
+            var performanceLimit = new PerformanceLimit(key, warningLimit, errorLimit);
+            AddPerformanceLimit(performanceLimit);
+        }
+
+        protected void AddDefaultPerformanceLimit(string selector, double warningLimit, double errorLimit)
+        {
+            AddPerformanceLimit(GetDefaultPerformanceLimitKey(selector), warningLimit, errorLimit);
+        }
+
+        protected PerformanceLimit GetPerformanceLimit(int performanceLimitKey)
+        {
+            if (m_PerformanceLimits.TryGetValue(performanceLimitKey, out var limit))
+                return limit;
+            return PerformanceLimit.invalid;
+        }
+
+        protected PerformanceLimit GetDefaultPerformanceLimit(string selector)
+        {
+            return GetPerformanceLimit(GetDefaultPerformanceLimitKey(selector));
+        }
+
+        protected void AddUnitPower(UnitPowerType powerType, params string[] symbols)
+        {
+            var sortedSymbols = symbols.Length == 0 ? symbols : symbols.OrderByDescending(s => s.Length).ToArray();
+            var unitPower = new UnitPower(powerType, sortedSymbols);
+            m_UnitPowers.TryAdd(powerType, unitPower);
+        }
+
+        protected UnitTypeHandle AddUnitType(string suffix, UnitTypeHandle unitTypeHandle, params UnitPowerType[] supportedPowers)
+        {
+            var sortedPowerTypes = supportedPowers.OrderByDescending(p =>
+            {
+                var symbols = m_UnitPowers[p].symbols;
+                if (symbols == null || symbols.Length == 0) return 0;
+                return symbols[0].Length; // Already sorter in UnitPower.
+            });
+            var unitType = new UnitType(suffix?.ToLowerInvariant(), unitTypeHandle, sortedPowerTypes.ToArray());
+            m_UnitTypes.TryAdd(unitType.handle, unitType);
+            m_SortedUnitTypes = null;
+            return unitType.handle;
+        }
+
+        protected UnitTypeHandle AddUnitType(string suffix, params UnitPowerType[] supportedPowers)
+        {
+            var lower = suffix?.ToLowerInvariant();
+            return AddUnitType(lower, UnitType.GetHandle(lower), supportedPowers);
+        }
+
+        protected UnitTypeHandle AddUnitType(params UnitPowerType[] supportedPowers)
+        {
+            return AddUnitType(null, supportedPowers);
+        }
+
+        protected bool IsSupportedUnit(UnitTypeHandle unitTypeHandle)
+        {
+            return m_UnitTypes.ContainsKey(unitTypeHandle);
+        }
+
+        protected static bool AreUnitSameType(ValueWithUnit valueA, ValueWithUnit valueB)
+        {
+            return valueA.unityTypeHandle.Equals(valueB.unityTypeHandle);
+        }
+
+        protected UnitType GetUnitType(UnitTypeHandle unitTypeHandle)
+        {
+            return m_UnitTypes[unitTypeHandle];
+        }
+
+        protected UnitType GetUnitType(ValueWithUnit value)
+        {
+            return GetUnitType(value.unityTypeHandle);
+        }
+
+        protected static UnitPowerType GetSmallestPower(UnitPowerType powerTypeA, UnitPowerType powerTypeB)
+        {
+            if ((int)powerTypeA <= (int)powerTypeB)
+                return powerTypeA;
+            return powerTypeB;
+        }
+
+        protected void BuildSortedUnityTypesCache()
+        {
+            m_SortedUnitTypes = m_UnitTypes.Values.OrderByDescending(converter => converter.suffix.Length).ToList();
+        }
+
+        protected static double ConvertToPower(double baseValue, UnitPowerType power)
+        {
+            switch (power)
+            {
+                case UnitPowerType.Nano:
+                    return baseValue / 1e9;
+                case UnitPowerType.Micro:
+                    return baseValue / 1e6;
+                case UnitPowerType.Milli:
+                    return baseValue / 1e3;
+                case UnitPowerType.Centi:
+                    return baseValue / 100;
+                case UnitPowerType.Deci:
+                    return baseValue / 10;
+                case UnitPowerType.One:
+                    return baseValue;
+                case UnitPowerType.Deca:
+                    return baseValue * 10;
+                case UnitPowerType.Hecto:
+                    return baseValue * 100;
+                case UnitPowerType.Kilo:
+                    return baseValue * 1e3;
+                case UnitPowerType.Mega:
+                    return baseValue * 1e6;
+                case UnitPowerType.Giga:
+                    return baseValue * 1e9;
+                case UnitPowerType.Tera:
+                    return baseValue * 1e12;
+                case UnitPowerType.Peta:
+                    return baseValue * 1e15;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(power), power, null);
+            }
+        }
+    }
+
+    abstract class BasePerformanceProvider<TPerformanceData> : BasePerformanceProvider
+    {
+
+        protected QueryEngine<TPerformanceData> m_QueryEngine;
+
+        protected BasePerformanceProvider(string id, string displayName)
+            : base(id, displayName)
+        {}
+
+        public override void Initialize()
+        {
+            m_QueryEngine = BuildQueryEngine();
+            active = false;
+            isExplicitProvider = true;
+            fetchColumns = FetchColumns;
+            fetchDescription = FetchDescription;
+            fetchItems = (context, _, provider) => FetchItem(context, provider);
+            tableConfig = GetDefaultTableConfig;
+            actions = GetActions().ToList();
+            fetchPropositions = FetchPropositions;
+        }
+
+        protected override IEnumerable<SearchProposition> FetchPropositions(SearchContext context, SearchPropositionOptions options)
+        {
+            if (options.HasAny(SearchPropositionFlags.QueryBuilder))
+                return FetchQueryBuilderPropositions(context, options);
+            return Enumerable.Empty<SearchProposition>();
+        }
+
+        protected virtual IEnumerable<SearchProposition> FetchQueryBuilderPropositions(SearchContext context, SearchPropositionOptions options)
+        {
+            return m_QueryEngine.GetPropositions();
+        }
+
+        protected virtual QueryEngine<TPerformanceData> BuildQueryEngine()
+        {
+            var queryEngineOptions = new QueryValidationOptions { validateFilters = false, skipNestedQueries = true, skipUnknownFilters = true };
+            var qe = new QueryEngine<TPerformanceData>(queryEngineOptions);
+
+            var supportedOperators = new[] { "=", "!=", ">", ">=", "<", "<=" };
+            qe.SetFilter(sampleAvgSelector, GetPerformanceAverageValue, supportedOperators)
+                .AddOrUpdatePropositionData(category: "Performance", label: "Average", replacement: "avg>100", help: "Search by average value", color: QueryColors.filter);
+            qe.SetFilter(sampleTotalSelector, GetPerformanceTotalValue, supportedOperators)
+                .AddOrUpdatePropositionData(category: "Performance", label: "Total", replacement: "total>1000", help: "Search by total value", color: QueryColors.filter);
+            qe.SetFilter(samplePeakSelector, GetPerformancePeakValue, supportedOperators)
+                .AddOrUpdatePropositionData(category: "Performance", label: "Peak", replacement: "peak>100", help: "Search by peak value", color: QueryColors.filter);
+            qe.SetFilter(sampleCountSelector, GetPerformanceSampleCountValue, supportedOperators)
+                .AddOrUpdatePropositionData(category: "Performance", label: "Sample Count", replacement: "count>1000", help: "Search by sample count", color: QueryColors.filter);
+
+            SetupFilter(qe, sampleAvgSelector, CompareValuesWithUnit);
+            SetupFilter(qe, sampleTotalSelector, CompareValuesWithUnit);
+            SetupFilter(qe, samplePeakSelector, CompareValuesWithUnit);
+            SetupFilter(qe, sampleCountSelector, CompareValuesWithUnit);
+            qe.SetSearchDataCallback(YieldPerformanceDataWords, StringComparison.OrdinalIgnoreCase);
+            return qe;
+        }
+
+        protected void SetupFilter(QueryEngine<TPerformanceData> qe, string filterToken, Func<ValueWithUnit, ValueWithUnit, FilterOperatorType, bool> handler)
+        {
+            var filter = qe.GetFilter(filterToken);
+
+            filter.AddTypeParser(ParseFilterValue);
+            filter.AddOperator("=").AddHandler<ValueWithUnit, ValueWithUnit>((value, filterValue) => handler(value, filterValue, FilterOperatorType.Equal));
+            filter.AddOperator("!=").AddHandler<ValueWithUnit, ValueWithUnit>((value, filterValue) => handler(value, filterValue, FilterOperatorType.NotEqual));
+            filter.AddOperator(">").AddHandler<ValueWithUnit, ValueWithUnit>((value, filterValue) => handler(value, filterValue, FilterOperatorType.Greater));
+            filter.AddOperator(">=").AddHandler<ValueWithUnit, ValueWithUnit>((value, filterValue) => handler(value, filterValue, FilterOperatorType.GreaterOrEqual));
+            filter.AddOperator("<").AddHandler<ValueWithUnit, ValueWithUnit>((value, filterValue) => handler(value, filterValue, FilterOperatorType.Lesser));
+            filter.AddOperator("<=").AddHandler<ValueWithUnit, ValueWithUnit>((value, filterValue) => handler(value, filterValue, FilterOperatorType.LesserOrEqual));
+        }
+
+        protected abstract IEnumerable<string> YieldPerformanceDataWords(TPerformanceData data);
+        protected abstract ValueWithUnit GetPerformanceAverageValue(TPerformanceData data);
+        protected abstract ValueWithUnit GetPerformanceTotalValue(TPerformanceData data);
+        protected abstract ValueWithUnit GetPerformancePeakValue(TPerformanceData data);
+        protected abstract ValueWithUnit GetPerformanceSampleCountValue(TPerformanceData data);
+
+        protected bool CompareValuesWithUnit(ValueWithUnit perfDataValue, ValueWithUnit filterValue, FilterOperatorType op)
+        {
+            // If both values are not the same type, bail out.
+            if (!AreUnitSameType(perfDataValue, filterValue))
+                return false;
+
+            switch (op)
+            {
+                case FilterOperatorType.Equal:
+                    return perfDataValue.CompareTo(filterValue) == 0;
+                case FilterOperatorType.NotEqual:
+                    return perfDataValue.CompareTo(filterValue) != 0;
+                case FilterOperatorType.Greater:
+                    return perfDataValue.CompareTo(filterValue) > 0;
+                case FilterOperatorType.GreaterOrEqual:
+                    return perfDataValue.CompareTo(filterValue) >= 0;
+                case FilterOperatorType.Lesser:
+                    return perfDataValue.CompareTo(filterValue) < 0;
+                case FilterOperatorType.LesserOrEqual:
+                    return perfDataValue.CompareTo(filterValue) <= 0;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(op), op, null);
+            }
+        }
+
+        ParseResult<ValueWithUnit> ParseFilterValue(string filterValue)
+        {
+            if (m_SortedUnitTypes == null)
+                BuildSortedUnityTypesCache();
+
+            filterValue = filterValue.Replace(',', '.');
+            filterValue = filterValue.ToLowerInvariant();
+
+            var sv = filterValue.GetStringView();
+            foreach (var unitType in m_SortedUnitTypes!)
+            {
+                if (!sv.EndsWith(unitType.suffix))
+                    continue;
+
+                var valueWithPowerPart = sv.Substring(0, sv.length - unitType.suffix.Length);
+                foreach (var supportedPower in unitType.supportedPowers)
+                {
+                    var unitPower = m_UnitPowers[supportedPower];
+                    string matchingSymbol = null;
+                    if (unitPower.symbols == null || unitPower.symbols.Length == 0)
+                    {
+                        matchingSymbol = string.Empty;
+                    }
+                    else
+                    {
+                        foreach (var symbol in unitPower.symbols)
+                        {
+                            if (valueWithPowerPart.EndsWith(symbol))
+                            {
+                                matchingSymbol = symbol;
+                            }
+                        }
+                    }
+
+                    if (matchingSymbol != null)
+                    {
+                        var valuePart = valueWithPowerPart.Substring(0, valueWithPowerPart.length - matchingSymbol.Length);
+                        if (Utils.TryParseLowerInvariant<double>(valuePart, out var value))
+                        {
+                            return new ParseResult<ValueWithUnit>(true, new ValueWithUnit(value, unitType.handle, supportedPower));
+                        }
+                    }
+                }
+            }
+
+            // Always return a success so that it doesn't generate an error but can still be filtered out.
+            return new ParseResult<ValueWithUnit>(true, new ValueWithUnit(0, UnitType.unsupported.handle, UnitPowerType.One));
+        }
+    }
+
+    static class PerformanceWindowHelper
+    {
+        [MenuItem("Window/Analysis/Performance Markers", priority = 1272)]
+        public static void OpenProvider()
+        {
+            var providerIds = new[] { PerformanceProvider.providerId, ProfilerMarkersProvider.providerId };
+            var providers = SearchService.GetProviders(providerIds).ToArray();
+            var context = SearchService.CreateContext(providers, "", SearchFlags.OpenContextual);
+            context.useExplicitProvidersAsNormalProviders = true;
+            var columns = new[] { new SearchColumn("Name", "label") }.Concat(providers[1].fetchColumns(context, null));
+            var tableConfig = new SearchTable("perf", columns);
+            var viewState = new SearchViewState(context, tableConfig);
+            viewState.itemSize = (float)DisplayMode.Table;
+            SearchService.ShowWindow(viewState);
+        }
+    }
+}
diff --git a/Modules/QuickSearch/Editor/Providers/FindProvider.cs b/Modules/QuickSearch/Editor/Providers/FindProvider.cs
index 4927682bc6..b272eac5ad 100644
--- a/Modules/QuickSearch/Editor/Providers/FindProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/FindProvider.cs
@@ -2,7 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-//#define DEBUG_FIND_PROVIDER
+// #define DEBUG_FIND_PROVIDER
 using System;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
@@ -10,7 +10,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Text.RegularExpressions;
-using UnityEngine;
+using UnityEditorInternal;
 
 namespace UnityEditor.Search.Providers
 {
@@ -23,6 +23,8 @@ enum FindOptions
         Glob = 1 << 2,
         Fuzzy = 1 << 3,
         Exact = 1 << 15,
+        FileName = 1 << 16,
+        NoExtension = 1 << 17,
         Packages = 1 << 28,
         All = Words | Regex | Glob | Fuzzy | Packages,
 
@@ -128,7 +130,8 @@ public static IEnumerable<SearchDocument> Search(string searchQuery, IEnumerable
             {
                 options |= FindOptions.Packages;
             }
-            roots = roots ?? GetRoots(options);
+            if (roots == null || roots.Count() == 0)
+                roots = GetRoots(options);
 
             var results = new ConcurrentBag<SearchDocument>();
             var searchTask = Task.Run(() =>
@@ -162,29 +165,18 @@ private static IEnumerable<SearchDocument> GetRootPaths(string root, FindOptions
                 }
                 else
                 {
-                    var docsBag = new ConcurrentBag<SearchDocument>();
                     var foundFiles = new ConcurrentDictionary<SearchDocument, byte>();
                     var baseScore = isPackage ? 1 : 0;
-                    var scanFileTask = Task.Run(() =>
-                    {
-                        var files = Directory.EnumerateFiles(root, "*.meta", SearchOption.AllDirectories);
-                        foreach (var f in files)
-                        {
-                            var p = f.Substring(0, f.Length - 5).Replace("\\", "/");
-                            var doc = new SearchDocument(p, null, null, baseScore, SearchDocumentFlags.Asset);
-                            if (foundFiles.TryAdd(doc, 0))
-                                docsBag.Add(doc);
-                        }
-                    });
-
-                    while (docsBag.Count > 0 || !scanFileTask.Wait(1) || docsBag.Count > 0)
-                    {
-                        while (docsBag.TryTake(out var e))
-                            yield return e;
 
-                        if (scanFileTask.IsFaulted || scanFileTask.IsCanceled)
-                            yield break;
+                    var files = Directory.EnumerateFiles(root, "*.meta", SearchOption.AllDirectories);
+                    foreach (var f in files)
+                    {
+                        var p = f.Substring(0, f.Length - 5).Replace("\\", "/");
+                        var doc = new SearchDocument(p, null, null, baseScore, SearchDocumentFlags.Asset);
+                        if (foundFiles.TryAdd(doc, 0))
+                            yield return doc;
                     }
+
                     s_RootFilePaths.TryAdd(root, foundFiles);
                 }
             }
@@ -205,7 +197,7 @@ private static void SearchWord(bool exclude, string word, FindOptions options, I
                 try
                 {
                     var match = SearchFile(doc.name, word, options, rxm, globRx, out var score) ||
-                        (!string.IsNullOrEmpty(doc.m_Source) && SearchFile(doc.m_Source, word, options, rxm, globRx, out score));
+                        (!string.IsNullOrEmpty(doc.m_Source) && doc.m_Source != doc.name && SearchFile(doc.m_Source, word, options, rxm, globRx, out score));
                     if (!exclude && match)
                         results.Add(new SearchDocument(doc, ComputeResultScore(score, doc.name)));
                     else if (exclude && !match)
@@ -229,9 +221,29 @@ static int ComputeResultScore(int score, in string name)
             return score;
         }
 
+        internal static string ProcessFilePath(string path, FindOptions options)
+        {
+            if (options.HasAll(FindOptions.FileName | FindOptions.NoExtension))
+            {
+                return Path.GetFileNameWithoutExtension(path);
+            }
+            else if (options.HasFlag(FindOptions.FileName))
+            {
+                return Path.GetFileName(path);
+            }
+            else if(options.HasFlag(FindOptions.NoExtension))
+            {
+                var ext = Path.GetExtension(path);
+                return string.IsNullOrEmpty(ext) ? path : path.Substring(0, path.Length - ext.Length);
+            }
+
+            return path;
+        }
+
         private static bool SearchFile(string f, string word, FindOptions options, in Regex rxm, in Regex globRx, out int score)
         {
             score = 0;
+            f = ProcessFilePath(f, options);
 
             if (options.HasAny(FindOptions.Words))
             {
@@ -288,15 +300,23 @@ public static IEnumerable<SearchDocument> SearchWord(bool exclude, string word,
         {
             {
                 var results = new ConcurrentBag<SearchDocument>();
-                var searchTask = Task.Run(() => SearchWord(exclude, word, options, documents, results));
+                if (InternalEditorUtility.CurrentThreadIsMainThread())
+                {
+                    var searchTask = Task.Run(() => SearchWord(exclude, word, options, documents, results));
+                    while (results.Count > 0 || !searchTask.Wait(1) || results.Count > 0)
+                    {
+                        while (results.TryTake(out var e))
+                            yield return e;
 
-                while (results.Count > 0 || !searchTask.Wait(1) || results.Count > 0)
+                        if (searchTask.IsFaulted || searchTask.IsCanceled)
+                            break;
+                    }
+                }
+                else
                 {
+                    SearchWord(exclude, word, options, documents, results);
                     while (results.TryTake(out var e))
                         yield return e;
-
-                    if (searchTask.IsFaulted || searchTask.IsCanceled)
-                        break;
                 }
             }
         }
diff --git a/Modules/QuickSearch/Editor/Providers/MenuProvider.cs b/Modules/QuickSearch/Editor/Providers/MenuProvider.cs
index 0a33453e25..73318e0585 100644
--- a/Modules/QuickSearch/Editor/Providers/MenuProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/MenuProvider.cs
@@ -114,10 +114,8 @@ private static void BuildMenus(List<string> itemNames)
 
         private static IEnumerable<SearchItem> FetchItems(SearchContext context, List<SearchItem> items, SearchProvider provider)
         {
-            if (string.IsNullOrEmpty(context.searchQuery))
-                yield break;
-            var query = queryEngine.ParseQuery(context.searchQuery);
-            if (!query.valid)
+            var query = (string.IsNullOrEmpty(context.searchQuery) && context.providers.Count() == 1) ? null : queryEngine.ParseQuery(context.searchQuery);
+            if (query != null && !query.valid)
             {
                 context.AddSearchQueryErrors(query.errors.Select(e => new SearchQueryError(e, context, provider)));
                 yield break;
@@ -126,7 +124,8 @@ private static IEnumerable<SearchItem> FetchItems(SearchContext context, List<Se
             while (menus == null)
                 yield return null;
 
-            foreach (var m in query.Apply(menus, false))
+            var results = query == null ? menus : query.Apply(menus, false);
+            foreach (var m in results)
                 yield return provider.CreateItem(context, m.path);
         }
 
@@ -162,6 +161,9 @@ static IEnumerable<SearchProposition> FetchPropositions(SearchContext context, S
             if (!options.flags.HasAny(SearchPropositionFlags.QueryBuilder))
                 yield break;
 
+            foreach (var p in QueryAndOrBlock.BuiltInQueryBuilderPropositions())
+                yield return p;
+
             foreach (var proposition in queryEngine.GetPropositions())
                 yield return proposition;
         }
diff --git a/Modules/QuickSearch/Editor/Providers/ObjectQueryEngine.cs b/Modules/QuickSearch/Editor/Providers/ObjectQueryEngine.cs
index bddf0b3589..c19ff7511d 100644
--- a/Modules/QuickSearch/Editor/Providers/ObjectQueryEngine.cs
+++ b/Modules/QuickSearch/Editor/Providers/ObjectQueryEngine.cs
@@ -10,6 +10,14 @@
 
 namespace UnityEditor.Search.Providers
 {
+    enum MissingReferenceFilter
+    {
+        Script,
+        Asset,
+        Prefab,
+        Any
+    }
+
     class ObjectQueryEngine : ObjectQueryEngine<UnityEngine.Object>
     {
     }
@@ -26,6 +34,7 @@ class ObjectQueryEngine<T> where T : UnityEngine.Object
         [ThreadStatic] List<int> m_FuzzyMatches = new List<int>();
 
         public QueryEngine<T> engine => m_QueryEngine;
+        public bool reportError;
 
         private static readonly char[] s_EntrySeparators = { '/', ' ', '_', '-', '.' };
         private static readonly SearchProposition[] s_FixedPropositions = new SearchProposition[]
@@ -73,6 +82,9 @@ protected class GOD
 
             public bool? isChild;
             public bool? isLeaf;
+            public bool missingScript;
+            public bool missingPrefab;
+            public bool missingAssetReference;
         }
 
         public bool InvalidateObject(int instanceId)
@@ -80,6 +92,22 @@ public bool InvalidateObject(int instanceId)
             return m_GODS.Remove(instanceId);
         }
 
+        public bool InvalidateObjectAndRefs(int instanceId)
+        {
+            // Invalidate all refs because depending on the topology changed it becomes costly and
+            // difficult to compute what needs to be updated. Example of Topology changed:
+            // - Reparent NodeA: invalidate every node referencing nodeA
+            // - Reparent NodeA which is the parent of a whole hierarchy: invalidate every node referencing nodeA AND any of
+            //   the moved children since their TransformPath has changed as well
+
+            // TODO: Should we store scene dependency as GlobalObjectId in the query instead of path?
+            foreach (var god in m_GODS.Values)
+            {
+                god.refs = null;
+            }
+            return m_GODS.Remove(instanceId);
+        }
+
         public ObjectQueryEngine()
             : this(new T[0])
         {
@@ -91,7 +119,7 @@ public ObjectQueryEngine(IEnumerable<T> objects)
             m_QueryEngine.AddFilter<int>("id", GetId);
             m_QueryEngine.AddFilter("path", GetPath);
             m_QueryEngine.AddFilter<string>("is", OnIsFilter, new[] {":"});
-
+            m_QueryEngine.AddFilter<MissingReferenceFilter>("missing", OnMissing, new[] { ":" });
             m_QueryEngine.AddFilter<string>("t", OnTypeFilter, new[] {"=", ":"});
             m_QueryEngine.SetFilter<string>("ref", GetReferences, new[] {"=", ":"}).AddTypeParser(s =>
             {
@@ -122,6 +150,7 @@ public ObjectQueryEngine(IEnumerable<T> objects)
 
             m_QueryEngine.SetSearchWordMatcher(OnSearchData);
             m_QueryEngine.SetSearchDataCallback(OnSearchData, s => s.ToLowerInvariant(), StringComparison.Ordinal);
+            reportError = true;
         }
 
         public virtual void SetupQueryEnginePropositions()
@@ -176,7 +205,8 @@ public IEnumerable<T> Search(SearchContext context, SearchProvider provider, IEn
             var query = m_QueryEngine.ParseQuery(context.searchQuery, true);
             if (!query.valid)
             {
-                context.AddSearchQueryErrors(query.errors.Select(e => new SearchQueryError(e, context, provider)));
+                if (reportError)
+                    context.AddSearchQueryErrors(query.errors.Select(e => new SearchQueryError(e, context, provider)));
                 return Enumerable.Empty<T>();
             }
 
@@ -213,6 +243,30 @@ protected GOD GetGOD(UnityEngine.Object obj)
             return god;
         }
 
+        protected bool OnMissing(T obj, QueryFilterOperator op, MissingReferenceFilter value)
+        {
+            var god = GetGOD(obj);
+
+            if (god.refs == null)
+            {
+                BuildReferences(ref god, obj);
+            }
+
+            switch(value)
+            {
+                case MissingReferenceFilter.Any:
+                    return god.missingAssetReference || god.missingScript || god.missingPrefab;
+                case MissingReferenceFilter.Script:
+                    return god.missingScript;
+                case MissingReferenceFilter.Asset:
+                    return god.missingAssetReference;
+                case MissingReferenceFilter.Prefab:
+                    return god.missingPrefab;
+                default:
+                    return false;
+            }
+        }
+
         protected virtual bool OnIsFilter(T obj, QueryFilterOperator op, string value)
         {
             if (string.Equals(value, "object", StringComparison.Ordinal))
@@ -306,7 +360,44 @@ bool OnTypeFilter(T obj, QueryFilterOperator op, string value)
             return CompareWords(op, value.ToLowerInvariant(), god.types);
         }
 
-        private void BuildReferences(UnityEngine.Object obj, ICollection<int> refs)
+        private void BuildReferences(ref GOD god, T obj)
+        {
+            var refs = new HashSet<int>();
+
+            BuildReferences(obj, ref god, refs);
+
+            if (obj is GameObject go)
+            {
+                // Index any prefab reference
+                if (PrefabUtility.IsAnyPrefabInstanceRoot(go))
+                    AddReference(go, PrefabUtility.GetPrefabAssetPathOfNearestInstanceRoot(go), refs);
+                
+                if (PrefabUtility.IsPrefabAssetMissing(go))
+                {
+                    god.missingPrefab = true;
+                }
+
+                var gocs = go.GetComponents<Component>();
+                for (int componentIndex = 1; componentIndex < gocs.Length; ++componentIndex)
+                {
+                    var c = gocs[componentIndex];
+                    if (c == null || !c)
+                    {
+                        god.missingScript = true;
+                        continue;
+                    }
+
+                    if ((c.hideFlags & HideFlags.HideInInspector) == HideFlags.HideInInspector)
+                        continue;
+                    BuildReferences(c, ref god, refs);
+                }
+            }
+
+            refs.Remove(obj.GetHashCode());
+            god.refs = refs;
+        }
+
+        private void BuildReferences(UnityEngine.Object obj, ref GOD god, ICollection<int> refs)
         {
             if (!obj)
                 return;
@@ -318,8 +409,10 @@ private void BuildReferences(UnityEngine.Object obj, ICollection<int> refs)
                     var next = p.NextVisible(true);
                     while (next)
                     {
-                        AddPropertyReferences(obj, p, refs);
-                        next = p.NextVisible(p.hasVisibleChildren);
+                        AddPropertyReferences(obj, p, ref god, refs);
+
+                        // NOTE: Property iteration on managedReference does not handle cycle (ObjectReference does). Do not dig in managedReference for now.
+                        next = p.NextVisible(p.propertyType != SerializedPropertyType.ManagedReference && p.hasVisibleChildren);
                     }
                 }
             }
@@ -329,11 +422,17 @@ private void BuildReferences(UnityEngine.Object obj, ICollection<int> refs)
             }
         }
 
-        private void AddPropertyReferences(UnityEngine.Object obj, SerializedProperty p, ICollection<int> refs)
+        private void AddPropertyReferences(UnityEngine.Object obj, SerializedProperty p, ref GOD god, ICollection<int> refs)
         {
-            if (p.propertyType != SerializedPropertyType.ObjectReference || !p.objectReferenceValue)
+            if (p.propertyType != SerializedPropertyType.ObjectReference)
                 return;
 
+            if (p.objectReferenceValue == null)
+            {
+                god.missingAssetReference = god.missingAssetReference || p.objectReferenceInstanceIDValue != 0;
+                return;
+            }
+
             var refValue = AssetDatabase.GetAssetPath(p.objectReferenceValue);
             if (string.IsNullOrEmpty(refValue) && p.objectReferenceValue is GameObject go)
                 refValue = SearchUtils.GetTransformPath(go.transform);
@@ -342,13 +441,16 @@ private void AddPropertyReferences(UnityEngine.Object obj, SerializedProperty p,
                 AddReference(p.objectReferenceValue, refValue, refs);
             refs.Add(p.objectReferenceValue.GetInstanceID());
             if (p.objectReferenceValue is Component c)
+            {
                 refs.Add(c.gameObject.GetInstanceID());
+                var compRefValue = SearchUtils.GetTransformPath(c.gameObject.transform);
+                AddReference(c.gameObject, compRefValue, refs);
+            }
 
             // Add custom object cases
-            if (p.objectReferenceValue is Material material)
+            if (p.objectReferenceValue is Material material && material.shader)
             {
-                if (material.shader)
-                    AddReference(material.shader, material.shader.name, refs);
+                AddReference(material.shader, material.shader.name, refs);
             }
         }
 
@@ -357,9 +459,12 @@ private bool AddReference(UnityEngine.Object refObj, string refValue, ICollectio
             if (string.IsNullOrEmpty(refValue))
                 return false;
 
+            refValue = refValue.ToLowerInvariant();
             if (refValue[0] == '/')
-                refValue = refValue.Substring(1);
-            refs.Add(refValue.ToLowerInvariant().GetHashCode());
+            {
+                refs.Add(refValue.Substring(1).GetHashCode());
+            }
+            refs.Add(refValue.GetHashCode());
 
             var refType = refObj?.GetType().Name;
             if (refType != null)
@@ -374,33 +479,19 @@ private bool GetReferences(T obj, QueryFilterOperator op, string value)
 
             if (god.refs == null)
             {
-                var refs = new HashSet<int>();
-
-                BuildReferences(obj, refs);
-
-                if (obj is GameObject go)
-                {
-                    // Index any prefab reference
-                    AddReference(go, PrefabUtility.GetPrefabAssetPathOfNearestInstanceRoot(go), refs);
-
-                    var gocs = go.GetComponents<Component>();
-                    for (int componentIndex = 1; componentIndex < gocs.Length; ++componentIndex)
-                    {
-                        var c = gocs[componentIndex];
-                        if (!c || (c.hideFlags & HideFlags.HideInInspector) == HideFlags.HideInInspector)
-                            continue;
-                        BuildReferences(c, refs);
-                    }
-                }
-
-                refs.Remove(obj.GetHashCode());
-                god.refs = refs;
+                BuildReferences(ref god, obj);
             }
 
             if (god.refs.Count == 0)
                 return false;
 
-            if (Utils.TryParse(value, out int instanceId))
+            // Account for legacy ref:<InstanceID>: query that can be emitted by the various Find Reference in Scene menu items.
+            var potentialId = value;
+            if (value.EndsWith(":"))
+            {
+                potentialId = value.TrimEnd(':');
+            }
+            if (Utils.TryParse(potentialId, out int instanceId))
                 return god.refs.Contains(instanceId);
 
             return god.refs.Contains(value.ToLowerInvariant().GetHashCode());
diff --git a/Modules/QuickSearch/Editor/Providers/PerformanceProvider.cs b/Modules/QuickSearch/Editor/Providers/PerformanceProvider.cs
index 7479d3c797..cfeeccc727 100644
--- a/Modules/QuickSearch/Editor/Providers/PerformanceProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/PerformanceProvider.cs
@@ -2,113 +2,50 @@
 // 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 UnityEditor.Profiling;
 using UnityEngine;
 using System.Text.RegularExpressions;
-using UnityEditorInternal;
-using UnityEngine.Profiling;
 using System.Linq;
-using UnityEngine.UIElements;
 
 namespace UnityEditor.Search.Providers
 {
-    static class PerformanceProvider
+    class PerformanceProvider : BasePerformanceProvider<string>
     {
-        const string type = "performance";
+        internal const string providerId = "performance";
 
-        static class Styles
-        {
-            public static readonly bool isDarkTheme = EditorGUIUtility.isProSkin;
-            public static readonly Color normalColor = isDarkTheme ? new Color(196 / 255f, 196 / 255f, 196 / 255f) : new Color(32 / 255f, 32 / 255f, 32 / 255f);
-            public static readonly Color warningColor = isDarkTheme ? new Color(255 / 255f, 204 / 255f, 0 / 255f) : new Color(240 / 255f, 105 / 255f, 53 / 255f);
-            public static readonly Color criticalColor = new Color(204 / 255f, 51 / 255f, 0 / 255f);
-        }
-
-        [MenuItem("Window/Search/Performance Trackers", priority = 1272)]
-        public static void OpenProvider()
-        {
-            SearchService.ShowContextual(type);
-        }
+        static readonly UnitTypeHandle k_SecondUnitTypeHandle = UnitType.GetHandle("s");
 
         [SearchItemProvider]
         public static SearchProvider CreateProvider()
         {
-            var qe = BuildQueryEngine();
-            return new SearchProvider(type, "Performance")
-            {
-                active = false,
-                isExplicitProvider = true,
-                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),
-                    new SearchAction("select", "Stop profiling", (SearchItem item) => StopProfilerRecordingAndOpenProfiler(), _ => ProfilerDriver.enabled),
-                    new SearchAction("enable_deep", "Enable Deep Profiling...", _ => SetProfilerDeepProfile(true), _ => !ProfilerDriver.deepProfiling),
-                    new SearchAction("start_deep", "Deep Profile...", item => StartProfilerRecording(item.id, true, deepProfile: true), _ => ProfilerDriver.deepProfiling && !ProfilerDriver.enabled),
-                    new SearchAction("log", "Callstack", item => EditorPerformanceTracker.GetCallstack(item.id, cs => CaptureCallstack(item, cs))),
-                    new SearchAction("reset", "Reset", ResetItems),
-                })
-            };
+            var p = new PerformanceProvider(providerId, "Performance Trackers");
+            p.Initialize();
+            p.filterId = "perf:";
+            return p;
         }
 
-        private static void ResetItems(SearchItem[] items)
+        protected PerformanceProvider(string id, string displayName)
+            : base(id, displayName)
         {
-            foreach (var item in items)
-                EditorPerformanceTracker.Reset(item.id);
+            AddUnitType("s", k_SecondUnitTypeHandle, UnitPowerType.One, UnitPowerType.Milli, UnitPowerType.Micro, UnitPowerType.Nano);
         }
 
-        private static SearchTable GetDefaultTableConfig(SearchContext context)
+        protected override IEnumerable<SearchAction> GetActions()
         {
-            return new SearchTable(type, new [] { new SearchColumn("Name", "label") }.Concat(FetchColumns(context, null)));
+            return base.GetActions().Append(new SearchAction("log", "Callstack", item => EditorPerformanceTracker.GetCallstack(item.id, cs => CaptureCallstack(item, cs))));
         }
 
-        [SearchColumnProvider(nameof(PerformanceMetric))]
-        public static void PerformanceMetric(SearchColumn column)
+        protected override void ResetItems(SearchItem[] items)
         {
-            column.getter = args =>
-            {
-                switch (column.selector)
-                {
-                    case "count": return EditorPerformanceTracker.GetSampleCount(args.item.id);
-                    case "peak": return EditorPerformanceTracker.GetPeakTime(args.item.id);
-                    case "avg": return EditorPerformanceTracker.GetAverageTime(args.item.id);
-                    case "total": return EditorPerformanceTracker.GetTotalTime(args.item.id);
-                    case "age": return EditorPerformanceTracker.GetTimestamp(args.item.id);
-                }
-
-                return null;
-            };
-
-            if (column.selector != "count")
-            {
-                column.binder = (SearchColumnEventArgs args, VisualElement ve) =>
-                {
-                    var label = (TextElement)ve;
-                    if (Utils.TryGetNumber(args.value, out var d))
-                        label.text = GetTimeLabel(d, 0.5d, 2.0d);
-                    else
-                        label.text = string.Empty;
-                };
-            }
+            foreach (var item in items)
+                EditorPerformanceTracker.Reset(item.id);
         }
 
-        [SearchSelector("count", provider: type, cacheable = false)] static object SelectCount(SearchSelectorArgs args) => EditorPerformanceTracker.GetSampleCount(args.current.id);
-        [SearchSelector("peak", provider: type, cacheable = false)] static object SelectPeak(SearchSelectorArgs args) => EditorPerformanceTracker.GetPeakTime(args.current.id);
-        [SearchSelector("avg", provider: type, cacheable = false)] static object SelectAvg(SearchSelectorArgs args) => EditorPerformanceTracker.GetAverageTime(args.current.id);
-        [SearchSelector("total", provider: type, cacheable = false)] static object SelectTotal(SearchSelectorArgs args) => EditorPerformanceTracker.GetTotalTime(args.current.id);
-
-        static IEnumerable<SearchColumn> FetchColumns(SearchContext context, IEnumerable<SearchItem> items)
-        {
-            yield return new SearchColumn("Performance/Sample Count", "count", nameof(PerformanceMetric));
-            yield return new SearchColumn("Performance/Peak Time", "peak", nameof(PerformanceMetric));
-            yield return new SearchColumn("Performance/Average Time", "avg", nameof(PerformanceMetric));
-            yield return new SearchColumn("Performance/Total Time", "total", nameof(PerformanceMetric));
-        }
+        [SearchSelector(sampleCountSelector, provider: providerId, cacheable = false)] static object SelectCount(SearchSelectorArgs args) => TrackerToValueWithUnit(EditorPerformanceTracker.GetSampleCount(args.current.id));
+        [SearchSelector(samplePeakSelector, provider: providerId, cacheable = false)] static object SelectPeak(SearchSelectorArgs args) => TrackerToValueWithUnit(EditorPerformanceTracker.GetPeakTime(args.current.id));
+        [SearchSelector(sampleAvgSelector, provider: providerId, cacheable = false)] static object SelectAvg(SearchSelectorArgs args) => TrackerToValueWithUnit(EditorPerformanceTracker.GetAverageTime(args.current.id));
+        [SearchSelector(sampleTotalSelector, provider: providerId, cacheable = false)] static object SelectTotal(SearchSelectorArgs args) => TrackerToValueWithUnit(EditorPerformanceTracker.GetTotalTime(args.current.id));
 
         static void CaptureCallstack(in SearchItem item, string callstack)
         {
@@ -116,26 +53,7 @@ static void CaptureCallstack(in SearchItem item, string callstack)
             item.data = callstack;
         }
 
-        static string ColorToHexCode(Color color)
-        {
-            var r = (int)(color.r * 255);
-            var g = (int)(color.g * 255);
-            var b = (int)(color.b * 255);
-            return $"#{r:X2}{g:X2}{b:X2}";
-        }
-
-        static Color GetLabelTimeColor(double time, double warningLimit, double errorLimit)
-        {
-            if (time >= errorLimit)
-                return Styles.criticalColor;
-
-            if (time >= warningLimit)
-                return Styles.warningColor;
-
-            return Styles.normalColor;
-        }
-
-        static string FetchDescription(SearchItem item, SearchContext context)
+        protected override string FetchDescription(SearchItem item, SearchContext context)
         {
             var fullDescription = item.options.HasAny(SearchItemOptions.FullDescription);
             var description = GetTrackerDescription(item.id, fullDescription ? '\n' : ' ');
@@ -146,76 +64,60 @@ static string FetchDescription(SearchItem item, SearchContext context)
             return description;
         }
 
-        private static string FormatCallstackForConsole(string callstack)
+        protected override string FormatColumnValue(SearchColumnEventArgs args)
+        {
+            if (args.value == null)
+                return string.Empty;
+            if (args.value is string valueStr)
+                return valueStr;
+
+            var valueWithUnit = (ValueWithUnit)args.value;
+            if (args.column.selector == sampleCountSelector)
+                return valueWithUnit.value.ToString("F0");
+
+            return GetTimeLabel(valueWithUnit.value, GetDefaultPerformanceLimit(args.column.selector));
+        }
+
+        static string FormatCallstackForConsole(string callstack)
         {
             return Regex.Replace(callstack, "\\[(\\S+?):(\\d+)\\]", "[<a href=\"$1\" line=\"$2\">$1:$2</a>]");
         }
 
-        private static string GetTrackerDescription(string trackerName, char splitter)
+        string GetTrackerDescription(string trackerName, char splitter)
         {
             var sampleCount = EditorPerformanceTracker.GetSampleCount(trackerName);
             var peakTime = EditorPerformanceTracker.GetPeakTime(trackerName);
             var avgTime = EditorPerformanceTracker.GetAverageTime(trackerName);
             var totalTime = EditorPerformanceTracker.GetTotalTime(trackerName);
             return $"Sample Count: <b>{sampleCount}</b>{splitter}" +
-                $"Peak: {GetTimeLabel(peakTime, 0.5, 1.0)}{splitter}" +
-                $"Avg: {GetTimeLabel(avgTime, 0.1, 0.5)}{splitter}" +
-                $"Total: {GetTimeLabel(totalTime, 5, 10)}";
+                $"Peak: {GetTimeLabel(peakTime, GetDefaultPerformanceLimit(samplePeakSelector))}{splitter}" +
+                $"Avg: {GetTimeLabel(avgTime, GetDefaultPerformanceLimit(sampleAvgSelector))}{splitter}" +
+                $"Total: {GetTimeLabel(totalTime, GetDefaultPerformanceLimit(sampleTotalSelector))}";
         }
 
-        static string GetTimeLabel(double time, double warningLimit, double errorLimit)
+        protected override IEnumerable<string> YieldPerformanceDataWords(string trackerName)
         {
-            return $"<color={ColorToHexCode(GetLabelTimeColor(time, warningLimit, errorLimit))}>{ToEngineeringNotation(time)}s</color>";
+            yield return trackerName;
         }
 
-        static string ToEngineeringNotation(double d, bool printSign = false)
-        {
-            var sign = !printSign || d < 0 ? "" : "+";
-            if (Math.Abs(d) >= 1)
-                return $"{sign}{d.ToString("###.0", System.Globalization.CultureInfo.InvariantCulture)}";
-
-            if (Math.Abs(d) > 0)
-            {
-                double exponent = Math.Log10(Math.Abs(d));
-                switch ((int)Math.Floor(exponent))
-                {
-                    case -1: case -2: case -3: return $"{sign}{(d * 1e3):###.0} m";
-                    case -4: case -5: case -6: return $"{sign}{(d * 1e6):###.0} µ";
-                    case -7: case -8: case -9: return $"{sign}{(d * 1e9):###.0} n";
-                    case -10: case -11: case -12: return $"{sign}{(d * 1e12):###.0} p";
-                    case -13: case -14: case -15: return $"{sign}{(d * 1e15):###.0} f";
-                    case -16: case -17: case -18: return $"{sign}{(d * 1e15):###.0} a";
-                    case -19: case -20: case -21: return $"{sign}{(d * 1e15):###.0} z";
-                    default: return $"{sign}{(d * 1e15):###.0} y";
-                }
-            }
-
-            return "0";
-        }
+        protected override ValueWithUnit GetPerformanceAverageValue(string trackerName) => TrackerToValueWithUnit(EditorPerformanceTracker.GetAverageTime(trackerName));
+        protected override ValueWithUnit GetPerformanceTotalValue(string trackerName) => TrackerToValueWithUnit(EditorPerformanceTracker.GetTotalTime(trackerName));
+        protected override ValueWithUnit GetPerformancePeakValue(string trackerName) => TrackerToValueWithUnit(EditorPerformanceTracker.GetPeakTime(trackerName));
+        protected override ValueWithUnit GetPerformanceSampleCountValue(string trackerName) => TrackerToValueWithUnit(EditorPerformanceTracker.GetSampleCount(trackerName));
 
-        static QueryEngine<string> BuildQueryEngine()
+        static ValueWithUnit TrackerToValueWithUnit(double value)
         {
-            var queryEngineOptions = new QueryValidationOptions { validateFilters = false, skipNestedQueries = true };
-            var qe = new QueryEngine<string>(queryEngineOptions);
-
-            qe.AddFilter("age", trackerName => EditorPerformanceTracker.GetTimestamp(trackerName));
-            qe.AddFilter("avg", trackerName => EditorPerformanceTracker.GetAverageTime(trackerName));
-            qe.AddFilter("total", trackerName => EditorPerformanceTracker.GetTotalTime(trackerName));
-            qe.AddFilter("peak", trackerName => EditorPerformanceTracker.GetPeakTime(trackerName));
-            qe.AddFilter("count", trackerName => EditorPerformanceTracker.GetSampleCount(trackerName));
-
-            qe.SetSearchDataCallback(YieldTrackerWords, StringComparison.OrdinalIgnoreCase);
-            return qe;
+            return new ValueWithUnit(value, k_SecondUnitTypeHandle, UnitPowerType.One);
         }
 
-        static IEnumerable<string> YieldTrackerWords(string trackerName)
+        static ValueWithUnit TrackerToValueWithUnit(int value)
         {
-            yield return trackerName;
+            return new ValueWithUnit(value, k_UnitlessTypeHandle, UnitPowerType.One);
         }
 
-        static IEnumerable<SearchItem> FetchItem(QueryEngine<string> qe, SearchContext context, SearchProvider provider)
+        protected override IEnumerable<SearchItem> FetchItem(SearchContext context, SearchProvider provider)
         {
-            var query = qe.ParseQuery(context.searchQuery);
+            var query = m_QueryEngine.ParseQuery(context.searchQuery);
             if (!query.valid)
                 yield break;
 
@@ -230,80 +132,5 @@ static SearchItem CreateItem(in SearchContext context, in SearchProvider provide
             item.options = SearchItemOptions.AlwaysRefresh;
             return item;
         }
-
-        static bool StartProfilerRecording(string markerFilter, bool editorProfile, bool deepProfile)
-        {
-            if (ProfilerDriver.deepProfiling != deepProfile)
-            {
-                if (deepProfile)
-                    Debug.LogWarning("Enabling deep profiling. Domain reload will occur. Please restart Profiling.");
-                else
-                    Debug.LogWarning("Disabling deep profiling. Domain reload will occur. Please restart Profiling.");
-
-                SetProfilerDeepProfile(deepProfile);
-                return false;
-            }
-
-            var editorProfileStr = editorProfile ? "editor" : "playmode";
-            var deepProfileStr = deepProfile ? " - deep profile" : "";
-            var hasMarkerFilter = !string.IsNullOrEmpty(markerFilter);
-            var markerStr = hasMarkerFilter ? $"- MarkerFilter: {markerFilter}" : "";
-            Debug.Log($"Start profiler recording: {editorProfileStr} {deepProfileStr} {markerStr}...");
-
-            EnableProfiler(false);
-
-            EditorApplication.delayCall += () =>
-            {
-                ProfilerDriver.ClearAllFrames();
-                ProfilerDriver.profileEditor = editorProfile;
-                ProfilerDriver.deepProfiling = deepProfile;
-                if (hasMarkerFilter)
-                    SetMarkerFiltering(markerFilter);
-
-                EditorApplication.delayCall += () => EnableProfiler(true);
-            };
-
-            return true;
-        }
-
-        static void StopProfilerRecording(Action toProfilerStopped = null)
-        {
-            SetMarkerFiltering("");
-            EnableProfiler(false);
-            Debug.Log($"Stop profiler recording.");
-
-            if (toProfilerStopped != null)
-                EditorApplication.delayCall += () => toProfilerStopped();
-        }
-
-        static void StopProfilerRecordingAndOpenProfiler()
-        {
-            StopProfilerRecording(() => OpenProfilerWindow());
-        }
-
-        static void EnableProfiler(in bool enable)
-        {
-            ProfilerDriver.enabled = enable;
-            SessionState.SetBool("ProfilerEnabled", enable);
-        }
-
-        static EditorWindow OpenProfilerWindow()
-        {
-            var profilerWindow = EditorWindow.CreateWindow<ProfilerWindow>();
-            var cpuProfilerModule = profilerWindow.GetProfilerModule<UnityEditorInternal.Profiling.CPUOrGPUProfilerModule>(ProfilerArea.CPU);
-            cpuProfilerModule.ViewType = ProfilerViewType.Hierarchy;
-            profilerWindow.Show();
-            return profilerWindow;
-        }
-
-        static void SetProfilerDeepProfile(in bool deepProfile)
-        {
-            ProfilerWindow.SetEditorDeepProfiling(deepProfile);
-        }
-
-        static void SetMarkerFiltering(in string markerName)
-        {
-            ProfilerDriver.SetMarkerFiltering(markerName);
-        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/Providers/ProfilerMarkersProvider.cs b/Modules/QuickSearch/Editor/Providers/ProfilerMarkersProvider.cs
new file mode 100644
index 0000000000..c48025f822
--- /dev/null
+++ b/Modules/QuickSearch/Editor/Providers/ProfilerMarkersProvider.cs
@@ -0,0 +1,415 @@
+// 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 Unity.Profiling.LowLevel.Unsafe;
+
+namespace UnityEditor.Search.Providers
+{
+    class ProfilerMarkersProvider : BasePerformanceProvider<ProfilerMarkersProvider.ProfilerRecorderInfo>
+    {
+        internal struct ProfilerRecorderCumulativeData
+        {
+            public long totalValue;
+            public long totalCount;
+            public long maxValue;
+            public double average;
+
+            public static ProfilerRecorderCumulativeData clear = new();
+        }
+
+        internal class ProfilerRecorderInfo
+        {
+            public ProfilerRecorder recorder;
+            public ProfilerRecorderDescription description;
+            public ProfilerRecorderCumulativeData data;
+
+            public long GetSampleCount()
+            {
+                return data.totalCount;
+            }
+
+            public long GetMaxValue()
+            {
+                return data.maxValue;
+            }
+
+            public long GetTotalValue()
+            {
+                return data.totalValue;
+            }
+
+            public double GetAverageValue()
+            {
+                return data.average;
+            }
+
+            public void ResetData()
+            {
+                data = ProfilerRecorderCumulativeData.clear;
+            }
+        }
+
+        internal const string providerId = "profilermarkers";
+        const int k_SamplesCount = 5;
+        const double k_NanoSecondsInSeconds = 1e9;
+        const double k_KiloByte = 1024 * 1024;
+        const double k_MegaByte = k_KiloByte * 1024;
+
+        List<ProfilerRecorderInfo> m_Recorders = new();
+        bool m_Enabled;
+
+        static readonly UnitTypeHandle k_SecondUnitTypeHandle = UnitType.GetHandle("s");
+        static readonly UnitTypeHandle k_ByteUnitTypeHandle = UnitType.GetHandle("b");
+        static readonly UnitTypeHandle k_PercentUnitTypeHandle = UnitType.GetHandle("%");
+        static readonly UnitTypeHandle k_HertzUnitTypeHandle = UnitType.GetHandle("hz");
+
+        [SearchItemProvider]
+        public static SearchProvider CreateProvider()
+        {
+            var p = new ProfilerMarkersProvider(providerId, "Profiler Markers");
+            p.Initialize();
+            p.filterId = "profile:";
+            return p;
+        }
+
+        protected ProfilerMarkersProvider(string id, string displayName)
+            : base(id, displayName)
+        {
+            var defaultTimeAvgLimit = GetDefaultPerformanceLimit(sampleAvgSelector);
+            var defaultTimePeakLimit = GetDefaultPerformanceLimit(samplePeakSelector);
+
+            AddPerformanceLimit(samplePeakSelector, ProfilerMarkerDataUnit.TimeNanoseconds, defaultTimePeakLimit.warningLimit, defaultTimePeakLimit.errorLimit);
+            AddPerformanceLimit(sampleAvgSelector, ProfilerMarkerDataUnit.TimeNanoseconds, defaultTimeAvgLimit.warningLimit, defaultTimeAvgLimit.errorLimit);
+            AddPerformanceLimit(samplePeakSelector, ProfilerMarkerDataUnit.Bytes, 100 * k_KiloByte, k_MegaByte);
+            AddPerformanceLimit(sampleAvgSelector, ProfilerMarkerDataUnit.Bytes, 100 * k_KiloByte, k_MegaByte);
+
+            AddUnitType("s", k_SecondUnitTypeHandle, UnitPowerType.One, UnitPowerType.Milli, UnitPowerType.Micro, UnitPowerType.Nano);
+            AddUnitType("b", k_ByteUnitTypeHandle, UnitPowerType.One, UnitPowerType.Kilo, UnitPowerType.Mega, UnitPowerType.Giga, UnitPowerType.Tera, UnitPowerType.Peta);
+            AddUnitType("%", k_PercentUnitTypeHandle, UnitPowerType.One);
+            AddUnitType("hz", k_HertzUnitTypeHandle, UnitPowerType.One, UnitPowerType.Kilo, UnitPowerType.Mega, UnitPowerType.Giga, UnitPowerType.Tera, UnitPowerType.Peta);
+        }
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            onEnable = EnableProvider;
+            onDisable = DisableProvider;
+        }
+
+        void EnableProvider()
+        {
+            var availableStatHandles = new List<ProfilerRecorderHandle>();
+            ProfilerRecorderHandle.GetAvailable(availableStatHandles);
+
+            foreach (var profilerRecorderHandle in availableStatHandles)
+            {
+                if (!profilerRecorderHandle.Valid)
+                    continue;
+
+                var recorderInfo = new ProfilerRecorderInfo()
+                {
+                    data = new ProfilerRecorderCumulativeData(),
+                    description = ProfilerRecorderHandle.GetDescription(profilerRecorderHandle),
+                    recorder = new ProfilerRecorder(profilerRecorderHandle, k_SamplesCount)
+                };
+                recorderInfo.recorder.Start();
+                m_Recorders.Add(recorderInfo);
+            }
+
+            EditorApplication.update += OnUpdate;
+            m_Enabled = true;
+        }
+
+        void DisableProvider()
+        {
+            m_Enabled = false;
+            EditorApplication.update -= OnUpdate;
+            foreach (var profilerRecorder in m_Recorders)
+            {
+                profilerRecorder.recorder.Stop();
+                profilerRecorder.recorder.Dispose();
+            }
+            m_Recorders.Clear();
+        }
+
+        void OnUpdate()
+        {
+            if (!m_Enabled)
+                return;
+            foreach (var profilerRecorder in m_Recorders)
+            {
+                profilerRecorder.data = UpdateRecorderData(profilerRecorder.recorder, profilerRecorder.data);
+            }
+        }
+
+        static ProfilerRecorderCumulativeData UpdateRecorderData(ProfilerRecorder recorder, ProfilerRecorderCumulativeData data)
+        {
+            var samplesCount = recorder.Capacity;
+            if (samplesCount != k_SamplesCount)
+                return data;
+
+            if (recorder.Count == 0)
+                return data;
+
+            unsafe
+            {
+                var samples = stackalloc ProfilerRecorderSample[samplesCount];
+                recorder.CopyTo(samples, samplesCount);
+
+                var lastSampleIndex = recorder.Count - 1;
+                var lastSample = samples[lastSampleIndex];
+                if (lastSample is { Value: >= 0, Count: > 0 })
+                {
+                    data.totalValue = AddWithoutOverflow(data.totalValue, lastSample.Value);
+                    data.maxValue = Math.Max(data.maxValue, lastSample.Value);
+                    data.totalCount = AddWithoutOverflow(data.totalCount, lastSample.Count);
+                }
+
+                // Compute average over samples
+                double totalValue = 0;
+                double totalCount = 0;
+                for (var i = 0; i < samplesCount; ++i)
+                {
+                    var sampleValue = samples[i].Value;
+                    var sampleCount = samples[i].Count;
+                    if (sampleValue < 0 || sampleCount <= 0)
+                        continue;
+                    totalValue += sampleValue;
+                    totalCount += sampleCount;
+                }
+
+                if (totalCount > 0)
+                {
+                    data.average = totalValue / totalCount;
+                }
+            }
+
+            return data;
+        }
+
+        static long AddWithoutOverflow(long a, long b)
+        {
+            if (b > long.MaxValue - a)
+                return long.MaxValue;
+            return a + b;
+        }
+
+        static ProfilerRecorderInfo GetRecorderInfo(SearchItem item)
+        {
+            return (ProfilerRecorderInfo)item.data;
+        }
+
+        protected override string FormatColumnValue(SearchColumnEventArgs args)
+        {
+            if (!m_Enabled)
+                return string.Empty;
+
+            if (args.value == null)
+                return string.Empty;
+
+            var valueWithUnit = (ValueWithUnit)args.value;
+            if (args.column.selector == sampleCountSelector)
+                return valueWithUnit.value.ToString("F0");
+
+            var pri = GetRecorderInfo(args.item);
+            if (!pri.recorder.Valid)
+                return string.Empty;
+
+            return FormatUnit(valueWithUnit.value, args.column.selector, pri.recorder.UnitType);
+        }
+
+        static double ConvertLongWithMaxValue(long value)
+        {
+            if (value == long.MaxValue)
+                return double.PositiveInfinity;
+            return value;
+        }
+
+        protected override void ResetItems(SearchItem[] items)
+        {
+            foreach (var item in items)
+                GetRecorderInfo(item).ResetData();
+        }
+
+        static ValueWithUnit GetSampleCount(SearchItem item)
+        {
+            var pri = GetRecorderInfo(item);
+            return ProfilerRecorderInfoToUnitWithValue(pri, pri.GetSampleCount());
+        }
+
+        static ValueWithUnit GetMaxValue(SearchItem item)
+        {
+            var pri = GetRecorderInfo(item);
+            return ProfilerRecorderInfoToUnitWithValue(pri, pri.GetMaxValue());
+        }
+
+        static ValueWithUnit GetTotalValue(SearchItem item)
+        {
+            var pri = GetRecorderInfo(item);
+            return ProfilerRecorderInfoToUnitWithValue(pri, ConvertLongWithMaxValue(pri.GetTotalValue()));
+        }
+
+        static ValueWithUnit GetAverageValue(SearchItem item)
+        {
+            var pri = GetRecorderInfo(item);
+            return ProfilerRecorderInfoToUnitWithValue(pri, pri.GetAverageValue());
+        }
+
+        [SearchSelector(sampleCountSelector, provider: providerId, cacheable = false)] static object SelectCount(SearchSelectorArgs args) => GetSampleCount(args.current);
+        [SearchSelector(samplePeakSelector, provider: providerId, cacheable = false)] static object SelectPeak(SearchSelectorArgs args) => GetMaxValue(args.current);
+        [SearchSelector(sampleAvgSelector, provider: providerId, cacheable = false)] static object SelectAvg(SearchSelectorArgs args) => GetAverageValue(args.current);
+        [SearchSelector(sampleTotalSelector, provider: providerId, cacheable = false)] static object SelectTotal(SearchSelectorArgs args) => GetTotalValue(args.current);
+
+        protected override string FetchDescription(SearchItem item, SearchContext context)
+        {
+            var fullDescription = item.options.HasAny(SearchItemOptions.FullDescription);
+            var description = GetTrackerDescription(item, fullDescription ? '\n' : ' ');
+            if (item.options.HasAny(SearchItemOptions.Compacted))
+                return $"<b>{item.id}</b> {description}";
+            return description;
+        }
+
+        string GetTrackerDescription(SearchItem item, char splitter)
+        {
+            if (!m_Enabled)
+                return string.Empty;
+
+            var pri = GetRecorderInfo(item);
+            var sampleCount = pri.GetSampleCount();
+            var peak = pri.GetMaxValue();
+            var avg = pri.GetAverageValue();
+            var total = pri.GetTotalValue();
+            var unitType = pri.recorder.UnitType;
+            return $"Sample Count: <b>{sampleCount}</b>{splitter}" +
+                $"Peak: {FormatUnit(peak, samplePeakSelector, unitType)}{splitter}" +
+                $"Avg: {FormatUnit(avg, sampleAvgSelector, unitType)}{splitter}" +
+                $"Total: {FormatUnit(total, sampleTotalSelector, unitType)}{splitter}" +
+                $"Category: {pri.description.Category}{splitter}" +
+                $"Unit Type: {pri.description.UnitType}{splitter}" +
+                $"Data Type: {pri.description.DataType}";
+        }
+
+        string FormatUnit(double value, string selector, ProfilerMarkerDataUnit unit)
+        {
+            var performanceLimitKey = GetPerformanceLimitKey(selector, unit);
+            var performanceLimit = GetPerformanceLimit(performanceLimitKey);
+
+            switch (unit)
+            {
+                case ProfilerMarkerDataUnit.Undefined:
+                    return FormatUndefined(value, performanceLimit);
+                case ProfilerMarkerDataUnit.TimeNanoseconds:
+                    return FormatTime(value, performanceLimit);
+                case ProfilerMarkerDataUnit.Bytes:
+                    return FormatByte(value, performanceLimit);
+                case ProfilerMarkerDataUnit.Count:
+                    return FormatCount(value, performanceLimit);
+                case ProfilerMarkerDataUnit.Percent:
+                    if (selector == sampleTotalSelector)
+                        return string.Empty;
+                    return FormatPercent(value, performanceLimit);
+                case ProfilerMarkerDataUnit.FrequencyHz:
+                    if (selector == sampleTotalSelector)
+                        return string.Empty;
+                    return FormatFrequency(value, performanceLimit);
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(unit), unit, null);
+            }
+        }
+
+        static string FormatUndefined(double value, in PerformanceLimit performanceLimit)
+        {
+            return GetPerformanceLimitLabel(value, performanceLimit, d => $"{d}");
+        }
+
+        static string FormatCount(double value, in PerformanceLimit performanceLimit)
+        {
+            return GetPerformanceLimitLabel(value, performanceLimit, d => $"{Utils.FormatCount((ulong)d)} hit(s)");
+        }
+
+        static string FormatTime(double value, in PerformanceLimit performanceLimit)
+        {
+            // GetTimeLabel expects time in seconds
+            return GetTimeLabel(value / k_NanoSecondsInSeconds, performanceLimit);
+        }
+
+        static string FormatByte(double value, in PerformanceLimit performanceLimit)
+        {
+            return GetPerformanceLimitLabel(value, performanceLimit, d => $"{Utils.FormatBytes((long)d)}");
+        }
+
+        static string FormatPercent(double value, in PerformanceLimit performanceLimit)
+        {
+            return GetPerformanceLimitLabel(value, performanceLimit, d => $"{d}%");
+        }
+
+        static string FormatFrequency(double value, in PerformanceLimit performanceLimit)
+        {
+            return GetPerformanceLimitLabel(value, performanceLimit, d => $"{Utils.FormatCount((ulong)d)}Hz");
+        }
+
+        protected override IEnumerable<string> YieldPerformanceDataWords(ProfilerRecorderInfo pri)
+        {
+            yield return pri.description.Name;
+            yield return pri.description.Category.Name;
+        }
+
+        protected override ValueWithUnit GetPerformanceAverageValue(ProfilerRecorderInfo pri) => ProfilerRecorderInfoToUnitWithValue(pri, pri.GetAverageValue());
+        protected override ValueWithUnit GetPerformanceTotalValue(ProfilerRecorderInfo pri) => ProfilerRecorderInfoToUnitWithValue(pri, pri.GetTotalValue());
+        protected override ValueWithUnit GetPerformancePeakValue(ProfilerRecorderInfo pri) => ProfilerRecorderInfoToUnitWithValue(pri, pri.GetMaxValue());
+        protected override ValueWithUnit GetPerformanceSampleCountValue(ProfilerRecorderInfo pri) => ProfilerRecorderInfoToUnitWithValue(pri, pri.GetSampleCount());
+
+        static ValueWithUnit ProfilerRecorderInfoToUnitWithValue(ProfilerRecorderInfo pri, double value)
+        {
+            switch (pri.description.UnitType)
+            {
+                case ProfilerMarkerDataUnit.Undefined:
+                    return new ValueWithUnit(value, k_UnitlessTypeHandle, UnitPowerType.One);
+                case ProfilerMarkerDataUnit.TimeNanoseconds:
+                    return new ValueWithUnit(value, k_SecondUnitTypeHandle, UnitPowerType.Nano);
+                case ProfilerMarkerDataUnit.Bytes:
+                    return new ValueWithUnit(value, k_ByteUnitTypeHandle, UnitPowerType.One);
+                case ProfilerMarkerDataUnit.Count:
+                    return new ValueWithUnit(value, k_UnitlessTypeHandle, UnitPowerType.One);
+                case ProfilerMarkerDataUnit.Percent:
+                    return new ValueWithUnit(value, k_PercentUnitTypeHandle, UnitPowerType.One);
+                case ProfilerMarkerDataUnit.FrequencyHz:
+                    return new ValueWithUnit(value, k_HertzUnitTypeHandle, UnitPowerType.One);
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        protected override IEnumerable<SearchItem> FetchItem(SearchContext context, SearchProvider provider)
+        {
+            var query = m_QueryEngine.ParseQuery(context.searchQuery);
+            if (!query.valid)
+                yield break;
+
+            foreach (var trackerName in query.Apply(m_Recorders))
+                yield return CreateItem(context, provider, trackerName);
+        }
+
+        static SearchItem CreateItem(in SearchContext context, in SearchProvider provider, in ProfilerRecorderInfo pri)
+        {
+            var markerName = pri.description.Name;
+            var item = provider.CreateItem(context, markerName, markerName, null, null, pri);
+            item.options = SearchItemOptions.AlwaysRefresh;
+            return item;
+        }
+
+        static int GetPerformanceLimitKey(string selector, ProfilerMarkerDataUnit unit)
+        {
+            return HashCode.Combine(selector, unit);
+        }
+
+        void AddPerformanceLimit(string selector, ProfilerMarkerDataUnit unit, double warningLimit, double errorLimit)
+        {
+            AddPerformanceLimit(GetPerformanceLimitKey(selector, unit), warningLimit, errorLimit);
+        }
+    }
+}
diff --git a/Modules/QuickSearch/Editor/Providers/SceneProvider.cs b/Modules/QuickSearch/Editor/Providers/SceneProvider.cs
index e4271793a8..269e9615e3 100644
--- a/Modules/QuickSearch/Editor/Providers/SceneProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/SceneProvider.cs
@@ -117,7 +117,7 @@ public SceneProvider(string providerId, string filterId, string displayName)
                 var obj = ObjectFromItem(item);
                 if (obj == null)
                     return item.thumbnail;
-                return Utils.GetSceneObjectPreview(obj, size, options, item.thumbnail);
+                return Utils.GetSceneObjectPreview(context, obj, size, options, item.thumbnail);
             };
 
             startDrag = (item, context) =>
@@ -172,7 +172,7 @@ private void InvalidateScene()
             Refresh();
         }
 
-        private void InvalidateObject(int instanceId, RefreshFlags flags = RefreshFlags.Default)
+        private void InvalidateObject(int instanceId)
         {
             if (UnityEngine.Object.FindObjectFromInstanceID(instanceId) is Component c)
                 queryEngine.InvalidateObject(c.gameObject.GetInstanceID());
@@ -180,6 +180,14 @@ private void InvalidateObject(int instanceId, RefreshFlags flags = RefreshFlags.
                 queryEngine.InvalidateObject(instanceId);
         }
 
+        private void InvalidateObjectAndRefs(int instanceId)
+        {
+            if (UnityEngine.Object.FindObjectFromInstanceID(instanceId) is Component c)
+                queryEngine.InvalidateObjectAndRefs(c.gameObject.GetInstanceID());
+            else
+                queryEngine.InvalidateObjectAndRefs(instanceId);
+        }
+
         private void OnObjectChanged(ref ObjectChangeEventStream stream)
         {
             if (m_SceneQueryEngine == null)
@@ -205,19 +213,19 @@ private void OnObjectChanged(ref ObjectChangeEventStream stream)
                     case ObjectChangeKind.ChangeGameObjectStructureHierarchy:
                     {
                         stream.GetChangeGameObjectStructureHierarchyEvent(i, out var e);
-                        InvalidateObject(e.instanceId, RefreshFlags.StructureChanged);
+                        InvalidateObjectAndRefs(e.instanceId);
                     }
                     break;
                     case ObjectChangeKind.ChangeGameObjectStructure:
                     {
                         stream.GetChangeGameObjectStructureEvent(i, out var e);
-                        InvalidateObject(e.instanceId, RefreshFlags.StructureChanged);
+                        InvalidateObjectAndRefs(e.instanceId);
                     }
                     break;
                     case ObjectChangeKind.ChangeGameObjectParent:
                     {
                         stream.GetChangeGameObjectParentEvent(i, out var e);
-                        InvalidateObject(e.instanceId);
+                        InvalidateObjectAndRefs(e.instanceId);
                     }
                     break;
                     case ObjectChangeKind.ChangeGameObjectOrComponentProperties:
@@ -303,29 +311,32 @@ private IEnumerator SearchItems(SearchContext context, SearchProvider provider)
                 using (SearchMonitor.GetView())
                 {
                     yield return queryEngine.Search(context, provider, null)
-                        .Where(go => go)
                         .Select(go => AddResult(context, provider, go));
                 }
             }
             else if (context.filterType != null && string.IsNullOrEmpty(context.searchQuery))
             {
-                yield return UnityEngine.Object.FindObjectsOfType(context.filterType)
+                yield return UnityEngine.Object.FindObjectsByType(context.filterType, UnityEngine.FindObjectsSortMode.None)
                     .Select(obj =>
                     {
                         if (obj is Component c)
                             return c.gameObject;
                         return obj as GameObject;
                     })
-                    .Where(go => go)
                     .Select(go => AddResult(context, provider, go));
             }
         }
 
         public static SearchItem AddResult(SearchContext context, SearchProvider provider, GameObject go)
         {
-            var instanceId = go.GetHashCode();
-            var item = provider.CreateItem(context, instanceId.ToString(), ~instanceId, null, null, null, new GameObjectData(go));
-            return SetItemDescriptionFormat(item, useFuzzySearch: false);
+            if (go)
+            {
+                var instanceId = go.GetHashCode();
+                var item = provider.CreateItem(context, instanceId.ToString(), ~instanceId, null, null, null, new GameObjectData(go));
+                return SetItemDescriptionFormat(item, useFuzzySearch: false);
+            }
+
+            return null;
         }
 
         private static SearchItem SetItemDescriptionFormat(SearchItem item, bool useFuzzySearch)
@@ -386,12 +397,18 @@ private static UnityEngine.Object ObjectFromItem(in SearchItem item, Type type)
 
         private IEnumerable<SearchProposition> FetchQueryBuilderPropositions(SearchContext context)
         {
+            foreach (var p in QueryAndOrBlock.BuiltInQueryBuilderPropositions())
+                yield return p;
+
             foreach (var t in QueryListBlockAttribute.GetPropositions(typeof(QueryComponentBlock)))
                 yield return t;
 
             foreach (var f in QueryListBlockAttribute.GetPropositions(typeof(QueryIsFilterBlock)))
                 yield return f;
 
+            foreach (var f in QueryListBlockAttribute.GetPropositions(typeof(QueryMissingBlock)))
+                yield return f;
+
             foreach (var p in queryEngine.engine.GetPropositions())
                 yield return p;
 
diff --git a/Modules/QuickSearch/Editor/Providers/SceneQueryEngine.cs b/Modules/QuickSearch/Editor/Providers/SceneQueryEngine.cs
index 322198036c..edff036a83 100644
--- a/Modules/QuickSearch/Editor/Providers/SceneQueryEngine.cs
+++ b/Modules/QuickSearch/Editor/Providers/SceneQueryEngine.cs
@@ -25,6 +25,12 @@ public class SceneQueryEngineFilterAttribute : QueryEngineFilterAttribute
         public SceneQueryEngineFilterAttribute(string token, string[] supportedOperators = null)
             : base(token, supportedOperators) {}
 
+        internal SceneQueryEngineFilterAttribute(string token, string[] supportedOperators, string propositionReplacement)
+            : base(token, supportedOperators)
+        {
+            this.propositionReplacement = propositionReplacement;
+        }
+
         /// <summary>
         /// Create a filter with the corresponding token, string comparison options and supported operators.
         /// </summary>
@@ -67,7 +73,7 @@ class SceneQueryEngine : ObjectQueryEngine<GameObject>
     {
         private List<SearchProposition> m_PropertyPrositions;
 
-        static Regex SerializedPropertyRx = new Regex(@"#([\w\d\.]+)");
+        static Regex SerializedPropertyRx = new Regex(@"#([\w\d\.\[\]]+)");
 
         public SceneQueryEngine(IEnumerable<GameObject> gameObjects)
             : base(gameObjects)
@@ -121,7 +127,8 @@ public override void SetupQueryEnginePropositions()
 
             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:"Referencing Asset", replacement:"ref=<$object:none,UnityEngine.Object$>", help: "Find all objects referencing a specific asset.", icon:sceneIcon, color: QueryColors.filter)
+                .AddOrUpdatePropositionData(category: "Reference", label: "Referencing GameObject", replacement: "ref=<$object:none,UnityEngine.GameObject$>", help: "Find all objects referencing a specific GameObject.", 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);
 
@@ -250,7 +257,7 @@ int GetOverlapCount(GameObject go)
             {
                 overlapCount = 0;
 
-                var renderers = UnityEngine.Object.FindObjectsOfType<Renderer>();
+                var renderers = UnityEngine.Object.FindObjectsByType<Renderer>(UnityEngine.FindObjectsSortMode.None);
 
                 foreach (var r in renderers)
                 {
diff --git a/Modules/QuickSearch/Editor/Providers/SettingsProvider.cs b/Modules/QuickSearch/Editor/Providers/SettingsProvider.cs
index a99c36afc6..d469a910a2 100644
--- a/Modules/QuickSearch/Editor/Providers/SettingsProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/SettingsProvider.cs
@@ -103,6 +103,9 @@ static IEnumerable<SearchProposition> FetchPropositions(SearchContext context, S
             if (!options.flags.HasAny(SearchPropositionFlags.QueryBuilder))
                 yield break;
 
+            foreach (var p in QueryAndOrBlock.BuiltInQueryBuilderPropositions())
+                yield return p;
+
             foreach (var f in SettingsProviderCache.queryEngine.GetPropositions())
                 yield return f;
         }
diff --git a/Modules/QuickSearch/Editor/Providers/StaticMethodProvider.cs b/Modules/QuickSearch/Editor/Providers/StaticMethodProvider.cs
index e4ce7b17cb..de36ed4d2e 100644
--- a/Modules/QuickSearch/Editor/Providers/StaticMethodProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/StaticMethodProvider.cs
@@ -31,7 +31,7 @@ internal static SearchProvider CreateProvider()
             return new SearchProvider(type, displayName)
             {
                 priority = 85,
-                filterId = "#",
+                filterId = "api:",
                 isExplicitProvider = true,
                 fetchItems = (context, items, provider) => FetchItems(context, provider),
                 fetchThumbnail = (item, context) => Icons.staticAPI
@@ -65,8 +65,9 @@ private static IEnumerable<SearchItem> FetchItems(SearchContext context, SearchP
 
         private static MethodInfo[] FetchStaticAPIMethodInfo()
         {
-            bool isDevBuild = Unsupported.IsDeveloperBuild();
-            return AppDomain.CurrentDomain.GetAllStaticMethods(isDevBuild);
+            // Note: since 23.2 an internal api causes a hard crash when fetching for it.
+            // bool isDevBuild = Unsupported.IsDeveloperBuild();
+            return AppDomain.CurrentDomain.GetAllStaticMethods(false);
         }
 
         private static MethodInfo[] GetAllStaticMethods(this AppDomain aAppDomain, bool showInternalAPIs)
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAddNewBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAddNewBlock.cs
index 5cd537ed24..d9cbc81900 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAddNewBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAddNewBlock.cs
@@ -62,14 +62,15 @@ IEnumerable<SearchProposition> IBlockSource.FetchPropositions()
                 (source.context.empty ? SearchPropositionFlags.ForceAllProviders : SearchPropositionFlags.None));
             if (source.context.empty)
             {
-                return QueryAreaBlock.FetchPropositions(context)
-                    .Concat(new[] { SearchProposition.CreateSeparator() })
-                    .Concat(SearchProposition.Fetch(context, options).OrderBy(p => p));
+                var areaPropositions = QueryAreaBlock.FetchPropositions(context);
+                var allOtherPropositions = new[] { SearchProposition.CreateSeparator() }.Concat(SearchProposition.Fetch(context, options).OrderBy(p => p));
+                return areaPropositions.Count() > 1 ?
+                    areaPropositions.Concat(allOtherPropositions) :
+                    allOtherPropositions;
             }
             else
             {
-                return SearchProposition.Fetch(context, options)
-                    .Concat(QueryAndOrBlock.BuiltInQueryBuilderPropositions()).OrderBy(p => p);
+                return SearchProposition.Fetch(context, options).OrderBy(p => p);
             }
         }
     }
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryFilterBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryFilterBlock.cs
index 1e19145154..1772b45fd7 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryFilterBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryFilterBlock.cs
@@ -430,7 +430,7 @@ private bool ParseValue(in string value)
                 this.value = Utils.ToString(v4);
                 this.formatValue = v4;
             }
-            else if (!string.IsNullOrEmpty(value) && TryParseObjectValue(value, out var objValue))
+            else if (Utils.TryParseObjectValue(value, out var objValue))
             {
                 format = QueryBlockFormat.Object;
                 formatValue = objValue;
@@ -445,29 +445,7 @@ private bool ParseValue(in string value)
 
             return true;
         }
-
-        private static bool TryParseObjectValue(in string value, out UnityEngine.Object objValue)
-        {
-            objValue = null;
-            if (string.Equals("none", value, StringComparison.OrdinalIgnoreCase))
-                return true;
-
-            if (value.StartsWith("GlobalObjectId", StringComparison.Ordinal) && GlobalObjectId.TryParse(value, out var gid))
-            {
-                objValue = GlobalObjectId.GlobalObjectIdentifierToObjectSlow(gid);
-                return objValue != null;
-            }
-
-            var guid = AssetDatabase.AssetPathToGUID(value);
-            if (!string.IsNullOrEmpty(guid))
-            {
-                objValue = AssetDatabase.LoadMainAssetAtPath(value);
-                return true;
-            }
-
-            return false;
-        }
-
+        
         private void ParseMarker(in QueryMarker marker)
         {
             this.marker = marker;
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlock.cs
index 514e09b04e..c2111be4f1 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlock.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEditor.Search.Providers;
 using UnityEditorInternal;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -67,13 +68,23 @@ internal override Color GetBackgroundColor()
             return icon == null ? QueryColors.type : QueryColors.typeIcon;
         }
 
-        internal SearchProposition CreateProposition(SearchPropositionFlags flags, string label, string data, string help = "", int score = 0)
+        internal IEnumerable<SearchProposition> GetEnumPropositions<TEnum>(SearchPropositionFlags flags, string helpTemplate) where TEnum : System.Enum
+        {
+            foreach (var obj in Enum.GetValues(typeof(TEnum)))
+            {
+                var e = (TEnum)obj;
+                yield return new SearchProposition(category: GetCategory(flags), label: e.ToString(), help: $"{helpTemplate} {e}",
+                        data: e, priority: 0, icon: null, type: GetType(), color: GetBackgroundColor());
+            }
+        }
+
+        internal SearchProposition CreateProposition(SearchPropositionFlags flags, string label, object 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());
         }
 
-        internal SearchProposition CreateProposition(SearchPropositionFlags flags, string label, string data, string help, Texture2D icon, int score = 0)
+        internal SearchProposition CreateProposition(SearchPropositionFlags flags, string label, object 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());
@@ -81,13 +92,14 @@ internal SearchProposition CreateProposition(SearchPropositionFlags flags, strin
 
         internal override void CreateBlockElement(VisualElement container)
         {
-            if (!icon || alwaysDrawLabel)
+            if ((label == null && label != value) || alwaysDrawLabel)
             {
                 base.CreateBlockElement(container);
                 return;
             }
 
-            AddIcon(container, icon);
+            if (icon != null)
+                AddIcon(container, icon);
             AddLabel(container, label ?? value);
             AddOpenEditorArrow(container);
         }
@@ -415,4 +427,23 @@ public override IEnumerable<SearchProposition> GetPropositions(SearchProposition
             yield return CreateProposition(flags, "Main", "main", "Search main asset representation");
         }
     }
+
+    [QueryListBlock("Missing", "missing", "missing", ":")]
+    class QueryMissingBlock : QueryListBlock
+    {
+        public QueryMissingBlock(IQuerySource source, string id, string value, QueryListBlockAttribute attr)
+            : base(source, id, value, attr)
+        {
+            icon = Utils.LoadIcon("Filter Icon");
+            alwaysDrawLabel = false;
+        }
+
+        public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags)
+        {
+            foreach(var e in Enum.GetValues(typeof(MissingReferenceFilter)))
+            {
+                yield return CreateProposition(flags, e.ToString(), e, $"Missing {e}");
+            }
+        }
+    }
 }
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryWordBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryWordBlock.cs
index a90a7f1198..88b05afbe1 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryWordBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryWordBlock.cs
@@ -38,9 +38,10 @@ public override void Apply(in SearchProposition searchProposition)
 
         public static IEnumerable<SearchProposition> BuiltInQueryBuilderPropositions(string category = "Operators")
         {
-            var icon = Utils.LoadIcon("LayoutElement Icon");
-            yield return new SearchProposition(category: category, label: "OR", replacement: "or", icon: icon, color: QueryColors.combine);
-            yield return new SearchProposition(category: category, label: "AND", replacement: "and", icon: icon, color: QueryColors.combine);
+            foreach(var p in QueryEnginePropositionsExtension.GetCombiningOperatorPropositions(QueryEnginePropositionsExtension.CombiningOperatorPropositions.Default))
+            {
+                yield return p;
+            }
         }
     }
 
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/QueryBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/QueryBlock.cs
index 398fae3ed2..0879a3f3bc 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/QueryBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/QueryBlock.cs
@@ -136,7 +136,6 @@ void OpenMenu(Event evt)
             if (menu.GetItemCount() > 0)
             {
                 menu.ShowAsContext();
-                evt.Use();
             }
         }
 
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilder.cs b/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilder.cs
index a7210963d2..e36c662bfb 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilder.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilder.cs
@@ -69,6 +69,8 @@ public string wordText
             }
         }
 
+        internal QueryTextFieldBlock textBlock => m_TextBlock;
+
         public bool hasOwnText => m_SearchText != null;
 
         public bool valid => errors.Count == 0;
@@ -292,7 +294,7 @@ public bool Build()
                         break;
 
                     var wordBlock = newBlocks[w] as QueryWordBlock;
-                    if (!wordBlock.explicitQuotes && newBlocks.Remove(wordBlock))
+                    if (!wordBlock.explicitQuotes && !wordBlock.excluded && newBlocks.Remove(wordBlock))
                         wordText = (wordBlock.value + " " + wordText).Trim();
                 }
                 if (!string.IsNullOrEmpty(wordText))
@@ -560,7 +562,7 @@ public bool HandleKeyEvent(in Event evt)
                     return true;
                 }
             }
-            else if (evt.keyCode == KeyCode.RightArrow && cursorAtBeginning && !HasCharacterModifier(evt))
+            else if (evt.keyCode == KeyCode.RightArrow && !HasCharacterModifier(evt))
             {
                 var currentIndex = GetBlockIndex(currentBlock);
                 if (currentIndex != -1)
@@ -570,13 +572,17 @@ public bool HandleKeyEvent(in Event evt)
                         // Put focus back in the textfield:
                         m_TextBlock.GetSearchField()?.Focus();
                     }
+                    
                     SetSelection(currentIndex + 1);
                     evt.Use();
                     return true;
                 }
+                else
+                {
+                    m_TextBlock.GetSearchField()?.Focus();
+                }
             }
-            else if ((evt.keyCode == KeyCode.Backspace && cursorAtBeginning) ||
-                     (evt.keyCode == KeyCode.Delete && (cursorAtBeginning || cursorAtEnd)))
+            else if (evt.keyCode == KeyCode.Backspace || evt.keyCode == KeyCode.Delete)
             {
                 QueryBlock toRemoveBlock = currentBlock;
                 if (toRemoveBlock != null && !toRemoveBlock.@readonly)
@@ -657,6 +663,15 @@ public bool HandleGlobalKeyDown(KeyDownEvent evt)
                     return true;
                 }
             }
+            else if (evt.keyCode == KeyCode.LeftArrow)
+            {
+                var currentIndex = GetBlockIndex(currentBlock);
+                if (m_TextBlock != null && currentIndex == -1 && te != null && te.cursorIndex == 0 && blocks.Count > 0)
+                {
+                    SetSelection(blocks.Count - 1);
+                    return true;
+                }
+            }
 
             return false;
         }
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilderHelpers.cs b/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilderHelpers.cs
index a907b1399f..1d29cfb664 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilderHelpers.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilderHelpers.cs
@@ -153,9 +153,9 @@ internal static ISearchQuery CreateQuery(string queryStr)
             return q;
         }
 
-        public void UpdateTitle()
+        public void UpdateTitle(int count)
         {
-            title.text = ($"{displayName} ({queries.Count})");
+            title.text = ($"{displayName} ({count})");
         }
 
         public bool HasQuery(ISearchQuery query, out int index)
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/QueryEnginePropositionsExtensions.cs b/Modules/QuickSearch/Editor/QueryBuilder/QueryEnginePropositionsExtensions.cs
index 3ddd42f117..a44b1cade3 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/QueryEnginePropositionsExtensions.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/QueryEnginePropositionsExtensions.cs
@@ -9,10 +9,36 @@
 
 namespace UnityEditor.Search
 {
-    static class QueryEnginePropositionsExtenstion
+    static class CombiningOperatorPropositionsExtensions
+    {
+        public static bool HasAny(this QueryEnginePropositionsExtension.CombiningOperatorPropositions flags, QueryEnginePropositionsExtension.CombiningOperatorPropositions f) => (flags & f) != 0;
+        public static bool HasAll(this QueryEnginePropositionsExtension.CombiningOperatorPropositions flags, QueryEnginePropositionsExtension.CombiningOperatorPropositions all) => (flags & all) == all;
+    }
+
+    static class QueryEnginePropositionsExtension
     {
         const string k_BaseSearchPropositionDataKey = "searchproposition_";
 
+        [Flags]
+        public enum CombiningOperatorPropositions
+        {
+            None = 0,
+            And = 1 << 0,
+            Or = 1 << 1,
+            Default = And | Or
+        }
+
+        public static IEnumerable<SearchProposition> GetCombiningOperatorPropositions(CombiningOperatorPropositions props, string category = "Operators")
+        {
+            var icon = Utils.LoadIcon("LayoutElement Icon");
+
+            if (props.HasAny(CombiningOperatorPropositions.Or))
+                yield return new SearchProposition(category: category, label: "OR", replacement: "or", icon: icon, color: QueryColors.combine);
+
+            if (props.HasAny(CombiningOperatorPropositions.And))
+                yield return new SearchProposition(category: category, label: "AND", replacement: "and", icon: icon, color: QueryColors.combine);
+        }
+
         [Serializable]
         class SearchPropositionDescription
         {
@@ -148,15 +174,15 @@ public static SearchProposition GetPropositionFromKey(this IQueryEngineFilter fi
             return propositionDescription.ToSearchProposition();
         }
 
-        public static IEnumerable<SearchProposition> GetPropositions(this QueryEngine queryEngine)
+        public static IEnumerable<SearchProposition> GetPropositions(this QueryEngine queryEngine, CombiningOperatorPropositions props = CombiningOperatorPropositions.Default)
         {
-            return queryEngine.GetPropositions<object>();
+            return queryEngine.GetPropositions<object>(props);
         }
 
-        public static IEnumerable<SearchProposition> GetPropositions<TData>(this QueryEngine<TData> queryEngine)
+        public static IEnumerable<SearchProposition> GetPropositions<TData>(this QueryEngine<TData> queryEngine, CombiningOperatorPropositions props = CombiningOperatorPropositions.Default)
         {
             var filters = queryEngine.GetAllFilters();
-            return filters.SelectMany(f => f.GetPropositions());
+            return GetCombiningOperatorPropositions(props).Concat(filters.SelectMany(f => f.GetPropositions()));
         }
 
         public static IEnumerable<SearchProposition> GetPropositions(this IQueryEngineFilter filter)
@@ -287,7 +313,7 @@ public static void AddPropositionsFromFilterAttributes<TData, TAttribute>(this Q
                 if (mi.ReturnType == typeof(Vector4))
                     value = "(,,,)";
 
-                var replacement = $"{attr.token}{op}{value}";
+                var replacement = attr.propositionReplacement ?? $"{attr.token}{op}{value}";
 
                 var descriptionAttr = mi.GetAttribute<System.ComponentModel.DescriptionAttribute>();
                 if (descriptionAttr != null)
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/QueryMarker.cs b/Modules/QuickSearch/Editor/QueryBuilder/QueryMarker.cs
index 346be3a8a0..03b30a1f2e 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/QueryMarker.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/QueryMarker.cs
@@ -18,10 +18,21 @@ struct QueryMarkerArgument
         public IEnumerable<object> Evaluate(SearchContext context, bool reevaluateLiterals = false)
         {
             if (expression == null)
-                return new[] { rawText.ToString() };
-            if (expression.types.HasAny(SearchExpressionType.Literal) && !reevaluateLiterals)
-                return new[] { value };
-            return expression.Execute(context).Where(item => item != null).Select(item => item.value);
+            {
+                yield return rawText.ToString();
+            }
+            else if (expression.types.HasAny(SearchExpressionType.Literal) && !reevaluateLiterals)
+            {
+                yield return value;
+            }
+            else
+            {
+                var oldOptions = context.options;
+                context.options |= SearchFlags.Synchronous;
+                foreach (var r in expression.Execute(context).Where(item => item != null).Select(item => item.value))
+                    yield return r;
+                context.options = oldOptions;
+            }
         }
 
         public IEnumerable<object> Evaluate(bool reevaluateLiterals = false)
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/QuerySelector.cs b/Modules/QuickSearch/Editor/QueryBuilder/QuerySelector.cs
index 0649dbec12..a5464626e1 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/QuerySelector.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/QuerySelector.cs
@@ -174,6 +174,7 @@ public QuerySelector(Rect rect, IBlockSource dataSource, string title = null)
             maximumSize = new Vector2(Mathf.Max(rect.width, 400f), 450f);
 
             m_DataSource = new CallbackDataSource(BuildRoot);
+            m_DataSource.CurrentFolderContextualSearch = true;
             m_Gui = new QuerySelectorItemGUI(m_DataSource, this);
         }
 
@@ -203,8 +204,51 @@ private void Bind()
             m_DataSource.searchMatchItemComparer = new ItemPropositionComparer();
         }
 
-        private bool OnSearchItemMatch(in AdvancedDropdownItem item, in string[] words, out bool didMatchStart)
+        struct ItemSearchData
         {
+            public string data;
+            public int lastIndex;
+            public bool isValid => lastIndex != -1;
+        }
+
+        static ItemSearchData[] s_ItemSearchDatas = new ItemSearchData[2];
+        internal static bool DoSearchItemMatch(in AdvancedDropdownItem item, in string[] words, out bool didMatchStart)
+        {            
+            void PrepareItemData(int index, string data)
+            {
+                s_ItemSearchDatas[index].data = data;
+                s_ItemSearchDatas[index].lastIndex = -1;
+                if (!string.IsNullOrEmpty(data))
+                {
+                    s_ItemSearchDatas[index].lastIndex = data.LastIndexOf('(');
+                    s_ItemSearchDatas[index].lastIndex = s_ItemSearchDatas[index].lastIndex == -1 ? data.Length : s_ItemSearchDatas[index].lastIndex;
+                }
+            }
+
+            PrepareItemData(0, item.displayName);
+            PrepareItemData(1, item.name);
+
+            didMatchStart = false;
+            var fp = -1;
+            foreach (var w in words)
+            {                
+                for (var i = 0; i < s_ItemSearchDatas.Length; ++i)
+                {
+                    if (s_ItemSearchDatas[i].isValid)
+                    {
+                        fp = s_ItemSearchDatas[i].data.IndexOf(w, 0, s_ItemSearchDatas[i].lastIndex, StringComparison.OrdinalIgnoreCase);
+                        didMatchStart |= fp != -1 && (fp == 0 || s_ItemSearchDatas[i].data[fp - 1] == ' ');
+                        if (fp != -1)
+                            break;
+                    }
+                }
+
+                if (fp == -1)
+                    return false;
+            }
+            return fp != -1;
+
+            /*
             didMatchStart = false;
             var label = item.displayName ?? item.name;
             var pp = label.LastIndexOf('(');
@@ -214,9 +258,15 @@ private bool OnSearchItemMatch(in AdvancedDropdownItem item, in string[] words,
                 var fp = label.IndexOf(w, 0, pp, StringComparison.OrdinalIgnoreCase);
                 if (fp == -1)
                     return false;
-                didMatchStart |= (fp == 0 || label[fp-1] == ' ');
+                didMatchStart |= (fp == 0 || label[fp - 1] == ' ');
             }
             return true;
+            */
+        }
+
+        private bool OnSearchItemMatch(in AdvancedDropdownItem item, in string[] words, out bool didMatchStart)
+        {
+            return DoSearchItemMatch(item, words, out didMatchStart);            
         }
 
         private void OnClose(AdvancedDropdownWindow w = null)
@@ -246,11 +296,12 @@ protected override AdvancedDropdownItem BuildRoot()
                     prefix = path.Substring(0, ls);
                 }
 
+                var displayName = formatNames ? ObjectNames.NicifyVariableName(name) : name;
                 var newItem = new AdvancedDropdownItem(path)
                 {
-                    displayName = formatNames ? ObjectNames.NicifyVariableName(name) : name,
+                    displayName = displayName,
                     icon = p.icon ?? Icons.quicksearch,
-                    tooltip = p.help,
+                    tooltip = string.IsNullOrEmpty(p.help) ? $"Search {displayName}" : p.help,
                     userData = p
                 };
 
diff --git a/Modules/QuickSearch/Editor/QueryEngine/QueryEngineAttributes.cs b/Modules/QuickSearch/Editor/QueryEngine/QueryEngineAttributes.cs
index fa3cb674ce..a36f56b2d1 100644
--- a/Modules/QuickSearch/Editor/QueryEngine/QueryEngineAttributes.cs
+++ b/Modules/QuickSearch/Editor/QueryEngine/QueryEngineAttributes.cs
@@ -52,6 +52,8 @@ public class QueryEngineFilterAttribute : Attribute
         /// </summary>
         public bool useRegularExpressionToken;
 
+        internal string propositionReplacement;
+
         /// <summary>
         /// Create a filter with the corresponding token and supported operators.
         /// </summary>
diff --git a/Modules/QuickSearch/Editor/QueryEngine/QueryFilters.cs b/Modules/QuickSearch/Editor/QueryEngine/QueryFilters.cs
index b8fb1d645e..f28d1f4a45 100644
--- a/Modules/QuickSearch/Editor/QueryEngine/QueryFilters.cs
+++ b/Modules/QuickSearch/Editor/QueryEngine/QueryFilters.cs
@@ -259,9 +259,9 @@ void BuildFilterMatchers()
 
         void ValidateRegexToken()
         {
-            // Group 0 is the match, group 1 if the first group
-            if (regexToken.GetGroupNumbers().Length != 2)
-                Debug.LogWarning($"Filter regex \"{regexToken}\" must have exactly one capturing group.");
+            // Group 0 is the match, group 1 is the first group
+            if (regexToken.GetGroupNumbers().Length > 2)
+                Debug.LogWarning($"Filter regex \"{regexToken}\" cannot have more than one capturing group.");
         }
 
         public override int GetHashCode()
diff --git a/Modules/QuickSearch/Editor/QueryEngine/QueryTokenizer.cs b/Modules/QuickSearch/Editor/QueryEngine/QueryTokenizer.cs
index f136979b11..6319deb383 100644
--- a/Modules/QuickSearch/Editor/QueryEngine/QueryTokenizer.cs
+++ b/Modules/QuickSearch/Editor/QueryEngine/QueryTokenizer.cs
@@ -21,7 +21,7 @@ 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_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)(?!))\\})";
diff --git a/Modules/QuickSearch/Editor/SearchAnalytics.cs b/Modules/QuickSearch/Editor/SearchAnalytics.cs
index 54b169d530..3c9bc31bdb 100644
--- a/Modules/QuickSearch/Editor/SearchAnalytics.cs
+++ b/Modules/QuickSearch/Editor/SearchAnalytics.cs
@@ -261,7 +261,9 @@ public enum GenericEventType
             QuickSearchToggleBuilder,
             QuickSearchHelperWidgetExecuted,
 
-            ObjectSelectorSettingsReset
+            ObjectSelectorSettingsReset,
+
+            BrowseAssetStoreWeb
         }
 
         public static readonly string Package = "com.unity.quicksearch";
diff --git a/Modules/QuickSearch/Editor/SearchContext.cs b/Modules/QuickSearch/Editor/SearchContext.cs
index e9de9249ab..0691c2f147 100644
--- a/Modules/QuickSearch/Editor/SearchContext.cs
+++ b/Modules/QuickSearch/Editor/SearchContext.cs
@@ -30,6 +30,8 @@ class RuntimeSearchContext
         public SceneSearchContext sceneSearchContext => searchEngineContext.engineScope == SearchEngineScope.Scene ? (SceneSearchContext)searchEngineContext : null;
         public ObjectSelectorSearchContext selectorSearchContext => searchEngineContext.engineScope == SearchEngineScope.ObjectSelector ? (ObjectSelectorSearchContext)searchEngineContext : null;
 
+        public string contextId;
+
         Object m_CurrentObject;
         public Object currentObject
         {
@@ -138,6 +140,7 @@ public class SearchContext : IDisposable, ISerializationCallbackReceiver
         [SerializeField] private List<SearchProvider> m_SerializedProviders;
         [SerializeField] private int m_SerializedSearchViewInstanceID;
         [SerializeField] private string m_SerializedFilterType;
+        [SerializeField] private bool m_UseExplicitProvidersAsNormalProviders;
 
         /// <summary>
         /// Progress handle to set the search current progress.
@@ -288,7 +291,7 @@ public IEnumerable<SearchProvider> providers
                 if (m_Providers.Count == 1)
                     return m_Providers;
 
-                return m_Providers.Where(p => !p.isExplicitProvider);
+                return m_Providers.Where(p => !p.isExplicitProvider || useExplicitProvidersAsNormalProviders);
             }
         }
 
@@ -335,6 +338,12 @@ public IEnumerable<SearchProvider> providers
         /// </summary>
         public string filterId { get; private set; }
 
+        internal bool useExplicitProvidersAsNormalProviders
+        {
+            get => m_UseExplicitProvidersAsNormalProviders;
+            set => m_UseExplicitProvidersAsNormalProviders = value;
+        }
+
         /// <summary>
         /// This event is used to receive any async search result.
         /// </summary>
@@ -459,7 +468,9 @@ internal SearchContext(IEnumerable<SearchProvider> providers, RuntimeSearchConte
 
         public SearchContext(SearchContext context)
             : this(context.providers, context.searchText, context.options, context.runtimeContext)
-        {}
+        {
+            m_UseExplicitProvidersAsNormalProviders = context.m_UseExplicitProvidersAsNormalProviders;
+        }
 
         /// <summary>
         /// Search context finalizer.
@@ -554,14 +565,14 @@ internal void RemoveProvider(SearchProvider provider)
             UpdateProviders(() => m_Providers.Remove(provider));
         }
 
-        internal void SetProviders(IEnumerable<SearchProvider> providers = null)
+        internal void SetProviders(IEnumerable<SearchProvider> newProviders = null)
         {
             CheckDisposed();
             UpdateProviders(() =>
             {
                 m_Providers.Clear();
-                if (providers != null)
-                    m_Providers.AddRange(FilterProviders(providers));
+                if (newProviders != null)
+                    m_Providers.AddRange(FilterProviders(newProviders));
             });
         }
 
diff --git a/Modules/QuickSearch/Editor/SearchEngines/DefaultAdvancedObjectSelector.cs b/Modules/QuickSearch/Editor/SearchEngines/DefaultAdvancedObjectSelector.cs
index e98f366cdb..cef37d87b4 100644
--- a/Modules/QuickSearch/Editor/SearchEngines/DefaultAdvancedObjectSelector.cs
+++ b/Modules/QuickSearch/Editor/SearchEngines/DefaultAdvancedObjectSelector.cs
@@ -86,7 +86,9 @@ static void SelectObject(in AdvancedObjectSelectorParameters parameters)
                 selectContext.requiredTypeNames.First(), selectContext.requiredTypes.First());
             if (parameters.context.currentObject)
                 viewState.selectedIds = new int[] { parameters.context.currentObject.GetInstanceID()};
-            viewState.context.runtimeContext = new RuntimeSearchContext() { searchEngineContext = selectContext, pickerType = SearchPickerType.AdvancedSearchPicker };
+            viewState.context.runtimeContext = new RuntimeSearchContext() {
+                searchEngineContext = selectContext,
+                pickerType = SearchPickerType.AdvancedSearchPicker };
             s_Window = SearchService.ShowPicker(viewState) as SearchWindow;
         }
 
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/EnvarEvaluators.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/EnvarEvaluators.cs
index a16e327d42..de00eed901 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/EnvarEvaluators.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/EnvarEvaluators.cs
@@ -15,9 +15,7 @@ namespace UnityEditor.Search
 {
     static partial class Evaluators
     {
-        [Description("Returns the currently selected folder."), Category("Env")]
-        [SearchExpressionEvaluator]
-        public static IEnumerable<SearchItem> CurrentFolder(SearchExpressionContext c)
+        static string GetSelectedPath()
         {
             string currentSelectedPath = string.Empty;
             if (ProjectBrowser.s_LastInteractedProjectBrowser)
@@ -37,12 +35,31 @@ public static IEnumerable<SearchItem> CurrentFolder(SearchExpressionContext c)
                     }
                 }
             }
+            return currentSelectedPath;
+        }
 
+        [Description("Returns the currently selected folder."), Category("Env")]
+        [SearchExpressionEvaluator]
+        public static IEnumerable<SearchItem> CurrentFolder(SearchExpressionContext c)
+        {
+            var currentSelectedPath = GetSelectedPath();
             if (!string.IsNullOrEmpty(currentSelectedPath))
                 currentSelectedPath = currentSelectedPath.ConvertSeparatorsToUnity();
             yield return SearchExpression.CreateItem(currentSelectedPath, c.ResolveAlias("CurrentFolder"));
         }
 
+        [Description("Returns the currently selected folder name"), Category("Env")]
+        [SearchExpressionEvaluator]
+        public static IEnumerable<SearchItem> CurrentFolderName(SearchExpressionContext c)
+        {
+            var currentSelectedPath = GetSelectedPath();
+            if (!string.IsNullOrEmpty(currentSelectedPath))
+            {
+                currentSelectedPath = Path.GetFileName(currentSelectedPath);
+            }
+            yield return SearchExpression.CreateItem(currentSelectedPath, c.ResolveAlias("CurrentFolderName"));
+        }
+
         [Description("Returns the name of the current project."), Category("Env")]
         [SearchExpressionEvaluator]
         public static IEnumerable<SearchItem> ProjectName(SearchExpressionContext c)
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/QueryEvaluator.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/QueryEvaluator.cs
index 50fe69da86..fbb70f38a2 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/QueryEvaluator.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/QueryEvaluator.cs
@@ -23,10 +23,10 @@ public static IEnumerable<SearchItem> Query(SearchExpressionContext c)
             }
 
             // Resolve variables
-            var queryText = c.expression.innerText.ToString();
+            var queryText = UnEscapeExpressions(c.expression);
             if (c.items.Count > 0 && (queryText.Contains('$') || queryText.Contains('@')))
             {
-                foreach (Match m in QueryVariableRx.Matches(queryText.ToString()))
+                foreach (Match m in QueryVariableRx.Matches(queryText))
                 {
                     for (int i = 2; i < m.Groups.Count; i++)
                         queryText = ResolveVariable(queryText, m.Groups[1].Value, m.Groups[i].Value, c);
@@ -37,7 +37,7 @@ public static IEnumerable<SearchItem> Query(SearchExpressionContext c)
             if (c.args?.Length > 0)
                 return SpreadExpression(queryText, c);
 
-            return RunQuery(c, queryText.ToString());
+            return RunQuery(c, queryText);
         }
 
         public static IEnumerable<SearchItem> RunQuery(SearchExpressionContext c, string queryText)
@@ -111,5 +111,13 @@ static string ResolveVariable(string query, string token, string varName, Search
 
             return query.Replace(token + varName, v.ToString());
         }
+
+        static string UnEscapeExpressions(SearchExpression expression)
+        {
+            if (!expression.hasEscapedNestedExpressions)
+                return expression.innerText.ToString();
+
+            return ParserUtils.UnEscapeExpressions(expression.innerText);
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Parsers/NamedExpressionParser.cs b/Modules/QuickSearch/Editor/SearchExpression/Parsers/NamedExpressionParser.cs
index df36b8fc26..2a3719c660 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Parsers/NamedExpressionParser.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Parsers/NamedExpressionParser.cs
@@ -19,7 +19,7 @@ internal static SearchExpression NamedParser(SearchExpressionParserArgs args)
             if (!match.Success || match.Index != 0 || match.Groups["name"].Length == 0)
                 return null;
 
-            var expressionsStartAndLength = ParserUtils.GetExpressionsStartAndLength(text, out _);
+            var expressionsStartAndLength = ParserUtils.GetExpressionsStartAndLength(text, out _, out _);
             if (expressionsStartAndLength.Length != 1)
                 return null;
 
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Parsers/QueryExpressionParser.cs b/Modules/QuickSearch/Editor/SearchExpression/Parsers/QueryExpressionParser.cs
index 05bce2ee9e..eb550738e7 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Parsers/QueryExpressionParser.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Parsers/QueryExpressionParser.cs
@@ -15,7 +15,7 @@ internal static SearchExpression QueryParser(SearchExpressionParserArgs args)
         {
             var text = ParserUtils.SimplifyExpression(args.text);
             var nestedExpressions = new List<SearchExpression>();
-            var expressionsStartAndLength = ParserUtils.GetExpressionsStartAndLength(text, out _);
+            var expressionsStartAndLength = ParserUtils.GetExpressionsStartAndLength(text, out _, out var rootHasEscapedOpenersAndClosers);
             var lastExpressionEndIndex = 0;
             foreach (var expression in expressionsStartAndLength)
             {
@@ -34,7 +34,7 @@ internal static SearchExpression QueryParser(SearchExpressionParserArgs args)
                 lastExpressionEndIndex = expression.startIndex + expression.length - text.startIndex;
             }
 
-            return new SearchExpression(SearchExpressionType.QueryString, args.text, text, QueryEvaluator, nestedExpressions.ToArray());
+            return new SearchExpression(SearchExpressionType.QueryString, args.text, text, QueryEvaluator, nestedExpressions.ToArray(), rootHasEscapedOpenersAndClosers);
         }
     }
 }
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Parsers/SetExpressionParser.cs b/Modules/QuickSearch/Editor/SearchExpression/Parsers/SetExpressionParser.cs
index 154a0ec503..1eac993d9b 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Parsers/SetExpressionParser.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Parsers/SetExpressionParser.cs
@@ -17,7 +17,7 @@ internal static SearchExpression FixedSetParser(SearchExpressionParserArgs args)
             var text = ParserUtils.SimplifyExpression(outerText);
             if (text.length < 2 || text[0] != '[' || text[text.length - 1] != ']')
                 return null;
-            var expressions = ParserUtils.GetExpressionsStartAndLength(text, out _);
+            var expressions = ParserUtils.GetExpressionsStartAndLength(text, out _, out _);
             if (expressions.Length != 1 || expressions[0].startIndex != text.startIndex || expressions[0].length != text.length)
                 return null;
 
@@ -42,7 +42,7 @@ internal static SearchExpression ExpressionSetParser(SearchExpressionParserArgs
             if (text[0] != '{' || text[text.length - 1] != '}')
                 return null;
 
-            var expressions = ParserUtils.GetExpressionsStartAndLength(innerText, out var rootHasParameters);
+            var expressions = ParserUtils.GetExpressionsStartAndLength(innerText, out var rootHasParameters, out _);
             if (!rootHasParameters)
                 return null;
 
diff --git a/Modules/QuickSearch/Editor/SearchExpression/SearchExpression.cs b/Modules/QuickSearch/Editor/SearchExpression/SearchExpression.cs
index e30f4adb43..fd625dba34 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/SearchExpression.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/SearchExpression.cs
@@ -89,6 +89,7 @@ public class SearchExpression
         public readonly StringView outerText;
         public readonly StringView innerText;
         public readonly StringView alias;
+        internal bool hasEscapedNestedExpressions;
 
         // Evaluation fields
         internal readonly SearchExpressionEvaluator evaluator;
@@ -96,7 +97,7 @@ public class SearchExpression
 
         internal SearchExpression(SearchExpressionType types,
                                 StringView outerText, StringView innerText, StringView alias,
-                                SearchExpressionEvaluator evaluator, SearchExpression[] parameters)
+                                SearchExpressionEvaluator evaluator, SearchExpression[] parameters, bool hasEscapedNestedExpressions)
         {
             this.types = types;
             this.outerText = outerText;
@@ -104,50 +105,62 @@ internal SearchExpression(SearchExpressionType types,
             this.alias = alias;
             this.parameters = parameters ?? new SearchExpression[0];
             this.evaluator = evaluator;
+            this.hasEscapedNestedExpressions = hasEscapedNestedExpressions;
         }
 
+        internal SearchExpression(SearchExpressionType types,
+            StringView outerText, StringView innerText, StringView alias,
+            SearchExpressionEvaluator evaluator, SearchExpression[] parameters)
+            : this(types, outerText, innerText, alias, evaluator, parameters, false)
+        {}
+
         internal SearchExpression(SearchExpressionType types, StringView text)
-            : this(types, text, StringView.nil, StringView.nil, default, null)
+            : this(types, text, StringView.nil, StringView.nil, default, null, false)
         {
         }
 
         internal SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText)
-            : this(types, outerText, innerText, StringView.nil, default, null)
+            : this(types, outerText, innerText, StringView.nil, default, null, false)
         {
         }
 
         internal SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText, SearchExpressionEvaluator evaluator)
-            : this(types, outerText, innerText, StringView.nil, evaluator, null)
+            : this(types, outerText, innerText, StringView.nil, evaluator, null, false)
         {
         }
 
         internal SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText, SearchExpressionEvaluator evaluator, SearchExpression[] parameters)
-            : this(types, outerText, innerText, StringView.nil, evaluator, parameters)
+            : this(types, outerText, innerText, StringView.nil, evaluator, parameters, false)
+        {
+        }
+
+        internal SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText, SearchExpressionEvaluator evaluator, SearchExpression[] parameters, bool hasEscapedNestedExpressions)
+            : this(types, outerText, innerText, StringView.nil, evaluator, parameters, hasEscapedNestedExpressions)
         {
         }
 
         internal SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText, StringView alias, SearchExpressionEvaluator evaluator)
-            : this(types, outerText, innerText, alias, evaluator, null)
+            : this(types, outerText, innerText, alias, evaluator, null, false)
         {
         }
 
         internal SearchExpression(SearchExpressionType types, StringView text, SearchExpressionEvaluator evaluator)
-            : this(types, text, text, StringView.nil, evaluator, null)
+            : this(types, text, text, StringView.nil, evaluator, null, false)
         {
         }
 
         internal SearchExpression(SearchExpressionType types, StringView text, SearchExpressionEvaluator evaluator, SearchExpression[] parameters)
-            : this(types, text, text, StringView.nil, evaluator, parameters)
+            : this(types, text, text, StringView.nil, evaluator, parameters, false)
         {
         }
 
         internal SearchExpression(SearchExpression ex, SearchExpressionType types, StringView outerText, StringView innerText)
-            : this(types, outerText, innerText, ex.alias, ex.evaluator, ex.parameters)
+            : this(types, outerText, innerText, ex.alias, ex.evaluator, ex.parameters, false)
         {
         }
 
         internal SearchExpression(SearchExpression ex, StringView newAlias)
-            : this(ex.types, ex.outerText, ex.innerText, newAlias, ex.evaluator, ex.parameters)
+            : this(ex.types, ex.outerText, ex.innerText, newAlias, ex.evaluator, ex.parameters, false)
         {
         }
 
@@ -303,7 +316,9 @@ private IEnumerable<SearchItem> Evaluate(SearchExpressionContext c, SearchExpres
                     else if (!skipNull)
                     {
                         if (timeoutWatch.Elapsed.TotalSeconds > 3.0d)
+                        {
                             c.ThrowError("Timeout");
+                        }
                         yield return null;
                     }
                 }
@@ -315,7 +330,7 @@ internal SearchExpression Apply(string functionName, params SearchExpression[] a
             var see = EvaluatorManager.GetEvaluatorByNameDuringParsing(functionName, innerText);
             var seeArgs = new List<SearchExpression> { this };
             seeArgs.AddRange(args);
-            return new SearchExpression(SearchExpressionType.Function, StringView.nil, innerText, alias, see, seeArgs.ToArray());
+            return new SearchExpression(SearchExpressionType.Function, StringView.nil, innerText, alias, see, seeArgs.ToArray(), hasEscapedNestedExpressions);
         }
 
         public static bool TryConvertToDouble(SearchItem item, out double value, string selector = null)
diff --git a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionParser.cs b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionParser.cs
index 68efad5b10..87a5cb6b41 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionParser.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionParser.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Text;
 using System.Text.RegularExpressions;
 
 namespace UnityEditor.Search
@@ -218,13 +219,13 @@ public static StringView[] ExtractArguments(StringView text, string errorPrefix
                 if (currentStringTokenIndex != -1) // is in string
                     continue;
 
-                if (k_Openers.Any(c => c == paramsBlock[i]))
+                if (k_Openers.Any(c => c == paramsBlock[i]) && !IsEscaped(paramsBlock, i))
                 {
                     openersStack.Push(paramsBlock[i]);
                     continue;
                 }
 
-                if (k_Closers.Any(c => c == paramsBlock[i]))
+                if (k_Closers.Any(c => c == paramsBlock[i]) && !IsEscaped(paramsBlock, i))
                 {
                     if (CharMatchOpener(openersStack.Peek(), paramsBlock[i]))
                     {
@@ -311,9 +312,10 @@ public static bool HasQuotes(StringView sv)
             return c == sv.Last();
         }
 
-        public static StringView[] GetExpressionsStartAndLength(StringView text, out bool rootHasParameters)
+        public static StringView[] GetExpressionsStartAndLength(StringView text, out bool rootHasParameters, out bool rootHasEscapedOpenersAndClosers)
         {
             rootHasParameters = false;
+            rootHasEscapedOpenersAndClosers = false;
             var openersStack = new Stack<char>();
             var expressions = new List<StringView>();
             int firstOpenerIndex = -1;
@@ -337,6 +339,12 @@ public static StringView[] GetExpressionsStartAndLength(StringView text, out boo
 
                 if (k_Openers.Any(c => c == text[i]))
                 {
+                    if (IsEscaped(text, i))
+                    {
+                        rootHasEscapedOpenersAndClosers = true;
+                        continue;
+                    }
+
                     if (openersStack.Count == 0)
                         firstOpenerIndex = i;
                     openersStack.Push(text[i]);
@@ -345,6 +353,12 @@ public static StringView[] GetExpressionsStartAndLength(StringView text, out boo
 
                 if (k_Closers.Any(c => c == text[i]))
                 {
+                    if (IsEscaped(text, i))
+                    {
+                        rootHasEscapedOpenersAndClosers = true;
+                        continue;
+                    }
+
                     if (openersStack.Count == 0)
                         throw new SearchExpressionParseException($"Extra \"{text[i]}\" found", text.startIndex + i, 1);
                     if (CharMatchOpener(openersStack.Peek(), text[i]))
@@ -380,7 +394,7 @@ public static StringView SimplifyExpression(StringView outerText, bool trimLastW
             {
                 if (char.IsWhiteSpace(outerText[i]))
                     continue;
-                if (outerText[i] == '}')
+                if (outerText[i] == '}' && !IsEscaped(outerText, i))
                 {
                     nestedLevelsEnd.Push(i);
                     continue;
@@ -404,7 +418,7 @@ public static StringView SimplifyExpression(StringView outerText, bool trimLastW
                     }
                     if (isInString)
                         continue;
-                    if (outerText[i] == '{')
+                    if (outerText[i] == '{' && !IsEscaped(outerText, i))
                     {
                         nestedLevelsStart.Push(i);
                         // if part can't be trimmed we must not keep the { so we keep track of how many
@@ -414,7 +428,7 @@ public static StringView SimplifyExpression(StringView outerText, bool trimLastW
                     }
                     if (!nestedLevelsStart.Any() || !nestedLevelsEnd.Any())
                         break;
-                    if (outerText[i] == '}')
+                    if (outerText[i] == '}' && !IsEscaped(outerText, i))
                     {
                         if (nonTrimmableOpeners == 0 && i == nestedLevelsEnd.Peek() && nestedLevelsStart.Count == nestedLevelsEnd.Count)
                         {
@@ -461,5 +475,47 @@ public static string ReplaceSelectorInExpr(string originalExpr, Func<string, str
             });
             return re.Replace(originalExpr, evaluator);
         }
+
+        public static bool IsEscaped(StringView sv, int index)
+        {
+            if (index <= 0 || index >= sv.length)
+                return false;
+            return IsEscapeChar(sv[index - 1]);
+        }
+
+        public static bool IsEscaped(string s, int index)
+        {
+            return IsEscaped(new StringView(s), index);
+        }
+
+        public static bool IsEscapeChar(char c)
+        {
+            return c == '\\';
+        }
+
+        public static string UnEscapeExpressions(StringView sv)
+        {
+            var sb = new StringBuilder();
+            var length = sv.length;
+            var usableLength = length - 1;
+            for (var i = 0; i < sv.length; ++i)
+            {
+                var c = sv[i];
+                if (i < usableLength && IsEscapeChar(c))
+                {
+                    var nextC = sv[i + 1];
+                    if (IsOpener(nextC) || IsCloser(nextC))
+                        continue;
+                }
+                sb.Append(c);
+            }
+
+            return sb.ToString();
+        }
+
+        public static string UnEscapeExpressions(string expression)
+        {
+            return UnEscapeExpressions(new StringView(expression));
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/SearchExpression/SearchItemQueryEngine.cs b/Modules/QuickSearch/Editor/SearchExpression/SearchItemQueryEngine.cs
index a587b7ae38..9278fc69a5 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/SearchItemQueryEngine.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/SearchItemQueryEngine.cs
@@ -542,7 +542,50 @@ private static bool PropertyStringCompare(in SearchValue v, string s, Func<strin
             {
                 if (string.Equals(s, "none", StringComparison.Ordinal) && string.Equals(v.text, string.Empty, StringComparison.Ordinal))
                     return comparer(s, "none");
-                return !string.IsNullOrEmpty(v.text) && comparer(v.text, s);
+                if (string.IsNullOrEmpty(v.text))
+                    return false;
+
+                // Test with the value as is.
+                if (comparer(v.text, s))
+                    return true;
+
+                // Could be an asset path, try to resolve it.
+                if (!v.text.StartsWith("/") && AssetDatabase.AssetPathExists(v.text))
+                {
+                    var obj = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(v.text);
+
+                    // Compare with the name of the asset.
+                    return obj != null && comparer(obj.name, s);
+                }
+
+                // Might be a global object id, try to resolve it.
+                // Note: do this last, as it is slow.
+                if (v.text.StartsWith("GlobalObjectId", StringComparison.Ordinal) && GlobalObjectId.TryParse(v.text, out var goid))
+                {
+                    var obj = GlobalObjectId.GlobalObjectIdentifierToObjectSlow(goid);
+                    if (obj == null)
+                        return false;
+
+                    // Compare name of the object.
+                    if (comparer(obj.name, s))
+                        return true;
+
+                    if (obj is Component c)
+                    {
+                        var tp = SearchUtils.GetTransformPath(c.gameObject.transform);
+                        return comparer(tp, s);
+                    }
+
+                    var assetPath = AssetDatabase.GetAssetPath(obj);
+                    if (!string.IsNullOrEmpty(assetPath) && Utils.IsBuiltInResource(assetPath))
+                        return comparer(assetPath, s);
+
+                    if (obj is GameObject go)
+                    {
+                        var tp = SearchUtils.GetTransformPath(go.transform);
+                        return comparer(tp, s);
+                    }
+                }
             }
             if (v.type == ValueType.Bool)
             {
@@ -566,6 +609,7 @@ private static bool PropertyColorCompare(in SearchValue v, SearchColor value, Fu
         [PropertyDatabaseSerializer(typeof(SearchValue))]
         internal static PropertyDatabaseRecordValue SearchValueSerializer(PropertyDatabaseSerializationArgs args)
         {
+            // TODO: Figure out why vectors use strings instead of saving the data directly in the record value
             int stringSymbol;
             var gop = (SearchValue)args.value;
             switch (gop.type)
@@ -643,7 +687,7 @@ internal static object SearchValueDeserializer(PropertyDatabaseDeserializationAr
 
     class SearchItemQueryEngine : QueryEngine<SearchItem>
     {
-        static Regex PropertyFilterRx = new Regex(@"[\@\$]([#\w\d\.]+)");
+        static Regex PropertyFilterRx = new Regex(@"[\@\$]([#\w\d\.\[\]]+)");
 
         SearchExpressionContext m_Context;
 
diff --git a/Modules/QuickSearch/Editor/SearchExpression/TaskEvaluatorManager.cs b/Modules/QuickSearch/Editor/SearchExpression/TaskEvaluatorManager.cs
index ca4b9be448..08c905ae3b 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/TaskEvaluatorManager.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/TaskEvaluatorManager.cs
@@ -85,7 +85,7 @@ internal static IEnumerable<SearchItem> Evaluate(SearchExpressionContext c, Sear
                 }
             });
 
-            while (!concurrentList.IsEmpty || !TaskHelper.IsTaskFinished(task))
+            while (!TaskHelper.IsTaskFinished(task) || !concurrentList.IsEmpty)
             {
                 if (cancelToken.IsCancellationRequested)
                 {
@@ -101,7 +101,9 @@ internal static IEnumerable<SearchItem> Evaluate(SearchExpressionContext c, Sear
                     yield return null;
                 }
                 while (concurrentList.TryTake(out var item))
+                {
                     yield return item;
+                }
             }
 
             yieldSignal.Dispose();
diff --git a/Modules/QuickSearch/Editor/SearchItem.cs b/Modules/QuickSearch/Editor/SearchItem.cs
index 0733549262..6c3bb423e2 100644
--- a/Modules/QuickSearch/Editor/SearchItem.cs
+++ b/Modules/QuickSearch/Editor/SearchItem.cs
@@ -126,7 +126,6 @@ public class SearchItem : IEquatable<SearchItem>, IComparable<SearchItem>, IComp
         public static readonly SearchItem none = new SearchItem(Guid.NewGuid().ToString())
         {
             label = "None",
-            description = "Clear the current value",
             score = int.MinValue,
             provider = defaultProvider,
             options = SearchItemOptions.CustomAction
diff --git a/Modules/QuickSearch/Editor/SearchList.cs b/Modules/QuickSearch/Editor/SearchList.cs
index d7e425e897..7f341ac6a9 100644
--- a/Modules/QuickSearch/Editor/SearchList.cs
+++ b/Modules/QuickSearch/Editor/SearchList.cs
@@ -438,6 +438,11 @@ public bool Add(SearchItem item)
                 var itemHash = item.GetHashCode();
                 if (m_IdHashes.Contains(itemHash))
                 {
+                    // TODO: We should revisit this. There is an inconsistency in how we deal with ordering and score.
+                    // If an item has the same id, a higher score (high score=sorted last) but sorted first based on the sorting method, it will not be replaced by the new item.
+                    // Which is ok if we consider that we want to keep the first result based on the sorting method. However,
+                    // if the existing item is sorted last, but has a lower score (lower score=sorted first), it will not be replaced and the new item will not be added, so the behavior
+                    // is not the same as the other case.
                     var startIndex = m_Items.BinarySearch(item, m_Comparer);
                     if (startIndex < 0)
                         startIndex = ~startIndex;
@@ -494,6 +499,7 @@ void IGroup.SortBy(ISearchListComparer comparer)
             }
         }
 
+        internal const string allGroupId = "all";
         private int m_CurrentGroupIndex = 0;
         private string m_CurrentGroupId;
         private readonly List<IGroup> m_Groups = new List<IGroup>();
@@ -623,7 +629,7 @@ public override void Clear()
             if (m_Groups.Count == 0)
             {
                 m_CurrentGroupIndex = 0;
-                m_Groups.Add(new Group("all", "all", "All", m_DefaultComparer, int.MinValue));
+                m_Groups.Add(new Group(allGroupId, allGroupId, "All", m_DefaultComparer, int.MinValue));
                 AddDefaultGroups();
             }
             else
@@ -657,7 +663,7 @@ public string currentGroup
         {
             get
             {
-                return m_CurrentGroupId ?? "all";
+                return m_CurrentGroupId ?? allGroupId;
             }
 
             set
@@ -814,6 +820,7 @@ public ConcurrentSearchList(SearchContext searchContext) : base(searchContext)
         {
             m_UnorderedItems = new ConcurrentBag<SearchItem>();
             searchContext.sessionStarted += SearchContextOnsessionStarted;
+            m_SearchStarted = searchContext.searchInProgress;
         }
 
         protected override void Dispose(bool disposing)
diff --git a/Modules/QuickSearch/Editor/SearchMonitor.cs b/Modules/QuickSearch/Editor/SearchMonitor.cs
index 16d7b5fed7..bb94e0f92b 100644
--- a/Modules/QuickSearch/Editor/SearchMonitor.cs
+++ b/Modules/QuickSearch/Editor/SearchMonitor.cs
@@ -6,11 +6,13 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using UnityEditor.SceneManagement;
+using UnityEditorInternal;
 using UnityEngine;
 
 
@@ -18,13 +20,16 @@ namespace UnityEditor.Search
 {
     public readonly struct AssetIndexChangeSet
     {
+        static readonly string[] s_EmptyStrings = new string[0];
+        internal static readonly AssetIndexChangeSet s_Empty = new AssetIndexChangeSet(null, null);
+        
         public readonly string[] updated;
         public readonly string[] removed;
 
         public AssetIndexChangeSet(string[] updated, string[] removed)
         {
-            this.removed = removed;
-            this.updated = updated;
+            this.removed = removed ?? s_EmptyStrings;
+            this.updated = updated ?? s_EmptyStrings;
         }
 
         public AssetIndexChangeSet(IEnumerable<string> updated, IEnumerable<string> removed, IEnumerable<string> moved, Func<string, bool> predicate)
@@ -38,7 +43,7 @@ public AssetIndexChangeSet(IEnumerable<string> updated, IEnumerable<string> remo
             this.removed = removed.Distinct().Where(predicate).ToArray();
         }
 
-        public bool empty => updated?.Length == 0 && removed?.Length == 0;
+        public bool empty => updated == null || removed == null || (updated.Length == 0 && removed.Length == 0);
         public IEnumerable<string> all => updated?.Concat(removed ?? new string[0]).Distinct() ?? Enumerable.Empty<string>();
     }
 
@@ -190,11 +195,13 @@ public static class SearchMonitor
         static readonly HashSet<string> s_MovedItems = new HashSet<string>();
 
         static Action s_ContentRefreshOff;
-        static Action s_DelayedInvalidateOff;
+        static Delayer s_DelayedInvalidate;
         static readonly HashSet<ulong> s_DocumentsToInvalidate = new HashSet<ulong>();
 
         public static bool pending => s_UpdatedItems.Count > 0 || s_RemovedItems.Count > 0 || s_MovedItems.Count > 0;
 
+        internal static bool enabled => InternalEditorUtility.isHumanControllingUs || File.Exists("Assets/Editor/test_search_monitor.txt");
+
         public static event Action sceneChanged;
         public static event ObjectChangeEvents.ObjectChangeEventsHandler objectChanged;
         public static event Action documentsInvalidated;
@@ -229,9 +236,19 @@ public static event Action<string[], string[], string[]> contentRefreshed
             }
         }
 
+        static double refreshContentDelay
+        {
+            get
+            {
+                if (Utils.runningTests)
+                    return 0d;
+                return 1d;
+            }
+        }
+
         static SearchMonitor()
         {
-            if (!Utils.IsMainProcess())
+            if (!Utils.IsMainProcess() || !enabled)
                 return;
 
             if (!EditorApplication.isPlayingOrWillChangePlaymode)
@@ -256,8 +273,13 @@ static void Init()
             EditorApplication.quitting += OnQuitting;
             AssemblyReloadEvents.beforeAssemblyReload += OnBeforeAssemblyReload;
             EditorSceneManager.activeSceneChangedInEditMode += (_, __) => InvalidateCurrentScene();
+            EditorSceneManager.sceneOpened += (scene, mode) => InvalidateCurrentScene();
+            EditorSceneManager.sceneClosed += scene => InvalidateCurrentScene();
             PrefabStage.prefabStageOpened += _ => InvalidateCurrentScene();
             PrefabStage.prefabStageClosing += _ => InvalidateCurrentScene();
+            EditorApplication.playModeStateChanged += _ => InvalidateCurrentScene();
+
+            s_DelayedInvalidate = Delayer.Debounce(_ => InvalidateDocuments());
 
             ObjectChangeEvents.changesPublished += OnObjectChanged;
             EditorApplication.playModeStateChanged += OnPlayModeChanged;
@@ -268,7 +290,7 @@ static void Init()
         public static AssetIndexChangeSet GetDiff(long timestamp, IEnumerable<string> deletedAssets, Func<string, bool> predicate)
         {
             if (s_TransactionManager == null)
-                return default;
+                return AssetIndexChangeSet.s_Empty;
 
             var updated = new HashSet<string>();
             var moved = new HashSet<string>();
@@ -304,7 +326,7 @@ public static void RaiseContentRefreshed(string[] updated, string[] removed, str
             {
                 Log("Content changed", (ulong)(s_UpdatedItems.Count + s_RemovedItems.Count + s_MovedItems.Count));
                 s_ContentRefreshOff?.Invoke();
-                s_ContentRefreshOff = Utils.CallDelayed(RaiseContentRefreshed, 1d);
+                s_ContentRefreshOff = Utils.CallDelayed(RaiseContentRefreshed, refreshContentDelay);
             }
         }
 
@@ -507,8 +529,7 @@ private static void InvalidateDocument(string documentId)
         private static void InvalidateDocument(ulong documentKey)
         {
             s_DocumentsToInvalidate.Add(documentKey);
-            if (s_DelayedInvalidateOff == null)
-                s_DelayedInvalidateOff = Utils.CallDelayed(InvalidateDocuments, 1f);
+            s_DelayedInvalidate?.Execute();
         }
 
         private static void InvalidateDocuments()
@@ -519,7 +540,6 @@ private static void InvalidateDocuments()
                     view.InvalidateDocument(k);
             }
             s_DocumentsToInvalidate.Clear();
-            s_DelayedInvalidateOff = null;
             documentsInvalidated?.Invoke();
         }
 
diff --git a/Modules/QuickSearch/Editor/SearchPreviewManager.cs b/Modules/QuickSearch/Editor/SearchPreviewManager.cs
index 65a90083c2..1d6df80674 100644
--- a/Modules/QuickSearch/Editor/SearchPreviewManager.cs
+++ b/Modules/QuickSearch/Editor/SearchPreviewManager.cs
@@ -101,7 +101,7 @@ class SearchPreviewManager
         ConcurrentDictionary<SearchPreviewKey, SearchPreview> m_PreviewCollections = new();
         ConcurrentDictionary<SearchPreviewKey, SearchPreviewAsyncFetch> m_FetchPreviewOffs = new();
 
-        public int poolSize { get; }
+        public int poolSize { get; set; }
         public int count => m_PreviewCollections.Count;
 
         public SearchPreviewManager(int poolSize)
diff --git a/Modules/QuickSearch/Editor/SearchProvider.cs b/Modules/QuickSearch/Editor/SearchProvider.cs
index f251fdecb4..46810eba52 100644
--- a/Modules/QuickSearch/Editor/SearchProvider.cs
+++ b/Modules/QuickSearch/Editor/SearchProvider.cs
@@ -82,6 +82,11 @@ public enum ShowDetailsOptions
         /// </summary>
         DefaultGroup = 1 << 5,
 
+        /// <summary>
+        /// Show inspector of this provider without a header.
+        /// </summary>
+        InspectorWithoutHeader = 1 << 6,
+
         /// <summary>
         /// Default set of options used when [[showDetails]] is set to true.
         /// </summary>
@@ -392,7 +397,7 @@ private void CopyFrom(SearchProvider templateProvider)
         }
 
         private static object DefaultFetchItems(SearchContext context, List<SearchItem> items, SearchProvider provider) => null;
-        private string DefaultFetchLabel(SearchItem item, SearchContext context) => item.id ?? string.Empty;
+        private string DefaultFetchLabel(SearchItem item, SearchContext context) => item.label ?? item.id ?? string.Empty;
         private static Texture2D DefaultFetchThumbnail(SearchItem item, SearchContext context) => Icons.quicksearch;
 
         /// <summary>
diff --git a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryAsset.cs b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryAsset.cs
index 637e6d8c37..36ed5fe308 100644
--- a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryAsset.cs
+++ b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryAsset.cs
@@ -16,8 +16,10 @@ namespace UnityEditor.Search
     /// Asset storing a query that will be executable by a SearchEngine.
     /// </summary>
     [Serializable, ExcludeFromPreset]
+    [HelpURL("search-usage")]
     class SearchQueryAsset : ScriptableObject, ISearchQuery
     {
+        static bool s_ListeningToAssetChanges = false;
         static List<SearchQueryAsset> s_SavedQueries;
 
         private long m_CreationTime;
@@ -136,13 +138,28 @@ public string tooltip
             }
         }
 
+        internal static void ContentRefreshed(string[] updated, string[] removed, string[] moved)
+        {
+            if (updated.Any(p => p.EndsWith(".asset")) || removed.Any(p => p.EndsWith(".asset")))
+            {
+                ResetSearchQueryItems();
+                Dispatcher.Emit(SearchEvent.ProjectQueryListChanged, new SearchEventPayload((ISearchElement)null));
+            }
+        }
+
         internal static IEnumerable<SearchQueryAsset> savedQueries
         {
             get
             {
-                if (s_SavedQueries == null || s_SavedQueries.Any(qs => !qs))
-                    s_SavedQueries = EnumerateAll().Where(asset => asset != null).ToList();
-
+                if (s_SavedQueries == null)
+                {
+                    if (!s_ListeningToAssetChanges)
+                    {
+                        SearchMonitor.contentRefreshed += ContentRefreshed;
+                        s_ListeningToAssetChanges = true;
+                    }
+                    s_SavedQueries = EnumerateAll().Where(asset => asset).ToList();
+                }
                 return s_SavedQueries.Where(s => s);
             }
         }
diff --git a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryEditor.cs b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryEditor.cs
index 6c6b50f25d..65ea819c5f 100644
--- a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryEditor.cs
+++ b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryEditor.cs
@@ -19,10 +19,13 @@ class SearchQueryEditor : Editor
         private SerializedProperty m_IconProperty;
         private SerializedProperty m_ViewStateProperty;
         private ScrollView m_InspectorScrollView;
+        private VisualElement m_EditorContainer;
         private VisualElement m_HeaderElement;
-
+        private bool m_HasPreview;
         private SearchQueryAsset query => target as SearchQueryAsset;
 
+        VisualElement m_Body;
+
         public override bool RequiresConstantRepaint() => false;
         public override bool UseDefaultMargins() => false;
         internal override bool CanOpenMultipleObjects() => false;
@@ -42,14 +45,16 @@ public void OnEnable()
             var newViewState = new SearchViewState();
             newViewState.Assign(query.GetViewState());
             newViewState.flags |= UnityEngine.Search.SearchViewFlags.DisableQueryHelpers;
-            m_ResultView = new SearchView(newViewState);
+            m_ResultView = new SearchView(newViewState, GetInstanceID());
+            m_ResultView.AddToClassList("result-view");
+            m_HasPreview = true;
         }
 
         public override VisualElement CreateInspectorGUI()
         {
-            var body = new VisualElement();
-            body.AddToClassList("search-inspector");
-            SearchElement.AppendStyleSheets(body);
+            m_Body = new VisualElement();
+            m_Body.AddToClassList("search-inspector");
+            SearchElement.AppendStyleSheets(m_Body);
 
             m_HeaderElement = new VisualElement();
             m_HeaderElement.AddToClassList("search-inspector-header");
@@ -57,19 +62,39 @@ public override VisualElement CreateInspectorGUI()
 
             m_HeaderElement.Add(new UIElements.PropertyField(m_IsSearchTemplateProperty));
             m_HeaderElement.Add(new UIElements.PropertyField(m_IconProperty));
-            m_HeaderElement.Add(new UIElements.PropertyField(m_TextProperty));
+
+            var searchTextElement = new VisualElement();
+            searchTextElement.style.flexDirection = FlexDirection.Row;
+            var searchQueryTextEditor = new UIElements.PropertyField(m_TextProperty);
+            searchQueryTextEditor.style.flexGrow = 1;
+            searchQueryTextEditor.RegisterValueChangeCallback(evt => {
+                if (evt.changedProperty.stringValue != m_ResultView.context.searchText)
+                {
+                    m_ResultView.context.searchText = evt.changedProperty.stringValue;
+                    m_ResultView.Refresh();
+                }
+            });
+            searchTextElement.Add(searchQueryTextEditor);
+            var refreshButton = new Button(() =>
+            {
+                m_ResultView.Refresh();
+            });
+            refreshButton.text = L10n.Tr("Refresh");
+            searchTextElement.Add(refreshButton);
+
+            m_HeaderElement.Add(searchTextElement);
             m_HeaderElement.Add(new UIElements.PropertyField(m_DescriptionProperty));
 
             if (Unsupported.IsSourceBuild())
                 m_HeaderElement.Add(new UIElements.PropertyField(m_ViewStateProperty, "Debug View State") { });
             m_HeaderElement.Add(new SearchGroupBar("", m_ResultView));
 
-            body.Add(m_HeaderElement);
-            body.Add(m_ResultView);
+            m_Body.Add(m_HeaderElement);
+            m_Body.Add(m_ResultView);
 
             m_ResultView.RegisterCallback<AttachToPanelEvent>(OnBodyAttached);
             m_ResultView.RegisterCallback<DetachFromPanelEvent>(OnBodyDetached);
-            return body;
+            return m_Body;
         }
 
         private void OnBodyAttached(AttachToPanelEvent evt)
@@ -82,6 +107,9 @@ private void OnBodyAttached(AttachToPanelEvent evt)
             // the available space in the inspector. Therefore, we query the scrollview of the inspector
             // and resize the result view based its size.
             m_InspectorScrollView = body?.GetFirstAncestorOfType<ScrollView>();
+            var searchDetails = body?.GetFirstAncestorWhere(el => el.name == "SearchDetailViewContainer");
+            m_EditorContainer = searchDetails ?? m_InspectorScrollView;
+            m_HasPreview = searchDetails == null;
             if (m_InspectorScrollView != null)
             {
                 m_InspectorScrollView.RegisterCallback<GeometryChangedEvent>(ResizeResultView);
@@ -93,6 +121,7 @@ private void OnBodyAttached(AttachToPanelEvent evt)
 
         private void OnBodyDetached(DetachFromPanelEvent evt)
         {
+            m_EditorContainer = null;
             if (m_InspectorScrollView != null)
             {
                 m_InspectorScrollView.UnregisterCallback<GeometryChangedEvent>(ResizeResultView);
@@ -109,14 +138,16 @@ private void ResizeResultView(GeometryChangedEvent evt)
 
         private void ResizeResultView()
         {
-            if (m_InspectorScrollView == null || m_ResultView == null || m_HeaderElement == null)
+            if (m_EditorContainer == null || m_ResultView == null || m_HeaderElement == null)
                 return;
 
             // To avoid the 2 scrollbars situation, we resize the result view according to the size available in the scrollview.
-            m_ResultView.style.height = m_InspectorScrollView.worldBound.yMax - m_HeaderElement.worldBound.yMax;
+            var newHeight = Mathf.Max(m_EditorContainer.worldBound.yMax - m_HeaderElement.worldBound.yMax, 100);
+            if (m_ResultView.style.height != newHeight)
+                m_ResultView.style.height = newHeight;
         }
 
-        public override bool HasPreviewGUI() => true;
+        public override bool HasPreviewGUI() => m_HasPreview;
 
         public override void DrawPreview(Rect previewArea)
         {
@@ -158,7 +189,15 @@ public override string GetInfoString()
 
         public void OnDisable()
         {
+            // Clear body to prevent accessing disposed properties.
+            m_Body.Clear();
+
             m_ResultView?.Dispose();
+            m_DescriptionProperty.Dispose();
+            m_TextProperty.Dispose();
+            m_IsSearchTemplateProperty.Dispose();
+            m_IconProperty.Dispose();
+            m_ViewStateProperty.Dispose();
         }
     }
 }
diff --git a/Modules/QuickSearch/Editor/SearchSelection.cs b/Modules/QuickSearch/Editor/SearchSelection.cs
index 58ab84f60a..7eb3f95800 100644
--- a/Modules/QuickSearch/Editor/SearchSelection.cs
+++ b/Modules/QuickSearch/Editor/SearchSelection.cs
@@ -13,6 +13,7 @@ namespace UnityEditor.Search
     /// </summary>
     public class SearchSelection : IReadOnlyCollection<SearchItem>
     {
+        int m_ListInitialCount;
         private ISearchList m_List;
         private IList<int> m_Selection;
         private List<SearchItem> m_Items;
@@ -26,6 +27,7 @@ public SearchSelection(IList<int> selection, ISearchList filteredItems)
         {
             m_Selection = selection;
             m_List = filteredItems;
+            m_ListInitialCount = m_List.Count;
         }
 
         public SearchSelection(IEnumerable<SearchItem> items)
@@ -37,6 +39,22 @@ public SearchSelection(IEnumerable<SearchItem> items)
             m_List = null;
         }
 
+        internal bool SyncSelectionIfInvalid()
+        {
+            if (m_Items == null)
+                // Will be sync next time it is accessed
+                return false;
+            if (m_List == null)
+                return false;
+
+            if (m_Selection.Count != m_Items.Count || m_List.Count != m_ListInitialCount)
+            {
+                BuildSelection();
+                return true;
+            }
+            return false;
+        }
+
         internal IList<int> indexes => m_Selection;
 
         /// <summary>
@@ -113,8 +131,17 @@ private void BuildSelection()
             m_Items = new List<SearchItem>(m_Selection.Count);
             if (m_List == null)
                 return;
+
+            if (m_List.Count != m_ListInitialCount)
+            {
+                m_Selection = new List<int>(m_Selection.Where(index => index >= 0 && index < m_List.Count));
+                m_ListInitialCount = m_List.Count;
+            }
+
             foreach (var s in m_Selection)
+            {
                 m_Items.Add(m_List.ElementAt(s));
+            }
         }
 
         public bool Contains(SearchItem item)
diff --git a/Modules/QuickSearch/Editor/SearchService.cs b/Modules/QuickSearch/Editor/SearchService.cs
index 5fbdc6f9ef..8e768e044e 100644
--- a/Modules/QuickSearch/Editor/SearchService.cs
+++ b/Modules/QuickSearch/Editor/SearchService.cs
@@ -158,6 +158,11 @@ public static void RefreshWindows()
             if (EditorApplication.isPlayingOrWillChangePlaymode && !SearchSettings.refreshSearchWindowsInPlayMode)
                 return;
 
+            ForceRefreshWindows();
+        }
+
+        internal static void ForceRefreshWindows()
+        {
             var windows = Resources.FindObjectsOfTypeAll<SearchWindow>();
             if (windows == null)
                 return;
@@ -323,6 +328,11 @@ internal static SearchContext CreateContext(RuntimeSearchContext runtimeContext,
         /// <param name="options">Options defining how the query will be performed</param>
         /// <returns>A list of search items matching the search query.</returns>
         public static List<SearchItem> GetItems(SearchContext context, SearchFlags options = SearchFlags.Default)
+        {
+            return GetItems(context, GetNewSessionGuid(), options);
+        }
+
+        static List<SearchItem> GetItems(SearchContext context, Hash128 sessionGuid, SearchFlags options = SearchFlags.Default)
         {
             // Stop all search sessions every time there is a new search.
             context.sessions.StopAllAsyncSearchSessions();
@@ -330,13 +340,13 @@ public static List<SearchItem> GetItems(SearchContext context, SearchFlags optio
             context.sessionEnded -= OnSearchEnded;
             context.sessionEnded += OnSearchEnded;
 
-            context.sessions.StartSessions(context);
+            context.sessions.StartSessions(context, sessionGuid);
 
             if (options.HasAny(SearchFlags.WantsMore))
                 context.wantsMore = true;
 
-            if (options.HasAny(SearchFlags.Synchronous))
-                context.options |= SearchFlags.Synchronous;
+            // Transfer all options from options to context.options
+            context.options |= options;
 
             int fetchProviderCount = 0;
             var allItems = new List<SearchItem>(3);
@@ -344,7 +354,7 @@ public static List<SearchItem> GetItems(SearchContext context, SearchFlags optio
             if (TryParseExpression(context, out var expression))
             {
                 var iterator = EvaluateExpression(expression, context);
-                HandleItemsIteratorSession(iterator, allItems, s_SearchServiceProvider, context, options);
+                HandleItemsIteratorSession(iterator, allItems, s_SearchServiceProvider, context);
                 fetchProviderCount++;
             }
             else
@@ -357,7 +367,7 @@ public static List<SearchItem> GetItems(SearchContext context, SearchFlags optio
                         watch.Start();
                         fetchProviderCount++;
                         var iterator = provider.fetchItems(context, allItems, provider);
-                        HandleItemsIteratorSession(iterator, allItems, provider, context, options);
+                        HandleItemsIteratorSession(iterator, allItems, provider, context);
                         provider.RecordFetchTime(watch.Elapsed.TotalMilliseconds);
                     }
                     catch (Exception ex)
@@ -373,17 +383,21 @@ public static List<SearchItem> GetItems(SearchContext context, SearchFlags optio
                 context.sessions.StopAllAsyncSearchSessions();
             }
 
-            if (!options.HasAny(SearchFlags.Sorted))
+            if (!context.options.HasAny(SearchFlags.Sorted))
                 return allItems;
 
             allItems.Sort(SortItemComparer);
             return allItems.GroupBy(i => i.id).Select(i => i.First()).ToList();
         }
 
-        static void HandleItemsIteratorSession(object iterator, List<SearchItem> allItems, SearchProvider provider, SearchContext context, SearchFlags options)
+        static void HandleItemsIteratorSession(object iterator, List<SearchItem> allItems, SearchProvider provider, SearchContext context)
         {
             if (iterator != null && context.options.HasAny(SearchFlags.Synchronous))
             {
+                var session = context.sessions.GetProviderSession(provider);
+                session.Reset(context.sessions.currentSessionContext, iterator, k_MaxFetchTimeMs, k_MaxSessionTimeMs);
+                session.Start();
+
                 using (var stackedEnumerator = new SearchEnumerator<SearchItem>(iterator))
                 {
                     while (stackedEnumerator.MoveNext())
@@ -392,6 +406,8 @@ static void HandleItemsIteratorSession(object iterator, List<SearchItem> allItem
                             allItems.Add(stackedEnumerator.Current);
                     }
                 }
+
+                session.Stop();
             }
             else
             {
@@ -399,7 +415,7 @@ static void HandleItemsIteratorSession(object iterator, List<SearchItem> allItem
                 session.Reset(context.sessions.currentSessionContext, iterator, k_MaxFetchTimeMs, k_MaxSessionTimeMs);
                 session.Start();
                 var sessionEnded = !session.FetchSome(allItems, k_MaxFetchTimeMs);
-                if (options.HasAny(SearchFlags.FirstBatchAsync))
+                if (context.options.HasAny(SearchFlags.FirstBatchAsync))
                 {
                     session.SendItems(allItems);
                     allItems.Clear();
@@ -417,6 +433,7 @@ static void HandleItemsIteratorSession(object iterator, List<SearchItem> allItem
         /// <returns>Asynchronous list of search items.</returns>
         public static ISearchList Request(SearchContext context, SearchFlags options = SearchFlags.None)
         {
+            context.options |= options;
             ISearchList results = null;
             if (!InternalEditorUtility.CurrentThreadIsMainThread())
             {
@@ -424,19 +441,19 @@ public static ISearchList Request(SearchContext context, SearchFlags options = S
 
                 Dispatcher.Enqueue(() =>
                 {
-                    results.AddItems(GetItems(context, options));
+                    results.AddItems(GetItems(context, context.options));
                     (results as ConcurrentSearchList)?.GetItemsDone();
                 });
 
                 return results;
             }
 
-            if (options.HasAny(SearchFlags.Sorted))
+            if (context.options.HasAny(SearchFlags.Sorted))
                 results = new SortedSearchList(context);
             else
                 results = new AsyncSearchList(context);
 
-            results.AddItems(GetItems(context, options));
+            results.AddItems(GetItems(context, context.options));
             return results;
         }
 
@@ -449,7 +466,7 @@ public static ISearchList Request(string searchText, SearchFlags options = Searc
         {
             var activeProviders = GetActiveProviders();
             var context = CreateContext(activeProviders, searchText, options);
-            return Request(context, options);
+            return Request(context, context.options);
         }
 
         /// <summary>
@@ -463,7 +480,7 @@ public static void Request(string searchText, Action<SearchContext, IList<Search
             {
                 onSearchCompleted?.Invoke(c, items);
                 c.Dispose();
-            }, options);
+            }, context.options);
         }
 
         /// <summary>
@@ -480,7 +497,7 @@ public static void Request(string searchText,
             {
                 onSearchCompleted?.Invoke(c);
                 c.Dispose();
-            }, options);
+            }, context.options);
         }
 
         /// <summary>
@@ -493,7 +510,7 @@ public static void Request(SearchContext context, Action<SearchContext, IList<Se
             Request(context,
                 (c, items) => results.AddRange(items),
                 (c) => onSearchCompleted?.Invoke(c, results),
-                options);
+                context.options);
         }
 
         /// <summary>
@@ -505,9 +522,10 @@ public static void Request(SearchContext context,
             Action<SearchContext> onSearchCompleted,
             SearchFlags options = SearchFlags.None)
         {
-            var requestId = Guid.NewGuid().ToString("N");
-            if (options.HasAny(SearchFlags.Debug))
-                Debug.Log($"{requestId} Request started {context.searchText} ({options | context.options})");
+            var requestId = GetNewSessionGuid();
+            context.options |= options;
+            if (context.options.HasAny(SearchFlags.Debug))
+                Debug.Log($"{requestId} Request started {context.searchText} ({context.options})");
             var sessionCount = 0;
             var firstBatchResolved = false;
             var completed = false;
@@ -515,26 +533,28 @@ public static void Request(SearchContext context,
 
             void ReceiveItems(SearchContext c, IEnumerable<SearchItem> items)
             {
-                if (options.HasAny(SearchFlags.Debug))
+                if (context.options.HasAny(SearchFlags.Debug))
                     Debug.Log($"{requestId} #{batchCount++} Request incoming batch {context.searchText}");
                 onIncomingItems?.Invoke(c, items.Where(e => e != null));
             }
 
             void OnSessionStarted(SearchContext c)
             {
-                if (options.HasAny(SearchFlags.Debug))
+                if (context.options.HasAny(SearchFlags.Debug))
                     Debug.Log($"{requestId} Request session begin {context.searchText}");
                 ++sessionCount;
             }
 
             void OnSessionEnded(SearchContext c)
             {
-                if (options.HasAny(SearchFlags.Debug))
+                if (c.sessions.currentSessionContext.guid != requestId)
+                    return;
+                if (context.options.HasAny(SearchFlags.Debug))
                     Debug.Log($"{requestId} Request session ended {context.searchText}");
                 --sessionCount;
                 if (sessionCount == 0 && firstBatchResolved)
                 {
-                    if (options.HasAny(SearchFlags.Debug))
+                    if (context.options.HasAny(SearchFlags.Debug))
                         Debug.Log($"{requestId} Request async ended {context.searchText}");
                     context.asyncItemReceived -= ReceiveItems;
                     context.sessionStarted -= OnSessionStarted;
@@ -547,13 +567,13 @@ void OnSessionEnded(SearchContext c)
             context.asyncItemReceived += ReceiveItems;
             context.sessionStarted += OnSessionStarted;
             context.sessionEnded += OnSessionEnded;
-            var firstResults = GetItems(context, options);
+            var firstResults = GetItems(context, requestId, context.options);
             if (firstResults.Count > 0)
                 ReceiveItems(context, firstResults);
             firstBatchResolved = true;
             if (sessionCount == 0 && !completed)
             {
-                if (options.HasAny(SearchFlags.Debug))
+                if (context.options.HasAny(SearchFlags.Debug))
                     Debug.Log($"{requestId} Request sync ended {context.searchText}");
                 context.asyncItemReceived -= ReceiveItems;
                 context.sessionStarted -= OnSessionStarted;
@@ -562,6 +582,11 @@ void OnSessionEnded(SearchContext c)
             }
         }
 
+        static Hash128 GetNewSessionGuid()
+        {
+            return Hash128.Compute(Guid.NewGuid().ToByteArray());
+        }
+
         private static void OnSearchEnded(SearchContext context)
         {
             context.searchFinishTime = DateTime.UtcNow.Ticks;
@@ -787,7 +812,7 @@ public static void CreateIndex(
             if (options.HasNone(IndexingOptions.Temporary))
             {
                 indexName = System.IO.Path.GetFileNameWithoutExtension(indexPath);
-                if (!AssetDatabase.GetAssetFolderInfo(indexPath, out var rootFolder, out var immutable) || immutable)
+                if (!AssetDatabase.TryGetAssetFolderInfo(indexPath, out var rootFolder, out var immutable) || immutable)
                     indexPath = AssetDatabase.GenerateUniqueAssetPath($"Assets/{indexName}.index");
             }
             else
@@ -889,7 +914,7 @@ static bool TryParseExpression(SearchContext context, out SearchExpression expre
 
             var rootExpression = ParseExpression(context);
             if (rootExpression == null || (rootExpression.types.HasAny(SearchExpressionType.QueryString) &&
-                                           rootExpression.parameters.Length == 0 && rootExpression.innerText == rootExpression.outerText) ||
+                    rootExpression.parameters.Length == 0 && rootExpression.innerText == rootExpression.outerText && !rootExpression.hasEscapedNestedExpressions) ||
                 !rootExpression.types.HasAny(SearchExpressionType.Iterable))
                 return false;
 
diff --git a/Modules/QuickSearch/Editor/SearchSession.cs b/Modules/QuickSearch/Editor/SearchSession.cs
index 38e5a155b8..72920eec3f 100644
--- a/Modules/QuickSearch/Editor/SearchSession.cs
+++ b/Modules/QuickSearch/Editor/SearchSession.cs
@@ -16,15 +16,25 @@ readonly struct SearchSessionContext
     {
         public readonly SearchContext searchContext;
         public readonly StackTrace stackTrace;
+        public readonly Hash128 guid;
 
-        public SearchSessionContext(SearchContext context, StackTrace stackTrace)
+        public SearchSessionContext(SearchContext context, StackTrace stackTrace, Hash128 guid)
         {
             this.searchContext = context;
             this.stackTrace = stackTrace;
+            this.guid = guid;
         }
 
+        public SearchSessionContext(SearchContext context, StackTrace stackTrace)
+            : this(context, stackTrace, Hash128.Compute(Guid.NewGuid().ToByteArray()))
+        {}
+
+        public SearchSessionContext(SearchContext context, Hash128 guid)
+            : this(context, new StackTrace(2, true), guid)
+        {}
+
         public SearchSessionContext(SearchContext context)
-            : this(context, new StackTrace(2, true))
+            : this(context, new StackTrace(2, true), Hash128.Compute(Guid.NewGuid().ToByteArray()))
         {}
     }
 
@@ -379,7 +389,7 @@ private void OnProviderAsyncItemReceived(SearchContext context, IEnumerable<Sear
             asyncItemReceived?.Invoke(context, items);
         }
 
-        public void StartSessions(SearchContext context)
+        public void StartSessions(SearchContext context, Hash128 sessionGuid)
         {
             if (m_CancelSource != null)
             {
@@ -388,7 +398,7 @@ public void StartSessions(SearchContext context)
             }
             m_CancelSource = new System.Threading.CancellationTokenSource();
 
-            currentSessionContext = new SearchSessionContext(context);
+            currentSessionContext = new SearchSessionContext(context, sessionGuid);
         }
 
         /// <summary>
diff --git a/Modules/QuickSearch/Editor/SearchSettings.cs b/Modules/QuickSearch/Editor/SearchSettings.cs
index 7edc46d03b..11f655eb44 100644
--- a/Modules/QuickSearch/Editor/SearchSettings.cs
+++ b/Modules/QuickSearch/Editor/SearchSettings.cs
@@ -93,7 +93,7 @@ class ObjectSelectorsSettings : BaseDictionarySettings
         public bool active;
         public int priority;
 
-        public override int Count => 3;
+        public override int Count => 2;
         public override ICollection Keys => new string[] { nameof(active), nameof(priority) };
         public override ICollection Values => new object[] { active, priority };
 
@@ -129,36 +129,39 @@ public override IDictionaryEnumerator GetEnumerator()
         }
     }
 
-    public static class SearchSettings
+    class SearchSettingsStorage
     {
-        internal static readonly string projectLocalSettingsFolder = Utils.CleanPath(new DirectoryInfo("UserSettings").FullName);
-        internal static readonly string projectLocalSettingsPath = $"{projectLocalSettingsFolder}/Search.settings";
+        public string settingsFolder { get; set; }
+        public string settingsPath { get; set; }
 
-        const string k_ItemIconSizePrefKey = "Search.ItemIconSize";
-        internal const string settingsPreferencesKey = "Preferences/Search";
+        public string itemIconSizePrefKey { get; set; }= "Search.ItemIconSize";
+        public string favoritesQueryPrefKey { get; set; } = "SearchQuery.Favorites";
+        public string ignoredPropertiesCustomDependency { get; set; } = "SearchIndexIgnoredProperties";
 
         // Per project settings
-        internal static bool trackSelection { get; set; }
-        internal static bool fetchPreview { get; set; }
-        internal static SearchFlags defaultFlags { 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 Dictionary<string, ObjectSelectorsSettings> objectSelectors { get; private set; }
-        internal static bool queryBuilder { get; set; }
-        internal static string ignoredProperties { get; set; }
-        internal static string helperWidgetCurrentArea { get; set; }
-        internal static bool refreshSearchWindowsInPlayMode { get; set; }
-
-        internal static int[] expandedQueries { get; set; }
-
-        internal static bool wantsMore
+        public bool trackSelection { get; set; }
+        public bool fetchPreview { get; set; }
+        public SearchFlags defaultFlags { get; set; }
+        public bool keepOpen { get; set; }
+        public string queryFolder { get; set; }
+        public bool onBoardingDoNotAskAgain { get; set; }
+        public bool showPackageIndexes { get; set; }
+        public bool showStatusBar { get; set; }
+        public bool hideTabs { get; set; }
+        public SearchQuerySortOrder savedSearchesSortOrder { get; set; }
+        public bool showSavedSearchPanel { get; set; }
+        public Dictionary<string, string> scopes { get; private set; } = new();
+        public Dictionary<string, SearchProviderSettings> providers { get; private set; } = new();
+        public Dictionary<string, ObjectSelectorsSettings> objectSelectors { get; private set; } = new();
+        public bool queryBuilder { get; set; }
+        public string ignoredProperties { get; set; }
+        public string helperWidgetCurrentArea { get; set; }
+        public bool refreshSearchWindowsInPlayMode { get; set; }
+        public int minIndexVariations { get; set; }
+        public bool findProviderIndexHelper { get; set; }
+        public int[] expandedQueries { get; set; } = Array.Empty<int>();
+
+        public bool wantsMore
         {
             get => defaultFlags.HasAny(SearchFlags.WantsMore);
             set
@@ -171,61 +174,55 @@ internal static bool wantsMore
         }
 
         // User editor pref
-        internal static float itemIconSize { get; set; } = (float)DisplayMode.List;
+        public float itemIconSize { get; set; } = (float)DisplayMode.List;
 
-        internal const int k_RecentSearchMaxCount = 20;
-        internal static List<string> recentSearches = new List<string>(k_RecentSearchMaxCount);
+        int m_RecentSearchMaxCount = 20;
+        public int recentSearchMaxCount
+        {
+            get => m_RecentSearchMaxCount;
+            set
+            {
+                m_RecentSearchMaxCount = value;
+                ApplyRecentSearchCapacity();
+            }
+        }
+        public List<string> recentSearches = new();
 
-        static string s_DisabledIndexersString;
-        static HashSet<string> s_DisabledIndexers;
-        internal static HashSet<string> disabledIndexers
+        string m_DisabledIndexersString;
+        HashSet<string> m_DisabledIndexers;
+        public HashSet<string> disabledIndexers
         {
             get
             {
-                if (s_DisabledIndexers == null)
+                if (m_DisabledIndexers == null)
                 {
-                    var entries = s_DisabledIndexersString ?? string.Empty;
-                    s_DisabledIndexers = new HashSet<string>(entries.Split(new string[] { ";;;" }, StringSplitOptions.RemoveEmptyEntries));
+                    var entries = m_DisabledIndexersString ?? string.Empty;
+                    m_DisabledIndexers = new HashSet<string>(entries.Split(new string[] { ";;;" }, StringSplitOptions.RemoveEmptyEntries));
                 }
-                return s_DisabledIndexers;
+                return m_DisabledIndexers;
             }
         }
 
-        public static HashSet<string> searchItemFavorites = new HashSet<string>();
-        internal static HashSet<string> searchQueryFavorites = new HashSet<string>();
-
-        internal static event Action<string, bool> providerActivationChanged;
+        public HashSet<string> searchItemFavorites = new();
+        public HashSet<string> searchQueryFavorites = new();
 
-        internal static int debounceMs
+        public int debounceMs
         {
             get { return UnityEditor.SearchUtils.debounceThresholdMs; }
 
             set { UnityEditor.SearchUtils.debounceThresholdMs = value; }
         }
 
-        static SearchSettings()
+        public void Load()
         {
-            expandedQueries = new int[0];
-            Load();
-        }
-
-        private static void Load()
-        {
-            if (Application.HasARGV("cleanTestPrefs") || !File.Exists(projectLocalSettingsPath))
-            {
-                if (!Directory.Exists("UserSettings/"))
-                    Directory.CreateDirectory("UserSettings/");
-                Utils.WriteTextFileToDisk(projectLocalSettingsPath, "{}");
-            }
-
             IDictionary settings = null;
             try
             {
-                settings = (IDictionary)SJSON.Load(projectLocalSettingsPath);
+                settings = (IDictionary)SJSON.Load(settingsPath);
             }
             catch (Exception ex)
             {
-                Debug.LogError($"We weren't able to parse search user settings at {projectLocalSettingsPath}. We will fallback to default settings.\n{ex}");
+                Debug.LogError($"We weren't able to parse search user settings at {settingsPath}. We will fallback to default settings.\n{ex}");
             }
 
             trackSelection = ReadSetting(settings, nameof(trackSelection), true);
@@ -236,15 +233,18 @@ private static void Load()
             onBoardingDoNotAskAgain = ReadSetting(settings, nameof(onBoardingDoNotAskAgain), false);
             showPackageIndexes = ReadSetting(settings, nameof(showPackageIndexes), false);
             showStatusBar = ReadSetting(settings, nameof(showStatusBar), false);
+            hideTabs = ReadSetting(settings, nameof(hideTabs), false);
             savedSearchesSortOrder = (SearchQuerySortOrder)ReadSetting(settings, nameof(savedSearchesSortOrder), 0);
             showSavedSearchPanel = ReadSetting(settings, nameof(showSavedSearchPanel), false);
             queryBuilder = ReadSetting(settings, nameof(queryBuilder), false);
             ignoredProperties = ReadSetting(settings, nameof(ignoredProperties), "id;name;classname;imagecontentshash");
             helperWidgetCurrentArea = ReadSetting(settings, nameof(helperWidgetCurrentArea), "all");
-            s_DisabledIndexersString = ReadSetting(settings, nameof(disabledIndexers), "");
+            m_DisabledIndexersString = ReadSetting(settings, nameof(disabledIndexers), "");
             refreshSearchWindowsInPlayMode = ReadSetting(settings, nameof(refreshSearchWindowsInPlayMode), false);
+            minIndexVariations = ReadSetting(settings, nameof(minIndexVariations), 2);
+            findProviderIndexHelper = ReadSetting(settings, nameof(findProviderIndexHelper), true);
 
-            itemIconSize = EditorPrefs.GetFloat(k_ItemIconSizePrefKey, itemIconSize);
+            itemIconSize = EditorPrefs.GetFloat(itemIconSizePrefKey, itemIconSize);
 
 
             var searches = ReadSetting<object[]>(settings, nameof(recentSearches));
@@ -264,9 +264,11 @@ private static void Load()
             objectSelectors = ReadPickerSettings(settings, nameof(objectSelectors));
 
             LoadFavorites();
+
+            RegisterIgnoredPropertiesCustomDependencies();
         }
 
-        internal static void Save()
+        public void Save()
         {
             var settings = new Dictionary<string, object>
             {
@@ -286,53 +288,76 @@ internal static void Save()
                 [nameof(searchItemFavorites)] = searchItemFavorites.ToList(),
                 [nameof(savedSearchesSortOrder)] = (int)savedSearchesSortOrder,
                 [nameof(showSavedSearchPanel)] = showSavedSearchPanel,
-                [nameof(expandedQueries)] = expandedQueries,
+                [nameof(hideTabs)] = hideTabs,
+                [nameof(expandedQueries)] = expandedQueries ?? Array.Empty<int>(),
                 [nameof(queryBuilder)] = queryBuilder,
                 [nameof(ignoredProperties)] = ignoredProperties,
                 [nameof(helperWidgetCurrentArea)] = helperWidgetCurrentArea,
                 [nameof(disabledIndexers)] = string.Join(";;;", disabledIndexers),
+                [nameof(minIndexVariations)] = minIndexVariations,
+                [nameof(findProviderIndexHelper)] = findProviderIndexHelper,
 
             };
 
             RetriableOperation<IOException>.Execute(() =>
             {
-                SJSON.Save(settings, projectLocalSettingsPath);
+                CreateFolderIfNeeded();
+                SJSON.Save(settings, settingsPath);
             }, 5, TimeSpan.FromMilliseconds(10));
             SaveFavorites();
 
-            EditorPrefs.SetFloat(k_ItemIconSizePrefKey, itemIconSize);
+            EditorPrefs.SetFloat(itemIconSizePrefKey, itemIconSize);
 
-            AssetDatabaseAPI.RegisterCustomDependency("SearchIndexIgnoredProperties", Hash128.Compute(ignoredProperties));
+            RegisterIgnoredPropertiesCustomDependencies();
         }
 
-        internal static void SetScopeValue(string prefix, int hash, string value)
+        public void RegisterIgnoredPropertiesCustomDependencies()
+        {
+            if (AssetDatabase.IsAssetImportWorkerProcess() || EditorApplication.isUpdating)
+                return;
+            AssetDatabaseAPI.RegisterCustomDependency(ignoredPropertiesCustomDependency, Hash128.Compute(ignoredProperties));
+        }
+
+        public void ClearSettingsFile()
+        {
+            CreateFolderIfNeeded();
+            Utils.WriteTextFileToDisk(settingsPath, "{}");
+        }
+
+        void CreateFolderIfNeeded()
+        {
+            if (!Directory.Exists(settingsFolder))
+                Directory.CreateDirectory(settingsFolder);
+        }
+
+        public void SetScopeValue(string prefix, int hash, string value)
         {
             scopes[$"{prefix}.{hash:X8}"] = value;
         }
 
-        internal static void SetScopeValue(string prefix, int hash, int value)
+        public void SetScopeValue(string prefix, int hash, int value)
         {
             scopes[$"{prefix}.{hash:X8}"] = value.ToString();
         }
 
-        internal static void SetScopeValue(string prefix, int hash, float value)
+        public void SetScopeValue(string prefix, int hash, float value)
         {
             scopes[$"{prefix}.{hash:X8}"] = value.ToString();
         }
 
-        internal static void SetScopeValue(string prefix, int hash, Rect rect)
+        public void SetScopeValue(string prefix, int hash, Rect rect)
         {
             scopes[$"{prefix}.{hash:X8}"] = $"{rect.x};{rect.y};{rect.width};{rect.height}";
         }
 
-        internal static string GetScopeValue(string prefix, int hash, string defaultValue)
+        public string GetScopeValue(string prefix, int hash, string defaultValue)
         {
             if (scopes.TryGetValue($"{prefix}.{hash:X8}", out var value))
                 return value;
             return defaultValue;
         }
 
-        internal static int GetScopeValue(string prefix, int hash, int defaultValue)
+        public int GetScopeValue(string prefix, int hash, int defaultValue)
         {
             if (scopes.TryGetValue($"{prefix}.{hash:X8}", out var value))
             {
@@ -341,7 +366,7 @@ internal static int GetScopeValue(string prefix, int hash, int defaultValue)
             return defaultValue;
         }
 
-        internal static float GetScopeValue(string prefix, int hash, float defaultValue)
+        public float GetScopeValue(string prefix, int hash, float defaultValue)
         {
             if (scopes.TryGetValue($"{prefix}.{hash:X8}", out var value))
             {
@@ -350,7 +375,7 @@ internal static float GetScopeValue(string prefix, int hash, float defaultValue)
             return defaultValue;
         }
 
-        internal static Rect GetScopeValue(string prefix, int hash, Rect defaultValue)
+        public Rect GetScopeValue(string prefix, int hash, Rect defaultValue)
         {
             if (scopes.TryGetValue($"{prefix}.{hash:X8}", out var value))
             {
@@ -361,6 +386,393 @@ internal static Rect GetScopeValue(string prefix, int hash, Rect defaultValue)
             return defaultValue;
         }
 
+        public void AddRecentSearch(string search)
+        {
+            recentSearches.Insert(0, search);
+            ApplyRecentSearchCapacity();
+            recentSearches = recentSearches.Distinct().ToList();
+        }
+
+        void ApplyRecentSearchCapacity()
+        {
+            if (recentSearches.Count > recentSearchMaxCount)
+                recentSearches.RemoveRange(recentSearchMaxCount, recentSearches.Count - recentSearchMaxCount);
+        }
+
+        public ObjectSelectorsSettings GetObjectSelectorSettings(string selectorId, bool defaultActive, int defaultPriority)
+        {
+            if (TryGetObjectSelectorSettings(selectorId, out var settings))
+                return settings;
+
+            objectSelectors[selectorId] = new ObjectSelectorsSettings() { active = defaultActive, priority = defaultPriority };
+            return objectSelectors[selectorId];
+        }
+
+        public bool TryGetObjectSelectorSettings(string selectorId, out ObjectSelectorsSettings settings)
+        {
+            return objectSelectors.TryGetValue(selectorId, out settings);
+        }
+
+        public void ResetObjectSelectorSettings()
+        {
+            objectSelectors.Clear();
+        }
+
+        public SearchProviderSettings GetProviderSettings(string providerId, bool defaultActive, int defaultPriority, string defaultAction, bool addToSettings = true)
+        {
+            if (TryGetProviderSettings(providerId, out var settings))
+                return settings;
+
+            var newSettings = new SearchProviderSettings() { active = defaultActive, priority = defaultPriority, defaultAction = defaultAction };
+            if (addToSettings)
+                providers[providerId] = newSettings;
+            return newSettings;
+        }
+
+        public bool TryGetProviderSettings(string providerId, out SearchProviderSettings settings)
+        {
+            return providers.TryGetValue(providerId, out settings);
+        }
+
+        public void ResetProviderSettings()
+        {
+            providers.Clear();
+        }
+
+        public void ToggleCustomIndexer(string name, bool enable)
+        {
+            if (enable)
+                disabledIndexers.Remove(name);
+            else
+                disabledIndexers.Add(name);
+            Save();
+        }
+
+        public void AddItemFavorite(string itemId)
+        {
+            searchItemFavorites.Add(itemId);
+        }
+
+        public void RemoveItemFavorite(string itemId)
+        {
+            searchItemFavorites.Remove(itemId);
+        }
+
+        public void LoadFavorites()
+        {
+            var favoriteString = EditorPrefs.GetString(favoritesQueryPrefKey, "");
+            searchQueryFavorites.UnionWith(favoriteString.Split(new string[] { ";;;" }, StringSplitOptions.RemoveEmptyEntries));
+        }
+
+        public void SaveFavorites()
+        {
+            EditorPrefs.SetString(favoritesQueryPrefKey, string.Join(";;;", searchQueryFavorites));
+        }
+
+        static T ReadSetting<T>(IDictionary settings, string key, T defaultValue = default)
+        {
+            try
+            {
+                if (SJSON.TryGetValue(settings, key, out var value))
+                    return (T)value;
+            }
+            catch (Exception)
+            {
+                // Any error will return the default value.
+            }
+
+            return defaultValue;
+        }
+
+        static float ReadSetting(IDictionary settings, string key, float defaultValue = 0)
+        {
+            return (float)ReadSetting(settings, key, (double)defaultValue);
+        }
+
+        static int ReadSetting(IDictionary settings, string key, int defaultValue = 0)
+        {
+            return (int)ReadSetting(settings, key, (double)defaultValue);
+        }
+
+        static Dictionary<string, SearchProviderSettings> ReadProviderSettings(IDictionary settings, string fieldName)
+        {
+            return ReadDictionary<SearchProviderSettings>(settings, fieldName, vdict => new SearchProviderSettings()
+            {
+                active = Convert.ToBoolean(vdict[nameof(SearchProviderSettings.active)]),
+                priority = (int)(double)vdict[nameof(SearchProviderSettings.priority)],
+                defaultAction = vdict[nameof(SearchProviderSettings.defaultAction)] as string,
+            });
+        }
+
+        static Dictionary<string, ObjectSelectorsSettings> ReadPickerSettings(IDictionary settings, string fieldName)
+        {
+            return ReadDictionary<ObjectSelectorsSettings>(settings, fieldName, vdict => new ObjectSelectorsSettings()
+            {
+                active = Convert.ToBoolean(vdict[nameof(SearchProviderSettings.active)]),
+                priority = (int)(double)vdict[nameof(SearchProviderSettings.priority)]
+            });
+        }
+
+        static Dictionary<string, T> ReadProperties<T>(IDictionary settings, string fieldName)
+        {
+            return ReadDictionary(settings, fieldName, o => (T)o);
+        }
+
+        static Dictionary<string, T> ReadDictionary<T>(IDictionary settings, string fieldName, Func<object, T> valueCreator)
+        {
+            return ReadDictionary(settings, fieldName, e => true, valueCreator);
+        }
+
+        static Dictionary<string, T> ReadDictionary<T>(IDictionary settings, string fieldName, Func<IDictionary, BaseDictionarySettings> valueCreator)
+            where T : BaseDictionarySettings
+        {
+            return ReadDictionary(settings, fieldName, e => e.Value is IDictionary, o =>
+            {
+                var vdict = o as IDictionary;
+                return (T)valueCreator(vdict);
+            });
+        }
+
+        static Dictionary<string, T> ReadDictionary<T>(IDictionary settings, string fieldName, Func<DictionaryEntry, bool> extraPredicate, Func<object, T> valueCreator)
+        {
+            var d = new Dictionary<string, T>();
+            if (SJSON.TryGetValue(settings, fieldName, out var _data) && _data is IDictionary dataDict)
+            {
+                foreach (var p in dataDict)
+                {
+                    try
+                    {
+                        if (p is DictionaryEntry e && extraPredicate(e))
+                            d[(string)e.Key] = valueCreator(e.Value);
+                    }
+                    catch
+                    {
+                        // ignore copy
+                    }
+                }
+            }
+            return d;
+        }
+    }
+
+    public static class SearchSettings
+    {
+        internal static readonly string projectLocalSettingsFolder = Utils.CleanPath(new DirectoryInfo("UserSettings").FullName);
+        internal static readonly string projectLocalSettingsPath = $"{projectLocalSettingsFolder}/Search.settings";
+        internal const string settingsPreferencesKey = "Preferences/Search";
+
+        static SearchSettingsStorage s_SettingsStorage;
+
+        // Per project settings
+        internal static bool trackSelection
+        {
+            get => s_SettingsStorage.trackSelection;
+            set => s_SettingsStorage.trackSelection = value;
+        }
+
+        internal static bool fetchPreview
+        {
+            get => s_SettingsStorage.fetchPreview;
+            set => s_SettingsStorage.fetchPreview = value;
+        }
+
+        internal static SearchFlags defaultFlags
+        {
+            get => s_SettingsStorage.defaultFlags;
+            set => s_SettingsStorage.defaultFlags = value;
+        }
+
+        internal static bool keepOpen
+        {
+            get => s_SettingsStorage.keepOpen;
+            set => s_SettingsStorage.keepOpen = value;
+        }
+
+        internal static string queryFolder
+        {
+            get => s_SettingsStorage.queryFolder;
+            set => s_SettingsStorage.queryFolder = value;
+        }
+
+        internal static bool onBoardingDoNotAskAgain
+        {
+            get => s_SettingsStorage.onBoardingDoNotAskAgain;
+            set => s_SettingsStorage.onBoardingDoNotAskAgain = value;
+        }
+
+        internal static bool showPackageIndexes
+        {
+            get => s_SettingsStorage.showPackageIndexes;
+            set => s_SettingsStorage.showPackageIndexes = value;
+        }
+
+        internal static bool showStatusBar
+        {
+            get => s_SettingsStorage.showStatusBar;
+            set => s_SettingsStorage.showStatusBar = value;
+        }
+
+        internal static bool hideTabs
+        {
+            get => s_SettingsStorage.hideTabs;
+            set => s_SettingsStorage.hideTabs = value;
+        }
+
+        internal static SearchQuerySortOrder savedSearchesSortOrder
+        {
+            get => s_SettingsStorage.savedSearchesSortOrder;
+            set => s_SettingsStorage.savedSearchesSortOrder = value;
+        }
+
+        internal static bool showSavedSearchPanel
+        {
+            get => s_SettingsStorage.showSavedSearchPanel;
+            set => s_SettingsStorage.showSavedSearchPanel = value;
+        }
+
+        internal static Dictionary<string, string> scopes => s_SettingsStorage.scopes;
+        internal static Dictionary<string, SearchProviderSettings> providers => s_SettingsStorage.providers;
+        internal static Dictionary<string, ObjectSelectorsSettings> objectSelectors => s_SettingsStorage.objectSelectors;
+
+        internal static bool queryBuilder
+        {
+            get => s_SettingsStorage.queryBuilder;
+            set => s_SettingsStorage.queryBuilder = value;
+        }
+
+        internal static string ignoredProperties
+        {
+            get => s_SettingsStorage.ignoredProperties;
+            set => s_SettingsStorage.ignoredProperties = value;
+        }
+
+        internal static string helperWidgetCurrentArea
+        {
+            get => s_SettingsStorage.helperWidgetCurrentArea;
+            set => s_SettingsStorage.helperWidgetCurrentArea = value;
+        }
+
+        internal static bool refreshSearchWindowsInPlayMode
+        {
+            get => s_SettingsStorage.refreshSearchWindowsInPlayMode;
+            set => s_SettingsStorage.refreshSearchWindowsInPlayMode = value;
+        }
+
+        internal static int minIndexVariations
+        {
+            get => s_SettingsStorage.minIndexVariations;
+            set => s_SettingsStorage.minIndexVariations = value;
+        }
+
+        internal static bool findProviderIndexHelper
+        {
+            get => s_SettingsStorage.findProviderIndexHelper;
+            set => s_SettingsStorage.findProviderIndexHelper = value;
+        }
+
+        internal static int[] expandedQueries
+        {
+            get => s_SettingsStorage.expandedQueries;
+            set => s_SettingsStorage.expandedQueries = value;
+        }
+
+        internal static bool wantsMore
+        {
+            get => s_SettingsStorage.wantsMore;
+            set => s_SettingsStorage.wantsMore = value;
+        }
+
+        const int k_RecentSearchMaxCount = 20;
+        internal static IReadOnlyList<string> recentSearches => s_SettingsStorage.recentSearches;
+
+        // User editor pref
+        internal static float itemIconSize
+        {
+            get => s_SettingsStorage.itemIconSize;
+            set => s_SettingsStorage.itemIconSize = value;
+        }
+
+        internal static HashSet<string> disabledIndexers => s_SettingsStorage.disabledIndexers;
+
+        // TODO: That's not good that it is public like that. Should have been a property.
+        public static HashSet<string> searchItemFavorites = new();
+
+        internal static event Action<string, bool> providerActivationChanged;
+
+        internal static int debounceMs
+        {
+            get => s_SettingsStorage.debounceMs;
+            set => s_SettingsStorage.debounceMs = value;
+        }
+
+        static SearchSettings()
+        {
+            s_SettingsStorage = new SearchSettingsStorage()
+            {
+                settingsFolder = projectLocalSettingsFolder,
+                settingsPath = projectLocalSettingsPath,
+                recentSearchMaxCount = k_RecentSearchMaxCount,
+                itemIconSize = (float)DisplayMode.List,
+                expandedQueries = Array.Empty<int>()
+            };
+            Load();
+        }
+
+        internal static void Load()
+        {
+            if (Application.HasARGV("cleanTestPrefs") || !File.Exists(projectLocalSettingsPath))
+            {
+                s_SettingsStorage.ClearSettingsFile();
+            }
+            s_SettingsStorage.Load();
+            searchItemFavorites = s_SettingsStorage.searchItemFavorites;
+        }
+
+        internal static void Save()
+        {
+            s_SettingsStorage?.Save();
+        }
+
+        internal static void SetScopeValue(string prefix, int hash, string value)
+        {
+            s_SettingsStorage.SetScopeValue(prefix, hash, value);
+        }
+
+        internal static void SetScopeValue(string prefix, int hash, int value)
+        {
+            s_SettingsStorage.SetScopeValue(prefix, hash, value);
+        }
+
+        internal static void SetScopeValue(string prefix, int hash, float value)
+        {
+            s_SettingsStorage.SetScopeValue(prefix, hash, value);
+        }
+
+        internal static void SetScopeValue(string prefix, int hash, Rect rect)
+        {
+            s_SettingsStorage.SetScopeValue(prefix, hash, rect);
+        }
+
+        internal static string GetScopeValue(string prefix, int hash, string defaultValue)
+        {
+            return s_SettingsStorage.GetScopeValue(prefix, hash, defaultValue);
+        }
+
+        internal static int GetScopeValue(string prefix, int hash, int defaultValue)
+        {
+            return s_SettingsStorage.GetScopeValue(prefix, hash, defaultValue);
+        }
+
+        internal static float GetScopeValue(string prefix, int hash, float defaultValue)
+        {
+            return s_SettingsStorage.GetScopeValue(prefix, hash, defaultValue);
+        }
+
+        internal static Rect GetScopeValue(string prefix, int hash, Rect defaultValue)
+        {
+            return s_SettingsStorage.GetScopeValue(prefix, hash, defaultValue);
+        }
+
         internal static SearchFlags GetContextOptions()
         {
             return SearchFlags.Default | defaultFlags;
@@ -378,10 +790,7 @@ internal static void ApplyContextOptions(SearchContext context)
 
         internal static void AddRecentSearch(string search)
         {
-            recentSearches.Insert(0, search);
-            if (recentSearches.Count > k_RecentSearchMaxCount)
-                recentSearches.RemoveRange(k_RecentSearchMaxCount, recentSearches.Count - k_RecentSearchMaxCount);
-            recentSearches = recentSearches.Distinct().ToList();
+            s_SettingsStorage.AddRecentSearch(search);
         }
 
         [SettingsProvider]
@@ -390,7 +799,11 @@ internal static SettingsProvider CreateSearchSettings()
             var settings = new SettingsProvider(settingsPreferencesKey, SettingsScope.User)
             {
                 guiHandler = DrawSearchSettings,
-                keywords = new[] { "quick", "omni", "search" },
+                keywords = new[] { "quick", "search",  }
+                    .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties<Styles>())
+                    .Concat(SearchService.OrderedObjectSelectors.Select(s => s.displayName))
+                    .Concat(SearchService.OrderedProviders.Select(p => p.name))
+                    .Concat(GetOrderedApis().Select(api => api.displayName))
             };
             return settings;
         }
@@ -401,14 +814,14 @@ internal static SettingsProvider CreateSearchIndexSettings()
             return new SettingsProvider("Preferences/Search/Indexing", SettingsScope.User)
             {
                 guiHandler = DrawSearchIndexingSettings,
-                keywords = new[] { "search", "index" },
+                keywords = new[] { "search", "index", "indexer", "custom" },
             };
         }
 
         static void DrawSearchServiceSettings()
         {
             EditorGUILayout.LabelField(L10n.Tr("Search Engines"), EditorStyles.largeLabel);
-            var orderedApis = UnityEditor.SearchService.SearchService.searchApis.OrderBy(api => api.displayName);
+            var orderedApis = GetOrderedApis();
             foreach (var api in orderedApis)
             {
                 var searchContextName = api.displayName;
@@ -426,20 +839,16 @@ static void DrawSearchServiceSettings()
                             $"Search engine for {searchContextName}" :
                             $"Set search engine for {searchContextName}")).ToArray();
                         var activeEngineIndex = Math.Max(searchEngines.FindIndex(engine => engine.name == activeEngine?.name), 0);
-
                         GUILayout.Space(20);
-                        GUILayout.Label(new GUIContent(searchContextName), GUILayout.Width(175));
-                        GUILayout.Space(20);
-
                         using (var scope = new EditorGUI.ChangeCheckScope())
                         {
-                            var newSearchEngine = EditorGUILayout.Popup(activeEngineIndex, items, GUILayout.ExpandWidth(true));
+                            var newSearchEngine = EditorGUILayout.Popup(new GUIContent(searchContextName), activeEngineIndex, items, GUILayout.ExpandWidth(true));
                             if (scope.changed)
                             {
                                 api.SetActiveSearchEngine(searchEngines[newSearchEngine].name);
                                 GUI.changed = true;
                             }
-                            GUILayout.Space(10);
+                            GUILayout.Space(35);
                         }
                     }
                     catch (Exception ex)
@@ -461,6 +870,11 @@ static void DrawSearchServiceSettings()
             }
         }
 
+        static IEnumerable<ISearchApi> GetOrderedApis()
+        {
+            return UnityEditor.SearchService.SearchService.searchApis.OrderBy(api => api.displayName);
+        }
+
         static void DrawAdvancedObjectSelectorsSettings()
         {
             using (new EditorGUILayout.VerticalScope())
@@ -473,16 +887,12 @@ static void DrawAdvancedObjectSelectorsSettings()
                     GUILayout.Space(20);
 
                     var wasActive = selector.active;
-                    if (GUILayout.Toggle(wasActive, Styles.toggleObjectSelectorActiveContent) != wasActive)
+                    var c = new GUIContent(selector.displayName, Styles.toggleObjectSelectorActiveContent.tooltip);
+                    if (EditorGUILayout.ToggleLeft(c, wasActive, GUILayout.Width(200)) != wasActive)
                     {
                         TogglePickerActive(selector);
                     }
 
-                    using (new EditorGUI.DisabledGroupScope(!selector.active))
-                    {
-                        GUILayout.Label(new GUIContent(selector.displayName), GUILayout.Width(175));
-                    }
-
                     if (GUILayout.Button(Styles.increaseObjectSelectorPriorityContent, Styles.priorityButton))
                         DecreaseObjectSelectorPriority(selector, SearchService.ObjectSelectors);
 
@@ -504,11 +914,7 @@ static void DrawAdvancedObjectSelectorsSettings()
 
         internal static ObjectSelectorsSettings GetObjectSelectorSettings(AdvancedObjectSelector selector)
         {
-            if (TryGetObjectSelectorSettings(selector.id, out var settings))
-                return settings;
-
-            objectSelectors[selector.id] = new ObjectSelectorsSettings() { active = selector.active, priority = selector.priority };
-            return objectSelectors[selector.id];
+            return s_SettingsStorage.GetObjectSelectorSettings(selector.id, selector.active, selector.priority);
         }
 
         internal static ObjectSelectorsSettings GetObjectSelectorSettings(string selectorId)
@@ -522,7 +928,7 @@ internal static ObjectSelectorsSettings GetObjectSelectorSettings(string selecto
         static void ResetObjectSelectorSettings()
         {
             SearchAnalytics.SendEvent(null, SearchAnalytics.GenericEventType.ObjectSelectorSettingsReset);
-            objectSelectors.Clear();
+            s_SettingsStorage.ResetObjectSelectorSettings();
             SearchService.RefreshObjectSelectors();
         }
 
@@ -593,7 +999,7 @@ internal static void IncreaseObjectSelectorPriority(AdvancedObjectSelector selec
 
         internal static bool TryGetObjectSelectorSettings(string selectorId, out ObjectSelectorsSettings settings)
         {
-            return objectSelectors.TryGetValue(selectorId, out settings);
+            return s_SettingsStorage.TryGetObjectSelectorSettings(selectorId, out settings);
         }
 
         private static void DrawSearchSettings(string searchContext)
@@ -642,9 +1048,23 @@ private static void DrawSearchIndexingSettings(string searchContext)
                     if (EditorGUILayout.DropdownButton(Utils.GUIContentTemp("Custom Indexers"), FocusType.Passive))
                         OpenCustomIndexerMenu();
 
-                    EditorGUILayout.LabelField(L10n.Tr("Ignored properties (Use line break or ; to separate tokens)"), EditorStyles.largeLabel);
                     EditorGUI.BeginChangeCheck();
-                        ignoredProperties = EditorGUILayout.TextArea(ignoredProperties, GUILayout.ExpandWidth(true), GUILayout.ExpandHeight(true));
+                    if (Unsupported.IsSourceBuild())
+                    {
+                        findProviderIndexHelper = EditorGUILayout.Toggle("Use Find Provider", findProviderIndexHelper);
+                        minIndexVariations = EditorGUILayout.IntField("Min Variations", minIndexVariations);
+                        if (minIndexVariations < 1)
+                        {
+                            minIndexVariations = 1;
+                        }
+                        else if (minIndexVariations > 5)
+                        {
+                            minIndexVariations = 5;
+                        }
+                    }
+
+                    EditorGUILayout.LabelField(L10n.Tr("Ignored properties (Use line break or ; to separate tokens)"), EditorStyles.largeLabel);
+                    ignoredProperties = EditorGUILayout.TextArea(ignoredProperties, GUILayout.ExpandWidth(true), GUILayout.ExpandHeight(true));
                     if (EditorGUI.EndChangeCheck())
                         Save();
                 }
@@ -667,11 +1087,7 @@ private static void OpenCustomIndexerMenu()
 
         private static void ToggleCustomIndexer(string name, bool enable)
         {
-            if (enable)
-                disabledIndexers.Remove(name);
-            else
-                disabledIndexers.Add(name);
-            Save();
+            s_SettingsStorage.ToggleCustomIndexer(name, enable);
         }
 
         private static bool Toggle(GUIContent content, string propertyName, bool value)
@@ -682,91 +1098,6 @@ private static bool Toggle(GUIContent content, string propertyName, bool value)
             return newValue;
         }
 
-        private static T ReadSetting<T>(IDictionary settings, string key, T defaultValue = default)
-        {
-            try
-            {
-                if (SJSON.TryGetValue(settings, key, out var value))
-                    return (T)value;
-            }
-            catch (Exception)
-            {
-                // Any error will return the default value.
-            }
-
-            return defaultValue;
-        }
-
-        private static float ReadSetting(IDictionary settings, string key, float defaultValue = 0)
-        {
-            return (float)ReadSetting(settings, key, (double)defaultValue);
-        }
-
-        private static int ReadSetting(IDictionary settings, string key, int defaultValue = 0)
-        {
-            return (int)ReadSetting(settings, key, (double)defaultValue);
-        }
-
-        private static Dictionary<string, SearchProviderSettings> ReadProviderSettings(IDictionary settings, string fieldName)
-        {
-            return ReadDictionary<SearchProviderSettings>(settings, fieldName, vdict => new SearchProviderSettings()
-            {
-                active = Convert.ToBoolean(vdict[nameof(SearchProviderSettings.active)]),
-                priority = (int)(double)vdict[nameof(SearchProviderSettings.priority)],
-                defaultAction = vdict[nameof(SearchProviderSettings.defaultAction)] as string,
-            });
-        }
-
-        private static Dictionary<string, ObjectSelectorsSettings> ReadPickerSettings(IDictionary settings, string fieldName)
-        {
-            return ReadDictionary<ObjectSelectorsSettings>(settings, fieldName, vdict => new ObjectSelectorsSettings()
-            {
-                active = Convert.ToBoolean(vdict[nameof(SearchProviderSettings.active)]),
-                priority = (int)(double)vdict[nameof(SearchProviderSettings.priority)]
-            });
-        }
-
-        private static Dictionary<string, T> ReadProperties<T>(IDictionary settings, string fieldName)
-        {
-            return ReadDictionary(settings, fieldName, o => (T)o);
-        }
-
-        static Dictionary<string, T> ReadDictionary<T>(IDictionary settings, string fieldName, Func<object, T> valueCreator)
-        {
-            return ReadDictionary(settings, fieldName, e => true, valueCreator);
-        }
-
-        static Dictionary<string, T> ReadDictionary<T>(IDictionary settings, string fieldName, Func<IDictionary, BaseDictionarySettings> valueCreator)
-            where T : BaseDictionarySettings
-        {
-            return ReadDictionary(settings, fieldName, e => e.Value is IDictionary, o =>
-            {
-                var vdict = o as IDictionary;
-                return (T)valueCreator(vdict);
-            });
-        }
-
-        static Dictionary<string, T> ReadDictionary<T>(IDictionary settings, string fieldName, Func<DictionaryEntry, bool> extraPredicate, Func<object, T> valueCreator)
-        {
-            var d = new Dictionary<string, T>();
-            if (SJSON.TryGetValue(settings, fieldName, out var _data) && _data is IDictionary dataDict)
-            {
-                foreach (var p in dataDict)
-                {
-                    try
-                    {
-                        if (p is DictionaryEntry e && extraPredicate(e))
-                            d[(string)e.Key] = valueCreator(e.Value);
-                    }
-                    catch
-                    {
-                        // ignore copy
-                    }
-                }
-            }
-            return d;
-        }
-
         private static void DrawProviderSettings()
         {
             EditorGUILayout.LabelField(L10n.Tr("Provider Settings"), EditorStyles.largeLabel);
@@ -777,8 +1108,9 @@ private static void DrawProviderSettings()
 
                 var settings = GetProviderSettings(p.id);
 
+                var content = p.name + " (" + $"{p.filterId}" + ")";
                 var wasActive = p.active;
-                p.active = GUILayout.Toggle(wasActive, Styles.toggleProviderActiveContent);
+                p.active = EditorGUILayout.ToggleLeft(new GUIContent(content, Styles.toggleProviderActiveContent.tooltip), wasActive, GUILayout.Width(200));
                 if (p.active != wasActive)
                 {
                     SearchAnalytics.SendEvent(null, SearchAnalytics.GenericEventType.PreferenceChanged, "activateProvider", p.id, p.active.ToString());
@@ -787,12 +1119,6 @@ private static void DrawProviderSettings()
                         providerActivationChanged.Invoke(p.id, p.active);
                 }
 
-                using (new EditorGUI.DisabledGroupScope(!p.active))
-                {
-                    var content = p.name + " (" + $"{p.filterId}" + ")";
-                    GUILayout.Label(new GUIContent(content), GUILayout.Width(175));
-                }
-
                 if (!p.isExplicitProvider)
                 {
                     if (GUILayout.Button(Styles.increaseProviderPriorityContent, Styles.priorityButton))
@@ -842,26 +1168,23 @@ private static void DrawProviderSettings()
 
         internal static SearchProviderSettings GetProviderSettings(string providerId)
         {
-            if (TryGetProviderSettings(providerId, out var settings))
-                return settings;
-
             var provider = SearchService.GetProvider(providerId);
+            SearchProviderSettings defaultSettings = null;
             if (provider == null)
-                return new SearchProviderSettings();
+                defaultSettings = new SearchProviderSettings();
 
-            providers[providerId] = new SearchProviderSettings() { active = provider.active, priority = provider.priority, defaultAction = null };
-            return providers[providerId];
+            return s_SettingsStorage.GetProviderSettings(providerId, provider?.active ?? defaultSettings.active, provider?.priority ?? defaultSettings.priority, null, provider != null);
         }
 
         internal static bool TryGetProviderSettings(string providerId, out SearchProviderSettings settings)
         {
-            return providers.TryGetValue(providerId, out settings);
+            return s_SettingsStorage.TryGetProviderSettings(providerId, out settings);
         }
 
         private static void ResetProviderSettings()
         {
             SearchAnalytics.SendEvent(null, SearchAnalytics.GenericEventType.PreferenceReset);
-            providers.Clear();
+            s_SettingsStorage.ResetProviderSettings();
             SearchService.Refresh();
         }
 
@@ -958,7 +1281,7 @@ internal static string GetFullQueryFolderPath()
             return initialFolder;
         }
 
-        static class Styles
+        class Styles
         {
             public static GUIStyle priorityButton = new GUIStyle("Button")
             {
@@ -996,21 +1319,10 @@ static class Styles
             public static GUIContent decreaseObjectSelectorPriorityContent = EditorGUIUtility.TrTextContent("\u2193", "Decrease the object selector's priority");
         }
 
-        internal static void AddSearchFavorite(string searchText)
-        {
-            searchQueryFavorites.Add(searchText);
-            SaveFavorites();
-        }
-
-        internal static void RemoveSearchFavorite(string searchText)
-        {
-            searchQueryFavorites.Remove(searchText);
-            SaveFavorites();
-        }
-
         public static void AddItemFavorite(SearchItem item)
         {
             searchItemFavorites.Add(item.id);
+            s_SettingsStorage.AddItemFavorite(item.id);
             Dispatcher.Emit(SearchEvent.ItemFavoriteStateChanged, new SearchEventPayload(item.context, item.id));
             SearchAnalytics.SendEvent(null, SearchAnalytics.GenericEventType.QuickSearchAddFavoriteItem, item.provider.id);
         }
@@ -1018,19 +1330,9 @@ public static void AddItemFavorite(SearchItem item)
         public static void RemoveItemFavorite(SearchItem item)
         {
             searchItemFavorites.Remove(item.id);
+            s_SettingsStorage.RemoveItemFavorite(item.id);
             Dispatcher.Emit(SearchEvent.ItemFavoriteStateChanged, new SearchEventPayload(item.context, item.id));
             SearchAnalytics.SendEvent(null, SearchAnalytics.GenericEventType.QuickSearchRemoveFavoriteItem, item.provider.id);
         }
-
-        internal static void LoadFavorites()
-        {
-            var favoriteString = EditorPrefs.GetString("SearchQuery.Favorites", "");
-            searchQueryFavorites.UnionWith(favoriteString.Split(new string[] { ";;;" }, StringSplitOptions.RemoveEmptyEntries));
-        }
-
-        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 7a45575740..a44d7ed1b1 100644
--- a/Modules/QuickSearch/Editor/SearchUtils.cs
+++ b/Modules/QuickSearch/Editor/SearchUtils.cs
@@ -12,6 +12,7 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UIElements;
+using UnityEngine.Pool;
 
 using UnityEditor.SceneManagement;
 
@@ -54,7 +55,12 @@ public static string[] FindShiftLeftVariations(string word)
 
         public static Texture2D GetSceneObjectPreview(GameObject obj, Vector2 size, FetchPreviewOptions options, Texture2D thumbnail)
         {
-            return Utils.GetSceneObjectPreview(obj, size, options, thumbnail);
+            return Utils.GetSceneObjectPreview(null, obj, size, options, thumbnail);
+        }
+
+        public static Texture2D GetSceneObjectPreview(SearchContext ctx, GameObject obj, Vector2 size, FetchPreviewOptions options, Texture2D thumbnail)
+        {
+            return GetSceneObjectPreview(null, obj, size, options, thumbnail);
         }
 
         /// <summary>
@@ -62,7 +68,7 @@ public static Texture2D GetSceneObjectPreview(GameObject obj, Vector2 size, Fetc
         /// </summary>
         /// <param name="source"></param>
         /// <returns></returns>
-        static readonly Regex s_CamelCaseSplit = new Regex(@"(?<!^)(?=[A-Z0-9])", RegexOptions.Compiled);
+        static readonly Regex s_CamelCaseSplit = new Regex(@"(?<!^)(?=[A-Z])", RegexOptions.Compiled);
         public static string[] SplitCamelCase(string source)
         {
             return s_CamelCaseSplit.Split(source);
@@ -134,6 +140,11 @@ public static IEnumerable<string> SplitEntryComponents(string entry, char[] entr
         /// <param name="entrySeparators"></param>
         /// <returns>Returns list of tokens and variations in lowercase</returns>
         public static IEnumerable<string> SplitFileEntryComponents(string path, in char[] entrySeparators)
+        {
+            return SplitFileEntryComponents(path, entrySeparators, 1);
+        }
+
+        public static IEnumerable<string> SplitFileEntryComponents(string path, in char[] entrySeparators, int minTokenLength)
         {
             path = Utils.RemoveInvalidCharsFromPath(path, '_');
             var name = Path.GetFileNameWithoutExtension(path);
@@ -141,11 +152,11 @@ public static IEnumerable<string> SplitFileEntryComponents(string path, in char[
             var scc = nameTokens.SelectMany(s => SplitCamelCase(s)).Where(s => s.Length > 0).ToArray();
             var fcc = scc.Aggregate("", (current, s) => current + s[0]);
             return new[] { Path.GetExtension(path).Replace(".", "") }
-                .Concat(scc.Where(s => s.Length > 1))
+                .Concat(scc)
                 .Concat(FindShiftLeftVariations(fcc))
                 .Concat(nameTokens)
                 .Concat(path.Split(entrySeparators).Reverse())
-                .Where(s => s.Length > 1)
+                .Where(s => s.Length >= minTokenLength)
                 .Select(s => s.ToLowerInvariant())
                 .Distinct();
         }
@@ -394,15 +405,41 @@ public static IEnumerable<GameObject> FetchGameObjects()
             if (prefabStage != null)
                 return SceneModeUtility.GetObjects(new[] { prefabStage.prefabContentsRoot }, true);
 
-            var goRoots = new List<UnityEngine.Object>();
-            for (int i = 0; i < SceneManager.sceneCount; ++i)
+            void AddScene(Scene scene, List<Scene> outScenes)
             {
-                var scene = SceneManager.GetSceneAt(i);
                 if (!scene.IsValid() || !scene.isLoaded)
-                    continue;
+                    return;
+                outScenes.Add(scene);
+            }
+
+            using var scenesPoolHandle = ListPool<Scene>.Get(out var scenes);
+            var stage = StageUtility.GetCurrentStage();
+            if (stage is not MainStage)
+            {
+                for (int i = 0, c = stage.sceneCount; i < c; ++i)
+                {
+                    var scene = stage.GetSceneAt(i);
+                    AddScene(scene, scenes);
+                }
+            }
+            else
+            {
+                for (int i = 0; i < SceneManager.sceneCount; ++i)
+                {
+                    var scene = SceneManager.GetSceneAt(i);
+                    AddScene(scene, scenes);
+                }
+
+                if (EditorApplication.isPlaying)
+                    AddScene(EditorSceneManager.GetDontDestroyOnLoadScene(), scenes);
+            }
 
-                var sceneRootObjects = scene.GetRootGameObjects();
-                if (sceneRootObjects != null && sceneRootObjects.Length > 0)
+            using var gameObjectRootPoolHandle = ListPool<UnityEngine.Object>.Get(out var goRoots);
+            using var sceneRootGameObjectPoolHandle = ListPool<GameObject>.Get(out var sceneRootObjects);
+            foreach (var scene in scenes)
+            {
+                scene.GetRootGameObjects(sceneRootObjects);
+                if (sceneRootObjects.Count > 0)
                     goRoots.AddRange(sceneRootObjects);
             }
 
@@ -547,7 +584,7 @@ internal static SearchProposition CreateKeywordProposition(in string keyword)
                 return SearchProposition.invalid;
             return new SearchProposition(
                 priority: (ownerType.Name[0] << 4) + tokens[1][0],
-                category: $"Properties/{ownerType.Name}",
+                category: $"Properties/{ObjectNames.NicifyVariableName(ownerType.Name)}",
                 label: $"{tokens[1]} ({blockType?.Name ?? valueType})",
                 replacement: replacement,
                 help: tokens[2],
@@ -737,7 +774,7 @@ internal static bool IsPropertyTypeSupported(SerializedProperty p)
                     return false;
             }
 
-            return !p.isArray && !p.isFixedBuffer && p.propertyPath.LastIndexOf('[') == -1;
+            return (p.propertyType == SerializedPropertyType.String || !p.isArray) && !p.isFixedBuffer && p.propertyPath.LastIndexOf('[') == -1;
         }
 
         internal static IEnumerable<UnityEngine.Object> GetTemplates(IEnumerable<UnityEngine.Object> objects)
@@ -1021,19 +1058,29 @@ public static Rect GetMainWindowCenteredPosition(Vector2 size)
             return Utils.GetMainWindowCenteredPosition(size);
         }
 
+        public static Texture2D GetAssetThumbnailFromPath(SearchContext context, string path)
+        {
+            return Utils.GetAssetThumbnailFromPath(context, path);
+        }
+
         public static Texture2D GetAssetThumbnailFromPath(string path)
         {
-            return Utils.GetAssetThumbnailFromPath(path);
+            return GetAssetThumbnailFromPath(null, path);
         }
 
         public static Texture2D GetAssetPreviewFromPath(string path, FetchPreviewOptions previewOptions)
         {
-            return Utils.GetAssetPreviewFromPath(path, previewOptions);
+            return GetAssetPreviewFromPath(null, path, previewOptions);
+        }
+
+        public static Texture2D GetAssetPreviewFromPath(SearchContext context, string path, FetchPreviewOptions previewOptions, Vector2 previewSize = new())
+        {
+            return Utils.GetAssetPreviewFromPath(context, path, previewSize == Vector2.zero ? new Vector2(128, 128) : previewSize, previewOptions);
         }
 
         public static Texture2D GetAssetPreviewFromPath(string path, Vector2 previewSize, FetchPreviewOptions previewOptions)
         {
-            return Utils.GetAssetPreviewFromPath(path, previewSize, previewOptions);
+            return GetAssetPreviewFromPath(null, path, previewOptions, previewSize);
         }
 
         public static void FrameAssetFromPath(string path)
@@ -1155,7 +1202,7 @@ internal static ISearchView OpenWithContextualProvider(params string[] providerI
             return OpenWithContextualProvider(null, providerIds, SearchFlags.OpenContextual);
         }
 
-        internal static ISearchView OpenWithContextualProvider(string searchQuery, string[] providerIds, SearchFlags flags, string topic = null)
+        internal static ISearchView OpenWithContextualProvider(string searchQuery, string[] providerIds, SearchFlags flags, string topic = null, bool useExplicitProvidersAsNormalProviders = false)
         {
             var providers = SearchService.GetProviders(providerIds).ToArray();
             if (providers.Length != providerIds.Length)
@@ -1165,6 +1212,7 @@ internal static ISearchView OpenWithContextualProvider(string searchQuery, strin
                 return SearchWindow.OpenDefaultQuickSearch();
 
             var context = SearchService.CreateContext(providers, searchQuery, flags);
+            context.useExplicitProvidersAsNormalProviders = useExplicitProvidersAsNormalProviders;
             topic = topic ?? string.Join(", ", providers.Select(p => p.name.ToLower()));
             var qsWindow = SearchWindow.Create<SearchWindow>(context, topic);
 
diff --git a/Modules/QuickSearch/Editor/Selectors/MaterialSelectors.cs b/Modules/QuickSearch/Editor/Selectors/MaterialSelectors.cs
index 305107eb6c..4853fcf9cb 100644
--- a/Modules/QuickSearch/Editor/Selectors/MaterialSelectors.cs
+++ b/Modules/QuickSearch/Editor/Selectors/MaterialSelectors.cs
@@ -124,12 +124,9 @@ private void Create(MaterialProperty property, SearchColumnEventArgs args)
                         m_ValueElement = new FloatField() { label = "\u2022", style = { flexDirection = FlexDirection.Row } };
                         break;
                     case MaterialProperty.PropType.Range:
-                        m_ValueElement = new Slider(0f, 1f);
-                        m_ValueElement.Add(new Label());
-                        m_ValueElement.RegisterCallback<ChangeEvent<float>>(evt =>
-                        {
-                            m_ValueElement.Q<Label>().text = m_ValueElement.tooltip = evt.newValue.ToString();
-                        });
+                        var slider = new Slider(0f, 1f);
+                        slider.showInputField = true;
+                        m_ValueElement = slider;
                         break;
                     case MaterialProperty.PropType.Vector: m_ValueElement = new Vector4Field(); break;
                     case MaterialProperty.PropType.Texture:
@@ -185,7 +182,6 @@ public void Bind(SearchColumnEventArgs args)
                                 s.SetValueWithoutNotify(matProp.floatValue);
                                 s.lowValue = matProp.rangeLimits.x;
                                 s.SetHighValueWithoutNotify(matProp.rangeLimits.y);
-                                s.Q<Label>().text = s.tooltip = matProp.floatValue.ToString();
                             }
                         }
                         break;
@@ -288,9 +284,15 @@ internal static void SetMaterialPropertyValue(SearchItem item, SearchColumn colu
                     break;
 
                 case MaterialProperty.PropType.Texture:
-                    if (matProp.textureValue != (Texture)newValue)
-                        matProp.textureValue = (Texture)newValue;
-                    break;
+                    {
+                        var texValue = newValue as Texture;
+                        if ((newValue == null || texValue != null) && matProp.textureValue != texValue)
+                        {
+                            matProp.textureValue = texValue;
+                        }
+                        break;
+                    }
+                    
             }
         }
 
@@ -308,7 +310,7 @@ static object MaterialPropertyDrawer(Rect r, object prop)
                 case MaterialProperty.PropType.Range:
                     return MaterialEditor.RangePropertyInternal(r, matProp, GUIContent.none);
                 case MaterialProperty.PropType.Vector:
-                    return MaterialEditor.VectorPropertyInternal(r, matProp, string.Empty);
+                    return MaterialEditor.VectorPropertyInternal(r, matProp, GUIContent.none);
                 case MaterialProperty.PropType.Texture:
                     return EditorGUI.DoObjectField(r, r, GUIUtility.GetControlID(FocusType.Passive), matProp.textureValue, matProp.targets[0], typeof(Texture), null, true);
             }
diff --git a/Modules/QuickSearch/Editor/Selectors/PropertySelectors.cs b/Modules/QuickSearch/Editor/Selectors/PropertySelectors.cs
index b98522e19c..882b714dc1 100644
--- a/Modules/QuickSearch/Editor/Selectors/PropertySelectors.cs
+++ b/Modules/QuickSearch/Editor/Selectors/PropertySelectors.cs
@@ -13,7 +13,7 @@ namespace UnityEditor.Search
 {
     static class PropertySelectors
     {
-        [SearchSelector(@"#(?<propertyPath>[\w\d\.]+)", 9999, printable: false)]
+        [SearchSelector(@"#(?<propertyPath>[\w\d\.\[\]]+)", 9999, printable: false)]
         [SearchSelector("SerializedProperty/(?<propertyPath>.+)", 9999, printable: false)]
         public static object GetSerializedPropertyValue(SearchSelectorArgs args)
         {
diff --git a/Modules/QuickSearch/Editor/Selectors/SearchColumn.cs b/Modules/QuickSearch/Editor/Selectors/SearchColumn.cs
index d9e2f431fb..6e22ddc10e 100644
--- a/Modules/QuickSearch/Editor/Selectors/SearchColumn.cs
+++ b/Modules/QuickSearch/Editor/Selectors/SearchColumn.cs
@@ -275,7 +275,7 @@ public static List<SearchColumn> Enumerate(SearchContext context, IEnumerable<Se
 
             // In case there is a valid search group selected in the search view, lets use that instead.
             var currentGroup = context.searchView?.currentGroup;
-            if (!string.IsNullOrEmpty(currentGroup) && !string.Equals(currentGroup, "all", StringComparison.Ordinal))
+            if (!string.IsNullOrEmpty(currentGroup) && !string.Equals(currentGroup, GroupedSearchList.allGroupId, StringComparison.Ordinal))
             {
                 providerTypes.Clear();
                 providerTypes.Add(currentGroup);
diff --git a/Modules/QuickSearch/Editor/Table/ColumnEditor.cs b/Modules/QuickSearch/Editor/Table/ColumnEditor.cs
index 723032fee8..6634186c1f 100644
--- a/Modules/QuickSearch/Editor/Table/ColumnEditor.cs
+++ b/Modules/QuickSearch/Editor/Table/ColumnEditor.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Linq;
+using UnityEditorInternal;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -30,23 +31,11 @@ public static ColumnEditor ShowWindow(SearchTableViewColumn column, Action<Colum
             var sc = column.searchColumn;
             if (sc != null)
                 s_Window.titleContent = sc.content ?? s_Window.titleContent;
+
             s_Window.ShowAuxWindow();
             return s_Window;
         }
-
-        static ColumnEditor()
-        {
-            EditorApplication.update += CloseOnLostFocus;
-        }
-        static void CloseOnLostFocus()
-        {
-            if (s_Window != null && focusedWindow && focusedWindow != s_Window)
-            {
-                s_Window.Close();
-                s_Window = null;
-            }
-        }
-
+        
         public void CreateGUI()
         {
             var sc = column.searchColumn;
diff --git a/Modules/QuickSearch/Editor/UI/IResultView.cs b/Modules/QuickSearch/Editor/UI/IResultView.cs
index 7a6d04d01a..d8ebaa2735 100644
--- a/Modules/QuickSearch/Editor/UI/IResultView.cs
+++ b/Modules/QuickSearch/Editor/UI/IResultView.cs
@@ -17,5 +17,7 @@ interface IResultView : IDisposable
         void OnGroupChanged(string prevGroupId, string newGroupId);
         void AddSaveQueryMenuItems(SearchContext context, GenericMenu menu);
         void Focus();
+
+        internal int ComputeVisibleItemCapacity(float size, float height);
     }
 }
diff --git a/Modules/QuickSearch/Editor/UI/ObjectField.cs b/Modules/QuickSearch/Editor/UI/ObjectField.cs
index 710b71e3fa..1c991fa2b4 100644
--- a/Modules/QuickSearch/Editor/UI/ObjectField.cs
+++ b/Modules/QuickSearch/Editor/UI/ObjectField.cs
@@ -337,6 +337,7 @@ internal void ShowObjectSelector()
             m_OriginalObject = value;
             var runtimeContext = new RuntimeSearchContext
             {
+                contextId = bindingPath ?? name ?? label,
                 pickerType = SearchPickerType.ObjectField,
                 currentObject = m_OriginalObject,
                 requiredTypes = new[] { objectType },
diff --git a/Modules/QuickSearch/Editor/UI/SearchContextPropertyDrawer.cs b/Modules/QuickSearch/Editor/UI/SearchContextPropertyDrawer.cs
index be18f49e4b..4ef39382e9 100644
--- a/Modules/QuickSearch/Editor/UI/SearchContextPropertyDrawer.cs
+++ b/Modules/QuickSearch/Editor/UI/SearchContextPropertyDrawer.cs
@@ -33,13 +33,14 @@ public override VisualElement CreatePropertyGUI(SerializedProperty prop)
             ObjectField obj = new ObjectField()
             {
                 name = kVisualElementName,
-                label = prop.localizedDisplayName,
+                label = preferredLabel,
                 bindingPath = prop.propertyPath,
                 objectType = fieldInfo.FieldType,
                 searchViewFlags = searchContextAttribute.flags,
                 searchContext = CreateContextFromAttribute(searchContextAttribute)
             };
             obj.searchContext.runtimeContext = runtimeContext;
+            obj.AddToClassList(ObjectField.alignedFieldUssClassName);
 
             return obj;
         }
@@ -48,6 +49,7 @@ internal static RuntimeSearchContext CreateRuntimeSearchContextFromAttribute(Ser
         {
             return new RuntimeSearchContext
             {
+                contextId = property.propertyPath,
                 pickerType = SearchPickerType.SearchContextAttribute,
                 currentObject = property.objectReferenceValue,
                 editedObjects = property.serializedObject.targetObjects,
diff --git a/Modules/QuickSearch/Editor/UI/SearchPickerWindow.cs b/Modules/QuickSearch/Editor/UI/SearchPickerWindow.cs
index ba22c4c7f0..074efcbbe1 100644
--- a/Modules/QuickSearch/Editor/UI/SearchPickerWindow.cs
+++ b/Modules/QuickSearch/Editor/UI/SearchPickerWindow.cs
@@ -21,11 +21,6 @@ public override bool IsPicker()
             return true;
         }
 
-        internal override void OnEnable()
-        {
-            base.OnEnable();
-        }
-
         internal override void OnDisable()
         {
             if (m_LastFocusedWindow && !Utils.IsRunningTests())
@@ -40,7 +35,7 @@ internal override void OnDisable()
 
         protected override void RestoreSearchText(SearchViewState viewState)
         {
-            if (Utils.IsRunningTests() || viewState.context == null)
+            if (Utils.IsRunningTests() || viewState.context == null || viewState.ignoreSaveSearches)
                 return;
 
             var previousSearchText = SearchSettings.GetScopeValue(k_SavedSearchTextPrefKey, m_ContextHash, viewState.initialQuery);
diff --git a/Modules/QuickSearch/Editor/UI/SearchViewState.cs b/Modules/QuickSearch/Editor/UI/SearchViewState.cs
index d28c34b2e5..70ee7f6e81 100644
--- a/Modules/QuickSearch/Editor/UI/SearchViewState.cs
+++ b/Modules/QuickSearch/Editor/UI/SearchViewState.cs
@@ -97,11 +97,14 @@ internal int[] selectedIds
         public bool hasWindowSize => position.width > 0f && position.height > 0;
         public Vector2 windowSize => hasWindowSize ? position.size : defaultSize;
 
+
+        [SerializeField] bool m_ContextUseExplicitProvidersAsNormalProviders;
+
         public SearchContext context
         {
             get
             {
-                if (m_Context == null && m_WasDeserialized)
+                if (m_Context == null && m_WasDeserialized && Utils.IsMainProcess())
                     BuildContext();
                 return m_Context;
             }
@@ -112,6 +115,8 @@ internal set
             }
         }
 
+        internal bool hasContext => m_Context != null;
+
         public string text
         {
             get
@@ -217,13 +222,13 @@ internal SearchViewState SetSearchViewFlags(SearchViewFlags flags)
 
         internal void Assign(SearchViewState state)
         {
-            Assign(state, state.context);
+            // Be sure to create a copy of the context
+            Assign(state, state.context != null ? new SearchContext(state.context) : null);
         }
 
         internal void Assign(SearchViewState state, SearchContext searchContext)
         {
             var previousSearchView = context?.searchView;
-
             if (searchContext != null)
             {
                 context = searchContext;
@@ -264,6 +269,7 @@ internal void BuildContext()
                 m_Context = SearchService.CreateContext(providerIds, searchText ?? string.Empty, searchFlags);
             else
                 m_Context = SearchService.CreateContext(searchText ?? string.Empty, searchFlags | SearchFlags.OpenDefault);
+            m_Context.useExplicitProvidersAsNormalProviders = m_ContextUseExplicitProvidersAsNormalProviders;
             m_WasDeserialized = false;
         }
 
@@ -299,6 +305,7 @@ internal SearchViewState LoadDefaults(SearchFlags additionalFlags = SearchFlags.
                 title = "Unity";
             if (!forceViewMode && !runningTests)
                 itemSize = SearchSettings.itemIconSize;
+            hideTabs = SearchSettings.hideTabs;
 
             if (!runningTests && flags.HasNone(SearchViewFlags.OpenInBuilderMode) && flags.HasNone(SearchViewFlags.OpenInTextMode))
                 queryBuilderEnabled = SearchSettings.queryBuilder;
@@ -320,6 +327,7 @@ public void OnBeforeSerialize()
             searchText = context.searchText;
             providerIds = GetProviderIds().ToArray();
             m_ActiveQueryGuid = m_ActiveQuery?.guid;
+            m_ContextUseExplicitProvidersAsNormalProviders = context.useExplicitProvidersAsNormalProviders;
         }
 
         public void OnAfterDeserialize()
diff --git a/Modules/QuickSearch/Editor/UI/UndoManager.cs b/Modules/QuickSearch/Editor/UI/UndoManager.cs
index 91774457b8..c09d8f4696 100644
--- a/Modules/QuickSearch/Editor/UI/UndoManager.cs
+++ b/Modules/QuickSearch/Editor/UI/UndoManager.cs
@@ -211,28 +211,39 @@ public bool HandleEvent(in KeyDownEvent evt, out string searchText, out int curs
             selectPos = -1;
 
 
-            if (evt.modifiers.HasAny(EventModifiers.Alt))
+            if (evt.altKey)
             {
                 if (evt.keyCode == KeyCode.DownArrow)
+                {
                     searchText = CyclePreviousSearch(-1);
+                    return true;
+                }
                 else if (evt.keyCode == KeyCode.UpArrow)
+                {
                     searchText = CyclePreviousSearch(+1);
+                    return true;
+                }
             }
-            else if (m_UndoStack.CanUndo() && evt.keyCode == KeyCode.Z && (evt.commandKey || evt.ctrlKey))
-            {
-                if (!m_UndoStack.Undo(out var undoData))
-                    return false;
-                searchText = undoData.text;
-                cursorPos = undoData.cursorPos;
-                selectPos = undoData.selectPos;
-            }
-            else if (m_UndoStack.CanRedo() && evt.keyCode == KeyCode.Y && (evt.commandKey || evt.ctrlKey))
+            else if (evt.commandKey || evt.ctrlKey)
             {
-                if (!m_UndoStack.Redo(out var redoData))
-                    return false;
-                searchText = redoData.text;
-                cursorPos = redoData.cursorPos;
-                selectPos = redoData.selectPos;
+                if (m_UndoStack.CanUndo() && evt.keyCode == KeyCode.Z)
+                {
+                    if (!m_UndoStack.Undo(out var undoData))
+                        return false;
+                    searchText = undoData.text;
+                    cursorPos = undoData.cursorPos;
+                    selectPos = undoData.selectPos;
+                    return true;
+                }
+                else if (m_UndoStack.CanRedo() && evt.keyCode == KeyCode.Y)
+                {
+                    if (!m_UndoStack.Redo(out var redoData))
+                        return false;
+                    searchText = redoData.text;
+                    cursorPos = redoData.cursorPos;
+                    selectPos = redoData.selectPos;
+                    return true;
+                }
             }
 
             if (searchText != null && string.CompareOrdinal(searchText, m_CurrentText) != 0)
diff --git a/Modules/QuickSearch/Editor/UITK/GridView.cs b/Modules/QuickSearch/Editor/UITK/GridView.cs
index a9a57911a1..1b8ba89aa8 100644
--- a/Modules/QuickSearch/Editor/UITK/GridView.cs
+++ b/Modules/QuickSearch/Editor/UITK/GridView.cs
@@ -202,7 +202,6 @@ public GridView(IList itemsSource, float itemFixedWidth, float itemFixedHeight,
             m_MakeItem = makeItem;
 
             AddToClassList(k_GridViewStyleClassName);
-            RegisterCallback<GeometryChangedEvent>(OnSizeChanged);
 
             m_ScrollView = new ScrollView();
             m_ScrollView.AddToClassList(k_GridViewItemsScrollViewStyleClassName);
@@ -227,6 +226,8 @@ private void OnAttachToPanel(AttachToPanelEvent evt)
             if (evt.destinationPanel == null)
                 return;
 
+            RegisterCallback<GeometryChangedEvent>(OnSizeChanged);
+
             m_ScrollView.contentContainer.AddManipulator(m_NavigationManipulator = new KeyboardGridNavigationManipulator(Apply));
             m_ScrollView.RegisterCallback<PointerDownEvent>(OnPointerDown);
             m_ScrollView.RegisterCallback<PointerUpEvent>(OnPointerUp);
@@ -745,7 +746,7 @@ private void ProcessSingleClick(int itemIndex)
 
         internal int GetIndexByPosition(Vector2 localPosition)
         {
-            var resolvedRowWidth = m_ScrollView.contentContainer.resolvedStyle.width;
+            var resolvedRowWidth = m_ScrollView.contentContainer.boundingBox.width;
             var calculatedRowWidth = m_ColumnCount * m_FixedItemWidth;
             var delta = resolvedRowWidth - calculatedRowWidth;
             var extraElementPadding = Mathf.Ceil(delta / (m_ColumnCount - 1));
@@ -788,23 +789,17 @@ private void OnScroll(Vector2 offset)
             if (m_FirstVisibleRowIndex == newFirstVisibleRowIndex)
                 return;
 
+            var direction = m_FirstVisibleRowIndex > newFirstVisibleRowIndex ? ScrollingDirection.Up : ScrollingDirection.Down;
             var delta = Math.Abs(newFirstVisibleRowIndex - m_FirstVisibleRowIndex);
+            m_FirstVisibleRowIndex = newFirstVisibleRowIndex;
             if (delta >= m_RowCount)
             {
                 RebindActiveItems(newFirstVisibleRowIndex);
-            }
-            else if (m_FirstVisibleRowIndex > newFirstVisibleRowIndex)
-            {
-                for (int i = m_FirstVisibleRowIndex - 1; i >= newFirstVisibleRowIndex; i--)
-                    OnScrollBindItems(ScrollingDirection.Up);
-            }
-            else if (m_FirstVisibleRowIndex < newFirstVisibleRowIndex)
-            {
-                for (int i = m_FirstVisibleRowIndex + 1; i <= newFirstVisibleRowIndex; i++)
-                    OnScrollBindItems(ScrollingDirection.Down);
+                return;
             }
 
-            m_FirstVisibleRowIndex = newFirstVisibleRowIndex;
+            for (var i = 0; i < delta; ++i)
+                OnScrollBindItems(direction);
         }
 
         private void RebindActiveItems(int firstVisibleItemIndex)
@@ -846,7 +841,11 @@ private void OnScrollBindItems(ScrollingDirection scrollingDirection)
 
         private void ScrollingDown()
         {
-            var nextElementIndexToBind = m_RowPool.Last().GetLastItemInRow().index + 1;
+            // When scrolling down, if the last item in the last row is already undefined
+            // (because it is already outside the range of source items), then don't bind
+            // items from the start.
+            var lastIndex = m_RowPool.Last().GetLastItemInRow().index;
+            var nextElementIndexToBind = lastIndex == ReusableGridViewItem.UndefinedIndex ? ReusableGridViewItem.UndefinedIndex : lastIndex + 1;
             var row = m_RowPool.First();
             for (int i = 0; i < m_ColumnCount; i++)
             {
@@ -855,7 +854,7 @@ private void ScrollingDown()
                 UnbindItem(reusableItem, reusableItem.index);
 
                 row.AddItem(reusableItem);
-                if (nextElementIndexToBind < m_ItemsSource.Count)
+                if (nextElementIndexToBind != ReusableGridViewItem.UndefinedIndex && nextElementIndexToBind < m_ItemsSource.Count)
                 {
                     BindItem(reusableItem, nextElementIndexToBind, m_ItemsSourceIds[nextElementIndexToBind]);
                     nextElementIndexToBind++;
@@ -951,11 +950,6 @@ private void ReplaceActiveItems()
                 var reusableItem = activeItems[activeItemIndex];
                 activeItemIndex++;
 
-                if (m_SelectedIds.Contains(reusableItem.id))
-                    reusableItem.SetSelected(true);
-                else
-                    reusableItem.SetSelected(false);
-
                 if (i >= m_ItemsSource.Count)
                 {
                     if (reusableItem.id != ReusableGridViewItem.UndefinedIndex)
@@ -968,6 +962,26 @@ private void ReplaceActiveItems()
                     continue;
 
                 UnbindItem(reusableItem, i);
+            }
+
+            activeItemIndex = 0;
+            for (int i = firstVisibleItemIndex; i < endIndex; i++)
+            {
+                var reusableItem = activeItems[activeItemIndex];
+                activeItemIndex++;
+
+                if (m_SelectedIds.Contains(reusableItem.id))
+                    reusableItem.SetSelected(true);
+                else
+                    reusableItem.SetSelected(false);
+
+                if (i >= m_ItemsSource.Count)
+                {
+                    continue;
+                }
+
+                if (m_ItemsSourceIds[i] == reusableItem.id)
+                    continue;
                 BindItem(reusableItem, i, m_ItemsSourceIds[i]);
             }
 
diff --git a/Modules/QuickSearch/Editor/UITK/RenamableLabel.cs b/Modules/QuickSearch/Editor/UITK/RenamableLabel.cs
index 480feb4546..94855b97fa 100644
--- a/Modules/QuickSearch/Editor/UITK/RenamableLabel.cs
+++ b/Modules/QuickSearch/Editor/UITK/RenamableLabel.cs
@@ -3,7 +3,6 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.Search
@@ -15,6 +14,8 @@ class RenamableLabel : VisualElement
         /// </summary>
         public static readonly string ussClassName = "search-renamable-label";
 
+        public static readonly string labelClassName = ussClassName.WithUssElement("label");
+
         Label m_Label;
         TextField m_TextField;
 
@@ -34,6 +35,7 @@ public RenamableLabel(string text)
             AddToClassList(ussClassName);
 
             m_Label = new Label(text);
+            m_Label.AddToClassList(labelClassName);
             Add(m_Label);
         }
 
diff --git a/Modules/QuickSearch/Editor/UITK/SearchBaseCollectionView.cs b/Modules/QuickSearch/Editor/UITK/SearchBaseCollectionView.cs
index a396ec63c7..017585ab06 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchBaseCollectionView.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchBaseCollectionView.cs
@@ -18,6 +18,8 @@ abstract class SearchBaseCollectionView<T> : SearchElement, IResultView where T
         private bool m_Disposed;
         private Delayer m_Throttler;
 
+        private Action m_UpdateSelectionOffHandler;
+
         protected T m_ListView;
 
         Rect IResultView.rect => worldBound;
@@ -29,6 +31,11 @@ public SearchBaseCollectionView(string name, ISearchView viewModel, string class
         {
         }
 
+        int IResultView.ComputeVisibleItemCapacity(float size, float height)
+        {
+            return (int)(height / GetItemHeight()) + 10;
+        }
+
         protected override void OnAttachToPanel(AttachToPanelEvent evt)
         {
             base.OnAttachToPanel(evt);
@@ -62,6 +69,10 @@ protected override void OnDetachFromPanel(DetachFromPanelEvent evt)
             m_ListView.itemsChosen -= OnItemsChosen;
             m_ListView.selectedIndicesChanged -= HandleItemsSelected;
 
+            // Make sure to remove callbacks when Detaching from panel
+            m_UpdateSelectionOffHandler?.Invoke();
+            m_UpdateSelectionOffHandler = null;
+
             m_Throttler?.Dispose();
 
             base.OnDetachFromPanel(evt);
@@ -105,7 +116,12 @@ void IDisposable.Dispose()
         }
 
         void IResultView.Focus() => m_ListView.Focus();
-        public virtual void Refresh(RefreshFlags flags) { }
+        public virtual void Refresh(RefreshFlags flags)
+        {
+            if (flags.HasAny(RefreshFlags.DisplayModeChanged))
+                OnDisplayModeChanged(null);
+        }
+
         void IResultView.OnGroupChanged(string prevGroupId, string newGroupId) => OnGroupChanged(prevGroupId, newGroupId);
 
         protected virtual void OnGroupChanged(string prevGroupId, string newGroupId)
@@ -166,10 +182,16 @@ protected virtual float GetItemHeight()
         protected virtual void UpdateSelection()
         {
             var selectedIndexes = m_ViewModel.selection.indexes;
+            if (m_ListView.selectedIndices.SequenceEqual(selectedIndexes))
+                return;
+
             var firstSelection = selectedIndexes.Count > 0 ? selectedIndexes[0] : -1;
             m_ListView.SetSelectionWithoutNotify(selectedIndexes);
             if (firstSelection != -1)
-                Utils.CallDelayed(() => m_ListView.ScrollToItem(firstSelection), 0.01d);
+            {
+                m_UpdateSelectionOffHandler?.Invoke();
+                m_UpdateSelectionOffHandler = Utils.CallDelayed(() => m_ListView.ScrollToItem(firstSelection), 0.01d);
+            }
         }
 
         private void HandleItemsSelected(IEnumerable<int> selection)
diff --git a/Modules/QuickSearch/Editor/UITK/SearchDetailView.cs b/Modules/QuickSearch/Editor/UITK/SearchDetailView.cs
index 1f16a271df..03b066d51f 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchDetailView.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchDetailView.cs
@@ -28,6 +28,7 @@ class SearchDetailView : SearchElement, ISearchPanel
         private Action m_RefreshOff;
         private IVisualElementScheduledItem m_PreviewImageRefreshCallback;
         private IVisualElementScheduledItem m_ActionsRefreshCallback;
+        private ScrollView m_ScrollView;
 
         public static readonly string ussClassName = "search-details-view";
         public static readonly string inspectorLabelContainerClassName = ussClassName.WithUssElement("header");
@@ -51,8 +52,8 @@ public SearchDetailView(string name, ISearchView viewModel, params string[] clas
 
             m_ActiveElements = new List<VisualElement>();
 
-            var scrollView = new ScrollView(ScrollViewMode.Vertical);
-            scrollView.horizontalScrollerVisibility = ScrollerVisibility.Hidden;
+            m_ScrollView = new ScrollView(ScrollViewMode.Vertical);
+            m_ScrollView.horizontalScrollerVisibility = ScrollerVisibility.Hidden;
 
             var labelWithIcon = Create<VisualElement>(null, inspectorLabelContainerClassName);
             labelWithIcon.Add(new Image() { image = previewInspectorContent.image });
@@ -74,15 +75,15 @@ public SearchDetailView(string name, ISearchView viewModel, params string[] clas
             m_ActiveElements.Add(m_DescriptionLabel);
             m_ActiveElements.Add(m_EditorContainer);
 
-            scrollView.Add(labelWithIcon);
-            scrollView.Add(actionsContainer);
-            scrollView.Add(m_SelectionLabel);
-            scrollView.Add(m_PreviewImage);
-            scrollView.Add(m_InteractivePreviewElement);
-            scrollView.Add(m_DescriptionLabel);
-            scrollView.Add(m_EditorContainer);
+            m_ScrollView.Add(labelWithIcon);
+            m_ScrollView.Add(actionsContainer);
+            m_ScrollView.Add(m_SelectionLabel);
+            m_ScrollView.Add(m_PreviewImage);
+            m_ScrollView.Add(m_InteractivePreviewElement);
+            m_ScrollView.Add(m_DescriptionLabel);
+            m_ScrollView.Add(m_EditorContainer);
 
-            Add(scrollView);
+            Add(m_ScrollView);
 
             HideElements(m_ActiveElements);
 
@@ -128,16 +129,15 @@ private void OnPreviewSizeChanged(GeometryChangedEvent evt)
 
         private void OnSelectionChanged(ISearchEvent evt)
         {
-            if (evt.sourceViewState.context.searchView != viewState.context.searchView)
-                return;
-
             int selectionCount;
             if (evt.argumentCount == 1)
             {
                 selectionCount = evt.GetArgument<IEnumerable<int>>(0).ToList().Count;
                 if (selectionCount == 0)
                 {
-                    HideElements(m_ActiveElements);
+                    SetVisibleDetail(false);
+                    ResetEditors();
+                    m_EditorContainer.Clear();
                     return;
                 }
             }
@@ -197,13 +197,17 @@ private void Refresh()
 
             var selectionCount = selection.Count;
 
-            HideElements(m_ActiveElements);
+            SetVisibleDetail(false);
 
             SetupEditors(selection, showOptions);
 
             if (selectionCount == 0)
+            {
+                m_EditorContainer?.Clear();
                 return;
+            }
 
+            SetVisibleDetail(true);
             if (selectionCount > 1)
             {
                 ShowElements(m_SelectionLabel);
@@ -221,7 +225,7 @@ private void Refresh()
             }
 
             m_ActionsRefreshCallback?.Pause();
-            if (showOptions.HasAny(ShowDetailsOptions.Actions))
+            if (showOptions.HasAny(ShowDetailsOptions.Actions) && !m_ViewModel.IsPicker())
             {
                 RefreshActions(context);
                 m_ActionsRefreshCallback = schedule.Execute(() => RefreshActions(context)).StartingIn(100).Every(100);
@@ -238,13 +242,31 @@ private void Refresh()
 
             if (showOptions.HasAny(ShowDetailsOptions.Inspector))
                 DrawInspector(selection, showOptions);
+            else
+                m_EditorContainer.Clear();
 
             m_RefreshOff?.Invoke();
             m_RefreshOff = null;
         }
 
+        private void SetVisibleDetail(bool visible)
+        {
+            if (visible)
+            {
+                m_ScrollView.verticalScrollerVisibility = ScrollerVisibility.Auto;
+            }
+            else
+            {
+                HideElements(m_ActiveElements);
+                m_ScrollView.verticalScrollerVisibility = ScrollerVisibility.Hidden;
+            }
+        }
+
         private void RefreshActions(SearchContext context)
         {
+            if (context == null || context.selection == null)
+                return;
+
             HideElements(m_ActionButtons);
             HideElements(m_MoreButton);
             var selection = context.selection;
@@ -314,7 +336,6 @@ struct MoreButtonData
 
         private void RefreshMoreMenu(SearchSelection selection, IEnumerable<SearchAction> actions)
         {
-
             if (!actions.Any())
             {
                 return;
@@ -368,17 +389,20 @@ private void DrawPreview(SearchContext ctx, SearchItem item)
             if (editorWithPreview != null)
             {
                 m_InteractivePreviewElement.style.height = 256;
-                m_InteractivePreviewElement.onGUIHandler = () => editorWithPreview.DrawPreview(m_InteractivePreviewElement.contentRect);
+                m_InteractivePreviewElement.onGUIHandler = () =>
+                {
+                    if (editorWithPreview.targets.All(t => t))
+                        editorWithPreview.DrawPreview(m_InteractivePreviewElement.contentRect);
+                };
                 ShowElements(m_InteractivePreviewElement);
             }
             else
             {
-                UpdatePreviewImage(ctx, item, resolvedStyle.width, m_PreviewImage);
-
+                UpdatePreviewImage(ctx, item, resolvedStyle.width, this);
                 if (item.provider?.id.Equals("store", StringComparison.Ordinal) == true)
                 {
                     m_PreviewImageRefreshCallback =
-                        m_PreviewImage.schedule.Execute(() => UpdatePreviewImage(ctx, item, resolvedStyle.width, m_PreviewImage));
+                        m_PreviewImage.schedule.Execute(() => UpdatePreviewImage(ctx, item, resolvedStyle.width, this));
                     m_PreviewImageRefreshCallback
                         .StartingIn(500)
                         .Every(500)
@@ -387,11 +411,16 @@ private void DrawPreview(SearchContext ctx, SearchItem item)
             }
         }
 
-        static void UpdatePreviewImage(SearchContext ctx, SearchItem item, float width, Image m_PreviewImage)
+        static void UpdatePreviewImage(SearchContext ctx, SearchItem item, float width, SearchDetailView view)
         {
+            if (view.context.selection.Count == 0)
+                return;
+
+            var previewImage = view.m_PreviewImage;
             Texture2D thumbnail = null;
             if (SearchSettings.fetchPreview && width >= 32)
             {
+                // TODO: Use SearchPreviewManager
                 thumbnail = item.GetPreview(ctx, new Vector2(width, 256f),
                     FetchPreviewOptions.Large | FetchPreviewOptions.Preview2D, cacheThumbnail: false);
             }
@@ -401,8 +430,8 @@ static void UpdatePreviewImage(SearchContext ctx, SearchItem item, float width,
 
             if (!IsBuiltInIcon(thumbnail))
             {
-                m_PreviewImage.image = thumbnail;
-                ShowElements(m_PreviewImage);
+                previewImage.image = thumbnail;
+                ShowElements(previewImage);
             }
         }
 
@@ -426,6 +455,7 @@ private void DrawInspector(SearchSelection selection, ShowDetailsOptions showOpt
                     continue;
 
                 var editorElement = new SearchItemEditorElement(null, e);
+                editorElement.HideHeader(showOptions.HasFlag(ShowDetailsOptions.InspectorWithoutHeader));
                 m_EditorContainer.Add(editorElement);
                 hasValidEditor = true;
             }
@@ -526,3 +556,4 @@ private bool GetTargetsFromSearchItem(SearchItem item, List<UnityEngine.Object>
         }
     }
 }
+
diff --git a/Modules/QuickSearch/Editor/UITK/SearchElement.cs b/Modules/QuickSearch/Editor/UITK/SearchElement.cs
index 0d8df2989c..1db7245dd8 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchElement.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchElement.cs
@@ -28,6 +28,7 @@ static class SearchEvent
         public const string UserQueryRemoved = "search-user-query-removed";
         public const string ProjectQueryAdded = "search-project-query-added";
         public const string ProjectQueryRemoved = "search-project-query-removed";
+        public const string ProjectQueryListChanged = "search-project-query-list-changed";
         public const string ActiveQueryChanged = "search-active-query-changed";
         public const string SaveActiveSearchQuery = "search-save-active-search-query";
         public const string SearchQueryChanged = "search-query-changed";
@@ -83,6 +84,31 @@ public static EditorWindow GetHostWindow(this VisualElement self)
             return null;
         }
 
+        public static ISearchWindow GetSearchHostWindow(this VisualElement self)
+        {
+            if (self?.elementPanel == null)
+                return null;
+
+            if (self.elementPanel.ownerObject is ISearchWindow sw)
+                return sw;
+            if (self.elementPanel.ownerObject is HostView hv && hv.actualView is ISearchWindow hvsw)
+                return hvsw;
+            if (self.elementPanel.ownerObject is IEditorWindowModel ewm && ewm.window is ISearchWindow ewmsw)
+                return ewmsw;
+            return null;
+        }
+
+        public static bool HostWindowHasFocus(this VisualElement self)
+        {
+            if (self?.elementPanel == null)
+                return false;
+
+            if (self.elementPanel.ownerObject is ISearchWindow sw)
+                return sw.HasFocus();
+            var hostWindow = self.GetHostWindow();
+            return hostWindow?.hasFocus ?? false;
+        }
+
         public static void RegisterFireAndForgetCallback<TEventType>(this VisualElement self, EventCallback<TEventType> callback)
             where TEventType : EventBase<TEventType>, new()
         {
diff --git a/Modules/QuickSearch/Editor/UITK/SearchEmptyView.cs b/Modules/QuickSearch/Editor/UITK/SearchEmptyView.cs
index 1aedab9b55..f5f6e1ae10 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchEmptyView.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchEmptyView.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
+using UnityEngine.Search;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.Search
@@ -28,12 +29,29 @@ class SearchEmptyView : SearchElement, IResultView
         private bool m_Disposed;
         private QueryBuilder m_Areas;
         private VisualElement m_QueriesContainer;
+        private SearchEmptyViewMode m_DisplayMode;
 
         float IResultView.itemSize => m_ViewModel.itemIconSize;
         Rect IResultView.rect => worldBound;
         bool IResultView.showNoResultMessage => true;
 
-        public bool hideHelpers { get; set; }
+        enum SearchEmptyViewMode
+        {
+            None,
+            HideHelpersNoResult,
+            SearchInProgress,
+            NoResult,
+            NoResultWithTips,
+            QueryHelpersText,
+            QueryHelpersBlock
+        }
+
+        public SearchViewFlags searchViewFlags { get; set; }
+
+        int IResultView.ComputeVisibleItemCapacity(float width, float height)
+        {
+            return 0;
+        }
 
         static readonly string k_NoResultsLabel = L10n.Tr("No Results.");
         static readonly string k_SearchInProgressLabel = L10n.Tr("Search in progress...");
@@ -55,38 +73,92 @@ class SearchEmptyView : SearchElement, IResultView
         static readonly string k_AddFilterOrKeywordLabel = L10n.Tr("The search query is empty. Try adding some filters or keywords.");
         static readonly string k_TryAQueryLabel = L10n.Tr("The search query is empty. Try one of these queries:");
 
-        public SearchEmptyView(ISearchView viewModel, bool hideHelpers = false)
+        public SearchEmptyView(ISearchView viewModel, SearchViewFlags flags)
             : base("SearchEmptyView", viewModel, ussClassName)
         {
-            this.hideHelpers = hideHelpers;
+            searchViewFlags = flags;
 
             BuildView();
         }
 
-        private void BuildView()
+        public void Update()
+        {
+            if (GetDisplayMode() == SearchEmptyViewMode.NoResultWithTips && !context.empty)
+            {
+                BuildView(true);
+            }
+        }
+
+        private SearchEmptyViewMode GetDisplayMode()
+        {
+            if (searchViewFlags.HasFlag(SearchViewFlags.DisableQueryHelpers))
+                return SearchEmptyViewMode.HideHelpersNoResult;
+
+            if (m_ViewModel.searchInProgress)
+                return SearchEmptyViewMode.SearchInProgress;
+
+            if (!QueryEmpty())
+            {
+                return searchViewFlags.HasFlag(SearchViewFlags.DisableNoResultTips) ?
+                    SearchEmptyViewMode.NoResult :
+                    SearchEmptyViewMode.NoResultWithTips;
+            }
+
+            if (viewState.queryBuilderEnabled)
+                return SearchEmptyViewMode.QueryHelpersBlock;
+
+            return SearchEmptyViewMode.QueryHelpersText;
+        }
+
+        private bool QueryEmpty()
+        {
+            return string.IsNullOrEmpty(context.searchText);
+        }
+
+        private void BuildView(bool forceBuild = false)
         {
+            var displayMode = GetDisplayMode();
+            if (!forceBuild && displayMode == m_DisplayMode)
+                return;
+            m_DisplayMode = displayMode;
+
             Clear();
 
-            if (hideHelpers)
-                AddNoResultLabel(k_NoResultsLabel);
-            else if (m_ViewModel.searchInProgress)
-                AddNoResultLabel(k_SearchInProgressLabel);
-            else if (!context.empty)
-                BuildNoResultsTips();
-            else
-                BuildQueryHelpers();
+            switch(m_DisplayMode)
+            {
+                case SearchEmptyViewMode.HideHelpersNoResult:
+                    AddNoResultLabel(k_NoResultsLabel);
+                    break;
+                case SearchEmptyViewMode.NoResult:
+                    AddNoResultLabel(k_NoResultsLabel);
+                    break;
+                case SearchEmptyViewMode.NoResultWithTips:
+                    BuildNoResultsTips();
+                    break;
+                case SearchEmptyViewMode.SearchInProgress:
+                    AddNoResultLabel(k_SearchInProgressLabel);
+                    break;
+                default:
+                    BuildQueryHelpers();
+                    break;
+            }
 
-            EnableInClassList(helperBackgroundClassName, hideHelpers || context.empty);
+            EnableInClassList(helperBackgroundClassName, m_DisplayMode == SearchEmptyViewMode.HideHelpersNoResult || QueryEmpty());
         }
 
         private void BuildQueryHelpers()
         {
-            Add(CreateHeader(k_NarrowYourSearchLabel));
-            Add(CreateProviderHelpers(viewState.queryBuilderEnabled));
-
             m_QueriesContainer = new VisualElement();
             m_QueriesContainer.name = "QueryHelpersContainer";
-            BuildSearches();
+            if (GetActiveHelperProviders(viewState.queryBuilderEnabled).Count() > 1)
+            {
+                Add(CreateHeader(k_NarrowYourSearchLabel));
+                Add(CreateProviderHelpers(viewState.queryBuilderEnabled));
+            }
+            else
+            {
+                BuildSearches();
+            }
 
             Add(m_QueriesContainer);
         }
@@ -102,7 +174,6 @@ private void BuildSearches()
             m_QueriesContainer.Add(searchesHeader);
             m_QueriesContainer.Add(CreateSearchHelpers(viewState.queryBuilderEnabled, searches));
 
-            searches.UpdateTitle();
             searchesHeader.text = searches.title.text;
         }
 
@@ -126,7 +197,7 @@ private VisualElement CreateSearchHelpers(bool blockMode, QueryHelperSearchGroup
             var currentAreaFilterId = SearchSettings.helperWidgetCurrentArea;
             var filteredQueries = GetFilteredQueries(searches.queries, currentAreaFilterId, blockMode); ;
             PopulateSearchHelpers(filteredQueries, container);
-
+            searches.UpdateTitle(filteredQueries.Count());
             container.Children().LastOrDefault()?.AddToClassList("last-child");
             return container;
         }
@@ -172,7 +243,7 @@ private void OnQueryHelperClicked(ClickEvent evt)
             if (evt.target is not VisualElement ve || ve.userData is not QueryHelperSearchGroup.QueryData qd)
                 return;
 
-            if (qd.query != null && this.GetHostWindow() is ISearchQueryView sqv)
+            if (qd.query != null && this.GetSearchHostWindow() is ISearchQueryView sqv)
                 ExecuteQuery(qd.query);
             else
                 m_ViewModel.SetSearchText(qd.searchText);
@@ -192,12 +263,17 @@ private bool IsFilteredQuery(ISearchQuery query, SearchProvider provider)
 
         private IEnumerable<QueryHelperSearchGroup.QueryData> GetFilteredQueries(IEnumerable<QueryHelperSearchGroup.QueryData> queries, string currentAreaFilterId, bool blockMode)
         {
+            var activeProviders = GetActiveHelperProviders(blockMode);
             var isAll = k_All == currentAreaFilterId;
             if (isAll)
-                return queries;
-            var currentProvider = GetActiveHelperProviders(blockMode).FirstOrDefault(p => p.filterId == currentAreaFilterId);
+            {
+                // Keep only query matching one of the active providers.
+                return queries.Where(q => activeProviders.Any(p => IsFilteredQuery(q.query, p)));
+            }
+            var currentProvider = activeProviders.FirstOrDefault(p => p.filterId == currentAreaFilterId);
             return queries.Where(q =>
             {
+                // Keep query matching THE selected provider.
                 if (q.type == QueryHelperSearchGroup.QueryType.Recent)
                     return q.searchText.StartsWith(currentAreaFilterId, StringComparison.Ordinal);
                 return IsFilteredQuery(q.query, currentProvider);
@@ -250,7 +326,23 @@ private VisualElement CreateProviderHelpers(bool blockMode = true)
                 b.tooltip = string.Format(k_AreaTooltipFormat, b.value);
 
             foreach (var b in m_Areas.EnumerateBlocks())
+            {
+                if (b is QueryAreaBlock area && GetFilterId(area) == SearchSettings.helperWidgetCurrentArea)
+                {
+                    b.selected = true;
+                }
                 providersContainer.Add(b.CreateGUI());
+            }
+
+            if (!m_Areas.selectedBlocks.Any())
+            {
+                allArea.selected = true;
+                SetCurrentArea(allArea);
+            }
+            else
+            {
+                BuildSearches();
+            }
 
             return providersContainer;
         }
@@ -268,15 +360,25 @@ private void OnProviderClicked(ClickEvent evt)
             }
             else
             {
-                var filterId = string.IsNullOrEmpty(area.filterId) ? area.value : area.filterId;
-                SearchSettings.helperWidgetCurrentArea = filterId;
-                BuildSearches();
+                SetCurrentArea(area);
             }
 
             evt.StopPropagation();
             evt.PreventDefault();
         }
 
+        private void SetCurrentArea(QueryAreaBlock area)
+        {
+            var filterId = GetFilterId(area);
+            SearchSettings.helperWidgetCurrentArea = filterId;
+            BuildSearches();
+        }
+
+        private static string GetFilterId(QueryAreaBlock area)
+        {
+            return string.IsNullOrEmpty(area.filterId) ? area.value : area.filterId;
+        }
+
         private static ISearchQuery CreateQuery(string queryStr)
         {
             var q = new SearchQuery() { searchText = queryStr };
@@ -286,7 +388,7 @@ private static ISearchQuery CreateQuery(string queryStr)
 
         private void ExecuteQuery(ISearchQuery query)
         {
-            if(this.GetHostWindow() is ISearchQueryView sqv)
+            if(this.GetSearchHostWindow() is ISearchQueryView sqv)
                 sqv.ExecuteSearchQuery(query);
         }
 
@@ -329,6 +431,7 @@ protected override void OnDetachFromPanel(DetachFromPanelEvent evt)
 
         private void BuildView(ISearchEvent evt)
         {
+            m_DisplayMode = SearchEmptyViewMode.None;
             BuildView();
         }
 
@@ -449,7 +552,8 @@ private void AddNoResultHelpLabelWithButton(in string text, in string buttonText
 
         void IResultView.Refresh(RefreshFlags flags)
         {
-            BuildView();
+            if (flags == RefreshFlags.QueryCompleted || flags == RefreshFlags.ItemsChanged)
+                BuildView();
         }
 
         void IResultView.OnGroupChanged(string prevGroupId, string newGroupId)
diff --git a/Modules/QuickSearch/Editor/UITK/SearchGlobalEventHandlerManager.cs b/Modules/QuickSearch/Editor/UITK/SearchGlobalEventHandlerManager.cs
index 665edace5d..f821c837d5 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchGlobalEventHandlerManager.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchGlobalEventHandlerManager.cs
@@ -99,5 +99,17 @@ static void RemoveHandlerWithHashCode(int handlerHashCode, List<SearchGlobalEven
             if (existingHandlerIndex >= 0)
                 handlerList.RemoveAt(existingHandlerIndex);
         }
+
+        public static bool HandleGlobalEventHandlers<T>(SearchGlobalEventHandlerManager eventManager, T evt) where T : EventBase
+        {
+            var globalEventHandlers = eventManager.GetOrderedGlobalEventHandlers<T>();
+            foreach (var globalEventHandler in globalEventHandlers)
+            {
+                if (globalEventHandler?.Invoke(evt) ?? false)
+                    return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/UITK/SearchGridView.cs b/Modules/QuickSearch/Editor/UITK/SearchGridView.cs
index 27111e9bba..b42e9fddf6 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchGridView.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchGridView.cs
@@ -70,6 +70,15 @@ public SearchGridView(ISearchView viewModel)
             Add(m_GridView);
         }
 
+
+        int IResultView.ComputeVisibleItemCapacity(float width, float height)
+        {
+            // Approximation of how many we can fit.
+            width /= m_ViewModel.itemIconSize;
+            height /= m_ViewModel.itemIconSize;
+            return (int)(width * height);
+        }
+
         private float GetItemSize()
         {
             if (m_ViewModel.itemIconSize == 0)
@@ -154,7 +163,8 @@ private void OnRefreshContent(ISearchEvent evt)
 
         private void OnSelectionChanged(ISearchEvent evt)
         {
-            UpdateSelection();
+            if (evt.sourceElement != this)
+                UpdateSelection();
         }
 
         private void HandleItemsSelected(IEnumerable<int> selection)
@@ -349,8 +359,10 @@ private void UpdateSelection()
         {
             if (m_ViewModel == null || m_ViewModel.selection == null)
                 return;
-
+            
             var selectedIndexes = m_ViewModel.selection.indexes;
+            if (m_GridView.selectedIndices.SequenceEqual(selectedIndexes))
+                return;
             var firstSelection = selectedIndexes.Count > 0 ? selectedIndexes[0] : -1;
             m_GridView.SetSelectionWithoutNotify(selectedIndexes);
             if (firstSelection != -1)
diff --git a/Modules/QuickSearch/Editor/UITK/SearchGroupBar.cs b/Modules/QuickSearch/Editor/UITK/SearchGroupBar.cs
index 89ff946014..720c75a4e8 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchGroupBar.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchGroupBar.cs
@@ -190,6 +190,9 @@ private void DetachTabs(DetachFromPanelEvent evt)
         {
             Off(SearchEvent.RefreshContent, OnRefreshed);
             Off(SearchEvent.DisplayModeChanged, UpdateResultViewButton);
+
+            // Make sure to remove callbacks when Detaching from panel
+            EditorApplication.tick -= AdjustTabs;
         }
 
         private void BuildGroups()
@@ -237,7 +240,7 @@ private void AdjustTabs(float barWidth, float barHeight)
                     continue;
 
                 tab.groupNameLabel.text = tab.name;
-                if (!context.empty)
+                if (tab.count > 0)
                 {
                     var formattedCount = Utils.FormatCount((ulong)tab.count);
                     tab.groupCountLabel.text = string.Format(m_TabCountTextColorFormat, formattedCount);
diff --git a/Modules/QuickSearch/Editor/UITK/SearchItemEditorElement.cs b/Modules/QuickSearch/Editor/UITK/SearchItemEditorElement.cs
index 0730a7314e..6ef3b0a87f 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchItemEditorElement.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchItemEditorElement.cs
@@ -52,6 +52,11 @@ public SearchItemEditorElement(string name, Editor editor, params string[] class
             Init();
         }
 
+        public void HideHeader(bool hide)
+        {
+            m_Header.visible = !hide;
+        }
+
         void Init()
         {
             m_EditorTarget = editor.targets[0];
@@ -85,11 +90,7 @@ InspectorElement BuildInspectorElement()
         {
             var editorTitle = ObjectNames.GetInspectorTitle(m_EditorTarget);
 
-            InspectorElement.Mode inspectorElementMode = InspectorElement.Mode.Normal;
-            if (editor is GenericInspector)
-                inspectorElementMode = InspectorElement.Mode.UIEDefault;
-
-            var inspectorElement = new InspectorElement(editor, inspectorElementMode)
+            var inspectorElement = new InspectorElement(editor, InspectorElement.DefaultInspectorFramework.UIToolkit)
             {
                 focusable = false,
                 name = editorTitle + "Inspector",
@@ -122,7 +123,7 @@ IMGUIContainer BuildHeaderElement(string editorTitle)
 
         void HeaderOnGUI()
         {
-            if (editor == null)
+            if (!Utils.IsEditorValid(editor))
             {
                 if (m_InspectorElement != null)
                 {
@@ -296,9 +297,7 @@ IMGUIContainer BuildFooterElement(string editorTitle)
 
         void FooterOnGUI()
         {
-            var ed = editor;
-
-            if (ed == null)
+            if (!Utils.IsEditorValid(editor))
             {
                 return;
             }
diff --git a/Modules/QuickSearch/Editor/UITK/SearchListView.cs b/Modules/QuickSearch/Editor/UITK/SearchListView.cs
index d90d21f1ee..8b958bc2c1 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchListView.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchListView.cs
@@ -50,8 +50,11 @@ public SearchListViewItem(ISearchView viewModel)
             labels.Add(m_Description);
             Add(labels);
 
-            m_ActionDropdown = CreateButton("SearchItemActionsDropdown", moreActionsTooltip, OnActionDropdownClicked, baseIconButtonClassName, moreActionButtonClassName);
-            Add(m_ActionDropdown);
+            if (!viewModel.IsPicker())
+            {
+                m_ActionDropdown = CreateButton("SearchItemActionsDropdown", moreActionsTooltip, OnActionDropdownClicked, baseIconButtonClassName, moreActionButtonClassName);
+                Add(m_ActionDropdown);
+            }
 
             Add(m_FavoriteButton);
         }
diff --git a/Modules/QuickSearch/Editor/UITK/SearchQueryBuilderView.cs b/Modules/QuickSearch/Editor/UITK/SearchQueryBuilderView.cs
index ed8444aebe..96a0bf7951 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchQueryBuilderView.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchQueryBuilderView.cs
@@ -51,6 +51,7 @@ string INotifyValueChanged<string>.value
         }
 
         internal QueryBuilder builder => m_QueryBuilder;
+        internal TextField searchField => m_TextField;
 
         public SearchQueryBuilderView(string name, ISearchView viewModel, SearchFieldBase<TextField, string> searchField)
             : base(name, viewModel, ussClassName)
@@ -120,7 +121,10 @@ private void Rebuild(ISearchEvent evt)
         private void OnQueryChanged(ChangeEvent<string> evt)
         {
             if (m_QueryBuilder != null)
+            {
                 m_QueryBuilder.wordText = evt.newValue;
+                m_ViewModel.SetSelection();
+            }
         }
 
         private void OnKeyDown(KeyDownEvent evt)
@@ -134,7 +138,10 @@ private void OnKeyDown(KeyDownEvent evt)
 
         private bool GlobalEventHandler(KeyDownEvent evt)
         {
-            return m_QueryBuilder?.HandleGlobalKeyDown(evt) ?? false;
+            var isHandled = m_QueryBuilder?.HandleGlobalKeyDown(evt) ?? false;
+            if (isHandled)
+                Focus();
+            return isHandled;
         }
 
         private void DeferRefreshBuilder()
diff --git a/Modules/QuickSearch/Editor/UITK/SearchQueryListView.cs b/Modules/QuickSearch/Editor/UITK/SearchQueryListView.cs
index 1eb20f61f1..76533cf1bc 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchQueryListView.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchQueryListView.cs
@@ -136,8 +136,6 @@ class SearchQueryListViewItem : SearchElement
 
         internal ISearchQuery searchQuery => m_SearchQuery;
 
-        internal static readonly string tabCountTextColorFormat = EditorGUIUtility.isProSkin ? "<color=#7B7B7B>{0}</color>" : "<color=#6A6A6A>{0}</color>";
-
         public static readonly string ussClassName = "search-query-listview-item";
         public static readonly string nameLabelClassName = ussClassName.WithUssElement("label");
         public static readonly string countLabelClassName = ussClassName.WithUssElement("count");
@@ -241,7 +239,7 @@ void UpdateSearchQueryItemCount(int itemCount)
                 return;
 
             string formattedCount = Utils.FormatCount(Convert.ToUInt64(itemCount));
-            m_CountLabel.text = string.Format(tabCountTextColorFormat, formattedCount);
+            m_CountLabel.text = string.Format(formattedCount);
         }
 
         public void Rename()
@@ -252,7 +250,7 @@ public void Rename()
 
         void OnPointerDown(PointerDownEvent evt)
         {
-            if (evt.clickCount != 1 && evt.button != 0)
+            if (evt.clickCount != 1 || evt.button != 0)
                 return;
 
             if (!m_Selected)
@@ -287,6 +285,7 @@ class SearchQueryListView : SearchElement
         public Action saveSearchQuery { get; set; }
         public Action<ISearchQuery, SearchQueryListViewItem> bindItem { get; set; }
         public Action<SearchQueryListView, bool> expandStateChanged { get; set; }
+        public IEnumerable<ISearchQuery> itemSource => m_Source;
 
         public const string headerIdName = "SearchQueryListViewHeader";
         public const string saveIconIdName = "SaveQueryButton";
diff --git a/Modules/QuickSearch/Editor/UITK/SearchQueryPanelView.cs b/Modules/QuickSearch/Editor/UITK/SearchQueryPanelView.cs
index 6969858fe7..fb9a7cdcba 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchQueryPanelView.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchQueryPanelView.cs
@@ -199,6 +199,7 @@ protected override void OnAttachToPanel(AttachToPanelEvent evt)
 
             OnAll(SearchEvent.UserQueryAdded, HandleUserQueriesChanged);
             OnAll(SearchEvent.UserQueryRemoved, HandleUserQueriesChanged);
+            OnAll(SearchEvent.ProjectQueryListChanged, HandleProjectQueriesChanged);
             OnAll(SearchEvent.ProjectQueryAdded, HandleProjectQueriesChanged);
             OnAll(SearchEvent.ProjectQueryRemoved, HandleProjectQueriesChanged);
             OnAll(SearchEvent.SearchQueryChanged, HandleSearchQueryChanged);
@@ -209,6 +210,7 @@ protected override void OnDetachFromPanel(DetachFromPanelEvent evt)
         {
             Off(SearchEvent.UserQueryAdded, HandleUserQueriesChanged);
             Off(SearchEvent.UserQueryRemoved, HandleUserQueriesChanged);
+            Off(SearchEvent.ProjectQueryListChanged, HandleProjectQueriesChanged);
             Off(SearchEvent.ProjectQueryAdded, HandleProjectQueriesChanged);
             Off(SearchEvent.ProjectQueryRemoved, HandleProjectQueriesChanged);
             Off(SearchEvent.SearchQueryChanged, HandleSearchQueryChanged);
@@ -287,7 +289,7 @@ void HandleUserQueriesChanged(ISearchEvent evt)
 
         void HandleViewQueryAdded(ISearchEvent evt, string eventName, SearchQuerySource source, bool waitForGeometryChanged)
         {
-            if (!IsEventFromSameView(evt) || evt.eventName != eventName)
+            if (evt == null || !IsEventFromSameView(evt) || evt.eventName != eventName)
                 return;
 
             var listView = GetListView(source.id);
diff --git a/Modules/QuickSearch/Editor/UITK/SearchStatusBar.cs b/Modules/QuickSearch/Editor/UITK/SearchStatusBar.cs
index 25ae76a7c0..a054439b19 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchStatusBar.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchStatusBar.cs
@@ -170,7 +170,8 @@ private void OnRefreshed(ISearchEvent evt)
                 var firstLineIndex = string.IsNullOrEmpty(err.reason) ? -1 : err.reason.IndexOf("\n");
                 if (firstLineIndex >= 0)
                     firstLineReason = err.reason.Substring(0, firstLineIndex);
-                m_StatusMessage.text = Utils.TrimText(firstLineReason);
+                var msg = $"[in {err.provider.name}] {Utils.TrimText(firstLineReason)}";
+                m_StatusMessage.text = msg;
                 m_StatusMessage.tooltip = $"({err.provider.name}) {err.reason}";
                 m_StatusMessage.style.color = Color.red;
             }
diff --git a/Modules/QuickSearch/Editor/UITK/SearchTableView.cs b/Modules/QuickSearch/Editor/UITK/SearchTableView.cs
index 7023716250..acb12896a0 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchTableView.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchTableView.cs
@@ -23,7 +23,6 @@ class SearchTableView : SearchBaseCollectionView<MultiColumnListView>, ITableVie
         public static readonly string resetSearchColumnsTooltip = L10n.Tr("Reset search result columns.");
 
         private Action m_DeferredSortColumnOff;
-        private readonly Button m_AddColumnButton;
 
         public SearchTable tableConfig
         {
@@ -52,13 +51,7 @@ public SearchTableView(ISearchView viewModel)
                 sortingEnabled = true
             };
             m_ListView.AddToClassList(resultsListClassName);
-
-            m_AddColumnButton = Create<Button>(null, addColumnButtonClassName);
-            m_AddColumnButton.tooltip = addMoreColumnsTooltip;
-            m_AddColumnButton.RegisterCallback<ClickEvent>(OnAddColumn);
-
             Add(m_ListView);
-            Add(m_AddColumnButton);
 
             if (tableConfig == null)
                 SetupColumns();
@@ -233,6 +226,12 @@ private void OnAddResultViewButtons(ISearchEvent evt)
         {
             var container = evt.GetArgument<VisualElement>(0);
 
+            var addColumnButton = new Button { tooltip = addMoreColumnsTooltip };
+            addColumnButton.RegisterCallback<ClickEvent>(OnAddColumn);
+            addColumnButton.AddToClassList(SearchGroupBar.groupBarButtonClassName);
+            addColumnButton.AddToClassList(addColumnButtonClassName);
+            container.Add(addColumnButton);
+
             var resetColumnsButton = new Button(ResetColumnLayout) { tooltip = resetSearchColumnsTooltip };
             resetColumnsButton.AddToClassList(SearchGroupBar.groupBarButtonClassName);
             resetColumnsButton.AddToClassList(resetColumnsButtonClassName);
@@ -285,7 +284,7 @@ private void OnSearchColumnContextualMenu(ContextualMenuPopulateEvent evt, Colum
 
             if (columnUnderMouse != null)
             {
-                var colName = (columnUnderMouse as SearchTableViewColumn)?.searchColumn?.name ?? columnUnderMouse.name;
+                var colName = (columnUnderMouse as SearchTableViewColumn)?.title ?? columnUnderMouse.title;
                 evt.menu.AppendAction(EditorGUIUtility.TrTextContent($"Edit {colName}...").text, (a) => EditColumn(activeColumnIndex));
                 evt.menu.AppendAction(EditorGUIUtility.TrTextContent($"Remove {colName}").text, (a) => RemoveColumn(activeColumnIndex));
             }
@@ -398,16 +397,20 @@ public void AddColumns(IEnumerable<SearchColumn> newColumns, int insertColumnAt)
             if (tableConfig == null)
                 return;
 
+            var uniqueColumns = newColumns.Where(newColumn => tableConfig.columns.All(c => c.selector != newColumn.selector)).ToList();
+            if (uniqueColumns.Count == 0)
+                return;
+
             var searchColumns = new List<SearchColumn>(tableConfig.columns);
             if (insertColumnAt == -1)
                 insertColumnAt = searchColumns.Count;
             var columnCountBefore = searchColumns.Count;
-            searchColumns.InsertRange(insertColumnAt, newColumns);
+            searchColumns.InsertRange(insertColumnAt, uniqueColumns);
 
             var columnAdded = searchColumns.Count - columnCountBefore;
             if (columnAdded > 0)
             {
-                var firstColumn = newColumns.First();
+                var firstColumn = uniqueColumns.First();
                 var e = SearchAnalytics.GenericEvent.Create(null, SearchAnalytics.GenericEventType.QuickSearchTableAddColumn, firstColumn.name);
                 e.intPayload1 = columnAdded;
                 e.message = firstColumn.provider;
diff --git a/Modules/QuickSearch/Editor/UITK/SearchTableViewCell.cs b/Modules/QuickSearch/Editor/UITK/SearchTableViewCell.cs
index 5c02e1a965..ff4fe3b92a 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchTableViewCell.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchTableViewCell.cs
@@ -83,7 +83,11 @@ private void OnAttachToPanel(AttachToPanelEvent attachEvent)
         {
             // the contextual click is registered on the row container to ensure that there are no gaps between cells in the click target
             var pp = parent?.parent;
-            pp?.RegisterCallback<ContextClickEvent>(OnItemContextualClicked);
+            if (m_TableView.GetColumnIndex(m_SearchColumn.name) == 0)
+            {
+                // Ensure we only register a single context click handler.
+                pp?.RegisterCallback<ContextClickEvent>(OnItemContextualClicked);
+            }
 
             if (m_SearchColumn.setter == null)
             {
@@ -284,7 +288,7 @@ private void OnItemContextualClicked(ContextClickEvent evt)
             if (m_BindedItem == null)
                 return;
 
-            m_ViewModel.ShowItemContextualMenu(m_BindedItem, worldBound);
+            m_ViewModel.ShowItemContextualMenu(m_BindedItem, new Rect(evt.mousePosition, worldBound.size));
         }
 
         private void OnItemPointerDown(PointerDownEvent evt)
diff --git a/Modules/QuickSearch/Editor/UITK/SearchTableViewColumnSorter.cs b/Modules/QuickSearch/Editor/UITK/SearchTableViewColumnSorter.cs
index f51dbaa544..ffa73ca125 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchTableViewColumnSorter.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchTableViewColumnSorter.cs
@@ -178,7 +178,9 @@ public override int CompareItems(in SearchItem x, in SearchItem y)
             if (xs == null) return 2;
             if (ys == null) return -2;
 
-            return DefaultCompare(xs, ys, sortAscending: true);
+            var c = DefaultCompare(xs, ys, sortAscending: true);
+            if (c != 0) return c;
+            return base.CompareItems(x, y);
         }
 
         public override int GetHashCode()
diff --git a/Modules/QuickSearch/Editor/UITK/SearchToolbar.cs b/Modules/QuickSearch/Editor/UITK/SearchToolbar.cs
index 3d62b3fb4b..595079256e 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchToolbar.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchToolbar.cs
@@ -79,6 +79,8 @@ public void UpdatePosition(in Rect newPosition)
 
         public static readonly string pressToFilterTooltip = L10n.Tr("Press Tab \u21B9 to filter");
 
+        const float k_PlaceholdersTouchThreshold = 2f;
+
         protected readonly ISearchView m_ViewModel;
         protected readonly Toggle m_SearchQueryToggle;
         protected readonly Toggle m_QueryBuilderToggle;
@@ -88,19 +90,20 @@ public void UpdatePosition(in Rect newPosition)
         private readonly UndoManager m_UndoManager;
         private readonly Label m_SearchPlaceholder;
         private readonly Label m_PressTabPlaceholder;
-        private readonly ToolbarMenu s_SaveQueryDropdown;
+        private readonly ToolbarMenu m_SaveQueryDropdown;
 
         public virtual SearchContext context => m_ViewModel.context;
         public virtual SearchViewState viewState => m_ViewModel.state;
 
         public ToolbarSearchField searchField { get; private set; }
-        internal QueryBuilder queryBuilder => (m_SearchTextInput as SearchQueryBuilderView).builder;
+        internal QueryBuilder queryBuilder => (m_SearchTextInput as SearchQueryBuilderView)?.builder;
 
         List<VisualMessage> m_VisualMessages = new();
         IVisualElementScheduledItem m_UpdateQueryErrorScheduledItem;
 
         internal List<VisualMessage> visualMessages => m_VisualMessages;
         internal IVisualElementScheduledItem queryErrorsScheduleItem => m_UpdateQueryErrorScheduledItem;
+        internal INotifyValueChanged<string> searchTextInput => m_SearchTextInput;
 
         public TextElement textElement
         {
@@ -113,10 +116,12 @@ public TextElement textElement
             }
         }
 
-        TextField textField
+        internal TextField textField
         {
             get
             {
+                if (viewState.queryBuilderEnabled && queryBuilder != null)
+                    return queryBuilder?.textBlock?.GetSearchField()?.GetTextElement() as TextField;
                 if (searchField?.Q<TextField>() is not TextField tf)
                     return null;
                 return tf;
@@ -173,6 +178,10 @@ public SearchToolbar(string name, ISearchView viewModel)
             m_PressTabPlaceholder.style.paddingBottom = 3f;
             m_PressTabPlaceholder.focusable = false;
             m_PressTabPlaceholder.pickingMode = PickingMode.Ignore;
+            if (!context.empty)
+                m_PressTabPlaceholder.style.right = 12f;
+            else
+                m_PressTabPlaceholder.style.right = 2f;
 
             // Search field
             m_SearchFieldContainer = new VisualElement();
@@ -182,8 +191,8 @@ public SearchToolbar(string name, ISearchView viewModel)
             // Save query dropdown
             if (window?.IsSavedSearchQueryEnabled() ?? false)
             {
-                s_SaveQueryDropdown = SearchElement.Create<ToolbarMenu, MouseUpEvent>("SearchSaveQueryMenu", OnSaveQueryDropdown, buttonClassName, dropdownClassName, saveQueryButtonClassName);
-                Add(s_SaveQueryDropdown);
+                m_SaveQueryDropdown = SearchElement.Create<ToolbarMenu, ClickEvent>("SearchSaveQueryMenu", OnSaveQueryDropdown, buttonClassName, dropdownClassName, saveQueryButtonClassName);
+                Add(m_SaveQueryDropdown);
                 UpdateSaveQueryButton();
             }
 
@@ -203,6 +212,7 @@ public SearchToolbar(string name, ISearchView viewModel)
 
         private void CreateSearchField(VisualElement searchFieldContainer)
         {
+            m_SearchTextInput = null;
             m_VisualMessages.Clear();
             searchFieldContainer.Clear();
             searchFieldContainer.style.flexDirection = FlexDirection.Row;
@@ -220,8 +230,8 @@ private void CreateSearchField(VisualElement searchFieldContainer)
             if (viewState.queryBuilderEnabled)
             {
                 var queryBuilderView = new SearchQueryBuilderView("SearchQueryBuilder", m_ViewModel, searchField);
-                queryBuilderView.RegisterCallback<ChangeEvent<string>>(OnQueryChanged);
                 searchField.Insert(1, queryBuilderView);
+                queryBuilderView.RegisterCallback<ChangeEvent<string>>(OnQueryChanged);
                 m_SearchTextInput = queryBuilderView;
             }
             else
@@ -253,7 +263,7 @@ public void FocusSearchField()
 
         void FocusSearchField(FocusType focusType)
         {
-            if (!(textElement?.GetHostWindow()?.hasFocus ?? false))
+            if (!(textElement?.GetSearchHostWindow()?.HasFocus() ?? false))
                 return;
 
             if (textElement != null && textElement.selection != null)
@@ -288,11 +298,16 @@ void FocusSearchField(FocusType focusType)
 
         private void UpdatePlaceholders()
         {
-            m_SearchPlaceholder.style.display = !context.empty ? DisplayStyle.None : DisplayStyle.Flex;
+            m_SearchPlaceholder.style.visibility = !context.empty ? Visibility.Hidden : Visibility.Visible;
+            if (m_SearchPlaceholder.worldBound.xMax + k_PlaceholdersTouchThreshold >= searchField.worldBound.xMax)
+                m_SearchPlaceholder.style.visibility = Visibility.Hidden;
+
+            var oldRight = m_PressTabPlaceholder.style.right.value.value;
             if (!context.empty)
                 m_PressTabPlaceholder.style.right = 12f;
             else
                 m_PressTabPlaceholder.style.right = 2f;
+            var offset = m_PressTabPlaceholder.style.right.value.value - oldRight;
 
             var te = searchField.Q<TextElement>();
             if (te != null)
@@ -302,6 +317,9 @@ private void UpdatePlaceholders()
                     m_PressTabPlaceholder.style.visibility = Visibility.Hidden;
                 else
                     m_PressTabPlaceholder.style.visibility = Visibility.Visible;
+
+                if (m_PressTabPlaceholder.style.visibility == Visibility.Visible && (m_PressTabPlaceholder.worldBound.xMin - offset) <= m_SearchPlaceholder.worldBound.xMax + k_PlaceholdersTouchThreshold)
+                    m_PressTabPlaceholder.style.visibility = Visibility.Hidden;
             }
             else
                 m_PressTabPlaceholder.style.display = DisplayStyle.None;
@@ -329,7 +347,7 @@ private void OnToggleInspector(ChangeEvent<bool> evt)
 
         private void OnQueryChanged(ChangeEvent<string> evt)
         {
-            if (evt.target != m_SearchTextInput)
+            if (m_SearchTextInput != evt.target)
                 return;
 
             m_ViewModel.SetSearchText(evt.newValue, TextCursorPlacement.None);
@@ -349,10 +367,10 @@ private void OnSaveQuery(SearchWindow window)
             }
 
             AddSaveQueryMenuItems(window, saveQueryMenu);
-            saveQueryMenu.ShowAsContext();
+            saveQueryMenu.DropDown(m_SaveQueryDropdown.worldBound);
         }
 
-        private void OnSaveQueryDropdown(MouseUpEvent evt)
+        private void OnSaveQueryDropdown(ClickEvent evt)
         {
             if (m_ViewModel is SearchWindow window)
                 OnSaveQuery(window);
@@ -400,6 +418,7 @@ private void OnSearchFieldDetachFromPanel(DetachFromPanelEvent evt)
             Dispatcher.Off(SearchEvent.RefreshContent, OnRefreshContent);
 
             UnregisterCallback<KeyDownEvent>(OnSearchToolbarKeyDown);
+            searchField.UnregisterCallback<KeyDownEvent>(OnSearchFieldKeyDown);
 
             viewState.globalEventManager.UnregisterGlobalEventHandler<KeyDownEvent>(OnGlobalKeyInput);
 
@@ -414,8 +433,8 @@ void OnSearchFieldReady(GeometryChangedEvent evt)
             Dispatcher.On(SearchEvent.SearchContextChanged, OnSearchContextChanged);
             Dispatcher.On(SearchEvent.RefreshBuilder, OnQueryBuilderStateChanged);
             Dispatcher.On(SearchEvent.RefreshContent, OnRefreshContent);
-
             RegisterCallback<KeyDownEvent>(OnSearchToolbarKeyDown);
+            searchField.RegisterCallback<KeyDownEvent>(OnSearchFieldKeyDown);
 
             viewState.globalEventManager.RegisterGlobalEventHandler<KeyDownEvent>(OnGlobalKeyInput, int.MaxValue);
 
@@ -473,7 +492,10 @@ private void OnSearchToolbarKeyDown(KeyDownEvent evt)
                 evt.StopPropagation();
                 evt.PreventDefault();
             }
+        }
 
+        private void OnSearchFieldKeyDown(KeyDownEvent evt)
+        {
             if (m_UndoManager.HandleEvent(evt, out var undoText, out var cursorPos, out _))
             {
                 UpdateSearchText(undoText, cursorPos);
@@ -619,7 +641,7 @@ private void DrawQueryErrors()
             if (m_UpdateQueryErrorScheduledItem != null && m_UpdateQueryErrorScheduledItem.isActive)
                 m_UpdateQueryErrorScheduledItem.Pause();
 
-            if (!context.options.HasAny(SearchFlags.ShowErrorsWithResults) && m_ViewModel.results.Count > 0)
+            if (m_ViewModel.results == null || (!context.options.HasAny(SearchFlags.ShowErrorsWithResults) && m_ViewModel.results.Count > 0))
                 return;
 
             List<SearchQueryError> errors;
@@ -755,10 +777,10 @@ internal void UpdateInternalTextData()
 
         void UpdateSaveQueryButton()
         {
-            if (s_SaveQueryDropdown == null)
+            if (m_SaveQueryDropdown == null)
                 return;
 
-            s_SaveQueryDropdown.SetEnabled(!context.empty);
+            m_SaveQueryDropdown.SetEnabled(!context.empty);
         }
     }
 }
diff --git a/Modules/QuickSearch/Editor/UITK/SearchView.cs b/Modules/QuickSearch/Editor/UITK/SearchView.cs
index 0093c1d61d..0f1c85a9d2 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchView.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchView.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
+using UnityEditor.Profiling;
 using UnityEngine.Search;
 using UnityEngine.UIElements;
 
@@ -16,6 +17,7 @@ class SearchView : VisualElement, ISearchView, ISearchElement
         const int k_ResetSelectionIndex = -1;
         internal const double resultViewUpdateThrottleDelay = 0.05d;
 
+        private int m_ViewId;
         private bool m_Disposed = false;
         private SearchViewState m_ViewState;
         private Action m_AsyncRequestOff = null;
@@ -27,6 +29,7 @@ class SearchView : VisualElement, ISearchView, ISearchElement
         private int m_DelayedCurrentSelection = k_ResetSelectionIndex;
         private bool m_SyncSearch;
         private SearchPreviewManager m_PreviewManager;
+        private int m_TextureCacheSize;
 
         // UITK
         private VisualElement m_ResultViewContainer;
@@ -73,6 +76,10 @@ public string currentGroup
             {
                 var prevGroup = currentGroup;
                 viewState.groupChanged?.Invoke(context, value, currentGroup);
+
+                var selectedItems = m_SearchItemSelection != null ? m_SearchItemSelection.ToArray() : Array.Empty<SearchItem>();
+                var newSelectedIndices = new int[selectedItems.Length];
+                
                 viewState.group = value;
                 m_FilteredItems.currentGroup = value;
                 resultView?.OnGroupChanged(prevGroup, value);
@@ -81,6 +88,13 @@ public string currentGroup
                     NotifySyncSearch(currentGroup, UnityEditor.SearchService.SearchService.SyncSearchEvent.SyncSearch);
 
                 RefreshContent(RefreshFlags.GroupChanged);
+
+                for (var i  = 0; i < selectedItems.Length; ++i)
+                {
+                    var selectedItem = selectedItems[i];
+                    newSelectedIndices[i] = m_FilteredItems.IndexOf(selectedItem);
+                }
+                SetSelection(true, newSelectedIndices, true);
             }
         }
 
@@ -112,35 +126,28 @@ internal bool syncSearch
         public IEnumerable<SearchItem> items => m_FilteredItems;
         public bool searchInProgress => context.searchInProgress || m_AsyncRequestOff != null;
 
-        public SearchView(SearchViewState viewState)
+        public SearchView(SearchViewState viewState, int viewId)
         {
-            m_ViewState = viewState;
-            m_PreviewManager = new SearchPreviewManager();
-
-            context.searchView = context.searchView ?? this;
-            multiselect = viewState.context?.options.HasAny(SearchFlags.Multiselect) ?? false;
-            m_FilteredItems = new GroupedSearchList(context, GetDefaultSearchListComparer());
-            m_FilteredItems.currentGroup = viewState.group;
-            viewState.itemSize = GetDefaultItemSize();
-            hideHelpers = m_ViewState.HasFlag(SearchViewFlags.DisableQueryHelpers);
-
-            style.flexGrow = 1f;
+            using (new EditorPerformanceTracker("SearchView.ctor"))
+            {
+                m_ViewId = viewId;
+                m_ViewState = viewState;
+                m_PreviewManager = new SearchPreviewManager();
 
-            Refresh();
-            UpdateView();
-        }
+                context.searchView = context.searchView ?? this;
+                multiselect = viewState.context?.options.HasAny(SearchFlags.Multiselect) ?? false;
+                m_FilteredItems = new GroupedSearchList(context, GetDefaultSearchListComparer());
+                m_FilteredItems.currentGroup = viewState.group;
+                viewState.itemSize = GetDefaultItemSize();
+                hideHelpers = m_ViewState.HasFlag(SearchViewFlags.DisableQueryHelpers);
 
-        public SearchView(SearchContext context) : this(new SearchViewState(context, SearchViewFlags.GridView)) { }
-        public SearchView(SearchContext context, SearchViewFlags flags) : this(new SearchViewState(context, flags)) { }
+                style.flexGrow = 1f;
 
-        public SearchView(in string searchText)
-            : this(searchText, SearchViewFlags.GridView)
-        {
-        }
+                Refresh();
+                UpdateView();
 
-        public SearchView(in string searchText, SearchViewFlags flags)
-            : this(SearchService.CreateContext(searchText ?? string.Empty, SearchFlags.OpenGlobal), flags)
-        {
+                RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
+            }
         }
 
         public void Reset()
@@ -166,16 +173,27 @@ private ISearchListComparer GetDefaultSearchListComparer()
 
         public void Refresh(RefreshFlags reason = RefreshFlags.Default)
         {
-            m_AsyncRequestOff?.Invoke();
-            m_AsyncRequestOff = Utils.CallDelayed(AsyncRefresh, SearchSettings.debounceMs / 1000d);
+            // TODO FetchItemProperties (DOTSE-1994): remove this case and always refresh.
+            if (reason == RefreshFlags.DisplayModeChanged)
+            {
+                RefreshContent(reason);
+            }
+            else
+            {
+                m_AsyncRequestOff?.Invoke();
+                m_AsyncRequestOff = Utils.CallDelayed(AsyncRefresh, SearchSettings.debounceMs / 1000d);
+            }
         }
 
         private void AsyncRefresh()
         {
-            if (m_SyncSearch)
-                NotifySyncSearch(currentGroup, UnityEditor.SearchService.SearchService.SyncSearchEvent.SyncSearch);
+            using (new EditorPerformanceTracker("SearchView.AsyncRefresh"))
+            {
+                if (m_SyncSearch)
+                    NotifySyncSearch(currentGroup, UnityEditor.SearchService.SearchService.SyncSearchEvent.SyncSearch);
 
-            FetchItems();
+                FetchItems();
+            }
         }
 
         public void FetchItems()
@@ -186,8 +204,9 @@ public void FetchItems()
             context.ClearErrors();
             m_FilteredItems.Clear();
 
-            if (this.GetHostWindow() is ISearchWindow searchWindow)
-                OnIncomingItems(context, searchWindow.FetchItems());
+            var hostWindow = this.GetSearchHostWindow();
+            if (hostWindow != null)
+                OnIncomingItems(context, hostWindow.FetchItems());
 
             if (context.options.HasAny(SearchFlags.Debug))
                 Debug.Log($"[{context.sessionId}] Running query {context.searchText}");
@@ -210,6 +229,7 @@ public void Dispose(bool disposing)
 
             if (disposing)
             {
+                AssetPreview.DeletePreviewTextureManagerByID(m_ViewId);
                 m_AsyncRequestOff?.Invoke();
                 m_AsyncRequestOff = null;
                 m_ViewState.context?.Dispose();
@@ -218,6 +238,16 @@ public void Dispose(bool disposing)
             m_Disposed = true;
         }
 
+        int ISearchView.GetViewId()
+        {
+            return m_ViewId;
+        }
+
+        private void OnGeometryChanged(GeometryChangedEvent evt)
+        {
+            UpdatePreviewManagerCacheSize();
+        }
+
         private void SetItemSize(float value)
         {
             var previousDisplayModeIsList = false;
@@ -243,58 +273,83 @@ private void EmitDisplayModeChanged()
 
         private bool UpdateView()
         {
-            IResultView nextView;
-            if (results.Count == 0 && displayMode != DisplayMode.Table)
-            {
-                if (!m_ResultView?.showNoResultMessage ?? false)
-                    return false;
-
-                if (m_ResultView is SearchEmptyView)
-                    return false;
-
-                nextView = new SearchEmptyView(this, hideHelpers);
-            }
-            else
+            using (new EditorPerformanceTracker("SearchView.UpdateView"))
             {
-                if (itemSize <= 32f)
+                IResultView nextView = null;
+                if (results.Count == 0 && displayMode != DisplayMode.Table)
                 {
-                    if (m_ResultView is SearchListView)
+                    if (!m_ResultView?.showNoResultMessage ?? false)
                         return false;
-                    nextView = new SearchListView(this);
-                }
-                else if (itemSize >= (float)DisplayMode.Table)
-                {
-                    if (m_ResultView is ITableView)
+
+                    if (m_ResultView is SearchEmptyView emptyView)
+                    {
+                        emptyView.Update();
                         return false;
-                    nextView = new SearchTableView(this);
+                    }
+
+                    nextView = new SearchEmptyView(this, viewState.flags);
                 }
                 else
                 {
-                    if (m_ResultView is SearchGridView)
-                        return false;
-                    nextView = new SearchGridView(this);
+                    if (itemSize <= 32f)
+                    {
+                        if (!(m_ResultView is SearchListView))
+                            nextView = new SearchListView(this);
+                    }
+                    else if (itemSize >= (float)DisplayMode.Table)
+                    {
+                        if (!(m_ResultView is SearchTableView))
+                            nextView = new SearchTableView(this);
+                    }
+                    else
+                    {
+                        if (!(m_ResultView is SearchGridView))
+                            nextView = new SearchGridView(this);
+                    }
                 }
-            }
 
-            if (nextView == null)
-                return false;
+                if (nextView == null)
+                    return false;
 
-            if (nextView is not SearchTableView)
-                m_FilteredItems.Sort();
+                if (nextView is not SearchTableView)
+                    m_FilteredItems.Sort();
 
-            m_ResultView = nextView;
-            if (m_ResultViewContainer != null)
-                m_ResultViewContainer.RemoveFromHierarchy();
+                m_ResultView = nextView;
+                UpdatePreviewManagerCacheSize();
 
-            m_ResultViewContainer = m_ResultView as VisualElement;
-            if (m_ResultViewContainer == null)
-                throw new NotSupportedException("Result view must be implemented using UTIK");
+                if (m_ResultViewContainer != null)
+                    m_ResultViewContainer.RemoveFromHierarchy();
 
-            m_ResultViewContainer.style.flexGrow = 1f;
-            Add(m_ResultViewContainer);
+                m_ResultViewContainer = m_ResultView as VisualElement;
+                if (m_ResultViewContainer == null)
+                    throw new NotSupportedException("Result view must be implemented using UTIK");
 
-            EmitDisplayModeChanged();
-            return true;
+                m_ResultViewContainer.style.flexGrow = 1f;
+                Add(m_ResultViewContainer);
+
+                EmitDisplayModeChanged();
+                return true;
+            }
+        }
+
+        private void UpdatePreviewManagerCacheSize()
+        {
+            var width = worldBound.width;
+            var height = worldBound.height;
+            if (width <= 0 || float.IsNaN(width) || height <= 0 || float.IsNaN(height))
+                return;
+
+            // Note: We approximate how many items could be displayed in the current Rect. We cannot rely on the ResultView to have
+            // an exact list of visibleItems since get updated AFTER our resize handler and we need to update the Cache size so preview are properly generated.
+
+            var potentialVisibleItems = Mathf.Min(m_ResultView.ComputeVisibleItemCapacity(width, height), results.Count);
+            var newTextureCacheSize = Mathf.Max(potentialVisibleItems * 2 + 30, 128);
+            if (potentialVisibleItems == 0 || newTextureCacheSize <= m_TextureCacheSize)
+                return;
+
+            m_PreviewManager.poolSize = newTextureCacheSize;
+            m_TextureCacheSize = newTextureCacheSize;
+            AssetPreview.SetPreviewTextureCacheSize(m_TextureCacheSize, ((ISearchView)this).GetViewId());
         }
 
         private DisplayMode GetDisplayMode()
@@ -324,11 +379,14 @@ private float GetDefaultItemSize()
 
         public void RefreshContent(RefreshFlags flags)
         {
-            UpdateView();
-            if (context.debug)
-                Debug.Log($"[{searchInProgress}] Refresh {flags} for query \"{context.searchText}\": {m_ResultView}");
-            m_ResultView?.Refresh(flags);
-            Dispatcher.Emit(SearchEvent.RefreshContent, new SearchEventPayload(this, flags, context.searchText));
+            using (new EditorPerformanceTracker("SearchView.RefreshContent"))
+            {
+                UpdateView();
+                if (context.debug)
+                    Debug.Log($"[{searchInProgress}] Refresh {flags} for query \"{context.searchText}\": {m_ResultView}");
+                m_ResultView?.Refresh(flags);
+                Dispatcher.Emit(SearchEvent.RefreshContent, new SearchEventPayload(this, flags, context.searchText));
+            }
         }
 
         private void OnIncomingItems(SearchContext context, IEnumerable<SearchItem> items)
@@ -349,7 +407,13 @@ private void OnQueryRequestFinished(SearchContext context)
         }
 
         private void UpdateSelectionFromIds()
-        {
+        {            
+            if (selection.SyncSelectionIfInvalid())
+            {
+                SetSelection(trackSelection: false, selection.indexes.ToArray());
+                return;
+            }
+
             if (viewState.selectedIds.Length == 0 || selection.Count != 0)
                 return;
 
@@ -381,7 +445,7 @@ private bool IsItemValid(int index)
             return true;
         }
 
-        private void SetSelection(bool trackSelection, int[] selection)
+        private void SetSelection(bool trackSelection, int[] selection, bool forceChange = false)
         {
             if (!multiselect && selection.Length > 1)
                 selection = new int[] { selection[selection.Length - 1] };
@@ -401,7 +465,7 @@ private void SetSelection(bool trackSelection, int[] selection)
                 lastIndexAdded = idx;
             }
 
-            if (lastIndexAdded != k_ResetSelectionIndex)
+            if (lastIndexAdded != k_ResetSelectionIndex || forceChange)
             {
                 m_SearchItemSelection = null;
                 viewState.selectedIds = selectedIds.ToArray();
@@ -451,6 +515,9 @@ internal void DelayTrackSelection()
 
         public void ShowItemContextualMenu(SearchItem item, Rect contextualActionPosition)
         {
+            if (IsPicker())
+                return;
+
             SearchAnalytics.SendEvent(viewState.sessionId, SearchAnalytics.GenericEventType.QuickSearchShowActionMenu, item.provider.id);
             var menu = new GenericMenu();
             var shortcutIndex = 0;
@@ -519,7 +586,7 @@ public void ExecuteAction(SearchAction action, SearchItem[] items, bool endSearc
             }
 
             var searchWindow = this.GetHostWindow() as SearchWindow;
-            if (endSearch && (action?.closeWindowAfterExecution ?? true) && !(searchWindow?.docked ?? false))
+            if (searchWindow != null && endSearch && (action?.closeWindowAfterExecution ?? true) && !searchWindow.docked)
                 searchWindow.CloseSearchWindow();
         }
 
@@ -632,9 +699,8 @@ internal IEnumerable<SearchQueryError> GetAllVisibleErrors()
 
         public bool IsPicker()
         {
-            if (this.GetHostWindow() is ISearchWindow window)
-                return window.IsPicker();
-            return false;
+            var window = this.GetSearchHostWindow();
+            return window != null && window.IsPicker();
         }
 
         IEnumerable<IGroup> ISearchView.EnumerateGroups()
diff --git a/Modules/QuickSearch/Editor/UITK/SearchViewItem.cs b/Modules/QuickSearch/Editor/UITK/SearchViewItem.cs
index 628b5b8be5..106e00815a 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchViewItem.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchViewItem.cs
@@ -116,6 +116,7 @@ public virtual void Bind(in SearchItem item)
             UpdatePreview();
 
             // Last tries at getting the preview. (For the AssetStoreProvider).
+            // TODO FetchItemProperties(DOTSE - 1994): All the fetching of async properties should be consolidated in the ResultView/SearchView.
             var counter = 0;
             m_PreviewRefreshCallback = m_Thumbnail.schedule.Execute(() =>
             {
@@ -127,7 +128,6 @@ public virtual void Bind(in SearchItem item)
                 counter++;
                 return m_ViewModel.previewManager.HasPreview(m_PreviewKey) || counter >= k_PreviewFetchCounter;
             });
-
             UpdateFavoriteImage();
         }
 
@@ -220,7 +220,7 @@ private void AsyncFetchPreview()
         private void FetchPreview(SearchItem item, SearchContext context, FetchPreviewOptions options, Vector2 size, OnPreviewReady onPreviewReady)
         {
             SearchPreview searchPreview;
-            if (item == null)
+            if (item == null || m_BindedItem == null)
             {
                 searchPreview = SearchPreview.invalid;
             }
@@ -235,7 +235,7 @@ private void FetchPreview(SearchItem item, SearchContext context, FetchPreviewOp
 
         private void OnPreviewReady(SearchItem item, SearchContext context, SearchPreview preview)
         {
-            if (preview.valid)
+            if (preview.valid && m_BindedItem != null && m_Thumbnail != null)
             {
                 var fetchedPreview = preview.texture;
                 if (fetchedPreview != null && fetchedPreview.width > 0 && fetchedPreview.height > 0)
@@ -245,7 +245,7 @@ private void OnPreviewReady(SearchItem item, SearchContext context, SearchPrevie
                 }
             }
 
-            if (m_Thumbnail.image == null)
+            if (m_Thumbnail != null && m_BindedItem != null && m_Thumbnail.image == null)
             {
                 var tex = m_BindedItem.GetThumbnail(context, cacheThumbnail: false);
                 m_Thumbnail.image = tex;
diff --git a/Modules/QuickSearch/Editor/UITK/SearchWindow.cs b/Modules/QuickSearch/Editor/UITK/SearchWindow.cs
index abb1147df8..eb60dc0243 100644
--- a/Modules/QuickSearch/Editor/UITK/SearchWindow.cs
+++ b/Modules/QuickSearch/Editor/UITK/SearchWindow.cs
@@ -6,7 +6,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using UnityEditor.Profiling;
 using UnityEditor.ShortcutManagement;
+using UnityEditor.Utils;
 using UnityEngine;
 using UnityEngine.Search;
 using UnityEngine.UIElements;
@@ -17,6 +19,7 @@ interface ISearchWindow
     {
         void Close();
         bool IsPicker();
+        bool HasFocus();
         void Show();
         ISearchView ShowWindow();
         ISearchView ShowWindow(SearchFlags flags);
@@ -55,6 +58,7 @@ class SearchWindow : EditorWindow, ISearchView, ISearchQueryView, ISearchElement
         private SearchAutoCompleteWindow m_SearchAutoCompleteWindow;
         private VisualElement m_SearchQueryPanelContainer;
         private VisualElement m_DetailsPanelContainer;
+        private IEnumerable<SearchProvider> m_AvailableProviders;
 
         [SerializeField] protected int m_ContextHash;
         [SerializeField] private float m_PreviousItemSize = -1;
@@ -120,6 +124,11 @@ public void CreateGUI()
             m_SearchAutoCompleteWindow = new SearchAutoCompleteWindow(this, body);
         }
 
+        int ISearchView.GetViewId()
+        {
+            return ((ISearchView)m_SearchView).GetViewId();
+        }
+
         private void SetFocusOnViewAttached(AttachToPanelEvent evt)
         {
             SelectSearch();
@@ -159,28 +168,18 @@ private bool HandleDefaultPressEnter(Event evt)
             return true;
         }
 
-        private bool HandleGlobalEventHandlers<T>(T evt) where T : EventBase
-        {
-            var globalEventHandlers = m_ViewState.globalEventManager.GetOrderedGlobalEventHandlers<T>();
-            foreach (var globalEventHandler in globalEventHandlers)
-            {
-                if (globalEventHandler?.Invoke(evt) ?? false)
-                    return true;
-            }
-
-            return false;
-        }
-
         private bool HandleKeyboardNavigation(VisualElement target, KeyDownEvent evt, Event imguiEvt)
         {
-            if ((target is TextElement) && !SearchElement.IsPartOf<SearchToolbar>(target))
+            // Note: Inspector done with IMGUI (ex: transform, Light...) can allow TextField editing that is not done through a UIElements.TextElement so
+            // assume all KeyDownEvent coming from UIElements.InspectorElement needs to be handle by the Embedded Inspector.
+            if ((target is TextElement || target?.parent is UIElements.InspectorElement) && !SearchElement.IsPartOf<SearchToolbar>(target))
                 return false;
 
             // Ignore tabbing and line return in quicksearch
             if (evt.keyCode == KeyCode.None && (evt.character == '\t' || (int)evt.character == 10))
                 return true;
 
-            if (HandleGlobalEventHandlers(evt))
+            if (SearchGlobalEventHandlerManager.HandleGlobalEventHandlers(m_ViewState.globalEventManager, evt))
                 return true;
 
             if (imguiEvt != null && HandleDefaultPressEnter(imguiEvt))
@@ -333,6 +332,11 @@ public void SetSearchText(string searchText, TextCursorPlacement moveCursor, int
             var oldText = context.searchText;
             m_SearchView.SetSearchText(searchText, moveCursor);
             Dispatcher.Emit(SearchEvent.SearchTextChanged, new SearchEventPayload(this, oldText, context.searchText, moveCursor, cursorInsertPosition));
+
+            if (viewState.queryBuilderEnabled && queryBuilder != null && queryBuilder.BuildQuery() != searchText)
+            {
+                Dispatcher.Emit(SearchEvent.RefreshBuilder, new SearchEventPayload(this));
+            }
         }
 
         public virtual void Refresh(RefreshFlags flags = RefreshFlags.Default)
@@ -444,42 +448,47 @@ public void ShowItemContextualMenu(SearchItem item, Rect position)
 
         internal virtual void OnEnable()
         {
-            minSize = new Vector2(200f, minSize.y);
-
-            rootVisualElement.name = nameof(SearchWindow);
-            rootVisualElement.AddToClassList("search-window");
-            SearchElement.AppendStyleSheets(rootVisualElement);
+            using (new EditorPerformanceTracker("SearchView.OnEnable"))
+            {
+                minSize = new Vector2(200f, minSize.y);
 
-            hideFlags |= HideFlags.DontSaveInEditor;
-            wantsLessLayoutEvents = true;
+                rootVisualElement.name = nameof(SearchWindow);
+                rootVisualElement.AddToClassList("search-window");
+                SearchElement.AppendStyleSheets(rootVisualElement);
 
-            m_LastFocusedWindow = m_LastFocusedWindow ?? focusedWindow;
-            m_ViewState = s_GlobalViewState ?? m_ViewState ?? SearchViewState.LoadDefaults();
+                hideFlags |= HideFlags.DontSaveInEditor;
+                wantsLessLayoutEvents = true;
 
-            SetContext(m_ViewState.context);
-            LoadSessionSettings(m_ViewState);
+                m_LastFocusedWindow = m_LastFocusedWindow ?? focusedWindow;
+                m_ViewState = s_GlobalViewState ?? m_ViewState ?? SearchViewState.LoadDefaults();
 
-            SearchSettings.SortActionsPriority();
+                SetContext(m_ViewState.context);
+                LoadSessionSettings(m_ViewState);
 
-            m_SearchMonitorView = SearchMonitor.GetView();
-            m_SearchView = new SearchView(m_ViewState) { multiselect = true };
+                SearchSettings.SortActionsPriority();
 
-            UpdateWindowTitle();
+                m_SearchMonitorView = SearchMonitor.GetView();
+                m_SearchView = new SearchView(m_ViewState, GetInstanceID()) { multiselect = true };
 
-            SearchSettings.providerActivationChanged += OnProviderActivationChanged;
+                UpdateWindowTitle();
 
-            m_SearchEventOffs = new List<Action>()
-            {
-                Dispatcher.On(SearchEvent.ExecuteSearchQuery, HandleExecuteSearchQuery),
-                Dispatcher.On(SearchEvent.SaveUserQuery, HandleSaveUserQuery),
-                Dispatcher.On(SearchEvent.SaveProjectQuery, HandleSaveProjectQuery),
-                Dispatcher.On(SearchEvent.SaveActiveSearchQuery, HandleSaveActiveSearchQuery),
-                Dispatcher.On(SearchEvent.TogglePackages, HandleTogglePackages),
-                Dispatcher.On(SearchEvent.ToggleWantsMore, HandleToggleWantsMore),
-                Dispatcher.On(SearchEvent.RefreshContent, RefreshContent)
-            };
+                SearchSettings.providerActivationChanged += OnProviderActivationChanged;
 
-            s_GlobalViewState = null;
+                m_SearchEventOffs = new List<Action>()
+                {
+                    Dispatcher.On(SearchEvent.ExecuteSearchQuery, HandleExecuteSearchQuery),
+                    Dispatcher.On(SearchEvent.SaveUserQuery, HandleSaveUserQuery),
+                    Dispatcher.On(SearchEvent.SaveProjectQuery, HandleSaveProjectQuery),
+                    Dispatcher.On(SearchEvent.SaveActiveSearchQuery, HandleSaveActiveSearchQuery),
+                    Dispatcher.On(SearchEvent.TogglePackages, HandleTogglePackages),
+                    Dispatcher.On(SearchEvent.ToggleWantsMore, HandleToggleWantsMore),
+                    Dispatcher.On(SearchEvent.RefreshContent, RefreshContent)
+                };
+
+                m_AvailableProviders = (IsPicker() || !context.options.HasFlag(SearchFlags.OpenGlobal)) ? new List<SearchProvider>(context.providers) : SearchService.OrderedProviders;
+
+                s_GlobalViewState = null;
+            }
         }
 
         void HandleToggleWantsMore(ISearchEvent evt)
@@ -537,7 +546,14 @@ internal virtual void OnDisable()
             EditorApplication.delayCall -= m_SearchView.DelayTrackSelection;
             SearchSettings.providerActivationChanged -= OnProviderActivationChanged;
 
-            selectCallback?.Invoke(selection?.FirstOrDefault(), selection == null || selection.Count == 0);
+            try
+            {
+                selectCallback?.Invoke(selection?.FirstOrDefault(), selection == null || selection.Count == 0);
+            }
+            catch
+            {
+            }
+            
             selectCallback = null;
 
             SaveSessionSettings();
@@ -610,7 +626,18 @@ protected bool ToggleFilter(string providerId)
             }
             if (providerId == m_SearchView.currentGroup)
                 SelectGroup(null);
+
             context.SetFilter(providerId, toggledEnabled);
+            if (toggledEnabled && provider == null && !context.providers.Any(p => p.id == providerId))
+            {
+                // Provider that are not stored in the SearchService, might only exists in the m_AvailableProviders (local providers created directly in the context).
+                var localProvider = m_AvailableProviders.FirstOrDefault(p => p.id == providerId);
+                if (localProvider != null)
+                {
+                    var newProviderList = context.GetProviders().Concat(new[] { localProvider }).ToArray();
+                    context.SetProviders(newProviderList);
+                }
+            }
 
             Dispatcher.Emit(SearchEvent.FilterToggled, new SearchEventPayload(this, providerId));
 
@@ -732,6 +759,8 @@ private void ToggleShowTabs()
         {
             var currentTabs = rootVisualElement.Q<SearchGroupBar>();
             viewState.hideTabs = !viewState.hideTabs;
+            SearchSettings.hideTabs = viewState.hideTabs;
+            SearchSettings.Save();
             if (viewState.hideTabs)
                 currentTabs?.RemoveFromHierarchy();
             else if (currentTabs == null)
@@ -881,20 +910,17 @@ private IEnumerable<IGroup> EnumerateGroups()
 
         void ISearchWindow.AddProvidersToMenu(GenericMenu menu)
         {
-            if (IsPicker())
+            var allEnabledProviders = m_AvailableProviders.Where(p => context.IsEnabled(p.id));
+            var singleProviderEnabled = allEnabledProviders.Count() == 1 ? allEnabledProviders.First() : null;
+            foreach (var p in m_AvailableProviders)
             {
-                // Only allow customization of provider in current context.
-                foreach (var p in context.providers)
+                var filterContent = new GUIContent($"{p.name} ({p.filterId})");
+                if (singleProviderEnabled == p)
                 {
-                    var filterContent = new GUIContent($"{p.name} ({p.filterId})");
-                    menu.AddItem(filterContent, context.IsEnabled(p.id), () => ToggleFilter(p.id));
+                    menu.AddDisabledItem(filterContent, context.IsEnabled(p.id));
                 }
-            }
-            else
-            {
-                foreach (var p in SearchService.OrderedProviders)
+                else
                 {
-                    var filterContent = new GUIContent($"{p.name} ({p.filterId})");
                     menu.AddItem(filterContent, context.IsEnabled(p.id), () => ToggleFilter(p.id));
                 }
             }
@@ -981,6 +1007,11 @@ private void SaveProjectSearchQuery(in string path = null)
             var searchQueryPath = string.IsNullOrWhiteSpace(path) ? EditorUtility.SaveFilePanel("Save search query...", initialFolder, searchQueryFileName, "asset") : path;
             if (string.IsNullOrEmpty(searchQueryPath))
                 return;
+            if (!Paths.IsValidAssetPath(searchQueryPath, ".asset", out var errorMessage))
+            {
+                Debug.LogWarning($"Save Search Query has failed. {errorMessage}.");
+                return;
+            }
 
             searchQueryPath = Utils.CleanPath(searchQueryPath);
             if (!System.IO.Directory.Exists(Path.GetDirectoryName(searchQueryPath)) || !Utils.IsPathUnderProject(searchQueryPath))
@@ -991,7 +1022,6 @@ private void SaveProjectSearchQuery(in string path = null)
 
             SaveSearchQueryFromContext(searchQueryPath, true);
         }
-
         private void SaveSearchQueryFromContext(string searchQueryPath, bool newQuery)
         {
             try
@@ -1061,6 +1091,8 @@ private void LoadContext()
             m_ContextHash = Utils.CombineHashCodes(m_ContextHash, GetType().Name.GetHashCode());
             if (context.filterType != null)
                 m_ContextHash = Utils.CombineHashCodes(m_ContextHash, context.filterType.Name.GetHashCode());
+            if (context.runtimeContext != null && !string.IsNullOrEmpty(context.runtimeContext.contextId))
+                m_ContextHash = Utils.CombineHashCodes(m_ContextHash, context.runtimeContext.contextId.GetHashCode());
             context.searchView = this;
             Refresh();
         }
@@ -1101,7 +1133,7 @@ protected virtual void LoadSessionSettings(SearchViewState args)
             }
 
             args.group = viewState.hideTabs ? null : (loadGroup ?? args.group);
-            if (viewState.hideAllGroup && (args.group == null || string.Equals("all", args.group, StringComparison.Ordinal)))
+            if (viewState.hideAllGroup && (args.group == null || string.Equals(GroupedSearchList.allGroupId, args.group, StringComparison.Ordinal)))
                 args.group = args.context?.GetProviders().FirstOrDefault()?.id;
 
             if (Utils.IsRunningTests() && !string.IsNullOrEmpty(args.searchText))
@@ -1279,34 +1311,37 @@ ISearchView ISearchWindow.ShowWindow(float width, float height, SearchFlags flag
 
         public SearchWindow ShowWindow(float width, float height, SearchFlags flags)
         {
-            var windowSize = new Vector2(width, height);
-            if (flags.HasAny(SearchFlags.Dockable) && viewState.flags.HasNone(SearchViewFlags.Borderless))
+            using (new EditorPerformanceTracker("SearchView.ShowWindow"))
             {
-                bool firstOpen = Utils.IsRunningTests() || !EditorPrefs.HasKey(k_CheckWindowKeyName);
-                Show(true);
-                if (firstOpen)
+                var windowSize = new Vector2(width, height);
+                if (flags.HasAny(SearchFlags.Dockable) && viewState.flags.HasNone(SearchViewFlags.Borderless))
                 {
-                    var centeredPosition = Utils.GetMainWindowCenteredPosition(windowSize);
-                    position = centeredPosition;
-                }
-                else if (!firstOpen && !docked)
-                {
-                    var newWindow = this;
-                    var existingWindow = Resources.FindObjectsOfTypeAll<SearchWindow>().FirstOrDefault(w => w != newWindow);
-                    if (existingWindow)
+                    bool firstOpen = Utils.IsRunningTests() || !EditorPrefs.HasKey(k_CheckWindowKeyName);
+                    Show(true);
+                    if (firstOpen)
                     {
-                        var cascadedWindowPosition = existingWindow.position.position;
-                        cascadedWindowPosition += new Vector2(30f, 30f);
-                        position = new Rect(cascadedWindowPosition, position.size);
+                        var centeredPosition = Utils.GetMainWindowCenteredPosition(windowSize);
+                        position = centeredPosition;
+                    }
+                    else if (!firstOpen && !docked)
+                    {
+                        var newWindow = this;
+                        var existingWindow = Resources.FindObjectsOfTypeAll<SearchWindow>().FirstOrDefault(w => w != newWindow);
+                        if (existingWindow)
+                        {
+                            var cascadedWindowPosition = existingWindow.position.position;
+                            cascadedWindowPosition += new Vector2(30f, 30f);
+                            position = new Rect(cascadedWindowPosition, position.size);
+                        }
                     }
                 }
+                else
+                {
+                    this.ShowDropDown(windowSize);
+                }
+                Focus();
+                return this;
             }
-            else
-            {
-                this.ShowDropDown(windowSize);
-            }
-            Focus();
-            return this;
         }
 
         void ISearchView.SetupColumns(IList<SearchField> fields)
@@ -1379,6 +1414,11 @@ IEnumerable<SearchItem> ISearchWindow.FetchItems()
             return FetchItems();
         }
 
+        bool ISearchWindow.HasFocus()
+        {
+            return hasFocus;
+        }
+
         [WindowAction]
         internal static WindowAction CreateSearchHelpWindowAction()
         {
@@ -1388,11 +1428,16 @@ internal static WindowAction CreateSearchHelpWindowAction()
             return action;
         }
 
+        internal static string GetHelpURL()
+        {
+            return Help.FindHelpNamed("search-overview");
+        }
+
         private static void OpenSearchHelp(EditorWindow window, WindowAction action)
         {
             var windowId = (window as SearchWindow)?.windowId ?? null;
             SearchAnalytics.SendEvent(windowId, SearchAnalytics.GenericEventType.QuickSearchOpenDocLink);
-            EditorUtility.OpenWithDefaultApp("https://docs.unity3d.com/Manual/search-overview.html");
+            EditorUtility.OpenWithDefaultApp(GetHelpURL());
         }
     }
 }
diff --git a/Modules/QuickSearch/Editor/Utilities/IStringView.cs b/Modules/QuickSearch/Editor/Utilities/IStringView.cs
index 3ac5812dc4..a7e4d9b0df 100644
--- a/Modules/QuickSearch/Editor/Utilities/IStringView.cs
+++ b/Modules/QuickSearch/Editor/Utilities/IStringView.cs
@@ -18,6 +18,7 @@ interface IStringView : IEnumerable<char>
         IStringView Substring(int start);
         IStringView Substring(int start, int length);
         IStringView Trim(params char[] chrs);
+        IStringView TrimEnd(params char[] chrs);
         int IndexOf(IStringView other, StringComparison sc = StringComparison.Ordinal);
         int IndexOf(string other, StringComparison sc = StringComparison.Ordinal);
         int IndexOf(char other, StringComparison sc = StringComparison.Ordinal);
diff --git a/Modules/QuickSearch/Editor/Utilities/StringView.cs b/Modules/QuickSearch/Editor/Utilities/StringView.cs
index 40d960508d..37c0851990 100644
--- a/Modules/QuickSearch/Editor/Utilities/StringView.cs
+++ b/Modules/QuickSearch/Editor/Utilities/StringView.cs
@@ -146,10 +146,26 @@ IStringView IStringView.Trim(params char[] chrs)
             return Trim(chrs);
         }
 
+        internal StringView TrimEnd(params char[] chrs)
+        {
+            FindTrimEnd(m_StartIndex, m_EndIndex, m_BaseString, chrs, out var end);
+            return new StringView(m_BaseString, m_StartIndex, end);
+        }
+
+        IStringView IStringView.TrimEnd(params char[] chrs)
+        {
+            return TrimEnd(chrs);
+        }
+
         static void FindTrimStartEnd(int localStart, int localEnd, string baseString, char[] chrs, out int trimStart, out int trimEnd)
+        {
+            FindTrimStart(localStart, localEnd, baseString, chrs, out trimStart);
+            FindTrimEnd(trimStart, localEnd, baseString, chrs, out trimEnd);
+        }
+
+        static void FindTrimStart(int localStart, int localEnd, string baseString, char[] chrs, out int trimStart)
         {
             trimStart = localStart;
-            trimEnd = localEnd;
             for (; trimStart < localEnd;)
             {
                 var globalIndex = trimStart;
@@ -159,8 +175,12 @@ static void FindTrimStartEnd(int localStart, int localEnd, string baseString, ch
                 else
                     break;
             }
+        }
 
-            for (; trimEnd > trimStart;)
+        static void FindTrimEnd(int localStart, int localEnd, string baseString, char[] chrs, out int trimEnd)
+        {
+            trimEnd = localEnd;
+            for (; trimEnd > localStart;)
             {
                 var globalIndex = trimEnd - 1;
                 var c = baseString[globalIndex];
@@ -608,5 +628,10 @@ public static bool HasQuotes(this StringView sv, in char quoteChar = '"')
         {
             return sv.length >= 2 && sv.StartsWith(quoteChar) && sv.EndsWith(quoteChar);
         }
+
+        public static ReadOnlySpan<char> ToReadOnlySpan(this StringView sv)
+        {
+            return sv.baseString.AsSpan(sv.startIndex, sv.length);
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/Utilities/SubsetStringView.cs b/Modules/QuickSearch/Editor/Utilities/SubsetStringView.cs
index e1aa4a8597..3a40c37c58 100644
--- a/Modules/QuickSearch/Editor/Utilities/SubsetStringView.cs
+++ b/Modules/QuickSearch/Editor/Utilities/SubsetStringView.cs
@@ -202,10 +202,32 @@ IStringView IStringView.Trim(params char[] chrs)
             return Trim(chrs);
         }
 
+        public SubsetStringView TrimEnd(params char[] chrs)
+        {
+            FindTrimEnd(0, length, chrs, out var end);
+
+            var indexes = new List<int>(end);
+            for (var i = 0; i < end; ++i)
+            {
+                indexes.Add(m_Indexes[i]);
+            }
+            return new SubsetStringView(m_BaseString, indexes, m_Counts);
+        }
+
+        IStringView IStringView.TrimEnd(params char[] chrs)
+        {
+            return TrimEnd(chrs);
+        }
+
         void FindTrimStartEnd(int localStart, int localEnd, char[] chrs, out int trimStart, out int trimEnd)
+        {
+            FindTrimStart(localStart, localEnd, chrs, out trimStart);
+            FindTrimEnd(trimStart, localEnd, chrs, out trimEnd);
+        }
+
+        void FindTrimStart(int localStart, int localEnd, char[] chrs, out int trimStart)
         {
             trimStart = localStart;
-            trimEnd = localEnd;
             for (; trimStart < localEnd;)
             {
                 var globalIndex = m_Indexes[trimStart];
@@ -215,8 +237,12 @@ void FindTrimStartEnd(int localStart, int localEnd, char[] chrs, out int trimSta
                 else
                     break;
             }
+        }
 
-            for (; trimEnd > trimStart;)
+        void FindTrimEnd(int localStart, int localEnd, char[] chrs, out int trimEnd)
+        {
+            trimEnd = localEnd;
+            for (; trimEnd > localStart;)
             {
                 var globalIndex = m_Indexes[trimEnd - 1];
                 var c = baseString[globalIndex];
diff --git a/Modules/QuickSearch/Editor/Utilities/Utils.cs b/Modules/QuickSearch/Editor/Utilities/Utils.cs
index eb92fe3bfc..80f6927bea 100644
--- a/Modules/QuickSearch/Editor/Utilities/Utils.cs
+++ b/Modules/QuickSearch/Editor/Utilities/Utils.cs
@@ -44,6 +44,7 @@ static class Utils
 
         internal static readonly bool isDeveloperBuild = false;
         internal static bool runningTests { get; set; }
+        internal static bool fakeWorkerProcess { get; set; }
 
         struct RootDescriptor
         {
@@ -126,26 +127,26 @@ internal static Hash128 GetSourceAssetFileHash(string guid)
             return AssetDatabase.GetSourceAssetFileHash(guid);
         }
 
-        public static Texture2D GetAssetThumbnailFromPath(string path)
+        public static Texture2D GetAssetThumbnailFromPath(SearchContext ctx, string path)
         {
-            var thumbnail = GetAssetPreviewFromGUID(AssetDatabase.AssetPathToGUID(path));
+            var thumbnail = GetAssetPreviewFromGUID(ctx, AssetDatabase.AssetPathToGUID(path));
             if (thumbnail)
                 return thumbnail;
             thumbnail = AssetDatabase.GetCachedIcon(path) as Texture2D;
             return thumbnail ?? InternalEditorUtility.FindIconForFile(path);
         }
 
-        private static Texture2D GetAssetPreviewFromGUID(string guid)
+        private static Texture2D GetAssetPreviewFromGUID(SearchContext ctx, string guid)
         {
-            return AssetPreview.GetAssetPreviewFromGUID(guid);
+            return AssetPreview.GetAssetPreviewFromGUID(guid, GetClientId(ctx));
         }
 
-        public static Texture2D GetAssetPreviewFromPath(string path, FetchPreviewOptions previewOptions)
+        public static Texture2D GetAssetPreviewFromPath(SearchContext ctx, string path, FetchPreviewOptions previewOptions)
         {
-            return GetAssetPreviewFromPath(path, new Vector2(128, 128), previewOptions);
+            return GetAssetPreviewFromPath(ctx, path, new Vector2(128, 128), previewOptions);
         }
 
-        public static Texture2D GetAssetPreviewFromPath(string path, Vector2 previewSize, FetchPreviewOptions previewOptions)
+        public static Texture2D GetAssetPreviewFromPath(SearchContext ctx, string path, Vector2 previewSize, FetchPreviewOptions previewOptions)
         {
             var assetType = AssetDatabase.GetMainAssetTypeAtPath(path);
             if (assetType == typeof(SceneAsset))
@@ -154,7 +155,7 @@ public static Texture2D GetAssetPreviewFromPath(string path, Vector2 previewSize
             if (previewOptions.HasAny(FetchPreviewOptions.Normal))
             {
                 if (assetType == typeof(AudioClip))
-                    return GetAssetThumbnailFromPath(path);
+                    return GetAssetThumbnailFromPath(ctx, path);
 
                 try
                 {
@@ -162,7 +163,7 @@ public static Texture2D GetAssetPreviewFromPath(string path, Vector2 previewSize
                     if (!fi.Exists)
                         return null;
                     if (fi.Length > 16 * 1024 * 1024)
-                        return GetAssetThumbnailFromPath(path);
+                        return GetAssetThumbnailFromPath(ctx, path);
                 }
                 catch
                 {
@@ -188,7 +189,7 @@ public static Texture2D GetAssetPreviewFromPath(string path, Vector2 previewSize
                     return tex;
             }
 
-            return GetAssetPreview(obj, previewOptions) ?? AssetDatabase.GetCachedIcon(path) as Texture2D;
+            return GetAssetPreview(ctx, obj, previewOptions) ?? AssetDatabase.GetCachedIcon(path) as Texture2D;
         }
 
         internal static bool HasInvalidComponent(UnityEngine.Object obj)
@@ -216,9 +217,9 @@ internal static GUIContent GUIContentTemp(string text)
             return GUIContent.Temp(text);
         }
 
-        internal static Texture2D GetAssetPreview(UnityEngine.Object obj, FetchPreviewOptions previewOptions)
+        internal static Texture2D GetAssetPreview(SearchContext ctx, UnityEngine.Object obj, FetchPreviewOptions previewOptions)
         {
-            var preview = AssetPreview.GetAssetPreview(obj);
+            var preview = AssetPreview.GetAssetPreview(obj.GetInstanceID(), GetClientId(ctx));
             if (preview == null || previewOptions.HasAny(FetchPreviewOptions.Large))
             {
                 var largePreview = AssetPreview.GetMiniThumbnail(obj);
@@ -481,11 +482,6 @@ internal static object JsonDeserialize(string json)
             return Json.Deserialize(json);
         }
 
-        internal static int GetNumCharactersThatFitWithinWidth(GUIStyle style, string text, float width)
-        {
-            return style.GetNumCharactersThatFitWithinWidth(text, width);
-        }
-
         internal static string GetNextWord(string src, ref int index)
         {
             // Skip potential white space BEFORE the actual word we are extracting
@@ -709,16 +705,22 @@ internal static string GetPathUnderProject(string path)
             return path;
         }
 
-        internal static Texture2D GetSceneObjectPreview(GameObject obj, Vector2 previewSize, FetchPreviewOptions options, Texture2D defaultThumbnail)
+        private static int GetClientId(SearchContext ctx)
+        {
+            return ctx != null && ctx.searchView != null ? ctx.searchView.GetViewId() : 0;
+        }
+
+        internal static Texture2D GetSceneObjectPreview(SearchContext ctx, GameObject obj, Vector2 previewSize, FetchPreviewOptions options, Texture2D defaultThumbnail)
         {
             var sr = obj.GetComponent<SpriteRenderer>();
             if (sr && sr.sprite && sr.sprite.texture)
                 return sr.sprite.texture;
 
 
+            
             if (!options.HasAny(FetchPreviewOptions.Large))
             {
-                var preview = AssetPreview.GetAssetPreview(obj);
+                var preview = AssetPreview.GetAssetPreview(obj.GetInstanceID(), GetClientId(ctx));
                 if (preview)
                     return preview;
 
@@ -728,8 +730,8 @@ internal static Texture2D GetSceneObjectPreview(GameObject obj, Vector2 previewS
 
             var assetPath = SearchUtils.GetHierarchyAssetPath(obj, true);
             if (string.IsNullOrEmpty(assetPath))
-                return AssetPreview.GetAssetPreview(obj) ?? defaultThumbnail;
-            return GetAssetPreviewFromPath(assetPath, previewSize, options);
+                return AssetPreview.GetAssetPreview(obj.GetInstanceID(), GetClientId(ctx)) ?? defaultThumbnail;
+            return GetAssetPreviewFromPath(ctx, assetPath, previewSize, options);
         }
 
         internal static bool TryGetNumber(object value, out double number)
@@ -765,6 +767,11 @@ internal static bool IsRunningTests()
             return runningTests;
         }
 
+        internal static bool IsFakeWorkerProcess()
+        {
+            return fakeWorkerProcess;
+        }
+
         internal static bool IsMainProcess()
         {
             if (AssetDatabaseAPI.IsAssetImportWorkerProcess())
@@ -776,6 +783,11 @@ internal static bool IsMainProcess()
             if (MPE.ProcessService.level != MPE.ProcessLevel.Main)
                 return false;
 
+            if (IsRunningTests())
+            {
+                return !IsFakeWorkerProcess();
+            }
+
             return true;
         }
 
@@ -966,17 +978,23 @@ internal static bool TryParseVectorValue(in object value, out Vector4 vc, out in
             return true;
         }
 
-        public static bool TryParse<T>(string expression, out T result)
+        public static bool TryParse<T>(string expression, out T result, bool supportNamedNumber = true)
         {
             expression = expression.Replace(',', '.');
-            expression = expression.TrimEnd('f');
             expression = expression.ToLowerInvariant();
 
+            return TryParseLowerInvariant(expression.GetStringView(), out result, supportNamedNumber);
+        }
+
+        public static bool TryParseLowerInvariant<T>(StringView sv, out T result, bool supportNamedNumber = true)
+        {
+            sv = sv.TrimEnd('f');
+            var expression = sv.ToReadOnlySpan();
             bool success = false;
             result = default;
             if (typeof(T) == typeof(float))
             {
-                if (expression == "pi")
+                if (supportNamedNumber && expression == "pi")
                 {
                     success = true;
                     result = (T)(object)(float)Math.PI;
@@ -999,7 +1017,7 @@ public static bool TryParse<T>(string expression, out T result)
             }
             else if (typeof(T) == typeof(double))
             {
-                if (expression == "pi")
+                if (supportNamedNumber && expression == "pi")
                 {
                     success = true;
                     result = (T)(object)Math.PI;
@@ -1250,6 +1268,44 @@ internal static T GetAttribute<T>(this Type mi) where T : System.Attribute
             return attrs[0] as T;
         }
 
+        internal static bool TryParseObjectValue(in string value, out UnityEngine.Object objValue)
+        {
+            objValue = null;
+            if (string.IsNullOrEmpty(value))
+            {
+                return false;
+            }
+
+            if (string.Equals("none", value, StringComparison.OrdinalIgnoreCase))
+                return true;
+
+            if (value.StartsWith("GlobalObjectId", StringComparison.Ordinal) && GlobalObjectId.TryParse(value, out var gid))
+            {
+                objValue = GlobalObjectId.GlobalObjectIdentifierToObjectSlow(gid);
+                return objValue != null;
+            }
+
+            // ADB prints a warning if the path starts with /
+            if (!value.StartsWith("/") && AssetDatabase.AssetPathExists(value))
+            {
+                var guid = AssetDatabase.AssetPathToGUID(value);
+                if (!string.IsNullOrEmpty(guid))
+                {
+                    objValue = AssetDatabase.LoadMainAssetAtPath(value);
+                    return true;
+                }
+            }
+
+            // Try to get the corresponding gameObject from the scene.
+            var go = GameObject.Find(value);
+            if (go)
+            {
+                objValue = go;
+                return true;
+            }
+            return false;
+        }
+
         internal static bool IsBuiltInResource(UnityEngine.Object obj)
         {
             var resPath = AssetDatabase.GetAssetPath(obj);
diff --git a/Modules/SceneTemplateEditor/DependencyListView.cs b/Modules/SceneTemplateEditor/DependencyListView.cs
index 91c875ebdd..b2f1640679 100644
--- a/Modules/SceneTemplateEditor/DependencyListView.cs
+++ b/Modules/SceneTemplateEditor/DependencyListView.cs
@@ -161,6 +161,7 @@ public DependencyListView(List<SerializedProperty> itemsSource, int itemHeight,
             var listViewContainer = new VisualElement();
             listViewContainer.AddToClassList(k_ListView);
             listViewContainer.style.flexGrow = 1;
+            listViewContainer.style.maxHeight = (Mathf.Min(m_OriginalItems.Count, 30) + 2) * m_ItemSize;
 
             listView = new ListView(m_FilteredItems, itemHeight, MakeItem, BindItem);
             listView.name = k_ListInternalView;
@@ -169,7 +170,8 @@ public DependencyListView(List<SerializedProperty> itemsSource, int itemHeight,
             listView.RegisterCallback<KeyUpEvent>(OnKeyUpEvent);
             listView.selectionType = SelectionType.Multiple;
             listView.itemsChosen += OnDoubleClick;
-            listView.style.maxHeight = Mathf.Max(m_OriginalItems.Count * m_ItemSize + 100, listView.style.maxHeight.value.value);
+            listView.style.minHeight = 0;
+            listView.style.maxHeight = (Mathf.Min(m_OriginalItems.Count, 30) + 1) * m_ItemSize;
 
             var searchField = new ToolbarSearchField();
             searchField.name = "dependency-listview-toolbar-searchfield";
@@ -238,7 +240,6 @@ VisualElement MakeHeader()
             });
             m_CloneHeaderToggle.AddToClassList("scene-template-asset-inspector-dependency-header-clone-column");
             changeAllRowElement.Add(m_CloneHeaderToggle);
-
             return changeAllRowElement;
         }
 
@@ -274,10 +275,7 @@ void BindItem(VisualElement el, int modelIndex)
                 instantiationModeProperty.enumValueIndex = (int)newInstantiationType;
 
                 // Sync Selection if the dependency is part of it:
-                if (listView.selectedIndices.Contains(modelIndex))
-                    SyncListSelectionToValue(newInstantiationType);
-                m_SerializedObject.ApplyModifiedProperties();
-
+                SyncListSelectionToValue(newInstantiationType);
                 UpdateGlobalCloneToggle();
             });
         }
@@ -323,16 +321,9 @@ void OnKeyUpEvent(KeyUpEvent e)
 
         void SyncListSelectionToValue(TemplateInstantiationMode mode)
         {
-            if (listView.selectedIndex != -1)
+            foreach(var item in GetSelectedItems())
             {
-                var listContent = listView.Q<VisualElement>("unity-content-container");
-                foreach (var row in listContent.Children())
-                {
-                    if (row.ClassListContains("unity-list-view__item--selected"))
-                    {
-                        SetDependencyInstantiationMode(row, mode);
-                    }
-                }
+                SetDependencyInstantiationMode(item, mode);
             }
             m_SerializedObject.ApplyModifiedProperties();
         }
@@ -354,22 +345,24 @@ static void SetDependencyInstantiationMode(VisualElement row, TemplateInstantiat
             }
         }
 
-        IEnumerable<SerializedProperty> GetSelectedDependencies()
+        IEnumerable<VisualElement> GetSelectedItems()
         {
-            var selectedItems = new List<SerializedProperty>();
-            if (listView.selectedIndex != -1)
+            if (listView.selectedIndex == -1)
+                yield break;
+
+            var listContent = listView.Q<VisualElement>("unity-content-container");
+            foreach (var row in listContent.Children())
             {
-                var listContent = listView.Q<VisualElement>("unity-content-container");
-                foreach (var row in listContent.Children())
+                if (row.ClassListContains("unity-collection-view__item--selected"))
                 {
-                    var prop = (SerializedProperty)row.userData;
-                    if (row.ClassListContains("unity-list-view__item--selected"))
-                    {
-                        selectedItems.Add(prop);
-                    }
+                    yield return row;
                 }
             }
-            return selectedItems;
+        }
+
+        IEnumerable<SerializedProperty> GetSelectedDependencies()
+        {
+            return GetSelectedItems().Select(item => (SerializedProperty)item.userData);
         }
 
         static void OnDoubleClick(IEnumerable<object> objs)
diff --git a/Modules/SceneTemplateEditor/GridView.cs b/Modules/SceneTemplateEditor/GridView.cs
index b63f742efd..f805f2dda7 100644
--- a/Modules/SceneTemplateEditor/GridView.cs
+++ b/Modules/SceneTemplateEditor/GridView.cs
@@ -654,6 +654,7 @@ private void LayoutItems()
                     element.style.height = listItemHeight;
                     element.style.width = Length.Percent(100);
                     icon.style.width = listItemHeight;
+                    icon.style.minWidth = listItemHeight;
                     pin.RemoveFromHierarchy();
                     element.Insert(0, pin);
                 }
diff --git a/Modules/SceneTemplateEditor/ReferenceUtils.cs b/Modules/SceneTemplateEditor/ReferenceUtils.cs
index 35c762cd79..aee09cb469 100644
--- a/Modules/SceneTemplateEditor/ReferenceUtils.cs
+++ b/Modules/SceneTemplateEditor/ReferenceUtils.cs
@@ -10,18 +10,18 @@ namespace UnityEditor.SceneTemplate
 {
     internal static class ReferenceUtils
     {
-        public static void GetSceneDependencies(SceneAsset scene, List<Object> dependencies)
+        public static void GetSceneDependencies(SceneAsset scene, List<Object> dependencies, HashSet<string> editorOnlyDependencies = null)
         {
             var path = AssetDatabase.GetAssetPath(scene);
-            GetSceneDependencies(path, dependencies);
+            GetSceneDependencies(path, dependencies, editorOnlyDependencies);
         }
 
-        public static void GetSceneDependencies(Scene scene, List<Object> dependencies)
+        public static void GetSceneDependencies(Scene scene, List<Object> dependencies, HashSet<string> editorOnlyDependencies = null)
         {
-            GetSceneDependencies(scene.path, dependencies);
+            GetSceneDependencies(scene.path, dependencies, editorOnlyDependencies);
         }
 
-        public static void GetSceneDependencies(string scenePath, List<Object> dependencies)
+        public static void GetSceneDependencies(string scenePath, List<Object> dependencies, HashSet<string> editorOnlyDependencies = null)
         {
             var dependencyPaths = AssetDatabase.GetDependencies(scenePath);
 
@@ -35,6 +35,16 @@ public static void GetSceneDependencies(string scenePath, List<Object> dependenc
                 var dependencyType = AssetDatabase.GetMainAssetTypeAtPath(dependencyPath);
                 if (dependencyType == null)
                     continue;
+                if (dependencyType == typeof(MonoScript))
+                {
+                    var scriptDependencies = AssetDatabase.GetDependencies(dependencyPath);
+                    foreach(var scriptDepPath in scriptDependencies)
+                    {
+                        if (scriptDepPath != dependencyPath)
+                            editorOnlyDependencies.Add(scriptDepPath);
+                    }
+                }
+
                 var typeInfo = SceneTemplateProjectSettings.Get().GetDependencyInfo(dependencyType);
                 if (typeInfo.ignore)
                     continue;
@@ -48,6 +58,9 @@ public static void RemapAssetReferences(Dictionary<string, string> pathMap, Dict
             var objects = new List<Object>();
             foreach (var dstPath in pathMap.Values)
             {
+                // In case of subscene, we cannot call LoadAllAssetsAtPath on it. It creates loading error.
+                if (dstPath.EndsWith(".unity"))
+                    continue;
                 var assetsInDstPath = AssetDatabase.LoadAllAssetsAtPath(dstPath);
                 foreach (var o in assetsInDstPath)
                 {
diff --git a/Modules/SceneTemplateEditor/SceneTemplateAsset.cs b/Modules/SceneTemplateEditor/SceneTemplateAsset.cs
index 276196f831..1a8a36f25a 100644
--- a/Modules/SceneTemplateEditor/SceneTemplateAsset.cs
+++ b/Modules/SceneTemplateEditor/SceneTemplateAsset.cs
@@ -21,6 +21,7 @@ public enum TemplateInstantiationMode
     [Serializable]
     [ExcludeFromPreset]
     [AssetFileNameExtension("scenetemplate")]
+    [HelpURL("scene-templates")]
     public class SceneTemplateAsset : ScriptableObject
     {
         internal const string extension = "scenetemplate";
@@ -82,7 +83,8 @@ internal bool UpdateDependencies()
             var sceneCloneableDependenciesFolder = Path.Combine(sceneFolder, sceneName).Replace("\\", "/");
 
             var depList = new List<Object>();
-            ReferenceUtils.GetSceneDependencies(scenePath, depList);
+            var editorOnlyDependencies = new HashSet<string>();
+            ReferenceUtils.GetSceneDependencies(scenePath, depList, editorOnlyDependencies);
 
             var newDependenciesAdded = false;
 
@@ -104,6 +106,10 @@ internal bool UpdateDependencies()
                     {
                         instantiationMode = TemplateInstantiationMode.Clone;
                     }
+                    else if (editorOnlyDependencies.Contains(dependencyPath))
+                    {
+                        instantiationMode = TemplateInstantiationMode.Reference;
+                    }
                 }
 
                 return new DependencyInfo()
diff --git a/Modules/SceneTemplateEditor/SceneTemplateAssetInspectorWindow.cs b/Modules/SceneTemplateEditor/SceneTemplateAssetInspectorWindow.cs
index 53f84adf22..7665de3862 100644
--- a/Modules/SceneTemplateEditor/SceneTemplateAssetInspectorWindow.cs
+++ b/Modules/SceneTemplateEditor/SceneTemplateAssetInspectorWindow.cs
@@ -24,6 +24,7 @@ internal class SceneTemplateAssetInspectorWindow : Editor
         private const string k_ThumbnailAreaName = "scene-template-asset-inspector-thumbnail-area";
         private const string k_DependencyListView = "scene-template-asset-inspector-list-view";
         private const string k_NoLabelRowName = "scene-template-asset-inspector-no-label-row";
+        private const string k_DynamicResize = "scene-template-control-dynamic-resize";
 
         static readonly string k_SceneTemplateInfo = L10n.Tr("Scene Template Pipeline must be a Mono Script whose main class derives from ISceneTemplatePipeline or SceneTemplatePipelineAdapter. The main class and the script must have the same name.");
 
@@ -36,7 +37,7 @@ internal class SceneTemplateAssetInspectorWindow : Editor
         private static readonly string k_SnapshotTargetPopupName = "snapshot";
         private static readonly string k_CreatePipelineTooltip = L10n.Tr("Create a new Scene Template Pipeline.");
         private static readonly string k_CreatePipelineButtonLabel = L10n.Tr("Create New Scene Template Pipeline");
-        private static readonly string k_PipelineHelpUrl = "https://docs.unity3d.com/2020.2/Documentation/Manual/scene-templates.html";
+        private static readonly string k_SceneTemplatePipelineHelpButtonTooltip = L10n.Tr("Open Reference for Scene Template Pipeline.");
         private List<SerializedProperty> m_DependenciesProperty = new List<SerializedProperty>();
 
         private Texture2D m_HelpIcon;
@@ -91,6 +92,7 @@ public override VisualElement CreateInspectorGUI()
             root.style.flexDirection = FlexDirection.Column;
 
             var detailElement = new VisualElement();
+            detailElement.style.marginRight = 6f;
 
             // Template scene
             var templateSceneProperty = serializedObject.FindProperty(SceneTemplateUtils.TemplateScenePropertyName);
@@ -146,31 +148,24 @@ public override VisualElement CreateInspectorGUI()
             });
             detailElement.Add(description);
 
+            // Pin in new scene dialog
             var templateAddToDefaultsProperty = serializedObject.FindProperty(SceneTemplateUtils.TemplateAddToDefaultsPropertyName);
-            var defaultTemplateField = new VisualElement();
-            defaultTemplateField.style.flexDirection = FlexDirection.Row;
-            var addToDefaultsPropertyField = new PropertyField(templateAddToDefaultsProperty, " ");
+            var addToDefaultsPropertyField = new PropertyField(templateAddToDefaultsProperty, L10n.Tr("Pin in New Scene Dialog"));
+            addToDefaultsPropertyField.tooltip = L10n.Tr("Pin in New Scene Dialog. Ensuring this template is shown before unpinned template in the list.");
             addToDefaultsPropertyField.RegisterCallback<ChangeEvent<bool>>(e => TriggerSceneTemplateModified());
-            addToDefaultsPropertyField.style.flexShrink = 0;
-            defaultTemplateField.Add(addToDefaultsPropertyField);
-            var label = new Label(L10n.Tr("Pin in New Scene Dialog"));
-            label.tooltip = L10n.Tr("Pin in New Scene Dialog. Ensuring this template is shown before unpinned template in the list.");
-            label.style.unityTextAlign = TextAnchor.MiddleLeft;
-            label.style.overflow = Overflow.Hidden;
-            label.style.textOverflow = TextOverflow.Ellipsis;
-            label.style.flexShrink = 1;
-            defaultTemplateField.Add(label);
-            detailElement.Add(defaultTemplateField);
+            detailElement.Add(addToDefaultsPropertyField);
             root.Add(CreateFoldoutInspector(detailElement, L10n.Tr("Details"), "SceneTemplateInspectorDetailsFoldout"));
 
             // Template thumbnail
             var templateThumbnailProperty = serializedObject.FindProperty(SceneTemplateUtils.TemplateThumbnailPropertyName);
             var templateThumbnailBadgeProperty = serializedObject.FindProperty(SceneTemplateUtils.TemplateThumbnailBadgePropertyName);
             var thumbnailField = MakeThumbnailField(templateThumbnailProperty, templateThumbnailBadgeProperty);
+            thumbnailField.style.marginRight = 6f;
             root.Add(CreateFoldoutInspector(thumbnailField, L10n.Tr("Thumbnail"), "SceneTemplateInspectorThumbnailFoldout"));
 
             // SceneTemplatePipeline
             var sceneTemplatePipeline = new VisualElement();
+            sceneTemplatePipeline.style.marginRight = 6f;
             var pipelineProperty = serializedObject.FindProperty(SceneTemplateUtils.TemplatePipelineName);
             var pipelineField = new PropertyField(pipelineProperty, L10n.Tr("Scene Template Pipeline"));
             pipelineField.tooltip = k_SceneTemplateInfo;
@@ -184,23 +179,58 @@ public override VisualElement CreateInspectorGUI()
                 }
             });
             sceneTemplatePipeline.Add(pipelineField);
-            var buttonRow = CreateEmptyLabelRow(L10n.Tr("Scene Template Pipeline"), Styles.classUnityPropertyFieldLabel); // Use a hidden label instead of an empty element for proper alignment
+            var buttonRow = CreateEmptyLabelRow(); // Use a hidden label instead of an empty element for proper alignment
             var createPipelineButton = new Button(OnCreateSceneTemplatePipeline) { text = k_CreatePipelineButtonLabel, tooltip = k_CreatePipelineTooltip };
             createPipelineButton.AddToClassList(Styles.classUnityBaseFieldInput);
             buttonRow.Add(createPipelineButton);
             sceneTemplatePipeline.Add(buttonRow);
-            root.Add(CreateFoldoutInspectorWithHelp(sceneTemplatePipeline, L10n.Tr("Scene Template Pipeline"), "SceneTemplatePipelineFoldout", k_PipelineHelpUrl));
+            var version = UnityEditorInternal.InternalEditorUtility.GetUnityVersion();
+            root.Add(CreateFoldoutInspectorWithHelp(sceneTemplatePipeline, L10n.Tr("Scene Template Pipeline"), "SceneTemplatePipelineFoldout", GetSceneTemplatePipelineHelp(), k_SceneTemplatePipelineHelpButtonTooltip));
 
             // Dependencies
             root.Add(CreateFoldoutInspector(BuildDependencyRows(), L10n.Tr("Dependencies"), "SceneTemplateDependenciesFoldout"));
+
+            root.RegisterCallback<GeometryChangedEvent>(OnInspectorFieldGeometryChanged);
             return root;
         }
 
+        internal static string GetSceneTemplatePipelineHelp()
+        {
+            return Help.FindHelpNamed("scene-templates-customizing-scene-instantiation");
+        }
+
         protected override bool ShouldHideOpenButton()
         {
             return true;
         }
 
+        private void OnInspectorFieldGeometryChanged(GeometryChangedEvent e)
+        {
+            var foldouts = Root.Query<Foldout>();
+            if (foldouts == null)
+                return;
+            Foldout openFoldout = null;
+            foreach (var foldout in foldouts.ToList())
+            {
+                if (foldout.value)
+                {
+                    openFoldout = foldout;
+                    break;
+                }
+            }
+            if (openFoldout == null)
+                return;
+
+            var referenceLabel = openFoldout.Q<Label>(null, "unity-property-field__label");
+            if (referenceLabel == null)
+                return;
+            var dynResizeControls = Root.Query(null, k_DynamicResize).ToList();
+            foreach (var control in dynResizeControls)
+            {
+                control.style.width = referenceLabel.style.width;
+            }
+        }
+
         void OnCreateSceneTemplatePipeline()
         {
             var assetPath = AssetDatabase.GetAssetPath(serializedObject.targetObject.GetInstanceID());
@@ -240,7 +270,7 @@ private static Foldout CreateFoldoutInspector(VisualElement element, string titl
             return foldout;
         }
 
-        private Foldout CreateFoldoutInspectorWithHelp(VisualElement element, string title, string foldoutEditorPref, string helpUrl)
+        private Foldout CreateFoldoutInspectorWithHelp(VisualElement element, string title, string foldoutEditorPref, string helpUrl, string helpTooltip)
         {
             var foldout = CreateFoldoutInspector(element, title, foldoutEditorPref);
 
@@ -259,6 +289,7 @@ private Foldout CreateFoldoutInspectorWithHelp(VisualElement element, string tit
             helpButton.style.backgroundPositionY = BackgroundPropertyHelper.ConvertScaleModeToBackgroundPosition(ScaleMode.ScaleToFit);
             helpButton.style.backgroundRepeat = BackgroundPropertyHelper.ConvertScaleModeToBackgroundRepeat(ScaleMode.ScaleToFit);
             helpButton.style.backgroundSize = BackgroundPropertyHelper.ConvertScaleModeToBackgroundSize(ScaleMode.ScaleToFit);
+            helpButton.tooltip = helpTooltip;
 
             helpButton.AddToClassList(Styles.classFoldoutHelpButton);
             toggleInput.Add(helpButton);
@@ -362,6 +393,7 @@ private VisualElement MakeThumbnailField(SerializedProperty thumbnailProperty, S
             cameraNames.Add(new SnapshotTargetInfo()); // Separator
             cameraNames.Add(new SnapshotTargetInfo { Name = L10n.Tr("Game View"), OnSnapshotAction = (info, callback) => TakeSnapshotFromGameView(callback) });
             var snapshotTargetPopup = new PopupField<SnapshotTargetInfo>(L10n.Tr("View"), cameraNames, Camera.allCameras.Length == 0 ? 1 : 0);
+            snapshotTargetPopup.Q(null, "unity-popup-field__label").AddToClassList(k_DynamicResize);
             snapshotTargetPopup.tooltip = L10n.Tr("View or Camera to use as the source of the snapshot.");
             snapshotTargetPopup.formatListItemCallback = info => info.Name;
             snapshotTargetPopup.formatSelectedValueCallback = info => info.Name;
@@ -381,6 +413,7 @@ private VisualElement MakeThumbnailField(SerializedProperty thumbnailProperty, S
             snapshotButton.tooltip = k_SnapshotTooltip;
             snapshotButton.text = k_SnapshotButtonLabel;
             snapshotButton.AddToClassList(Styles.classUnityBaseFieldInput);
+            snapshotButton.AddToClassList(k_DynamicResize);
             snapshotSecondRowElement.Add(snapshotButton);
 
             return propertyElement;
@@ -534,6 +567,7 @@ private static VisualElement CreateEmptyLabelRow(string hiddenLabel = null, para
                 emptyLabel.AddToClassList(hiddenLabelClass);
             }
             emptyLabel.AddToClassList(Styles.classUnityBaseFieldLabel);
+            emptyLabel.AddToClassList(k_DynamicResize);
             emptyLabelRow.Add(emptyLabel);
             return emptyLabelRow;
         }
diff --git a/Modules/SceneTemplateEditor/SceneTemplateDialog.cs b/Modules/SceneTemplateEditor/SceneTemplateDialog.cs
index f4065c6d26..59c5118519 100644
--- a/Modules/SceneTemplateEditor/SceneTemplateDialog.cs
+++ b/Modules/SceneTemplateEditor/SceneTemplateDialog.cs
@@ -189,14 +189,12 @@ private void BuildUI()
                         var sceneTemplatesContainer = new VisualElement();
                         sceneTemplatesContainer.AddToClassList(Styles.classTemplatesContainer);
                         sceneTemplatesContainer.AddToClassList(Styles.sceneTemplateDialogBorder);
-                        // mainContainer.Add(sceneTemplatesContainer);
                         CreateAllSceneTemplateListsUI(sceneTemplatesContainer);
 
                         // Create a container for the template description (right side)
                         var descriptionContainer = new VisualElement();
                         descriptionContainer.AddToClassList(Styles.classDescriptionContainer);
                         descriptionContainer.AddToClassList(Styles.classBorder);
-                        // mainContainer.Add(descriptionContainer);
                         CreateTemplateDescriptionUI(descriptionContainer);
 
                         if (EditorPrefs.HasKey(GetKeyName(nameof(m_Splitter))))
@@ -319,6 +317,9 @@ private void RefreshTemplateGridView()
             m_GridView.SetPinned(m_SceneTemplateInfos.Where(template => template.isPinned).Select(template => template.GetHashCode()));
             m_GridView.SetSelection(m_LastSelectedTemplate.GetHashCode());
 
+            if (m_GridView.filterString != null && !m_GridView.filterString.Equals(string.Empty))
+                m_GridView.filterString = m_GridView.filterString;
+
             m_GridView.onPinnedChanged += OnPinnedChanged;
             m_GridView.onSelectionChanged += OnTemplateListViewSelectionChanged;
         }
@@ -399,13 +400,15 @@ private void CreateTemplateDescriptionUI(VisualElement rootContainer)
 
             rootContainer.RegisterCallback<GeometryChangedEvent>(evt => m_PreviewArea?.UpdatePreviewAreaSize());
 
-            // Text container
+            // Title
             var sceneTitleLabel = new Label();
+            rootContainer.Add(sceneTitleLabel);
             sceneTitleLabel.name = k_SceneTemplateTitleLabelName;
             sceneTitleLabel.AddToClassList(Styles.classWrappingText);
-            rootContainer.Add(sceneTitleLabel);
 
+            // Asset path
             var assetPathSection = new VisualElement();
+            rootContainer.Add(assetPathSection);
             assetPathSection.name = k_SceneTemplatePathSection;
             {
                 var scenePathLabel = new Label();
@@ -450,9 +453,10 @@ private void CreateTemplateDescriptionUI(VisualElement rootContainer)
                 }
                 assetPathSection.Add(editLocateRow);
             }
-            rootContainer.Add(assetPathSection);
 
+            // Description
             var descriptionSection = new VisualElement();
+            rootContainer.Add(descriptionSection);
             descriptionSection.name = k_SceneTemplateDescriptionSection;
             {
                 var descriptionLabel = new Label();
@@ -460,12 +464,15 @@ private void CreateTemplateDescriptionUI(VisualElement rootContainer)
                 descriptionLabel.text = L10n.Tr("Description");
                 descriptionSection.Add(descriptionLabel);
 
+                // Text container
+                var scrollViewContainer = new ScrollView { style = { flexGrow = 1 } };
+                descriptionSection.Add(scrollViewContainer);
+
                 var sceneDescriptionLabel = new Label();
                 sceneDescriptionLabel.AddToClassList(Styles.classWrappingText);
                 sceneDescriptionLabel.name = k_SceneTemplateDescriptionName;
-                descriptionSection.Add(sceneDescriptionLabel);
+                scrollViewContainer.Add(sceneDescriptionLabel);
             }
-            rootContainer.Add(descriptionSection);
         }
 
         private void UpdateTemplateDescriptionUI(SceneTemplateInfo newSceneTemplateInfo)
@@ -543,11 +550,13 @@ private void OnPinnedChanged(GridView.Item item, bool isPinned)
             }
             else
             {
-                var infoObj = new SerializedObject(info.sceneTemplate);
-                var prop = infoObj.FindProperty("addToDefaults");
-                prop.boolValue = isPinned;
-                infoObj.ApplyModifiedProperties();
-                OnSceneTemplateAssetModified(info.sceneTemplate);
+                using (var infoObj = new SerializedObject(info.sceneTemplate))
+                {
+                    var prop = infoObj.FindProperty("addToDefaults");
+                    prop.boolValue = isPinned;
+                    infoObj.ApplyModifiedProperties();
+                    OnSceneTemplateAssetModified(info.sceneTemplate);
+                }
             }
         }
 
diff --git a/Modules/SceneTemplateEditor/SceneTemplateProjectSettings.cs b/Modules/SceneTemplateEditor/SceneTemplateProjectSettings.cs
index cb1ffea41d..6799e7f7b5 100644
--- a/Modules/SceneTemplateEditor/SceneTemplateProjectSettings.cs
+++ b/Modules/SceneTemplateEditor/SceneTemplateProjectSettings.cs
@@ -76,9 +76,9 @@ public static string ToShortFullName(string fullName)
 
         public bool userAdded;
         public string type;
-        public bool ignore;
+        [NonSerialized] public bool ignore;
         public TemplateInstantiationMode defaultInstantiationMode;
-        public bool supportsModification;
+        [NonSerialized] public bool supportsModification;
 
         GUIContent m_Content;
         public GUIContent content
@@ -261,8 +261,8 @@ static void InitDefaultDependencyTypeInfos()
             });
             defaultDependencyTypeInfos.Add(new DependencyTypeInfo(typeof(SceneAsset))
             {
-                defaultInstantiationMode = TemplateInstantiationMode.Clone,
-                supportsModification = false
+                defaultInstantiationMode = TemplateInstantiationMode.Reference,
+                supportsModification = true
             });
             defaultDependencyTypeInfos.Add(new DependencyTypeInfo(typeof(GameObject))
             {
@@ -354,15 +354,27 @@ void SetupDependencyTypeInfos()
                 };
                 needSaving = true;
             }
+            else
+            {
+                defaultDependencyTypeInfo.ignore = false;
+                defaultDependencyTypeInfo.supportsModification = true;
+            }            
 
-            foreach (var dependencyTypeInfo in defaultDependencyTypeInfos)
+            foreach (var defaultDti in defaultDependencyTypeInfos)
             {
-                if (dependencyTypeInfos.Find(dti => dti.type == dependencyTypeInfo.type) == null)
+                var dti = dependencyTypeInfos.Find(dti => dti.type == defaultDti.type);
+                if (dti == null)
                 {
-                    var dti = new DependencyTypeInfo(dependencyTypeInfo);
+                    dti = new DependencyTypeInfo(defaultDti);
                     dependencyTypeInfos.Add(dti);
                     needSaving = true;
                 }
+                else
+                {
+                    // These parameters are not considered to be user definable so always override it from default.
+                    dti.ignore = defaultDti.ignore;
+                    dti.supportsModification = defaultDti.supportsModification;
+                }
             }
 
             Sort(dependencyTypeInfos);
diff --git a/Modules/SceneTemplateEditor/SceneTemplateService.cs b/Modules/SceneTemplateEditor/SceneTemplateService.cs
index e48882fa32..ea83148029 100644
--- a/Modules/SceneTemplateEditor/SceneTemplateService.cs
+++ b/Modules/SceneTemplateEditor/SceneTemplateService.cs
@@ -33,6 +33,7 @@ struct InMemorySceneState
         public string path;
         public string rootFolder;
         public bool hasCloneableDependencies;
+        public bool hasSubScene;
         public string dependencyFolderName;
 
         public static InMemorySceneState None = new InMemorySceneState();
@@ -52,6 +53,24 @@ internal string Export(bool format = false)
         }
     }
 
+    internal sealed class ClonePathInfo
+    {
+        public DependencyInfo dependency;
+        public string dependencyPath;
+        public string clonePath;
+
+        public ClonePathInfo(DependencyInfo dependency, string dependencyPath)
+        {
+            this.dependency = dependency;
+            this.dependencyPath = dependencyPath;
+        }
+
+        public override string ToString()
+        {
+            return dependencyPath;
+        }
+    }
+
     public static class SceneTemplateService
     {
         public delegate void NewTemplateInstantiating(SceneTemplateAsset sceneTemplateAsset, string newSceneOutputPath, bool additiveLoad);
@@ -186,6 +205,7 @@ internal static InstantiationResult Instantiate(SceneTemplateAsset sceneTemplate
                 s_CurrentInMemorySceneState.rootFolder = rootFolder;
                 s_CurrentInMemorySceneState.hasCloneableDependencies = hasAnyCloneableDependencies;
                 s_CurrentInMemorySceneState.dependencyFolderName = Path.GetFileNameWithoutExtension(newSceneOutputPath);
+                s_CurrentInMemorySceneState.hasSubScene = sceneTemplate.dependencies.Any(dep => dep.dependency is SceneAsset);
             }
 
             SceneTemplateAnalytics.SendSceneInstantiationEvent(instantiateEvent);
@@ -406,14 +426,27 @@ static void HandleSceneSave(Scene scene)
                 }
 
                 SceneTemplateUtils.DeleteAsset(s_CurrentInMemorySceneState.rootFolder);
-
-                var success = EditorSceneManager.ReloadScene(scene);
-                if (!success)
+                if (s_CurrentInMemorySceneState.hasSubScene)
                 {
-                    Debug.LogError($"Failed to reload scene {scene.path}");
+                    EditorApplication.delayCall += () =>
+                    {
+                        var success = EditorSceneManager.ReloadScene(scene);
+                        if (!success)
+                        {
+                            Debug.LogError($"Failed to reload scene {scene.path}");
+                        }
+                        ClearInMemorySceneState();
+                    };
+                }
+                else
+                {
+                    var success = EditorSceneManager.ReloadScene(scene);
+                    if (!success)
+                    {
+                        Debug.LogError($"Failed to reload scene {scene.path}");
+                    }
+                    ClearInMemorySceneState();
                 }
-
-                ClearInMemorySceneState();
             }
         }
 
@@ -435,13 +468,12 @@ private static bool CopyCloneableDependencies(SceneTemplateAsset sceneTemplate,
             try
             {
                 AssetDatabase.StartAssetEditing();
-
                 var dependencyPaths = sceneTemplate.dependencies
                     .Where(d => d.instantiationMode == TemplateInstantiationMode.Clone)
-                    .Select(d => (dependency: d, dependencyPath: AssetDatabase.GetAssetPath(d.dependency))).ToArray();
+                    .Select(d => new ClonePathInfo(d, AssetDatabase.GetAssetPath(d.dependency))).ToArray();
 
                 var nullPath = dependencyPaths.FirstOrDefault(d => string.IsNullOrEmpty(d.dependencyPath));
-                if (nullPath.dependency != null)
+                if (nullPath != null && nullPath.dependency != null)
                 {
                     Debug.LogError("Cannot find dependency path for: " + nullPath.dependency);
                     if (createdDirectory)
@@ -449,14 +481,9 @@ private static bool CopyCloneableDependencies(SceneTemplateAsset sceneTemplate,
                     return false;
                 }
 
-                var clonedPaths = dependencyPaths.Select(d =>
-                {
-                    var clonedDepName = Path.GetFileName(d.dependencyPath);
-                    var clonedDepPath = Path.Combine(dependencyFolder, clonedDepName).Replace("\\", "/");
-                    return (d.dependencyPath, clonedDepPath);
-                }).ToArray();
-
-                refPathMap = clonedPaths.ToDictionary(d => d.dependencyPath, d => d.clonedDepPath);
+                // Gather all dependencies. Extract their name. For duplicate clone paths format a new name including the former path (without Assets/).
+                var clonePathToInfos = SetupClonePathInfos(dependencyFolder, dependencyPaths);
+                refPathMap = clonePathToInfos.ToDictionary(d => d.dependencyPath, d => d.clonePath);
 
                 if (!AssetDatabase.CopyAssets(refPathMap.Keys.ToArray(), refPathMap.Values.ToArray()))
                 {
@@ -494,6 +521,33 @@ private static bool CopyCloneableDependencies(SceneTemplateAsset sceneTemplate,
             return true;
         }
 
+        internal static IEnumerable<ClonePathInfo> SetupClonePathInfos(string dependencyFolder, IEnumerable<ClonePathInfo> infos)
+        {
+            var clonePathToInfo = new Dictionary<string, ClonePathInfo>();
+            foreach (var depInfo in infos)
+            {
+                var clonedDepName = Path.GetFileName(depInfo.dependencyPath);
+                depInfo.clonePath = Path.Combine(dependencyFolder, clonedDepName).Replace("\\", "/");
+                if (clonePathToInfo.TryGetValue(depInfo.clonePath, out var existing))
+                {
+                    if (existing.clonePath == depInfo.clonePath)
+                    {
+                        existing.clonePath = CreateUniqueAssetName(dependencyFolder, existing.dependencyPath);
+                    }
+                    depInfo.clonePath = CreateUniqueAssetName(dependencyFolder, depInfo.dependencyPath);
+                }
+                clonePathToInfo[depInfo.clonePath] = depInfo;
+            }
+            return clonePathToInfo.Values;
+        }
+
+        internal static string CreateUniqueAssetName(string folder, string path)
+        {
+            var tokens = path.Split('/');
+            var uniqueName = string.Join("_", tokens.Skip(1));
+            return Path.Combine(folder, uniqueName).Replace("\\", "/");
+        }
+
         static void RegisterInMemoryTempFolder()
         {
             if (registeredTempFolder)
diff --git a/Modules/SceneTemplateEditor/SceneTemplateUtils.cs b/Modules/SceneTemplateEditor/SceneTemplateUtils.cs
index fc38a1f074..6b59e1c80b 100644
--- a/Modules/SceneTemplateEditor/SceneTemplateUtils.cs
+++ b/Modules/SceneTemplateEditor/SceneTemplateUtils.cs
@@ -9,6 +9,8 @@
 using System.Linq;
 using UnityEditor.PackageManager;
 using UnityEditor.SceneManagement;
+using UnityEditor.Scripting.ScriptCompilation;
+using UnityEditor.Utils;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -142,9 +144,10 @@ internal static string GetLastFolder(string fileExtension)
             return lastFolder ?? "Assets";
         }
 
-        internal static string SaveFilePanelUniqueName(string title, string directory, string filename, string extension)
+        internal static string SaveFilePanelUniqueName(string title, string directory, string filename, string extension, bool showSaveFilePanel = true)
         {
-            var initialPath = Path.Combine(directory, filename + "." + extension).Replace("\\", "/");
+            var extensionWithDot = $".{extension}";
+            var initialPath = Path.Combine(directory, filename + extensionWithDot).Replace("\\", "/");
             if (Path.IsPathRooted(initialPath))
             {
                 initialPath = FileUtil.GetProjectRelativePath(initialPath);
@@ -152,24 +155,32 @@ internal static string SaveFilePanelUniqueName(string title, string directory, s
             var uniqueAssetPath = AssetDatabase.GenerateUniqueAssetPath(initialPath);
             directory = Path.GetDirectoryName(uniqueAssetPath);
             filename = Path.GetFileName(uniqueAssetPath);
-            var result = EditorUtility.SaveFilePanel(title, directory, filename, extension);
-            if (!string.IsNullOrEmpty(result))
+            var result = showSaveFilePanel ? EditorUtility.SaveFilePanel(title, directory, filename, extension) : new FileInfo(uniqueAssetPath).FullName;
+            if (string.IsNullOrEmpty(result))
             {
-                SetLastFolder(result);
-                if (Path.IsPathRooted(result))
-                {
-                    result = FileUtil.GetProjectRelativePath(result);
-                }
+                // User has cancelled.
+                return null;
+            }
+
+            directory = Paths.ConvertSeparatorsToUnity(Path.GetDirectoryName(result));
+            if (!Search.Utils.IsPathUnderProject(directory))
+            {
+                UnityEngine.Debug.LogWarning($"Not a valid folder to save an asset: {directory}.");
+                return null;
+            }
+            if (!Paths.IsValidAssetPath(result, extensionWithDot, out var errorMessage))
+            {
+                UnityEngine.Debug.LogWarning($"Invalid asset path: {errorMessage}.");
+                return null;
             }
 
-            return result;
+            SetLastFolder(directory);
+            return Search.Utils.GetPathUnderProject(result);
         }
 
         internal static void OpenDocumentationUrl()
         {
-            const string documentationUrl = "https://docs.unity3d.com/2021.1/Documentation/Manual/scene-templates.html";
-            var uri = new Uri(documentationUrl);
-            Process.Start(uri.AbsoluteUri);
+            Help.BrowseURL(Help.FindHelpNamed("scene-templates"));
         }
 
         internal static List<SceneTemplateInfo> GetSceneTemplateInfos()
@@ -204,7 +215,7 @@ internal static List<SceneTemplateInfo> GetSceneTemplateInfos()
                     var assetName = Path.GetFileNameWithoutExtension(templateData.Item1);
 
                     var isReadOnly = false;
-                    if (templateData.Item1.StartsWith("Packages/") && AssetDatabase.GetAssetFolderInfo(templateData.Item1, out var isRootFolder, out var isImmutable))
+                    if (templateData.Item1.StartsWith("Packages/") && AssetDatabase.TryGetAssetFolderInfo(templateData.Item1, out var isRootFolder, out var isImmutable))
                     {
                         isReadOnly = isImmutable;
                     }
diff --git a/Modules/SceneView/SceneViewLightingOverlays.cs b/Modules/SceneView/SceneViewLightingOverlays.cs
index 250e4d1a5a..75d84fff82 100644
--- a/Modules/SceneView/SceneViewLightingOverlays.cs
+++ b/Modules/SceneView/SceneViewLightingOverlays.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using UnityEditor.Overlays;
 using UnityEditor.Rendering;
-using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.Experimental.Rendering;
 using UnityEngine.UIElements;
@@ -24,6 +23,7 @@ class SceneViewLighting : Overlay, ITransientOverlay
         const string k_SliderRowClass = "unity-pbr-slider-row";
         const string k_SliderClass = "unity-pbr-slider";
         const string k_SliderFloatFieldClass = "unity-pbr-slider-float-field";
+        const string k_SwatchColorContent = "color-content";
 
         static readonly PrefColor kSceneViewMaterialValidateLow = new PrefColor("Scene/Material Validator Value Too Low", 255.0f / 255.0f, 0.0f, 0.0f, 1.0f);
         static readonly PrefColor kSceneViewMaterialValidateHigh = new PrefColor("Scene/Material Validator Value Too High", 0.0f, 0.0f, 255.0f / 255.0f, 1.0f);
@@ -33,6 +33,10 @@ class SceneViewLighting : Overlay, ITransientOverlay
         static readonly PrefColor kSceneViewMaterialReceiveGILightmaps = new PrefColor("Scene/Contribute GI: On / Receive GI: Lightmaps", 89.0f / 255.0f, 148.0f / 255.0f, 161.0f / 255.0f, 1.0f);
         static readonly PrefColor kSceneViewMaterialReceiveGILightProbes = new PrefColor("Scene/Contribute GI: On / Receive GI: Light Probes", 221.0f / 255.0f, 115.0f / 255.0f, 91.0f / 255.0f, 1.0f);
 
+        // material validation, contribute GI, and albedo swatches are represented in this array. it is used to update
+        // the colors when preferences are changed.
+        Dictionary<PrefColor, VisualElement> m_PrefColorSwatches = new Dictionary<PrefColor, VisualElement>();
+
         SceneView m_SceneView;
         SceneView sceneView => m_SceneView;
 
@@ -69,6 +73,7 @@ public SceneViewLighting()
         {
             CreateAlbedoSwatchData();
             collapsedChanged += OnCollapsedChanged;
+            PrefSettings.settingChanged += UpdatePrefColors;
         }
 
         public override void OnCreated()
@@ -128,7 +133,7 @@ void OnCameraModeChanged(SceneView.CameraMode mode)
                 case DrawCameraMode.ValidateAlbedo:
                 case DrawCameraMode.ValidateMetalSpecular:
                     displayName = "PBR Validation Settings";
-                    m_AlbedoContent.Q<HelpBox>().EnableInClassList(k_UnityHiddenClass, PlayerSettings.colorSpace != ColorSpace.Gamma);
+                    m_AlbedoContent.Q<HelpBox>()?.EnableInClassList(k_UnityHiddenClass, PlayerSettings.colorSpace != ColorSpace.Gamma);
                     m_SceneView.SetOverlayVisible(k_OverlayID, true);
                     break;
 
@@ -233,9 +238,9 @@ VisualElement CreateGIContent()
             // string receiveGILightmaps = L10r.Tr("Contribute GI: On / Receive GI: Lightmaps");
             // string receiveGILightProbes = L10r.Tr("Contribute GI: On / Receive GI: Light Probes");
 
-            root.Add(CreateColorSwatch(contributeGIOff, kSceneViewMaterialNoContributeGI));
-            root.Add(CreateColorSwatch(receiveGILightmaps, kSceneViewMaterialReceiveGILightmaps));
-            root.Add(CreateColorSwatch(receiveGILightProbes, kSceneViewMaterialReceiveGILightProbes));
+            root.Add(m_PrefColorSwatches[kSceneViewMaterialNoContributeGI] = CreateColorSwatch(contributeGIOff, kSceneViewMaterialNoContributeGI));
+            root.Add(m_PrefColorSwatches[kSceneViewMaterialReceiveGILightmaps] = CreateColorSwatch(receiveGILightmaps, kSceneViewMaterialReceiveGILightmaps));
+            root.Add(m_PrefColorSwatches[kSceneViewMaterialReceiveGILightProbes] = CreateColorSwatch(receiveGILightProbes, kSceneViewMaterialReceiveGILightProbes));
 
             return root;
         }
@@ -320,9 +325,9 @@ VisualElement CreateColorLegend()
                 ? "Luminance"
                 : "Specular";
 
-            root.Add(CreateColorSwatch($"Below Minimum {modeString} Value", kSceneViewMaterialValidateLow.Color));
-            root.Add(CreateColorSwatch($"Above Maximum {modeString} Value", kSceneViewMaterialValidateHigh.Color));
-            root.Add(CreateColorSwatch($"Not A Pure Metal", kSceneViewMaterialValidatePureMetal.Color));
+            root.Add(m_PrefColorSwatches[kSceneViewMaterialValidateLow] = CreateColorSwatch($"Below Minimum {modeString} Value", kSceneViewMaterialValidateLow.Color));
+            root.Add(m_PrefColorSwatches[kSceneViewMaterialValidateHigh] = CreateColorSwatch($"Above Maximum {modeString} Value", kSceneViewMaterialValidateHigh.Color));
+            root.Add(m_PrefColorSwatches[kSceneViewMaterialValidatePureMetal] = CreateColorSwatch($"Not A Pure Metal", kSceneViewMaterialValidatePureMetal.Color));
 
             return root;
         }
@@ -336,7 +341,7 @@ VisualElement CreateColorSwatch(string label, Color color)
             swatchContainer.AddToClassList("unity-base-field__label");
             swatchContainer.AddToClassList("unity-pbr-validation-color-swatch");
 
-            var colorContent = new VisualElement() { name = "color-content" };
+            var colorContent = new VisualElement() { name = k_SwatchColorContent };
             colorContent.style.backgroundColor = new StyleColor(color);
             swatchContainer.Add(colorContent);
             row.Add(swatchContainer);
@@ -468,7 +473,6 @@ void UpdateAlbedoMetalValidation()
         {
             if (PlayerSettings.colorSpace != m_LastKnownColorSpace)
                 UpdatePBRColorLegend();
-            UpdateAlbedoSwatch();
             SelectedAlbedoSwatchChanged();
         }
 
@@ -505,7 +509,7 @@ void UpdateAlbedoSwatch()
 
         void SelectedAlbedoSwatchChanged()
         {
-            var color = m_AlbedoContent.Q("color-content");
+            var color = m_AlbedoContent.Q(k_SwatchColorContent);
             var label = m_AlbedoContent.Q<Label>("color-label");
 
             bool colorCorrect = PlayerSettings.colorSpace == ColorSpace.Linear;
@@ -560,5 +564,25 @@ void UpdateGizmoExposure(SceneView view)
                 Gizmos.exposure = s_EmptyExposureTexture;
             }
         }
+
+        void UpdatePrefColors(string key, Type prefType)
+        {
+            if (m_ContentRoot == null || prefType != typeof(PrefColor))
+                return;
+
+            foreach(var color in m_PrefColorSwatches)
+            {
+                if (color.Key.Name == key)
+                {
+                    var swatch = color.Value.Q(k_SwatchColorContent);
+                    if(swatch != null)
+                        swatch.style.backgroundColor = new StyleColor(color.Key.Color);
+                    break;
+                }
+            }
+
+            UpdatePBRColorLegend();
+            SelectedAlbedoSwatchChanged();
+        }
     }
 }
diff --git a/Modules/ShaderFoundry/ScriptBindings/Block.binding.cs b/Modules/ShaderFoundry/ScriptBindings/Block.binding.cs
index 86034155a0..274b7309f8 100644
--- a/Modules/ShaderFoundry/ScriptBindings/Block.binding.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/Block.binding.cs
@@ -10,6 +10,7 @@
 using BlockInput = UnityEditor.ShaderFoundry.BlockVariable;
 using BlockOutput = UnityEditor.ShaderFoundry.BlockVariable;
 using BlockProperty = UnityEditor.ShaderFoundry.BlockVariable;
+using UnityEngine;
 
 namespace UnityEditor.ShaderFoundry
 {
@@ -17,6 +18,7 @@ namespace UnityEditor.ShaderFoundry
     internal struct BlockInternal : IInternalType<BlockInternal>
     {
         internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_AttributeListHandle;
         internal FoundryHandle m_DeclaredTypeListHandle;
         internal FoundryHandle m_ReferencedTypeListHandle;
         internal FoundryHandle m_DeclaredFunctionListHandle;
@@ -68,6 +70,7 @@ internal struct BlockInternal : IInternalType<BlockInternal>
         public bool IsValid => Exists && block.IsValid;
 
         public string Name => container?.GetString(block.m_NameHandle) ?? string.Empty;
+        public IEnumerable<ShaderAttribute> Attributes => FixedHandleListInternal.Enumerate<ShaderAttribute>(container, block.m_AttributeListHandle);
         public IEnumerable<ShaderType> Types
         {
             get
@@ -197,6 +200,7 @@ public class Builder
             internal FoundryHandle passParentHandle;
             internal FoundryHandle templateParentHandle;
             internal string name;
+            List<ShaderAttribute> attributes;
             List<ShaderType> types = new List<ShaderType>();
             List<ShaderType> referencedTypes = new List<ShaderType>();
             List<ShaderFunction> functions = new List<ShaderFunction>();
@@ -208,6 +212,8 @@ public class Builder
             List<IncludeDescriptor> m_Includes = new List<IncludeDescriptor>();
             List<KeywordDescriptor> m_Keywords = new List<KeywordDescriptor>();
             List<PragmaDescriptor> m_Pragmas = new List<PragmaDescriptor>();
+            public List<BlockVariable> interfaceFields;
+            public ShaderType InterfaceType { get; private set; }
             bool finalized = false;
 
             public ShaderContainer Container => container;
@@ -226,12 +232,44 @@ internal Builder(ShaderContainer container, string name, FoundryHandle passParen
                 blockHandle = container.Create<BlockInternal>();
             }
 
+            public void AddAttribute(ShaderAttribute attribute) => Utilities.AddToList(ref attributes, attribute);
             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 SetEntryPointFunction(ShaderFunction function)
+            {
+                entryPointFunction = HandleLegacyEntryPointFunction(function);
+                AddFunction(entryPointFunction);
+            }
+
+            bool ValidateEntryPointFunction(ShaderFunction function)
+            {
+                if (!function.IsValid)
+                    return false;
+
+                // Function must have a return type of void
+                if (!function.ReturnType.IsVoid)
+                    return false;
+
+                // Function must have only one parameter that is "inout" with the
+                // type name of either "Interface" or the block's name.
+                // TODO @ Shaders: Update this to check for [EntryPoint] somehow
+                var paramCount = 0;
+                foreach (var param in function.Parameters)
+                {
+                    bool isInOut = param.IsInput && param.IsOutput;
+                    if (!isInOut || paramCount != 0)
+                        return false;
+
+                    bool isParamTypeValid = param.Type.Name == "Interface" || param.Type.Name == this.name;
+                    if (!isParamTypeValid)
+                        return false;
+                    ++paramCount;
+                }
+                return true;
+            }
 
             public void AddCommand(CommandDescriptor descriptor) { m_Commands.Add(descriptor); }
             public void AddDefine(DefineDescriptor descriptor) { m_Defines.Add(descriptor); }
@@ -239,32 +277,66 @@ internal Builder(ShaderContainer container, string name, FoundryHandle passParen
             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)
+            // Adds a new interface field to the block.
+            public void AddInterfaceField(BlockVariable variable)
             {
-                inputType = outputType = ShaderType.Invalid;
-                if (function.IsValid)
-                {
-                    outputType = function.ReturnType;
-                    var parameters = function.Parameters.GetEnumerator();
-                    if (parameters.MoveNext())
-                        inputType = parameters.Current.Type;
-                }
+                if (InterfaceType.IsValid)
+                    throw new InvalidOperationException("Cannot add an interface field after the interface type has been built");
+
+                Utilities.AddToList(ref interfaceFields, variable);
+            }
+
+            // Builds the interface type from current interface fields.
+            // If the interface type has already been set, then the old value is returned.
+            public ShaderType BuildInterfaceType(string typeName = "Interface")
+            {
+                if (InterfaceType.IsValid)
+                    return InterfaceType;
+
+                var builder = CreateBuilderForInterfaceType(typeName);
+                SetInterfaceType(builder.Build());
+                return InterfaceType;
             }
 
-            static List<BlockVariable> BuildVariablesFromTypeFields(ShaderContainer container, ShaderType type)
+            // Creates the builder from the current interface fields. Attributes can be added to the resultant type builder.
+            public ShaderType.StructBuilder CreateBuilderForInterfaceType(string typeName = "Interface")
             {
-                var results = new List<BlockVariable>();
-                foreach (var field in type.StructFields)
+                var typeBuilder = new ShaderType.StructBuilder(this, typeName);
+                if (interfaceFields != null)
                 {
-                    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());
+                    foreach (var field in interfaceFields)
+                    {
+                        var fieldBuilder = new StructField.Builder(container, field.Name, field.Type);
+                        foreach (var attribute in field.Attributes)
+                            fieldBuilder.AddAttribute(attribute);
+
+                        typeBuilder.AddField(fieldBuilder.Build());
+                    }
                 }
-                return results;
+                return typeBuilder;
+            }
+
+            // Sets the current interface type for the block.
+            public void SetInterfaceType(ShaderType type)
+            {
+                if (InterfaceType.IsValid)
+                    throw new InvalidOperationException($"Interface type for block '{name}' has already been set. Cannot set interface type twice.");
+
+                InterfaceType = type;
+                AddType(type);
+            }
+
+            // Generates a base entry point function builder for this block. The interface type must be set before calling this.
+            public ShaderFunction.Builder CreateBuilderForEntryPointFunction(string fnName, string selfName)
+            {
+                if (!InterfaceType.IsValid)
+                    throw new InvalidOperationException("You must call 'SetInterfaceType' before building an entry point function.");
+
+                var builder = new ShaderFunction.Builder(this, fnName);
+                var paramBuilder = new FunctionParameter.Builder(container, selfName, InterfaceType, true, true);
+                builder.AddParameter(paramBuilder.Build());
+                builder.AddAttribute(new ShaderAttribute.Builder(container, "EntryPoint").Build());
+                return builder;
             }
 
             public Block Build()
@@ -276,16 +348,25 @@ public Block Build()
                 var blockInternal = new BlockInternal();
                 blockInternal.m_NameHandle = container.AddString(name);
 
+                blockInternal.m_AttributeListHandle = FixedHandleListInternal.Build(container, attributes);
                 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);
+                List<BlockVariable> inputs = new List<BlockInput>();
+                List<BlockVariable> outputs = new List<BlockInput>();
+                if (interfaceFields != null)
+                {
+                    foreach (var field in interfaceFields)
+                    {
+                        if (field.IsInput)
+                            inputs.Add(field);
+                        if (field.IsOutput)
+                            outputs.Add(field);
+                    }
+                }
 
                 blockInternal.m_InputVariableListHandle = FixedHandleListInternal.Build(container, inputs, (v) => (v.handle));
                 blockInternal.m_OutputVariableListHandle = FixedHandleListInternal.Build(container, outputs, (v) => (v.handle));
@@ -301,6 +382,103 @@ public Block Build()
                 container.Set(blockHandle, blockInternal);
                 return new Block(container, blockHandle);
             }
+
+            // TODO @ SHADERS: Below here is utilities for building from a legacy entry point.
+            // This can be deleted once we clean up all examples, and shader graph.
+            ShaderFunction HandleLegacyEntryPointFunction(ShaderFunction function)
+            {
+                // Old Interface, build a wrapper
+                if (!ValidateEntryPointFunction(function))
+                {
+                    Debug.LogWarning($"Setting entry point for block {name} which uses a legacy syntax. " +
+                        "A wrapper entry point has been generated from the provide entry point. " +
+                        "Please update to use AddInterfaceField, BuildInterfaceType, and CreateEntryPointFunction.");
+                    AddFunction(function);
+                    return BuildLegacyFromEntryPoint(function);
+                }
+                else
+                    return function;
+            }
+
+            ShaderFunction BuildLegacyFromEntryPoint(ShaderFunction legacyEntryPointFn)
+            {
+                const string selfName = "self";
+                const string inputsName = "inputs";
+                const string outputsName = "outputs";
+                Dictionary<string, BlockVariable.Builder> variables = new Dictionary<string, BlockVariable.Builder>();
+                void AddVariable(StructField field, bool input, bool output)
+                {
+                    // The field name already exists, make sure there's not a type conflict
+                    if (variables.TryGetValue(field.Name, out var builder))
+                    {
+                        if (builder.Type != field.Type)
+                        {
+                            var message = $"Cannot upgrade old interface field {field.Name}. " +
+                                $"Variable is declared with conflicting types {builder.Type.Name} and {field.Type.Name}";
+                            throw new InvalidOperationException(message);
+                        }
+                    }
+                    // The field name doesn't exist, create it
+                    else
+                    {
+                        builder = new BlockVariable.Builder(Container);
+                        builder.Name = field.Name;
+                        builder.Type = field.Type;
+                        // Initialize the flags to false so that the ors work correctly.
+                        builder.IsInput = false;
+                        builder.IsOutput = false;
+                        variables[field.Name] = builder;
+                    }
+
+                    builder.IsInput |= input;
+                    builder.IsOutput |= output;
+                    foreach (var attribute in field.Attributes)
+                        builder.AddAttribute(attribute);
+                }
+
+                GetInOutTypes(legacyEntryPointFn, out var inputType, out var outputType);
+                // First have to merge inputs and outputs together so we know if something was an inout.
+                // This can cause errors if the old interface had an input and output with the same name but different types.
+                foreach (var field in inputType.StructFields)
+                    AddVariable(field, true, false);
+                foreach (var field in outputType.StructFields)
+                    AddVariable(field, false, true);
+
+                // Now build the interface from the merged types
+                foreach (var variableBuilder in variables.Values)
+                    AddInterfaceField(variableBuilder.Build());
+                BuildInterfaceType();
+
+                // Now build the entry point function
+                var fnBuilder = CreateBuilderForEntryPointFunction("apply", selfName);
+
+                // Copy the inputs to the old inputs struct
+                fnBuilder.DeclareVariable(inputType, inputsName);
+                foreach (var field in inputType.StructFields)
+                    fnBuilder.AddLine($"{inputsName}.{field.Name} = {selfName}.{field.Name};");
+
+                // Call the old entry point
+                fnBuilder.CallFunctionWithDeclaredReturn(legacyEntryPointFn, outputType, outputsName, inputsName);
+
+                // Copy the outputs from the old outputs struct
+                foreach (var field in outputType.StructFields)
+                    fnBuilder.AddLine($"{selfName}.{field.Name} = {outputsName}.{field.Name};");
+
+                return fnBuilder.Build();
+            }
+
+            // 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;
+                }
+            }
         }
     }
 }
diff --git a/Modules/ShaderFoundry/ScriptBindings/BlockLinkOverride.binding.cs b/Modules/ShaderFoundry/ScriptBindings/BlockLinkOverride.binding.cs
index 2744c747bd..831c998e70 100644
--- a/Modules/ShaderFoundry/ScriptBindings/BlockLinkOverride.binding.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/BlockLinkOverride.binding.cs
@@ -53,8 +53,8 @@ internal struct LinkElementInternal : IInternalType<LinkElementInternal>
             LinkElementInternal IInternalType<LinkElementInternal>.ConstructInvalid() => Invalid();
         }
 
-        internal FoundryHandle m_SourceHandle;
-        internal FoundryHandle m_DestinationHandle;
+        internal FoundryHandle m_InterfaceFieldHandle;
+        internal FoundryHandle m_ArgumentHandle;
 
         internal extern static BlockLinkOverrideInternal Invalid();
         internal extern bool IsValid();
@@ -272,8 +272,10 @@ public LinkElement Build()
             }
         }
 
-        public LinkElement Source => new LinkElement(container, linkOverride.m_SourceHandle);
-        public LinkElement Destination => new LinkElement(container, linkOverride.m_DestinationHandle);
+        // The interface field is applied to the block sequence element (e.g. block input or output).
+        public LinkElement InterfaceField => new LinkElement(container, linkOverride.m_InterfaceFieldHandle);
+        // The argument is applied to the block sequence (e.g. the input or output being matched against).
+        public LinkElement Argument => new LinkElement(container, linkOverride.m_ArgumentHandle);
 
         // private
         internal BlockLinkOverride(ShaderContainer container, FoundryHandle handle)
@@ -295,23 +297,23 @@ internal BlockLinkOverride(ShaderContainer container, FoundryHandle handle)
         public class Builder
         {
             ShaderContainer container;
-            internal LinkElement source;
-            internal LinkElement destination;
+            internal LinkElement interfaceField;
+            internal LinkElement argument;
 
             public ShaderContainer Container => container;
 
-            public Builder(ShaderContainer container, LinkElement source, LinkElement destination)
+            public Builder(ShaderContainer container, LinkElement interfaceField, LinkElement argument)
             {
                 this.container = container;
-                this.source = source;
-                this.destination = destination;
+                this.interfaceField = interfaceField;
+                this.argument = argument;
             }
 
             public BlockLinkOverride Build()
             {
                 var linkOverrideInternal = new BlockLinkOverrideInternal();
-                linkOverrideInternal.m_SourceHandle = source.handle;
-                linkOverrideInternal.m_DestinationHandle = destination.handle;
+                linkOverrideInternal.m_InterfaceFieldHandle = interfaceField.handle;
+                linkOverrideInternal.m_ArgumentHandle = argument.handle;
                 var returnTypeHandle = container.Add(linkOverrideInternal);
                 return new BlockLinkOverride(container, returnTypeHandle);
             }
diff --git a/Modules/ShaderFoundry/ScriptBindings/BlockSequenceElement.binding.cs b/Modules/ShaderFoundry/ScriptBindings/BlockSequenceElement.binding.cs
index 14c58cd4b4..008414678c 100644
--- a/Modules/ShaderFoundry/ScriptBindings/BlockSequenceElement.binding.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/BlockSequenceElement.binding.cs
@@ -13,6 +13,7 @@ namespace UnityEditor.ShaderFoundry
     [NativeHeader("Modules/ShaderFoundry/Public/BlockSequenceElement.h")]
     internal struct BlockSequenceElementInternal : IInternalType<BlockSequenceElementInternal>
     {
+        internal FoundryHandle m_AttributeListHandle;
         internal FoundryHandle m_BlockHandle;
         internal FoundryHandle m_CustomizationPointHandle;
         internal FoundryHandle m_InstanceNameHandle;
@@ -42,6 +43,7 @@ internal struct BlockSequenceElementInternal : IInternalType<BlockSequenceElemen
 
         public ShaderContainer Container => container;
         public bool IsValid => (container != null && handle.IsValid);
+        public IEnumerable<ShaderAttribute> Attributes => FixedHandleListInternal.Enumerate<ShaderAttribute>(container, element.m_AttributeListHandle);
         public Block Block => new Block(container, element.m_BlockHandle);
         public CustomizationPoint CustomizationPoint => new CustomizationPoint(container, element.m_CustomizationPointHandle);
         public string InstanceName => container?.GetString(element.m_InstanceNameHandle) ?? string.Empty;
@@ -69,6 +71,7 @@ internal BlockSequenceElement(ShaderContainer container, FoundryHandle handle)
         public class Builder
         {
             ShaderContainer container;
+            public List<ShaderAttribute> attributes;
             public Block block { get; private set; }
             public CustomizationPoint customizationPoint { get; private set; }
             public string instanceName;
@@ -91,6 +94,7 @@ public Builder(ShaderContainer container, CustomizationPoint customizationPoint)
                 this.block = Block.Invalid;
             }
 
+            public void AddAttribute(ShaderAttribute attribute) => Utilities.AddToList(ref attributes, attribute);
             public void AddInputOverride(BlockLinkOverride linkOverride)
             {
                 if (inputOverrides == null)
@@ -108,6 +112,7 @@ public void AddOutputOverride(BlockLinkOverride linkOverride)
             public BlockSequenceElement Build()
             {
                 var internalResult = new BlockSequenceElementInternal();
+                internalResult.m_AttributeListHandle = FixedHandleListInternal.Build(container, attributes);
                 internalResult.m_BlockHandle = block.handle;
                 internalResult.m_CustomizationPointHandle = customizationPoint.handle;
                 internalResult.m_InstanceNameHandle = container.AddString(instanceName);
diff --git a/Modules/ShaderFoundry/ScriptBindings/BlockShader.binding.cs b/Modules/ShaderFoundry/ScriptBindings/BlockShader.binding.cs
new file mode 100644
index 0000000000..70ad1a6164
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/BlockShader.binding.cs
@@ -0,0 +1,151 @@
+// 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;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/BlockShader.h")]
+    internal struct BlockShaderInternal : IInternalType<BlockShaderInternal>
+    {
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_AttributeListHandle;
+        internal FoundryHandle m_BlockShaderInterfaceListHandle;
+        internal FoundryHandle m_BlockListHandle;
+        internal FoundryHandle m_CustomizationPointImplementationListHandle;
+
+        internal extern static BlockShaderInternal Invalid();
+        internal extern bool IsValid();
+
+        // IInternalType
+        BlockShaderInternal IInternalType<BlockShaderInternal>.ConstructInvalid() => Invalid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct BlockShader : IEquatable<BlockShader>, IPublicType<BlockShader>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly BlockShaderInternal blockShaderInternal;
+
+        // IPublicType
+        ShaderContainer IPublicType.Container => Container;
+        bool IPublicType.IsValid => IsValid;
+        FoundryHandle IPublicType.Handle => handle;
+        BlockShader IPublicType<BlockShader>.ConstructFromHandle(ShaderContainer container, FoundryHandle handle) => new BlockShader(container, handle);
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && handle.IsValid);
+
+        public string Name => container?.GetString(blockShaderInternal.m_NameHandle) ?? string.Empty;
+        public IEnumerable<ShaderAttribute> Attributes
+        {
+            get
+            {
+                var listHandle = blockShaderInternal.m_AttributeListHandle;
+                return FixedHandleListInternal.Enumerate<ShaderAttribute>(container, listHandle);
+            }
+        }
+        public IEnumerable<BlockShaderInterface> BlockShaderInterfaces
+        {
+            get
+            {
+                var listHandle = blockShaderInternal.m_BlockShaderInterfaceListHandle;
+                return FixedHandleListInternal.Enumerate<BlockShaderInterface>(container, listHandle);
+            }
+        }
+        public IEnumerable<Block> Blocks
+        {
+            get
+            {
+                var listHandle = blockShaderInternal.m_BlockListHandle;
+                return FixedHandleListInternal.Enumerate<Block>(container, listHandle);
+            }
+        }
+        public IEnumerable<CustomizationPointImplementation> CustomizationPointImplementations
+        {
+            get
+            {
+                var listHandle = blockShaderInternal.m_CustomizationPointImplementationListHandle;
+                return FixedHandleListInternal.Enumerate<CustomizationPointImplementation>(container, listHandle);
+            }
+        }
+
+        // private
+        internal BlockShader(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            ShaderContainer.Get(container, handle, out blockShaderInternal);
+        }
+
+        public static BlockShader Invalid => new BlockShader(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 BlockShader other && this.Equals(other);
+        public bool Equals(BlockShader other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(BlockShader lhs, BlockShader rhs) => lhs.Equals(rhs);
+        public static bool operator!=(BlockShader lhs, BlockShader rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            public string Name;
+            public List<ShaderAttribute> Attributes;
+            public List<BlockShaderInterface> BlockShaderInterfaces;
+            public List<Block> Blocks;
+            public List<CustomizationPointImplementation> CustomizationPointImplementations;
+            public ShaderContainer Container => container;
+
+            // TODO: Should this require an interface? A block shader without this isn't really usable...
+            public Builder(ShaderContainer container, string name)
+            {
+                this.container = container;
+                this.Name = name;
+            }
+
+            public void AddAttribute(ShaderAttribute attribute)
+            {
+                Utilities.AddToList(ref Attributes, attribute);
+            }
+
+            public void AddBlockShaderInterface(BlockShaderInterface blockShaderInterface)
+            {
+                Utilities.AddToList(ref BlockShaderInterfaces, blockShaderInterface);
+            }
+
+            public void AddBlock(Block block)
+            {
+                Utilities.AddToList(ref Blocks, block);
+            }
+
+            public void AddCustomizationPointImplementation(CustomizationPointImplementation customizationPointImplementation)
+            {
+                Utilities.AddToList(ref CustomizationPointImplementations, customizationPointImplementation);
+            }
+
+            public BlockShader Build()
+            {
+                var blockShaderInternal = new BlockShaderInternal()
+                {
+                    m_NameHandle = container.AddString(Name),
+                };
+
+                blockShaderInternal.m_AttributeListHandle = FixedHandleListInternal.Build(container, Attributes);
+                blockShaderInternal.m_BlockShaderInterfaceListHandle = FixedHandleListInternal.Build(container, BlockShaderInterfaces);
+                blockShaderInternal.m_BlockListHandle = FixedHandleListInternal.Build(container, Blocks);
+                blockShaderInternal.m_CustomizationPointImplementationListHandle = FixedHandleListInternal.Build(container, CustomizationPointImplementations);
+
+                var returnTypeHandle = container.Add(blockShaderInternal);
+                return new BlockShader(container, returnTypeHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/BlockShaderInterface.binding.cs b/Modules/ShaderFoundry/ScriptBindings/BlockShaderInterface.binding.cs
new file mode 100644
index 0000000000..2f52ba992d
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/BlockShaderInterface.binding.cs
@@ -0,0 +1,134 @@
+// 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;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/BlockShaderInterface.h")]
+    internal struct BlockShaderInterfaceInternal : IInternalType<BlockShaderInterfaceInternal>
+    {
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_AttributeListHandle;
+        internal FoundryHandle m_ExtensionsListHandle;
+        internal FoundryHandle m_CustomizationPointListHandle;
+
+        internal extern static BlockShaderInterfaceInternal Invalid();
+        internal extern bool IsValid();
+
+        // IInternalType
+        BlockShaderInterfaceInternal IInternalType<BlockShaderInterfaceInternal>.ConstructInvalid() => Invalid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct BlockShaderInterface : IEquatable<BlockShaderInterface>, IPublicType<BlockShaderInterface>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly BlockShaderInterfaceInternal blockShaderInterfaceInternal;
+
+        // IPublicType
+        ShaderContainer IPublicType.Container => Container;
+        bool IPublicType.IsValid => IsValid;
+        FoundryHandle IPublicType.Handle => handle;
+        BlockShaderInterface IPublicType<BlockShaderInterface>.ConstructFromHandle(ShaderContainer container, FoundryHandle handle) => new BlockShaderInterface(container, handle);
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && handle.IsValid);
+
+        public string Name => container?.GetString(blockShaderInterfaceInternal.m_NameHandle) ?? string.Empty;
+        public IEnumerable<ShaderAttribute> Attributes
+        {
+            get
+            {
+                var listHandle = blockShaderInterfaceInternal.m_AttributeListHandle;
+                return FixedHandleListInternal.Enumerate<ShaderAttribute>(container, listHandle);
+            }
+        }
+        public IEnumerable<BlockShaderInterface> Extensions
+        {
+            get
+            {
+                var listHandle = blockShaderInterfaceInternal.m_ExtensionsListHandle;
+                return FixedHandleListInternal.Enumerate<BlockShaderInterface>(container, listHandle);
+            }
+        }
+        public IEnumerable<CustomizationPoint> CustomizationPoints
+        {
+            get
+            {
+                var listHandle = blockShaderInterfaceInternal.m_CustomizationPointListHandle;
+                return FixedHandleListInternal.Enumerate<CustomizationPoint>(container, listHandle);
+            }
+        }
+
+        // private
+        internal BlockShaderInterface(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            ShaderContainer.Get(container, handle, out blockShaderInterfaceInternal);
+        }
+
+        public static BlockShaderInterface Invalid => new BlockShaderInterface(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 BlockShaderInterface other && this.Equals(other);
+        public bool Equals(BlockShaderInterface other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(BlockShaderInterface lhs, BlockShaderInterface rhs) => lhs.Equals(rhs);
+        public static bool operator!=(BlockShaderInterface lhs, BlockShaderInterface rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            public string Name;
+            public List<ShaderAttribute> Attributes;
+            public List<BlockShaderInterface> Extensions;
+            public List<CustomizationPoint> CustomizationPoints;
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name)
+            {
+                this.container = container;
+                this.Name = name;
+            }
+
+            public void AddAttribute(ShaderAttribute attribute)
+            {
+                Utilities.AddToList(ref Attributes, attribute);
+            }
+
+            public void AddExtension(BlockShaderInterface blockShaderInterface)
+            {
+                Utilities.AddToList(ref Extensions, blockShaderInterface);
+            }
+
+            public void AddCustomizationPoint(CustomizationPoint customizationPoint)
+            {
+                Utilities.AddToList(ref CustomizationPoints, customizationPoint);
+            }
+
+            public BlockShaderInterface Build()
+            {
+                var blockShaderInterfaceInternal = new BlockShaderInterfaceInternal()
+                {
+                    m_NameHandle = container.AddString(Name),
+                };
+
+                blockShaderInterfaceInternal.m_AttributeListHandle = FixedHandleListInternal.Build(container, Attributes);
+                blockShaderInterfaceInternal.m_ExtensionsListHandle = FixedHandleListInternal.Build(container, Extensions);
+                blockShaderInterfaceInternal.m_CustomizationPointListHandle = FixedHandleListInternal.Build(container, CustomizationPoints);
+
+                var returnTypeHandle = container.Add(blockShaderInterfaceInternal);
+                return new BlockShaderInterface(container, returnTypeHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/BlockVariable.binding.cs b/Modules/ShaderFoundry/ScriptBindings/BlockVariable.binding.cs
index 536e007541..2d093aba2d 100644
--- a/Modules/ShaderFoundry/ScriptBindings/BlockVariable.binding.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/BlockVariable.binding.cs
@@ -13,9 +13,18 @@ namespace UnityEditor.ShaderFoundry
     [NativeHeader("Modules/ShaderFoundry/Public/BlockVariable.h")]
     internal struct BlockVariableInternal : IInternalType<BlockVariableInternal>
     {
+        // these enums must match the declarations in BlockVariable.h
+        [Flags]
+        internal enum Flags : UInt32
+        {
+            kNone = 0,
+            kInput = 1 << 0,
+            kOutput = 1 << 1,
+        };
         internal FoundryHandle m_TypeHandle;
         internal FoundryHandle m_NameHandle;
         internal FoundryHandle m_AttributeListHandle;
+        internal Flags m_Flags;
 
         internal static extern BlockVariableInternal Invalid();
         internal extern bool IsValid();
@@ -55,6 +64,8 @@ public IEnumerable<ShaderAttribute> Attributes
                 }
             }
         }
+        public bool IsInput => variable.m_Flags.HasFlag(BlockVariableInternal.Flags.kInput);
+        public bool IsOutput => variable.m_Flags.HasFlag(BlockVariableInternal.Flags.kOutput);
 
         // private
         internal BlockVariable(ShaderContainer container, FoundryHandle handle)
@@ -80,6 +91,25 @@ public class Builder
             public string Name { get; set; }
             public List<ShaderAttribute> Attributes { get; set; } = new List<ShaderAttribute>();
             public ShaderContainer Container => container;
+            BlockVariableInternal.Flags m_Flags = BlockVariableInternal.Flags.kInput;
+
+            public bool IsInput
+            {
+                get { return m_Flags.HasFlag(BlockVariableInternal.Flags.kInput); }
+                set { SetFlag(BlockVariableInternal.Flags.kInput, value); }
+            }
+            public bool IsOutput
+            {
+                get { return m_Flags.HasFlag(BlockVariableInternal.Flags.kOutput); }
+                set { SetFlag(BlockVariableInternal.Flags.kOutput, value); }
+            }
+            void SetFlag(BlockVariableInternal.Flags flag, bool state)
+            {
+                if (state)
+                    m_Flags |= flag;
+                else
+                    m_Flags &= ~flag;
+            }
 
             public Builder(ShaderContainer container)
             {
@@ -93,6 +123,9 @@ public void AddAttribute(ShaderAttribute attribute)
 
             public BlockVariable Build()
             {
+                if (IsInput == false && IsOutput == false)
+                    throw new InvalidOperationException("BlockVariable is neither an input or an output. At least one must be true.");
+
                 var blockVariableInternal = new BlockVariableInternal()
                 {
                     m_TypeHandle = Type.handle,
@@ -101,6 +134,7 @@ public BlockVariable Build()
                 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);
+                blockVariableInternal.m_Flags = m_Flags;
 
                 var returnTypeHandle = container.Add(blockVariableInternal);
                 return new BlockVariable(container, returnTypeHandle);
diff --git a/Modules/ShaderFoundry/ScriptBindings/CustomizationPoint.cs b/Modules/ShaderFoundry/ScriptBindings/CustomizationPoint.cs
index bb2b2bed98..a9a8b72990 100644
--- a/Modules/ShaderFoundry/ScriptBindings/CustomizationPoint.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/CustomizationPoint.cs
@@ -14,6 +14,7 @@ namespace UnityEditor.ShaderFoundry
     internal struct CustomizationPointInternal : IInternalType<CustomizationPointInternal>
     {
         internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_AttributeListHandle;
         internal FoundryHandle m_InputListHandle;
         internal FoundryHandle m_OutputListHandle;
         internal FoundryHandle m_DefaultBlockSequenceElementListHandle;
@@ -43,6 +44,7 @@ internal struct CustomizationPointInternal : IInternalType<CustomizationPointInt
         public ShaderContainer Container => container;
         public bool IsValid => (container != null && handle.IsValid);
         public string Name => container?.GetString(customizationPoint.m_NameHandle) ?? string.Empty;
+        public IEnumerable<ShaderAttribute> Attributes => FixedHandleListInternal.Enumerate<ShaderAttribute>(container, customizationPoint.m_AttributeListHandle);
         public IEnumerable<BlockVariable> Inputs => GetVariableEnumerable(customizationPoint.m_InputListHandle);
         public IEnumerable<BlockVariable> Outputs => GetVariableEnumerable(customizationPoint.m_OutputListHandle);
         // TODO @ SHADERS: Delete this once we don't rely on it in the prototype
@@ -83,6 +85,7 @@ public class Builder
         {
             ShaderContainer container;
             internal string name;
+            public List<ShaderAttribute> attributes;
             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>();
@@ -95,6 +98,7 @@ public Builder(ShaderContainer container, string name)
                 this.name = name;
             }
 
+            public void AddAttribute(ShaderAttribute attribute) => Utilities.AddToList(ref attributes, attribute);
             public void AddInput(BlockVariable input) { inputs.Add(input); }
             public void AddOutput(BlockVariable output) { outputs.Add(output); }
             // TODO @ SHADERS: Delete this once we don't rely on it in the prototype
@@ -107,6 +111,7 @@ public CustomizationPoint Build()
                     m_NameHandle = container.AddString(name),
                 };
 
+                customizationPointInternal.m_AttributeListHandle = FixedHandleListInternal.Build(container, attributes);
                 customizationPointInternal.m_InputListHandle = FixedHandleListInternal.Build(container, inputs, (v) => (v.handle));
                 customizationPointInternal.m_OutputListHandle = FixedHandleListInternal.Build(container, outputs, (v) => (v.handle));
                 customizationPointInternal.m_DefaultBlockSequenceElementListHandle = FixedHandleListInternal.Build(container, defaultBlockSequenceElements, (v) => (v.handle));
diff --git a/Modules/ShaderFoundry/ScriptBindings/CustomizationPointImplementation.cs b/Modules/ShaderFoundry/ScriptBindings/CustomizationPointImplementation.cs
index 3780bd7120..1afa181a30 100644
--- a/Modules/ShaderFoundry/ScriptBindings/CustomizationPointImplementation.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/CustomizationPointImplementation.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine.Bindings;
-using PassIdentifier = UnityEngine.Rendering.PassIdentifier;
 
 namespace UnityEditor.ShaderFoundry
 {
@@ -39,7 +38,7 @@ internal struct CustomizationPointImplementationInternal : IInternalType<Customi
 
         // public API
         public ShaderContainer Container => container;
-        public bool IsValid => (container != null);
+        public bool IsValid => (container != null && handle.IsValid);
         public CustomizationPoint CustomizationPoint => new CustomizationPoint(container, customizationPointImplementation.m_CustomizationPointHandle);
 
         public IEnumerable<BlockSequenceElement> BlockSequenceElements
diff --git a/Modules/ShaderFoundry/ScriptBindings/DataType.binding.cs b/Modules/ShaderFoundry/ScriptBindings/DataType.binding.cs
index ce85b4bd4f..ed44071dc6 100644
--- a/Modules/ShaderFoundry/ScriptBindings/DataType.binding.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/DataType.binding.cs
@@ -32,7 +32,6 @@ internal enum DataType : ushort
         ShaderType,
         BlockVariable,
         Block,
-        PassIdentifier,
         CustomizationPoint,
         TemplatePass,
         Template,
@@ -47,6 +46,10 @@ internal enum DataType : ushort
         BlockSequenceElement,
         CustomizationPointImplementation,
         StageDescription,
+        BlockShaderInterface,
+        BlockShader,
+        InterfaceRegistrationStatement,
+        RegisterTemplatesWithInterface,
         // THIS ENUM MUST BE KEPT IN SYNC WITH THE ENUM IN DataType.h -- ALSO ADD THE TYPE MAPPING TO Initialize() BELOW
         // ALSO ADD THE TYPE MAPPING TO DataTypeStatic.Initialize()
     };
diff --git a/Modules/ShaderFoundry/ScriptBindings/DataTypeStatic.cs b/Modules/ShaderFoundry/ScriptBindings/DataTypeStatic.cs
index 548605703c..18cbf1ad0c 100644
--- a/Modules/ShaderFoundry/ScriptBindings/DataTypeStatic.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/DataTypeStatic.cs
@@ -82,6 +82,10 @@ static void Initialize()
             m_Instance.Register<BlockSequenceElementInternal, BlockSequenceElement>(DataType.BlockSequenceElement);
             m_Instance.Register<CustomizationPointImplementationInternal, CustomizationPointImplementation>(DataType.CustomizationPointImplementation);
             m_Instance.Register<StageDescriptionInternal, StageDescription>(DataType.StageDescription);
+            m_Instance.Register<BlockShaderInterfaceInternal, BlockShaderInterface>(DataType.BlockShaderInterface);
+            m_Instance.Register<BlockShaderInternal, BlockShader>(DataType.BlockShader);
+            m_Instance.Register<RegisterTemplatesWithInterfaceInternal, RegisterTemplatesWithInterface>(DataType.RegisterTemplatesWithInterface);
+            m_Instance.Register<InterfaceRegistrationStatementInternal, InterfaceRegistrationStatement>(DataType.InterfaceRegistrationStatement);
         }
 
         void Register<InternalType, PublicType>(DataType dataType)
diff --git a/Modules/ShaderFoundry/ScriptBindings/FixedHandleList.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/FixedHandleList.bindings.cs
index ef784198f6..df473771a6 100644
--- a/Modules/ShaderFoundry/ScriptBindings/FixedHandleList.bindings.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/FixedHandleList.bindings.cs
@@ -40,6 +40,16 @@ public static FoundryHandle Build(ShaderContainer container, List<FoundryHandle>
             return listHandle;
         }
 
+        public static FoundryHandle Build<T>(ShaderContainer container, List<T> items) where T : struct, IPublicType<T>
+        {
+            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, items[i].Handle);
+            return listHandle;
+        }
+
         public static FoundryHandle Build<T>(ShaderContainer container, List<T> items, Func<T, FoundryHandle> indexFunc)
         {
             if ((items == null) || (items.Count <= 0))
@@ -59,6 +69,17 @@ public IEnumerable<T> Select<T>(ShaderContainer container, Func<FoundryHandle, T
                 yield return func(handle);
             }
         }
+
+        public static IEnumerable<T> Enumerate<T>(ShaderContainer container, FoundryHandle listHandle) where T : struct, IPublicType<T>
+        {
+            var list = new FixedHandleListInternal(listHandle);
+            var size = list.GetSize(container);
+            for (uint i = 0; i < size; i++)
+            {
+                var handle = list.GetElement(container, i);
+                yield return PublicTypeStatic<T>.ConstructFromHandle(container, handle);
+            }
+        }
     }
 
     internal static class FixedHandleListUtilities
diff --git a/Modules/ShaderFoundry/ScriptBindings/FoundryHandle.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/FoundryHandle.bindings.cs
index a494472918..ab77d9d841 100644
--- a/Modules/ShaderFoundry/ScriptBindings/FoundryHandle.bindings.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/FoundryHandle.bindings.cs
@@ -30,6 +30,6 @@ internal bool ReferenceEquals(FoundryHandle other)
 
         // 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; }}
-        internal UInt32 LegacyHandle { get { return m_Handle - 1; } set{ m_Handle = value + 1; } }
+        internal UInt32 LegacyHandle { get { return m_Handle - 1; } set { m_Handle = value + 1; } }
     }
 }
diff --git a/Modules/ShaderFoundry/ScriptBindings/InterfaceRegistrationStatement.binding.cs b/Modules/ShaderFoundry/ScriptBindings/InterfaceRegistrationStatement.binding.cs
new file mode 100644
index 0000000000..503752dd96
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/InterfaceRegistrationStatement.binding.cs
@@ -0,0 +1,141 @@
+// 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;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/InterfaceRegistrationStatement.h")]
+    internal struct InterfaceRegistrationStatementInternal : IInternalType<InterfaceRegistrationStatementInternal>
+    {
+        internal FoundryHandle m_AttributeListHandle;
+        internal FoundryHandle m_EntryHandle;
+
+        internal extern static InterfaceRegistrationStatementInternal Invalid();
+        internal extern bool IsValid();
+
+        internal extern bool IsProviderStatement(ShaderContainer container);
+        internal extern bool IsTemplateStatement(ShaderContainer container);
+
+        // IInternalType
+        InterfaceRegistrationStatementInternal IInternalType<InterfaceRegistrationStatementInternal>.ConstructInvalid() => Invalid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct InterfaceRegistrationStatement : IEquatable<InterfaceRegistrationStatement>, IPublicType<InterfaceRegistrationStatement>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly InterfaceRegistrationStatementInternal statementInternal;
+
+        // IPublicType
+        ShaderContainer IPublicType.Container => Container;
+        bool IPublicType.IsValid => IsValid;
+        FoundryHandle IPublicType.Handle => handle;
+        InterfaceRegistrationStatement IPublicType<InterfaceRegistrationStatement>.ConstructFromHandle(ShaderContainer container, FoundryHandle handle) => new InterfaceRegistrationStatement(container, handle);
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && handle.IsValid);
+
+        public IEnumerable<ShaderAttribute> Attributes
+        {
+            get
+            {
+                var listHandle = statementInternal.m_AttributeListHandle;
+                return FixedHandleListInternal.Enumerate<ShaderAttribute>(container, listHandle);
+            }
+        }
+        public bool IsProviderStatement => statementInternal.IsProviderStatement(container);
+        public bool IsTemplateStatement => statementInternal.IsTemplateStatement(container);
+        public string ProviderName
+        {
+            get
+            {
+                if (container == null || !IsProviderStatement)
+                {
+                    var message = "Invalid call to 'InterfaceRegistrationStatement.ProviderName'. " +
+                        "Statement is not a provider. Check IsProviderStatement before calling.";
+                    throw new InvalidOperationException(message);
+                }
+                return container.GetString(statementInternal.m_EntryHandle);
+            }
+        }
+        public Template Template
+        {
+            get
+            {
+                if (container == null || !IsTemplateStatement)
+                {
+                    var message = "Invalid call to 'InterfaceRegistrationStatement.Template'. " +
+                        "Statement is not a template. Check IsTemplateStatement before calling.";
+                    throw new InvalidOperationException(message);
+                }
+                return new Template(container, statementInternal.m_EntryHandle);
+            }
+        }
+
+        // private
+        internal InterfaceRegistrationStatement(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            ShaderContainer.Get(container, handle, out statementInternal);
+        }
+
+        public static InterfaceRegistrationStatement Invalid => new InterfaceRegistrationStatement(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 InterfaceRegistrationStatement other && this.Equals(other);
+        public bool Equals(InterfaceRegistrationStatement other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(InterfaceRegistrationStatement lhs, InterfaceRegistrationStatement rhs) => lhs.Equals(rhs);
+        public static bool operator!=(InterfaceRegistrationStatement lhs, InterfaceRegistrationStatement rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+
+            public List<ShaderAttribute> Attributes;
+            public string ProviderName { get; private set; }
+            public Template Template { get; private set; }
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string providerName)
+            {
+                this.container = container;
+                this.ProviderName = providerName;
+            }
+
+            public Builder(ShaderContainer container, Template template)
+            {
+                this.container = container;
+                this.Template = template;
+            }
+
+            public void AddAttribute(ShaderAttribute attribute)
+            {
+                Utilities.AddToList(ref Attributes, attribute);
+            }
+
+            public InterfaceRegistrationStatement Build()
+            {
+                var statementInternal = new InterfaceRegistrationStatementInternal();
+
+                statementInternal.m_AttributeListHandle = FixedHandleListInternal.Build(container, Attributes);
+                if (Template.IsValid)
+                    statementInternal.m_EntryHandle = Template.handle;
+                else
+                    statementInternal.m_EntryHandle = container.AddString(ProviderName);
+
+                var returnTypeHandle = container.Add(statementInternal);
+                return new InterfaceRegistrationStatement(container, returnTypeHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/KeywordDescriptor.binding.cs b/Modules/ShaderFoundry/ScriptBindings/KeywordDescriptor.binding.cs
index 114e17d74b..362ae92ee3 100644
--- a/Modules/ShaderFoundry/ScriptBindings/KeywordDescriptor.binding.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/KeywordDescriptor.binding.cs
@@ -17,12 +17,11 @@ internal struct KeywordDescriptorInternal : IInternalType<KeywordDescriptorInter
         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 void Setup(ShaderContainer container, string definition, string scope, string stage, 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);
 
@@ -51,7 +50,6 @@ internal struct KeywordDescriptorInternal : IInternalType<KeywordDescriptorInter
         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
         {
@@ -86,15 +84,13 @@ public class Builder
             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)
+            public Builder(ShaderContainer container, string definition, string scope, string stage, IEnumerable<string> ops)
             {
                 this.container = container;
-                this.name = name;
                 this.definition = definition;
                 this.scope = scope;
                 this.stage = stage;
@@ -104,7 +100,7 @@ public Builder(ShaderContainer container, string name, string definition, string
             public KeywordDescriptor Build()
             {
                 var descriptor = new KeywordDescriptorInternal();
-                descriptor.Setup(container, definition, scope, stage, name, ops.ToArray());
+                descriptor.Setup(container, definition, scope, stage, ops.ToArray());
                 var resultHandle = container.Add(descriptor);
                 return new KeywordDescriptor(container, resultHandle);
             }
diff --git a/Modules/ShaderFoundry/ScriptBindings/PassIdentifier.cs b/Modules/ShaderFoundry/ScriptBindings/PassIdentifier.cs
deleted file mode 100644
index 0d4ce08ec5..0000000000
--- a/Modules/ShaderFoundry/ScriptBindings/PassIdentifier.cs
+++ /dev/null
@@ -1,21 +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.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/PassStageType.binding.cs b/Modules/ShaderFoundry/ScriptBindings/PassStageType.binding.cs
index 6dc2d1e1b6..e7a3e3afc5 100644
--- a/Modules/ShaderFoundry/ScriptBindings/PassStageType.binding.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/PassStageType.binding.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine.Bindings;
-using PassIdentifier = UnityEngine.Rendering.PassIdentifier;
 
 namespace UnityEditor.ShaderFoundry
 {
diff --git a/Modules/ShaderFoundry/ScriptBindings/RegisterTemplatesWithInterface.binding.cs b/Modules/ShaderFoundry/ScriptBindings/RegisterTemplatesWithInterface.binding.cs
new file mode 100644
index 0000000000..385908bcd7
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/RegisterTemplatesWithInterface.binding.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.Collections.Generic;
+using System.Linq;
+using UnityEngine.Bindings;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/RegisterTemplatesWithInterface.h")]
+    internal struct RegisterTemplatesWithInterfaceInternal : IInternalType<RegisterTemplatesWithInterfaceInternal>
+    {
+        internal FoundryHandle m_AttributeListHandle;
+        internal FoundryHandle m_BlockShaderInterfaceHandle;
+        internal FoundryHandle m_RegistrationStatementListHandle;
+
+        internal extern static RegisterTemplatesWithInterfaceInternal Invalid();
+        internal extern bool IsValid();
+
+        // IInternalType
+        RegisterTemplatesWithInterfaceInternal IInternalType<RegisterTemplatesWithInterfaceInternal>.ConstructInvalid() => Invalid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct RegisterTemplatesWithInterface : IEquatable<RegisterTemplatesWithInterface>, IPublicType<RegisterTemplatesWithInterface>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly RegisterTemplatesWithInterfaceInternal internalData;
+
+        // IPublicType
+        ShaderContainer IPublicType.Container => Container;
+        bool IPublicType.IsValid => IsValid;
+        FoundryHandle IPublicType.Handle => handle;
+        RegisterTemplatesWithInterface IPublicType<RegisterTemplatesWithInterface>.ConstructFromHandle(ShaderContainer container, FoundryHandle handle)
+            => new RegisterTemplatesWithInterface(container, handle);
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && handle.IsValid);
+
+        public IEnumerable<ShaderAttribute> Attributes
+        {
+            get
+            {
+                var listHandle = internalData.m_AttributeListHandle;
+                return FixedHandleListInternal.Enumerate<ShaderAttribute>(container, listHandle);
+            }
+        }
+        public BlockShaderInterface Interface => new BlockShaderInterface(container, internalData.m_BlockShaderInterfaceHandle);
+        public IEnumerable<InterfaceRegistrationStatement> RegistrationStatements
+        {
+            get
+            {
+                var listHandle = internalData.m_RegistrationStatementListHandle;
+                return FixedHandleListInternal.Enumerate<InterfaceRegistrationStatement>(container, listHandle);
+            }
+        }
+        // private
+        internal RegisterTemplatesWithInterface(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            ShaderContainer.Get(container, handle, out internalData);
+        }
+
+        public static RegisterTemplatesWithInterface Invalid => new RegisterTemplatesWithInterface(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 RegisterTemplatesWithInterface other && this.Equals(other);
+        public bool Equals(RegisterTemplatesWithInterface other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(RegisterTemplatesWithInterface lhs, RegisterTemplatesWithInterface rhs) => lhs.Equals(rhs);
+        public static bool operator!=(RegisterTemplatesWithInterface lhs, RegisterTemplatesWithInterface rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            public BlockShaderInterface blockShaderInterface;
+            public List<ShaderAttribute> Attributes;
+            public List<InterfaceRegistrationStatement> RegistrationStatements;
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, BlockShaderInterface blockShaderInterface)
+            {
+                this.container = container;
+                this.blockShaderInterface = blockShaderInterface;
+            }
+
+            public void AddAttribute(ShaderAttribute attribute)
+            {
+                Utilities.AddToList(ref Attributes, attribute);
+            }
+
+            public void AddRegistrationStatement(InterfaceRegistrationStatement registrationStatement)
+            {
+                Utilities.AddToList(ref RegistrationStatements, registrationStatement);
+            }
+
+            public RegisterTemplatesWithInterface Build()
+            {
+                var internalData = new RegisterTemplatesWithInterfaceInternal();
+                internalData.m_BlockShaderInterfaceHandle = blockShaderInterface.handle;
+                internalData.m_AttributeListHandle = FixedHandleListInternal.Build(container, Attributes);
+                internalData.m_RegistrationStatementListHandle = FixedHandleListInternal.Build(container, RegistrationStatements);
+
+                var returnTypeHandle = container.Add(internalData);
+                return new RegisterTemplatesWithInterface(container, returnTypeHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/ShaderAttribute.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/ShaderAttribute.bindings.cs
index 3d1c1ce308..7d283c4097 100644
--- a/Modules/ShaderFoundry/ScriptBindings/ShaderAttribute.bindings.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/ShaderAttribute.bindings.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using UnityEngine.Bindings;
 using System.Runtime.InteropServices;
+using System.Linq;
 
 namespace UnityEditor.ShaderFoundry
 {
@@ -24,6 +25,9 @@ internal struct ShaderAttributeParamInternal : IInternalType<ShaderAttributePara
         internal extern string GetName(ShaderContainer container);
         internal extern string GetValue(ShaderContainer container);
 
+        internal extern bool ValueIsString(ShaderContainer container);
+        internal extern bool ValueIsArray(ShaderContainer container);
+
         internal extern static bool ValueEquals(ShaderContainer aContainer, FoundryHandle aHandle, ShaderContainer bContainer, FoundryHandle bHandle);
 
         // IInternalType
@@ -53,7 +57,31 @@ internal ShaderAttributeParam(ShaderContainer container, FoundryHandle handle)
         public ShaderContainer Container => container;
         public bool IsValid => (container != null) && (param.IsValid());
         public string Name => param.GetName(container);
-        public string Value => param.GetValue(container);
+        public string Value
+        {
+            get
+            {
+                if (container == null || !ValueIsString)
+                    throw new InvalidOperationException("Invalid call to 'ShaderAttributeParam.Value'. Value is not a string. Check ValueIsString before calling.");
+                return container.GetString(param.m_ValueHandle);
+            }
+        }
+        public IEnumerable<ShaderAttributeParam> Values
+        {
+            get
+            {
+                if (container == null || !ValueIsArray)
+                    throw new InvalidOperationException("Invalid call to 'ShaderAttributeParam.Values'. Values is not a List. Check ValueIsArray before calling.");
+
+                var handleType = container.GetDataTypeFromHandle(param.m_ValueHandle);
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(param.m_ValueHandle);
+                return list.Select<ShaderAttributeParam>(localContainer, (handle) => (new ShaderAttributeParam(localContainer, handle)));
+            }
+        }
+        public bool ValueIsString => param.ValueIsString(container);
+        // The value is an array of sub attributes. This is equivalent to "param = [value, value]".
+        public bool ValueIsArray => param.ValueIsArray(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.
@@ -73,6 +101,7 @@ public class Builder
             ShaderContainer container;
             internal string m_Name;
             internal string m_Value;
+            internal List<ShaderAttributeParam> m_Values;
 
             public ShaderContainer Container => container;
 
@@ -81,12 +110,27 @@ public Builder(ShaderContainer container, string name, string value)
                 this.container = container;
                 m_Name = name;
                 m_Value = value;
+                m_Values = null;
+            }
+
+            public Builder(ShaderContainer container, string name, List<ShaderAttributeParam> values)
+            {
+                this.container = container;
+                m_Name = name;
+                m_Value = null;
+                m_Values = values;
             }
 
             public ShaderAttributeParam Build()
             {
                 var paramInternal = new ShaderAttributeParamInternal();
-                paramInternal.Setup(container, m_Name, m_Value);
+                if (m_Values == null)
+                    paramInternal.Setup(container, m_Name, m_Value);
+                else
+                {
+                    paramInternal.m_NameHandle = container.AddString(m_Name);
+                    paramInternal.m_ValueHandle = FixedHandleListInternal.Build(container, m_Values, (v) => v.handle);
+                }
 
                 var returnHandle = container.Add(paramInternal);
                 return new ShaderAttributeParam(container, returnHandle);
diff --git a/Modules/ShaderFoundry/ScriptBindings/ShaderContainer.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/ShaderContainer.bindings.cs
index 4c98dff527..dbfc6750ad 100644
--- a/Modules/ShaderFoundry/ScriptBindings/ShaderContainer.bindings.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/ShaderContainer.bindings.cs
@@ -8,8 +8,6 @@
 using UnityEngine.Bindings;
 using Object = UnityEngine.Object;
 
-using PassIdentifier = UnityEngine.Rendering.PassIdentifier;
-
 namespace UnityEditor.ShaderFoundry
 {
     [NativeHeader("Modules/ShaderFoundry/Public/ShaderContainer.h")]
@@ -135,10 +133,6 @@ public ShaderType GetType(string name, Block.Builder builder)
             return new ShaderType(this, GetTypeByName(name, builder.blockHandle));
         }
 
-        internal extern FoundryHandle AddPassIdentifier(uint subShaderIndex, uint passIndex);
-        [NativeMethod("Get<PassIdentifier>")]
-        internal extern PassIdentifier GetPassIdentifier(FoundryHandle passIdentifierHandle);
-
         internal FoundryHandle AddTemplateLinker(ITemplateLinker linker)
         {
             // If the linker is either null, or has already been added, we return an invalid handle
diff --git a/Modules/ShaderFoundry/ScriptBindings/StageDescription.binding.cs b/Modules/ShaderFoundry/ScriptBindings/StageDescription.binding.cs
index b591ce47f4..8a2826c063 100644
--- a/Modules/ShaderFoundry/ScriptBindings/StageDescription.binding.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/StageDescription.binding.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine.Bindings;
-using PassIdentifier = UnityEngine.Rendering.PassIdentifier;
 
 namespace UnityEditor.ShaderFoundry
 {
diff --git a/Modules/ShaderFoundry/ScriptBindings/Template.binding.cs b/Modules/ShaderFoundry/ScriptBindings/Template.binding.cs
index dd721cb7b0..459d0fc148 100644
--- a/Modules/ShaderFoundry/ScriptBindings/Template.binding.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/Template.binding.cs
@@ -15,6 +15,7 @@ namespace UnityEditor.ShaderFoundry
     internal struct TemplateInternal : IInternalType<TemplateInternal>
     {
         internal FoundryHandle m_NameHandle;                        // string
+        internal FoundryHandle m_AttributeListHandle;               // List<ShaderAttribute>
         internal FoundryHandle m_PassListHandle;                    // List<TemplatePass>
         internal FoundryHandle m_TagDescriptorListHandle;           // List<FoundryHandle>
         internal FoundryHandle m_LODHandle;                         // string
@@ -58,6 +59,7 @@ internal struct TemplateInternal : IInternalType<TemplateInternal>
         public ShaderContainer Container => container;
         public bool IsValid => (container != null && handle.IsValid);
         public string Name => container?.GetString(template.m_NameHandle) ?? string.Empty;
+        public IEnumerable<ShaderAttribute> Attributes => FixedHandleListInternal.Enumerate<ShaderAttribute>(container, template.m_AttributeListHandle);
         public string AdditionalShaderID => container?.GetString(template.m_AdditionalShaderIDStringHandle) ?? string.Empty;
         public IEnumerable<TemplatePass> Passes
         {
@@ -103,6 +105,7 @@ internal Template(ShaderContainer container, FoundryHandle handle)
         public class Builder
         {
             public string Name { get; set; }
+            public List<ShaderAttribute> attributes;
             List<TemplatePass> passes { get; set; }
             public string AdditionalShaderID { get; set; }
             ITemplateLinker linker;
@@ -131,6 +134,7 @@ public Builder(ShaderContainer container, string name, ITemplateLinker linker)
                 this.linker = linker;
             }
 
+            public void AddAttribute(ShaderAttribute attribute) => Utilities.AddToList(ref attributes, attribute);
             public void AddPass(TemplatePass pass)
             {
                 if (pass.IsValid)
@@ -215,6 +219,7 @@ public Template Build()
                     m_ShaderFallbackHandle = container.AddString(ShaderFallback),
                 };
 
+                templateInternal.m_AttributeListHandle = FixedHandleListInternal.Build(container, attributes);
                 templateInternal.m_PassListHandle = FixedHandleListInternal.Build(container, passes, (p) => (p.handle));
                 templateInternal.m_LODHandle =  container.AddString(LOD);
                 templateInternal.m_PackageRequirementListHandle = FixedHandleListInternal.Build(container, packageRequirements, (p) => (p.handle));
diff --git a/Modules/ShaderFoundry/ScriptBindings/TemplatePass.binding.cs b/Modules/ShaderFoundry/ScriptBindings/TemplatePass.binding.cs
index 869bf6eab7..0c8e9a21b6 100644
--- a/Modules/ShaderFoundry/ScriptBindings/TemplatePass.binding.cs
+++ b/Modules/ShaderFoundry/ScriptBindings/TemplatePass.binding.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine.Bindings;
-using PassIdentifier = UnityEngine.Rendering.PassIdentifier;
 
 namespace UnityEditor.ShaderFoundry
 {
@@ -16,7 +15,6 @@ internal struct TemplatePassInternal : IInternalType<TemplatePassInternal>
         internal FoundryHandle m_UsePassNameHandle;
         internal FoundryHandle m_DisplayNameHandle;
         internal FoundryHandle m_ReferenceNameHandle;
-        internal FoundryHandle m_PassIdentifierHandle;
         internal FoundryHandle m_StageDescriptionListHandle;
         internal FoundryHandle m_CommandDescriptorListHandle;
         internal FoundryHandle m_PragmaDescriptorListHandle;
@@ -54,8 +52,6 @@ internal struct TemplatePassInternal : IInternalType<TemplatePassInternal>
         public string UsePassName => container?.GetString(templatePass.m_UsePassNameHandle) ?? string.Empty;
         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 StageDescription GetStageDescription(PassStageType stageType)
         {
@@ -137,7 +133,6 @@ public TemplatePass Build()
                     m_UsePassNameHandle = container.AddString(usePassName),
                     m_DisplayNameHandle = invalid,
                     m_ReferenceNameHandle = invalid,
-                    m_PassIdentifierHandle = invalid,
                     m_TagDescriptorListHandle = invalid,
                     m_PackageRequirementListHandle = invalid,
                     m_EnableDebugging = false
@@ -151,7 +146,6 @@ public TemplatePass Build()
         public class Builder
         {
             ShaderContainer container;
-            PassIdentifierInternal passIdentifier = new PassIdentifierInternal(uint.MaxValue, uint.MaxValue);
             List<StageDescription> stageDescriptions;
             List<CommandDescriptor> commandDescriptors;
             List<PragmaDescriptor> pragmaDescriptors;
@@ -171,11 +165,6 @@ public Builder(ShaderContainer container)
                     stageDescriptions.Add(StageDescription.Invalid);
             }
 
-            public void SetPassIdentifier(uint subShaderIndex, uint passIndex)
-            {
-                passIdentifier = new PassIdentifierInternal(subShaderIndex, passIndex);
-            }
-
             public void AddCommandDescriptor(CommandDescriptor commandDescriptor)
             {
                 if (commandDescriptors == null)
@@ -223,7 +212,6 @@ public TemplatePass Build()
                     m_EnableDebugging = EnableDebugging,
                 };
 
-                templatePassInternal.m_PassIdentifierHandle = container.AddPassIdentifier(passIdentifier.SubShaderIndex, passIdentifier.PassIndex);
                 templatePassInternal.m_StageDescriptionListHandle = FixedHandleListInternal.Build(container, stageDescriptions, (s) => (s.handle));
                 templatePassInternal.m_CommandDescriptorListHandle = FixedHandleListInternal.Build(container, commandDescriptors, (o) => (o.handle));
                 templatePassInternal.m_PragmaDescriptorListHandle = FixedHandleListInternal.Build(container, pragmaDescriptors, (o) => (o.handle));
diff --git a/Modules/SharedInternals/BindingsAttributes.cs b/Modules/SharedInternals/BindingsAttributes.cs
index cc445f6bb7..c064207f6d 100644
--- a/Modules/SharedInternals/BindingsAttributes.cs
+++ b/Modules/SharedInternals/BindingsAttributes.cs
@@ -474,18 +474,4 @@ 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/ShortcutManager/ShortcutManagerWindowView.cs b/Modules/ShortcutManager/ShortcutManagerWindowView.cs
index b80f344024..584bc96049 100644
--- a/Modules/ShortcutManager/ShortcutManagerWindowView.cs
+++ b/Modules/ShortcutManager/ShortcutManagerWindowView.cs
@@ -186,9 +186,11 @@ void BindShortcutEntryItem(VisualElement shortcutElementTemplate, int index)
 
             nameElement.text = m_ViewController.GetShortcutPathList()[index];
             nameElement.tooltip = nameElement.text;
-            contextType.text = shortcutEntry.context != ContextManager.globalContextType ? shortcutEntry.context.Name : string.Empty;
+            contextType.text = shortcutEntry.context != ContextManager.globalContextType
+                ? ObjectNames.NicifyVariableName(shortcutEntry.context.Name) : string.Empty;
             tag.text = shortcutEntry.tag;
-            contextElement.tooltip = contextType.text;
+            contextElement.tooltip = shortcutEntry.context != ContextManager.globalContextType
+                ? shortcutEntry.context.Name : string.Empty;
             if (!string.IsNullOrWhiteSpace(tag.text)) contextElement.tooltip += $" ({tag.text})";
             bindingTextElement.text = KeyCombination.SequenceToString(shortcutEntry.combinations);
             bindingField.SetValueWithoutNotify(shortcutEntry.combinations.ToList());
@@ -378,7 +380,8 @@ void OnRenameProfileClicked()
                 m_ViewController.activeProfile,
                 L10n.Tr("Rename"),
                 m_ViewController.CanRenameActiveProfile,
-                m_ViewController.RenameActiveProfile);
+                m_ViewController.RenameActiveProfile,
+                400f, 200f);
         }
 
         void OnDeleteProfileClicked()
@@ -548,7 +551,6 @@ void BuildVisualElementHierarchyRoot()
             m_Root.AddToClassList("ShortcutManagerView");
             if (EditorGUIUtility.isProSkin)
                 m_Root.AddToClassList("isProSkin");
-            m_Root.AddStyleSheetPath("StyleSheets/ShortcutManager/ShortcutManagerView.uss");
 
             BuildProfileManagementRow(header);
             BuildLegendRow(header);
@@ -749,7 +751,8 @@ void ShortcutSelectionChanged(IEnumerable<object> selection)
 
         void ShortcutTableRightClickDown(MouseDownEvent evt)
         {
-            evt.StopPropagation();
+            if(!m_ShortcutsTable.scrollView.verticalScroller.worldBound.Contains(evt.mousePosition))
+                evt.StopPropagation();
 
             var slider = m_ShortcutsTable.Q<Scroller>(className: Scroller.verticalVariantUssClassName);
             var clickedIndex = (int)((evt.localMousePosition.y + slider.value) / m_ShortcutsTable.ResolveItemHeight());
@@ -1436,11 +1439,13 @@ private void RegisterEvents(VisualElement input)
         {
             input.RegisterCallback<KeyDownEvent>(OnKeyDown, TrickleDown.TrickleDown);
             input.RegisterCallback<KeyUpEvent>(OnKeyUp, TrickleDown.TrickleDown);
-            input.RegisterCallback<MouseDownEvent>(OnMouse, TrickleDown.TrickleDown);
-            input.RegisterCallback<MouseUpEvent>(OnMouse, TrickleDown.TrickleDown);
+            input.RegisterCallback<PointerDownEvent>(OnPointer, TrickleDown.TrickleDown);
+            input.RegisterCallback<PointerUpEvent>(OnPointer, TrickleDown.TrickleDown);
             input.RegisterCallback<FocusEvent>((evt) => {
                 StartNewCombination();
                 evt.StopPropagation();
+                evt.propagation |= EventBase.EventPropagation.Cancellable;
+                evt.PreventDefault();
                 textSelection.MoveTextEnd();
             }, TrickleDown.TrickleDown);
             input.RegisterCallback<BlurEvent>((evt) =>
@@ -1492,11 +1497,15 @@ void OnKeyUp(KeyUpEvent kue)
             textSelection.MoveTextEnd();
         }
 
-        void OnMouse<T>(MouseEventBase<T> evt) where T : MouseEventBase<T>, new()
+        void OnPointer<T>(PointerEventBase<T> evt) where T : PointerEventBase<T>, new()
         {
-            if (evt.GetType() == typeof(MouseDownEvent))
+            if (evt.GetType() == typeof(PointerDownEvent))
             {
-                m_KeyDown.Add(KeyCode.Mouse0 + evt.button);
+                var keyCode = KeyCode.Mouse0 + evt.button;
+
+                m_KeyDown.Add(keyCode);
+                AppendKeyCombination(keyCode, evt.modifiers);
+
                 Apply();
             }
             evt.StopPropagation();
diff --git a/Modules/ShortcutManagerEditor/DeleteShortcutProfileWindow.cs b/Modules/ShortcutManagerEditor/DeleteShortcutProfileWindow.cs
index fe54561444..9286979570 100644
--- a/Modules/ShortcutManagerEditor/DeleteShortcutProfileWindow.cs
+++ b/Modules/ShortcutManagerEditor/DeleteShortcutProfileWindow.cs
@@ -21,10 +21,12 @@ public static void Show(string profileName, Action action)
         {
             var deleteProfilePromptWindow = GetWindow<DeleteShortcutProfileWindow>(true, "Delete Profile", true);
 
-            deleteProfilePromptWindow.minSize = new Vector2(320, 120);
+            deleteProfilePromptWindow.minSize = new Vector2(400, 130);
+            deleteProfilePromptWindow.maxSize = new Vector2(400, 130);
 
             deleteProfilePromptWindow.m_HeaderTextElement.text = "Delete a shortcut profile";
-            deleteProfilePromptWindow.m_MessageTextElement.text = string.Format("Are you sure you want to delete the shortcut profile '{0}'?", profileName);
+            deleteProfilePromptWindow.m_MessageTextElement.text =
+                $"Are you sure you want to delete the shortcut profile '{profileName}'?";
             deleteProfilePromptWindow.m_Action = action;
 
             deleteProfilePromptWindow.ShowModal();
diff --git a/Modules/ShortcutManagerEditor/HelperWindow.cs b/Modules/ShortcutManagerEditor/HelperWindow.cs
index 78ef26e125..b37bd960ba 100644
--- a/Modules/ShortcutManagerEditor/HelperWindow.cs
+++ b/Modules/ShortcutManagerEditor/HelperWindow.cs
@@ -21,18 +21,26 @@ internal class HelperWindow : EditorWindow
         //[MenuItem("Window/General/Helper _%H")]
         static void ShowWindow() => GetWindow<HelperWindow>().Show();
 
-        static HelperWindow() => EditorApplication.globalEventHandler += Init;
-
         static Dictionary<KeyCode, GUIContent> keyIcons;
+        static bool s_Initialized;
 
         static void Init()
         {
+            if (s_Initialized)
+                return;
+
             EditorApplication.globalEventHandler += UpdateContext;
             ContextManager.onTagChange += UpdateContext;
             Selection.selectionChanged += UpdateContext;
             focusedWindowChanged += UpdateContext;
+            UpdateContext();
 
-            EditorApplication.globalEventHandler -= Init;
+            s_Initialized = true;
+        }
+
+        void OnEnable()
+        {
+            Init();
         }
 
         static bool HandleKey(Event evt)
@@ -184,6 +192,7 @@ private void CreateGUI()
 
         internal static void StatusBarShortcuts()
         {
+            Init();
             if (keyIcons == null)
             {
                 keyIcons = new Dictionary<KeyCode, GUIContent>();
diff --git a/Modules/ShortcutManagerEditor/PromptWindow.cs b/Modules/ShortcutManagerEditor/PromptWindow.cs
index 1cb6a9952a..fea4c7b907 100644
--- a/Modules/ShortcutManagerEditor/PromptWindow.cs
+++ b/Modules/ShortcutManagerEditor/PromptWindow.cs
@@ -12,7 +12,7 @@ namespace UnityEditor.ShortcutManagement
 {
     class PromptWindow : EditorWindow
     {
-        Predicate<string> m_Validator;
+        Func<string, string> m_Validator;
         Action<string> m_Action;
         bool m_IsValid;
 
@@ -20,14 +20,16 @@ class PromptWindow : EditorWindow
         TextElement m_MessageTextElement;
         TextElement m_LabelTextElement;
         TextField m_TextField;
+        Label m_WarningText;
         Button m_SubmitButton;
 
-        public static void Show(string title, string headerText, string messageText, string valueLabel, string initialValue, string acceptButtonText, Predicate<string> validator, Action<string> action)
+        public static void Show(string title, string headerText, string messageText, string valueLabel, string initialValue,
+            string acceptButtonText, Func<string, string> validator, Action<string> action, float windowWidth = 380f, float windowHeight = 160f)
         {
             var promptWindow = GetWindow<PromptWindow>(true, title, true);
 
             // TODO: Ideally the window size should be fixed according to its contents
-            promptWindow.minSize = new Vector2(360, 180);
+            promptWindow.minSize = promptWindow.maxSize = new Vector2(windowWidth, windowHeight);
 
             promptWindow.m_HeaderTextElement.text = headerText;
             promptWindow.m_MessageTextElement.text = messageText;
@@ -56,7 +58,6 @@ void OnEnable()
             // Load styles
             if (EditorGUIUtility.isProSkin)
                 root.AddToClassList("isProSkin");
-            root.AddStyleSheetPath("StyleSheets/ShortcutManager/PromptWindow.uss");
 
             // Find elements
             m_HeaderTextElement = root.Q<TextElement>("header");
@@ -64,6 +65,7 @@ void OnEnable()
             var labelAndTextField = root.Q("label-and-text-field");
             m_LabelTextElement = labelAndTextField.Q<TextElement>();
             m_TextField = labelAndTextField.Q<TextField>();
+            m_WarningText = labelAndTextField.Q<Label>("warning-text");
             var buttons = root.Q("buttons");
             m_SubmitButton = root.Q<Button>("submit");
             var cancelButton = root.Q<Button>("cancel");
@@ -91,17 +93,13 @@ void OnEnable()
 
         void UpdateValidation()
         {
-            m_IsValid = m_Validator == null || m_Validator(m_TextField.value);
-            if (m_IsValid)
-            {
-                m_SubmitButton.SetEnabled(true);
-                m_TextField.RemoveFromClassList("invalid");
-            }
-            else
-            {
-                m_SubmitButton.SetEnabled(false);
-                m_TextField.AddToClassList("invalid");
-            }
+            var validationErrorMessage = m_Validator?.Invoke(m_TextField.value);
+
+            m_WarningText.text = validationErrorMessage;
+            m_IsValid = validationErrorMessage == null;
+
+            m_SubmitButton.SetEnabled(m_IsValid);
+            m_WarningText.visible = !m_IsValid;
         }
 
         void Submit()
diff --git a/Modules/ShortcutManagerEditor/ShortcutAttributeDiscoveryProvider.cs b/Modules/ShortcutManagerEditor/ShortcutAttributeDiscoveryProvider.cs
index 5f80a854bf..cc240cd52f 100644
--- a/Modules/ShortcutManagerEditor/ShortcutAttributeDiscoveryProvider.cs
+++ b/Modules/ShortcutManagerEditor/ShortcutAttributeDiscoveryProvider.cs
@@ -65,7 +65,7 @@ internal struct SourceInfo
             public string filePath;
         }
 
-        internal static SequencePoint FindSequencePoint(MethodDefinition methodWithBody)
+        private static SequencePoint FindSequencePoint(MethodDefinition methodWithBody)
         {
             foreach (var instruction in methodWithBody.Body.Instructions)
             {
@@ -77,36 +77,38 @@ internal static SequencePoint FindSequencePoint(MethodDefinition methodWithBody)
             return null;
         }
 
-        internal static MethodDefinition FromMethodInfo(MethodInfo methodInfo)
+        private static SequencePoint FromMethodInfo(MethodInfo methodInfo)
         {
             var assembly = methodInfo.DeclaringType.Assembly;
             var parms = new ReaderParameters { ReadSymbols = true };
-            var module = ModuleDefinition.ReadModule(assembly.Location, parms);
-
-            var convertedFullName = methodInfo.DeclaringType.FullName.Replace("+", "/");
-            var typeDefinition = module.GetType(convertedFullName);
-            var expectedParams = methodInfo.GetParameters();
-
-            foreach (var methodDefinition in typeDefinition.Methods)
+            using (var assemblyDefinition = AssemblyDefinition.ReadAssembly(assembly.Location, parms))
             {
-                if (methodDefinition.Name != methodInfo.Name)
-                    continue;
 
-                var paramz = methodDefinition.Parameters;
-                if (paramz.Count != expectedParams.Length)
-                    continue;
+                var convertedFullName = methodInfo.DeclaringType.FullName.Replace("+", "/");
+                var typeDefinition = assemblyDefinition.MainModule.GetType(convertedFullName);
+                var expectedParams = methodInfo.GetParameters();
 
-                var sameParameters = true;
-                for (int i = 0; i < expectedParams.Length; ++i)
+                foreach (var methodDefinition in typeDefinition.Methods)
                 {
-                    var typeEquals = paramz[i].ParameterType.FullName == expectedParams[i].ParameterType.FullName;
-                    sameParameters = sameParameters && typeEquals;
-                    if (!sameParameters)
-                        break;
-                }
+                    if (methodDefinition.Name != methodInfo.Name)
+                        continue;
+
+                    var paramz = methodDefinition.Parameters;
+                    if (paramz.Count != expectedParams.Length)
+                        continue;
+
+                    var sameParameters = true;
+                    for (int i = 0; i < expectedParams.Length; ++i)
+                    {
+                        var typeEquals = paramz[i].ParameterType.FullName == expectedParams[i].ParameterType.FullName;
+                        sameParameters = sameParameters && typeEquals;
+                        if (!sameParameters)
+                            break;
+                    }
 
-                if (sameParameters)
-                    return methodDefinition;
+                    if (sameParameters)
+                        return FindSequencePoint(methodDefinition);
+                }
             }
 
             return null;
@@ -114,8 +116,11 @@ internal static MethodDefinition FromMethodInfo(MethodInfo methodInfo)
 
         internal static SourceInfo GetSourceInfo(MethodInfo methodInfo)
         {
-            var methodWithBody = FromMethodInfo(methodInfo);
-            var seq = FindSequencePoint(methodWithBody);
+            var seq = FromMethodInfo(methodInfo);
+            if(seq == null)
+            {
+                throw new InvalidOperationException("Can't find symbol information for " + methodInfo);
+            }
             SourceInfo sourceInfo = new SourceInfo()
             {
                 lineNumber = seq.StartLine,
diff --git a/Modules/ShortcutManagerEditor/ShortcutEntry.cs b/Modules/ShortcutManagerEditor/ShortcutEntry.cs
index eb60761c66..314b14ba4a 100644
--- a/Modules/ShortcutManagerEditor/ShortcutEntry.cs
+++ b/Modules/ShortcutManagerEditor/ShortcutEntry.cs
@@ -153,7 +153,7 @@ internal void ResetToDefault()
         internal void SetOverride(IEnumerable<KeyCombination> newKeyCombinations)
         {
             m_OverriddenCombinations = newKeyCombinations.ToList();
-            if (m_Type == ShortcutType.Menu && m_Identifier.path.StartsWith(ShortcutManagerWindowViewController.s_MainMenu))
+            if (m_Type == ShortcutType.Menu && m_Identifier.path.StartsWith(ShortcutManagerWindowViewController.k_MainMenu))
             {
                 var newMenuKey = m_OverriddenCombinations.Any() ? m_OverriddenCombinations[0].ToMenuShortcutString() : "";
                 Menu.SetHotkey(m_Identifier.path.Substring(Discovery.k_MainMenuShortcutPrefix.Length), newMenuKey);
diff --git a/Modules/ShortcutManagerEditor/ShortcutManagerWindow.cs b/Modules/ShortcutManagerEditor/ShortcutManagerWindow.cs
index 81ab42f89c..c452178da4 100644
--- a/Modules/ShortcutManagerEditor/ShortcutManagerWindow.cs
+++ b/Modules/ShortcutManagerEditor/ShortcutManagerWindow.cs
@@ -52,10 +52,10 @@ string activeProfile
         {
             get; set;
         }
-        bool CanCreateProfile(string newProfileId);
+        string CanCreateProfile(string newProfileId);
         void CreateProfile(string newProfileId);
         bool CanRenameActiveProfile();
-        bool CanRenameActiveProfile(string newProfileId);
+        string CanRenameActiveProfile(string newProfileId);
         void RenameActiveProfile(string newProfileId);
         bool CanDeleteActiveProfile();
         void DeleteActiveProfile();
diff --git a/Modules/ShortcutManagerEditor/ShortcutManagerWindowViewController.cs b/Modules/ShortcutManagerEditor/ShortcutManagerWindowViewController.cs
index d120c27661..3e4a5c8780 100644
--- a/Modules/ShortcutManagerEditor/ShortcutManagerWindowViewController.cs
+++ b/Modules/ShortcutManagerEditor/ShortcutManagerWindowViewController.cs
@@ -12,9 +12,15 @@ namespace UnityEditor.ShortcutManagement
 {
     class ShortcutManagerWindowViewController : IShortcutManagerWindowViewController, IKeyBindingStateProvider
     {
-        readonly string m_AllUnityCommands = L10n.Tr("All Unity Commands");
-        readonly string m_CommandsWithConflicts = L10n.Tr("Binding Conflicts");
-        internal static readonly string s_MainMenu = L10n.Tr("Main Menu");
+        static readonly string k_AllUnityCommands = L10n.Tr("All Unity Commands");
+        static readonly string k_CommandsWithConflicts = L10n.Tr("Binding Conflicts");
+        internal static readonly string k_MainMenu = L10n.Tr("Main Menu");
+
+        static readonly string k_ProfileNameEmpty = L10n.Tr("Profile name is empty");
+        static readonly string k_ProfileNameUnsupported = L10n.Tr("Profile name is unsupported");
+        static readonly string k_ProfileExists = L10n.Tr("Profile already exists");
+        static readonly string k_DefaultRename = L10n.Tr("Default profile cannot be renamed");
+        static readonly string k_ProfileNotFound = L10n.Tr("Couldn't find active profile");
 
         const int k_AllUnityCommandsIndex = 0;
         const int k_ConflictsIndex = 1;
@@ -171,7 +177,7 @@ void BuildCategoryList()
                 var identifier = entry.displayName;
                 m_AllEntries.Add(entry);
 
-                if (entry.type == ShortcutType.Menu && entry.displayName.StartsWith(s_MainMenu))
+                if (entry.type == ShortcutType.Menu && entry.displayName.StartsWith(k_MainMenu))
                 {
                     menuItems.Add(entry);
                 }
@@ -195,27 +201,27 @@ void BuildCategoryList()
             var shortcutNameComparer = new ShortcutNameComparer();
             m_AllEntries.Sort(shortcutNameComparer);
 
-            m_CategoryToEntriesList.Add(m_AllUnityCommands, m_AllEntries);
+            m_CategoryToEntriesList.Add(k_AllUnityCommands, m_AllEntries);
 
 
-            m_CategoryToEntriesList.Add(m_CommandsWithConflicts, new List<ShortcutEntry>());
+            m_CategoryToEntriesList.Add(k_CommandsWithConflicts, new List<ShortcutEntry>());
 
             UpdateCommandsWithConflicts();
             menuItems.Sort(shortcutNameComparer);
-            m_CategoryToEntriesList.Add(s_MainMenu, menuItems);
+            m_CategoryToEntriesList.Add(k_MainMenu, menuItems);
 
 
             m_Categories = categories.ToList();
 
             m_Categories.Sort();
-            m_Categories.Insert(k_AllUnityCommandsIndex, m_AllUnityCommands);
-            m_Categories.Insert(k_ConflictsIndex, m_CommandsWithConflicts);
-            m_Categories.Insert(k_MainMenuIndex, s_MainMenu);
+            m_Categories.Insert(k_AllUnityCommandsIndex, k_AllUnityCommands);
+            m_Categories.Insert(k_ConflictsIndex, k_CommandsWithConflicts);
+            m_Categories.Insert(k_MainMenuIndex, k_MainMenu);
         }
 
         void UpdateCommandsWithConflicts()
         {
-            GetAllCommandsWithConflicts(m_CategoryToEntriesList[m_CommandsWithConflicts]);
+            GetAllCommandsWithConflicts(m_CategoryToEntriesList[k_CommandsWithConflicts]);
         }
 
         void GetAllCommandsWithConflicts(List<ShortcutEntry> output)
@@ -252,9 +258,19 @@ public string activeProfile
             }
         }
 
-        public bool CanCreateProfile(string newProfileId)
+        public string CanCreateProfile(string newProfileId)
         {
-            return m_ShortcutProfileManager.CanCreateProfile(newProfileId) == CanCreateProfileResult.Success;
+            var canCreateProfileResult = m_ShortcutProfileManager.CanCreateProfile(newProfileId);
+
+            switch (canCreateProfileResult)
+            {
+                case CanCreateProfileResult.InvalidProfileId:
+                    return string.IsNullOrWhiteSpace(newProfileId) ? k_ProfileNameEmpty : k_ProfileNameUnsupported;
+                case CanCreateProfileResult.DuplicateProfileId:
+                    return k_ProfileExists;
+                default:
+                    return null;
+            }
         }
 
         public void CreateProfile(string newProfileId)
@@ -268,12 +284,22 @@ public bool CanRenameActiveProfile()
             return CanDeleteActiveProfile();
         }
 
-        public bool CanRenameActiveProfile(string newProfileId)
+        public string CanRenameActiveProfile(string newProfileId)
         {
             if (m_ShortcutProfileManager.activeProfile == null)
-                return false;
+                return k_DefaultRename;
 
-            return m_ShortcutProfileManager.CanRenameProfile(m_ShortcutProfileManager.activeProfile, newProfileId) == CanRenameProfileResult.Success;
+            switch (m_ShortcutProfileManager.CanRenameProfile(m_ShortcutProfileManager.activeProfile, newProfileId))
+            {
+                case CanRenameProfileResult.ProfileNotFound:
+                    return k_ProfileNotFound;
+                case CanRenameProfileResult.InvalidProfileId:
+                    return string.IsNullOrWhiteSpace(newProfileId) ? k_ProfileNameEmpty : k_ProfileNameUnsupported;
+                case CanRenameProfileResult.DuplicateProfileId:
+                    return k_ProfileExists;
+                default:
+                    return null;
+            }
         }
 
         public void RenameActiveProfile(string newProfileId)
@@ -384,7 +410,7 @@ public void GetSearchFilters(List<string> filters)
         {
             if (m_SelectedCategoryIndex != k_AllUnityCommandsIndex)
                 filters.Add(m_Categories[m_SelectedCategoryIndex]);
-            filters.Add(m_AllUnityCommands);
+            filters.Add(k_AllUnityCommands);
         }
 
         public string GetSelectedSearchFilter()
@@ -392,7 +418,7 @@ public string GetSelectedSearchFilter()
             switch (m_SerializedState.searchCategoryFilter)
             {
                 case SearchCategoryFilter.IgnoreCategory:
-                    return m_AllUnityCommands;
+                    return k_AllUnityCommands;
                 case SearchCategoryFilter.SearchWithinSelectedCategory:
                     return m_Categories[m_SelectedCategoryIndex];
                 default:
@@ -402,7 +428,7 @@ public string GetSelectedSearchFilter()
 
         public void SetSelectedSearchFilter(string filter)
         {
-            if (filter == m_AllUnityCommands)
+            if (filter == k_AllUnityCommands)
                 m_SerializedState.searchCategoryFilter = SearchCategoryFilter.IgnoreCategory;
             else if (filter == m_Categories[m_SelectedCategoryIndex])
                 m_SerializedState.searchCategoryFilter = SearchCategoryFilter.SearchWithinSelectedCategory;
@@ -425,7 +451,7 @@ void PopulateShortcutList()
             var category = selectedCategory;
 
             if (IsSearching() && m_SerializedState.searchCategoryFilter == SearchCategoryFilter.IgnoreCategory)
-                category = m_AllUnityCommands;
+                category = k_AllUnityCommands;
 
             var identifierList = m_CategoryToEntriesList[category];
 
@@ -599,7 +625,7 @@ string FindCategoryFor(ShortcutEntry shortcutEntry)
                     return pair.Key;
             }
 
-            return m_AllUnityCommands;
+            return k_AllUnityCommands;
         }
 
         public void SetKeySelected(KeyCode keyCode, EventModifiers eventModifier)
@@ -675,7 +701,7 @@ public IList<ShortcutEntry> GetShortcutsBoundTo(KeyCode keyCode, EventModifiers
 
         public bool IsEntryPartOfConflict(ShortcutEntry shortcutEntry)
         {
-            return m_CategoryToEntriesList[m_CommandsWithConflicts].Contains(shortcutEntry);
+            return m_CategoryToEntriesList[k_CommandsWithConflicts].Contains(shortcutEntry);
         }
 
         //TODO: find a better place for this logic, Directory maybe?
@@ -803,7 +829,7 @@ static bool IsGlobalContext(ShortcutEntry entry)
 
         public void SelectConflictCategory()
         {
-            SetCategorySelected(m_CommandsWithConflicts);
+            SetCategorySelected(k_CommandsWithConflicts);
             GetView().RefreshCategoryList();
         }
 
diff --git a/Modules/ShortcutManagerEditor/ShortcutProfileManager.cs b/Modules/ShortcutManagerEditor/ShortcutProfileManager.cs
index cbd7b04ff0..f6100e5a02 100644
--- a/Modules/ShortcutManagerEditor/ShortcutProfileManager.cs
+++ b/Modules/ShortcutManagerEditor/ShortcutProfileManager.cs
@@ -296,7 +296,10 @@ public void ModifyShortcutEntry(Identifier identifier, IEnumerable<KeyCombinatio
                 throw new InvalidOperationException("No active profile");
 
             if (!m_BindingValidator.IsCombinationValid(combinationSequence, out string invalidBindingMessage))
-                throw new ArgumentException(invalidBindingMessage, nameof(combinationSequence));
+            {
+                Debug.LogError(invalidBindingMessage);
+                return;
+            }
 
             var shortcutEntry = m_Entries.FirstOrDefault(e => e.identifier.Equals(identifier));
             var oldBinding = new ShortcutBinding(shortcutEntry.combinations);
diff --git a/Modules/ShortcutManagerEditor/Trigger.cs b/Modules/ShortcutManagerEditor/Trigger.cs
index 4d24711785..8691bcb771 100644
--- a/Modules/ShortcutManagerEditor/Trigger.cs
+++ b/Modules/ShortcutManagerEditor/Trigger.cs
@@ -29,9 +29,8 @@ public Trigger(IDirectory directory, IConflictResolver conflictResolver)
 
         public void HandleKeyEvent(Event evt, IContextManager contextManager)
         {
-            if (evt == null) return;
-
-            if (evt.keyCode == KeyCode.None) return;
+            if (evt == null || evt.keyCode == KeyCode.None)
+                return;
 
             if (evt.type == EventType.KeyUp || evt.type == EventType.MouseUp)
             {
diff --git a/Modules/StyleSheetsEditor/StylePainter.cs b/Modules/StyleSheetsEditor/StylePainter.cs
index 28cc40fa20..f3d32280ae 100644
--- a/Modules/StyleSheetsEditor/StylePainter.cs
+++ b/Modules/StyleSheetsEditor/StylePainter.cs
@@ -294,7 +294,7 @@ internal static void DrawBlock(GUIStyle basis, StyleBlock block, Rect drawRect,
                 float contentImageOffsetX = hasImage ? block.GetFloat(StyleCatalogKeyword.contentImageOffsetX) : 0;
                 float contentImageOffsetY = hasImage ? block.GetFloat(StyleCatalogKeyword.contentImageOffsetY) : 0;
                 basis.Internal_DrawContent(contentRect, content, states.isHover, states.isActive, states.on, states.hasKeyboardFocus,
-                    states.hasTextInput, states.drawSelectionAsComposition, states.cursorFirst, states.cursorLast,
+                    states.hasTextInput, states.drawSelectionAsComposition, states.cursorFirstPosition, states.cursorLastPosition,
                     states.cursorColor, states.selectionColor, guiContentColor * opacity,
                     0, 0, contentImageOffsetY, contentImageOffsetX, false, false);
 
diff --git a/Modules/Terrain/Public/Terrain.bindings.cs b/Modules/Terrain/Public/Terrain.bindings.cs
index 9acd303857..287bd85bc4 100644
--- a/Modules/Terrain/Public/Terrain.bindings.cs
+++ b/Modules/Terrain/Public/Terrain.bindings.cs
@@ -71,6 +71,7 @@ public sealed partial class Terrain : Behaviour
 
         extern public float heightmapPixelError { get; set; }
         extern public int heightmapMaximumLOD { get; set; }
+        extern public int heightmapMinimumLODSimplification { get; set; }
 
         extern public float basemapDistance { get; set; }
 
@@ -156,6 +157,8 @@ public void GetSplatMaterialPropertyBlock(MaterialPropertyBlock dest)
 
         extern public bool deringLightProbesForTrees { get; set; }
 
+        extern public TreeMotionVectorModeOverride treeMotionVectorModeOverride { get; set; }
+
         extern public bool preserveTreePrototypeLayers { get; set; }
 
         [StaticAccessor("Terrain", StaticAccessorType.DoubleColon)]
diff --git a/Modules/Terrain/Public/TerrainData.bindings.cs b/Modules/Terrain/Public/TerrainData.bindings.cs
index 8595b27200..154f56d929 100644
--- a/Modules/Terrain/Public/TerrainData.bindings.cs
+++ b/Modules/Terrain/Public/TerrainData.bindings.cs
@@ -85,6 +85,15 @@ public enum DetailScatterMode
         InstanceCountMode = 1
     }
 
+    // should match TreeMotionVectorModeOverride enum in Terrain.h
+    public enum TreeMotionVectorModeOverride
+    {
+        CameraMotionOnly = 0,
+        PerObjectMotion = 1,
+        ForceNoMotion = 2,
+        InheritFromPrototype = 3,
+    }
+
     [StructLayout(LayoutKind.Sequential)]
     [NativeHeader("TerrainScriptingClasses.h")]
     [NativeHeader("Modules/Terrain/Public/TerrainDataScriptingInterface.h")]
@@ -1054,6 +1063,7 @@ extern public TerrainLayer[] terrainLayers
             get;
 
             [FreeFunction(k_ScriptingInterfacePrefix + "SetTerrainLayers", HasExplicitThis = true)]
+            [param: Unmarshalled]
             set;
         }
 
@@ -1069,7 +1079,7 @@ public void SetTerrainLayersRegisterUndo(TerrainLayer[] terrainLayers, string un
         }
 
         [FreeFunction(k_ScriptingInterfacePrefix + "SetTerrainLayersRegisterUndo", HasExplicitThis = true)]
-        extern private void Internal_SetTerrainLayersRegisterUndo(TerrainLayer[] terrainLayers, string undoName);
+        extern private void Internal_SetTerrainLayersRegisterUndo([Unmarshalled] TerrainLayer[] terrainLayers, string undoName);
 
         [NativeName(k_TreeDatabasePrefix + "AddTree")]
         extern internal void AddTree(ref TreeInstance tree);
diff --git a/Modules/TerrainEditor/Overlays/BrushAttributes.cs b/Modules/TerrainEditor/Overlays/BrushAttributes.cs
index 39d3d61516..e9f9e0a054 100644
--- a/Modules/TerrainEditor/Overlays/BrushAttributes.cs
+++ b/Modules/TerrainEditor/Overlays/BrushAttributes.cs
@@ -12,7 +12,7 @@
 
 namespace UnityEditor.TerrainTools
 {
-    [Overlay(typeof(SceneView), "Brush Attributes")]
+    [Overlay(typeof(SceneView), "Brush Attributes", defaultDockPosition = DockPosition.Top, defaultDockZone = DockZone.TopToolbar)]
     [Icon("TerrainOverlays/BrushSettingIcons/BrushAttributes.png")]
     internal class BrushAttributes : ToolbarOverlay, ITransientOverlay, ICreateHorizontalToolbar, ICreateVerticalToolbar
     {
@@ -20,16 +20,14 @@ public bool visible
         {
             get
             {
-                if (packageIsInstalled) return false; // no core brushAttributes when package is installed
                 var currTool = TerrainInspector.GetActiveTerrainTool() as ITerrainPaintToolWithOverlays;
-                if (currTool == null)
-                    return false;
-                return currTool.HasBrushAttributes && BrushesOverlay.IsSelectedObjectTerrain();
+                if (currTool == null) return false;
+                bool directlyInheritsOverlays = currTool.GetType().BaseType.GetGenericTypeDefinition() == typeof(TerrainPaintToolWithOverlays<>).GetGenericTypeDefinition();
+                return currTool.HasBrushAttributes && BrushesOverlay.IsSelectedObjectTerrain() && directlyInheritsOverlays;
             }
         }
 
         internal static BrushAttributes s_Instance;
-        private bool packageIsInstalled;
 
         BrushAttributes() : base(
 
@@ -37,7 +35,6 @@ public bool visible
             BrushSize.k_Id)
         {
             s_Instance = this;
-            packageIsInstalled = TerrainToolsPackageInstalled();
 
             // only rebuild if the next tool is/isn't PaintDetailsTool
             ToolManager.activeToolChanged += RebuildAttributesOverlays;
@@ -51,14 +48,6 @@ public override void OnWillBeDestroyed()
             ToolManager.activeContextChanged -= RebuildAttributesOverlays;
         }
 
-        private bool TerrainToolsPackageInstalled()
-        {
-            // check if package is installed
-            var upm = UnityEditor.PackageManager.PackageInfo.GetAllRegisteredPackages();
-            var terrainPackageInfo = upm.Where(pi => pi.name == "com.unity.terrain-tools");
-            return terrainPackageInfo.Any(); // if q returns any then yes a package is installed
-        }
-
         // this function serves to prevent calling RebuildContent() more than necessary
         private ITerrainPaintToolWithOverlays lastPaintTool = null;
         private void RebuildAttributesOverlays()
@@ -79,7 +68,6 @@ private void RebuildAttributesOverlays()
 
             // set last == curr
             lastPaintTool = currTool;
-
         }
 
         // call this function for horizontal and vertical toolbar create
@@ -93,7 +81,6 @@ private OverlayToolbar CreateToolbarContent()
             root.Add(bs);
 
             var currTool = TerrainInspector.GetActiveTerrainTool() as ITerrainPaintToolWithOverlays;
-            if (currTool == null) Debug.LogWarning("current tool is null");
             if (currTool is PaintDetailsTool)
             {
                 var bts = new BrushTargetStrength();
@@ -116,7 +103,6 @@ private OverlayToolbar CreateToolbarContent()
         public override VisualElement CreatePanelContent()
         {
             var currTool = TerrainInspector.GetActiveTerrainTool() as ITerrainPaintToolWithOverlays;
-            if (currTool == null) Debug.LogWarning("current tool is null");
 
             string[] toolbarElementIds;
 
@@ -197,11 +183,14 @@ public BrushOpacity()
             };
             UpdateOverlayDirection(true);
 
-            ToolManager.activeToolChanged += UpdateValues;
-            ToolManager.activeContextChanged += UpdateValues;
-            TerrainInspector.BrushStrengthChanged += UpdateValues;
-            BrushAttributes.s_Instance.layoutChanged += UpdateOverlayDirection; // when the overlay is dragged, see if the direction needs to be updated
-            BrushAttributes.s_Instance.collapsedChanged += UpdateOverlayDirection;
+            RegisterCallback<AttachToPanelEvent>(e =>
+            {
+                ToolManager.activeToolChanged += UpdateValues;
+                ToolManager.activeContextChanged += UpdateValues;
+                TerrainInspector.BrushStrengthChanged += UpdateValues;
+                BrushAttributes.s_Instance.layoutChanged += UpdateOverlayDirection; // when the overlay is dragged, see if the direction needs to be updated
+                BrushAttributes.s_Instance.collapsedChanged += UpdateOverlayDirection;
+            });
 
             RegisterCallback<DetachFromPanelEvent>(e =>
             {
@@ -301,11 +290,14 @@ public BrushSize()
         {
             UpdateOverlayDirection(true);
 
-            ToolManager.activeToolChanged += UpdateValues;
-            ToolManager.activeContextChanged += UpdateValues;
-            TerrainInspector.BrushSizeChanged += UpdateValues;
-            BrushAttributes.s_Instance.layoutChanged += UpdateOverlayDirection; // when the overlay is dragged, see if the direction needs to be updated
-            BrushAttributes.s_Instance.collapsedChanged += UpdateOverlayDirection;
+            RegisterCallback<AttachToPanelEvent>(e =>
+            {
+                ToolManager.activeToolChanged += UpdateValues;
+                ToolManager.activeContextChanged += UpdateValues;
+                TerrainInspector.BrushSizeChanged += UpdateValues;
+                BrushAttributes.s_Instance.layoutChanged += UpdateOverlayDirection; // when the overlay is dragged, see if the direction needs to be updated
+                BrushAttributes.s_Instance.collapsedChanged += UpdateOverlayDirection;
+            });
 
             RegisterCallback<DetachFromPanelEvent>(e =>
             {
@@ -319,8 +311,7 @@ public BrushSize()
             this.RegisterValueChangedCallback(e =>
             {
                 var editor = TerrainInspector.s_activeTerrainInspectorInstance;
-                if (!editor) Debug.LogWarning("cannot display SIZE in BrushAttributesOverlay.CS");
-                editor.brushSize = e.newValue;
+                if (editor) editor.brushSize = e.newValue;
             });
 
             if (direction == SliderDirection.Horizontal)
@@ -392,11 +383,14 @@ public BrushTargetStrength()
             };
             UpdateOverlayDirection(true);
 
-            ToolManager.activeToolChanged += UpdateValues;
-            ToolManager.activeContextChanged += UpdateValues;
-            PaintDetailsTool.BrushTargetStrengthChanged += UpdateValues;
-            BrushAttributes.s_Instance.layoutChanged += UpdateOverlayDirection; // when the overlay is dragged, see if the direction needs to be updated
-            BrushAttributes.s_Instance.collapsedChanged += UpdateOverlayDirection;
+            RegisterCallback<AttachToPanelEvent>(e =>
+            {
+                ToolManager.activeToolChanged += UpdateValues;
+                ToolManager.activeContextChanged += UpdateValues;
+                PaintDetailsTool.BrushTargetStrengthChanged += UpdateValues;
+                BrushAttributes.s_Instance.layoutChanged += UpdateOverlayDirection; // when the overlay is dragged, see if the direction needs to be updated
+                BrushAttributes.s_Instance.collapsedChanged += UpdateOverlayDirection;
+            });
 
             RegisterCallback<DetachFromPanelEvent>(e =>
             {
@@ -410,7 +404,6 @@ public BrushTargetStrength()
             this.RegisterValueChangedCallback(e =>
             {
                 var currTool = TerrainInspector.GetActiveTerrainTool() as PaintDetailsTool;
-                if (currTool == null) Debug.LogWarning("current tool is null");
                 if (currTool != null)
                 {
                     currTool.detailStrength = e.newValue;
diff --git a/Modules/TerrainEditor/Overlays/BrushesOverlay.cs b/Modules/TerrainEditor/Overlays/BrushesOverlay.cs
index 3c0be48239..e7308b0603 100644
--- a/Modules/TerrainEditor/Overlays/BrushesOverlay.cs
+++ b/Modules/TerrainEditor/Overlays/BrushesOverlay.cs
@@ -75,7 +75,7 @@ internal static void OnGUI(BrushGUIEditFlags flags = BrushGUIEditFlags.All)
 
 
     // brush masks ----------------
-    [Overlay(typeof(SceneView), "Brush Masks")]
+    [Overlay(typeof(SceneView), "Brush Masks", defaultDockPosition = DockPosition.Top, defaultDockZone = DockZone.LeftToolbar, defaultDockIndex = 10)]
     [Icon("TerrainOverlays/BrushSettingIcons/BrushMask.png")]
     internal class BrushMaskOverlay : ToolbarOverlay, ITransientOverlay
     {
diff --git a/Modules/TerrainEditor/Overlays/CondensedSlider.cs b/Modules/TerrainEditor/Overlays/CondensedSlider.cs
index 8d6b3b4e18..04ae11ad95 100644
--- a/Modules/TerrainEditor/Overlays/CondensedSlider.cs
+++ b/Modules/TerrainEditor/Overlays/CondensedSlider.cs
@@ -136,21 +136,15 @@ private void CreateSlider(float min, float max, SliderDirection direction)
             var slider = m_Slider.Q("unity-tracker");
             slider.ClearClassList();
             slider.AddToClassList("condensed-slider__slider-tracker");
-            m_Slider.RegisterCallback<GeometryChangedEvent>(e =>
-            {
-                if (direction == SliderDirection.Horizontal)
-                    slider.style.height = e.newRect.height;
-                else
-                    slider.style.width = e.newRect.width;
-            });
+
             m_Slider.Q("unity-dragger").style.display = DisplayStyle.None;
             m_Slider.Q("unity-dragger-border").style.display = DisplayStyle.None;
 
             var content = new VisualElement();
+            content.name = "content";
             content.AddToClassList("condensed-slider__content--"+directionClassSuffix);
             content.pickingMode = PickingMode.Ignore;
             m_Slider.Add(content);
-            m_Slider.RegisterCallback<GeometryChangedEvent>(e => content.style.width = e.newRect.width);
             var imageField = new VisualElement();
             imageField.AddToClassList("condensed-slider__image");
             imageField.AddToClassList("condensed-slider__image--"+directionClassSuffix);
@@ -166,12 +160,13 @@ private void CreateSlider(float min, float max, SliderDirection direction)
             m_LabelField.pickingMode = PickingMode.Ignore;
             content.Add(m_LabelField);
 
-
             var contentTextField = new VisualElement();
+            contentTextField.name = "contentTextField";
             contentTextField.AddToClassList("condensed-slider__content-textfield--"+directionClassSuffix);
             contentTextField.pickingMode = PickingMode.Ignore;
             m_Slider.Add(contentTextField);
             var textField = new FloatField();
+            textField.name = "textField";
             textField.AddToClassList("condensed-slider__label");
             textField.AddToClassList("condensed-slider__textfield--"+directionClassSuffix);
             textField.style.display = DisplayStyle.None;
@@ -183,59 +178,130 @@ private void CreateSlider(float min, float max, SliderDirection direction)
                     textField.style.marginTop = 34;
             }
 
-            textField.RegisterValueChangedCallback(e => UpdateValue(e.newValue, false));
             contentTextField.Add(textField);
 
-            m_Slider.RegisterValueChangedCallback(e =>
-            {
-                SetValueWithoutNotify(e.newValue);
-            });
-            // open the textfield when right clicking on the slider
-            m_Slider.RegisterCallback<MouseDownEvent>(e =>
+            RegisterCallback<AttachToPanelEvent>(RegisterCallbacks);
+            RegisterCallback<DetachFromPanelEvent>(UnregisterCallbacks);
+        }
+
+        private void RegisterCallbacks(AttachToPanelEvent e)
+        {
+            var textField = m_Slider.Q("textField") as FloatField;
+            var contentTextField = m_Slider.Q("contentTextField"); ;
+            m_Slider.RegisterCallback<GeometryChangedEvent>(OnSliderRectChange);
+            m_Slider.RegisterCallback<GeometryChangedEvent>(OnSliderWidthChange);
+            textField.RegisterValueChangedCallback(TextFieldValueChange);
+            m_Slider.RegisterValueChangedCallback(SliderSetValue);
+            m_Slider.RegisterCallback<MouseDownEvent>(SliderMouseDownEvent);
+            m_Slider.RegisterCallback<MouseUpEvent>(SliderMouseUpEvent);
+            contentTextField.RegisterCallback<MouseDownEvent>(TextFieldMouseDownEvent);
+            textField.RegisterCallback<KeyDownEvent>(TextFieldKeyDownEvent);
+        }
+
+        private void UnregisterCallbacks(DetachFromPanelEvent e)
+        {
+            var textField = m_Slider.Q("textField") as FloatField;
+            var contentTextField = m_Slider.Q("contentTextField");
+            m_Slider.UnregisterCallback<GeometryChangedEvent>(OnSliderRectChange);
+            m_Slider.UnregisterCallback<GeometryChangedEvent>(OnSliderWidthChange);
+            textField.UnregisterValueChangedCallback(TextFieldValueChange);
+            m_Slider.UnregisterValueChangedCallback(SliderSetValue);
+            m_Slider.UnregisterCallback<MouseDownEvent>(SliderMouseDownEvent);
+            m_Slider.UnregisterCallback<MouseUpEvent>(SliderMouseUpEvent);
+            contentTextField.UnregisterCallback<MouseDownEvent>(TextFieldMouseDownEvent);
+            textField.UnregisterCallback<KeyDownEvent>(TextFieldKeyDownEvent);
+        }
+
+        private void OnSliderRectChange(GeometryChangedEvent e)
+        {
+            var slider = m_Slider.Q("unity-tracker");
+            if (direction == SliderDirection.Horizontal)
+                slider.style.height = e.newRect.height;
+            else
+                slider.style.width = e.newRect.width;
+        }
+
+        private void OnSliderWidthChange(GeometryChangedEvent e)
+        {
+            var content = m_Slider.Q("content");
+            content.style.width = e.newRect.width;
+        }
+
+        private void TextFieldValueChange(ChangeEvent<float> e)
+        {
+            UpdateValue(e.newValue, false);
+        }
+
+        private void SliderSetValue(ChangeEvent<float> e)
+        {
+            SetValueWithoutNotify(e.newValue);
+        }
+
+        private void SliderMouseDownEvent(MouseDownEvent e)
+        {
+            if (e.button == (int)MouseButton.RightMouse)
             {
-                if (e.button == (int)MouseButton.RightMouse)
-                {
-                    e.StopPropagation();
-                    e.PreventDefault();
+                e.StopPropagation();
+                e.PreventDefault();
+
+                var textField = m_Slider.Q("textField") as FloatField;
+                var contentTextField = m_Slider.Q("contentTextField");
 
+                if (textField != null)
+                {
                     textField.value = m_Slider.value;
                     textField.style.display = DisplayStyle.Flex;
-                    m_LabelField.style.display = DisplayStyle.None;
-                    contentTextField.pickingMode = PickingMode.Position;
                 }
-            });
-            // Stop propagating the mouse up to avoid context menus
-            m_Slider.RegisterCallback<MouseUpEvent>(e =>
+
+                m_LabelField.style.display = DisplayStyle.None;
+                contentTextField.pickingMode = PickingMode.Position;
+            }
+        }
+
+        private void SliderMouseUpEvent(MouseUpEvent e)
+        {
+            if (e.button == (int)MouseButton.RightMouse)
             {
-                if (e.button == (int)MouseButton.RightMouse)
-                {
-                    e.StopPropagation();
-                    e.PreventDefault();
-                }
-            });
-            // Any click inside the hidden element closes the textfield
-            contentTextField.RegisterCallback<MouseDownEvent>(e =>
+                e.StopPropagation();
+                e.PreventDefault();
+            }
+        }
+
+        private void TextFieldMouseDownEvent(MouseDownEvent e)
+        {
+            var textField = m_Slider.Q("textField") as FloatField;
+            var contentTextField = m_Slider.Q("contentTextField");
+
+            contentTextField.pickingMode = PickingMode.Ignore;
+            if (textField != null)
             {
-                contentTextField.pickingMode = PickingMode.Ignore;
                 if (textField.style.display == DisplayStyle.Flex)
                 {
                     textField.style.display = DisplayStyle.None;
                     m_LabelField.style.display = DisplayStyle.Flex;
                 }
-            });
-            // closes the textfield on escape or return
-            textField.RegisterCallback<KeyDownEvent>(e =>
+            }
+
+        }
+
+        private void TextFieldKeyDownEvent(KeyDownEvent e)
+        {
+            var textField = m_Slider.Q("textField") as FloatField;
+            var contentTextField = m_Slider.Q("contentTextField");
+
+            if (e.keyCode == KeyCode.Escape || e.keyCode == KeyCode.Return)
             {
-                if (e.keyCode == KeyCode.Escape || e.keyCode == KeyCode.Return)
+                contentTextField.pickingMode = PickingMode.Ignore;
+
+                if (textField != null)
                 {
-                    contentTextField.pickingMode = PickingMode.Ignore;
                     if (textField.style.display == DisplayStyle.Flex)
                     {
                         textField.style.display = DisplayStyle.None;
                         m_LabelField.style.display = DisplayStyle.Flex;
                     }
                 }
-            });
+            }
         }
 
         public void UpdateDirection(SliderDirection newDirection, float min, float max)
@@ -244,9 +310,7 @@ public void UpdateDirection(SliderDirection newDirection, float min, float max)
             direction = newDirection;
             Clear();
             ClearClassList();
-
             CreateSlider(min, max, newDirection);
-
         }
 
     }
diff --git a/Modules/TerrainEditor/Overlays/TerrainTransientToolbarOverlay.cs b/Modules/TerrainEditor/Overlays/TerrainTransientToolbarOverlay.cs
index 7cd98fe436..9505c0f3b7 100644
--- a/Modules/TerrainEditor/Overlays/TerrainTransientToolbarOverlay.cs
+++ b/Modules/TerrainEditor/Overlays/TerrainTransientToolbarOverlay.cs
@@ -36,9 +36,11 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
         }
     }
 
-    [Overlay(typeof(SceneView), "Terrain Tools")]
+    [Overlay(typeof(SceneView), "Terrain Tools", defaultDockPosition = DockPosition.Top, defaultDockZone = DockZone.LeftToolbar, defaultDockIndex = -1)]
     internal class TerrainTransientToolbarOverlay : ToolbarOverlay, ITransientOverlay, ICreateHorizontalToolbar, ICreateVerticalToolbar
     {
+        bool m_OverlaysPackageInstalled;
+        
         // See also
         // - SceneViewToolbars
         public TerrainTransientToolbarOverlay() : base("TerrainTransientToolbar")
@@ -47,6 +49,7 @@ public TerrainTransientToolbarOverlay() : base("TerrainTransientToolbar")
             collapsedIcon = EditorGUIUtility.LoadIcon("TerrainOverlays/ToolModeIcons/SculptMode_On.png");
             CreateToolbarIfNull();
             s_TerrainTransientToolbarOverlay = this;
+            m_OverlaysPackageInstalled = IsOverlaysPackageVersionInstalled();
         }
 
         private void CreateToolbarIfNull()
@@ -58,10 +61,10 @@ private void CreateToolbarIfNull()
             }
         }
 
-         internal static TerrainTransientToolbarOverlay s_TerrainTransientToolbarOverlay;
+        internal static TerrainTransientToolbarOverlay s_TerrainTransientToolbarOverlay;
 
         // determines whether the toolbar should be visible or not
-        public bool visible => IsOverlaysPackageVersionInstalled() && TerrainInspector.s_activeTerrainInspectorInstance != null && BrushesOverlay.IsSelectedObjectTerrain();
+        public bool visible => m_OverlaysPackageInstalled && TerrainInspector.s_activeTerrainInspectorInstance != null && BrushesOverlay.IsSelectedObjectTerrain();
 
         internal static TerrainTransientToolbar s_TerrainToolbarOverlay;
         private string m_PackageVersion = string.Empty;
@@ -102,14 +105,14 @@ bool ParseTerrainToolsVersion(string versionString, int d0, int d1, int d2)
                 // scheme is prefix-major.minor.patch-postfix.version
                 // where prefix is letters, major, minor, patch are numbers,
                 // postfix is letters, and postfix.version is a number
-                
+
                 // use regex to get the major, minor, patch components of the string
                 var versionDigits = Regex.Match(versionString, @"\d+\.\d+\.\d+");
-                
+
                 if (!versionDigits.Success) return false;
                 var parts = versionDigits.Value.Split(".");
                 if (parts.Length != 3) return false;
-                
+
                 if (!Int32.TryParse(parts[0], out var major)) return false;
                 if (!Int32.TryParse(parts[1], out var minor)) return false;
                 if (!Int32.TryParse(parts[2], out var patch)) return false;
@@ -129,7 +132,7 @@ bool ParseTerrainToolsVersion(string versionString, int d0, int d1, int d2)
             // only parse if version is different than what we have cached -- otherwise
             // just return the result from the last parse
             if (version.Equals(m_PackageVersion)) return m_PackageInstalled;
-            
+
             m_PackageInstalled = ParseTerrainToolsVersion(version, 5, 1, 0);
             m_PackageVersion = version;
 
@@ -415,6 +418,12 @@ void CreateMainMenu()
             // going through all the icons in the menu
             for (int i = 0; i < s_ModeMenu.Length; i++)
             {
+                // check if the menu mode tools are empty or not
+                if (m_CategoryToTools[(TerrainCategory)i].Count == 0)
+                {
+                    continue;
+                }
+
                 EditorToolbarToggle button = new EditorToolbarToggle
                 {
                     tooltip = s_ModeMenu[i].ToolTip,
@@ -429,7 +438,7 @@ void CreateMainMenu()
                     if (evt.newValue)
                     {
                         m_DefaultToolsVE.Clear();
-                        ToolManager.SetActiveTool<NoneTool>(); // the tool deselects
+                        ToolManager.RestorePreviousPersistentTool();
                         LoadTool((TerrainCategory) indexCopy);
                     }
 
diff --git a/Modules/TerrainEditor/Overlays/ToolEditors.cs b/Modules/TerrainEditor/Overlays/ToolEditors.cs
index 2c2ba5b8f9..671b1bc324 100644
--- a/Modules/TerrainEditor/Overlays/ToolEditors.cs
+++ b/Modules/TerrainEditor/Overlays/ToolEditors.cs
@@ -18,17 +18,136 @@
 namespace UnityEditor.TerrainTools
 {
     [CustomEditor(typeof(TerrainPaintToolWithOverlaysBase), editorForChildClasses: true)]
-    internal class TerrainToolEditor : Editor
+    internal class TerrainToolEditor : Editor, ICreateHorizontalToolbar
     {
         private Vector2 m_ScrollPos;
         private IMGUIContainer m_ImgContainer;
+        static Dictionary<Type, (MethodInfo, bool)> m_ToolTypeToGUIFunc = new (); // true for non-obsolete, false for obsolete
+        private static bool? m_IsTerrainToolsInstalled; // this value gets cleared on domain reload
 
-        public override VisualElement CreateInspectorGUI()
+        private static bool IsTerrainToolsPackageInstalled()
+        {
+            if (m_IsTerrainToolsInstalled.HasValue)
+            {
+                return m_IsTerrainToolsInstalled.Value;
+            }
+
+            var upm = UnityEditor.PackageManager.PackageInfo.GetAllRegisteredPackages();
+            var terrainPackageInfo = upm.Where(pi => pi.name == "com.unity.terrain-tools").ToArray();
+
+            Debug.Assert(terrainPackageInfo.Length <= 1, "Only one version of terrain-tools package allowed to be installed");
+
+            m_IsTerrainToolsInstalled = terrainPackageInfo.Length != 0; // equals 0 means no package installed, equals 1 means package is installed
+            return m_IsTerrainToolsInstalled.Value;
+        }
+
+        public OverlayToolbar CreateHorizontalToolbarContent()
+        {
+
+            var toolbar = new OverlayToolbar();
+            var editor = TerrainInspector.s_activeTerrainInspectorInstance;
+            var tool = target as TerrainPaintToolWithOverlaysBase;
+            if (!editor || !tool) return toolbar;
+
+            toolbar.Add(new EditorToolbarDropdown($"{tool.GetName()} Settings", () =>
+            {
+                var m = Event.current.mousePosition;
+                PopupWindow.Show(new Rect(m.x, m.y, 10, 20), new TerrainSettingsPopup());
+            }));
+            return toolbar;
+        }
+
+        class TerrainSettingsPopup : PopupWindowContent
+        {
+
+            private Vector2 m_ScrollPos;
+
+            public override Vector2 GetWindowSize()
+            {
+                var editor = TerrainInspector.s_activeTerrainInspectorInstance;
+                var tool = EditorToolManager.GetActiveTool() as TerrainPaintToolWithOverlaysBase;
+                if (editor && tool)
+                {
+                    if (!tool.HasToolSettings)
+                    {
+                        // appropriate size for no tool settings message
+                        return new Vector2(230, 30);
+                    }
+
+                    // else tool settings
+                    // different sizes based on tooltype / package installed perhaps
+                    if (tool.Category == TerrainCategory.NeighborTerrains)
+                    {
+                        return new Vector2(400, 60);
+                    }
+
+                    if (tool.Category == TerrainCategory.Materials || tool.Category == TerrainCategory.Foliage || tool.Category == TerrainCategory.CustomBrushes)
+                    {
+                        return new Vector2(400, 250);
+                    }
+
+                    // if package installed
+                    if (IsTerrainToolsPackageInstalled())
+                    {
+                        // stamp and noise foliage and materials should be longer
+                        if (tool.GetName() == "Stamp Terrain" || tool.GetName() == "Sculpt/Noise")
+                        {
+                            return new Vector2(400, 250);
+                        }
+
+                        if (tool.GetName() == "Transform/Smudge" || tool.GetName() == "Effects/Sharpen Peaks" || tool.GetName() == "Effects/Contrast")
+                        {
+                            return new Vector2(400, 80);
+                        }
+
+                        if (tool.GetName() == "Transform/Twist" || tool.GetName() == "Transform/Pinch" || tool.GetName() == "Smooth Height")
+                        {
+                            return new Vector2(400, 100);
+                        }
+
+                        // need to do something about erosion too (same size, but a little longer maybe)
+                        if (tool.GetName() == "Erosion/Wind" || tool.GetName() == "Erosion/Hydraulic" || tool.GetName() == "Erosion/Thermal")
+                        {
+                            return new Vector2(400, 160);
+                        }
+
+                        // else everything else should be smaller
+                        return new Vector2(400, 120);
+                    }
+
+                    // else package is NOT installed
+                    if (tool.GetName() == "Smooth Height")
+                    {
+                        return new Vector2(400, 35);
+                    }
+
+                    return new Vector2(400, 75); // every other tool without package
+
+                }
+
+                // if code reaches here, tool is null
+                return new Vector2(400, 250); // return some default
+            }
+
+            public override void OnGUI(Rect rect)
+            {
+                var editor = TerrainInspector.s_activeTerrainInspectorInstance;
+                var tool = EditorToolManager.GetActiveTool() as TerrainPaintToolWithOverlaysBase;
+                if (editor && tool)
+                {
+                    m_ScrollPos = EditorGUILayout.BeginScrollView(m_ScrollPos);
+                    TerrainToolEditor.OnGUI(tool);
+                    EditorGUILayout.EndScrollView();
+                }
+            }
+        }
+
+        public void CreateIMGContainer()
         {
             m_ImgContainer = new IMGUIContainer();
             m_ImgContainer.style.minWidth = 300;
             m_ImgContainer.style.maxWidth = 400;
-            m_ImgContainer.style.maxHeight =600;
+            m_ImgContainer.style.maxHeight = 600;
 
             m_ImgContainer.onGUIHandler = () =>
             {
@@ -37,20 +156,19 @@ public override VisualElement CreateInspectorGUI()
                 OnGUI();
                 EditorGUILayout.Space(); // spacer for bottom offset
             };
-            return m_ImgContainer;
         }
 
-        public void OnGUI()
-        {
-            var editor = TerrainInspector.s_activeTerrainInspectorInstance;
-            if (!editor) return;
 
-            var tool = target as TerrainPaintToolWithOverlaysBase;
-            m_ScrollPos = EditorGUILayout.BeginScrollView(m_ScrollPos);
+        public override VisualElement CreateInspectorGUI()
+        {
+            CreateIMGContainer();
+            return m_ImgContainer;
+        }
 
+        public static void OnGUI(TerrainPaintToolWithOverlaysBase tool)
+        {
             if (!tool)
             {
-                Debug.LogError("Tool is NULL");
                 return;
             }
 
@@ -61,18 +179,55 @@ public void OnGUI()
 
             if (!tool.Terrain)
             {
-                Debug.LogError("Tool does NOT have associated terrain");
                 return;
             }
 
             if (tool.HasToolSettings)
             {
-                tool.OnToolSettingsGUI(tool.Terrain, new OnInspectorGUIContext(), true);
+                Type type = tool.GetType();
+
+                if (!m_ToolTypeToGUIFunc.ContainsKey(type))
+                {
+                    // store the tool type to function ONCE
+                    MethodInfo funcWithoutBoolean = type.GetMethod("OnToolSettingsGUI", new [] {typeof(Terrain), typeof(IOnInspectorGUI)}); // not obsolete
+                    MethodInfo funcWithBoolean = type.GetMethod("OnToolSettingsGUI", new [] {typeof(Terrain), typeof(IOnInspectorGUI), typeof(bool)}); // obsolete
+                    if (funcWithoutBoolean == null || funcWithBoolean == null) return;
+
+                    if (funcWithoutBoolean.DeclaringType != funcWithoutBoolean.GetBaseDefinition().DeclaringType)
+                    {
+                        // non obsolete method is overriden
+                        m_ToolTypeToGUIFunc[type] = (funcWithoutBoolean, true);
+                    } else if (funcWithBoolean.DeclaringType != funcWithBoolean.GetBaseDefinition().DeclaringType)
+                    {
+                        // obsolete method is overriden
+                        m_ToolTypeToGUIFunc[type] = (funcWithBoolean, false);
+                    }
+                    else
+                    {
+                        return; // shouldnt get here
+                    }
+                }
+
+                // invoke obsolete or non obsolete method depending on value of Item2 (bool)
+                m_ToolTypeToGUIFunc[type].Item1
+                    .Invoke(tool,
+                        m_ToolTypeToGUIFunc[type].Item2
+                            ? new object[] {tool.Terrain, new OnInspectorGUIContext()}
+                            : new object[] {tool.Terrain, new OnInspectorGUIContext(), false});
             }
             else
             {
                 GUILayout.Label("This tool has no extra tool settings!");
             }
+        }
+
+        public void OnGUI()
+        {
+            var editor = TerrainInspector.s_activeTerrainInspectorInstance;
+            var tool = target as TerrainPaintToolWithOverlaysBase;
+            if (!editor || !tool) return;
+            m_ScrollPos = EditorGUILayout.BeginScrollView(m_ScrollPos);
+            OnGUI(tool); // helper function for GUI
             EditorGUILayout.EndScrollView();
         }
     }
diff --git a/Modules/TerrainEditor/PaintTools/CreateTerrainTool.cs b/Modules/TerrainEditor/PaintTools/CreateTerrainTool.cs
index ec337b7028..f505d87ff2 100644
--- a/Modules/TerrainEditor/PaintTools/CreateTerrainTool.cs
+++ b/Modules/TerrainEditor/PaintTools/CreateTerrainTool.cs
@@ -94,7 +94,7 @@ private void SaveInspectorSettings()
             EditorPrefs.SetInt("TerrainFillAddressMode", (int)m_FillAddressMode);
         }
 
-        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
             if (s_Styles == null)
                 s_Styles = new Styles();
@@ -113,15 +113,9 @@ public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editCont
             }
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
-        {
-            base.OnInspectorGUI(terrain, editContext);
-            OnToolSettingsGUI(terrain, editContext, overlays);
-        }
-
         public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
-            OnInspectorGUI(terrain, editContext, false);
+            OnToolSettingsGUI(terrain, editContext);
         }
 
         Terrain CreateNeighbor(Terrain parent, Vector3 position)
diff --git a/Modules/TerrainEditor/PaintTools/PaintDetailsTool.cs b/Modules/TerrainEditor/PaintTools/PaintDetailsTool.cs
index e53085bfe7..ab59b0d44f 100644
--- a/Modules/TerrainEditor/PaintTools/PaintDetailsTool.cs
+++ b/Modules/TerrainEditor/PaintTools/PaintDetailsTool.cs
@@ -111,6 +111,11 @@ public override bool OnPaint(Terrain terrain, IOnPaint editContext)
 
                     DetailBrushBounds brushBounds = new DetailBrushBounds(terrainData, ctx, size, t);
 
+                    if (brushBounds.bounds.size == Vector2.zero)
+                    {
+                        continue;
+                    }
+
                     int[] layers = { detailPrototype };
                     if (targetStrength < 0.0F && !Event.current.control)
                         layers = terrainData.GetSupportedLayers(brushBounds.min, brushBounds.bounds.size);
@@ -229,7 +234,7 @@ private void ShowDetailPrototypeMessages(DetailPrototype detailPrototype, Terrai
             }
         }
 
-        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
             if (s_Styles == null)
                 s_Styles = new Styles();
@@ -295,7 +300,7 @@ public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editCont
         }
 
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
             if (s_Styles == null)
                 s_Styles = new Styles();
@@ -318,15 +323,10 @@ public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext
             // Brush editor
             editContext.ShowBrushesGUI((int)EditorGUIUtility.singleLineHeight, BrushGUIEditFlags.Inspect);
 
-            OnToolSettingsGUI(terrain, editContext, overlays);
+            OnToolSettingsGUI(terrain, editContext);
 
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
-        {
-            OnInspectorGUI(terrain, editContext, false);
-        }
-
         private void ShowTextureFallbackWarning(ref Terrain terrain)
         {
             if (!UnityEngine.Experimental.Rendering.GraphicsFormatUtility.IsCompressedFormat(terrain.terrainData.atlasFormat))
diff --git a/Modules/TerrainEditor/PaintTools/PaintHeightTool.cs b/Modules/TerrainEditor/PaintTools/PaintHeightTool.cs
index 71fd6aa81b..f142135d07 100644
--- a/Modules/TerrainEditor/PaintTools/PaintHeightTool.cs
+++ b/Modules/TerrainEditor/PaintTools/PaintHeightTool.cs
@@ -59,16 +59,12 @@ public override string GetDescription()
             return GetStyles().description.text;
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
             int textureRez = terrain.terrainData.heightmapResolution;
             editContext.ShowBrushesGUI(5, BrushGUIEditFlags.All, textureRez);
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
-        {
-            OnInspectorGUI(terrain, editContext, false);
-        }
 
         private void ApplyBrushInternal(PaintContext paintContext, float brushStrength, Texture brushTexture, BrushTransform brushXform)
         {
diff --git a/Modules/TerrainEditor/PaintTools/PaintHolesTool.cs b/Modules/TerrainEditor/PaintTools/PaintHolesTool.cs
index 5ba0481392..cc6224cbb4 100644
--- a/Modules/TerrainEditor/PaintTools/PaintHolesTool.cs
+++ b/Modules/TerrainEditor/PaintTools/PaintHolesTool.cs
@@ -44,16 +44,12 @@ public override string GetDescription()
             return "Left click to paint a hole.\n\nHold shift and left click to erase it.";
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
             int textureRez = terrain.terrainData.holesResolution;
             editContext.ShowBrushesGUI(5, BrushGUIEditFlags.All, textureRez);
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
-        {
-            OnInspectorGUI(terrain, editContext, false);
-        }
 
         public override void OnRenderBrushPreview(Terrain terrain, IOnSceneGUI editContext)
         {
diff --git a/Modules/TerrainEditor/PaintTools/PaintTextureTool.cs b/Modules/TerrainEditor/PaintTools/PaintTextureTool.cs
index 1fef32ae74..acc03cf16c 100644
--- a/Modules/TerrainEditor/PaintTools/PaintTextureTool.cs
+++ b/Modules/TerrainEditor/PaintTools/PaintTextureTool.cs
@@ -99,7 +99,7 @@ public override void OnRenderBrushPreview(Terrain terrain, IOnSceneGUI editConte
             }
         }
 
-        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        private void TextureToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
         {
             GUILayout.Label("Settings", EditorStyles.boldLabel);
             EditorGUI.BeginChangeCheck();
@@ -131,18 +131,18 @@ public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editCont
 
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
-            OnToolSettingsGUI(terrain, editContext, overlays);
+            TextureToolSettingsGUI(terrain, editContext, false);
             // Texture painting needs to know the largest of the splat map and the height map, as the result goes to
             // the splat map, but the height map is used for previewing.
             int resolution = Mathf.Max(terrain.terrainData.heightmapResolution, terrain.terrainData.alphamapResolution);
             editContext.ShowBrushesGUI(5, BrushGUIEditFlags.All, resolution);
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
+        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
-            OnInspectorGUI(terrain, editContext, false);
+            TextureToolSettingsGUI(terrain, editContext, true);
         }
     }
 }
diff --git a/Modules/TerrainEditor/PaintTools/PaintTreesTool.cs b/Modules/TerrainEditor/PaintTools/PaintTreesTool.cs
index 2cb557616e..6df269cc27 100644
--- a/Modules/TerrainEditor/PaintTools/PaintTreesTool.cs
+++ b/Modules/TerrainEditor/PaintTools/PaintTreesTool.cs
@@ -440,7 +440,7 @@ void ShowUpgradeTreePrototypeScaleUI(Terrain terrain)
             }
         }
 
-        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
             LoadTreeIcons(terrain);
 
@@ -578,14 +578,10 @@ public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editCont
             }
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
-        {
-            OnToolSettingsGUI(terrain, editContext, overlays);
-        }
-
         public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
-            OnInspectorGUI(terrain, editContext, false);
+            OnToolSettingsGUI(terrain, editContext);
         }
+
     }
 }
diff --git a/Modules/TerrainEditor/PaintTools/SetHeightTool.cs b/Modules/TerrainEditor/PaintTools/SetHeightTool.cs
index d78ccd1aa0..f32f156c86 100644
--- a/Modules/TerrainEditor/PaintTools/SetHeightTool.cs
+++ b/Modules/TerrainEditor/PaintTools/SetHeightTool.cs
@@ -164,7 +164,7 @@ void FlattenAll()
             }
         }
 
-        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
             Styles styles = GetStyles();
 
@@ -193,18 +193,13 @@ public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editCont
 
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
+            OnToolSettingsGUI(terrain, editContext);
+
             // show built-in brushes
             int textureRez = terrain.terrainData.heightmapResolution;
             editContext.ShowBrushesGUI(5, BrushGUIEditFlags.All, textureRez);
-
-            OnToolSettingsGUI(terrain, editContext, overlays);
-        }
-
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
-        {
-            OnInspectorGUI(terrain, editContext, false);
         }
     }
 }
diff --git a/Modules/TerrainEditor/PaintTools/SmoothHeightTool.cs b/Modules/TerrainEditor/PaintTools/SmoothHeightTool.cs
index fa81315080..6b8acab8eb 100644
--- a/Modules/TerrainEditor/PaintTools/SmoothHeightTool.cs
+++ b/Modules/TerrainEditor/PaintTools/SmoothHeightTool.cs
@@ -66,26 +66,20 @@ public override string GetDescription()
         public override bool HasBrushMask => true;
         public override bool HasBrushAttributes => true;
 
-        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
             Styles styles = GetStyles();
             m_direction = EditorGUILayout.Slider(styles.direction, m_direction, -1.0f, 1.0f);
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
+            OnToolSettingsGUI(terrain, editContext);
+
             int textureRez = terrain.terrainData.heightmapResolution;
             editContext.ShowBrushesGUI(5, BrushGUIEditFlags.All, textureRez);
-
-            OnToolSettingsGUI(terrain, editContext, overlays);
-        }
-
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
-        {
-            OnInspectorGUI(terrain, editContext, false);
         }
 
-
         private void ApplyBrushInternal(PaintContext paintContext, float brushStrength, Texture brushTexture, BrushTransform brushXform)
         {
             Material mat = TerrainPaintUtility.GetBuiltinPaintMaterial();
diff --git a/Modules/TerrainEditor/PaintTools/StampTool.cs b/Modules/TerrainEditor/PaintTools/StampTool.cs
index 93686c22a3..7c19b8c959 100644
--- a/Modules/TerrainEditor/PaintTools/StampTool.cs
+++ b/Modules/TerrainEditor/PaintTools/StampTool.cs
@@ -147,7 +147,7 @@ public override void OnRenderBrushPreview(Terrain terrain, IOnSceneGUI editConte
             }
         }
 
-        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
             Styles styles = GetStyles();
             EditorGUI.BeginChangeCheck();
@@ -164,17 +164,13 @@ public override void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editCont
             m_MaxBlendAdd = EditorGUILayout.Slider(styles.maxadd, m_MaxBlendAdd, 0.0f, 1.0f);
         }
 
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
         {
+            OnToolSettingsGUI(terrain, editContext);
+
             // show built-in brushes
             int textureRez = terrain.terrainData.heightmapResolution;
             editContext.ShowBrushesGUI(5, BrushGUIEditFlags.All, textureRez);
-            OnToolSettingsGUI(terrain, editContext, overlays);
-        }
-
-        public override void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext)
-        {
-            OnInspectorGUI(terrain, editContext, false);
         }
     }
 }
diff --git a/Modules/TerrainEditor/PaintTools/TerrainPaintTool.cs b/Modules/TerrainEditor/PaintTools/TerrainPaintTool.cs
index c2005b2a35..d3b1dcb259 100644
--- a/Modules/TerrainEditor/PaintTools/TerrainPaintTool.cs
+++ b/Modules/TerrainEditor/PaintTools/TerrainPaintTool.cs
@@ -114,9 +114,12 @@ internal interface ITerrainPaintToolWithOverlays : ITerrainPaintTool
 
         bool HasToolSettings => false;
 
-        // function for drawing GUI for specific tool
+        [Obsolete("Use OnToolSettingsGUI without the overlays boolean")]
         void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays);
 
+        void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editorContext);
+
+        [Obsolete("Use OnInspectorGUI without the overlays boolean")]
         void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays);
     }
 
@@ -192,8 +195,12 @@ public virtual TerrainCategory Category
         public virtual bool HasBrushMask => false;
         public virtual bool HasBrushAttributes => false;
 
-        // function for drawing GUI for specific tool
-        public virtual void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays) { }
+        [Obsolete("Use OnToolSettingsGUI without the overlays boolean")]
+        public virtual void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays)
+        { }
+
+        public virtual void OnToolSettingsGUI(Terrain terrain, IOnInspectorGUI editContext) { }
+
         public Terrain Terrain { get; set; }
         public abstract string GetName();
         public abstract string GetDescription();
@@ -201,7 +208,10 @@ public virtual void OnEnable() {}
         public virtual void OnDisable() {}
         public virtual void OnEnterToolMode() { }
         public virtual void OnExitToolMode() { }
+
         public virtual void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext) { }
+
+        [Obsolete("Use OnInspectorGUI without the overlays boolean")]
         public virtual void OnInspectorGUI(Terrain terrain, IOnInspectorGUI editContext, bool overlays) { }
         public virtual void OnSceneGUI(Terrain terrain, IOnSceneGUI editContext) { }
         public virtual void OnRenderBrushPreview(Terrain terrain, IOnSceneGUI editContext) { }
diff --git a/Modules/TerrainEditor/TerrainInspector.cs b/Modules/TerrainEditor/TerrainInspector.cs
index 3e2aa1eaea..078a3e52d5 100644
--- a/Modules/TerrainEditor/TerrainInspector.cs
+++ b/Modules/TerrainEditor/TerrainInspector.cs
@@ -168,8 +168,7 @@ internal class Styles
             public readonly GUIContent assign = EditorGUIUtility.TrTextContent("Assign");
             public readonly GUIContent duplicateTab = EditorGUIUtility.TrTextContent("This inspector tab is not the active Terrain inspector, paint functionality disabled.");
             public readonly GUIContent makeMeActive = EditorGUIUtility.TrTextContent("Activate this inspector");
-            public readonly GUIContent gles2NotSupported = EditorGUIUtility.TrTextContentWithIcon("Terrain editting is not supported in GLES2.", MessageType.Info);
-
+ 
             // Heightmaps
             public readonly GUIContent textures = EditorGUIUtility.TrTextContent("Texture Resolutions (On Terrain Data)");
             public readonly GUIContent requireResampling = EditorGUIUtility.TrTextContent("Require resampling on change");
@@ -191,6 +190,8 @@ internal class Styles
             public readonly GUIContent qualitySettings = EditorGUIUtility.TrTextContent("Quality Settings");
             public readonly GUIContent ignoreQualitySettings = EditorGUIUtility.TrTextContent("Ignore Quality Settings", "Toggle whether this terrain should ignore the current active quality settings' terrain overrides.");
             public readonly GUIContent pixelError = EditorGUIUtility.TrTextContent("Pixel Error", "The accuracy of the mapping between the terrain maps (heightmap, textures, etc.) and the generated terrain; higher values indicate lower accuracy but lower rendering overhead.");
+            public readonly GUIContent heightmapMinLODLimit = EditorGUIUtility.TrTextContent("Minimum Detail Limit", "Enforces a minimum level of detail on the Heightmap.\n0 enforces no limit - higher values enforce progressively more detail.\nMost users will not need this setting - see documentation.");
+            public readonly GUIContent heightmapMaxLODLimit = EditorGUIUtility.TrTextContent("Maximum Complexity Limit", "Enforces a maximum level of detail on the Heightmap.\n0 enforces no limit - higher values enforce progressively more detail.\nThis can be useful to limit detail on low-end devices.");
             public readonly GUIContent baseMapDist = EditorGUIUtility.TrTextContent("Base Map Dist.", "The maximum distance at which terrain textures will be displayed at full resolution. Beyond this distance, a lower resolution composite image will be used for efficiency.");
             public readonly GUIContent castShadows = EditorGUIUtility.TrTextContent("Cast Shadows", "Does the terrain cast shadows?");
             public readonly GUIContent createMaterial = EditorGUIUtility.TrTextContent("Create...", "Create a new Material asset to be used by the terrain by duplicating the current default Terrain material.");
@@ -198,6 +199,7 @@ internal class Styles
             public readonly GUIContent preserveTreePrototypeLayers = EditorGUIUtility.TextContent("Preserve Tree Prototype Layers|Enable this option if you want your tree instances to take on the layer values of their prototype prefabs, rather than the terrain GameObject's layer.");
             public readonly GUIContent treeAndDetails = EditorGUIUtility.TrTextContent("Tree & Detail Objects");
             public readonly GUIContent drawTrees = EditorGUIUtility.TrTextContent("Draw", "Should trees, grass and details be drawn?");
+            public readonly GUIContent treeMotionVectorOverrideMode = EditorGUIUtility.TrTextContent("Tree Motion Vectors", "Select the motion vector mode to be used for all of the trees painted on the terrain. 'Inherit From Prototype' will use the value from the tree prototype's mesh renderer.");
             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 Scale", "Scaling factor applied to the density of all details. Only affects details with the \"Affected by Density Scale\" option enabled.");
             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.");
@@ -778,7 +780,7 @@ static bool IsTerrainPartOfPrefabOrAsset(Terrain terrain)
 
         public void LoadTools()
         {
-            if ((m_ToolNameToType != null && m_TypeToToolName != null && m_ToolsMap != null) || IsTerrainPartOfPrefabOrAsset(target as Terrain)) return;
+            if ((m_ToolNameToType != null && m_TypeToToolName != null && m_ToolsMap != null)) return;
 
             m_ToolsMap = new Dictionary<string, ITerrainPaintTool>();
             m_ToolNameToType = new Dictionary<string, Type>();
@@ -945,7 +947,7 @@ void SelectCategory(TerrainTool category, bool selectTool = true)
                     case TerrainTool.TerrainSettings:
                         if (GetActiveTerrainTool() != null)
                         {
-                            EditorTools.ToolManager.SetActiveTool<NoneTool>();
+                            ToolManager.RestorePreviousPersistentTool();
                         }
                         break;
                     case TerrainTool.None:
@@ -1214,8 +1216,7 @@ private void SetCurrentPaintToolInactive()
                     // is editor tool?
                     if (paintTool is ITerrainPaintToolWithOverlays)
                     {
-                        // deactivate the editor tool
-                        ToolManager.SetActiveTool<NoneTool>();
+                        ToolManager.RestorePreviousPersistentTool();
                         s_ActiveTerrainToolIsEditorTool = false;
                     }
                     else
@@ -1412,6 +1413,11 @@ public void ShowSettings()
                         ShowOverrideBar();
                 }
 
+                // 17 is the hard-coded patch size in the engine.
+                int numLevels = Mathf.RoundToInt(Mathf.Log(terrainData.heightmapResolution / 17, 2));
+                m_Terrain.heightmapMinimumLODSimplification = EditorGUILayout.IntSlider(styles.heightmapMinLODLimit, m_Terrain.heightmapMinimumLODSimplification, 0, numLevels);
+                m_Terrain.heightmapMaximumLOD = EditorGUILayout.IntSlider(styles.heightmapMaxLODLimit, m_Terrain.heightmapMaximumLOD, 0, numLevels);
+
                 float basemapDistance = m_Terrain.basemapDistance;
                 bool overrideBasemapDistance = overrideFlags.HasFlag(TerrainQualityOverrides.BasemapDistance) && !m_Terrain.ignoreQualitySettings;
                 using (new EditorGUI.DisabledScope(overrideBasemapDistance))
@@ -1508,6 +1514,10 @@ public void ShowSettings()
                     deringLightProbesForTrees = EditorGUILayout.Toggle(styles.deringLightProbesForTrees, deringLightProbesForTrees);
                 var preserveTreePrototypeLayers = EditorGUILayout.Toggle(styles.preserveTreePrototypeLayers, m_Terrain.preserveTreePrototypeLayers);
 
+                TreeMotionVectorModeOverride treeMotionVectorOverrideMode = m_Terrain.treeMotionVectorModeOverride;
+                using (new EditorGUI.DisabledScope(EditorApplication.isPlaying))
+                    treeMotionVectorOverrideMode = (TreeMotionVectorModeOverride)EditorGUILayout.EnumPopup(styles.treeMotionVectorOverrideMode, m_Terrain.treeMotionVectorModeOverride);
+
                 float detailObjectDistance = m_Terrain.detailObjectDistance;
                 bool overrideDetailDistance = overrideFlags.HasFlag(TerrainQualityOverrides.DetailDistance) && !m_Terrain.ignoreQualitySettings;
                 using (new EditorGUI.DisabledScope(overrideDetailDistance))
@@ -1595,6 +1605,7 @@ public void ShowSettings()
                     m_Terrain.treeBillboardDistance = treeBillboardDistance;
                     m_Terrain.treeCrossFadeLength = treeCrossFadeLength;
                     m_Terrain.treeMaximumFullLODCount = treeMaximumFullLODCount;
+                    m_Terrain.treeMotionVectorModeOverride = treeMotionVectorOverrideMode;
 
                     if (m_Terrain.terrainData.detailScatterMode != detailScatterMode)
                     {
@@ -2208,36 +2219,29 @@ public override void OnInspectorGUI()
             EditorGUI.BeginDisabledGroup(s_activeTerrainInspector != GetInstanceID() || s_activeTerrainInspectorInstance != this);
 
             int tool = (int)selectedCategory;
-            if (SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLES2)
-            {
-                EditorGUILayout.HelpBox(styles.gles2NotSupported);
-                tool = (int)TerrainTool.TerrainSettings;
-            }
-            else
-            {
-                // Show the master tool selector
-                GUILayout.BeginHorizontal();
-                GUILayout.FlexibleSpace();          // flexible space on either end centers the toolbar
-                GUI.changed = false;
-                int newlySelectedTool = GUILayout.Toolbar(tool, styles.toolIcons, styles.command);
-
-                if (newlySelectedTool != tool)
-                {
-                    SelectCategory((TerrainTool) newlySelectedTool);
+            // Show the master tool selector
+            GUILayout.BeginHorizontal();
+            GUILayout.FlexibleSpace();          // flexible space on either end centers the toolbar
+            GUI.changed = false;
+            int newlySelectedTool = GUILayout.Toolbar(tool, styles.toolIcons, styles.command);
 
-                    // Need to repaint other terrain inspectors as their previously selected tool is now deselected.
-                    InspectorWindow.RepaintAllInspectors();
+            if (newlySelectedTool != tool)
+            {
+                SelectCategory((TerrainTool) newlySelectedTool);
 
-                    if (Toolbar.get != null)
-                        Toolbar.get.Repaint();
-                }
+                // Need to repaint other terrain inspectors as their previously selected tool is now deselected.
+                InspectorWindow.RepaintAllInspectors();
 
-                GUILayout.FlexibleSpace();
-                GUILayout.EndHorizontal();
+                if (Toolbar.get != null)
+                    Toolbar.get.Repaint();
             }
 
+            GUILayout.FlexibleSpace();
+            GUILayout.EndHorizontal();
+
             EditorGUI.EndDisabledGroup();
 
+
             switch ((TerrainTool)tool)
             {
                 case TerrainTool.Paint:
diff --git a/Modules/TextCoreTextEngine/Managed/FontAsset.cs b/Modules/TextCoreTextEngine/Managed/FontAsset.cs
index 38b14df604..dd2f7da264 100644
--- a/Modules/TextCoreTextEngine/Managed/FontAsset.cs
+++ b/Modules/TextCoreTextEngine/Managed/FontAsset.cs
@@ -9,6 +9,8 @@
 using UnityEngine.Serialization;
 using UnityEngine.TextCore.LowLevel;
 
+using UnityEditor;
+
 namespace UnityEngine.TextCore.Text
 {
     /// <summary>
@@ -131,6 +133,18 @@ internal Font SourceFont_EditorRef
         }
         internal Font m_SourceFontFile_EditorRef;
 
+        
+        /// <summary>
+        /// The settings used in the Font Asset Creator when this font asset was created or edited.
+        /// </summary>
+        public FontAssetCreationEditorSettings fontAssetCreationEditorSettings
+        {
+            get { return m_fontAssetCreationEditorSettings; }
+            set { m_fontAssetCreationEditorSettings = value; }
+        }
+        [SerializeField]
+        internal FontAssetCreationEditorSettings m_fontAssetCreationEditorSettings;
+
         /// <summary>
         /// Source font file when atlas population mode is set to dynamic. Null when the atlas population mode is set to static.
         /// </summary>
@@ -439,17 +453,6 @@ public List<FontAsset> fallbackFontAssetTable
         [SerializeField]
         internal List<FontAsset> m_FallbackFontAssetTable;
 
-        /// <summary>
-        /// The settings used in the Font Asset Creator when this font asset was created or edited.
-        /// </summary>
-        public FontAssetCreationEditorSettings fontAssetCreationEditorSettings
-        {
-            get { return m_fontAssetCreationEditorSettings; }
-            set { m_fontAssetCreationEditorSettings = value; }
-        }
-        [SerializeField]
-        internal FontAssetCreationEditorSettings m_fontAssetCreationEditorSettings;
-
         /// <summary>
         /// Array containing font assets to be used as alternative typefaces for the various potential font weights of this font asset.
         /// </summary>
@@ -593,8 +596,22 @@ static FontAsset CreateFontAsset(Font font, int faceIndex, int samplingPointSize
             {
                 if (font.name == "LegacyRuntime")
                 {
-                    return FontAsset.CreateFontAsset("Arial", "Regular");
+                    RuntimePlatform platform = Application.platform;
+
+                    switch (platform)
+                    {
+                        case RuntimePlatform.LinuxPlayer:
+                            return FontAsset.CreateFontAsset("Liberation Sans", "Regular");
+                        case RuntimePlatform.Switch:
+                            return FontAsset.CreateFontAsset("nintendo_udsg-r_std_003", "R");
+                        default:
+                            return FontAsset.CreateFontAsset("Arial", "Regular");
+                    }
                 }
+                FontAsset systemFontAsset = CreateFontAsset(font.name, "Regular");
+                if (systemFontAsset != null)
+                    return systemFontAsset;
+
                 Debug.LogWarning("Unable to load font face for [" + font.name + "]. Make sure \"Include Font Data\" is enabled in the Font Import Settings.", font);
                 return null;
             }
@@ -630,7 +647,7 @@ static FontAsset CreateFontAssetInstance(Font font, int atlasPadding, GlyphRende
             fontAsset.atlasTextures = new Texture2D[1];
 
             // Create and add font atlas texture.
-            Texture2D texture = new Texture2D(0, 0, TextureFormat.Alpha8, false);
+            Texture2D texture = new Texture2D(1, 1, TextureFormat.Alpha8, false);
             fontAsset.atlasTextures[0] = texture;
 
             fontAsset.isMultiAtlasTexturesEnabled = enableMultiAtlasSupport;
@@ -697,6 +714,7 @@ static FontAsset CreateFontAssetInstance(Font font, int atlasPadding, GlyphRende
         internal static Action<Texture2D, bool> SetAtlasTextureIsReadable;
         internal static Func<string, Font> GetSourceFontRef;
         internal static Func<Font, string> SetSourceFontGUID;
+        internal static Func<bool> EditorApplicationIsUpdating;
 
         // Profiler Marker declarations
         private static ProfilerMarker k_ReadFontAssetDefinitionMarker = new ProfilerMarker("FontAsset.ReadFontAssetDefinition");
@@ -728,6 +746,10 @@ private void OnValidate()
             if (Time.frameCount == 0)
                 return;
 
+            // See TMPB-187
+            if (EditorApplicationIsUpdating?.Invoke() ?? true)
+                return;
+
             // Make sure our lookup dictionary have been initialized.
             if (m_CharacterLookupDictionary == null || m_GlyphLookupDictionary == null)
                 ReadFontAssetDefinition();
@@ -1201,6 +1223,18 @@ public bool HasCharacter(int character)
         /// <param name="tryAddCharacter"></param>
         /// <returns></returns>
         public bool HasCharacter(char character, bool searchFallbacks = false, bool tryAddCharacter = false)
+        {
+            return HasCharacter((uint)character, searchFallbacks, tryAddCharacter);
+        }
+
+        /// <summary>
+        /// Function to check if a character is contained in the font asset with the option to also check potential local fallbacks.
+        /// </summary>
+        /// <param name="character"></param>
+        /// <param name="searchFallbacks"></param>
+        /// <param name="tryAddCharacter"></param>
+        /// <returns></returns>
+        public bool HasCharacter(uint character, bool searchFallbacks = false, bool tryAddCharacter = false)
         {
             // Read font asset definition if it hasn't already been done.
             if (m_CharacterLookupDictionary == null)
@@ -1819,7 +1853,7 @@ public bool TryAddCharacters(uint[] unicodes, out uint[] missingUnicodes, bool i
             }
 
             // Resize the Atlas Texture to the appropriate size
-            if (m_AtlasTextures[m_AtlasTextureIndex].width == 0 || m_AtlasTextures[m_AtlasTextureIndex].height == 0)
+            if (m_AtlasTextures[m_AtlasTextureIndex].width <= 1 || m_AtlasTextures[m_AtlasTextureIndex].height <= 1)
             {
                 m_AtlasTextures[m_AtlasTextureIndex].Reinitialize(m_AtlasWidth, m_AtlasHeight);
                 FontEngine.ResetAtlasTexture(m_AtlasTextures[m_AtlasTextureIndex]);
@@ -2034,7 +2068,7 @@ public bool TryAddCharacters(string characters, out string missingCharacters, bo
             }
 
             // Resize the Atlas Texture to the appropriate size
-            if (m_AtlasTextures[m_AtlasTextureIndex].width == 0 || m_AtlasTextures[m_AtlasTextureIndex].height == 0)
+            if (m_AtlasTextures[m_AtlasTextureIndex].width <= 1 || m_AtlasTextures[m_AtlasTextureIndex].height <= 1)
             {
                 m_AtlasTextures[m_AtlasTextureIndex].Reinitialize(m_AtlasWidth, m_AtlasHeight);
                 FontEngine.ResetAtlasTexture(m_AtlasTextures[m_AtlasTextureIndex]);
@@ -2155,7 +2189,7 @@ internal bool TryAddCharacter_Internal(uint unicode)
             }
 
             // Resize the Atlas Texture to the appropriate size
-            if (m_AtlasTextures[m_AtlasTextureIndex].width == 0 || m_AtlasTextures[m_AtlasTextureIndex].height == 0)
+            if (m_AtlasTextures[m_AtlasTextureIndex].width <= 1 || m_AtlasTextures[m_AtlasTextureIndex].height <= 1)
             {
                 //Debug.Log("Setting initial size of atlas texture used by font asset [" + this.name + "].");
                 m_AtlasTextures[m_AtlasTextureIndex].Reinitialize(m_AtlasWidth, m_AtlasHeight);
@@ -2204,7 +2238,7 @@ internal TMP_Character AddCharacter_Internal(uint unicode, Glyph glyph)
             uint glyphIndex = glyph.index;
 
             // Resize the Atlas Texture to the appropriate size
-            if (m_AtlasTextures[m_AtlasTextureIndex].width == 0 || m_AtlasTextures[m_AtlasTextureIndex].height == 0)
+            if (m_AtlasTextures[m_AtlasTextureIndex].width <= 1 || m_AtlasTextures[m_AtlasTextureIndex].height <= 1)
             {
                 //Debug.Log("Setting initial size of atlas texture used by font asset [" + this.name + "].");
                 m_AtlasTextures[m_AtlasTextureIndex].Reinitialize(m_AtlasWidth, m_AtlasHeight);
@@ -2279,7 +2313,7 @@ internal bool TryAddGlyphInternal(uint glyphIndex, out Glyph glyph)
                 }
 
                 // Resize the Atlas Texture to the appropriate size
-                if (m_AtlasTextures[m_AtlasTextureIndex].width == 0 || m_AtlasTextures[m_AtlasTextureIndex].height == 0)
+                if (m_AtlasTextures[m_AtlasTextureIndex].width <= 1 || m_AtlasTextures[m_AtlasTextureIndex].height <= 1)
                 {
                     m_AtlasTextures[m_AtlasTextureIndex].Reinitialize(m_AtlasWidth, m_AtlasHeight);
                     FontEngine.ResetAtlasTexture(m_AtlasTextures[m_AtlasTextureIndex]);
@@ -2449,7 +2483,7 @@ internal bool TryAddCharacterInternal(uint unicode, out Character character, boo
             }
 
             // Resize the Atlas Texture to the appropriate size
-            if (m_AtlasTextures[m_AtlasTextureIndex].width == 0 || m_AtlasTextures[m_AtlasTextureIndex].height == 0)
+            if (m_AtlasTextures[m_AtlasTextureIndex].width <= 1 || m_AtlasTextures[m_AtlasTextureIndex].height <= 1)
             {
                 m_AtlasTextures[m_AtlasTextureIndex].Reinitialize(m_AtlasWidth, m_AtlasHeight);
                 FontEngine.ResetAtlasTexture(m_AtlasTextures[m_AtlasTextureIndex]);
@@ -2644,7 +2678,7 @@ internal void TryAddGlyphsToAtlasTextures()
                 return;
 
             // Resize the Atlas Texture to the appropriate size
-            if (m_AtlasTextures[m_AtlasTextureIndex].width == 0 || m_AtlasTextures[m_AtlasTextureIndex].height == 0)
+            if (m_AtlasTextures[m_AtlasTextureIndex].width <= 1 || m_AtlasTextures[m_AtlasTextureIndex].height <= 1)
             {
                 //Debug.Log("Setting initial size of atlas texture used by font asset [" + this.name + "].");
                 m_AtlasTextures[m_AtlasTextureIndex].Reinitialize(m_AtlasWidth, m_AtlasHeight);
@@ -2766,7 +2800,7 @@ void SetupNewAtlasTexture()
 
             // Add new texture as sub asset to font asset
             Texture2D tex = m_AtlasTextures[m_AtlasTextureIndex];
-            tex.name = m_AtlasTexture.name + " " + m_AtlasTextureIndex;
+            tex.name = atlasTexture.name + " " + m_AtlasTextureIndex;
 
             OnFontAssetTextureChanged?.Invoke(tex, this);
         }
@@ -3115,7 +3149,7 @@ internal void ClearAtlasTextures(bool setAtlasSizeToZero = false)
 
             if (setAtlasSizeToZero)
             {
-                texture.Reinitialize(0, 0, TextureFormat.Alpha8, false);
+                texture.Reinitialize(1, 1, TextureFormat.Alpha8, false);
             }
             else if (texture.width != m_AtlasWidth || texture.height != m_AtlasHeight)
             {
diff --git a/Modules/TextCoreTextEngine/Managed/MeshInfo.cs b/Modules/TextCoreTextEngine/Managed/MeshInfo.cs
index 97b68a4baa..d555110ce4 100644
--- a/Modules/TextCoreTextEngine/Managed/MeshInfo.cs
+++ b/Modules/TextCoreTextEngine/Managed/MeshInfo.cs
@@ -3,29 +3,36 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Runtime.InteropServices;
 using UnityEngine.Bindings;
 using UnityEngine.TextCore.LowLevel;
+using UnityEngine.Scripting;
 
 namespace UnityEngine.TextCore.Text
 {
     enum VertexSortingOrder { Normal, Reverse }
+    enum VertexDataLayout { Mesh, VBO }
 
     /// <summary>
-    /// Structure which contains the vertex attributes (geometry) of the text object.
+    /// Structure which contains the vertex attributes (geometry) of the text object, as well as the material to be used.
     /// </summary>
-    struct MeshInfo
+    internal 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 TextCoreVertex[] vertexData;
+        public Material material;
+
+        [Ignore] static readonly Color32 k_DefaultColor = new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue);
+        [Ignore] static readonly Vector3 k_DefaultNormal = new Vector3(0.0f, 0.0f, -1f);
+        [Ignore] static readonly Vector4 k_DefaultTangent = new Vector4(-1f, 0.0f, 0.0f, 1f);
+        [Ignore] static readonly Bounds k_DefaultBounds = new Bounds();
 
-        public Vector3[] vertices;
-        public Vector3[] normals;
-        public Vector4[] tangents;
+        [Ignore] public Mesh mesh;
+
+        [Ignore] public Vector3[] vertices;
+        [Ignore] public Vector3[] normals;
+        [Ignore] public Vector4[] tangents;
+        [Ignore] public int vertexBufferSize;
 
         /// <summary>
         /// UV0 contains the following information
@@ -33,20 +40,21 @@ struct MeshInfo
         /// 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;
+        [Ignore] public Vector4[] uvs0;
+        [Ignore] public Vector2[] uvs2;
+        [Ignore] public Color32[] colors32;
+        [Ignore] public int[] triangles;
 
-        public Material material;
+        [Ignore] public VertexDataLayout vertexDataLayout;
         internal GlyphRenderMode glyphRenderMode;
 
         /// <summary>
         /// Function to pre-allocate vertex attributes for a mesh of size X.
         /// </summary>
         /// <param name="size"></param>
-        public MeshInfo(int size)
+        public MeshInfo(int size, VertexDataLayout layout) : this()
         {
+            vertexDataLayout = layout;
             material = null;
 
             // Limit the mesh to less than 65535 vertices which is the limit for Unity's Mesh.
@@ -56,47 +64,54 @@ public MeshInfo(int size)
             int sizeX6 = size * 6;
 
             vertexCount = 0;
+            vertexBufferSize = sizeX4;
 
-            vertices = new Vector3[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;
-            int indexX4 = 0;
-            while (indexX4 / 4 < size)
+            if (layout == VertexDataLayout.VBO)
             {
-                for (int i = 0; i < 4; i++)
+                vertexData = new TextCoreVertex[sizeX4];
+            }
+            else
+            {
+                vertices = new Vector3[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;
+                int indexX4 = 0;
+                while (indexX4 / 4 < size)
                 {
-                    vertices[indexX4 + i] = Vector3.zero;
-                    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;
-                }
+                    for (int i = 0; i < 4; i++)
+                    {
+                        vertices[indexX4 + i] = Vector3.zero;
+                        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;
-                triangles[indexX6 + 1] = indexX4 + 1;
-                triangles[indexX6 + 2] = indexX4 + 2;
-                triangles[indexX6 + 3] = indexX4 + 2;
-                triangles[indexX6 + 4] = indexX4 + 3;
-                triangles[indexX6 + 5] = indexX4 + 0;
+                    triangles[indexX6 + 0] = indexX4 + 0;
+                    triangles[indexX6 + 1] = indexX4 + 1;
+                    triangles[indexX6 + 2] = indexX4 + 2;
+                    triangles[indexX6 + 3] = indexX4 + 2;
+                    triangles[indexX6 + 4] = indexX4 + 3;
+                    triangles[indexX6 + 5] = indexX4 + 0;
 
-                indexX4 += 4;
-                indexX6 += 6;
-            }
+                    indexX4 += 4;
+                    indexX6 += 6;
+                }
 
-            mesh.vertices = vertices;
-            mesh.normals = normals;
-            mesh.tangents = tangents;
-            mesh.triangles = triangles;
-            mesh.bounds = k_DefaultBounds;
+                mesh.vertices = vertices;
+                mesh.normals = normals;
+                mesh.tangents = tangents;
+                mesh.triangles = triangles;
+                mesh.bounds = k_DefaultBounds;
+            }
             material = null;
             glyphRenderMode = 0;
         }
@@ -106,8 +121,10 @@ public MeshInfo(int size)
         /// </summary>
         /// <param name="mesh"></param>
         /// <param name="size"></param>
-        public MeshInfo(Mesh mesh, int size)
+        public MeshInfo(Mesh mesh, int size) : this()
         {
+            // This should only be used for Mesh data structure
+            vertexDataLayout = VertexDataLayout.Mesh;
             // Clear existing mesh data
             if (mesh == null)
                 mesh = new Mesh();
@@ -123,6 +140,7 @@ public MeshInfo(Mesh mesh, int size)
             int sizeX6 = size * 6;
 
             vertexCount = 0;
+            vertexBufferSize = sizeX4;
 
             vertices = new Vector3[sizeX4];
             uvs0 = new Vector4[sizeX4];
@@ -182,29 +200,37 @@ internal void ResizeMeshInfo(int size)
             int sizeX4 = size * 4;
             int sizeX6 = size * 6;
 
-            int previousSize = vertices.Length / 4;
+            vertexBufferSize = sizeX4;
 
-            Array.Resize(ref vertices, sizeX4);
+            if (vertexDataLayout == VertexDataLayout.VBO)
+            {
+                Array.Resize(ref vertexData, sizeX4);
+            }
+            else
+            {
+                int previousSize = vertices.Length / 4;
+                Array.Resize(ref vertices, sizeX4);
 
-            Array.Resize(ref uvs0, sizeX4);
-            Array.Resize(ref uvs2, sizeX4);
+                Array.Resize(ref uvs0, sizeX4);
+                Array.Resize(ref uvs2, sizeX4);
 
-            Array.Resize(ref colors32, sizeX4);
+                Array.Resize(ref colors32, sizeX4);
 
-            Array.Resize(ref triangles, sizeX6);
+                Array.Resize(ref triangles, sizeX6);
 
-            for (int i = previousSize; i < size; i++)
-            {
-                int indexX4 = i * 4;
-                int indexX6 = i * 6;
-
-                // Setup Triangles
-                triangles[0 + indexX6] = 0 + indexX4;
-                triangles[1 + indexX6] = 1 + indexX4;
-                triangles[2 + indexX6] = 2 + indexX4;
-                triangles[3 + indexX6] = 2 + indexX4;
-                triangles[4 + indexX6] = 3 + indexX4;
-                triangles[5 + indexX6] = 0 + indexX4;
+                for (int i = previousSize; i < size; i++)
+                {
+                    int indexX4 = i * 4;
+                    int indexX6 = i * 6;
+
+                    // Setup Triangles
+                    triangles[0 + indexX6] = 0 + indexX4;
+                    triangles[1 + indexX6] = 1 + indexX4;
+                    triangles[2 + indexX6] = 2 + indexX4;
+                    triangles[3 + indexX6] = 2 + indexX4;
+                    triangles[4 + indexX6] = 3 + indexX4;
+                    triangles[5 + indexX6] = 0 + indexX4;
+                }
             }
         }
 
@@ -213,9 +239,19 @@ internal void ResizeMeshInfo(int size)
         /// </summary>
         internal void Clear(bool uploadChanges)
         {
-            if (vertices == null) return;
-
-            Array.Clear(vertices, 0, vertices.Length);
+            if (vertexDataLayout == VertexDataLayout.VBO)
+            {
+                if (vertexData == null) return;
+                Array.Clear(vertexData, 0, vertexData.Length);
+                vertexBufferSize = vertexData.Length;
+            }
+            else
+            {
+                if (vertices == null) return;
+                Array.Clear(vertices, 0, vertices.Length);
+                vertexBufferSize = vertices.Length;
+            }
+            
             vertexCount = 0;
         }
 
@@ -224,10 +260,24 @@ internal void Clear(bool uploadChanges)
         /// </summary>
         internal void ClearUnusedVertices()
         {
-            int length = vertices.Length - vertexCount;
+            if (vertexDataLayout == VertexDataLayout.VBO)
+            {
+                int length = vertexData.Length - vertexCount;
+
+                if (length > 0)
+                    Array.Clear(vertexData, vertexCount, length);
 
-            if (length > 0)
-                Array.Clear(vertices, vertexCount, length);
+                vertexBufferSize = vertexData.Length;
+            }
+            else
+            {
+                int length = vertices.Length - vertexCount;
+
+                if (length > 0)
+                    Array.Clear(vertices, vertexCount, length);
+
+                vertexBufferSize = vertices.Length;
+            }
         }
 
         /// <summary>
@@ -236,13 +286,27 @@ internal void ClearUnusedVertices()
         /// <param name="startIndex"></param>
         public void ClearUnusedVertices(int startIndex, bool updateMesh)
         {
-            int length = this.vertices.Length - startIndex;
+            if (vertexDataLayout == VertexDataLayout.VBO)
+            {
+                int length = vertexData.Length - startIndex;
+
+                if (length > 0)
+                    Array.Clear(vertexData, startIndex, length);
+
+                vertexBufferSize = vertexData.Length;
+            }
+            else
+            {
+                int length = vertices.Length - startIndex;
+
+                if (length > 0)
+                    Array.Clear(vertices, startIndex, length);
 
-            if (length > 0)
-                Array.Clear(this.vertices, startIndex, length);
+                if (updateMesh && mesh != null)
+                    mesh.vertices = vertices;
 
-            if (updateMesh && mesh != null)
-                this.mesh.vertices = this.vertices;
+                vertexBufferSize = vertices.Length;
+            }
         }
 
         /// <summary>
@@ -251,10 +315,24 @@ public void ClearUnusedVertices(int startIndex, bool updateMesh)
         /// <param name="startIndex"></param>
         internal void ClearUnusedVertices(int startIndex)
         {
-            int length = vertices.Length - startIndex;
+            if (vertexDataLayout == VertexDataLayout.VBO)
+            {
+                int length = vertexData.Length - startIndex;
+
+                if (length > 0)
+                    Array.Clear(vertexData, startIndex, length);
+
+                  vertexBufferSize = vertexData.Length;
+            }
+            else
+            {
+                int length = vertices.Length - startIndex;
+
+                if (length > 0)
+                    Array.Clear(vertices, startIndex, length);
 
-            if (length > 0)
-                Array.Clear(vertices, startIndex, length);
+                vertexBufferSize = vertices.Length;
+            }
         }
 
         internal void SortGeometry(VertexSortingOrder order)
@@ -288,76 +366,97 @@ internal void SwapVertexData(int src, int dst)
             int srcIndex = src;
             int dstIndex = dst;
 
-            // Swap vertices
-            Vector3 vertex;
-            vertex = vertices[dstIndex + 0];
-            vertices[dstIndex + 0] = vertices[srcIndex + 0];
-            vertices[srcIndex + 0] = vertex;
-
-            vertex = vertices[dstIndex + 1];
-            vertices[dstIndex + 1] = vertices[srcIndex + 1];
-            vertices[srcIndex + 1] = vertex;
-
-            vertex = vertices[dstIndex + 2];
-            vertices[dstIndex + 2] = vertices[srcIndex + 2];
-            vertices[srcIndex + 2] = vertex;
-
-            vertex = vertices[dstIndex + 3];
-            vertices[dstIndex + 3] = vertices[srcIndex + 3];
-            vertices[srcIndex + 3] = vertex;
-
-            //Swap UVs0
-            Vector4 uvs;
-            uvs = uvs0[dstIndex + 0];
-            uvs0[dstIndex + 0] = uvs0[srcIndex + 0];
-            uvs0[srcIndex + 0] = uvs;
-
-            uvs = uvs0[dstIndex + 1];
-            uvs0[dstIndex + 1] = uvs0[srcIndex + 1];
-            uvs0[srcIndex + 1] = uvs;
-
-            uvs = uvs0[dstIndex + 2];
-            uvs0[dstIndex + 2] = uvs0[srcIndex + 2];
-            uvs0[srcIndex + 2] = uvs;
-
-            uvs = uvs0[dstIndex + 3];
-            uvs0[dstIndex + 3] = uvs0[srcIndex + 3];
-            uvs0[srcIndex + 3] = uvs;
-
-            // Swap UVs2
-            uvs = uvs2[dstIndex + 0];
-            uvs2[dstIndex + 0] = uvs2[srcIndex + 0];
-            uvs2[srcIndex + 0] = uvs;
-
-            uvs = uvs2[dstIndex + 1];
-            uvs2[dstIndex + 1] = uvs2[srcIndex + 1];
-            uvs2[srcIndex + 1] = uvs;
-
-            uvs = uvs2[dstIndex + 2];
-            uvs2[dstIndex + 2] = uvs2[srcIndex + 2];
-            uvs2[srcIndex + 2] = uvs;
-
-            uvs = uvs2[dstIndex + 3];
-            uvs2[dstIndex + 3] = uvs2[srcIndex + 3];
-            uvs2[srcIndex + 3] = uvs;
-
-            // Vertex Colors
-            Color32 color;
-            color = colors32[dstIndex + 0];
-            colors32[dstIndex + 0] = colors32[srcIndex + 0];
-            colors32[srcIndex + 0] = color;
-
-            color = colors32[dstIndex + 1];
-            colors32[dstIndex + 1] = colors32[srcIndex + 1];
-            colors32[srcIndex + 1] = color;
-
-            color = colors32[dstIndex + 2];
-            colors32[dstIndex + 2] = colors32[srcIndex + 2];
-            colors32[srcIndex + 2] = color;
-
-            color = colors32[dstIndex + 3];
-            colors32[dstIndex + 3] = colors32[srcIndex + 3];
-            colors32[srcIndex + 3] = color;
+            if(vertexDataLayout == VertexDataLayout.VBO)
+            {
+                var vertex = vertexData[dstIndex + 0];
+                vertexData[dstIndex + 0] = vertexData[srcIndex + 0];
+                vertexData[srcIndex + 0] = vertex;
+
+                vertex = vertexData[dstIndex + 1];
+                vertexData[dstIndex + 1] = vertexData[srcIndex + 1];
+                vertexData[srcIndex + 1] = vertex;
+
+                vertex = vertexData[dstIndex + 2];
+                vertexData[dstIndex + 2] = vertexData[srcIndex + 2];
+                vertexData[srcIndex + 2] = vertex;
+
+                vertex = vertexData[dstIndex + 3];
+                vertexData[dstIndex + 3] = vertexData[srcIndex + 3];
+                vertexData[srcIndex + 3] = vertex;
+            }
+            else
+            {
+                // Swap vertices
+                Vector3 vertex;
+                vertex = vertices[dstIndex + 0];
+                vertices[dstIndex + 0] = vertices[srcIndex + 0];
+                vertices[srcIndex + 0] = vertex;
+
+                vertex = vertices[dstIndex + 1];
+                vertices[dstIndex + 1] = vertices[srcIndex + 1];
+                vertices[srcIndex + 1] = vertex;
+
+                vertex = vertices[dstIndex + 2];
+                vertices[dstIndex + 2] = vertices[srcIndex + 2];
+                vertices[srcIndex + 2] = vertex;
+
+                vertex = vertices[dstIndex + 3];
+                vertices[dstIndex + 3] = vertices[srcIndex + 3];
+                vertices[srcIndex + 3] = vertex;
+
+                //Swap UVs0
+                Vector4 uvs;
+                uvs = uvs0[dstIndex + 0];
+                uvs0[dstIndex + 0] = uvs0[srcIndex + 0];
+                uvs0[srcIndex + 0] = uvs;
+
+                uvs = uvs0[dstIndex + 1];
+                uvs0[dstIndex + 1] = uvs0[srcIndex + 1];
+                uvs0[srcIndex + 1] = uvs;
+
+                uvs = uvs0[dstIndex + 2];
+                uvs0[dstIndex + 2] = uvs0[srcIndex + 2];
+                uvs0[srcIndex + 2] = uvs;
+
+                uvs = uvs0[dstIndex + 3];
+                uvs0[dstIndex + 3] = uvs0[srcIndex + 3];
+                uvs0[srcIndex + 3] = uvs;
+
+                // Swap UVs2
+                uvs = uvs2[dstIndex + 0];
+                uvs2[dstIndex + 0] = uvs2[srcIndex + 0];
+                uvs2[srcIndex + 0] = uvs;
+
+                uvs = uvs2[dstIndex + 1];
+                uvs2[dstIndex + 1] = uvs2[srcIndex + 1];
+                uvs2[srcIndex + 1] = uvs;
+
+                uvs = uvs2[dstIndex + 2];
+                uvs2[dstIndex + 2] = uvs2[srcIndex + 2];
+                uvs2[srcIndex + 2] = uvs;
+
+                uvs = uvs2[dstIndex + 3];
+                uvs2[dstIndex + 3] = uvs2[srcIndex + 3];
+                uvs2[srcIndex + 3] = uvs;
+
+                // Vertex Colors
+                Color32 color;
+                color = colors32[dstIndex + 0];
+                colors32[dstIndex + 0] = colors32[srcIndex + 0];
+                colors32[srcIndex + 0] = color;
+
+                color = colors32[dstIndex + 1];
+                colors32[dstIndex + 1] = colors32[srcIndex + 1];
+                colors32[srcIndex + 1] = color;
+
+                color = colors32[dstIndex + 2];
+                colors32[dstIndex + 2] = colors32[srcIndex + 2];
+                colors32[srcIndex + 2] = color;
+
+                color = colors32[dstIndex + 3];
+                colors32[dstIndex + 3] = colors32[srcIndex + 3];
+                colors32[srcIndex + 3] = color;
+            }
         }
     }
 }
diff --git a/Modules/TextCoreTextEngine/Managed/SpriteCharacter.cs b/Modules/TextCoreTextEngine/Managed/SpriteCharacter.cs
index 4232e4f7fc..4357fa468d 100644
--- a/Modules/TextCoreTextEngine/Managed/SpriteCharacter.cs
+++ b/Modules/TextCoreTextEngine/Managed/SpriteCharacter.cs
@@ -78,21 +78,5 @@ public SpriteCharacter(uint unicode, SpriteAsset spriteAsset, SpriteGlyph glyph)
             this.glyphIndex = glyph.index;
             this.scale = 1.0f;
         }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="unicode"></param>
-        /// <param name="glyphIndex"></param>
-        internal SpriteCharacter(uint unicode, uint glyphIndex)
-        {
-            m_ElementType = TextElementType.Sprite;
-
-            this.unicode = unicode;
-            this.textAsset = null;
-            this.glyph = null;
-            this.glyphIndex = glyphIndex;
-            this.scale = 1.0f;
-        }
     }
 }
diff --git a/Modules/TextCoreTextEngine/Managed/TextElementInfo.cs b/Modules/TextCoreTextEngine/Managed/TextElementInfo.cs
index 26bfe79bc7..fce701e3f2 100644
--- a/Modules/TextCoreTextEngine/Managed/TextElementInfo.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextElementInfo.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.Bindings;
 
 namespace UnityEngine.TextCore.Text
@@ -68,5 +69,16 @@ struct TextElementInfo
         public HighlightState highlightState;
         public FontStyles style;
         public bool isVisible;
+
+        public override string ToString()
+        {
+            return $"{nameof(character)}: {character}\n{nameof(index)}: {index}\n{nameof(elementType)}: {elementType}\n{nameof(stringLength)}: {stringLength}\n{nameof(textElement)}: {textElement}\n{nameof(alternativeGlyph)}: {alternativeGlyph}\n{nameof(fontAsset)}: {fontAsset}\n{nameof(spriteAsset)}: {spriteAsset}\n{nameof(spriteIndex)}: {spriteIndex}\n{nameof(material)}: {material}\n{nameof(materialReferenceIndex)}: {materialReferenceIndex}\n{nameof(isUsingAlternateTypeface)}: {isUsingAlternateTypeface}\n{nameof(pointSize)}: {pointSize}\n{nameof(lineNumber)}: {lineNumber}\n{nameof(pageNumber)}: {pageNumber}\n{nameof(vertexIndex)}: {vertexIndex}\n{nameof(vertexTopLeft)}: {vertexTopLeft}\n{nameof(vertexBottomLeft)}: {vertexBottomLeft}\n{nameof(vertexTopRight)}: {vertexTopRight}\n{nameof(vertexBottomRight)}: {vertexBottomRight}\n{nameof(topLeft)}: {topLeft}\n{nameof(bottomLeft)}: {bottomLeft}\n{nameof(topRight)}: {topRight}\n{nameof(bottomRight)}: {bottomRight}\n{nameof(origin)}: {origin}\n{nameof(ascender)}: {ascender}\n{nameof(baseLine)}: {baseLine}\n{nameof(descender)}: {descender}\n{nameof(adjustedAscender)}: {adjustedAscender}\n{nameof(adjustedDescender)}: {adjustedDescender}\n{nameof(adjustedHorizontalAdvance)}: {adjustedHorizontalAdvance}\n{nameof(xAdvance)}: {xAdvance}\n{nameof(aspectRatio)}: {aspectRatio}\n{nameof(scale)}: {scale}\n{nameof(color)}: {color}\n{nameof(underlineColor)}: {underlineColor}\n{nameof(underlineVertexIndex)}: {underlineVertexIndex}\n{nameof(strikethroughColor)}: {strikethroughColor}\n{nameof(strikethroughVertexIndex)}: {strikethroughVertexIndex}\n{nameof(highlightColor)}: {highlightColor}\n{nameof(highlightState)}: {highlightState}\n{nameof(style)}: {style}\n{nameof(isVisible)}: {isVisible}";
+        }
+
+        // Used in automated tests.
+        internal string ToStringTest()
+        {
+            return $"topLeft.x: {topLeft.x.ToString("F4")}\n topLeft.y: {topLeft.y.ToString("F4")}\n topRight.x: {topRight.x.ToString("F4")}\n topRight.y: {topRight.y.ToString("F4")}\n  bottomLeft.x: {bottomLeft.x.ToString("F4")}\n bottomLeft.y: {bottomLeft.y.ToString("F4")}\n  bottomRight.x: {bottomRight.x.ToString("F4")}\n bottomRight.y: {bottomRight.y.ToString("F4")}\n{nameof(origin)}: {origin.ToString("F4")}\n{nameof(xAdvance)}: {xAdvance.ToString("F4")}\n";
+        }
     }
 }
diff --git a/Modules/TextCoreTextEngine/Managed/TextGenerator.cs b/Modules/TextCoreTextEngine/Managed/TextGenerator.cs
index 39cb962b03..35ba17501a 100644
--- a/Modules/TextCoreTextEngine/Managed/TextGenerator.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextGenerator.cs
@@ -48,7 +48,7 @@ internal class TextGenerationSettings : IEquatable<TextGenerationSettings>
         public bool enableKerning = true;
         public bool richText;
         public bool isRightToLeft;
-        public bool extraPadding;
+        public float extraPadding = 6.0f;
         public bool parseControlCharacters = true;
         public bool isOrthographic = true;
         public bool isPlaceholder = false;
@@ -75,40 +75,41 @@ internal class TextGenerationSettings : IEquatable<TextGenerationSettings>
         public float uvLineOffset;
         public VertexSortingOrder geometrySortingOrder = VertexSortingOrder.Normal;
         public bool inverseYAxis;
+        public bool isIMGUI;
 
         public float charWidthMaxAdj;
         internal TextInputSource inputSource = TextInputSource.TextString;
 
-        public bool Equals(TextGenerationSettings other)
+
+	public bool Equals(TextGenerationSettings other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
-            return text == other.text && screenRect.Equals(other.screenRect) && margins.Equals(other.margins) &&
-                scale.Equals(other.scale) && Equals(fontAsset, other.fontAsset) && Equals(material, other.material) &&
-                Equals(spriteAsset, other.spriteAsset) && Equals(styleSheet, other.styleSheet) &&
-                fontStyle == other.fontStyle && Equals(textSettings, other.textSettings) &&
-                textAlignment == other.textAlignment && overflowMode == other.overflowMode &&
-                wordWrap == other.wordWrap && wordWrappingRatio.Equals(other.wordWrappingRatio) &&
-                color.Equals(other.color) && Equals(fontColorGradient, other.fontColorGradient) &&
-                Equals(fontColorGradientPreset, other.fontColorGradientPreset) && tintSprites == other.tintSprites &&
-                overrideRichTextColors == other.overrideRichTextColors &&
-                shouldConvertToLinearSpace == other.shouldConvertToLinearSpace && fontSize.Equals(other.fontSize) &&
-                autoSize == other.autoSize && fontSizeMin.Equals(other.fontSizeMin) &&
-                fontSizeMax.Equals(other.fontSizeMax) && enableKerning == other.enableKerning &&
-                richText == other.richText && isRightToLeft == other.isRightToLeft &&
-                extraPadding == other.extraPadding && parseControlCharacters == other.parseControlCharacters &&
-                isOrthographic == other.isOrthographic && tagNoParsing == other.tagNoParsing &&
-                characterSpacing.Equals(other.characterSpacing) && wordSpacing.Equals(other.wordSpacing) &&
-                lineSpacing.Equals(other.lineSpacing) && paragraphSpacing.Equals(other.paragraphSpacing) &&
-                lineSpacingMax.Equals(other.lineSpacingMax) && textWrappingMode == other.textWrappingMode &&
-                maxVisibleCharacters == other.maxVisibleCharacters && maxVisibleWords == other.maxVisibleWords &&
-                maxVisibleLines == other.maxVisibleLines && firstVisibleCharacter == other.firstVisibleCharacter &&
-                useMaxVisibleDescender == other.useMaxVisibleDescender && fontWeight == other.fontWeight &&
-                pageToDisplay == other.pageToDisplay && horizontalMapping == other.horizontalMapping &&
-                verticalMapping == other.verticalMapping && uvLineOffset.Equals(other.uvLineOffset) &&
-                geometrySortingOrder == other.geometrySortingOrder && inverseYAxis == other.inverseYAxis &&
-                charWidthMaxAdj.Equals(other.charWidthMaxAdj) && inputSource == other.inputSource &&
-                isOrthographic.Equals(other.isOrthographic) && isPlaceholder.Equals(other.isPlaceholder);
+            return text == other.text && screenRect.Equals(other.screenRect) && margins.Equals(other.margins)
+                && scale.Equals(other.scale) && Equals(fontAsset, other.fontAsset) && Equals(material, other.material)
+                && Equals(spriteAsset, other.spriteAsset) && Equals(styleSheet, other.styleSheet)
+                && fontStyle == other.fontStyle && Equals(textSettings, other.textSettings)
+                && textAlignment == other.textAlignment && overflowMode == other.overflowMode
+                && wordWrap == other.wordWrap && wordWrappingRatio.Equals(other.wordWrappingRatio)
+                && color.Equals(other.color) && Equals(fontColorGradient, other.fontColorGradient)
+                && Equals(fontColorGradientPreset, other.fontColorGradientPreset) && tintSprites == other.tintSprites
+                && overrideRichTextColors == other.overrideRichTextColors
+                && shouldConvertToLinearSpace == other.shouldConvertToLinearSpace && fontSize.Equals(other.fontSize)
+                && autoSize == other.autoSize && fontSizeMin.Equals(other.fontSizeMin)
+                && fontSizeMax.Equals(other.fontSizeMax) && enableKerning == other.enableKerning && richText == other.richText
+                && isRightToLeft == other.isRightToLeft && extraPadding == other.extraPadding
+                && parseControlCharacters == other.parseControlCharacters && isOrthographic == other.isOrthographic
+                && isPlaceholder == other.isPlaceholder && tagNoParsing == other.tagNoParsing
+                && characterSpacing.Equals(other.characterSpacing) && wordSpacing.Equals(other.wordSpacing)
+                && lineSpacing.Equals(other.lineSpacing) && paragraphSpacing.Equals(other.paragraphSpacing)
+                && lineSpacingMax.Equals(other.lineSpacingMax) && textWrappingMode == other.textWrappingMode
+                && maxVisibleCharacters == other.maxVisibleCharacters && maxVisibleWords == other.maxVisibleWords
+                && maxVisibleLines == other.maxVisibleLines && firstVisibleCharacter == other.firstVisibleCharacter
+                && useMaxVisibleDescender == other.useMaxVisibleDescender && fontWeight == other.fontWeight
+                && horizontalMapping == other.horizontalMapping && verticalMapping == other.verticalMapping
+                && uvLineOffset.Equals(other.uvLineOffset) && geometrySortingOrder == other.geometrySortingOrder
+                && inverseYAxis == other.inverseYAxis && charWidthMaxAdj.Equals(other.charWidthMaxAdj)
+                && isIMGUI == other.isIMGUI;
         }
 
         public override bool Equals(object obj)
@@ -174,6 +175,7 @@ public override int GetHashCode()
             hashCode.Add(charWidthMaxAdj);
             hashCode.Add((int)inputSource);
             hashCode.Add(isPlaceholder);
+            hashCode.Add(isIMGUI);
             return hashCode.ToHashCode();
         }
 
@@ -220,7 +222,7 @@ const int
             k_ZeroWidthSpace = 0x200B,
             k_NarrowNoBreakSpace = 0x202F,
             k_WordJoiner = 0x2060,
-            k_HorizontalEllipsis = 8230,
+            k_HorizontalEllipsis = 0x2026,
             k_RightSingleQuote = 8217,
             k_Square = 9633,
             k_HangulJamoStart = 0x1100,
@@ -236,7 +238,8 @@ const int
             k_CjkFormsStart = 0xFE30,
             k_CjkFormsEnd = 0xFE4F,
             k_CjkHalfwidthStart = 0xFF00,
-            k_CjkHalfwidthEnd = 0xFFEF;
+            k_CjkHalfwidthEnd = 0xFFEF,
+            k_EndOfText = 0x03;
 
 
         const float k_FloatUnset = -32767;
@@ -288,7 +291,7 @@ public static Vector2 GetCursorPosition(TextGenerationSettings settings, int ind
                 return Vector2.zero;
             }
 
-            TextInfo textInfo = new TextInfo();
+            TextInfo textInfo = new TextInfo(VertexDataLayout.Mesh);
             GenerateText(settings, textInfo);
 
             return GetCursorPosition(textInfo, settings.screenRect, index);
@@ -391,7 +394,7 @@ bool vertexBufferAutoSizeReduction
         [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.
+        private char[] m_HtmlTag = new char[256]; // Maximum length of rich text tag. This is pre-allocated to avoid GC.
 
         internal HighlightState m_HighlightState = new HighlightState(Color.white, Offset.zero);
 
@@ -431,7 +434,6 @@ bool vertexBufferAutoSizeReduction
         float m_Padding;
         SpriteAsset m_CurrentSpriteAsset;
         int m_TotalCharacterCount;
-        float m_FontScale;
         float m_FontSize;
         float m_FontScaleMultiplier;
         float m_CurrentFontSize;
@@ -515,7 +517,6 @@ bool vertexBufferAutoSizeReduction
         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]);
@@ -539,19 +540,18 @@ bool vertexBufferAutoSizeReduction
         protected SpecialCharacter m_Ellipsis;
         protected SpecialCharacter m_Underline;
 
-        bool m_IsUsingBold;
-        bool m_IsSdfShader;
-
         TextElementInfo[] m_InternalTextElementInfo;
 
+        // bool m_IsUsingBold;
+
         void Prepare(TextGenerationSettings generationSettings, TextInfo textInfo)
         {
             Profiler.BeginSample("TextGenerator.Prepare");
-            // TODO: Find a way for GetPaddingForMaterial to not allocate
-            // TODO: Hard coded padding value is temporary change to avoid clipping of text geometry with small point size.
-            m_Padding = 6.0f; // generationSettings.extraPadding ? 5.5f : 1.5f;
+            m_Padding = generationSettings.extraPadding;
 
-            m_IsMaskingEnabled = false;
+            // Set the font style that is assigned by the builder
+            m_FontStyleInternal = generationSettings.fontStyle;
+            m_FontWeightInternal = (m_FontStyleInternal & FontStyles.Bold) == FontStyles.Bold ? TextFontWeight.Bold : generationSettings.fontWeight;
 
             // Find and cache Underline & Ellipsis characters.
             GetSpecialCharacters(generationSettings);
@@ -775,7 +775,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 {
                     Debug.LogError("Line breaking recursion max threshold hit... Character [" + charCode + "] index: " + i);
                     characterToSubstitute.index = m_CharacterCount;
-                    characterToSubstitute.unicode = 0x03;
+                    characterToSubstitute.unicode = k_EndOfText;
                 }
 
                 // Skip characters that have been substituted.
@@ -827,14 +827,14 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
                     switch (charCode)
                     {
-                        case 0x03:
-                            textInfo.textElementInfo[m_CharacterCount].textElement = m_CurrentFontAsset.characterLookupTable[0x03];
+                        case k_EndOfText:
+                            textInfo.textElementInfo[m_CharacterCount].textElement = m_CurrentFontAsset.characterLookupTable[k_EndOfText];
                             m_IsTextTruncated = true;
                             break;
                         case 0x2D:
                             //
                             break;
-                        case 0x2026:
+                        case k_HorizontalEllipsis:
                             textInfo.textElementInfo[m_CharacterCount].textElement = m_Ellipsis.character;
                             textInfo.textElementInfo[m_CharacterCount].elementType = TextElementType.Character;
                             textInfo.textElementInfo[m_CharacterCount].fontAsset = m_Ellipsis.fontAsset;
@@ -846,7 +846,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
                             // End Of Text
                             characterToSubstitute.index = m_CharacterCount + 1;
-                            characterToSubstitute.unicode = 0x03;
+                            characterToSubstitute.unicode = k_EndOfText;
                             break;
                     }
                 }
@@ -855,7 +855,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
                 // When using Linked text, mark character as ignored and skip to next character.
                 #region Linked Text
-                if (m_CharacterCount < generationSettings.firstVisibleCharacter && charCode != 0x03)
+                if (m_CharacterCount < generationSettings.firstVisibleCharacter && charCode != k_EndOfText)
                 {
                     textInfo.textElementInfo[m_CharacterCount].isVisible = false;
                     textInfo.textElementInfo[m_CharacterCount].character = (char)k_ZeroWidthSpace;
@@ -907,14 +907,12 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 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].textElement.textAsset as SpriteAsset;
-                    m_SpriteIndex = (int)textInfo.textElementInfo[m_CharacterCount].textElement.glyphIndex;
+                    SpriteCharacter sprite = (SpriteCharacter)textInfo.textElementInfo[m_CharacterCount].textElement;
+                    m_CurrentSpriteAsset = sprite.textAsset as SpriteAsset;
+                    m_SpriteIndex = (int)sprite.glyphIndex;
 
-                    SpriteCharacter sprite = m_CurrentSpriteAsset.spriteCharacterTable[m_SpriteIndex];
                     if (sprite == null)
-                    {
                         continue;
-                    }
 
                     // Sprites are assigned in the E000 Private Area + sprite Index
                     if (charCode == '<')
@@ -975,7 +973,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         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)
+                    if (isInjectedCharacter && charCode == k_HorizontalEllipsis)
                     {
                         elementAscentLine = 0;
                         elementDescentLine = 0;
@@ -992,15 +990,16 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     textInfo.textElementInfo[m_CharacterCount].elementType = TextElementType.Character;
                     textInfo.textElementInfo[m_CharacterCount].scale = currentElementScale;
 
-                    padding = m_CurrentMaterialIndex == 0 ? m_Padding : GetPaddingForMaterial(m_CurrentMaterial, generationSettings.extraPadding);
+                    padding = m_Padding;
                 }
+
                 #endregion
 
 
                 // Handle Soft Hyphen
                 #region Handle Soft Hyphen
                 float currentElementUnmodifiedScale = currentElementScale;
-                if (charCode == 0xAD || charCode == 0x03)
+                if (charCode == 0xAD || charCode == k_EndOfText)
                     currentElementScale = 0;
                 #endregion
 
@@ -1235,15 +1234,14 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 {
                     // Shift Top vertices forward by half (Shear Value * height of character) and Bottom vertices back by same amount.
                     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;
+                    float midPoint = ((m_CurrentFontAsset.m_FaceInfo.capLine - (m_CurrentFontAsset.m_FaceInfo.baseline + m_BaselineOffset)) / 2) * m_FontScaleMultiplier * m_CurrentFontAsset.m_FaceInfo.scale;
+                    Vector3 topShear = new Vector3(shearValue * ((currentGlyphMetrics.horizontalBearingY + padding + stylePadding - midPoint) * currentElementScale), 0, 0);
+                    Vector3 bottomShear = new Vector3(shearValue * (((currentGlyphMetrics.horizontalBearingY - currentGlyphMetrics.height - padding - stylePadding - midPoint)) * currentElementScale), 0, 0);
+
+                    topLeft += topShear;
+                    bottomLeft += bottomShear;
+                    topRight += topShear;
+                    bottomRight += bottomShear;
                 }
                 #endregion Handle Italics & Shearing
 
@@ -1348,7 +1346,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
                 // Setup Mesh for visible text elements. ie. not a SPACE / LINEFEED / CARRIAGE RETURN.
                 #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)
+                if (charCode == k_Tab || ((wordWrap == TextWrappingMode.PreserveWhitespace || wordWrap == TextWrappingMode.PreserveWhitespaceNoWrap) && (isWhiteSpace || charCode == k_ZeroWidthSpace)) || (isWhiteSpace == false && charCode != k_ZeroWidthSpace && charCode != 0xAD && charCode != k_EndOfText) || (charCode == 0xAD && isSoftHyphenIgnored == false) || m_TextElementType == TextElementType.Sprite)
                 {
                     textInfo.textElementInfo[m_CharacterCount].isVisible = true;
 
@@ -1457,36 +1455,40 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                 i = RestoreWordWrappingState(ref m_SavedLastValidState, textInfo);
 
                                 characterToSubstitute.index = testedCharacterCount;
-                                //characterToSubstitute.unicode = 0x03;
+                                //characterToSubstitute.unicode = k_EndOfText;
                                 continue;
 
                             case TextOverflowMode.Ellipsis:
-                                if (m_EllipsisInsertionCandidateStack.Count == 0)
+                                if (m_LineNumber > 0)
                                 {
-                                    i = -1;
-                                    m_CharacterCount = 0;
-                                    characterToSubstitute.index = 0;
-                                    characterToSubstitute.unicode = 0x03;
-                                    m_FirstCharacterOfLine = 0;
-                                    continue;
-                                }
+                                    if (m_EllipsisInsertionCandidateStack.Count == 0)
+                                    {
+                                        i = -1;
+                                        m_CharacterCount = 0;
+                                        characterToSubstitute.index = 0;
+                                        characterToSubstitute.unicode = k_EndOfText;
+                                        m_FirstCharacterOfLine = 0;
+                                        continue;
+                                    }
 
-                                var ellipsisState = m_EllipsisInsertionCandidateStack.Pop();
-                                i = RestoreWordWrappingState(ref ellipsisState, textInfo);
+                                    var ellipsisState = m_EllipsisInsertionCandidateStack.Pop();
+                                    i = RestoreWordWrappingState(ref ellipsisState, textInfo);
 
-                                i -= 1;
-                                m_CharacterCount -= 1;
-                                characterToSubstitute.index = m_CharacterCount;
-                                characterToSubstitute.unicode = 0x2026;
+                                    i -= 1;
+                                    m_CharacterCount -= 1;
+                                    characterToSubstitute.index = m_CharacterCount;
+                                    characterToSubstitute.unicode = k_HorizontalEllipsis;
 
-                                restoreCount += 1;
-                                continue;
+                                    restoreCount += 1;
+                                    continue;
+                                }
+                                break;
                             case TextOverflowMode.Linked:
                                 i = RestoreWordWrappingState(ref m_SavedLastValidState, textInfo);
 
                                 // Truncate remaining text
                                 characterToSubstitute.index = testedCharacterCount;
-                                characterToSubstitute.unicode = 0x03;
+                                characterToSubstitute.unicode = k_EndOfText;
                                 continue;
 
                             case TextOverflowMode.Page:
@@ -1496,7 +1498,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                     i = -1;
                                     m_CharacterCount = 0;
                                     characterToSubstitute.index = 0;
-                                    characterToSubstitute.unicode = 0x03;
+                                    characterToSubstitute.unicode = k_EndOfText;
                                     continue;
                                 }
                                 else if (m_MaxLineAscender - m_MaxLineDescender > marginHeight + 0.0001f)
@@ -1506,7 +1508,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                     i = RestoreWordWrappingState(ref m_SavedLineState, textInfo);
 
                                     characterToSubstitute.index = testedCharacterCount;
-                                    characterToSubstitute.unicode = 0x03;
+                                    characterToSubstitute.unicode = k_EndOfText;
                                     continue;
                                 }
 
@@ -1712,7 +1714,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                         i = RestoreWordWrappingState(ref m_SavedLastValidState, textInfo);
 
                                         characterToSubstitute.index = testedCharacterCount;
-                                        characterToSubstitute.unicode = 0x03;
+                                        characterToSubstitute.unicode = k_EndOfText;
                                         continue;
 
                                     case TextOverflowMode.Ellipsis:
@@ -1721,7 +1723,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                             i = -1;
                                             m_CharacterCount = 0;
                                             characterToSubstitute.index = 0;
-                                            characterToSubstitute.unicode = 0x03;
+                                            characterToSubstitute.unicode = k_EndOfText;
                                             m_FirstCharacterOfLine = 0;
                                             continue;
                                         }
@@ -1732,14 +1734,14 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                         i -= 1;
                                         m_CharacterCount -= 1;
                                         characterToSubstitute.index = m_CharacterCount;
-                                        characterToSubstitute.unicode = 0x2026;
+                                        characterToSubstitute.unicode = k_HorizontalEllipsis;
 
                                         restoreCount += 1;
                                         continue;
                                     case TextOverflowMode.Linked:
                                         // Truncate remaining text
                                         characterToSubstitute.index = m_CharacterCount;
-                                        characterToSubstitute.unicode = 0x03;
+                                        characterToSubstitute.unicode = k_EndOfText;
                                         continue;
 
                                     case TextOverflowMode.Page:
@@ -1844,7 +1846,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                     i = RestoreWordWrappingState(ref m_SavedWordWrapState, textInfo);
 
                                     characterToSubstitute.index = testedCharacterCount;
-                                    characterToSubstitute.unicode = 0x03;
+                                    characterToSubstitute.unicode = k_EndOfText;
                                     continue;
 
                                 case TextOverflowMode.Ellipsis:
@@ -1853,7 +1855,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                         i = -1;
                                         m_CharacterCount = 0;
                                         characterToSubstitute.index = 0;
-                                        characterToSubstitute.unicode = 0x03;
+                                        characterToSubstitute.unicode = k_EndOfText;
                                         m_FirstCharacterOfLine = 0;
                                         continue;
                                     }
@@ -1864,7 +1866,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                     i -= 1;
                                     m_CharacterCount -= 1;
                                     characterToSubstitute.index = m_CharacterCount;
-                                    characterToSubstitute.unicode = 0x2026;
+                                    characterToSubstitute.unicode = k_HorizontalEllipsis;
 
                                     restoreCount += 1;
                                     continue;
@@ -1873,7 +1875,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
                                     // Truncate text the overflows the vertical bounds
                                     characterToSubstitute.index = m_CharacterCount;
-                                    characterToSubstitute.unicode = 0x03;
+                                    characterToSubstitute.unicode = k_EndOfText;
                                     continue;
                             }
 
@@ -1948,7 +1950,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
                             // Truncate remaining text
                             characterToSubstitute.index = testedCharacterCount;
-                            characterToSubstitute.unicode = 0x03;
+                            characterToSubstitute.unicode = k_EndOfText;
                             continue;
                         }
                     }
@@ -1991,7 +1993,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     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;
 
-                    if (textWidth < widthOfTextAreaForEllipsis * (isJustifiedOrFlush ? 1.05f : 1.0f) && textHeight < marginHeight + 0.0001f)
+                    if (textWidth < widthOfTextAreaForEllipsis * (isJustifiedOrFlush ? 1.05f : 1.0f))
                     {
                         SaveWordWrappingState(ref m_SavedEllipsisState, i, m_CharacterCount, textInfo);
                         m_EllipsisInsertionCandidateStack.Push(m_SavedEllipsisState);
@@ -2012,32 +2014,36 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
                 // Handle xAdvance & Tabulation Stops. Tab stops at every 25% of Font Size.
                 #region XAdvance, Tabulation & Stops
-                if (charCode == k_Tab)
-                {
-                    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 + ((m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment) * currentEmScale) + m_CSpacing) * (1 - m_CharWidthAdjDelta);
 
-                    if (isWhiteSpace || charCode == k_ZeroWidthSpace)
-                        m_XAdvance += generationSettings.wordSpacing * currentEmScale;
-                }
-                else if (generationSettings.isRightToLeft)
+                if (charCode != k_ZeroWidthSpace)
                 {
-                    m_XAdvance -= ((glyphAdjustments.xAdvance * currentElementScale + (m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment + boldSpacingAdjustment) * currentEmScale + m_CSpacing) * (1 - m_CharWidthAdjDelta));
+                    if (charCode == k_Tab)
+                    {
+                        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 + ((m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment) * currentEmScale) + m_CSpacing) * (1 - m_CharWidthAdjDelta);
 
-                    if (isWhiteSpace || charCode == k_ZeroWidthSpace)
-                        m_XAdvance -= generationSettings.wordSpacing * currentEmScale;
-                }
-                else
-                {
-                    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;
+                    }
+                    else if (generationSettings.isRightToLeft)
+                    {
+                        m_XAdvance -= ((glyphAdjustments.xAdvance * currentElementScale + (m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment + boldSpacingAdjustment) * currentEmScale + m_CSpacing) * (1 - m_CharWidthAdjDelta));
 
-                    if (isWhiteSpace || charCode == k_ZeroWidthSpace)
-                        m_XAdvance += generationSettings.wordSpacing * currentEmScale;
+                        if (isWhiteSpace || charCode == k_ZeroWidthSpace)
+                            m_XAdvance -= generationSettings.wordSpacing * currentEmScale;
+                    }
+                    else
+                    {
+                        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
@@ -2081,7 +2087,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
                 // Handle Line Spacing Adjustments + Word Wrapping & special case for last line.
                 #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)
+                if (charCode == k_LineFeed || charCode == 11 || charCode == k_EndOfText || charCode == 0x2028 || charCode == 0x2029 || (charCode == 0x2D && isInjectedCharacter) || m_CharacterCount == totalCharacterCount - 1)
                 {
                     // Adjust current line spacing (if necessary) before inserting new line
                     float baselineAdjustmentDelta = m_MaxLineAscender - m_StartOfLineAscender;
@@ -2191,7 +2197,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     }
 
                     // If End of Text
-                    if (charCode == 0x03)
+                    if (charCode == k_EndOfText)
                         i = m_TextProcessingArray.Length;
                 }
                 #endregion Check for Linefeed or Last Character
@@ -2314,17 +2320,16 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 Debug.Log("Auto Size Iteration Count: " + m_AutoSizeIterationCount + ". Final Point Size: " + m_FontSize);
 
             // 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))
+            if (m_CharacterCount == 0 || (m_CharacterCount == 1 && charCode == k_EndOfText))
             {
                 ClearMesh(true, textInfo);
                 return;
             }
 
             // *** PHASE II of Text Generation ***
-            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);
+            textInfo.meshInfo[m_CurrentMaterialIndex].Clear(false);
 
             // Handle Text Alignment
             #region Text Vertical Alignment
@@ -2508,7 +2513,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     case TextAlignment.MidlineFlush:
                     case TextAlignment.CaplineFlush:
                         // 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;
+                        if (i > lineInfo.lastVisibleCharacterIndex || unicode == 0x0A || unicode == 0xAD || unicode == k_ZeroWidthSpace || unicode == k_WordJoiner || unicode == k_EndOfText) break;
 
                         char lastCharOfCurrentLine = textElementInfos[lineInfo.lastCharacterIndex].character;
 
@@ -2535,7 +2540,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                             {
                                 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;
+                                int spaces = lineInfo.spaceCount - lineInfo.controlCharacterCount;
 
                                 if (isFirstSeperator) { spaces -= 1; visibleCount += 1; }
 
@@ -2886,7 +2891,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 {
                     bool isUnderlineVisible = true;
                     int currentPage = textInfo.textElementInfo[i].pageNumber;
-                    textInfo.textElementInfo[i].underlineVertexIndex = lastVertIndex;
+                    textInfo.textElementInfo[i].underlineVertexIndex = m_MaterialReferences[m_Underline.materialIndex].referenceCount * 4;
 
                     if (i > generationSettings.maxVisibleCharacters || currentLine > generationSettings.maxVisibleLines || (generationSettings.overflowMode == TextOverflowMode.Page && currentPage + 1 != generationSettings.pageToDisplay))
                         isUnderlineVisible = false;
@@ -2896,7 +2901,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     {
                         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);
+                        underlineBaseLine = Mathf.Min(currentPage == lastPage ? underlineBaseLine : TextGeneratorUtilities.largePositiveFloat, textInfo.textElementInfo[i].baseLine + currentFontAsset.faceInfo.underlineOffset * underlineMaxScale);
                         lastPage = currentPage; // Need to track pages to ensure we reset baseline for the new pages.
                     }
 
@@ -2925,7 +2930,7 @@ 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, xScaleMax, underlineColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(underlineStart, underlineEnd, underlineStartScale, underlineEndScale, underlineMaxScale, xScaleMax, underlineColor, generationSettings, textInfo);
                         underlineMaxScale = 0;
                         xScaleMax = 0;
                         underlineBaseLine = TextGeneratorUtilities.largePositiveFloat;
@@ -2946,7 +2951,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         }
 
                         beginUnderline = false;
-                        DrawUnderlineMesh(underlineStart, underlineEnd, ref lastVertIndex, underlineStartScale, underlineEndScale, underlineMaxScale, xScaleMax, underlineColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(underlineStart, underlineEnd, underlineStartScale, underlineEndScale, underlineMaxScale, xScaleMax, underlineColor, generationSettings, textInfo);
                         underlineMaxScale = 0;
                         xScaleMax = 0;
                         underlineBaseLine = TextGeneratorUtilities.largePositiveFloat;
@@ -2957,7 +2962,7 @@ 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, xScaleMax, underlineColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(underlineStart, underlineEnd, underlineStartScale, underlineEndScale, underlineMaxScale, xScaleMax, underlineColor, generationSettings, textInfo);
                         underlineMaxScale = 0;
                         xScaleMax = 0;
                         underlineBaseLine = TextGeneratorUtilities.largePositiveFloat;
@@ -2969,7 +2974,7 @@ 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, xScaleMax, underlineColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(underlineStart, underlineEnd, underlineStartScale, underlineEndScale, underlineMaxScale, xScaleMax, underlineColor, generationSettings, textInfo);
                         underlineMaxScale = 0;
                         xScaleMax = 0;
                         underlineBaseLine = TextGeneratorUtilities.largePositiveFloat;
@@ -2984,7 +2989,7 @@ 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, xScaleMax, underlineColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(underlineStart, underlineEnd, underlineStartScale, underlineEndScale, underlineMaxScale, xScaleMax, underlineColor, generationSettings, textInfo);
                         underlineMaxScale = 0;
                         xScaleMax = 0;
                         underlineBaseLine = TextGeneratorUtilities.largePositiveFloat;
@@ -2997,12 +3002,12 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 #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.m_FaceInfo.strikethroughOffset;
+                float strikethroughOffset = currentFontAsset.faceInfo.strikethroughOffset;
 
                 if (isStrikethrough)
                 {
                     bool isStrikeThroughVisible = true;
-                    textInfo.textElementInfo[i].strikethroughVertexIndex = lastVertIndex;
+                    textInfo.textElementInfo[i].strikethroughVertexIndex = m_MaterialReferences[m_Underline.materialIndex].referenceCount * 4;
 
                     if (i > generationSettings.maxVisibleCharacters || currentLine > generationSettings.maxVisibleLines || (generationSettings.overflowMode == TextOverflowMode.Page && textInfo.textElementInfo[i].pageNumber + 1 != generationSettings.pageToDisplay))
                         isStrikeThroughVisible = false;
@@ -3028,7 +3033,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         beginStrikethrough = false;
                         strikethroughEnd = new Vector3(textInfo.textElementInfo[i].topRight.x, textInfo.textElementInfo[i].baseLine + strikethroughOffset * strikethroughScale, 0);
 
-                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, ref lastVertIndex, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
                     }
                     else if (beginStrikethrough && i == lineInfo.lastCharacterIndex)
                     {
@@ -3045,7 +3050,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         }
 
                         beginStrikethrough = false;
-                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, ref lastVertIndex, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
                     }
                     else if (beginStrikethrough && i < m_CharacterCount && (textInfo.textElementInfo[i + 1].pointSize != strikethroughPointSize || !TextGeneratorUtilities.Approximately(textInfo.textElementInfo[i + 1].baseLine + offset.y, strikethroughBaseline)))
                     {
@@ -3058,7 +3063,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         else
                             strikethroughEnd = new Vector3(textInfo.textElementInfo[i].topRight.x, textInfo.textElementInfo[i].baseLine + strikethroughOffset * strikethroughScale, 0);
 
-                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, ref lastVertIndex, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
                     }
                     else if (beginStrikethrough && i < m_CharacterCount && currentFontAsset.GetInstanceID() != textElementInfos[i + 1].fontAsset.GetInstanceID())
                     {
@@ -3066,7 +3071,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         beginStrikethrough = false;
                         strikethroughEnd = new Vector3(textInfo.textElementInfo[i].topRight.x, textInfo.textElementInfo[i].baseLine + strikethroughOffset * strikethroughScale, 0);
 
-                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, ref lastVertIndex, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
                     }
                     else if (beginStrikethrough && !isStrikeThroughVisible)
                     {
@@ -3074,7 +3079,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         beginStrikethrough = false;
                         strikethroughEnd = new Vector3(textInfo.textElementInfo[i - 1].topRight.x, textInfo.textElementInfo[i - 1].baseLine + strikethroughOffset * strikethroughScale, 0);
 
-                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, ref lastVertIndex, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
                     }
                 }
                 else
@@ -3085,7 +3090,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         beginStrikethrough = false;
                         strikethroughEnd = new Vector3(textInfo.textElementInfo[i - 1].topRight.x, textInfo.textElementInfo[i - 1].baseLine + strikethroughOffset * strikethroughScale, 0);
 
-                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, ref lastVertIndex, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(strikethroughStart, strikethroughEnd, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
                     }
                 }
                 #endregion
@@ -3134,7 +3139,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                             highlightStart.y = Mathf.Min(highlightStart.y, currentCharacter.descender);
                             highlightEnd.y = Mathf.Max(highlightEnd.y, currentCharacter.ascender);
 
-                            DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightState.color, generationSettings, textInfo);
+                            DrawTextHighlight(highlightStart, highlightEnd, highlightState.color, generationSettings, textInfo);
 
                             beginHighlight = true;
                             highlightStart = new Vector2(highlightEnd.x, currentCharacter.descender - currentState.padding.bottom);
@@ -3174,17 +3179,17 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     {
                         beginHighlight = false;
 
-                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightState.color, generationSettings, textInfo);
+                        DrawTextHighlight(highlightStart, highlightEnd, highlightState.color, generationSettings, textInfo);
                     }
                     else if (beginHighlight && (i == lineInfo.lastCharacterIndex || i >= lineInfo.lastVisibleCharacterIndex))
                     {
                         beginHighlight = false;
-                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightState.color, generationSettings, textInfo);
+                        DrawTextHighlight(highlightStart, highlightEnd, highlightState.color, generationSettings, textInfo);
                     }
                     else if (beginHighlight && !isHighlightVisible)
                     {
                         beginHighlight = false;
-                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightState.color, generationSettings, textInfo);
+                        DrawTextHighlight(highlightStart, highlightEnd, highlightState.color, generationSettings, textInfo);
                     }
                 }
                 else
@@ -3193,7 +3198,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     if (beginHighlight == true)
                     {
                         beginHighlight = false;
-                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightState.color, generationSettings, textInfo);
+                        DrawTextHighlight(highlightStart, highlightEnd, highlightState.color, generationSettings, textInfo);
                     }
                 }
                 #endregion
@@ -3202,9 +3207,6 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
             }
             #endregion
 
-            // Set vertex count for Underline geometry
-            textInfo.meshInfo[m_Underline.materialIndex].vertexCount = lastVertIndex;
-
             // METRICS ABOUT THE TEXT OBJECT
             textInfo.characterCount = m_CharacterCount;
             textInfo.spriteCount = m_SpriteCount;
@@ -3215,9 +3217,6 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
             // Phase III - Update Mesh Vertex Data
 
             // *** UPLOAD MESH DATA ***
-            if (generationSettings.geometrySortingOrder != VertexSortingOrder.Normal)
-                textInfo.meshInfo[0].SortGeometry(VertexSortingOrder.Reverse);
-
             for (int i = 1; i < textInfo.materialCount; i++)
             {
                 // Clear unused vertices
@@ -3248,7 +3247,7 @@ void SaveWordWrappingState(ref WordWrapState state, int index, int count, TextIn
             state.lastVisibleCharIndex = m_LastVisibleCharacterOfLine;
 
             state.fontStyle = m_FontStyleInternal;
-            state.fontScale = m_FontScale;
+            state.italicAngle = m_ItalicAngle;
 
             state.fontScaleMultiplier = m_FontScaleMultiplier;
             state.currentFontSize = m_CurrentFontSize;
@@ -3328,7 +3327,6 @@ protected int RestoreWordWrappingState(ref WordWrapState state, TextInfo textInf
 
             m_FontStyleInternal = state.fontStyle;
             m_ItalicAngle = state.italicAngle;
-            m_FontScale = state.fontScale;
             m_FontScaleMultiplier = state.fontScaleMultiplier;
 
             m_CurrentFontSize = state.currentFontSize;
@@ -3513,7 +3511,7 @@ protected bool ValidateHtmlTag(TextProcessingElement[] chars, int startIndex, ou
                         else if (tagValueType == TagValueType.StringValue)
                         {
                             // Compute HashCode value for the named tag.
-                            if (unicode != '"')
+                            if (generationSettings.isIMGUI || unicode != '"')
                             {
                                 m_XmlAttribute[attributeIndex].valueHashCode = (m_XmlAttribute[attributeIndex].valueHashCode << 5) + m_XmlAttribute[attributeIndex].valueHashCode ^ TextGeneratorUtilities.ToUpperFast((char)unicode);
                                 m_XmlAttribute[attributeIndex].valueLength += 1;
@@ -3563,7 +3561,6 @@ protected bool ValidateHtmlTag(TextProcessingElement[] chars, int startIndex, ou
 
                 if (attributeFlag == 2 && unicode == ' ')
                     attributeFlag = 0;
-
             }
 
             if (!isValidHtmlTag)
@@ -3667,6 +3664,7 @@ protected bool ValidateHtmlTag(TextProcessingElement[] chars, int startIndex, ou
                         {
                             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);
+                            textInfo.hasMultipleColors = true;
                         }
                         else
                             m_StrikethroughColor = m_HtmlColor;
@@ -3691,6 +3689,7 @@ protected bool ValidateHtmlTag(TextProcessingElement[] chars, int startIndex, ou
                         {
                             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);
+                            textInfo.hasMultipleColors = true;
                         }
                         else
                             m_UnderlineColor = m_HtmlColor;
@@ -3745,6 +3744,7 @@ protected bool ValidateHtmlTag(TextProcessingElement[] chars, int startIndex, ou
 
                         m_HighlightState = new HighlightState(highlightColor, highlightPadding);
                         m_HighlightStateStack.Push(m_HighlightState);
+                        textInfo.hasMultipleColors = true;
 
                         return true;
                     case MarkupTag.SLASH_MARK:
@@ -4138,7 +4138,22 @@ protected bool ValidateHtmlTag(TextProcessingElement[] chars, int startIndex, ou
                     case MarkupTag.A:
                         if (m_isTextLayoutPhase && !m_IsCalculatingPreferredValues)
                         {
-                            if (m_XmlAttribute[1].nameHashCode == (int)MarkupTag.HREF)
+                            // For IMGUI, we want to treat the a tag as we do with the link tag
+                            if (generationSettings.isIMGUI)
+                            {
+                                int index = textInfo.linkCount;
+
+                                if (index + 1 > textInfo.linkInfo.Length)
+                                    TextInfo.Resize(ref textInfo.linkInfo, index + 1);
+
+                                textInfo.linkInfo[index].hashCode = (int)MarkupTag.HREF;
+                                textInfo.linkInfo[index].linkTextfirstCharacterIndex = m_CharacterCount;
+
+                                textInfo.linkInfo[index].linkIdFirstCharacterIndex = 3;
+                                if (m_XmlAttribute[1].valueLength > 0)
+                                    textInfo.linkInfo[index].SetLinkId(m_HtmlTag, 2, m_XmlAttribute[1].valueLength + m_XmlAttribute[1].valueStartIndex - 2);
+                            }
+                            else if (m_XmlAttribute[1].nameHashCode == (int)MarkupTag.HREF)
                             {
                                 // Make sure linkInfo array is of appropriate size.
                                 int index = textInfo.linkCount;
@@ -4157,11 +4172,17 @@ protected bool ValidateHtmlTag(TextProcessingElement[] chars, int startIndex, ou
                     case MarkupTag.SLASH_A:
                         if (m_isTextLayoutPhase && !m_IsCalculatingPreferredValues)
                         {
-                            int index = textInfo.linkCount;
-
-                            textInfo.linkInfo[index].linkTextLength = m_CharacterCount - textInfo.linkInfo[index].linkTextfirstCharacterIndex;
-
-                            textInfo.linkCount += 1;
+                            if (textInfo.linkInfo.Length <= 0)
+                            {
+                                if (generationSettings.textSettings.displayWarnings)
+                                    Debug.LogWarning($"There seems to be an issue with the formatting of the <a> tag. Possible issues include: missing or misplaced closing '>', missing or incorrect attribute, or unclosed quotes for attribute values. Please review the tag syntax.");
+                            }
+                            else
+                            {
+                                int index = textInfo.linkCount;
+                                textInfo.linkInfo[index].linkTextLength = m_CharacterCount - textInfo.linkInfo[index].linkTextfirstCharacterIndex;
+                                textInfo.linkCount += 1;
+                            }
                         }
                         return true;
 
@@ -4281,6 +4302,7 @@ protected bool ValidateHtmlTag(TextProcessingElement[] chars, int startIndex, ou
                     //    }
                     //    return true;
                     case MarkupTag.COLOR:
+                        textInfo.hasMultipleColors = true;
                         // <color=#FFF> 3 Hex (short hand)
                         if (m_HtmlTag[6] == k_NumberSign && tagCharCount == k_LineFeed)
                         {
@@ -4317,7 +4339,7 @@ protected bool ValidateHtmlTag(TextProcessingElement[] chars, int startIndex, ou
                                 m_HtmlColor = Color.red;
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
-                            case -992792864: // <color=lightblue>
+                            case (int)MarkupTag.LIGHTBLUE: // <color=lightblue>
                                 m_HtmlColor = new Color32(173, 216, 230, 255);
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
@@ -4325,7 +4347,7 @@ protected bool ValidateHtmlTag(TextProcessingElement[] chars, int startIndex, ou
                                 m_HtmlColor = Color.blue;
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
-                            case 3680713: // <color=grey>
+                            case (int)MarkupTag.GREY: // <color=grey>
                                 m_HtmlColor = new Color32(128, 128, 128, 255);
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
@@ -5051,9 +5073,7 @@ void SaveGlyphVertexInfo(float padding, float stylePadding, Color32 vertexColor,
             }
             #endregion
 
-            // Apply stylePadding only if this is a SDF Shader.
-            if (!m_IsSdfShader)
-                stylePadding = 0;
+            stylePadding = 0;
 
             // Setup UVs for the Character
             #region Setup UVs
@@ -5170,29 +5190,27 @@ void SaveSpriteVertexInfo(Color32 vertexColor, TextGenerationSettings generation
         /// <param name="underlineColor"></param>
         /// <param name="generationSettings"></param>
         /// <param name="textInfo"></param>
-        void DrawUnderlineMesh(Vector3 start, Vector3 end, ref int index, float startScale, float endScale, float maxScale, float sdfScale, Color32 underlineColor, TextGenerationSettings generationSettings, TextInfo textInfo)
+        void DrawUnderlineMesh(Vector3 start, Vector3 end, float startScale, float endScale, float maxScale, float sdfScale, Color32 underlineColor, TextGenerationSettings generationSettings, TextInfo textInfo)
         {
-            TextSettings textSettings = generationSettings.textSettings;
-
             // Get Underline special character from the primary font asset.
             GetUnderlineSpecialCharacter(generationSettings);
 
             if (m_Underline.character == null)
             {
-                if (textSettings.displayWarnings)
+                if (generationSettings.textSettings.displayWarnings)
                     Debug.LogWarning("Unable to add underline or strikethrough since the character [0x5F] used by these features is not present in the Font Asset assigned to this text object.");
                 return;
             }
 
-            int underlineMaterialIndex = m_Underline.materialIndex;
-
-            int verticesCount = index + 12;
+            const int k_VertexIncrease = 12;
+            int index = textInfo.meshInfo[m_CurrentMaterialIndex].vertexCount;
+            int newVerticesCount = index + k_VertexIncrease;
 
             // Check to make sure our current mesh buffer allocations can hold these new Quads.
-            if (verticesCount > textInfo.meshInfo[underlineMaterialIndex].vertices.Length)
+            if (newVerticesCount > textInfo.meshInfo[m_CurrentMaterialIndex].vertexBufferSize)
             {
                 // Resize Mesh Buffers
-                textInfo.meshInfo[underlineMaterialIndex].ResizeMeshInfo(verticesCount / 4);
+                textInfo.meshInfo[m_CurrentMaterialIndex].ResizeMeshInfo(newVerticesCount / 4);
             }
 
             // Adjust the position of the underline based on the lowest character. This matters for subscript character.
@@ -5216,25 +5234,49 @@ void DrawUnderlineMesh(Vector3 start, Vector3 end, ref int index, float startSca
 
             // UNDERLINE VERTICES FOR (3) LINE SEGMENTS
             #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
-            vertices[index + 1] = start + new Vector3(0, m_Padding * maxScale, 0); // TL
-            vertices[index + 2] = vertices[index + 1] + new Vector3(segmentWidth, 0, 0); // TR
-            vertices[index + 3] = vertices[index + 0] + new Vector3(segmentWidth, 0, 0); // BR
-
-            // Middle Part of the Underline
-            vertices[index + 4] = vertices[index + 3]; // BL
-            vertices[index + 5] = vertices[index + 2]; // TL
-            vertices[index + 6] = end + new Vector3(-segmentWidth, m_Padding * maxScale, 0); // TR
-            vertices[index + 7] = end + new Vector3(-segmentWidth, -(underlineThickness + m_Padding) * maxScale, 0); // BR
-
-            // End Part of the Underline
-            vertices[index + 8] = vertices[index + 7]; // BL
-            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
+            var vertexData = textInfo.meshInfo[m_CurrentMaterialIndex].vertexData;
+
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                // Front Part of the Underline
+                vertexData[index + 0].position = start + new Vector3(0, 0 - (underlineThickness + m_Padding) * maxScale, 0); // BL
+                vertexData[index + 1].position = start + new Vector3(0, m_Padding * maxScale, 0); // TL
+                vertexData[index + 2].position = vertexData[index + 1].position + new Vector3(segmentWidth, 0, 0); // TR
+                vertexData[index + 3].position = vertexData[index + 0].position + new Vector3(segmentWidth, 0, 0); // BR
+
+                // Middle Part of the Underline
+                vertexData[index + 4].position = vertexData[index + 3].position; // BL
+                vertexData[index + 5].position = vertexData[index + 2].position; // TL
+                vertexData[index + 6].position = end + new Vector3(-segmentWidth, m_Padding * maxScale, 0); // TR
+                vertexData[index + 7].position = end + new Vector3(-segmentWidth, -(underlineThickness + m_Padding) * maxScale, 0); // BR
+
+                // End Part of the Underline
+                vertexData[index + 8].position = vertexData[index + 7].position; // BL
+                vertexData[index + 9].position = vertexData[index + 6].position; // TL
+                vertexData[index + 10].position = end + new Vector3(0, m_Padding * maxScale, 0); // TR
+                vertexData[index + 11].position = end + new Vector3(0, -(underlineThickness + m_Padding) * maxScale, 0); // BR
+            }
+            else
+            {
+                Vector3[] vertices = textInfo.meshInfo[m_CurrentMaterialIndex].vertices;
+                // Front Part of the Underline
+                vertices[index + 0] = start + new Vector3(0, 0 - (underlineThickness + m_Padding) * maxScale, 0); // BL
+                vertices[index + 1] = start + new Vector3(0, m_Padding * maxScale, 0); // TL
+                vertices[index + 2] = vertices[index + 1] + new Vector3(segmentWidth, 0, 0); // TR
+                vertices[index + 3] = vertices[index + 0] + new Vector3(segmentWidth, 0, 0); // BR
+
+                // Middle Part of the Underline
+                vertices[index + 4] = vertices[index + 3]; // BL
+                vertices[index + 5] = vertices[index + 2]; // TL
+                vertices[index + 6] = end + new Vector3(-segmentWidth, m_Padding * maxScale, 0); // TR
+                vertices[index + 7] = end + new Vector3(-segmentWidth, -(underlineThickness + m_Padding) * maxScale, 0); // BR
+
+                // End Part of the Underline
+                vertices[index + 8] = vertices[index + 7]; // BL
+                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.
@@ -5242,40 +5284,29 @@ void DrawUnderlineMesh(Vector3 start, Vector3 end, ref int index, float startSca
             {
                 Vector3 axisOffset;
                 axisOffset.x = 0;
-                axisOffset.y = generationSettings.screenRect.y + generationSettings.screenRect.height;
+                axisOffset.y = generationSettings.screenRect.height;
                 axisOffset.z = 0;
 
-                //vertices[index + 0].x += axisOffset.x;
-                vertices[index + 0].y = (vertices[index + 0].y * -1) + axisOffset.y;
-                //vertices[index + 1].x += axisOffset.x;
-                vertices[index + 1].y = (vertices[index + 1].y * -1) + axisOffset.y;
-                //vertices[index + 2].x += axisOffset.x;
-                vertices[index + 2].y = (vertices[index + 2].y * -1) + axisOffset.y;
-                //vertices[index + 3].x += axisOffset.x;
-                vertices[index + 3].y = (vertices[index + 3].y * -1) + axisOffset.y;
-
-                //vertices[index + 4].x += axisOffset.x;
-                vertices[index + 4].y = (vertices[index + 4].y * -1) + axisOffset.y;
-                //vertices[index + 5].x += axisOffset.x;
-                vertices[index + 5].y = (vertices[index + 5].y * -1) + axisOffset.y;
-                //vertices[index + 6].x += axisOffset.x;
-                vertices[index + 6].y = (vertices[index + 6].y * -1) + axisOffset.y;
-                //vertices[index + 7].x += axisOffset.x;
-                vertices[index + 7].y = (vertices[index + 7].y * -1) + axisOffset.y;
-
-                //vertices[index + 8].x += axisOffset.x;
-                vertices[index + 8].y = (vertices[index + 8].y * -1) + axisOffset.y;
-                //vertices[index + 9].x += axisOffset.x;
-                vertices[index + 9].y = (vertices[index + 9].y * -1) + axisOffset.y;
-                //vertices[index + 10].x += axisOffset.x;
-                vertices[index + 10].y = (vertices[index + 10].y * -1) + axisOffset.y;
-                //vertices[index + 11].x += axisOffset.x;
-                vertices[index + 11].y = (vertices[index + 11].y * -1) + axisOffset.y;
+                if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+                {
+                    for (int i = 0; i < 12; i++)
+                    {
+                        //vertices[index + i].x += axisOffset.x;
+                        textInfo.meshInfo[m_CurrentMaterialIndex].vertexData[index + i].position.y = textInfo.meshInfo[m_CurrentMaterialIndex].vertexData[index + i].position.y * -1 + axisOffset.y;
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < 12; i++)
+                    {
+                        //vertices[index + i].x += axisOffset.x;
+                        textInfo.meshInfo[m_CurrentMaterialIndex].vertices[index + i].y = textInfo.meshInfo[m_CurrentMaterialIndex].vertices[index + i].y * -1 + axisOffset.y;
+                    }
+                }
             }
 
             // UNDERLINE UV0
             #region HANDLE UV0
-            Vector4[] uvs0 = textInfo.meshInfo[underlineMaterialIndex].uvs0;
 
             int atlasWidth = m_Underline.fontAsset.atlasWidth;
             int atlasHeight = m_Underline.fontAsset.atlasHeight;
@@ -5292,52 +5323,105 @@ void DrawUnderlineMesh(Vector3 start, Vector3 end, ref int index, float startSca
             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
-            uvs0[1 + index] = uv1; // TL
-            uvs0[2 + index] = uv2; // TR
-            uvs0[3 + index] = uv3; // BR
-
-            // Middle Part of the Underline
-            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;
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                // Left Part of the Underline
+                vertexData[0 + index].uv0 = uv0; // BL
+                vertexData[1 + index].uv0 = uv1; // TL
+                vertexData[2 + index].uv0 = uv2; // TR
+                vertexData[3 + index].uv0 = uv3; // BR
+
+                // Middle Part of the Underline
+                vertexData[4 + index].uv0 = new Vector4(uv2.x - uv2.x * 0.001f, uv0.y, 0, xScale);
+                vertexData[5 + index].uv0 = new Vector4(uv2.x - uv2.x * 0.001f, uv1.y, 0, xScale);
+                vertexData[6 + index].uv0 = new Vector4(uv2.x + uv2.x * 0.001f, uv1.y, 0, xScale);
+                vertexData[7 + index].uv0 = new Vector4(uv2.x + uv2.x * 0.001f, uv0.y, 0, xScale);
+
+                // Right Part of the Underline
+                vertexData[8 + index].uv0 = uv5;
+                vertexData[9 + index].uv0 = uv4;
+                vertexData[10 + index].uv0 = uv6;
+                vertexData[11 + index].uv0 = uv7;
+            }
+            else
+            {
+                Vector4[] uvs0 = textInfo.meshInfo[m_CurrentMaterialIndex].uvs0;
+                // Left Part of the Underline
+                uvs0[0 + index] = uv0; // BL
+                uvs0[1 + index] = uv1; // TL
+                uvs0[2 + index] = uv2; // TR
+                uvs0[3 + index] = uv3; // BR
+
+                // Middle Part of the Underline
+                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 = 0;
-            float maxUvX = (vertices[index + 2].x - start.x) / (end.x - start.x);
+            float min_UvX = 0;
+
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                float max_UvX = (vertexData[index + 2].position.x - start.x) / (end.x - start.x);
+
+                vertexData[0 + index].uv2 = new Vector2(0, 0);
+                vertexData[1 + index].uv2 = new Vector2(0, 1);
+                vertexData[2 + index].uv2 = new Vector2(max_UvX, 1);
+                vertexData[3 + index].uv2 = new Vector2(max_UvX, 0);
 
-            Vector2[] uvs2 = textInfo.meshInfo[underlineMaterialIndex].uvs2;
+                min_UvX = (vertexData[index + 4].position.x - start.x) / (end.x - start.x);
+                max_UvX = (vertexData[index + 6].position.x - start.x) / (end.x - start.x);
+
+                vertexData[4 + index].uv2 = new Vector2(min_UvX, 0);
+                vertexData[5 + index].uv2 = new Vector2(min_UvX, 1);
+                vertexData[6 + index].uv2 = new Vector2(max_UvX, 1);
+                vertexData[7 + index].uv2 = new Vector2(max_UvX, 0);
+
+                min_UvX = (vertexData[index + 8].position.x - start.x) / (end.x - start.x);
+
+                vertexData[8 + index].uv2 = new Vector2(min_UvX, 0);
+                vertexData[9 + index].uv2 = new Vector2(min_UvX, 1);
+                vertexData[10 + index].uv2 = new Vector2(1, 1);
+                vertexData[11 + index].uv2 = new Vector2(1, 0);
+            }
+            else
+            {
+                Vector3[] vertices = textInfo.meshInfo[m_CurrentMaterialIndex].vertices;
+                float max_UvX = (vertices[index + 2].x - start.x) / (end.x - start.x);
 
-            uvs2[0 + index] = TextGeneratorUtilities.PackUV(0, 0, xScale);
-            uvs2[1 + index] = TextGeneratorUtilities.PackUV(0, 1, xScale);
-            uvs2[2 + index] = TextGeneratorUtilities.PackUV(maxUvX, 1, xScale);
-            uvs2[3 + index] = TextGeneratorUtilities.PackUV(maxUvX, 0, xScale);
+                Vector2[] uvs2 = textInfo.meshInfo[m_CurrentMaterialIndex].uvs2;
 
-            minUvX = (vertices[index + 4].x - start.x) / (end.x - start.x);
-            maxUvX = (vertices[index + 6].x - start.x) / (end.x - start.x);
+                uvs2[0 + index] = new Vector2(0, 0);
+                uvs2[1 + index] = new Vector2(0, 1);
+                uvs2[2 + index] = new Vector2(max_UvX, 1);
+                uvs2[3 + index] = new Vector2(max_UvX, 0);
 
-            uvs2[4 + index] = TextGeneratorUtilities.PackUV(minUvX, 0, xScale);
-            uvs2[5 + index] = TextGeneratorUtilities.PackUV(minUvX, 1, xScale);
-            uvs2[6 + index] = TextGeneratorUtilities.PackUV(maxUvX, 1, xScale);
-            uvs2[7 + index] = TextGeneratorUtilities.PackUV(maxUvX, 0, xScale);
+                min_UvX = (vertices[index + 4].x - start.x) / (end.x - start.x);
+                max_UvX = (vertices[index + 6].x - start.x) / (end.x - start.x);
 
-            minUvX = (vertices[index + 8].x - start.x) / (end.x - start.x);
+                uvs2[4 + index] = new Vector2(min_UvX, 0);
+                uvs2[5 + index] = new Vector2(min_UvX, 1);
+                uvs2[6 + index] = new Vector2(max_UvX, 1);
+                uvs2[7 + index] = new Vector2(max_UvX, 0);
 
-            uvs2[8 + index] = TextGeneratorUtilities.PackUV(minUvX, 0, xScale);
-            uvs2[9 + index] = TextGeneratorUtilities.PackUV(minUvX, 1, xScale);
-            uvs2[10 + index] = TextGeneratorUtilities.PackUV(1, 1, xScale);
-            uvs2[11 + index] = TextGeneratorUtilities.PackUV(1, 0, xScale);
+                min_UvX = (vertices[index + 8].x - start.x) / (end.x - start.x);
+
+                uvs2[8 + index] = new Vector2(min_UvX, 0);
+                uvs2[9 + index] = new Vector2(min_UvX, 1);
+                uvs2[10 + index] = new Vector2(1, 1);
+                uvs2[11 + index] = new Vector2(1, 0);
+            }
             #endregion
 
             // UNDERLINE VERTEX COLORS
@@ -5345,85 +5429,100 @@ void DrawUnderlineMesh(Vector3 start, Vector3 end, ref int index, float startSca
             // 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;
 
-            Color32[] colors32 = textInfo.meshInfo[underlineMaterialIndex].colors32;
-            colors32[0 + index] = underlineColor;
-            colors32[1 + index] = underlineColor;
-            colors32[2 + index] = underlineColor;
-            colors32[3 + index] = underlineColor;
-
-            colors32[4 + index] = underlineColor;
-            colors32[5 + index] = underlineColor;
-            colors32[6 + index] = underlineColor;
-            colors32[7 + index] = underlineColor;
-
-            colors32[8 + index] = underlineColor;
-            colors32[9 + index] = underlineColor;
-            colors32[10 + index] = underlineColor;
-            colors32[11 + index] = underlineColor;
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                for (int i = 0; i < 12; i++)
+                {
+                    vertexData[i + index].color = underlineColor;
+                }
+            }
+            else
+            {
+                Color32[] colors32 = textInfo.meshInfo[m_CurrentMaterialIndex].colors32;
+                for (int i = 0; i < 12; i++)
+                {
+                    colors32[i + index] = underlineColor;
+                }
+            }
             #endregion
 
-            index += 12;
+            textInfo.meshInfo[m_CurrentMaterialIndex].vertexCount += k_VertexIncrease;
         }
 
-        void DrawTextHighlight(Vector3 start, Vector3 end, ref int index, Color32 highlightColor, TextGenerationSettings generationSettings, TextInfo textInfo)
+        void DrawTextHighlight(Vector3 start, Vector3 end, Color32 highlightColor, TextGenerationSettings generationSettings, TextInfo textInfo)
         {
-            TextSettings textSettings = generationSettings.textSettings;
+            GetUnderlineSpecialCharacter(generationSettings);
 
             if (m_Underline.character == null)
             {
-                GetUnderlineSpecialCharacter(generationSettings);
-
-                if (m_Underline.character == null)
-                {
-                    if (textSettings.displayWarnings)
-                        Debug.LogWarning("Unable to add highlight since the primary Font Asset doesn't contain the underline character.");
+                if (generationSettings.textSettings.displayWarnings)
+                    Debug.LogWarning("Unable to add highlight since the primary Font Asset doesn't contain the underline character.");
 
-                    return;
-                }
+                return;
             }
 
-            int underlineMaterialIndex = m_Underline.materialIndex;
-
-            int verticesCount = index + 4;
+            const int k_VertexIncrease = 4;
+            int index = textInfo.meshInfo[m_CurrentMaterialIndex].vertexCount;
+            int newVerticesCount = index + k_VertexIncrease;
 
             // Check to make sure our current mesh buffer allocations can hold these new Quads.
-            if (verticesCount > textInfo.meshInfo[underlineMaterialIndex].vertices.Length)
+            if (newVerticesCount > textInfo.meshInfo[m_CurrentMaterialIndex].vertexBufferSize)
             {
                 // Resize Mesh Buffers
-                textInfo.meshInfo[underlineMaterialIndex].ResizeMeshInfo(verticesCount / 4);
+                textInfo.meshInfo[m_CurrentMaterialIndex].ResizeMeshInfo(newVerticesCount / 4);
             }
 
+            var vertexData = textInfo.meshInfo[m_CurrentMaterialIndex].vertexData;
+
             // UNDERLINE VERTICES FOR (3) LINE SEGMENTS
             #region HIGHLIGHT VERTICES
-            Vector3[] vertices = textInfo.meshInfo[underlineMaterialIndex].vertices;
 
-            // Front Part of the Underline
-            vertices[index + 0] = start; // BL
-            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
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                vertexData[index + 0].position = start; // BL
+                vertexData[index + 1].position = new Vector3(start.x, end.y, 0); // TL
+                vertexData[index + 2].position = end; // TR
+                vertexData[index + 3].position = new Vector3(end.x, start.y, 0); // BR
+            }
+            else
+            {
+                Vector3[] vertices = textInfo.meshInfo[m_CurrentMaterialIndex].vertices;
+                // Front Part of the Underline
+                vertices[index + 0] = start; // BL
+                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
 
             if (generationSettings.inverseYAxis)
             {
                 Vector3 axisOffset;
                 axisOffset.x = 0;
-                axisOffset.y = generationSettings.screenRect.y + generationSettings.screenRect.height;
+                axisOffset.y = generationSettings.screenRect.height;
                 axisOffset.z = 0;
 
-                //vertices[index + 0].x += axisOffset.x;
-                vertices[index + 0].y = (vertices[index + 0].y * -1) + axisOffset.y;
-                //vertices[index + 1].x += axisOffset.x;
-                vertices[index + 1].y = (vertices[index + 1].y * -1) + axisOffset.y;
-                //vertices[index + 2].x += axisOffset.x;
-                vertices[index + 2].y = (vertices[index + 2].y * -1) + axisOffset.y;
-                //vertices[index + 3].x += axisOffset.x;
-                vertices[index + 3].y = (vertices[index + 3].y * -1) + axisOffset.y;
+                if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+                {
+                    for (int i = 0; i < 4; i++)
+                    {
+                        //vertices[index + 0].x += axisOffset.x;
+                        vertexData[index + i].position.y = vertexData[index + i].position.y * -1 + axisOffset.y;
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < 4; i++)
+                    {
+                        //vertices[index + 0].x += axisOffset.x;
+                        textInfo.meshInfo[m_CurrentMaterialIndex].vertices[index + i].y = textInfo.meshInfo[m_CurrentMaterialIndex].vertices[index + i].y * -1 + axisOffset.y;
+                    }
+                }
             }
 
             // UNDERLINE UV0
             #region HANDLE UV0
-            Vector4[] uvs0 = textInfo.meshInfo[underlineMaterialIndex].uvs0;
 
             int atlasWidth = m_Underline.fontAsset.atlasWidth;
             int atlasHeight = m_Underline.fontAsset.atlasHeight;
@@ -5433,21 +5532,46 @@ void DrawTextHighlight(Vector3 start, Vector3 end, ref int index, Color32 highli
             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);
 
-            // 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
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                // UVs for the Quad
+                vertexData[0 + index].uv0 = uvGlyphCenter - uvTexelSize; // BL
+                vertexData[1 + index].uv0 = uvGlyphCenter + new Vector2(-uvTexelSize.x, uvTexelSize.y); // TL
+                vertexData[2 + index].uv0 = uvGlyphCenter + uvTexelSize; // TR
+                vertexData[3 + index].uv0 = uvGlyphCenter + new Vector2(uvTexelSize.x, -uvTexelSize.y); // BR
+            }
+            else
+            {
+                Vector4[] uvs0 = textInfo.meshInfo[m_CurrentMaterialIndex].uvs0;
+                // 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
 
             // 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;
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                // HIGHLIGHT UV2
+                vertexData[0 + index].uv2 = customUV;
+                vertexData[1 + index].uv2 = customUV;
+                vertexData[2 + index].uv2 = customUV;
+                vertexData[3 + index].uv2 = customUV;
+            }
+            else
+            {
+                Vector2[] uvs2 = textInfo.meshInfo[m_CurrentMaterialIndex].uvs2;
+                // HIGHLIGHT UV2
+                uvs2[0 + index] = customUV;
+                uvs2[1 + index] = customUV;
+                uvs2[2 + index] = customUV;
+                uvs2[3 + index] = customUV;
+            }
             #endregion
 
             // HIGHLIGHT VERTEX COLORS
@@ -5455,14 +5579,24 @@ void DrawTextHighlight(Vector3 start, Vector3 end, ref int index, Color32 highli
             // 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;
 
-            Color32[] colors32 = textInfo.meshInfo[underlineMaterialIndex].colors32;
-            colors32[0 + index] = highlightColor;
-            colors32[1 + index] = highlightColor;
-            colors32[2 + index] = highlightColor;
-            colors32[3 + index] = highlightColor;
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                vertexData[0 + index].color = highlightColor;
+                vertexData[1 + index].color = highlightColor;
+                vertexData[2 + index].color = highlightColor;
+                vertexData[3 + index].color = highlightColor;
+            }
+            else
+            {
+                Color32[] colors = textInfo.meshInfo[m_CurrentMaterialIndex].colors32;
+                colors[0 + index] = highlightColor;
+                colors[1 + index] = highlightColor;
+                colors[2 + index] = highlightColor;
+                colors[3 + index] = highlightColor;
+            }
             #endregion
 
-            index += 4;
+            textInfo.meshInfo[m_CurrentMaterialIndex].vertexCount += k_VertexIncrease;
         }
 
         /// <summary>
@@ -5473,17 +5607,6 @@ static void ClearMesh(bool updateMesh, TextInfo textInfo)
             textInfo.ClearMeshInfo(updateMesh);
         }
 
-        void EnableMasking()
-        {
-            m_IsMaskingEnabled = true;
-        }
-
-        // Enable Masking in the Shader
-        void DisableMasking()
-        {
-            m_IsMaskingEnabled = false;
-        }
-
         internal int SetArraySizes(TextProcessingElement[] textProcessingArray, TextGenerationSettings generationSettings, TextInfo textInfo)
         {
             TextSettings textSettings = generationSettings.textSettings;
@@ -5491,7 +5614,6 @@ internal int SetArraySizes(TextProcessingElement[] textProcessingArray, TextGene
             int spriteCount = 0;
 
             m_TotalCharacterCount = 0;
-            m_IsUsingBold = false;
             m_isTextLayoutPhase = false;
             m_TagNoParsing = false;
             m_FontStyleInternal = generationSettings.fontStyle;
@@ -5510,7 +5632,7 @@ internal int SetArraySizes(TextProcessingElement[] textProcessingArray, TextGene
             MaterialReference.AddMaterialReference(m_CurrentMaterial, m_CurrentFontAsset, ref m_MaterialReferences, m_MaterialReferenceIndexLookup);
 
             if (textInfo == null)
-                textInfo = new TextInfo();
+                textInfo = new TextInfo(VertexDataLayout.Mesh);
             else if (textInfo.textElementInfo.Length < m_InternalTextProcessingArraySize)
                 TextInfo.Resize(ref textInfo.textElementInfo, m_InternalTextProcessingArraySize, false);
 
@@ -5593,8 +5715,8 @@ internal int SetArraySizes(TextProcessingElement[] textProcessingArray, TextGene
                         int tagStartIndex = textProcessingArray[i].stringIndex;
                         i = endTagIndex;
 
-                        if ((m_FontStyleInternal & FontStyles.Bold) == FontStyles.Bold)
-                            m_IsUsingBold = true;
+                        // if ((m_FontStyleInternal & FontStyles.Bold) == FontStyles.Bold)
+                        //     m_IsUsingBold = true;
 
                         if (m_TextElementType == TextElementType.Sprite)
                         {
@@ -5714,7 +5836,7 @@ internal int SetArraySizes(TextProcessingElement[] textProcessingArray, TextGene
                     if (character == null)
                     {
                         // Use End of Text (0x03) Glyph from the currently assigned font asset.
-                        unicode = textProcessingArray[i].unicode = 0x03;
+                        unicode = textProcessingArray[i].unicode = k_EndOfText;
                         character = FontAssetUtilities.GetCharacterFromFontAsset((uint)unicode, m_CurrentFontAsset, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
                     }
 
@@ -5894,16 +6016,16 @@ internal int SetArraySizes(TextProcessingElement[] textProcessingArray, TextGene
                 int referenceCount = m_MaterialReferences[i].referenceCount;
 
                 // Check to make sure buffer allocations can accommodate the required text elements.
-                if (textInfo.meshInfo[i].vertices == null || textInfo.meshInfo[i].vertices.Length < referenceCount * 4)
+                if ((textInfo.meshInfo[i].vertexData == null && textInfo.meshInfo[i].vertices == null) || textInfo.meshInfo[i].vertexBufferSize < referenceCount * 4)
                 {
-                    if (textInfo.meshInfo[i].vertices == null)
+                    if (textInfo.meshInfo[i].vertexData == null && textInfo.meshInfo[i].vertices == null)
                     {
-                        textInfo.meshInfo[i] = new MeshInfo(referenceCount + 1);
+                        textInfo.meshInfo[i] = new MeshInfo(referenceCount + 1, textInfo.vertexDataLayout);
                     }
                     else
                         textInfo.meshInfo[i].ResizeMeshInfo(referenceCount > 1024 ? referenceCount + 256 : Mathf.NextPowerOfTwo(referenceCount));
                 }
-                else if (textInfo.meshInfo[i].vertices.Length - referenceCount * 4 > 1024)
+                else if (textInfo.meshInfo[i].vertexBufferSize - referenceCount * 4 > 1024)
                 {
                     // Resize vertex buffers if allocations are excessive.
                     textInfo.meshInfo[i].ResizeMeshInfo(referenceCount > 1024 ? referenceCount + 256 : Mathf.Max(Mathf.NextPowerOfTwo(referenceCount), 256));
@@ -6081,31 +6203,31 @@ protected void GetEllipsisSpecialCharacter(TextGenerationSettings generationSett
         {
             bool isUsingAlternativeTypeface;
 
-            FontAsset fontAsset = generationSettings.fontAsset;
+            FontAsset fontAsset = m_CurrentFontAsset ?? generationSettings.fontAsset;
             TextSettings textSettings = generationSettings.textSettings;
 
             // Search base font asset
-            Character character = FontAssetUtilities.GetCharacterFromFontAsset(0x2026, fontAsset, false, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
+            Character character = FontAssetUtilities.GetCharacterFromFontAsset(k_HorizontalEllipsis, fontAsset, false, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
 
             if (character == null)
             {
                 // Search primary fallback list
                 if (fontAsset.m_FallbackFontAssetTable != null && fontAsset.m_FallbackFontAssetTable.Count > 0)
-                    character = FontAssetUtilities.GetCharacterFromFontAssets(0x2026, fontAsset, fontAsset.m_FallbackFontAssetTable, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
+                    character = FontAssetUtilities.GetCharacterFromFontAssets(k_HorizontalEllipsis, fontAsset, fontAsset.m_FallbackFontAssetTable, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
             }
 
             // 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);
+                    character = FontAssetUtilities.GetCharacterFromFontAssets(k_HorizontalEllipsis, fontAsset, textSettings.fallbackFontAssets, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
             }
 
             // Search the setting's default font asset
             if (character == null)
             {
                 if (textSettings.defaultFontAsset != null)
-                    character = FontAssetUtilities.GetCharacterFromFontAsset(0x2026, textSettings.defaultFontAsset, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
+                    character = FontAssetUtilities.GetCharacterFromFontAsset(k_HorizontalEllipsis, textSettings.defaultFontAsset, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
             }
 
             if (character != null)
@@ -6116,32 +6238,14 @@ protected void GetUnderlineSpecialCharacter(TextGenerationSettings generationSet
         {
             bool isUsingAlternativeTypeface;
 
-            FontAsset fontAsset = generationSettings.fontAsset;
+            FontAsset fontAsset = m_CurrentFontAsset ?? generationSettings.fontAsset;
             TextSettings textSettings = generationSettings.textSettings;
 
             // Search base font asset
             Character character = FontAssetUtilities.GetCharacterFromFontAsset(0x5F, fontAsset, false, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
 
             if (character != null)
-                m_Underline = new SpecialCharacter(character, 0);
-        }
-
-        /// <summary>
-        /// Get the padding value for the currently assigned material.
-        /// </summary>
-        /// <returns></returns>
-        float GetPaddingForMaterial(Material material, bool extraPadding)
-        {
-            TextShaderUtilities.GetShaderPropertyIDs();
-
-            if (material == null)
-                return 0;
-
-            m_Padding = TextShaderUtilities.GetPadding(material, extraPadding, m_IsUsingBold);
-            m_IsMaskingEnabled = TextShaderUtilities.IsMaskingEnabled(material);
-            m_IsSdfShader = material.HasProperty(TextShaderUtilities.ID_WeightNormal);
-
-            return m_Padding;
+                m_Underline = new SpecialCharacter(character, m_CurrentMaterialIndex);
         }
 
         /// <summary>
@@ -6199,7 +6303,7 @@ float GetPreferredHeightInternal(TextGenerationSettings generationSettings, Text
 
             while (m_IsAutoSizePointSizeSet == false)
             {
-                preferredHeight = CalculatePreferredValues(ref fontSize, margin, !generationSettings.autoSize, wrapMode, generationSettings, textInfo).y;
+                preferredHeight = CalculatePreferredValues(ref fontSize, margin, generationSettings.autoSize, wrapMode, generationSettings, textInfo).y;
                 m_AutoSizeIterationCount += 1;
             }
 
@@ -6218,12 +6322,12 @@ Vector2 GetPreferredValuesInternal(TextGenerationSettings generationSettings, Te
             m_MaxFontSize = generationSettings.fontSizeMax;
             m_CharWidthAdjDelta = 0;
 
-            Vector2 margin = new Vector2(m_MarginWidth != 0 ? m_MarginWidth : TextGeneratorUtilities.largePositiveFloat, TextGeneratorUtilities.largePositiveFloat);
+            Vector2 margin = new Vector2(m_MarginWidth != 0 ? m_MarginWidth : TextGeneratorUtilities.largePositiveFloat, m_MarginHeight != 0 ? m_MarginHeight : TextGeneratorUtilities.largePositiveFloat);
             TextWrappingMode wrapMode = generationSettings.wordWrap ? TextWrappingMode.Normal : TextWrappingMode.NoWrap;
 
             m_AutoSizeIterationCount = 0;
 
-            return CalculatePreferredValues(ref fontSize, margin, !generationSettings.autoSize, wrapMode, generationSettings, textInfo);
+            return CalculatePreferredValues(ref fontSize, margin, generationSettings.autoSize, wrapMode, generationSettings, textInfo);
         }
 
 
@@ -6400,14 +6504,14 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
 
                     switch (charCode)
                     {
-                        case 0x03:
-                            m_InternalTextElementInfo[m_CharacterCount].textElement = m_CurrentFontAsset.characterLookupTable[0x03];
+                        case k_EndOfText:
+                            m_InternalTextElementInfo[m_CharacterCount].textElement = m_CurrentFontAsset.characterLookupTable[k_EndOfText];
                             m_IsTextTruncated = true;
                             break;
                         case 0x2D:
                             //
                             break;
-                        case 0x2026:
+                        case k_HorizontalEllipsis:
                             m_InternalTextElementInfo[m_CharacterCount].textElement = m_Ellipsis.character;
                             m_InternalTextElementInfo[m_CharacterCount].elementType = TextElementType.Character;
                             m_InternalTextElementInfo[m_CharacterCount].fontAsset = m_Ellipsis.fontAsset;
@@ -6419,7 +6523,7 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
 
                             // End Of Text
                             characterToSubstitute.index = m_CharacterCount + 1;
-                            characterToSubstitute.unicode = 0x03;
+                            characterToSubstitute.unicode = k_EndOfText;
                             break;
                     }
                 }
@@ -6428,7 +6532,7 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
 
                 // When using Linked text, mark character as ignored and skip to next character.
                 #region Linked Text
-                if (m_CharacterCount < generationSettings.firstVisibleCharacter && charCode != 0x03)
+                if (m_CharacterCount < generationSettings.firstVisibleCharacter && charCode != k_EndOfText)
                 {
                     m_InternalTextElementInfo[m_CharacterCount].isVisible = false;
                     m_InternalTextElementInfo[m_CharacterCount].character = (char)k_ZeroWidthSpace;
@@ -6479,10 +6583,10 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
                 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].textElement.textAsset as SpriteAsset;
-                    m_SpriteIndex = (int)textInfo.textElementInfo[m_CharacterCount].textElement.glyphIndex;
+                    SpriteCharacter sprite = (SpriteCharacter)textInfo.textElementInfo[m_CharacterCount].textElement;
+                    m_CurrentSpriteAsset = sprite.textAsset as SpriteAsset;
+                    m_SpriteIndex = (int)sprite.glyphIndex;
 
-                    SpriteCharacter sprite = m_CurrentSpriteAsset.spriteCharacterTable[m_SpriteIndex];
                     if (sprite == null) continue;
 
                     // Sprites are assigned in the E000 Private Area + sprite Index
@@ -6529,7 +6633,7 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
                         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)
+                    if (isInjectedCharacter && charCode == k_HorizontalEllipsis)
                     {
                         elementAscentLine = 0;
                         elementDescentLine = 0;
@@ -6550,7 +6654,7 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
                 // Handle Soft Hyphen
                 #region Handle Soft Hyphen
                 float currentElementUnmodifiedScale = currentElementScale;
-                if (charCode == 0xAD || charCode == 0x03)
+                if (charCode == 0xAD || charCode == k_EndOfText)
                     currentElementScale = 0;
                 #endregion
 
@@ -6789,7 +6893,7 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
 
                 // Setup Mesh for visible text elements. ie. not a SPACE / LINEFEED / CARRIAGE RETURN.
                 #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)
+                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 != k_EndOfText) || (charCode == 0xAD && isSoftHyphenIgnored == false) || m_TextElementType == TextElementType.Sprite)
                 {
                     //float marginLeft = m_MarginLeft;
                     //float marginRight = m_MarginRight;
@@ -6939,7 +7043,7 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
 
                     // Compute Preferred Width & Height
                     renderedWidth = Mathf.Max(renderedWidth, textWidth + m_MarginLeft + m_MarginRight);
-                    renderedHeight = m_MaxAscender - m_MaxDescender;
+                    renderedHeight = Mathf.Max(renderedHeight, m_MaxAscender - m_MaxDescender);
 
                 }
                 #endregion Handle Visible Characters
@@ -6947,7 +7051,7 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
 
                 // Check if Line Spacing of previous line needs to be adjusted.
                 #region Adjust Line Spacing
-                /*if (m_LineOffset > 0 && !TextGeneratorUtilities.Approximately(m_MaxLineAscender, m_StartOfLineAscender) && m_IsDrivenLineSpacing == false && !m_IsNewPage)
+                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);
@@ -6957,31 +7061,34 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
                     m_StartOfLineAscender += offsetDelta;
                     internalWordWrapState.lineOffset = m_LineOffset;
                     internalWordWrapState.startOfLineAscender = m_StartOfLineAscender;
-                }*/
+                }
                 #endregion
 
 
                 // Handle xAdvance & Tabulation Stops. Tab stops at every 25% of Font Size.
                 #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;
-                    m_XAdvance = tabs > m_XAdvance ? tabs : m_XAdvance + tabSize;
-                }
-                else if (m_MonoSpacing != 0)
+                if (charCode != k_ZeroWidthSpace)
                 {
-                    m_XAdvance += (m_MonoSpacing - monoAdvance + ((m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment) * currentEmScale) + m_CSpacing) * (1 - m_CharWidthAdjDelta);
+                    if (charCode == k_Tab)
+                    {
+                        float tabSize = m_CurrentFontAsset.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 + ((m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment) * currentEmScale) + m_CSpacing) * (1 - m_CharWidthAdjDelta);
 
-                    if (isWhiteSpace || charCode == k_ZeroWidthSpace)
-                        m_XAdvance += generationSettings.wordSpacing * currentEmScale;
-                }
-                else
-                {
-                    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;
+                    }
+                    else
+                    {
+                        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;
+                        if (isWhiteSpace || charCode == k_ZeroWidthSpace)
+                            m_XAdvance += generationSettings.wordSpacing * currentEmScale;
+                    }
                 }
                 #endregion Tabulation & Stops
 
@@ -6997,7 +7104,7 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
 
                 // Handle Line Spacing Adjustments + Word Wrapping & special case for last line.
                 #region Check for Line Feed and Last Character
-                if (charCode == k_LineFeed || charCode == 11 || charCode == 0x03 || charCode == 0x2028 || charCode == 0x2029 || m_CharacterCount == totalCharacterCount - 1)
+                if (charCode == k_LineFeed || charCode == 11 || charCode == k_EndOfText || charCode == 0x2028 || charCode == 0x2029 || m_CharacterCount == totalCharacterCount - 1)
                 {
                     // Check if Line Spacing of previous line needs to be adjusted.
                     float baselineAdjustmentDelta = m_MaxLineAscender - m_StartOfLineAscender;
@@ -7052,7 +7159,7 @@ protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 m
                     }
 
                     // If End of Text
-                    if (charCode == 0x03)
+                    if (charCode == k_EndOfText)
                         i = m_TextProcessingArray.Length;
                 }
                 #endregion Check for Linefeed or Last Character
diff --git a/Modules/TextCoreTextEngine/Managed/TextGeneratorUtilities.cs b/Modules/TextCoreTextEngine/Managed/TextGeneratorUtilities.cs
index f0dd1e5027..0328f7101b 100644
--- a/Modules/TextCoreTextEngine/Managed/TextGeneratorUtilities.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextGeneratorUtilities.cs
@@ -1393,7 +1393,7 @@ public static void FillCharacterVertexBuffers(int i, bool convertToLinearSpace,
             int indexX4 = textInfo.meshInfo[materialIndex].vertexCount;
 
             // Check to make sure our current mesh buffer allocations can hold these new Quads.
-            if (indexX4 >= textInfo.meshInfo[materialIndex].vertices.Length)
+            if (indexX4 >= textInfo.meshInfo[materialIndex].vertexBufferSize)
                 textInfo.meshInfo[materialIndex].ResizeMeshInfo(Mathf.NextPowerOfTwo((indexX4 + 4) / 4));
 
             TextElementInfo[] textElementInfoArray = textInfo.textElementInfo;
@@ -1404,48 +1404,104 @@ public static void FillCharacterVertexBuffers(int i, bool convertToLinearSpace,
             {
                 Vector3 axisOffset;
                 axisOffset.x = 0;
-                axisOffset.y = generationSettings.screenRect.y + generationSettings.screenRect.height;
+                axisOffset.y = generationSettings.screenRect.height;
                 axisOffset.z = 0;
 
                 Vector3 position = textElementInfoArray[i].vertexBottomLeft.position;
                 position.y *= -1;
 
-                textInfo.meshInfo[materialIndex].vertices[0 + indexX4] = position + axisOffset;
-                position = textElementInfoArray[i].vertexTopLeft.position;
-                position.y *= -1;
-                textInfo.meshInfo[materialIndex].vertices[1 + indexX4] = position + axisOffset;
-                position = textElementInfoArray[i].vertexTopRight.position;
-                position.y *= -1;
-                textInfo.meshInfo[materialIndex].vertices[2 + indexX4] = position + axisOffset;
-                position = textElementInfoArray[i].vertexBottomRight.position;
-                position.y *= -1;
-                textInfo.meshInfo[materialIndex].vertices[3 + indexX4] = position + axisOffset;
+                if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+                {
+                    textInfo.meshInfo[materialIndex].vertexData[0 + indexX4].position = position + axisOffset;
+                    position = textElementInfoArray[i].vertexTopLeft.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertexData[1 + indexX4].position = position + axisOffset;
+                    position = textElementInfoArray[i].vertexTopRight.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertexData[2 + indexX4].position = position + axisOffset;
+                    position = textElementInfoArray[i].vertexBottomRight.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertexData[3 + indexX4].position = position + axisOffset;
+                }
+                else
+                {
+                    textInfo.meshInfo[materialIndex].vertices[0 + indexX4] = position + axisOffset;
+                    position = textElementInfoArray[i].vertexTopLeft.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertices[1 + indexX4] = position + axisOffset;
+                    position = textElementInfoArray[i].vertexTopRight.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertices[2 + indexX4] = position + axisOffset;
+                    position = textElementInfoArray[i].vertexBottomRight.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertices[3 + indexX4] = position + axisOffset;
+                }
             }
             else
             {
-                textInfo.meshInfo[materialIndex].vertices[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.position;
-                textInfo.meshInfo[materialIndex].vertices[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.position;
-                textInfo.meshInfo[materialIndex].vertices[2 + indexX4] = textElementInfoArray[i].vertexTopRight.position;
-                textInfo.meshInfo[materialIndex].vertices[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.position;
+                if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+                {
+                    textInfo.meshInfo[materialIndex].vertexData[0 + indexX4].position = textElementInfoArray[i].vertexBottomLeft.position;
+                    textInfo.meshInfo[materialIndex].vertexData[1 + indexX4].position = textElementInfoArray[i].vertexTopLeft.position;
+                    textInfo.meshInfo[materialIndex].vertexData[2 + indexX4].position = textElementInfoArray[i].vertexTopRight.position;
+                    textInfo.meshInfo[materialIndex].vertexData[3 + indexX4].position = textElementInfoArray[i].vertexBottomRight.position;
+                }
+                else
+                {
+                    textInfo.meshInfo[materialIndex].vertices[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.position;
+                    textInfo.meshInfo[materialIndex].vertices[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.position;
+                    textInfo.meshInfo[materialIndex].vertices[2 + indexX4] = textElementInfoArray[i].vertexTopRight.position;
+                    textInfo.meshInfo[materialIndex].vertices[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.position;
+                }
             }
 
             // Setup UVS0
-            textInfo.meshInfo[materialIndex].uvs0[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.uv;
-            textInfo.meshInfo[materialIndex].uvs0[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.uv;
-            textInfo.meshInfo[materialIndex].uvs0[2 + indexX4] = textElementInfoArray[i].vertexTopRight.uv;
-            textInfo.meshInfo[materialIndex].uvs0[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.uv;
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                textInfo.meshInfo[materialIndex].vertexData[0 + indexX4].uv0 = textElementInfoArray[i].vertexBottomLeft.uv;
+                textInfo.meshInfo[materialIndex].vertexData[1 + indexX4].uv0 = textElementInfoArray[i].vertexTopLeft.uv;
+                textInfo.meshInfo[materialIndex].vertexData[2 + indexX4].uv0 = textElementInfoArray[i].vertexTopRight.uv;
+                textInfo.meshInfo[materialIndex].vertexData[3 + indexX4].uv0 = textElementInfoArray[i].vertexBottomRight.uv;
+            }
+            else
+            {
+                textInfo.meshInfo[materialIndex].uvs0[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.uv;
+                textInfo.meshInfo[materialIndex].uvs0[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.uv;
+                textInfo.meshInfo[materialIndex].uvs0[2 + indexX4] = textElementInfoArray[i].vertexTopRight.uv;
+                textInfo.meshInfo[materialIndex].uvs0[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.uv;
+            }
 
             // Setup UVS2
-            textInfo.meshInfo[materialIndex].uvs2[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.uv2;
-            textInfo.meshInfo[materialIndex].uvs2[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.uv2;
-            textInfo.meshInfo[materialIndex].uvs2[2 + indexX4] = textElementInfoArray[i].vertexTopRight.uv2;
-            textInfo.meshInfo[materialIndex].uvs2[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.uv2;
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                textInfo.meshInfo[materialIndex].vertexData[0 + indexX4].uv2 = textElementInfoArray[i].vertexBottomLeft.uv2;
+                textInfo.meshInfo[materialIndex].vertexData[1 + indexX4].uv2 = textElementInfoArray[i].vertexTopLeft.uv2;
+                textInfo.meshInfo[materialIndex].vertexData[2 + indexX4].uv2 = textElementInfoArray[i].vertexTopRight.uv2;
+                textInfo.meshInfo[materialIndex].vertexData[3 + indexX4].uv2 = textElementInfoArray[i].vertexBottomRight.uv2;
+            }
+            else
+            {
+                textInfo.meshInfo[materialIndex].uvs2[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.uv2;
+                textInfo.meshInfo[materialIndex].uvs2[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.uv2;
+                textInfo.meshInfo[materialIndex].uvs2[2 + indexX4] = textElementInfoArray[i].vertexTopRight.uv2;
+                textInfo.meshInfo[materialIndex].uvs2[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.uv2;
+            }
 
             // setup Vertex Colors
-            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;
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                textInfo.meshInfo[materialIndex].vertexData[0 + indexX4].color = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexBottomLeft.color) : textElementInfoArray[i].vertexBottomLeft.color;
+                textInfo.meshInfo[materialIndex].vertexData[1 + indexX4].color = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexTopLeft.color) : textElementInfoArray[i].vertexTopLeft.color;
+                textInfo.meshInfo[materialIndex].vertexData[2 + indexX4].color = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexTopRight.color) : textElementInfoArray[i].vertexTopRight.color;
+                textInfo.meshInfo[materialIndex].vertexData[3 + indexX4].color = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexBottomRight.color) : textElementInfoArray[i].vertexBottomRight.color;
+            }
+            else
+            {
+                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;
         }
@@ -1469,49 +1525,104 @@ public static void FillSpriteVertexBuffers(int i, bool convertToLinearSpace, Tex
             {
                 Vector3 axisOffset;
                 axisOffset.x = 0;
-                axisOffset.y = generationSettings.screenRect.y + generationSettings.screenRect.height;
+                axisOffset.y = generationSettings.screenRect.height;
                 axisOffset.z = 0;
 
                 Vector3 position = textElementInfoArray[i].vertexBottomLeft.position;
                 position.y *= -1;
 
-                textInfo.meshInfo[materialIndex].vertices[0 + indexX4] = position + axisOffset;
-                position = textElementInfoArray[i].vertexTopLeft.position;
-                position.y *= -1;
-                textInfo.meshInfo[materialIndex].vertices[1 + indexX4] = position + axisOffset;
-                position = textElementInfoArray[i].vertexTopRight.position;
-                position.y *= -1;
-                textInfo.meshInfo[materialIndex].vertices[2 + indexX4] = position + axisOffset;
-                position = textElementInfoArray[i].vertexBottomRight.position;
-                position.y *= -1;
-                textInfo.meshInfo[materialIndex].vertices[3 + indexX4] = position + axisOffset;
+                if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+                {
+                    textInfo.meshInfo[materialIndex].vertexData[0 + indexX4].position = position + axisOffset;
+                    position = textElementInfoArray[i].vertexTopLeft.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertexData[1 + indexX4].position = position + axisOffset;
+                    position = textElementInfoArray[i].vertexTopRight.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertexData[2 + indexX4].position = position + axisOffset;
+                    position = textElementInfoArray[i].vertexBottomRight.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertexData[3 + indexX4].position = position + axisOffset;
+                }
+                else
+                {
+                    textInfo.meshInfo[materialIndex].vertices[0 + indexX4] = position + axisOffset;
+                    position = textElementInfoArray[i].vertexTopLeft.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertices[1 + indexX4] = position + axisOffset;
+                    position = textElementInfoArray[i].vertexTopRight.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertices[2 + indexX4] = position + axisOffset;
+                    position = textElementInfoArray[i].vertexBottomRight.position;
+                    position.y *= -1;
+                    textInfo.meshInfo[materialIndex].vertices[3 + indexX4] = position + axisOffset;
+                }
             }
             else
             {
-                textInfo.meshInfo[materialIndex].vertices[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.position;
-                textInfo.meshInfo[materialIndex].vertices[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.position;
-                textInfo.meshInfo[materialIndex].vertices[2 + indexX4] = textElementInfoArray[i].vertexTopRight.position;
-                textInfo.meshInfo[materialIndex].vertices[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.position;
+                if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+                {
+                    textInfo.meshInfo[materialIndex].vertexData[0 + indexX4].position = textElementInfoArray[i].vertexBottomLeft.position;
+                    textInfo.meshInfo[materialIndex].vertexData[1 + indexX4].position = textElementInfoArray[i].vertexTopLeft.position;
+                    textInfo.meshInfo[materialIndex].vertexData[2 + indexX4].position = textElementInfoArray[i].vertexTopRight.position;
+                    textInfo.meshInfo[materialIndex].vertexData[3 + indexX4].position = textElementInfoArray[i].vertexBottomRight.position;
+                }
+                else
+                {
+                    textInfo.meshInfo[materialIndex].vertices[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.position;
+                    textInfo.meshInfo[materialIndex].vertices[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.position;
+                    textInfo.meshInfo[materialIndex].vertices[2 + indexX4] = textElementInfoArray[i].vertexTopRight.position;
+                    textInfo.meshInfo[materialIndex].vertices[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.position;
+                }
             }
 
             // Setup UVS0
-            textInfo.meshInfo[materialIndex].uvs0[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.uv;
-            textInfo.meshInfo[materialIndex].uvs0[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.uv;
-            textInfo.meshInfo[materialIndex].uvs0[2 + indexX4] = textElementInfoArray[i].vertexTopRight.uv;
-            textInfo.meshInfo[materialIndex].uvs0[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.uv;
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                textInfo.meshInfo[materialIndex].vertexData[0 + indexX4].uv0 = textElementInfoArray[i].vertexBottomLeft.uv;
+                textInfo.meshInfo[materialIndex].vertexData[1 + indexX4].uv0 = textElementInfoArray[i].vertexTopLeft.uv;
+                textInfo.meshInfo[materialIndex].vertexData[2 + indexX4].uv0 = textElementInfoArray[i].vertexTopRight.uv;
+                textInfo.meshInfo[materialIndex].vertexData[3 + indexX4].uv0 = textElementInfoArray[i].vertexBottomRight.uv;
+            }
+            else
+            {
+                textInfo.meshInfo[materialIndex].uvs0[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.uv;
+                textInfo.meshInfo[materialIndex].uvs0[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.uv;
+                textInfo.meshInfo[materialIndex].uvs0[2 + indexX4] = textElementInfoArray[i].vertexTopRight.uv;
+                textInfo.meshInfo[materialIndex].uvs0[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.uv;
+            }
 
             // Setup UVS2
-            textInfo.meshInfo[materialIndex].uvs2[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.uv2;
-            textInfo.meshInfo[materialIndex].uvs2[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.uv2;
-            textInfo.meshInfo[materialIndex].uvs2[2 + indexX4] = textElementInfoArray[i].vertexTopRight.uv2;
-            textInfo.meshInfo[materialIndex].uvs2[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.uv2;
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                textInfo.meshInfo[materialIndex].vertexData[0 + indexX4].uv2 = textElementInfoArray[i].vertexBottomLeft.uv2;
+                textInfo.meshInfo[materialIndex].vertexData[1 + indexX4].uv2 = textElementInfoArray[i].vertexTopLeft.uv2;
+                textInfo.meshInfo[materialIndex].vertexData[2 + indexX4].uv2 = textElementInfoArray[i].vertexTopRight.uv2;
+                textInfo.meshInfo[materialIndex].vertexData[3 + indexX4].uv2 = textElementInfoArray[i].vertexBottomRight.uv2;
+            }
+            else
+            {
+                textInfo.meshInfo[materialIndex].uvs2[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.uv2;
+                textInfo.meshInfo[materialIndex].uvs2[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.uv2;
+                textInfo.meshInfo[materialIndex].uvs2[2 + indexX4] = textElementInfoArray[i].vertexTopRight.uv2;
+                textInfo.meshInfo[materialIndex].uvs2[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.uv2;
+            }
 
             // setup Vertex Colors
-            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;
-
+            if (textInfo.vertexDataLayout == VertexDataLayout.VBO)
+            {
+                textInfo.meshInfo[materialIndex].vertexData[0 + indexX4].color = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexBottomLeft.color) : textElementInfoArray[i].vertexBottomLeft.color;
+                textInfo.meshInfo[materialIndex].vertexData[1 + indexX4].color = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexTopLeft.color) : textElementInfoArray[i].vertexTopLeft.color;
+                textInfo.meshInfo[materialIndex].vertexData[2 + indexX4].color = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexTopRight.color) : textElementInfoArray[i].vertexTopRight.color;
+                textInfo.meshInfo[materialIndex].vertexData[3 + indexX4].color = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexBottomRight.color) : textElementInfoArray[i].vertexBottomRight.color;
+            }
+            else
+            {
+                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;
         }
 
@@ -1820,7 +1931,10 @@ internal static bool IsHangul(uint c)
 
         internal static bool IsCJK(uint c)
         {
-            return c >= 0x3100  && c <= 0x312F  || /* Bopomofo */
+            return
+                   c >= 0x3000  && c <= 0x303F  || /* CJK Symbols and Punctuation */
+                   c >= 0x16FE0 && c <= 0x16FF  || /* CJK Ideographic Symbols and Punctuation */
+                   c >= 0x3100  && c <= 0x312F  || /* Bopomofo */
                    c >= 0x31A0  && c <= 0x31BF  || /* Bopomofo Extended */
                    c >= 0x4E00  && c <= 0x9FFF  || /* CJK Unified Ideographs (Han) */
                    c >= 0x3400  && c <= 0x4DBF  || /* CJK Extension A */
diff --git a/Modules/TextCoreTextEngine/Managed/TextHandle.cs b/Modules/TextCoreTextEngine/Managed/TextHandle.cs
index d1eaac2277..d0cd6c58bc 100644
--- a/Modules/TextCoreTextEngine/Managed/TextHandle.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextHandle.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.Collections.Generic;
 using System;
 using System.Text;
 
@@ -11,63 +12,111 @@ internal class TextHandle
     {
         public TextHandle()
         {
-            textGenerationSettings = new TextGenerationSettings();
         }
 
-        Vector2 m_PreferredSize;
-        /// <summary>
-        /// DO NOT USE m_TextInfo directly, use textInfo to guarantee lazy allocation.
-        /// </summary>
-        private TextInfo m_TextInfo;
+        internal static TextCore.Text.TextGenerationSettings s_Settings = new TextCore.Text.TextGenerationSettings();
+
+        ~TextHandle()
+        {
+            RemoveTextInfoFromCache();
+        }
+
+        internal Vector2 preferredSize { get; private set; }
+        private Rect screenRect;
+        private float lineHeightDefault;
+        private bool isPlaceholder;
+        private bool m_IsCached;
+        private LinkedListNode<TextInfo> m_TextInfoNode;
+
+        private static LinkedList<TextInfo> s_TextInfoPool = new LinkedList<TextInfo>();
+        private static TextInfo s_TextInfoCommon = new TextInfo(VertexDataLayout.VBO);
+        private static double s_MinTimeInCache = 1;
+
+        internal static TextInfo textInfoCommon => s_TextInfoCommon;
 
         /// <summary>
-        /// The TextInfo instance, use from this instead of the m_TextInfo member to guarantee lazy allocation.
+        /// The TextInfo instance, use from this instead of the m_TextInfo member.
+        /// References a cached textInfo if dynamic, or a static instance (textInfoCommon) if not cached.
         /// </summary>
         internal TextInfo textInfo
         {
             get
             {
-                if (m_TextInfo == null)
-                {
-                    m_TextInfo = new TextInfo();
-                }
 
-                return m_TextInfo;
+                if (m_TextInfoNode == null)
+                    return textInfoCommon;
+                else
+                    return m_TextInfoNode.Value;
             }
         }
 
-        // For testing purposes
-        internal bool IsTextInfoAllocated()
+        public virtual void AddTextInfoToCache()
         {
-            return m_TextInfo != null;
+            if (m_IsCached)
+            {
+                RefreshCaching();
+                return;
+            }
+
+            var currentTime = Time.realtimeSinceStartup;
+            // If last textInfo in the list has not been used in a while, take it. Otherwise, create a new one.
+            if (s_TextInfoPool.Count > 0 && ((currentTime - s_TextInfoPool.Last.Value.lastTimeInCache) > s_MinTimeInCache))
+            {
+                RecycleTextInfoFromCache();
+            }
+            else
+            {
+                var textInfo = new TextInfo(VertexDataLayout.VBO);
+                m_TextInfoNode = new LinkedListNode<TextInfo>(textInfo);
+                s_TextInfoPool.AddFirst(m_TextInfoNode);
+                textInfo.lastTimeInCache = currentTime;
+                textInfo.removedFromCache += RemoveTextInfoFromCache;
+            }
+
+            m_IsCached = true;
+            SetDirty();
+            Update(s_Settings);
         }
 
-        /// <summary>
-        /// DO NOT USE m_LayoutTextInfo directly, use textInfo to guarantee lazy allocation.
-        /// </summary>
-        static TextInfo m_LayoutTextInfo;
+        public virtual void RemoveTextInfoFromCache()
+        {
+            if (!m_IsCached)
+                return;
+
+            m_IsCached = false;
+            textInfo.lastTimeInCache = 0;
+            textInfo.removedFromCache = null;
+            s_TextInfoPool.Remove(m_TextInfoNode);
+            s_TextInfoPool.AddLast(m_TextInfoNode);
+            m_TextInfoNode = null;
+        }
 
-        /// <summary>
-        /// The TextInfo instance to be used for layout, use from this instead of the m_LayoutTextInfo member to guarantee lazy allocation.
-        /// </summary>
-        internal static TextInfo layoutTextInfo
+        private void RefreshCaching()
         {
-            get
-            {
-                if (m_LayoutTextInfo == null)
-                {
-                    m_LayoutTextInfo = new TextInfo();
-                }
+            textInfo.lastTimeInCache = Time.realtimeSinceStartup;
+            s_TextInfoPool.Remove(m_TextInfoNode);
+            s_TextInfoPool.AddFirst(m_TextInfoNode);
+        }
 
-                return m_LayoutTextInfo;
-            }
+        private void RecycleTextInfoFromCache()
+        {
+            var currentTime = Time.realtimeSinceStartup;
+            m_TextInfoNode = s_TextInfoPool.Last;
+            m_TextInfoNode.Value.RemoveFromCache();
+            s_TextInfoPool.RemoveLast();
+            s_TextInfoPool.AddFirst(m_TextInfoNode);
+            textInfo.removedFromCache += RemoveTextInfoFromCache;
+            textInfo.lastTimeInCache = currentTime;
+            m_IsCached = false;
         }
 
-        int m_PreviousGenerationSettingsHash;
-        protected TextGenerationSettings textGenerationSettings;
+        // For testing purposes
+        internal bool IsTextInfoAllocated()
+        {
+            return textInfo != null;
+        }
 
-        //static instance cached to minimize allocation
-        protected static TextGenerationSettings s_LayoutSettings = new TextGenerationSettings();
+        internal int m_PreviousGenerationSettingsHash;
 
         private bool isDirty;
         public void SetDirty()
@@ -75,9 +124,9 @@ public void SetDirty()
             isDirty = true;
         }
 
-        public bool IsDirty()
+        public bool IsDirty(TextGenerationSettings settings)
         {
-            int hash = textGenerationSettings.GetHashCode();
+            int hash = settings.GetHashCode();
             if (m_PreviousGenerationSettingsHash == hash && !isDirty)
                 return false;
 
@@ -88,13 +137,10 @@ public bool IsDirty()
 
         public Vector2 GetCursorPositionFromStringIndexUsingCharacterHeight(int index, bool inverseYAxis = true)
         {
-            if (textGenerationSettings == null)
-                return Vector2.zero;
-
-            var screenRect = textGenerationSettings.screenRect;
+            AddTextInfoToCache();
             var result = screenRect.position;
             if (textInfo.characterCount == 0)
-                return result;
+                return inverseYAxis ? new Vector2(0, lineHeightDefault) : result;
 
             var validIndex = index >= textInfo.characterCount ? textInfo.characterCount - 1 : index;
             var character = textInfo.textElementInfo[validIndex];
@@ -110,13 +156,10 @@ public Vector2 GetCursorPositionFromStringIndexUsingCharacterHeight(int index, b
 
         public Vector2 GetCursorPositionFromStringIndexUsingLineHeight(int index, bool useXAdvance = false, bool inverseYAxis = true)
         {
-            if (textGenerationSettings == null)
-                return Vector2.zero;
-
-            var screenRect = textGenerationSettings.screenRect;
+            AddTextInfoToCache();
             var result = screenRect.position;
-            if (textInfo.characterCount == 0)
-                return result;
+            if (textInfo.characterCount == 0 || index < 0)
+                return inverseYAxis ? new Vector2(0, lineHeightDefault) : result;
 
             if (index >= textInfo.characterCount)
                 index = textInfo.characterCount - 1;
@@ -143,11 +186,8 @@ public Vector2 GetCursorPositionFromStringIndexUsingLineHeight(int index, bool u
         // Add support for world space.
         public int GetCursorIndexFromPosition(Vector2 position, bool inverseYAxis = true)
         {
-            if (textGenerationSettings == null)
-                return 0;
-
             if (inverseYAxis)
-                position.y = textGenerationSettings.screenRect.height - position.y;
+                position.y = screenRect.height - position.y;
 
             var lineNumber = 0;
             if (textInfo.lineCount > 1)
@@ -317,6 +357,8 @@ public int FindNearestLine(Vector2 position)
 
         public int FindNearestCharacterOnLine(Vector2 position, int line, bool visibleOnly)
         {
+            if (line >= textInfo.lineInfo.Length || line < 0)
+                return 0;
             int firstCharacter = textInfo.lineInfo[line].firstCharacterIndex;
             int lastCharacter = textInfo.lineInfo[line].lastCharacterIndex;
 
@@ -331,7 +373,7 @@ public int FindNearestCharacterOnLine(Vector2 position, int line, bool visibleOn
                 if (visibleOnly && !cInfo.isVisible) continue;
 
                 // Ignore Carriage Returns <CR>
-                if (cInfo.character == '\r')
+                if (cInfo.character == '\r' || cInfo.character == '\n')
                     continue;
 
                 // Get Bottom Left and Top Right position of the current character
@@ -372,7 +414,7 @@ public int FindNearestCharacterOnLine(Vector2 position, int line, bool visibleOn
         public int FindIntersectingLink(Vector3 position, bool inverseYAxis = true)
         {
             if (inverseYAxis)
-                position.y = textGenerationSettings.screenRect.height - position.y;
+                position.y = screenRect.height - position.y;
 
             for (int i = 0; i < textInfo.linkCount; i++)
             {
@@ -454,6 +496,46 @@ public int FindIntersectingLink(Vector3 position, bool inverseYAxis = true)
             return -1;
         }
 
+        public float ComputeTextWidth(TextGenerationSettings tgs)
+        {
+            UpdatePreferredValues(tgs);
+            return preferredSize.x;
+        }
+
+        public float ComputeTextHeight(TextGenerationSettings tgs)
+        {
+            UpdatePreferredValues(tgs);
+            return preferredSize.y;
+        }
+
+        public int GetCorrespondingStringIndex(int index)
+        {
+            if (index <= 0)
+                return 0;
+
+            return textInfo.textElementInfo[index - 1].index + textInfo.textElementInfo[index - 1].stringLength;
+        }
+
+        public int GetCorrespondingCodePointIndex(int stringIndex)
+        {
+            if (stringIndex <= 0)
+                return 0;
+
+            for (int i = 0; i < textInfo.characterCount; i++)
+            {
+                var character = textInfo.textElementInfo[i];
+                if (character.index + character.stringLength >= stringIndex)
+                    return i + 1;
+            }
+
+            return textInfo.characterCount;
+        }
+
+        public LineInfo GetLineInfoFromCharacterIndex(int index)
+        {
+            return textInfo.lineInfo[GetLineNumber(index)];
+        }
+
         private static bool PointIntersectRectangle(Vector3 m, Vector3 a, Vector3 b, Vector3 c, Vector3 d)
         {
             Vector3 ab = b - a;
@@ -501,7 +583,8 @@ public int GetLineNumber(int index)
         {
             if (index <= 0)
                 index = 0;
-            else if (index >= textInfo.characterCount)
+
+            if (index >= textInfo.characterCount)
                 index = Mathf.Max(0, textInfo.characterCount - 1);
 
             return textInfo.textElementInfo[index].lineNumber;
@@ -511,7 +594,8 @@ public float GetLineHeight(int lineNumber)
         {
             if (lineNumber <= 0)
                 lineNumber = 0;
-            else if (lineNumber >= textInfo.lineCount)
+
+            if (lineNumber >= textInfo.lineCount)
                 lineNumber = Mathf.Max(0, textInfo.lineCount - 1);
 
             return textInfo.lineInfo[lineNumber].lineHeight;
@@ -521,7 +605,8 @@ public float GetLineHeightFromCharacterIndex(int index)
         {
             if (index <= 0)
                 index = 0;
-            else if (index >= textInfo.characterCount)
+
+            if (index >= textInfo.characterCount)
                 index = Mathf.Max(0, textInfo.characterCount - 1);
             return GetLineHeight(textInfo.textElementInfo[index].lineNumber);
         }
@@ -530,7 +615,8 @@ public float GetCharacterHeightFromIndex(int index)
         {
             if (index <= 0)
                 index = 0;
-            else if (index >= textInfo.characterCount)
+
+            if (index >= textInfo.characterCount)
                 index = Mathf.Max(0, textInfo.characterCount - 1);
 
             var characterInfo = textInfo.textElementInfo[index];
@@ -539,7 +625,7 @@ public float GetCharacterHeightFromIndex(int index)
 
         public bool IsPlaceholder
         {
-            get => textGenerationSettings.isPlaceholder;
+            get => isPlaceholder;
         }
 
         public bool IsElided()
@@ -610,38 +696,64 @@ public int LastIndexOf(char value, int startIndex)
             return -1;
         }
 
-        protected float ComputeTextWidth(TextGenerationSettings tgs)
+        protected void UpdatePreferredValues(TextGenerationSettings tgs)
         {
-            UpdatePreferredValues(tgs);
-            return m_PreferredSize.x;
+            preferredSize = TextGenerator.GetPreferredValues(tgs, textInfoCommon);
         }
 
-        protected float ComputeTextHeight(TextGenerationSettings tgs)
+        protected TextInfo Update(TextGenerationSettings tgs)
         {
-            UpdatePreferredValues(tgs);
-            return m_PreferredSize.y;
-        }
+            screenRect = tgs.screenRect;
+            lineHeightDefault = GetLineHeightDefault(tgs);
+            isPlaceholder = tgs.isPlaceholder;
+            if (!IsDirty(tgs))
+                return textInfo;
+
+            TextGenerator.GenerateText(tgs, textInfo);
+            return textInfo;
 
-        protected void UpdatePreferredValues(TextGenerationSettings tgs)
-        {
-            m_PreferredSize = TextGenerator.GetPreferredValues(tgs, layoutTextInfo);
         }
 
-        internal TextInfo Update(string newText)
+        internal void UpdatePreferredSize(TextGenerationSettings generationSettings)
         {
-            textGenerationSettings.text = newText;
-            return Update(textGenerationSettings);
+            if (textInfo.characterCount <= 0)
+                return;
+
+            var maxAscender = float.MinValue;
+            var maxDescender = textInfo.textElementInfo[textInfo.characterCount - 1].descender;
+            var renderedWidth = 0f;
+            var renderedHeight = 0f;
+
+            for (var i = 0; i < textInfo.lineCount; i++)
+            {
+                var lineInfo = textInfo.lineInfo[i];
+                maxAscender = Mathf.Max(maxAscender, textInfo.textElementInfo[lineInfo.firstVisibleCharacterIndex].ascender);
+                maxDescender = Mathf.Min(maxDescender, textInfo.textElementInfo[lineInfo.firstVisibleCharacterIndex].descender);
+
+                renderedWidth = Mathf.Max(renderedWidth, lineInfo.lineExtents.max.x - lineInfo.lineExtents.min.x);
+            }
+            renderedHeight = maxAscender - maxDescender;
+
+            // Adjust Preferred Width and Height to account for Margins.
+            renderedWidth += generationSettings.margins.x > 0 ? generationSettings.margins.x : 0;
+            renderedWidth += generationSettings.margins.z > 0 ? generationSettings.margins.z : 0;
+            renderedHeight += generationSettings.margins.y > 0 ? generationSettings.margins.y : 0;
+            renderedHeight += generationSettings.margins.w > 0 ? generationSettings.margins.w : 0;
+
+            // Round Preferred Values to nearest 5/100.
+            renderedWidth = (int)(renderedWidth * 100 + 1f) / 100f;
+            renderedHeight = (int)(renderedHeight * 100 + 1f) / 100f;
+
+            preferredSize = new Vector2(renderedWidth, renderedHeight);
         }
 
-        protected TextInfo Update(TextGenerationSettings tgs)
+        internal static float GetLineHeightDefault(TextGenerationSettings settings)
         {
-            if (!IsDirty())
-                return textInfo;
-
-            textInfo.isDirty = true;
-            TextGenerator.GenerateText(tgs, textInfo);
-            textGenerationSettings = tgs;
-            return textInfo;
+            if (settings != null && settings.fontAsset != null)
+            {
+                return settings.fontAsset.faceInfo.lineHeight / settings.fontAsset.faceInfo.pointSize * settings.fontSize;
+            }
+            return 0.0f;
         }
     }
 }
diff --git a/Modules/TextCoreTextEngine/Managed/TextInfo.cs b/Modules/TextCoreTextEngine/Managed/TextInfo.cs
index cab10a14bb..07e36c3680 100644
--- a/Modules/TextCoreTextEngine/Managed/TextInfo.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextInfo.cs
@@ -3,7 +3,6 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using UnityEngine.Bindings;
 
 namespace UnityEngine.TextCore.Text
 {
@@ -51,21 +50,29 @@ class TextInfo
         public PageInfo[] pageInfo;
         public MeshInfo[] meshInfo;
 
-        public bool isDirty;
+        public double lastTimeInCache;
+        public Action removedFromCache;
+        public VertexDataLayout vertexDataLayout { get; private set; }
+        public bool hasMultipleColors = false;
+
+
+        public void RemoveFromCache()
+        {
+            removedFromCache?.Invoke();
+            removedFromCache = null;
+        }
 
         // Default Constructor
-        public TextInfo()
+        public TextInfo(VertexDataLayout vertexDataLayout)
         {
+            this.vertexDataLayout = vertexDataLayout;
             textElementInfo = new TextElementInfo[4];
             wordInfo = new WordInfo[1];
             lineInfo = new LineInfo[1];
             pageInfo = new PageInfo[1];
-            linkInfo = new LinkInfo[0];
-            meshInfo = new MeshInfo[1];
-
+            linkInfo = Array.Empty<LinkInfo>();
+            meshInfo = Array.Empty<MeshInfo>();
             materialCount = 0;
-
-            isDirty = true;
         }
 
         /// <summary>
@@ -80,6 +87,7 @@ internal void Clear()
             lineCount = 0;
             pageCount = 0;
             spriteCount = 0;
+            hasMultipleColors = false;
 
             for (int i = 0; i < meshInfo.Length; i++)
             {
diff --git a/Modules/TextCoreTextEngine/Managed/TextMarkupTagsCommon.cs b/Modules/TextCoreTextEngine/Managed/TextMarkupTagsCommon.cs
index c3e097a309..83b82ba02a 100644
--- a/Modules/TextCoreTextEngine/Managed/TextMarkupTagsCommon.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextMarkupTagsCommon.cs
@@ -125,12 +125,14 @@ internal enum MarkupTag : int
         BLACK = 81074727,
         WHITE = 105680263,
         PURPLE = -1250222130,
+        GREY = 2638345,
+        LIGHTBLUE= 341063360,
 
         // Unicode Characters
         BR = 2256,                          // <br> Line Feed (LF) \u0A
         CR = 2289,                          // <cr> Carriage Return (CR) \u000D
         ZWSP = 3288238,                     // <zwsp> Zero Width Space \u200B
-        ZWJ = 99623,                        // <zwj> Zero Width Space \u200D
+        ZWJ = 99623,                        // <zwj> Zero Width Joiner \u200D
         NBSP = 2869039,                     // <nbsp> Non Breaking Space \u00A0
         SHY = 92674,                        // <SHY> Soft Hyphen \u00AD
 
diff --git a/Modules/TextCoreTextEngine/Managed/TextSettings.cs b/Modules/TextCoreTextEngine/Managed/TextSettings.cs
index f9a8c3e982..0742dc8836 100644
--- a/Modules/TextCoreTextEngine/Managed/TextSettings.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextSettings.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.Serialization;
 using UnityEngine.TextCore.LowLevel;
@@ -12,6 +13,10 @@ namespace UnityEngine.TextCore.Text
     [System.Serializable][ExcludeFromPresetAttribute][ExcludeFromObjectFactory]
     public class TextSettings : ScriptableObject
     {
+        internal string k_SystemFontName =
+            "Lucida Grande"
+        ;
+
         /// <summary>
         /// The version of the TextSettings class.
         /// Version 1.2.0 was introduced with the TextCore package
@@ -252,6 +257,9 @@ public bool displayWarnings
 
         protected void InitializeFontReferenceLookup()
         {
+            if (m_FontReferences == null)
+                m_FontReferences = new List<FontReferenceMap>();
+
             for (int i = 0; i < m_FontReferences.Count; i++)
             {
                 FontReferenceMap fontRef = m_FontReferences[i];
@@ -259,13 +267,13 @@ protected void InitializeFontReferenceLookup()
                 // Validate fontRef data
                 if (fontRef.font == null || fontRef.fontAsset == null)
                 {
-                    Debug.Log("Deleting invalid font reference.");
+                    Debug.LogWarning("Deleting invalid font reference.");
                     m_FontReferences.RemoveAt(i);
                     i -= 1;
                     continue;
                 }
 
-                int id = fontRef.font.GetInstanceID();
+                int id = fontRef.font.GetHashCode() + fontRef.fontAsset.material.shader.GetHashCode();
 
                 if (!m_FontLookup.ContainsKey(id))
                     m_FontLookup.Add(id, fontRef.fontAsset);
@@ -289,7 +297,13 @@ public FontReferenceMap(Font font, FontAsset fontAsset)
         internal Dictionary<int, FontAsset> m_FontLookup;
         private List<FontReferenceMap> m_FontReferences = new List<FontReferenceMap>();
 
+
         protected FontAsset GetCachedFontAssetInternal(Font font)
+        {
+            return GetCachedFontAsset(font, TextShaderUtilities.ShaderRef_MobileSDF);
+        }
+
+        internal FontAsset GetCachedFontAsset(Font font, Shader shader)
         {
             if (m_FontLookup == null)
             {
@@ -297,20 +311,23 @@ protected FontAsset GetCachedFontAssetInternal(Font font)
                 InitializeFontReferenceLookup();
             }
 
-            int id = font.GetInstanceID();
+            int id = font.GetInstanceID() + shader.GetInstanceID().GetHashCode();
 
             if (m_FontLookup.ContainsKey(id))
                 return m_FontLookup[id];
 
             FontAsset fontAsset;
-            if (font.name == "System Normal")
+            if (font.name == "System Normal" || font.name == "System Small" || font.name == "System Big" || font.name == "System Warning")
+            {
+                fontAsset = FontAsset.CreateFontAsset(k_SystemFontName, "Regular", 90);
+            }
+            else if (font.name == "System Normal Bold" || font.name == "System Small Bold")
             {
-                fontAsset = FontAsset.CreateFontAsset("Lucida Grande", "Regular");
+                fontAsset = FontAsset.CreateFontAsset(k_SystemFontName, "Bold", 90);
             }
             else
             {
-                //Debug.Log("Creating new Dynamic Runtime Font Asset for [" + font.name + "].");
-                fontAsset = FontAsset.CreateFontAsset(font, 90, 9, GlyphRenderMode.SDFAA, 1024, 1024, AtlasPopulationMode.Dynamic);
+                fontAsset = FontAsset.CreateFontAsset(font, 90, 9, GlyphRenderMode.SDFAA, 1024, 1024, AtlasPopulationMode.Dynamic, true);
             }
 
             if (fontAsset != null)
@@ -319,6 +336,7 @@ protected FontAsset GetCachedFontAssetInternal(Font font)
                 fontAsset.atlasTextures[0].hideFlags = HideFlags.DontSave;
                 fontAsset.material.hideFlags = HideFlags.DontSave;
                 fontAsset.isMultiAtlasTexturesEnabled = true;
+                fontAsset.material.shader = shader;
 
                 m_FontReferences.Add(new FontReferenceMap(font, fontAsset));
                 m_FontLookup.Add(id, fontAsset);
@@ -326,5 +344,17 @@ protected FontAsset GetCachedFontAssetInternal(Font font)
 
             return fontAsset;
         }
+
+        internal virtual float GetEditorTextSharpness()
+        {
+            Debug.LogWarning("GetEditorTextSettings() should only be called on EditorTextSettings");
+            return 0.0f;
+        }
+
+        internal virtual Font GetEditorFont()
+        {
+            Debug.LogWarning("GetEditorTextSettings() should only be called on EditorTextSettings");
+            return null;
+        }
     }
 }
diff --git a/Modules/TextCoreTextEngine/Managed/TextShaderUtilities.cs b/Modules/TextCoreTextEngine/Managed/TextShaderUtilities.cs
index 37a4d9e03d..6eaebc1955 100644
--- a/Modules/TextCoreTextEngine/Managed/TextShaderUtilities.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextShaderUtilities.cs
@@ -163,6 +163,27 @@ internal static Shader ShaderRef_MobileSDF
         }
         static Shader k_ShaderRef_MobileSDF;
 
+        /// <summary>
+        /// Returns a reference to the mobile distance field shader for IMGUI
+        /// </summary>
+        internal static Shader ShaderRef_MobileSDF_IMGUI
+        {
+            get
+            {
+                // IMGUI doesn't work with TMP shader so we ignore that one
+                if (k_ShaderRef_MobileSDF_IMGUI == null)
+                {
+                    k_ShaderRef_MobileSDF_IMGUI = Shader.Find("Text/Mobile/Distance Field SSD");
+
+                    if (k_ShaderRef_MobileSDF_IMGUI == null)
+                        k_ShaderRef_MobileSDF_IMGUI = Shader.Find("Hidden/TextCore/Distance Field SSD");
+                }
+
+                return k_ShaderRef_MobileSDF_IMGUI;
+            }
+        }
+        static Shader k_ShaderRef_MobileSDF_IMGUI;
+
         /// <summary>
         /// Returns a reference to the mobile bitmap shader.
         /// </summary>
diff --git a/Modules/TextCoreTextEngine/Managed/UnicodeLineBreakingRules.cs b/Modules/TextCoreTextEngine/Managed/UnicodeLineBreakingRules.cs
index 942d777495..24c179c06e 100644
--- a/Modules/TextCoreTextEngine/Managed/UnicodeLineBreakingRules.cs
+++ b/Modules/TextCoreTextEngine/Managed/UnicodeLineBreakingRules.cs
@@ -54,7 +54,7 @@ internal HashSet<uint> leadingCharactersLookup
             get
             {
                 if (s_LeadingCharactersLookup == null)
-                    LoadLineBreakingRules();
+                    LoadLineBreakingRules(leadingCharacters, followingCharacters);
 
                 return s_LeadingCharactersLookup;
             }
@@ -69,7 +69,7 @@ internal HashSet<uint> followingCharactersLookup
             get
             {
                 if (s_LeadingCharactersLookup == null)
-                    LoadLineBreakingRules();
+                    LoadLineBreakingRules(leadingCharacters, followingCharacters);
 
                 return s_FollowingCharactersLookup;
             }
diff --git a/Modules/TextCoreTextEngine/MeshInfo.bindings.cs b/Modules/TextCoreTextEngine/MeshInfo.bindings.cs
new file mode 100644
index 0000000000..f2ff9ef990
--- /dev/null
+++ b/Modules/TextCoreTextEngine/MeshInfo.bindings.cs
@@ -0,0 +1,24 @@
+// 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 UnityEngine.Bindings;
+using UnityEngine.Scripting;
+
+namespace UnityEngine.TextCore.Text
+{
+    /// <summary>
+    /// Copy of MeshInfo, where we pass only the parameters necessary for rendering on the Native side
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    [NativeHeader("Modules/TextCoreTextEngine/MeshInfo.h")]
+    [UsedByNativeCode("MeshInfo")]
+    internal struct MeshInfoBindings
+    {
+        public TextCoreVertex[] vertexData;
+        public Material material;
+        public int vertexCount;
+    }
+}
diff --git a/Modules/TextCoreTextEngine/TextCoreVertex.bindings.cs b/Modules/TextCoreTextEngine/TextCoreVertex.bindings.cs
new file mode 100644
index 0000000000..35e9c4d494
--- /dev/null
+++ b/Modules/TextCoreTextEngine/TextCoreVertex.bindings.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;
+using System.Runtime.InteropServices;
+using UnityEngine.Bindings;
+using UnityEngine.Scripting;
+
+namespace UnityEngine.TextCore.Text
+{
+    /// <summary>
+    /// Structure which contains the vertex attributes (geometry) of the text object.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    [NativeHeader("Modules/TextCoreTextEngine/TextCoreVertex.h")]
+    [UsedByNativeCode("TextCoreVertex")]
+    internal struct TextCoreVertex
+    {
+        public Vector3 position;
+        public Color32 color;
+        public Vector2 uv0;
+        public Vector2 uv2;
+    }
+}
diff --git a/Modules/TextCoreTextEngineEditor/Managed/EditorShaderUtilities.cs b/Modules/TextCoreTextEngineEditor/Managed/EditorShaderUtilities.cs
index 12fb431cf1..2124208a34 100644
--- a/Modules/TextCoreTextEngineEditor/Managed/EditorShaderUtilities.cs
+++ b/Modules/TextCoreTextEngineEditor/Managed/EditorShaderUtilities.cs
@@ -77,7 +77,7 @@ internal static Material internalColorBitmapMaterial
         /// <returns></returns>
         internal static void CopyMaterialProperties(Material source, Material destination)
         {
-            destination.CopyPropertiesFromMaterial(source);
+            destination.CopyMatchingPropertiesFromMaterial(source);
         }
     }
 }
diff --git a/Modules/TextCoreTextEngineEditor/Managed/FontAssetCreationMenu.cs b/Modules/TextCoreTextEngineEditor/Managed/FontAssetCreationMenu.cs
index d70db21ebf..00961f1dc8 100644
--- a/Modules/TextCoreTextEngineEditor/Managed/FontAssetCreationMenu.cs
+++ b/Modules/TextCoreTextEngineEditor/Managed/FontAssetCreationMenu.cs
@@ -209,8 +209,8 @@ static void CreateFontAssetFromSelectedObject(Object target)
             // Initialize array for the font atlas textures.
             fontAsset.atlasTextures = new Texture2D[1];
 
-            // Create atlas texture of size zero.
-            Texture2D texture = new Texture2D(0, 0, TextureFormat.Alpha8, false);
+            // Create atlas texture of size one.
+            Texture2D texture = new Texture2D(1, 1, TextureFormat.Alpha8, false);
 
             texture.name = assetName + " Atlas";
             fontAsset.atlasTextures[0] = texture;
diff --git a/Modules/TextCoreTextEngineEditor/Managed/FontAssetEditor.cs b/Modules/TextCoreTextEngineEditor/Managed/FontAssetEditor.cs
index 6e3e9d0fc6..575826146a 100644
--- a/Modules/TextCoreTextEngineEditor/Managed/FontAssetEditor.cs
+++ b/Modules/TextCoreTextEngineEditor/Managed/FontAssetEditor.cs
@@ -2700,12 +2700,16 @@ void DrawMarkToBasePreview(int selectedRecord, Rect rect)
 
             DrawAnchorPoint(baseAnchorPosition, Color.green);
 
-            Glyph markGlyph = m_fontAsset.glyphLookupTable[markGlyphIndex];
+            // Draw Mark
+            if (m_fontAsset.glyphLookupTable.ContainsKey(markGlyphIndex))
+            {
+                Glyph markGlyph = m_fontAsset.glyphLookupTable[markGlyphIndex];
 
-            Rect markGlyphPosition = new Rect(baseAnchorPosition.x + (markGlyph.metrics.horizontalBearingX - adjustmentRecord.markPositionAdjustment.xPositionAdjustment) * scale, baseAnchorPosition.y + (adjustmentRecord.markPositionAdjustment.yPositionAdjustment - markGlyph.metrics.horizontalBearingY) * scale, markGlyph.metrics.width, markGlyph.metrics.height);
+                Rect markGlyphPosition = new Rect(baseAnchorPosition.x + (markGlyph.metrics.horizontalBearingX - adjustmentRecord.markPositionAdjustment.xPositionAdjustment) * scale, baseAnchorPosition.y + (adjustmentRecord.markPositionAdjustment.yPositionAdjustment - markGlyph.metrics.horizontalBearingY) * scale, markGlyph.metrics.width, markGlyph.metrics.height);
 
-            // Draw Mark Origin
-            DrawGlyph(markGlyph, markGlyphPosition, scale);
+                // Draw Mark Origin
+                DrawGlyph(markGlyph, markGlyphPosition, scale);
+            }
         }
 
         void DrawMarkToMarkPreview(int selectedRecord, Rect rect)
@@ -2748,11 +2752,15 @@ void DrawMarkToMarkPreview(int selectedRecord, Rect rect)
 
             DrawAnchorPoint(baseAnchorPosition, Color.green);
 
-            Glyph markGlyph = m_fontAsset.glyphLookupTable[markGlyphIndex];
+            // Draw Mark Glyph
+            if (m_fontAsset.glyphLookupTable.ContainsKey(markGlyphIndex))
+            {
+                Glyph markGlyph = m_fontAsset.glyphLookupTable[markGlyphIndex];
 
-            Rect markGlyphPosition = new Rect(baseAnchorPosition.x + (markGlyph.metrics.horizontalBearingX - adjustmentRecord.combiningMarkPositionAdjustment.xPositionAdjustment) * scale, baseAnchorPosition.y + (adjustmentRecord.combiningMarkPositionAdjustment.yPositionAdjustment - markGlyph.metrics.horizontalBearingY) * scale, markGlyph.metrics.width, markGlyph.metrics.height);
+                Rect markGlyphPosition = new Rect(baseAnchorPosition.x + (markGlyph.metrics.horizontalBearingX - adjustmentRecord.combiningMarkPositionAdjustment.xPositionAdjustment) * scale, baseAnchorPosition.y + (adjustmentRecord.combiningMarkPositionAdjustment.yPositionAdjustment - markGlyph.metrics.horizontalBearingY) * scale, markGlyph.metrics.width, markGlyph.metrics.height);
 
-            DrawGlyph(markGlyph, markGlyphPosition, scale);
+                DrawGlyph(markGlyph, markGlyphPosition, scale);
+            }
         }
 
         void DrawBaseline(Vector2 position, float width, Color color)
diff --git a/Modules/TextCoreTextEngineEditor/Managed/PropertyDrawers/SpriteCharacterPropertyDrawer.cs b/Modules/TextCoreTextEngineEditor/Managed/PropertyDrawers/SpriteCharacterPropertyDrawer.cs
index 2d2b726c82..7d6df45858 100644
--- a/Modules/TextCoreTextEngineEditor/Managed/PropertyDrawers/SpriteCharacterPropertyDrawer.cs
+++ b/Modules/TextCoreTextEngineEditor/Managed/PropertyDrawers/SpriteCharacterPropertyDrawer.cs
@@ -16,7 +16,6 @@ internal class SpriteCharacterPropertyDrawer : PropertyDrawer
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
             SerializedProperty prop_SpriteName = property.FindPropertyRelative("m_Name");
-            SerializedProperty prop_SpriteNameHashCode = property.FindPropertyRelative("m_HashCode");
             SerializedProperty prop_SpriteUnicode = property.FindPropertyRelative("m_Unicode");
             SerializedProperty prop_SpriteGlyphIndex = property.FindPropertyRelative("m_GlyphIndex");
             SerializedProperty prop_SpriteScale = property.FindPropertyRelative("m_Scale");
@@ -86,8 +85,6 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
                 EditorGUI.DelayedTextField(new Rect(rect.x + 195f, rect.y, rect.width - 255, 18), prop_SpriteName, new GUIContent("Name:"));
                 if (EditorGUI.EndChangeCheck())
                 {
-                    // Recompute hashCode for new name
-                    prop_SpriteNameHashCode.intValue = TextUtilities.GetHashCodeCaseInSensitive(prop_SpriteName.stringValue);
                     spriteAsset.m_IsSpriteAssetLookupTablesDirty = true;
                 }
 
diff --git a/Modules/TextCoreTextEngineEditor/Managed/PropertyDrawers/TextCorePropertyDrawerUtilities.cs b/Modules/TextCoreTextEngineEditor/Managed/PropertyDrawers/TextCorePropertyDrawerUtilities.cs
index fa2d843946..b9a2911d38 100644
--- a/Modules/TextCoreTextEngineEditor/Managed/PropertyDrawers/TextCorePropertyDrawerUtilities.cs
+++ b/Modules/TextCoreTextEngineEditor/Managed/PropertyDrawers/TextCorePropertyDrawerUtilities.cs
@@ -149,6 +149,7 @@ internal static bool TryGetMaterial(SerializedObject serializedObject, Texture2D
                     return false;
 
                 mat.mainTexture = texture;
+                mat.color = Color.white;
             }
             else
             {
diff --git a/Modules/TextCoreTextEngineEditor/Managed/TextAssetPostProcessor.cs b/Modules/TextCoreTextEngineEditor/Managed/TextAssetPostProcessor.cs
index dd59d8cc72..732ed62837 100644
--- a/Modules/TextCoreTextEngineEditor/Managed/TextAssetPostProcessor.cs
+++ b/Modules/TextCoreTextEngineEditor/Managed/TextAssetPostProcessor.cs
@@ -20,10 +20,6 @@ private static void OnPostprocessAllAssets(string[] importedAssets, string[] del
             bool textureImported = false;
             foreach (var asset in importedAssets)
             {
-                // Return if imported asset path is outside of the project.
-                if (asset.StartsWith("Assets/", StringComparison.OrdinalIgnoreCase) == false)
-                    continue;
-
                 Type assetType = AssetDatabase.GetMainAssetTypeAtPath(asset);
                 if (assetType == typeof(FontAsset))
                 {
@@ -36,12 +32,22 @@ private static void OnPostprocessAllAssets(string[] importedAssets, string[] del
 
                 if (assetType == typeof(Texture2D))
                     textureImported = true;
+
+                if (assetType == typeof(Font))
+                    EditorApplication.delayCall += () => UpdateFallbackFontReferences(asset);
             }
 
             // If textures were imported, issue callback to any potential text objects that might require updating.
             if (textureImported)
                 TextEventManager.ON_SPRITE_ASSET_PROPERTY_CHANGED(true, null);
         }
+
+        static void UpdateFallbackFontReferences(string fontPath)
+        {
+            TrueTypeFontImporter fontImporter = AssetImporter.GetAtPath(fontPath) as TrueTypeFontImporter;
+            if (fontImporter != null)
+                fontImporter.fontReferences = fontImporter.LookupFallbackFontReferences(fontImporter.fontNames);
+        }
     }
 
     internal class TMP_FontAssetPostProcessor : AssetModificationProcessor
diff --git a/Modules/TextCoreTextEngineEditor/Managed/TextEditorResourceManager.cs b/Modules/TextCoreTextEngineEditor/Managed/TextEditorResourceManager.cs
index a46f04081b..bc4475a533 100644
--- a/Modules/TextCoreTextEngineEditor/Managed/TextEditorResourceManager.cs
+++ b/Modules/TextCoreTextEngineEditor/Managed/TextEditorResourceManager.cs
@@ -21,6 +21,7 @@ internal static void InitializeFontAssetResourceChangeCallBacks()
             FontAsset.SetAtlasTextureIsReadable += FontEngineEditorUtilities.SetAtlasTextureIsReadable;
             FontAsset.GetSourceFontRef += TextEditorResourceManager.GetSourceFontRef;
             FontAsset.SetSourceFontGUID += TextEditorResourceManager.SetSourceFontGUID;
+            FontAsset.EditorApplicationIsUpdating += () => EditorApplication.isUpdating;
 
             // Callback to handle clearing dynamic font asset data when closing the Editor
             EditorApplication.quitting += () =>
diff --git a/Modules/TextRendering/TextRendering.bindings.cs b/Modules/TextRendering/TextRendering.bindings.cs
index 1c34bac324..0322112c46 100644
--- a/Modules/TextRendering/TextRendering.bindings.cs
+++ b/Modules/TextRendering/TextRendering.bindings.cs
@@ -282,7 +282,7 @@ public sealed class Font : Object
         public delegate void FontTextureRebuildCallback();
 
         public extern Material material { get; set; }
-        public extern string[] fontNames { get; set; }
+        public extern string[] fontNames { get; [param: Unmarshalled] set; }
         public extern bool dynamic { get; }
         public extern int ascent { get; }
         public extern int fontSize { get; }
@@ -359,7 +359,7 @@ public bool HasCharacter(char c)
 
         private static extern void Internal_CreateFont([Writable] Font self, string name);
         private static extern void Internal_CreateFontFromPath([Writable] Font self, string fontPath);
-        private static extern void Internal_CreateDynamicFont([Writable] Font self, string[] _names, int size);
+        private static extern void Internal_CreateDynamicFont([Writable] Font self, [Unmarshalled]string[] _names, int size);
 
         [FreeFunction("TextRenderingPrivate::GetCharacterInfo", HasExplicitThis = true)]
         public extern bool GetCharacterInfo(char ch, out CharacterInfo info, [DefaultValue("0")] int size, [DefaultValue("FontStyle.Normal")] FontStyle style);
diff --git a/Modules/TextRenderingEditor/TrueTypeFontImporter.bindings.cs b/Modules/TextRenderingEditor/TrueTypeFontImporter.bindings.cs
index 497dbd83d6..24db1f81ab 100644
--- a/Modules/TextRenderingEditor/TrueTypeFontImporter.bindings.cs
+++ b/Modules/TextRenderingEditor/TrueTypeFontImporter.bindings.cs
@@ -51,13 +51,13 @@ public sealed class TrueTypeFontImporter : AssetImporter
         [NativeProperty("FontNameFromTTFData", false, TargetType.Function)] public extern string fontTTFName { get; }
         [NativeProperty("ForceTextureCase", false, TargetType.Function)] public extern FontTextureCase fontTextureCase { get; set; }
 
-        [NativeProperty("MarshalledFontReferences", false, TargetType.Function)] public extern Font[] fontReferences { get; set; }
-        [NativeProperty("MarshalledFontNames", false, TargetType.Function)] public extern string[] fontNames { get; set; }
+        [NativeProperty("MarshalledFontReferences", false, TargetType.Function)] public extern Font[] fontReferences { get; [param:Unmarshalled] set; }
+        [NativeProperty("MarshalledFontNames", false, TargetType.Function)] public extern string[] fontNames { get; [param:Unmarshalled] set; }
 
         internal extern bool IsFormatSupported();
         public extern Font GenerateEditableFont(string path);
 
-        internal extern Font[] MarshalledLookupFallbackFontReferences(string[] names);
+        internal extern Font[] MarshalledLookupFallbackFontReferences([Unmarshalled] string[] names);
         internal Font[] LookupFallbackFontReferences(string[] names)
         {
             return MarshalledLookupFallbackFontReferences(names);
diff --git a/Modules/Tilemap/ScriptBindings/Tilemap.bindings.cs b/Modules/Tilemap/ScriptBindings/Tilemap.bindings.cs
index 910e044e35..9867b083cc 100644
--- a/Modules/Tilemap/ScriptBindings/Tilemap.bindings.cs
+++ b/Modules/Tilemap/ScriptBindings/Tilemap.bindings.cs
@@ -142,7 +142,7 @@ public TileBase[] GetTilesBlock(BoundsInt bounds)
         }
 
         [FreeFunction(Name = "TilemapBindings::GetTileAssetsBlockNonAlloc", HasExplicitThis = true)]
-        internal extern int GetTileAssetsBlockNonAlloc(Vector3Int startPosition, Vector3Int endPosition, Object[] tiles);
+        internal extern int GetTileAssetsBlockNonAlloc(Vector3Int startPosition, Vector3Int endPosition, [Unmarshalled] Object[] tiles);
 
         public int GetTilesBlockNonAlloc(BoundsInt bounds, TileBase[] tiles)
         {
@@ -152,7 +152,7 @@ public int GetTilesBlockNonAlloc(BoundsInt bounds, TileBase[] tiles)
         public extern int GetTilesRangeCount(Vector3Int startPosition, Vector3Int endPosition);
 
         [FreeFunction(Name = "TilemapBindings::GetTileAssetsRangeNonAlloc", HasExplicitThis = true)]
-        internal extern int GetTileAssetsRangeNonAlloc(Vector3Int startPosition, Vector3Int endPosition, Vector3Int[] positions, Object[] tiles);
+        internal extern int GetTileAssetsRangeNonAlloc(Vector3Int startPosition, Vector3Int endPosition, Vector3Int[] positions, [Unmarshalled] Object[] tiles);
 
         public int GetTilesRangeNonAlloc(Vector3Int startPosition, Vector3Int endPosition, Vector3Int[] positions, TileBase[] tiles)
         {
@@ -209,10 +209,10 @@ public int GetUsedSpritesNonAlloc(Sprite[] usedSprites)
         }
 
         [FreeFunction(Name = "TilemapBindings::GetUsedTilesNonAlloc", HasExplicitThis = true)]
-        internal extern int Internal_GetUsedTilesNonAlloc(Object[] usedTiles);
+        internal extern int Internal_GetUsedTilesNonAlloc([Unmarshalled] Object[] usedTiles);
 
         [FreeFunction(Name = "TilemapBindings::GetUsedSpritesNonAlloc", HasExplicitThis = true)]
-        internal extern int Internal_GetUsedSpritesNonAlloc(Object[] usedSprites);
+        internal extern int Internal_GetUsedSpritesNonAlloc([Unmarshalled] Object[] usedSprites);
 
         public extern Sprite GetSprite(Vector3Int position);
 
diff --git a/Modules/TilemapEditor/Editor/Managed/TilemapCollider2DEditor.cs b/Modules/TilemapEditor/Editor/Managed/TilemapCollider2DEditor.cs
index 49270d07ea..7bf7017a29 100644
--- a/Modules/TilemapEditor/Editor/Managed/TilemapCollider2DEditor.cs
+++ b/Modules/TilemapEditor/Editor/Managed/TilemapCollider2DEditor.cs
@@ -37,7 +37,7 @@ public override void OnInspectorGUI()
         {
             serializedObject.Update();
             EditorGUILayout.PropertyField(m_MaximumTileChangeCount, Styles.maximumTileChangeCountLabel);
-            using (new EditorGUI.DisabledScope(!(target as TilemapCollider2D).usedByComposite))
+            using (new EditorGUI.DisabledScope((target as TilemapCollider2D).compositeOperation == Collider2D.CompositeOperation.None))
                 EditorGUILayout.PropertyField(m_ExtrusionFactor, Styles.extrusionFactorLabel);
             EditorGUILayout.PropertyField(m_UseDelaunayMesh);
             base.OnInspectorGUI();
diff --git a/Modules/UI/ScriptBindings/UICanvas.bindings.cs b/Modules/UI/ScriptBindings/UICanvas.bindings.cs
index ba41ee9160..047325cdc3 100644
--- a/Modules/UI/ScriptBindings/UICanvas.bindings.cs
+++ b/Modules/UI/ScriptBindings/UICanvas.bindings.cs
@@ -50,6 +50,7 @@ public sealed class Canvas : Behaviour
         public extern float scaleFactor { get; set; }
         public extern float referencePixelsPerUnit { get; set; }
         public extern bool overridePixelPerfect { get; set; }
+        public extern bool vertexColorAlwaysGammaSpace { get; set; }
         public extern bool pixelPerfect { get; set; }
         public extern float planeDistance { get; set; }
         public extern int renderOrder { get; }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Builder.cs b/Modules/UIBuilder/Editor/Builder/Builder.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Builder.cs
rename to Modules/UIBuilder/Editor/Builder/Builder.cs
index 2fc0c98cc1..eb51192eb3 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Builder.cs
+++ b/Modules/UIBuilder/Editor/Builder/Builder.cs
@@ -1,3 +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.Linq;
 using UnityEditor;
 using UnityEditor.Callbacks;
@@ -8,6 +12,16 @@ namespace Unity.UI.Builder
 {
     class Builder : BuilderPaneWindow, IBuilderViewportWindow, IHasCustomMenu
     {
+        static Builder()
+        {
+            EditorApplication.fileMenuSaved += () =>
+            {
+                var builder = ActiveWindow;
+                if (builder != null && builder.document.hasUnsavedChanges)
+                    builder.SaveChanges();
+            };
+        }
+        
         BuilderSelection m_Selection;
 
         BuilderToolbar m_Toolbar;
@@ -236,6 +250,11 @@ public override void DiscardChanges()
             base.DiscardChanges();
         }
 
+        public void ReloadDocument()
+        {
+            m_Toolbar.ReloadDocument();
+        }
+
         protected override void OnEnable()
         {
             base.OnEnable();
@@ -288,6 +307,10 @@ public static bool OnOpenAsset(int instanceID, int line)
             {
                 builderWindow.LoadDocument(asset);
             }
+            else
+            {
+                builderWindow.ReloadDocument();
+            }
 
             return true;
         }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderExternalPackages.cs b/Modules/UIBuilder/Editor/Builder/BuilderExternalPackages.cs
similarity index 55%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderExternalPackages.cs
rename to Modules/UIBuilder/Editor/Builder/BuilderExternalPackages.cs
index 0e0a810b33..5aca2cd68d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderExternalPackages.cs
+++ b/Modules/UIBuilder/Editor/Builder/BuilderExternalPackages.cs
@@ -1,3 +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 PackageInfo = UnityEditor.PackageManager.PackageInfo;
 using System.Linq;
 using UnityEditor;
@@ -11,7 +15,10 @@ public static bool is2DSpriteEditorInstalled
         {
             get
             {
-                return PackageInfo.GetAllRegisteredPackages().Any(x => x.name == "com.unity.2d.sprite" && x.version == "1.0.0");
+                var packageInfo = PackageInfo.FindForPackageName("com.unity.2d.sprite");
+                if (packageInfo != null)
+                    return packageInfo.version == "1.0.0";
+                return false;
             }
         }
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPane.cs b/Modules/UIBuilder/Editor/Builder/BuilderPane.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPane.cs
rename to Modules/UIBuilder/Editor/Builder/BuilderPane.cs
index a780401d81..195c41edeb 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPane.cs
+++ b/Modules/UIBuilder/Editor/Builder/BuilderPane.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPaneContent.cs b/Modules/UIBuilder/Editor/Builder/BuilderPaneContent.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPaneContent.cs
rename to Modules/UIBuilder/Editor/Builder/BuilderPaneContent.cs
index 2dbde3e98a..9a1f4f8c1d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPaneContent.cs
+++ b/Modules/UIBuilder/Editor/Builder/BuilderPaneContent.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using System.Collections.Generic;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPaneWindow.cs b/Modules/UIBuilder/Editor/Builder/BuilderPaneWindow.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPaneWindow.cs
rename to Modules/UIBuilder/Editor/Builder/BuilderPaneWindow.cs
index cc4b6172be..6b6c2bc54a 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPaneWindow.cs
+++ b/Modules/UIBuilder/Editor/Builder/BuilderPaneWindow.cs
@@ -1,3 +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.IO;
 using UnityEditor;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderSelection.cs b/Modules/UIBuilder/Editor/Builder/BuilderSelection.cs
similarity index 90%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderSelection.cs
rename to Modules/UIBuilder/Editor/Builder/BuilderSelection.cs
index ecda5947d9..e8958e64a4 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderSelection.cs
+++ b/Modules/UIBuilder/Editor/Builder/BuilderSelection.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Reflection;
@@ -81,14 +85,13 @@ public BuilderSelectionType selectionType
                     return BuilderSelectionType.StyleSheet;
                 if (selectedElement.GetVisualElementAsset() == null)
                 {
-                    if (selectedElement.HasProperty(VisualTreeAsset.LinkedVEAInTemplatePropertyName))
+                    if (selectedElement.HasProperty(VisualTreeAsset.LinkedVEAInTemplatePropertyName)
+                        && BuilderAssetUtilities.GetVisualElementRootTemplate(selectedElement) != null)
                     {
                         return BuilderSelectionType.ElementInTemplateInstance;
                     }
-                    else
-                    {
-                        return BuilderSelectionType.ElementInControlInstance;
-                    }
+
+                    return BuilderSelectionType.ElementInControlInstance;
                 }
                 if (selectedElement.IsPartOfActiveVisualTreeAsset(m_PaneWindow.document))
                     return BuilderSelectionType.Element;
@@ -111,8 +114,6 @@ public VisualElement documentRootElement
 
         public bool isEmpty { get { return m_Selection.Count == 0; } }
 
-        MethodInfo m_LiveReloadTriggerMethod;
-
         public BuilderSelection(VisualElement root, BuilderPaneWindow paneWindow)
         {
             m_Notifiers = new List<IBuilderSelectionNotifier>();
@@ -129,8 +130,6 @@ public BuilderSelection(VisualElement root, BuilderPaneWindow paneWindow)
             m_DummyElementForStyleChangeNotifications.style.width = 1;
             m_DummyElementForStyleChangeNotifications.RegisterCallback<GeometryChangedEvent>(AfterPanelUpdaterChange);
             m_Root.Add(m_DummyElementForStyleChangeNotifications);
-
-            m_LiveReloadTriggerMethod = ReflectionExtensions.GetStaticMethodByReflection(typeof(UIElementsUtility), "InMemoryAssetsHaveBeenChanged");
         }
 
         public void AssignNotifiers(IEnumerable<IBuilderSelectionNotifier> notifiers)
@@ -258,11 +257,21 @@ public void NotifyOfHierarchyChange(
             // This is so anyone interested can refresh their use of this UXML with
             // the latest (unsaved to disk) changes.
             EditorUtility.SetDirty(m_PaneWindow.document.visualTreeAsset);
-            m_LiveReloadTriggerMethod?.Invoke(null, null);
 
             foreach (var notifier in m_Notifiers)
                 if (notifier != source)
                     notifier.HierarchyChanged(element, changeType);
+
+            if (hasUnsavedChanges && !isAnonymousDocument)
+            {
+                var liveReloadChanges = ((changeType & BuilderHierarchyChangeType.InlineStyle) != 0
+                                            ? BuilderAssetUtilities.LiveReloadChanges.Styles
+                                            : 0) |
+                                        ((changeType & ~BuilderHierarchyChangeType.InlineStyle) != 0
+                                            ? BuilderAssetUtilities.LiveReloadChanges.Hierarchy
+                                            : 0);
+                BuilderAssetUtilities.LiveReload(liveReloadChanges);
+            }
         }
 
         public void NotifyOfStylingChange(IBuilderSelectionNotifier source = null, List<string> styles = null, BuilderStylingChangeType changeType = BuilderStylingChangeType.Default)
@@ -298,12 +307,16 @@ public void NotifyOfStylingChangePostStylingUpdate()
             // the latest (unsaved to disk) changes.
             //RetainedMode.FlagStyleSheetChange(); // Works but TOO SLOW.
             m_PaneWindow.document.MarkStyleSheetsDirty();
-            m_LiveReloadTriggerMethod?.Invoke(null, null);
 
             foreach (var notifier in m_Notifiers)
                 if (notifier != m_CurrentNotifier)
                     notifier.StylingChanged(m_CurrentStyleList, m_CurrentChangeType);
 
+            if (hasUnsavedChanges && !isAnonymousDocument)
+            {
+                BuilderAssetUtilities.LiveReload(BuilderAssetUtilities.LiveReloadChanges.Styles);
+            }
+
             m_CurrentNotifier = null;
             m_CurrentStyleList = null;
         }
@@ -369,5 +382,10 @@ public void ResetUnsavedChanges()
         {
             hasUnsavedChanges = false;
         }
+
+        private bool isAnonymousDocument
+        {
+            get { return m_PaneWindow.document.activeOpenUXMLFile.isAnonymousDocument; }
+        }
     }
 }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocument.cs b/Modules/UIBuilder/Editor/Builder/Document/BuilderDocument.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocument.cs
rename to Modules/UIBuilder/Editor/Builder/Document/BuilderDocument.cs
index 5cf9fda7a6..493418641c 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocument.cs
+++ b/Modules/UIBuilder/Editor/Builder/Document/BuilderDocument.cs
@@ -1,3 +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 UnityEngine;
 using UnityEngine.UIElements;
 using System.Collections.Generic;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentOpenUSS.cs b/Modules/UIBuilder/Editor/Builder/Document/BuilderDocumentOpenUSS.cs
similarity index 81%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentOpenUSS.cs
rename to Modules/UIBuilder/Editor/Builder/Document/BuilderDocumentOpenUSS.cs
index 406593fe04..1c130c3342 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentOpenUSS.cs
+++ b/Modules/UIBuilder/Editor/Builder/Document/BuilderDocumentOpenUSS.cs
@@ -1,3 +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 UnityEngine;
 using UnityEngine.UIElements;
 using UnityEditor;
@@ -173,5 +177,31 @@ bool WriteUSSToFile(string ussPath, string ussText)
 
             return BuilderAssetUtilities.WriteTextFileToDisk(ussPath, ussText);
         }
+        
+        public int GetComplexSelectorsCount()
+        {
+            if (m_StyleSheet == null || m_StyleSheet.complexSelectors == null)
+                return 0;
+            
+            var nbComplexSelectorsCount = 0;
+            for (var complexSelectorIndex = 0;
+                 complexSelectorIndex < m_StyleSheet.complexSelectors.Length;
+                 ++complexSelectorIndex)
+            {
+                var complexSelector = m_StyleSheet.complexSelectors[complexSelectorIndex];
+
+                // Omit special selection rule.
+                if (complexSelector.selectors.Length > 0 &&
+                    complexSelector.selectors[0].parts.Length > 0 &&
+                    (complexSelector.selectors[0].parts[0].value == BuilderConstants.SelectedStyleSheetSelectorName
+                     || complexSelector.selectors[0].parts[0].value
+                         .StartsWith(BuilderConstants.StyleSelectorElementName)))
+                    continue;
+
+                nbComplexSelectorsCount++;
+            }
+
+            return nbComplexSelectorsCount;
+        }
     }
 }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentOpenUXML.cs b/Modules/UIBuilder/Editor/Builder/Document/BuilderDocumentOpenUXML.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentOpenUXML.cs
rename to Modules/UIBuilder/Editor/Builder/Document/BuilderDocumentOpenUXML.cs
index 08ca0d21a9..51190d8877 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentOpenUXML.cs
+++ b/Modules/UIBuilder/Editor/Builder/Document/BuilderDocumentOpenUXML.cs
@@ -1,3 +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 UnityEngine;
 using UnityEngine.UIElements;
 using System.Collections.Generic;
@@ -57,7 +61,7 @@ class BuilderDocumentOpenUXML
 
         public BuilderUXMLFileSettings fileSettings => m_FileSettings ?? (m_FileSettings = new BuilderUXMLFileSettings(visualTreeAsset));
 
-        List<BuilderDocumentOpenUXML> openUXMLFiles
+        internal List<BuilderDocumentOpenUXML> openUXMLFiles
         {
             get
             {
@@ -180,6 +184,11 @@ public bool hasUnsavedChanges
             }
         }
 
+        public bool isAnonymousDocument
+        {
+            get { return string.IsNullOrEmpty(uxmlPath); }
+        }
+
         public float viewportZoomScale
         {
             get
@@ -265,7 +274,7 @@ public void RefreshStyle(VisualElement documentRootElement)
             UnityEngine.UIElements.StyleSheets.StyleSheetCache.ClearCaches();
             foreach (var openUSS in m_OpenUSSFiles)
                 openUSS.FixRuleReferences();
-            m_CurrentDocumentRootElement.IncrementVersion((VersionChangeType)(-1));
+            m_CurrentDocumentRootElement.IncrementVersion((VersionChangeType) (-1));
         }
 
         public void MarkStyleSheetsDirty()
@@ -376,10 +385,6 @@ public void UpdateActiveStyleSheet(BuilderSelection selection, StyleSheet styleS
             selection.ForceReselection(source);
         }
 
-        //
-        // Save / Load
-        //
-
         public bool SaveUnsavedChanges(string manualUxmlPath = null, bool isSaveAs = false)
         {
             return SaveNewDocument(null, isSaveAs, out var needsFullRefresh, manualUxmlPath);
@@ -392,8 +397,6 @@ public bool SaveNewDocument(
         {
             needsFullRefresh = false;
 
-            ClearUndo();
-
             // Re-use or ask the user for the UXML path.
             var newUxmlPath = uxmlPath;
             if (string.IsNullOrEmpty(newUxmlPath) || isSaveAs)
@@ -410,7 +413,10 @@ public bool SaveNewDocument(
                 }
             }
 
-            List<BuilderDocumentOpenUSS> savedUSSFiles = new List<BuilderDocumentOpenUSS>();
+            ClearUndo();
+
+            var startTime = DateTime.UtcNow;
+            var savedUSSFiles = new List<BuilderDocumentOpenUSS>();
 
             // Save USS files.
             foreach (var openUSSFile in m_OpenUSSFiles)
@@ -488,6 +494,9 @@ public bool SaveNewDocument(
 
             hasUnsavedChanges = false;
 
+            var assetSize = uxmlText?.Length ?? 0;
+            BuilderAnalyticsUtility.SendSaveEvent(startTime, this, newUxmlPath, assetSize);
+
             return true;
         }
 
@@ -637,6 +646,9 @@ public void LoadDocument(VisualTreeAsset visualTreeAsset, VisualElement document
             m_VisualTreeAssetBackup = visualTreeAsset.DeepCopy();
             m_VisualTreeAsset = visualTreeAsset;
 
+            // Re-stamp orderInDocument values using BuilderConstants.VisualTreeAssetOrderIncrement
+            VisualTreeAssetUtilities.ReOrderDocument(m_VisualTreeAsset);
+
             PostLoadDocumentStyleSheetCleanup();
 
             hasUnsavedChanges = false;
@@ -672,11 +684,6 @@ private void LoadVisualTreeAsset(VisualTreeAsset newVisualTreeAsset)
             if (builderWindow == null)
                 builderWindow = Builder.ShowWindow();
 
-            // LoadDocument() will call Clear() which will try to restore from Backup().
-            // If we don't clear the Backups here, they will overwrite the newly post-processed
-            // and re-imported asset we detected here.
-            ClearBackups();
-
             if (string.IsNullOrEmpty(uxmlPath))
                 builderWindow.toolbar.ReloadDocument();
             else
@@ -711,6 +718,11 @@ public void OnPostProcessAsset(string assetPath)
                     return;
             }
 
+            // LoadDocument() will call Clear() which will try to restore from Backup().
+            // If we don't clear the Backups here, they will overwrite the newly post-processed
+            // and re-imported asset we detected here.
+            ClearBackups();
+
             if (EditorWindow.HasOpenInstances<Builder>())
             {
                 // LoadVisualTreeAsset needs to be delayed to ensure that this is called later, while in a correct state.
@@ -750,6 +762,7 @@ void ValidateActiveStyleSheet()
                 found = true;
                 break;
             }
+
             if (!found)
                 m_ActiveStyleSheet = firstStyleSheet;
         }
@@ -817,7 +830,15 @@ public void RestoreAssetsFromBackup()
                 openUSSFile.RestoreFromBackup();
 
             if (m_VisualTreeAsset != null && m_VisualTreeAssetBackup != null)
+            {
                 m_VisualTreeAssetBackup.DeepOverwrite(m_VisualTreeAsset);
+                EditorUtility.SetDirty(m_VisualTreeAsset);
+                if (hasUnsavedChanges && !isAnonymousDocument)
+                {
+                    BuilderAssetUtilities.LiveReload(BuilderAssetUtilities.LiveReloadChanges.Hierarchy |
+                                                     BuilderAssetUtilities.LiveReloadChanges.Styles);
+                }
+            }
 
             hasUnsavedChanges = false;
         }
@@ -933,6 +954,7 @@ void ReloadDocumentToCanvas(VisualElement documentRootElement)
                         continue;
                     sibling.style.opacity = BuilderConstants.OpacityFadeOutFactor;
                 }
+
                 currentRoot = currentParent;
             }
         }
@@ -953,6 +975,7 @@ void ReloadDocumentHierarchyToCanvas(VisualTreeAsset vta, VisualElement parentEl
                 Debug.LogError("Invalid UXML or USS: " + e.ToString());
                 Clear();
             }
+
             parentElement.SetProperty(
                 BuilderConstants.ElementLinkedVisualTreeAssetVEPropertyName, vta);
         }
@@ -1023,6 +1046,7 @@ bool PostSaveToDiskChecksAndFixes(string newUxmlPath, bool needsFullRefresh)
                 var hash = UXMLImporterImpl.GenerateHash(localUxmlPath);
                 m_VisualTreeAsset.contentHash = hash.GetHashCode();
             }
+
             return needsFullRefresh;
         }
     }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentSettings.cs b/Modules/UIBuilder/Editor/Builder/Document/BuilderDocumentSettings.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentSettings.cs
rename to Modules/UIBuilder/Editor/Builder/Document/BuilderDocumentSettings.cs
index 3655a0d57e..9db87bd025 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentSettings.cs
+++ b/Modules/UIBuilder/Editor/Builder/Document/BuilderDocumentSettings.cs
@@ -1,3 +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 UnityEngine;
 using System;
 using System.IO;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderUXMLFileSettings.cs b/Modules/UIBuilder/Editor/Builder/Document/BuilderUXMLFileSettings.cs
similarity index 90%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderUXMLFileSettings.cs
rename to Modules/UIBuilder/Editor/Builder/Document/BuilderUXMLFileSettings.cs
index 784985fe8b..fa135164c5 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderUXMLFileSettings.cs
+++ b/Modules/UIBuilder/Editor/Builder/Document/BuilderUXMLFileSettings.cs
@@ -1,3 +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;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderClassDragger.cs b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderClassDragger.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderClassDragger.cs
rename to Modules/UIBuilder/Editor/Builder/Draggers/BuilderClassDragger.cs
index f5fd0b17ff..52e78c7103 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderClassDragger.cs
+++ b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderClassDragger.cs
@@ -1,3 +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 UnityEngine;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderDragger.cs b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderDragger.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderDragger.cs
rename to Modules/UIBuilder/Editor/Builder/Draggers/BuilderDragger.cs
index 317b26bf2a..e556a63842 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderDragger.cs
+++ b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderDragger.cs
@@ -1,3 +1,8 @@
+// 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;
@@ -47,6 +52,8 @@ protected enum DestinationPane
         public VisualElement builderHierarchyRoot { get; set; }
         public VisualElement builderStylesheetRoot { get; set; }
 
+        public bool active => m_Active;
+
         protected BuilderPaneWindow paneWindow { get { return m_PaneWindow; } }
         protected BuilderSelection selection { get { return m_Selection; } }
         protected VisualElement documentRootElement => m_Canvas;
@@ -57,6 +64,8 @@ protected enum DestinationPane
         List<ManipulatorActivationFilter> activators { get; set; }
         ManipulatorActivationFilter m_CurrentActivator;
 
+        public event Action onEndDrag;
+        
         public BuilderDragger(
             BuilderPaneWindow paneWindow,
             VisualElement root, BuilderSelection selection,
@@ -429,6 +438,7 @@ void PerformDragInner(VisualElement target, Vector2 mousePosition)
         void EndDragInner()
         {
             EndDrag();
+            onEndDrag?.Invoke();
 
             m_LastRowHoverElement?.RemoveFromClassList(s_TreeItemHoverHoverClassName);
             m_LastRowHoverElement?.Query(className: BuilderConstants.ExplorerItemReorderZoneClassName).ForEach(e => e.RemoveFromClassList(s_TreeItemHoverWithDragBetweenElementsSupportClassName));
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderExplorerDragger.cs b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderExplorerDragger.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderExplorerDragger.cs
rename to Modules/UIBuilder/Editor/Builder/Draggers/BuilderExplorerDragger.cs
index 8030503ff9..f2e6c1983a 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderExplorerDragger.cs
+++ b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderExplorerDragger.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderHierarchyDragger.cs b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderHierarchyDragger.cs
similarity index 84%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderHierarchyDragger.cs
rename to Modules/UIBuilder/Editor/Builder/Draggers/BuilderHierarchyDragger.cs
index 7d1d68f46f..5c90f227eb 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderHierarchyDragger.cs
+++ b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderHierarchyDragger.cs
@@ -1,4 +1,9 @@
+// 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;
 using UnityEngine.UIElements;
 
@@ -62,8 +67,14 @@ protected override void PerformAction(VisualElement destination, DestinationPane
                 if (newParent == element || newParent.HasAncestor(element))
                     continue;
 
+                // When editing in context the new parent has to be null so it's inserted at the root of the active vta
+                if (newParent.IsActiveSubDocumentRoot(paneWindow.document))
+                {
+                    newParent = null;
+                }
+                
                 BuilderAssetUtilities.ReparentElementInAsset(
-                    paneWindow.document, element, newParent, index, undo);
+                    paneWindow.document, element, newParent, index++, undo);
 
                 undo = false;
             }
@@ -80,6 +91,9 @@ protected override bool IsPickedElementValid(VisualElement element)
             if (element == null)
                 return true;
 
+            if (element.IsActiveSubDocumentRoot(paneWindow.document))
+                return true;
+            
             if (element.contentContainer == null)
                 return false;
 
@@ -134,7 +148,12 @@ protected override void ResetDragPreviewElement()
 
         protected override IEnumerable<VisualElement> GetSelectedElements()
         {
-            return documentRootElement.FindSelectedElements();
+            var selectedElements = selection.selection;
+            var sortedSelectedElementsInAsset = documentRootElement.FindSelectedElements();
+
+            sortedSelectedElementsInAsset.RemoveAll(x => !selectedElements.Contains(x));
+
+            return sortedSelectedElementsInAsset;
         }
     }
 }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderLibraryDragger.cs b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderLibraryDragger.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderLibraryDragger.cs
rename to Modules/UIBuilder/Editor/Builder/Draggers/BuilderLibraryDragger.cs
index 4b87e37a41..fcb1e822be 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderLibraryDragger.cs
+++ b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderLibraryDragger.cs
@@ -1,3 +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 UnityEngine;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderStyleSheetsDragger.cs b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderStyleSheetsDragger.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderStyleSheetsDragger.cs
rename to Modules/UIBuilder/Editor/Builder/Draggers/BuilderStyleSheetsDragger.cs
index f81bcb5c88..3cf0c77c26 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderStyleSheetsDragger.cs
+++ b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderStyleSheetsDragger.cs
@@ -1,3 +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.Linq;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderViewportDragger.cs b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderViewportDragger.cs
similarity index 83%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderViewportDragger.cs
rename to Modules/UIBuilder/Editor/Builder/Draggers/BuilderViewportDragger.cs
index 99853695cb..6b5827bd39 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderViewportDragger.cs
+++ b/Modules/UIBuilder/Editor/Builder/Draggers/BuilderViewportDragger.cs
@@ -1,3 +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.Collections.Generic;
 using System.Linq;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderExplorer.cs b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderExplorer.cs
similarity index 86%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderExplorer.cs
rename to Modules/UIBuilder/Editor/Builder/Explorer/BuilderExplorer.cs
index 874348f5a4..a66c682aee 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderExplorer.cs
+++ b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderExplorer.cs
@@ -1,3 +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;
 using UnityEngine.UIElements;
 using System.Linq;
@@ -18,6 +22,7 @@ internal enum BuilderElementInfoVisibilityState
             TypeName = 1 << 0,
             ClassList = 1 << 1,
             StyleSheets = 1 << 2,
+            FullSelectorText = 1 << 3,
 
             All = ~0
         }
@@ -30,6 +35,7 @@ internal enum BuilderElementInfoVisibilityState
         protected ElementHierarchyView m_ElementHierarchyView;
         protected BuilderSelection m_Selection;
         bool m_SelectionMadeExternally;
+        [SerializeField] protected BuilderElementInfoVisibilityState m_ElementInfoVisibilityState;
 
         BuilderClassDragger m_ClassDragger;
         BuilderExplorerDragger m_ExplorerDragger;
@@ -97,6 +103,21 @@ public BuilderExplorer(
             m_ShouldRebuildHierarchyOnStyleChange = true;
         }
 
+        internal void ChangeVisibilityState(BuilderElementInfoVisibilityState state)
+        {
+            m_ElementInfoVisibilityState ^= state;
+            m_ElementHierarchyView.elementInfoVisibilityState = m_ElementInfoVisibilityState;
+            SaveViewData();
+            UpdateHierarchyAndSelection(m_ElementHierarchyView.hasUnsavedChanges);
+        }
+
+        internal override void OnViewDataReady()
+        {
+            base.OnViewDataReady();
+            OverwriteFromViewData(this, viewDataKey);
+            m_ElementHierarchyView.elementInfoVisibilityState = m_ElementInfoVisibilityState;
+        }
+
         public void ClearHighlightOverlay()
         {
             m_ElementHierarchyView.ClearHighlightOverlay();
@@ -163,10 +184,10 @@ public void UpdateHierarchyAndSelection(bool hasUnsavedChanges)
         public virtual void HierarchyChanged(VisualElement element, BuilderHierarchyChangeType changeType)
         {
             if (element == null ||
-                changeType.HasFlag(BuilderHierarchyChangeType.ChildrenAdded) ||
-                changeType.HasFlag(BuilderHierarchyChangeType.ChildrenRemoved) ||
-                changeType.HasFlag(BuilderHierarchyChangeType.Attributes) ||
-                changeType.HasFlag(BuilderHierarchyChangeType.ClassList))
+                (changeType & (BuilderHierarchyChangeType.ChildrenAdded |
+                               BuilderHierarchyChangeType.ChildrenRemoved |
+                               BuilderHierarchyChangeType.Attributes |
+                               BuilderHierarchyChangeType.ClassList)) != 0)
             {
                 UpdateHierarchyAndSelection(m_Selection.hasUnsavedChanges);
                 m_ShouldRebuildHierarchyOnStyleChange = !m_Selection.hasUnsavedChanges;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderExplorerItem.cs b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderExplorerItem.cs
similarity index 65%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderExplorerItem.cs
rename to Modules/UIBuilder/Editor/Builder/Explorer/BuilderExplorerItem.cs
index 2db2d46beb..0914e57bd5 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderExplorerItem.cs
+++ b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderExplorerItem.cs
@@ -1,3 +1,8 @@
+// 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.UIElements;
 using UnityEngine;
 
@@ -8,6 +13,8 @@ internal class BuilderExplorerItem : VisualElement
         VisualElement m_Container;
         VisualElement m_ReorderZoneAbove;
         VisualElement m_ReorderZoneBelow;
+        TextField m_RenameTextField;
+        internal List<Label> elidableLabels = new();
 
         public override VisualElement contentContainer => m_Container == null ? this : m_Container;
 
@@ -28,19 +35,6 @@ public BuilderExplorerItem()
 
             m_ReorderZoneAbove.userData = this;
             m_ReorderZoneBelow.userData = this;
-
-            // Register on TrickleDown to receive the event before the BuilderClassDragger because it stops propagation
-            this.RegisterCallback<MouseDownEvent>(e => OnMouseDownEventForRename(e), TrickleDown.TrickleDown);
-        }
-
-        void OnMouseDownEventForRename(MouseDownEvent e)
-        {
-            if (e.clickCount != 2 || e.button != (int)MouseButton.LeftMouse || e.target == null)
-                return;
-
-            ActivateRenameElementMode();
-
-            e.PreventDefault();
         }
 
         public void ActivateRenameElementMode()
@@ -51,74 +45,96 @@ public void ActivateRenameElementMode()
                 !BuilderSharedStyles.IsSelectorElement(documentElement))
                 return;
 
+            SetReorderingZonesEnabled(false);
+
             FocusOnRenameTextField();
         }
 
+        internal void SetReorderingZonesEnabled(bool value)
+        {
+            m_ReorderZoneAbove.pickingMode = value ? PickingMode.Position : PickingMode.Ignore;
+            m_ReorderZoneBelow.pickingMode = value ? PickingMode.Position : PickingMode.Ignore;
+        }
+
+        public bool IsRenamingActive()
+        {
+            if (m_RenameTextField == null)
+                return false;
+
+            return !m_RenameTextField.ClassListContains(BuilderConstants.HiddenStyleClassName);
+        }
+
         void FocusOnRenameTextField()
         {
-            var renameTextfield = this.Q<TextField>(BuilderConstants.ExplorerItemRenameTextfieldName);
             var nameLabel = this.Q<Label>(classes: BuilderConstants.ExplorerItemNameLabelClassName);
             var labelContainer = this.Q(classes: BuilderConstants.ExplorerItemSelectorLabelContClassName);
 
-            renameTextfield.RemoveFromClassList(BuilderConstants.HiddenStyleClassName);
+            m_RenameTextField.RemoveFromClassList(BuilderConstants.HiddenStyleClassName);
 
             nameLabel?.AddToClassList(BuilderConstants.HiddenStyleClassName);
             labelContainer?.AddToClassList(BuilderConstants.HiddenStyleClassName);
 
-            var baseInput = renameTextfield.Q(TextField.textInputUssName).Q<TextElement>();
+            var baseInput = m_RenameTextField.Q(TextField.textInputUssName).Q<TextElement>();
             if (baseInput.focusController != null)
+            {
                 // Since renameTextfield isn't attached to a panel yet, we are using DoFocusChange() to bypass canGrabFocus.
                 baseInput.focusController.DoFocusChange(baseInput);
-
-            renameTextfield.textSelection.SelectAll();
+                baseInput.selectingManipulator.m_SelectingUtilities.OnFocus();
+            }
         }
 
         public TextField CreateRenamingTextField(VisualElement documentElement, Label nameLabel, BuilderSelection selection)
         {
-            var renameTextfield = new TextField()
+            m_RenameTextField = new TextField()
             {
                 name = BuilderConstants.ExplorerItemRenameTextfieldName,
                 isDelayed = true
             };
-            renameTextfield.AddToClassList(BuilderConstants.ExplorerItemRenameTextfieldClassName);
+            m_RenameTextField.AddToClassList(BuilderConstants.ExplorerItemRenameTextfieldClassName);
 
             if (BuilderSharedStyles.IsSelectorElement(documentElement))
             {
-                renameTextfield.SetValueWithoutNotify(BuilderSharedStyles.GetSelectorString(documentElement));
+                m_RenameTextField.SetValueWithoutNotify(BuilderSharedStyles.GetSelectorString(documentElement));
             }
             else
             {
-                renameTextfield.SetValueWithoutNotify(
+                m_RenameTextField.SetValueWithoutNotify(
                     string.IsNullOrEmpty(documentElement.name)
                     ? documentElement.typeName
                     : documentElement.name);
             }
-            renameTextfield.AddToClassList(BuilderConstants.HiddenStyleClassName);
+            m_RenameTextField.AddToClassList(BuilderConstants.HiddenStyleClassName);
 
-            renameTextfield.RegisterCallback<KeyUpEvent>((e) =>
+            m_RenameTextField.RegisterCallback<KeyDownEvent>((e) =>
             {
                 if (e.keyCode == KeyCode.Return || e.keyCode == KeyCode.KeypadEnter || e.keyCode == KeyCode.Escape)
                 {
-                    (e.currentTarget as VisualElement).Blur();
+                    Focus();
                     return;
                 }
 
                 e.StopImmediatePropagation();
             });
 
-            renameTextfield.RegisterCallback<FocusOutEvent>(e =>
+            m_RenameTextField.RegisterCallback<FocusOutEvent>(e =>
             {
-                OnEditTextFinished(documentElement, renameTextfield, nameLabel, selection);
+                OnEditTextFinished(documentElement, nameLabel, selection);
+            });
+
+            m_RenameTextField.RegisterCallback<MouseUpEvent>(e =>
+            {
+                // Stop propagation when clicking on the text field so we don't get back focus to the TreeView
+                e.StopImmediatePropagation();
             });
 
-            return renameTextfield;
+            return m_RenameTextField;
         }
 
-        void OnEditTextFinished(VisualElement documentElement, TextField renameTextfield, Label nameLabel,
+        void OnEditTextFinished(VisualElement documentElement, Label nameLabel,
             BuilderSelection selection)
         {
             var vea = documentElement.GetVisualElementAsset();
-            var value = renameTextfield.text ?? documentElement.name;
+            var value = m_RenameTextField.text ?? documentElement.name;
 
             if (documentElement.IsSelector())
             {
@@ -126,15 +142,15 @@ void OnEditTextFinished(VisualElement documentElement, TextField renameTextfield
 
                 var stylesheet = documentElement.GetStyleSheet();
 
-                if (!string.IsNullOrEmpty(renameTextfield.text))
+                if (!string.IsNullOrEmpty(m_RenameTextField.text))
                 {
                     if (!BuilderNameUtilities.styleSelectorRegex.IsMatch(value))
                     {
                         Builder.ShowWarning(string.Format(BuilderConstants.StyleSelectorValidationSpacialCharacters, "Name"));
-                        renameTextfield.schedule.Execute(() =>
+                        m_RenameTextField.schedule.Execute(() =>
                         {
                             FocusOnRenameTextField();
-                            renameTextfield.SetValueWithoutNotify(value);
+                            m_RenameTextField.SetValueWithoutNotify(value);
                         });
                         return;
                     }
@@ -146,17 +162,17 @@ void OnEditTextFinished(VisualElement documentElement, TextField renameTextfield
             }
             else
             {
-                if (!string.IsNullOrEmpty(renameTextfield.text))
+                if (!string.IsNullOrEmpty(m_RenameTextField.text))
                 {
                     value = value.Trim();
                     value = value.TrimStart('#');
                     if (!BuilderNameUtilities.attributeRegex.IsMatch(value))
                     {
                         Builder.ShowWarning(string.Format(BuilderConstants.AttributeValidationSpacialCharacters, "Name"));
-                        renameTextfield.schedule.Execute(() =>
+                        m_RenameTextField.schedule.Execute(() =>
                         {
                             FocusOnRenameTextField();
-                            renameTextfield.SetValueWithoutNotify(value);
+                            m_RenameTextField.SetValueWithoutNotify(value);
                         });
                         return;
                     }
@@ -165,7 +181,7 @@ void OnEditTextFinished(VisualElement documentElement, TextField renameTextfield
                 }
                 else
                 {
-                    nameLabel.text = renameTextfield.text;
+                    nameLabel.text = m_RenameTextField.text;
                 }
 
                 documentElement.name = value;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderHierarchy.cs b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderHierarchy.cs
similarity index 78%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderHierarchy.cs
rename to Modules/UIBuilder/Editor/Builder/Explorer/BuilderHierarchy.cs
index 934500dbc7..d422b40e16 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderHierarchy.cs
+++ b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderHierarchy.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using UnityEditor.UIElements;
 using UnityEngine;
@@ -6,8 +10,6 @@ namespace Unity.UI.Builder
 {
     internal class BuilderHierarchy : BuilderExplorer, IBuilderSelectionNotifier
     {
-        [SerializeField] BuilderElementInfoVisibilityState m_ElementInfoVisibilityState;
-
         public BuilderHierarchy(
             BuilderPaneWindow paneWindow,
             BuilderViewport viewport,
@@ -67,20 +69,5 @@ protected override void InitEllipsisMenu()
                 ? DropdownMenuAction.Status.Checked
                 : DropdownMenuAction.Status.Normal);
         }
-
-        void ChangeVisibilityState(BuilderElementInfoVisibilityState state)
-        {
-            m_ElementInfoVisibilityState ^= state;
-            m_ElementHierarchyView.elementInfoVisibilityState = m_ElementInfoVisibilityState;
-            SaveViewData();
-            UpdateHierarchyAndSelection(m_ElementHierarchyView.hasUnsavedChanges);
-        }
-
-        internal override void OnViewDataReady()
-        {
-            base.OnViewDataReady();
-            OverwriteFromViewData(this, viewDataKey);
-            m_ElementHierarchyView.elementInfoVisibilityState = m_ElementInfoVisibilityState;
-        }
     }
 }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderHierarchyUtilities.cs b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderHierarchyUtilities.cs
similarity index 88%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderHierarchyUtilities.cs
rename to Modules/UIBuilder/Editor/Builder/Explorer/BuilderHierarchyUtilities.cs
index c5f7063cff..1ccf373abf 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderHierarchyUtilities.cs
+++ b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderHierarchyUtilities.cs
@@ -1,3 +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 UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderHierarchyWindow.cs b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderHierarchyWindow.cs
similarity index 92%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderHierarchyWindow.cs
rename to Modules/UIBuilder/Editor/Builder/Explorer/BuilderHierarchyWindow.cs
index d293d0685c..3435425fd4 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderHierarchyWindow.cs
+++ b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderHierarchyWindow.cs
@@ -1,3 +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 UnityEditor;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderNewSelectorField.cs b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderNewSelectorField.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderNewSelectorField.cs
rename to Modules/UIBuilder/Editor/Builder/Explorer/BuilderNewSelectorField.cs
index a15711624e..1656ce5c99 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderNewSelectorField.cs
+++ b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderNewSelectorField.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheets.cs b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheets.cs
similarity index 89%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheets.cs
rename to Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheets.cs
index 5981486fa7..b6dbecf46b 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheets.cs
+++ b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheets.cs
@@ -1,3 +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;
 using UnityEngine.UIElements;
 using System.Linq;
@@ -159,6 +163,23 @@ public BuilderStyleSheets(
             RegisterCallback<GeometryChangedEvent>(e => AdjustPosition());
         }
 
+        protected override void InitEllipsisMenu()
+        {
+            base.InitEllipsisMenu();
+
+            if (pane == null)
+            {
+                return;
+            }
+
+            pane.AppendActionToEllipsisMenu(L10n.Tr("Full selector text"),
+                a => ChangeVisibilityState(BuilderElementInfoVisibilityState.FullSelectorText),
+            a => m_ElementHierarchyView.elementInfoVisibilityState
+                .HasFlag(BuilderElementInfoVisibilityState.FullSelectorText)
+                ? DropdownMenuAction.Status.Checked
+                : DropdownMenuAction.Status.Normal);
+        }
+
         TextField GetTextFieldParent(VisualElement ve)
         {
             return ve.GetFirstAncestorOfType<TextField>();
@@ -218,10 +239,17 @@ void CreateNewSelector(StyleSheet styleSheet)
                 m_ShouldRefocusSelectorFieldOnBlur = true;
             }
 
-            var newSelectorStr = newValue;
-            if (newSelectorStr.StartsWith(BuilderConstants.UssSelectorClassNameSymbol))
+            var newSelectorStr = newValue.Trim();
+            var selectorTypeSymbol = (newSelectorStr[0]) switch
+            {
+                '.' => BuilderConstants.UssSelectorClassNameSymbol,
+                '#' => BuilderConstants.UssSelectorNameSymbol,
+                ':' => BuilderConstants.UssSelectorPseudoStateSymbol,
+                _ => ""
+            };
+            if (!string.IsNullOrEmpty(selectorTypeSymbol))
             {
-                newSelectorStr = BuilderConstants.UssSelectorClassNameSymbol + newSelectorStr.TrimStart(BuilderConstants.UssSelectorClassNameSymbol[0]);
+                newSelectorStr = selectorTypeSymbol + newSelectorStr.Trim(selectorTypeSymbol[0]).Trim();
             }
 
             if (string.IsNullOrEmpty(newSelectorStr))
@@ -256,6 +284,12 @@ void CreateNewSelector(StyleSheet styleSheet)
                     (e) => e.GetStyleComplexSelector() == newComplexSelector);
             if (newSelectorElement != null)
                 m_Selection.Select(null, newSelectorElement);
+
+            schedule.Execute(() =>
+            {
+                m_NewSelectorTextField.Blur();
+                m_NewSelectorTextField.SetValueWithoutNotify(BuilderConstants.ExplorerInExplorerNewClassSelectorInfoMessage);
+            });
         }
 
         void SetUpAddUSSMenu()
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheetsContextMenu.cs b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheetsContextMenu.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheetsContextMenu.cs
rename to Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheetsContextMenu.cs
index 9e8a41b36a..304b4328c3 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheetsContextMenu.cs
+++ b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheetsContextMenu.cs
@@ -1,3 +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 UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheetsUtilities.cs b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheetsUtilities.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheetsUtilities.cs
rename to Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheetsUtilities.cs
index e828bcf5cf..23e29c25e9 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheetsUtilities.cs
+++ b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheetsUtilities.cs
@@ -1,3 +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;
 using System.IO;
 using System.Linq;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheetsWindow.cs b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheetsWindow.cs
similarity index 91%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheetsWindow.cs
rename to Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheetsWindow.cs
index 1556de0d49..bf8f517cea 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheetsWindow.cs
+++ b/Modules/UIBuilder/Editor/Builder/Explorer/BuilderStyleSheetsWindow.cs
@@ -1,3 +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 UnityEditor;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspector.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspector.cs
similarity index 92%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspector.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspector.cs
index 9bbe2a9992..18f51278d4 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspector.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspector.cs
@@ -1,7 +1,12 @@
+// 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 UnityEngine.UIElements;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Pool;
@@ -55,7 +60,7 @@ struct CachedScrollPosition
         const float m_PreviewDefaultHeight = 200;
         const float m_PreviewMinHeight = 20;
         float m_CachedPreviewHeight = m_PreviewDefaultHeight;
-        
+
         // Utilities
         BuilderInspectorMatchingSelectors m_MatchingSelectors;
         BuilderInspectorStyleFields m_StyleFields;
@@ -72,12 +77,12 @@ struct CachedScrollPosition
         BuilderInspectorInheritedStyles m_InheritedStyleSection;
         BuilderInspectorLocalStyles m_LocalStylesSection;
         BuilderInspectorStyleSheet m_StyleSheetSection;
-        
+
         // Selector Preview
         TwoPaneSplitView m_SplitView;
         BuilderInspectorPreview m_SelectorPreview;
         BuilderInspectorPreviewWindow m_PreviewWindow;
-        
+
         public BuilderInspectorCanvas canvasInspector => m_CanvasSection;
         public BuilderInspectorAttributes attributesSection => m_AttributesSection;
 
@@ -109,7 +114,7 @@ struct CachedScrollPosition
         public BuilderInspectorPreview preview => m_SelectorPreview;
         public BuilderInspectorPreviewWindow previewWindow => m_PreviewWindow;
         public bool showingPreview => m_SplitView?.fixedPane?.resolvedStyle.height > m_PreviewMinHeight;
-        
+
         public StyleSheet styleSheet
         {
             get
@@ -267,7 +272,7 @@ public BuilderInspector(BuilderPaneWindow paneWindow, BuilderSelection selection
             // Local Styles Section
             m_LocalStylesSection = new BuilderInspectorLocalStyles(this, m_StyleFields);
             m_Sections.Add(m_LocalStylesSection.root);
-            
+
             m_SplitView = this.Q<TwoPaneSplitView>("inspector-content");
             m_SplitView.RegisterCallback<GeometryChangedEvent>(OnFirstDisplay);
             var previewPane = this.Q<BuilderPane>("inspector-selector-preview");
@@ -279,7 +284,7 @@ public BuilderInspector(BuilderPaneWindow paneWindow, BuilderSelection selection
             previewPane.toolbar.Add(m_SelectorPreview.backgroundToggle);
 
             previewPane.RegisterCallback<GeometryChangedEvent>(OnSizeChange);
-            
+
             RegisterDraglineInteraction();
 
             // This will take into account the current selection and then call RefreshUI().
@@ -287,7 +292,7 @@ public BuilderInspector(BuilderPaneWindow paneWindow, BuilderSelection selection
 
             // Forward focus to the panel header.
             this.Query().Where(e => e.focusable).ForEach((e) => AddFocusable(e));
-            
+
             RegisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
         }
 
@@ -360,14 +365,29 @@ void ResetSections()
 
         public void UpdateFieldStatus(VisualElement field, StyleProperty property)
         {
+            if (m_CurrentVisualElement == null)
+            {
+                return;
+            }
+
             var valueInfo = FieldValueInfo.Get(this, field, property);
 
             field.SetProperty(BuilderConstants.InspectorFieldValueInfoVEPropertyName, valueInfo);
-            UpdateFieldStatusIconAndStyling(field, valueInfo);
+            UpdateFieldStatusIconAndStyling(currentVisualElement, field, valueInfo);
             UpdateFieldTooltip(field, valueInfo);
+
+            var isAttribute = field.HasProperty(BuilderConstants.InspectorLinkedAttributeDescriptionVEPropertyName);
+            if (isAttribute)
+            {
+                attributeSection.UpdateAttributeOverrideStyle(field);
+            }
+            else
+            {
+                m_LocalStylesSection.UpdateStyleCategoryFoldoutOverrides();
+            }
         }
 
-        void UpdateFieldStatusIconAndStyling(VisualElement field, FieldValueInfo valueInfo)
+        internal static void UpdateFieldStatusIconAndStyling(VisualElement currentElement, VisualElement field, FieldValueInfo valueInfo)
         {
             var statusIndicator = field.GetFieldStatusIndicator();
 
@@ -378,6 +398,7 @@ void ClearClassLists(VisualElement ve)
                 ve.RemoveFromClassList(BuilderConstants.InspectorLocalStyleSelectorClassName);
                 ve.RemoveFromClassList(BuilderConstants.InspectorLocalStyleVariableClassName);
                 ve.RemoveFromClassList(BuilderConstants.InspectorLocalStyleUnresolvedVariableClassName);
+                ve.RemoveFromClassList(BuilderConstants.InspectorLocalStyleSelectorElementClassName);
             };
 
             ClearClassLists(field);
@@ -398,14 +419,43 @@ void ClearClassLists(VisualElement ve)
 
             statusIndicator.AddToClassList(statusClassName);
             field.AddToClassList(statusClassName);
+
+            if (currentElement != null)
+            {
+                var isSelector = currentElement.IsSelector();
+                if (isSelector)
+                {
+                    statusIndicator.AddToClassList(BuilderConstants.InspectorLocalStyleSelectorElementClassName);
+                    field.AddToClassList(BuilderConstants.InspectorLocalStyleSelectorElementClassName);
+                }
+            }
         }
 
-        void UpdateFieldTooltip(VisualElement field, FieldValueInfo valueInfo)
+        internal static void UpdateFieldTooltip(VisualElement field, FieldValueInfo valueInfo)
         {
-            field.tooltip = GetFieldTooltip(field, valueInfo);
+            var draggerLabel = GetDraggerLabel(field);
+            var tooltipValue = GetFieldTooltip(field, valueInfo);
+            var fieldLabel = field.GetValueByReflection("labelElement") as Label;
+
+            if (draggerLabel != null)
+            {
+                draggerLabel.tooltip = tooltipValue;
+            }
+
+            if (fieldLabel != null)
+            {
+                fieldLabel.tooltip = tooltipValue;
+            }
+
             field.GetFieldStatusIndicator().tooltip = GetFieldStatusIndicatorTooltip(valueInfo);
         }
 
+        internal static Label GetDraggerLabel(VisualElement field)
+        {
+            var labelDraggers = field.Query<Label>(classes: BaseField<float>.labelDraggerVariantUssClassName).ToList();
+            return labelDraggers.Count != 1 ? null : labelDraggers.First();
+        }
+
         static string GetFieldStatusIndicatorTooltip(FieldValueInfo info)
         {
             if (info.valueSource.type == FieldValueSourceInfoType.Default)
@@ -703,6 +753,15 @@ public void SelectionChanged()
                 m_CachedVisualElement = m_CurrentVisualElement;
             }
 
+            if (IsElementSelected())
+            {
+                m_AttributesSection.SetAttributesOwner(visualTreeAsset, currentVisualElement, m_Selection.selectionType == BuilderSelectionType.ElementInTemplateInstance);
+            }
+            else
+            {
+                m_AttributesSection.ResetAttributesOwner();
+            }
+
             if (m_CurrentVisualElement != null && BuilderSharedStyles.IsSelectorElement(m_CurrentVisualElement))
             {
                 StyleSheetUtilities.AddFakeSelector(m_CurrentVisualElement);
@@ -714,6 +773,12 @@ public void SelectionChanged()
             }
         }
 
+        private bool IsElementSelected()
+        {
+            return m_CurrentVisualElement != null && m_Selection.selectionType is BuilderSelectionType.Element
+                or BuilderSelectionType.ElementInTemplateInstance or BuilderSelectionType.ElementInControlInstance;
+        }
+
         private UnityEngine.UIElements.UxmlTraits GetCurrentElementTraits()
         {
             var currentVisualElementTypeName = currentVisualElement.GetType().ToString();
@@ -730,7 +795,7 @@ private UnityEngine.UIElements.UxmlTraits GetCurrentElementTraits()
                 }
             }
 
-            var traits = factoryList[0].GetTraits();
+            var traits = factoryList[0].GetTraits() as UxmlTraits;
             return traits;
         }
 
@@ -793,7 +858,7 @@ public void StylingChanged(List<string> styles, BuilderStylingChangeType changeT
                 RefreshUI();
             }
         }
-        
+
         void OnFirstDisplay(GeometryChangedEvent evt)
         {
             if (m_PreviewWindow != null)
@@ -809,29 +874,29 @@ void OnFirstDisplay(GeometryChangedEvent evt)
             UpdateSelectorPreviewsVisibility();
             m_SplitView.UnregisterCallback<GeometryChangedEvent>(OnFirstDisplay);
         }
-        
+
         private void OnSizeChange(GeometryChangedEvent evt)
         {
             var hideToggle = !showingPreview && m_PreviewWindow == null;
             m_SelectorPreview.backgroundToggle.style.display = hideToggle ? DisplayStyle.None : DisplayStyle.Flex;
         }
-        
+
         private void OnDragLineChange(PointerUpEvent evt)
         {
             var previewHeight = m_SplitView.fixedPane.resolvedStyle.height;
             var isSingleClick = (previewHeight == m_CachedPreviewHeight || previewHeight == m_PreviewMinHeight)
                                 && Math.Abs(m_SplitView.m_Resizer.delta) <= 5;
-            
+
             if (isSingleClick && evt.button == (int) MouseButton.LeftMouse)
             {
                 TogglePreviewInInspector();
                 return;
             }
-            
+
             if (!showingPreview) return;
             m_CachedPreviewHeight = previewHeight;
         }
-        
+
         internal void ReattachPreview()
         {
             var previewPane = this.Q<BuilderPane>("inspector-selector-preview");
@@ -853,7 +918,7 @@ void UpdateSelectorPreviewsVisibility()
                     m_SplitView.UnCollapse();
                     m_SelectorPreview.style.display = DisplayStyle.Flex;
                 }
-                else 
+                else
                     m_SplitView.CollapseChild(1);
             }
             else if (currElementIsSelector)
@@ -886,7 +951,7 @@ internal void TogglePreviewInInspector()
         void UpdatePreviewHeight(float newHeight)
         {
             var draglineAnchor = m_SplitView.Q("unity-dragline-anchor");
-            
+
             m_SplitView.fixedPane.style.height = newHeight;
             m_SplitView.fixedPaneDimension = newHeight;
             draglineAnchor.style.top = m_SplitView.resolvedStyle.height - newHeight;
diff --git a/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorAttributes.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorAttributes.cs
new file mode 100644
index 0000000000..d620a38856
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorAttributes.cs
@@ -0,0 +1,64 @@
+// 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 Unity.UI.Builder
+{
+    internal class BuilderInspectorAttributes : BuilderUxmlAttributesView, IBuilderInspectorSection
+    {
+        BuilderInspector m_Inspector;
+
+        public VisualElement root => fieldsContainer;
+
+        public BuilderInspectorAttributes(BuilderInspector inspector)
+        {
+            m_Inspector = inspector;
+            fieldsContainer = m_Inspector.Q<PersistedFoldout>("inspector-attributes-foldout");
+        }
+
+        public override void Refresh()
+        {
+            base.Refresh();
+
+            if (currentElement != null && m_Inspector.selection.selectionType == BuilderSelectionType.ElementInTemplateInstance &&
+                string.IsNullOrEmpty(currentElement.name))
+            {
+                var helpBox = new HelpBox();
+                helpBox.AddToClassList(BuilderConstants.InspectorClassHelpBox);
+                helpBox.text = BuilderConstants.NoNameElementAttributes;
+                fieldsContainer.Insert(0, helpBox);
+            }
+
+            // Forward focus to the panel header.
+            fieldsContainer
+                .Query()
+                .Where(e => e.focusable)
+                .ForEach((e) => m_Inspector.AddFocusable(e));
+        }
+
+        public void Enable()
+        {
+            fieldsContainer.contentContainer.SetEnabled(true);
+        }
+
+        public void Disable()
+        {
+            fieldsContainer.contentContainer.SetEnabled(false);
+        }
+
+        protected override void UpdateFieldStatus(BindableElement fieldElement)
+        {
+            m_Inspector.UpdateFieldStatus(fieldElement, null);
+
+            var hasOverriddenField = BuilderInspectorUtilities.HasOverriddenField(fieldsContainer);
+            fieldsContainer.EnableInClassList(BuilderConstants.InspectorCategoryFoldoutOverrideClassName, hasOverriddenField);
+        }
+
+        protected override void NotifyAttributesChanged()
+        {
+            m_Inspector.selection.NotifyOfHierarchyChange(m_Inspector);
+        }
+    }
+}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorCanvas.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorCanvas.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorCanvas.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorCanvas.cs
index ab3202bddc..eeff5102ba 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorCanvas.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorCanvas.cs
@@ -1,3 +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;
 using System.Linq;
 using UnityEditor;
@@ -263,6 +267,11 @@ public void Refresh()
 
             ApplyBackgroundOptions();
             RefreshMatchGameViewToggle();
+            bool canvasDimensionsDifferentFromSettings = (int) m_Canvas.height != settings.CanvasHeight || (int) m_Canvas.width != settings.CanvasWidth;
+            if (canvasDimensionsDifferentFromSettings)
+            {
+                m_Canvas.SetSizeFromDocumentSettings();
+            }
         }
 
         void RefreshMatchGameViewToggle()
@@ -432,6 +441,7 @@ void OnCanvasSizeChange(GeometryChangedEvent evt)
         void OnWidthChange(ChangeEvent<int> evt)
         {
             var newValue = evt.newValue;
+            Undo.RegisterCompleteObjectUndo(m_Document, BuilderConstants.ChangeCanvasDimensionsOrMatchViewUndoMessage);
             if (newValue < (int)BuilderConstants.CanvasMinWidth)
             {
                 newValue = (int)BuilderConstants.CanvasMinWidth;
@@ -452,6 +462,7 @@ void OnWidthChange(ChangeEvent<int> evt)
         void OnHeightChange(ChangeEvent<int> evt)
         {
             var newValue = evt.newValue;
+            Undo.RegisterCompleteObjectUndo(m_Document,BuilderConstants.ChangeCanvasDimensionsOrMatchViewUndoMessage);
             if (newValue < (int)BuilderConstants.CanvasMinHeight)
             {
                 newValue = (int)BuilderConstants.CanvasMinHeight;
@@ -472,6 +483,7 @@ void OnHeightChange(ChangeEvent<int> evt)
 
         void OnMatchGameViewModeChanged(ChangeEvent<bool> evt)
         {
+            Undo.RegisterCompleteObjectUndo(m_Document,BuilderConstants.ChangeCanvasDimensionsOrMatchViewUndoMessage);
             settings.MatchGameView = evt.newValue;
             RefreshMatchGameViewToggle();
             m_Canvas.matchGameView = settings.MatchGameView;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorHeader.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorHeader.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorHeader.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorHeader.cs
index c6a489c479..f65193f036 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorHeader.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorHeader.cs
@@ -1,3 +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 UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorInheritedStyles.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorInheritedStyles.cs
similarity index 87%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorInheritedStyles.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorInheritedStyles.cs
index fdea2385be..e4d157c4c8 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorInheritedStyles.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorInheritedStyles.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using System.Text;
 using UnityEditor;
@@ -8,6 +12,14 @@ namespace Unity.UI.Builder
 {
     internal class BuilderInspectorInheritedStyles : IBuilderInspectorSection
     {
+        public static readonly string classListContainerName = "class-list-container";
+        public static readonly string addClassButtonName = "add-class-button";
+        public static readonly string addClassFieldName = "add-class-field";
+        public static readonly string inspectorInheritedStylesFoldoutName = "inspector-inherited-styles-foldout";
+
+        // Used in tests
+        public static readonly string classListFoldoutName = "class-list-foldout";
+
         BuilderInspector m_Inspector;
         BuilderSelection m_Selection;
         BuilderPaneWindow m_PaneWindow;
@@ -21,6 +33,7 @@ internal class BuilderInspectorInheritedStyles : IBuilderInspectorSection
         Button m_AddClassButton;
         Button m_CreateClassButton;
         VisualTreeAsset m_ClassPillTemplate;
+        StringBuilder m_TooltipBuilder = new();
 
         VisualElement currentVisualElement => m_Inspector.currentVisualElement;
 
@@ -33,15 +46,15 @@ public BuilderInspectorInheritedStyles(BuilderInspector inspector, BuilderInspec
             m_PaneWindow = inspector.paneWindow;
             m_MatchingSelectors = matchingSelectors;
 
-            m_InheritedStylesSection = m_Inspector.Q<PersistedFoldout>("inspector-inherited-styles-foldout");
-            m_ClassListContainer = m_Inspector.Q("class-list-container");
+            m_InheritedStylesSection = m_Inspector.Q<PersistedFoldout>(inspectorInheritedStylesFoldoutName);
+            m_ClassListContainer = m_Inspector.Q(classListContainerName);
             m_MatchingSelectorsFoldout = m_Inspector.Q<PersistedFoldout>("matching-selectors-container");
 
-            m_AddClassField = m_Inspector.Q<TextField>("add-class-field");
+            m_AddClassField = m_Inspector.Q<TextField>(addClassFieldName);
             m_AddClassField.isDelayed = true;
             m_AddClassField.RegisterCallback<KeyUpEvent>(OnAddClassFieldChange);
 
-            m_AddClassButton = m_Inspector.Q<Button>("add-class-button");
+            m_AddClassButton = m_Inspector.Q<Button>(addClassButtonName);
             m_CreateClassButton = m_Inspector.Q<Button>("create-class-button");
 
             m_ClassPillTemplate = BuilderPackageUtilities.LoadAssetAtPath<VisualTreeAsset>(
@@ -268,6 +281,11 @@ void RefreshClassListContainer()
 
             var documentRootElement = builderWindow.documentRootElement;
 
+            var disabledPills = m_Selection.selectionType == BuilderSelectionType.ElementInTemplateInstance ||
+                                m_Selection.selectionType == BuilderSelectionType.ElementInControlInstance ||
+                                m_Selection.selectionType == BuilderSelectionType.ParentStyleSelector ||
+                                m_Selection.selectionType == BuilderSelectionType.ElementInParentDocument;
+
             foreach (var className in currentVisualElement.GetClasses())
             {
                 m_ClassPillTemplate.CloneTree(m_ClassListContainer.contentContainer);
@@ -277,9 +295,9 @@ void RefreshClassListContainer()
                 pillDeleteButton.userData = className;
                 pill.userData = className;
 
-                // Add ellipsis if the class name is too long.
-                var classNameShortened = BuilderNameUtilities.CapStringLengthAndAddEllipsis(className, BuilderConstants.ClassNameInPillMaxLength);
-                pillLabel.text = BuilderConstants.UssSelectorClassNameSymbol + classNameShortened;
+                var pillText = BuilderConstants.UssSelectorClassNameSymbol + className;
+                pillLabel.text = pillText;
+                pillLabel.AddToClassList(BuilderConstants.SelectorLabelClassName);
 
                 if (IsClassInUXMLDoc(className))
                 {
@@ -296,15 +314,30 @@ void RefreshClassListContainer()
                 pill.SetProperty(BuilderConstants.InspectorClassPillLinkedSelectorElementVEPropertyName, selector);
                 var clickable = CreateClassPillClickableManipulator();
                 pill.AddManipulator(clickable);
+
+                m_TooltipBuilder.Clear();
+                m_TooltipBuilder.Append(pillText);
+
+                if (!disabledPills)
+                {
+                    m_TooltipBuilder.Append("\n\n");
+                }
+
                 if (selector == null)
                 {
                     pill.AddToClassList(BuilderConstants.InspectorClassPillNotInDocumentClassName);
-                    pill.tooltip = BuilderConstants.InspectorClassPillDoubleClickToCreate;
+
+                    if (!disabledPills)
+                    {
+                        m_TooltipBuilder.Append(L10n.Tr(BuilderConstants.InspectorClassPillDoubleClickToCreate));
+                    }
                 }
-                else
+                else if (!disabledPills)
                 {
-                    pill.tooltip = BuilderConstants.InspectorClassPillDoubleClickToSelect;
+                    m_TooltipBuilder.Append(L10n.Tr(BuilderConstants.InspectorClassPillDoubleClickToSelect));
                 }
+
+                pill.tooltip = m_TooltipBuilder.ToString();
             }
         }
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorLocalStyles.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorLocalStyles.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorLocalStyles.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorLocalStyles.cs
index cb7e3a0b44..3b238280d8 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorLocalStyles.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorLocalStyles.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEngine.Assertions;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorMatchingSelectors.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorMatchingSelectors.cs
similarity index 85%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorMatchingSelectors.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorMatchingSelectors.cs
index c376fe7e7b..1a141701dc 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorMatchingSelectors.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorMatchingSelectors.cs
@@ -1,3 +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 UnityEditor.UIElements.Debugger;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorPreview.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorPreview.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorPreview.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorPreview.cs
index 734c6b96fe..de01fc385a 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorPreview.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorPreview.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEditor.UIElements;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorPreviewWindow.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorPreviewWindow.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorPreviewWindow.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorPreviewWindow.cs
index b8faaa0833..8a0d069b70 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorPreviewWindow.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorPreviewWindow.cs
@@ -1,3 +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 UnityEditor;
 using UnityEngine.UIElements;
 using Toolbar = UnityEditor.UIElements.Toolbar;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields+Transitions.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorStyleFields+Transitions.cs
similarity index 99%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields+Transitions.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorStyleFields+Transitions.cs
index 56dc4fa0ad..b73dc4fc40 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields+Transitions.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorStyleFields+Transitions.cs
@@ -1,3 +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.Collections.Generic;
 using System.Linq;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorStyleFields.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorStyleFields.cs
index c4f4b4c097..9f5a1d9bd2 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorStyleFields.cs
@@ -1,3 +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 Object = UnityEngine.Object;
 using System;
 using System.Collections.Generic;
@@ -180,16 +184,14 @@ public void BindStyleField(BuilderStyleRow styleRow, string styleName, VisualEle
                 var uiField = fieldElement as ColorField;
                 uiField.RegisterValueChangedCallback(e => OnFieldValueChange(e, styleName));
             }
-            else if (IsComputedStyleFont(val, styleName) && fieldElement is ObjectField)
+            else if (IsComputedStyleFont(val, styleName) && fieldElement is ObjectField fontField)
             {
-                var uiField = fieldElement as ObjectField;
-                uiField.objectType = typeof(Font);
-                uiField.RegisterValueChangedCallback(e => OnFieldValueChangeFont(e, styleName));
+                fontField.objectType = typeof(Font);
+                fontField.RegisterValueChangedCallback(e => OnFieldValueChange(e, styleName));
             }
-            else if (IsComputedStyleFontAsset(val, styleName) && fieldElement is ObjectField objectField)
+            else if (IsComputedStyleFontAsset(val, styleName) && fieldElement is FontDefinitionStyleField fontAssetField)
             {
-                objectField.objectType = typeof(FontAsset);
-                objectField.RegisterValueChangedCallback(e => OnFieldValueChangeFont(e, styleName));
+                fontAssetField.RegisterValueChangedCallback(e => OnFieldValueChange(e, styleName));
             }
             else if (IsComputedStyleTextShadow(val) && fieldElement is TextShadowStyleField textShadowStyleField)
             {
@@ -743,7 +745,7 @@ public void RefreshStyleField(string styleName, VisualElement fieldElement)
 
                 uiField.SetValueWithoutNotify(value);
             }
-            else if (IsComputedStyleFontAsset(val, styleName) && fieldElement is ObjectField objectField)
+            else if (IsComputedStyleFontAsset(val, styleName) && fieldElement is FontDefinitionStyleField objectField)
             {
                 var value = GetComputedStyleFontAssetValue(val);
                 objectField.SetValueWithoutNotify(useStyleProperty
@@ -1000,7 +1002,7 @@ public void DispatchChangeEvent(string styleName, VisualElement fieldElement)
             {
                 DispatchChangeEvent(objectFontField);
             }
-            else if (IsComputedStyleFontAsset(val, styleName) && fieldElement is ObjectField objectFontAssetField)
+            else if (IsComputedStyleFontAsset(val, styleName) && fieldElement is FontDefinitionStyleField objectFontAssetField)
             {
                 DispatchChangeEvent(objectFontAssetField);
             }
@@ -2040,27 +2042,6 @@ void OnFieldObjectValueChange(IEventHandler target, Object newValue, Object prev
             PostStyleFieldSteps(target as VisualElement, styleProperty, styleName, isNewValue);
         }
 
-        void OnFieldValueChangeFont(ChangeEvent<Object> e, string styleName)
-        {
-            var field = e.target as ObjectField;
-            var styleProperty = GetOrCreateStylePropertyByStyleName(styleName);
-            var isNewValue = styleProperty.values.Length == 0;
-
-            if (!isNewValue && styleProperty.IsVariable())
-            {
-                Undo.RegisterCompleteObjectUndo(styleSheet, BuilderConstants.ChangeUIStyleValueUndoMessage);
-                styleProperty.values = new StyleValueHandle[0];
-                isNewValue = true;
-            }
-
-            if (isNewValue)
-                styleSheet.AddValue(styleProperty, e.newValue);
-            else // TODO: Assume only one value.
-                styleSheet.SetValue(styleProperty.values[0], e.newValue);
-
-            PostStyleFieldSteps(field, styleProperty, styleName, isNewValue);
-        }
-
         void OnFieldValueChangeTextShadow(ChangeEvent<BuilderTextShadow> e, string styleName)
         {
             var field = e.target as TextShadowStyleField;
@@ -2378,16 +2359,20 @@ static public Font GetComputedStyleFontValue(object val)
             return style.value;
         }
 
-        static public FontAsset GetComputedStyleFontAssetValue(object val)
+        private static Object GetComputedStyleFontAssetValue(object val)
         {
-            if (val is FontAsset fontAsset)
-                return fontAsset;
-
-            if (val is FontDefinition fontDefinition)
-                return (FontAsset)fontDefinition.fontAsset;
-
-            var style = (StyleFontDefinition)val;
-            return (FontAsset)style.value.fontAsset;
+            switch (val)
+            {
+                case Font font: return font;
+                case FontAsset fontAsset: return fontAsset;
+                case FontDefinition fontDefinition: return (Object)fontDefinition.fontAsset ?? fontDefinition.font;
+                case StyleFont styleFont: return styleFont.value;
+                case StyleFontDefinition styleFontDefinition: return (Object)styleFontDefinition.value.fontAsset ?? styleFontDefinition.value.font;
+                default:
+                {
+                    throw new ArgumentOutOfRangeException();
+                }
+            }
         }
 
         static public Background GetComputedStyleBackgroundValue(object val)
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleSheet.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorStyleSheet.cs
similarity index 93%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleSheet.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorStyleSheet.cs
index 63a4143a53..fad8132c2f 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleSheet.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorStyleSheet.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using UnityEditor;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorWindow.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorWindow.cs
similarity index 90%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorWindow.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorWindow.cs
index 980c7ddcf1..c33e853756 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorWindow.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderInspectorWindow.cs
@@ -1,3 +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 UnityEditor;
 using UnityEditor.Callbacks;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderStyleRow.cs b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderStyleRow.cs
similarity index 85%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderStyleRow.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/BuilderStyleRow.cs
index 8ed3ef7696..a2899f814b 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderStyleRow.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/BuilderStyleRow.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using UnityEditor;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/IBuilderInspectorSection.cs b/Modules/UIBuilder/Editor/Builder/Inspector/IBuilderInspectorSection.cs
similarity index 68%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/IBuilderInspectorSection.cs
rename to Modules/UIBuilder/Editor/Builder/Inspector/IBuilderInspectorSection.cs
index fea771d4b0..3fdf468603 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/IBuilderInspectorSection.cs
+++ b/Modules/UIBuilder/Editor/Builder/Inspector/IBuilderInspectorSection.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibrary.cs b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibrary.cs
similarity index 85%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibrary.cs
rename to Modules/UIBuilder/Editor/Builder/Library/BuilderLibrary.cs
index c27ad91ab5..7670180767 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibrary.cs
+++ b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibrary.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
@@ -20,6 +24,12 @@ public enum LibraryViewMode
             TreeView
         }
 
+        public enum DefaultVisualElementType
+        {
+            Styled = 0,
+            NoStyles = 1
+        }
+
         const string k_UssClassName = "unity-builder-library";
         const string k_ContentContainerName = "content";
 
@@ -42,6 +52,8 @@ public enum LibraryViewMode
         [SerializeField] LibraryViewMode m_ViewMode = LibraryViewMode.IconTile;
         [SerializeField] BuilderLibraryTab m_ActiveTab = BuilderLibraryTab.Standard;
 
+        int defaultVisualElementType => EditorPrefs.GetInt(BuilderConstants.LibraryDefaultVisualElementType, (int)DefaultVisualElementType.Styled);
+
         public BuilderLibrary(
             BuilderPaneWindow paneWindow, BuilderViewport viewport,
             BuilderSelection selection, BuilderLibraryDragger dragger,
@@ -124,6 +136,18 @@ protected override void InitEllipsisMenu()
                 a => m_PaneWindow.document.fileSettings.editorExtensionMode
                     ? DropdownMenuAction.Status.Checked
                     : DropdownMenuAction.Status.Normal);
+
+            pane.AppendActionToEllipsisMenu(BuilderConstants.LibraryDefaultVisualElementType + "/" + BuilderConstants.LibraryDefaultVisualElementStyledName,
+                a => SwitchDefaultVisualElementType(),
+                a => defaultVisualElementType == (int)DefaultVisualElementType.Styled
+                    ? DropdownMenuAction.Status.Checked
+                    : DropdownMenuAction.Status.Normal);
+
+            pane.AppendActionToEllipsisMenu(BuilderConstants.LibraryDefaultVisualElementType + "/" + BuilderConstants.LibraryDefaultVisualElementNoStylesName,
+                a => SwitchDefaultVisualElementType(),
+                a => defaultVisualElementType == (int)DefaultVisualElementType.NoStyles
+                    ? DropdownMenuAction.Status.Checked
+                    : DropdownMenuAction.Status.Normal);
         }
 
         void ToggleEditorExtensionsAuthoring()
@@ -173,6 +197,21 @@ void SwitchControlsViewMode()
                 : LibraryViewMode.IconTile);
         }
 
+        internal void SetDefaultVisualElementType(DefaultVisualElementType visualElementType)
+        {
+            if (defaultVisualElementType == (int)visualElementType)
+                return;
+
+            EditorPrefs.SetInt(BuilderConstants.LibraryDefaultVisualElementType, (int)visualElementType);
+        }
+
+        void SwitchDefaultVisualElementType()
+        {
+            SetDefaultVisualElementType(defaultVisualElementType == (int)DefaultVisualElementType.NoStyles
+                ? DefaultVisualElementType.Styled
+                : DefaultVisualElementType.NoStyles);
+        }
+
         BuilderLibraryTreeView controlsTreeView
         {
             get
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryContent.cs b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryContent.cs
similarity index 90%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryContent.cs
rename to Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryContent.cs
index c1f098c094..0e67caeae9 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryContent.cs
+++ b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryContent.cs
@@ -1,5 +1,8 @@
+// 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 UnityEditor;
 using UnityEditor.UIElements;
@@ -73,6 +76,9 @@ public void OnPostProcessAsset()
         public static List<TreeViewItem> projectContentTree { get; private set; }
         public static List<TreeViewItem> projectContentTreeNoPackages { get; private set; }
 
+        static HashSet<string> s_StandardEditorControls = new();
+        static HashSet<string> s_StandardControls = new();
+
         static readonly int k_DefaultVisualElementFlexGrow = 1;
         static readonly Color k_DefaultVisualElementBackgroundColor = new (0, 0, 0, 0);
 
@@ -91,18 +97,28 @@ static BuilderLibraryContent()
             }));
         }
 
+        public static bool IsEditorOnlyControl(string fullTypeName)
+        {
+            return s_StandardEditorControls.Contains(fullTypeName);
+        }
+
+        public static bool IsStandardControl(string fullTypeName)
+        {
+            return s_StandardControls.Contains(fullTypeName);
+        }
+
         public static void RegenerateLibraryContent()
         {
             standardControlsTree = GenerateControlsItemsTree();
             standardControlsTreeNoEditor = new List<TreeViewItem>();
+
             foreach (var item in standardControlsTree)
             {
                 var builderLibraryTreeItem = item.data;
-                if (builderLibraryTreeItem.isEditorOnly)
-                    continue;
-
-                standardControlsTreeNoEditor.Add(item);
-                RemoveEditorOnlyControls(item);
+                if (!builderLibraryTreeItem.isEditorOnly)
+                {
+                    standardControlsTreeNoEditor.Add(item);
+                }
             }
 
             GenerateProjectContentTrees();
@@ -113,22 +129,6 @@ public static void RegenerateLibraryContent()
             OnLibraryContentUpdated?.Invoke();
         }
 
-        static void RemoveEditorOnlyControls(TreeViewItem item)
-        {
-            var children = new List<TreeViewItem>(item.children);
-            (item.children as IList)?.Clear();
-            foreach (var child in children)
-            {
-                var builderLibraryTreeItem = child.data;
-                if (!builderLibraryTreeItem.isEditorOnly)
-                {
-                    item.AddChild(child);
-                    if (child.hasChildren)
-                        RemoveEditorOnlyControls(child);
-                }
-            }
-        }
-
         internal static void ResetProjectUxmlPathsHash()
         {
             s_ProjectUxmlPathsHash = default;
@@ -237,6 +237,9 @@ internal static TreeViewItemData<BuilderLibraryTreeItem> CreateItem(string name,
 
         static List<TreeViewItem> GenerateControlsItemsTree()
         {
+            s_StandardEditorControls.Clear();
+            s_StandardControls.Clear();
+
             var containersItem = CreateItem(BuilderConstants.LibraryContainersSectionHeaderName, null, null, null, id: 1, isHeader:true);
             var controlsTree = new List<TreeViewItem>();
             IList<TreeViewItem> containersItemList = new List<TreeViewItem>
@@ -246,10 +249,14 @@ static List<TreeViewItem> GenerateControlsItemsTree()
                     (inVta, inParent, ve) =>
                     {
                         var vea = inVta.AddElement(inParent, ve);
-                        BuilderStyleUtilities.SetInlineStyleValue(inVta, vea, ve, "flex-grow",
-                            k_DefaultVisualElementFlexGrow);
-                        BuilderStyleUtilities.SetInlineStyleValue(inVta, vea, ve, "background-color",
-                            k_DefaultVisualElementBackgroundColor);
+
+                        const int visualElementStyled = (int)BuilderLibrary.DefaultVisualElementType.Styled;
+                        if (EditorPrefs.GetInt(BuilderConstants.LibraryDefaultVisualElementType, visualElementStyled) == visualElementStyled)
+                        {
+                            BuilderStyleUtilities.SetInlineStyleValue(inVta, vea, ve, "flex-grow",
+                                k_DefaultVisualElementFlexGrow);
+                        }
+
                         return vea;
                     }),
                 CreateItem("Scroll View", "ScrollView", typeof(ScrollView), () => new ScrollView()),
@@ -271,7 +278,7 @@ static List<TreeViewItem> GenerateControlsItemsTree()
                 CreateItem("Button", nameof(Button), typeof(Button), () => new Button { text = "Button" }),
                 CreateItem("Toggle", nameof(Toggle), typeof(Toggle), () => new Toggle("Toggle")),
                 CreateItem("Scroller", nameof(Scroller), typeof(Scroller), () => new Scroller(0, 100, (v) => {}, SliderDirection.Horizontal) { value = 42 }),
-                CreateItem("Text Field", nameof(TextField), typeof(TextField), () => new TextField("Text Field") { value = "filler text", maskChar = TextInputBaseField<string>.kMaskCharDefault }),
+                CreateItem("Text Field", nameof(TextField), typeof(TextField), () => new TextField("Text Field") { placeholderText = "filler text", maskChar = TextInputBaseField<string>.kMaskCharDefault }),
                 CreateItem("Foldout", nameof(Foldout), typeof(Foldout), () => new Foldout { text = "Foldout" }),
                 CreateItem("Slider", nameof(Slider), typeof(Slider), () => new Slider("Slider", 0, 100) { value = 42 }),
                 CreateItem("Slider (Int)", nameof(SliderInt), typeof(SliderInt), () => new SliderInt("SliderInt", 0, 100) { value = 42 }),
@@ -285,7 +292,7 @@ static List<TreeViewItem> GenerateControlsItemsTree()
 
             var numericFields = CreateItem("Numeric Fields", null, null, null, null, new List<TreeViewItemData<BuilderLibraryTreeItem>>
             {
-                CreateItem("Integer", nameof(IntegerField), typeof(IntegerField), () => new IntegerField("Int Field") { value = 42 }),
+                CreateItem("Integer", nameof(IntegerField), typeof(IntegerField), () => new IntegerField("Integer Field") { value = 42 }),
                 CreateItem("Float", nameof(FloatField), typeof(FloatField), () => new FloatField("Float Field") { value = 42.2f }),
                 CreateItem("Long", nameof(LongField), typeof(LongField), () => new LongField("Long Field") { value = 42 }),
                 CreateItem("Double", nameof(DoubleField), typeof(DoubleField), () => new DoubleField("Double Field") { value = 42.2 }),
@@ -295,6 +302,8 @@ static List<TreeViewItem> GenerateControlsItemsTree()
                 CreateItem("Vector4", nameof(Vector4Field), typeof(Vector4Field), () => new Vector4Field("Vec4 Field")),
                 CreateItem("Rect", nameof(RectField), typeof(RectField), () => new RectField("Rect")),
                 CreateItem("Bounds", nameof(BoundsField), typeof(BoundsField), () => new BoundsField("Bounds")),
+                CreateItem("Integer (Unsigned)", nameof(UnsignedIntegerField), typeof(UnsignedIntegerField), () => new UnsignedIntegerField("Unsigned Integer Field") { value = 42 }),
+                CreateItem("Long (Unsigned)", nameof(UnsignedLongField), typeof(UnsignedLongField), () => new UnsignedLongField("Unsigned Long Field") { value = 42 }),
                 CreateItem("Vector2 (Int)", nameof(Vector2IntField), typeof(Vector2IntField), () => new Vector2IntField("Vector2Int")),
                 CreateItem("Vector3 (Int)", nameof(Vector3IntField), typeof(Vector3IntField), () => new Vector3IntField("Vector3Int")),
                 CreateItem("Rect (Int)", nameof(RectIntField), typeof(RectIntField), () => new RectIntField("RectInt")),
@@ -360,6 +369,19 @@ static List<TreeViewItem> GenerateControlsItemsTree()
             controlsTree.Add(toolbar);
             controlsTree.Add(inspectors);
 
+            foreach (var categoryData in controlsTree)
+            {
+                foreach (var itemData in categoryData.children)
+                {
+                    if (categoryData.data.isEditorOnly)
+                    {
+                        s_StandardEditorControls.Add(itemData.data.type.FullName);
+                    }
+
+                    s_StandardControls.Add(itemData.data.type.FullName);
+                }
+            }
+
             return controlsTree;
         }
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryPlainView.cs b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryPlainView.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryPlainView.cs
rename to Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryPlainView.cs
index 6706db7701..e69765313d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryPlainView.cs
+++ b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryPlainView.cs
@@ -1,3 +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.Collections.Generic;
 using System.Linq;
 using UnityEditor;
@@ -200,8 +204,10 @@ void FillView(IEnumerable<TreeViewItem> items, VisualElement itemsParent = null)
 
                 plainViewItem.RegisterCallback<MouseDownEvent>(e =>
                 {
-                    if (e.clickCount == 2)
+                    if (e.clickCount == 2 && e.button == (int)MouseButton.LeftMouse)
+                    {
                         AddItemToTheDocument(libraryTreeItem);
+                    }
                 });
                 itemsParent?.Add(plainViewItem);
                 m_PlainViewItems.Add(plainViewItem);
@@ -253,6 +259,13 @@ void DoSelected(int itemId)
 
         void OnContextualMenuPopulateEvent(ContextualMenuPopulateEvent evt)
         {
+            if (m_Dragger.active)
+            {
+                evt.PreventDefault();
+                evt.StopImmediatePropagation();
+                return;
+            }
+            
             var libraryItem = GetLibraryTreeItem(evt.elementTarget);
 
             evt.menu.AppendAction(
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryProjectScanner.cs b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryProjectScanner.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryProjectScanner.cs
rename to Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryProjectScanner.cs
index d60ecc471e..bb238d1ee1 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryProjectScanner.cs
+++ b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryProjectScanner.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.IO;
@@ -207,7 +211,11 @@ static void AddCategoriesToStack(BuilderLibraryItem sourceCategory, List<Builder
             for (int i = 0; i < split.Length; ++i)
             {
                 var part = split[i];
-                fullName += part;
+                if (string.IsNullOrWhiteSpace(fullName))
+                    fullName += part;
+                else
+                    fullName += "." + part;
+
                 if (categoryStack.Count > i)
                 {
                     var data = categoryStack[i].data;
@@ -291,13 +299,11 @@ public void ImportUxmlFromProject(BuilderLibraryItem projectCategory, bool inclu
 
                         var tree = vta.CloneTree();
                         tree.SetProperty(BuilderConstants.LibraryItemLinkedTemplateContainerPathVEPropertyName, assetPath);
-                        tree.name = vta.name;
                         return tree;
                     },
                     (inVta, inParent, ve) =>
                     {
                         var vea = inVta.AddTemplateInstance(inParent, assetPath) as VisualElementAsset;
-                        vea.SetAttribute("name", vta.name);
                         ve.SetProperty(BuilderConstants.ElementLinkedInstancedVisualTreeAssetVEPropertyName, vta);
                         return vea;
                     },
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryTreeItem.cs b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryTreeItem.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryTreeItem.cs
rename to Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryTreeItem.cs
index 0b0d5e5038..40b30f326b 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryTreeItem.cs
+++ b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryTreeItem.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryTreeView.cs b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryTreeView.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryTreeView.cs
rename to Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryTreeView.cs
index 42f77a4774..e4dc005eee 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryTreeView.cs
+++ b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryTreeView.cs
@@ -1,3 +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.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -50,6 +54,13 @@ void OnContextualMenuPopulateEvent(ContextualMenuPopulateEvent evt)
         {
             var libraryItem = GetLibraryTreeItem(evt.elementTarget);
 
+            if (m_Dragger.active)
+            {
+                evt.PreventDefault();
+                evt.StopImmediatePropagation();
+                return;
+            }
+            
             evt.menu.AppendAction(
                 "Add",
                 action => { AddItemToTheDocument(libraryItem); },
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryView.cs b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryView.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryView.cs
rename to Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryView.cs
index 012416197b..0e26efee3e 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryView.cs
+++ b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryView.cs
@@ -1,3 +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.Linq;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -8,12 +12,12 @@ abstract class BuilderLibraryView : VisualElement
     {
         VisualElement m_DocumentRootElement;
         BuilderSelection m_Selection;
-        BuilderLibraryDragger m_Dragger;
         BuilderTooltipPreview m_TooltipPreview;
         BuilderPaneContent m_BuilderPaneContent;
 
         protected BuilderPaneWindow m_PaneWindow;
-
+        protected BuilderLibraryDragger m_Dragger;
+        
         public abstract VisualElement primaryFocusable { get; }
 
         public virtual void SetupView(BuilderLibraryDragger dragger, BuilderTooltipPreview tooltipPreview,
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryWindow.cs b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryWindow.cs
similarity index 89%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryWindow.cs
rename to Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryWindow.cs
index 3bf458bcf1..5c1e17a98e 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryWindow.cs
+++ b/Modules/UIBuilder/Editor/Builder/Library/BuilderLibraryWindow.cs
@@ -1,3 +1,7 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
 namespace Unity.UI.Builder
 {
     class BuilderLibraryWindow : BuilderPaneWindow
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderAnchorer.cs b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderAnchorer.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderAnchorer.cs
rename to Modules/UIBuilder/Editor/Builder/Manipulators/BuilderAnchorer.cs
index 6b2070bb30..caa66d857b 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderAnchorer.cs
+++ b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderAnchorer.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEditor;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderManipulator.cs b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderManipulator.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderManipulator.cs
rename to Modules/UIBuilder/Editor/Builder/Manipulators/BuilderManipulator.cs
index bb5ab4d1e7..9ccc38bab2 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderManipulator.cs
+++ b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderManipulator.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderMover.cs b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderMover.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderMover.cs
rename to Modules/UIBuilder/Editor/Builder/Manipulators/BuilderMover.cs
index a47f0a9de4..75d3430e4d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderMover.cs
+++ b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderMover.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderParentTracker.cs b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderParentTracker.cs
similarity index 71%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderParentTracker.cs
rename to Modules/UIBuilder/Editor/Builder/Manipulators/BuilderParentTracker.cs
index 701e01209d..b8b69eb5b4 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderParentTracker.cs
+++ b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderParentTracker.cs
@@ -1,3 +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 UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderPlacementIndicator.cs b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderPlacementIndicator.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderPlacementIndicator.cs
rename to Modules/UIBuilder/Editor/Builder/Manipulators/BuilderPlacementIndicator.cs
index 533f46cbe2..72c0a2c1b0 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderPlacementIndicator.cs
+++ b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderPlacementIndicator.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderResizer.cs b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderResizer.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderResizer.cs
rename to Modules/UIBuilder/Editor/Builder/Manipulators/BuilderResizer.cs
index 250d6235fb..5a6c37de8b 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderResizer.cs
+++ b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderResizer.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderSelectionIndicator.cs b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderSelectionIndicator.cs
similarity index 92%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderSelectionIndicator.cs
rename to Modules/UIBuilder/Editor/Builder/Manipulators/BuilderSelectionIndicator.cs
index 4a53842b26..d25617ad0a 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderSelectionIndicator.cs
+++ b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderSelectionIndicator.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderTracker.cs b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderTracker.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderTracker.cs
rename to Modules/UIBuilder/Editor/Builder/Manipulators/BuilderTracker.cs
index 4a3fd743e0..ff63f05ac1 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderTracker.cs
+++ b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderTracker.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderTransformer.cs b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderTransformer.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderTransformer.cs
rename to Modules/UIBuilder/Editor/Builder/Manipulators/BuilderTransformer.cs
index 43c0070c96..f06d22f268 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderTransformer.cs
+++ b/Modules/UIBuilder/Editor/Builder/Manipulators/BuilderTransformer.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderCodePreview.cs b/Modules/UIBuilder/Editor/Builder/Previews/BuilderCodePreview.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderCodePreview.cs
rename to Modules/UIBuilder/Editor/Builder/Previews/BuilderCodePreview.cs
index 31cdc989e9..1754fb9dcc 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderCodePreview.cs
+++ b/Modules/UIBuilder/Editor/Builder/Previews/BuilderCodePreview.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using System.Linq;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderPreviewWindow.cs b/Modules/UIBuilder/Editor/Builder/Previews/BuilderPreviewWindow.cs
similarity index 93%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderPreviewWindow.cs
rename to Modules/UIBuilder/Editor/Builder/Previews/BuilderPreviewWindow.cs
index eb01dac980..b1e9858ddd 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderPreviewWindow.cs
+++ b/Modules/UIBuilder/Editor/Builder/Previews/BuilderPreviewWindow.cs
@@ -1,3 +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 UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderTooltipPreview.cs b/Modules/UIBuilder/Editor/Builder/Previews/BuilderTooltipPreview.cs
similarity index 93%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderTooltipPreview.cs
rename to Modules/UIBuilder/Editor/Builder/Previews/BuilderTooltipPreview.cs
index 5e6a4ba7dc..3190bf64b4 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderTooltipPreview.cs
+++ b/Modules/UIBuilder/Editor/Builder/Previews/BuilderTooltipPreview.cs
@@ -1,3 +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;
 using UnityEngine.UIElements;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUssPreview.cs b/Modules/UIBuilder/Editor/Builder/Previews/BuilderUssPreview.cs
similarity index 93%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUssPreview.cs
rename to Modules/UIBuilder/Editor/Builder/Previews/BuilderUssPreview.cs
index af26a3ccf2..8277d30cf2 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUssPreview.cs
+++ b/Modules/UIBuilder/Editor/Builder/Previews/BuilderUssPreview.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUssPreviewWindow.cs b/Modules/UIBuilder/Editor/Builder/Previews/BuilderUssPreviewWindow.cs
similarity index 89%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUssPreviewWindow.cs
rename to Modules/UIBuilder/Editor/Builder/Previews/BuilderUssPreviewWindow.cs
index e9cb13b59e..573b08f5cb 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUssPreviewWindow.cs
+++ b/Modules/UIBuilder/Editor/Builder/Previews/BuilderUssPreviewWindow.cs
@@ -1,3 +1,7 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
 namespace Unity.UI.Builder
 {
     internal class BuilderUssPreviewWindow : BuilderPaneWindow
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUxmlPreview.cs b/Modules/UIBuilder/Editor/Builder/Previews/BuilderUxmlPreview.cs
similarity index 91%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUxmlPreview.cs
rename to Modules/UIBuilder/Editor/Builder/Previews/BuilderUxmlPreview.cs
index 6860cdfc6d..19caee1dc4 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUxmlPreview.cs
+++ b/Modules/UIBuilder/Editor/Builder/Previews/BuilderUxmlPreview.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using System.Collections.Generic;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUxmlPreviewWindow.cs b/Modules/UIBuilder/Editor/Builder/Previews/BuilderUxmlPreviewWindow.cs
similarity index 89%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUxmlPreviewWindow.cs
rename to Modules/UIBuilder/Editor/Builder/Previews/BuilderUxmlPreviewWindow.cs
index 37957451a1..7f3be89196 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUxmlPreviewWindow.cs
+++ b/Modules/UIBuilder/Editor/Builder/Previews/BuilderUxmlPreviewWindow.cs
@@ -1,3 +1,7 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
 namespace Unity.UI.Builder
 {
     internal class BuilderUxmlPreviewWindow : BuilderPaneWindow
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Toolbar/BuilderToolbar.cs b/Modules/UIBuilder/Editor/Builder/Toolbar/BuilderToolbar.cs
similarity index 89%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Toolbar/BuilderToolbar.cs
rename to Modules/UIBuilder/Editor/Builder/Toolbar/BuilderToolbar.cs
index 66fb207ec7..f910c431b4 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Toolbar/BuilderToolbar.cs
+++ b/Modules/UIBuilder/Editor/Builder/Toolbar/BuilderToolbar.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.IO;
@@ -37,7 +41,7 @@ internal class BuilderToolbar : VisualElement, IBuilderAssetModificationProcesso
         ThemeStyleSheetManager m_ThemeManager;
         ThemeStyleSheet m_LastCustomTheme;
 
-        string m_LastSavePath = "Assets";
+        string m_LastSavePath = "Assets/";
 
         public BuilderDocument document
         {
@@ -108,40 +112,58 @@ public BuilderToolbar(
         }
 
         public void InitCanvasTheme()
+        {
+            // Make sure a default runtime theme exists
+            var defaultTssAsset = FindDefaultRuntimeThemeAsset();
+
+            if (defaultTssAsset == null)
+            {
+                // Create the default runtime asset for the user.
+                // Creation should be delayed to not interfere with the windows layout restore
+                schedule.Execute(() =>
+                {
+                    defaultTssAsset = FindDefaultRuntimeThemeAsset();
+
+                    // Make sure again that the default runtime asset doesn't exist
+                    if (defaultTssAsset != null)
+                    {
+                        InitCanvasTheme(defaultTssAsset);
+                    }
+                    else
+                    {
+                        var pathName = $"Assets/{ThemeRegistry.kUnityRuntimeThemeFileName}";
+                        defaultTssAsset = BuilderAssetUtilities.CreateDefaultRuntimeAsset(pathName);
+                        InitCanvasTheme(defaultTssAsset);
+                    }
+                });
+            }
+            else
+            {
+                InitCanvasTheme(defaultTssAsset);
+            }
+        }
+
+        private void InitCanvasTheme(ThemeStyleSheet defaultTssAsset)
         {
             var currentTheme = document.currentCanvasTheme;
             var currentThemeSheet = document.currentCanvasThemeStyleSheet;
 
             // 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;
+            }
+            else if (currentTheme == BuilderDocument.CanvasTheme.Custom && currentThemeSheet == null)
+            {
+                // Theme file was deleted, fallback to default theme
+                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)
-                {
-                    // 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;
@@ -168,6 +190,22 @@ public void InitCanvasTheme()
             UpdateCanvasThemeMenuStatus();
         }
 
+        private ThemeStyleSheet FindDefaultRuntimeThemeAsset()
+        {
+            if (m_ThemeManager != null && m_ThemeManager.themeFiles.Count > 0)
+            {
+                foreach (var themeFilePath in m_ThemeManager.themeFiles)
+                {
+                    if (BuilderAssetUtilities.IsDefaultRuntimeAsset(themeFilePath))
+                    {
+                        return AssetDatabase.LoadAssetAtPath<ThemeStyleSheet>(themeFilePath);
+                    }
+                }
+            }
+
+            return null;
+        }
+
         void RegisterCallbacks(AttachToPanelEvent evt)
         {
             RegisterCallback<DetachFromPanelEvent>(UnregisterCallbacks);
@@ -481,10 +519,9 @@ void SetUpFileMenu()
                 if (string.IsNullOrEmpty(path))
                     return;
 
-                var appPath = Application.dataPath;
-                if (path.StartsWith(appPath))
+                if (BuilderAssetUtilities.IsPathInProject(path))
                 {
-                    path = "Assets/" + path.Substring(appPath.Length);
+                    path = BuilderAssetUtilities.GetPathRelativeToProject(path);
                 }
                 else
                 {
@@ -607,19 +644,41 @@ 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)
+        public void ChangeCanvasTheme(BuilderDocument.CanvasTheme theme, ThemeStyleSheet customThemeStyleSheet = null)
         {
-            ApplyCanvasTheme(m_Viewport.sharedStylesAndDocumentElement, theme, themeStyleSheet);
-            ApplyCanvasTheme(m_Viewport.documentRootElement, theme, themeStyleSheet);
-            ApplyCanvasBackground(m_Viewport.canvas.defaultBackgroundElement, theme, themeStyleSheet);
-            ApplyCanvasTheme(m_TooltipPreview, theme, themeStyleSheet);
-            ApplyCanvasBackground(m_TooltipPreview, theme, themeStyleSheet);
+            m_Viewport.canvas.defaultBackgroundElement.style.display = theme == BuilderDocument.CanvasTheme.Custom ? DisplayStyle.None : DisplayStyle.Flex;
+            m_Viewport.canvas.checkerboardBackgroundElement.style.display = theme == BuilderDocument.CanvasTheme.Custom ? DisplayStyle.Flex : DisplayStyle.None;
+
+            StyleSheet activeThemeStyleSheet = null;
+
+            switch (theme)
+            {
+                case BuilderDocument.CanvasTheme.Dark:
+                    activeThemeStyleSheet = UIElementsEditorUtility.GetCommonDarkStyleSheet();
+                    break;
+                case BuilderDocument.CanvasTheme.Light:
+                    activeThemeStyleSheet = UIElementsEditorUtility.GetCommonLightStyleSheet();
+                    break;
+                case BuilderDocument.CanvasTheme.Default:
+                    activeThemeStyleSheet = EditorGUIUtility.isProSkin ? UIElementsEditorUtility.GetCommonDarkStyleSheet() : UIElementsEditorUtility.GetCommonLightStyleSheet();
+                    break;
+                case BuilderDocument.CanvasTheme.Custom:
+                    activeThemeStyleSheet = customThemeStyleSheet;
+                    break;
+            }
+
+            ApplyCanvasTheme(m_Viewport.sharedStylesAndDocumentElement, activeThemeStyleSheet, m_LastCustomTheme);
+            ApplyCanvasTheme(m_Viewport.documentRootElement, activeThemeStyleSheet, m_LastCustomTheme);
+            ApplyCanvasBackground(m_Viewport.canvas.defaultBackgroundElement, theme);
+            ApplyCanvasTheme(m_TooltipPreview, activeThemeStyleSheet, m_LastCustomTheme);
+            ApplyCanvasBackground(m_TooltipPreview, theme);
+            document.ChangeDocumentTheme(m_Viewport.documentRootElement, theme, customThemeStyleSheet);
+            m_LastCustomTheme = customThemeStyleSheet;
 
-            document.ChangeDocumentTheme(m_Viewport.documentRootElement, theme, themeStyleSheet);
             m_Inspector?.selection.NotifyOfStylingChange(null, null, BuilderStylingChangeType.RefreshOnly);
         }
 
-        void ApplyCanvasTheme(VisualElement element, BuilderDocument.CanvasTheme theme, ThemeStyleSheet customThemeSheet)
+        void ApplyCanvasTheme(VisualElement element, StyleSheet newThemeStyleSheet, StyleSheet oldCustomThemeStyleSheet)
         {
             if (element == null)
                 return;
@@ -649,50 +708,21 @@ void ApplyCanvasTheme(VisualElement element, BuilderDocument.CanvasTheme theme,
                 }
             }
 
-            // Should remove the previous custom theme stylesheet
-            if (m_LastCustomTheme)
-            {
-                element.styleSheets.Remove(m_LastCustomTheme);
-                m_LastCustomTheme = null;
-            }
-            // We verify whether the styles are loaded beforehand because calling GetCommonXXXStyleSheet() will load them unecessarily in this case
+            // We verify whether the styles are loaded beforehand because calling GetCommonXXXStyleSheet() will load them unnecessarily in this case
             if (UIElementsEditorUtility.IsCommonDarkStyleSheetLoaded())
                 element.styleSheets.Remove(UIElementsEditorUtility.GetCommonDarkStyleSheet());
             if (UIElementsEditorUtility.IsCommonLightStyleSheetLoaded())
                 element.styleSheets.Remove(UIElementsEditorUtility.GetCommonLightStyleSheet());
-            m_Viewport.canvas.defaultBackgroundElement.style.display = DisplayStyle.Flex;
-
-            StyleSheet themeStyleSheet = null;
-            m_Viewport.canvas.checkerboardBackgroundElement.style.display = DisplayStyle.None;
-
-            switch (theme)
-            {
-                case BuilderDocument.CanvasTheme.Dark:
-                    themeStyleSheet = UIElementsEditorUtility.GetCommonDarkStyleSheet();
-                    break;
-                case BuilderDocument.CanvasTheme.Light:
-                    themeStyleSheet = UIElementsEditorUtility.GetCommonLightStyleSheet();
-                    break;
-                case BuilderDocument.CanvasTheme.Default:
-                    themeStyleSheet = EditorGUIUtility.isProSkin ? UIElementsEditorUtility.GetCommonDarkStyleSheet() : UIElementsEditorUtility.GetCommonLightStyleSheet();
-                    break;
-                case BuilderDocument.CanvasTheme.Custom:
-                    m_Viewport.canvas.defaultBackgroundElement.style.display = DisplayStyle.None;
-                    m_Viewport.canvas.checkerboardBackgroundElement.style.display = DisplayStyle.Flex;
-                    m_LastCustomTheme = customThemeSheet;
-                    themeStyleSheet = customThemeSheet;
-                    break;
-                default:
-                    break;
-            }
+            if (oldCustomThemeStyleSheet != null)
+                element.styleSheets.Remove(oldCustomThemeStyleSheet);
 
-            if (themeStyleSheet != null)
-                element.styleSheets.Add(themeStyleSheet);
+            if (newThemeStyleSheet != null)
+                element.styleSheets.Add(newThemeStyleSheet);
 
-            element.SetProperty(BuilderConstants.ElementLinkedActiveThemeStyleSheetVEPropertyName, themeStyleSheet);
+            element.SetProperty(BuilderConstants.ElementLinkedActiveThemeStyleSheetVEPropertyName, newThemeStyleSheet);
         }
 
-        void ApplyCanvasBackground(VisualElement element, BuilderDocument.CanvasTheme theme, ThemeStyleSheet themeStyleSheet)
+        void ApplyCanvasBackground(VisualElement element, BuilderDocument.CanvasTheme theme)
         {
             if (element == null)
                 return;
diff --git a/Modules/UIBuilder/Editor/Builder/Utilities/BuilderAnalyticsUtility.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderAnalyticsUtility.cs
new file mode 100644
index 0000000000..d7ec40ee02
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderAnalyticsUtility.cs
@@ -0,0 +1,192 @@
+// 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;
+using UnityEditorInternal;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEngine.UIElements.StyleSheets;
+
+namespace Unity.UI.Builder
+{
+    [Serializable]
+    class BuilderSaveEventData
+    {
+        public string assetGuid; // uxml asset guid
+        public long assetSize; // uxml asset size, in bytes
+        public int elements; // number of elements in the Builder Hierarchy
+        public int depth; // maximum depth of the Builder Hierarchy
+        public int styleSheets; // number of USS assets referenced by the UXML document
+        public int selectors; // total number of USS selectors
+        public int inlineStyles; // number of inline styles on the elements
+        public int editorElements; // number of Editor-only elements in the Hierarchy
+        public int customElements; // number of custom elements in the Hierarchy (to the current project)
+        public bool editorExtension; // whether or not using Editor elements is allowed
+        public string[] features; // whether or not specific features are used.
+    }
+
+    [Flags]
+    enum Features
+    {
+        None                = 0,
+        Instances           = 1 << 0,
+        Transitions         = 1 << 1,
+        Transforms          = 1 << 2,
+        Imports             = 1 << 3,
+        CustomProperties    = 1 << 4,
+        AttributeOverrides  = 1 << 5,
+        Variables           = 1 << 6,
+        ListView            = 1 << 7,
+        TreeView            = 1 << 8
+    }
+    
+    internal static class BuilderAnalyticsUtility
+    {
+        // Used in tests
+        public static BuilderSaveEventData cachedSaveEventData { get; private set; }
+        
+        /// <summary>
+        /// Gets the feature usage in a uxml file
+        /// </summary>
+        private static string[] GetFeatureUsage(VisualTreeAsset vta)
+        {
+            var features = Features.None;
+            var stylesheets = new List<StyleSheet>();
+            stylesheets.AddRange(vta.stylesheets);
+
+            if (vta.inlineSheet != null)
+            {
+                stylesheets.Add(vta.inlineSheet);    
+            }
+
+            foreach (var stylesheet in stylesheets)
+            {
+                if (stylesheet.imports?.Length > 0)
+                    features |= Features.Imports;
+                
+                foreach (var rule in stylesheet.rules)
+                {
+                    if (rule.customPropertiesCount > 0)
+                        features |= Features.CustomProperties;
+
+                    foreach (var property in rule.properties)
+                    {
+                        StylePropertyUtil.s_NameToId.TryGetValue(property.name, out var id);
+                        if (id.IsTransitionId())
+                        {
+                            features |= Features.Transitions;
+                        }
+                        else if (id is StylePropertyId.TransformOrigin or StylePropertyId.Translate 
+                                 or StylePropertyId.Rotate or StylePropertyId.Scale)
+                        {
+                            features |= Features.Transforms;
+                        }
+                        
+                        if (property.IsVariable())
+                        {
+                            features |= Features.Variables;
+                        }
+                    }
+                }
+            }
+
+            if (vta.templateAssets.Count > 0)
+            {
+                features |= Features.Instances;
+                
+                if (vta.templateAssets.Any(x => x.attributeOverrides.Count > 0))
+                {
+                    features |= Features.AttributeOverrides;    
+                }
+            }
+            
+            if (vta.visualElementAssets.Any(x => x.fullTypeName == typeof(ListView).FullName))
+            {
+                features |= Features.ListView;
+            }
+            if (vta.visualElementAssets.Any(x => x.fullTypeName == typeof(TreeView).FullName))
+            {
+                features |= Features.TreeView;
+            }
+
+            return features == 0 ? Array.Empty<string>() : features.ToString().Split();
+        }
+        
+        /// <summary>
+        /// It gathers and sends the data for the builder save event
+        /// </summary>
+        public static void SendSaveEvent(DateTime startTime, BuilderDocumentOpenUXML openUxml, string uxmlPath,
+            int assetSize)
+        {
+            try
+            {
+                // If we encounter any error while collecting the data we should still be able to save and skip
+                // the analytics call
+                var vta = openUxml.visualTreeAsset;
+                var openUssFiles = openUxml.openUSSFiles;
+                var openUxmlFiles = openUxml.openUXMLFiles;
+                var editorExtensionMode = openUxml.fileSettings.editorExtensionMode;
+                var idToChildren = VisualTreeAssetUtilities.GenerateIdToChildren(vta);
+                var elementsInfo = VisualTreeAssetUtilities.GetElementsInfo(idToChildren);
+                var features = GetFeatureUsage(vta);
+            
+                var selectorCount = 0;
+                foreach (var styleSheetFile in openUssFiles)
+                {
+                    selectorCount += styleSheetFile.GetComplexSelectorsCount();
+                }
+
+                var inlineStyleCount = 0;
+                foreach (var openUxmlFile in openUxmlFiles)
+                {
+                    if (openUxmlFile.visualTreeAsset.inlineSheet == null)
+                    {
+                        continue;
+                    }
+                
+                    foreach (var styleRule in openUxmlFile.visualTreeAsset.inlineSheet.rules)
+                    {
+                        inlineStyleCount += styleRule.properties.Length;
+                    }
+                }
+
+                var guid = AssetDatabase.AssetPathToGUID(uxmlPath);
+                
+                var saveEventData = new BuilderSaveEventData
+                {
+                    assetGuid = guid,
+                    assetSize = assetSize,
+                    elements = elementsInfo.elements,
+                    depth = elementsInfo.hierarchyDepth,
+                    styleSheets = openUssFiles.Count,
+                    selectors = selectorCount,
+                    inlineStyles = inlineStyleCount,
+                    editorElements = elementsInfo.editorElements,
+                    customElements = elementsInfo.customElements,
+                    editorExtension = editorExtensionMode,
+                    features = features
+                };
+
+                cachedSaveEventData = saveEventData;
+
+                var now = DateTime.UtcNow;
+                var duration = now - startTime;
+
+                // This check avoids analytics sent by tests or batch mode
+                if (InternalEditorUtility.isHumanControllingUs)
+                {
+                    UsabilityAnalytics.SendEvent("uiBuilderSave", now, duration, true, saveEventData);    
+                }
+            }
+            catch (Exception e)
+            {
+                // If there's any error we should log it to potentially fix it
+                Debug.LogError(e);
+            }
+        }
+    }
+}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetModificationProcessor.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderAssetModificationProcessor.cs
similarity index 77%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetModificationProcessor.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderAssetModificationProcessor.cs
index 0733d144d1..ab6bf1ff5e 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetModificationProcessor.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderAssetModificationProcessor.cs
@@ -1,3 +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 UnityEditor;
 using System.Collections.Generic;
 using System.Linq;
@@ -75,19 +79,6 @@ static AssetMoveResult OnWillMoveAsset(string sourcePath, string destinationPath
 
         static string[] OnWillSaveAssets(string[] paths)
         {
-            // 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") || x.Contains(".uss"))))
-            {
-                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/BuilderAssetPostprocessor.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderAssetPostprocessor.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetPostprocessor.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderAssetPostprocessor.cs
index 01031d42e9..1f7179ed71 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetPostprocessor.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderAssetPostprocessor.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEditor;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetUtilities.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderAssetUtilities.cs
similarity index 82%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetUtilities.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderAssetUtilities.cs
index 2913ff9068..a024e81aea 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetUtilities.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderAssetUtilities.cs
@@ -1,8 +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;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using UnityEditor;
+using UnityEditor.ProjectWindowCallback;
+using UnityEditor.UIElements.StyleSheets;
 using UnityEngine;
 using UnityEngine.UIElements;
 using Object = UnityEngine.Object;
@@ -11,6 +17,60 @@ namespace Unity.UI.Builder
 {
     internal static class BuilderAssetUtilities
     {
+        public static string assetsPath { get; } = Application.dataPath;
+        public static string projectPath { get; } = assetsPath.Substring(0, Application.dataPath.Length - "/Assets".Length);
+        public static string packagesPath { get; } = projectPath + "/Packages";
+
+        public const string defaultRuntimeThemeContent = "@import url(\"" + ThemeRegistry.kThemeScheme +
+                                                           "://default\");\nVisualElement {}";
+
+        internal static ThemeStyleSheet CreateDefaultRuntimeAsset(string pathName)
+        {
+            pathName = AssetDatabase.GenerateUniqueAssetPath(pathName);
+
+            var action = ScriptableObject.CreateInstance<DoCreateAssetWithContent>();
+            action.filecontent = defaultRuntimeThemeContent;
+
+            const int instanceId = ProjectBrowser.kAssetCreationInstanceID_ForNonExistingAssets;
+            action.Action(instanceId, pathName, null);
+            action.CleanUp();
+
+            return EditorGUIUtility.Load(pathName) as ThemeStyleSheet;
+        }
+
+        internal static bool IsDefaultRuntimeAsset(string path)
+        {
+            var assetString = File.ReadAllText(path);
+
+            if (!string.IsNullOrEmpty(assetString))
+            {
+                assetString = assetString.Replace("\r", "");
+            }
+
+            return assetString == defaultRuntimeThemeContent;
+        }
+
+        static string GetFullPath(string path)
+        {
+            return Path.GetFullPath(path).Replace("\\", "/");
+        }
+        
+        public static bool IsPathInProject(string path)
+        {
+            var fullPath = GetFullPath(path);
+            
+            return fullPath.StartsWith(assetsPath, StringComparison.InvariantCultureIgnoreCase) ||
+                   fullPath.StartsWith(packagesPath, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        public static string GetPathRelativeToProject(string path)
+        {
+            if (!IsPathInProject(path))
+                return null;
+            var fullPath = GetFullPath(path);
+            return fullPath.Substring(projectPath.Length + 1); // "/"
+        }
+        
         public static string GetResourcesPathForAsset(Object asset)
         {
             var assetPath = AssetDatabase.GetAssetPath(asset);
@@ -19,18 +79,29 @@ public static string GetResourcesPathForAsset(Object asset)
 
         public static string GetResourcesPathForAsset(string assetPath)
         {
-            var resourcesFolder = "Resources/";
-            if (string.IsNullOrEmpty(assetPath) || !assetPath.Contains(resourcesFolder))
+            if (string.IsNullOrWhiteSpace(assetPath))
                 return null;
 
-            var lastResourcesSubstring = assetPath.LastIndexOf(resourcesFolder) + resourcesFolder.Length;
+            // Start by trying to find a "Resources" folder in the middle of the path. 
+            var resourcesFolder = "/Resources/";
+            var lastResourcesFolderIndex = assetPath.LastIndexOf(resourcesFolder, StringComparison.Ordinal);
+            // Otherwise check if the "Resources" path is at the start.
+            if (lastResourcesFolderIndex < 0)
+            {
+                if (assetPath.StartsWith("Resources/"))
+                {
+                    lastResourcesFolderIndex = 0;
+                    resourcesFolder = "Resources/";
+                }
+                else return null;
+            }
+            
+            var lastResourcesSubstring = lastResourcesFolderIndex + resourcesFolder.Length;
             assetPath = assetPath.Substring(lastResourcesSubstring);
-            var lastExtDot = assetPath.LastIndexOf(".");
+            var lastExtDot = assetPath.LastIndexOf(".", StringComparison.Ordinal);
 
             if (lastExtDot == -1)
-            {
                 return null;
-            }
 
             assetPath = assetPath.Substring(0, lastExtDot);
 
@@ -155,6 +226,17 @@ public static void ReorderStyleSheetsInAsset(
                 var rightOrder = reorderedUSSList.IndexOf(right.styleSheet);
                 return leftOrder.CompareTo(rightOrder);
             });
+
+            var rootElement = openUXMLFile.visualTreeAsset.GetRootUXMLElement();
+            if (rootElement != null && rootElement.stylesheets != null)
+            {
+                rootElement.stylesheets.Sort((left, right) =>
+                {
+                    var leftOrder = reorderedUSSList.IndexOf(left);
+                    var rightOrder = reorderedUSSList.IndexOf(right);
+                    return leftOrder.CompareTo(rightOrder);
+                });
+            }
         }
 
         public static VisualElementAsset AddElementToAsset(
@@ -406,7 +488,6 @@ public static void AddElementToSelectionInAsset(BuilderDocument document, Visual
             }
             else if (ve.GetVisualElementAsset() != null)
             {
-                Undo.IncrementCurrentGroup();
                 Undo.RegisterCompleteObjectUndo(
                     document.visualTreeAsset, BuilderConstants.ChangeSelectionUndoMessage);
 
@@ -444,7 +525,6 @@ public static void RemoveElementFromSelectionInAsset(BuilderDocument document, V
             }
             else if (ve.GetVisualElementAsset() != null)
             {
-                Undo.IncrementCurrentGroup();
                 Undo.RegisterCompleteObjectUndo(
                     document.visualTreeAsset, BuilderConstants.ChangeSelectionUndoMessage);
 
@@ -483,9 +563,13 @@ public static TemplateContainer GetVisualElementRootTemplate(VisualElement visua
 
             while (parent != null)
             {
-                if (parent is TemplateContainer && parent.GetVisualElementAsset() != null)
+                if (parent is TemplateContainer templateContainer)
                 {
-                    templateContainerParent = parent as TemplateContainer;
+                    if (templateContainer.GetVisualElementAsset() != null)
+                    {
+                        templateContainerParent = templateContainer;
+                    }
+
                     break;
                 }
 
@@ -506,7 +590,7 @@ public static bool HasAttributeOverrideInRootTemplate(VisualElement visualElemen
         public static List<CreationContext.AttributeOverrideRange> GetAccumulatedAttributeOverrides(VisualElement visualElement)
         {
             VisualElement parent = visualElement.parent;
-            List<CreationContext.AttributeOverrideRange> attributeOverrideRanges = new ();
+            List<CreationContext.AttributeOverrideRange> attributeOverrideRanges = new();
 
             while (parent != null)
             {
@@ -527,7 +611,7 @@ public static bool HasAttributeOverrideInRootTemplate(VisualElement visualElemen
                         VisualTreeAsset visualTreeAsset = parent.GetVisualTreeAsset();
                         if (visualTreeAsset != null)
                         {
-                            attributeOverrideRanges.Add(new CreationContext.AttributeOverrideRange(visualTreeAsset, templateAsset.attributeOverrides));   
+                            attributeOverrideRanges.Add(new CreationContext.AttributeOverrideRange(visualTreeAsset, templateAsset.attributeOverrides));
                         }
                     }
 
@@ -547,7 +631,7 @@ public static bool HasAttributeOverrideInRootTemplate(VisualElement visualElemen
             return attributeOverrideRanges;
         }
 
-        static public bool WriteTextFileToDisk(string path, string content)
+        public static bool WriteTextFileToDisk(string path, string content)
         {
             bool success = FileUtil.WriteTextFileToDisk(path, content, out string message);
 
@@ -559,5 +643,20 @@ static public bool WriteTextFileToDisk(string path, string content)
 
             return success;
         }
+
+        // Refresh GameView preview with the latest (unsaved to disk) changes.
+        [Flags]
+        public enum LiveReloadChanges
+        {
+            Hierarchy = 1,
+            Styles = 2
+        }
+        public static void LiveReload(LiveReloadChanges changes)
+        {
+            if ((changes & LiveReloadChanges.Hierarchy) != 0)
+                UIElementsUtility.InMemoryAssetsHierarchyHaveBeenChanged();
+            if ((changes & LiveReloadChanges.Styles) != 0)
+                UIElementsUtility.InMemoryAssetsStyleHaveBeenChanged();
+        }
     }
 }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderCommandHandler.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderCommandHandler.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderCommandHandler.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderCommandHandler.cs
index 95bb3a8e38..7282b7f9b9 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderCommandHandler.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderCommandHandler.cs
@@ -1,3 +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 UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -335,7 +339,8 @@ bool DeleteElement(VisualElement element)
             if (BuilderSharedStyles.IsSelectorsContainerElement(element) ||
                 BuilderSharedStyles.IsStyleSheetElement(element) ||
                 BuilderSharedStyles.IsDocumentElement(element) ||
-                !element.IsLinkedToAsset())
+                !element.IsLinkedToAsset() ||
+                (!BuilderSharedStyles.IsSelectorElement(element) && !element.IsPartOfActiveVisualTreeAsset(m_PaneWindow.document)))
                 return false;
 
             if (BuilderSharedStyles.IsSelectorElement(element))
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderConstants.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderConstants.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderConstants.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderConstants.cs
index 3829b9403b..c872a5849f 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderConstants.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderConstants.cs
@@ -1,8 +1,11 @@
+// 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.IO;
 using UnityEditor;
 using UnityEngine;
-using UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
 {
@@ -11,10 +14,7 @@ internal static class BuilderConstants
         // Builder
         public const string BuilderWindowTitle = "UI Builder";
         public const string BuilderWindowIcon = IconsResourcesPath + "/Generic/UIBuilder";
-        public const string BuilderPackageName = "com.unity.ui.builder";
         public const string BuilderMenuEntry = "Window/UI Toolkit/UI Builder";
-        public const string UIToolkitPackageName = "com.unity.ui";
-        public static readonly Rect BuilderWindowDefaultRect = new Rect(50, 50, 1000, 700);
         // These sizes are copied from EditorWindow.cs. See the default values of EditorWindow.m_MinSize and EditorWindow.m_MaxSize.
         public static readonly Vector2 BuilderWindowDefaultMinSize = new Vector2(100, 100);
         public static readonly Vector2 BuilderWindowDefaultMaxSize = new Vector2(4000, 4000);
@@ -26,7 +26,7 @@ internal static class BuilderConstants
         public static readonly float CanvasInitialHeight = 450; // Making this too large might break tests.
         public static readonly float CanvasMinWidth = 100;
         public static readonly float CanvasMinHeight = 100;
-        public static readonly int ClassNameInPillMaxLength = 25;
+        public static readonly float ClassNameInPillMinWidth = 180f;
         public static readonly float TooltipPreviewYOffset = 20;
         public static readonly float ViewportInitialZoom = 1.0f;
         public static readonly Vector2 ViewportInitialContentOffset = new Vector2(20.0f, 20.0f);
@@ -127,6 +127,7 @@ internal static class BuilderConstants
         public static readonly string InspectorLocalStyleVariableEditingClassName = "unity-builder-inspector__style--variable-editing";
         public static readonly string InspectorLocalStyleInheritedClassName = "unity-builder-inspector__style--inherited";
         public static readonly string InspectorLocalStyleSelectorClassName = "unity-builder-inspector__style--uss-selector";
+        public static readonly string InspectorLocalStyleSelectorElementClassName = "unity-builder-inspector__style--selector-element";
         public static readonly string InspectorLocalStyleDefaultStatusClassName = "unity-builder-inspector__style--default";
         public static readonly string InspectorEmptyFoldoutLabelClassName = "unity-builder-inspector__empty-foldout-label";
         public static readonly string InspectorClassPillNotInDocumentClassName = "unity-builder-class-pill--not-in-document";
@@ -134,6 +135,9 @@ internal static class BuilderConstants
         public static readonly string InspectorContainerClassName = "unity-builder-inspector__container";
         public static readonly string InspectorMultiFieldsRowClassName = "unity-builder-composite-field-row";
         public static readonly string InspectorCompositeStyleRowElementClassName = "unity-builder-composite-style-row-element";
+        public static readonly string InspectorFixedItemHeightFieldClassName = "unity-builder-uxml-attribute__fixed-item-height";
+        public static readonly string InspectorShownNegativeWarningMessageClassName = "unity-builder-uxml-attribute__negative-warning--shown";
+        public static readonly string InspectorHiddenNegativeWarningMessageClassName = "unity-builder-uxml-attribute__negative-warning--hidden";
 
         // Inspector Links VE Property Names
         public static readonly string InspectorLinkedStyleRowVEPropertyName = "__unity-ui-builder-style-row";
@@ -171,6 +175,8 @@ internal static class BuilderConstants
         public static readonly string EditPropertyToAddNewTransition = "Set a property to a non-keyword value to add a new transition.";
         public static readonly string FileNotFoundMessage = "File not found";
         public static readonly string HeaderSectionHelpBoxMessage = "This control is not supported in Runtime UI. Remove it, or enable Editor Extension Authoring in the Library.";
+        public static readonly string HeightIntFieldValueCannotBeNegativeMessage = "Please enter a positive number. Non-positive numbers will default to 1.";
+        public static readonly string UnnamedValue = "<No Name>";
 
         // Tooltip Messages
         public static readonly string FieldStatusIndicatorDefaultTooltip = "Default value";
@@ -203,6 +209,12 @@ internal static class BuilderConstants
         public const string PreviewRestoreInInspector = "Restore in Inspector";
         public const string PreviewTransparencyToggleTooltip = "Show or hide transparency view.";
 
+        // Attribute fields
+        public static readonly string AttributeFieldFactoryVEPropertyName = "__unity-ui-builder-attribute-field-factory";
+
+        // Dimension Style Field specific
+        public const float DimensionStyleFieldReducedDragStep = 0.1f;
+
         //
         // Explorer
         //
@@ -235,6 +247,10 @@ internal static class BuilderConstants
         public static readonly string ExplorerActiveStyleSheetClassName = "unity-builder-stylesheets-pane--active-stylesheet";
         public static readonly string ExplorerItemBelongsToOpenDocument = "unity-builder-explorer-excluded";
 
+        // Selector labels
+        public static readonly string SelectorLabelClassName = "unity-builder-selector-label";
+        public static readonly string SelectorLabelMultiplePartsClassName = "unity-builder-selector-label-multiple-parts";
+
         // StyleSheets Pane Menu
         public static readonly string ExplorerStyleSheetsPanePlusMenuNoElementsMessage = "Need at least one element in UXML to add StyleSheets.";
         public static readonly string ExplorerStyleSheetsPaneSetActiveUSS = "Set as Active USS";
@@ -275,6 +291,9 @@ internal static class BuilderConstants
         public const string LibraryShowPackageFiles = "Show Package Files";
         public const string LibraryViewModeToggle = "Tree View";
         public const string LibraryEditorExtensionsAuthoring = "Editor Extension Authoring";
+        public const string LibraryDefaultVisualElementType = "Default Visual Element Type";
+        public const string LibraryDefaultVisualElementStyledName = "Styled";
+        public const string LibraryDefaultVisualElementNoStylesName = "No styles";
         public const string LibraryProjectTabName = "Project";
         public const string LibraryStandardControlsTabName = "Standard";
 
@@ -344,6 +363,7 @@ internal static class BuilderConstants
         public static readonly string RenameSelectorUndoMessage = "Rename USS Selector";
         public static readonly string DeleteSelectorUndoMessage = "Delete USS Selector";
         public static readonly string MoveUSSSelectorUndoMessage = "Move USS Selector";
+        public static readonly string ChangeCanvasDimensionsOrMatchViewUndoMessage = "Change Canvas Dimensions or Match View";
         public static readonly string SaveAsNewDocumentsDialogMessage = "Save As New UI Documents";
         public static readonly string NewDocumentsDialogMessage = "New UI Documents";
 
@@ -446,6 +466,7 @@ internal static class BuilderConstants
         public static readonly string UxmlTagTypeName = "UnityEngine.UIElements.UXML";
         public static readonly string UxmlInstanceTypeName = "UnityEngine.UIElements.Instance";
         public static readonly string UxmlBindableElementTypeName = "UnityEngine.UIElements.BindableElement";
+        public static readonly string UxmlVisualElementTypeName = "UnityEngine.UIElements.VisualElement";
 
         // USS
         public static readonly string UssSelectorNameSymbol = "#";
@@ -523,7 +544,7 @@ public static string builderDocumentDiskJsonFolderAbsolutePath
         {
             get
             {
-                var path = Application.dataPath + "/../" + BuilderDocumentDiskJsonFolderPath;
+                var path = BuilderAssetUtilities.projectPath + "/" + BuilderDocumentDiskJsonFolderPath;
                 path = Path.GetFullPath(path);
                 return path;
             }
@@ -542,7 +563,7 @@ public static string builderDocumentDiskSettingsJsonFolderAbsolutePath
         {
             get
             {
-                var path = Application.dataPath + "/../" + BuilderDocumentDiskSettingsJsonFolderPath;
+                var path = BuilderAssetUtilities.projectPath + "/" + BuilderDocumentDiskSettingsJsonFolderPath;
                 path = Path.GetFullPath(path);
                 return path;
             }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderDialogsUtility.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderDialogsUtility.cs
similarity index 64%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderDialogsUtility.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderDialogsUtility.cs
index 3a0ca41584..f17fd97f02 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderDialogsUtility.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderDialogsUtility.cs
@@ -1,3 +1,8 @@
+// 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;
 using UnityEngine;
 
@@ -41,20 +46,21 @@ public static string DisplayOpenFileDialog(string title, string directory, strin
                 return null;
 
             if (string.IsNullOrEmpty(directory))
-                directory = Application.dataPath;
+                directory = BuilderAssetUtilities.assetsPath;
 
             var newPath = EditorUtility.OpenFilePanel(
                 title,
                 directory,
                 extension);
 
-            if (string.IsNullOrEmpty(newPath?.Trim()))
+            if (string.IsNullOrWhiteSpace(newPath))
                 return null;
 
-            var appPathLength = Application.dataPath.Length - 6; // - "Assets".Length
-            newPath = newPath.Substring(appPathLength);
-
-            return newPath;
+            
+            var projectPath = BuilderAssetUtilities.GetPathRelativeToProject(newPath.Trim());
+            if (string.IsNullOrWhiteSpace(projectPath))
+                DisplayDialog("Opening document failed", $"Could not open the document at the requested path ('{newPath}'): the path is outside of the project.");
+            return projectPath;
         }
 
         public static string DisplaySaveFileDialog(string title, string directory, string defaultName, string extension)
@@ -63,7 +69,7 @@ public static string DisplaySaveFileDialog(string title, string directory, strin
                 return null;
 
             if (string.IsNullOrEmpty(directory))
-                directory = Application.dataPath;
+                directory = BuilderAssetUtilities.assetsPath;
 
             var newPath = EditorUtility.SaveFilePanel(
                 title,
@@ -71,13 +77,14 @@ public static string DisplaySaveFileDialog(string title, string directory, strin
                 defaultName,
                 extension);
 
-            if (string.IsNullOrEmpty(newPath?.Trim()))
+            if (string.IsNullOrWhiteSpace(newPath))
                 return null;
 
-            var appPathLength = Application.dataPath.Length - 6; // - "Assets".Length
-            newPath = newPath.Substring(appPathLength);
+            var projectPath = BuilderAssetUtilities.GetPathRelativeToProject(newPath.Trim());
 
-            return newPath;
+            if (string.IsNullOrWhiteSpace(projectPath))
+                DisplayDialog("Saving new document failed", $"Could not save the current document at the requested path ('{newPath}'): the path is outside of the project.");
+            return projectPath;
         }
     }
 }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderEditorUtility.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderEditorUtility.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderEditorUtility.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderEditorUtility.cs
index b88bd99445..848589a3ce 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderEditorUtility.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderEditorUtility.cs
@@ -1,3 +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;
 using UnityEditor;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderElementContextMenu.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderElementContextMenu.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderElementContextMenu.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderElementContextMenu.cs
index f94f41b56e..40f579d749 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderElementContextMenu.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderElementContextMenu.cs
@@ -1,3 +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.Collections.Generic;
 using System.Linq;
 using UnityEditor;
diff --git a/Modules/UIBuilder/Editor/Builder/Utilities/BuilderInspectorUtilities.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderInspectorUtilities.cs
new file mode 100644
index 0000000000..cba30ab045
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderInspectorUtilities.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 UnityEngine.UIElements;
+
+namespace Unity.UI.Builder
+{
+    internal static class BuilderInspectorUtilities
+    {
+        public static bool HasOverriddenField(VisualElement ve)
+        {
+            return ve.Q(className: BuilderConstants.InspectorLocalStyleOverrideClassName) != null;
+        }
+    }
+}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderNameUtilities.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderNameUtilities.cs
similarity index 72%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderNameUtilities.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderNameUtilities.cs
index 5a9b410dd3..e570d0aeb3 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderNameUtilities.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderNameUtilities.cs
@@ -1,4 +1,7 @@
-using System.Collections.Generic;
+// 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.Text;
 using System.Text.RegularExpressions;
@@ -80,6 +83,38 @@ public static string CapStringLengthAndAddEllipsis(string str, int maxLength)
             return strShortened;
         }
 
+        public static string GetNameByReflection(object obj)
+        {
+            if (obj == null)
+                return null;
+
+            var type = obj.GetType();
+
+            // Look for a name property
+            var nameProperty = type.GetProperty("name");
+            var objName = BuilderConstants.UnnamedValue;
+            object nameValue = null;
+
+            if (nameProperty != null)
+            {
+                nameValue = nameProperty.GetValue(obj);
+            }
+            else
+            {
+                var nameField = type.GetField(("name"));
+
+                if (nameField != null)
+                    nameValue = nameField.GetValue(obj);
+            }
+
+            if (nameValue != null)
+                objName = nameValue.ToString();
+
+            if (string.IsNullOrEmpty(objName))
+                objName = BuilderConstants.UnnamedValue;
+            return objName;
+        }
+
         public static Regex attributeRegex { get; } = new Regex(@"^[a-zA-Z0-9\-_]+$");
         public static Regex styleSelectorRegex { get; } = new Regex(@"^[a-zA-Z0-9\-_:#\*>. ]+$");
         public static Regex bindingPathAttributeRegex { get; } = new Regex(@"^[a-zA-Z0-9\-_.]+$");
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderPackageUtilities.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderPackageUtilities.cs
similarity index 88%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderPackageUtilities.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderPackageUtilities.cs
index 5fe37654fb..9788b51d2b 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderPackageUtilities.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderPackageUtilities.cs
@@ -1,3 +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.IO;
 using UnityEngine;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderPlacementUtilities.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderPlacementUtilities.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderPlacementUtilities.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderPlacementUtilities.cs
index 3e91542654..aaa81bfbab 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderPlacementUtilities.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderPlacementUtilities.cs
@@ -1,3 +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 UnityEngine;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderProjectSettings.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderProjectSettings.cs
similarity index 93%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderProjectSettings.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderProjectSettings.cs
index bbc7d4d094..351c036098 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderProjectSettings.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderProjectSettings.cs
@@ -1,3 +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;
 using UnityEditor;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderSharedStyles.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderSharedStyles.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderSharedStyles.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderSharedStyles.cs
index 4029ab03af..69dd75f943 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderSharedStyles.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderSharedStyles.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using System.Collections.Generic;
 using UnityEditor.UIElements.Debugger;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderStyleUtilities.cs b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderStyleUtilities.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderStyleUtilities.cs
rename to Modules/UIBuilder/Editor/Builder/Utilities/BuilderStyleUtilities.cs
index 3d3203f6c1..22d7ad1eb8 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderStyleUtilities.cs
+++ b/Modules/UIBuilder/Editor/Builder/Utilities/BuilderStyleUtilities.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using System;
 using UnityEngine;
diff --git a/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/BuilderUxmlAttributesView.cs b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/BuilderUxmlAttributesView.cs
new file mode 100644
index 0000000000..0c1b2ae621
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/BuilderUxmlAttributesView.cs
@@ -0,0 +1,1030 @@
+// 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 System.Reflection;
+using System.Text.RegularExpressions;
+using UnityEngine.UIElements;
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine;
+
+namespace Unity.UI.Builder
+{
+    /// <summary>
+    /// This view displays and edits the list of uxml attributes of an object in a uxml document.
+    /// </summary>
+    internal class BuilderUxmlAttributesView
+    {
+        static readonly string s_AttributeFieldRowUssClassName = "unity-builder-attribute-field-row";
+        static readonly string s_AttributeFieldUssClassName = "unity-builder-attribute-field";
+        static readonly PropertyName UndoGroupPropertyKey = "__UnityUndoGroup";
+        VisualTreeAsset m_UxmlDocument;
+        VisualElement m_CurrentElement;
+        VisualElementAsset m_CurrentUxmlElement;
+        object m_CurrentSubObject;
+        UxmlObjectAsset m_CurrentUxmlSubObject;
+        List<UxmlAttributeDescription> m_Attributes;
+        static List<UxmlAttributeDescription> s_EmptyAttributeList = new();
+
+        bool m_IsInTemplateInstance;
+
+        /// <summary>
+        /// Gets or sets the value that indicates whether undo-redo is enabled when editing fields.
+        /// </summary>
+        public bool undoEnabled { get; set; } = true;
+
+        /// <summary>
+        /// Gets or sets the value that indicates whether UxmlTraits.Init() should be invoked on attribute value change.
+        /// </summary>
+        public bool callInitOnValueChange { get; set; } = true;
+
+        /// <summary>
+        /// The container of fields generated from uxml attributes.
+        /// </summary>
+        public VisualElement fieldsContainer { get; set; }
+
+        /// <summary>
+        /// The visual element being edited.
+        /// </summary>
+        public VisualElement currentElement => m_CurrentElement;
+
+        /// <summary>
+        /// The uxml document being edited.
+        /// </summary>
+        public VisualTreeAsset uxmlDocument => m_UxmlDocument;
+
+        /// <summary>
+        /// Returns the object associated to the uxml element attributes being edited by the view.
+        /// </summary>
+        public object attributesOwner => m_CurrentSubObject != null ? m_CurrentSubObject : m_CurrentElement;
+
+        /// <summary>
+        /// Returns the uxml element of which attributes are being edited by the view.
+        /// </summary>
+        public UxmlAsset attributesUxmlOwner => m_CurrentUxmlSubObject != null ? m_CurrentUxmlSubObject : m_CurrentUxmlElement;
+
+        /// <summary>
+        /// Returns the list of attributes.
+        /// </summary>
+        public List<UxmlAttributeDescription> attributes => m_Attributes;
+
+        /// <summary>
+        /// Finds the attribute description with the specified name.
+        /// </summary>
+        /// <param name="attributeName">The name of the attribute to seek.</param>
+        /// <returns>The attribute description to seek.</returns>
+        public UxmlAttributeDescription FindAttribute(string attributeName)
+        {
+            foreach (var attr in m_Attributes)
+            {
+                if (attr.name == attributeName)
+                    return attr;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Sets the specified VisualElement as the owner of attributes to be edited.
+        /// </summary>
+        /// <param name="uxmlDocument">The uxml document being edited</param>
+        /// <param name="visualElement">The VisualElement that provides attributes to be edited</param>
+        /// <param name="isInTemplate">Indicates whether the VisualElement is in a template instance</param>
+        public void SetAttributesOwner(VisualTreeAsset uxmlDocument, VisualElement visualElement, bool isInTemplate = false)
+        {
+            m_IsInTemplateInstance = isInTemplate;
+            SetAttributesOwner(uxmlDocument, visualElement, null, null);
+            fieldsContainer.Clear();
+        }
+
+        /// <summary>
+        /// Sets the specified sub object in the specified VisualElement as the owner of attributes to be edited.
+        /// </summary>
+        /// <param name="uxmlDocument">The uxml document being edited</param>
+        /// <param name="visualElement">The VisualElement that owns the selected sub object</param>
+        /// <param name="uxmlObjectElement">The uxml element from which the selected sub object was created</param>
+        /// <param name="objectElement">The sub object that provides attributes to be edited</param>
+        public virtual void SetAttributesOwner(VisualTreeAsset uxmlDoc, VisualElement visualElement, UxmlObjectAsset uxmlObjectElement, object objectElement)
+        {
+            m_UxmlDocument = uxmlDoc;
+            m_CurrentUxmlElement = visualElement.GetVisualElementAsset();
+            m_CurrentElement = visualElement;
+            m_CurrentUxmlSubObject = uxmlObjectElement;
+            m_CurrentSubObject = objectElement;
+
+            if (m_CurrentSubObject != null)
+            {
+                var factory = m_UxmlDocument.GetUxmlObjectFactory(m_CurrentUxmlSubObject);
+                m_Attributes = factory.GetTraits().uxmlAttributesDescription.ToList();
+            }
+            else if (m_CurrentElement != null)
+            {
+                m_Attributes = m_CurrentElement.GetAttributeDescriptions();
+            }
+
+            m_Attributes ??= s_EmptyAttributeList;
+        }
+
+        /// <summary>
+        /// Clears the the attributes owner.
+        /// </summary>
+        public void ResetAttributesOwner()
+        {
+            SetAttributesOwner(null, null);
+        }
+
+        /// <summary>
+        /// Refreshes the view.
+        /// </summary>
+        public virtual void Refresh()
+        {
+            fieldsContainer.Clear();
+
+            if (attributesOwner == null || m_Attributes.Count == 0)
+                return;
+
+            GenerateUxmlAttributeFields();
+        }
+
+        /// <summary>
+        /// Generates fields from the uxml attributes.
+        /// </summary>
+        protected virtual void GenerateUxmlAttributeFields()
+        {
+            foreach (var attribute in m_Attributes)
+            {
+                if (attribute == null || attribute.name == null || IsAttributeIgnored(attribute))
+                    continue;
+                CreateAttributeRow(attribute);
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether the specified uxml attribute should be ignored.
+        /// </summary>
+        /// <param name="attribute">The attribute to evaluate.</param>
+        /// <returns></returns>
+        protected virtual bool IsAttributeIgnored(UxmlAttributeDescription attribute)
+        {
+            if (attributesOwner is VisualElement)
+            {
+                // Temporary check until we add an "obsolete" mechanism to uxml attribute description.
+                return attribute.name == "show-horizontal-scroller" || attribute.name == "show-vertical-scroller" || attribute.name == "name";
+            }
+            return false;
+        }
+
+        private static string GetRemapAttributeNameToCSProperty(object attributesOwner, string attributeName)
+        {
+            if (attributesOwner is VisualElement)
+            {
+                if (attributesOwner is ObjectField && attributeName == "type")
+                    return "objectType";
+                else if (attributeName == "readonly")
+                    return "isReadOnly";
+            }
+
+            var camel = BuilderNameUtilities.ConvertDashToCamel(attributeName);
+            return camel;
+        }
+
+        internal string GetRemapAttributeNameToCSProperty(string attributeName)
+        {
+            return GetRemapAttributeNameToCSProperty(attributesOwner, attributeName);
+        }
+
+        internal string GetRemapCSPropertyToAttributeName(string CSProperty)
+        {
+            if (attributesOwner is VisualElement)
+            {
+                if (attributesOwner is ObjectField && CSProperty == "objectType")
+                    return "type";
+                else if (CSProperty == "isReadonly")
+                    return "readOnly";
+            }
+
+            return BuilderNameUtilities.ConvertCamelToDash(CSProperty);
+        }
+
+        object GetAttributeValueNotMatchingCSPropertyName(string attributeName)
+        {
+            if (attributesOwner is ScrollView scrollView)
+            {
+                if (attributeName == "show-horizontal-scroller")
+                {
+                    return scrollView.horizontalScrollerVisibility != ScrollerVisibility.Hidden;
+                }
+                else if (attributeName == "show-vertical-scroller")
+                {
+                    return scrollView.verticalScrollerVisibility != ScrollerVisibility.Hidden;
+                }
+                else if (attributeName == "touch-scroll-type")
+                {
+                    return scrollView.touchScrollBehavior;
+                }
+            }
+            else if (attributesOwner is ListView listView)
+            {
+                if (attributeName == "horizontal-scrolling")
+                    return listView.horizontalScrollingEnabled;
+            }
+            else if (attributesOwner is BoundsField boundsField)
+            {
+                if (attributeName == "cx")
+                    return boundsField.value.center.x;
+                else if (attributeName == "cy")
+                    return boundsField.value.center.y;
+                else if (attributeName == "cz")
+                    return boundsField.value.center.z;
+                else
+                    if (attributeName == "ex")
+                    return boundsField.value.size.x;
+                else
+                    if (attributeName == "ey")
+                    return boundsField.value.size.y;
+                else
+                    if (attributeName == "ez")
+                    return boundsField.value.size.z;
+            }
+            else if (attributesOwner is BoundsIntField boundsIntField)
+            {
+                if (attributeName == "px")
+                    return boundsIntField.value.position.x;
+                else if (attributeName == "py")
+                    return boundsIntField.value.position.y;
+                else if (attributeName == "pz")
+                    return boundsIntField.value.position.z;
+                else
+                    if (attributeName == "sx")
+                    return boundsIntField.value.size.x;
+                else
+                    if (attributeName == "sy")
+                    return boundsIntField.value.size.y;
+                else
+                    if (attributeName == "sz")
+                    return boundsIntField.value.size.z;
+            }
+            else if (attributesOwner is RectField rectField)
+            {
+                if (attributeName == "x")
+                    return rectField.value.x;
+                else if (attributeName == "y")
+                    return rectField.value.y;
+                else if (attributeName == "w")
+                    return rectField.value.width;
+                else if (attributeName == "h")
+                    return rectField.value.height;
+            }
+            else if (attributesOwner is Vector2Field vec2Field)
+            {
+                if (attributeName == "x")
+                    return vec2Field.value.x;
+                else if (attributeName == "y")
+                    return vec2Field.value.y;
+            }
+            else if (attributesOwner is Vector3Field vec3Field)
+            {
+                if (attributeName == "x")
+                    return vec3Field.value.x;
+                else if (attributeName == "y")
+                    return vec3Field.value.y;
+                else if (attributeName == "z")
+                    return vec3Field.value.z;
+            }
+            else if (attributesOwner is Vector4Field vec4Field)
+            {
+                if (attributeName == "x")
+                    return vec4Field.value.x;
+                else if (attributeName == "y")
+                    return vec4Field.value.y;
+                else if (attributeName == "z")
+                    return vec4Field.value.z;
+                else if (attributeName == "w")
+                    return vec4Field.value.w;
+            }
+            else if (attributesOwner is Vector2IntField vec2IntField)
+            {
+                if (attributeName == "x")
+                    return vec2IntField.value.x;
+                else if (attributeName == "y")
+                    return vec2IntField.value.y;
+            }
+            else if (attributesOwner is Vector3IntField vec3IntField)
+            {
+                if (attributeName == "x")
+                    return vec3IntField.value.x;
+                else if (attributeName == "y")
+                    return vec3IntField.value.y;
+                else if (attributeName == "z")
+                    return vec3IntField.value.z;
+            }
+
+            return null;
+        }
+
+        protected BuilderStyleRow CreateAttributeRow(string attributeName, VisualElement parent = null)
+        {
+            return CreateAttributeRow(FindAttribute(attributeName), parent);
+        }
+
+        /// <summary>
+        /// Creates a row in the fields container for the specified attribute.
+        /// </summary>
+        /// <param name="attribute">The target attribute</param>
+        /// <param name="parent">The parent where to add the row</param>
+        /// <returns></returns>
+        protected BuilderStyleRow CreateAttributeRow(UxmlAttributeDescription attribute, VisualElement parent = null)
+        {
+            BindableElement fieldElement = CreateAttributeField(attribute);
+
+            parent ??= fieldsContainer;
+
+            // Create row.
+            var styleRow = new BuilderStyleRow();
+
+            styleRow.AddToClassList($"{s_AttributeFieldRowUssClassName}-{attribute.name}");
+            styleRow.Add(fieldElement);
+
+            // Link the field.
+            fieldElement.SetProperty(BuilderConstants.InspectorLinkedStyleRowVEPropertyName, styleRow);
+            fieldElement.SetLinkedAttributeDescription(attribute);
+
+            // Ensure the row is added to the inspector hierarchy before refreshing
+            parent.Add(styleRow);
+
+            // Set initial value.
+            UpdateAttributeField(fieldElement);
+
+            // Setup field binding path.
+            fieldElement.bindingPath = attribute.name;
+
+            // Context menu.
+            styleRow.AddManipulator(new ContextualMenuManipulator((evt) => BuildAttributeFieldContextualMenu(evt.menu, fieldElement)));
+
+            if (fieldElement.GetFieldStatusIndicator() != null)
+            {
+                fieldElement.GetFieldStatusIndicator().populateMenuItems =
+                    (menu) => BuildAttributeFieldContextualMenu(menu, fieldElement);
+            }
+
+            if (fieldElement is IEditableElement editableElement)
+            {
+                // used to group undo operations (UUM-32599)
+                editableElement.editingStarted += () => SetUndoGroup(fieldElement);
+                editableElement.editingEnded += () => UnsetUndoGroup(fieldElement);
+            }
+
+            UpdateFieldStatus(fieldElement);
+
+            return styleRow;
+        }
+
+        /// <summary>
+        /// Creates a field from the specified attribute.
+        /// </summary>
+        /// <param name="attribute">The target attribute</param>
+        /// <returns></returns>
+        protected virtual BindableElement CreateAttributeField(UxmlAttributeDescription attribute)
+        {
+            var factory = BuilderUxmlAttributeFieldFactoryRegistry.GetFactory(attributesOwner, attributesUxmlOwner, attribute);
+            var uiField = factory.CreateField(attributesOwner, attributesUxmlOwner, attribute, OnAttributeValueChanged);
+            uiField.AddToClassList($"{s_AttributeFieldUssClassName}-{attribute.name}");
+            uiField.SetProperty(BuilderConstants.AttributeFieldFactoryVEPropertyName, factory);
+            return uiField as BindableElement;
+        }
+
+        /// <summary>
+        /// Gets the value of the specified attribute.
+        /// </summary>
+        /// <param name="attribute">The target attribute.</param>
+        /// <returns></returns>
+        protected virtual object GetAttributeValue(UxmlAttributeDescription attribute)
+        {
+            var objType = attributesOwner.GetType();
+            var csPropertyName = GetRemapAttributeNameToCSProperty(attribute.name);
+            var fieldInfo = objType.GetProperty(csPropertyName,
+                BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.IgnoreCase);
+
+            return fieldInfo == null ? GetAttributeValueNotMatchingCSPropertyName(attribute.name) : fieldInfo.GetValue(attributesOwner, null);
+        }
+
+        /// <summary>
+        /// Refreshes the value and status of the specified field.
+        /// </summary>
+        /// <param name="fieldElement">The field to refresh</param>
+        void UpdateAttributeField(BindableElement fieldElement)
+        {
+            var styleRow =
+                fieldElement.GetProperty(BuilderConstants.InspectorLinkedStyleRowVEPropertyName) as VisualElement;
+            var attribute =
+                fieldElement.GetLinkedAttributeDescription();
+            object fieldValue = GetAttributeValue(attribute);
+
+            if (fieldValue == null)
+            {
+                if (attributesOwner is EnumField defaultEnumField &&
+                    attribute.name == "value")
+                {
+                    if (defaultEnumField.type == null)
+                    {
+                        fieldElement.SetEnabled(false);
+                    }
+                    else
+                    {
+                        ((EnumField)fieldElement).PopulateDataFromType(defaultEnumField.type);
+                        fieldElement.SetEnabled(true);
+                    }
+                }
+
+                else if (attributesOwner is EnumFlagsField defaultEnumFlagsField &&
+                         attribute.name == "value")
+                {
+                    if (defaultEnumFlagsField.type == null)
+                    {
+                        fieldElement.SetEnabled(false);
+                    }
+                    else
+                    {
+                        ((EnumFlagsField)fieldElement).PopulateDataFromType(defaultEnumFlagsField.type);
+                        fieldElement.SetEnabled(true);
+                    }
+                }
+                else if (!(fieldElement is ObjectField or TextField))
+                {
+                    return;
+                }
+            }
+
+            UpdateAttributeField(fieldElement, attribute, fieldValue);
+            styleRow.EnableInClassList(BuilderConstants.InspectorLocalStyleOverrideClassName, IsAttributeOverriden(attribute));
+
+            UpdateAttributeOverrideStyle(fieldElement);
+            UpdateFieldStatus(fieldElement);
+        }
+
+        internal virtual void UpdateAttributeOverrideStyle(VisualElement fieldElement)
+        {
+            var styleRow =
+                fieldElement.GetProperty(BuilderConstants.InspectorLinkedStyleRowVEPropertyName) as VisualElement;
+            var attribute =
+                fieldElement.GetProperty(BuilderConstants.InspectorLinkedAttributeDescriptionVEPropertyName) as
+                    UxmlAttributeDescription;
+            styleRow.EnableInClassList(BuilderConstants.InspectorLocalStyleOverrideClassName, IsAttributeOverriden(attribute));
+        }
+
+        /// <summary>
+        /// Refreshes the value and status of the specified field.
+        /// </summary>
+        /// <param name="fieldElement">The field to refresh</param>
+        /// <para name="attribute">The attribute related to the field</para>
+        /// <param name="value">The new value</param>
+        protected virtual void UpdateAttributeField(BindableElement fieldElement, UxmlAttributeDescription attribute, object value)
+        {
+            if (fieldElement.HasProperty(BuilderConstants.AttributeFieldFactoryVEPropertyName))
+            {
+                var fieldFactory = fieldElement.GetProperty(BuilderConstants.AttributeFieldFactoryVEPropertyName) as
+                        IBuilderUxmlAttributeFieldFactory;
+                fieldFactory.SetFieldValue(fieldElement, attributesOwner, uxmlDocument, attributesUxmlOwner, attribute, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets details about the value of the specified field.
+        /// </summary>
+        /// <param name="fieldElement">The target field.</param>
+        protected virtual FieldValueInfo GetValueInfo(BindableElement fieldElement)
+        {
+            var attribute = fieldElement.GetLinkedAttributeDescription();
+            var attributeIsOverriden = IsAttributeOverriden(attribute);
+            var valueSourceType = attributeIsOverriden ? FieldValueSourceInfoType.Inline : FieldValueSourceInfoType.Default;
+
+            return new FieldValueInfo()
+            {
+                type = FieldValueInfoType.UXMLAttribute,
+                name = attribute.name,
+                valueBinding = new FieldValueBindingInfo(FieldValueBindingInfoType.Constant),
+                valueSource = new FieldValueSourceInfo(valueSourceType)
+            };
+        }
+
+        /// <summary>
+        /// Updates the status of the specified field.
+        /// </summary>
+        /// <param name="fieldElement">The field to update.</param>
+        protected virtual void UpdateFieldStatus(BindableElement fieldElement)
+        {
+            var valueInfo = GetValueInfo(fieldElement);
+
+            fieldElement.SetProperty(BuilderConstants.InspectorFieldValueInfoVEPropertyName, valueInfo);
+            BuilderInspector.UpdateFieldStatusIconAndStyling(currentElement, fieldElement, valueInfo);
+            BuilderInspector.UpdateFieldTooltip(fieldElement, valueInfo);
+        }
+
+        /// <summary>
+        /// Notifies that the list of attributes has changed.
+        /// </summary>
+        protected virtual void NotifyAttributesChanged()
+        {
+        }
+
+        protected bool IsAttributeOverriden(UxmlAttributeDescription attribute)
+        {
+            return IsAttributeOverriden(attributesOwner, attributesUxmlOwner, attribute);
+        }
+
+        /// <summary>
+        /// Indicates whether the specified uxml attribute is defined in the uxml element related to the specified instance.
+        /// </summary>
+        /// <param name="attributesOwner">An instance of the uxml element that owns the uxml attribute</param>
+        /// <param name="attribute">The uxml attribute</param>
+        public static bool IsAttributeOverriden(VisualElement attributesOwner, UxmlAttributeDescription attribute)
+        {
+            return IsAttributeOverriden(attributesOwner, attributesOwner.GetVisualElementAsset(), attribute);
+        }
+
+        /// <summary>
+         /// Indicates whether the specified attribute is defined in the specified uxml element.
+         /// </summary>
+        /// <param name="attributeOwner">An instance created from the uxml element that owns the related xml attribute.</param>
+        /// <param name="attributeUxmlOwner">The uxml element that owns the uxml attribute to evaluate.</param>
+        /// <param name="attribute">The uxml attribute.</param>
+         /// <returns></returns>
+        public static bool IsAttributeOverriden(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            if (attributeOwner is VisualElement ve)
+            {
+                if (attributeUxmlOwner != null && attribute.name == "picking-mode")
+                {
+                    var veaAttributeValue = attributeUxmlOwner.GetAttributeValue(attribute.name);
+                    if (veaAttributeValue != null &&
+                        veaAttributeValue.ToLower() != attribute.defaultValueAsString.ToLower())
+                        return true;
+                }
+                else if (attribute.name == "name")
+                {
+                    if (!string.IsNullOrEmpty(ve.name))
+                        return true;
+                }
+                else if (BuilderAssetUtilities.HasAttributeOverrideInRootTemplate(ve, attribute.name))
+                {
+                    return true;
+                }
+            }
+
+            if (attributeUxmlOwner != null && attributeUxmlOwner.HasAttribute(attribute.name))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Resets the value of the specified attribute field to its default value.
+        /// </summary>
+        /// <param name="fieldElement">The field to reset.</param>
+        void ResetAttributeFieldToDefault(BindableElement fieldElement)
+        {
+            var styleRow =
+                fieldElement.GetProperty(BuilderConstants.InspectorLinkedStyleRowVEPropertyName) as VisualElement;
+            var attribute = fieldElement.GetLinkedAttributeDescription();
+
+            ResetAttributeFieldToDefault(fieldElement, attribute);
+
+            // Clear override.
+            styleRow.RemoveFromClassList(BuilderConstants.InspectorLocalStyleOverrideClassName);
+            var styleFields = styleRow.Query<BindableElement>().ToList();
+            foreach (var styleField in styleFields)
+            {
+                styleField.RemoveFromClassList(BuilderConstants.InspectorLocalStyleResetClassName);
+                styleField.RemoveFromClassList(BuilderConstants.InspectorLocalStyleOverrideClassName);
+            }
+        }
+
+        /// <summary>
+        /// Resets the value of the specified attribute field to its default value.
+        /// </summary>
+        /// <param name="fieldElement">The field to reset</param>
+        /// <para name="attribute">The attribute related to the field</para>
+        protected virtual void ResetAttributeFieldToDefault(BindableElement fieldElement, UxmlAttributeDescription attribute)
+        {
+            if (fieldElement.HasProperty(BuilderConstants.AttributeFieldFactoryVEPropertyName))
+            {
+                var fieldFactory = fieldElement.GetProperty(BuilderConstants.AttributeFieldFactoryVEPropertyName) as IBuilderUxmlAttributeFieldFactory;
+                fieldFactory.ResetFieldValue(fieldElement, attributesOwner, uxmlDocument, attributesUxmlOwner, attribute);
+            }
+        }
+
+        protected virtual void BuildAttributeFieldContextualMenu(DropdownMenu menu, VisualElement fieldElement)
+        {
+            menu.AppendAction(
+                BuilderConstants.ContextMenuUnsetMessage,
+                UnsetAttributeProperty,
+                action =>
+                {
+                    var fieldElement = action.userData as BindableElement;
+                    if (fieldElement == null)
+                        return DropdownMenuAction.Status.Disabled;
+
+                    var attributeName = fieldElement.bindingPath;
+                    var bindingProperty = GetRemapAttributeNameToCSProperty(attributesOwner, attributeName);
+                    var isAttributeOverrideAttribute =
+                        m_IsInTemplateInstance
+                        && BuilderAssetUtilities.HasAttributeOverrideInRootTemplate(m_CurrentElement,
+                            attributeName);
+
+                    return (attributesUxmlOwner != null && attributesUxmlOwner.HasAttribute(attributeName)) || isAttributeOverrideAttribute
+                        ? DropdownMenuAction.Status.Normal
+                        : DropdownMenuAction.Status.Disabled;
+                },
+                fieldElement);
+
+            menu.AppendAction(
+                BuilderConstants.ContextMenuUnsetAllMessage,
+                (action) => UnsetAllAttributes(),
+                action =>
+                {
+                    foreach (var attribute in m_Attributes)
+                    {
+                        if (attribute?.name == null)
+                            continue;
+
+                        if (m_IsInTemplateInstance
+                            && attribute.name == "name")
+                        {
+                            continue;
+                        }
+
+                        if (IsAttributeOverriden(attribute))
+                            return DropdownMenuAction.Status.Normal;
+                    }
+
+                    return DropdownMenuAction.Status.Disabled;
+                },
+                fieldElement);
+        }
+
+        internal void UnsetAllAttributes()
+        {
+            // Undo/Redo
+            if (undoEnabled)
+            {
+                Undo.RegisterCompleteObjectUndo(m_UxmlDocument,
+                    BuilderConstants.ChangeAttributeValueUndoMessage);
+            }
+
+            if (m_IsInTemplateInstance)
+            {
+                var parentTemplate = BuilderAssetUtilities.GetVisualElementRootTemplate(m_CurrentElement);
+                var parentTemplateAsset = parentTemplate.GetVisualElementAsset() as TemplateAsset;
+                var attributeOverrides =
+                    new List<TemplateAsset.AttributeOverride>(parentTemplateAsset.attributeOverrides);
+
+                foreach (var attributeOverride in attributeOverrides)
+                {
+                    if (attributeOverride.m_ElementName == m_CurrentElement.name)
+                    {
+                        parentTemplateAsset.RemoveAttributeOverride(attributeOverride.m_ElementName,
+                            attributeOverride.m_AttributeName);
+                    }
+                }
+
+                var builder = Builder.ActiveWindow;
+                var hierarchyView = builder.hierarchy.elementHierarchyView;
+                var selectionId = hierarchyView.GetSelectedItemId();
+
+                builder.OnEnableAfterAllSerialization();
+
+                hierarchyView.SelectItemById(selectionId);
+            }
+            else
+            {
+                foreach (var attribute in m_Attributes)
+                {
+                    if (attribute?.name == null)
+                        continue;
+
+                    // Unset value in asset.
+                    attributesUxmlOwner.RemoveAttribute(attribute.name);
+                }
+
+                var fields = fieldsContainer.Query<BindableElement>()
+                    .Where(e => !string.IsNullOrEmpty(e.bindingPath)).ToList();
+                foreach (var fieldElement in fields)
+                {
+                    // Reset UI value.
+                    ResetAttributeFieldToDefault(fieldElement);
+                    UpdateFieldStatus(fieldElement);
+                }
+
+                // Call Init();
+                CallInitOnElement();
+
+                // Notify of changes.
+                NotifyAttributesChanged();
+            }
+        }
+
+        private UxmlTraits GetCurrentElementTraits()
+        {
+            string uxmlTypeName = null;
+
+            if (m_CurrentElement is TemplateContainer)
+            {
+                uxmlTypeName = BuilderConstants.BuilderInspectorTemplateInstance;
+            }
+            else
+            {
+                uxmlTypeName = m_CurrentUxmlElement != null ? m_CurrentUxmlElement.fullTypeName : m_CurrentElement.GetType().ToString();
+            }
+
+            List<IUxmlFactory> factories = null;
+
+            // Workaround: TemplateContainer.UxmlTrais.Init() cannot be called multiple times. Otherwise, the source template is loaded again into the template container without clearing the previous content.
+            if (uxmlTypeName == BuilderConstants.UxmlInstanceTypeName || !VisualElementFactoryRegistry.TryGetValue(uxmlTypeName, out factories))
+            {
+                // We fallback on the VisualElement factory if we don't find any so
+                // we can update the modified attributes. This fixes the TemplateContainer
+                // factory not found.
+                VisualElementFactoryRegistry.TryGetValue(BuilderConstants.UxmlVisualElementTypeName,
+                    out factories);
+            }
+
+            if (factories == null)
+                return null;
+
+            return factories[0].GetTraits() as UxmlTraits;
+        }
+
+        internal void CallInitOnElement()
+        {
+            if (!callInitOnValueChange)
+                return;
+
+            var traits = GetCurrentElementTraits();
+
+            if (traits == null)
+                return;
+
+            var context = new CreationContext(null, null, m_UxmlDocument, m_CurrentElement);
+
+            traits.Init(m_CurrentElement, m_CurrentUxmlElement, context);
+        }
+
+        internal void CallInitOnTemplateChild(VisualElement visualElement, VisualElementAsset vea,
+           List<CreationContext.AttributeOverrideRange> attributeOverrides)
+        {
+            if (!callInitOnValueChange)
+                return;
+
+            var traits = GetCurrentElementTraits();
+
+            if (traits == null)
+                return;
+
+            var context = new CreationContext(null, attributeOverrides, null, null);
+
+            traits.Init(visualElement, vea, context);
+        }
+
+        void UnsetAttributeProperty(DropdownMenuAction action)
+        {
+            var fieldElement = action.userData as BindableElement;
+            UnsetAttributeProperty(fieldElement);
+
+            // When unsetting the type value for an enum field, we also need to clear the value field as well.
+            if (attributesOwner is EnumField && 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 = fieldsContainer.Query<EnumField>().Where(f => f.label == "Value").First();
+                UnsetAttributeProperty(valueField);
+            }
+            if (attributesOwner 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 = fieldsContainer.Query<EnumFlagsField>().Where(f => f.label == "Value").First();
+                UnsetAttributeProperty(valueField);
+            }
+        }
+
+        public void UnsetAttributeProperty(BindableElement fieldElement)
+        {
+            var attributeName = fieldElement.bindingPath;
+
+            // Undo/Redo
+            if (undoEnabled)
+            {
+                Undo.RegisterCompleteObjectUndo(m_UxmlDocument,
+                    BuilderConstants.ChangeAttributeValueUndoMessage);
+            }
+
+            // Unset value in asset.
+
+            if (m_IsInTemplateInstance)
+            {
+                var templateContainer = BuilderAssetUtilities.GetVisualElementRootTemplate(m_CurrentElement);
+                var templateAsset = templateContainer.GetVisualElementAsset() as TemplateAsset;
+
+                if (templateAsset != null)
+                {
+                    var builder = Builder.ActiveWindow;
+                    var hierarchyView = builder.hierarchy.elementHierarchyView;
+                    var selectionId = hierarchyView.GetSelectedItemId();
+
+                    templateAsset.RemoveAttributeOverride(m_CurrentElement.name, attributeName);
+
+                    builder.OnEnableAfterAllSerialization();
+
+                    hierarchyView.SelectItemById(selectionId);
+                }
+            }
+            else
+            {
+                attributesUxmlOwner.RemoveAttribute(attributeName);
+
+                // Reset UI value.
+                ResetAttributeFieldToDefault(fieldElement);
+
+                // Call Init();
+                CallInitOnElement();
+
+                // Notify of changes.
+                NotifyAttributesChanged();
+
+                UpdateFieldStatus(fieldElement);
+                Refresh();
+            }
+        }
+
+        void OnAttributeValueChange(ChangeEvent<string> evt)
+        {
+            var field = evt.elementTarget as TextField;
+            PostAttributeValueChange(field, evt.newValue);
+        }
+
+        internal void OnValidatedAttributeValueChange(ChangeEvent<string> evt, Regex regex, string message)
+        {
+            var field = evt.elementTarget as TextField;
+            if (!string.IsNullOrEmpty(evt.newValue) && !regex.IsMatch(evt.newValue))
+            {
+                Builder.ShowWarning(string.Format(message, field.label));
+                field.SetValueWithoutNotify(evt.previousValue);
+                evt.StopPropagation();
+                return;
+            }
+
+            OnAttributeValueChange(evt);
+        }
+
+        void OnAttributeValueChanged(VisualElement field, UxmlAttributeDescription attribute, object value, string uxmlValue)
+        {
+            var attributeType = attribute.GetType();
+            bool needRefresh = false;
+
+            var undoGroup = Undo.GetCurrentGroup();
+
+            if (value is UnityEngine.Object asset)
+            {
+                var assetType = attributeType.GetGenericArguments()[0];
+
+                if (!string.IsNullOrEmpty(uxmlValue) && !uxmlDocument.AssetEntryExists(uxmlValue, assetType))
+                    uxmlDocument.RegisterAssetEntry(uxmlValue, assetType, asset);
+            }
+            else if (attributeType.IsGenericType && !attributeType.GetGenericArguments()[0].IsEnum && attributeType.GetGenericArguments()[0] is Type)
+            {
+                if (attributesOwner is EnumField)
+                {
+                    // 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 = fieldsContainer.Query<EnumField>().Where(f => f.label == "Value").First();
+                    UnsetAttributeProperty(valueField);
+                    needRefresh = true;
+                }
+                else if (attributesOwner 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 = fieldsContainer.Query<EnumFlagsField>().Where(f => f.label == "Value").First();
+                    UnsetAttributeProperty(valueField);
+                    needRefresh = true;
+                }
+
+                // If the type of an object field changes, we have to refresh the inspector to ensure it has the correct type associated with it.
+                if (attributesOwner is ObjectField && attribute.name == "type")
+                {
+                    needRefresh = true;
+                }
+            }
+
+            PostAttributeValueChange(field, uxmlValue);
+
+            // Use the undo group of the field if it has one, otherwise use the current undo group
+            var fieldUndoGroup = (int?)field.GetProperty(UndoGroupPropertyKey);
+            Undo.CollapseUndoOperations(fieldUndoGroup ?? undoGroup);
+
+            if (needRefresh)
+                Refresh();
+        }
+
+        void PostAttributeValueChange(VisualElement field, string value)
+        {
+            var attributeName = (field as BindableElement).bindingPath;
+
+            // Undo/Redo
+            if (undoEnabled)
+            {
+                Undo.RegisterCompleteObjectUndo(m_UxmlDocument,
+                    BuilderConstants.ChangeAttributeValueUndoMessage);
+            }
+
+            // Set value in asset.
+            if (m_IsInTemplateInstance)
+            {
+                TemplateContainer templateContainerParent =
+                    BuilderAssetUtilities.GetVisualElementRootTemplate(m_CurrentElement);
+
+                if (templateContainerParent != null)
+                {
+                    var templateAsset = templateContainerParent.GetVisualElementAsset() as TemplateAsset;
+                    var currentVisualElementName = m_CurrentElement.name;
+
+                    if (!string.IsNullOrEmpty(currentVisualElementName))
+                    {
+                        templateAsset.SetAttributeOverride(currentVisualElementName, attributeName, value);
+
+                        var document = Builder.ActiveWindow.document;
+                        var rootElement = Builder.ActiveWindow.viewport.documentRootElement;
+
+                        var elementsToChange = templateContainerParent.Query<VisualElement>(currentVisualElementName);
+                        elementsToChange.ForEach(x =>
+                        {
+                            var templateVea =
+                                x.GetProperty(VisualTreeAsset.LinkedVEAInTemplatePropertyName) as VisualElementAsset;
+                            var attributeOverrides =
+                                BuilderAssetUtilities.GetAccumulatedAttributeOverrides(m_CurrentElement);
+                            CallInitOnTemplateChild(x, templateVea, attributeOverrides);
+                        });
+                    }
+                }
+            }
+            else
+            {
+                attributesUxmlOwner.SetAttribute(attributeName, value);
+
+                // Call Init();
+                CallInitOnElement();
+            }
+
+            // Mark field as overridden.
+            var styleRow = field.GetProperty(BuilderConstants.InspectorLinkedStyleRowVEPropertyName) as BuilderStyleRow;
+
+            if (styleRow != null)
+            {
+                styleRow.AddToClassList(BuilderConstants.InspectorLocalStyleOverrideClassName);
+
+                var styleFields = styleRow.Query<BindableElement>().ToList();
+
+                foreach (var styleField in styleFields)
+                {
+                    styleField.RemoveFromClassList(BuilderConstants.InspectorLocalStyleResetClassName);
+                    if (attributeName == styleField.bindingPath)
+                    {
+                        styleField.AddToClassList(BuilderConstants.InspectorLocalStyleOverrideClassName);
+                    }
+                    else if (!string.IsNullOrEmpty(styleField.bindingPath) &&
+                             attributeName != styleField.bindingPath &&
+                             !styleField.ClassListContains(BuilderConstants.InspectorLocalStyleOverrideClassName))
+                    {
+                        styleField.AddToClassList(BuilderConstants.InspectorLocalStyleResetClassName);
+                    }
+                }
+            }
+
+            // Notify of changes.
+            NotifyAttributesChanged();
+
+            if (styleRow != null)
+            {
+                UpdateFieldStatus(field as BindableElement);
+            }
+        }
+
+        void SetUndoGroup(VisualElement field)
+        {
+            Undo.IncrementCurrentGroup();
+            field?.SetProperty(UndoGroupPropertyKey, Undo.GetCurrentGroup());
+        }
+
+        void UnsetUndoGroup(VisualElement field)
+        {
+            Undo.IncrementCurrentGroup();
+            field?.SetProperty(UndoGroupPropertyKey, null);
+        }
+    }
+}
diff --git a/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlAssetAttributeField.cs b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlAssetAttributeField.cs
new file mode 100644
index 0000000000..f282d0977e
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlAssetAttributeField.cs
@@ -0,0 +1,165 @@
+// 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 UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+using Object = UnityEngine.Object;
+
+namespace Unity.UI.Builder
+{
+    class BuilderObjectField : ObjectField
+    {
+        static readonly string displayUssClassName = "unity-object-field-display";
+        static readonly string displayIconUssClassName = displayUssClassName + "__icon";
+        static readonly string displayLabelUssClassName = displayUssClassName + "__label";
+        private NonUnityObjectValue m_NonUnityObjectValue;
+        private Image m_ObjectIcon;
+        private Label m_ObjectLabel;
+
+        // To be able to change the value to null, we need to set the value of the object field to a non null value first.
+        public class NonUnityObjectValue : ScriptableObject
+        {
+            public object data { get; set;  }
+        }
+
+        public BuilderObjectField()
+        {
+            m_ObjectIcon = this.Q<Image>(classes: displayIconUssClassName);
+            m_ObjectLabel = this.Q<Label>(classes: displayLabelUssClassName);
+            RegisterCallback<DetachFromPanelEvent>((e) =>
+            {
+                if (m_NonUnityObjectValue != null)
+                    ScriptableObject.DestroyImmediate(m_NonUnityObjectValue);
+            });
+        }
+
+        public void SetNonUnityObject(object obj)
+        {
+            var valueChanged = m_NonUnityObjectValue == null || m_NonUnityObjectValue.data == null || !EqualityComparer<object>.Default.Equals(m_NonUnityObjectValue.data, obj);
+
+            if (valueChanged)
+            {
+                if (m_NonUnityObjectValue == null)
+                    m_NonUnityObjectValue = ScriptableObject.CreateInstance<NonUnityObjectValue>();
+                m_NonUnityObjectValue.data = obj;
+                SetValueWithoutNotify(m_NonUnityObjectValue);
+                UpdateDisplay();
+            }
+        }
+
+        public void SetObjectWithoutNotify(object obj)
+        {
+            if (obj == null || obj is Object)
+            {
+                SetValueWithoutNotify(obj as Object);
+            }
+            else
+            {
+                SetNonUnityObject(obj);
+            }
+        }
+
+        public override void SetValueWithoutNotify(Object obj)
+        {
+            if (m_NonUnityObjectValue != null && m_NonUnityObjectValue != obj)
+                m_NonUnityObjectValue.data = null;
+            base.SetValueWithoutNotify(obj);
+        }
+
+        internal override void UpdateDisplay()
+        {
+            if (m_NonUnityObjectValue != null && m_NonUnityObjectValue.data != null)
+            {
+                var type = m_NonUnityObjectValue.data.GetType();
+                var objName = BuilderNameUtilities.GetNameByReflection(m_NonUnityObjectValue.data);
+
+                m_ObjectIcon.image = AssetPreview.GetMiniTypeThumbnail(typeof(DefaultAsset));
+                m_ObjectLabel.text = $"{objName} ({type.Name})";
+            }
+            else
+            {
+                base.UpdateDisplay();
+            }
+        }
+    }
+
+    internal class BuilderUxmlAssetAttributeFieldFactory : IBuilderUxmlAttributeFieldFactory
+    {
+        public bool CanCreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            var attributeType = attribute.GetType();
+
+            return (attributeType.IsGenericType && attributeType.GetGenericTypeDefinition() == typeof(UxmlAssetAttributeDescription<>));
+        }
+
+        public VisualElement CreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute, Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange)
+        {
+            var fieldLabel = BuilderNameUtilities.ConvertDashToHuman(attribute.name);
+            var field = new BuilderObjectField();
+            var attributeType = attribute.GetType();
+            var assetType = attributeType.GetGenericArguments()[0];
+            field.objectType = assetType;
+
+            field.label = fieldLabel;
+
+            field.RegisterValueChangedCallback((evt) =>
+            {
+                NotifyValueChanged(evt, field, attributeOwner, attributeUxmlOwner, attribute, ValueToUxml.Convert(evt.newValue), onValueChange);
+            });
+            return field;
+        }
+
+        public void SetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute, object value)
+        {
+            var objField = field as BuilderObjectField;
+
+            if (value != null && value is not Object)
+            {
+                objField.SetNonUnityObject(value);
+            }
+            else
+            {
+                if (value == null)
+                {
+                    if (attributeUxmlOwner != null && attribute.TryGetValueFromBagAsString(attributeUxmlOwner, CreationContext.Default, out var attrValue))
+                    {
+                        // Asset wasn't loaded correctly, most likely due to an invalid path. Show the missing reference.
+                        value = uxmlDocument.GetAsset(attrValue, objField.objectType);
+                    }
+                }
+                objField.SetValueWithoutNotify(value as Object);
+            }
+        }
+
+        public void ResetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            (field as ObjectField).SetValueWithoutNotify(null);
+        }
+
+        protected void NotifyValueChanged(ChangeEvent<UnityEngine.Object> evt
+            , ObjectField field
+            , object attributeOwner
+            , UxmlAsset attributeUxmlOwner
+            , UxmlAttributeDescription attribute
+            , string uxmlValue
+            , Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange)
+        {
+            var assetPath = AssetDatabase.GetAssetPath(evt.newValue);
+            if (BuilderAssetUtilities.IsBuiltinPath(assetPath))
+            {
+                Builder.ShowWarning(BuilderConstants.BuiltInAssetPathsNotSupportedMessageUxml);
+
+                // Revert the change.
+                field.SetValueWithoutNotify(evt.previousValue);
+                return;
+            }
+
+            onValueChange?.Invoke(field, attribute, evt.newValue, uxmlValue);
+        }
+    }
+}
diff --git a/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlAttributeFieldFactory.cs b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlAttributeFieldFactory.cs
new file mode 100644
index 0000000000..a4db24d8b9
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlAttributeFieldFactory.cs
@@ -0,0 +1,181 @@
+// 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 Unity.UI.Builder
+{
+    /// <summary>
+    /// Creates a ui field based on uxml attributes. 
+    /// </summary>
+    internal interface IBuilderUxmlAttributeFieldFactory
+    {
+        /// <summary>
+        /// Indicates whether this factory can create a field for the specified uxml attribute.
+        /// </summary>
+        /// <param name="attributeOwner">An instance created from the uxml element that owns the related xml attribute.</param>
+        /// <param name="attributeUxmlOwner">The uxml element that owns the uxml attribute related to evaluate.</param>
+        /// <param name="attribute">The uxml attribute to evaluate.</param>
+        /// <returns>Return true if the factory can create field for the specified attribute.</returns>
+        bool CanCreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute);
+        
+        /// <summary>
+        /// Creates a ui field based on uxml attributes.
+        /// </summary>
+        /// <param name="attributeOwner">An instance created from the uxml element that owns the related xml attribute.</param>
+        /// <param name="attributeUxmlOwner">The uxml element that owns the uxml attribute related to field to create.</param>
+        /// <param name="attribute">The uxml attribute.</param>
+        /// <param name="onValueChange">The callback to invoke whenever the value of the create field changes.</param>
+        /// <returns>The field created for the specified uxml attribute.</returns>
+        VisualElement CreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute, Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange);
+        
+        /// <summary>
+        /// Sets the value of the specified field created from the specified uxml attribute.
+        /// </summary>
+        /// <param name="field">The field to update</param>
+        /// <param name="attributeOwner">An instance created from the uxml element that owns the related xml attribute.</param>
+        /// <param name="uxmlDocument">The uxml document that contains the uxml attribute owner.</param>
+        /// <param name="attributeUxmlOwner">The uxml element that owns the uxml attribute related to field to update.</param>
+        /// <param name="attribute">The uxml attribute related to the field to update.</param>
+        /// <param name="value">The new value to set</param>
+        void SetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute, object value);
+        
+        /// <summary>
+        /// Resets the value of the specified field created from the specified uxml attribute to its default value.
+        /// </summary>
+        /// <param name="field">The field to reset.</param>
+        /// <param name="attributeOwner">An instance created from the uxml element that owns the related xml attribute.</param>
+        /// <param name="uxmlDocument">The uxml document that contains the uxml attribute owner.</param>
+        /// <param name="attributeUxmlOwner">The uxml element that owns the uxml attribute related to field to reset.</param>
+        /// <param name="attribute">The uxml attribute related to the field to reset.</param>
+        void ResetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute);
+    }
+
+    /// <summary>
+    /// Base factory to create a ui field based on a TypedUxmlAttributeDescription .
+    /// </summary>
+    /// <typeparam name="T">The value type of TypedUxmlAttributeDescription for which this factory can create fields</typeparam>
+    /// <typeparam name="TFieldType">The class of fields created by this factory</typeparam>
+    internal abstract class BuilderTypedUxmlAttributeFieldFactoryBase<T, TFieldType> : IBuilderUxmlAttributeFieldFactory where TFieldType : BaseField<T>
+    {
+        public virtual bool CanCreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            return attribute is TypedUxmlAttributeDescription<T>;
+        }
+
+        /// <summary>
+        /// Instantiates a ui field based on the specified uxml attribute.
+        /// </summary>
+        /// <param name="attributeOwner">An instance created from the uxml element that owns the related xml attribute.</param>
+        /// <param name="attributeUxmlOwner">The uxml element that owns the uxml attribute related to field to instantiate.</param>
+        /// <param name="attribute">The uxml attribute.</param>
+        /// <returns></returns>
+        protected abstract TFieldType InstantiateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute);
+
+        public VisualElement CreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute, Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange)
+        {
+            var fieldLabel = BuilderNameUtilities.ConvertDashToHuman(attribute.name);
+            var field = InstantiateField(attributeOwner, attributeUxmlOwner, attribute);
+
+            field.label = fieldLabel;
+
+            if (attribute.name.Equals("multiline") && attributeOwner is TextField)
+            {
+                field.RegisterValueChangedCallback(evt =>
+                {
+                    OnMultilineToggleValueChange(evt, attributeUxmlOwner);
+                    NotifyValueChanged(evt, field, attributeOwner, attributeUxmlOwner, attribute, ValueToUxml.Convert(evt.newValue), onValueChange);
+                });
+
+                return field;
+            }
+
+            field.RegisterValueChangedCallback((evt) =>
+            {
+                NotifyValueChanged(evt, field, attributeOwner, attributeUxmlOwner, attribute, ValueToUxml.Convert(evt.newValue), onValueChange);
+            });
+            return field;
+        }
+
+        public virtual void SetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute, object value)
+        {
+            (field as TFieldType).SetValueWithoutNotify((T)value);
+        }
+
+        public virtual void ResetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            var typedAttribute = attribute as TypedUxmlAttributeDescription<T>;
+            (field as TFieldType).SetValueWithoutNotify(typedAttribute.defaultValue);
+        }
+
+        /// <summary>
+        /// Notifies that the value of the specified field has changed.
+        /// </summary>
+        /// <param name="evt">The event emitted when the value of the field changed.</param>
+        /// <param name="field">The field created by this factory of which value has changed.</param>
+        /// <param name="attributeOwner">An instance created from the uxml element that owns the related xml attribute.</param>
+        /// <param name="attributeUxmlOwner">The uxml element that owns the uxml attribute related to the field.</param>
+        /// <param name="attribute">The uxml attribute edited by the target field.</param>
+        /// <param name="uxmlValue">The new value formatted to uxml.</param>
+        /// <param name="onValueChange">The callback to invoke.</param>
+        protected virtual void NotifyValueChanged(ChangeEvent<T> evt, TFieldType field
+            , object attributeOwner
+            , UxmlAsset attributeUxmlOwner
+            , UxmlAttributeDescription attribute
+            , string uxmlValue
+            , Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange)
+        {
+            onValueChange?.Invoke(field, attribute, evt.newValue, uxmlValue);
+        }
+
+        void OnMultilineToggleValueChange(ChangeEvent<T> evt, UxmlAsset attributeUxmlOwner)
+        {
+            if (evt.target is not Toggle target)
+                return;
+            if (evt is not ChangeEvent<bool> boolEvt)
+                return;
+
+            var valueFieldInInspector = target?.GetFirstAncestorOfType<BuilderInspector>().Query<TextField>().Where(x => x.bindingPath is "value").First();
+            if (valueFieldInInspector == null)
+                return;
+
+            valueFieldInInspector.multiline = boolEvt.newValue;
+            valueFieldInInspector.EnableInClassList(BuilderConstants.InspectorMultiLineTextFieldClassName, boolEvt.newValue);
+            if (!boolEvt.newValue)
+                return;
+
+            // when multiline set, inspector field does not have \n, but its value attribute does
+            // set inspector field value to the value attribute
+            var valueAttributeString = attributeUxmlOwner.GetAttributeValue("value");
+            valueFieldInInspector.SetValueWithoutNotify(valueAttributeString);
+        }
+    }
+
+    /// <summary>
+    /// Creates a ui field based on a TypedUxmlAttributeDescription.
+    /// </summary>
+    /// <typeparam name="T">The value type of TypedUxmlAttributeDescription for which this factory can create fields.</typeparam>
+    /// <typeparam name="TFieldType">The class of fields created by this factory.</typeparam>
+    internal class BuilderTypedUxmlAttributeFieldFactory<T, TFieldType> : BuilderTypedUxmlAttributeFieldFactoryBase<T, TFieldType> where TFieldType : BaseField<T>, new ()
+    {
+        protected override TFieldType InstantiateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            return new TFieldType();
+        }
+    }
+
+    internal sealed class BuilderDefaultUxmlAttributeFieldFactory : BuilderTypedUxmlAttributeFieldFactory<string, TextField>
+    {
+        public override bool CanCreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            return true;
+        }
+
+        public override void ResetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            (field as TextField).SetValueWithoutNotify(string.Empty);
+        }
+    }
+}
diff --git a/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlAttributeFieldFactoryRegistry.cs b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlAttributeFieldFactoryRegistry.cs
new file mode 100644
index 0000000000..efee587dd9
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlAttributeFieldFactoryRegistry.cs
@@ -0,0 +1,98 @@
+// 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;
+using UnityEditor.UIElements;
+
+namespace Unity.UI.Builder
+{
+    /// <summary>
+    /// Manages the list of IUxmlAttributeFieldFactories.
+    /// </summary>
+    internal static class BuilderUxmlAttributeFieldFactoryRegistry
+    {
+        static List<IBuilderUxmlAttributeFieldFactory> s_Factories;
+
+        /// <summary>
+        /// The list of all registered factories.
+        /// </summary>
+        public static List<IBuilderUxmlAttributeFieldFactory> factories
+        {
+            get
+            {
+                if (s_Factories == null)
+                {
+                    s_Factories = new List<IBuilderUxmlAttributeFieldFactory>();
+                    RegisterDefaultFactories();
+                }
+                return s_Factories;
+            }
+        }
+
+        static void RegisterDefaultFactories()
+        {
+            // The order in which factories are added is important because we can have two factories that match a specific
+            // attribute. In this case, the factory added after will be selected. This is why the default factory being the less
+            // specific of all is added first.
+            RegisterFactory(new BuilderDefaultUxmlAttributeFieldFactory());
+            RegisterFactory(new BuilderTypedUxmlAttributeFieldFactory<float, FloatField>());
+            RegisterFactory(new BuilderTypedUxmlAttributeFieldFactory<double, DoubleField>());
+            RegisterFactory(new BuilderTypedUxmlAttributeFieldFactory<long, LongField>());
+            RegisterFactory(new BuilderTypedUxmlAttributeFieldFactory<ulong, UnsignedLongField>());
+            RegisterFactory(new BuilderTypedUxmlAttributeFieldFactory<uint, UnsignedIntegerField>());
+            RegisterFactory(new BuilderTypedUxmlAttributeFieldFactory<bool, Toggle>());
+            RegisterFactory(new BuilderUxmlIntAttributeFieldFactory());
+            RegisterFactory(new BuilderUxmlStringAttributeFieldFactory());
+            RegisterFactory(new BuilderTypedUxmlAttributeFieldFactory<Color, ColorField>());
+            RegisterFactory(new BuilderTypedUxmlAttributeFieldFactory<UnityEngine.Object, ObjectField>());
+            RegisterFactory(new BuilderUxmlEnumAttributeFieldFactory());
+            RegisterFactory(new BuilderUxmlTypeAttributeFieldFactory());
+            RegisterFactory(new BuilderUxmlAssetAttributeFieldFactory());
+            RegisterFactory(new BuilderTypedUxmlAttributeFieldFactory<Hash128, Hash128Field>());
+        }
+
+        /// <summary>
+        /// Registers the specified factory of fields to uxml attributes.
+        /// </summary>
+        /// <param name="factory">The factory to register.</param>
+        /// <exception cref="ArgumentException">Thrown if the factory is null or already registered.</exception>
+        public static void RegisterFactory(IBuilderUxmlAttributeFieldFactory factory)
+        {
+            if (factory == null)
+                throw new ArgumentException("Cannot add a null factory");
+
+            if (factories.Contains(factory))
+                throw new ArgumentException("The factory is already registered");
+
+            factories.Add(factory);
+        }
+
+        /// <summary>
+        /// Returns the factory that can create a UI field for the specified UXML attribute.
+        /// </summary>
+        /// <param name="attributeOwner">An instance created from the UXML element that owns the related UXML attribute.</param>
+        /// <param name="attributeUxmlOwner">The UXML element that owns the UXML attribute related to the field factory to seek.</param>
+        /// <param name="attribute">The UXML attribute.</param>
+        /// <returns>The factory found.</returns>
+        public static IBuilderUxmlAttributeFieldFactory GetFactory(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            // Traverse factories from last to first because we can have two factories that match a specific attribute but we want
+            // the one with the most specific conditions (override) to win. We ensure this factory is added after the
+            // less specific one.
+            for (var i = factories.Count - 1; i > 0; i--)
+            {
+                var factory = factories[i];
+
+                if (factory.CanCreateField(attributeOwner, attributeUxmlOwner, attribute))
+                {
+                    return factory;
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlEnumAttributeField.cs b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlEnumAttributeField.cs
new file mode 100644
index 0000000000..3288738ba8
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlEnumAttributeField.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.Linq;
+using System.Reflection;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Unity.UI.Builder
+{
+    internal class BuilderUxmlEnumAttributeFieldFactory : BuilderTypedUxmlAttributeFieldFactoryBase<Enum, BaseField<Enum>>
+    {
+        public override bool CanCreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            var attributeType = attribute.GetType();
+            return (attributeType.IsGenericType && attributeType.GetGenericArguments()[0].IsEnum);
+        }
+
+        protected override BaseField<Enum> InstantiateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            var attributeType = attribute.GetType();
+            var propInfo = attributeType.GetProperty("defaultValue");
+            var defaultEnumValue = propInfo.GetValue(attribute, null) as Enum;
+
+            if (defaultEnumValue.GetType().GetCustomAttribute<FlagsAttribute>() == null)
+            {
+                // Create and initialize the EnumField.
+                var uiField = new EnumField();
+                uiField.Init(defaultEnumValue);
+                return uiField;
+            }
+            else
+            {
+                // Create and initialize the EnumFlagsField.
+                var uiField = new EnumFlagsField();
+                uiField.Init(defaultEnumValue);
+                return uiField;
+            }
+        }
+
+        public override void SetFieldValue(VisualElement field
+            , object attributeOwner
+            , VisualTreeAsset uxmlDocument
+            , UxmlAsset attributeUxmlOwner
+            , UxmlAttributeDescription attribute, object value)
+        {
+            var attributeType = attribute.GetType();
+            var propInfo = attributeType.GetProperty("defaultValue");
+            var defaultEnumValue = propInfo.GetValue(attribute, null) as Enum;
+            string enumAttributeValueStr;
+            VisualElement parentTemplate = null;
+            VisualElement veAttributeOwner = null;
+
+            if (attributeOwner is VisualElement)
+            {
+                veAttributeOwner = attributeOwner as VisualElement;
+                parentTemplate = BuilderAssetUtilities.GetVisualElementRootTemplate(veAttributeOwner);
+            }
+
+            // In a template instance
+            if (parentTemplate != null)
+            {
+                var parentTemplateAsset = parentTemplate.GetVisualElementAsset() as TemplateAsset;
+                var fieldAttributeOverride = parentTemplateAsset.attributeOverrides.FirstOrDefault(x =>
+                    x.m_AttributeName == attribute.name && x.m_ElementName == veAttributeOwner.name);
+
+                enumAttributeValueStr = fieldAttributeOverride.m_ElementName == veAttributeOwner.name ? fieldAttributeOverride.m_Value : value.ToString();
+            }
+            else
+            {
+                enumAttributeValueStr = attributeUxmlOwner?.GetAttributeValue(attribute.name);
+            }
+
+            // Set the value from the UXML attribute.
+            if (!string.IsNullOrEmpty(enumAttributeValueStr))
+            {
+                try
+                {
+                    value = Enum.Parse(defaultEnumValue.GetType(), enumAttributeValueStr, true) as Enum;
+                }
+                catch (ArgumentException exception)
+                {
+                    Debug.LogException(exception);
+                    value = defaultEnumValue;
+                }
+                catch (OverflowException exception)
+                {
+                    Debug.LogException(exception);
+                    value = defaultEnumValue;
+                }
+            }
+
+            base.SetFieldValue(field, attributeOwner, uxmlDocument, attributeUxmlOwner, attribute, value);
+        }
+
+        public override void ResetFieldValue(VisualElement field
+            , object attributeOwner
+            , VisualTreeAsset uxmlDocument
+            , UxmlAsset attributeUxmlOwner
+            , UxmlAttributeDescription attribute)
+        {
+            var attributeType = attribute.GetType();
+            var propInfo = attributeType.GetProperty("defaultValue");
+            var defaultEnumValue = propInfo.GetValue(attribute, null) as Enum;
+            var uiField = field as BaseField<Enum>;
+
+            uiField.SetValueWithoutNotify(defaultEnumValue);
+        }
+    }
+}
diff --git a/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlIntAttributeField.cs b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlIntAttributeField.cs
new file mode 100644
index 0000000000..b7edd387bb
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlIntAttributeField.cs
@@ -0,0 +1,151 @@
+// 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;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Unity.UI.Builder
+{
+    internal class BuilderUxmlIntAttributeFieldFactory : BuilderTypedUxmlAttributeFieldFactoryBase<int, BaseField<int>>
+    {
+        protected override BaseField<int> InstantiateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            if (attribute.name.Equals("value") && attributeOwner is LayerField)
+            {
+                return new LayerField();
+            }
+
+            if (attribute.name.Equals("value") && attributeOwner is LayerMaskField)
+            {
+                return new LayerMaskField();
+            }
+
+            if (attribute.name.Equals("fixed-item-height") &&
+                     attributeOwner is BaseVerticalCollectionView)
+            {
+                var uiField = new IntegerField(BuilderNameUtilities.ConvertDashToHuman(attribute.name));
+                uiField.isDelayed = true;
+                uiField.RegisterCallback<InputEvent>(OnFixedHeightValueChangedImmediately);
+                uiField.labelElement.RegisterCallback<PointerMoveEvent>(OnFixedHeightValueChangedImmediately);
+                return uiField;
+            }
+
+            return new IntegerField();
+        }
+
+        public override void SetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute, object value)
+        {
+            if (field is IntegerField && attribute.name.Equals("fixed-item-height") && attributeOwner is BaseVerticalCollectionView)
+            {
+                var styleRow = field.GetProperty(BuilderConstants.InspectorLinkedStyleRowVEPropertyName) as BuilderStyleRow;
+                styleRow?.contentContainer.AddToClassList(BuilderConstants.InspectorFixedItemHeightFieldClassName);
+            }
+
+            if (field is LayerField layerField)
+            {
+                var layerFieldAttributeOwner = attributeOwner as LayerField;
+
+                layerField.SetValueWithoutNotify(layerFieldAttributeOwner.value);
+            }
+            else if (field is LayerMaskField layerMaskField)
+            {
+                var layerMaskFieldAttributeOwner = attributeOwner as LayerMaskField;
+
+                layerMaskField.SetValueWithoutNotify(layerMaskFieldAttributeOwner.value);
+            }
+            else
+            {
+                if (value is float)
+                    value = Convert.ToInt32(value);
+                base.SetFieldValue(field, attributeOwner, uxmlDocument, attributeUxmlOwner, attribute, value);
+            }
+        }
+
+        void OnFixedItemHeightValueChanged(ChangeEvent<int> evt, UxmlAttributeDescription attribute, Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange)
+        {
+            var field = evt.target as IntegerField;
+            if (evt.newValue < 1)
+            {
+                SetNegativeFixedItemHeightHelpBoxEnabled(true,field);
+                field.SetValueWithoutNotify(1);
+                onValueChange?.Invoke(field, attribute, field.value, ValueToUxml.Convert(field.value));
+                return;
+            }
+
+            onValueChange?.Invoke(field, attribute, evt.newValue, ValueToUxml.Convert(evt.newValue));
+        }
+
+        void OnFixedHeightValueChangedImmediately(InputEvent evt)
+        {
+            var field = evt.target as BaseField<int>;
+            if (field == null)
+                return;
+
+            var newValue = evt.newData;
+            var valueResolved = UINumericFieldsUtils.TryConvertStringToLong(newValue, out var v);
+            var resolvedValue = valueResolved ? Mathf.ClampToInt(v) : field.value;
+
+            SetNegativeFixedItemHeightHelpBoxEnabled((newValue.Length != 0 && (resolvedValue < 1 || newValue.Equals("-"))), field);
+        }
+
+        void OnFixedHeightValueChangedImmediately(PointerMoveEvent evt)
+        {
+            if (evt.target is not Label labelElement)
+                return;
+
+            var field = labelElement.parent as TextInputBaseField<int>;
+            if (field == null)
+                return;
+            var valueResolved = UINumericFieldsUtils.TryConvertStringToLong(field.text, out var v);
+            var resolvedValue = valueResolved ? Mathf.ClampToInt(v) : field.value;
+
+            SetNegativeFixedItemHeightHelpBoxEnabled((resolvedValue < 1 || field.text.ToCharArray()[0].Equals('-')), field);
+        }
+
+        void SetNegativeFixedItemHeightHelpBoxEnabled(bool enabled, BaseField<int> field)
+        {
+            var negativeWarningHelpBox = field.parent.Q<UnityEngine.UIElements.HelpBox>();
+            if (enabled)
+            {
+                if (negativeWarningHelpBox == null)
+                {
+                    negativeWarningHelpBox = new UnityEngine.UIElements.HelpBox(
+                        L10n.Tr(BuilderConstants.HeightIntFieldValueCannotBeNegativeMessage), HelpBoxMessageType.Warning);
+                    field.parent.Add(negativeWarningHelpBox);
+                    negativeWarningHelpBox.EnableInClassList(BuilderConstants.InspectorShownNegativeWarningMessageClassName, true);
+                }
+                else
+                {
+                    negativeWarningHelpBox.EnableInClassList(BuilderConstants.InspectorShownNegativeWarningMessageClassName, true);
+                    negativeWarningHelpBox.EnableInClassList(BuilderConstants.InspectorHiddenNegativeWarningMessageClassName, false);
+                }
+                return;
+            }
+
+            if (negativeWarningHelpBox == null)
+                return;
+            negativeWarningHelpBox.EnableInClassList(BuilderConstants.InspectorHiddenNegativeWarningMessageClassName, true);
+            negativeWarningHelpBox.EnableInClassList(BuilderConstants.InspectorShownNegativeWarningMessageClassName, false);
+        }
+
+        protected override void NotifyValueChanged(ChangeEvent<int> evt, BaseField<int> field
+            , object attributeOwner
+            , UxmlAsset attributeUxmlOwner
+            , UxmlAttributeDescription attribute
+            , string uxmlValue
+            , Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange)
+        {
+            if (attribute.name.Equals("fixed-item-height") &&
+                attributeOwner is BaseVerticalCollectionView)
+            {
+                OnFixedItemHeightValueChanged(evt, attribute, onValueChange);
+                return;
+            }
+            onValueChange?.Invoke(field, attribute, evt.newValue, uxmlValue);
+        }
+    }
+}
diff --git a/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlStringAttributeField.cs b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlStringAttributeField.cs
new file mode 100644
index 0000000000..3bbe2f73f2
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlStringAttributeField.cs
@@ -0,0 +1,242 @@
+// 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 System.Text.RegularExpressions;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace Unity.UI.Builder
+{
+    internal sealed class BuilderUxmlStringAttributeFieldFactory :  IBuilderUxmlAttributeFieldFactory
+    {
+        public bool CanCreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            return attribute is UxmlStringAttributeDescription;
+        }
+
+        static bool CheckNullOrEmptyTextChange(ChangeEvent<string> evt)
+        {
+            // Ignore change if both texts are null or empty
+            return !(string.IsNullOrEmpty(evt.newValue) && string.IsNullOrEmpty(evt.previousValue));
+        }
+
+        public VisualElement CreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute, Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange)
+        {
+            var fieldLabel = BuilderNameUtilities.ConvertDashToHuman(attribute.name);
+
+            if (attribute.name.Equals("value") && attributeOwner is EnumField enumField)
+            {
+                var uiField = new EnumField(fieldLabel);
+
+                if (null != enumField.value)
+                    uiField.Init(enumField.value, enumField.includeObsoleteValues);
+                else
+                    uiField.SetValueWithoutNotify(null);
+                uiField.RegisterValueChangedCallback(evt =>
+                {
+                    if (evt.leafTarget == uiField.labelElement)
+                        return;
+                    InvokeValueChangedCallback(uiField, attribute, evt.newValue, ValueToUxml.Convert(uiField.value), onValueChange);
+                });
+
+                return uiField;
+            }
+
+            if (attribute.name.Equals("value") && attributeOwner is EnumFlagsField enumFlagsField)
+            {
+                var uiField = new EnumFlagsField(fieldLabel);
+
+                if (null != enumFlagsField.value)
+                    uiField.Init(enumFlagsField.value, enumFlagsField.includeObsoleteValues);
+                else
+                    uiField.SetValueWithoutNotify(null);
+                uiField.RegisterValueChangedCallback(evt =>
+                {
+                    if (evt.leafTarget == uiField.labelElement)
+                        return;
+                    InvokeValueChangedCallback(uiField, attribute, evt.newValue, ValueToUxml.Convert(uiField.value), onValueChange);
+                });
+
+                return uiField;
+            }
+
+            if (attribute.name.Equals("value") && attributeOwner is TagField)
+            {
+                var uiField = new TagField(fieldLabel);
+                uiField.RegisterValueChangedCallback(evt =>
+                {
+                    if (evt.leafTarget == uiField.labelElement)
+                        return;
+                    InvokeValueChangedCallback(uiField, attribute, evt.newValue, ValueToUxml.Convert(uiField.value), onValueChange);
+                });
+
+                return uiField;
+            }
+
+            if (attribute.name.Equals("value") && attributeOwner is TextField { multiline: true })
+            {
+                var uiField = new TextField(fieldLabel);
+                uiField.RegisterValueChangedCallback(evt =>
+                {
+                    if (evt.leafTarget == uiField.labelElement || !CheckNullOrEmptyTextChange(evt))
+                        return;
+                    InvokeValueChangedCallback(uiField, attribute, evt.newValue, ValueToUxml.Convert(uiField.value), onValueChange);
+                });
+                uiField.multiline = true;
+                uiField.AddToClassList(BuilderConstants.InspectorMultiLineTextFieldClassName);
+                return uiField;
+            }
+            else
+            {
+                var uiField = new TextField(fieldLabel);
+                if (attribute.name.Equals("name") || attribute.name.Equals("view-data-key"))
+                    uiField.RegisterValueChangedCallback(evt =>
+                    {
+                        if (evt.leafTarget == uiField.labelElement || !CheckNullOrEmptyTextChange(evt))
+                            return;
+                        OnValidatedAttributeValueChange(evt, BuilderNameUtilities.attributeRegex,
+                            BuilderConstants.AttributeValidationSpacialCharacters, attribute, onValueChange);
+                    });
+                else if (attributeOwner is VisualElement && attribute.name.Equals("binding-path") || attribute.name.Equals("data-source-path"))
+                    uiField.RegisterValueChangedCallback(evt =>
+                    {
+                        if (evt.leafTarget == uiField.labelElement || !CheckNullOrEmptyTextChange(evt))
+                            return;
+                        OnValidatedAttributeValueChange(evt, BuilderNameUtilities.bindingPathAttributeRegex,
+                            BuilderConstants.BindingPathAttributeValidationSpacialCharacters, attribute, onValueChange);
+                    });
+                else
+                {
+                    uiField.RegisterValueChangedCallback(evt =>
+                    {
+                        if (evt.leafTarget == uiField.labelElement || !CheckNullOrEmptyTextChange(evt))
+                            return;
+                        InvokeValueChangedCallback(uiField, attribute, evt.newValue, ValueToUxml.Convert(uiField.value), onValueChange);
+                    });
+                }
+
+                if (attribute.name.Equals("text") || attribute.name.Equals("label"))
+                {
+                    uiField.multiline = true;
+                    uiField.AddToClassList(BuilderConstants.InspectorMultiLineTextFieldClassName);
+                }
+
+                return uiField;
+            }
+        }
+
+        public void SetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute, object value)
+        {
+            if (field is EnumField enumField)
+            {
+                var enumFieldAttributeOwner = attributeOwner as EnumField;
+                var hasValue = enumFieldAttributeOwner.value != null;
+                if (hasValue)
+                    enumField.Init(enumFieldAttributeOwner.value, enumFieldAttributeOwner.includeObsoleteValues);
+                else
+                    enumField.SetValueWithoutNotify(null);
+                enumField.SetEnabled(hasValue);
+            }
+            else if (field is TagField tagField)
+            {
+                var tagFieldAttributeOwner = attributeOwner as TagField;
+
+                tagField.SetValueWithoutNotify(tagFieldAttributeOwner.value);
+            }
+            else if (field is EnumFlagsField enumFlagsField)
+            {
+                var enumFlagsFieldAttributeOwner = attributeOwner as EnumFlagsField;
+                var hasValue = enumFlagsFieldAttributeOwner.value != null;
+                if (hasValue)
+                    enumFlagsField.Init(enumFlagsFieldAttributeOwner.value, enumFlagsFieldAttributeOwner.includeObsoleteValues);
+                else
+                    enumFlagsField.SetValueWithoutNotify(null);
+                enumFlagsField.SetEnabled(hasValue);
+            }
+            else
+            {
+                var strValue = GetAttributeStringValue(value);
+
+                if (field is TextField textField)
+                {
+                    textField.SetValueWithoutNotify(strValue);
+                }
+            }
+        }
+
+        public void ResetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            var a = attribute as UxmlStringAttributeDescription;
+
+            if (field is EnumField enumField)
+            {
+                if (null == enumField.type)
+                    enumField.SetValueWithoutNotify(null);
+                else
+                    enumField.SetValueWithoutNotify((Enum)Enum.ToObject(enumField.type, 0));
+            }
+            else if (field is TagField tagField)
+            {
+                tagField.SetValueWithoutNotify(a.defaultValue);
+            }
+            else if (field is EnumFlagsField enumFlagsField)
+            {
+                if (null == enumFlagsField.type)
+                    enumFlagsField.SetValueWithoutNotify(null);
+                else
+                    enumFlagsField.SetValueWithoutNotify((Enum)Enum.ToObject(enumFlagsField.type, 0));
+            }
+            else
+            {
+                (field as TextField).SetValueWithoutNotify(a.defaultValue);
+            }
+        }
+
+        private static string GetAttributeStringValue(object attributeValue)
+        {
+            string value;
+            if (attributeValue is Enum @enum)
+                value = @enum.ToString();
+            else if (attributeValue is IEnumerable<string> list)
+            {
+                value = string.Join(",", list.ToArray());
+            }
+            else
+            {
+                value = attributeValue?.ToString();
+            }
+
+            return value;
+        }
+
+        private static void OnValidatedAttributeValueChange(ChangeEvent<string> evt, Regex regex, string message, UxmlAttributeDescription attribute, Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange)
+        {
+            // Prevent ChangeEvent caused by changing the label of the field to be propagated
+            if (string.IsNullOrEmpty(evt.newValue) && string.IsNullOrEmpty(evt.previousValue))
+            {
+                evt.StopPropagation();
+                return;
+            }
+
+            var field = evt.elementTarget as TextField;
+            if (!string.IsNullOrEmpty(evt.newValue) && !regex.IsMatch(evt.newValue))
+            {
+                Builder.ShowWarning(string.Format(message, field.label));
+                field.SetValueWithoutNotify(evt.previousValue);
+                evt.StopPropagation();
+                return;
+            }
+
+            onValueChange?.Invoke(field, attribute, evt.newValue, ValueToUxml.Convert(evt.newValue));
+        }
+
+        private static void InvokeValueChangedCallback(VisualElement field, UxmlAttributeDescription attribute, object value, string uxmlValue, Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange)
+        {
+            onValueChange?.Invoke(field, attribute, value, uxmlValue);
+        }
+    }
+}
diff --git a/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlTypeAttributeField.cs b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlTypeAttributeField.cs
new file mode 100644
index 0000000000..98b9c1d6c8
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/UxmlAttributesView/Fields/BuilderUxmlTypeAttributeField.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.Linq;
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace Unity.UI.Builder
+{
+    internal class BuilderUxmlTypeAttributeFieldFactory : IBuilderUxmlAttributeFieldFactory
+    {
+        static readonly Dictionary<Type, TypeInfo> s_CachedTypeInfos = new Dictionary<Type, TypeInfo>();
+
+        static readonly UnityEngine.Pool.ObjectPool<BuilderAttributeTypeName> s_TypeNameItemPool = new(
+                () => new BuilderAttributeTypeName(),
+                null,
+                c => c.ClearType());
+
+        static TypeInfo GetTypeInfo(Type type)
+        {
+            if (!s_CachedTypeInfos.TryGetValue(type, out var typeInfo))
+                s_CachedTypeInfos[type] = typeInfo = new TypeInfo(type);
+            return typeInfo;
+        }
+
+        public readonly struct TypeInfo
+        {
+            public readonly Type type;
+            public readonly string value;
+
+            public TypeInfo(Type type)
+            {
+                this.type = type;
+                value = type.GetFullNameWithAssembly();
+            }
+        }
+
+        public bool CanCreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            var attributeType = attribute.GetType();
+
+            return (attributeType.IsGenericType && !attributeType.GetGenericArguments()[0].IsEnum && attributeType.GetGenericArguments()[0] is Type);
+        }
+
+        public VisualElement CreateField(object attributeOwner, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute, Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange)
+        {
+            var attributeType = attribute.GetType();
+            var desiredType = attributeType.GetGenericArguments()[0];
+            var fieldLabel = BuilderNameUtilities.ConvertDashToHuman(attribute.name);
+            var uiField = new TextField(fieldLabel) { isDelayed = true };
+            var completer = new FieldSearchCompleter<TypeInfo>(uiField);
+
+            // When possible, the popup should have the same width as the input field, so that the auto-complete
+            // characters will try to match said input field.
+            completer.matcherCallback += (str, info) => info.value.IndexOf(str, StringComparison.OrdinalIgnoreCase) >= 0;
+            completer.itemHeight = 36;
+            completer.dataSourceCallback += () =>
+            {
+                var desiredTypeInfo = new TypeInfo(desiredType);
+
+                return TypeCache.GetTypesDerivedFrom(desiredType)
+                    .Where(t => !t.IsGenericType)
+                    // Remove UIBuilder types from the list
+                    .Where(t => t.Assembly != GetType().Assembly)
+                    .Select(GetTypeInfo)
+                    .Append(desiredTypeInfo);
+            };
+            completer.getTextFromDataCallback += info => info.value;
+            completer.makeItem = () => s_TypeNameItemPool.Get();
+            completer.destroyItem = e =>
+            {
+                if (e is BuilderAttributeTypeName typeItem)
+                    s_TypeNameItemPool.Release(typeItem);
+            };
+            completer.bindItem = (v, i) =>
+            {
+                if (v is BuilderAttributeTypeName l)
+                    l.SetType(completer.results[i].type, completer.textField.text);
+            };
+
+            uiField.RegisterValueChangedCallback(e =>
+            {
+                // null and empty string are considered equal in this case
+                if (string.IsNullOrEmpty(e.newValue) && string.IsNullOrEmpty(e.previousValue))
+                    return;
+                OnValidatedTypeAttributeChange(e, desiredType
+                    , attributeOwner, attribute, onValueChange);
+            });
+            uiField.userData = completer;
+            return uiField;
+        }
+
+        public void SetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute, object value)
+        {
+            var strValue = string.Empty;
+
+            if (value is Type typeValue)
+            {
+                var fullTypeName = typeValue.AssemblyQualifiedName;
+                var fullTypeNameSplit = fullTypeName.Split(',');
+                strValue = $"{fullTypeNameSplit[0]},{fullTypeNameSplit[1]}";
+            }
+            else if (value is string str)
+            {
+                strValue = str;
+            }
+
+            (field as TextField).SetValueWithoutNotify(strValue);
+        }
+
+        public void ResetFieldValue(VisualElement field, object attributeOwner, VisualTreeAsset uxmlDocument, UxmlAsset attributeUxmlOwner, UxmlAttributeDescription attribute)
+        {
+            var a = attribute as TypedUxmlAttributeDescription<Type>;
+            var f = field as TextField;
+
+            if (a.defaultValue == null)
+                f.SetValueWithoutNotify(string.Empty);
+            else
+                f.SetValueWithoutNotify(a.defaultValue.ToString());
+        }
+
+        void OnValidatedTypeAttributeChange(ChangeEvent<string> evt, Type desiredType
+            , object attributeOwner, UxmlAttributeDescription attribute
+            , Action<VisualElement, UxmlAttributeDescription, object, string> onValueChange)
+        {
+            var field = evt.elementTarget as TextField;
+            var typeName = evt.newValue;
+            var fullTypeName = typeName;
+
+            if (evt.leafTarget == field.labelElement)
+                return;
+
+            Type type = null;
+            if (!string.IsNullOrEmpty(typeName))
+            {
+                type = Type.GetType(fullTypeName, false);
+
+                // Try some auto-fixes.
+                if (type == null)
+                {
+                    fullTypeName = typeName + ", UnityEngine.CoreModule";
+                    type = Type.GetType(fullTypeName, false);
+                }
+
+                if (type == null)
+                {
+                    fullTypeName = typeName + ", UnityEditor";
+                    type = Type.GetType(fullTypeName, false);
+                }
+
+                if (type == null && typeName.Contains("."))
+                {
+                    var split = typeName.Split('.');
+                    fullTypeName = typeName + $", {split[0]}.{split[1]}Module";
+                    type = Type.GetType(fullTypeName, false);
+                }
+
+                if (type == null)
+                {
+                    Builder.ShowWarning(string.Format(BuilderConstants.TypeAttributeInvalidTypeMessage, field.label));
+                    evt.StopPropagation();
+                    return;
+                }
+                else if (!desiredType.IsAssignableFrom(type))
+                {
+                    Builder.ShowWarning(string.Format(BuilderConstants.TypeAttributeMustDeriveFromMessage, field.label,
+                        desiredType.FullName));
+                    evt.StopPropagation();
+                    return;
+                }
+            }
+
+            field.value = fullTypeName;
+            onValueChange?.Invoke(field, attribute, fullTypeName, fullTypeName);
+        }
+    }
+}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderCanvas.cs b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderCanvas.cs
similarity index 90%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderCanvas.cs
rename to Modules/UIBuilder/Editor/Builder/Viewport/BuilderCanvas.cs
index 1a9122c3f8..7182d41da9 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderCanvas.cs
+++ b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderCanvas.cs
@@ -1,3 +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;
 using UnityEditor;
 using UnityEngine;
@@ -68,6 +72,7 @@ public void SetSelection(BuilderSelection selection)
         private float m_Height;
         private float m_ZoomScale = 1.0f;
         private bool m_MatchGameView = false;
+        private bool m_IsFirstDragSinceClick = true;
 
         public float x
         {
@@ -288,28 +293,38 @@ public void ResetSize()
             height = BuilderConstants.CanvasInitialHeight;
         }
 
+        // GameView Disabled Warning should only be shown if the resize bar is used, not if it is only clicked on
+        private void DisplayGameViewWarning(bool allowWarning)
+        {
+            // Make sure that the warning is not spammed every time the mouse is slightly moved
+            if (matchGameView && allowWarning && m_IsFirstDragSinceClick)
+            {
+                Builder.ShowWarning(BuilderConstants.DocumentMatchGameViewModeDisabled);
+                matchGameView = false;
+                m_IsFirstDragSinceClick = false;
+            }
+        }
+
         void OnStartDrag(VisualElement handle)
         {
             m_ThisRectOnStartDrag = new Rect(x, y, width * zoomScale, height * zoomScale);
 
             m_DragHoverCoverLayer.style.display = DisplayStyle.Flex;
             m_DragHoverCoverLayer.style.cursor = handle.computedStyle.cursor;
-
-            if (matchGameView)
-            {
-                Builder.ShowWarning(BuilderConstants.DocumentMatchGameViewModeDisabled);
-                matchGameView = false;
-            }
+            m_IsFirstDragSinceClick = true;
         }
 
         void OnEndDrag()
         {
             m_DragHoverCoverLayer.style.display = DisplayStyle.None;
             m_DragHoverCoverLayer.RemoveFromClassList(k_ActiveHandleClassName);
+            m_IsFirstDragSinceClick = false;
         }
 
         void OnDragLeft(Vector2 diff)
         {
+            Undo.RegisterCompleteObjectUndo(m_Document,BuilderConstants.ChangeCanvasDimensionsOrMatchViewUndoMessage);
+            DisplayGameViewWarning(diff != Vector2.zero);
             var newWidth = (m_ThisRectOnStartDrag.width - diff.x) / m_ZoomScale;
             var oldWidth = width;
 
@@ -320,6 +335,8 @@ void OnDragLeft(Vector2 diff)
 
         void OnDragBottom(Vector2 diff)
         {
+            Undo.RegisterCompleteObjectUndo(m_Document,BuilderConstants.ChangeCanvasDimensionsOrMatchViewUndoMessage);
+            DisplayGameViewWarning(diff != Vector2.zero);
             var newHeight = m_ThisRectOnStartDrag.height + diff.y;
             newHeight = Mathf.Max(newHeight, BuilderConstants.CanvasMinHeight);
             height = newHeight / m_ZoomScale;
@@ -327,6 +344,8 @@ void OnDragBottom(Vector2 diff)
 
         void OnDragRight(Vector2 diff)
         {
+            Undo.RegisterCompleteObjectUndo(m_Document,BuilderConstants.ChangeCanvasDimensionsOrMatchViewUndoMessage);
+            DisplayGameViewWarning(diff != Vector2.zero);
             var newWidth = m_ThisRectOnStartDrag.width + diff.x;
             newWidth = Mathf.Max(newWidth, BuilderConstants.CanvasMinWidth);
             width = newWidth / m_ZoomScale;
@@ -334,6 +353,8 @@ void OnDragRight(Vector2 diff)
 
         void OnDragTop(Vector2 diff)
         {
+            Undo.RegisterCompleteObjectUndo(m_Document,BuilderConstants.ChangeCanvasDimensionsOrMatchViewUndoMessage);
+            DisplayGameViewWarning(diff != Vector2.zero);
             var oldHeight = height;
             var newHeight = (m_ThisRectOnStartDrag.height - diff.y) / m_ZoomScale;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderCanvasStyleControls.cs b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderCanvasStyleControls.cs
similarity index 99%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderCanvasStyleControls.cs
rename to Modules/UIBuilder/Editor/Builder/Viewport/BuilderCanvasStyleControls.cs
index c7f71bd784..552648123b 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderCanvasStyleControls.cs
+++ b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderCanvasStyleControls.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
@@ -152,6 +156,9 @@ public void Deactivate()
 
         public void UpdateButtonIcons(List<string> styles)
         {
+            if (m_Target == null)
+                return;
+
             foreach (var style in styles)
             {
                 switch (style)
diff --git a/Modules/UIBuilder/Editor/Builder/Viewport/BuilderInPlaceTextEditingUtilities.cs b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderInPlaceTextEditingUtilities.cs
new file mode 100644
index 0000000000..1b60e7442e
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderInPlaceTextEditingUtilities.cs
@@ -0,0 +1,307 @@
+// 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;
+using UnityEngine;
+using UnityEngine.UIElements;
+using Object = UnityEngine.Object;
+
+namespace Unity.UI.Builder
+{
+    static class BuilderInPlaceTextEditingUtilities
+    {
+        struct EditingContext
+        {
+            public VisualElement editedElement;
+            public TextElement targetTextElement;
+            public string uxmlAttributeName;
+            public string propertyName;
+
+            public bool CanEdit => null != targetTextElement
+                                   && null != targetTextElement.panel
+                                   && !string.IsNullOrWhiteSpace(uxmlAttributeName);
+        }
+
+
+        const string k_DummyText = " ";
+        const string k_TextAttributeName = "text";
+
+        private static bool CheckIfTransformIsUsed(VisualElement element, VisualElement root)
+        {
+            var parent = element.hierarchy.parent;
+
+            while (parent != null && parent != root)
+            {
+                var computedStyle = parent.computedStyle;
+
+                if (!computedStyle.translate.IsNone())
+                    return true;
+
+                if (!computedStyle.rotate.IsNone())
+                    return true;
+
+                if (computedStyle.scale != Scale.Initial())
+                    return true;
+
+                if (computedStyle.transformOrigin != TransformOrigin.Initial())
+                    return true;
+
+                parent = parent.hierarchy.parent;
+            }
+
+            return false;
+        }
+
+        internal static void GetAlignmentFromTextAnchor(TextAnchor anchor, out Align align, out Justify justifyContent)
+        {
+            align = Align.FlexStart;
+            justifyContent = Justify.FlexStart;
+
+            switch (anchor)
+            {
+                case TextAnchor.UpperCenter:
+                case TextAnchor.MiddleCenter:
+                case TextAnchor.LowerCenter:
+                    align = Align.Center;
+                    break;
+                case TextAnchor.UpperRight:
+                case TextAnchor.MiddleRight:
+                case TextAnchor.LowerRight:
+                    align = Align.FlexEnd;
+                    break;
+            }
+
+            switch (anchor)
+            {
+                case TextAnchor.MiddleLeft:
+                case TextAnchor.MiddleCenter:
+                case TextAnchor.MiddleRight:
+                    justifyContent = Justify.Center;
+                    break;
+                case TextAnchor.LowerLeft:
+                case TextAnchor.LowerCenter:
+                case TextAnchor.LowerRight:
+                    justifyContent = Justify.FlexEnd;
+                    break;
+            }
+        }
+
+        static EditingContext GetAttributeToEdit(VisualElement editedElement, string uxmlAttributeName)
+        {
+            var context = new EditingContext
+            {
+                editedElement = editedElement
+            };
+
+            switch (editedElement)
+            {
+                case IPrefixLabel prefixLabel:
+                    context.targetTextElement = prefixLabel.labelElement;
+                    context.uxmlAttributeName = nameof(IPrefixLabel.label);
+                    context.propertyName = nameof(IPrefixLabel.label);
+                    break;
+                case Foldout foldout:
+                    context.targetTextElement = foldout.toggle.boolFieldLabelElement;
+                    context.uxmlAttributeName = nameof(FoldoutField.text);
+                    context.propertyName = nameof(FoldoutField.text);
+                    break;
+                case TextElement textElement:
+                    context.targetTextElement = textElement;
+                    context.uxmlAttributeName = uxmlAttributeName;
+                    context.propertyName = BuilderNameUtilities.ConvertDashToCamel(uxmlAttributeName);;
+                    break;
+                case BaseListView {showFoldoutHeader: true} listView:
+                    context.targetTextElement = listView.headerFoldout.toggle.boolFieldLabelElement;
+                    context.uxmlAttributeName = "header-title";
+                    context.propertyName = nameof(BaseListView.headerTitle);
+                    break;
+                case GroupBox groupBox:
+                    context.targetTextElement = groupBox.titleLabel;
+                    context.uxmlAttributeName = nameof(GroupBox.text);
+                    context.propertyName = nameof(GroupBox.text);
+                    break;
+            }
+
+            return context;
+        }
+
+        public static void OpenEditor(VisualElement element, Vector2 pos, VisualElement documentRoot)
+        {
+            var viewport = element.GetFirstAncestorOfType<BuilderViewport>();
+            var editorLayer = viewport.editorLayer;
+            var textEditor = viewport.textEditor;
+
+            var context = GetAttributeToEdit(element, k_TextAttributeName);
+
+            if (context.targetTextElement == null || string.IsNullOrEmpty(context.uxmlAttributeName))
+                return;
+
+            if (CheckIfTransformIsUsed(context.targetTextElement, documentRoot))
+            {
+                Builder.ShowWarning("In-place editing is not supported when any ancestor is setting a transform related style property.");
+                return;
+            }
+
+            if (!context.CanEdit)
+                return;
+
+            var value = context.editedElement.GetValueByReflection(context.propertyName) as string;
+
+            // To ensure the text element is visible
+            if (string.IsNullOrEmpty(value))
+            {
+                context.editedElement.SetValueByReflection(context.propertyName, k_DummyText);
+            }
+
+            editorLayer.RemoveFromClassList(BuilderConstants.HiddenStyleClassName);
+
+            var textInput = textEditor.Q(TextField.textInputUssName);
+            textEditor.SetValueWithoutNotify(value);
+
+            textInput.style.unityTextAlign = context.targetTextElement.computedStyle.unityTextAlign;
+            textInput.style.fontSize = context.targetTextElement.computedStyle.fontSize;
+            textInput.style.unityFontStyleAndWeight = context.targetTextElement.computedStyle.unityFontStyleAndWeight;
+            textInput.style.whiteSpace = context.targetTextElement.computedStyle.whiteSpace;
+            textInput.style.width = context.targetTextElement.computedStyle.width;
+            textInput.style.height = context.targetTextElement.computedStyle.height;
+            textInput.style.borderBottomWidth = context.targetTextElement.computedStyle.borderBottomWidth;
+            textInput.style.borderTopWidth = context.targetTextElement.computedStyle.borderTopWidth;
+            textInput.style.borderLeftWidth = context.targetTextElement.computedStyle.borderLeftWidth;
+            textInput.style.borderRightWidth = context.targetTextElement.computedStyle.borderRightWidth;
+            textInput.style.paddingBottom = context.targetTextElement.computedStyle.paddingBottom;
+            textInput.style.paddingTop = context.targetTextElement.computedStyle.paddingTop;
+            textInput.style.paddingLeft = context.targetTextElement.computedStyle.paddingLeft;
+            textInput.style.paddingRight = context.targetTextElement.computedStyle.paddingRight;
+            textInput.style.letterSpacing = context.targetTextElement.computedStyle.letterSpacing;
+            textInput.style.wordSpacing = context.targetTextElement.computedStyle.wordSpacing;
+            textInput.style.unityParagraphSpacing = context.targetTextElement.computedStyle.unityParagraphSpacing;
+            textInput.style.textOverflow = context.targetTextElement.computedStyle.textOverflow;
+            textInput.style.overflow = context.targetTextElement.computedStyle.overflow == OverflowInternal.Visible ? Overflow.Visible : Overflow.Hidden;
+
+            textEditor.style.translate = context.targetTextElement.computedStyle.translate;
+            textEditor.style.transformOrigin = context.targetTextElement.computedStyle.transformOrigin;
+            textEditor.style.rotate = context.targetTextElement.computedStyle.rotate;
+            textEditor.style.scale = context.targetTextElement.computedStyle.scale;
+
+            GetAlignmentFromTextAnchor(context.targetTextElement.computedStyle.unityTextAlign, out var alignItems, out var justifyContent);
+
+            UpdateTextEditorGeometry(context);
+            context.targetTextElement.RegisterCallback<GeometryChangedEvent, EditingContext>(OnTextElementGeometryChanged, context);
+
+            textEditor.schedule.Execute(a => textEditor.Focus());
+            textEditor.textSelection.SelectAll();
+
+            textInput.RegisterCallback<FocusOutEvent, EditingContext>(OnFocusOutEvent, context, TrickleDown.TrickleDown);
+            textEditor.RegisterCallback<ChangeEvent<string>, EditingContext>(OnTextChanged, context);
+        }
+
+        static void OnTextElementGeometryChanged(GeometryChangedEvent evt, EditingContext context)
+        {
+            UpdateTextEditorGeometry(context);
+        }
+
+        static void UpdateTextEditorGeometry(EditingContext context)
+        {
+            if (!context.CanEdit)
+                return;
+
+            var viewport = context.editedElement.GetFirstOfType<BuilderViewport>();
+            if (null == viewport)
+                return;
+
+            var textElementPos =
+                context.targetTextElement.parent.ChangeCoordinatesTo(viewport.documentRootElement, new Vector2(context.targetTextElement.layout.x, context.targetTextElement.layout.y));
+
+            var textEditorContainer = viewport.textEditor.parent;
+
+            // Note: Set the font here it because the font maybe still null of empty label of field in OpenEditor()
+            viewport.textEditor.Q(TextField.textInputUssName).style.unityFont = context.targetTextElement.computedStyle.unityFont;
+            viewport.textEditor.Q(TextField.textInputUssName).style.unityFontDefinition = context.targetTextElement.computedStyle.unityFontDefinition;
+
+            textEditorContainer.style.left = textElementPos.x;
+            textEditorContainer.style.top = textElementPos.y;
+            var textInput = textEditorContainer.Q(TextField.textInputUssName);
+
+            textInput.style.width = context.targetTextElement.layout.width;
+            textInput.style.height = context.targetTextElement.layout.height;
+        }
+
+        private static void CloseEditor(EditingContext context)
+        {
+            var viewport = context.editedElement.GetFirstAncestorOfType<BuilderViewport>();
+            if (null == viewport)
+                return;
+
+            viewport.textEditor.UnregisterCallback<FocusOutEvent, EditingContext>(OnFocusOutEvent, TrickleDown.TrickleDown);
+            viewport.textEditor.UnregisterCallback<ChangeEvent<string>, EditingContext>(OnTextChanged);
+            viewport.editorLayer.AddToClassList(BuilderConstants.HiddenStyleClassName);
+            context.targetTextElement.UnregisterCallback<GeometryChangedEvent, EditingContext>(OnTextElementGeometryChanged);
+        }
+
+        static void OnTextChanged(ChangeEvent<string> evt, EditingContext context)
+        {
+            context.editedElement.SetValueByReflection(context.propertyName, string.IsNullOrEmpty(evt.newValue) ? k_DummyText : evt.newValue);
+        }
+
+        static void OnFocusOutEvent(FocusOutEvent evt, EditingContext context)
+        {
+            OnEditTextFinished(context);
+        }
+
+        static void OnEditTextFinished(EditingContext context)
+        {
+            if (!context.CanEdit)
+                return;
+
+            var viewport = context.editedElement.GetFirstAncestorOfType<BuilderViewport>();
+            if (null == viewport)
+                return;
+
+            var editedElement = context.editedElement;
+            var uxmlAttributeName = context.uxmlAttributeName;
+
+            // Undo/Redo
+            Undo.RegisterCompleteObjectUndo(viewport.paneWindow.document.visualTreeAsset, BuilderConstants.ChangeAttributeValueUndoMessage);
+
+            var newValue = viewport.textEditor.value;
+            var type = editedElement.GetType();
+            var vea = editedElement.GetVisualElementAsset();
+            var oldValue = vea.GetAttributeValue(uxmlAttributeName);
+
+            if (newValue != oldValue)
+            {
+                // Set value in asset.
+                vea.SetAttribute(context.uxmlAttributeName, newValue);
+
+                var fullTypeName = type.ToString();
+
+                if (VisualElementFactoryRegistry.TryGetValue(fullTypeName, out var factoryList))
+                {
+                    var traits = factoryList[0].GetTraits() as UxmlTraits;
+
+                    if (traits == null)
+                    {
+                        CloseEditor(context);
+                        return;
+                    }
+
+                    var creationContext = new CreationContext();
+
+                    try
+                    {
+                        traits.Init(editedElement, vea, creationContext);
+                    }
+                    catch
+                    {
+                        // HACK: This throws in 2019.3.0a4 because usageHints property throws when set after the element has already been added to the panel.
+                    }
+                }
+
+                viewport.selection.NotifyOfHierarchyChange(viewport);
+            }
+            CloseEditor(context);
+        }
+    }
+}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderNotifications.cs b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderNotifications.cs
similarity index 93%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderNotifications.cs
rename to Modules/UIBuilder/Editor/Builder/Viewport/BuilderNotifications.cs
index 1128d6684c..574f3d34df 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderNotifications.cs
+++ b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderNotifications.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderPanner.cs b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderPanner.cs
similarity index 93%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderPanner.cs
rename to Modules/UIBuilder/Editor/Builder/Viewport/BuilderPanner.cs
index fe2934ace0..e77cc371df 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderPanner.cs
+++ b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderPanner.cs
@@ -1,3 +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 UnityEngine.UIElements;
 using UnityEngine;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderViewport.cs b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderViewport.cs
similarity index 99%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderViewport.cs
rename to Modules/UIBuilder/Editor/Builder/Viewport/BuilderViewport.cs
index 98de7569c4..2703b3e801 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderViewport.cs
+++ b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderViewport.cs
@@ -1,3 +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.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -156,7 +160,7 @@ public BuilderViewport(BuilderPaneWindow paneWindow, BuilderSelection selection,
             m_StyleSelectorElementContainer = this.Q(BuilderConstants.StyleSelectorElementContainerName);
             m_DocumentRootElement = this.Q("document");
             m_DocumentRootElement.StretchToParentSize();
-            
+
             // Fix UUM-16248 : Ensure the size of the document cannot be changed inside the builder with the :root selector
             m_DocumentRootElement.style.width = StyleKeyword.Initial;
             m_DocumentRootElement.style.height = StyleKeyword.Initial;
@@ -345,7 +349,7 @@ void OnPick(MouseDownEvent evt)
                 if (evt.clickCount == 2)
                 {
                     var posInViewport = m_PickOverlay.ChangeCoordinatesTo(this, evt.localMousePosition);
-                    BuilderInPlaceTextEditingUtilities.OpenEditor(pickedElement, this.ChangeCoordinatesTo(pickedElement, posInViewport));
+                    BuilderInPlaceTextEditingUtilities.OpenEditor(pickedElement, this.ChangeCoordinatesTo(pickedElement, posInViewport), documentRootElement);
                 }
             }
             else
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderViewportWindow.cs b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderViewportWindow.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderViewportWindow.cs
rename to Modules/UIBuilder/Editor/Builder/Viewport/BuilderViewportWindow.cs
index 7a21518e06..55a5c84315 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderViewportWindow.cs
+++ b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderViewportWindow.cs
@@ -1,3 +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 UnityEditor;
 using UnityEditor.Callbacks;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderVisualTreeStyleUpdaterTraversal.cs b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderVisualTreeStyleUpdaterTraversal.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderVisualTreeStyleUpdaterTraversal.cs
rename to Modules/UIBuilder/Editor/Builder/Viewport/BuilderVisualTreeStyleUpdaterTraversal.cs
index a57159b2c6..2beff8fab3 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderVisualTreeStyleUpdaterTraversal.cs
+++ b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderVisualTreeStyleUpdaterTraversal.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderZoomer.cs b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderZoomer.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderZoomer.cs
rename to Modules/UIBuilder/Editor/Builder/Viewport/BuilderZoomer.cs
index 8c60092c01..17fa002250 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderZoomer.cs
+++ b/Modules/UIBuilder/Editor/Builder/Viewport/BuilderZoomer.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/IBuilderViewportWindow.cs b/Modules/UIBuilder/Editor/Builder/Viewport/IBuilderViewportWindow.cs
similarity index 65%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/IBuilderViewportWindow.cs
rename to Modules/UIBuilder/Editor/Builder/Viewport/IBuilderViewportWindow.cs
index a72083b7ac..8c6628bc76 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/IBuilderViewportWindow.cs
+++ b/Modules/UIBuilder/Editor/Builder/Viewport/IBuilderViewportWindow.cs
@@ -1,3 +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 UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Background/CheckerboardBackground.cs b/Modules/UIBuilder/Editor/Utilities/Background/CheckerboardBackground.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Background/CheckerboardBackground.cs
rename to Modules/UIBuilder/Editor/Utilities/Background/CheckerboardBackground.cs
index 0df2ac0578..37063f2d38 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Background/CheckerboardBackground.cs
+++ b/Modules/UIBuilder/Editor/Utilities/Background/CheckerboardBackground.cs
@@ -1,3 +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 JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ButtonStrip/ButtonStrip.cs b/Modules/UIBuilder/Editor/Utilities/ButtonStrip/ButtonStrip.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ButtonStrip/ButtonStrip.cs
rename to Modules/UIBuilder/Editor/Utilities/ButtonStrip/ButtonStrip.cs
index 72a11d5735..0e07b26080 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ButtonStrip/ButtonStrip.cs
+++ b/Modules/UIBuilder/Editor/Utilities/ButtonStrip/ButtonStrip.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/CategoryDropdownField/CategoryDropdownContent.cs b/Modules/UIBuilder/Editor/Utilities/CategoryDropdownField/CategoryDropdownContent.cs
similarity index 92%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/CategoryDropdownField/CategoryDropdownContent.cs
rename to Modules/UIBuilder/Editor/Utilities/CategoryDropdownField/CategoryDropdownContent.cs
index 72516ad7c9..fbeacb54a1 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/CategoryDropdownField/CategoryDropdownContent.cs
+++ b/Modules/UIBuilder/Editor/Utilities/CategoryDropdownField/CategoryDropdownContent.cs
@@ -1,3 +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.Collections.Generic;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField+WindowContent.cs b/Modules/UIBuilder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField+WindowContent.cs
similarity index 99%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField+WindowContent.cs
rename to Modules/UIBuilder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField+WindowContent.cs
index 6d05f59547..cb229dbc53 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField+WindowContent.cs
+++ b/Modules/UIBuilder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField+WindowContent.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField.cs b/Modules/UIBuilder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField.cs
rename to Modules/UIBuilder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField.cs
index da9bde1e54..53f371a81e 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/CategoryDropdownField/CategoryDropdownField.cs
@@ -1,3 +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;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/BaseOverlayPainter.cs b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/BaseOverlayPainter.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/BaseOverlayPainter.cs
rename to Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/BaseOverlayPainter.cs
index 0070b7db07..c93064fa27 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/BaseOverlayPainter.cs
+++ b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/BaseOverlayPainter.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/ElementHierarchyView.cs b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/ElementHierarchyView.cs
similarity index 77%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/ElementHierarchyView.cs
rename to Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/ElementHierarchyView.cs
index 9066f45382..3648f06cb6 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/ElementHierarchyView.cs
+++ b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/ElementHierarchyView.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.IO;
@@ -21,6 +25,7 @@ struct PreSaveState
     internal class ElementHierarchyView : VisualElement
     {
         public const string k_PillName = "unity-builder-tree-class-pill";
+        const string k_TreeItemPillClass = "unity-debugger-tree-item-pill";
 
         public bool hierarchyHasChanged { get; set; }
         public bool hasUnsavedChanges { get; set; }
@@ -63,12 +68,18 @@ public IEnumerable<TreeViewItemData<VisualElement>> treeItems
         BuilderClassDragger m_ClassDragger;
         BuilderExplorerDragger m_ExplorerDragger;
         BuilderElementContextMenu m_ContextMenuManipulator;
+        bool m_AllowMouseUpRenaming;
+        IVisualElementScheduledItem m_RenamingScheduledItem;
+        ManipulatorActivationFilter m_RenamingManipulatorFilter;
+        List<Label> m_LabelsToResize = new();
 
         public VisualElement container
         {
             get { return m_Container; }
         }
 
+        internal TreeView treeView => m_TreeView;
+
         public ElementHierarchyView(
             BuilderPaneWindow paneWindow,
             VisualElement documentRootElement,
@@ -105,6 +116,14 @@ public ElementHierarchyView(
                     m_PaneWindow.primarySelection.ClearSelection(null);
             });
 
+            RegisterCallback<GeometryChangedEvent>(e =>
+            {
+                foreach (var label in m_LabelsToResize)
+                {
+                    UpdateResizableLabelWidthInSelector(label);
+                }
+            });
+
             m_TreeViewHoverOverlay = highlightOverlayPainter;
 
             m_Container = new VisualElement();
@@ -112,6 +131,7 @@ public ElementHierarchyView(
             m_Container.style.flexGrow = 1;
             m_ClassDragger.builderHierarchyRoot = m_Container;
             m_ExplorerDragger.builderHierarchyRoot = m_Container;
+            m_ExplorerDragger.onEndDrag += OnExplorerEndDrag;
             Add(m_Container);
 
             m_ClassPillTemplate = BuilderPackageUtilities.LoadAssetAtPath<VisualTreeAsset>(
@@ -119,20 +139,91 @@ public ElementHierarchyView(
 
             // Create TreeView.
             m_TreeRootItems = new List<TreeViewItem>();
-            m_TreeView = new TreeView(20, MakeItem, FillItem);
+            m_TreeView = new TreeView(20, MakeItem, BindItem);
             m_TreeView.SetRootItems(m_TreeRootItems);
+            m_TreeView.unbindItem += UnbindItem;
             m_TreeViewController = m_TreeView.viewController as DefaultTreeViewController<VisualElement>;
 
             m_TreeView.selectionType = SelectionType.Multiple;
             m_TreeView.viewDataKey = "unity-builder-explorer-tree";
             m_TreeView.style.flexGrow = 1;
             m_TreeView.selectedIndicesChanged += OnSelectionChange;
+            m_TreeView.selectionNotChanged += OnSameItemSelection;
             m_TreeView.horizontalScrollingEnabled = true;
 
             m_TreeView.RegisterCallback<MouseDownEvent>(OnLeakedMouseClick);
             m_Container.Add(m_TreeView);
 
             m_ContextMenuManipulator.RegisterCallbacksOnTarget(m_Container);
+
+            RegisterCallback<KeyDownEvent>(evt =>
+            {
+                if (selection.selectionCount != 1)
+                {
+                    return;
+                }
+
+                var selectedElement = selection.selection.First();
+                var explorerItem = selectedElement.GetProperty(BuilderConstants.ElementLinkedExplorerItemVEPropertyName) as BuilderExplorerItem;
+
+                if (explorerItem == null)
+                {
+                    return;
+                }
+
+                switch (evt.keyCode)
+                {
+                    case KeyCode.Return:
+                    case KeyCode.KeypadEnter:
+                        if (Application.platform == RuntimePlatform.OSXEditor)
+                        {
+                            explorerItem.ActivateRenameElementMode();
+                            evt.PreventDefault();
+                        }
+
+                        break;
+                    case KeyCode.F2:
+                        if (Application.platform != RuntimePlatform.OSXEditor)
+                        {
+                            explorerItem.ActivateRenameElementMode();
+                            evt.PreventDefault();
+                        }
+                        break;
+                }
+            }, TrickleDown.TrickleDown);
+        }
+
+        private void UnbindItem(VisualElement element, int index)
+        {
+            var explorerItem = element as BuilderExplorerItem;
+
+            foreach (var label in explorerItem.elidableLabels)
+            {
+                m_LabelsToResize.Remove(label);
+            }
+
+            explorerItem.elidableLabels.Clear();
+        }
+
+        private void OnExplorerEndDrag()
+        {
+            m_AllowMouseUpRenaming = false;
+        }
+
+        private void OnSameItemSelection()
+        {
+            if (m_Selection.isEmpty)
+            {
+                return;
+            }
+
+            var selectedElement = m_Selection.selection.First();
+            var explorerItem = selectedElement.GetProperty(BuilderConstants.ElementLinkedExplorerItemVEPropertyName) as BuilderExplorerItem;
+
+            if (explorerItem != null && !explorerItem.IsRenamingActive() && m_TreeView.IsFocused())
+            {
+                m_AllowMouseUpRenaming = true;
+            }
         }
 
         public void CopyTreeViewItemStates(VisualElementAsset sourceVEA, VisualElementAsset targetVEA)
@@ -161,10 +252,12 @@ public void CopyTreeViewItemStates(VisualElementAsset sourceVEA, VisualElementAs
                 m_TreeView.CopyExpandedStates(templateTreeItem.id, unpackedElementTreeItem.id);
         }
 
-        void FillItem(VisualElement element, int index)
+        void BindItem(VisualElement element, int index)
         {
             var item = m_TreeViewController.GetTreeViewItemDataForIndex(index);
             var explorerItem = element as BuilderExplorerItem;
+
+            explorerItem.SetReorderingZonesEnabled(true);
             explorerItem.Clear();
 
             // Pre-emptive cleanup.
@@ -172,6 +265,7 @@ void FillItem(VisualElement element, int index)
             row.RemoveFromClassList(BuilderConstants.ExplorerHeaderRowClassName);
             row.RemoveFromClassList(BuilderConstants.ExplorerItemHiddenClassName);
             row.RemoveFromClassList(BuilderConstants.ExplorerActiveStyleSheetClassName);
+            row.tooltip = string.Empty;
 
             // Get target element (in the document).
             var documentElement = item.data;
@@ -241,6 +335,7 @@ void FillItem(VisualElement element, int index)
 
                 var selectorLabelCont = new VisualElement();
                 selectorLabelCont.AddToClassList(BuilderConstants.ExplorerItemSelectorLabelContClassName);
+
                 labelCont.Add(selectorLabelCont);
 
                 // Register right-click events for context menu actions.
@@ -251,25 +346,20 @@ void FillItem(VisualElement element, int index)
 
                 foreach (var partStr in selectorParts)
                 {
+                    Label label;
+                    VisualElement pill = null;
+
                     if (partStr.StartsWith(BuilderConstants.UssSelectorClassNameSymbol))
                     {
                         m_ClassPillTemplate.CloneTree(selectorLabelCont);
-                        var pill = selectorLabelCont.contentContainer.ElementAt(selectorLabelCont.childCount - 1);
-                        var pillLabel = pill.Q<Label>("class-name-label");
+                        pill = selectorLabelCont.contentContainer.ElementAt(selectorLabelCont.childCount - 1);
+                        label = pill.Q<Label>("class-name-label");
                         pill.name = k_PillName;
-                        pill.AddToClassList("unity-debugger-tree-item-pill");
+                        pill.AddToClassList(k_TreeItemPillClass);
                         pill.SetProperty(BuilderConstants.ExplorerStyleClassPillClassNameVEPropertyName, partStr);
                         pill.userData = documentElement;
 
-                        // Add ellipsis if the class name is too long.
-                        var partStrShortened = BuilderNameUtilities.CapStringLengthAndAddEllipsis(partStr, BuilderConstants.ClassNameInPillMaxLength);
-
-                        if (partStrShortened != partStr)
-                        {
-                            pillLabel.tooltip = partStr;
-                        }
-
-                        pillLabel.text = partStrShortened;
+                        label.text = partStr;
 
                         // We want class dragger first because it has priority on the pill label when drag starts.
                         m_ClassDragger.RegisterCallbacksOnTarget(pill);
@@ -277,31 +367,62 @@ void FillItem(VisualElement element, int index)
                     }
                     else if (partStr.StartsWith(BuilderConstants.UssSelectorNameSymbol))
                     {
-                        var selectorPartLabel = new Label(partStr);
-                        selectorPartLabel.AddToClassList(BuilderConstants.ExplorerItemLabelClassName);
-                        selectorPartLabel.AddToClassList(BuilderConstants.ElementNameClassName);
-                        selectorLabelCont.Add(selectorPartLabel);
+                        label = new Label(partStr);
+                        label.AddToClassList(BuilderConstants.ExplorerItemLabelClassName);
+                        label.AddToClassList(BuilderConstants.ElementNameClassName);
+                        selectorLabelCont.Add(label);
                     }
                     else if (partStr.StartsWith(BuilderConstants.UssSelectorPseudoStateSymbol))
                     {
-                        var selectorPartLabel = new Label(partStr);
-                        selectorPartLabel.AddToClassList(BuilderConstants.ExplorerItemLabelClassName);
-                        selectorPartLabel.AddToClassList(BuilderConstants.ElementPseudoStateClassName);
-                        selectorLabelCont.Add(selectorPartLabel);
+                        label = new Label(partStr);
+                        label.AddToClassList(BuilderConstants.ExplorerItemLabelClassName);
+                        label.AddToClassList(BuilderConstants.ElementPseudoStateClassName);
+                        selectorLabelCont.Add(label);
                     }
                     else if (partStr == BuilderConstants.SingleSpace)
                     {
-                        var selectorPartLabel = new Label(BuilderConstants.TripleSpace);
-                        selectorPartLabel.AddToClassList(BuilderConstants.ExplorerItemLabelClassName);
-                        selectorPartLabel.AddToClassList(BuilderConstants.ElementTypeClassName);
-                        selectorLabelCont.Add(selectorPartLabel);
+                        label = new Label(BuilderConstants.TripleSpace);
+                        label.AddToClassList(BuilderConstants.ExplorerItemLabelClassName);
+                        label.AddToClassList(BuilderConstants.ElementTypeClassName);
+                        selectorLabelCont.Add(label);
                     }
                     else
                     {
-                        var selectorPartLabel = new Label(partStr);
-                        selectorPartLabel.AddToClassList(BuilderConstants.ExplorerItemLabelClassName);
-                        selectorPartLabel.AddToClassList(BuilderConstants.ElementTypeClassName);
-                        selectorLabelCont.Add(selectorPartLabel);
+                        label = new Label(partStr);
+                        label.AddToClassList(BuilderConstants.ExplorerItemLabelClassName);
+                        label.AddToClassList(BuilderConstants.ElementTypeClassName);
+                        selectorLabelCont.Add(label);
+                    }
+
+                    var shouldElideText = !elementInfoVisibilityState.HasFlag(BuilderExplorer.BuilderElementInfoVisibilityState
+                        .FullSelectorText);
+
+                    label.AddToClassList(BuilderConstants.SelectorLabelClassName);
+
+                    if (shouldElideText)
+                    {
+                        explorerItem.elidableLabels.Add(label);
+
+                        if (selectorParts.Count == 1)
+                        {
+                            m_LabelsToResize.Add(label);
+                        }
+                        else
+                        {
+                            // Label has a max-width
+                            label.AddToClassList(BuilderConstants.SelectorLabelMultiplePartsClassName);
+                        }
+
+                        label.RegisterCallback<GeometryChangedEvent>(e =>
+                        {
+                            if (selectorParts.Count == 1)
+                            {
+                                UpdateResizableLabelWidthInSelector(label);
+                            }
+
+                            var fullSelectorText = BuilderSharedStyles.GetSelectorString(documentElement);
+                            UpdateTooltips(label, pill, explorerItem, fullSelectorText, partStr);
+                        });
                     }
                 }
 
@@ -461,6 +582,38 @@ void FillItem(VisualElement element, int index)
             m_ContextMenuManipulator.RegisterCallbacksOnTarget(explorerItem);
         }
 
+        private void UpdateTooltips(Label label, VisualElement pill, BuilderExplorerItem explorerItem,
+            string fullSelectorText, string selectorPart)
+        {
+            var tooltipElement = pill ?? label;
+            var row = explorerItem.GetFirstAncestorWithClass(BaseTreeView.itemUssClassName);
+
+            tooltipElement.tooltip = label.isElided ? selectorPart : string.Empty;
+
+            if (label.isElided)
+            {
+                row.tooltip = fullSelectorText;
+            }
+            else
+            {
+                row.tooltip = explorerItem.elidableLabels.Any(x => x.isElided) ? fullSelectorText : string.Empty;
+            }
+        }
+
+        private void UpdateResizableLabelWidthInSelector(Label label)
+        {
+            var padding = label.resolvedStyle.paddingRight;
+
+            if (label.parent.ClassListContains(k_TreeItemPillClass))
+            {
+                padding += label.parent.resolvedStyle.paddingRight;
+            }
+
+            var size = resolvedStyle.width - label.worldBound.position.x - padding;
+
+            label.style.maxWidth = Mathf.Max(BuilderConstants.ClassNameInPillMinWidth, size);
+        }
+
         void HighlightItemInTargetWindow(VisualElement documentElement)
         {
             if (m_TreeViewHoverOverlay == null)
@@ -701,6 +854,49 @@ VisualElement MakeItem()
                 icon.style.backgroundImage = styleBackgroundImage;
             });
 
+            element.RegisterCallback<ClickEvent>(evt =>
+            {
+                if (!m_RenamingManipulatorFilter.Matches(evt))
+                {
+                    return;
+                }
+
+                if (evt.clickCount > 1)
+                {
+                    // Multiple clicks. Cancel rename
+                    m_RenamingScheduledItem?.Pause();
+                }
+
+                if (evt.clickCount == 1 && m_AllowMouseUpRenaming)
+                {
+                    m_RenamingScheduledItem = element.schedule.Execute(() =>
+                    {
+                        if (m_Selection.selectionCount != 1 || !m_TreeView.IsFocused())
+                        {
+                            return;
+                        }
+
+                        var selectedElement = m_Selection.selection.First();
+
+                        if (!selectedElement.HasProperty(BuilderConstants.ElementLinkedExplorerItemVEPropertyName))
+                        {
+                            return;
+                        }
+
+                        var explorerItem = selectedElement.GetProperty(BuilderConstants.ElementLinkedExplorerItemVEPropertyName) as BuilderExplorerItem;
+
+                        if (explorerItem == element)
+                        {
+                            element.ActivateRenameElementMode();
+                        }
+                    }).StartingIn(500);
+                    evt.PreventDefault();
+                }
+
+                m_AllowMouseUpRenaming = false;
+
+            }, TrickleDown.TrickleDown);
+
             return element;
         }
 
@@ -726,6 +922,12 @@ TreeViewItem FindElement(IEnumerable<TreeViewItem> list, VisualElement element)
             return default;
         }
 
+        // Used in tests
+        internal bool IsRenamingScheduled()
+        {
+            return m_RenamingScheduledItem != null && m_RenamingScheduledItem.isActive;
+        }
+
         public void ClearSelection()
         {
             m_TreeView?.ClearSelection();
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/HighlightOverlayPainter.cs b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/HighlightOverlayPainter.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/HighlightOverlayPainter.cs
rename to Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/HighlightOverlayPainter.cs
index ef19238394..65bf558638 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/HighlightOverlayPainter.cs
+++ b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/HighlightOverlayPainter.cs
@@ -1,3 +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 UnityEngine;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/LayoutOverlayPainter.cs b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/LayoutOverlayPainter.cs
similarity index 88%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/LayoutOverlayPainter.cs
rename to Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/LayoutOverlayPainter.cs
index d95645d4b3..77cf52becc 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/LayoutOverlayPainter.cs
+++ b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/LayoutOverlayPainter.cs
@@ -1,3 +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 UnityEngine;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/OverlayPainterHelperElement.cs b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/OverlayPainterHelperElement.cs
similarity index 88%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/OverlayPainterHelperElement.cs
rename to Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/OverlayPainterHelperElement.cs
index 44b3441a84..8f9cbd926a 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/OverlayPainterHelperElement.cs
+++ b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/OverlayPainterHelperElement.cs
@@ -1,3 +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 UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/RepaintOverlayPainter.cs b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/RepaintOverlayPainter.cs
similarity index 87%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/RepaintOverlayPainter.cs
rename to Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/RepaintOverlayPainter.cs
index cc1123cbc3..bac821dcc4 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/RepaintOverlayPainter.cs
+++ b/Modules/UIBuilder/Editor/Utilities/ElementHierarchyView/RepaintOverlayPainter.cs
@@ -1,3 +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 UnityEngine;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutColorField.cs b/Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutColorField.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutColorField.cs
rename to Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutColorField.cs
index 2940385634..7e3cb42ab5 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutColorField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutColorField.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutField.cs b/Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutField.cs
similarity index 91%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutField.cs
rename to Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutField.cs
index 4621a82c5f..b30a8ce682 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutField.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutNumberField.cs b/Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutNumberField.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutNumberField.cs
rename to Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutNumberField.cs
index 7ab288a405..d6f38f9bc2 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutNumberField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutNumberField.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutTransitionField.cs b/Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutTransitionField.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutTransitionField.cs
rename to Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutTransitionField.cs
index a3cfc496b0..465e093590 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutField/FoldoutTransitionField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/FoldoutField/FoldoutTransitionField.cs
@@ -1,3 +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;
 using UnityEditor;
 using UnityEditor.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutWithCheckbox/FoldoutWithCheckbox.cs b/Modules/UIBuilder/Editor/Utilities/FoldoutWithCheckbox/FoldoutWithCheckbox.cs
similarity index 93%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutWithCheckbox/FoldoutWithCheckbox.cs
rename to Modules/UIBuilder/Editor/Utilities/FoldoutWithCheckbox/FoldoutWithCheckbox.cs
index 89b3b6aa50..a70e69d165 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FoldoutWithCheckbox/FoldoutWithCheckbox.cs
+++ b/Modules/UIBuilder/Editor/Utilities/FoldoutWithCheckbox/FoldoutWithCheckbox.cs
@@ -1,3 +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 JetBrains.Annotations;
 using UnityEditor;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FontStyleStrip/FontStyleStrip.cs b/Modules/UIBuilder/Editor/Utilities/FontStyleStrip/FontStyleStrip.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FontStyleStrip/FontStyleStrip.cs
rename to Modules/UIBuilder/Editor/Utilities/FontStyleStrip/FontStyleStrip.cs
index 1427a22bff..35c21f740e 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/FontStyleStrip/FontStyleStrip.cs
+++ b/Modules/UIBuilder/Editor/Utilities/FontStyleStrip/FontStyleStrip.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/HelpBox/HelpBox.cs b/Modules/UIBuilder/Editor/Utilities/HelpBox/HelpBox.cs
similarity index 84%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/HelpBox/HelpBox.cs
rename to Modules/UIBuilder/Editor/Utilities/HelpBox/HelpBox.cs
index 2beebbd9ca..458b9b6af0 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/HelpBox/HelpBox.cs
+++ b/Modules/UIBuilder/Editor/Utilities/HelpBox/HelpBox.cs
@@ -1,3 +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 UnityEditor;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Importers/BuilderStyleSheetImporter.cs b/Modules/UIBuilder/Editor/Utilities/Importers/BuilderStyleSheetImporter.cs
similarity index 73%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Importers/BuilderStyleSheetImporter.cs
rename to Modules/UIBuilder/Editor/Utilities/Importers/BuilderStyleSheetImporter.cs
index 9d710a05f5..079b1b259d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Importers/BuilderStyleSheetImporter.cs
+++ b/Modules/UIBuilder/Editor/Utilities/Importers/BuilderStyleSheetImporter.cs
@@ -1,3 +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 UnityEditor;
 
 using UnityEditor.UIElements.StyleSheets;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Importers/BuilderVisualTreeAssetImporter.cs b/Modules/UIBuilder/Editor/Utilities/Importers/BuilderVisualTreeAssetImporter.cs
similarity index 72%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Importers/BuilderVisualTreeAssetImporter.cs
rename to Modules/UIBuilder/Editor/Utilities/Importers/BuilderVisualTreeAssetImporter.cs
index af982f6b68..1922339fb8 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Importers/BuilderVisualTreeAssetImporter.cs
+++ b/Modules/UIBuilder/Editor/Utilities/Importers/BuilderVisualTreeAssetImporter.cs
@@ -1,3 +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 UnityEditor;
 using UnityEditor.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/LibraryFoldout/LibraryFoldout.cs b/Modules/UIBuilder/Editor/Utilities/LibraryFoldout/LibraryFoldout.cs
similarity index 93%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/LibraryFoldout/LibraryFoldout.cs
rename to Modules/UIBuilder/Editor/Utilities/LibraryFoldout/LibraryFoldout.cs
index 02c929ef63..d51531b514 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/LibraryFoldout/LibraryFoldout.cs
+++ b/Modules/UIBuilder/Editor/Utilities/LibraryFoldout/LibraryFoldout.cs
@@ -1,3 +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 JetBrains.Annotations;
 using UnityEditor;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ModalPopup/ModalPopup.cs b/Modules/UIBuilder/Editor/Utilities/ModalPopup/ModalPopup.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ModalPopup/ModalPopup.cs
rename to Modules/UIBuilder/Editor/Utilities/ModalPopup/ModalPopup.cs
index eff22ece84..f4d00009ae 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ModalPopup/ModalPopup.cs
+++ b/Modules/UIBuilder/Editor/Utilities/ModalPopup/ModalPopup.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEditor;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/MultiTypeField/MultiTypeField.cs b/Modules/UIBuilder/Editor/Utilities/MultiTypeField/MultiTypeField.cs
similarity index 51%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/MultiTypeField/MultiTypeField.cs
rename to Modules/UIBuilder/Editor/Utilities/MultiTypeField/MultiTypeField.cs
index ead23a98b8..f106430058 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/MultiTypeField/MultiTypeField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/MultiTypeField/MultiTypeField.cs
@@ -1,8 +1,13 @@
+// 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;
 using UnityEditor.UIElements;
+using UnityEngine;
 using UnityEngine.UIElements;
 using Object = UnityEngine.Object;
 
@@ -12,10 +17,13 @@ abstract class MultiTypeField : BaseField<Object>
     {
         static readonly string k_UssPath = BuilderConstants.UtilitiesPath + "/MultiTypeField/MultiTypeField.uss";
         static readonly string k_UxmlPath = BuilderConstants.UtilitiesPath + "/MultiTypeField/MultiTypeField.uxml";
+        static readonly string acceptDropVariantUssClassName = "unity-object-field-display--accept-drop";
+        static readonly PropertyName serializedPropertyKey = new PropertyName("--unity-object-field-serialized-property");
 
         const string k_OptionsPopupContainerName = "unity-multi-type-options-popup-container";
 
         readonly ObjectField m_ObjectField;
+        readonly VisualElement m_ObjectFieldInput;
         readonly Dictionary<string, Type> m_TypeOptions;
         readonly PopupField<string> m_TypePopup;
 
@@ -32,11 +40,67 @@ protected MultiTypeField(string label) : base(label)
             m_ObjectField = this.Q<ObjectField>();
             m_ObjectField.RegisterValueChangedCallback(OnObjectValueChange);
 
+            // To be able to support drag and dropping assets of all the supported types, we need to override the default behaviour of the ObjectField.
+            // to do this, we register a trickle down callback on the (private) element that handles that on the `ObjectField`.
+            m_ObjectFieldInput = m_ObjectField.Q(className:"unity-object-field-display");
+            m_ObjectFieldInput.RegisterCallback<DragPerformEvent>(OnDragPerformed, TrickleDown.TrickleDown);
+            m_ObjectFieldInput.RegisterCallback<DragUpdatedEvent>(OnDragUpdated, TrickleDown.TrickleDown);
+
             var popupContainer = this.Q(k_OptionsPopupContainerName);
             m_TypePopup = new PopupField<string> { formatSelectedValueCallback = OnFormatSelectedValue };
             popupContainer.Add(m_TypePopup);
         }
 
+        private void OnDragUpdated(DragUpdatedEvent evt)
+        {
+            Object validatedObject = DNDValidateObject();
+            if (validatedObject != null)
+            {
+                DragAndDrop.visualMode = DragAndDropVisualMode.Generic;
+                m_ObjectFieldInput.EnableInClassList(acceptDropVariantUssClassName, true);
+
+                evt.StopImmediatePropagation();
+            }
+        }
+
+        private void OnDragPerformed(DragPerformEvent evt)
+        {
+            Object validatedObject = DNDValidateObject();
+            if (validatedObject != null)
+            {
+                DragAndDrop.visualMode = DragAndDropVisualMode.Generic;
+                m_ObjectField.value = validatedObject;
+
+                DragAndDrop.AcceptDrag();
+                m_ObjectFieldInput.RemoveFromClassList(acceptDropVariantUssClassName);
+
+                evt.StopImmediatePropagation();
+            }
+        }
+
+        private Object DNDValidateObject()
+        {
+            var references = DragAndDrop.objectReferences;
+            var property = m_ObjectField.GetProperty(serializedPropertyKey) as SerializedProperty;
+
+            foreach (var type in m_TypeOptions.Values)
+            {
+                var validatedObject = EditorGUI.ValidateObjectFieldAssignment(references, type, property, EditorGUI.ObjectFieldValidatorOptions.None);
+
+                if (validatedObject != null)
+                {
+                    // If scene objects are not allowed and object is a scene object then clear
+                    if (!m_ObjectField.allowSceneObjects && !EditorUtility.IsPersistent(validatedObject))
+                        validatedObject = null;
+                }
+
+                if (validatedObject)
+                    return validatedObject;
+            }
+
+            return null;
+        }
+
         void OnObjectValueChange(ChangeEvent<Object> evt)
         {
             value = evt.newValue;
@@ -70,7 +134,8 @@ string OnFormatSelectedValue(string formatValue)
             if (m_TypeOptions.Count > 0)
             {
                 m_ObjectField.objectType = m_TypeOptions[formatValue];
-                if (m_ObjectField.value != null && m_ObjectField.objectType != m_ObjectField.value.GetType())
+                if (!m_ObjectField.value) return formatValue;
+                if (!m_ObjectField.objectType.IsInstanceOfType(m_ObjectField.value))
                     m_ObjectField.value = null;
             }
 
@@ -79,18 +144,18 @@ string OnFormatSelectedValue(string formatValue)
 
         public void SetTypePopupValueWithoutNotify(Type type)
         {
-            var typeDisplayName = m_TypeOptions.FirstOrDefault(pair => pair.Value == type).Key;
+            var typeDisplayName = m_TypeOptions.FirstOrDefault(pair => pair.Value.IsAssignableFrom(type)).Key;
             m_TypePopup.SetValueWithoutNotify(typeDisplayName);
         }
 
         public override void SetValueWithoutNotify(Object newValue)
         {
             m_ObjectField.SetValueWithoutNotify(newValue);
-            if (newValue != null)
+            if (newValue)
             {
                 foreach (var pair in m_TypeOptions)
                 {
-                    if (pair.Value == newValue.GetType())
+                    if (pair.Value.IsInstanceOfType(newValue))
                     {
                         m_TypePopup.SetValueWithoutNotify(pair.Key);
                         break;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/PercentSlider/PercentSlider.cs b/Modules/UIBuilder/Editor/Utilities/PercentSlider/PercentSlider.cs
similarity index 52%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/PercentSlider/PercentSlider.cs
rename to Modules/UIBuilder/Editor/Utilities/PercentSlider/PercentSlider.cs
index 65ed7e184c..e1df162849 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/PercentSlider/PercentSlider.cs
+++ b/Modules/UIBuilder/Editor/Utilities/PercentSlider/PercentSlider.cs
@@ -1,38 +1,31 @@
+// 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 UnityEditor;
-using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
 {
-    internal class PercentSlider : BaseField<float>
+    internal class PercentSlider : BaseField<float>, IValueField<float>
     {
         static readonly string s_UssPath = BuilderConstants.UtilitiesPath + "/PercentSlider/PercentSlider.uss";
         static readonly string s_UxmlPath = BuilderConstants.UtilitiesPath + "/PercentSlider/PercentSlider.uxml";
+        
+        static readonly string k_DraggerFieldUssClassName = "unity-style-field__dragger-field";
 
         static readonly string s_UssClassName = "unity-percent-slider";
         static readonly string s_VisualInputName = "unity-visual-input";
         static readonly string s_SliderName = "unity-slider";
-        static readonly string s_FieldName = "unity-field";
 
         public new class UxmlFactory : UxmlFactory<PercentSlider, UxmlTraits> { }
 
         public new class UxmlTraits : BaseField<float>.UxmlTraits
         {
-            public UxmlTraits()
-            {
-            }
-
-            public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
-            {
-                base.Init(ve, bag, cc);
-            }
         }
 
-        SliderInt mSlider;
-        IntegerField mField;
+        SliderInt m_Slider;
 
         public override void SetValueWithoutNotify(float newValue)
         {
@@ -53,11 +46,14 @@ public PercentSlider(string label) : base(label)
             template.CloneTree(this);
 
             visualInput = this.Q(s_VisualInputName);
-            mSlider = this.Q<SliderInt>(s_SliderName);
-            mField = this.Q<IntegerField>(s_FieldName);
+            m_Slider = this.Q<SliderInt>(s_SliderName);
+            m_Slider.AddToClassList(k_DraggerFieldUssClassName);
+
+            m_Slider.RegisterValueChangedCallback(OnSubFieldValueChange);
 
-            mSlider.RegisterValueChangedCallback(OnSubFieldValueChange);
-            mField.RegisterValueChangedCallback(OnSubFieldValueChange);
+            var mouseDragger = new FieldMouseDragger<float>(this);
+            mouseDragger.SetDragZone(labelElement);
+            labelElement.AddToClassList(labelDraggerVariantUssClassName);
         }
 
         void RefreshSubFields()
@@ -65,11 +61,9 @@ void RefreshSubFields()
             var value100 = value * 100.0f;
             var intNewValue = (int)Math.Round(value100, 0);
 
-            mSlider.SetValueWithoutNotify(intNewValue);
-            if (mSlider.elementPanel != null)
-                mSlider.OnViewDataReady(); // Hack to force update the slide handle position.
-
-            mField.SetValueWithoutNotify(intNewValue);
+            m_Slider.SetValueWithoutNotify(intNewValue);
+            if (m_Slider.elementPanel != null)
+                m_Slider.OnViewDataReady(); // Hack to force update the slide handle position.
         }
 
         void OnSubFieldValueChange(ChangeEvent<int> evt)
@@ -82,5 +76,23 @@ void OnSubFieldValueChange(ChangeEvent<int> evt)
             else
                 value = newValueFloat;
         }
+
+        void IValueField<float>.ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, float startValue)
+        {
+            double sensitivity = NumericFieldDraggerUtility.CalculateIntDragSensitivity((int)startValue, m_Slider.lowValue, m_Slider.highValue);
+            float acceleration = NumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+            long v = m_Slider.value;
+
+            v += (long)Math.Round(NumericFieldDraggerUtility.NiceDelta(delta, acceleration) * sensitivity);
+            m_Slider.value = (int)v;
+        }
+
+        void IValueField<float>.StartDragging()
+        {
+        }
+
+        void IValueField<float>.StopDragging()
+        {
+        }
     }
 }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/PersistedFoldout/PersistedFoldout.cs b/Modules/UIBuilder/Editor/Utilities/PersistedFoldout/PersistedFoldout.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/PersistedFoldout/PersistedFoldout.cs
rename to Modules/UIBuilder/Editor/Utilities/PersistedFoldout/PersistedFoldout.cs
index d6677c3994..9f50d74870 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/PersistedFoldout/PersistedFoldout.cs
+++ b/Modules/UIBuilder/Editor/Utilities/PersistedFoldout/PersistedFoldout.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ReflectionExtensions/ReflectionExtensions.cs b/Modules/UIBuilder/Editor/Utilities/ReflectionExtensions/ReflectionExtensions.cs
similarity index 93%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ReflectionExtensions/ReflectionExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/ReflectionExtensions/ReflectionExtensions.cs
index cf5d8e5248..66662755c7 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ReflectionExtensions/ReflectionExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/ReflectionExtensions/ReflectionExtensions.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Modules/UIBuilder/Editor/Utilities/SampleDocument/BuilderAttributesTestElement.cs b/Modules/UIBuilder/Editor/Utilities/SampleDocument/BuilderAttributesTestElement.cs
new file mode 100644
index 0000000000..b1805b2214
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Utilities/SampleDocument/BuilderAttributesTestElement.cs
@@ -0,0 +1,520 @@
+// 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.ComponentModel;
+using System.Reflection;
+using JetBrains.Annotations;
+using Unity.Properties;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+using Object = UnityEngine.Object;
+
+namespace Unity.UI.Builder
+{
+    interface IBuilderAttributesTestObject
+    {
+        object objAttr { get; set; }
+        string stringAttr { get; set; }
+        double doubleAttr  { get; set; }
+        float floatAttr { get; set; }
+        int intAttr { get; set; }
+        long longAttr { get; set; }
+        bool boolAttr { get; set; }
+        Color colorAttr { get; set; }
+        BuilderAttributesTestElement.Existance enumAttr { get; set; }
+        Texture2D assetAttr { get; set; }
+        event PropertyChangedEventHandler propertyChanged;
+    }
+
+    class BuilderAttributesTestFieldsView : VisualElement
+    {
+        private Dictionary<string, VisualElement> m_Controls = new();
+        private IBuilderAttributesTestObject m_Source;
+
+        public BuilderAttributesTestFieldsView(IBuilderAttributesTestObject source)
+        {
+            m_Source = source;
+            source.propertyChanged += OnPropertyChanged;
+            AddControls(this);
+        }
+
+        void UpdateControlValue(string propertyName)
+        {
+            var control = m_Controls[propertyName];
+            var controlType = control.GetType();
+            var sourceType = m_Source.GetType();
+            var sourcePropInfo = sourceType.GetProperty(propertyName, BindingFlags.Instance | BindingFlags.Public);
+            var value = sourcePropInfo.GetValue(m_Source);
+
+            if (control is BuilderObjectField objField)
+            {
+                UpdateControlObjectValue(objField, value);
+            }
+            else
+            {
+                var valuePropInfo = controlType.GetProperty("value", BindingFlags.Instance | BindingFlags.Public);
+                valuePropInfo.SetValue(control, value);
+            }
+        }
+
+        void UpdateControlObjectValue(BuilderObjectField objField, object value)
+        {
+            if (value != null && value is not Object)
+            {
+                objField.SetNonUnityObject(value);
+            }
+            else
+            {
+                objField.SetValueWithoutNotify(value as Object);
+            }
+        }
+
+        public TControl AddControl<TControl>(string propertyName,  VisualElement parent, Action<TControl> setup = null) where TControl : VisualElement, new()
+        {
+            var type = m_Source.GetType();
+            var propInfo = type.GetProperty(propertyName, BindingFlags.Instance | BindingFlags.Public);
+            var control = new TControl();
+
+            control.GetType().GetProperty("label", BindingFlags.Instance | BindingFlags.Public).SetValue(control, propertyName + " - " + propInfo.PropertyType.Name);
+            setup?.Invoke(control);
+            parent.Add(control);
+            m_Controls[propertyName] = control;
+            UpdateControlValue(propertyName);
+
+            return control;
+        }
+
+        public void AddControls(VisualElement parent)
+        {
+            AddControl<BuilderObjectField>("objAttr", parent);
+            AddControl<TextField>("stringAttr", parent);
+            AddControl<FloatField>("floatAttr", parent);
+            AddControl<DoubleField>("doubleAttr", parent);
+            AddControl<IntegerField>("intAttr", parent);
+            AddControl<LongField>("longAttr", parent);
+            AddControl<Toggle>("boolAttr", parent);
+            AddControl<ColorField>("colorAttr", parent);
+            AddControl<EnumField>("enumAttr", parent, (enumField) => enumField.Init(BuilderAttributesTestElement.Existance.Bad));
+            AddControl<BuilderObjectField>("assetAttr", parent, (objField) => objField.objectType = typeof(Texture2D));
+        }
+
+        void OnPropertyChanged(object obj, PropertyChangedEventArgs args)
+        {
+            UpdateControlValue(args.PropertyName);
+        }
+    }
+
+    class BuilderAttributesTestObject : IBuilderAttributesTestObject
+    {
+        [UsedImplicitly]
+        internal class UxmlObjectFactory : UxmlObjectFactory<BuilderAttributesTestObject, UxmlObjectTraits> {}
+
+        internal class UxmlObjectTraits : UnityEngine.UIElements.UxmlObjectTraits<BuilderAttributesTestObject>
+        {
+            UxmlAssetAttributeDescription<Object> m_ObjAttr = new() { name = "obj-attr" };
+            UxmlStringAttributeDescription m_String = new() { name = "string-attr", defaultValue = "default_value" };
+            UxmlFloatAttributeDescription m_Float = new() { name = "float-attr", defaultValue = 0.1f };
+            UxmlDoubleAttributeDescription m_Double = new() { name = "double-attr", defaultValue = 0.1 };
+            UxmlIntAttributeDescription m_Int = new() { name = "int-attr", defaultValue = 2 };
+            UxmlLongAttributeDescription m_Long = new() { name = "long-attr", defaultValue = 3 };
+            UxmlBoolAttributeDescription m_Bool = new() { name = "bool-attr", defaultValue = false };
+            UxmlColorAttributeDescription m_Color = new() { name = "color-attr", defaultValue = Color.red };
+            UxmlEnumAttributeDescription<BuilderAttributesTestElement.Existance> m_Enum = new() { name = "enum-attr", defaultValue = BuilderAttributesTestElement.Existance.Bad };
+            UxmlAssetAttributeDescription<Texture2D> m_Asset = new() { name = "asset-attr" };
+
+            public override void Init(ref BuilderAttributesTestObject obj, IUxmlAttributes bag, CreationContext cc)
+            {
+                base.Init(ref obj, bag, cc);
+
+                obj.objAttr = m_ObjAttr.GetValueFromBag(bag, cc);
+                obj.stringAttr = m_String.GetValueFromBag(bag, cc);
+                obj.floatAttr = m_Float.GetValueFromBag(bag, cc);
+                obj.doubleAttr = m_Double.GetValueFromBag(bag, cc);
+                obj.intAttr = m_Int.GetValueFromBag(bag, cc);
+                obj.longAttr = m_Long.GetValueFromBag(bag, cc);
+                obj.boolAttr = m_Bool.GetValueFromBag(bag, cc);
+                obj.colorAttr = m_Color.GetValueFromBag(bag, cc);
+                obj.enumAttr = m_Enum.GetValueFromBag(bag, cc);
+                obj.assetAttr = m_Asset.GetValueFromBag(bag, cc);
+            }
+        }
+
+        private object m_ObjAttr;
+        private string m_StringAttr;
+        private float m_FloatAttr;
+        private double m_DoubleAttr;
+        private int m_IntAttr;
+        private long m_LongAttr;
+        private bool m_BoolAttr;
+        private Color m_ColorAttr;
+        private BuilderAttributesTestElement.Existance m_EnumAttr;
+        private Texture2D m_AssetAttr;
+
+        [CreateProperty]
+        public object objAttr
+        {
+            get => m_ObjAttr;
+            set
+            {
+                if (m_ObjAttr == value)
+                    return;
+                m_ObjAttr = value;
+                NotifyPropertyChanged(nameof(objAttr));
+            }
+        }
+
+        [CreateProperty]
+        public string stringAttr
+        {
+            get => m_StringAttr;
+            set
+            {
+                if (m_StringAttr == value)
+                    return;
+                m_StringAttr = value;
+                NotifyPropertyChanged(nameof(stringAttr));
+            }
+        }
+
+        [CreateProperty]
+        public double doubleAttr
+        {
+            get => m_DoubleAttr;
+            set
+            {
+                if (m_DoubleAttr == value)
+                    return;
+                m_DoubleAttr = value;
+                NotifyPropertyChanged(nameof(doubleAttr));
+            }
+        }
+
+        [CreateProperty]
+        public float floatAttr
+        {
+            get => m_FloatAttr;
+            set
+            {
+                if (m_FloatAttr == value)
+                    return;
+                m_FloatAttr = value;
+                NotifyPropertyChanged(nameof(floatAttr));
+            }
+        }
+
+        [CreateProperty]
+        public int intAttr
+        {
+            get => m_IntAttr;
+            set
+            {
+                if (m_IntAttr == value)
+                    return;
+                m_IntAttr = value;
+                NotifyPropertyChanged(nameof(intAttr));
+            }
+        }
+
+        [CreateProperty]
+        public long longAttr
+        {
+            get => m_LongAttr;
+            set
+            {
+                if (m_LongAttr == value)
+                    return;
+                m_LongAttr = value;
+                NotifyPropertyChanged(nameof(longAttr));
+            }
+        }
+
+        [CreateProperty]
+        public bool boolAttr
+        {
+            get => m_BoolAttr;
+            set
+            {
+                if (m_BoolAttr == value)
+                    return;
+                m_BoolAttr = value;
+                NotifyPropertyChanged(nameof(boolAttr));
+            }
+        }
+
+        [CreateProperty]
+        public Color colorAttr
+        {
+            get => m_ColorAttr;
+            set
+            {
+                if (m_ColorAttr == value)
+                    return;
+                m_ColorAttr = value;
+                NotifyPropertyChanged(nameof(colorAttr));
+            }
+        }
+
+        [CreateProperty]
+        public BuilderAttributesTestElement.Existance enumAttr
+        {
+            get => m_EnumAttr;
+            set
+            {
+                if (m_EnumAttr == value)
+                    return;
+                m_EnumAttr = value;
+                NotifyPropertyChanged(nameof(enumAttr));
+            }
+        }
+
+        [CreateProperty]
+        public Texture2D assetAttr
+        {
+            get => m_AssetAttr;
+            set
+            {
+                if (m_AssetAttr == value)
+                    return;
+                m_AssetAttr = value;
+                NotifyPropertyChanged(nameof(assetAttr));
+            }
+        }
+
+        public event PropertyChangedEventHandler propertyChanged;
+
+        void NotifyPropertyChanged(string property)
+        {
+            propertyChanged?.Invoke(this, new PropertyChangedEventArgs(property));
+        }
+    }
+
+    internal class BuilderAttributesTestElement : Button, IBuilderAttributesTestObject
+    {
+        public enum Existance
+        {
+            None,
+            Good,
+            Bad
+        }
+
+        public new class UxmlFactory : UxmlFactory<BuilderAttributesTestElement, UxmlTraits> { }
+
+        public new class UxmlTraits : Button.UxmlTraits
+        {
+            UxmlAssetAttributeDescription<Object> m_ObjAttr = new() { name = "obj-attr" };
+            UxmlStringAttributeDescription m_String = new() { name = "string-attr", defaultValue = "default_value" };
+            UxmlFloatAttributeDescription m_Float = new() { name = "float-attr", defaultValue = 0.1f };
+            UxmlDoubleAttributeDescription m_Double = new() { name = "double-attr", defaultValue = 0.1 };
+            UxmlIntAttributeDescription m_Int = new() { name = "int-attr", defaultValue = 2 };
+            UxmlLongAttributeDescription m_Long = new() { name = "long-attr", defaultValue = 3 };
+            UxmlBoolAttributeDescription m_Bool = new() { name = "bool-attr", defaultValue = false };
+            UxmlColorAttributeDescription m_Color = new() { name = "color-attr", defaultValue = Color.red };
+            UxmlEnumAttributeDescription<Existance> m_Enum = new() { name = "enum-attr", defaultValue = Existance.Bad };
+            UxmlAssetAttributeDescription<Texture2D> m_Asset = new() { name = "asset-attr" };
+            readonly UxmlObjectListAttributeDescription<BuilderAttributesTestObject> m_Objects = new();
+            UxmlBoolAttributeDescription m_Unbindable = new() { name = "unbindable-attr" };
+
+            public override IEnumerable<UxmlChildElementDescription> uxmlChildElementsDescription
+            {
+                get { yield break; }
+            }
+
+            public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
+            {
+                base.Init(ve, bag, cc);
+                var ate = ve as BuilderAttributesTestElement;
+
+                ate.Clear();
+
+                ate.objAttr = m_ObjAttr.GetValueFromBag(bag, cc);
+                ate.stringAttr = m_String.GetValueFromBag(bag, cc);
+                ate.floatAttr = m_Float.GetValueFromBag(bag, cc);
+                ate.doubleAttr = m_Double.GetValueFromBag(bag, cc);
+                ate.intAttr = m_Int.GetValueFromBag(bag, cc);
+                ate.longAttr = m_Long.GetValueFromBag(bag, cc);
+                ate.boolAttr = m_Bool.GetValueFromBag(bag, cc);
+                ate.colorAttr = m_Color.GetValueFromBag(bag, cc);
+                ate.enumAttr = m_Enum.GetValueFromBag(bag, cc);
+                ate.assetAttr = m_Asset.GetValueFromBag(bag, cc);
+                ate.unbindableAttr = m_Unbindable.GetValueFromBag(bag, cc);
+
+                ate.Add(new BuilderAttributesTestFieldsView(ate));
+
+                ate.objectsAttr = m_Objects.GetValueFromBag(bag, cc);
+
+                var foldout = new FoldoutField() { text = "Objects"};
+
+                if (ate.objectsAttr != null)
+                {
+                    for (var i = 0; i < ate.objectsAttr.Count; i++)
+                    {
+                        var obj = ate.objectsAttr[i];
+                        var itemFoldout = new FoldoutField() {text = "Object #" + i};
+
+                        itemFoldout.Add(new BuilderAttributesTestFieldsView(obj));
+                        foldout.Add(itemFoldout);
+                    }
+                }
+
+                ate.Add(foldout);
+            }
+        }
+
+        private object m_ObjAttr;
+        private string m_StringAttr;
+        private float m_FloatAttr;
+        private double m_DoubleAttr;
+        private int m_IntAttr;
+        private long m_LongAttr;
+        private bool m_BoolAttr;
+        private Color m_ColorAttr;
+        private Existance m_EnumAttr;
+        private Texture2D m_AssetAttr;
+
+        [CreateProperty]
+        public object objAttr
+        {
+            get => m_ObjAttr;
+            set
+            {
+                if (m_ObjAttr == value)
+                    return;
+                m_ObjAttr = value;
+                NotifyPropertyChanged(nameof(objAttr));
+            }
+        }
+
+        [CreateProperty]
+        public string stringAttr
+        {
+            get => m_StringAttr;
+            set
+            {
+                if (m_StringAttr == value)
+                    return;
+                m_StringAttr = value;
+                NotifyPropertyChanged(nameof(stringAttr));
+            }
+        }
+
+        [CreateProperty]
+        public double doubleAttr
+        {
+            get => m_DoubleAttr;
+            set
+            {
+                if (m_DoubleAttr == value)
+                    return;
+                m_DoubleAttr = value;
+                NotifyPropertyChanged(nameof(doubleAttr));
+            }
+        }
+
+        [CreateProperty]
+        public float floatAttr
+        {
+            get => m_FloatAttr;
+            set
+            {
+                if (m_FloatAttr == value)
+                    return;
+                m_FloatAttr = value;
+                NotifyPropertyChanged(nameof(floatAttr));
+            }
+        }
+
+        [CreateProperty]
+        public int intAttr
+        {
+            get => m_IntAttr;
+            set
+            {
+                if (m_IntAttr == value)
+                    return;
+                m_IntAttr = value;
+                NotifyPropertyChanged(nameof(intAttr));
+            }
+        }
+
+        [CreateProperty]
+        public long longAttr
+        {
+            get => m_LongAttr;
+            set
+            {
+                if (m_LongAttr == value)
+                    return;
+                m_LongAttr = value;
+                NotifyPropertyChanged(nameof(longAttr));
+            }
+        }
+
+        [CreateProperty]
+        public bool boolAttr
+        {
+            get => m_BoolAttr;
+            set
+            {
+                if (m_BoolAttr == value)
+                    return;
+                m_BoolAttr = value;
+                NotifyPropertyChanged(nameof(boolAttr));
+            }
+        }
+
+        [CreateProperty]
+        public Color colorAttr
+        {
+            get => m_ColorAttr;
+            set
+            {
+                if (m_ColorAttr == value)
+                    return;
+                m_ColorAttr = value;
+                NotifyPropertyChanged(nameof(colorAttr));
+            }
+        }
+
+        [CreateProperty]
+        public BuilderAttributesTestElement.Existance enumAttr
+        {
+            get => m_EnumAttr;
+            set
+            {
+                if (m_EnumAttr == value)
+                    return;
+                m_EnumAttr = value;
+                NotifyPropertyChanged(nameof(enumAttr));
+            }
+        }
+
+        [CreateProperty]
+        public Texture2D assetAttr
+        {
+            get => m_AssetAttr;
+            set
+            {
+                if (m_AssetAttr == value)
+                    return;
+                m_AssetAttr = value;
+                NotifyPropertyChanged(nameof(assetAttr));
+            }
+        }
+
+        public List<BuilderAttributesTestObject> objectsAttr { get; set; }
+
+        public bool unbindableAttr { get; set; }
+
+        public event PropertyChangedEventHandler propertyChanged;
+
+        void NotifyPropertyChanged(string property)
+        {
+            propertyChanged?.Invoke(this, new PropertyChangedEventArgs(property));
+        }
+
+    }
+}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Selector/SelectorUtility.cs b/Modules/UIBuilder/Editor/Utilities/Selector/SelectorUtility.cs
similarity index 92%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Selector/SelectorUtility.cs
rename to Modules/UIBuilder/Editor/Utilities/Selector/SelectorUtility.cs
index 7f46f5057b..af1bd4d8aa 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Selector/SelectorUtility.cs
+++ b/Modules/UIBuilder/Editor/Utilities/Selector/SelectorUtility.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/AngleStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/AngleStyleField.cs
similarity index 91%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/AngleStyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/AngleStyleField.cs
index 63e02b540f..2ef4917006 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/AngleStyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/AngleStyleField.cs
@@ -1,3 +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 UnityEngine;
 using UnityEngine.UIElements;
 using UnityEngine.UIElements.StyleSheets;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/DimensionStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/DimensionStyleField.cs
similarity index 92%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/DimensionStyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/DimensionStyleField.cs
index 7b0fe03283..dec4f0f72b 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/DimensionStyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/DimensionStyleField.cs
@@ -1,9 +1,11 @@
+// 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 UnityEditor;
-using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
 using UnityEngine.UIElements.StyleSheets;
@@ -26,6 +28,8 @@ internal class DimensionStyleField : StyleField<float>
 
         IntegerField m_DraggerIntegerField;
 
+        bool m_IsFieldDraggerInitialized;
+
         float m_DragStep = 1;
 
         public float dragStep
@@ -224,6 +228,17 @@ protected override string GetTextFromValue()
 
         protected override void RefreshChildFields()
         {
+            if (!m_IsFieldDraggerInitialized)
+            {
+                var propName = GetProperty(BuilderConstants.InspectorStylePropertyNameVEPropertyName) as string;
+                if (!string.IsNullOrEmpty(propName))
+                {
+                    m_IsFieldDraggerInitialized = true;
+                    if (propName == "-unity-slice-scale")
+                        dragStep = BuilderConstants.DimensionStyleFieldReducedDragStep;
+                }
+            }
+
             textField.SetValueWithoutNotify(GetTextFromValue());
             UpdateDragger();
             optionsPopup.SetValueWithoutNotify(GetOptionFromValue());
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldSearchCompleter.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/FieldSearchCompleter.cs
similarity index 99%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldSearchCompleter.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/FieldSearchCompleter.cs
index a62d863eb9..d2e0469145 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldSearchCompleter.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/FieldSearchCompleter.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldStatusIndicator.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/FieldStatusIndicator.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldStatusIndicator.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/FieldStatusIndicator.cs
index cc206568f1..462c6aa5ce 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldStatusIndicator.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/FieldStatusIndicator.cs
@@ -1,3 +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;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldValueInfo.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/FieldValueInfo.cs
similarity index 99%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldValueInfo.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/FieldValueInfo.cs
index 610437a77f..241d0c672d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldValueInfo.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/FieldValueInfo.cs
@@ -1,3 +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.Linq;
 using System.Collections.Generic;
 using UnityEditor.UIElements.Debugger;
diff --git a/Modules/UIBuilder/Editor/Utilities/StyleField/FontDefinitionStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/FontDefinitionStyleField.cs
new file mode 100644
index 0000000000..1c98b60c1d
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/FontDefinitionStyleField.cs
@@ -0,0 +1,42 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using JetBrains.Annotations;
+using UnityEngine;
+using UnityEngine.TextCore.Text;
+using UnityEngine.UIElements;
+
+namespace Unity.UI.Builder
+{
+    [UsedImplicitly]
+    class FontDefinitionStyleField : MultiTypeField
+    {
+        [UsedImplicitly]
+        public new class UxmlFactory : UxmlFactory<FontDefinitionStyleField, UxmlTraits> {}
+
+        const string k_UssPath = BuilderConstants.UtilitiesPath + "/StyleField/FontDefinitionStyleField.uss";
+
+        const string k_FieldInputName = "unity-visual-input";
+        const string k_FontDefinitionStyleFieldContainerName = "unity-font-definition-style-field-container";
+        const string k_FontDefinitionStyleFieldContainerClassName = "unity-font-definition-style-field__container";
+
+        public FontDefinitionStyleField() : this(null) {}
+
+        public FontDefinitionStyleField(string label) : base(label)
+        {
+            AddType(typeof(FontAsset), "Font Asset");
+            AddType(typeof(Font), "Font");
+
+            styleSheets.Add(BuilderPackageUtilities.LoadAssetAtPath<StyleSheet>(k_UssPath));
+            var fieldContainer = new VisualElement {name = k_FontDefinitionStyleFieldContainerName};
+            fieldContainer.AddToClassList(k_FontDefinitionStyleFieldContainerClassName);
+
+            var fieldInput = this.Q(k_FieldInputName);
+            // Move visual input over to field container
+            fieldContainer.Add(fieldInput);
+
+            Add(fieldContainer);
+        }
+    }
+}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/ImageStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/ImageStyleField.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/ImageStyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/ImageStyleField.cs
index d0e60b0583..0e8cb0e453 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/ImageStyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/ImageStyleField.cs
@@ -1,3 +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 JetBrains.Annotations;
 using Object = UnityEngine.Object;
 using System;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/IntegerStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/IntegerStyleField.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/IntegerStyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/IntegerStyleField.cs
index f5268b23a1..e08766e66f 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/IntegerStyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/IntegerStyleField.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/NumericStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/NumericStyleField.cs
similarity index 93%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/NumericStyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/NumericStyleField.cs
index d6020b7cca..e269559025 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/NumericStyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/NumericStyleField.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionAnchorPoint.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/PositionAnchorPoint.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionAnchorPoint.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/PositionAnchorPoint.cs
index 0345ce0219..9b994ff450 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionAnchorPoint.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/PositionAnchorPoint.cs
@@ -1,3 +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;
 using UnityEngine.UIElements;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionAnchors.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/PositionAnchors.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionAnchors.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/PositionAnchors.cs
index cf97b094ba..b5cd8d436e 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionAnchors.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/PositionAnchors.cs
@@ -1,3 +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 JetBrains.Annotations;
 using UnityEditor;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionSection.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/PositionSection.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionSection.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/PositionSection.cs
index 1804c74b70..74d4bf276a 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionSection.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/PositionSection.cs
@@ -1,3 +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 JetBrains.Annotations;
 using UnityEngine.UIElements;
 using UnityEngine.UIElements.StyleSheets;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/PositionStyleField.cs
similarity index 90%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionStyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/PositionStyleField.cs
index d89b28f102..64da3cab68 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/PositionStyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/PositionStyleField.cs
@@ -1,3 +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 JetBrains.Annotations;
 using UnityEngine.UIElements;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/RotateStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/RotateStyleField.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/RotateStyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/RotateStyleField.cs
index 26010a2031..31a310fa76 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/RotateStyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/RotateStyleField.cs
@@ -1,3 +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;
 using JetBrains.Annotations;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/ScaleStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/ScaleStyleField.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/ScaleStyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/ScaleStyleField.cs
index 7d747b1ce7..7a76f36c9d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/ScaleStyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/ScaleStyleField.cs
@@ -1,3 +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;
 using System.Globalization;
 using JetBrains.Annotations;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/StyleField.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/StyleField.cs
index 3fcd3a7a9f..481dccd6a0 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/StyleField.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleFieldConstants.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/StyleFieldConstants.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleFieldConstants.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/StyleFieldConstants.cs
index 0d49ba441e..e158aae77b 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleFieldConstants.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/StyleFieldConstants.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEngine.UIElements;
 using UnityEngine.UIElements.StyleSheets.Syntax;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleFieldPopup.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/StyleFieldPopup.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleFieldPopup.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/StyleFieldPopup.cs
index 178067d3c7..4e7c981973 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleFieldPopup.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/StyleFieldPopup.cs
@@ -1,3 +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;
 using UnityEditor;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleVariableUtilities.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/StyleVariableUtilities.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleVariableUtilities.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/StyleVariableUtilities.cs
index 2dcf56df66..77e4462266 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/StyleVariableUtilities.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/StyleVariableUtilities.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TextShadowStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/TextShadowStyleField.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TextShadowStyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/TextShadowStyleField.cs
index 694ac96611..d6d3a4884b 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TextShadowStyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/TextShadowStyleField.cs
@@ -1,3 +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 JetBrains.Annotations;
 using UnityEngine.UIElements;
 using UnityEditor;
@@ -67,6 +71,11 @@ public TextShadowStyleField(string label) : base(label)
             m_OffsetXField = this.Q<DimensionStyleField>(s_OffsetXFieldName);
             m_OffsetYField = this.Q<DimensionStyleField>(s_OffsetYFieldName);
             m_BlurRadiusField = this.Q<DimensionStyleField>(s_BlurRadiusFieldName);
+
+            m_OffsetXField.dragStep = BuilderConstants.DimensionStyleFieldReducedDragStep;
+            m_OffsetYField.dragStep = BuilderConstants.DimensionStyleFieldReducedDragStep;
+            m_BlurRadiusField.dragStep = BuilderConstants.DimensionStyleFieldReducedDragStep;
+
             m_ColorField = this.Q<ColorField>(s_ColorFieldName);
 
             m_OffsetXField.RegisterValueChangedCallback(e =>
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TransformOriginSelector.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/TransformOriginSelector.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TransformOriginSelector.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/TransformOriginSelector.cs
index 7c8fe4fc1e..b5f65bd4fe 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TransformOriginSelector.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/TransformOriginSelector.cs
@@ -1,3 +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;
 using JetBrains.Annotations;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TransformOriginStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/TransformOriginStyleField.cs
similarity index 99%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TransformOriginStyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/TransformOriginStyleField.cs
index 07181d759f..eeeba2be88 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TransformOriginStyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/TransformOriginStyleField.cs
@@ -1,3 +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;
 using JetBrains.Annotations;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TranslateStyleField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/TranslateStyleField.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TranslateStyleField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/TranslateStyleField.cs
index 0a6ab79429..8584d9847c 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/TranslateStyleField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/TranslateStyleField.cs
@@ -1,3 +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;
 using JetBrains.Annotations;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableCompleter.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableCompleter.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableCompleter.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/VariableCompleter.cs
index 32c41877bf..00bce0ddce 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableCompleter.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableCompleter.cs
@@ -1,3 +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.Collections.Generic;
 using System.IO;
 using UnityEditor;
@@ -98,7 +102,7 @@ public static StyleValueType[] GetCompatibleStyleValueTypes(VariableEditingHandl
                 return new[] { StyleValueType.Color };
             }
 
-            if (BuilderInspectorStyleFields.IsComputedStyleFont(val, handler.styleName))
+            if (BuilderInspectorStyleFields.IsComputedStyleFont(val, handler.styleName) || BuilderInspectorStyleFields.IsComputedStyleFontAsset(val, handler.styleName))
             {
                 return new[] { StyleValueType.AssetReference, StyleValueType.ResourcePath };
             }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableEditingHandler.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableEditingHandler.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableEditingHandler.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/VariableEditingHandler.cs
index cbc1039f64..50676c39ab 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableEditingHandler.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableEditingHandler.cs
@@ -1,3 +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.Linq;
 using UnityEngine.UIElements;
 using UnityEngine.UIElements.StyleSheets;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableField.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableField.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableField.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/VariableField.cs
index 7d3bbba195..5065c026ec 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableField.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableField.cs
@@ -1,3 +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.Linq;
 using System.Text.RegularExpressions;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableInfo.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableInfo.cs
similarity index 87%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableInfo.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/VariableInfo.cs
index d66d8e4ce4..025a57d6de 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableInfo.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableInfo.cs
@@ -1,3 +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 UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableInfoTooltip.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableInfoTooltip.cs
similarity index 91%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableInfoTooltip.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/VariableInfoTooltip.cs
index ee7b63a7b7..007c604034 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableInfoTooltip.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableInfoTooltip.cs
@@ -1,3 +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;
 using System.IO;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableInfoView.cs b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableInfoView.cs
similarity index 97%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableInfoView.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleField/VariableInfoView.cs
index 02f3a0a937..50ce4f1744 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableInfoView.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleField/VariableInfoView.cs
@@ -1,3 +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.IO;
 using UnityEditor;
 using UnityEngine;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/CSSSpecCopy.cs b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/CSSSpecCopy.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/CSSSpecCopy.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/CSSSpecCopy.cs
index a075c41284..20507b56cf 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/CSSSpecCopy.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/CSSSpecCopy.cs
@@ -1,3 +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;
 using System.Text.RegularExpressions;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleComplexSelectorExtensions.cs b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleComplexSelectorExtensions.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleComplexSelectorExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleComplexSelectorExtensions.cs
index b5520f55f5..22cc53892c 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleComplexSelectorExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleComplexSelectorExtensions.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StylePropertyExtensions.cs b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StylePropertyExtensions.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StylePropertyExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StylePropertyExtensions.cs
index 2d5b3b40f3..0a5453f40c 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StylePropertyExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StylePropertyExtensions.cs
@@ -1,3 +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.Linq;
 using UnityEngine.UIElements;
 using UnityEngine.UIElements.StyleSheets;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StylePropertyManipulator.cs b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StylePropertyManipulator.cs
similarity index 99%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StylePropertyManipulator.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StylePropertyManipulator.cs
index 9e4d5639f9..bddce10644 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StylePropertyManipulator.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StylePropertyManipulator.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleRuleExtensions.cs b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleRuleExtensions.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleRuleExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleRuleExtensions.cs
index 18dbe2b903..3528deeb7d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleRuleExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleRuleExtensions.cs
@@ -1,3 +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.Collections.Generic;
 using System.Linq;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetExtensions.cs b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleSheetExtensions.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleSheetExtensions.cs
index 16dad3bd82..ab81f07258 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleSheetExtensions.cs
@@ -1,3 +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.Collections.Generic;
 using System.Linq;
 using System;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetToUss.cs b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleSheetToUss.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetToUss.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleSheetToUss.cs
index c2d71b9341..fe24a0ce40 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetToUss.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleSheetToUss.cs
@@ -1,3 +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;
 using System.Globalization;
 using System.IO;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetUtilities.cs b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleSheetUtilities.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetUtilities.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleSheetUtilities.cs
index 39f2435348..d51c69cf5d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetUtilities.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleSheetUtilities.cs
@@ -1,3 +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.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleValueHandleExtensions.cs b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleValueHandleExtensions.cs
similarity index 99%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleValueHandleExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleValueHandleExtensions.cs
index 8e69e5d63a..993bf94aca 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleValueHandleExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/StyleSheetExtensions/StyleValueHandleExtensions.cs
@@ -1,3 +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;
 using System.Linq;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/TextAlignStrip/TextAlignStrip.cs b/Modules/UIBuilder/Editor/Utilities/TextAlignStrip/TextAlignStrip.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/TextAlignStrip/TextAlignStrip.cs
rename to Modules/UIBuilder/Editor/Utilities/TextAlignStrip/TextAlignStrip.cs
index d8ca513470..ee3ca161db 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/TextAlignStrip/TextAlignStrip.cs
+++ b/Modules/UIBuilder/Editor/Utilities/TextAlignStrip/TextAlignStrip.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ToggleButtonStrip/ToggleButtonStrip.cs b/Modules/UIBuilder/Editor/Utilities/ToggleButtonStrip/ToggleButtonStrip.cs
similarity index 94%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ToggleButtonStrip/ToggleButtonStrip.cs
rename to Modules/UIBuilder/Editor/Utilities/ToggleButtonStrip/ToggleButtonStrip.cs
index df8069c52d..c5887dc975 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ToggleButtonStrip/ToggleButtonStrip.cs
+++ b/Modules/UIBuilder/Editor/Utilities/ToggleButtonStrip/ToggleButtonStrip.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/BuilderTransition.cs b/Modules/UIBuilder/Editor/Utilities/Transitions/BuilderTransition.cs
similarity index 86%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/BuilderTransition.cs
rename to Modules/UIBuilder/Editor/Utilities/Transitions/BuilderTransition.cs
index a75e654252..e56683c032 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/BuilderTransition.cs
+++ b/Modules/UIBuilder/Editor/Utilities/Transitions/BuilderTransition.cs
@@ -1,3 +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 UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/BuilderTransitionData.cs b/Modules/UIBuilder/Editor/Utilities/Transitions/BuilderTransitionData.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/BuilderTransitionData.cs
rename to Modules/UIBuilder/Editor/Utilities/Transitions/BuilderTransitionData.cs
index d91b0baec0..b331ed5ddf 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/BuilderTransitionData.cs
+++ b/Modules/UIBuilder/Editor/Utilities/Transitions/BuilderTransitionData.cs
@@ -1,3 +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;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionChangeType.cs b/Modules/UIBuilder/Editor/Utilities/Transitions/TransitionChangeType.cs
similarity index 81%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionChangeType.cs
rename to Modules/UIBuilder/Editor/Utilities/Transitions/TransitionChangeType.cs
index 0a7a0d58d6..7063549f8a 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionChangeType.cs
+++ b/Modules/UIBuilder/Editor/Utilities/Transitions/TransitionChangeType.cs
@@ -1,3 +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;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionEvents.cs b/Modules/UIBuilder/Editor/Utilities/Transitions/TransitionEvents.cs
similarity index 77%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionEvents.cs
rename to Modules/UIBuilder/Editor/Utilities/Transitions/TransitionEvents.cs
index 1c6cc3b0f4..45c3860d34 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionEvents.cs
+++ b/Modules/UIBuilder/Editor/Utilities/Transitions/TransitionEvents.cs
@@ -1,3 +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 UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionListView.cs b/Modules/UIBuilder/Editor/Utilities/Transitions/TransitionListView.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionListView.cs
rename to Modules/UIBuilder/Editor/Utilities/Transitions/TransitionListView.cs
index 724b32c1aa..980d5b9367 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionListView.cs
+++ b/Modules/UIBuilder/Editor/Utilities/Transitions/TransitionListView.cs
@@ -1,3 +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 UnityEditor;
 using UnityEngine.Pool;
 using UnityEngine.UIElements;
diff --git a/Modules/UIBuilder/Editor/Utilities/Transitions/TransitionPropertyDropdownContent.cs b/Modules/UIBuilder/Editor/Utilities/Transitions/TransitionPropertyDropdownContent.cs
new file mode 100644
index 0000000000..5565cab9fe
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Utilities/Transitions/TransitionPropertyDropdownContent.cs
@@ -0,0 +1,11 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace Unity.UI.Builder
+{
+    static class TransitionPropertyDropdownContent
+    {
+        public static CategoryDropdownContent Content;
+    }
+}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionsExtensions.cs b/Modules/UIBuilder/Editor/Utilities/Transitions/TransitionsExtensions.cs
similarity index 96%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionsExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/Transitions/TransitionsExtensions.cs
index 2f09465c1f..33d53369d0 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/TransitionsExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/Transitions/TransitionsExtensions.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/UIStyleValue.cs b/Modules/UIBuilder/Editor/Utilities/Transitions/UIStyleValue.cs
similarity index 80%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/UIStyleValue.cs
rename to Modules/UIBuilder/Editor/Utilities/Transitions/UIStyleValue.cs
index af787674bf..57a8456188 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/Transitions/UIStyleValue.cs
+++ b/Modules/UIBuilder/Editor/Utilities/Transitions/UIStyleValue.cs
@@ -1,3 +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 UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
diff --git a/Modules/UIBuilder/Editor/Utilities/TypeExtensions/TypeExtensions.cs b/Modules/UIBuilder/Editor/Utilities/TypeExtensions/TypeExtensions.cs
new file mode 100644
index 0000000000..9d7b9ebe61
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Utilities/TypeExtensions/TypeExtensions.cs
@@ -0,0 +1,13 @@
+// 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.UI.Builder
+{
+    internal static class TypeExtensions
+    {
+        public static string GetFullNameWithAssembly(this Type type) => $"{type.FullName}, {type.Assembly.GetName().Name}";
+    }
+}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/TypeField/BuilderAttributeTypeName.cs b/Modules/UIBuilder/Editor/Utilities/TypeField/BuilderAttributeTypeName.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/TypeField/BuilderAttributeTypeName.cs
rename to Modules/UIBuilder/Editor/Utilities/TypeField/BuilderAttributeTypeName.cs
index 0fa971fae8..6b48954a9d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/TypeField/BuilderAttributeTypeName.cs
+++ b/Modules/UIBuilder/Editor/Utilities/TypeField/BuilderAttributeTypeName.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using UnityEditor;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/UIExtensionsTestWindow/UIExtensionsTestWindow.cs b/Modules/UIBuilder/Editor/Utilities/UIExtensionsTestWindow/UIExtensionsTestWindow.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/UIExtensionsTestWindow/UIExtensionsTestWindow.cs
rename to Modules/UIBuilder/Editor/Utilities/UIExtensionsTestWindow/UIExtensionsTestWindow.cs
index d1731da773..8ac377a7ec 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/UIExtensionsTestWindow/UIExtensionsTestWindow.cs
+++ b/Modules/UIBuilder/Editor/Utilities/UIExtensionsTestWindow/UIExtensionsTestWindow.cs
@@ -1,3 +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.Text;
 using UnityEngine;
 using UnityEngine.UIElements;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/UnityUIBuilderSelectionMarker/UnityUIBuilderSelectionMarker.cs b/Modules/UIBuilder/Editor/Utilities/UnityUIBuilderSelectionMarker/UnityUIBuilderSelectionMarker.cs
similarity index 86%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/UnityUIBuilderSelectionMarker/UnityUIBuilderSelectionMarker.cs
rename to Modules/UIBuilder/Editor/Utilities/UnityUIBuilderSelectionMarker/UnityUIBuilderSelectionMarker.cs
index a1a2019b37..c05dc7e556 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/UnityUIBuilderSelectionMarker/UnityUIBuilderSelectionMarker.cs
+++ b/Modules/UIBuilder/Editor/Utilities/UnityUIBuilderSelectionMarker/UnityUIBuilderSelectionMarker.cs
@@ -1,3 +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 UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualElementExtensions/VisualElementExtensions.cs b/Modules/UIBuilder/Editor/Utilities/VisualElementExtensions/VisualElementExtensions.cs
similarity index 89%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualElementExtensions/VisualElementExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/VisualElementExtensions/VisualElementExtensions.cs
index ed5d13a4cf..fa717c1d0d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualElementExtensions/VisualElementExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/VisualElementExtensions/VisualElementExtensions.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.Reflection;
@@ -16,6 +20,17 @@ internal static class VisualElementExtensions
             "template",
         };
 
+        public static UxmlAttributeDescription GetLinkedAttributeDescription(this VisualElement ve)
+        {
+            return ve.GetProperty(BuilderConstants.InspectorLinkedAttributeDescriptionVEPropertyName) as
+                    UxmlAttributeDescription;
+        }
+
+        public static void SetLinkedAttributeDescription(this VisualElement ve, UxmlAttributeDescription attribute)
+        {
+            ve.SetProperty(BuilderConstants.InspectorLinkedAttributeDescriptionVEPropertyName, attribute);
+        }
+
         public static List<UxmlAttributeDescription> GetAttributeDescriptions(this VisualElement ve)
         {
             var attributeList = new List<UxmlAttributeDescription>();
@@ -238,6 +253,22 @@ public static bool IsPartOfActiveVisualTreeAsset(this VisualElement element, Bui
             return hasAssetLink || hasVTALink || isDocumentRootElement;
         }
 
+        public static bool IsActiveSubDocumentRoot(this VisualElement element, BuilderDocument builderDocument)
+        {
+            if (!builderDocument.activeOpenUXMLFile.isChildSubDocument ||
+                element is not TemplateContainer templateContainer ||
+                templateContainer.templateSource != builderDocument.activeOpenUXMLFile.visualTreeAsset)
+            {
+                return false;
+            }
+            
+            var templateAsset = templateContainer.GetVisualElementAsset() as TemplateAsset;
+            var activeOpenUxmlFile = builderDocument.activeOpenUXMLFile;
+            var templateAssetIndex =
+                activeOpenUxmlFile.openSubDocumentParent.visualTreeAsset.templateAssets.IndexOf(templateAsset);
+            return templateAssetIndex == activeOpenUxmlFile.openSubDocumentParentSourceTemplateAssetIndex;
+        }
+
         public static bool IsSelector(this VisualElement element)
         {
             return BuilderSharedStyles.IsSelectorElement(element);
@@ -413,12 +444,7 @@ public static VisualElement GetVisualInput(this VisualElement ve)
 
         public static FieldStatusIndicator GetFieldStatusIndicator(this VisualElement field)
         {
-            FieldStatusIndicator statusIndicator = null;
-            
-            if (field.HasProperty(FieldStatusIndicator.s_FieldStatusIndicatorVEPropertyName))
-            {
-               statusIndicator = field.GetProperty(FieldStatusIndicator.s_FieldStatusIndicatorVEPropertyName) as FieldStatusIndicator;
-            }
+            var statusIndicator = field.GetProperty(FieldStatusIndicator.s_FieldStatusIndicatorVEPropertyName) as FieldStatusIndicator;
 
             if (statusIndicator == null)
             {
@@ -427,7 +453,7 @@ public static FieldStatusIndicator GetFieldStatusIndicator(this VisualElement fi
                 if (row == null)
                     return null;
 
-                // If the field has a name then look for a FieldStatusIndicator in the same containing row that has 
+                // If the field has a name then look for a FieldStatusIndicator in the same containing row that has
                 // targetFieldName matching the field's name.
                 if (!string.IsNullOrEmpty(field.name))
                 {
@@ -454,6 +480,8 @@ public static FieldStatusIndicator GetFieldStatusIndicator(this VisualElement fi
 
             return statusIndicator;
         }
+
+        public static IBuilderUxmlAttributeFieldFactory GetFieldFactory(this VisualElement field) => field.GetProperty(BuilderConstants.AttributeFieldFactoryVEPropertyName) as IBuilderUxmlAttributeFieldFactory;
     }
 
     enum BuilderElementStyle
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/IUxmlFactoryExtensions.cs b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/IUxmlFactoryExtensions.cs
similarity index 69%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/IUxmlFactoryExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/IUxmlFactoryExtensions.cs
index e48c1feb75..84de779af1 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/IUxmlFactoryExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/IUxmlFactoryExtensions.cs
@@ -1,3 +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.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -11,7 +15,7 @@ internal static class IUXMLFactoryExtensions
     {
         internal static readonly string s_TraitsNotFoundMessage = "UI Builder: IUxmlFactory.m_Traits field has not been found! Update the reflection code!";
 
-        public static UxmlTraits GetTraits(this IUxmlFactory factory)
+        public static BaseUxmlTraits GetTraits(this IBaseUxmlFactory factory)
         {
             var traitsField = factory.GetType()
                 .GetField("m_Traits", BindingFlags.Instance | BindingFlags.NonPublic);
@@ -21,7 +25,7 @@ public static UxmlTraits GetTraits(this IUxmlFactory factory)
                 return null;
             }
 
-            return traitsField.GetValue(factory) as UxmlTraits;
+            return traitsField.GetValue(factory) as BaseUxmlTraits;
         }
     }
 }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/TemplateAssetExtensions.cs b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/TemplateAssetExtensions.cs
similarity index 92%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/TemplateAssetExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/TemplateAssetExtensions.cs
index facdc552b2..1631940fe6 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/TemplateAssetExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/TemplateAssetExtensions.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEngine.UIElements;
 
diff --git a/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/ValueToUXML.cs b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/ValueToUXML.cs
new file mode 100644
index 0000000000..810cfdedc6
--- /dev/null
+++ b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/ValueToUXML.cs
@@ -0,0 +1,80 @@
+// 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 UnityEngine;
+using UnityEditor.UIElements.StyleSheets;
+
+namespace Unity.UI.Builder
+{
+    internal interface IValueToUxmlConverter<T>
+    {
+        string Convert(T value);
+    }
+
+    internal interface IContravariantValueToUxmlConverter<in T>
+    {
+        string Convert(T value);
+    }
+
+    internal class ValueToUxmlConverter : IValueToUxmlConverter<bool>
+        , IValueToUxmlConverter<float>
+        , IValueToUxmlConverter<double>
+        , IValueToUxmlConverter<Color>
+        , IValueToUxmlConverter<string>
+        , IContravariantValueToUxmlConverter<Object>
+    {
+        public string Convert<T>(T value)
+        {
+            switch (this)
+            {
+                case IValueToUxmlConverter<T> converter: return converter.Convert(value);
+                case IContravariantValueToUxmlConverter<T> converter: return converter.Convert(value);
+                default: return value.ToString();
+            }
+        }
+
+        public string Convert(bool value)
+        {
+            return value.ToString().ToLower();
+        }
+
+        public string Convert(float value)
+        {
+            return value.ToString(CultureInfo.InvariantCulture.NumberFormat);
+        }
+
+        public string Convert(double value)
+        {
+            return value.ToString(CultureInfo.InvariantCulture.NumberFormat);
+        }
+
+        public string Convert(Color value)
+        {
+            return "#" + ColorUtility.ToHtmlStringRGBA(value);
+        }
+
+        public string Convert(string value)
+        {
+            return value;
+        }
+
+        public string Convert(Object value)
+        {
+            return value ? URIHelpers.MakeAssetUri(value) : null;
+        }
+    }
+
+    /// <summary>
+    /// This helper class converts a value into its uxml string representation.
+    /// </summary>
+    internal static class ValueToUxml
+    {
+        static readonly ValueToUxmlConverter s_Converter = new();
+        public static string Convert<T>(T value)
+        {
+            return s_Converter.Convert(value);
+        }
+    }
+}
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualElementAssetExtensions.cs b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualElementAssetExtensions.cs
similarity index 95%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualElementAssetExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualElementAssetExtensions.cs
index 8379cebb6d..cefd2602a1 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualElementAssetExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualElementAssetExtensions.cs
@@ -1,3 +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.Collections.Generic;
 using System.Linq;
 using System.Reflection;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetExtensions.cs b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetExtensions.cs
similarity index 99%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetExtensions.cs
rename to Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetExtensions.cs
index b849ccee55..df6e2ec43e 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetExtensions.cs
+++ b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetExtensions.cs
@@ -1,3 +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;
 using System.Collections.Generic;
 using System.IO;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetLinkedCloneTree.cs b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetLinkedCloneTree.cs
similarity index 98%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetLinkedCloneTree.cs
rename to Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetLinkedCloneTree.cs
index 759598cca8..3a4c41af95 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetLinkedCloneTree.cs
+++ b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetLinkedCloneTree.cs
@@ -1,3 +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.Collections.Generic;
 using UnityEngine.Assertions;
 using System;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetToUXML.cs b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetToUXML.cs
similarity index 99%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetToUXML.cs
rename to Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetToUXML.cs
index 5789779490..0c98f7045f 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetToUXML.cs
+++ b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetToUXML.cs
@@ -1,3 +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.Collections.Generic;
 using System.Text;
 using UnityEngine.Assertions;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetUtilities.cs b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetUtilities.cs
similarity index 72%
rename from External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetUtilities.cs
rename to Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetUtilities.cs
index 0b29eac090..5f1a7a1089 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetUtilities.cs
+++ b/Modules/UIBuilder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetUtilities.cs
@@ -1,4 +1,9 @@
+// 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;
 using UnityEngine.Assertions;
 using UnityEngine.UIElements;
@@ -7,6 +12,14 @@ namespace Unity.UI.Builder
 {
     internal static class VisualTreeAssetUtilities
     {
+        public struct ElementsInfo
+        {
+            public int elements { get; set; }
+            public int editorElements { get; set; }
+            public int customElements { get; set; }
+            public int hierarchyDepth { get; set; }
+        }
+        
         public static VisualTreeAsset CreateInstance()
         {
             var vta = ScriptableObject.CreateInstance<VisualTreeAsset>();
@@ -202,5 +215,65 @@ public static VisualElementAsset ReparentElementInDocument(
 
             return vea;
         }
+        
+        static void GetElementsInfoRecursively(List<VisualElementAsset> rootAssets,
+            Dictionary<int, List<VisualElementAsset>> idToChildren, ref ElementsInfo elementsInfo)
+        {
+            if (rootAssets == null || rootAssets.Count == 0)
+            {
+                return;
+            }
+            
+            elementsInfo.hierarchyDepth++;
+
+            rootAssets.Sort(CompareForOrder);
+            foreach (var rootElement in rootAssets)
+            {
+                Assert.IsNotNull(rootElement);
+
+                // Editor elements
+                if (rootElement.fullTypeName.Contains("UnityEditor") 
+                    || BuilderLibraryContent.IsEditorOnlyControl(rootElement.fullTypeName))
+                {
+                    elementsInfo.editorElements++;
+                }
+                // Custom controls
+                // i.e. everything that is not a template and is not in the Standard library tab
+                else if (rootElement.fullTypeName != BuilderConstants.UxmlInstanceTypeName 
+                         && !BuilderLibraryContent.IsStandardControl(rootElement.fullTypeName))
+                {
+                    elementsInfo.customElements++;
+                }
+
+                // All elements
+                elementsInfo.elements++;
+                
+                idToChildren.TryGetValue(rootElement.id, out var rootChildAssets);
+                rootChildAssets?.Sort(CompareForOrder);
+                GetElementsInfoRecursively(rootChildAssets, idToChildren, ref elementsInfo);
+            }
+        }
+
+        /// <summary>
+        /// It gathers the data needed to fill <see cref="ElementsInfo"/>
+        /// </summary>
+        internal static ElementsInfo GetElementsInfo(Dictionary<int, List<VisualElementAsset>> idToChildren)
+        {
+            ElementsInfo elementsInfo = new ElementsInfo();
+
+            // Tree root have a parentId == 0
+            idToChildren.TryGetValue(0, out var rootAssets);
+            if (rootAssets == null || rootAssets.Count == 0) 
+                return elementsInfo;
+            
+            var root = rootAssets[0];
+            rootAssets.Clear();
+            idToChildren.TryGetValue(root.id, out rootAssets);
+            rootAssets?.Sort(CompareForOrder);
+
+            GetElementsInfoRecursively(rootAssets, idToChildren, ref elementsInfo);
+
+            return elementsInfo;
+        }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/BoundsFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/BoundsFieldSnippet.cs
index 845830b800..392aca487a 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/BoundsFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/BoundsFieldSnippet.cs
@@ -13,7 +13,7 @@ internal class BoundsFieldSnippet : ElementSnippet<BoundsFieldSnippet>
         internal override void Apply(VisualElement container)
         {
             /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<BoundsField>("the-uxml-field");
             uxmlField.value = new Bounds(new Vector3(1.1f, 2.2f, 3.3f), new Vector3(2.2f, 4.4f, 6.6f));
 
@@ -24,7 +24,7 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Bounds>>((evt) =>
             {
                 csharpField.value = evt.newValue;
diff --git a/Modules/UIElementsSamplesEditor/Snippets/BoundsIntFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/BoundsIntFieldSnippet.cs
index 1246e7ca9b..41ecae700f 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/BoundsIntFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/BoundsIntFieldSnippet.cs
@@ -13,7 +13,7 @@ internal class BoundsIntFieldSnippet : ElementSnippet<BoundsIntFieldSnippet>
         internal override void Apply(VisualElement container)
         {
             /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<BoundsIntField>("the-uxml-field");
             uxmlField.value = new BoundsInt(new Vector3Int(1, 2, 3), new Vector3Int(2, 4, 6));
 
@@ -24,7 +24,7 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<BoundsInt>>((evt) =>
             {
                 csharpField.value = evt.newValue;
diff --git a/Modules/UIElementsSamplesEditor/Snippets/ButtonSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/ButtonSnippet.cs
index ce59c301e8..d010228c2d 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/ButtonSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/ButtonSnippet.cs
@@ -13,7 +13,7 @@ internal class ButtonSnippet : ElementSnippet<ButtonSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // Action to perform when button is pressed.
             // Toggles the text on all buttons in 'container'.
             Action action = () =>
@@ -32,7 +32,7 @@ internal override void Apply(VisualElement container)
             var csharpButton = new Button(action) { text = "C# Button" };
             csharpButton.AddToClassList("some-styled-button");
             container.Add(csharpButton);
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/ColorFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/ColorFieldSnippet.cs
index 3875159877..629e4337ac 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/ColorFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/ColorFieldSnippet.cs
@@ -12,8 +12,8 @@ internal class ColorFieldSnippet : ElementSnippet<ColorFieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<ColorField>("the-uxml-field");
             uxmlField.value = Color.red;
 
@@ -24,12 +24,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Color>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/CurveFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/CurveFieldSnippet.cs
index e5e74d36a9..ce86dd1362 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/CurveFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/CurveFieldSnippet.cs
@@ -12,8 +12,8 @@ internal class CurveFieldSnippet : ElementSnippet<CurveFieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<CurveField>("the-uxml-field");
             uxmlField.value = new AnimationCurve(new Keyframe[]
                 { new Keyframe(0, 0), new Keyframe(5, 8), new Keyframe(10, 4) });
@@ -25,12 +25,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<AnimationCurve>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/DropdownFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/DropdownFieldSnippet.cs
index 257f0a6a70..f926551be6 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/DropdownFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/DropdownFieldSnippet.cs
@@ -12,12 +12,12 @@ internal class DropdownFieldSnippet : ElementSnippet<DropdownFieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // You can provide the list of choices by code, or by comma separated values in UXML
             // <DropdownField .... choices="Option 1,Option 2,Option 3" .... />
             var choices = new List<string> { "Option 1", "Option 2", "Option 3" };
 
-            // Get a reference to the dropdown field from UXML and assign it its value.
+            // Get a reference to the dropdown field from UXML and assign a value to it.
             var uxmlField = container.Q<DropdownField>("the-uxml-field");
             uxmlField.choices = choices;
             uxmlField.value = choices[0];
@@ -28,12 +28,12 @@ internal override void Apply(VisualElement container)
             csharpField.AddToClassList("some-styled-field");
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<string>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/EnumFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/EnumFieldSnippet.cs
index c2db911145..ec378885d4 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/EnumFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/EnumFieldSnippet.cs
@@ -12,10 +12,10 @@ internal class EnumFieldSnippet : ElementSnippet<EnumFieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // Get a reference to the field from UXML,
             // initialize it with an Enum type,
-            // and assign it its value.
+            // and assign a value to it.
             var uxmlField = container.Q<EnumField>("the-uxml-field");
             uxmlField.Init(TextAlignment.Center);
             uxmlField.value = TextAlignment.Left;
@@ -27,12 +27,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Enum>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/EnumFlagsFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/EnumFlagsFieldSnippet.cs
index 4e6578b02f..892ffc3de5 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/EnumFlagsFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/EnumFlagsFieldSnippet.cs
@@ -21,10 +21,10 @@ enum EnumFlags
 
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // Get a reference to the field from UXML,
             // initialize it with an Enum type,
-            // and assign it its value.
+            // and assign a value to it.
             var uxmlField = container.Q<EnumFlagsField>("the-uxml-field");
             uxmlField.Init(EnumFlags.First);
             uxmlField.value = EnumFlags.Second;
@@ -36,12 +36,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Enum>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/FloatFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/FloatFieldSnippet.cs
index 0466f43f07..0eaf6e190f 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/FloatFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/FloatFieldSnippet.cs
@@ -12,8 +12,8 @@ internal class FloatFieldSnippet : ElementSnippet<FloatFieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<FloatField>("the-uxml-field");
             uxmlField.value = 42.4f;
 
@@ -24,12 +24,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<float>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/GradientFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/GradientFieldSnippet.cs
index 2bed14efdc..244f9ac2a6 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/GradientFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/GradientFieldSnippet.cs
@@ -12,7 +12,7 @@ internal class GradientFieldSnippet : ElementSnippet<GradientFieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             var initialValue = new Gradient();
             initialValue.colorKeys = new GradientColorKey[]
             {
@@ -21,7 +21,7 @@ internal override void Apply(VisualElement container)
                 new GradientColorKey(Color.green, 20)
             };
 
-            // Get a reference to the field from UXML and assign it its value.
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<GradientField>("the-uxml-field");
             uxmlField.value = initialValue;
 
@@ -32,12 +32,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Gradient>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/HelpBoxSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/HelpBoxSnippet.cs
index 04d268c3f2..1ba2a3edfa 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/HelpBoxSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/HelpBoxSnippet.cs
@@ -10,7 +10,7 @@ internal class HelpBoxSnippet : ElementSnippet<HelpBoxSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // Get a reference to the help box from UXML and update its text.
             var uxmlHelpBox = container.Q<HelpBox>("the-uxml-help-box");
             uxmlHelpBox.text += " (Updated in C#)";
@@ -19,7 +19,7 @@ internal override void Apply(VisualElement container)
             var csharpHelpBox = new HelpBox("This is a help box", HelpBoxMessageType.Warning);
             csharpHelpBox.AddToClassList("some-styled-help-box");
             container.Add(csharpHelpBox);
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/IntegerFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/IntegerFieldSnippet.cs
index 428ed8c114..1e0c41b063 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/IntegerFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/IntegerFieldSnippet.cs
@@ -13,7 +13,7 @@ internal class IntegerFieldSnippet : ElementSnippet<IntegerFieldSnippet>
         internal override void Apply(VisualElement container)
         {
             /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<IntegerField>("the-uxml-field");
             uxmlField.value = 42;
 
@@ -24,7 +24,7 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<int>>((evt) =>
             {
                 csharpField.value = evt.newValue;
diff --git a/Modules/UIElementsSamplesEditor/Snippets/LabelSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/LabelSnippet.cs
index 979b0c8107..706044bf74 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/LabelSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/LabelSnippet.cs
@@ -12,7 +12,7 @@ internal class LabelSnippet : ElementSnippet<LabelSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // Get a reference to the label from UXML and update its text.
             var uxmlLabel = container.Q<Label>("the-uxml-label");
             uxmlLabel.text += " (Updated in C#)";
@@ -21,7 +21,7 @@ internal override void Apply(VisualElement container)
             var csharpLabel = new Label("C# Label");
             csharpLabel.AddToClassList("some-styled-label");
             container.Add(csharpLabel);
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/LayerFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/LayerFieldSnippet.cs
index 7eb7042b91..632af669b1 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/LayerFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/LayerFieldSnippet.cs
@@ -12,8 +12,8 @@ internal class LayerFieldSnippet : ElementSnippet<LayerFieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<LayerField>("the-uxml-field");
             uxmlField.value = 1;
 
@@ -24,12 +24,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<int>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/LayerMaskFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/LayerMaskFieldSnippet.cs
index d9addbc4c7..c2681d615f 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/LayerMaskFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/LayerMaskFieldSnippet.cs
@@ -12,8 +12,8 @@ internal class LayerMaskFieldSnippet : ElementSnippet<LayerMaskFieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<LayerMaskField>("the-uxml-field");
             uxmlField.value = 0;
 
@@ -24,12 +24,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<int>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/ListViewSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/ListViewSnippet.cs
index 756324dd5b..3861de15e1 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/ListViewSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/ListViewSnippet.cs
@@ -13,7 +13,7 @@ internal class ListViewSnippet : ElementSnippet<ListViewSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // Create some list of data, here simply numbers in interval [1, 1000]
             const int itemCount = 1000;
             var items = new List<string>(itemCount);
@@ -41,7 +41,7 @@ internal override void Apply(VisualElement container)
 
             // Callback invoked when the user changes the selection inside the ListView
             listView.selectionChanged += Debug.Log;
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/LongFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/LongFieldSnippet.cs
index 78c23830af..66cfb3702d 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/LongFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/LongFieldSnippet.cs
@@ -12,8 +12,8 @@ internal class LongFieldSnippet : ElementSnippet<LongFieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<LongField>("the-uxml-field");
             uxmlField.value = 42;
 
@@ -24,12 +24,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<long>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/MaskFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/MaskFieldSnippet.cs
index 24e52a3ff1..4fb8e69246 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/MaskFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/MaskFieldSnippet.cs
@@ -16,7 +16,7 @@ internal override void Apply(VisualElement container)
             /// <sample>
             var choices = new List<string> { "First", "Second", "Third" };
 
-            // Get a reference to the field from UXML and assign it its value.
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<MaskField>("the-uxml-field");
             uxmlField.value = 1;
             uxmlField.choices = choices;
@@ -28,7 +28,7 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<int>>((evt) =>
             {
                 csharpField.value = evt.newValue;
diff --git a/Modules/UIElementsSamplesEditor/Snippets/MinMaxSliderSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/MinMaxSliderSnippet.cs
index 3d13be15c8..40da668661 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/MinMaxSliderSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/MinMaxSliderSnippet.cs
@@ -12,8 +12,8 @@ internal class MinMaxSliderSnippet : ElementSnippet<MinMaxSliderSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<MinMaxSlider>("the-uxml-field");
             uxmlField.value = new Vector2(10, 12);
 
@@ -24,12 +24,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Vector2>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/ObjectFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/ObjectFieldSnippet.cs
index 8bcfbd25ba..3b6e998ca0 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/ObjectFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/ObjectFieldSnippet.cs
@@ -13,7 +13,7 @@ internal class ObjectFieldSnippet : ElementSnippet<ObjectFieldSnippet>
         internal override void Apply(VisualElement container)
         {
             /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<ObjectField>("the-uxml-field");
             uxmlField.value = new Texture2D(10, 10) { name = "new_texture" };
 
@@ -24,7 +24,7 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Object>>((evt) =>
             {
                 csharpField.value = evt.newValue;
diff --git a/Modules/UIElementsSamplesEditor/Snippets/PopupFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/PopupFieldSnippet.cs
index 25d48e5ec0..30c02b338f 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/PopupFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/PopupFieldSnippet.cs
@@ -17,7 +17,7 @@ internal override void Apply(VisualElement container)
 
             var choices = new List<string> { "First", "Second", "Third" };
 
-            // Create a new field and assign it its value.
+            // Create a new field and assign a value to it.
             var normalField = new PopupField<string>("Normal Field", choices, 0);
             normalField.value = "Second";
             container.Add(normalField);
@@ -29,7 +29,7 @@ internal override void Apply(VisualElement container)
             styledField.value = normalField.value;
             container.Add(styledField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             normalField.RegisterCallback<ChangeEvent<string>>((evt) =>
             {
                 styledField.value = evt.newValue;
diff --git a/Modules/UIElementsSamplesEditor/Snippets/RadioButtonGroupSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/RadioButtonGroupSnippet.cs
index a6d41e5960..4f113aeb1b 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/RadioButtonGroupSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/RadioButtonGroupSnippet.cs
@@ -12,12 +12,12 @@ internal class RadioButtonGroupSnippet : ElementSnippet<RadioButtonGroupSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // You can provide the list of choices by code, or by comma separated values in UXML
             // <DropdownField .... choices="Option 1,Option 2,Option 3" .... />
             var choices = new List<string> { "Option 1", "Option 2", "Option 3" };
 
-            // Get a reference to the radio button group field from UXML and assign it its value.
+            // Get a reference to the radio button group field from UXML and assign a value to it.
             var uxmlField = container.Q<RadioButtonGroup>("the-uxml-field");
             uxmlField.choices = choices;
             uxmlField.value = 0;
@@ -30,12 +30,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<int>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/RadioButtonSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/RadioButtonSnippet.cs
index 5a034256eb..6a8c20b6d7 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/RadioButtonSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/RadioButtonSnippet.cs
@@ -11,10 +11,10 @@ internal class RadioButtonSnippet : ElementSnippet<RadioButtonSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // Note: See also RadioButtonGroup in the ChoiceField section of UI Toolkit Samples
 
-            // Get a reference to the first radio button from UXML and assign it its value.
+            // Get a reference to the first radio button from UXML and assign a value to it.
             var uxmlField1 = container.Q<RadioButton>("the-uxml-field1");
             var uxmlField2 = container.Q<RadioButton>("the-uxml-field2");
             uxmlField1.value = true;
@@ -35,7 +35,7 @@ internal override void Apply(VisualElement container)
 
             csharpField1.value = uxmlField1.value;
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField1.RegisterCallback<ChangeEvent<bool>>((evt) =>
             {
                 csharpField1.value = evt.newValue;
@@ -44,7 +44,7 @@ internal override void Apply(VisualElement container)
             {
                 csharpField2.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/RectFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/RectFieldSnippet.cs
index e03d8fd365..895131c3ee 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/RectFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/RectFieldSnippet.cs
@@ -13,7 +13,7 @@ internal class RectFieldSnippet : ElementSnippet<RectFieldSnippet>
         internal override void Apply(VisualElement container)
         {
             /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<RectField>("the-uxml-field");
             uxmlField.value = new Rect(0.0f, 5.5f, 10.1f, 20.3f);
 
@@ -24,7 +24,7 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Rect>>((evt) =>
             {
                 csharpField.value = evt.newValue;
diff --git a/Modules/UIElementsSamplesEditor/Snippets/RectIntFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/RectIntFieldSnippet.cs
index 22c68e8d17..c28ec65bfe 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/RectIntFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/RectIntFieldSnippet.cs
@@ -13,7 +13,7 @@ internal class RectIntFieldSnippet : ElementSnippet<RectIntFieldSnippet>
         internal override void Apply(VisualElement container)
         {
             /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<RectIntField>("the-uxml-field");
             uxmlField.value = new RectInt(0, 5, 10, 20);
 
@@ -24,7 +24,7 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<RectInt>>((evt) =>
             {
                 csharpField.value = evt.newValue;
diff --git a/Modules/UIElementsSamplesEditor/Snippets/ScrollerSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/ScrollerSnippet.cs
index 30bef3c7be..cc0ba84fa6 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/ScrollerSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/ScrollerSnippet.cs
@@ -12,7 +12,7 @@ internal class ScrollerSnippet : ElementSnippet<ScrollerSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // Get a reference to the scroller from UXML and assign it its value.
             var uxmlField = container.Q<Scroller>("the-uxml-scroller");
             uxmlField.valueChanged += (v) => {};
@@ -30,7 +30,7 @@ internal override void Apply(VisualElement container)
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/SliderIntSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/SliderIntSnippet.cs
index d44a8b82b6..f0427adbb7 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/SliderIntSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/SliderIntSnippet.cs
@@ -12,7 +12,7 @@ internal class SliderIntSnippet : ElementSnippet<SliderIntSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // Get a reference to the slider from UXML and assign it its value.
             var uxmlSlider = container.Q<SliderInt>("the-uxml-slider");
             uxmlSlider.value = 42;
@@ -29,7 +29,7 @@ internal override void Apply(VisualElement container)
             {
                 csharpSlider.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/SliderSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/SliderSnippet.cs
index 5bcccfcb43..5b5fb718dc 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/SliderSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/SliderSnippet.cs
@@ -12,7 +12,7 @@ internal class SliderSnippet : ElementSnippet<SliderSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
+            #region sample
             // Get a reference to the slider from UXML and assign it its value.
             var uxmlSlider = container.Q<Slider>("the-uxml-slider");
             uxmlSlider.value = 42.2f;
@@ -29,7 +29,7 @@ internal override void Apply(VisualElement container)
             {
                 csharpSlider.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/TagFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/TagFieldSnippet.cs
index 243e460330..4ddd92edf3 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/TagFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/TagFieldSnippet.cs
@@ -13,7 +13,7 @@ internal class TagFieldSnippet : ElementSnippet<TagFieldSnippet>
         internal override void Apply(VisualElement container)
         {
             /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<TagField>("the-uxml-field");
             uxmlField.value = "Player";
 
@@ -24,7 +24,7 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<string>>((evt) =>
             {
                 csharpField.value = evt.newValue;
diff --git a/Modules/UIElementsSamplesEditor/Snippets/TextFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/TextFieldSnippet.cs
index 37d2b22805..0d1ad96d4c 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/TextFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/TextFieldSnippet.cs
@@ -13,7 +13,7 @@ internal class TextFieldSnippet : ElementSnippet<TextFieldSnippet>
         internal override void Apply(VisualElement container)
         {
             /// <sample>
-            // Get a reference to the field from UXML and append to it its value.
+            // Get a reference to the field from UXML and append a value to it.
             var uxmlField = container.Q<TextField>("the-uxml-field");
             uxmlField.value += "..";
 
@@ -25,7 +25,7 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<string>>((evt) =>
             {
                 csharpField.value = evt.newValue;
diff --git a/Modules/UIElementsSamplesEditor/Snippets/ToggleSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/ToggleSnippet.cs
index e7362c1661..24b3597ba2 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/ToggleSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/ToggleSnippet.cs
@@ -12,8 +12,8 @@ internal class ToggleSnippet : ElementSnippet<ToggleSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<Toggle>("the-uxml-field");
             uxmlField.value = true;
 
@@ -25,12 +25,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<bool>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/TreeViewSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/TreeViewSnippet.cs
index 91df56e386..2ea900d385 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/TreeViewSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/TreeViewSnippet.cs
@@ -15,7 +15,7 @@ internal override void Apply(VisualElement container)
         {
             var treeView = container.Q<TreeView>();
 
-            /// <sample>
+            #region 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++)
@@ -55,7 +55,7 @@ internal override void Apply(VisualElement container)
 
             // Callback invoked when the user changes the selection inside the TreeView
             treeView.selectedIndicesChanged += Debug.Log;
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/UnsignedIntegerFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/UnsignedIntegerFieldSnippet.cs
new file mode 100644
index 0000000000..7839efad77
--- /dev/null
+++ b/Modules/UIElementsSamplesEditor/Snippets/UnsignedIntegerFieldSnippet.cs
@@ -0,0 +1,33 @@
+// 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.UIElements.Samples
+{
+    internal class UnsignedIntegerFieldSnippet : ElementSnippet<UnsignedIntegerFieldSnippet>
+    {
+        internal override void Apply(VisualElement container)
+        {
+            /// <sample>
+            // Get a reference to the field from UXML and assign a value to it.
+            var uxmlField = container.Q<UnsignedIntegerField>("the-uxml-field");
+            uxmlField.value = 42;
+
+            // Create a new field, disable it, and give it a style class.
+            var csharpField = new UnsignedIntegerField("C# Field");
+            csharpField.SetEnabled(false);
+            csharpField.AddToClassList("some-styled-field");
+            csharpField.value = uxmlField.value;
+            container.Add(csharpField);
+
+            // Mirror the value of UXML field into the C# field.
+            uxmlField.RegisterCallback<ChangeEvent<uint>>((evt) =>
+            {
+                csharpField.value = evt.newValue;
+            });
+            /// </sample>
+        }
+    }
+}
diff --git a/Modules/UIElementsSamplesEditor/Snippets/UnsignedLongFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/UnsignedLongFieldSnippet.cs
new file mode 100644
index 0000000000..1850e5fb08
--- /dev/null
+++ b/Modules/UIElementsSamplesEditor/Snippets/UnsignedLongFieldSnippet.cs
@@ -0,0 +1,33 @@
+// 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.UIElements.Samples
+{
+    internal class UnsignedLongFieldSnippet : ElementSnippet<UnsignedLongFieldSnippet>
+    {
+        internal override void Apply(VisualElement container)
+        {
+            /// <sample>
+            // Get a reference to the field from UXML and assign a value to it.
+            var uxmlField = container.Q<UnsignedLongField>("the-uxml-field");
+            uxmlField.value = 42;
+
+            // Create a new field, disable it, and give it a style class.
+            var csharpField = new UnsignedLongField("C# Field");
+            csharpField.SetEnabled(false);
+            csharpField.AddToClassList("some-styled-field");
+            csharpField.value = uxmlField.value;
+            container.Add(csharpField);
+
+            // Mirror the value of the UXML field into the C# field.
+            uxmlField.RegisterCallback<ChangeEvent<ulong>>((evt) =>
+            {
+                csharpField.value = evt.newValue;
+            });
+            /// </sample>
+        }
+    }
+}
diff --git a/Modules/UIElementsSamplesEditor/Snippets/Vector2FieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/Vector2FieldSnippet.cs
index 76c8d59a57..fa7c7af51c 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/Vector2FieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/Vector2FieldSnippet.cs
@@ -12,8 +12,8 @@ internal class Vector2FieldSnippet : ElementSnippet<Vector2FieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<Vector2Field>("the-uxml-field");
             uxmlField.value = new Vector2(23.8f, 12.6f);
 
@@ -24,12 +24,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Vector2>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/Vector2IntFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/Vector2IntFieldSnippet.cs
index 7b11a90b9d..9a16b772af 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/Vector2IntFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/Vector2IntFieldSnippet.cs
@@ -12,8 +12,8 @@ internal class Vector2IntFieldSnippet : ElementSnippet<Vector2IntFieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<Vector2IntField>("the-uxml-field");
             uxmlField.value = new Vector2Int(23, 12);
 
@@ -24,12 +24,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Vector2Int>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/Vector3FieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/Vector3FieldSnippet.cs
index a6d3c89c1d..cc6d85647d 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/Vector3FieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/Vector3FieldSnippet.cs
@@ -12,8 +12,8 @@ internal class Vector3FieldSnippet : ElementSnippet<Vector3FieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<Vector3Field>("the-uxml-field");
             uxmlField.value = new Vector3(23.8f, 12.6f, 88.3f);
 
@@ -24,12 +24,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Vector3>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/Vector3IntFieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/Vector3IntFieldSnippet.cs
index 0cf3e083b5..4a0c3bc78d 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/Vector3IntFieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/Vector3IntFieldSnippet.cs
@@ -12,8 +12,8 @@ internal class Vector3IntFieldSnippet : ElementSnippet<Vector3IntFieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<Vector3IntField>("the-uxml-field");
             uxmlField.value = new Vector3Int(23, 12, 88);
 
@@ -24,12 +24,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Vector3Int>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/Vector4FieldSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/Vector4FieldSnippet.cs
index 8a91ee2973..16a446ee04 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/Vector4FieldSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/Vector4FieldSnippet.cs
@@ -12,8 +12,8 @@ internal class Vector4FieldSnippet : ElementSnippet<Vector4FieldSnippet>
     {
         internal override void Apply(VisualElement container)
         {
-            /// <sample>
-            // Get a reference to the field from UXML and assign it its value.
+            #region sample
+            // Get a reference to the field from UXML and assign a value to it.
             var uxmlField = container.Q<Vector4Field>("the-uxml-field");
             uxmlField.value = new Vector4(23.8f, 12.6f, 88.3f, 92.1f);
 
@@ -24,12 +24,12 @@ internal override void Apply(VisualElement container)
             csharpField.value = uxmlField.value;
             container.Add(csharpField);
 
-            // Mirror value of uxml field into the C# field.
+            // Mirror the value of the UXML field into the C# field.
             uxmlField.RegisterCallback<ChangeEvent<Vector4>>((evt) =>
             {
                 csharpField.value = evt.newValue;
             });
-            /// </sample>
+            #endregion
         }
     }
 }
diff --git a/Modules/UIElementsSamplesEditor/UIElementsSamples.cs b/Modules/UIElementsSamplesEditor/UIElementsSamples.cs
index f03c267d58..2bcb881660 100644
--- a/Modules/UIElementsSamplesEditor/UIElementsSamples.cs
+++ b/Modules/UIElementsSamplesEditor/UIElementsSamples.cs
@@ -107,6 +107,8 @@ public void OnEnable()
                     new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("Vector4", Vector4FieldSnippet.Create)),
                     new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("Rect", RectFieldSnippet.Create)),
                     new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("Bounds", BoundsFieldSnippet.Create)),
+                    new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("UnsignedInteger", UnsignedIntegerFieldSnippet.Create)),
+                    new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("UnsignedLong", UnsignedLongFieldSnippet.Create)),
                     new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("SliderInt", SliderIntSnippet.Create)),
                     new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("Vector2Int", Vector2IntFieldSnippet.Create)),
                     new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("Vector3Int", Vector3IntFieldSnippet.Create)),
@@ -221,6 +223,8 @@ private VisualElement MakeNumericFieldsPanel(SampleTreeItem item)
             container.Add(new Vector4Field("Vector4"));
             container.Add(new RectField("Rect"));
             container.Add(new BoundsField("Bounds"));
+            container.Add(new UnsignedIntegerField("UnsignedInteger"));
+            container.Add(new UnsignedLongField("UnsignedLong"));
             container.Add(new SliderInt("SliderInt"));
             container.Add(new Vector2IntField("Vector2Int"));
             container.Add(new Vector3IntField("Vector3Int"));
diff --git a/Modules/UnityConnectEditor/Common/PackageHelper.cs b/Modules/UnityConnectEditor/Common/PackageHelper.cs
index 238df7c7e0..9bc281f31b 100644
--- a/Modules/UnityConnectEditor/Common/PackageHelper.cs
+++ b/Modules/UnityConnectEditor/Common/PackageHelper.cs
@@ -11,26 +11,14 @@ static class PackageHelper
     {
         const string k_CorePackageName = "com.unity.services.core";
 
-        public static bool IsCorePackageInstalled()
+        public static bool IsCorePackageRegistered()
         {
-            return IsPackageInstalled(k_CorePackageName);
-        }
-
-        public static bool IsPackageInstalled(string packageName)
-        {
-            return GetPackageInfo(packageName) != null;
-        }
-
-        static PackageManager.PackageInfo GetPackageInfo(string packageName)
-        {
-            var packageInfos = PackageManager.PackageInfo.GetAllRegisteredPackages();
-            return packageInfos.FirstOrDefault(packageInfo => packageInfo.name.Equals(packageName));
+            return PackageManager.PackageInfo.IsPackageRegistered(k_CorePackageName);
         }
 
         public static bool HasCoreDependency(string packageName)
         {
-            var packageInfo = GetPackageInfo(packageName);
-
+            var packageInfo = PackageManager.PackageInfo.FindForPackageName(packageName);
             return packageInfo != null && HasDependencyToPackage(packageInfo, k_CorePackageName);
         }
 
@@ -43,7 +31,7 @@ public static bool IsInstalledPackageAtMinimumVersionOrHigher(string packageName
         {
             bool installedPackageIsAtMinimumVersionOrHigher = false;
 
-            var packageInfo = GetPackageInfo(packageName);
+            var packageInfo = PackageManager.PackageInfo.FindForPackageName(packageName);
             if (packageInfo != null)
             {
                 var packageVersion = new SemVersion().Parse(packageInfo.version);
diff --git a/Modules/UnityConnectEditor/Common/ProjectBindManager.cs b/Modules/UnityConnectEditor/Common/ProjectBindManager.cs
index cf7d9afb81..d97d9114c1 100644
--- a/Modules/UnityConnectEditor/Common/ProjectBindManager.cs
+++ b/Modules/UnityConnectEditor/Common/ProjectBindManager.cs
@@ -35,9 +35,10 @@ internal class ProjectBindManager : IDisposable
 
         const string k_LinkProjectWindowTitle = "Link Project";
         const string k_DialogConfirmationMessage = "Are you sure you want to link to the project '{0}' in organization '{1}'?";
+        const string k_NetworkIssueWarningMessage = "This might be caused by network issues. Try using the refresh button.";
         const string k_CouldNotCreateProjectMessage = "Could not create project.";
-        const string k_CouldNotObtainProjectMessage = "Could not obtain projects.";
-        const string k_CouldNotObtainOrganizationsMessage = "Could not obtain organizations.";
+        const string k_CouldNotObtainProjectMessage = $"Could not obtain projects. {k_NetworkIssueWarningMessage}";
+        const string k_CouldNotObtainOrganizationsMessage = $"Could not obtain organizations. {k_NetworkIssueWarningMessage}";
         const string k_ProjectLinkSuccessMessage = "Project was linked successfully.";
 
         const string k_ProjectBindContainerName = "ProjectBindContainer";
@@ -48,6 +49,7 @@ internal class ProjectBindManager : IDisposable
         const string k_ReuseProjectIdLinkBtnName = "ReuseProjectIdLinkBtn";
         const string k_CreateProjectIdLinkBtnName = "CreateProjectIdLinkBtn";
         const string k_ProjectIdFieldName = "ProjectIdField";
+        const string k_RefreshBtnName = "RefreshBtn";
         const string k_LinkBtnName = "LinkBtn";
         const string k_CancelBtnName = "CancelBtn";
 
@@ -69,6 +71,10 @@ internal class ProjectBindManager : IDisposable
         const string k_JsonOrgNameNodeName = "org_name";
         internal const string k_FakeSlashUnicode = "\uff0f";
 
+        PopupField<string> m_CreateOrganizationPopupField;
+        PopupField<string> m_ReuseOrganizationPopupField;
+        PopupField<string> m_ReuseProjectIdPopupField;
+
         Dictionary<string, ProjectInfoData> m_ProjectInfoByName;
         VisualElement m_CreateProjectIdBlock;
         VisualElement m_ReuseProjectIdBlock;
@@ -211,10 +217,16 @@ void InitializeProjectBindManager(VisualElement rootVisualElement)
             EditorGameServicesAnalytics.SendProjectBindDisplayEvent();
         }
 
+        void OnRefreshButtonClicked()
+        {
+            LoadCreateOrganizationField(m_CreateOrganizationPopupField);
+            LoadReuseOrganizationField(m_ReuseOrganizationPopupField, m_ReuseProjectIdPopupField);
+        }
+
         void SetupCreateProjectIdBlock()
         {
-            var popupField = BuildPopupField(m_CreateProjectIdBlock, k_OrganizationFieldName);
-            popupField.RegisterValueChangedCallback(delegate(ChangeEvent<string> evt)
+            m_CreateOrganizationPopupField = BuildPopupField(m_CreateProjectIdBlock, k_OrganizationFieldName);
+            m_CreateOrganizationPopupField.RegisterValueChangedCallback(delegate(ChangeEvent<string> evt)
             {
                 if (evt.newValue != m_LastCreateBlockOrganization)
                 {
@@ -222,10 +234,9 @@ void SetupCreateProjectIdBlock()
                     m_CreateProjectIdBlock.Q(k_CreateProjectIdBtnName).SetEnabled(m_LastCreateBlockOrganization != L10n.Tr(k_SelectOrganizationText));
                 }
             });
-            popupField.choices.Add(L10n.Tr(k_SelectOrganizationText));
-            popupField.value = L10n.Tr(k_SelectOrganizationText);
-            popupField.SetEnabled(false);
-            LoadCreateOrganizationField(popupField);
+            m_CreateOrganizationPopupField.choices.Add(L10n.Tr(k_SelectOrganizationText));
+            m_CreateOrganizationPopupField.value = L10n.Tr(k_SelectOrganizationText);
+            m_CreateOrganizationPopupField.SetEnabled(false);
 
             var reuseProjectIdClickable = new Clickable(() =>
             {
@@ -246,14 +257,18 @@ void SetupCreateProjectIdBlock()
                     RequestCreateOperation();
                 }
             };
+
+            var refreshBtn = m_CreateProjectIdBlock.Q<Button>(k_RefreshBtnName);
+            refreshBtn.clicked += OnRefreshButtonClicked;
+
+            LoadCreateOrganizationField(m_CreateOrganizationPopupField);
         }
 
         void SetupReuseProjectIdBlock()
         {
-            var organizationPopupField = BuildPopupField(m_ReuseProjectIdBlock, k_OrganizationFieldName);
-            var projectIdPopupField = BuildPopupField(m_ReuseProjectIdBlock, k_ProjectIdFieldName);
-
-            organizationPopupField.RegisterValueChangedCallback(delegate(ChangeEvent<string> evt)
+            m_ReuseOrganizationPopupField = BuildPopupField(m_ReuseProjectIdBlock, k_OrganizationFieldName);
+            m_ReuseProjectIdPopupField = BuildPopupField(m_ReuseProjectIdBlock, k_ProjectIdFieldName);
+            m_ReuseOrganizationPopupField.RegisterValueChangedCallback(delegate(ChangeEvent<string> evt)
             {
                 if (evt.newValue != m_LastReuseBlockOrganization)
                 {
@@ -269,17 +284,16 @@ void SetupReuseProjectIdBlock()
                     else
                     {
                         var projectIdField = m_ReuseProjectIdBlock.Q<PopupField<string>>(k_ProjectIdFieldName);
-                        LoadProjectField(organizationPopupField.value, projectIdField);
+                        LoadProjectField(m_ReuseOrganizationPopupField.value, projectIdField);
                         projectIdField.value = L10n.Tr(k_SelectProjectText);
                     }
                 }
             });
-            organizationPopupField.choices.Add(L10n.Tr(k_SelectOrganizationText));
-            organizationPopupField.value = L10n.Tr(k_SelectOrganizationText);
-            organizationPopupField.SetEnabled(false);
-            LoadReuseOrganizationField(organizationPopupField, projectIdPopupField);
-
-            projectIdPopupField.RegisterValueChangedCallback(delegate(ChangeEvent<string> evt)
+            m_ReuseOrganizationPopupField.choices.Add(L10n.Tr(k_SelectOrganizationText));
+            m_ReuseOrganizationPopupField.value = L10n.Tr(k_SelectOrganizationText);
+            m_ReuseOrganizationPopupField.SetEnabled(false);
+            
+            m_ReuseProjectIdPopupField.RegisterValueChangedCallback(delegate(ChangeEvent<string> evt)
             {
                 m_LastReuseBlockProject.LastProjectName = evt.newValue;
                 if (m_LastReuseBlockOrganization == L10n.Tr(k_SelectOrganizationText))
@@ -290,8 +304,8 @@ void SetupReuseProjectIdBlock()
                 m_ReuseProjectIdBlock.Q<Button>(k_LinkBtnName)
                     .SetEnabled(m_LastReuseBlockProject.LastProjectName != L10n.Tr(k_SelectProjectText));
             });
-            projectIdPopupField.choices.Add(L10n.Tr(k_SelectProjectText));
-            projectIdPopupField.value = L10n.Tr(k_SelectProjectText);
+            m_ReuseProjectIdPopupField.choices.Add(L10n.Tr(k_SelectProjectText));
+            m_ReuseProjectIdPopupField.value = L10n.Tr(k_SelectProjectText);
 
             m_ReuseProjectIdBlock.style.display = DisplayStyle.None;
 
@@ -313,8 +327,8 @@ void SetupReuseProjectIdBlock()
                     var abort = false;
                     var projectInfo = m_ProjectInfoByName[m_LastReuseBlockProject.LastProjectName];
                     if (EditorUtility.DisplayDialog(L10n.Tr(k_LinkProjectWindowTitle),
-                        string.Format(L10n.Tr(k_DialogConfirmationMessage), projectInfo.name, projectInfo.organizationName),
-                        L10n.Tr(k_Yes), L10n.Tr(k_No)))
+                            string.Format(L10n.Tr(k_DialogConfirmationMessage), projectInfo.name, projectInfo.organizationName),
+                            L10n.Tr(k_Yes), L10n.Tr(k_No)))
                     {
                         try
                         {
@@ -344,6 +358,11 @@ void SetupReuseProjectIdBlock()
                     }
                 }
             };
+
+            var refreshBtn = m_ReuseProjectIdBlock.Q<Button>(k_RefreshBtnName);
+            refreshBtn.clicked += OnRefreshButtonClicked;
+
+            LoadReuseOrganizationField(m_ReuseOrganizationPopupField, m_ReuseProjectIdPopupField);
         }
 
         void RequestCreateOperation()
diff --git a/Modules/UnityConnectEditor/Common/ServicesConfiguration.cs b/Modules/UnityConnectEditor/Common/ServicesConfiguration.cs
index c861b860ef..54ab984d57 100644
--- a/Modules/UnityConnectEditor/Common/ServicesConfiguration.cs
+++ b/Modules/UnityConnectEditor/Common/ServicesConfiguration.cs
@@ -19,7 +19,7 @@ internal sealed class ServicesConfiguration
         const string k_CloudHubServiceUrl = "https://public-cdn.cloud.unity3d.com/editor/production/cloud/hub";
         const string k_CloudUsageDashboardUrl = "/usage";
         const string k_CloudBuildAddTargetUrl = "/setup/platform";
-        const string k_CloudBuildTutorialUrl = "https://unity3d.com/learn/tutorials/topics/cloud-build-0";
+        const string k_CloudBuildTutorialUrl = "https://docs.unity.com/devops/en/manual/unity-build-automation";
         const string k_CloudDiagnosticsUrl = "https://unitytech.github.io/clouddiagnostics/";
         const string k_CloudDiagUserReportingSdkUrl = "https://userreporting.cloud.unity3d.com/api/userreporting/sdk";
         const int k_NoProgressId = -1;
@@ -36,6 +36,7 @@ internal sealed class ServicesConfiguration
         string m_ProjectServiceFlagsApiUrl;
         string m_CloudDiagCrashesDashboardUrl;
         string m_UnityTeamUrl;
+        string m_LearnMoreCloudBuildUrl;
 
         string m_CloudBuildProjectUrl;
         string m_CloudBuildUploadUrl;
@@ -105,6 +106,7 @@ static ServicesConfiguration()
         ServicesConfiguration()
         {
             m_UnityTeamUrl = L10n.Tr("https://unity3d.com/teams"); // Should be https://unity3d.com/fr/teams in French !
+            m_LearnMoreCloudBuildUrl = L10n.Tr("https://unity.com/solutions/ci-cd"); // Should be https://unity3d.com/fr/teams in French !
             PrepareAdsEnvironment(ConvertStringToServerEnvironment(UnityConnect.instance.GetEnvironment()));
             if (!string.IsNullOrEmpty(SessionState.GetString(k_ConfigJsonSessionStateKey, null)))
             {
@@ -147,7 +149,7 @@ void BuildPaths()
 
             m_CloudBuildProjectUrl = m_ServicesUrlsConfig["build"] + "/build/orgs/{0}/projects/{1}";
 
-            m_CloudBuildUploadUrl = m_CloudBuildProjectUrl + "/upload/?page=1";
+            m_CloudBuildUploadUrl = m_CloudBuildProjectUrl + "?upload=true";
             m_CloudBuildTargetUrl = m_CloudBuildProjectUrl + "/buildtargets";
             m_CloudBuildApiUrl = m_ServicesUrlsConfig["build-api"];
             m_CloudBuildApiProjectUrl = m_CloudBuildApiUrl + "/api/v1/orgs/{0}/projects/{1}";
@@ -581,6 +583,12 @@ public string GetUnityTeamInfoUrl()
             return m_UnityTeamUrl;
         }
 
+        // Return the specific Unity Teams information URL for the Collab service
+        public string GetLearnMoreCloudBuildUrl()
+        {
+            return m_LearnMoreCloudBuildUrl;
+        }
+
         // Return the specific cloud build tutorial URL for the cloud build service
         public string GetCloudBuildTutorialUrl()
         {
@@ -597,7 +605,7 @@ public void RequestCloudBuildAddTargetUrl(Action<string> callback)
 
         public void RequestCloudBuildCurrentProjectUrl(Action<string> callback)
         {
-            RequestCloudBuildProjectsUrl(UnityConnect.instance.projectInfo.organizationId, UnityConnect.instance.projectInfo.projectId, callback);
+            RequestCloudBuildProjectsUrl(UnityConnect.instance.projectInfo.organizationForeignKey, UnityConnect.instance.projectInfo.projectGUID, callback);
         }
 
         public void RequestCloudBuildProjectsUrl(string organizationId, string projectId, Action<string> callback)
diff --git a/Modules/UnityConnectEditor/Common/ServicesConstants.cs b/Modules/UnityConnectEditor/Common/ServicesConstants.cs
index 3ed7af283f..7bdebf2789 100644
--- a/Modules/UnityConnectEditor/Common/ServicesConstants.cs
+++ b/Modules/UnityConnectEditor/Common/ServicesConstants.cs
@@ -8,7 +8,6 @@ static class ServicesConstants
     {
         public const int ExploreServicesTopMenuPriority = int.MinValue;
         public const int GeneralSettingsServicesTopMenuPriority = int.MinValue + 1;
-
         public const string ExploreServicesPackageManagerFilter = "UnityRegistry/services";
     }
 }
diff --git a/Modules/UnityConnectEditor/ProjectSettings/CloudBuildProjectSettings.cs b/Modules/UnityConnectEditor/ProjectSettings/CloudBuildProjectSettings.cs
index 9a6a9ac944..95f69e9f6c 100644
--- a/Modules/UnityConnectEditor/ProjectSettings/CloudBuildProjectSettings.cs
+++ b/Modules/UnityConnectEditor/ProjectSettings/CloudBuildProjectSettings.cs
@@ -45,7 +45,6 @@ internal class CloudBuildProjectSettings : ServicesProjectSettings
         const string k_HistoryButtonName = "HistoryButton";
         const string k_UploadButtonName = "UploadButton";
         const string k_ManageTargetButton = "ManageTargetButton";
-        const string k_AddTargetButton = "AddTargetButton";
         const string k_NoTargetContainer = "NoTargetContainer";
         const string k_PollFooterSectionName = "PollFooterSection";
         const string k_PollFooterName = "PollFooter";
@@ -90,13 +89,13 @@ internal class CloudBuildProjectSettings : ServicesProjectSettings
 
         const string k_LaunchBuildPayload = "{\"clean\":false}";
 
-        const string k_MessageErrorForProjectData = "An unexpected error occurred while querying Cloud Build for current project data. See the console for more information.";
-        const string k_MessageErrorForProjectTeamData = "An unexpected error occurred while querying Cloud Build for current project team data. See the console for more information.";
-        const string k_MessageErrorForProjectBuildTargetsData = "An unexpected error occurred while querying Cloud Build for current project configured build targets. See the console for more information.";
-        const string k_MessageProjectStateMismatch = "There is a mismatch between local and web configuration for Cloud Build. Please open the Cloud Build web dashboard and enable the current project.";
-        const string k_MessageErrorForApiStatusData = "An unexpected error occurred while querying Cloud Build for api status. See the console for more information.";
+        const string k_MessageErrorForProjectData = "An unexpected error occurred while querying Unity Build Automation for current project data. See the console for more information.";
+        const string k_MessageErrorForProjectTeamData = "An unexpected error occurred while querying Unity Build Automation for current project team data. See the console for more information.";
+        const string k_MessageErrorForProjectBuildTargetsData = "An unexpected error occurred while querying Unity Build Automation for current project configured build targets. See the console for more information.";
+        const string k_MessageProjectStateMismatch = "There is a mismatch between local and web configuration for Unity Build Automation. Please open the Unity Build Automation web dashboard and enable the current project.";
+        const string k_MessageErrorForApiStatusData = "An unexpected error occurred while querying Unity Build Automation for api status. See the console for more information.";
         const string k_MessageErrorForBuildLaunch = "An unexpected error occurred while launching a build. See the console for more information.";
-        const string k_CloudBuildPermissionMessage = "You do not have sufficient permissions to enable / disable Cloud Build service.";
+        const string k_CloudBuildPermissionMessage = "You do not have sufficient permissions to enable / disable Unity Build Automation service.";
 
         const string k_MessageLaunchingBuild = "Starting build {0}.";
         const string k_MessageLaunchedBuildSuccess = "Build #{0} {1} added to queue";
@@ -267,7 +266,7 @@ protected override void ActivateAction(string searchContext)
             {
                 var clickable = new Clickable(() =>
                 {
-                    Application.OpenURL(ServicesConfiguration.instance.GetUnityTeamInfoUrl());
+                    Application.OpenURL(ServicesConfiguration.instance.GetLearnMoreCloudBuildUrl());
                 });
                 learnMore.AddManipulator(clickable);
             }
@@ -466,17 +465,6 @@ public override void EnterState()
                     };
                     manageTargetButton.style.display = DisplayStyle.None;
                 }
-                var addTargetButton = m_Provider.rootVisualElement.Q<Button>(k_AddTargetButton);
-                if (addTargetButton != null)
-                {
-                    addTargetButton.clicked += () =>
-                    {
-                        ServicesConfiguration.instance.RequestCloudBuildAddTargetUrl(cloudBuildAddTargetUrl =>
-                        {
-                            Application.OpenURL(cloudBuildAddTargetUrl);
-                        });
-                    };
-                }
                 m_Provider.UpdateServiceToggleAndDashboardLink(m_Provider.serviceInstance.IsServiceEnabled());
 
                 ResetData();
@@ -656,6 +644,9 @@ void GetBuildTargetsRequestOnCompleted(AsyncOperation obj)
                             var jsonParser = new JSONParser(m_Provider.m_GetProjectBuildTargetsRequest.downloadHandler.text);
                             var json = jsonParser.Parse();
                             var buildEntryList = json.AsList();
+
+                            m_Provider.rootVisualElement.Q(k_ManageTargetButton).style.display = DisplayStyle.Flex;
+
                             if (buildEntryList.Count <= 0)
                             {
                                 CloudBuildPoller.instance.Disable();
@@ -663,8 +654,6 @@ void GetBuildTargetsRequestOnCompleted(AsyncOperation obj)
                             else
                             {
                                 m_Provider.rootVisualElement.Q(k_NoTargetContainer).style.display = DisplayStyle.None;
-                                m_Provider.rootVisualElement.Q(k_AddTargetButton).style.display = DisplayStyle.None;
-                                m_Provider.rootVisualElement.Q(k_ManageTargetButton).style.display = DisplayStyle.Flex;
                                 m_Provider.rootVisualElement.Q(k_PollFooterName).style.display = DisplayStyle.Flex;
                                 m_Provider.rootVisualElement.Q(k_PollFooterSectionName).style.display = DisplayStyle.Flex;
 
diff --git a/Modules/UnityConnectEditor/ProjectSettings/CollabProjectSettings.cs b/Modules/UnityConnectEditor/ProjectSettings/CollabProjectSettings.cs
deleted file mode 100644
index e52f471598..0000000000
--- a/Modules/UnityConnectEditor/ProjectSettings/CollabProjectSettings.cs
+++ /dev/null
@@ -1,407 +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 UnityEngine;
-using UnityEditor.Collaboration;
-using UnityEditor.Connect.Fallback;
-using UnityEngine.UIElements;
-
-namespace UnityEditor.Connect
-{
-    internal class CollabProjectSettings : ServicesProjectSettings
-    {
-        const string k_ServiceName = "Collaborate";
-
-        // Actual states for the collab state machine
-        const string k_StateNameDisabled = "DisabledState";
-        const string k_StateNameEnabled = "EnabledState";
-
-        const string k_CollaborateCommonUxmlPath = "UXML/ServicesWindow/CollabProjectSettings.uxml";
-        const string k_CollaborateDisabledUxmlPath = "UXML/ServicesWindow/CollabProjectSettingsDisabled.uxml";
-        const string k_CollaborateEnabledUxmlPath = "UXML/ServicesWindow/CollabProjectSettingsEnabled.uxml";
-
-        // Elements of the UXML
-        const string k_ServiceToggleClassName = "service-toggle";
-        const string k_ServiceNameProperty = "serviceName";
-        const string k_ServiceScrollContainerClassName = "scroll-container";
-
-        const string k_LearnMoreLink = "LearnMore";
-        const string k_GoToWebDashboardLink = "GoToWebDashboard";
-        const string k_GoToDashboardLinkName = "GoToDashboard";
-        const string k_OpenHistoryLink = "OpenHistory";
-        const string k_OpenChangesLink = "OpenChanges";
-
-        const string k_CollabPublishSection = "CollabPublishSection";
-        const string k_CollabHistorySection = "CollabHistorySection";
-
-        VisualElement m_GoToDashboard;
-        Toggle m_MainServiceToggle;
-        bool m_EventHandlerInitialized;
-
-        const string k_CollabPermissionMessage = "You do not have sufficient permissions to enable / disable Collaborate service.";
-        const string k_CollabPackageName = "Collab Package";
-
-        internal enum CollabEvent
-        {
-            Enabling,
-            Disabling,
-        }
-
-        [SettingsProvider]
-        public static SettingsProvider CreateServicesProvider()
-        {
-            SettingsProvider projectSettings = null;
-
-
-            return projectSettings;
-        }
-
-        SimpleStateMachine<CollabEvent> m_StateMachine;
-        EnabledState m_EnabledState;
-        DisabledState m_DisabledState;
-
-        public CollabProjectSettings(string path, SettingsScope scopes, IEnumerable<string> keywords = null)
-            : base(path, scopes, k_ServiceName, keywords)
-        {
-            m_StateMachine = new SimpleStateMachine<CollabEvent>();
-            m_StateMachine.AddEvent(CollabEvent.Enabling);
-            m_StateMachine.AddEvent(CollabEvent.Disabling);
-
-            m_EnabledState = new EnabledState(m_StateMachine, this);
-            m_DisabledState = new DisabledState(m_StateMachine, this);
-
-            m_StateMachine.AddState(m_EnabledState);
-            m_StateMachine.AddState(m_DisabledState);
-        }
-
-        void OnDestroy()
-        {
-            UnregisterEvent();
-        }
-
-        protected override Notification.Topic[] notificationTopicsToSubscribe => new[]
-        {
-            Notification.Topic.CollabService,
-            Notification.Topic.ProjectBind
-        };
-        protected override SingleService serviceInstance => CollabService.instance;
-        protected override string serviceUssClassName => "collab";
-        void SetupServiceToggle(SingleService singleService)
-        {
-            m_MainServiceToggle.SetProperty(k_ServiceNameProperty, singleService.name);
-            m_MainServiceToggle.SetEnabled(false);
-            UpdateServiceToggleAndDashboardLink(singleService.IsServiceEnabled());
-
-            if (singleService.displayToggle)
-            {
-                m_MainServiceToggle.RegisterValueChangedCallback(evt =>
-                {
-                    if (currentUserPermission != UserRole.Owner && currentUserPermission != UserRole.Manager)
-                    {
-                        UpdateServiceToggleAndDashboardLink(evt.previousValue);
-                        return;
-                    }
-                    singleService.EnableService(evt.newValue);
-                });
-            }
-            else
-            {
-                m_MainServiceToggle.style.display = DisplayStyle.None;
-            }
-        }
-
-        void UpdateServiceToggleAndDashboardLink(bool isEnabled)
-        {
-            if (m_GoToDashboard != null)
-            {
-                m_GoToDashboard.style.display = (isEnabled) ? DisplayStyle.Flex : DisplayStyle.None;
-            }
-
-            if (m_MainServiceToggle != null)
-            {
-                m_MainServiceToggle.SetValueWithoutNotify(isEnabled);
-                SetupServiceToggleLabel(m_MainServiceToggle, isEnabled);
-            }
-        }
-
-        protected override void ToggleRestrictedVisualElementsAvailability(bool enable)
-        {
-            var serviceToggleContainer = rootVisualElement.Q(className: k_ServiceToggleContainerClassName);
-            var unityToggle = serviceToggleContainer?.Q(className: k_UnityToggleClassName);
-            if (unityToggle != null)
-            {
-                unityToggle.SetEnabled(enable);
-                if (!enable)
-                {
-                    var notifications = NotificationManager.instance.GetNotificationsForTopics(Notification.Topic.CollabService);
-                    if (notifications.Any(notification => notification.rawMessage == k_CollabPermissionMessage))
-                    {
-                        return;
-                    }
-
-                    NotificationManager.instance.Publish(
-                        Notification.Topic.CollabService,
-                        Notification.Severity.Warning,
-                        k_CollabPermissionMessage);
-                }
-            }
-        }
-
-        void OnCollabStateChanged(CollabInfo info)
-        {
-            // Make sure to update the service state based on the information changed in Collab...
-            if (CollabService.instance.IsServiceEnabled() != Collab.instance.IsCollabEnabledForCurrentProject())
-            {
-                CollabService.instance.EnableService(Collab.instance.IsCollabEnabledForCurrentProject());
-            }
-        }
-
-        protected override void ActivateAction(string searchContext)
-        {
-            // Must reset properties every time this is activated
-            var mainTemplate = EditorGUIUtility.Load(k_CollaborateCommonUxmlPath) as VisualTreeAsset;
-            rootVisualElement.Add(mainTemplate.CloneTree().contentContainer);
-
-            // Make sure to reset the state machine
-            m_StateMachine.ClearCurrentState();
-
-            // Make sure to activate the state machine to the current state...
-            if (CollabService.instance.IsServiceEnabled())
-            {
-                m_StateMachine.Initialize(m_EnabledState);
-            }
-            else
-            {
-                m_StateMachine.Initialize(m_DisabledState);
-            }
-
-            // Register the events for enabling / disabling the service only once.
-            RegisterEvent();
-            // Moved the Go to dashboard link to the header title section.
-            m_GoToDashboard = rootVisualElement.Q(k_GoToDashboardLinkName);
-            if (m_GoToDashboard != null)
-            {
-                var clickable = new Clickable(() =>
-                {
-                    ServicesConfiguration.instance.RequestBaseCollabDashboardUrl(OpenDashboardOrgAndProjectIds);
-                });
-                m_GoToDashboard.AddManipulator(clickable);
-            }
-
-            m_MainServiceToggle = rootVisualElement.Q<Toggle>(null, k_ServiceToggleClassName);
-            SetupServiceToggle(CollabService.instance);
-
-            var learnMore = rootVisualElement.Q(k_LearnMoreLink);
-            if (learnMore != null)
-            {
-                var clickable = new Clickable(() =>
-                {
-                    Application.OpenURL(ServicesConfiguration.instance.GetUnityTeamInfoUrl());
-                });
-                learnMore.AddManipulator(clickable);
-            }
-        }
-
-        protected override void DeactivateAction()
-        {
-            UnregisterEvent();
-        }
-
-        void RegisterEvent()
-        {
-            if (!m_EventHandlerInitialized)
-            {
-                // Make sure to follow-up the Collab State...
-                // Collab is a specific case where the service can be enabled inside another Editor Window by the Collab package code itself.
-                //     We need to be informed of that changed when it happens
-                Collab.instance.StateChanged += OnCollabStateChanged;
-
-                CollabService.instance.serviceAfterEnableEvent += ServiceIsEnablingEvent;
-                CollabService.instance.serviceAfterDisableEvent += ServiceIsDisablingEvent;
-                m_EventHandlerInitialized = true;
-            }
-        }
-
-        void UnregisterEvent()
-        {
-            if (m_EventHandlerInitialized)
-            {
-                Collab.instance.StateChanged -= OnCollabStateChanged;
-                CollabService.instance.serviceAfterEnableEvent -= ServiceIsEnablingEvent;
-                CollabService.instance.serviceAfterDisableEvent -= ServiceIsDisablingEvent;
-                m_EventHandlerInitialized = false;
-            }
-        }
-
-        void ServiceIsEnablingEvent(object sender, EventArgs args)
-        {
-            if (settingsWindow.GetCurrentProvider() == this)
-            {
-                m_MainServiceToggle.SetValueWithoutNotify(true);
-                m_StateMachine.ProcessEvent(CollabEvent.Enabling);
-            }
-        }
-
-        void ServiceIsDisablingEvent(object sender, EventArgs args)
-        {
-            if (settingsWindow.GetCurrentProvider() == this)
-            {
-                m_MainServiceToggle.SetValueWithoutNotify(false);
-                m_StateMachine.ProcessEvent(CollabEvent.Disabling);
-            }
-        }
-
-        // Disabled state of the service
-        sealed class DisabledState : GenericBaseState<CollabProjectSettings, CollabEvent>
-        {
-            public DisabledState(SimpleStateMachine<CollabEvent> simpleStateMachine, CollabProjectSettings provider)
-                : base(k_StateNameDisabled, simpleStateMachine, provider)
-            {
-                ModifyActionForEvent(CollabEvent.Enabling, HandleBinding);
-            }
-
-            public override void EnterState()
-            {
-                var generalTemplate = EditorGUIUtility.Load(k_CollaborateDisabledUxmlPath) as VisualTreeAsset;
-                var scrollContainer = provider.rootVisualElement.Q(null, k_ServiceScrollContainerClassName);
-                scrollContainer.Clear();
-                if (generalTemplate != null)
-                {
-                    var newVisual = generalTemplate.CloneTree().contentContainer;
-                    ServicesUtils.TranslateStringsInTree(newVisual);
-                    scrollContainer.Add(newVisual);
-
-                    provider.UpdateServiceToggleAndDashboardLink(provider.serviceInstance.IsServiceEnabled());
-                }
-
-                provider.HandlePermissionRestrictedControls();
-            }
-
-            SimpleStateMachine<CollabEvent>.State HandleBinding(CollabEvent raisedEvent)
-            {
-                return stateMachine.GetStateByName(k_StateNameEnabled);
-            }
-        }
-
-        // Enabled state of the service
-        sealed class EnabledState : GenericBaseState<CollabProjectSettings, CollabEvent>
-        {
-            VisualElement m_CollabPublishSection;
-            VisualElement m_CollabHistorySection;
-
-            public EnabledState(SimpleStateMachine<CollabEvent> simpleStateMachine, CollabProjectSettings provider)
-                : base(k_StateNameEnabled, simpleStateMachine, provider)
-            {
-                ModifyActionForEvent(CollabEvent.Disabling, HandleUnbinding);
-
-                // Related protected variables
-                topicForNotifications = Notification.Topic.CollabService;
-                notLatestPackageInstalledInfo = string.Format(k_NotLatestPackageInstalledInfo, k_CollabPackageName);
-                packageInstallationHeadsup = string.Format(k_PackageInstallationHeadsup, k_CollabPackageName);
-                duplicateInstallWarning = null;
-                packageInstallationDialogTitle = string.Format(k_PackageInstallationDialogTitle, k_CollabPackageName);
-            }
-
-            protected override void PackageInformationUpdated()
-            {
-                if (packmanPackageInstalled)
-                {
-                    // Show the Publish and History section
-                    if (m_CollabHistorySection != null)
-                    {
-                        m_CollabHistorySection.style.display = DisplayStyle.Flex;
-                    }
-                    if (m_CollabPublishSection != null)
-                    {
-                        m_CollabPublishSection.style.display = DisplayStyle.Flex;
-                    }
-                }
-                else
-                {
-                    // Don't show the Publish and History section
-                    if (m_CollabHistorySection != null)
-                    {
-                        m_CollabHistorySection.style.display = DisplayStyle.None;
-                    }
-                    if (m_CollabPublishSection != null)
-                    {
-                        m_CollabPublishSection.style.display = DisplayStyle.None;
-                    }
-                }
-            }
-
-            public override void EnterState()
-            {
-                //If we haven't received new bound info, fetch them
-                var generalTemplate = EditorGUIUtility.Load(k_CollaborateEnabledUxmlPath) as VisualTreeAsset;
-                var scrollContainer = provider.rootVisualElement.Q(null, k_ServiceScrollContainerClassName);
-                var newVisual = generalTemplate.CloneTree().contentContainer;
-                ServicesUtils.TranslateStringsInTree(newVisual);
-                scrollContainer.Clear();
-                scrollContainer.Add(newVisual);
-
-                m_CollabPublishSection = scrollContainer.Q(k_CollabPublishSection);
-                m_CollabHistorySection = scrollContainer.Q(k_CollabHistorySection);
-                // Don't show the Publish and History section by default
-                if (m_CollabHistorySection != null)
-                {
-                    m_CollabHistorySection.style.display = DisplayStyle.None;
-                }
-                if (m_CollabPublishSection != null)
-                {
-                    m_CollabPublishSection.style.display = DisplayStyle.None;
-                }
-
-                var openHistory = provider.rootVisualElement.Q(k_OpenHistoryLink) as Button;
-                if (openHistory != null)
-                {
-                    openHistory.clicked += () =>
-                    {
-                        if (Collab.ShowHistoryWindow != null)
-                        {
-                            Collab.ShowHistoryWindow();
-                        }
-                    };
-                }
-
-                Button openChangesLinkBtn = provider.rootVisualElement.Q(k_OpenChangesLink) as Button;
-                if (openChangesLinkBtn != null)
-                {
-                    openChangesLinkBtn.clicked += () =>
-                    {
-                        if (Collab.ShowChangesWindow != null)
-                        {
-                            Collab.ShowChangesWindow();
-                        }
-                    };
-                }
-
-                var gotoWebDashboard = scrollContainer.Q(k_GoToWebDashboardLink);
-                if (gotoWebDashboard != null)
-                {
-                    var clickable = new Clickable(() =>
-                    {
-                        ServicesConfiguration.instance.RequestBaseCloudUsageDashboardUrl(provider.OpenDashboardOrgAndProjectIds);
-                    });
-                    gotoWebDashboard.AddManipulator(clickable);
-                }
-                provider.UpdateServiceToggleAndDashboardLink(provider.serviceInstance.IsServiceEnabled());
-
-                // Prepare the package section and update the package information
-                PreparePackageSection(scrollContainer);
-                UpdatePackageInformation();
-
-                provider.HandlePermissionRestrictedControls();
-            }
-
-            SimpleStateMachine<CollabEvent>.State HandleUnbinding(CollabEvent raisedEvent)
-            {
-                return stateMachine.GetStateByName(k_StateNameDisabled);
-            }
-        }
-    }
-}
diff --git a/Modules/UnityConnectEditor/Services/BuildService.cs b/Modules/UnityConnectEditor/Services/BuildService.cs
index 75dc8856f2..9c1f9c6323 100644
--- a/Modules/UnityConnectEditor/Services/BuildService.cs
+++ b/Modules/UnityConnectEditor/Services/BuildService.cs
@@ -11,7 +11,7 @@ internal class BuildService : SingleService
         public override string title { get; }
         public override string description { get; }
         public override string pathTowardIcon { get; }
-        public override string projectSettingsPath { get; } = "Project/Services/Cloud Build";
+        public override string projectSettingsPath { get; } = "Project/Services/Build Automation";
         public override string settingsProviderClassName => nameof(CloudBuildProjectSettings);
         public override bool displayToggle { get; }
         public override Notification.Topic notificationTopic => Notification.Topic.BuildService;
@@ -39,7 +39,7 @@ struct BuildServiceState
         BuildService()
         {
             name = "Build";
-            title = L10n.Tr("Cloud Build");
+            title = L10n.Tr("Build Automation");
             description = L10n.Tr("Build games faster");
             pathTowardIcon = @"Builtin Skins\Shared\Images\ServicesWindow-ServiceIcon-Build.png";
             displayToggle = true;
diff --git a/Modules/UnityConnectEditor/Services/CloudBuildPoller.cs b/Modules/UnityConnectEditor/Services/CloudBuildPoller.cs
index 474a7b7c0d..297d0a1fc0 100644
--- a/Modules/UnityConnectEditor/Services/CloudBuildPoller.cs
+++ b/Modules/UnityConnectEditor/Services/CloudBuildPoller.cs
@@ -35,7 +35,7 @@ internal class CloudBuildPoller
         const int k_IntervalSeconds = 15;
 
         const string k_BuildFinishedWithStatusMsg = "Build #{0} {1} {2}.";
-        const string k_MessageErrorForApiStatusData = "An unexpected error occurred while querying Cloud Build for api status. See the console for more information.";
+        const string k_MessageErrorForApiStatusData = "An unexpected error occurred while querying Unity Build Automation for api status. See the console for more information.";
 
         bool m_Enabled;
         bool m_EnabledOnce;
diff --git a/Modules/UnityConnectEditor/Services/CollabService.cs b/Modules/UnityConnectEditor/Services/CollabService.cs
deleted file mode 100644
index b51674c036..0000000000
--- a/Modules/UnityConnectEditor/Services/CollabService.cs
+++ /dev/null
@@ -1,67 +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 UnityEditor.Collaboration;
-
-namespace UnityEditor.Connect
-{
-    [InitializeOnLoad]
-    internal class CollabService : SingleService
-    {
-        public override string name { get; }
-        public override string title { get; }
-        public override string description { get; }
-        public override string pathTowardIcon { get; }
-        public override string projectSettingsPath { get; } = "Project/Services/Collaborate";
-        public override string settingsProviderClassName => nameof(CollabProjectSettings);
-        public override bool displayToggle { get; }
-        public override Notification.Topic notificationTopic => Notification.Topic.CollabService;
-        public override string packageName { get; }
-
-        public override string editorGamePackageName { get; } = "com.unity.collab-proxy";
-
-        public override string serviceFlagName { get; }
-        public override bool shouldSyncOnProjectRebind => true;
-
-        static readonly CollabService k_Instance;
-
-        public static CollabService instance => k_Instance;
-
-        struct CollabServiceState
-        {
-            public bool collaborate;
-        }
-
-        static CollabService()
-        {
-            k_Instance = new CollabService();
-        }
-
-        protected override void InternalEnableService(bool enable, bool shouldUpdateApiFlag)
-        {
-            if (IsServiceEnabled() != enable)
-            {
-                EditorAnalytics.SendEventServiceInfo(new CollabServiceState() { collaborate = enable });
-            }
-
-            base.InternalEnableService(enable, shouldUpdateApiFlag);
-
-            Collab.instance.SetCollabEnabledForCurrentProject(enable);
-
-            AssetDatabase.Refresh();                    // If auto-refresh was off, make sure we refresh when setting it back on
-        }
-
-        CollabService()
-        {
-            name = "Collab";
-            title = L10n.Tr("Collaborate");
-            description = L10n.Tr("Create together seamlessly");
-            pathTowardIcon = @"Builtin Skins\Shared\Images\ServicesWindow-ServiceIcon-Collab.png";
-            displayToggle = true;
-            packageName = "com.unity.collab-proxy";
-            serviceFlagName = "collab";
-            ServicesRepository.AddService(this);
-        }
-    }
-}
diff --git a/Modules/UnityConnectEditor/ServicesRepository.cs b/Modules/UnityConnectEditor/ServicesRepository.cs
index ff25f48857..4bed500732 100644
--- a/Modules/UnityConnectEditor/ServicesRepository.cs
+++ b/Modules/UnityConnectEditor/ServicesRepository.cs
@@ -84,12 +84,12 @@ static bool CanAddService(SingleService singleService)
         {
             var isServiceAlreadyAdded = k_Services.ContainsKey(singleService.name);
 
-            var isCorePackageInstalled = PackageHelper.IsCorePackageInstalled();
-            var servicePackageInstalled = PackageHelper.IsPackageInstalled(singleService.editorGamePackageName);
+            var isCorePackageRegistered = PackageHelper.IsCorePackageRegistered();
+            var servicePackageRegistered = PackageManager.PackageInfo.IsPackageRegistered(singleService.editorGamePackageName);
             var servicePackageHasCoreDependency = PackageHelper.HasCoreDependency(singleService.editorGamePackageName);
 
             return !isServiceAlreadyAdded &&
-                (!isCorePackageInstalled || (servicePackageInstalled && !servicePackageHasCoreDependency));
+                (!isCorePackageRegistered || (servicePackageRegistered && !servicePackageHasCoreDependency));
         }
 
         public static List<SingleService> GetServices()
diff --git a/Modules/UnityEditorAnalyticsEditor/BuildEventsHandler.cs b/Modules/UnityEditorAnalyticsEditor/BuildEventsHandler.cs
index 95c2968ecf..ec52bc4cb0 100644
--- a/Modules/UnityEditorAnalyticsEditor/BuildEventsHandler.cs
+++ b/Modules/UnityEditorAnalyticsEditor/BuildEventsHandler.cs
@@ -69,7 +69,7 @@ private void ReportBuildPackageIds(BuildFile[] buildFiles)
             List<string> managedLibraries = new List<string>();
             foreach (BuildFile file in buildFiles)
             {
-                if (file.role == "ManagedLibrary")
+                if (file.role == "ManagedLibrary" || file.role == "dll")
                     managedLibraries.Add(file.path);
             }
 
diff --git a/Modules/UnityEditorAnalyticsEditor/EditorAnalytics.bindings.cs b/Modules/UnityEditorAnalyticsEditor/EditorAnalytics.bindings.cs
index d48a7b40ce..8fc56f0bb8 100644
--- a/Modules/UnityEditorAnalyticsEditor/EditorAnalytics.bindings.cs
+++ b/Modules/UnityEditorAnalyticsEditor/EditorAnalytics.bindings.cs
@@ -141,14 +141,12 @@ internal static bool SendEventSceneViewInfo(object parameters)
 
         internal static bool SendEventBuildPackageList(object parameters)
         {
-            return EditorAnalytics.SendEvent("buildPackageList", parameters,
-                SendEventOptions.kAppendBuildGuid | SendEventOptions.kAppendBuildTarget);
+            return EditorAnalytics.SendEvent("buildPackageList", parameters, SendEventOptions.kAppendBuildGuid | SendEventOptions.kAppendBuildTarget);
         }
 
         internal static bool SendEventBuildTargetPermissions(object parameters)
         {
-            return EditorAnalytics.SendEvent("buildTargetPermissions", parameters,
-                SendEventOptions.kAppendBuildGuid | SendEventOptions.kAppendBuildTarget);
+            return EditorAnalytics.SendEvent("buildTargetPermissions", parameters, SendEventOptions.kAppendBuildGuid | SendEventOptions.kAppendBuildTarget);
         }
 
         internal static bool SendCollabUserAction(object parameters)
diff --git a/Modules/UnityWebRequest/Public/DownloadHandler/DownloadHandler.bindings.cs b/Modules/UnityWebRequest/Public/DownloadHandler/DownloadHandler.bindings.cs
index a2042529df..61c9cda71e 100644
--- a/Modules/UnityWebRequest/Public/DownloadHandler/DownloadHandler.bindings.cs
+++ b/Modules/UnityWebRequest/Public/DownloadHandler/DownloadHandler.bindings.cs
@@ -125,7 +125,7 @@ private Encoding GetTextEncoder()
         private extern string GetContentType();
 
         // Return true if you processed the data successfully, false otherwise.
-        [UsedByNativeCode]
+        [RequiredByNativeCode]
         protected virtual bool ReceiveData(byte[] data, int dataLength) { return true; }
 
         [RequiredByNativeCode]
@@ -139,10 +139,10 @@ protected virtual void ReceiveContentLengthHeader(ulong contentLength)
         [Obsolete("Use ReceiveContentLengthHeader")]
         protected virtual void ReceiveContentLength(int contentLength) {}
 
-        [UsedByNativeCode]
+        [RequiredByNativeCode]
         protected virtual void CompleteContent() {}
 
-        [UsedByNativeCode]
+        [RequiredByNativeCode]
         protected virtual float GetProgress() { return 0.0f; }
 
         protected static T GetCheckedDownloader<T>(UnityWebRequest www) where T : DownloadHandler
diff --git a/Modules/UnityWebRequest/Public/WebRequestUtils.cs b/Modules/UnityWebRequest/Public/WebRequestUtils.cs
index bf717d6426..acb20296ad 100644
--- a/Modules/UnityWebRequest/Public/WebRequestUtils.cs
+++ b/Modules/UnityWebRequest/Public/WebRequestUtils.cs
@@ -454,6 +454,8 @@ public static bool SevenBitClean(string s, Encoding e)
         {
             unsafe
             {
+                if (string.IsNullOrEmpty(s))
+                    return true;
                 int capacity = s.Length * 2;
                 byte* bytes = stackalloc byte[capacity];
                 int length;
diff --git a/Modules/UnityWebRequestTexture/Public/DownloadHandlerTexture.bindings.cs b/Modules/UnityWebRequestTexture/Public/DownloadHandlerTexture.bindings.cs
index 05a6c38003..c27910ed24 100644
--- a/Modules/UnityWebRequestTexture/Public/DownloadHandlerTexture.bindings.cs
+++ b/Modules/UnityWebRequestTexture/Public/DownloadHandlerTexture.bindings.cs
@@ -15,8 +15,6 @@ namespace UnityEngine.Networking
     public sealed class DownloadHandlerTexture : DownloadHandler
     {
         private NativeArray<byte> m_NativeData;
-        private Texture2D mTexture;
-        private bool mHasTexture;
         private bool mNonReadable;
 
         private static extern IntPtr Create(DownloadHandlerTexture obj, bool readable);
@@ -50,27 +48,7 @@ public override void Dispose()
 
         public Texture2D texture
         {
-            get { return InternalGetTexture(); }
-        }
-
-        private Texture2D InternalGetTexture()
-        {
-            if (mHasTexture)
-            {
-                if (mTexture == null)
-                {
-                    // this is corner case when this DH survives scene reload, while texture does not
-                    mTexture = new Texture2D(2, 2);
-                    mTexture.LoadImage(GetData(), mNonReadable);
-                }
-            }
-            else if (mTexture == null)
-            {
-                mTexture = InternalGetTextureNative();
-                mHasTexture = true;
-            }
-
-            return mTexture;
+            get { return InternalGetTextureNative(); }
         }
 
         [NativeThrows]
diff --git a/Modules/VFX/Public/ScriptBindings/VFXEnums.bindings.cs b/Modules/VFX/Public/ScriptBindings/VFXEnums.bindings.cs
index 87baac8439..74bd78afe7 100644
--- a/Modules/VFX/Public/ScriptBindings/VFXEnums.bindings.cs
+++ b/Modules/VFX/Public/ScriptBindings/VFXEnums.bindings.cs
@@ -166,6 +166,7 @@ internal enum VFXExpressionOperation
         ExtractFarPlaneFromMainCamera,
         ExtractAspectRatioFromMainCamera,
         ExtractPixelDimensionsFromMainCamera,
+        ExtractScaledPixelDimensionsFromMainCamera,
         ExtractLensShiftFromMainCamera,
         GetBufferFromMainCamera,
         IsMainCameraOrthographic,
@@ -212,6 +213,7 @@ internal enum VFXExpressionOperation
         TextureWidth,
         TextureHeight,
         TextureDepth,
+        TextureFormat,
 
         // Event attribute in spawner
         ReadEventAttribute,
diff --git a/Modules/VFX/Public/ScriptBindings/VisualEffect.bindings.cs b/Modules/VFX/Public/ScriptBindings/VisualEffect.bindings.cs
index 3340175625..6f77daa0c9 100644
--- a/Modules/VFX/Public/ScriptBindings/VisualEffect.bindings.cs
+++ b/Modules/VFX/Public/ScriptBindings/VisualEffect.bindings.cs
@@ -251,7 +251,7 @@ public AnimationCurve GetAnimationCurve(int nameID)
         extern public bool HasAnySystemAwake();
 
         [FreeFunction(Name = "VisualEffectBindings::GetComputedBounds", HasExplicitThis = true)] extern internal Bounds GetComputedBounds(int nameID);
-        [FreeFunction(Name = "VisualEffectBindings::GetCurrentPadding", HasExplicitThis = true)] extern internal Vector3 GetCurrentPadding(int nameID);
+        [FreeFunction(Name = "VisualEffectBindings::GetCurrentBoundsPadding", HasExplicitThis = true)] extern internal Vector3 GetCurrentBoundsPadding(int nameID);
 
         public void GetSpawnSystemInfo(int nameID, VFXSpawnerState spawnState)
         {
@@ -567,9 +567,9 @@ internal Bounds GetComputedBounds(string name)
             return GetComputedBounds(Shader.PropertyToID(name));
         }
 
-        internal Vector3 GetCurrentPadding(string name)
+        internal Vector3 GetCurrentBoundsPadding(string name)
         {
-            return GetCurrentPadding(Shader.PropertyToID(name));
+            return GetCurrentBoundsPadding(Shader.PropertyToID(name));
         }
 
         extern public int aliveParticleCount { get; }
diff --git a/Modules/VFXEditor/Public/ScriptBindings/VFXExpressionTexture.bindings.cs b/Modules/VFXEditor/Public/ScriptBindings/VFXExpressionTexture.bindings.cs
new file mode 100644
index 0000000000..5db55413cc
--- /dev/null
+++ b/Modules/VFXEditor/Public/ScriptBindings/VFXExpressionTexture.bindings.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.Runtime.InteropServices;
+using UnityEngine;
+using UnityEngine.Bindings;
+using UnityEngine.Rendering;
+using UnityEngine.Scripting;
+
+namespace UnityEditor.VFX
+{
+    [RequiredByNativeCode]
+    [NativeType(Header = "Modules/VFX/Public/VFXExpressionTextureFunctions.h")]
+    [StaticAccessor("VFXExpressionTextureFunctions", StaticAccessorType.DoubleColon)]
+    internal class VFXExpressionTexture
+    {
+        extern static internal uint GetTextureFormat(Texture texture);
+    }
+}
diff --git a/Modules/VFXEditor/Public/ScriptBindings/VFXMemorySerializer.bindings.cs b/Modules/VFXEditor/Public/ScriptBindings/VFXMemorySerializer.bindings.cs
index d171134c71..8088a1b50c 100644
--- a/Modules/VFXEditor/Public/ScriptBindings/VFXMemorySerializer.bindings.cs
+++ b/Modules/VFXEditor/Public/ScriptBindings/VFXMemorySerializer.bindings.cs
@@ -17,16 +17,22 @@ namespace UnityEditor.VFX
     [StaticAccessor("VFXMemorySerializerBindings", StaticAccessorType.DoubleColon)]
     internal static class VFXMemorySerializer
     {
+
+        [FreeFunction(Name = "VFXMemorySerializerBindings::StoreObjects", ThrowsException = true)]
         extern public static string StoreObjects(ScriptableObject[] objects);
 
+        [FreeFunction(Name = "VFXMemorySerializerBindings::StoreObjectsToByteArray", ThrowsException = true)]
         extern public static byte[] StoreObjectsToByteArray(ScriptableObject[] objects, CompressionLevel compressionLevel = CompressionLevel.None);
 
-        [FreeFunction(Name = "VFXMemorySerializerBindings::Internal_ExtractObjects_FromString")]
+        [FreeFunction(Name = "VFXMemorySerializerBindings::Internal_ExtractObjects_FromString", ThrowsException = true)]
         extern private static ScriptableObject[] ExtractObjects_FromString(string data, bool asACopy);
 
-        [FreeFunction(Name = "VFXMemorySerializerBindings::Internal_ExtractObjects_FromByteArray")]
+        [FreeFunction(Name = "VFXMemorySerializerBindings::Internal_ExtractObjects_FromByteArray", ThrowsException = true)]
         extern private static ScriptableObject[] ExtractObjects_FromByteArray(byte[] data, bool asACopy);
 
+        [FreeFunction(Name = "VFXMemorySerializerBindings::Internal_DuplicateObjects", ThrowsException = true)]
+        extern public static ScriptableObject[] DuplicateObjects(ScriptableObject[] objects);
+
         public static ScriptableObject[] ExtractObjects(string data, bool asACopy)
         {
             return ExtractObjects_FromString(data, asACopy);
@@ -36,8 +42,5 @@ public static ScriptableObject[] ExtractObjects(byte[] data, bool asACopy)
         {
             return ExtractObjects_FromByteArray(data, asACopy);
         }
-
-        [FreeFunction(Name = "VFXMemorySerializerBindings::Internal_DuplicateObjects")]
-        extern public static ScriptableObject[] DuplicateObjects(ScriptableObject[] objects);
     }
 }
diff --git a/Modules/VFXEditor/Public/ScriptBindings/VisualEffectResource.bindings.cs b/Modules/VFXEditor/Public/ScriptBindings/VisualEffectResource.bindings.cs
index 04d0169f7f..465f31f26b 100644
--- a/Modules/VFXEditor/Public/ScriptBindings/VisualEffectResource.bindings.cs
+++ b/Modules/VFXEditor/Public/ScriptBindings/VisualEffectResource.bindings.cs
@@ -151,6 +151,7 @@ internal struct VFXEditorTaskDesc
         public VFXMapping[] values;
         public VFXMapping[] parameters;
         private UnityObject processor;
+        public uint instanceSplitIndex;
         private int m_ShaderSourceIndex;
         public UnityObject model;
 
@@ -180,6 +181,14 @@ public int shaderSourceIndex
             }
         }
     }
+
+    [UsedByNativeCode]
+    [NativeType(CodegenOptions.Custom, "ScriptingVFXInstanceSplitDesc")]
+    internal struct VFXInstanceSplitDesc
+    {
+        public uint[] values;
+    }
+
     [UsedByNativeCode]
     [NativeType(CodegenOptions.Custom, "ScriptingVFXEditorSystemDesc")]
     internal struct VFXEditorSystemDesc
@@ -192,6 +201,7 @@ internal struct VFXEditorSystemDesc
         public VFXMapping[] buffers;
         public VFXMapping[] values;
         public VFXEditorTaskDesc[] tasks;
+        public VFXInstanceSplitDesc[] instanceSplitDescs;
     }
 
     [NativeType(CodegenOptions.Custom, "ScriptingVFXEventDesc")]
diff --git a/Modules/VFXEditor/Public/VisualEffectEditorDefault.cs b/Modules/VFXEditor/Public/VisualEffectEditorDefault.cs
index 7494750e40..3cbdefdf15 100644
--- a/Modules/VFXEditor/Public/VisualEffectEditorDefault.cs
+++ b/Modules/VFXEditor/Public/VisualEffectEditorDefault.cs
@@ -10,7 +10,7 @@ namespace UnityEditor.VFX
 {
     [CustomEditor(typeof(VisualEffect))]
     [CanEditMultipleObjects]
-    class VisualEffectEditorDefault : Editor
+    class VisualEffectEditorDefault : Editor, ICoupledEditor
     {
         class Styles
         {
@@ -21,5 +21,7 @@ public override void OnInspectorGUI()
         {
             EditorGUILayout.LabelField(Styles.message);
         }
+
+        SerializedObject ICoupledEditor.coupledComponent => null;
     }
 }
diff --git a/Modules/VR/ScriptBindings/XR.bindings.cs b/Modules/VR/ScriptBindings/XR.bindings.cs
index 00dd8bf904..5896c3eb05 100644
--- a/Modules/VR/ScriptBindings/XR.bindings.cs
+++ b/Modules/VR/ScriptBindings/XR.bindings.cs
@@ -172,7 +172,7 @@ public static class XRDevice
 
 
         [NativeName("DeviceRefreshRate")]
-        [StaticAccessor("GetIVRDeviceScripting()", StaticAccessorType.ArrowWithDefaultReturnIfNull)]
+        [StaticAccessor("GetIVRDeviceSwapChain()", StaticAccessorType.ArrowWithDefaultReturnIfNull)]
         extern public static float refreshRate { get; }
 
         [StaticAccessor("GetIVRDeviceScripting()", StaticAccessorType.ArrowWithDefaultReturnIfNull)]
diff --git a/Modules/VirtualTexturing/ScriptBindings/VirtualTexturing.bindings.cs b/Modules/VirtualTexturing/ScriptBindings/VirtualTexturing.bindings.cs
index 2b1a3ac604..f54f08dfe3 100644
--- a/Modules/VirtualTexturing/ScriptBindings/VirtualTexturing.bindings.cs
+++ b/Modules/VirtualTexturing/ScriptBindings/VirtualTexturing.bindings.cs
@@ -43,11 +43,11 @@ internal struct StackValidationResult
 
             [NativeThrows] extern internal static int tileSize { get; }
 
-            [NativeThrows] extern public static bool ValidateTextureStack([NotNull] Texture[] textures, out string errorMessage);
+            [NativeThrows] extern public static bool ValidateTextureStack([NotNull][Unmarshalled] Texture[] textures, out string errorMessage);
 
             [NativeThrows] extern internal static StackValidationResult[] ValidateMaterialTextureStacks([NotNull] Material mat);
 
-            [NativeConditional("UNITY_EDITOR", "{}")]
+            [NativeConditional("UNITY_EDITOR")]
             [NativeThrows] extern public static GraphicsFormat[] QuerySupportedFormats();
         }
 
@@ -74,6 +74,7 @@ public struct Handle
             [NativeThrows] extern public static bool debugTilesEnabled { get; set; }
             [NativeThrows] extern public static bool resolvingEnabled { get; set; }
             [NativeThrows] extern public static bool flushEveryTickEnabled { get; set; }
+            [NativeThrows] extern public static int mipPreloadedTextureCount { get; }
         }
 
         [NativeHeader("Modules/VirtualTexturing/Public/VirtualTextureResolver.h")]
@@ -196,6 +197,8 @@ public static class Streaming
             extern public static void SetGPUCacheSettings(GPUCacheSetting[] cacheSettings);
             [NativeThrows]
             extern public static GPUCacheSetting[] GetGPUCacheSettings();
+            [NativeThrows]
+            extern public static void EnableMipPreloading(int texturesPerFrame, int mipCount);
         }
 
         [NativeHeader("Modules/VirtualTexturing/ScriptBindings/VirtualTexturing.bindings.h")]
diff --git a/Modules/XR/Subsystems/Display/XRDisplaySubsystem.bindings.cs b/Modules/XR/Subsystems/Display/XRDisplaySubsystem.bindings.cs
index af04f92297..333473b71f 100644
--- a/Modules/XR/Subsystems/Display/XRDisplaySubsystem.bindings.cs
+++ b/Modules/XR/Subsystems/Display/XRDisplaySubsystem.bindings.cs
@@ -232,6 +232,9 @@ public struct XRBlitParams
             public Rect srcRect;
             public Rect destRect;
             public IntPtr foveatedRenderingInfo;
+            public bool srcHdrEncoded;
+            public ColorGamut srcHdrColorGamut;
+            public int srcHdrMaxLuminance;
         }
 
         [NativeHeader("Modules/XR/Subsystems/Display/XRDisplaySubsystem.bindings.h")]
@@ -284,5 +287,8 @@ public bool AddGraphicsThreadMirrorViewBlit(CommandBuffer cmd, bool allowGraphic
         [NativeHeader("Runtime/Graphics/CommandBuffer/RenderingCommandBuffer.h")]
         [NativeConditional("ENABLE_XR")]
         extern public bool AddGraphicsThreadMirrorViewBlit(CommandBuffer cmd, bool allowGraphicsStateInvalidate, int mode);
+
+        private HDROutputSettings m_HDROutputSettings;
+        public HDROutputSettings hdrOutputSettings { get { if (m_HDROutputSettings == null) m_HDROutputSettings = new HDROutputSettings(-1); return m_HDROutputSettings; } }
     }
 }
diff --git a/Projects/CSharp/UnityEditor.csproj b/Projects/CSharp/UnityEditor.csproj
index f71da620b4..b5a596e8ae 100644
--- a/Projects/CSharp/UnityEditor.csproj
+++ b/Projects/CSharp/UnityEditor.csproj
@@ -6,9 +6,9 @@
     <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_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_GENERATE_NATIVE_PLUGINS_FOR_ASSEMBLIES_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_MARSHALLING_TESTS;ENABLE_MICROPHONE;ENABLE_MONO;ENABLE_MOVIES;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NAVIGATION_HEIGHTMESH_RUNTIME_SUPPORT;ENABLE_NAVIGATION_PACKAGE_DEBUG_VISUALIZATION;ENABLE_NAVIGATION_UI_REQUIRES_PACKAGE;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_UNITY_GAME_SERVICES_ANALYTICS_SUPPORT;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;USE_ITEM_LIBRARY_MODULE;USE_PROPERTY_DATABASE;USE_QUERY_BUILDER;USE_SEARCH_ENGINE_API;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_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_GENERATE_NATIVE_PLUGINS_FOR_ASSEMBLIES_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_MARSHALLING_TESTS;ENABLE_MICROPHONE;ENABLE_MONO;ENABLE_MOVIES;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NAVIGATION_HEIGHTMESH_RUNTIME_SUPPORT;ENABLE_NAVIGATION_PACKAGE_DEBUG_VISUALIZATION;ENABLE_NAVIGATION_UI_REQUIRES_PACKAGE;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_UNITY_GAME_SERVICES_ANALYTICS_SUPPORT;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_CAN_SHOW_SPLASH_SCREEN;UNITY_EDITOR;UNITY_EDITOR_API;UNITY_EDITOR_LINUX;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_TINYPROFILING_INTERNAL;UNITY_TVOS_API;UNITY_UNITYADS_API;UNITY_WEBGL_API;USE_ITEM_LIBRARY_MODULE;USE_PROPERTY_DATABASE;USE_QUERY_BUILDER;USE_SEARCH_ENGINE_API;USE_SEARCH_MODULE</DefineConstants>
     <LangVersion>latest</LangVersion>
-    <NoWarn>1071;0169;0649;0626</NoWarn>
+    <NoWarn>1701;0169;0649;0626</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\Editor\Mono\2D\Common\ScriptBindings\SpriteEditorExtension.bindings.cs">
@@ -752,69 +752,18 @@
     <Compile Include="..\..\Editor\Mono\Collab\AssetAccess.cs">
       <Link>Editor\Mono\Collab\AssetAccess.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\CloudBuildStatus.cs">
-      <Link>Editor\Mono\Collab\CloudBuildStatus.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\Collab.bindings.cs">
-      <Link>Editor\Mono\Collab\Collab.bindings.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\Collab.cs">
-      <Link>Editor\Mono\Collab\Collab.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\CollabChange.cs">
-      <Link>Editor\Mono\Collab\CollabChange.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\CollabChangeAction.cs">
-      <Link>Editor\Mono\Collab\CollabChangeAction.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\Collab\CollabChangeItem.cs">
       <Link>Editor\Mono\Collab\CollabChangeItem.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\CollabDialogs.cs">
-      <Link>Editor\Mono\Collab\CollabDialogs.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\CollabEditorHooks.cs">
-      <Link>Editor\Mono\Collab\CollabEditorHooks.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\CollabFilters.cs">
-      <Link>Editor\Mono\Collab\CollabFilters.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\CollabProgressInfo.cs">
-      <Link>Editor\Mono\Collab\CollabProgressInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\CollabRevision.cs">
-      <Link>Editor\Mono\Collab\CollabRevision.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\CollabRevisionsData.cs">
-      <Link>Editor\Mono\Collab\CollabRevisionsData.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\Collab\CollabTesting.cs">
       <Link>Editor\Mono\Collab\CollabTesting.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\Collab\CollabToUVCSBridge.cs">
+      <Link>Editor\Mono\Collab\CollabToUVCSBridge.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Collab\IVersionControl.cs">
       <Link>Editor\Mono\Collab\IVersionControl.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\RevisionsService.cs">
-      <Link>Editor\Mono\Collab\RevisionsService.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\Softlocks\CollabSoftLocks.cs">
-      <Link>Editor\Mono\Collab\Softlocks\CollabSoftLocks.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\Softlocks\SoftlockData.cs">
-      <Link>Editor\Mono\Collab\Softlocks\SoftlockData.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\Softlocks\SoftlockFilter.cs">
-      <Link>Editor\Mono\Collab\Softlocks\SoftlockFilter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\Softlocks\SoftlockUIData.cs">
-      <Link>Editor\Mono\Collab\Softlocks\SoftlockUIData.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\Softlocks\SoftlockViewController.cs">
-      <Link>Editor\Mono\Collab\Softlocks\SoftlockViewController.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Collab\Views\ICollabHistoryWindow.cs">
-      <Link>Editor\Mono\Collab\Views\ICollabHistoryWindow.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\CollectImportedDependenciesAttribute.cs">
       <Link>Editor\Mono\CollectImportedDependenciesAttribute.cs</Link>
     </Compile>
@@ -884,30 +833,6 @@
     <Compile Include="..\..\Editor\Mono\DisplayUtility.cs">
       <Link>Editor\Mono\DisplayUtility.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\Display\EditorDisplayFullscreenSetting.cs">
-      <Link>Editor\Mono\Display\EditorDisplayFullscreenSetting.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Display\EditorDisplayManager.cs">
-      <Link>Editor\Mono\Display\EditorDisplayManager.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Display\EditorDisplaySettingsProfile.cs">
-      <Link>Editor\Mono\Display\EditorDisplaySettingsProfile.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Display\EditorDisplayUtility.bindings.cs">
-      <Link>Editor\Mono\Display\EditorDisplayUtility.bindings.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Display\EditorFullscreenController.cs">
-      <Link>Editor\Mono\Display\EditorFullscreenController.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Display\FullscreenSettingsForAttribute.cs">
-      <Link>Editor\Mono\Display\FullscreenSettingsForAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Display\GameViewFullscreenSettings.cs">
-      <Link>Editor\Mono\Display\GameViewFullscreenSettings.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Display\IPlayModeViewFullscreenSettings.cs">
-      <Link>Editor\Mono\Display\IPlayModeViewFullscreenSettings.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\DragAndDrop.bindings.cs">
       <Link>Editor\Mono\DragAndDrop.bindings.cs</Link>
     </Compile>
@@ -956,6 +881,9 @@
     <Compile Include="..\..\Editor\Mono\EditorGUI.cs">
       <Link>Editor\Mono\EditorGUI.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\EditorGUILayout.cs">
+      <Link>Editor\Mono\EditorGUILayout.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\EditorGUIUtility.bindings.cs">
       <Link>Editor\Mono\EditorGUIUtility.bindings.cs</Link>
     </Compile>
@@ -1070,6 +998,9 @@
     <Compile Include="..\..\Editor\Mono\EditorSettings.bindings.cs">
       <Link>Editor\Mono\EditorSettings.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\EditorTextSettings.cs">
+      <Link>Editor\Mono\EditorTextSettings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\EditorUserBuildSettings.bindings.cs">
       <Link>Editor\Mono\EditorUserBuildSettings.bindings.cs</Link>
     </Compile>
@@ -1121,6 +1052,12 @@
     <Compile Include="..\..\Editor\Mono\GI\BuiltinSkyManager.bindings.cs">
       <Link>Editor\Mono\GI\BuiltinSkyManager.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\GI\InputExtraction.bindings.cs">
+      <Link>Editor\Mono\GI\InputExtraction.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\GI\LightBaker.bindings.cs">
+      <Link>Editor\Mono\GI\LightBaker.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\GI\LightProbeVisualization.bindings.cs">
       <Link>Editor\Mono\GI\LightProbeVisualization.bindings.cs</Link>
     </Compile>
@@ -1619,12 +1556,6 @@
     <Compile Include="..\..\Editor\Mono\GameView\GameView.cs">
       <Link>Editor\Mono\GameView\GameView.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\GameView\GameViewOnPlayMenu.cs">
-      <Link>Editor\Mono\GameView\GameViewOnPlayMenu.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\GameView\GameViewOnPlayMenuItemProvider.cs">
-      <Link>Editor\Mono\GameView\GameViewOnPlayMenuItemProvider.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\GameView\GameViewSize.cs">
       <Link>Editor\Mono\GameView\GameViewSize.cs</Link>
     </Compile>
@@ -2033,6 +1964,51 @@
     <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspector.cs">
       <Link>Editor\Mono\Inspector\GraphicsSettingsInspector.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsElement.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorAlwaysIncludedShader.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorAlwaysIncludedShader.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorBuiltinShaderLabel.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorBuiltinShaderLabel.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorBuiltinShaders.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorBuiltinShaders.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorCameraSettings.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorCameraSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorCullingSettings.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorCullingSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorLightProbe.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorLightProbe.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorRenderPipelineAsset.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorRenderPipelineAsset.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorShaderLog.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorShaderLog.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorShaderPreload.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorShaderPreload.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorShaderStripping.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorShaderStripping.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorTierSettings.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorTierSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorTitleBar.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorTitleBar.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorVideoShader.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsInspectorVideoShader.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsScopes.cs">
+      <Link>Editor\Mono\Inspector\GraphicsSettingsInspectors\GraphicsSettingsScopes.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Inspector\IEditorElement.cs">
       <Link>Editor\Mono\Inspector\IEditorElement.cs</Link>
     </Compile>
@@ -2072,9 +2048,6 @@
     <Compile Include="..\..\Editor\Mono\Inspector\LightingSettingsEditor.cs">
       <Link>Editor\Mono\Inspector\LightingSettingsEditor.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\Inspector\LineHandle.cs">
-      <Link>Editor\Mono\Inspector\LineHandle.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\Inspector\LineRendererCurveEditor.cs">
       <Link>Editor\Mono\Inspector\LineRendererCurveEditor.cs</Link>
     </Compile>
@@ -2249,6 +2222,9 @@
     <Compile Include="..\..\Editor\Mono\Inspector\ScriptableObjectAssetEditor.cs">
       <Link>Editor\Mono\Inspector\ScriptableObjectAssetEditor.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\Inspector\ScriptableRenderPipelineExtensionAttribute.deprecated.cs">
+      <Link>Editor\Mono\Inspector\ScriptableRenderPipelineExtensionAttribute.deprecated.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Inspector\ShaderGUI.cs">
       <Link>Editor\Mono\Inspector\ShaderGUI.cs</Link>
     </Compile>
@@ -2657,6 +2633,9 @@
     <Compile Include="..\..\Editor\Mono\PlayerSettingsAndroid.bindings.cs">
       <Link>Editor\Mono\PlayerSettingsAndroid.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\PlayerSettingsDefaultTextureCompressionHandler.cs">
+      <Link>Editor\Mono\PlayerSettingsDefaultTextureCompressionHandler.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\PlayerSettingsEmbeddedLinux.bindings.cs">
       <Link>Editor\Mono\PlayerSettingsEmbeddedLinux.bindings.cs</Link>
     </Compile>
@@ -2951,6 +2930,9 @@
     <Compile Include="..\..\Editor\Mono\SceneModeWindows\DefaultLightingExplorerExtension.cs">
       <Link>Editor\Mono\SceneModeWindows\DefaultLightingExplorerExtension.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\SceneModeWindows\LightingExplorerExtensionAttribute.deprecated.cs">
+      <Link>Editor\Mono\SceneModeWindows\LightingExplorerExtensionAttribute.deprecated.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\SceneModeWindows\LightingExplorerTab.cs">
       <Link>Editor\Mono\SceneModeWindows\LightingExplorerTab.cs</Link>
     </Compile>
@@ -2987,9 +2969,6 @@
     <Compile Include="..\..\Editor\Mono\SceneModeWindows\SceneModeUtility.cs">
       <Link>Editor\Mono\SceneModeWindows\SceneModeUtility.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\SceneModeWindows\TierSettingsWindow.cs">
-      <Link>Editor\Mono\SceneModeWindows\TierSettingsWindow.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\SceneObjectIdentifier.bindings.cs">
       <Link>Editor\Mono\SceneObjectIdentifier.bindings.cs</Link>
     </Compile>
@@ -3086,6 +3065,9 @@
     <Compile Include="..\..\Editor\Mono\Scripting\APIUpdater\APIUpdaterAssemblyHelper.cs">
       <Link>Editor\Mono\Scripting\APIUpdater\APIUpdaterAssemblyHelper.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\Scripting\APIUpdater\APIUpdaterHelper.cs">
+      <Link>Editor\Mono\Scripting\APIUpdater\APIUpdaterHelper.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Scripting\APIUpdater\APIUpdaterLogger.cs">
       <Link>Editor\Mono\Scripting\APIUpdater\APIUpdaterLogger.cs</Link>
     </Compile>
@@ -3095,9 +3077,6 @@
     <Compile Include="..\..\Editor\Mono\Scripting\APIUpdater\AssemblyDependencyGraph.cs">
       <Link>Editor\Mono\Scripting\APIUpdater\AssemblyDependencyGraph.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\Scripting\Compilers\APIUpdaterHelper.cs">
-      <Link>Editor\Mono\Scripting\Compilers\APIUpdaterHelper.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\Scripting\Compilers\CommandLineFormatter.cs">
       <Link>Editor\Mono\Scripting\Compilers\CommandLineFormatter.cs</Link>
     </Compile>
@@ -3374,9 +3353,6 @@
     <Compile Include="..\..\Editor\Mono\SettingsWindow\FogEditor.cs">
       <Link>Editor\Mono\SettingsWindow\FogEditor.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\SettingsWindow\GraphicsSettingsEditors.cs">
-      <Link>Editor\Mono\SettingsWindow\GraphicsSettingsEditors.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\SettingsWindow\LightingEditor.cs">
       <Link>Editor\Mono\SettingsWindow\LightingEditor.cs</Link>
     </Compile>
@@ -3518,9 +3494,6 @@
     <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>
@@ -3569,6 +3542,9 @@
     <Compile Include="..\..\Editor\Mono\UIElements\Drawers\Internal\UnityEventItem.cs">
       <Link>Editor\Mono\UIElements\Drawers\Internal\UnityEventItem.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\EditorFocusMonitor.cs">
+      <Link>Editor\Mono\UIElements\EditorFocusMonitor.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\UIElements\EditorGenericDropdownMenu.cs">
       <Link>Editor\Mono\UIElements\EditorGenericDropdownMenu.cs</Link>
     </Compile>
@@ -3893,540 +3869,6 @@
     <Compile Include="..\..\External\JsonParsers\MiniJson\MiniJSON.cs">
       <Link>External\JsonParsers\MiniJson\MiniJSON.cs</Link>
     </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Builder.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Builder.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\BuilderExternalPackages.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\BuilderExternalPackages.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\BuilderPane.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\BuilderPane.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\BuilderPaneContent.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\BuilderPaneContent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\BuilderPaneWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\BuilderPaneWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\BuilderSelection.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\BuilderSelection.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Document\BuilderDocument.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Document\BuilderDocument.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Document\BuilderDocumentOpenUSS.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Document\BuilderDocumentOpenUSS.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Document\BuilderDocumentOpenUXML.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Document\BuilderDocumentOpenUXML.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Document\BuilderDocumentSettings.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Document\BuilderDocumentSettings.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Document\BuilderUXMLFileSettings.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Document\BuilderUXMLFileSettings.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderClassDragger.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderClassDragger.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderDragger.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderDragger.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderExplorerDragger.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderExplorerDragger.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderHierarchyDragger.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderHierarchyDragger.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderLibraryDragger.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderLibraryDragger.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderStyleSheetsDragger.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderStyleSheetsDragger.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderViewportDragger.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Draggers\BuilderViewportDragger.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderExplorer.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderExplorer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderExplorerItem.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderExplorerItem.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderHierarchy.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderHierarchy.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderHierarchyUtilities.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderHierarchyUtilities.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderHierarchyWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderHierarchyWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderNewSelectorField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderNewSelectorField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderStyleSheets.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderStyleSheets.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderStyleSheetsContextMenu.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderStyleSheetsContextMenu.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderStyleSheetsUtilities.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderStyleSheetsUtilities.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderStyleSheetsWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Explorer\BuilderStyleSheetsWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspector.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspector.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorAttributes.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorAttributes.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorCanvas.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorCanvas.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorHeader.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorHeader.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorInheritedStyles.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorInheritedStyles.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorLocalStyles.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorLocalStyles.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorMatchingSelectors.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorMatchingSelectors.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorPreview.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorPreview.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorPreviewWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorPreviewWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorStyleFields+Transitions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorStyleFields+Transitions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorStyleFields.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorStyleFields.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorStyleSheet.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorStyleSheet.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderInspectorWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderStyleRow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\BuilderStyleRow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\IBuilderInspectorSection.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Inspector\IBuilderInspectorSection.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibrary.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibrary.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryContent.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryContent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryPlainView.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryPlainView.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryProjectScanner.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryProjectScanner.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryTreeItem.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryTreeItem.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryTreeView.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryTreeView.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryView.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryView.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Library\BuilderLibraryWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderAnchorer.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderAnchorer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderManipulator.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderManipulator.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderMover.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderMover.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderParentTracker.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderParentTracker.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderPlacementIndicator.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderPlacementIndicator.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderResizer.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderResizer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderSelectionIndicator.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderSelectionIndicator.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderTracker.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderTracker.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderTransformer.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Manipulators\BuilderTransformer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderCodePreview.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderCodePreview.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderPreviewWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderPreviewWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderTooltipPreview.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderTooltipPreview.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderUssPreview.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderUssPreview.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderUssPreviewWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderUssPreviewWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderUxmlPreview.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderUxmlPreview.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderUxmlPreviewWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Previews\BuilderUxmlPreviewWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Toolbar\BuilderToolbar.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Toolbar\BuilderToolbar.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderAssetModificationProcessor.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderAssetModificationProcessor.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderAssetPostprocessor.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderAssetPostprocessor.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderAssetUtilities.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderAssetUtilities.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderCommandHandler.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderCommandHandler.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderConstants.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderConstants.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderDialogsUtility.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderDialogsUtility.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderEditorUtility.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderEditorUtility.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderElementContextMenu.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderElementContextMenu.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderNameUtilities.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderNameUtilities.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderPackageUtilities.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderPackageUtilities.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderPlacementUtilities.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderPlacementUtilities.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderProjectSettings.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderProjectSettings.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderSharedStyles.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderSharedStyles.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderStyleUtilities.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Utilities\BuilderStyleUtilities.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderCanvas.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderCanvas.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderCanvasStyleControls.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderCanvasStyleControls.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderInPlaceTextEditingUtilities.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderInPlaceTextEditingUtilities.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderNotifications.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderNotifications.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderPanner.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderPanner.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderViewport.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderViewport.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderViewportWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderViewportWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderVisualTreeStyleUpdaterTraversal.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderVisualTreeStyleUpdaterTraversal.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderZoomer.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\BuilderZoomer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\IBuilderViewportWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Builder\Viewport\IBuilderViewportWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Background\CheckerboardBackground.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Background\CheckerboardBackground.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ButtonStrip\ButtonStrip.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ButtonStrip\ButtonStrip.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\CategoryDropdownField\CategoryDropdownContent.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\CategoryDropdownField\CategoryDropdownContent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\CategoryDropdownField\CategoryDropdownField+WindowContent.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\CategoryDropdownField\CategoryDropdownField+WindowContent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\CategoryDropdownField\CategoryDropdownField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\CategoryDropdownField\CategoryDropdownField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\BaseOverlayPainter.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\BaseOverlayPainter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\ElementHierarchyView.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\ElementHierarchyView.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\HighlightOverlayPainter.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\HighlightOverlayPainter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\LayoutOverlayPainter.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\LayoutOverlayPainter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\OverlayPainterHelperElement.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\OverlayPainterHelperElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\RepaintOverlayPainter.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ElementHierarchyView\RepaintOverlayPainter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FoldoutField\FoldoutColorField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FoldoutField\FoldoutColorField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FoldoutField\FoldoutField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FoldoutField\FoldoutField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FoldoutField\FoldoutNumberField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FoldoutField\FoldoutNumberField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FoldoutField\FoldoutTransitionField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FoldoutField\FoldoutTransitionField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FoldoutWithCheckbox\FoldoutWithCheckbox.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FoldoutWithCheckbox\FoldoutWithCheckbox.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FontStyleStrip\FontStyleStrip.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\FontStyleStrip\FontStyleStrip.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\HelpBox\HelpBox.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\HelpBox\HelpBox.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Importers\BuilderStyleSheetImporter.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Importers\BuilderStyleSheetImporter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Importers\BuilderVisualTreeAssetImporter.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Importers\BuilderVisualTreeAssetImporter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\LibraryFoldout\LibraryFoldout.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\LibraryFoldout\LibraryFoldout.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ModalPopup\ModalPopup.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ModalPopup\ModalPopup.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\MultiTypeField\MultiTypeField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\MultiTypeField\MultiTypeField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\PercentSlider\PercentSlider.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\PercentSlider\PercentSlider.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\PersistedFoldout\PersistedFoldout.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\PersistedFoldout\PersistedFoldout.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ReflectionExtensions\ReflectionExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ReflectionExtensions\ReflectionExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\SampleDocument\BuilderAttributesTestElement.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\SampleDocument\BuilderAttributesTestElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Selector\SelectorUtility.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Selector\SelectorUtility.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\AngleStyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\AngleStyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\DimensionStyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\DimensionStyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\FieldSearchCompleter.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\FieldSearchCompleter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\FieldStatusIndicator.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\FieldStatusIndicator.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\FieldValueInfo.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\FieldValueInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\ImageStyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\ImageStyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\IntegerStyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\IntegerStyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\NumericStyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\NumericStyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\PositionAnchorPoint.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\PositionAnchorPoint.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\PositionAnchors.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\PositionAnchors.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\PositionSection.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\PositionSection.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\PositionStyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\PositionStyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\RotateStyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\RotateStyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\ScaleStyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\ScaleStyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\StyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\StyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\StyleFieldConstants.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\StyleFieldConstants.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\StyleFieldPopup.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\StyleFieldPopup.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\StyleVariableUtilities.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\StyleVariableUtilities.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\TextShadowStyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\TextShadowStyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\TransformOriginSelector.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\TransformOriginSelector.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\TransformOriginStyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\TransformOriginStyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\TranslateStyleField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\TranslateStyleField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableCompleter.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableCompleter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableEditingHandler.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableEditingHandler.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableField.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableInfo.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableInfoTooltip.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableInfoTooltip.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableInfoView.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleField\VariableInfoView.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\CSSSpecCopy.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\CSSSpecCopy.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleComplexSelectorExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleComplexSelectorExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StylePropertyExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StylePropertyExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StylePropertyManipulator.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StylePropertyManipulator.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleRuleExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleRuleExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleSheetExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleSheetExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleSheetToUss.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleSheetToUss.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleSheetUtilities.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleSheetUtilities.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleValueHandleExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\StyleSheetExtensions\StyleValueHandleExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\TextAlignStrip\TextAlignStrip.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\TextAlignStrip\TextAlignStrip.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ToggleButtonStrip\ToggleButtonStrip.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\ToggleButtonStrip\ToggleButtonStrip.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\BuilderTransition.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\BuilderTransition.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\BuilderTransitionData.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\BuilderTransitionData.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\TransitionChangeType.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\TransitionChangeType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\TransitionEvents.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\TransitionEvents.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\TransitionListView.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\TransitionListView.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\TransitionPropertyDropdownContent.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\TransitionPropertyDropdownContent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\TransitionsExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\TransitionsExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\UIStyleValue.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\Transitions\UIStyleValue.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\TypeField\BuilderAttributeTypeName.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\TypeField\BuilderAttributeTypeName.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\UIExtensionsTestWindow\UIExtensionsTestWindow.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\UIExtensionsTestWindow\UIExtensionsTestWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\UnityUIBuilderSelectionMarker\UnityUIBuilderSelectionMarker.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\UnityUIBuilderSelectionMarker\UnityUIBuilderSelectionMarker.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualElementExtensions\VisualElementExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualElementExtensions\VisualElementExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\IUxmlFactoryExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\IUxmlFactoryExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\TemplateAssetExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\TemplateAssetExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\VisualElementAssetExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\VisualElementAssetExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetExtensions.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetLinkedCloneTree.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetLinkedCloneTree.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetToUXML.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetToUXML.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetUtilities.cs">
-      <Link>External\MirroredPackageSources\com.unity.ui.builder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetUtilities.cs</Link>
-    </Compile>
     <Compile Include="..\..\External\NiceIO\NiceIO.cs">
       <Link>External\NiceIO\NiceIO.cs</Link>
     </Compile>
@@ -4601,6 +4043,9 @@
     <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\UIElementsEditorInitialization.cs">
+      <Link>ModuleOverrides\com.unity.ui\Editor\UIElementsEditorInitialization.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\UIElementsEditorRuntimeUtility.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\UIElementsEditorRuntimeUtility.cs</Link>
     </Compile>
@@ -4679,6 +4124,9 @@
     <Compile Include="..\..\Modules\AssetDatabase\Editor\ScriptBindings\AssetOrigin.binding.cs">
       <Link>Modules\AssetDatabase\Editor\ScriptBindings\AssetOrigin.binding.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\AssetDatabase\Editor\ScriptBindings\CacheServer.bindings.cs">
+      <Link>Modules\AssetDatabase\Editor\ScriptBindings\CacheServer.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\AssetDatabase\Editor\V2\Managed\ArtifactDifferenceReporter.cs">
       <Link>Modules\AssetDatabase\Editor\V2\Managed\ArtifactDifferenceReporter.cs</Link>
     </Compile>
@@ -4826,6 +4274,9 @@
     <Compile Include="..\..\Modules\BuildPipeline\Editor\Managed\BuildSettings.cs">
       <Link>Modules\BuildPipeline\Editor\Managed\BuildSettings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\BuildPipeline\Editor\Managed\BuildTargetSelection.cs">
+      <Link>Modules\BuildPipeline\Editor\Managed\BuildTargetSelection.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\BuildPipeline\Editor\Managed\BuildUsageCache.bindings.cs">
       <Link>Modules\BuildPipeline\Editor\Managed\BuildUsageCache.bindings.cs</Link>
     </Compile>
@@ -5027,6 +4478,9 @@
     <Compile Include="..\..\Modules\EditorToolbar\Controls\EditorToolbarDropdownToggle.cs">
       <Link>Modules\EditorToolbar\Controls\EditorToolbarDropdownToggle.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\Controls\EditorToolbarIcon.cs">
+      <Link>Modules\EditorToolbar\Controls\EditorToolbarIcon.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\EditorToolbar\Controls\EditorToolbarToggle.cs">
       <Link>Modules\EditorToolbar\Controls\EditorToolbarToggle.cs</Link>
     </Compile>
@@ -5072,6 +4526,9 @@
     <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\SnapSettings.cs">
       <Link>Modules\EditorToolbar\ToolbarElements\SnapSettings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\StoreButton.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\StoreButton.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\UndoButton.cs">
       <Link>Modules\EditorToolbar\ToolbarElements\UndoButton.cs</Link>
     </Compile>
@@ -5090,6 +4547,9 @@
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\EditorCommon\CommandStateObserver\DeclarationHighlighter.cs">
       <Link>Modules\GraphToolsFoundationEditor\EditorCommon\CommandStateObserver\DeclarationHighlighter.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\GraphToolsFoundationEditor\EditorCommon\CommandStateObserver\IUndoableCommandMerger.cs">
+      <Link>Modules\GraphToolsFoundationEditor\EditorCommon\CommandStateObserver\IUndoableCommandMerger.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\EditorCommon\CommandStateObserver\PersistedStates\IPersistedStateComponent.cs">
       <Link>Modules\GraphToolsFoundationEditor\EditorCommon\CommandStateObserver\PersistedStates\IPersistedStateComponent.cs</Link>
     </Compile>
@@ -5240,6 +4700,9 @@
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\Model\Attributes\ModelSettingAttribute.cs">
       <Link>Modules\GraphToolsFoundationEditor\Model\Attributes\ModelSettingAttribute.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\GraphToolsFoundationEditor\Model\Attributes\NodeOptionAttribute.cs">
+      <Link>Modules\GraphToolsFoundationEditor\Model\Attributes\NodeOptionAttribute.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\Model\BasicModel\AbstractNodeModel.cs">
       <Link>Modules\GraphToolsFoundationEditor\Model\BasicModel\AbstractNodeModel.cs</Link>
     </Compile>
@@ -5657,6 +5120,9 @@
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\Stencil\Stencil.cs">
       <Link>Modules\GraphToolsFoundationEditor\Stencil\Stencil.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ButtonStrip.cs">
+      <Link>Modules\GraphToolsFoundationEditor\UI\ButtonStrip.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\CommandDispatch\Commands\BlackboardCommands.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\CommandDispatch\Commands\BlackboardCommands.cs</Link>
     </Compile>
@@ -5804,6 +5270,9 @@
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\Manipulators\GraphViewContextualMenuManipulator.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\Manipulators\GraphViewContextualMenuManipulator.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\Manipulators\GraphViewPanHelper_Internal.cs">
+      <Link>Modules\GraphToolsFoundationEditor\UI\Manipulators\GraphViewPanHelper_Internal.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\Manipulators\RectangleSelector.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\Manipulators\RectangleSelector.cs</Link>
     </Compile>
@@ -5999,9 +5468,6 @@
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\ModelView\Placemat\Placemat.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\ModelView\Placemat\Placemat.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\ModelView\Placemat\PlacematCommandsExtension_Internal.cs">
-      <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\ModelView\Placemat\PlacematCommandsExtension_Internal.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\ModelView\Placemat\PlacematContainer.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\ModelView\Placemat\PlacematContainer.cs</Link>
     </Compile>
@@ -6032,9 +5498,6 @@
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\UIElements\ResizableElement.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\UIElements\ResizableElement.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\UIElements\SelectionBorder.cs">
-      <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\UIElements\SelectionBorder.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\UIElements\WireBubble.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\GraphView\UIElements\WireBubble.cs</Link>
     </Compile>
@@ -6068,6 +5531,12 @@
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\NodePortsInspector.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\NodePortsInspector.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\PlacematFieldsInspector.cs">
+      <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\PlacematFieldsInspector.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\TextAlignmentFieldBuilder.cs">
+      <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\TextAlignmentFieldBuilder.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\UIElements\BaseModelPropertyField.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\UIElements\BaseModelPropertyField.cs</Link>
     </Compile>
@@ -6080,6 +5549,9 @@
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\UIElements\CustomizableModelPropertyField.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\UIElements\CustomizableModelPropertyField.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\UIElements\InspectorFieldOrderAttribute.cs">
+      <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\UIElements\InspectorFieldOrderAttribute.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\UIElements\MissingFieldEditor.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\ModelView\Inspector\UIElements\MissingFieldEditor.cs</Link>
     </Compile>
@@ -6170,6 +5642,9 @@
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\Shortcuts\ToolShortcutEventAttribute.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\Shortcuts\ToolShortcutEventAttribute.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\ToggleButtonStrip.cs">
+      <Link>Modules\GraphToolsFoundationEditor\UI\ToggleButtonStrip.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\Toolbars\BreadcrumbsToolbar\BreadcrumbsToolbar.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\Toolbars\BreadcrumbsToolbar\BreadcrumbsToolbar.cs</Link>
     </Compile>
@@ -6275,6 +5750,9 @@
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\Utils\RectUtils_Internal.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\Utils\RectUtils_Internal.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\Utils\ShortcutBlocker_Internal.cs">
+      <Link>Modules\GraphToolsFoundationEditor\UI\Utils\ShortcutBlocker_Internal.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\GraphToolsFoundationEditor\UI\Utils\StringUtilsExtensions.cs">
       <Link>Modules\GraphToolsFoundationEditor\UI\Utils\StringUtilsExtensions.cs</Link>
     </Compile>
@@ -6629,11 +6107,161 @@
     <Compile Include="..\..\Modules\Licensing\Public\LicensingUtility.bindings.cs">
       <Link>Modules\Licensing\Public\LicensingUtility.bindings.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\LocalizationEditor\LocalizationAttribute.cs">
-      <Link>Modules\LocalizationEditor\LocalizationAttribute.cs</Link>
+    <Compile Include="..\..\Modules\Licensing\UI\Data\Events\Base\Notification.cs">
+      <Link>Modules\Licensing\UI\Data\Events\Base\Notification.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\LocalizationEditor\LocalizationDatabase.bindings.cs">
-      <Link>Modules\LocalizationEditor\LocalizationDatabase.bindings.cs</Link>
+    <Compile Include="..\..\Modules\Licensing\UI\Data\Events\Base\NotificationReasons.cs">
+      <Link>Modules\Licensing\UI\Data\Events\Base\NotificationReasons.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Data\Events\Base\NotificationType.cs">
+      <Link>Modules\Licensing\UI\Data\Events\Base\NotificationType.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Data\Events\Base\NotificationWithDetails.cs">
+      <Link>Modules\Licensing\UI\Data\Events\Base\NotificationWithDetails.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Data\Events\LicenseExpiredNotification.cs">
+      <Link>Modules\Licensing\UI\Data\Events\LicenseExpiredNotification.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Data\Events\LicenseOfflineValidityEndingNotification.cs">
+      <Link>Modules\Licensing\UI\Data\Events\LicenseOfflineValidityEndingNotification.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Data\Events\LicenseUpdateNotification.cs">
+      <Link>Modules\Licensing\UI\Data\Events\LicenseUpdateNotification.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Buttons\CloseButton.cs">
+      <Link>Modules\Licensing\UI\Events\Buttons\CloseButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Buttons\CloseProjectButton.cs">
+      <Link>Modules\Licensing\UI\Events\Buttons\CloseProjectButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Buttons\EventsButtonFactory.cs">
+      <Link>Modules\Licensing\UI\Events\Buttons\EventsButtonFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Buttons\EventsButtonType.cs">
+      <Link>Modules\Licensing\UI\Events\Buttons\EventsButtonType.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Buttons\IEventsButtonFactory.cs">
+      <Link>Modules\Licensing\UI\Events\Buttons\IEventsButtonFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Buttons\ManageLicenseButton.cs">
+      <Link>Modules\Licensing\UI\Events\Buttons\ManageLicenseButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Buttons\OkButton.cs">
+      <Link>Modules\Licensing\UI\Events\Buttons\OkButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Buttons\OpenUnityHubButton.cs">
+      <Link>Modules\Licensing\UI\Events\Buttons\OpenUnityHubButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Buttons\SaveAndQuitButton.cs">
+      <Link>Modules\Licensing\UI\Events\Buttons\SaveAndQuitButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Buttons\TemplateEventsButton.cs">
+      <Link>Modules\Licensing\UI\Events\Buttons\TemplateEventsButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Buttons\UpdateLicenseButton.cs">
+      <Link>Modules\Licensing\UI\Events\Buttons\UpdateLicenseButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Handlers\INotificationHandler.cs">
+      <Link>Modules\Licensing\UI\Events\Handlers\INotificationHandler.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Handlers\LicenseExpiredHandler.cs">
+      <Link>Modules\Licensing\UI\Events\Handlers\LicenseExpiredHandler.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Handlers\LicenseOfflineValidityEndingHandler.cs">
+      <Link>Modules\Licensing\UI\Events\Handlers\LicenseOfflineValidityEndingHandler.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Handlers\LicenseUpdateHandler.cs">
+      <Link>Modules\Licensing\UI\Events\Handlers\LicenseUpdateHandler.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\ILicenseNotificationHandlerFactory.cs">
+      <Link>Modules\Licensing\UI\Events\ILicenseNotificationHandlerFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\IModalWrapper.cs">
+      <Link>Modules\Licensing\UI\Events\IModalWrapper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\INotificationDispatcher.cs">
+      <Link>Modules\Licensing\UI\Events\INotificationDispatcher.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\LicenseNotificationDispatcher.cs">
+      <Link>Modules\Licensing\UI\Events\LicenseNotificationDispatcher.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\LicenseNotificationHandlerFactory.cs">
+      <Link>Modules\Licensing\UI\Events\LicenseNotificationHandlerFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\ModalWrapper.cs">
+      <Link>Modules\Licensing\UI\Events\ModalWrapper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Text\LicenseTrStrings.cs">
+      <Link>Modules\Licensing\UI\Events\Text\LicenseTrStrings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseExpiredWindow.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseExpiredWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseExpiredWindowContents.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseExpiredWindowContents.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseOfflineValidityEndedWindow.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseOfflineValidityEndedWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseOfflineValidityEndedWindowContents.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseOfflineValidityEndedWindowContents.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseOfflineValidityEndingWindow.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseOfflineValidityEndingWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseOfflineValidityEndingWindowContents.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseOfflineValidityEndingWindowContents.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseRemovedWindow.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseRemovedWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseRemovedWindowContents.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseRemovedWindowContents.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseReturnedWindow.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseReturnedWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseReturnedWindowContents.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseReturnedWindowContents.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseRevokedWindow.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseRevokedWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\LicenseRevokedWindowContents.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\LicenseRevokedWindowContents.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\TemplateLicenseEventWindow.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\TemplateLicenseEventWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Events\Windows\TemplateLicenseEventWindowContents.cs">
+      <Link>Modules\Licensing\UI\Events\Windows\TemplateLicenseEventWindowContents.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Helper\Constants.cs">
+      <Link>Modules\Licensing\UI\Helper\Constants.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Helper\ILicenseLogger.cs">
+      <Link>Modules\Licensing\UI\Helper\ILicenseLogger.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Helper\LicenseLogger.cs">
+      <Link>Modules\Licensing\UI\Helper\LicenseLogger.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\Helper\Utils.cs">
+      <Link>Modules\Licensing\UI\Helper\Utils.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\INativeApiWrapper.cs">
+      <Link>Modules\Licensing\UI\INativeApiWrapper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\LicenseManagedWrapper.cs">
+      <Link>Modules\Licensing\UI\LicenseManagedWrapper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Licensing\UI\NativeApiWrapper.cs">
+      <Link>Modules\Licensing\UI\NativeApiWrapper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\LocalizationEditor\LocalizationAttribute.cs">
+      <Link>Modules\LocalizationEditor\LocalizationAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\LocalizationEditor\LocalizationDatabase.bindings.cs">
+      <Link>Modules\LocalizationEditor\LocalizationDatabase.bindings.cs</Link>
     </Compile>
     <Compile Include="..\..\Modules\LocalizationEditor\LocalizationDatabase.cs">
       <Link>Modules\LocalizationEditor\LocalizationDatabase.cs</Link>
@@ -6728,6 +6356,12 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Analytics\PackageManagerWindowAnalytics.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\Analytics\PackageManagerWindowAnalytics.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\AssetStore\Asset.cs">
+      <Link>Modules\PackageManagerUI\Editor\Services\AssetStore\Asset.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\AssetStore\AssetSelectionHandler.cs">
+      <Link>Modules\PackageManagerUI\Editor\Services\AssetStore\AssetSelectionHandler.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStoreCache.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStoreCache.cs</Link>
     </Compile>
@@ -6746,6 +6380,9 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStoreDownloadOperation.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStoreDownloadOperation.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStoreImportedPackage.cs">
+      <Link>Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStoreImportedPackage.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStoreListOperation.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStoreListOperation.cs</Link>
     </Compile>
@@ -6758,6 +6395,9 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStorePackageFactory.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStorePackageFactory.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStorePackageInstaller.cs">
+      <Link>Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStorePackageInstaller.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStorePackageVersion.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\AssetStore\AssetStorePackageVersion.cs</Link>
     </Compile>
@@ -6887,6 +6527,9 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Packages\RefreshOptions.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\Packages\RefreshOptions.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Packages\RegistryType.cs">
+      <Link>Modules\PackageManagerUI\Editor\Services\Packages\RegistryType.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\ProjectSettings\PackageManagerProjectSettings.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\ProjectSettings\PackageManagerProjectSettings.cs</Link>
     </Compile>
@@ -6914,6 +6557,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\DateTimeProxy.cs">
+      <Link>Modules\PackageManagerUI\Editor\Services\Proxies\DateTimeProxy.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Proxies\EditorAnalyticsProxy.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\Proxies\EditorAnalyticsProxy.cs</Link>
     </Compile>
@@ -7163,6 +6809,9 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\MultiSelect\RemoveFoldoutGroup.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\MultiSelect\RemoveFoldoutGroup.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\MultiSelect\RemoveImportedFoldoutGroup.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\MultiSelect\RemoveImportedFoldoutGroup.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\MultiSelect\UnlockFoldout.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\MultiSelect\UnlockFoldout.cs</Link>
     </Compile>
@@ -7196,6 +6845,9 @@
     <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\PackageDetailsImportedAssetsTab.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsImportedAssetsTab.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsOverviewTab.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsOverviewTab.cs</Link>
     </Compile>
@@ -7223,6 +6875,9 @@
     <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\PackageDetailsTabs\SortedColumn.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\SortedColumn.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageGroup.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\PackageGroup.cs</Link>
     </Compile>
@@ -7313,6 +6968,30 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\ScopedRegistryAddedPopup.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\ScopedRegistryAddedPopup.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindow.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowData.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowData.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowFooter.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowFooter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowHeader.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowHeader.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowProxy.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowProxy.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowRoot.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowRoot.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowRow.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowRow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowTreeView.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\SelectionWindow\SelectionWindowTreeView.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\ToolBar\PackageAddButton.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\ToolBar\PackageAddButton.cs</Link>
     </Compile>
@@ -7349,6 +7028,9 @@
     <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\PackageRemoveImportedButton.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\ToolBar\PackageRemoveImportedButton.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\ToolBar\PackageResetButton.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\ToolBar\PackageResetButton.cs</Link>
     </Compile>
@@ -7385,9 +7067,6 @@
     <Compile Include="..\..\Modules\PackageManager\Editor\Managed\CacheRootConfig.cs">
       <Link>Modules\PackageManager\Editor\Managed\CacheRootConfig.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\PackageManager\Editor\Managed\CachedPackageInfo.cs">
-      <Link>Modules\PackageManager\Editor\Managed\CachedPackageInfo.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Client.cs">
       <Link>Modules\PackageManager\Editor\Managed\Client.cs</Link>
     </Compile>
@@ -7499,9 +7178,6 @@
     <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Requests\GetCacheRootRequest.cs">
       <Link>Modules\PackageManager\Editor\Managed\Requests\GetCacheRootRequest.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Requests\GetCachedPackagesRequest.cs">
-      <Link>Modules\PackageManager\Editor\Managed\Requests\GetCachedPackagesRequest.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Requests\GetRegistriesRequest.cs">
       <Link>Modules\PackageManager\Editor\Managed\Requests\GetRegistriesRequest.cs</Link>
     </Compile>
@@ -7727,6 +7403,9 @@
     <Compile Include="..\..\Modules\Physics2DEditor\Managed\Colliders\EdgeCollider2DTool.cs">
       <Link>Modules\Physics2DEditor\Managed\Colliders\EdgeCollider2DTool.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\Physics2DEditor\Managed\Colliders\EditableLineHandle2D.cs">
+      <Link>Modules\Physics2DEditor\Managed\Colliders\EditableLineHandle2D.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\Physics2DEditor\Managed\Colliders\EditablePath2D.cs">
       <Link>Modules\Physics2DEditor\Managed\Colliders\EditablePath2D.cs</Link>
     </Compile>
@@ -7769,9 +7448,15 @@
     <Compile Include="..\..\Modules\Physics2DEditor\Managed\Joints\HingeJoint2DEditor.cs">
       <Link>Modules\Physics2DEditor\Managed\Joints\HingeJoint2DEditor.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\Physics2DEditor\Managed\Joints\HingeJoint2DTool.cs">
+      <Link>Modules\Physics2DEditor\Managed\Joints\HingeJoint2DTool.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\Physics2DEditor\Managed\Joints\Joint2DEditor.cs">
       <Link>Modules\Physics2DEditor\Managed\Joints\Joint2DEditor.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\Physics2DEditor\Managed\Joints\JointAngularLimitHandle2D.cs">
+      <Link>Modules\Physics2DEditor\Managed\Joints\JointAngularLimitHandle2D.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\Physics2DEditor\Managed\Joints\RelativeJoint2DEditor.cs">
       <Link>Modules\Physics2DEditor\Managed\Joints\RelativeJoint2DEditor.cs</Link>
     </Compile>
@@ -7943,6 +7628,15 @@
     <Compile Include="..\..\Modules\ProfilerEditor\ProfilerOutOfProcess\ProfilerRoleProvider.cs">
       <Link>Modules\ProfilerEditor\ProfilerOutOfProcess\ProfilerRoleProvider.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\Analytics\EditorAnalyticsService.cs">
+      <Link>Modules\ProfilerEditor\ProfilerWindow\Analytics\EditorAnalyticsService.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\Analytics\IAnalyticsService.cs">
+      <Link>Modules\ProfilerEditor\ProfilerWindow\Analytics\IAnalyticsService.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\Analytics\ProfilerWindowAnalytics.cs">
+      <Link>Modules\ProfilerEditor\ProfilerWindow\Analytics\ProfilerWindowAnalytics.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\Chart.cs">
       <Link>Modules\ProfilerEditor\ProfilerWindow\Chart.cs</Link>
     </Compile>
@@ -8156,9 +7850,6 @@
     <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ProfilerWindow.cs">
       <Link>Modules\ProfilerEditor\ProfilerWindow\ProfilerWindow.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ProfilerWindowAnalytics.cs">
-      <Link>Modules\ProfilerEditor\ProfilerWindow\ProfilerWindowAnalytics.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\UIElements\BackgroundPattern.cs">
       <Link>Modules\ProfilerEditor\ProfilerWindow\UIElements\BackgroundPattern.cs</Link>
     </Compile>
@@ -8207,8 +7898,8 @@
     <Compile Include="..\..\Modules\Progress\VisualProgressItem.cs">
       <Link>Modules\Progress\VisualProgressItem.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\PropertiesEditor\Module\PropertiesEditorModule.cs">
-      <Link>Modules\PropertiesEditor\Module\PropertiesEditorModule.cs</Link>
+    <Compile Include="..\..\Modules\PropertiesEditor\Module\PropertiesEditorInitialization.cs">
+      <Link>Modules\PropertiesEditor\Module\PropertiesEditorInitialization.cs</Link>
     </Compile>
     <Compile Include="..\..\Modules\QuickSearch\Editor\FuzzySearch.cs">
       <Link>Modules\QuickSearch\Editor\FuzzySearch.cs</Link>
@@ -8285,6 +7976,9 @@
     <Compile Include="..\..\Modules\QuickSearch\Editor\Providers\AssetStoreProvider.cs">
       <Link>Modules\QuickSearch\Editor\Providers\AssetStoreProvider.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\QuickSearch\Editor\Providers\BasePerformanceProvider.cs">
+      <Link>Modules\QuickSearch\Editor\Providers\BasePerformanceProvider.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\QuickSearch\Editor\Providers\Calculator.cs">
       <Link>Modules\QuickSearch\Editor\Providers\Calculator.cs</Link>
     </Compile>
@@ -8306,6 +8000,9 @@
     <Compile Include="..\..\Modules\QuickSearch\Editor\Providers\PerformanceProvider.cs">
       <Link>Modules\QuickSearch\Editor\Providers\PerformanceProvider.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\QuickSearch\Editor\Providers\ProfilerMarkersProvider.cs">
+      <Link>Modules\QuickSearch\Editor\Providers\ProfilerMarkersProvider.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\QuickSearch\Editor\Providers\SceneProvider.cs">
       <Link>Modules\QuickSearch\Editor\Providers\SceneProvider.cs</Link>
     </Compile>
@@ -8900,6 +8597,12 @@
     <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\BlockSequenceElement.binding.cs">
       <Link>Modules\ShaderFoundry\ScriptBindings\BlockSequenceElement.binding.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\BlockShader.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\BlockShader.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\BlockShaderInterface.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\BlockShaderInterface.binding.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\BlockVariable.binding.cs">
       <Link>Modules\ShaderFoundry\ScriptBindings\BlockVariable.binding.cs</Link>
     </Compile>
@@ -8951,6 +8654,9 @@
     <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\IncludeDescriptor.binding.cs">
       <Link>Modules\ShaderFoundry\ScriptBindings\IncludeDescriptor.binding.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\InterfaceRegistrationStatement.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\InterfaceRegistrationStatement.binding.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\InternalType.cs">
       <Link>Modules\ShaderFoundry\ScriptBindings\InternalType.cs</Link>
     </Compile>
@@ -8960,9 +8666,6 @@
     <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\PackageRequirement.binding.cs">
       <Link>Modules\ShaderFoundry\ScriptBindings\PackageRequirement.binding.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\PassIdentifier.cs">
-      <Link>Modules\ShaderFoundry\ScriptBindings\PassIdentifier.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\PassStageType.binding.cs">
       <Link>Modules\ShaderFoundry\ScriptBindings\PassStageType.binding.cs</Link>
     </Compile>
@@ -8972,6 +8675,9 @@
     <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\PublicType.cs">
       <Link>Modules\ShaderFoundry\ScriptBindings\PublicType.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\RegisterTemplatesWithInterface.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\RegisterTemplatesWithInterface.binding.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\ShaderAttribute.bindings.cs">
       <Link>Modules\ShaderFoundry\ScriptBindings\ShaderAttribute.bindings.cs</Link>
     </Compile>
@@ -9467,6 +9173,579 @@
     <Compile Include="..\..\Modules\UIAutomationEditor\TestEditorWindow.cs">
       <Link>Modules\UIAutomationEditor\TestEditorWindow.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Builder.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Builder.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\BuilderExternalPackages.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\BuilderExternalPackages.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\BuilderPane.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\BuilderPane.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\BuilderPaneContent.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\BuilderPaneContent.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\BuilderPaneWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\BuilderPaneWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\BuilderSelection.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\BuilderSelection.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Document\BuilderDocument.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Document\BuilderDocument.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Document\BuilderDocumentOpenUSS.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Document\BuilderDocumentOpenUSS.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Document\BuilderDocumentOpenUXML.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Document\BuilderDocumentOpenUXML.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Document\BuilderDocumentSettings.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Document\BuilderDocumentSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Document\BuilderUXMLFileSettings.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Document\BuilderUXMLFileSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Draggers\BuilderClassDragger.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Draggers\BuilderClassDragger.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Draggers\BuilderDragger.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Draggers\BuilderDragger.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Draggers\BuilderExplorerDragger.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Draggers\BuilderExplorerDragger.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Draggers\BuilderHierarchyDragger.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Draggers\BuilderHierarchyDragger.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Draggers\BuilderLibraryDragger.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Draggers\BuilderLibraryDragger.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Draggers\BuilderStyleSheetsDragger.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Draggers\BuilderStyleSheetsDragger.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Draggers\BuilderViewportDragger.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Draggers\BuilderViewportDragger.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Explorer\BuilderExplorer.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Explorer\BuilderExplorer.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Explorer\BuilderExplorerItem.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Explorer\BuilderExplorerItem.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Explorer\BuilderHierarchy.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Explorer\BuilderHierarchy.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Explorer\BuilderHierarchyUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Explorer\BuilderHierarchyUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Explorer\BuilderHierarchyWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Explorer\BuilderHierarchyWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Explorer\BuilderNewSelectorField.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Explorer\BuilderNewSelectorField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Explorer\BuilderStyleSheets.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Explorer\BuilderStyleSheets.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Explorer\BuilderStyleSheetsContextMenu.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Explorer\BuilderStyleSheetsContextMenu.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Explorer\BuilderStyleSheetsUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Explorer\BuilderStyleSheetsUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Explorer\BuilderStyleSheetsWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Explorer\BuilderStyleSheetsWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspector.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspector.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorAttributes.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorAttributes.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorCanvas.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorCanvas.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorHeader.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorHeader.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorInheritedStyles.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorInheritedStyles.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorLocalStyles.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorLocalStyles.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorMatchingSelectors.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorMatchingSelectors.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorPreview.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorPreview.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorPreviewWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorPreviewWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorStyleFields+Transitions.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorStyleFields+Transitions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorStyleFields.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorStyleFields.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorStyleSheet.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorStyleSheet.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderInspectorWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\BuilderStyleRow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\BuilderStyleRow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Inspector\IBuilderInspectorSection.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Inspector\IBuilderInspectorSection.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Library\BuilderLibrary.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Library\BuilderLibrary.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryContent.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryContent.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryPlainView.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryPlainView.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryProjectScanner.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryProjectScanner.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryTreeItem.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryTreeItem.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryTreeView.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryTreeView.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryView.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryView.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Library\BuilderLibraryWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Manipulators\BuilderAnchorer.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Manipulators\BuilderAnchorer.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Manipulators\BuilderManipulator.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Manipulators\BuilderManipulator.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Manipulators\BuilderMover.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Manipulators\BuilderMover.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Manipulators\BuilderParentTracker.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Manipulators\BuilderParentTracker.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Manipulators\BuilderPlacementIndicator.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Manipulators\BuilderPlacementIndicator.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Manipulators\BuilderResizer.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Manipulators\BuilderResizer.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Manipulators\BuilderSelectionIndicator.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Manipulators\BuilderSelectionIndicator.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Manipulators\BuilderTracker.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Manipulators\BuilderTracker.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Manipulators\BuilderTransformer.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Manipulators\BuilderTransformer.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Previews\BuilderCodePreview.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Previews\BuilderCodePreview.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Previews\BuilderPreviewWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Previews\BuilderPreviewWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Previews\BuilderTooltipPreview.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Previews\BuilderTooltipPreview.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Previews\BuilderUssPreview.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Previews\BuilderUssPreview.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Previews\BuilderUssPreviewWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Previews\BuilderUssPreviewWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Previews\BuilderUxmlPreview.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Previews\BuilderUxmlPreview.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Previews\BuilderUxmlPreviewWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Previews\BuilderUxmlPreviewWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Toolbar\BuilderToolbar.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Toolbar\BuilderToolbar.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderAnalyticsUtility.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderAnalyticsUtility.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderAssetModificationProcessor.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderAssetModificationProcessor.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderAssetPostprocessor.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderAssetPostprocessor.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderAssetUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderAssetUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderCommandHandler.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderCommandHandler.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderConstants.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderConstants.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderDialogsUtility.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderDialogsUtility.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderEditorUtility.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderEditorUtility.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderElementContextMenu.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderElementContextMenu.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderInspectorUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderInspectorUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderNameUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderNameUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderPackageUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderPackageUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderPlacementUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderPlacementUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderProjectSettings.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderProjectSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderSharedStyles.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderSharedStyles.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Utilities\BuilderStyleUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Utilities\BuilderStyleUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\UxmlAttributesView\BuilderUxmlAttributesView.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\UxmlAttributesView\BuilderUxmlAttributesView.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlAssetAttributeField.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlAssetAttributeField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlAttributeFieldFactory.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlAttributeFieldFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlAttributeFieldFactoryRegistry.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlAttributeFieldFactoryRegistry.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlEnumAttributeField.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlEnumAttributeField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlIntAttributeField.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlIntAttributeField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlStringAttributeField.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlStringAttributeField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlTypeAttributeField.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\UxmlAttributesView\Fields\BuilderUxmlTypeAttributeField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Viewport\BuilderCanvas.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Viewport\BuilderCanvas.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Viewport\BuilderCanvasStyleControls.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Viewport\BuilderCanvasStyleControls.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Viewport\BuilderInPlaceTextEditingUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Viewport\BuilderInPlaceTextEditingUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Viewport\BuilderNotifications.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Viewport\BuilderNotifications.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Viewport\BuilderPanner.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Viewport\BuilderPanner.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Viewport\BuilderViewport.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Viewport\BuilderViewport.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Viewport\BuilderViewportWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Viewport\BuilderViewportWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Viewport\BuilderVisualTreeStyleUpdaterTraversal.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Viewport\BuilderVisualTreeStyleUpdaterTraversal.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Viewport\BuilderZoomer.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Viewport\BuilderZoomer.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Builder\Viewport\IBuilderViewportWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Builder\Viewport\IBuilderViewportWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Background\CheckerboardBackground.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Background\CheckerboardBackground.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\ButtonStrip\ButtonStrip.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\ButtonStrip\ButtonStrip.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\CategoryDropdownField\CategoryDropdownContent.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\CategoryDropdownField\CategoryDropdownContent.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\CategoryDropdownField\CategoryDropdownField+WindowContent.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\CategoryDropdownField\CategoryDropdownField+WindowContent.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\CategoryDropdownField\CategoryDropdownField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\CategoryDropdownField\CategoryDropdownField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\BaseOverlayPainter.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\BaseOverlayPainter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\ElementHierarchyView.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\ElementHierarchyView.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\HighlightOverlayPainter.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\HighlightOverlayPainter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\LayoutOverlayPainter.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\LayoutOverlayPainter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\OverlayPainterHelperElement.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\OverlayPainterHelperElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\RepaintOverlayPainter.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\ElementHierarchyView\RepaintOverlayPainter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\FoldoutField\FoldoutColorField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\FoldoutField\FoldoutColorField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\FoldoutField\FoldoutField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\FoldoutField\FoldoutField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\FoldoutField\FoldoutNumberField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\FoldoutField\FoldoutNumberField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\FoldoutField\FoldoutTransitionField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\FoldoutField\FoldoutTransitionField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\FoldoutWithCheckbox\FoldoutWithCheckbox.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\FoldoutWithCheckbox\FoldoutWithCheckbox.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\FontStyleStrip\FontStyleStrip.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\FontStyleStrip\FontStyleStrip.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\HelpBox\HelpBox.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\HelpBox\HelpBox.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Importers\BuilderStyleSheetImporter.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Importers\BuilderStyleSheetImporter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Importers\BuilderVisualTreeAssetImporter.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Importers\BuilderVisualTreeAssetImporter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\LibraryFoldout\LibraryFoldout.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\LibraryFoldout\LibraryFoldout.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\ModalPopup\ModalPopup.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\ModalPopup\ModalPopup.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\MultiTypeField\MultiTypeField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\MultiTypeField\MultiTypeField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\PercentSlider\PercentSlider.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\PercentSlider\PercentSlider.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\PersistedFoldout\PersistedFoldout.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\PersistedFoldout\PersistedFoldout.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\ReflectionExtensions\ReflectionExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\ReflectionExtensions\ReflectionExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\SampleDocument\BuilderAttributesTestElement.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\SampleDocument\BuilderAttributesTestElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Selector\SelectorUtility.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Selector\SelectorUtility.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\AngleStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\AngleStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\DimensionStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\DimensionStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\FieldSearchCompleter.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\FieldSearchCompleter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\FieldStatusIndicator.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\FieldStatusIndicator.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\FieldValueInfo.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\FieldValueInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\FontDefinitionStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\FontDefinitionStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\ImageStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\ImageStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\IntegerStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\IntegerStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\NumericStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\NumericStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\PositionAnchorPoint.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\PositionAnchorPoint.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\PositionAnchors.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\PositionAnchors.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\PositionSection.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\PositionSection.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\PositionStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\PositionStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\RotateStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\RotateStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\ScaleStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\ScaleStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\StyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\StyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\StyleFieldConstants.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\StyleFieldConstants.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\StyleFieldPopup.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\StyleFieldPopup.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\StyleVariableUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\StyleVariableUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\TextShadowStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\TextShadowStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\TransformOriginSelector.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\TransformOriginSelector.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\TransformOriginStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\TransformOriginStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\TranslateStyleField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\TranslateStyleField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\VariableCompleter.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\VariableCompleter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\VariableEditingHandler.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\VariableEditingHandler.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\VariableField.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\VariableField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\VariableInfo.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\VariableInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\VariableInfoTooltip.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\VariableInfoTooltip.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleField\VariableInfoView.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleField\VariableInfoView.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\CSSSpecCopy.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\CSSSpecCopy.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleComplexSelectorExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleComplexSelectorExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StylePropertyExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StylePropertyExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StylePropertyManipulator.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StylePropertyManipulator.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleRuleExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleRuleExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleSheetExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleSheetExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleSheetToUss.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleSheetToUss.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleSheetUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleSheetUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleValueHandleExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\StyleSheetExtensions\StyleValueHandleExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\TextAlignStrip\TextAlignStrip.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\TextAlignStrip\TextAlignStrip.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\ToggleButtonStrip\ToggleButtonStrip.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\ToggleButtonStrip\ToggleButtonStrip.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Transitions\BuilderTransition.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Transitions\BuilderTransition.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Transitions\BuilderTransitionData.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Transitions\BuilderTransitionData.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Transitions\TransitionChangeType.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Transitions\TransitionChangeType.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Transitions\TransitionEvents.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Transitions\TransitionEvents.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Transitions\TransitionListView.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Transitions\TransitionListView.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Transitions\TransitionPropertyDropdownContent.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Transitions\TransitionPropertyDropdownContent.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Transitions\TransitionsExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Transitions\TransitionsExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\Transitions\UIStyleValue.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\Transitions\UIStyleValue.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\TypeExtensions\TypeExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\TypeExtensions\TypeExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\TypeField\BuilderAttributeTypeName.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\TypeField\BuilderAttributeTypeName.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\UIExtensionsTestWindow\UIExtensionsTestWindow.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\UIExtensionsTestWindow\UIExtensionsTestWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\UnityUIBuilderSelectionMarker\UnityUIBuilderSelectionMarker.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\UnityUIBuilderSelectionMarker\UnityUIBuilderSelectionMarker.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\VisualElementExtensions\VisualElementExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\VisualElementExtensions\VisualElementExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\IUxmlFactoryExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\IUxmlFactoryExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\TemplateAssetExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\TemplateAssetExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\ValueToUXML.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\ValueToUXML.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\VisualElementAssetExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\VisualElementAssetExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetExtensions.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetLinkedCloneTree.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetLinkedCloneTree.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetToUXML.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetToUXML.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetUtilities.cs">
+      <Link>Modules\UIBuilder\Editor\Utilities\VisualTreeAssetExtensions\VisualTreeAssetUtilities.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\UIElementsSamplesEditor\ElementSnippet.cs">
       <Link>Modules\UIElementsSamplesEditor\ElementSnippet.cs</Link>
     </Compile>
@@ -9566,6 +9845,12 @@
     <Compile Include="..\..\Modules\UIElementsSamplesEditor\Snippets\TreeViewSnippet.cs">
       <Link>Modules\UIElementsSamplesEditor\Snippets\TreeViewSnippet.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\UIElementsSamplesEditor\Snippets\UnsignedIntegerFieldSnippet.cs">
+      <Link>Modules\UIElementsSamplesEditor\Snippets\UnsignedIntegerFieldSnippet.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\UIElementsSamplesEditor\Snippets\UnsignedLongFieldSnippet.cs">
+      <Link>Modules\UIElementsSamplesEditor\Snippets\UnsignedLongFieldSnippet.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\UIElementsSamplesEditor\Snippets\Vector2FieldSnippet.cs">
       <Link>Modules\UIElementsSamplesEditor\Snippets\Vector2FieldSnippet.cs</Link>
     </Compile>
@@ -9665,9 +9950,6 @@
     <Compile Include="..\..\Modules\UnityConnectEditor\ProjectSettings\CloudDiagProjectSettings.cs">
       <Link>Modules\UnityConnectEditor\ProjectSettings\CloudDiagProjectSettings.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\UnityConnectEditor\ProjectSettings\CollabProjectSettings.cs">
-      <Link>Modules\UnityConnectEditor\ProjectSettings\CollabProjectSettings.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\UnityConnectEditor\ProjectSettings\Fallback\InstallPackageSection.cs">
       <Link>Modules\UnityConnectEditor\ProjectSettings\Fallback\InstallPackageSection.cs</Link>
     </Compile>
@@ -9713,9 +9995,6 @@
     <Compile Include="..\..\Modules\UnityConnectEditor\Services\CloudBuildPoller.cs">
       <Link>Modules\UnityConnectEditor\Services\CloudBuildPoller.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\UnityConnectEditor\Services\CollabService.cs">
-      <Link>Modules\UnityConnectEditor\Services\CollabService.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\UnityConnectEditor\Services\CrashService.cs">
       <Link>Modules\UnityConnectEditor\Services\CrashService.cs</Link>
     </Compile>
@@ -9755,6 +10034,9 @@
     <Compile Include="..\..\Modules\VFXEditor\Public\ScriptBindings\VFXExpressionNoise.bindings.cs">
       <Link>Modules\VFXEditor\Public\ScriptBindings\VFXExpressionNoise.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\VFXEditor\Public\ScriptBindings\VFXExpressionTexture.bindings.cs">
+      <Link>Modules\VFXEditor\Public\ScriptBindings\VFXExpressionTexture.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\VFXEditor\Public\ScriptBindings\VFXMemorySerializer.bindings.cs">
       <Link>Modules\VFXEditor\Public\ScriptBindings\VFXMemorySerializer.bindings.cs</Link>
     </Compile>
@@ -9800,7 +10082,7 @@
     <Compile Include="..\..\Modules\XREditor\XRManagementInstaller.cs">
       <Link>Modules\XREditor\XRManagementInstaller.cs</Link>
     </Compile>
-    <Reference Include="../../artifacts/Stevedore/unity-compiler-linux-x64_f3f3/Unity.CompilationPipeline.Common/Unity.CompilationPipeline.Common.dll" />
+    <Reference Include="../../artifacts/Stevedore/unity-compiler-win-x64_dc19/Unity.CompilationPipeline.Common/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="../../Tools/Bee/build/Distribution/BeeDriver2/Bee.BeeDriver2.dll" />
diff --git a/Projects/CSharp/UnityEngine.csproj b/Projects/CSharp/UnityEngine.csproj
index f9f92df88a..980fdfa78f 100644
--- a/Projects/CSharp/UnityEngine.csproj
+++ b/Projects/CSharp/UnityEngine.csproj
@@ -6,110 +6,11 @@
     <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_USE_WEBREQUEST;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_EDITOR_GAME_SERVICES;ENABLE_EDITOR_HUB_LICENSE;ENABLE_GENERATE_NATIVE_PLUGINS_FOR_ASSEMBLIES_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_MARSHALLING_TESTS;ENABLE_MICROPHONE;ENABLE_MONO;ENABLE_MOVIES;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NAVIGATION_HEIGHTMESH_RUNTIME_SUPPORT;ENABLE_NAVIGATION_PACKAGE_DEBUG_VISUALIZATION;ENABLE_NAVIGATION_UI_REQUIRES_PACKAGE;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_SCRIPTING_GC_WBARRIERS;ENABLE_TEXTURE_STREAMING;ENABLE_UNITYEVENTS;ENABLE_UNITYWEBREQUEST;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_UNITY_GAME_SERVICES_ANALYTICS_SUPPORT;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</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_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_GENERATE_NATIVE_PLUGINS_FOR_ASSEMBLIES_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_MARSHALLING_TESTS;ENABLE_MICROPHONE;ENABLE_MONO;ENABLE_MOVIES;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NAVIGATION_HEIGHTMESH_RUNTIME_SUPPORT;ENABLE_NAVIGATION_PACKAGE_DEBUG_VISUALIZATION;ENABLE_NAVIGATION_UI_REQUIRES_PACKAGE;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_SCRIPTING_GC_WBARRIERS;ENABLE_TEXTURE_STREAMING;ENABLE_UNITYEVENTS;ENABLE_UNITYWEBREQUEST;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_UNITY_GAME_SERVICES_ANALYTICS_SUPPORT;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_EDITOR;UNITY_EDITOR_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_TVOS_API;UNITY_WEBGL_API</DefineConstants>
     <LangVersion>latest</LangVersion>
-    <NoWarn>1071;0626</NoWarn>
+    <NoWarn>1701;0626</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\BaselineFunction.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\BaselineFunction.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\Logger.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\Logger.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\MeasureFunction.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\MeasureFunction.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\MeasureOutput.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\MeasureOutput.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YGConfigHandle.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YGConfigHandle.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YGNodeHandle.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YGNodeHandle.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaAlign.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaAlign.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaBaselineFunc.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaBaselineFunc.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaConfig.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaConstants.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaConstants.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaDimension.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaDimension.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaDirection.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaDirection.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaDisplay.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaDisplay.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaEdge.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaEdge.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaExperimentalFeature.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaExperimentalFeature.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaFlexDirection.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaFlexDirection.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaJustify.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaJustify.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaLogLevel.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaLogLevel.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaLogger.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaLogger.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaMeasureFunc.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaMeasureFunc.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaMeasureMode.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaMeasureMode.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaNative.bindings.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaNative.bindings.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaNode.Spacing.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaNode.Spacing.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaNode.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaNode.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaNodeType.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaNodeType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaOverflow.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaOverflow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaPositionType.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaPositionType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaPrintOptions.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaPrintOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaSize.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaSize.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaUnit.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaUnit.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaValue.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaValue.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaValueExtensions.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaValueExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\External\Yoga\csharp\Facebook.Yoga\YogaWrap.cs">
-      <Link>External\Yoga\csharp\Facebook.Yoga\YogaWrap.cs</Link>
-    </Compile>
     <Compile Include="..\..\External\unitytls\builds\CSharp\BindingsUnity\TLSAgent.gen.bindings.cs">
       <Link>External\unitytls\builds\CSharp\BindingsUnity\TLSAgent.gen.bindings.cs</Link>
     </Compile>
@@ -167,6 +68,12 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Collections\Controllers\CollectionViewController.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\Collections\Controllers\CollectionViewController.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Collections\Controllers\DefaultMultiColumnTreeViewController.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Collections\Controllers\DefaultMultiColumnTreeViewController.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Collections\Controllers\DefaultTreeViewController.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Collections\Controllers\DefaultTreeViewController.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Collections\Controllers\IDefaultTreeViewController.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\Collections\Controllers\IDefaultTreeViewController.cs</Link>
     </Compile>
@@ -425,6 +332,12 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Controls\TwoPaneSplitViewResizer.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\Controls\TwoPaneSplitViewResizer.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Controls\UnsignedIntegerField.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Controls\UnsignedIntegerField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Controls\UnsignedLongField.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Controls\UnsignedLongField.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Conversions\SetValueVisitor.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\Conversions\SetValueVisitor.cs</Link>
     </Compile>
@@ -461,12 +374,12 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\DragAndDrop\IDragAndDrop.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\DragAndDrop\IDragAndDrop.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\DragAndDrop\IDragAndDropArgs.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\DragAndDrop\IDragAndDropArgs.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\DragAndDrop\IDragAndDropController.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\DragAndDrop\IDragAndDropController.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\DragAndDrop\IListDragAndDropArgs.cs">
-      <Link>ModuleOverrides\com.unity.ui\Core\DragAndDrop\IListDragAndDropArgs.cs</Link>
-    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\DragAndDrop\IReorderable.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\DragAndDrop\IReorderable.cs</Link>
     </Compile>
@@ -626,6 +539,9 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\IDataWatchService.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\IDataWatchService.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\IEnumerableUtils.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\IEnumerableUtils.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\IGroupBox.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\IGroupBox.cs</Link>
     </Compile>
@@ -656,6 +572,117 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\KeyboardNavigationManipulator.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\KeyboardNavigationManipulator.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\LayoutConfig.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\LayoutConfig.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\LayoutHandle.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\LayoutHandle.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\LayoutManager.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\LayoutManager.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\LayoutNode+Computed.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\LayoutNode+Computed.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\LayoutNode+Hierarchy.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\LayoutNode+Hierarchy.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\LayoutNode+Style.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\LayoutNode+Style.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\LayoutNode.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\LayoutNode.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\LayoutProcessor.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\LayoutProcessor.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutCacheData.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutCacheData.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutComputedData.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutComputedData.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutConfigData.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutConfigData.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutDataAccess.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutDataAccess.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutDataStore.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutDataStore.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutNodeData.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutNodeData.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutStyleData.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\Components\LayoutStyleData.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\FixedBuffer.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\FixedBuffer.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutAlign.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutAlign.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutDefaults.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutDefaults.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutDimension.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutDimension.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutDirection.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutDirection.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutDisplay.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutDisplay.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutEdge.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutEdge.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutFlexDirection.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutFlexDirection.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutJustify.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutJustify.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutList.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutList.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutLogLevel.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutLogLevel.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutMeasureMode.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutMeasureMode.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutNodeType.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutNodeType.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutOverflow.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutOverflow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutPositionType.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutPositionType.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutPrintOptions.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutPrintOptions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutSize.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutSize.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutUnit.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutUnit.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutValue.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutValue.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutWrap.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Model\LayoutWrap.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Native\LayoutNative.bindings.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Native\LayoutNative.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Layout\Native\LayoutProcessorNative.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Layout\Native\LayoutProcessorNative.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\ManipulatorActivationFilter.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\ManipulatorActivationFilter.cs</Link>
     </Compile>
@@ -1010,6 +1037,9 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Style\Generated\ResolvedStyleAccessPropertyBag.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\Style\Generated\ResolvedStyleAccessPropertyBag.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Style\Generated\ResolvedStyleProperties.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Style\Generated\ResolvedStyleProperties.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Style\Generated\ShorthandApplicator.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\Style\Generated\ShorthandApplicator.cs</Link>
     </Compile>
@@ -1019,6 +1049,9 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Style\Generated\StyleDebug.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\Style\Generated\StyleDebug.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Style\Generated\StyleProperties.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Style\Generated\StyleProperties.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Style\Generated\StylePropertyCache.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\Style\Generated\StylePropertyCache.cs</Link>
     </Compile>
@@ -1160,6 +1193,9 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\TextElementEdition.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\TextElementEdition.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\TextElementExperimental.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\TextElementExperimental.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\TextElementSelection.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\TextElementSelection.cs</Link>
     </Compile>
@@ -1187,6 +1223,9 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\UIElementsBridge.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\UIElementsBridge.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\UIElementsInitialization.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\UIElementsInitialization.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\UIElementsPackageUtility.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\UIElementsPackageUtility.cs</Link>
     </Compile>
@@ -1229,6 +1268,9 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\UXML\UxmlTypeRestriction.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\UXML\UxmlTypeRestriction.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\UXML\UxmlUtility.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\UXML\UxmlUtility.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\UXML\VisualElementAsset.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\UXML\VisualElementAsset.cs</Link>
     </Compile>
@@ -1247,15 +1289,18 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\VectorImage.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\VectorImage.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\VisualElement.PropertyBag.cs">
-      <Link>ModuleOverrides\com.unity.ui\Core\VisualElement.PropertyBag.cs</Link>
-    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\VisualElement.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\VisualElement.cs</Link>
     </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\VisualElementAnimation.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\VisualElementAnimation.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\VisualElementBindableProperties.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\VisualElementBindableProperties.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\VisualElementDataBinding.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\VisualElementDataBinding.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\VisualElementEventInterests.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\VisualElementEventInterests.cs</Link>
     </Compile>
@@ -1343,12 +1388,12 @@
     <Compile Include="..\..\Modules\Accessibility\VisionUtility.cs">
       <Link>Modules\Accessibility\VisionUtility.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\AndroidJNI\AndroidApp.bindings.cs">
+      <Link>Modules\AndroidJNI\AndroidApp.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\AndroidJNI\AndroidAssetPacks.bindings.cs">
       <Link>Modules\AndroidJNI\AndroidAssetPacks.bindings.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\AndroidJNI\AndroidCommon.cs">
-      <Link>Modules\AndroidJNI\AndroidCommon.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\AndroidJNI\AndroidDevice.bindings.cs">
       <Link>Modules\AndroidJNI\AndroidDevice.bindings.cs</Link>
     </Compile>
@@ -1937,6 +1982,9 @@
     <Compile Include="..\..\Modules\IMGUI\GUIUtility.cs">
       <Link>Modules\IMGUI\GUIUtility.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\IMGUI\IMGUITextHandle.cs">
+      <Link>Modules\IMGUI\IMGUITextHandle.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\IMGUI\LayoutEntry.cs">
       <Link>Modules\IMGUI\LayoutEntry.cs</Link>
     </Compile>
@@ -1946,6 +1994,9 @@
     <Compile Include="..\..\Modules\IMGUI\ObjectGUIState.bindings.cs">
       <Link>Modules\IMGUI\ObjectGUIState.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\IMGUI\RuntimeTextSettings.cs">
+      <Link>Modules\IMGUI\RuntimeTextSettings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\IMGUI\ScrollViewState.cs">
       <Link>Modules\IMGUI\ScrollViewState.cs</Link>
     </Compile>
@@ -2048,9 +2099,15 @@
     <Compile Include="..\..\Modules\Physics\ScriptBindings\Dynamics.deprecated.cs">
       <Link>Modules\Physics\ScriptBindings\Dynamics.deprecated.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\Physics\ScriptBindings\ImmediatePhysics.bindings.cs">
+      <Link>Modules\Physics\ScriptBindings\ImmediatePhysics.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\Physics\ScriptBindings\PhysicsContact.bindings.cs">
       <Link>Modules\Physics\ScriptBindings\PhysicsContact.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\Physics\ScriptBindings\PhysicsGeometry.bindings.cs">
+      <Link>Modules\Physics\ScriptBindings\PhysicsGeometry.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\Physics\ScriptBindings\QueryCommand.bindings.cs">
       <Link>Modules\Physics\ScriptBindings\QueryCommand.bindings.cs</Link>
     </Compile>
@@ -2126,8 +2183,8 @@
     <Compile Include="..\..\Modules\Properties\Runtime\PropertyBags\IndexedCollectionPropertyBag.cs">
       <Link>Modules\Properties\Runtime\PropertyBags\IndexedCollectionPropertyBag.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\Properties\Runtime\PropertyBags\Internal\DefaultPropertyBags.cs">
-      <Link>Modules\Properties\Runtime\PropertyBags\Internal\DefaultPropertyBags.cs</Link>
+    <Compile Include="..\..\Modules\Properties\Runtime\PropertyBags\Internal\PropertiesInitialization.cs">
+      <Link>Modules\Properties\Runtime\PropertyBags\Internal\PropertiesInitialization.cs</Link>
     </Compile>
     <Compile Include="..\..\Modules\Properties\Runtime\PropertyBags\Internal\PropertyBagStore.cs">
       <Link>Modules\Properties\Runtime\PropertyBags\Internal\PropertyBagStore.cs</Link>
@@ -2459,6 +2516,12 @@
     <Compile Include="..\..\Modules\TextCoreTextEngine\Managed\UnicodeLineBreakingRules.cs">
       <Link>Modules\TextCoreTextEngine\Managed\UnicodeLineBreakingRules.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\TextCoreTextEngine\MeshInfo.bindings.cs">
+      <Link>Modules\TextCoreTextEngine\MeshInfo.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\TextCoreTextEngine\TextCoreVertex.bindings.cs">
+      <Link>Modules\TextCoreTextEngine\TextCoreVertex.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\TextRendering\FontStyle.cs">
       <Link>Modules\TextRendering\FontStyle.cs</Link>
     </Compile>
@@ -2813,9 +2876,6 @@
     <Compile Include="..\..\Runtime\Export\Caching\Caching.deprecated.cs">
       <Link>Runtime\Export\Caching\Caching.deprecated.cs</Link>
     </Compile>
-    <Compile Include="..\..\Runtime\Export\Camera\AssetNotificationSystem.bindings.cs">
-      <Link>Runtime\Export\Camera\AssetNotificationSystem.bindings.cs</Link>
-    </Compile>
     <Compile Include="..\..\Runtime\Export\Camera\BuiltinRuntimeReflectionSystem.bindings.cs">
       <Link>Runtime\Export\Camera\BuiltinRuntimeReflectionSystem.bindings.cs</Link>
     </Compile>
@@ -2870,6 +2930,9 @@
     <Compile Include="..\..\Runtime\Export\Debug\Debug.deprecated.cs">
       <Link>Runtime\Export\Debug\Debug.deprecated.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\DedicatedServer\Arguments.bindings.cs">
+      <Link>Runtime\Export\DedicatedServer\Arguments.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\Device\Application.cs">
       <Link>Runtime\Export\Device\Application.cs</Link>
     </Compile>
@@ -3101,12 +3164,21 @@
     <Compile Include="..\..\Runtime\Export\Graphics\GraphicsRenderers.bindings.cs">
       <Link>Runtime\Export\Graphics\GraphicsRenderers.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\Graphics\GraphicsSettings.RenderPipelineGlobalSettings.bindings.cs">
+      <Link>Runtime\Export\Graphics\GraphicsSettings.RenderPipelineGlobalSettings.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\Graphics\GraphicsSettings.bindings.cs">
       <Link>Runtime\Export\Graphics\GraphicsSettings.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\Graphics\GraphicsTexture.bindings.cs">
+      <Link>Runtime\Export\Graphics\GraphicsTexture.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\Graphics\Graphics_BindingsOverloads.cs">
       <Link>Runtime\Export\Graphics\Graphics_BindingsOverloads.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\Graphics\HDROutputFaking.bindings.cs">
+      <Link>Runtime\Export\Graphics\HDROutputFaking.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\Graphics\LOD.bindings.cs">
       <Link>Runtime\Export\Graphics\LOD.bindings.cs</Link>
     </Compile>
@@ -3389,9 +3461,15 @@
     <Compile Include="..\..\Runtime\Export\RenderPipeline\GizmoSubset.cs">
       <Link>Runtime\Export\RenderPipeline\GizmoSubset.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\RenderPipeline\InvalidImportException.cs">
+      <Link>Runtime\Export\RenderPipeline\InvalidImportException.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\RenderPipeline\LODParameters.cs">
       <Link>Runtime\Export\RenderPipeline\LODParameters.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\RenderPipeline\ObjectIdRequest.cs">
+      <Link>Runtime\Export\RenderPipeline\ObjectIdRequest.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\RenderPipeline\PerObjectData.cs">
       <Link>Runtime\Export\RenderPipeline\PerObjectData.cs</Link>
     </Compile>
@@ -3542,12 +3620,18 @@
     <Compile Include="..\..\Runtime\Export\Scripting\Awaitable.ThreadSafeObjectPool.cs">
       <Link>Runtime\Export\Scripting\Awaitable.ThreadSafeObjectPool.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\Scripting\Awaitable.Threading.cs">
+      <Link>Runtime\Export\Scripting\Awaitable.Threading.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\Scripting\Awaitable.UnityEvents.cs">
       <Link>Runtime\Export\Scripting\Awaitable.UnityEvents.cs</Link>
     </Compile>
     <Compile Include="..\..\Runtime\Export\Scripting\Awaitable.cs">
       <Link>Runtime\Export\Scripting\Awaitable.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\Scripting\AwaitableCompletionSource.cs">
+      <Link>Runtime\Export\Scripting\AwaitableCompletionSource.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\Scripting\AwaitableT.cs">
       <Link>Runtime\Export\Scripting\AwaitableT.cs</Link>
     </Compile>
@@ -3860,6 +3944,9 @@
     <Compile Include="..\..\Runtime\Export\UnityEngineInternal\WrappedTypes.cs">
       <Link>Runtime\Export\UnityEngineInternal\WrappedTypes.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\UnityEvent\PropertyChangedEvent.cs">
+      <Link>Runtime\Export\UnityEvent\PropertyChangedEvent.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\UnityEvent\UnityEvent.cs">
       <Link>Runtime\Export\UnityEvent\UnityEvent.cs</Link>
     </Compile>
@@ -4019,6 +4106,9 @@
     <Compile Include="..\..\Runtime\Scripting\ManagedAttributeManagerTests.cs">
       <Link>Runtime\Scripting\ManagedAttributeManagerTests.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Scripting\Marshalling\ManagedSpanWrapper.cs">
+      <Link>Runtime\Scripting\Marshalling\ManagedSpanWrapper.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Transform\ScriptBindings\RectTransform.bindings.cs">
       <Link>Runtime\Transform\ScriptBindings\RectTransform.bindings.cs</Link>
     </Compile>
diff --git a/README.md b/README.md
index 3421527203..e45c5c5cd3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Unity 2023.1.0a19 C# reference source code
+## Unity 2023.1.20f1 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 45afe66c18..f6bed30b0b 100644
--- a/Runtime/2D/Common/ScriptBindings/SpriteDataAccess.bindings.cs
+++ b/Runtime/2D/Common/ScriptBindings/SpriteDataAccess.bindings.cs
@@ -128,7 +128,7 @@ unsafe public static void SetVertexAttribute<T>(this Sprite sprite, VertexAttrib
         unsafe public static NativeArray<Matrix4x4> GetBindPoses(this Sprite sprite)
         {
             var info = GetBindPoseInfo(sprite);
-            var arr = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<Matrix4x4>(info.buffer, info.count, Allocator.Invalid);
+            var arr = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<Matrix4x4>(info.buffer, info.count, Allocator.None);
             NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref arr, sprite.GetSafetyHandle());
             return arr;
         }
diff --git a/Runtime/2D/Common/ScriptBindings/Sprites.bindings.cs b/Runtime/2D/Common/ScriptBindings/Sprites.bindings.cs
index 0ea100c711..8fbfb9fb03 100644
--- a/Runtime/2D/Common/ScriptBindings/Sprites.bindings.cs
+++ b/Runtime/2D/Common/ScriptBindings/Sprites.bindings.cs
@@ -82,7 +82,7 @@ private Sprite() {}
         internal extern static Sprite CreateSpriteWithoutTextureScripting(Rect rect, Vector2 pivot, float pixelsToUnits, Texture2D texture);
 
         [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);
+        internal extern static Sprite CreateSprite(Texture2D texture, Rect rect, Vector2 pivot, float pixelsPerUnit, uint extrude, SpriteMeshType meshType, Vector4 border, bool generateFallbackPhysicsShape, [Unmarshalled] SecondarySpriteTexture[] secondaryTexture);
 
         public extern Bounds bounds
         {
@@ -109,7 +109,7 @@ public extern Texture2D texture
         // Get Secondary Texture count
         public extern int GetSecondaryTextureCount();
         [FreeFunction("SpritesBindings::GetSecondaryTextures", ThrowsException = true, HasExplicitThis = true)]
-        public extern int GetSecondaryTextures([NotNull] SecondarySpriteTexture[] secondaryTexture);
+        public extern int GetSecondaryTextures([NotNull][Unmarshalled] 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.
@@ -199,7 +199,7 @@ public extern Vector2[] uv
 
         public extern uint GetScriptableObjectsCount();
         [FreeFunction("SpritesBindings::GetScriptableObjects", ThrowsException = true, HasExplicitThis = true)]
-        public extern uint GetScriptableObjects([NotNull] ScriptableObject[] scriptableObjects);
+        public extern uint GetScriptableObjects([NotNull][Unmarshalled] ScriptableObject[] scriptableObjects);
         public extern bool AddScriptableObject([NotNull("NullExceptionObject")]ScriptableObject obj);
         public extern bool RemoveScriptableObjectAt(uint i);
         public extern bool SetScriptableObjectAt([NotNull("NullExceptionObject")]ScriptableObject obj, uint i);
diff --git a/Runtime/2D/Sorting/ScriptBindings/SortingGroup.bindings.cs b/Runtime/2D/Sorting/ScriptBindings/SortingGroup.bindings.cs
index d60194fb25..aa14a131b6 100644
--- a/Runtime/2D/Sorting/ScriptBindings/SortingGroup.bindings.cs
+++ b/Runtime/2D/Sorting/ScriptBindings/SortingGroup.bindings.cs
@@ -20,6 +20,9 @@ public sealed partial class SortingGroup : Behaviour
         [StaticAccessor("SortingGroup", StaticAccessorType.DoubleColon)]
         public extern static void UpdateAllSortingGroups();
 
+        [StaticAccessor("SortingGroup", StaticAccessorType.DoubleColon)]
+        internal extern static SortingGroup GetSortingGroupByIndex(int index);
+
         public extern string sortingLayerName { get; set; }
         public extern int sortingLayerID { get; set; }
         public extern int sortingOrder { get; set; }
diff --git a/Runtime/2D/SpriteAtlas/ScriptBindings/SpriteAtlas.bindings.cs b/Runtime/2D/SpriteAtlas/ScriptBindings/SpriteAtlas.bindings.cs
index 19eabcf3f0..8516efa263 100644
--- a/Runtime/2D/SpriteAtlas/ScriptBindings/SpriteAtlas.bindings.cs
+++ b/Runtime/2D/SpriteAtlas/ScriptBindings/SpriteAtlas.bindings.cs
@@ -55,7 +55,7 @@ public class SpriteAtlas : UnityEngine.Object
         public int GetSprites(Sprite[] sprites) { return GetSpritesScripting(sprites); }
         public int GetSprites(Sprite[] sprites, string name) {  return GetSpritesWithNameScripting(sprites, name); }
 
-        extern private int GetSpritesScripting(Sprite[] sprites);
-        extern private int GetSpritesWithNameScripting(Sprite[] sprites, string name);
+        extern private int GetSpritesScripting([Unmarshalled] Sprite[] sprites);
+        extern private int GetSpritesWithNameScripting([Unmarshalled] Sprite[] sprites, string name);
     }
 }
diff --git a/Runtime/Export/2D/SortingLayer.bindings.cs b/Runtime/Export/2D/SortingLayer.bindings.cs
index 2338bd3c18..6ce741018c 100644
--- a/Runtime/Export/2D/SortingLayer.bindings.cs
+++ b/Runtime/Export/2D/SortingLayer.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 UnityEngine.Bindings;
 
 namespace UnityEngine
@@ -31,6 +32,12 @@ public static SortingLayer[] layers
             }
         }
 
+        // Delegate for layer add/remove events
+        public delegate void LayerCallback(SortingLayer layer);
+
+        public static LayerCallback onLayerAdded;
+        public static LayerCallback onLayerRemoved;
+
         [FreeFunction("GetTagManager().GetSortingLayerIDs")]
         extern private static int[] GetSortingLayerIDsInternal();
 
diff --git a/Runtime/Export/Animation/AnimationCurve.bindings.cs b/Runtime/Export/Animation/AnimationCurve.bindings.cs
index e7f754f1be..01459cabcf 100644
--- a/Runtime/Export/Animation/AnimationCurve.bindings.cs
+++ b/Runtime/Export/Animation/AnimationCurve.bindings.cs
@@ -156,6 +156,9 @@ public class AnimationCurve : IEquatable<AnimationCurve>
         [FreeFunction("AnimationCurveBindings::Internal_Equals", HasExplicitThis = true, IsThreadSafe = true)]
         extern private bool Internal_Equals(IntPtr other);
 
+        [FreeFunction("AnimationCurveBindings::Internal_CopyFrom", HasExplicitThis = true, IsThreadSafe = true)]
+        extern private void Internal_CopyFrom(IntPtr other);
+
         ~AnimationCurve()
         {
             Internal_Destroy(m_Ptr);
@@ -183,6 +186,9 @@ public class AnimationCurve : IEquatable<AnimationCurve>
         [FreeFunction("AnimationCurveBindings::MoveKey", HasExplicitThis = true, IsThreadSafe = true)]
         extern public int MoveKey(int index, Keyframe key);
 
+        [FreeFunction("AnimationCurveBindings::ClearKeys", HasExplicitThis = true, IsThreadSafe = true)]
+        extern public void ClearKeys();
+
         // Removes a key
         [NativeThrows]
         [FreeFunction("AnimationCurveBindings::RemoveKey", HasExplicitThis = true, IsThreadSafe = true)]
@@ -212,6 +218,9 @@ extern public int length
         [FreeFunction("AnimationCurveBindings::GetKeys", HasExplicitThis = true, IsThreadSafe = true)]
         extern private Keyframe[] GetKeys();
 
+		[FreeFunction("AnimationCurveBindings::GetHashCode", HasExplicitThis = true, IsThreadSafe = true)]
+        extern public override int GetHashCode();
+
         // Smooth the in and out tangents of the keyframe at /index/.
         [NativeThrows]
         [FreeFunction("AnimationCurveBindings::SmoothTangents", HasExplicitThis = true, IsThreadSafe = true)]
@@ -287,11 +296,7 @@ public override bool Equals(object o)
                 return true;
             }
 
-            if (o.GetType() != this.GetType())
-            {
-                return false;
-            }
-            return Equals((AnimationCurve)o);
+            return o.GetType() == this.GetType() && Equals((AnimationCurve)o);
         }
 
         public bool Equals(AnimationCurve other)
@@ -306,17 +311,12 @@ public bool Equals(AnimationCurve other)
                 return true;
             }
 
-            if (m_Ptr.Equals(other.m_Ptr))
-            {
-                return true;
-            }
-
-            return Internal_Equals(other.m_Ptr);
+            return m_Ptr.Equals(other.m_Ptr) || Internal_Equals(other.m_Ptr);
         }
 
-        public override int GetHashCode()
+        public void CopyFrom(AnimationCurve other)
         {
-            return m_Ptr.GetHashCode();
+            Internal_CopyFrom(other.m_Ptr);
         }
     }
 
diff --git a/Runtime/Export/Application/Application.bindings.cs b/Runtime/Export/Application/Application.bindings.cs
index ae9d283525..a5a75fc332 100644
--- a/Runtime/Export/Application/Application.bindings.cs
+++ b/Runtime/Export/Application/Application.bindings.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.IO;
 using UnityEngineInternal;
 using UnityEngine.Scripting;
 using UnityEngine.Bindings;
@@ -123,9 +124,11 @@ public extern static bool isFocused
         }
 
         [FreeFunction("GetBuildSettings().GetBuildTags")]
+        [Obsolete("Application.GetBuildTags is no longer supported and will be removed.", false)]
         extern public static string[] GetBuildTags();
 
         [FreeFunction("GetBuildSettings().SetBuildTags")]
+        [Obsolete("Application.SetBuildTags is no longer supported and will be removed.", false)]
         extern public static void SetBuildTags(string[] buildTags);
 
         extern public static string buildGUID
diff --git a/Runtime/Export/AssemblyInfo.cs b/Runtime/Export/AssemblyInfo.cs
index 855b392480..08056c7b39 100644
--- a/Runtime/Export/AssemblyInfo.cs
+++ b/Runtime/Export/AssemblyInfo.cs
@@ -47,6 +47,7 @@
 [assembly: InternalsVisibleTo("Unity.Tiny.Rendering.Authoring")]
 [assembly: InternalsVisibleTo("Unity.Tiny.Authoring")]
 [assembly: InternalsVisibleTo("Unity.ImageConversionTests")]
+[assembly: InternalsVisibleTo("Unity.Motion.Editor.AnimationWindow")]
 
 // Required for the type forwarder UnityEngine.dll
 [assembly: InternalsVisibleTo("UnityEngine")]
@@ -93,6 +94,7 @@
 [assembly: InternalsVisibleTo("UnityEngine.UIElements.Tests")]
 
 [assembly: InternalsVisibleTo("Unity.UIElements.EditorTests")]
+[assembly: InternalsVisibleTo("Unity.UIElements.RuntimeTests")]
 [assembly: InternalsVisibleTo("UnityEngine.UI")]
 
 // Needed for Baselib CSharp binding access.
diff --git a/Runtime/Export/BaseClass.cs b/Runtime/Export/BaseClass.cs
index 342f275099..21c532245c 100644
--- a/Runtime/Export/BaseClass.cs
+++ b/Runtime/Export/BaseClass.cs
@@ -123,10 +123,12 @@ public enum RuntimePlatform
         [System.Obsolete("Lumin is no longer supported in Unity 2022.2")]
         Lumin = 33,
         // BJM
+        [System.Obsolete("Stadia is no longer supported in Unity 2023.1")]
         Stadia = 34,
         // Cloud Rendering
-        [System.Obsolete("Use LinuxPlayer instead")]
-        CloudRendering = 35,
+        [System.Obsolete("CloudRendering is deprecated, please use LinuxHeadlessSimulation (UnityUpgradable) -> LinuxHeadlessSimulation", false)]
+        CloudRendering = -1,
+        LinuxHeadlessSimulation = 35,
         // Game Core
         [System.Obsolete("GameCoreScarlett is deprecated, please use GameCoreXboxSeries (UnityUpgradable) -> GameCoreXboxSeries", false)]
         GameCoreScarlett = -1, // GameCoreScarlett renumbered here so it's destinct from GameCoreXboxSeries.
diff --git a/Runtime/Export/Burst/BurstAuthorizedExternalMethodAttribute.cs b/Runtime/Export/Burst/BurstAuthorizedExternalMethodAttribute.cs
index d0d2a0f727..ca1745b37f 100644
--- a/Runtime/Export/Burst/BurstAuthorizedExternalMethodAttribute.cs
+++ b/Runtime/Export/Burst/BurstAuthorizedExternalMethodAttribute.cs
@@ -3,9 +3,11 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using UnityEngine.Scripting;
 
 namespace Unity.Burst
 {
+    [RequireAttributeUsages]
     [AttributeUsage(AttributeTargets.Method)]
     public class BurstAuthorizedExternalMethodAttribute : Attribute
     {
diff --git a/Runtime/Export/Camera/AssetNotificationSystem.bindings.cs b/Runtime/Export/Camera/AssetNotificationSystem.bindings.cs
deleted file mode 100644
index 0e2b3be6b3..0000000000
--- a/Runtime/Export/Camera/AssetNotificationSystem.bindings.cs
+++ /dev/null
@@ -1,69 +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 Unity.Collections;
-using Unity.Collections.LowLevel.Unsafe;
-using UnityEngine.Bindings;
-
-namespace UnityEngine.Internal
-{
-    [NativeHeader("Runtime/Camera/AssetNotificationSystemScripting.h")]
-    internal static class AssetNotificationSystem
-    {
-        // Match AssetNotificationSystem.h Type
-        internal enum AssetType {
-            Mesh = 0,
-            Material = 1,
-            NumTypes
-        }
-
-        /// <summary>
-        /// Register a subscriber index for receiving asset change/deletion notifications.
-        /// </summary>
-        public static extern int AddSubscriber();
-
-        /// <summary>
-        /// Remove a subscriber index for receiving asset change/deletion notifications.
-        /// </summary>
-        public static extern void RemoveSubscriber(int subscriberId);
-
-        /// <summary>
-        /// Clear all change notifications for the given subscriber ID.
-        /// </summary>
-        public static extern void ClearChanges(int subscriberId);
-
-        /// <summary>
-        /// Count the number of outstanding change/deletion notifications for this asset type.
-        ///
-        /// Asset changes/deletions will only be reported if the specific asset has been subscribed
-        /// for notifications using SubscribeAsset.
-        /// </summary>
-        public static extern void CountChanges(int subscriberId, AssetType type, out int changedCount, out int deletedCount);
-
-        /// <summary>
-        /// Receive pending change notifications for the given subscriber ID and the asset type.
-        /// The caller should call CountChanges first to get the length necessary of each array.
-        /// If an array that is too small is passed in, the function will return false.
-        ///
-        /// After receiving changes, the caller should call ClearChanges to reset the notifications.
-        ///
-        /// Asset changes/deletions will only be reported if the specific asset has been subscribed
-        /// for notifications using SubscribeAsset.
-        /// </summary>
-        public static bool GetChanges(int subscriberId, AssetType type,
-            NativeArray<int> changedAssetInstanceIds, NativeArray<int> deletedAssetInstanceIds)
-        {
-            unsafe {
-                return GetChangesForScripting(subscriberId, type,
-                    (int*) NativeArrayUnsafeUtility.GetUnsafePtr(changedAssetInstanceIds), changedAssetInstanceIds.Length,
-                    (int*) NativeArrayUnsafeUtility.GetUnsafePtr(deletedAssetInstanceIds), deletedAssetInstanceIds.Length);
-            }
-        }
-
-        private static extern unsafe bool GetChangesForScripting(int subscriberID, AssetType type,
-            int* changed, int changedLength, int* deleted, int deletedLength);
-
-    }
-}
diff --git a/Runtime/Export/Camera/Camera.bindings.cs b/Runtime/Export/Camera/Camera.bindings.cs
index a6dae95554..1a64cfa18c 100644
--- a/Runtime/Export/Camera/Camera.bindings.cs
+++ b/Runtime/Export/Camera/Camera.bindings.cs
@@ -322,6 +322,9 @@ public SceneViewFilterMode sceneViewFilterMode
             }
         }
 
+        [NativeConditional("UNITY_EDITOR")]
+        extern public bool renderCloudsInSceneView { get; set; }
+
 
         // TODO: it should be collapsed with others
         [NativeName("RenderToCubemap")] extern private bool RenderToCubemapEyeImpl(RenderTexture cubemap, int faceMask, MonoOrStereoscopicEye stereoEye);
@@ -416,15 +419,46 @@ public void SubmitRenderRequest<RequestData>(RequestData renderRequest)
             if (renderRequest == null)
                 throw new ArgumentException($"{nameof(SubmitRenderRequests)} is invoked with invalid renderRequests");
 
+            if (renderRequest is ObjectIdRequest objectIdRequest)
+            {
+                if (objectIdRequest.destination.depthStencilFormat == Experimental.Rendering.GraphicsFormat.None)
+                {
+                    Debug.LogWarning("ObjectId Render Request submitted without a depth stencil, which can produce results that are not depth tested correctly");
+                }
+                if (GraphicsSettings.currentRenderPipeline == null || !RenderPipelineManager.currentPipeline.IsRenderRequestSupported(this, objectIdRequest))
+                {
+                    // If the render pipeline supports object id rendering let the pipeline handle it.
+                    // Otherwise rely on the built-in support through "magic", which also works with both hdrp/urp shaders
+                    HandleBuiltInObjectIDRenderRequest(objectIdRequest);
+                    return;
+                }
+            }
             if (GraphicsSettings.currentRenderPipeline == null)
             {
-                Debug.LogWarning("Trying to invoke 'SubmitRenderRequests' when no SRP is set. A scriptable render pipeline is needed for this function call");
+                Debug.LogWarning("Trying to invoke 'SubmitRenderRequest' when no SRP is set. A scriptable render pipeline is needed for this function call");
                 return;
             }
             SubmitRenderRequestsInternal(renderRequest);
         }
 
+        void HandleBuiltInObjectIDRenderRequest(ObjectIdRequest renderRequest)
+        {
+            UnityEngine.Object[] objects;
+            objects = SubmitBuiltInObjectIDRenderRequest(
+                renderRequest.destination,
+                renderRequest.mipLevel,
+                renderRequest.face,
+                renderRequest.slice);
+            renderRequest.result = new ObjectIdResult(objects);
+        }
+
         [FreeFunction("CameraScripting::SubmitRenderRequests", HasExplicitThis = true)]  extern private void SubmitRenderRequestsInternal(object requests);
+        [FreeFunction("CameraScripting::SubmitBuiltInObjectIDRenderRequest", HasExplicitThis = true)] [NativeConditional("UNITY_EDITOR")]
+        extern private UnityEngine.Object[] SubmitBuiltInObjectIDRenderRequest(
+            RenderTexture target,
+            int mipLevel,
+            CubemapFace cubemapFace,
+            int depthSlice);
         [FreeFunction("CameraScripting::SetupCurrent")] extern public static void SetupCurrent(Camera cur);
         [FreeFunction("CameraScripting::CopyFrom", HasExplicitThis = true)] extern public void CopyFrom(Camera other);
 
diff --git a/Runtime/Export/Collections/CollectionExtensions.cs b/Runtime/Export/Collections/CollectionExtensions.cs
index 630e487870..9a85c530e2 100644
--- a/Runtime/Export/Collections/CollectionExtensions.cs
+++ b/Runtime/Export/Collections/CollectionExtensions.cs
@@ -6,10 +6,11 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Text;
+using UnityEngine.Bindings;
 
 namespace Unity.Collections
 {
+    [VisibleToOtherModules]
     internal static class CollectionExtensions
     {
         /// <summary>
@@ -52,6 +53,28 @@ internal static void AddSorted<T>([DisallowNull] this List<T> list, T item, ICom
             list.Insert(index, item);
         }
 
+        /// <summary>
+        /// Adds <paramref name="count"/> elements <paramref name="value"/> to the list.
+        /// </summary>
+        /// <param name="dest">The list to modify.</param>
+        /// <param name="value">The value to add.</param>
+        /// <param name="count">The number of values to add.</param>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="dest"/> is null.</exception>
+        public static void Fill<T>(this List<T> dest, T value, int count)
+        {
+            if (dest == null)
+            {
+                throw new ArgumentNullException(nameof(dest));
+            }
+
+            dest.Capacity = Math.Max(dest.Capacity, dest.Count + count);
+            while (count-- > 0)
+            {
+                dest.Add(value);
+            }
+        }
+
         /// <summary>
         /// Returns collections as a string. This can be useful for debug collections in Debug.Log.
         /// String is also Json compatible. It use [ , , ] convention.
diff --git a/Runtime/Export/Collections/NativeCollectionEnums.bindings.cs b/Runtime/Export/Collections/NativeCollectionEnums.bindings.cs
index c0ce5b7a88..078c4b7934 100644
--- a/Runtime/Export/Collections/NativeCollectionEnums.bindings.cs
+++ b/Runtime/Export/Collections/NativeCollectionEnums.bindings.cs
@@ -23,9 +23,20 @@ public enum Allocator
         FirstUserIndex = 64,
     }
 
+    [UsedByNativeCode]
+    public enum NativeLeakDetectionMode
+    {
+        // NOTE: Any changes to this enum must be kept in sync with Runtime\Export\Collections\NativeCollectionLeakDetectionMode.h
+        Disabled = 1,
+        Enabled = 2,
+        EnabledWithStackTrace = 3
+    }
+
     [UsedByNativeCode]
     internal enum LeakCategory
     {
+        // NOTE: Any changes to this enum must be kept in sync with Runtime\Export\Collections\NativeCollectionLeakCategory.h
+        // and the strings in Runtime\Allocator\LeakDetection.cpp
         Invalid = 0,
         Malloc = 1,
         TempJob = 2,
diff --git a/Runtime/Export/Debug/Debug.bindings.cs b/Runtime/Export/Debug/Debug.bindings.cs
index 2efed92192..f78cbe8812 100644
--- a/Runtime/Export/Debug/Debug.bindings.cs
+++ b/Runtime/Export/Debug/Debug.bindings.cs
@@ -173,6 +173,9 @@ internal static void LogInfo(string message, string fileName, int lineNumber, in
         // Clears errors from the developer console.
         public static extern void ClearDeveloperConsole();
 
+        // Prevent the developer console from opening in developer builds
+        public static extern bool developerConsoleEnabled { get; set; }
+
         // Opens or closes developer console.
         public static extern bool developerConsoleVisible { get; set; }
 
@@ -240,8 +243,6 @@ public static void LogWarningFormat(UnityEngine.Object context, string format, p
         public static void LogAssertionFormat(Object context, string format, params object[] args) { unityLogger.LogFormat(LogType.Assert, context, format, args); }
 
         // In the Build Settings dialog there is a check box called "Development Build".
-        [StaticAccessor("GetBuildSettings()", StaticAccessorType.Dot)]
-        [NativeProperty(TargetType = TargetType.Field)]
         public static extern bool isDebugBuild { get; }
 
         [FreeFunction("DeveloperConsole_OpenConsoleFile")]
diff --git a/Runtime/Export/DedicatedServer/Arguments.bindings.cs b/Runtime/Export/DedicatedServer/Arguments.bindings.cs
new file mode 100644
index 0000000000..cde3eb7478
--- /dev/null
+++ b/Runtime/Export/DedicatedServer/Arguments.bindings.cs
@@ -0,0 +1,133 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.IO;
+using UnityEngine.Bindings;
+
+namespace UnityEngine.DedicatedServer
+{
+    [NativeHeader("Runtime/Export/DedicatedServer/Arguments.bindings.h")]
+    [StaticAccessor("DedicatedServerBindings", StaticAccessorType.DoubleColon)]
+    public static class Arguments
+    {
+        [NativeConditional("PLATFORM_SERVER")]
+        [FreeFunction("DedicatedServerBindings::GetBoolArgument")]
+        extern internal static bool GetBoolArgument(string arg);
+        [NativeConditional("PLATFORM_SERVER")]
+        [FreeFunction("DedicatedServerBindings::GetIntArgument")]
+        extern internal static bool GetIntArgument(string arg, out int intValue);
+        [NativeConditional("PLATFORM_SERVER")]
+        [FreeFunction("DedicatedServerBindings::GetStringArgument")]
+        extern internal static bool GetStringArgument(string arg, out string stringValue);
+        [NativeConditional("PLATFORM_SERVER")]
+        [FreeFunction("DedicatedServerBindings::SetBoolArgument")]
+        extern internal static void SetBoolArgument(string arg);
+        [NativeConditional("PLATFORM_SERVER")]
+        [FreeFunction("DedicatedServerBindings::SetIntArgument")]
+        extern internal static void SetIntArgument(string arg, int intValue);
+        [NativeConditional("PLATFORM_SERVER")]
+        [FreeFunction("DedicatedServerBindings::SetStringArgument")]
+        extern internal static void SetStringArgument(string arg, string stringValue);
+
+        public static int? Port
+        {
+            get {
+                if (GetIntArgument("port", out var intValue))
+                    return intValue;
+                return null;
+            }
+            set {
+                int intValue = value ?? default(int);
+                SetIntArgument("port", intValue);
+            }
+        }
+
+        public static int? TargetFramerate
+        {
+            get {
+                if (GetIntArgument("framerate", out var intValue))
+                    return intValue;
+                return null;
+            }
+            set {
+                int intValue = value ?? default(int);
+                SetIntArgument("framerate", intValue);
+            }
+        }
+
+        public static int? LogLevel
+        {
+            get {
+                if (GetIntArgument("loglevel", out var intValue))
+                    return intValue;
+                return null;
+            }
+            set {
+                int intValue = value ?? default(int);
+                SetIntArgument("loglevel", intValue);
+            }
+        }
+
+        public static string LogPath
+        {
+            get {
+                if (GetStringArgument("logpath", out var stringValue))
+                    return stringValue;
+                else if (GetStringArgument("logfile", out stringValue))
+                    return Path.GetDirectoryName(stringValue);
+                return null;
+            }
+            set {
+                SetStringArgument("logpath", value);
+            }
+        }
+
+        public static int? QueryPort
+        {
+            get {
+                if (GetIntArgument("queryport", out var intValue))
+                    return intValue;
+                return null;
+            }
+            set {
+                int intValue = value ?? default(int);
+                SetIntArgument("queryport", intValue);
+            }
+        }
+
+        public static string QueryType
+        {
+            get {
+                if (GetStringArgument("querytype", out var stringValue))
+                    return stringValue;
+                return null;
+            }
+            set {
+                SetStringArgument("querytype", value);
+            }
+        }
+
+        public enum ArgumentErrorPolicy {
+            Ignore,
+            Warn,
+            Fatal
+        }
+
+        [NativeConditional("PLATFORM_SERVER")]
+        [FreeFunction("DedicatedServerBindings::SetArgumentErrorPolicy")]
+        extern internal static void SetArgumentErrorPolicy(ArgumentErrorPolicy policy);
+        [NativeConditional("PLATFORM_SERVER")]
+        [FreeFunction("DedicatedServerBindings::GetArgumentErrorPolicy")]
+        extern internal static ArgumentErrorPolicy GetArgumentErrorPolicy();
+
+        public static ArgumentErrorPolicy ErrorPolicy {
+            get {
+                return GetArgumentErrorPolicy();
+            }
+            set {
+                SetArgumentErrorPolicy(value);
+            }
+        }
+    }
+}
diff --git a/Runtime/Export/Device/Application.cs b/Runtime/Export/Device/Application.cs
index 956b74fa34..3f9fb12e9e 100644
--- a/Runtime/Export/Device/Application.cs
+++ b/Runtime/Export/Device/Application.cs
@@ -123,6 +123,7 @@ public static bool CanStreamedLevelBeLoaded(string levelName)
             return ShimManager.applicationShim.CanStreamedLevelBeLoaded(levelName);
         }
 
+        [Obsolete("Application.GetBuildTags is no longer supported and will be removed.", false)]
         public static string[] GetBuildTags()
         {
             return ShimManager.applicationShim.GetBuildTags();
@@ -173,6 +174,7 @@ public static UnityEngine.AsyncOperation RequestUserAuthorization(UnityEngine.Us
             return ShimManager.applicationShim.RequestUserAuthorization(mode);
         }
 
+        [Obsolete("Application.SetBuildTags is no longer supported and will be removed.", false)]
         public static void SetBuildTags(string[] buildTags)
         {
             ShimManager.applicationShim.SetBuildTags(buildTags);
diff --git a/Runtime/Export/DiagnosticSwitch/DiagnosticSwitch.cs b/Runtime/Export/DiagnosticSwitch/DiagnosticSwitch.cs
index 30c3e9ae6a..40ff70118b 100644
--- a/Runtime/Export/DiagnosticSwitch/DiagnosticSwitch.cs
+++ b/Runtime/Export/DiagnosticSwitch/DiagnosticSwitch.cs
@@ -26,8 +26,9 @@ private DiagnosticSwitch() {}
         [Flags]
         internal enum Flags
         {
-            None                        = 0,
-            CanChangeAfterEngineStart   = (1 << 0)
+            None = 0,
+            CanChangeAfterEngineStart = (1 << 0),
+            PropagateToAssetImportWorkerProcess = (1 << 1),
         }
 
         public extern string name { get; }
diff --git a/Runtime/Export/ExpressionEvaluator.cs b/Runtime/Export/ExpressionEvaluator.cs
index c8b524967b..96f8252232 100644
--- a/Runtime/Export/ExpressionEvaluator.cs
+++ b/Runtime/Export/ExpressionEvaluator.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine.Scripting.APIUpdating;
 
 namespace UnityEngine
@@ -153,27 +154,41 @@ static bool EvaluateTokens<T>(string[] tokens, ref T value, int index, int count
             var res = false;
             if (typeof(T) == typeof(float))
             {
-                var v = (double)(float)(object)value;
+                var v = (double) UnsafeUtility.As<T, float>(ref value);
                 res = EvaluateDouble(tokens, ref v, index, count);
-                value = (T)(object)(float)v;
+                var outValue = (float)v;
+                value = UnsafeUtility.As<float, T>(ref outValue);
             }
             else if (typeof(T) == typeof(int))
             {
-                var v = (double)(int)(object)value;
+                var v = (double) UnsafeUtility.As<T, int>(ref value);
                 res = EvaluateDouble(tokens, ref v, index, count);
-                value = (T)(object)(int)v;
+                var outValue = (int)v;
+                value = UnsafeUtility.As<int, T>(ref outValue);
             }
             else if (typeof(T) == typeof(long))
             {
-                var v = (double)(long)(object)value;
+                var v = (double) UnsafeUtility.As<T, long>(ref value);
                 res = EvaluateDouble(tokens, ref v, index, count);
-                value = (T)(object)(long)v;
+                var outValue = (long)v;
+                value = UnsafeUtility.As<long, T>(ref outValue);
+            }
+            else if (typeof(T) == typeof(ulong))
+            {
+                var v = (double) UnsafeUtility.As<T, ulong>(ref value);
+                res = EvaluateDouble(tokens, ref v, index, count);
+                if (v < 0d)
+                {
+                    v = 0d;
+                }
+                var outValue = (ulong)v;
+                value = UnsafeUtility.As<ulong, T>(ref outValue);
             }
             else if (typeof(T) == typeof(double))
             {
-                var v = (double)(object)value;
+                var v = UnsafeUtility.As<T, double>(ref value);
                 res = EvaluateDouble(tokens, ref v, index, count);
-                value = (T)(object)v;
+                value = UnsafeUtility.As<double, T>(ref v);
             }
             return res;
         }
@@ -514,6 +529,11 @@ static bool TryParse<T>(string expression, out T result)
                 success = long.TryParse(expressionLowerCase, NumberStyles.Integer, CultureInfo.InvariantCulture.NumberFormat, out var temp);
                 result = (T)(object)temp;
             }
+            else if (typeof(T) == typeof(ulong))
+            {
+                success = ulong.TryParse(expressionLowerCase, NumberStyles.Integer, CultureInfo.InvariantCulture.NumberFormat, out var temp);
+                result = (T)(object)temp;
+            }
             return success;
         }
     }
diff --git a/Runtime/Export/GI/LightingSettings.bindings.cs b/Runtime/Export/GI/LightingSettings.bindings.cs
index 7cd65cb936..54b16cf6e3 100644
--- a/Runtime/Export/GI/LightingSettings.bindings.cs
+++ b/Runtime/Export/GI/LightingSettings.bindings.cs
@@ -170,8 +170,10 @@ internal enum TiledBaking
         [NativeName("FilterMode")]
         internal extern UnityEngine.FilterMode lightmapFilterMode { get; set; }
 
+        [Obsolete("Training data export for baked lighting is deprecated.", false)]
         public extern bool exportTrainingData { get; set; }
 
+        [Obsolete("Training data export for baked lighting is deprecated.", false)]
         public extern string trainingDataDestination { get; set; }
 
         // Realtime lightmap resolution in texels per world unit. Also used for indirect resolution when using baked GI.
@@ -185,13 +187,25 @@ internal enum TiledBaking
         internal extern bool realtimeForceUpdates { get; set; }
 
         [Obsolete("Bake with the Progressive Lightmapper. The backend that uses Enlighten to bake is obsolete.", true)]
-        public extern bool finalGather { get; set; }
-
+        public bool finalGather
+        {
+            get { return false; }
+            set { finalGather = false; }
+        }
+        
         [Obsolete("Bake with the Progressive Lightmapper. The backend that uses Enlighten to bake is obsolete.", true)]
-        public extern float finalGatherRayCount { get; set; }
+        public float finalGatherRayCount
+        {
+            get { return 0; }
+            set { finalGatherRayCount = 0; }
+        }
 
         [Obsolete("Bake with the Progressive Lightmapper. The backend that uses Enlighten to bake is obsolete.", true)]
-        public extern bool finalGatherFiltering { get; set; }
+        public bool finalGatherFiltering
+        {
+            get { return false; }
+            set { finalGatherFiltering = false; }
+        }
 
         [NativeName("PVRSampling")]
         public extern Sampling sampling { get; set; }
@@ -225,10 +239,6 @@ internal enum TiledBaking
         [NativeName("TiledBaking")]
         internal extern TiledBaking tiledBaking { get; set; }
 
-        // Force Num rays to shoot per texel
-        [NativeName("NumRaysToShootPerTexel")]
-        internal extern int numRaysToShootPerTexel { get; set; }
-
         // Which path tracer filtering mode is used.
         [NativeName("PVRFilteringMode")]
         public extern FilterMode filteringMode { get; set; }
diff --git a/Runtime/Export/Geometry/RectInt.cs b/Runtime/Export/Geometry/RectInt.cs
index 5e956fc7af..c74ff4525b 100644
--- a/Runtime/Export/Geometry/RectInt.cs
+++ b/Runtime/Export/Geometry/RectInt.cs
@@ -123,6 +123,9 @@ public RectInt(Vector2Int position, Vector2Int size)
             m_Height = size.y;
         }
 
+        // Shorthand for writing new RectInt(0,0,0,0).
+        static public RectInt zero => new RectInt(0, 0, 0, 0);
+
         [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void ClampToBounds(RectInt bounds)
         {
@@ -174,6 +177,41 @@ 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));
         }
 
+        // Returns true if the rectangles are different.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        public static bool operator!=(RectInt lhs, RectInt rhs)
+        {
+            return !(lhs == rhs);
+        }
+
+        // Returns true if the rectangles are the same.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        public static bool operator==(RectInt lhs, RectInt rhs)
+        {
+            return lhs.x == rhs.x && lhs.y == rhs.y && lhs.width == rhs.width && lhs.height == rhs.height;
+        }   
+
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        public override int GetHashCode()
+        {
+            var xHash = x.GetHashCode();
+            var yHash = y.GetHashCode();
+            var wHash = width.GetHashCode();
+            var hHash = height.GetHashCode();
+            return xHash ^ 
+                (yHash << 4) ^ (yHash >> 28) ^ 
+                (wHash >> 4) ^ (wHash << 28) ^
+                (hHash >> 4) ^ (hHash << 28);
+        }      
+
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+        public override bool Equals(object other)
+        {
+            if (!(other is RectInt)) return false;
+
+            return Equals((RectInt)other);
+        }                 
+
         [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Equals(RectInt other)
         {
diff --git a/Runtime/Export/Gizmos/Gizmos.bindings.cs b/Runtime/Export/Gizmos/Gizmos.bindings.cs
index 9bbd407b51..b44603b197 100644
--- a/Runtime/Export/Gizmos/Gizmos.bindings.cs
+++ b/Runtime/Export/Gizmos/Gizmos.bindings.cs
@@ -19,26 +19,16 @@ public sealed partial class Gizmos
         public static extern void DrawLine(Vector3 from, Vector3 to);
 
         [NativeThrows]
-        internal static unsafe extern void DrawLineStrip([Span("count", isReadOnly: true)] Vector3* points, int count, bool looped);
-        public static unsafe void DrawLineStrip(ReadOnlySpan<Vector3> points, bool looped)
-        {
-            fixed (Vector3* ptr = points)
-            {
-                DrawLineStrip(ptr, points.Length, looped);
-            }
-        }
+        public static unsafe extern void DrawLineStrip(ReadOnlySpan<Vector3> points, bool looped);
 
-        [NativeThrows]
-        internal static unsafe extern void DrawLineList([Span("count", isReadOnly: true)] Vector3* points, int count);
+        [NativeMethod(Name = "DrawLineList", ThrowsException = true)]
+        internal static unsafe extern void DrawLineListInternal(ReadOnlySpan<Vector3> points);
         public static unsafe void DrawLineList(ReadOnlySpan<Vector3> points)
         {
             if ((points.Length & 1) != 0)
                 throw new UnityException("You cannot draw a line list from an odd number of points, with two points per line the number of points must be even");
 
-            fixed (Vector3* ptr = points)
-            {
-                DrawLineList(ptr, points.Length);
-            }
+            DrawLineListInternal(points);
         }
 
         [NativeThrows]
diff --git a/Runtime/Export/Graphics/AsyncGPUReadback.bindings.cs b/Runtime/Export/Graphics/AsyncGPUReadback.bindings.cs
index aaf303feed..f4a43c9ae2 100644
--- a/Runtime/Export/Graphics/AsyncGPUReadback.bindings.cs
+++ b/Runtime/Export/Graphics/AsyncGPUReadback.bindings.cs
@@ -48,6 +48,10 @@ public unsafe NativeArray<T> GetData<T>(int layer = 0) where T : struct
         public int width { get { return GetWidth(); } }
         public int height { get { return GetHeight(); } }
         public int depth { get { return GetDepth(); } }
+        public bool forcePlayerLoopUpdate {
+            get { return GetForcePlayerLoopUpdate(); }
+            set { SetForcePlayerLoopUpdate(value); }
+        }
 
         private extern bool IsDone();
         private extern bool HasError();
@@ -56,6 +60,8 @@ public unsafe NativeArray<T> GetData<T>(int layer = 0) where T : struct
         private extern int GetWidth();
         private extern int GetHeight();
         private extern int GetDepth();
+        private extern bool GetForcePlayerLoopUpdate();
+        private extern void SetForcePlayerLoopUpdate(bool b);
 
         internal extern void CreateSafetyHandle();
         private extern AtomicSafetyHandle GetSafetyHandle();
diff --git a/Runtime/Export/Graphics/Display.bindings.cs b/Runtime/Export/Graphics/Display.bindings.cs
index 8cf6563f2b..a08462555f 100644
--- a/Runtime/Export/Graphics/Display.bindings.cs
+++ b/Runtime/Export/Graphics/Display.bindings.cs
@@ -189,112 +189,34 @@ internal static void FireDisplaysUpdated()
         public delegate void DisplaysUpdatedDelegate();
         public static event DisplaysUpdatedDelegate onDisplaysUpdated = null;
 
+        [FreeFunction("UnityDisplayManager_DisplaySystemResolution")]
+        extern private static void GetSystemExtImpl(IntPtr nativeDisplay, out int w, out int h);
 
-        internal delegate void GetSystemExtDelegate(IntPtr nativeDisplay, out int w, out int h);
-        internal delegate void GetRenderingExtDelegate(IntPtr nativeDisplay, out int w, out int h);
-        internal delegate void GetRenderingBuffersDelegate(IntPtr nativeDisplay, out RenderBuffer color,
-            out RenderBuffer depth);
-        internal delegate void SetRenderingResolutionDelegate(IntPtr nativeDisplay, int w, int h);
-        internal delegate void ActivateDisplayDelegate(IntPtr nativeDisplay, int width, int height, RefreshRate refreshRate);
-        internal delegate void SetParamsDelegate(IntPtr nativeDisplay, int width, int height, int x, int y);
-        internal delegate int RelativeMouseAtDelegate(int x, int y, out int rx, out int ry);
-        internal delegate bool GetActiveDelegate(IntPtr nativeDisplay);
-        internal delegate bool RequiresBlitToBackbufferDelegate(IntPtr nativeDisplay);
-
-        internal delegate bool RequiresSrgbBlitToBackbufferDelegate(IntPtr nativeDisplay);
-        internal static event GetSystemExtDelegate onGetSystemExt = null;
-        internal static event GetRenderingExtDelegate onGetRenderingExt = null;
-        internal static event GetRenderingBuffersDelegate onGetRenderingBuffers = null;
-        internal static event SetRenderingResolutionDelegate onSetRenderingResolution = null;
-        internal static event ActivateDisplayDelegate onActivateDisplay = null;
-        internal static event SetParamsDelegate onSetParams = null;
-        internal static event RelativeMouseAtDelegate onRelativeMouseAt = null;
-        internal static event GetActiveDelegate onGetActive = null;
-        internal static event RequiresBlitToBackbufferDelegate onRequiresBlitToBackbuffer = null;
-        internal static event RequiresSrgbBlitToBackbufferDelegate onRequiresSrgbBlitToBackbuffer = null;
-
-
-        private static void GetSystemExtImpl(IntPtr nativeDisplay, out int w, out int h)
-        {
-            if (onGetSystemExt != null)
-            {
-                onGetSystemExt(nativeDisplay, out w, out h);
-            }
-            else
-            {
-                w = 0;
-                h = 0;
-            }
-        }
+        [FreeFunction("UnityDisplayManager_DisplayRenderingResolution")]
+        extern private static void GetRenderingExtImpl(IntPtr nativeDisplay, out int w, out int h);
 
-        private static void GetRenderingExtImpl(IntPtr nativeDisplay, out int w, out int h)
-        {
-            if (onGetRenderingExt != null)
-            {
-                onGetRenderingExt(nativeDisplay, out w, out h);
-            }
-            else
-            {
-                w = 0;
-                h = 0;
-            }
-        }
+        [FreeFunction("UnityDisplayManager_GetRenderingBuffersWrapper")]
+        extern private static void GetRenderingBuffersImpl(IntPtr nativeDisplay, out RenderBuffer color, out RenderBuffer depth);
 
-        private static void GetRenderingBuffersImpl(IntPtr nativeDisplay, out RenderBuffer color,
-            out RenderBuffer depth)
-        {
-            if (onGetRenderingBuffers != null)
-            {
-                onGetRenderingBuffers(nativeDisplay, out color, out depth);
-            }
-            else
-            {
-                color = new RenderBuffer();
-                depth = new RenderBuffer();
-            }
-        }
+        [FreeFunction("UnityDisplayManager_SetRenderingResolution")]
+        extern private static void SetRenderingResolutionImpl(IntPtr nativeDisplay, int w, int h);
 
-        private static void SetRenderingResolutionImpl(IntPtr nativeDisplay, int w, int h)
-        {
-            onSetRenderingResolution?.Invoke(nativeDisplay, w, h);
-        }
-
-        private static void ActivateDisplayImpl(IntPtr nativeDisplay, int width, int height, RefreshRate refreshRate)
-        {
-            onActivateDisplay?.Invoke(nativeDisplay, width, height, refreshRate);
-        }
-
-        private static void SetParamsImpl(IntPtr nativeDisplay, int width, int height, int x, int y)
-        {
-            onSetParams?.Invoke(nativeDisplay, width, height, x, y);
-        }
-
-        private static int RelativeMouseAtImpl(int x, int y, out int rx, out int ry)
-        {
-            if (onRelativeMouseAt != null)
-            {
-                return onRelativeMouseAt(x, y, out rx, out ry);
-            }
-            rx = 0;
-            ry = 0;
+        [FreeFunction("UnityDisplayManager_ActivateDisplay")]
+        extern private static void ActivateDisplayImpl(IntPtr nativeDisplay, int width, int height, RefreshRate refreshRate);
 
-            return 0;
-        }
+        [FreeFunction("UnityDisplayManager_SetDisplayParam")]
+        extern private static void SetParamsImpl(IntPtr nativeDisplay, int width, int height, int x, int y);
 
-        private static bool GetActiveImpl(IntPtr nativeDisplay)
-        {
-            return onGetActive != null && onGetActive(nativeDisplay);
-        }
+        [FreeFunction("UnityDisplayManager_RelativeMouseAt")]
+        extern private static int RelativeMouseAtImpl(int x, int y, out int rx, out int ry);
 
-        private static bool RequiresBlitToBackbufferImpl(IntPtr nativeDisplay)
-        {
-            return onRequiresBlitToBackbuffer != null && onRequiresBlitToBackbuffer(nativeDisplay);
-        }
+        [FreeFunction("UnityDisplayManager_DisplayActive")]
+        extern private static bool GetActiveImpl(IntPtr nativeDisplay);
 
-        private static bool RequiresSrgbBlitToBackbufferImpl(IntPtr nativeDisplay)
-        {
-            return onRequiresSrgbBlitToBackbuffer != null && onRequiresSrgbBlitToBackbuffer(nativeDisplay);
-        }
+        [FreeFunction("UnityDisplayManager_RequiresBlitToBackbuffer")]
+        extern private static bool RequiresBlitToBackbufferImpl(IntPtr nativeDisplay);
 
+        [FreeFunction("UnityDisplayManager_RequiresSRGBBlitToBackbuffer")]
+        extern private static bool RequiresSrgbBlitToBackbufferImpl(IntPtr nativeDisplay);
     }
 }
diff --git a/Runtime/Export/Graphics/Graphics.bindings.cs b/Runtime/Export/Graphics/Graphics.bindings.cs
index 21bbc558db..a5398a1413 100644
--- a/Runtime/Export/Graphics/Graphics.bindings.cs
+++ b/Runtime/Export/Graphics/Graphics.bindings.cs
@@ -788,6 +788,9 @@ public sealed partial class GL
         [NativeName("ImmediateVertex")] extern public static void Vertex3(float x, float y, float z);
         public static void Vertex(Vector3 v) { Vertex3(v.x, v.y, v.z); }
 
+        [NativeName("ImmediateVertices")]
+        extern internal static unsafe void Vertices(Vector3* v, Vector3* coords, Vector4* colors, int length);
+
         [NativeName("ImmediateTexCoordAll")] extern public static void TexCoord3(float x, float y, float z);
         public static void TexCoord(Vector3 v)          { TexCoord3(v.x, v.y, v.z); }
         public static void TexCoord2(float x, float y)  { TexCoord3(x, y, 0.0f); }
@@ -957,7 +960,7 @@ public sealed partial class LightmapSettings : Object
         private LightmapSettings() {}
 
         // Lightmap array.
-        public extern static LightmapData[] lightmaps {[FreeFunction] get; [FreeFunction(ThrowsException = true)] set; }
+        public extern static LightmapData[] lightmaps {[FreeFunction] get; [FreeFunction(ThrowsException = true)][param: Unmarshalled] set; }
 
         public extern static LightmapsMode lightmapsMode { get; [FreeFunction(ThrowsException = true)] set; }
 
@@ -1103,10 +1106,13 @@ public extern int cellCount
 
 namespace UnityEngine
 {
+    [Obsolete("D3DHDRDisplayBitDepth has been replaced by HDRDisplayBitDepth. (UnityUpgradable) -> HDRDisplayBitDepth", true)]
     public enum D3DHDRDisplayBitDepth
     {
-        D3DHDRDisplayBitDepth10,
-        D3DHDRDisplayBitDepth16
+        [Obsolete("D3DHDRDisplayBitDepth::D3DHDRDisplayBitDepth10 has been replaced by HDRDisplayBitDepth::BitDepth10 (UnityUpgradable) -> HDRDisplayBitDepth.BitDepth10", true)]
+        D3DHDRDisplayBitDepth10 = 0,
+        [Obsolete("D3DHDRDisplayBitDepth::D3DHDRDisplayBitDepth16 has been replaced by HDRDisplayBitDepth::BitDepth16 (UnityUpgradable) -> HDRDisplayBitDepth.BitDepth16", true)]
+        D3DHDRDisplayBitDepth16 = 1
     }
 
     [NativeHeader("Runtime/GfxDevice/HDROutputSettings.h")]
@@ -1118,7 +1124,9 @@ public class HDROutputSettings
         //Don't allow users to construct these themselves, instead they need to be accessed from an internally managed list
         //This lines up with how multiple displays are handled, and while HDR is currently primary display only this will help with
         //future proofing this implementation, see Display in Display.bindings.cs
+        [VisibleToOtherModules("UnityEngine.XRModule")]
         internal HDROutputSettings() { m_DisplayIndex = 0; }
+        [VisibleToOtherModules("UnityEngine.XRModule")]
         internal HDROutputSettings(int displayIndex) { this.m_DisplayIndex = displayIndex; }
 
         public static HDROutputSettings[] displays = new HDROutputSettings[1] { new HDROutputSettings() };
@@ -1210,6 +1218,18 @@ public static void SetPaperWhiteInNits(float paperWhite)
         [FreeFunction("HDROutputSettingsBindings::RequestHDRModeChange", HasExplicitThis = false, ThrowsException = true)]
         extern private static void RequestHDRModeChangeInternal(int displayIndex, bool enabled);
     }
+
+    public class ColorGamutUtility
+    {
+        [FreeFunction(IsThreadSafe = true)]
+        extern public static ColorPrimaries GetColorPrimaries(ColorGamut gamut);
+
+        [FreeFunction(IsThreadSafe = true)]
+        extern public static WhitePoint GetWhitePoint(ColorGamut gamut);
+
+        [FreeFunction(IsThreadSafe = true)]
+        extern public static TransferFunction GetTransferFunction(ColorGamut gamut);
+    }
 }
 
 namespace UnityEngine.Rendering
diff --git a/Runtime/Export/Graphics/Graphics.cs b/Runtime/Export/Graphics/Graphics.cs
index 5055730d96..37ad886f5c 100644
--- a/Runtime/Export/Graphics/Graphics.cs
+++ b/Runtime/Export/Graphics/Graphics.cs
@@ -486,6 +486,19 @@ public unsafe static void RenderMesh(in RenderParams rparams, Mesh mesh, int sub
                 Internal_RenderMesh(rparams, mesh, submeshIndex, objectToWorld, null);
         }
 
+        internal static Dictionary<int, RenderInstancedDataLayout> s_RenderInstancedDataLayouts = new Dictionary<int, RenderInstancedDataLayout>();
+        private static RenderInstancedDataLayout GetCachedRenderInstancedDataLayout(Type type)
+        {
+            int typeHashCode = type.GetHashCode();
+            RenderInstancedDataLayout layout;
+            if(!s_RenderInstancedDataLayouts.TryGetValue(typeHashCode, out layout))
+            {
+                layout = new RenderInstancedDataLayout(type);
+                s_RenderInstancedDataLayouts.Add(typeHashCode, layout);
+            }
+            return layout;
+        }
+
         public unsafe static void RenderMeshInstanced<T>(in RenderParams rparams, Mesh mesh, int submeshIndex, T[] instanceData, [uei.DefaultValue("-1")] int instanceCount = -1, [uei.DefaultValue("0")] int startInstance = 0) where T : unmanaged
         {
             if (!SystemInfo.supportsInstancing)
@@ -494,7 +507,7 @@ public unsafe static void RenderMeshInstanced<T>(in RenderParams rparams, Mesh m
                 throw new InvalidOperationException("Material needs to enable instancing for use with RenderMeshInstanced.");
             else if (instanceData == null)
                 throw new ArgumentNullException("instanceData");
-            RenderInstancedDataLayout layout = new RenderInstancedDataLayout(typeof(T));
+            RenderInstancedDataLayout layout = GetCachedRenderInstancedDataLayout(typeof(T));
             uint count = Math.Min((uint)instanceCount, (uint)Math.Max(0, instanceData.Length - startInstance));
             fixed(T *data = instanceData) {Internal_RenderMeshInstanced(rparams, mesh, submeshIndex, (IntPtr)(data + startInstance), layout, count);}
         }
@@ -507,7 +520,7 @@ public unsafe static void RenderMeshInstanced<T>(in RenderParams rparams, Mesh m
                 throw new InvalidOperationException("Material needs to enable instancing for use with RenderMeshInstanced.");
             else if (instanceData == null)
                 throw new ArgumentNullException("instanceData");
-            RenderInstancedDataLayout layout = new RenderInstancedDataLayout(typeof(T));
+            RenderInstancedDataLayout layout = GetCachedRenderInstancedDataLayout(typeof(T));
             uint count = Math.Min((uint)instanceCount, (uint)Math.Max(0, instanceData.Count - startInstance));
             fixed(T *data = NoAllocHelpers.ExtractArrayFromListT(instanceData)) {Internal_RenderMeshInstanced(rparams, mesh, submeshIndex, (IntPtr)(data + startInstance), layout, count);}
         }
@@ -520,7 +533,7 @@ public unsafe static void RenderMeshInstanced<T>(RenderParams rparams, Mesh mesh
                 throw new InvalidOperationException("Material needs to enable instancing for use with RenderMeshInstanced.");
             else if (instanceData == null)
                 throw new ArgumentNullException("instanceData");
-            RenderInstancedDataLayout layout = new RenderInstancedDataLayout(typeof(T));
+            RenderInstancedDataLayout layout = GetCachedRenderInstancedDataLayout(typeof(T));
             uint count = Math.Min((uint)instanceCount, (uint)Math.Max(0, instanceData.Length - startInstance));
             Internal_RenderMeshInstanced(rparams, mesh, submeshIndex, (IntPtr)((T*)instanceData.GetUnsafePtr() + startInstance), layout, count);
         }
diff --git a/Runtime/Export/Graphics/GraphicsEnums.cs b/Runtime/Export/Graphics/GraphicsEnums.cs
index 5d7935a90d..e310bb7f0a 100644
--- a/Runtime/Export/Graphics/GraphicsEnums.cs
+++ b/Runtime/Export/Graphics/GraphicsEnums.cs
@@ -279,7 +279,38 @@ public enum ColorGamut
         Rec2020 = 2,
         DisplayP3 = 3,
         HDR10 = 4,
-        DolbyHDR = 5
+        DolbyHDR = 5,
+        P3D65G22 = 6
+    }
+    
+    [UsedByNativeCode]
+    [NativeHeader("Runtime/Graphics/ColorGamut.h")]
+    public enum ColorPrimaries
+    {
+        Unknown = -1,
+        Rec709 = 0,
+        Rec2020 = 1,
+        P3 = 2,
+    }
+
+    [UsedByNativeCode]
+    [NativeHeader("Runtime/Graphics/ColorGamut.h")]
+    public enum WhitePoint
+    {
+        Unknown = -1,
+        D65 = 0
+    }
+    
+    [UsedByNativeCode]
+    [NativeHeader("Runtime/Graphics/ColorGamut.h")]
+    public enum TransferFunction
+    {
+        Unknown = -1,
+        sRGB = 0,
+        BT1886 = 1,
+        PQ = 2,
+        Linear = 3,
+        Gamma22 = 4
     }
 
     public enum ScreenOrientation
@@ -564,6 +595,12 @@ public enum HDRDisplaySupportFlags
         AutomaticTonemapping = 1 << 2
     }
 
+    public enum HDRDisplayBitDepth 
+    {
+        BitDepth10 = 0,
+        BitDepth16 = 1
+    }
+
     namespace Rendering
     {
         public enum BlendShapeBufferLayout
@@ -1348,6 +1385,7 @@ public enum GraphicsDeviceType
         Null = 4,
         [System.Obsolete("Xbox360 is no longer supported in Unity 5.5+")]
         Xbox360 = 6,
+        [System.Obsolete("OpenGL ES 2.0 is no longer supported in Unity 2023.1")]
         OpenGLES2 = 8,
         OpenGLES3 = 11,
         [System.Obsolete("PVita is no longer supported as of Unity 2018")]
@@ -1873,7 +1911,7 @@ public enum BuiltinShaderDefine
         UNITY_PBS_USE_BRDF1,
         UNITY_PBS_USE_BRDF2,
         UNITY_PBS_USE_BRDF3,
-        UNITY_NO_FULL_STANDARD_SHADER,
+        [Obsolete("UNITY_NO_FULL_STANDARD_SHADER is never defined since OpenGL ES 2.0 was removed.")] UNITY_NO_FULL_STANDARD_SHADER,
         UNITY_SPECCUBE_BOX_PROJECTION,
         UNITY_SPECCUBE_BLENDING,
         UNITY_ENABLE_DETAIL_NORMALMAP,
@@ -1884,7 +1922,7 @@ public enum BuiltinShaderDefine
         UNITY_HARDWARE_TIER3,
         UNITY_COLORSPACE_GAMMA,
         UNITY_LIGHT_PROBE_PROXY_VOLUME,
-        UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS,
+        [Obsolete("UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS is never defined since OpenGL ES 2.0 was removed.")] UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS,
         UNITY_LIGHTMAP_DLDR_ENCODING,
         UNITY_LIGHTMAP_RGBM_ENCODING,
         UNITY_LIGHTMAP_FULL_HDR,
@@ -2022,6 +2060,7 @@ public enum RenderingThreadingMode
         LegacyJobified = 3,
         NativeGraphicsJobs = 4,
         NativeGraphicsJobsWithoutRenderThread = 5,
+        NativeGraphicsJobsSplitThreading = 6,
     }
     public enum CameraLateLatchMatrixType
     {
@@ -2034,6 +2073,7 @@ public enum CameraLateLatchMatrixType
     public enum OpenGLESVersion
     {
         None,
+        [System.Obsolete("OpenGL ES 2.0 is no longer supported in Unity 2023.1")]
         OpenGLES20,
         OpenGLES30,
         OpenGLES31,
diff --git a/Runtime/Export/Graphics/GraphicsManagers.bindings.cs b/Runtime/Export/Graphics/GraphicsManagers.bindings.cs
index 8ee7170b4b..a176b7b563 100644
--- a/Runtime/Export/Graphics/GraphicsManagers.bindings.cs
+++ b/Runtime/Export/Graphics/GraphicsManagers.bindings.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections;
 using UnityEngine.Bindings;
 using uei = UnityEngine.Internal;
 using UnityEngine.Rendering;
@@ -11,6 +12,7 @@
 using ReflectionMode = UnityEngine.Rendering.DefaultReflectionMode;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEngine.Assertions;
 
 namespace UnityEngine
 {
@@ -116,6 +118,46 @@ public static class TextureMipmapLimitGroups
     [StaticAccessor("GetQualitySettings()", StaticAccessorType.Dot)]
     public sealed partial class QualitySettings : Object
     {
+        public static void ForEach(Action callback)
+        {
+            if (callback == null)
+                return;
+
+            int currentQuality = QualitySettings.GetQualityLevel();
+            try
+            {
+                for (int i = 0; i < QualitySettings.count; ++i)
+                {
+                    QualitySettings.SetQualityLevel(i, applyExpensiveChanges: false);
+                    callback();
+                }
+            }
+            finally
+            {
+                QualitySettings.SetQualityLevel(currentQuality, applyExpensiveChanges: false);
+            }
+        }
+
+        public static void ForEach(Action<int, string> callback)
+        {
+            if (callback == null)
+                return;
+
+            int currentQuality = QualitySettings.GetQualityLevel();
+            try
+            {
+                for (int i = 0; i < QualitySettings.count; ++i)
+                {
+                    QualitySettings.SetQualityLevel(i, applyExpensiveChanges: false);
+                    callback(i, names[i]);
+                }
+            }
+            finally
+            {
+                QualitySettings.SetQualityLevel(currentQuality, applyExpensiveChanges: false);
+            }
+        }
+
         private QualitySettings() {}
 
         extern public static int pixelLightCount { get; set; }
@@ -142,6 +184,7 @@ private QualitySettings() {}
         extern public static bool  softParticles         { get; set; }
         extern public static bool  softVegetation        { get; set; }
         extern public static int   vSyncCount            { get; set; }
+        extern public static int   realtimeGICPUUsage    { get; set; }
         extern public static int   antiAliasing          { get; set; }
         extern public static int   asyncUploadTimeSlice  { get; set; }
         extern public static int   asyncUploadBufferSize { get; set; }
@@ -275,6 +318,9 @@ public static void GetAllRenderPipelineAssetsForPlatform(string buildTargetGroup
                 else
                     renderPipelineAssets.Add(GraphicsSettings.defaultRenderPipeline);
             }
+
+            if (renderPipelineAssets.Count == 0 && GraphicsSettings.defaultRenderPipeline != null)
+                renderPipelineAssets.Add(GraphicsSettings.defaultRenderPipeline);
         }
 
         static HashSet<Type> s_RenderPipelineAssetsTypes = new();
diff --git a/Runtime/Export/Graphics/GraphicsRenderers.bindings.cs b/Runtime/Export/Graphics/GraphicsRenderers.bindings.cs
index 4c2841958f..61fe698acf 100644
--- a/Runtime/Export/Graphics/GraphicsRenderers.bindings.cs
+++ b/Runtime/Export/Graphics/GraphicsRenderers.bindings.cs
@@ -54,7 +54,9 @@ extern public Bounds localBounds
         [FreeFunction(Name = "RendererScripting::GetMaterialArray", HasExplicitThis = true)] extern private Material[] GetMaterialArray();
         [FreeFunction(Name = "RendererScripting::GetMaterialArray", HasExplicitThis = true)] extern private void CopyMaterialArray([Out] Material[] m);
         [FreeFunction(Name = "RendererScripting::GetSharedMaterialArray", HasExplicitThis = true)] extern private void CopySharedMaterialArray([Out] Material[] m);
-        [FreeFunction(Name = "RendererScripting::SetMaterialArray", HasExplicitThis = true)] extern private void SetMaterialArray([NotNull] Material[] m);
+        [FreeFunction(Name = "RendererScripting::SetMaterialArray", HasExplicitThis = true)] extern private void SetMaterialArray([NotNull] Material[] m, int length);
+
+        private void SetMaterialArray(Material[] m) { SetMaterialArray(m, m != null ? m.Length : 0); }
 
         [FreeFunction(Name = "RendererScripting::SetPropertyBlock", HasExplicitThis = true)] extern internal void Internal_SetPropertyBlock(MaterialPropertyBlock properties);
         [FreeFunction(Name = "RendererScripting::GetPropertyBlock", HasExplicitThis = true)] extern internal void Internal_GetPropertyBlock([NotNull] MaterialPropertyBlock dest);
@@ -99,6 +101,8 @@ public partial class Renderer : Component
         extern internal int    sortingGroupID    { get; set; }
         extern internal int    sortingGroupOrder { get; set; }
 
+        internal extern byte stagePriority { get; set; }
+
         [NativeProperty("IsDynamicOccludee")] extern public bool allowOcclusionWhenDynamic { get; set; }
 
 
@@ -178,7 +182,7 @@ 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));
+            SetMaterialArray(NoAllocHelpers.ExtractArrayFromListT(materials), materials.Count);
         }
 
         public void SetMaterials(List<Material> materials)
@@ -186,7 +190,7 @@ 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));
+            SetMaterialArray(NoAllocHelpers.ExtractArrayFromListT(materials), materials.Count);
         }
 
         public void GetSharedMaterials(List<Material> m)
@@ -257,6 +261,9 @@ public sealed partial class TrailRenderer : Renderer
         [FreeFunction(Name = "TrailRendererScripting::GetPositions", HasExplicitThis = true)]
         extern public int GetPositions([NotNull][Out] Vector3[] positions);
 
+        [FreeFunction(Name = "TrailRendererScripting::GetVisiblePositions", HasExplicitThis = true)]
+        extern public int GetVisiblePositions([NotNull][Out] Vector3[] positions);
+
         [FreeFunction(Name = "TrailRendererScripting::SetPositions", HasExplicitThis = true)]
         extern public void SetPositions([NotNull] Vector3[] positions);
 
@@ -272,6 +279,9 @@ public sealed partial class TrailRenderer : Renderer
         public int GetPositions([Out] NativeArray<Vector3> positions) { unsafe { return GetPositionsWithNativeContainer((IntPtr)positions.GetUnsafePtr(), positions.Length); } }
         public int GetPositions([Out] NativeSlice<Vector3> positions) { unsafe { return GetPositionsWithNativeContainer((IntPtr)positions.GetUnsafePtr(), positions.Length); } }
 
+        public int GetVisiblePositions([Out] NativeArray<Vector3> positions) { unsafe { return GetVisiblePositionsWithNativeContainer((IntPtr)positions.GetUnsafePtr(), positions.Length); } }
+        public int GetVisiblePositions([Out] NativeSlice<Vector3> positions) { unsafe { return GetVisiblePositionsWithNativeContainer((IntPtr)positions.GetUnsafePtr(), positions.Length); } }
+
         public void AddPositions([Out] NativeArray<Vector3> positions) { unsafe { AddPositionsWithNativeContainer((IntPtr)positions.GetUnsafePtr(), positions.Length); } }
         public void AddPositions([Out] NativeSlice<Vector3> positions) { unsafe { AddPositionsWithNativeContainer((IntPtr)positions.GetUnsafePtr(), positions.Length); } }
 
@@ -281,6 +291,9 @@ public sealed partial class TrailRenderer : Renderer
         [FreeFunction(Name = "TrailRendererScripting::GetPositionsWithNativeContainer", HasExplicitThis = true)]
         extern private int GetPositionsWithNativeContainer(IntPtr positions, int length);
 
+        [FreeFunction(Name = "TrailRendererScripting::GetVisiblePositionsWithNativeContainer", HasExplicitThis = true)]
+        extern private int GetVisiblePositionsWithNativeContainer(IntPtr positions, int length);
+
         [FreeFunction(Name = "TrailRendererScripting::AddPositionsWithNativeContainer", HasExplicitThis = true)]
         extern private void AddPositionsWithNativeContainer(IntPtr positions, int length);
     }
diff --git a/Runtime/Export/Graphics/GraphicsSettings.RenderPipelineGlobalSettings.bindings.cs b/Runtime/Export/Graphics/GraphicsSettings.RenderPipelineGlobalSettings.bindings.cs
new file mode 100644
index 0000000000..bf4550f003
--- /dev/null
+++ b/Runtime/Export/Graphics/GraphicsSettings.RenderPipelineGlobalSettings.bindings.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.Linq;
+using System.Runtime.InteropServices;
+
+using UnityEngine;
+using UnityEngine.Scripting;
+using UnityEngine.Bindings;
+
+namespace UnityEngine.Rendering
+{
+    public sealed partial class GraphicsSettings
+    {
+        [NativeName("RegisterRenderPipelineSettings")] static extern void Internal_RegisterRenderPipeline(string renderpipelineName, Object settings);
+        [NativeName("UnregisterRenderPipelineSettings")] static extern void Internal_UnregisterRenderPipeline(string renderpipelineName);
+        [NativeName("GetSettingsForRenderPipeline")] static extern Object Internal_GetSettingsForRenderPipeline(string renderpipelineName);
+
+        public static void RegisterRenderPipelineSettings<T>(RenderPipelineGlobalSettings settings)
+            where T : RenderPipeline
+        {
+            Internal_RegisterRenderPipeline(typeof(T).FullName, settings);
+        }
+
+        public static void UnregisterRenderPipelineSettings<T>()
+            where T : RenderPipeline
+        {
+            Internal_UnregisterRenderPipeline(typeof(T).FullName);
+        }
+
+        public static RenderPipelineGlobalSettings GetSettingsForRenderPipeline<T>()
+            where T : RenderPipeline
+        {
+            return  Internal_GetSettingsForRenderPipeline(typeof(T).FullName) as RenderPipelineGlobalSettings;
+        }
+
+        public static bool TryGetCurrentRenderPipelineGlobalSettings(out RenderPipelineGlobalSettings currentRenderPipelineGlobalSettings)
+        {
+            currentRenderPipelineGlobalSettings = null;
+            if (currentRenderPipeline == null)
+                return false;
+
+            currentRenderPipelineGlobalSettings = Internal_GetSettingsForRenderPipeline(
+                    currentRenderPipeline.renderPipelineType?.FullName ?? string.Empty) as RenderPipelineGlobalSettings;
+
+            return currentRenderPipelineGlobalSettings != null;
+        }
+    }
+}
diff --git a/Runtime/Export/Graphics/GraphicsSettings.bindings.cs b/Runtime/Export/Graphics/GraphicsSettings.bindings.cs
index f37847b46c..5becb218ec 100644
--- a/Runtime/Export/Graphics/GraphicsSettings.bindings.cs
+++ b/Runtime/Export/Graphics/GraphicsSettings.bindings.cs
@@ -84,30 +84,7 @@ public static RenderPipelineAsset[] allConfiguredRenderPipelines
         [NativeName("SetCustomShaderScript")] extern static public void     SetCustomShader(BuiltinShaderType type, Shader shader);
         [NativeName("GetCustomShaderScript")] extern static public Shader   GetCustomShader(BuiltinShaderType type);
 
-
-        #region Default Settings for Render Pipelines
-        static public void RegisterRenderPipelineSettings<T>(RenderPipelineGlobalSettings settings) where T : RenderPipeline
-        {
-            RegisterRenderPipeline(typeof(T).FullName, settings);
-        }
-
-        [NativeName("RegisterRenderPipelineSettings")] extern static void RegisterRenderPipeline(string renderpipelineName, Object settings);
-
-        static public void UnregisterRenderPipelineSettings<T>() where T : RenderPipeline
-        {
-            UnregisterRenderPipeline(typeof(T).FullName);
-        }
-
-        [NativeName("UnregisterRenderPipelineSettings")] extern static void UnregisterRenderPipeline(string renderpipelineName);
-
-        static public RenderPipelineGlobalSettings GetSettingsForRenderPipeline<T>() where T : RenderPipeline
-        {
-            RenderPipelineGlobalSettings settings = GetSettingsForRenderPipeline(typeof(T).FullName) as RenderPipelineGlobalSettings;
-            return settings;
-        }
-
-        [NativeName("GetSettingsForRenderPipeline")] extern static Object GetSettingsForRenderPipeline(string renderpipelineName);
-
-        #endregion
+        extern public static bool cameraRelativeLightCulling { get; set; }
+        extern public static bool cameraRelativeShadowCulling { get; set; }
     }
 }
diff --git a/Runtime/Export/Graphics/GraphicsTexture.bindings.cs b/Runtime/Export/Graphics/GraphicsTexture.bindings.cs
new file mode 100644
index 0000000000..2dad16bff0
--- /dev/null
+++ b/Runtime/Export/Graphics/GraphicsTexture.bindings.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;
+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;
+
+namespace UnityEngine.Rendering
+{
+    [NativeHeader("Runtime/Export/Graphics/GraphicsTexture.bindings.h")]
+    [StructLayout(LayoutKind.Sequential)]
+    [UsedByNativeCode]
+    [Serializable]
+    public struct GraphicsTextureDescriptor
+    {
+        public int width;
+        public int height;
+        public int depth;
+        public int arrayLength;
+        public GraphicsFormat format;
+        public int mipCount;
+        public TextureDimension dimension;
+    };
+
+    [NativeType("Runtime/Export/Graphics/GraphicsTexture.bindings.h")]
+    [UsedByNativeCode]
+    public enum GraphicsTextureState
+    {
+        Constructed = 0,
+        Initializing = 1,
+        InitializedOnRenderThread = 2,
+        DestroyQueued = 3,
+        Destroyed = 4
+    };
+
+    [NativeHeader("Runtime/Export/Graphics/GraphicsTexture.bindings.h")]
+    [NativeType("Runtime/Graphics/Texture/GraphicsTexture.h")]
+    [UsedByNativeCode]
+    public partial class GraphicsTexture : IDisposable
+    {
+#pragma warning disable 414
+        internal IntPtr m_Ptr;
+#pragma warning restore 414
+
+        // --------------------------------------------------------------------
+        // IDisposable implementation
+
+        ~GraphicsTexture()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            // we don't have any managed references, so 'disposing' part of
+            // standard IDisposable pattern does not apply
+            // Release native resources
+            ReleaseBuffer();
+            m_Ptr = IntPtr.Zero;
+        }
+
+        // --------------------------------------------------------------------
+        // Actual API
+
+        public GraphicsTexture(GraphicsTextureDescriptor desc)
+        {
+            m_Ptr = InitBuffer(desc);
+        }
+
+        extern public GraphicsTextureDescriptor descriptor
+        {
+            [FreeFunction("GraphicsTexture_Bindings::GetDescriptor", HasExplicitThis = true, IsThreadSafe = true, ThrowsException = true)]
+            get;
+        }
+
+        extern public GraphicsTextureState state
+        {
+            [FreeFunction("GraphicsTexture_Bindings::GetState", HasExplicitThis = true, IsThreadSafe = true)]
+            get;
+        }
+
+        // --------------------------------------------------------------------
+        // Bindings
+
+        [FreeFunction("GraphicsTexture_Bindings::InitBuffer")]
+        extern private static IntPtr InitBuffer(GraphicsTextureDescriptor desc);
+
+        [FreeFunction("GraphicsTexture_Bindings::ReleaseBuffer", HasExplicitThis = true, IsThreadSafe = true)]
+        extern private void ReleaseBuffer();
+    }
+}
diff --git a/Runtime/Export/Graphics/HDROutputFaking.bindings.cs b/Runtime/Export/Graphics/HDROutputFaking.bindings.cs
new file mode 100644
index 0000000000..d843defe46
--- /dev/null
+++ b/Runtime/Export/Graphics/HDROutputFaking.bindings.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;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Diagnostics;
+using UnityEngine.Internal;
+using UnityEngine.Bindings;
+using UnityEngine.Scripting;
+
+[assembly: InternalsVisibleTo("TestRuntime")]
+[assembly: InternalsVisibleTo("TestRuntime.FakingHDR")]
+namespace UnityEngine.Internal
+{
+    [NativeHeader("Runtime/GfxDevice/HDROutputSettings.h")]
+    [ExcludeFromDocs]
+    internal static class InternalHDROutputFaking
+    {
+        [FreeFunction("HDROutputSettingsBindings::SetFakeHDROutputEnabled")]
+        [ExcludeFromDocs]
+        extern internal static void SetEnabled(bool enabled);
+    }
+}
diff --git a/Runtime/Export/Graphics/LOD.bindings.cs b/Runtime/Export/Graphics/LOD.bindings.cs
index b9fe358be1..0752d3f6c7 100644
--- a/Runtime/Export/Graphics/LOD.bindings.cs
+++ b/Runtime/Export/Graphics/LOD.bindings.cs
@@ -78,7 +78,7 @@ public extern bool lastLODBillboard
 
         // Set the LODs for the LOD group. This will remove any existing LODs configured on the LODGroup
         [FreeFunction("SetLODs_Binding", HasExplicitThis = true)]
-        extern public void SetLODs(LOD[] lods);
+        extern public void SetLODs([Unmarshalled] LOD[] lods);
 
         // Force a LOD level on this LOD group
         //
diff --git a/Runtime/Export/Graphics/Light.bindings.cs b/Runtime/Export/Graphics/Light.bindings.cs
index 3ec9ebd7d0..573774f7ee 100644
--- a/Runtime/Export/Graphics/Light.bindings.cs
+++ b/Runtime/Export/Graphics/Light.bindings.cs
@@ -133,6 +133,7 @@ public static int pixelLightCount
         }
 
         //*undocumented For terrain engine only
+        [Obsolete("Light.GetLights has been deprecated, use FindObjectsOfType in combination with light.cullingmask/light.type", false)]
         [FreeFunction("Light_Bindings::GetLights")]
         extern public static Light[] GetLights(LightType type, int layer);
 
diff --git a/Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.cs b/Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.cs
index a80608d70e..0bba513ea7 100644
--- a/Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.cs
+++ b/Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.cs
@@ -18,7 +18,7 @@
 namespace UnityEngine.Rendering
 {
     [UsedByNativeCode]
-    [NativeHeader("Runtime/Shaders/RayTracingAccelerationStructure.h")]
+    [NativeHeader("Runtime/Shaders/RayTracing/RayTracingAccelerationStructure.h")]
     [NativeHeader("Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.h")]
 
     [MovedFrom("UnityEngine.Experimental.Rendering")]
diff --git a/Runtime/Export/Graphics/RenderingCommandBuffer.bindings.cs b/Runtime/Export/Graphics/RenderingCommandBuffer.bindings.cs
index d7bc4d5628..d389f49290 100644
--- a/Runtime/Export/Graphics/RenderingCommandBuffer.bindings.cs
+++ b/Runtime/Export/Graphics/RenderingCommandBuffer.bindings.cs
@@ -19,7 +19,7 @@
 namespace UnityEngine.Rendering
 {
     [NativeHeader("Runtime/Shaders/ComputeShader.h")]
-    [NativeHeader("Runtime/Shaders/RayTracingShader.h")]
+    [NativeHeader("Runtime/Shaders/RayTracing/RayTracingShader.h")]
     [NativeHeader("Runtime/Export/Graphics/RenderingCommandBuffer.bindings.h")]
     [NativeType("Runtime/Graphics/CommandBuffer/RenderingCommandBuffer.h")]
     [UsedByNativeCode]
@@ -532,6 +532,9 @@ public void RequestAsyncReadbackIntoNativeSlice<T>(ref NativeSlice<T> output, Te
         [FreeFunction("RenderingCommandBuffer_Bindings::Internal_DrawMesh", HasExplicitThis = true)]
         extern private void Internal_DrawMesh([NotNull] Mesh mesh, Matrix4x4 matrix, Material material, int submeshIndex, int shaderPass, MaterialPropertyBlock properties);
 
+        [NativeMethod("AddDrawMultipleMeshes")]
+        extern private void Internal_DrawMultipleMeshes(Matrix4x4[] matrices, Mesh[] meshes, int[] subsetIndices, int count, Material material, int shaderPass, MaterialPropertyBlock properties);
+
         [NativeMethod("AddDrawRenderer")]
         extern private void Internal_DrawRenderer([NotNull] Renderer renderer, Material material, int submeshIndex, int shaderPass);
 
@@ -954,6 +957,9 @@ public void ClearRenderTarget(RTClearFlags clearFlags, Color[] backgroundColors,
         [FreeFunction("RenderingCommandBuffer_Bindings::SetFoveatedRenderingMode", HasExplicitThis = true)]
         extern public void SetFoveatedRenderingMode(FoveatedRenderingMode foveatedRenderingMode);
 
+        [FreeFunction("RenderingCommandBuffer_Bindings::SetWireframe", HasExplicitThis = true)]
+        extern public void SetWireframe(bool enable);
+
         [FreeFunction("RenderingCommandBuffer_Bindings::ConfigureFoveatedRendering", HasExplicitThis = true)]
         extern public void ConfigureFoveatedRendering(IntPtr platformData);
 
diff --git a/Runtime/Export/Graphics/RenderingCommandBuffer.cs b/Runtime/Export/Graphics/RenderingCommandBuffer.cs
index 48b12af1cb..5963a83629 100644
--- a/Runtime/Export/Graphics/RenderingCommandBuffer.cs
+++ b/Runtime/Export/Graphics/RenderingCommandBuffer.cs
@@ -323,7 +323,7 @@ public void SetRayTracingBufferParam(RayTracingShader rayTracingShader, string n
         public void SetRayTracingBufferParam(RayTracingShader rayTracingShader, int nameID, GraphicsBufferHandle bufferHandle)
         {
             Internal_SetRayTracingGraphicsBufferHandleParam(rayTracingShader, nameID, bufferHandle);
-        }     
+        }
 
         public void SetRayTracingConstantBufferParam(RayTracingShader rayTracingShader, int nameID, ComputeBuffer buffer, int offset, int size)
         {
@@ -514,6 +514,17 @@ public void DrawMesh(Mesh mesh, Matrix4x4 matrix, Material material)
             DrawMesh(mesh, matrix, material, 0);
         }
 
+        [ExcludeFromDocs]
+        public void DrawMultipleMeshes(Matrix4x4[] matrices, Mesh[] meshes, int[] subsetIndices, int count, Material material, int shaderPass, [DefaultValue("null")] MaterialPropertyBlock properties)
+        {
+            if (matrices.Length != meshes.Length || matrices.Length != subsetIndices.Length)
+                throw new InvalidOperationException("matrices, meshes, subsetIndices must be of same length and must be valid");
+            if (count < 1)
+                throw new InvalidOperationException("count must be atleast 1");
+
+            Internal_DrawMultipleMeshes(matrices, meshes, subsetIndices, count, material, shaderPass, properties);
+        }
+
         public void DrawRenderer(Renderer renderer, Material material, [DefaultValue("0")] int submeshIndex, [DefaultValue("-1")] int shaderPass)
         {
             if (renderer == null)
diff --git a/Runtime/Export/Graphics/SupportedOnRenderPipeline.cs b/Runtime/Export/Graphics/SupportedOnRenderPipeline.cs
index 4f714c5572..fc36639a7f 100644
--- a/Runtime/Export/Graphics/SupportedOnRenderPipeline.cs
+++ b/Runtime/Export/Graphics/SupportedOnRenderPipeline.cs
@@ -22,6 +22,9 @@ public enum SupportedMode
         static readonly Lazy<Type[]> k_DefaultRenderPipelineAsset = new(() => new[] { typeof(RenderPipelineAsset) });
         public Type[] renderPipelineTypes { get; }
 
+        public SupportedOnRenderPipelineAttribute(Type renderPipeline)
+            : this(new[] { renderPipeline }) {}
+
         public SupportedOnRenderPipelineAttribute(params Type[] renderPipeline)
         {
             if (renderPipeline == null)
diff --git a/Runtime/Export/Graphics/Texture.bindings.cs b/Runtime/Export/Graphics/Texture.bindings.cs
index d2de777b90..27edbe801c 100644
--- a/Runtime/Export/Graphics/Texture.bindings.cs
+++ b/Runtime/Export/Graphics/Texture.bindings.cs
@@ -8,6 +8,7 @@
 using UnityEngine.Scripting;
 using UnityEngine.Bindings;
 using uei = UnityEngine.Internal;
+using UnityEngine.Rendering;
 using UnityEngine.Experimental.Rendering;
 using Unity.Collections.LowLevel.Unsafe;
 
@@ -46,6 +47,8 @@ public virtual GraphicsFormat graphicsFormat
         virtual public int height { get { return GetDataHeight(); } set { throw new NotImplementedException(); } }
         virtual public TextureDimension dimension { get { return GetDimension(); } set { throw new NotImplementedException(); } }
 
+        extern internal bool isNativeTexture { [NativeName("IsNativeTexture")] get; }
+
         extern virtual public bool isReadable { get; }
 
         // Note: getter for "wrapMode" returns the U mode on purpose
@@ -175,8 +178,14 @@ extern public static bool allowThreadedTextureCreation
             set;
         }
 
-        extern internal int GetPixelDataSize(int mipLevel, int element = 0);
-        extern internal int GetPixelDataOffset(int mipLevel, int element = 0);
+        extern internal ulong GetPixelDataSize(int mipLevel, int element = 0);
+        extern internal ulong GetPixelDataOffset(int mipLevel, int element = 0);
+
+        extern public Rendering.GraphicsTexture graphicsTexture
+        {
+            [FreeFunction(Name = "Texture2DScripting::GetCurrentGraphicsTexture", HasExplicitThis = true)]
+            get;
+        }
     }
 
     [NativeHeader("Runtime/Graphics/Texture2D.h")]
@@ -197,6 +206,11 @@ extern public string mipmapLimitGroup
             [NativeName("GetMipmapLimitGroupName")] get;
         }
 
+        extern public int activeMipmapLimit
+        {
+            [NativeName("GetMipmapLimit")] get;
+        }
+
         [StaticAccessor("builtintex", StaticAccessorType.DoubleColon)] extern public static Texture2D whiteTexture { get; }
         [StaticAccessor("builtintex", StaticAccessorType.DoubleColon)] extern public static Texture2D blackTexture { get; }
         [StaticAccessor("builtintex", StaticAccessorType.DoubleColon)] extern public static Texture2D redTexture { get; }
@@ -206,11 +220,13 @@ extern public string mipmapLimitGroup
 
         extern public void Compress(bool highQuality);
 
+        [FreeFunction("Texture2DScripting::CreateEmpty")]
+        extern private static bool Internal_CreateEmptyImpl([Writable] Texture2D mono);
         [FreeFunction("Texture2DScripting::Create")]
-        extern private static bool Internal_CreateImpl([Writable] Texture2D mono, int w, int h, int mipCount, GraphicsFormat format, TextureCreationFlags flags, IntPtr nativeTex, string mipmapLimitGroupName);
-        private static void Internal_Create([Writable] Texture2D mono, int w, int h, int mipCount, GraphicsFormat format, TextureCreationFlags flags, IntPtr nativeTex, string mipmapLimitGroupName)
+        extern private static bool Internal_CreateImpl([Writable] Texture2D mono, int w, int h, int mipCount, GraphicsFormat format, TextureColorSpace colorSpace, TextureCreationFlags flags, IntPtr nativeTex, string mipmapLimitGroupName);
+        private static void Internal_Create([Writable] Texture2D mono, int w, int h, int mipCount, GraphicsFormat format, TextureColorSpace colorSpace, TextureCreationFlags flags, IntPtr nativeTex, string mipmapLimitGroupName)
         {
-            if (!Internal_CreateImpl(mono, w, h, mipCount, format, flags, nativeTex, mipmapLimitGroupName))
+            if (!Internal_CreateImpl(mono, w, h, mipCount, format, colorSpace, flags, nativeTex, mipmapLimitGroupName))
                 throw new UnityException("Failed to create texture because of invalid parameters.");
         }
 
@@ -236,7 +252,7 @@ private static void Internal_Create([Writable] Texture2D mono, int w, int h, int
         extern private void SetPixelsImpl(int x, int y, int w, int h, Color[] pixel, int miplevel, int frame);
 
         [FreeFunction(Name = "Texture2DScripting::LoadRawData", HasExplicitThis = true)]
-        extern private bool LoadRawTextureDataImpl(IntPtr data, int size);
+        extern private bool LoadRawTextureDataImpl(IntPtr data, ulong size);
 
         [FreeFunction(Name = "Texture2DScripting::LoadRawData", HasExplicitThis = true)]
         extern private bool LoadRawTextureDataImplArray(byte[] data);
@@ -248,7 +264,7 @@ private static void Internal_Create([Writable] Texture2D mono, int w, int h, int
         extern private bool SetPixelDataImpl(IntPtr data, int mipLevel, int elementSize, int dataArraySize, int sourceDataStartIndex = 0);
 
         extern private IntPtr GetWritableImageData(int frame);
-        extern private long GetRawImageDataSize();
+        extern private ulong GetRawImageDataSize();
 
         extern private static AtomicSafetyHandle GetSafetyHandle(Texture2D tex);
         extern private AtomicSafetyHandle GetSafetyHandleForSlice(int mipLevel);
@@ -329,7 +345,7 @@ extern public int loadedMipmapLevel
         [FreeFunction("Texture2DScripting::SetBlockOfPixels32", HasExplicitThis = true, ThrowsException = true)]
         extern private void SetBlockOfPixels32(int x, int y, int blockWidth, int blockHeight, Color32[] colors, int miplevel);
 
-        [FreeFunction("Texture2DScripting::GetRawTextureData", HasExplicitThis = true)]
+        [FreeFunction("Texture2DScripting::GetRawTextureData", HasExplicitThis = true, ThrowsException = true)]
         extern public byte[] GetRawTextureData();
 
         [FreeFunction("Texture2DScripting::GetPixels", HasExplicitThis = true, ThrowsException = true)]
@@ -376,10 +392,10 @@ public sealed partial class Cubemap : Texture
         extern public TextureFormat format { [NativeName("GetTextureFormat")] get; }
 
         [FreeFunction("CubemapScripting::Create")]
-        extern private static bool Internal_CreateImpl([Writable] Cubemap mono, int ext, int mipCount, GraphicsFormat format, TextureCreationFlags flags, IntPtr nativeTex);
-        private static void Internal_Create([Writable] Cubemap mono, int ext, int mipCount, GraphicsFormat format, TextureCreationFlags flags, IntPtr nativeTex)
+        extern private static bool Internal_CreateImpl([Writable] Cubemap mono, int ext, int mipCount, GraphicsFormat format, TextureColorSpace colorSpace, TextureCreationFlags flags, IntPtr nativeTex);
+        private static void Internal_Create([Writable] Cubemap mono, int ext, int mipCount, GraphicsFormat format, TextureColorSpace colorSpace, TextureCreationFlags flags, IntPtr nativeTex)
         {
-            if (!Internal_CreateImpl(mono, ext, mipCount, format, flags, nativeTex))
+            if (!Internal_CreateImpl(mono, ext, mipCount, format, colorSpace, flags, nativeTex))
                 throw new UnityException("Failed to create texture because of invalid parameters.");
         }
 
@@ -481,10 +497,10 @@ public sealed partial class Texture3D : Texture
         [NativeName("GetPixelBilinear")] extern private Color GetPixelBilinearImpl(int mip, float u, float v, float w);
 
         [FreeFunction("Texture3DScripting::Create")]
-        extern private static bool Internal_CreateImpl([Writable] Texture3D mono, int w, int h, int d, int mipCount, GraphicsFormat format, TextureCreationFlags flags, IntPtr nativeTex);
-        private static void Internal_Create([Writable] Texture3D mono, int w, int h, int d, int mipCount, GraphicsFormat format, TextureCreationFlags flags, IntPtr nativeTex)
+        extern private static bool Internal_CreateImpl([Writable] Texture3D mono, int w, int h, int d, int mipCount, GraphicsFormat format, TextureColorSpace colorSpace, TextureCreationFlags flags, IntPtr nativeTex);
+        private static void Internal_Create([Writable] Texture3D mono, int w, int h, int d, int mipCount, GraphicsFormat format, TextureColorSpace colorSpace, TextureCreationFlags flags, IntPtr nativeTex)
         {
-            if (!Internal_CreateImpl(mono, w, h, d, mipCount, format, flags, nativeTex))
+            if (!Internal_CreateImpl(mono, w, h, d, mipCount, format, colorSpace, flags, nativeTex))
                 throw new UnityException("Failed to create texture because of invalid parameters.");
         }
 
@@ -546,10 +562,10 @@ public sealed partial class Texture2DArray : Texture
         extern override public bool isReadable { get; }
 
         [FreeFunction("Texture2DArrayScripting::Create")]
-        extern private static bool Internal_CreateImpl([Writable] Texture2DArray mono, int w, int h, int d, int mipCount, GraphicsFormat format, TextureCreationFlags flags);
-        private static void Internal_Create([Writable] Texture2DArray mono, int w, int h, int d, int mipCount, GraphicsFormat format, TextureCreationFlags flags)
+        extern private static bool Internal_CreateImpl([Writable] Texture2DArray mono, int w, int h, int d, int mipCount, GraphicsFormat format, TextureColorSpace colorSpace, TextureCreationFlags flags);
+        private static void Internal_Create([Writable] Texture2DArray mono, int w, int h, int d, int mipCount, GraphicsFormat format, TextureColorSpace colorSpace, TextureCreationFlags flags)
         {
-            if (!Internal_CreateImpl(mono, w, h, d, mipCount, format, flags))
+            if (!Internal_CreateImpl(mono, w, h, d, mipCount, format, colorSpace, flags))
                 throw new UnityException("Failed to create 2D array texture because of invalid parameters.");
         }
 
@@ -608,10 +624,10 @@ public sealed partial class CubemapArray : Texture
         extern override public bool isReadable { get; }
 
         [FreeFunction("CubemapArrayScripting::Create")]
-        extern private static bool Internal_CreateImpl([Writable] CubemapArray mono, int ext, int count, int mipCount, GraphicsFormat format, TextureCreationFlags flags);
-        private static void Internal_Create([Writable] CubemapArray mono, int ext, int count, int mipCount, GraphicsFormat format, TextureCreationFlags flags)
+        extern private static bool Internal_CreateImpl([Writable] CubemapArray mono, int ext, int count, int mipCount, GraphicsFormat format, TextureColorSpace colorSpace, TextureCreationFlags flags);
+        private static void Internal_Create([Writable] CubemapArray mono, int ext, int count, int mipCount, GraphicsFormat format, TextureColorSpace colorSpace, TextureCreationFlags flags)
         {
-            if (!Internal_CreateImpl(mono, ext, count, mipCount, format, flags))
+            if (!Internal_CreateImpl(mono, ext, count, mipCount, format, colorSpace, flags))
                 throw new UnityException("Failed to create cubemap array texture because of invalid parameters.");
         }
 
@@ -668,7 +684,7 @@ public sealed partial class SparseTexture : Texture
         extern public bool isCreated { [NativeName("IsInitialized")] get; }
 
         [FreeFunction(Name = "SparseTextureScripting::Create", ThrowsException = true)]
-        extern private static void Internal_Create([Writable] SparseTexture mono, int width, int height, GraphicsFormat format, int mipCount);
+        extern private static void Internal_Create([Writable] SparseTexture mono, int width, int height, GraphicsFormat format, TextureColorSpace colorSpace, int mipCount);
 
         [FreeFunction(Name = "SparseTextureScripting::UpdateTile", HasExplicitThis = true)]
         extern public void UpdateTile(int tileX, int tileY, int miplevel, Color32[] data);
@@ -708,25 +724,14 @@ public RenderTextureFormat format
         {
             get
             {
-                RenderTextureFormat format;
-
-                if(graphicsFormat != GraphicsFormat.None)
+                if (graphicsFormat != GraphicsFormat.None)
                 {
-                    format = GraphicsFormatUtility.GetRenderTextureFormat(graphicsFormat);
+                    return GraphicsFormatUtility.GetRenderTextureFormat(graphicsFormat);
                 }
-                else //if graphicsFormat is None then it is a depth only RT
+                else // If graphicsFormat is None, then the RT is a depth-only RT.
                 {
-                    if(GetDescriptor().shadowSamplingMode != Rendering.ShadowSamplingMode.None)
-                    {
-                        format = RenderTextureFormat.Shadowmap;
-                    }
-                    else
-                    {
-                        format = RenderTextureFormat.Depth;
-                    }
+                    return (GetDescriptor().shadowSamplingMode != ShadowSamplingMode.None) ? RenderTextureFormat.Shadowmap : RenderTextureFormat.Depth;
                 }
-
-                return format;
             }
             set { graphicsFormat = GraphicsFormatUtility.GetGraphicsFormat(value, sRGB); }
         }
diff --git a/Runtime/Export/Graphics/Texture.cs b/Runtime/Export/Graphics/Texture.cs
index a9d5b89201..50c513ea0b 100644
--- a/Runtime/Export/Graphics/Texture.cs
+++ b/Runtime/Export/Graphics/Texture.cs
@@ -42,35 +42,37 @@ public GraphicsFormat graphicsFormat
 
         public RenderTextureFormat colorFormat
         {
-            get { return GraphicsFormatUtility.GetRenderTextureFormat(graphicsFormat); }
-            set
+            get
             {
-                GraphicsFormat requestedFormat = GraphicsFormatUtility.GetGraphicsFormat(value, sRGB);
-
-#pragma warning disable 618 // Disable deprecation warnings on the ShadowAuto and DepthAuto formats
-                if (requestedFormat == GraphicsFormat.DepthAuto || requestedFormat == GraphicsFormat.ShadowAuto)
+                if (graphicsFormat != GraphicsFormat.None)
                 {
-                    graphicsFormat = requestedFormat;
+                    return GraphicsFormatUtility.GetRenderTextureFormat(graphicsFormat);
                 }
-#pragma warning restore 618
                 else
                 {
-                    graphicsFormat = SystemInfo.GetCompatibleFormat(requestedFormat, FormatUsage.Render);
+                    return shadowSamplingMode != ShadowSamplingMode.None ? RenderTextureFormat.Shadowmap : RenderTextureFormat.Depth;
                 }
             }
+            set
+            {
+                GraphicsFormat requestedFormat = GraphicsFormatUtility.GetGraphicsFormat(value, sRGB);
+                graphicsFormat = SystemInfo.GetCompatibleFormat(requestedFormat, FormatUsage.Render);
+            }
         }
 
         public bool sRGB
         {
             get { return GraphicsFormatUtility.IsSRGBFormat(graphicsFormat); }
-            set { graphicsFormat = GraphicsFormatUtility.GetGraphicsFormat(colorFormat, value); }
-            // The code below does not work (while it feels like it should)
-            // This is because it does not take the project settings into account (unlike GraphicsFormatUtility.GetGraphicsFormat) and so we don't have the fallback kicking in (problem when some formats are not supported)
-            // We should fix this once we do a cleanup of colorspace management inside Unity
-            //set { graphicsFormat = (value) ? GraphicsFormatUtility.GetSRGBFormat(graphicsFormat)  : GraphicsFormatUtility.GetLinearFormat(graphicsFormat); }
+            set
+            {
+                graphicsFormat = (value && QualitySettings.activeColorSpace == ColorSpace.Linear
+                    && colorFormat != RenderTextureFormat.R8 && colorFormat != RenderTextureFormat.RG16)
+                    // ^ Maintain parity with old behaviour: respect project color space + do not consider R8_SRGB / R8G8_SRGB.
+                    ? GraphicsFormatUtility.GetSRGBFormat(graphicsFormat)
+                    : GraphicsFormatUtility.GetLinearFormat(graphicsFormat);
+            }
         }
 
-
         public int depthBufferBits
         {
             get { return GraphicsFormatUtility.GetDepthBits(depthStencilFormat); }
@@ -88,16 +90,19 @@ public int depthBufferBits
         public RenderTextureCreationFlags flags { get { return _flags; } }
         public RenderTextureMemoryless memoryless { get; set; }
 
+        [uei.ExcludeFromDocs]
         public RenderTextureDescriptor(int width, int height)
             : this(width, height, RenderTextureFormat.Default)
         {
         }
 
+        [uei.ExcludeFromDocs]
         public RenderTextureDescriptor(int width, int height, RenderTextureFormat colorFormat)
             : this(width, height, colorFormat, 0)
         {
         }
 
+        [uei.ExcludeFromDocs]
         public RenderTextureDescriptor(int width, int height, RenderTextureFormat colorFormat, int depthBufferBits)
             : this(width, height, colorFormat, depthBufferBits, Texture.GenerateAllMips)
         {
@@ -109,20 +114,16 @@ public RenderTextureDescriptor(int width, int height, GraphicsFormat colorFormat
         {
         }
 
+        [uei.ExcludeFromDocs]
         public RenderTextureDescriptor(int width, int height, RenderTextureFormat colorFormat, int depthBufferBits, int mipCount)
+            : this(width, height, colorFormat, depthBufferBits, mipCount, RenderTextureReadWrite.Linear)
         {
-            GraphicsFormat requestedFormat = GraphicsFormatUtility.GetGraphicsFormat(colorFormat, false);
+        }
 
-#pragma warning disable 618 // Disable deprecation warnings on the ShadowAuto and DepthAuto formats
-            if (requestedFormat == GraphicsFormat.DepthAuto || requestedFormat == GraphicsFormat.ShadowAuto)
-            {
-                this = new RenderTextureDescriptor(width, height, requestedFormat, depthBufferBits, mipCount);
-            }
-#pragma warning restore 618
-            else
-            {
-                this = new RenderTextureDescriptor(width, height, SystemInfo.GetCompatibleFormat(requestedFormat, FormatUsage.Render), depthBufferBits, mipCount);
-            }
+        public RenderTextureDescriptor(int width, int height, [uei.DefaultValue("RenderTextureFormat.Default")] RenderTextureFormat colorFormat, [uei.DefaultValue("0")] int depthBufferBits, [uei.DefaultValue("Texture.GenerateAllMips")] int mipCount, [uei.DefaultValue("RenderTextureReadWrite.Linear")] RenderTextureReadWrite readWrite)
+        {
+            GraphicsFormat compatibleFormat = RenderTexture.GetCompatibleFormat(colorFormat, readWrite);
+            this = new RenderTextureDescriptor(width, height, compatibleFormat, RenderTexture.GetDepthStencilFormatLegacy(depthBufferBits, colorFormat), mipCount);
         }
 
         [uei.ExcludeFromDocs]
@@ -239,7 +240,7 @@ public RenderTexture(RenderTexture textureToCopy)
 
         [uei.ExcludeFromDocs]
         public RenderTexture(int width, int height, int depth, DefaultFormat format)
-            : this(width, height, depth, SystemInfo.GetGraphicsFormat(format))
+            : this(width, height, GetDefaultColorFormat(format), GetDefaultDepthStencilFormat(format, depth), Texture.GenerateAllMips)
         {
         }
 
@@ -254,7 +255,7 @@ public RenderTexture(int width, int height, int depth, GraphicsFormat format, in
         {
             // Note: the code duplication here is because you can't set a descriptor with
             // zero width/height, which our own code (and possibly existing user code) relies on.
-            if (!ValidateFormat(format, FormatUsage.Render))
+            if (format != GraphicsFormat.None && !ValidateFormat(format, FormatUsage.Render))
                 return;
 
             Internal_Create(this);
@@ -313,12 +314,10 @@ private void Initialize(int width, int height, int depth, RenderTextureFormat fo
             // Note this may return the deprecated GraphicsFormat.ShadowAuto & DepthAuto for now. They will be filtered out internally
             // by RenderTexture creation code on the c++ side.
             GraphicsFormat colorFormat = GetCompatibleFormat(format, readWrite);
-
-            GraphicsFormat depthStencilFormat = GetDepthStencilFormatLegacy(depth, colorFormat);
+            GraphicsFormat depthStencilFormat = GetDepthStencilFormatLegacy(depth, format);
 
             // Note: the code duplication here is because you can't set a descriptor with
             // zero width/height, which our own code (and possibly existing user code) relies on.
-
             if (colorFormat != GraphicsFormat.None)
             {
                 if (!ValidateFormat(colorFormat, FormatUsage.Render))
@@ -341,6 +340,21 @@ internal static GraphicsFormat GetDepthStencilFormatLegacy(int depthBits, Graphi
                 : GraphicsFormatUtility.GetDepthStencilFormat(depthBits);
         }
 
+        internal static GraphicsFormat GetDepthStencilFormatLegacy(int depthBits, RenderTextureFormat format)
+        {
+            return GetDepthStencilFormatLegacy(depthBits, format == RenderTextureFormat.Shadowmap);
+        }
+
+        internal static GraphicsFormat GetDepthStencilFormatLegacy(int depthBits, DefaultFormat format)
+        {
+            return GetDepthStencilFormatLegacy(depthBits, format == DefaultFormat.Shadow);
+        }
+
+        internal static GraphicsFormat GetDepthStencilFormatLegacy(int depthBits, bool requestedShadowMap)
+        {
+            return requestedShadowMap ? GraphicsFormatUtility.GetDepthStencilFormat(depthBits, 0) : GraphicsFormatUtility.GetDepthStencilFormat(depthBits);
+        }
+
         public RenderTextureDescriptor descriptor
         {
             get { return GetDescriptor(); }
@@ -374,6 +388,33 @@ private static void ValidateRenderTextureDesc(RenderTextureDescriptor desc)
                 throw new ArgumentException("RenderTextureDesc graphicsFormat must not be a depth/stencil format. " + desc.graphicsFormat + " is not supported.", "desc.graphicsFormat");
 #pragma warning restore 618
         }
+
+        internal static GraphicsFormat GetDefaultColorFormat(DefaultFormat format)
+        {
+            switch (format)
+            {
+#pragma warning disable 618 // Disable deprecation warnings on the ShadowAuto and DepthAuto formats
+                case DefaultFormat.DepthStencil:
+                    return GraphicsFormat.DepthAuto;
+                case DefaultFormat.Shadow:
+                    return GraphicsFormat.ShadowAuto;
+#pragma warning restore 618
+                default:
+                    return SystemInfo.GetGraphicsFormat(format);
+            }
+        }
+
+        internal static GraphicsFormat GetDefaultDepthStencilFormat(DefaultFormat format, int depth)
+        {
+            switch (format)
+            {
+                case DefaultFormat.DepthStencil:
+                case DefaultFormat.Shadow:
+                    return SystemInfo.GetGraphicsFormat(format); // Note that "depth" is explicitly ignored in this case.
+                default:
+                    return GetDepthStencilFormatLegacy(depth, format);
+            }
+        }
     }
 
     public partial class RenderTexture : Texture
@@ -381,14 +422,6 @@ public partial class RenderTexture : Texture
         internal static GraphicsFormat GetCompatibleFormat(RenderTextureFormat renderTextureFormat, RenderTextureReadWrite readWrite)
         {
             GraphicsFormat requestedFormat = GraphicsFormatUtility.GetGraphicsFormat(renderTextureFormat, readWrite);
-
-#pragma warning disable 618 // Disable deprecation warnings on the ShadowAuto and DepthAuto formats
-            if (requestedFormat == GraphicsFormat.DepthAuto || requestedFormat == GraphicsFormat.ShadowAuto)
-            {
-                return requestedFormat;
-            }
-#pragma warning restore 618
-
             GraphicsFormat compatibleFormat = SystemInfo.GetCompatibleFormat(requestedFormat, FormatUsage.Render);
 
             if (requestedFormat == compatibleFormat)
@@ -411,12 +444,12 @@ public static RenderTexture GetTemporary(RenderTextureDescriptor desc)
         // in old bindings "default args" were expanded into overloads and we must mimic that when migrating to new bindings
         // to keep things sane we will do internal methods WITH default args and do overloads that simply call it
 
-        private static RenderTexture GetTemporaryImpl(int width, int height, int depthBuffer,
+        private static RenderTexture GetTemporaryImpl(int width, int height, GraphicsFormat depthStencilFormat,
             GraphicsFormat colorFormat,
             int antiAliasing = 1, RenderTextureMemoryless memorylessMode = RenderTextureMemoryless.None,
             VRTextureUsage vrUsage = VRTextureUsage.None, bool useDynamicScale = false)
         {
-            RenderTextureDescriptor desc = new RenderTextureDescriptor(width, height, colorFormat, GetDepthStencilFormatLegacy(depthBuffer, colorFormat));
+            RenderTextureDescriptor desc = new RenderTextureDescriptor(width, height, colorFormat, depthStencilFormat);
             desc.msaaSamples = antiAliasing;
             desc.memoryless = memorylessMode;
             desc.vrUsage = vrUsage;
@@ -432,32 +465,32 @@ public static RenderTexture GetTemporary(int width, int height, int depthBuffer,
             [uei.DefaultValue("VRTextureUsage.None")] VRTextureUsage vrUsage,
             [uei.DefaultValue("false")] bool useDynamicScale)
         {
-            return GetTemporaryImpl(width, height, depthBuffer, format, antiAliasing, memorylessMode, vrUsage, useDynamicScale);
+            return GetTemporaryImpl(width, height, GetDepthStencilFormatLegacy(depthBuffer, format), format, antiAliasing, memorylessMode, vrUsage, useDynamicScale);
         }
 
         // the rest will be excluded from docs (to "pretend" we have one method with default args)
         [uei.ExcludeFromDocs]
         public static RenderTexture GetTemporary(int width, int height, int depthBuffer, GraphicsFormat format, int antiAliasing, RenderTextureMemoryless memorylessMode, VRTextureUsage vrUsage)
         {
-            return GetTemporaryImpl(width, height, depthBuffer, format, antiAliasing, memorylessMode, vrUsage);
+            return GetTemporary(width, height, depthBuffer, format, antiAliasing, memorylessMode, vrUsage, false);
         }
 
         [uei.ExcludeFromDocs]
         public static RenderTexture GetTemporary(int width, int height, int depthBuffer, GraphicsFormat format, int antiAliasing, RenderTextureMemoryless memorylessMode)
         {
-            return GetTemporaryImpl(width, height, depthBuffer, format, antiAliasing, memorylessMode);
+            return GetTemporary(width, height, depthBuffer, format, antiAliasing, memorylessMode, VRTextureUsage.None);
         }
 
         [uei.ExcludeFromDocs]
         public static RenderTexture GetTemporary(int width, int height, int depthBuffer, GraphicsFormat format, int antiAliasing)
         {
-            return GetTemporaryImpl(width, height, depthBuffer, format, antiAliasing);
+            return GetTemporary(width, height, depthBuffer, format, antiAliasing, RenderTextureMemoryless.None);
         }
 
         [uei.ExcludeFromDocs]
         public static RenderTexture GetTemporary(int width, int height, int depthBuffer, GraphicsFormat format)
         {
-            return GetTemporaryImpl(width, height, depthBuffer, format);
+            return GetTemporary(width, height, depthBuffer, format, 1);
         }
 
         // most detailed overload: use it to specify default values for docs
@@ -468,50 +501,53 @@ public static RenderTexture GetTemporary(int width, int height,
             [uei.DefaultValue("VRTextureUsage.None")] VRTextureUsage vrUsage, [uei.DefaultValue("false")] bool useDynamicScale
         )
         {
-            return GetTemporaryImpl(width, height, depthBuffer, GetCompatibleFormat(format, readWrite), antiAliasing, memorylessMode, vrUsage, useDynamicScale);
+            GraphicsFormat graphicsFormat = GetCompatibleFormat(format, readWrite);
+            GraphicsFormat depthStencilFormat = GetDepthStencilFormatLegacy(depthBuffer, format);
+
+            return GetTemporaryImpl(width, height, depthStencilFormat, graphicsFormat, antiAliasing, memorylessMode, vrUsage, useDynamicScale);
         }
 
         // the rest will be excluded from docs (to "pretend" we have one method with default args)
         [uei.ExcludeFromDocs]
         public static RenderTexture GetTemporary(int width, int height, int depthBuffer, RenderTextureFormat format, RenderTextureReadWrite readWrite, int antiAliasing, RenderTextureMemoryless memorylessMode, VRTextureUsage vrUsage)
         {
-            return GetTemporaryImpl(width, height, depthBuffer, GetCompatibleFormat(format, readWrite), antiAliasing, memorylessMode, vrUsage);
+            return GetTemporary(width, height, depthBuffer, format, readWrite, antiAliasing, memorylessMode, vrUsage, false);
         }
 
         [uei.ExcludeFromDocs]
         public static RenderTexture GetTemporary(int width, int height, int depthBuffer, RenderTextureFormat format, RenderTextureReadWrite readWrite, int antiAliasing, RenderTextureMemoryless memorylessMode)
         {
-            return GetTemporaryImpl(width, height, depthBuffer, GetCompatibleFormat(format, readWrite), antiAliasing, memorylessMode);
+            return GetTemporary(width, height, depthBuffer, format, readWrite, antiAliasing, memorylessMode, VRTextureUsage.None);
         }
 
         [uei.ExcludeFromDocs]
         public static RenderTexture GetTemporary(int width, int height, int depthBuffer, RenderTextureFormat format, RenderTextureReadWrite readWrite, int antiAliasing)
         {
-            return GetTemporaryImpl(width, height, depthBuffer, GetCompatibleFormat(format, readWrite), antiAliasing);
+            return GetTemporary(width, height, depthBuffer, format, readWrite, antiAliasing, RenderTextureMemoryless.None);
         }
 
         [uei.ExcludeFromDocs]
         public static RenderTexture GetTemporary(int width, int height, int depthBuffer, RenderTextureFormat format, RenderTextureReadWrite readWrite)
         {
-            return GetTemporaryImpl(width, height, depthBuffer, GetCompatibleFormat(format, readWrite));
+            return GetTemporary(width, height, depthBuffer, format, readWrite, 1);
         }
 
         [uei.ExcludeFromDocs]
         public static RenderTexture GetTemporary(int width, int height, int depthBuffer, RenderTextureFormat format)
         {
-            return GetTemporaryImpl(width, height, depthBuffer, GetCompatibleFormat(format, RenderTextureReadWrite.Default));
+            return GetTemporary(width, height, depthBuffer, format, RenderTextureReadWrite.Default);
         }
 
         [uei.ExcludeFromDocs]
         public static RenderTexture GetTemporary(int width, int height, int depthBuffer)
         {
-            return GetTemporaryImpl(width, height, depthBuffer, GetCompatibleFormat(RenderTextureFormat.Default, RenderTextureReadWrite.Default));
+            return GetTemporary(width, height, depthBuffer, RenderTextureFormat.Default);
         }
 
         [uei.ExcludeFromDocs]
         public static RenderTexture GetTemporary(int width, int height)
         {
-            return GetTemporaryImpl(width, height, 0, GetCompatibleFormat(RenderTextureFormat.Default, RenderTextureReadWrite.Default));
+            return GetTemporary(width, height, 0);
         }
     }
 
@@ -525,7 +561,7 @@ public CustomRenderTexture(int width, int height, RenderTextureFormat format, [u
 
         [uei.ExcludeFromDocs]
         public CustomRenderTexture(int width, int height, RenderTextureFormat format)
-            : this(width, height, GetCompatibleFormat(format, RenderTextureReadWrite.Default))
+            : this(width, height, format, RenderTextureReadWrite.Default)
         {
         }
 
@@ -537,14 +573,24 @@ public CustomRenderTexture(int width, int height)
 
         [uei.ExcludeFromDocs]
         public CustomRenderTexture(int width, int height, [uei.DefaultValue("DefaultFormat.LDR")] DefaultFormat defaultFormat)
-            : this(width, height, SystemInfo.GetGraphicsFormat(defaultFormat))
-        {
+            : this(width, height, GetDefaultColorFormat(defaultFormat))
+        {
+            // CustomRenderTexture's 'depthStencilFormat' is DefaultFormat.Depth by default. This is different from
+            // RenderTexture, because the CRT constructors don't touch 'depthStencilFormat', so the
+            // RenderTextureDescriptor's 'depthStencilFormat' is left unmodified after construction on the C++ side.
+            // As such: to avoid changing behavior here, leave 'depthStencilFormat' alone, unless we are dealing
+            // with a depth related 'defaultFormat'. (in which case, we indeed should ensure that
+            // 'depthStencilFormat' is correct with regards to the user's request)
+            if (defaultFormat == DefaultFormat.DepthStencil || defaultFormat == DefaultFormat.Shadow)
+            {
+                this.depthStencilFormat = SystemInfo.GetGraphicsFormat(defaultFormat);
+            }
         }
 
         [uei.ExcludeFromDocs]
         public CustomRenderTexture(int width, int height, GraphicsFormat format)
         {
-            if (!ValidateFormat(format, FormatUsage.Render))
+            if (format != GraphicsFormat.None && !ValidateFormat(format, FormatUsage.Render))
                 return;
 
             Internal_CreateCustomRenderTexture(this);
@@ -560,6 +606,29 @@ public partial class Texture : Object
     {
         public static readonly int GenerateAllMips = -1;
 
+        // In TextureFormat constructors, we eventually need to convert the TextureFormat to a GraphicsFormat
+        // in order to call Internal_Create.
+        // When a GraphicsFormat is obtained (with GetGraphicsFormat), Unity is allowed to choose one that
+        // doesn't necessarily reflect what the user asked (sRGB / Linear) -- this is by design, TextureFormat
+        // should be easy to use, so the GraphicsFormat may indeed be UNorm instead of SRGB in gamma projects.
+        // However, if the Internal_Create only receives colorspace information through the GraphicsFormat,
+        // then the texture does not know what the (CPU) data colorspace really should have been.
+        // The texture then re-uses the GraphicsFormat information, which can cause issues if the user then
+        // converts the texture to an asset.
+        // That is why we separately pass the result of "GetTextureColorSpace" here to Internal_Create,
+        // so that we can have a proper distinction between CPU data colorspace & GPU colorspace.
+        internal TextureColorSpace GetTextureColorSpace(bool linear)
+        {
+            return linear ? TextureColorSpace.Linear : TextureColorSpace.sRGB;
+        }
+
+        // Do not use this in TextureFormat constructors, you would otherwise obtain a TextureColorSpace that
+        // may not reflect what the user asked. Always use the above in TextureFormat constructors instead.
+        internal TextureColorSpace GetTextureColorSpace(GraphicsFormat format)
+        {
+            return GetTextureColorSpace(!GraphicsFormatUtility.IsSRGBFormat(format));
+        }
+
         internal bool ValidateFormat(RenderTextureFormat format)
         {
             if (SystemInfo.SupportsRenderTextureFormat(format))
@@ -624,6 +693,11 @@ internal UnityException CreateNonReadableException(Texture t)
                 String.Format("Texture '{0}' is not readable, the texture memory can not be accessed from scripts. You can make the texture readable in the Texture Import Settings.", t.name)
             );
         }
+
+        internal UnityException CreateNativeArrayLengthOverflowException()
+        {
+            return new UnityException("Failed to create NativeArray, length exceeds the allowed maximum of Int32.MaxValue. Use a larger type as template argument to reduce the array length.");
+        }
     }
 
 
@@ -656,7 +730,7 @@ internal bool ValidateFormat(GraphicsFormat format, int width, int height)
         internal Texture2D(int width, int height, GraphicsFormat format, TextureCreationFlags flags, int mipCount, IntPtr nativeTex, string mipmapLimitGroupName)
         {
             if (ValidateFormat(format, width, height))
-                Internal_Create(this, width, height, mipCount, format, flags, nativeTex, mipmapLimitGroupName);
+                Internal_Create(this, width, height, mipCount, format, GetTextureColorSpace(format), flags, nativeTex, mipmapLimitGroupName);
         }
 
         [uei.ExcludeFromDocs]
@@ -708,7 +782,7 @@ internal Texture2D(int width, int height, TextureFormat textureFormat, int mipCo
                 flags |= TextureCreationFlags.DontUploadUponCreate | TextureCreationFlags.DontInitializePixels;
             if (ignoreMipmapLimit)
                 flags |= TextureCreationFlags.IgnoreMipmapLimit;
-            Internal_Create(this, width, height, mipCount, format, flags, nativeTex, mipmapLimitGroupName);
+            Internal_Create(this, width, height, mipCount, format, GetTextureColorSpace(linear), flags, nativeTex, mipmapLimitGroupName);
         }
 
         public Texture2D(int width, int height, [uei.DefaultValue("TextureFormat.RGBA32")] TextureFormat textureFormat, [uei.DefaultValue("-1")] int mipCount, [uei.DefaultValue("false")] bool linear)
@@ -736,16 +810,19 @@ public Texture2D(int width, int height, [uei.DefaultValue("TextureFormat.RGBA32"
         {
         }
 
-        [uei.ExcludeFromDocs]
         public Texture2D(int width, int height, TextureFormat textureFormat, bool mipChain)
             : this(width, height, textureFormat, mipChain ? Texture.GenerateAllMips : 1, false, IntPtr.Zero, false, false, null)
         {
         }
 
-        [uei.ExcludeFromDocs]
         public Texture2D(int width, int height)
-            : this(width, height, TextureFormat.RGBA32, Texture.GenerateAllMips, false, IntPtr.Zero, false, false, null)
         {
+            TextureFormat format = TextureFormat.RGBA32;
+            const bool linear = false;
+            if (width == 0 && height == 0)
+                Internal_CreateEmptyImpl(this);
+            else if (ValidateFormat(format, width, height))
+                Internal_Create(this, width, height, Texture.GenerateAllMips, GraphicsFormatUtility.GetGraphicsFormat(format, !linear), GetTextureColorSpace(linear), TextureCreationFlags.MipChain, IntPtr.Zero, null);
         }
 
         public static Texture2D CreateExternalTexture(int width, int height, TextureFormat format, bool mipChain, bool linear, IntPtr nativeTex)
@@ -823,7 +900,7 @@ public void LoadRawTextureData(IntPtr data, int size)
         {
             if (!isReadable) throw CreateNonReadableException(this);
             if (data == IntPtr.Zero || size == 0) { Debug.LogError("No texture data provided to LoadRawTextureData", this); return; }
-            if (!LoadRawTextureDataImpl(data, size))
+            if (!LoadRawTextureDataImpl(data, (ulong)size))
                 throw new UnityException("LoadRawTextureData: not enough data provided (will result in overread).");
         }
 
@@ -839,7 +916,7 @@ unsafe public void LoadRawTextureData<T>(NativeArray<T> data) where T : struct
         {
             if (!isReadable) throw CreateNonReadableException(this);
             if (!data.IsCreated || data.Length == 0) throw new UnityException("No texture data provided to LoadRawTextureData");
-            if (!LoadRawTextureDataImpl((IntPtr)data.GetUnsafeReadOnlyPtr(), data.Length * UnsafeUtility.SizeOf<T>()))
+            if (!LoadRawTextureDataImpl((IntPtr)data.GetUnsafeReadOnlyPtr(), (ulong)data.Length * (ulong)UnsafeUtility.SizeOf<T>()))
                 throw new UnityException("LoadRawTextureData: not enough data provided (will result in overread).");
         }
 
@@ -867,13 +944,16 @@ public unsafe NativeArray<T> GetPixelData<T>(int mipLevel) where T : struct
             if (mipLevel < 0 || mipLevel >= mipmapCount) throw new ArgumentException("The passed in miplevel " + mipLevel + " is invalid. It needs to be in the range 0 and " + (mipmapCount - 1));
             if (GetWritableImageData(0).ToInt64() == 0) throw new UnityException($"Texture '{name}' has no data.");
 
-            int chainOffset = GetPixelDataOffset(mipLevel);
-            int arraySize = GetPixelDataSize(mipLevel);
+            ulong chainOffset = GetPixelDataOffset(mipLevel);
+            ulong arraySize = GetPixelDataSize(mipLevel);
             int stride = UnsafeUtility.SizeOf<T>();
+            ulong arrayLength = arraySize / (ulong)stride;
+
+            if (arrayLength > Int32.MaxValue) throw CreateNativeArrayLengthOverflowException();
 
-            IntPtr dataPtr = new IntPtr(GetWritableImageData(0).ToInt64() + chainOffset);
+            IntPtr dataPtr = new IntPtr((long)((ulong)GetWritableImageData(0) + chainOffset));
 
-            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)dataPtr, (int)(arraySize / stride), Allocator.None);
+            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)dataPtr, (int)arrayLength, Allocator.None);
 
             NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref array, this.GetSafetyHandleForSlice(mipLevel));
             return array;
@@ -884,7 +964,11 @@ public unsafe NativeArray<T> GetRawTextureData<T>() where T : struct
             if (!isReadable) throw CreateNonReadableException(this);
 
             int stride = UnsafeUtility.SizeOf<T>();
-            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)GetWritableImageData(0), (int)(GetRawImageDataSize() / stride), Allocator.None);
+            ulong arrayLength = GetRawImageDataSize() / (ulong)stride;
+
+            if (arrayLength > Int32.MaxValue) throw CreateNativeArrayLengthOverflowException();
+
+            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)GetWritableImageData(0), (int)arrayLength, Allocator.None);
             NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref array, Texture2D.GetSafetyHandle(this));
             return array;
         }
@@ -1063,7 +1147,7 @@ public Cubemap(int width, GraphicsFormat format, TextureCreationFlags flags, int
 
             ValidateIsNotCrunched(flags); // Script created Crunched Cubemaps not supported
 
-            Internal_Create(this, width, mipCount, format, flags, IntPtr.Zero);
+            Internal_Create(this, width, mipCount, format, GetTextureColorSpace(format), flags, IntPtr.Zero);
         }
 
         internal Cubemap(int width, TextureFormat textureFormat, int mipCount, IntPtr nativeTex, bool createUninitialized)
@@ -1071,14 +1155,15 @@ internal Cubemap(int width, TextureFormat textureFormat, int mipCount, IntPtr na
             if (!ValidateFormat(textureFormat, width))
                 return;
 
-            GraphicsFormat format = GraphicsFormatUtility.GetGraphicsFormat(textureFormat, false);
+            const bool linear = true;
+            GraphicsFormat format = GraphicsFormatUtility.GetGraphicsFormat(textureFormat, !linear);
             TextureCreationFlags flags = (mipCount != 1) ? TextureCreationFlags.MipChain : TextureCreationFlags.None;
             if (GraphicsFormatUtility.IsCrunchFormat(textureFormat))
                 flags |= TextureCreationFlags.Crunch;
             if (createUninitialized)
                 flags |= TextureCreationFlags.DontUploadUponCreate | TextureCreationFlags.DontInitializePixels;
             ValidateIsNotCrunched(flags); // Script created Crunched Cubemaps not supported
-            Internal_Create(this, width, mipCount, format, flags, nativeTex);
+            Internal_Create(this, width, mipCount, format, GetTextureColorSpace(linear), flags, nativeTex);
         }
 
         public Cubemap(int width, TextureFormat textureFormat, bool mipChain)
@@ -1134,13 +1219,16 @@ public unsafe NativeArray<T> GetPixelData<T>(int mipLevel, CubemapFace face) whe
             if ((int)face < 0 || (int)face >= 6) throw new ArgumentException("The passed in face " + face + " is invalid. The valid range is 0 through 5.");
             if (GetWritableImageData(0).ToInt64() == 0) throw new UnityException($"Texture '{name}' has no data.");
 
-            int singleElementDataSize = GetPixelDataOffset(this.mipmapCount, (int)face);
-            int chainOffset = GetPixelDataOffset(mipLevel, (int)face);
-            int arraySize = GetPixelDataSize(mipLevel, (int)face);
+            ulong singleElementDataSize = GetPixelDataOffset(this.mipmapCount, (int)face);
+            ulong chainOffset = GetPixelDataOffset(mipLevel, (int)face);
+            ulong arraySize = GetPixelDataSize(mipLevel, (int)face);
             int stride = UnsafeUtility.SizeOf<T>();
+            ulong arrayLength = arraySize / (ulong)stride;
 
-            IntPtr dataPtr = new IntPtr(GetWritableImageData(0).ToInt64() + (singleElementDataSize * (int)face + chainOffset));
-            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)dataPtr, (int)(arraySize / stride), Allocator.None);
+            if (arrayLength > Int32.MaxValue) throw CreateNativeArrayLengthOverflowException();
+
+            IntPtr dataPtr = new IntPtr((long)((ulong)GetWritableImageData(0) + (singleElementDataSize * (ulong)face + chainOffset)));
+            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)dataPtr, (int)arrayLength, Allocator.None);
 
             NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref array, this.GetSafetyHandleForSlice(mipLevel, (int)face));
             return array;
@@ -1213,7 +1301,7 @@ public Texture3D(int width, int height, int depth, GraphicsFormat format, Textur
                 return;
 
             ValidateIsNotCrunched(flags);
-            Internal_Create(this, width, height, depth, mipCount, format, flags, IntPtr.Zero);
+            Internal_Create(this, width, height, depth, mipCount, format, GetTextureColorSpace(format), flags, IntPtr.Zero);
         }
 
         [uei.ExcludeFromDocs]
@@ -1232,14 +1320,15 @@ public Texture3D(int width, int height, int depth, TextureFormat textureFormat,
             if (!ValidateFormat(textureFormat))
                 return;
 
-            GraphicsFormat format = GraphicsFormatUtility.GetGraphicsFormat(textureFormat, false);
+            const bool linear = true;
+            GraphicsFormat format = GraphicsFormatUtility.GetGraphicsFormat(textureFormat, !linear);
             TextureCreationFlags flags = (mipCount != 1) ? TextureCreationFlags.MipChain : TextureCreationFlags.None;
             if (GraphicsFormatUtility.IsCrunchFormat(textureFormat))
                 flags |= TextureCreationFlags.Crunch;
             if (createUninitialized)
                 flags |= TextureCreationFlags.DontUploadUponCreate | TextureCreationFlags.DontInitializePixels;
             ValidateIsNotCrunched(flags);
-            Internal_Create(this, width, height, depth, mipCount, format, flags, nativeTex);
+            Internal_Create(this, width, height, depth, mipCount, format, GetTextureColorSpace(linear), flags, nativeTex);
         }
 
         [uei.ExcludeFromDocs]
@@ -1339,12 +1428,15 @@ public unsafe NativeArray<T> GetPixelData<T>(int mipLevel) where T : struct
             if (mipLevel < 0 || mipLevel >= mipmapCount) throw new ArgumentException("The passed in miplevel " + mipLevel + " is invalid. The valid range is 0 through  " + (mipmapCount - 1));
             if (GetImageDataPointer().ToInt64() == 0) throw new UnityException($"Texture '{name}' has no data.");
 
-            int chainOffset = GetPixelDataOffset(mipLevel);
-            int arraySize = GetPixelDataSize(mipLevel);
+            ulong chainOffset = GetPixelDataOffset(mipLevel);
+            ulong arraySize = GetPixelDataSize(mipLevel);
             int stride = UnsafeUtility.SizeOf<T>();
+            ulong arrayLength = arraySize / (ulong)stride;
+
+            if (arrayLength > Int32.MaxValue) throw CreateNativeArrayLengthOverflowException();
 
-            IntPtr dataPtr = new IntPtr(GetImageDataPointer().ToInt64() + chainOffset);
-            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)dataPtr, (int)(arraySize / stride), Allocator.None);
+            IntPtr dataPtr = new IntPtr((long)((ulong)GetImageDataPointer() + chainOffset));
+            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)dataPtr, (int)arrayLength, Allocator.None);
 
             NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref array, this.GetSafetyHandleForSlice(mipLevel));
             return array;
@@ -1398,7 +1490,7 @@ public Texture2DArray(int width, int height, int depth, DefaultFormat format, Te
                 return;
 
             ValidateIsNotCrunched(flags);
-            Internal_Create(this, width, height, depth, mipCount, gfxFormat, flags);
+            Internal_Create(this, width, height, depth, mipCount, gfxFormat, GetTextureColorSpace(gfxFormat), flags);
         }
 
 
@@ -1415,7 +1507,7 @@ public Texture2DArray(int width, int height, int depth, GraphicsFormat format, T
                 return;
 
             ValidateIsNotCrunched(flags);
-            Internal_Create(this, width, height, depth, mipCount, format, flags);
+            Internal_Create(this, width, height, depth, mipCount, format, GetTextureColorSpace(format), flags);
         }
 
         public Texture2DArray(int width, int height, int depth, TextureFormat textureFormat, int mipCount, bool linear, bool createUninitialized)
@@ -1430,7 +1522,7 @@ public Texture2DArray(int width, int height, int depth, TextureFormat textureFor
             if (createUninitialized)
                 flags |= TextureCreationFlags.DontUploadUponCreate | TextureCreationFlags.DontInitializePixels;
             ValidateIsNotCrunched(flags);
-            Internal_Create(this, width, height, depth, mipCount, format, flags);
+            Internal_Create(this, width, height, depth, mipCount, format, GetTextureColorSpace(linear), flags);
         }
 
         public Texture2DArray(int width, int height, int depth, TextureFormat textureFormat, int mipCount, bool linear)
@@ -1488,13 +1580,16 @@ public unsafe NativeArray<T> GetPixelData<T>(int mipLevel, int element) where T
             if (mipLevel < 0 || mipLevel >= mipmapCount) throw new ArgumentException("The passed in miplevel " + mipLevel + " is invalid. The valid range is 0 through " + (mipmapCount - 1));
             if (element < 0 || element >= depth) throw new ArgumentException("The passed in element " + element + " is invalid. The valid range is 0 through " + (depth - 1));
 
-            int singleElementDataSize = GetPixelDataOffset(this.mipmapCount, element);
-            int chainOffset = GetPixelDataOffset(mipLevel, element);
-            int arraySize = GetPixelDataSize(mipLevel, element);
+            ulong singleElementDataSize = GetPixelDataOffset(this.mipmapCount, element);
+            ulong chainOffset = GetPixelDataOffset(mipLevel, element);
+            ulong arraySize = GetPixelDataSize(mipLevel, element);
             int stride = UnsafeUtility.SizeOf<T>();
+            ulong arrayLength = arraySize / (ulong)stride;
 
-            IntPtr dataPtr = new IntPtr(GetImageDataPointer().ToInt64() + (singleElementDataSize * element + chainOffset));
-            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)dataPtr, (int)(arraySize / stride), Allocator.None);
+            if (arrayLength > Int32.MaxValue) throw CreateNativeArrayLengthOverflowException();
+
+            IntPtr dataPtr = new IntPtr((long)((ulong)GetImageDataPointer() + (singleElementDataSize * (ulong)element + chainOffset)));
+            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)dataPtr, (int)arrayLength, Allocator.None);
 
             NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref array, this.GetSafetyHandleForSlice(mipLevel, element));
             return array;
@@ -1534,7 +1629,7 @@ public CubemapArray(int width, int cubemapCount, GraphicsFormat format, TextureC
                 return;
 
             ValidateIsNotCrunched(flags);
-            Internal_Create(this, width, cubemapCount, mipCount, format, flags);
+            Internal_Create(this, width, cubemapCount, mipCount, format, GetTextureColorSpace(format), flags);
         }
 
         public CubemapArray(int width, int cubemapCount, TextureFormat textureFormat, int mipCount, bool linear, [uei.DefaultValue("false")] bool createUninitialized)
@@ -1549,7 +1644,7 @@ public CubemapArray(int width, int cubemapCount, TextureFormat textureFormat, in
             if (createUninitialized)
                 flags |= TextureCreationFlags.DontUploadUponCreate | TextureCreationFlags.DontInitializePixels;
             ValidateIsNotCrunched(flags);
-            Internal_Create(this, width, cubemapCount, mipCount, format, flags);
+            Internal_Create(this, width, cubemapCount, mipCount, format, GetTextureColorSpace(linear), flags);
         }
 
         public CubemapArray(int width, int cubemapCount, TextureFormat textureFormat, int mipCount, bool linear)
@@ -1609,13 +1704,16 @@ public unsafe NativeArray<T> GetPixelData<T>(int mipLevel, CubemapFace face, int
             if (element < 0 || element >= cubemapCount) throw new ArgumentException("The passed in element " + element + " is invalid. The valid range is 0 through " + (cubemapCount - 1));
 
             int elementOffset = element * 6 + (int)face;
-            int singleElementDataSize = GetPixelDataOffset(this.mipmapCount, elementOffset);
-            int chainOffset = GetPixelDataOffset(mipLevel, elementOffset);
-            int arraySize = GetPixelDataSize(mipLevel, elementOffset);
+            ulong singleElementDataSize = GetPixelDataOffset(this.mipmapCount, elementOffset);
+            ulong chainOffset = GetPixelDataOffset(mipLevel, elementOffset);
+            ulong arraySize = GetPixelDataSize(mipLevel, elementOffset);
             int stride = UnsafeUtility.SizeOf<T>();
+            ulong arrayLength = arraySize / (ulong)stride;
+
+            if (arrayLength > Int32.MaxValue) throw CreateNativeArrayLengthOverflowException();
 
-            IntPtr dataPtr = new IntPtr(GetImageDataPointer().ToInt64() + (singleElementDataSize * elementOffset + chainOffset));
-            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)dataPtr, (int)(arraySize / stride), Allocator.None);
+            IntPtr dataPtr = new IntPtr((long)((ulong)GetImageDataPointer() + (singleElementDataSize * (ulong)elementOffset + chainOffset)));
+            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>((void*)dataPtr, (int)(arrayLength), Allocator.None);
 
             NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref array, this.GetSafetyHandleForSlice(mipLevel, (int)face, element));
             return array;
@@ -1685,7 +1783,7 @@ public SparseTexture(int width, int height, GraphicsFormat format, int mipCount)
             if (!ValidateSize(width, height, format))
                 return;
 
-            Internal_Create(this, width, height, format, mipCount);
+            Internal_Create(this, width, height, format, GetTextureColorSpace(format), mipCount);
         }
 
         [uei.ExcludeFromDocs]
@@ -1722,7 +1820,7 @@ public SparseTexture(int width, int height, TextureFormat textureFormat, int mip
             if (!ValidateSize(width, height, format))
                 return;
 
-            Internal_Create(this, width, height, format, mipCount);
+            Internal_Create(this, width, height, format, GetTextureColorSpace(linear), mipCount);
         }
     }
 }
diff --git a/Runtime/Export/Jobs/AtomicSafetyHandle.bindings.cs b/Runtime/Export/Jobs/AtomicSafetyHandle.bindings.cs
index 016afa1a97..00fdf75e8c 100644
--- a/Runtime/Export/Jobs/AtomicSafetyHandle.bindings.cs
+++ b/Runtime/Export/Jobs/AtomicSafetyHandle.bindings.cs
@@ -8,6 +8,7 @@
 using UnityEngine.Bindings;
 using UnityEngine.Scripting;
 using Unity.Jobs;
+using System.Runtime.CompilerServices;
 
 namespace Unity.Collections.LowLevel.Unsafe
 {
@@ -37,9 +38,13 @@ public enum AtomicSafetyErrorType
     [NativeHeader("Runtime/Jobs/JobsDebugger.h")]
     public struct AtomicSafetyHandle
     {
+        // These bit flag constants need to be in sync with
+        // the bit flag enums in AtomicSafetyHandle.h
         internal const int Read = 1 << 0;
         internal const int Write = 1 << 1;
         internal const int Dispose = 1 << 2;
+        internal const int TempVersion = 1 << 3;
+        internal const int VersionIncrement = 1 << 4;
 
         internal const int ReadCheck = ~(Write | Dispose);
         internal const int WriteCheck = ~(Read | Dispose);
@@ -107,9 +112,21 @@ public struct AtomicSafetyHandle
         // Performs CheckWriteAndThrow and then bumps the secondary version.
         // This allows for example a NativeArray that becomes invalid if the Length of a List
         // is changed to be invalidated, while the NativeList handle itself remains valid.
-        [ThreadSafe(ThrowsException = true)]
         [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
-        public static extern void CheckWriteAndBumpSecondaryVersion(AtomicSafetyHandle handle);
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void CheckWriteAndBumpSecondaryVersion(AtomicSafetyHandle handle)
+        {
+            unsafe
+            {
+                int* ptr = (int*)(void*)handle.versionNode;
+                if (ptr == null || handle.version != (*ptr & WriteCheck))
+                {
+                    CheckWriteAndThrowNoEarlyOut(handle);
+                }
+
+                ptr[1] = ptr[1] + VersionIncrement;
+            }
+        }
 
         // For debugging purposes in unit tests we need to sometimes just sync
         // all jobs against an handle before shutting down.
@@ -162,6 +179,7 @@ public struct AtomicSafetyHandle
         // Checks if the handle can be read from
         // If not (already destroyed, job currently writing to the data) throws an exception.
         [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static unsafe void CheckReadAndThrow(AtomicSafetyHandle handle)
         {
             var versionPtr = (int*)handle.versionNode;
@@ -172,6 +190,7 @@ public static unsafe void CheckReadAndThrow(AtomicSafetyHandle handle)
         // Checks if the handle can be written to
         // If not (already destroyed, job currently reading or writing to the data) throws an exception.
         [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static unsafe void CheckWriteAndThrow(AtomicSafetyHandle handle)
         {
             var versionPtr = (int*)handle.versionNode;
@@ -202,10 +221,10 @@ public static unsafe bool IsValidNonDefaultHandle(in AtomicSafetyHandle handle)
             return false;
         }
 
-
         // Checks if the handle is still valid.
         // If not (already destroyed) throws an exception.
         [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static unsafe void CheckExistsAndThrow(in AtomicSafetyHandle handle)
         {
             var versionPtr = (int*)handle.versionNode;
@@ -223,7 +242,6 @@ public static unsafe bool IsHandleValid(in AtomicSafetyHandle handle)
             return true;
         }
 
-
         [ThreadSafe]
         public static extern string GetReaderName(AtomicSafetyHandle handle, int readerIndex);
 
@@ -246,6 +264,7 @@ public static unsafe int NewStaticSafetyId<T>()
         [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
         [NativeThrows, ThreadSafe]
         public static unsafe extern void SetCustomErrorMessage(int staticSafetyId, AtomicSafetyErrorType errorType, byte* messageBytes, int byteCount);
+
         [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
         public static unsafe void SetStaticSafetyId(ref AtomicSafetyHandle handle, int staticSafetyId)
         {
@@ -254,7 +273,7 @@ public static unsafe void SetStaticSafetyId(ref AtomicSafetyHandle handle, int s
 
         internal static void CreateHandle(out AtomicSafetyHandle safety, Allocator allocator)
         {
-            safety = (allocator == Allocator.Temp) ? AtomicSafetyHandle.GetTempMemoryHandle() : AtomicSafetyHandle.Create();
+            safety = (allocator == Allocator.Temp) ? GetTempMemoryHandle() : Create();
             if(!Unity.Jobs.LowLevel.Unsafe.JobsUtility.IsExecutingJob)
                 return;
             switch(allocator)
@@ -267,18 +286,17 @@ internal static void CreateHandle(out AtomicSafetyHandle safety, Allocator alloc
 
         internal static void DisposeHandle(ref AtomicSafetyHandle safety)
         {
-            AtomicSafetyHandle.CheckDeallocateAndThrow(safety);
-            // If the safety handle is for a temp allocation, create a new safety handle for this instance which can be marked as invalid
+            CheckDeallocateAndThrow(safety);
+            // If the safety handle is for a temp allocation, get a new safety handle for this instance which can be marked as invalid
             // Setting it to new AtomicSafetyHandle is not enough since the handle needs a valid node pointer in order to give the correct errors
-            if (AtomicSafetyHandle.IsTempMemoryHandle(safety))
+            if (IsTempMemoryHandle(safety))
             {
                 int staticSafetyId = safety.staticSafetyId;
-                safety = AtomicSafetyHandle.Create();
+                safety = AtomicSafetyHandle.GetTempMemoryHandle();
                 safety.staticSafetyId = staticSafetyId;
             }
-            AtomicSafetyHandle.Release(safety);
+            Release(safety);
         }
-
     }
 }
 
diff --git a/Runtime/Export/Math/ColorUtility.bindings.cs b/Runtime/Export/Math/ColorUtility.bindings.cs
index 8f74c51823..bd05562f9f 100644
--- a/Runtime/Export/Math/ColorUtility.bindings.cs
+++ b/Runtime/Export/Math/ColorUtility.bindings.cs
@@ -6,10 +6,10 @@
 
 namespace UnityEngine
 {
-    [NativeHeader("Runtime/Export/Math/ColorUtility.bindings.h")]
+    [NativeHeader("Runtime/Math/ColorUtility.h")]
     public partial class ColorUtility
     {
-        [FreeFunction]
+        [FreeFunction("TryParseHtmlColor", true)]
         extern internal static bool DoTryParseHtmlColor(string htmlString, out Color32 color);
     }
 }
diff --git a/Runtime/Export/Math/Mathf.cs b/Runtime/Export/Math/Mathf.cs
index 4882011a38..4c74b4539f 100644
--- a/Runtime/Export/Math/Mathf.cs
+++ b/Runtime/Export/Math/Mathf.cs
@@ -157,6 +157,7 @@ public static int Max(params int[] values)
         public static int RoundToInt(float f) { return (int)Math.Round(f); }
 
         // Returns the sign of /f/.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public static float Sign(float f) { return f >= 0F ? 1F : -1F; }
 
         // The infamous ''3.14159265358979...'' value (RO).
@@ -473,6 +474,17 @@ internal static int ClampToInt(long value)
             return (int)value;
         }
 
+        internal static uint ClampToUInt(long value)
+        {
+            if (value < uint.MinValue)
+                return uint.MinValue;
+
+            if (value > uint.MaxValue)
+                return uint.MaxValue;
+
+            return (uint)value;
+        }
+
         internal static float RoundToMultipleOf(float value, float roundingValue)
         {
             if (roundingValue == 0)
diff --git a/Runtime/Export/NativeArray/DisposeSentinel.cs b/Runtime/Export/NativeArray/DisposeSentinel.cs
index da5232a602..9e2afbc196 100644
--- a/Runtime/Export/NativeArray/DisposeSentinel.cs
+++ b/Runtime/Export/NativeArray/DisposeSentinel.cs
@@ -5,50 +5,27 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
+using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine;
 
 namespace Unity.Collections
 {
-    public enum NativeLeakDetectionMode
-    {
-        EnabledWithStackTrace = 3,
-        Enabled = 2,
-        Disabled = 1
-    }
-
     public static class NativeLeakDetection
     {
-        // For performance reasons no assignment operator (static initializer cost in il2cpp)
-        // and flipped enabled / disabled enum value
-        static int s_NativeLeakDetectionMode;
-        const string kNativeLeakDetectionModePrefsString = "Unity.Collections.NativeLeakDetection.Mode";
-
-        // Initialize leak detection on startup/domain reload to avoid NativeLeakDetection.Mode
-        // access on a job to trigger the initialization.
-        [RuntimeInitializeOnLoadMethod]
-        static void Initialize()
-        {
-            s_NativeLeakDetectionMode = UnityEngine.PlayerPrefs.EditorPrefsGetInt(kNativeLeakDetectionModePrefsString, (int)NativeLeakDetectionMode.Enabled);
-            if (s_NativeLeakDetectionMode < (int)NativeLeakDetectionMode.Disabled || s_NativeLeakDetectionMode > (int)NativeLeakDetectionMode.EnabledWithStackTrace)
-                s_NativeLeakDetectionMode = (int)NativeLeakDetectionMode.Enabled;
-        }
-
         public static NativeLeakDetectionMode Mode
         {
             get
             {
-                if (s_NativeLeakDetectionMode == 0)
-                    Initialize();
-                return (NativeLeakDetectionMode)s_NativeLeakDetectionMode;
+                return UnsafeUtility.GetLeakDetectionMode();
             }
             set
             {
-                var intValue = (int)value;
-                if (s_NativeLeakDetectionMode != intValue)
+                if (value < NativeLeakDetectionMode.Disabled || value > NativeLeakDetectionMode.EnabledWithStackTrace)
                 {
-                    s_NativeLeakDetectionMode = intValue;
-                    UnityEngine.PlayerPrefs.EditorPrefsSetInt(kNativeLeakDetectionModePrefsString, intValue);
+                    throw new ArgumentException("NativeLeakDetectionMode out of range");
                 }
+
+                UnsafeUtility.SetLeakDetectionMode(value);
             }
         }
     }
@@ -78,7 +55,7 @@ public static void Dispose(ref AtomicSafetyHandle safety, ref DisposeSentinel se
             if (AtomicSafetyHandle.IsTempMemoryHandle(safety))
             {
                 int staticSafetyId = safety.staticSafetyId;
-                safety = AtomicSafetyHandle.Create();
+                safety = AtomicSafetyHandle.GetTempMemoryHandle();
                 safety.staticSafetyId = staticSafetyId;
             }
             AtomicSafetyHandle.Release(safety);
diff --git a/Runtime/Export/NativeArray/NativeArray.cs b/Runtime/Export/NativeArray/NativeArray.cs
index 7d41bacb0c..657b842366 100644
--- a/Runtime/Export/NativeArray/NativeArray.cs
+++ b/Runtime/Export/NativeArray/NativeArray.cs
@@ -11,7 +11,10 @@
 using Unity.Burst;
 using Unity.Jobs;
 using Unity.Collections.LowLevel.Unsafe;
+using UnityEngine;
+using UnityEngine.Bindings;
 using UnityEngine.Internal;
+using UnityEngine.Scripting;
 
 namespace Unity.Collections
 {
@@ -93,7 +96,7 @@ static void CheckAllocateArguments(int length, Allocator allocator)
 
             // NativeArray constructor does not support custom allocator
             if (allocator >= Allocator.FirstUserIndex)
-                throw new ArgumentException("Use CollectionHelper.CreateNativeArray for custom allocator", nameof(allocator));
+                throw new ArgumentException("Use CollectionHelper.CreateNativeArray in com.unity.collections package for custom allocator", nameof(allocator));
 
             if (length < 0)
                 throw new ArgumentOutOfRangeException(nameof(length), "Length must be >= 0");
@@ -121,6 +124,7 @@ static void Allocate(int length, Allocator allocator, out NativeArray<T> array)
 
         public int Length
         {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
             {
                 return m_Length;
@@ -148,35 +152,35 @@ internal static void IsUnmanagedAndThrow()
         }
 
         [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         void CheckElementReadAccess(int index)
         {
             if (index < m_MinIndex || index > m_MaxIndex)
                 FailOutOfRangeError(index);
 
-            var versionPtr = (int*)m_Safety.versionNode;
-            if (m_Safety.version != ((*versionPtr) & AtomicSafetyHandle.ReadCheck))
-                AtomicSafetyHandle.CheckReadAndThrowNoEarlyOut(m_Safety);
+            AtomicSafetyHandle.CheckReadAndThrow(m_Safety);
         }
 
         [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         void CheckElementWriteAccess(int index)
         {
             if (index < m_MinIndex || index > m_MaxIndex)
                 FailOutOfRangeError(index);
 
-            var versionPtr = (int*)m_Safety.versionNode;
-            if (m_Safety.version != ((*versionPtr) & AtomicSafetyHandle.WriteCheck))
-                AtomicSafetyHandle.CheckWriteAndThrowNoEarlyOut(m_Safety);
+            AtomicSafetyHandle.CheckWriteAndThrow(m_Safety);
         }
 
         public T this[int index]
         {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
             {
                 CheckElementReadAccess(index);
                 return UnsafeUtility.ReadArrayElement<T>(m_Buffer, index);
             }
 
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             [WriteAccessRequired]
             set
             {
@@ -185,14 +189,23 @@ public T this[int index]
             }
         }
 
-        public bool IsCreated => m_Buffer != null;
+        public bool IsCreated
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => m_Buffer != null;
+        }
 
         [WriteAccessRequired]
         public void Dispose()
         {
-            if (m_Buffer == null)
+            if (m_AllocatorLabel != Allocator.None
+            && !AtomicSafetyHandle.IsDefaultValue(m_Safety))
             {
-                throw new ObjectDisposedException("The NativeArray is already disposed.");
+                AtomicSafetyHandle.CheckExistsAndThrow(m_Safety);
+            }
+            if (!IsCreated)
+            {
+                return;
             }
 
             if (m_AllocatorLabel == Allocator.Invalid)
@@ -200,6 +213,11 @@ public void Dispose()
                 throw new InvalidOperationException("The NativeArray can not be Disposed because it was not allocated with a valid allocator.");
             }
 
+            if (m_AllocatorLabel >= Allocator.FirstUserIndex)
+            {
+                throw new InvalidOperationException("The NativeArray can not be Disposed because it was allocated with a custom allocator, use CollectionHelper.Dispose in com.unity.collections package.");
+            }
+
             if (m_AllocatorLabel > Allocator.None)
             {
                 AtomicSafetyHandle.DisposeHandle(ref m_Safety);
@@ -212,14 +230,19 @@ public void Dispose()
 
         public JobHandle Dispose(JobHandle inputDeps)
         {
-            if (m_AllocatorLabel == Allocator.Invalid)
+            if (m_AllocatorLabel != Allocator.None
+            && !AtomicSafetyHandle.IsDefaultValue(m_Safety))
             {
-                throw new InvalidOperationException("The NativeArray can not be Disposed because it was not allocated with a valid allocator.");
+                AtomicSafetyHandle.CheckExistsAndThrow(m_Safety);
+            }
+            if (!IsCreated)
+            {
+                return inputDeps;
             }
 
-            if (m_Buffer == null)
+            if (m_AllocatorLabel >= Allocator.FirstUserIndex)
             {
-                throw new InvalidOperationException("The NativeArray is already disposed.");
+                throw new InvalidOperationException("The NativeArray can not be Disposed because it was allocated with a custom allocator, use CollectionHelper.Dispose in com.unity.collections package.");
             }
 
             if (m_AllocatorLabel > Allocator.None)
@@ -307,21 +330,31 @@ public struct Enumerator : IEnumerator<T>
         {
             NativeArray<T> m_Array;
             int m_Index;
+            T value;
 
             public Enumerator(ref NativeArray<T> array)
             {
                 m_Array = array;
                 m_Index = -1;
+                value = default;
             }
 
             public void Dispose()
             {
             }
 
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             public bool MoveNext()
             {
                 m_Index++;
-                return m_Index < m_Array.Length;
+                if (m_Index < m_Array.m_Length)
+                {
+                    AtomicSafetyHandle.CheckReadAndThrow(m_Array.m_Safety);
+                    value = UnsafeUtility.ReadArrayElement<T>(m_Array.m_Buffer, m_Index);
+                    return true;
+                }
+                value = default;
+                return false;
             }
 
             public void Reset()
@@ -330,9 +363,23 @@ public void Reset()
             }
 
             // Let NativeArray indexer check for out of range.
-            public T Current => m_Array[m_Index];
+            public T Current
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get
+                {
+                    return value;
+                }
+            }
 
-            object IEnumerator.Current => Current;
+            object IEnumerator.Current
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get
+                {
+                    return Current;
+                }
+            }
         }
 
         public bool Equals(NativeArray<T> other)
@@ -713,6 +760,7 @@ internal ReadOnly(void* buffer, int length, ref AtomicSafetyHandle safety)
 
             public int Length
             {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
                 get
                 {
                     return m_Length;
@@ -738,6 +786,7 @@ public NativeArray<U>.ReadOnly Reinterpret<U>() where U : struct
 
             public T this[int index]
             {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
                 get
                 {
                     CheckElementReadAccess(index);
@@ -754,40 +803,53 @@ public ref readonly T UnsafeElementAt(int index)
             }
 
             [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             void CheckElementReadAccess(int index)
             {
-                if (index < 0 || index >= m_Length)
+                if ((uint)index >= (uint)m_Length)
                 {
                     throw new IndexOutOfRangeException($"Index {index} is out of range (must be between 0 and {m_Length-1}).");
                 }
 
-                var versionPtr = (int*)m_Safety.versionNode;
-                if (m_Safety.version != ((*versionPtr) & AtomicSafetyHandle.ReadCheck))
-                    AtomicSafetyHandle.CheckReadAndThrowNoEarlyOut(m_Safety);
+                AtomicSafetyHandle.CheckReadAndThrow(m_Safety);
             }
 
-            public bool IsCreated => m_Buffer != null;
+            public bool IsCreated
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get => m_Buffer != null;
+            }
 
             [ExcludeFromDocs]
             public struct Enumerator : IEnumerator<T>
             {
                 ReadOnly m_Array;
                 int m_Index;
+                T value;
 
                 public Enumerator(in ReadOnly array)
                 {
                     m_Array = array;
                     m_Index = -1;
+                    value = default;
                 }
 
                 public void Dispose()
                 {
                 }
 
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
                 public bool MoveNext()
                 {
                     m_Index++;
-                    return m_Index < m_Array.Length;
+                    if (m_Index < m_Array.m_Length)
+                    {
+                        AtomicSafetyHandle.CheckReadAndThrow(m_Array.m_Safety);
+                        value = UnsafeUtility.ReadArrayElement<T>(m_Array.m_Buffer, m_Index);
+                        return true;
+                    }
+                    value = default;
+                    return false;
                 }
 
                 public void Reset()
@@ -796,7 +858,11 @@ public void Reset()
                 }
 
                 // Let NativeArray indexer check for out of range.
-                public T Current => m_Array[m_Index];
+                public T Current
+                {
+                    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                    get => value;
+                }
 
                 object IEnumerator.Current => Current;
             }
@@ -868,6 +934,7 @@ public void Dispose()
     }
 
     // [BurstCompile] - can't use attribute since it's inside com.unity.Burst.
+    [NativeClass(null)]
     internal struct NativeArrayDisposeJob : IJob
     {
         internal NativeArrayDispose Data;
@@ -876,6 +943,14 @@ public void Execute()
         {
             Data.Dispose();
         }
+
+        [RequiredByNativeCode]
+        internal static void RegisterNativeArrayDisposeJobReflectionData()
+        {
+            // Necessary so we may schedule NativeArrayDisposeJob from
+            // burst compiled codepaths
+            IJobExtensions.EarlyJobInit<NativeArrayDisposeJob>();
+        }
     }
 
     /// <summary>
@@ -1008,3 +1083,4 @@ public static unsafe NativeArray<T> ConvertExistingDataToNativeArray<T>(void* da
         }
     }
 }
+
diff --git a/Runtime/Export/NumericFieldDraggerUtility.cs b/Runtime/Export/NumericFieldDraggerUtility.cs
index f2e4638fe5..1d8bc66cb6 100644
--- a/Runtime/Export/NumericFieldDraggerUtility.cs
+++ b/Runtime/Export/NumericFieldDraggerUtility.cs
@@ -59,7 +59,17 @@ internal static double CalculateFloatDragSensitivity(double value, double minVal
 
         internal static long CalculateIntDragSensitivity(long value)
         {
-            return (long)Math.Max(1, Math.Pow(Math.Abs((double)value), 0.5) * kDragSensitivity);
+            return (long)CalculateIntDragSensitivity((double)value);
+        }
+
+        internal static ulong CalculateIntDragSensitivity(ulong value)
+        {
+            return (ulong)CalculateIntDragSensitivity((double)value);
+        }
+
+        private static double CalculateIntDragSensitivity(double value)
+        {
+            return Math.Max(1, Math.Pow(Math.Abs(value), 0.5) * kDragSensitivity);
         }
 
         internal static long CalculateIntDragSensitivity(long value, long minValue, long maxValue)
diff --git a/Runtime/Export/PlayerLoop/PlayerLoop.bindings.cs b/Runtime/Export/PlayerLoop/PlayerLoop.bindings.cs
index 519981427c..dcae33da87 100644
--- a/Runtime/Export/PlayerLoop/PlayerLoop.bindings.cs
+++ b/Runtime/Export/PlayerLoop/PlayerLoop.bindings.cs
@@ -268,6 +268,8 @@ public struct DirectorRenderImage {}
         [RequiredByNativeCode]
         public struct PlayerEmitCanvasGeometry {}
         [RequiredByNativeCode]
+        internal struct PlayerRenderUIEBatchModeOffscreen {}
+        [RequiredByNativeCode]
         public struct FinishFrameRendering {}
         [RequiredByNativeCode]
         public struct BatchModeUpdate {}
diff --git a/Runtime/Export/RenderPipeline/AttachmentDescriptor.cs b/Runtime/Export/RenderPipeline/AttachmentDescriptor.cs
index 2120b3ac23..f1d498da5d 100644
--- a/Runtime/Export/RenderPipeline/AttachmentDescriptor.cs
+++ b/Runtime/Export/RenderPipeline/AttachmentDescriptor.cs
@@ -48,7 +48,18 @@ public GraphicsFormat graphicsFormat
         // The format of this attachment, legacy.
         public RenderTextureFormat format
         {
-            get { return GraphicsFormatUtility.GetRenderTextureFormat(m_Format); }
+            get
+            {
+#pragma warning disable 618 // Disable deprecation warnings on the ShadowAuto format
+                if (GraphicsFormatUtility.IsDepthStencilFormat(m_Format) && m_Format != GraphicsFormat.ShadowAuto)
+#pragma warning restore 618
+                {
+                    return RenderTextureFormat.Depth;
+                    // Note that there is no way for us to identify the descriptor as "RenderTextureFormat.ShadowMap" when m_Format != ShadowAuto.
+                    // This is because the ShadowSamplingMode is not relevant to AttachmentDescriptors. (attachments aren't sampled)
+                }
+                return GraphicsFormatUtility.GetRenderTextureFormat(m_Format);
+            }
             set { m_Format = GraphicsFormatUtility.GetGraphicsFormat(value, RenderTextureReadWrite.Default); }
         }
 
diff --git a/Runtime/Export/RenderPipeline/CullingParameters.cs b/Runtime/Export/RenderPipeline/CullingParameters.cs
index 72f82a5ee9..d9d2a7322d 100644
--- a/Runtime/Export/RenderPipeline/CullingParameters.cs
+++ b/Runtime/Export/RenderPipeline/CullingParameters.cs
@@ -8,6 +8,7 @@
 using System.Runtime.InteropServices;
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine.Scripting;
+using Unity.Collections;
 
 namespace UnityEngine.Rendering
 {
@@ -581,4 +582,18 @@ public override int GetHashCode()
             return !left.Equals(right);
         }
     }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct LightShadowCasterCullingInfo
+    {
+        public RangeInt splitRange;
+        public BatchCullingProjectionType projectionType;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ShadowCastersCullingInfos
+    {
+        public NativeArray<ShadowSplitData> splitBuffer;
+        public NativeArray<LightShadowCasterCullingInfo> perLightInfos;
+    }
 }
diff --git a/Runtime/Export/RenderPipeline/CullingResults.cs b/Runtime/Export/RenderPipeline/CullingResults.cs
index 6bbc500865..a2ba3a2fd0 100644
--- a/Runtime/Export/RenderPipeline/CullingResults.cs
+++ b/Runtime/Export/RenderPipeline/CullingResults.cs
@@ -156,14 +156,8 @@ internal void Validate()
             if (ptr == IntPtr.Zero)
                 throw new InvalidOperationException($"The {nameof(CullingResults)} instance is invalid. This can happen if you construct an instance using the default constructor.");
 
-            try
-            {
-                AtomicSafetyHandle.CheckExistsAndThrow(m_Safety);
-            }
-            catch (Exception e)
-            {
-                throw new InvalidOperationException($"The {nameof(CullingResults)} instance is no longer valid. This can happen if you re-use it across multiple frames.", e);
-            }
+            if (!AtomicSafetyHandle.IsHandleValid(m_Safety))
+                throw new InvalidOperationException($"The {nameof(CullingResults)} instance is no longer valid. This can happen if you re-use it across multiple frames.");
         }
 
         public unsafe bool Equals(CullingResults other)
diff --git a/Runtime/Export/RenderPipeline/InvalidImportException.cs b/Runtime/Export/RenderPipeline/InvalidImportException.cs
new file mode 100644
index 0000000000..f2129a8c57
--- /dev/null
+++ b/Runtime/Export/RenderPipeline/InvalidImportException.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 UnityEngine.Rendering
+{
+    public class InvalidImportException : Exception
+    {
+        public InvalidImportException(string message)
+            : base(message)
+        {
+        }
+    }
+}
diff --git a/Runtime/Export/RenderPipeline/ObjectIdRequest.cs b/Runtime/Export/RenderPipeline/ObjectIdRequest.cs
new file mode 100644
index 0000000000..e2cf2dc9f5
--- /dev/null
+++ b/Runtime/Export/RenderPipeline/ObjectIdRequest.cs
@@ -0,0 +1,69 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace UnityEngine.Rendering
+{
+    public class ObjectIdRequest
+    {
+       /// <remarks>
+       /// A destination RenderTexture must be available in order for the request to be completed successfully
+       /// </remarks>
+       [NotNull]
+       public RenderTexture destination { get; set; }
+       public int mipLevel { get; set; }
+       public CubemapFace face { get; set; }
+       public int slice { get; set; }
+
+       /// <remarks>
+       /// Will be null until the request has been completed
+       /// </remarks>
+       [MaybeNull]
+       public ObjectIdResult result { get; internal set; }
+
+       public ObjectIdRequest(
+           [NotNull] RenderTexture destination,
+           int mipLevel = 0,
+           CubemapFace face = CubemapFace.Unknown,
+           int slice = 0)
+       {
+           this.destination = destination;
+           this.mipLevel = mipLevel;
+           this.face = face;
+           this.slice = slice;
+       }
+    }
+
+    public class ObjectIdResult
+    {
+        // idToObjectMapping[index] is a buffer mapping indices to objects, corresponding to the encoded colors in the destination RenderTexture.
+        // DecodeIdFromColor can be used to decode the RGBA colors in the destination RenderTexture to an index that can be looked up in this buffer.
+        //
+        // In order to use this information on the GPU, some sort of texture/buffer should be filled in C# (e.g. `colors[IdToObjectMapping.length]`) that
+        // contains the per-object information required in the shader for each object. The shader then loads the RGBA pixel from the destination render texture,
+        // decodes it to an index index (using the same math as in DecodeIdFromColor), then uses index to look up the per-object property stored in the buffer.
+        // The per-object property buffer is "tightly" packed only containing relevant objects for the current camera view (so at most a few 100s or 1000s).
+       [NotNull]
+       public Object[]  idToObjectMapping { get; }
+
+       internal ObjectIdResult(Object[] idToObjectMapping)
+       {
+           this.idToObjectMapping = idToObjectMapping;
+       }
+
+       public static int DecodeIdFromColor(Color color)
+       {
+           // This logic must be the inverse of the logic in `ColorRGBA32 PickingEncodeIndex(UInt32 index)` in picking.cpp
+           return (int)(color.r * 255) +
+                 ((int)(color.g * 255) <<  8) +
+                 ((int)(color.b * 255) << 16) +
+                 ((int)(color.a * 255) << 24);
+       }
+    }
+}
+
+
+
diff --git a/Runtime/Export/RenderPipeline/RenderPipeline.cs b/Runtime/Export/RenderPipeline/RenderPipeline.cs
index 5524d3f17d..83b7900f5e 100644
--- a/Runtime/Export/RenderPipeline/RenderPipeline.cs
+++ b/Runtime/Export/RenderPipeline/RenderPipeline.cs
@@ -11,7 +11,7 @@ public abstract class RenderPipeline
     {
         protected abstract void Render(ScriptableRenderContext context, Camera[] cameras);
         protected virtual void ProcessRenderRequests<RequestData>(ScriptableRenderContext context, Camera camera, RequestData renderRequest) { }
-        protected virtual bool IsRenderRequestSupported<RequestData>(Camera camera, RequestData data) { return false; }
+        protected internal virtual bool IsRenderRequestSupported<RequestData>(Camera camera, RequestData data) { return false; }
 
         protected static void BeginFrameRendering(ScriptableRenderContext context, Camera[] cameras)
         {
@@ -66,16 +66,23 @@ internal void InternalProcessRenderRequests<RequestData>(ScriptableRenderContext
 
         public static bool SupportsRenderRequest<RequestData>(Camera camera, RequestData data)
         {
+            var pipelineExistsAndSupportsRequest = false;
             if (GraphicsSettings.currentRenderPipeline != null)
             {
                 if(RenderPipelineManager.currentPipeline == null)
                 {
                     RenderPipelineManager.PrepareRenderPipeline(GraphicsSettings.currentRenderPipeline);
                 }
-                return RenderPipelineManager.currentPipeline.IsRenderRequestSupported(camera, data);
+                pipelineExistsAndSupportsRequest =
+                    RenderPipelineManager.currentPipeline.IsRenderRequestSupported(camera, data);
             }
-
-            return false;
+            if (data is ObjectIdRequest)
+            {
+                // There is a built-in fallback option available for ObjectIdRequest in editor;
+                // see Camera.SubmitRenderRequest
+                return true;
+            }
+            return pipelineExistsAndSupportsRequest;
         }
 
         public static void SubmitRenderRequest<RequestData>(Camera camera, RequestData data)
diff --git a/Runtime/Export/RenderPipeline/RenderPipelineAsset.cs b/Runtime/Export/RenderPipeline/RenderPipelineAsset.cs
index 00b104133c..6d758cedd4 100644
--- a/Runtime/Export/RenderPipeline/RenderPipelineAsset.cs
+++ b/Runtime/Export/RenderPipeline/RenderPipelineAsset.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.Rendering
 {
     public abstract class RenderPipelineAsset : ScriptableObject
@@ -11,16 +13,23 @@ internal RenderPipeline InternalCreatePipeline()
             RenderPipeline pipeline = null;
             try
             {
+                EnsureGlobalSettings();
                 pipeline = CreatePipeline();
             }
-            catch (System.Exception e)
+            catch (InvalidImportException)
             {
                 // This can be called at a time where AssetDatabase is not available for loading.
                 // When this happens, the GUID can be get but the resource loaded will be null.
                 // In SRP using the ResourceReloader mechanism in CoreRP, it checks this and add InvalidImport data when this occurs.
-                if (!(e.Data.Contains("InvalidImport") && e.Data["InvalidImport"] is int && (int)e.Data["InvalidImport"] == 1))
-                    Debug.LogException(e);
             }
+
+            catch (Exception e)
+            {
+                Debug.LogException(e);
+            }
+            
+            if (renderPipelineType != null && pipeline != null && renderPipelineType != pipeline.GetType())
+                Debug.LogWarning($"{GetType()}.{nameof(CreatePipeline)}. Type error: {renderPipelineType} is different from {pipeline.GetType()}. The property {nameof(renderPipelineType)} must return the same type");
             return pipeline;
         }
 
@@ -69,6 +78,21 @@ internal RenderPipeline InternalCreatePipeline()
 
         protected abstract RenderPipeline CreatePipeline();
 
+        protected internal virtual Type renderPipelineType
+        {
+            get
+            {
+                Debug.LogWarning(
+                    $"You must either inherit from {nameof(RenderPipelineAsset)}<TRenderPipeline> or override {nameof(renderPipelineType)} property");
+                return null;
+            }
+        }
+
+        protected virtual void EnsureGlobalSettings()
+        {
+
+        }
+
         protected virtual void OnValidate()
         {
             if (RenderPipelineManager.s_CurrentPipelineAsset == this)
@@ -83,4 +107,10 @@ protected virtual void OnDisable()
             RenderPipelineManager.CleanupRenderPipeline();
         }
     }
+
+    public abstract class RenderPipelineAsset<TRenderPipeline> : RenderPipelineAsset
+        where TRenderPipeline : RenderPipeline
+    {
+        protected internal sealed override Type renderPipelineType => typeof(TRenderPipeline);
+    }
 }
diff --git a/Runtime/Export/RenderPipeline/RenderPipelineManager.cs b/Runtime/Export/RenderPipeline/RenderPipelineManager.cs
index 88e4da8970..23f6745b20 100644
--- a/Runtime/Export/RenderPipeline/RenderPipelineManager.cs
+++ b/Runtime/Export/RenderPipeline/RenderPipelineManager.cs
@@ -15,10 +15,11 @@ public static class RenderPipelineManager
         internal static RenderPipelineAsset s_CurrentPipelineAsset;
         static List<Camera> s_Cameras = new List<Camera>();
 
-        private static string s_CurrentPipelineType;
+        private static string s_CurrentPipelineType = k_BuiltinPipelineName;
         const string k_BuiltinPipelineName = "Built-in Pipeline";
 
         private static RenderPipeline s_CurrentPipeline = null;
+
         public static RenderPipeline currentPipeline
         {
             get => s_CurrentPipeline;
@@ -29,20 +30,24 @@ private set
             }
         }
 
+        public static event Action<ScriptableRenderContext, Camera[]> beginFrameRendering;
+        public static event Action<ScriptableRenderContext, Camera[]> endFrameRendering;
         public static event Action<ScriptableRenderContext, List<Camera>> beginContextRendering;
         public static event Action<ScriptableRenderContext, List<Camera>> endContextRendering;
-        public static event Action<ScriptableRenderContext, Camera[]> beginFrameRendering;
         public static event Action<ScriptableRenderContext, Camera> beginCameraRendering;
-        public static event Action<ScriptableRenderContext, Camera[]> endFrameRendering;
         public static event Action<ScriptableRenderContext, Camera> endCameraRendering;
 
         public static event Action activeRenderPipelineTypeChanged;
         public static event Action<RenderPipelineAsset, RenderPipelineAsset> activeRenderPipelineAssetChanged;
 
+        public static event Action activeRenderPipelineCreated;
+        public static event Action activeRenderPipelineDisposed;
+        public static bool pipelineSwitchCompleted => ReferenceEquals(s_CurrentPipelineAsset, GraphicsSettings.currentRenderPipeline) && !IsPipelineRequireCreation();
+
         internal static void BeginContextRendering(ScriptableRenderContext context, List<Camera> cameras)
         {
-            beginFrameRendering?.Invoke(context, cameras.ToArray());
             beginContextRendering?.Invoke(context, cameras);
+            beginFrameRendering?.Invoke(context, cameras.ToArray());
         }
 
         internal static void BeginCameraRendering(ScriptableRenderContext context, Camera camera)
@@ -92,6 +97,7 @@ internal static void CleanupRenderPipeline()
         {
             if (currentPipeline != null && !currentPipeline.disposed)
             {
+                activeRenderPipelineDisposed?.Invoke();
                 currentPipeline.Dispose();
                 s_CurrentPipelineAsset = null;
                 currentPipeline = null;
@@ -130,11 +136,13 @@ internal static void PrepareRenderPipeline(RenderPipelineAsset pipelineAsset)
         {
             HandleRenderPipelineChange(pipelineAsset);
 
-            if (s_CurrentPipelineAsset != null
-                && (currentPipeline == null || currentPipeline.disposed))
+            if (IsPipelineRequireCreation())
             {
                 currentPipeline = s_CurrentPipelineAsset.InternalCreatePipeline();
+                activeRenderPipelineCreated?.Invoke();
             }
         }
+
+        static bool IsPipelineRequireCreation() => s_CurrentPipelineAsset != null && (currentPipeline == null || currentPipeline.disposed);
     }
 }
diff --git a/Runtime/Export/RenderPipeline/RendererList.bindings.cs b/Runtime/Export/RenderPipeline/RendererList.bindings.cs
index 7d5471cf2c..2fe73405f0 100644
--- a/Runtime/Export/RenderPipeline/RendererList.bindings.cs
+++ b/Runtime/Export/RenderPipeline/RendererList.bindings.cs
@@ -21,6 +21,7 @@ public struct RendererList
         internal UInt32 index;
         internal UInt32 frame;
         internal UInt32 type;
+        internal UInt32 contextID;
 
         extern public bool isValid { get; }
 
@@ -32,6 +33,7 @@ internal RendererList(UIntPtr ctx, UInt32 indx)
             index = indx;
             frame = 0;
             type = 0;
+            contextID = 0;
         }
     }
 
diff --git a/Runtime/Export/RenderPipeline/ScriptableRenderContext.bindings.cs b/Runtime/Export/RenderPipeline/ScriptableRenderContext.bindings.cs
index 5936465636..e40b10857c 100644
--- a/Runtime/Export/RenderPipeline/ScriptableRenderContext.bindings.cs
+++ b/Runtime/Export/RenderPipeline/ScriptableRenderContext.bindings.cs
@@ -33,6 +33,9 @@ public partial struct ScriptableRenderContext
         [FreeFunction("ScriptableRenderPipeline_Bindings::Internal_Cull")]
         static extern void Internal_Cull(ref ScriptableCullingParameters parameters, ScriptableRenderContext renderLoop, IntPtr results);
 
+        [FreeFunction("ScriptableRenderPipeline_Bindings::Internal_CullShadowCasters")]
+        static extern void Internal_CullShadowCasters(ScriptableRenderContext renderLoop, IntPtr context);
+
         [FreeFunction("InitializeSortSettings")]
         internal static extern void InitializeSortSettings(Camera camera, out SortingSettings sortingSettings);
 
diff --git a/Runtime/Export/RenderPipeline/ScriptableRenderContext.cs b/Runtime/Export/RenderPipeline/ScriptableRenderContext.cs
index d30b4caea7..5da4b29c27 100644
--- a/Runtime/Export/RenderPipeline/ScriptableRenderContext.cs
+++ b/Runtime/Export/RenderPipeline/ScriptableRenderContext.cs
@@ -277,6 +277,82 @@ public unsafe CullingResults Cull(ref ScriptableCullingParameters parameters)
             return results;
         }
 
+        // Match with struct in Internal_CullShadowCasters C++ side
+        unsafe struct CullShadowCastersContext
+        {
+            public IntPtr cullResults;
+            public ShadowSplitData* splitBuffer;
+            public int splitBufferCount;
+            public LightShadowCasterCullingInfo* perLightInfos;
+            public int perLightInfoCount;
+        }
+
+        unsafe void ValidateCullShadowCastersParameters(in CullingResults cullingResults, in ShadowCastersCullingInfos cullingInfos)
+        {
+            if (cullingResults.ptr == null)
+            {
+                throw new UnityException("CullingResults is null");
+            }
+
+            // Always valid to provide 0 range
+            if (cullingInfos.perLightInfos.Length == 0)
+                return;
+
+            if (cullingResults.visibleLights.Length != cullingInfos.perLightInfos.Length)
+            {
+                throw new UnityException($"CullingResults.visibleLights.Length ({cullingResults.visibleLights.Length}) != ShadowCastersCullingInfos.perLightInfos.Length ({cullingInfos.perLightInfos.Length}). " +
+                    "ShadowCastersCullingInfos.perLightInfos must have one entry per visible light.");
+            }
+
+            LightShadowCasterCullingInfo* perLightInfosPtr = (LightShadowCasterCullingInfo*)cullingInfos.perLightInfos.GetUnsafeReadOnlyPtr();
+
+            for (int i = 0; i < cullingInfos.perLightInfos.Length; ++i)
+            {
+                ref readonly LightShadowCasterCullingInfo infos = ref perLightInfosPtr[i];
+                RangeInt range = infos.splitRange;
+                int begin = range.start;
+                int length = range.length;
+                int end = begin + length;
+
+                // Null ranges are always valid
+                if (begin == 0 && length == 0)
+                    continue;
+
+                bool isBeginValid = begin >= 0 && begin <= cullingInfos.splitBuffer.Length;
+                bool isLengthValid = length >= 0;
+                bool isEndValid = end >= begin && end <= cullingInfos.splitBuffer.Length;
+                bool isRangeValid = isBeginValid && isLengthValid && isEndValid;
+                if (!isRangeValid)
+                {
+                    throw new UnityException($"ShadowCastersCullingInfos.perLightInfos[{i}] is referring to an invalid memory location. " +
+                        $"splitRange.start ({range.start}) splitRange.length ({range.length}) " +
+                        $"ShadowCastersCullingInfos.splitBuffer.Length ({cullingInfos.splitBuffer.Length}).");
+                }
+
+                if (length > 0 && infos.projectionType == BatchCullingProjectionType.Unknown)
+                {
+                    throw new UnityException($"ShadowCastersCullingInfos.perLightInfos[{i}].projectionType == {infos.projectionType}. "
+                        + $"The range however appears to be valid. splitRange.start ({range.start}) splitRange.length ({range.length})\n");
+                }
+            }
+        }
+
+        public unsafe void CullShadowCasters(CullingResults cullingResults, ShadowCastersCullingInfos infos)
+        {
+            Validate();
+
+            ValidateCullShadowCastersParameters(cullingResults, infos);
+
+            CullShadowCastersContext context = default;
+            context.cullResults = cullingResults.ptr;
+            context.splitBuffer = (ShadowSplitData*)infos.splitBuffer.GetUnsafePtr();
+            context.splitBufferCount = infos.splitBuffer.Length;
+            context.perLightInfos = (LightShadowCasterCullingInfo*)infos.perLightInfos.GetUnsafePtr();
+            context.perLightInfoCount = infos.perLightInfos.Length;
+
+            Internal_CullShadowCasters(this, (IntPtr)(&context));
+        }
+
         [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
         internal void Validate()
         {
diff --git a/Runtime/Export/RenderPipeline/ShadowDrawingSettings.cs b/Runtime/Export/RenderPipeline/ShadowDrawingSettings.cs
index ee25565a40..96642ea7f5 100644
--- a/Runtime/Export/RenderPipeline/ShadowDrawingSettings.cs
+++ b/Runtime/Export/RenderPipeline/ShadowDrawingSettings.cs
@@ -41,6 +41,7 @@ public bool useRenderingLayerMaskTest
             set { m_UseRenderingLayerMaskTest = value ? 1 : 0; }
         }
 
+        [Obsolete("ShadowDrawingSettings.splitData is deprecated. The equivalent data must be passed to ScriptableRenderContext.CullShadowCasters.")]
         public ShadowSplitData splitData
         {
             get { return m_SplitData; }
@@ -53,19 +54,14 @@ public ShadowObjectsFilter objectsFilter
             set { m_ObjectsFilter = value; }
         }
 
+        [Obsolete("ShadowDrawingSettings.projectionType is deprecated. There is no replacement for this parameter. You don't need to set it anymore.")]
         public BatchCullingProjectionType projectionType
         {
             get { return m_ProjectionType; }
             set { m_ProjectionType = value; }
         }
-
-        [Obsolete("ShadowDrawingSettings(CullingResults, int) is deprecated. Use ShadowDrawingSettings(CullingResults, int, BatchCullingProjectionType) instead.")]
+        
         public ShadowDrawingSettings(CullingResults cullingResults, int lightIndex)
-            : this(cullingResults, lightIndex, BatchCullingProjectionType.Unknown)
-        {
-        }
-
-        public ShadowDrawingSettings(CullingResults cullingResults, int lightIndex, BatchCullingProjectionType projectionType)
         {
             m_CullingResults = cullingResults;
             m_LightIndex = lightIndex;
@@ -73,6 +69,13 @@ public ShadowDrawingSettings(CullingResults cullingResults, int lightIndex, Batc
             m_SplitData = default(ShadowSplitData);
             m_SplitData.shadowCascadeBlendCullingFactor = 1f;
             m_ObjectsFilter = ShadowObjectsFilter.AllObjects;
+            m_ProjectionType = BatchCullingProjectionType.Unknown;
+        }
+
+        [Obsolete("ShadowDrawingSettings(CullingResults, int, BatchCullingProjectionType) is deprecated. Use ShadowDrawingSettings(CullingResults, int) instead.")]
+        public ShadowDrawingSettings(CullingResults cullingResults, int lightIndex, BatchCullingProjectionType projectionType)
+            : this(cullingResults, lightIndex)
+        {
             m_ProjectionType = projectionType;
         }
 
diff --git a/Runtime/Export/RenderPipeline/SupportedRenderingFeatures.cs b/Runtime/Export/RenderPipeline/SupportedRenderingFeatures.cs
index 562931145e..20a31781d0 100644
--- a/Runtime/Export/RenderPipeline/SupportedRenderingFeatures.cs
+++ b/Runtime/Export/RenderPipeline/SupportedRenderingFeatures.cs
@@ -59,7 +59,7 @@ public enum LightmapMixedBakeModes
         public bool reflectionProbes { get; set; } = true;
         public bool reflectionProbesBlendDistance { get; set; } = true;
         public bool rendererPriority { get; set; } = false;
-        public bool rendersUIOverlay { get; set; }
+        public bool rendersUIOverlay { get; set; } = false;
         public bool overridesEnvironmentLighting { get; set; } = false;
         public bool overridesFog { get; set; } = false;
         public bool overridesRealtimeReflectionProbes { get; set; } = false;
@@ -74,7 +74,9 @@ public enum LightmapMixedBakeModes
         public bool autoDefaultReflectionProbeBaking { get; set; } = true;
         public bool overridesShadowmask { get; set; } = false;
         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 bool supportsHDR { get; set; } = false;
+        public bool supportsClouds { get; set; } = false;
+        public string overridesLightProbeSystemWarningMessage { get; set; } = "Light Probe Groups are unavailable as Probe Volumes have been enabled by the current Render Pipeline.";
 
         internal static unsafe MixedLightingMode FallbackMixedLightingMode()
         {
@@ -239,6 +241,12 @@ internal static unsafe void IsAutoDefaultReflectionProbeBakingSupported(IntPtr i
             var isSupported = (bool*)isSupportedPtr;
             *isSupported = active.autoDefaultReflectionProbeBaking;
         }
+        [RequiredByNativeCode]
+        internal static unsafe void OverridesLightProbeSystem(IntPtr overridesPtr)
+        {
+            var overrides = (bool*)overridesPtr;
+            *overrides = active.overridesLightProbeSystem;
+        }
 
         internal static unsafe int FallbackLightmapper()
         {
diff --git a/Runtime/Export/Rendering/BatchRendererGroup.bindings.cs b/Runtime/Export/Rendering/BatchRendererGroup.bindings.cs
index cd7c6a72e3..140f14798d 100644
--- a/Runtime/Export/Rendering/BatchRendererGroup.bindings.cs
+++ b/Runtime/Export/Rendering/BatchRendererGroup.bindings.cs
@@ -166,6 +166,14 @@ public enum BatchDrawCommandFlags : int
         LODCrossFade = 1 << 4, // Draw command instances have a 8-bit SNORM crossfade dither factor in the highest bits of their visible instance index
     }
 
+    // Match with CullLightmappedShadowCasters in C++ side
+    [Flags]
+    public enum BatchCullingFlags : int
+    {
+        None = 0,
+        CullLightmappedShadowCasters = 1,
+    }
+
     // Match with BatchCullingViewType in C++ side
     public enum BatchCullingViewType : int
     {
@@ -363,6 +371,7 @@ internal BatchCullingContext(
             Matrix4x4 inLocalToWorldMatrix,
             BatchCullingViewType inViewType,
             BatchCullingProjectionType inProjectionType,
+            BatchCullingFlags inBatchCullingFlags,
             ulong inViewID,
             uint inCullingLayerMask,
             ulong inSceneCullingMask,
@@ -375,6 +384,7 @@ internal BatchCullingContext(
             localToWorldMatrix = inLocalToWorldMatrix;
             viewType = inViewType;
             projectionType = inProjectionType;
+            cullingFlags = inBatchCullingFlags;
             viewID = new BatchPackedCullingViewID { handle = inViewID };
             cullingLayerMask = inCullingLayerMask;
             sceneCullingMask = inSceneCullingMask;
@@ -391,6 +401,7 @@ internal BatchCullingContext(
         readonly public Matrix4x4 localToWorldMatrix;
         readonly public BatchCullingViewType viewType;
         readonly public BatchCullingProjectionType projectionType;
+        readonly public BatchCullingFlags cullingFlags;
         readonly public BatchPackedCullingViewID viewID;
         readonly public uint cullingLayerMask;
         readonly public ulong sceneCullingMask;
@@ -422,6 +433,7 @@ unsafe struct BatchRendererCullingOutput
         public int cullingSplitCount;
         public BatchCullingViewType viewType;
         public BatchCullingProjectionType projectionType;
+        public BatchCullingFlags cullingFlags;
         public ulong viewID;
         public uint  cullingLayerMask;
         public ulong sceneCullingMask;
@@ -528,6 +540,9 @@ unsafe public BatchID AddBatch(NativeArray<MetadataValue> batchMetadata, Graphic
         private extern static BatchBufferTarget GetBufferTarget();
         public static BatchBufferTarget BufferTarget => GetBufferTarget();
 
+        public extern static int GetConstantBufferMaxWindowSize();
+        public extern static int GetConstantBufferOffsetAlignment();
+
         static extern unsafe IntPtr Create(BatchRendererGroup group, void* userContext);
         static extern void Destroy(IntPtr groupHandle);
 
@@ -557,6 +572,7 @@ unsafe static void InvokeOnPerformCulling(BatchRendererGroup group, ref BatchRen
                         context.localToWorldMatrix,
                         context.viewType,
                         context.projectionType,
+                        context.cullingFlags,
                         context.viewID,
                         context.cullingLayerMask,
                         context.sceneCullingMask,
diff --git a/Runtime/Export/Scripting/Awaitable.Threading.cs b/Runtime/Export/Scripting/Awaitable.Threading.cs
new file mode 100644
index 0000000000..46e5f2fed5
--- /dev/null
+++ b/Runtime/Export/Scripting/Awaitable.Threading.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;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace UnityEngine
+{
+    partial class Awaitable
+    {
+        static SynchronizationContext _synchronizationContext;
+        internal static void SetSynchronizationContext(SynchronizationContext synchronizationContext) {
+            _synchronizationContext = synchronizationContext;
+        }
+
+        public static MainThreadAwaitable MainThreadAsync()
+        {
+            return new MainThreadAwaitable(_synchronizationContext);
+        }
+
+        public static BackgroundThreadAwaitable BackgroundThreadAsync()
+        {
+            return new BackgroundThreadAwaitable(_synchronizationContext);
+        }
+    }
+
+    [Internal.ExcludeFromDocs]
+    public struct MainThreadAwaitable : INotifyCompletion
+    {
+        private readonly SynchronizationContext _synchronizationContext;
+        internal MainThreadAwaitable(SynchronizationContext syncContext)
+        {
+            _synchronizationContext = syncContext;
+        }
+
+        public MainThreadAwaitable GetAwaiter() => this;
+        public bool IsCompleted => _synchronizationContext == SynchronizationContext.Current;
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void GetResult() { }
+
+        public void OnCompleted(Action continuation)
+        {
+            _synchronizationContext.Post(DoOnCompleted, continuation);
+        }
+
+        static void DoOnCompleted(object continuation)
+        {
+            (continuation as Action)?.Invoke();
+        }
+    }
+
+    [Internal.ExcludeFromDocs]
+    public struct BackgroundThreadAwaitable : INotifyCompletion
+    {
+        private readonly SynchronizationContext _synchronizationContext;
+        internal BackgroundThreadAwaitable(SynchronizationContext syncContext)
+        {
+            _synchronizationContext = syncContext;
+        }
+
+        public BackgroundThreadAwaitable GetAwaiter() => this;
+        public bool IsCompleted => _synchronizationContext != SynchronizationContext.Current;
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void GetResult() { }
+
+        public void OnCompleted(Action continuation)
+        {
+            Task.Run(continuation);
+        }
+    }
+}
diff --git a/Runtime/Export/Scripting/Awaitable.cs b/Runtime/Export/Scripting/Awaitable.cs
index 1982a098cb..b5aa9aa52d 100644
--- a/Runtime/Export/Scripting/Awaitable.cs
+++ b/Runtime/Export/Scripting/Awaitable.cs
@@ -14,7 +14,7 @@ namespace UnityEngine
     /* Awaitable Coroutines are async/await compatible types specially tailored for running in Unity. (they can be awaited, and they can be used as return type
      * of an async method)
      * Compared to System.Threading.Tasks it is much less smart and takes shortcuts to improve performance based on
-     * Unity specific assumption. 
+     * Unity specific assumption.
      * Main differences compared to .net tasks:
     - Can be awaited only once: a given Awaitable object can't be awaited by multiple async functions. This is considered undefined behaviour
     (considering it undefined behaviour allows for optimizations non-achievable otherwise)
@@ -279,7 +279,7 @@ bool IEnumerator.MoveNext()
         {
             if (IsCompleted)
             {
-                RaiseManagedCompletion();
+                PropagateExceptionAndRelease();
                 return false;
             }
             return true;
diff --git a/Runtime/Export/Scripting/AwaitableCompletionSource.cs b/Runtime/Export/Scripting/AwaitableCompletionSource.cs
new file mode 100644
index 0000000000..f0727150bd
--- /dev/null
+++ b/Runtime/Export/Scripting/AwaitableCompletionSource.cs
@@ -0,0 +1,127 @@
+// 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.Threading;
+
+namespace UnityEngine
+{
+    public class AwaitableCompletionSource
+    {
+        volatile int _state; // 0: not raise, 1: raised or canceled
+        public Awaitable Awaitable { get; private set; } = Awaitable.NewManagedAwaitable();
+
+        public void SetResult()
+        {
+            if (!TrySetResult()) throw new InvalidOperationException("Can't raise completion of the same Awaitable twice");
+        }
+
+        public void SetCanceled()
+        {
+            if (!TrySetCanceled()) throw new InvalidOperationException("Can't raise completion of the same Awaitable twice");
+        }
+
+        public void SetException(Exception exception)
+        {
+            if (!TrySetException(exception)) throw new InvalidOperationException("Can't raise completion of the same Awaitable twice");
+        }
+
+        bool CheckAndAcquireCompletionState() => Interlocked.CompareExchange(ref _state, 1, 0) == 0;
+
+        public bool TrySetResult()
+        {
+            if (!CheckAndAcquireCompletionState())
+            {
+                return false;
+            }
+            Awaitable.RaiseManagedCompletion();
+            return true;
+        }
+
+        public bool TrySetCanceled()
+        {
+            if (!CheckAndAcquireCompletionState())
+            {
+                return false;
+            }
+            Awaitable.Cancel();
+            return true;
+        }
+
+        public bool TrySetException(Exception exception)
+        {
+            if (!CheckAndAcquireCompletionState())
+            {
+                return false;
+            }
+            Awaitable.RaiseManagedCompletion(exception);
+            return true;
+        }
+
+        public void Reset()
+        {
+            Awaitable = Awaitable.NewManagedAwaitable();
+            _state = 0;
+        }
+    }
+
+    public class AwaitableCompletionSource<T>
+    {
+        volatile int _state; // 0: not raised, 1: raised or canceled
+        public Awaitable<T> Awaitable { get; private set; } = Awaitable<T>.GetManaged();
+
+        public void SetResult(in T value)
+        {
+            if (!TrySetResult(value)) throw new InvalidOperationException("Can't raise completion of the same Awaitable twice");
+        }
+
+        public void SetCanceled()
+        {
+            if (!TrySetCanceled()) throw new InvalidOperationException("Can't raise completion of the same Awaitable twice");
+        }
+
+        public void SetException(Exception exception)
+        {
+            if (!TrySetException(exception)) throw new InvalidOperationException("Can't raise completion of the same Awaitable twice");
+        }
+
+        bool CheckAndAcquireCompletionState() => Interlocked.CompareExchange(ref _state, 1, 0) == 0;
+
+        public bool TrySetResult(in T value)
+        {
+            if (!CheckAndAcquireCompletionState())
+            {
+                return false;
+            }
+            Awaitable.SetResultAndRaiseContinuation(value);
+            return true;
+        }
+
+        public bool TrySetCanceled()
+        {
+            if (!CheckAndAcquireCompletionState())
+            {
+                return false;
+            }
+            Awaitable.Cancel();
+            return true;
+        }
+
+        public bool TrySetException(Exception exception)
+        {
+            if (!CheckAndAcquireCompletionState())
+            {
+                return false;
+            }
+            Awaitable.SetExceptionAndRaiseContinuation(exception);
+            return true;
+        }
+
+        public void Reset()
+        {
+            Awaitable = Awaitable<T>.GetManaged();
+            _state = 0;
+        }
+    }
+}
diff --git a/Runtime/Export/Scripting/EnumDataUtility.cs b/Runtime/Export/Scripting/EnumDataUtility.cs
index 00c06e2836..ffc123048d 100644
--- a/Runtime/Export/Scripting/EnumDataUtility.cs
+++ b/Runtime/Export/Scripting/EnumDataUtility.cs
@@ -24,18 +24,24 @@ internal struct EnumData
 
     internal static class EnumDataUtility
     {
-        private static readonly Dictionary<Type, EnumData> s_NonObsoleteEnumData = new Dictionary<Type, EnumData>();
-        private static readonly Dictionary<Type, EnumData> s_EnumData = new Dictionary<Type, EnumData>();
+        public enum CachedType
+        {
+            // Excludes all obsolete enum values.
+            ExcludeObsolete,
+
+            // Includes all enum values except those marked as Obsolete IsError.
+            IncludeObsoleteExceptErrors,
+
+            // Includes all enum values.
+            IncludeAllObsolete
+        }
+
+        private static readonly Dictionary<(CachedType, Type), EnumData> s_EnumData = new();
 
-        internal static EnumData GetCachedEnumData(Type enumType, bool excludeObsolete = true, Func<string, string> nicifyName = null)
+        internal static EnumData GetCachedEnumData(Type enumType, CachedType cachedType = CachedType.IncludeObsoleteExceptErrors, Func<string, string> nicifyName = null)
         {
             EnumData enumData;
-            if (excludeObsolete && s_NonObsoleteEnumData.TryGetValue(enumType, out enumData))
-            {
-                return enumData;
-            }
-
-            if (!excludeObsolete && s_EnumData.TryGetValue(enumType, out enumData))
+            if (s_EnumData.TryGetValue((cachedType, enumType), out enumData))
             {
                 return enumData;
             }
@@ -51,7 +57,7 @@ internal static EnumData GetCachedEnumData(Type enumType, bool excludeObsolete =
             int enumFieldslen = enumFields.Length;
             for (int j = 0; j < enumFieldslen; j++)
             {
-                if (CheckObsoleteAddition(enumFields[j], excludeObsolete))
+                if (CheckObsoleteAddition(enumFields[j], cachedType))
                     enumfieldlist.Add(enumFields[j]);
             }
 
@@ -98,12 +104,10 @@ 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)
+            for (int i = 0; i < enumfieldlist.Count; ++i)
             {
-                enumData.names[i] = enumData.values[i].ToString();
+                enumData.names[i] = enumfieldlist[i].Name;
             }
 
             // convert "everything" values to ~0 for unsigned 8- and 16-bit types
@@ -128,11 +132,7 @@ internal static EnumData GetCachedEnumData(Type enumType, bool excludeObsolete =
             enumData.serializable = enumData.underlyingType != typeof(long) && enumData.underlyingType != typeof(ulong);
 
             HandleInspectorOrderAttribute(enumType, ref enumData);
-
-            if (excludeObsolete)
-                s_NonObsoleteEnumData[enumType] = enumData;
-            else
-                s_EnumData[enumType] = enumData;
+            s_EnumData[(cachedType, enumType)] = enumData;
 
             return enumData;
         }
@@ -241,16 +241,19 @@ internal static void HandleInspectorOrderAttribute(Type enumType, ref EnumData e
             enumData.tooltip = tooltip;
         }
 
-        private static bool CheckObsoleteAddition(FieldInfo field, bool excludeObsolete)
+        private static bool CheckObsoleteAddition(FieldInfo field, CachedType cachedType)
         {
             var obsolete = field.GetCustomAttributes(typeof(ObsoleteAttribute), false);
             if (obsolete.Length > 0)
             {
-                if (excludeObsolete)
+                if (cachedType == CachedType.ExcludeObsolete)
                 {
                     return false;
                 }
 
+                if (cachedType == CachedType.IncludeAllObsolete)
+                    return true;
+
                 return !((ObsoleteAttribute)obsolete.First()).IsError;
             }
 
diff --git a/Runtime/Export/Scripting/UnityEngineObject.bindings.cs b/Runtime/Export/Scripting/UnityEngineObject.bindings.cs
index 5c6683f423..39abc01474 100644
--- a/Runtime/Export/Scripting/UnityEngineObject.bindings.cs
+++ b/Runtime/Export/Scripting/UnityEngineObject.bindings.cs
@@ -44,6 +44,20 @@ public enum HideFlags
         HideAndDontSave = HideInHierarchy | DontSaveInEditor | NotEditable | DontSaveInBuild | DontUnloadUnusedAsset
     }
 
+    // Must match Scripting::FindObjectsSortMode
+    public enum FindObjectsSortMode
+    {
+        None = 0,
+        InstanceID = 1
+    }
+
+    // Must match Scripting::FindObjectsInactive
+    public enum FindObjectsInactive
+    {
+        Exclude = 0,
+        Include = 1
+    }
+
     [StructLayout(LayoutKind.Sequential)]
     [RequiredByNativeCode(GenerateProxy = true)]
     [NativeHeader("Runtime/Export/Scripting/UnityEngineObject.bindings.h")]
@@ -284,17 +298,51 @@ public static void DestroyImmediate(Object obj)
             DestroyImmediate(obj, allowDestroyingAssets);
         }
 
-        // Returns a list of all active loaded objects of Type /type/.
+        /*
+         * Profiling enter/exit playmode with the Volvo Test Track project and Gigaya has shown that ~95% of the time spent in FindObjectsOfType() is spent sorting the array by InstanceID even though in almost all cases this is not thought to be necessary.
+         * In the Volvo project(2022.1) during a single enter/exit playmode cycle 203ms was spent in Object::FindObjectsOfType() of which 190ms was in the sorting(93.6%)
+         * In Gigaya(2021.3) during a single enter/exit playmode cycle 496ms was spent in Object::FindObjectsOfType() of which 461ms was in the sorting(92.9%)
+         * There has been a lengthy discussion in #devs-scripting about possible solutions to this (https://unity.slack.com/archives/C06TPSM32/p1651840563109579), the consensus is to deprecate FindObjectsOfType() and replace it with FindObjectsByType()
+         * which lets the user choose whether to perform the sort or not
+         * Note it is considered undesirable to have the API updater automatically convert FindObjectsOfType() to FindObjectsByType(FindObjectsSortMode.InstanceID) as we really want users to assess their usage on a case by case basis and only choose
+         * sorting when necessary to maximise the performance gain
+         * The plan is:
+         *   2023.1 :
+         *     FindObjectsOfType() Obsolete(warning), direct users to FindObjectsByType
+         *     FindObjectOfType() Obsolete(warning), direct users to FindFirstObjectByType and FindAnyObjectByType
+         *   2023.2
+         *     FindObjectsOfType() Obsolete(error), direct users to FindObjectsByType
+         *     FindObjectOfType() Obsolete(error), direct users to FindFirstObjectByType and FindAnyObjectByType
+         *   2024.2
+         *     FindObjectsOfType() deleted
+         *     FindObjectOfType() deleted
+         * This work is captured in https://jira.unity3d.com/browse/COPT-854
+         * */
+
+        // Returns a list of all active loaded objects of Type /type/. Results are sorted by InstanceID
+        [Obsolete("Object.FindObjectsOfType has been deprecated. Use Object.FindObjectsByType instead which lets you decide whether you need the results sorted or not.  FindObjectsOfType sorts the results by InstanceID, but if you do not need this using FindObjectSortMode.None is considerably faster.", false)]
         public static Object[] FindObjectsOfType(Type type)
         {
             return FindObjectsOfType(type, false);
         }
 
-        // Returns a list of all loaded objects of Type /type/.
+        // Returns a list of all loaded objects of Type /type/. Results are sorted by InstanceID
         [TypeInferenceRule(TypeInferenceRules.ArrayOfTypeReferencedByFirstArgument)]
         [FreeFunction("UnityEngineObjectBindings::FindObjectsOfType")]
+        [Obsolete("Object.FindObjectsOfType has been deprecated. Use Object.FindObjectsByType instead which lets you decide whether you need the results sorted or not.  FindObjectsOfType sorts the results by InstanceID but if you do not need this using FindObjectSortMode.None is considerably faster.", false)]
         public extern static Object[] FindObjectsOfType(Type type, bool includeInactive);
 
+        // Returns a list of all active loaded objects of Type /type/.
+        public static Object[] FindObjectsByType(Type type, FindObjectsSortMode sortMode)
+        {
+            return FindObjectsByType(type, FindObjectsInactive.Exclude, sortMode);
+        }
+
+        // Returns a list of all loaded objects of Type /type/.
+        [TypeInferenceRule(TypeInferenceRules.ArrayOfTypeReferencedByFirstArgument)]
+        [FreeFunction("UnityEngineObjectBindings::FindObjectsByType")]
+        public extern static Object[] FindObjectsByType(Type type, FindObjectsInactive findObjectsInactive, FindObjectsSortMode sortMode);
+
         // Makes the object /target/ not be destroyed automatically when loading a new scene.
         [FreeFunction("GetSceneManager().DontDestroyOnLoad", ThrowsException = true)]
         public extern static void DontDestroyOnLoad([NotNull("NullExceptionObject")] Object target);
@@ -320,7 +368,7 @@ public static void DestroyObject(Object obj)
         }
 
         //*undocumented* DEPRECATED
-        [Obsolete("warning use Object.FindObjectsOfType instead.")]
+        [Obsolete("Object.FindSceneObjectsOfType has been deprecated, Use Object.FindObjectsByType instead which lets you decide whether you need the results sorted or not.  FindSceneObjectsOfType sorts the results by InstanceID but if you do not need this using FindObjectSortMode.None is considerably faster.", false)]
         public static Object[] FindSceneObjectsOfType(Type type)
         {
             return FindObjectsOfType(type);
@@ -331,26 +379,65 @@ public static Object[] FindSceneObjectsOfType(Type type)
         [FreeFunction("UnityEngineObjectBindings::FindObjectsOfTypeIncludingAssets")]
         public extern static Object[] FindObjectsOfTypeIncludingAssets(Type type);
 
+        // Returns a list of all loaded objects of Type /type/. Results are sorted by InstanceID
+        [Obsolete("Object.FindObjectsOfType has been deprecated. Use Object.FindObjectsByType instead which lets you decide whether you need the results sorted or not.  FindObjectsOfType sorts the results by InstanceID but if you do not need this using FindObjectSortMode.None is considerably faster.", false)]
         public static T[] FindObjectsOfType<T>() where T : Object
         {
             return Resources.ConvertObjects<T>(FindObjectsOfType(typeof(T), false));
         }
 
+        // Returns a list of all loaded objects of Type /type/
+        public static T[] FindObjectsByType<T>(FindObjectsSortMode sortMode) where T : Object
+        {
+            return Resources.ConvertObjects<T>(FindObjectsByType(typeof(T), FindObjectsInactive.Exclude, sortMode));
+        }
+
+        // Returns a list of all loaded objects of Type /type/. Results are sorted by InstanceID
+        [Obsolete("Object.FindObjectsOfType has been deprecated. Use Object.FindObjectsByType instead which lets you decide whether you need the results sorted or not.  FindObjectsOfType sorts the results by InstanceID but if you do not need this using FindObjectSortMode.None is considerably faster.", false)]
         public static T[] FindObjectsOfType<T>(bool includeInactive) where T : Object
         {
             return Resources.ConvertObjects<T>(FindObjectsOfType(typeof(T), includeInactive));
         }
 
+        // Returns a list of all loaded objects of Type /type/. Order of results is not guaranteed to be consistent between calls
+        public static T[] FindObjectsByType<T>(FindObjectsInactive findObjectsInactive, FindObjectsSortMode sortMode) where T : Object
+        {
+            return Resources.ConvertObjects<T>(FindObjectsByType(typeof(T), findObjectsInactive, sortMode));
+        }
+
+
+        [Obsolete("Object.FindObjectOfType has been deprecated. Use Object.FindFirstObjectByType instead or if finding any instance is acceptable the faster Object.FindAnyObjectByType", false)]
         public static T FindObjectOfType<T>() where T : Object
         {
             return (T)FindObjectOfType(typeof(T), false);
         }
 
+        [Obsolete("Object.FindObjectOfType has been deprecated. Use Object.FindFirstObjectByType instead or if finding any instance is acceptable the faster Object.FindAnyObjectByType", false)]
         public static T FindObjectOfType<T>(bool includeInactive) where T : Object
         {
             return (T)FindObjectOfType(typeof(T), includeInactive);
         }
 
+        public static T FindFirstObjectByType<T>() where T : Object
+        {
+            return (T)FindFirstObjectByType(typeof(T), FindObjectsInactive.Exclude);
+        }
+
+        public static T FindAnyObjectByType<T>() where T : Object
+        {
+            return (T)FindAnyObjectByType(typeof(T), FindObjectsInactive.Exclude);
+        }
+
+        public static T FindFirstObjectByType<T>(FindObjectsInactive findObjectsInactive) where T : Object
+        {
+            return (T)FindFirstObjectByType(typeof(T), findObjectsInactive);
+        }
+
+        public static T FindAnyObjectByType<T>(FindObjectsInactive findObjectsInactive) where T : Object
+        {
+            return (T)FindAnyObjectByType(typeof(T), findObjectsInactive);
+        }
+
         [System.Obsolete("Please use Resources.FindObjectsOfTypeAll instead")]
         public static Object[] FindObjectsOfTypeAll(Type type)
         {
@@ -365,6 +452,7 @@ static private void CheckNullArgument(object arg, string message)
 
         // Returns the first active loaded object of Type /type/.
         [TypeInferenceRule(TypeInferenceRules.TypeReferencedByFirstArgument)]
+        [Obsolete("Object.FindObjectOfType has been deprecated. Use Object.FindFirstObjectByType instead or if finding any instance is acceptable the faster Object.FindAnyObjectByType", false)]
         public static Object FindObjectOfType(System.Type type)
         {
             Object[] objects = FindObjectsOfType(type, false);
@@ -374,8 +462,21 @@ public static Object FindObjectOfType(System.Type type)
                 return null;
         }
 
+        public static Object FindFirstObjectByType(System.Type type)
+        {
+            Object[] objects = FindObjectsByType(type, FindObjectsInactive.Exclude, FindObjectsSortMode.InstanceID);
+            return (objects.Length > 0) ? objects[0] : null;
+        }
+
+        public static Object FindAnyObjectByType(System.Type type)
+        {
+            Object[] objects = FindObjectsByType(type, FindObjectsInactive.Exclude, FindObjectsSortMode.None);
+            return (objects.Length > 0) ? objects[0] : null;
+        }
+
         // Returns the first active loaded object of Type /type/.
         [TypeInferenceRule(TypeInferenceRules.TypeReferencedByFirstArgument)]
+        [Obsolete("Object.FindObjectOfType has been deprecated. Use Object.FindFirstObjectByType instead or if finding any instance is acceptable the faster Object.FindAnyObjectByType", false)]
         public static Object FindObjectOfType(System.Type type, bool includeInactive)
         {
             Object[] objects = FindObjectsOfType(type, includeInactive);
@@ -385,6 +486,18 @@ public static Object FindObjectOfType(System.Type type, bool includeInactive)
                 return null;
         }
 
+        public static Object FindFirstObjectByType(System.Type type, FindObjectsInactive findObjectsInactive)
+        {
+            Object[] objects = FindObjectsByType(type, findObjectsInactive, FindObjectsSortMode.InstanceID);
+            return (objects.Length > 0) ? objects[0] : null;
+        }
+
+        public static Object FindAnyObjectByType(System.Type type, FindObjectsInactive findObjectsInactive)
+        {
+            Object[] objects = FindObjectsByType(type, findObjectsInactive, FindObjectsSortMode.None);
+            return (objects.Length > 0) ? objects[0] : null;
+        }
+
         // Returns the name of the game object.
         public override string ToString()
         {
@@ -433,7 +546,7 @@ public override string ToString()
         internal extern static Object FindObjectFromInstanceID(int instanceID);
 
         [FreeFunction("UnityEngineObjectBindings::GetPtrFromInstanceID")]
-        private extern static IntPtr GetPtrFromInstanceID(int instanceID, out bool isMonoBehaviour);
+        private extern static IntPtr GetPtrFromInstanceID(int instanceID, Type objectType, out bool isMonoBehaviour);
 
         [VisibleToOtherModules]
         [FreeFunction("UnityEngineObjectBindings::ForceLoadFromInstanceID")]
@@ -447,7 +560,7 @@ internal static Object CreateMissingReferenceObject(int instanceID)
         internal static class MarshalledUnityObject
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public static IntPtr Marshal(Object obj)
+            public static IntPtr Marshal<T>(T obj) where T: Object
             {
                 // Do not to an == null or .Equals(null) check in here or anything that would make an icall
                 // This may be called during AppDomain shutdown and there is code called during shutdown
@@ -459,7 +572,7 @@ public static IntPtr Marshal(Object obj)
             }
 
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public static IntPtr MarshalNullCheck(Object obj)
+            public static IntPtr MarshalNullCheck<T>(T obj) where T: Object
             {
                 // We want a NullReferenceExcption to be thrown if obj is null, so we can let the runtime generate that for us
                 var cachedPtr = MarshalAssumeNotNull(obj);
@@ -469,7 +582,9 @@ public static IntPtr MarshalNullCheck(Object obj)
             }
 
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public static IntPtr MarshalNullCheck<TException>(Object obj, string parameterName) where TException: Exception
+            public static IntPtr MarshalNullCheck<T, TException>(T obj, string parameterName) 
+                where T: Object 
+                where TException: Exception
             {
                 if (ReferenceEquals(obj, null))
                     ThrowException<TException>(parameterName);
@@ -479,20 +594,19 @@ public static IntPtr MarshalNullCheck<TException>(Object obj, string parameterNa
                 return cachedPtr;
             }
 
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public static IntPtr MarshalAssumeNotNull(Object obj)
+            public static IntPtr MarshalAssumeNotNull<T>(T obj) where T : Object
             {
                 if (obj.m_CachedPtr != IntPtr.Zero)
                     return obj.m_CachedPtr;
                 return MarshalFromInstanceId(obj);
             }
 
-            private static IntPtr MarshalFromInstanceId(Object obj)
+            private static IntPtr MarshalFromInstanceId<T>(T obj) where T:Object
             {
                 if (obj.m_InstanceID == kInstanceID_None)
                     return IntPtr.Zero;
 
-                var retPtr = GetPtrFromInstanceID(obj.m_InstanceID, out var isNativeInstanceMonoBehaviour);
+                var retPtr = GetPtrFromInstanceID(obj.m_InstanceID, typeof(T), out var isNativeInstanceMonoBehaviour);
                 if (retPtr == IntPtr.Zero)
                     return IntPtr.Zero;
 
diff --git a/Runtime/Export/Scripting/UnitySynchronizationContext.cs b/Runtime/Export/Scripting/UnitySynchronizationContext.cs
index a344d6e24b..f93f74f84e 100644
--- a/Runtime/Export/Scripting/UnitySynchronizationContext.cs
+++ b/Runtime/Export/Scripting/UnitySynchronizationContext.cs
@@ -98,7 +98,9 @@ private bool HasPendingTasks()
         [RequiredByNativeCode]
         private static void InitializeSynchronizationContext()
         {
-            SynchronizationContext.SetSynchronizationContext(new UnitySynchronizationContext(System.Threading.Thread.CurrentThread.ManagedThreadId));
+            var synchronizationContext = new UnitySynchronizationContext(System.Threading.Thread.CurrentThread.ManagedThreadId);
+            SynchronizationContext.SetSynchronizationContext(synchronizationContext);
+            Awaitable.SetSynchronizationContext(synchronizationContext);
         }
 
         // All requests must be processed on the main thread where the full Unity API is available
diff --git a/Runtime/Export/SearchService/SearchContextAttribute.cs b/Runtime/Export/SearchService/SearchContextAttribute.cs
index ec86054b31..d3f2ee23d8 100644
--- a/Runtime/Export/SearchService/SearchContextAttribute.cs
+++ b/Runtime/Export/SearchService/SearchContextAttribute.cs
@@ -33,6 +33,7 @@ public enum SearchViewFlags
         DisableBuilderModeToggle = 1 << 24,
         Borderless = 1 << 25,
         DisableQueryHelpers = 1 << 26,
+        DisableNoResultTips = 1 << 27,
 
         ContextSwitchPreservedMask = Borderless | OpenLeftSidePanel | OpenInspectorPreview
     }
diff --git a/Runtime/Export/Shaders/ComputeBuffer.bindings.cs b/Runtime/Export/Shaders/ComputeBuffer.bindings.cs
index 07883a9efc..e597db3ada 100644
--- a/Runtime/Export/Shaders/ComputeBuffer.bindings.cs
+++ b/Runtime/Export/Shaders/ComputeBuffer.bindings.cs
@@ -60,7 +60,7 @@ void Dispose(bool disposing)
         [FreeFunction("GraphicsBuffer_Bindings::InitComputeBuffer")]
         static extern IntPtr InitBuffer(int count, int stride, ComputeBufferType type, ComputeBufferMode usage);
 
-        [FreeFunction("GraphicsBuffer_Bindings::DestroyBuffer")]
+        [FreeFunction("GraphicsBuffer_Bindings::DestroyComputeBuffer")]
         static extern void DestroyBuffer(ComputeBuffer buf);
 
         public ComputeBuffer(int count, int stride) : this(count, stride, ComputeBufferType.Default, ComputeBufferMode.Immutable, 3)
diff --git a/Runtime/Export/Shaders/ComputeShader.bindings.cs b/Runtime/Export/Shaders/ComputeShader.bindings.cs
index 413d90b0bb..82d15e42fc 100644
--- a/Runtime/Export/Shaders/ComputeShader.bindings.cs
+++ b/Runtime/Export/Shaders/ComputeShader.bindings.cs
@@ -15,7 +15,7 @@ namespace UnityEngine
     [UsedByNativeCode]
     [NativeHeader("Runtime/Graphics/ShaderScriptBindings.h")]
     [NativeHeader("Runtime/Shaders/ComputeShader.h")]
-    [NativeHeader("Runtime/Shaders/RayTracingAccelerationStructure.h")]
+    [NativeHeader("Runtime/Shaders/RayTracing/RayTracingAccelerationStructure.h")]
     public sealed partial class ComputeShader : Object
     {
         // skinning/blend-shapes are implemented with compute shaders so we must be able to load them from builtins
diff --git a/Runtime/Export/Shaders/Material.bindings.cs b/Runtime/Export/Shaders/Material.bindings.cs
index 7b72be1a4b..c53888aec2 100644
--- a/Runtime/Export/Shaders/Material.bindings.cs
+++ b/Runtime/Export/Shaders/Material.bindings.cs
@@ -187,6 +187,7 @@ public Vector2 mainTextureScale
         [FreeFunction("MaterialScripting::Lerp", HasExplicitThis = true)] extern public void Lerp(Material start, Material end, float t);
         [FreeFunction("MaterialScripting::SetPass", HasExplicitThis = true)] extern public bool SetPass(int pass);
         [FreeFunction("MaterialScripting::CopyPropertiesFrom", HasExplicitThis = true)] extern public void CopyPropertiesFromMaterial(Material mat);
+        [FreeFunction("MaterialScripting::CopyMatchingPropertiesFrom", HasExplicitThis = true)] extern public void CopyMatchingPropertiesFromMaterial(Material mat);
 
         [FreeFunction("MaterialScripting::GetShaderKeywords", HasExplicitThis = true)] extern private string[] GetShaderKeywords();
         [FreeFunction("MaterialScripting::SetShaderKeywords", HasExplicitThis = true)] extern private void SetShaderKeywords(string[] names);
diff --git a/Runtime/Export/Shaders/PassIdentifier.bindings.cs b/Runtime/Export/Shaders/PassIdentifier.bindings.cs
index a3a4970cf9..85a22ce037 100644
--- a/Runtime/Export/Shaders/PassIdentifier.bindings.cs
+++ b/Runtime/Export/Shaders/PassIdentifier.bindings.cs
@@ -17,6 +17,12 @@ namespace UnityEngine.Rendering
         public uint SubshaderIndex { get { return m_SubShaderIndex; } }
         public uint PassIndex { get { return m_PassIndex; } }
 
+        public PassIdentifier(uint subshaderIndex, uint passIndex)
+        {
+            m_SubShaderIndex = subshaderIndex;
+            m_PassIndex = passIndex;
+        }
+
         public override bool Equals(object o)
         {
             return o is PassIdentifier other && this.Equals(other);
diff --git a/Runtime/Export/Shaders/RayTracingShader.bindings.cs b/Runtime/Export/Shaders/RayTracingShader.bindings.cs
index 50b40d576a..ecf1041c25 100644
--- a/Runtime/Export/Shaders/RayTracingShader.bindings.cs
+++ b/Runtime/Export/Shaders/RayTracingShader.bindings.cs
@@ -8,8 +8,8 @@
 namespace UnityEngine.Rendering
 {
     [MovedFrom("UnityEngine.Experimental.Rendering")]
-    [NativeHeader("Runtime/Shaders/RayTracingShader.h")]
-    [NativeHeader("Runtime/Shaders/RayTracingAccelerationStructure.h")]
+    [NativeHeader("Runtime/Shaders/RayTracing/RayTracingShader.h")]
+    [NativeHeader("Runtime/Shaders/RayTracing/RayTracingAccelerationStructure.h")]
     [NativeHeader("Runtime/Graphics/ShaderScriptBindings.h")]
     public sealed partial class RayTracingShader : Object
     {
diff --git a/Runtime/Export/Shaders/Shader.bindings.cs b/Runtime/Export/Shaders/Shader.bindings.cs
index 861d2a954a..8f20a5bf77 100644
--- a/Runtime/Export/Shaders/Shader.bindings.cs
+++ b/Runtime/Export/Shaders/Shader.bindings.cs
@@ -96,7 +96,7 @@ public Rendering.ShaderTagId FindPassTagValue(int subshaderIndex, int passIndex,
         public Rendering.ShaderTagId FindSubshaderTagValue(int subshaderIndex, Rendering.ShaderTagId tagName)
         {
             if (subshaderIndex < 0 || subshaderIndex >= subshaderCount)
-                throw new ArgumentOutOfRangeException("subshaderIndex");
+                throw new ArgumentOutOfRangeException($"Invalid subshaderIndex {subshaderIndex}. Value must be in the range [0, {subshaderCount})");
             var id = Internal_FindSubshaderTagValue(subshaderIndex, tagName.id);
             return new Rendering.ShaderTagId { id = id };
         }
diff --git a/Runtime/Export/Shaders/ShaderKeywordSet.bindings.cs b/Runtime/Export/Shaders/ShaderKeywordSet.bindings.cs
index b744a29cc0..786746fda2 100644
--- a/Runtime/Export/Shaders/ShaderKeywordSet.bindings.cs
+++ b/Runtime/Export/Shaders/ShaderKeywordSet.bindings.cs
@@ -21,7 +21,7 @@ unsafe public struct ShaderKeywordSet
         private UInt64 m_StateIndex;
 
         [FreeFunction("keywords::IsKeywordEnabled")] extern private static bool IsGlobalKeywordEnabled(ShaderKeywordSet state, uint index);
-        [FreeFunction("keywords::IsKeywordEnabled")] extern private static bool IsKeywordEnabled(ShaderKeywordSet state, LocalKeyword keyword);
+        [FreeFunction("keywords::IsKeywordEnabled")] extern private static bool IsKeywordEnabled(ShaderKeywordSet state, LocalKeywordSpace keywordSpace, uint index);
         [FreeFunction("keywords::IsKeywordEnabled")] extern private static bool IsKeywordNameEnabled(ShaderKeywordSet state, string name);
         [FreeFunction("keywords::EnableKeyword")] extern private static void EnableGlobalKeyword(ShaderKeywordSet state, uint index);
         [FreeFunction("keywords::EnableKeyword")] extern private static void EnableKeywordName(ShaderKeywordSet state, string name);
@@ -54,7 +54,7 @@ public bool IsEnabled(GlobalKeyword keyword)
 
         public bool IsEnabled(LocalKeyword keyword)
         {
-            return IsKeywordEnabled(this, keyword);
+            return IsKeywordEnabled(this, keyword.m_SpaceInfo, keyword.m_Index);
         }
 
         public void Enable(ShaderKeyword keyword)
diff --git a/Runtime/Export/Shaders/ShaderVariantCollection.bindings.cs b/Runtime/Export/Shaders/ShaderVariantCollection.bindings.cs
index 7ef3fcd807..f16c37cd57 100644
--- a/Runtime/Export/Shaders/ShaderVariantCollection.bindings.cs
+++ b/Runtime/Export/Shaders/ShaderVariantCollection.bindings.cs
@@ -27,9 +27,9 @@ public sealed partial class ShaderVariantCollection : Object
         extern public int  warmedUpVariantCount { get; }
         extern public bool isWarmedUp   {[NativeName("IsWarmedUp")] get; }
 
-        extern private bool AddVariant(Shader shader, UnityEngine.Rendering.PassType passType, string[] keywords);
-        extern private bool RemoveVariant(Shader shader, UnityEngine.Rendering.PassType passType, string[] keywords);
-        extern private bool ContainsVariant(Shader shader, UnityEngine.Rendering.PassType passType, string[] keywords);
+        extern private bool AddVariant(Shader shader, UnityEngine.Rendering.PassType passType, [Unmarshalled] string[] keywords);
+        extern private bool RemoveVariant(Shader shader, UnityEngine.Rendering.PassType passType,[Unmarshalled] string[] keywords);
+        extern private bool ContainsVariant(Shader shader, UnityEngine.Rendering.PassType passType, [Unmarshalled] string[] keywords);
 
         [NativeName("ClearVariants")] extern public void Clear();
         [NativeName("WarmupShaders")] extern public void WarmUp();
diff --git a/Runtime/Export/StaticBatching/CombineForStaticBatching.cs b/Runtime/Export/StaticBatching/CombineForStaticBatching.cs
index 4c3296c37e..ab026e704c 100644
--- a/Runtime/Export/StaticBatching/CombineForStaticBatching.cs
+++ b/Runtime/Export/StaticBatching/CombineForStaticBatching.cs
@@ -27,7 +27,7 @@ private static void CombineRoot(GameObject staticBatchRoot)
             MeshFilter[] filters;
             GameObject[] gos;
             if (staticBatchRoot == null)
-                filters = (MeshFilter[])Object.FindObjectsOfType(typeof(MeshFilter));
+                filters = (MeshFilter[])Object.FindObjectsByType(typeof(MeshFilter), FindObjectsSortMode.None);
             else
                 filters = staticBatchRoot.GetComponentsInChildren<MeshFilter>();
 
diff --git a/Runtime/Export/StaticShim/ApplicationShimBase.cs b/Runtime/Export/StaticShim/ApplicationShimBase.cs
index 0ba6eeeb76..c59ae325e3 100644
--- a/Runtime/Export/StaticShim/ApplicationShimBase.cs
+++ b/Runtime/Export/StaticShim/ApplicationShimBase.cs
@@ -136,11 +136,18 @@ public virtual bool CanStreamedLevelBeLoaded(string levelName)
             return UnityEngine.Application.CanStreamedLevelBeLoaded(levelName);
         }
 
+#pragma warning disable 618
         public virtual string[] GetBuildTags()
         {
             return UnityEngine.Application.GetBuildTags();
         }
 
+        public virtual void SetBuildTags(string[] buildTags)
+        {
+            UnityEngine.Application.SetBuildTags(buildTags);
+        }
+#pragma warning restore 618
+        
         public virtual UnityEngine.StackTraceLogType GetStackTraceLogType(UnityEngine.LogType logType)
         {
             return UnityEngine.Application.GetStackTraceLogType(logType);
@@ -186,11 +193,6 @@ public virtual UnityEngine.AsyncOperation RequestUserAuthorization(UnityEngine.U
             return UnityEngine.Application.RequestUserAuthorization(mode);
         }
 
-        public virtual void SetBuildTags(string[] buildTags)
-        {
-            UnityEngine.Application.SetBuildTags(buildTags);
-        }
-
         public virtual void SetStackTraceLogType(UnityEngine.LogType logType, UnityEngine.StackTraceLogType stackTraceType)
         {
             UnityEngine.Application.SetStackTraceLogType(logType, stackTraceType);
diff --git a/Runtime/Export/SystemInfo/SystemInfo.bindings.cs b/Runtime/Export/SystemInfo/SystemInfo.bindings.cs
index b9d409af33..c85076f8c4 100644
--- a/Runtime/Export/SystemInfo/SystemInfo.bindings.cs
+++ b/Runtime/Export/SystemInfo/SystemInfo.bindings.cs
@@ -976,7 +976,7 @@ public static bool supportsIndirectArgumentsBuffer
         [FreeFunction("ScriptingGraphicsCaps::IsFormatSupported")]
         extern public static bool IsFormatSupported(GraphicsFormat format, FormatUsage usage);
 
-        [FreeFunction("ScriptingGraphicsCaps::GetCompatibleFormat", ThrowsException = true)]
+        [FreeFunction("ScriptingGraphicsCaps::GetCompatibleFormat")]
         extern public static GraphicsFormat GetCompatibleFormat(GraphicsFormat format, FormatUsage usage);
 
         [FreeFunction("ScriptingGraphicsCaps::GetGraphicsFormat")]
diff --git a/Runtime/Export/TouchScreenKeyboard/TouchScreenKeyboard.bindings.cs b/Runtime/Export/TouchScreenKeyboard/TouchScreenKeyboard.bindings.cs
index 88d54adeae..6347962098 100644
--- a/Runtime/Export/TouchScreenKeyboard/TouchScreenKeyboard.bindings.cs
+++ b/Runtime/Export/TouchScreenKeyboard/TouchScreenKeyboard.bindings.cs
@@ -93,7 +93,6 @@ public static bool isSupported
                     case RuntimePlatform.Switch:
                     case RuntimePlatform.PS4:
                     case RuntimePlatform.PS5:
-                    case RuntimePlatform.Stadia:
                     case RuntimePlatform.WebGLPlayer:
                     case RuntimePlatform.GameCoreXboxSeries:
                     case RuntimePlatform.GameCoreXboxOne:
@@ -128,19 +127,6 @@ public static bool isInPlaceEditingAllowed
         }
 
 
-        // Some platforms require us to always open TouchScreenKeyboard even if a physical keyboard is connected
-        // and in-place editing is used.
-        internal static bool isRequiredToForceOpen
-        {
-            get
-            {
-                return IsRequiredToForceOpen();
-            }
-        }
-
-        [FreeFunction("TouchScreenKeyboard_IsRequiredToForceOpen")]
-        extern private static bool IsRequiredToForceOpen();
-
         // Opens the native keyboard provided by OS on the screen.
         public static TouchScreenKeyboard Open(string text, [DefaultValue("TouchScreenKeyboardType.Default")]  TouchScreenKeyboardType keyboardType, [DefaultValue("true")]  bool autocorrection, [DefaultValue("false")]  bool multiline, [DefaultValue("false")]  bool secure, [DefaultValue("false")]  bool alert, [DefaultValue("\"\"")]  string textPlaceholder, [DefaultValue("0")]  int characterLimit)
         {
@@ -356,7 +342,7 @@ public static bool closeKeyboardOnOutsideTap
                     TouchScreenKeyboard.Android.consumesOutsideTouches = value;
                 }
             }
-
+            [Obsolete("consumesOutsideTouches is deprecated and will be removed in a future version where Unity will always process touch input outside of the on-screen keyboard (consumesOutsideTouches = false)")]
             public static bool consumesOutsideTouches
             {
                 set
diff --git a/Runtime/Export/UINumericFieldsUtils.cs b/Runtime/Export/UINumericFieldsUtils.cs
index 75e9960f11..35289cfa86 100644
--- a/Runtime/Export/UINumericFieldsUtils.cs
+++ b/Runtime/Export/UINumericFieldsUtils.cs
@@ -12,34 +12,111 @@ internal static class UINumericFieldsUtils
         public static readonly string k_FloatFieldFormatString = "g7";
         public static readonly string k_IntFieldFormatString = "#######0";
 
-        public static bool StringToDouble(string str, out double value)
+        public static bool TryConvertStringToDouble(string str, out double value)
         {
-            return StringToDouble(str, out value, out _);
+            return TryConvertStringToDouble(str, out value, out _);
         }
 
-        public static bool StringToDouble(string str, out double value, out ExpressionEvaluator.Expression expr)
+        public static bool TryConvertStringToDouble(string str, out double value, out ExpressionEvaluator.Expression expr)
         {
             expr = null;
-            string lowered = str.ToLower();
-            if (lowered == "inf" || lowered == "infinity")
-                value = double.PositiveInfinity;
-            else if (lowered == "-inf" || lowered == "-infinity")
-                value = double.NegativeInfinity;
-            else if (lowered == "nan")
-                value = double.NaN;
-            else
-                return ExpressionEvaluator.Evaluate(str, out value, out expr);
+            var lowered = str.ToLower();
+            switch (lowered)
+            {
+                case "inf" or "infinity":
+                    value = double.PositiveInfinity;
+                    break;
+                case "-inf" or "-infinity":
+                    value = double.NegativeInfinity;
+                    break;
+                case "nan":
+                    value = double.NaN;
+                    break;
+                default:
+                    return ExpressionEvaluator.Evaluate(str, out value, out expr);
+            }
             return true;
         }
 
-        public static bool StringToLong(string str, out long value)
+        public static bool TryConvertStringToDouble(string str, string initialValueAsString, out double value)
         {
-            return StringToLong(str, out value, out _);
+            var success = TryConvertStringToDouble(str, out value, out var expression);
+
+            if (!success && expression != null && !string.IsNullOrEmpty(initialValueAsString))
+            {
+                if (TryConvertStringToDouble(initialValueAsString, out var oldValue, out _))
+                {
+                    value = oldValue;
+                    success = expression.Evaluate(ref value);
+                }
+            }
+            return success;
+        }
+
+        public static bool TryConvertStringToFloat(string str, string initialValueAsString, out float value)
+        {
+            var success = TryConvertStringToDouble(str, initialValueAsString, out var v);
+            value = Mathf.ClampToFloat(v);
+            return success;
+        }
+
+        public static bool TryConvertStringToLong(string str, out long value)
+        {
+            return ExpressionEvaluator.Evaluate(str, out value, out _);
         }
 
-        public static bool StringToLong(string str, out long value, out ExpressionEvaluator.Expression expr)
+        public static bool TryConvertStringToLong(string str, out long value, out ExpressionEvaluator.Expression expr)
         {
             return ExpressionEvaluator.Evaluate(str, out value, out expr);
         }
+
+        public static bool TryConvertStringToLong(string str, string initialValueAsString, out long value)
+        {
+            var success = TryConvertStringToLong(str, out value, out var expression);
+
+            if (!success && expression != null && !string.IsNullOrEmpty(initialValueAsString))
+            {
+                if (TryConvertStringToLong(initialValueAsString, out var oldValue, out _))
+                {
+                    value = oldValue;
+                    success = expression.Evaluate(ref value);
+                }
+            }
+            return success;
+        }
+
+        public static bool TryConvertStringToULong(string str, out ulong value, out ExpressionEvaluator.Expression expr)
+        {
+            return ExpressionEvaluator.Evaluate(str, out value, out expr);
+        }
+
+        public static bool TryConvertStringToULong(string str, string initialValueAsString, out ulong value)
+        {
+            var success = TryConvertStringToULong(str, out value, out var expression);
+
+            if (!success && expression != null && !string.IsNullOrEmpty(initialValueAsString))
+            {
+                if (TryConvertStringToULong(initialValueAsString, out var newValue, out _))
+                {
+                    value = newValue;
+                    success = expression.Evaluate(ref value);
+                }
+            }
+            return success;
+        }
+
+        public static bool TryConvertStringToInt(string str, string initialValueAsString, out int value)
+        {
+            var success = TryConvertStringToLong(str, initialValueAsString, out var v);
+            value = Mathf.ClampToInt(v);
+            return success;
+        }
+
+        public static bool TryConvertStringToUInt(string str, string initialValueAsString, out uint value)
+        {
+            var success = TryConvertStringToLong(str, initialValueAsString, out var v);
+            value = Mathf.ClampToUInt(v);
+            return success;
+        }
     }
 }
diff --git a/Runtime/Export/UnityEvent/PropertyChangedEvent.cs b/Runtime/Export/UnityEvent/PropertyChangedEvent.cs
new file mode 100644
index 0000000000..4acc4af61c
--- /dev/null
+++ b/Runtime/Export/UnityEvent/PropertyChangedEvent.cs
@@ -0,0 +1,95 @@
+// 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.CompilerServices;
+
+namespace UnityEngine.Events
+{
+    internal class PropertyHelper<TBase>
+    {
+        public bool SetProperty<TData>(TBase instance, ref TData currentPropertyValue, TData newValue, [CallerMemberName] string propertyName = "")
+        {
+            if (Equals(currentPropertyValue, newValue))
+                return false;
+
+            currentPropertyValue = newValue;
+
+            propertyChangedEvent.Notify(instance, propertyName);
+
+            return true;
+        }
+
+        interface IEventHolder
+        {
+            void Invoke(TBase setting, string property);
+            bool IsEmpty();
+        }
+
+        class EventHolder<T> : IEventHolder
+            where T : class, TBase
+        {
+            public event Action<T, string> propertyEvent;
+
+            void IEventHolder.Invoke(TBase setting, string property)
+            {
+                propertyEvent?.Invoke(setting as T, property);
+            }
+
+            bool IEventHolder.IsEmpty() => propertyEvent == null;
+        }
+
+        public PropertyChangedEvent propertyChangedEvent = new();
+
+        public struct PropertyChangedEvent
+        {
+            Dictionary<Type, IEventHolder> m_Subscriptions;
+
+            public PropertyChangedEvent()
+            {
+                m_Subscriptions = new();
+            }
+
+            public void Subscribe<TChild>(Action<TChild, string> callback)
+                where TChild : class, TBase
+            {
+                EventHolder<TChild> handler = null;
+                if (m_Subscriptions.TryGetValue(typeof(TChild), out var tmp))
+                {
+                    handler = tmp as EventHolder<TChild>;
+                }
+                else
+                {
+                    handler = new();
+                    m_Subscriptions.Add(typeof(TChild), handler);
+                }
+
+                System.Diagnostics.Debug.Assert(handler != null, nameof(handler) + " != null");
+                handler.propertyEvent += callback;
+            }
+
+            public void Unsubscribe<TChild>(Action<TChild, string> callback)
+                where TChild : class, TBase
+            {
+                if (!m_Subscriptions.TryGetValue(typeof(TChild), out var tmp))
+                    return;
+
+                var handler = tmp as EventHolder<TChild>;
+                System.Diagnostics.Debug.Assert(handler != null, nameof(handler) + " != null");
+                handler.propertyEvent -= callback;
+                if (tmp.IsEmpty())
+                    m_Subscriptions.Remove(typeof(TChild));
+            }
+
+            public void Notify(TBase instance, [CallerMemberName] string propertyName = "")
+            {
+                if (m_Subscriptions.TryGetValue(instance.GetType(), out var handler))
+                {
+                    handler.Invoke(instance, propertyName);
+                }
+            }
+        }
+    }
+}
diff --git a/Runtime/Export/Unsafe/UnsafeUtilityPatched.cs b/Runtime/Export/Unsafe/UnsafeUtilityPatched.cs
index 35063c7d1b..9d53eee711 100644
--- a/Runtime/Export/Unsafe/UnsafeUtilityPatched.cs
+++ b/Runtime/Export/Unsafe/UnsafeUtilityPatched.cs
@@ -42,24 +42,28 @@ unsafe static void InternalCopyStructureToPtr<T>(ref T input, void* ptr) where T
             throw new NotImplementedException("Patching this method failed");
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         unsafe public static T ReadArrayElement<T>(void* source, int index)
         {
             // @patched at compile time
             throw new NotImplementedException("Patching this method failed");
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         unsafe public static T ReadArrayElementWithStride<T>(void* source, int index, int stride)
         {
             // @patched at compile time
             throw new NotImplementedException("Patching this method failed");
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         unsafe public static void WriteArrayElement<T>(void* destination, int index, T value)
         {
             // @patched at compile time
             throw new NotImplementedException("Patching this method failed");
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         unsafe public static void WriteArrayElementWithStride<T>(void* destination, int index, int stride, T value)
         {
             // @patched at compile time
@@ -67,6 +71,7 @@ unsafe public static void WriteArrayElementWithStride<T>(void* destination, int
         }
 
         // The address of the memory where the struct resides in memory
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         unsafe public static void* AddressOf<T>(ref T output) where T : struct
         {
             // @patched at compile time
@@ -74,6 +79,7 @@ unsafe public static void WriteArrayElementWithStride<T>(void* destination, int
         }
 
         // The size of a struct
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static int SizeOf<T>() where T : struct
         {
             // @patched at compile time
@@ -88,6 +94,7 @@ public static ref T As<U, T>(ref U from)
         }
 
         // The address of the memory where the struct resides in memory
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         unsafe public static ref T AsRef<T>(void* ptr) where T : struct
         {
             // @patched at compile time
@@ -95,6 +102,7 @@ unsafe public static ref T AsRef<T>(void* ptr) where T : struct
         }
 
         // The address of the memory where the struct resides in memory
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         unsafe public static ref T ArrayElementAsRef<T>(void* ptr, int index) where T : struct
         {
             // @patched at compile time
@@ -102,6 +110,7 @@ unsafe public static ref T ArrayElementAsRef<T>(void* ptr, int index) where T :
         }
 
         // converts generic enum to int without boxing
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static int EnumToInt<T>(T enumValue) where T : struct, IConvertible
         {
             var value = 0;
@@ -109,12 +118,14 @@ public static int EnumToInt<T>(T enumValue) where T : struct, IConvertible
             return value;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         static void InternalEnumToInt<T>(ref T enumValue, ref int intValue)
         {
             throw new NotImplementedException("Patching this method failed");
         }
 
         // generic enum equals check without boxing
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool EnumEquals<T>(T lhs, T rhs) where T : struct, IConvertible
         {
             throw new NotImplementedException("Patching this method failed");
diff --git a/Runtime/Export/Windows/Speech.bindings.cs b/Runtime/Export/Windows/Speech.bindings.cs
index 77da7996af..566a2dd223 100644
--- a/Runtime/Export/Windows/Speech.bindings.cs
+++ b/Runtime/Export/Windows/Speech.bindings.cs
@@ -34,7 +34,7 @@ public abstract partial class PhraseRecognizer : IDisposable
     {
         [NativeThrows]
         [NativeHeader("PlatformDependent/Win/Bindings/SpeechBindings.h")]
-        protected static extern IntPtr CreateFromKeywords(object self, string[] keywords, ConfidenceLevel minimumConfidence);
+        protected static extern IntPtr CreateFromKeywords(object self, [Unmarshalled] string[] keywords, ConfidenceLevel minimumConfidence);
 
         [NativeThrows]
         [NativeHeader("PlatformDependent/Win/Bindings/SpeechBindings.h")]
diff --git a/Runtime/Export/iOS/OnDemandResources.bindings.cs b/Runtime/Export/iOS/OnDemandResources.bindings.cs
index 276a37e095..bb10f6dcbc 100644
--- a/Runtime/Export/iOS/OnDemandResources.bindings.cs
+++ b/Runtime/Export/iOS/OnDemandResources.bindings.cs
@@ -42,7 +42,7 @@ public static partial class OnDemandResources
         extern public static bool enabled {[FreeFunction("OnDemandResourcesScripting::Enabled")] get; }
 
         [FreeFunction("OnDemandResourcesScripting::PreloadAsync")]
-        extern private static OnDemandResourcesRequest PreloadAsyncImpl(string[] tags);
+        extern private static OnDemandResourcesRequest PreloadAsyncImpl([Unmarshalled] string[] tags);
 
         public static OnDemandResourcesRequest PreloadAsync(string[] tags)
         {
diff --git a/Runtime/Export/iOS/iOSDevice.bindings.cs b/Runtime/Export/iOS/iOSDevice.bindings.cs
index 28517d53e2..b81f1c2320 100644
--- a/Runtime/Export/iOS/iOSDevice.bindings.cs
+++ b/Runtime/Export/iOS/iOSDevice.bindings.cs
@@ -105,6 +105,7 @@ public sealed partial class Device
     {
         extern public static string systemVersion
         {
+            [NativeConditional("PLATFORM_IOS")]
             [FreeFunction("systeminfo::GetDeviceSystemVersion")]
             get;
         }
diff --git a/Runtime/Export/iOS/tvOSDevice.bindings.cs b/Runtime/Export/iOS/tvOSDevice.bindings.cs
index 965154061b..30780554bf 100644
--- a/Runtime/Export/iOS/tvOSDevice.bindings.cs
+++ b/Runtime/Export/iOS/tvOSDevice.bindings.cs
@@ -26,6 +26,7 @@ public sealed partial class Device
     {
         extern private static string tvOSsystemVersion
         {
+            [NativeConditional("PLATFORM_TVOS")]
             [FreeFunction("systeminfo::GetDeviceSystemVersion")]
             get;
         }
diff --git a/Runtime/Jobs/ScriptBindings/Jobs.bindings.cs b/Runtime/Jobs/ScriptBindings/Jobs.bindings.cs
index 316d3dff14..ba5b2322d4 100644
--- a/Runtime/Jobs/ScriptBindings/Jobs.bindings.cs
+++ b/Runtime/Jobs/ScriptBindings/Jobs.bindings.cs
@@ -8,6 +8,7 @@
 using UnityEngine.Bindings;
 using System.Diagnostics;
 using UnityEngine.Scripting;
+using Unity.Burst;
 
 namespace Unity.Jobs.LowLevel.Unsafe
 {
@@ -156,10 +157,47 @@ public static int JobWorkerCount
             }
         }
 
-        //@TODO: @timj Should we decrease this???
+        /// <summary>
+        /// The maximum number of job threads that can ever be created by the job system.
+        /// </summary>
+        /// <remarks>This maximum is the theoretical max the job system supports. In practice, the maximum number of job worker threads
+        /// created by the job system will be lower as the job system will prevent creating more job worker threads than logical
+        /// CPU cores on the target hardware. This value is useful for compile time constants, however when used for creating buffers
+        /// it may be larger than required. For allocating a buffer that can be subdivided evenly between job worker threads, prefer
+        /// the runtime constant returned by <seealso cref="JobsUtility.ThreadIndexCount"/>.
+        /// </remarks>
         public const int MaxJobThreadCount = 128;
         public const int CacheLineSize = 64;
 
+        /// <summary>
+        /// Returns the index for the current thread when executing a job, otherwise 0. When multiple threads are executing jobs, no two threads will have the same index. Range is [0, <seealso cref="JobsUtility.ThreadIndexCount"/>).
+        /// </summary>
+        /// <remarks>
+        /// The value returned when used from within a job is the same as the one stored in job members decorated with <seealso cref="Unity.Collections.LowLevel.Unsafe.NativeSetThreadIndexAttribute"/>.
+        /// </remarks>
+        public static extern int ThreadIndex
+        {
+            [BurstAuthorizedExternalMethod]
+            [FreeFunction("GetJobWorkerIndex", IsThreadSafe = true)]
+            get;
+        }
+
+        /// <summary>
+        /// Returns the maximum number of job workers that can work on a job at the same time.
+        /// </summary>
+        /// <remarks>
+        /// The job system will create a number of job worker threads that will be no greater than the number of logical CPU cores for the platform. However, since arbitrary threads
+        /// can execute jobs via work stealing we allocate extra workers which act as temporary job worker threads. JobsUtility.ThreadIndexCount reflects the maximum number of job worker threads
+        /// plus temporary workers the job system will ever use. As such, this value is useful for allocating buffers which should be subdivided evenly between job workers since
+        /// <seealso cref="JobsUtility.ThreadIndex"/> and <seealso cref="Collections.LowLevel.Unsafe.NativeSetThreadIndexAttribute"/> will never return a value greater than JobsUtility.ThreadIndexCount.
+        /// </remarks>
+        public static extern int ThreadIndexCount
+        {
+            [BurstAuthorizedExternalMethod]
+            [FreeFunction("GetJobWorkerIndexCount", IsThreadSafe = true)]
+            get;
+        }
+
         [FreeFunction("IsJobQueueBatchingEnabled")]
         static extern bool GetJobBatchingEnabled();
         internal static bool JobBatchingEnabled => GetJobBatchingEnabled();
diff --git a/Runtime/Scripting/Marshalling/ManagedSpanWrapper.cs b/Runtime/Scripting/Marshalling/ManagedSpanWrapper.cs
new file mode 100644
index 0000000000..66d591a7b5
--- /dev/null
+++ b/Runtime/Scripting/Marshalling/ManagedSpanWrapper.cs
@@ -0,0 +1,22 @@
+// 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.InteropServices;
+
+namespace UnityEngine.Bindings
+{
+    [VisibleToOtherModules]
+    [StructLayout(LayoutKind.Sequential)]
+    internal readonly ref struct ManagedSpanWrapper
+    {
+        public readonly unsafe void* begin;
+        public readonly int length;
+
+        public unsafe ManagedSpanWrapper(void* begin, int length)
+        {
+            this.begin = begin;
+            this.length = length;
+        }
+    }
+}
diff --git a/Runtime/Transform/ScriptBindings/Transform.bindings.cs b/Runtime/Transform/ScriptBindings/Transform.bindings.cs
index 2782440ed1..372ab8755a 100644
--- a/Runtime/Transform/ScriptBindings/Transform.bindings.cs
+++ b/Runtime/Transform/ScriptBindings/Transform.bindings.cs
@@ -115,6 +115,9 @@ public void SetParent(Transform p)
 
         public extern void SetLocalPositionAndRotation(Vector3 localPosition, Quaternion localRotation);
 
+        public extern void GetPositionAndRotation(out Vector3 position, out Quaternion rotation);
+        public extern void GetLocalPositionAndRotation(out Vector3 localPosition, out Quaternion localRotation);
+
         // Moves the transform in the direction and distance of /translation/.
         public void Translate(Vector3 translation, [UnityEngine.Internal.DefaultValue("Space.Self")] Space relativeTo)
         {
@@ -230,23 +233,18 @@ public void RotateAround(Vector3 point, Vector3 axis, float angle)
         public Vector3 TransformDirection(float x, float y, float z) { return TransformDirection(new Vector3(x, y, z)); }
 
         // Transforms multiple directions from local space to world space.
-        internal unsafe extern void TransformDirections([Span("count", isReadOnly: true)] Vector3* directions, int count, [Span("transformedCount", isReadOnly: false)] Vector3* transformedDirections, int transformedCount);
+        [NativeMethod(Name = "TransformDirections")]
+        internal unsafe extern void TransformDirectionsInternal(ReadOnlySpan<Vector3> directions, Span<Vector3> transformedDirections);
         public unsafe void TransformDirections(ReadOnlySpan<Vector3> directions, Span<Vector3> transformedDirections)
         {
             if (directions.Length != transformedDirections.Length)
                 throw new InvalidOperationException($"Both spans passed to Transform.TransformDirections() must be the same length");
 
-            fixed (Vector3* srcPtr = directions)
-            {
-                fixed (Vector3* destPtr = transformedDirections)
-                {
-                    TransformDirections(srcPtr, directions.Length, destPtr, transformedDirections.Length);
-                }
-            }
+           TransformDirectionsInternal(directions, transformedDirections);
         }
         public unsafe void TransformDirections(Span<Vector3> directions)
         {
-            TransformDirections(directions, directions);
+            TransformDirectionsInternal(directions, directions);
         }
 
 
@@ -257,23 +255,18 @@ public unsafe void TransformDirections(Span<Vector3> directions)
         public Vector3 InverseTransformDirection(float x, float y, float z) { return InverseTransformDirection(new Vector3(x, y, z)); }
 
         // Transforms multiple directions from world space to local space. The opposite of Transform.TransformDirections.
-        internal unsafe extern void InverseTransformDirections([Span("count", isReadOnly: true)] Vector3* directions, int count, [Span("transformedCount", isReadOnly: false)] Vector3* transformedDirections, int transformedCount);
+        [NativeMethod(Name = "InverseTransformDirections")]
+        internal unsafe extern void InverseTransformDirectionsInternal(ReadOnlySpan<Vector3> directions, Span<Vector3> transformedDirections);
         public unsafe void InverseTransformDirections(ReadOnlySpan<Vector3> directions, Span<Vector3> transformedDirections)
         {
             if (directions.Length != transformedDirections.Length)
                 throw new InvalidOperationException($"Both spans passed to Transform.InverseTransformDirections() must be the same length");
 
-            fixed (Vector3* srcPtr = directions)
-            {
-                fixed (Vector3* destPtr = transformedDirections)
-                {
-                    InverseTransformDirections(srcPtr, directions.Length, destPtr, transformedDirections.Length);
-                }
-            }
+           InverseTransformDirectionsInternal(directions, transformedDirections);
         }
         public unsafe void InverseTransformDirections(Span<Vector3> directions)
         {
-            InverseTransformDirections(directions, directions);
+            InverseTransformDirectionsInternal(directions, directions);
         }
 
 
@@ -284,23 +277,18 @@ public unsafe void InverseTransformDirections(Span<Vector3> directions)
         public Vector3 TransformVector(float x, float y, float z) { return TransformVector(new Vector3(x, y, z)); }
 
         // Transforms multiple vectors from local space to world space.
-        internal unsafe extern void TransformVectors([Span("count", isReadOnly: true)] Vector3* vectors, int count, [Span("transformedCount", isReadOnly: false)] Vector3* transformedVectors, int transformedCount);
+        [NativeMethod(Name = "TransformVectors")]
+        internal unsafe extern void TransformVectorsInternal(ReadOnlySpan<Vector3> vectors, Span<Vector3> transformedVectors);
         public unsafe void TransformVectors(ReadOnlySpan<Vector3> vectors, Span<Vector3> transformedVectors)
         {
             if (vectors.Length != transformedVectors.Length)
                 throw new InvalidOperationException($"Both spans passed to Transform.TransformVectors() must be the same length");
 
-            fixed (Vector3* srcPtr = vectors)
-            {
-                fixed (Vector3* destPtr = transformedVectors)
-                {
-                    TransformVectors(srcPtr, vectors.Length, destPtr, transformedVectors.Length);
-                }
-            }
+           TransformVectorsInternal(vectors, transformedVectors);
         }
         public unsafe void TransformVectors(Span<Vector3> vectors)
         {
-            TransformVectors(vectors, vectors);
+            TransformVectorsInternal(vectors, vectors);
         }
 
 
@@ -311,23 +299,18 @@ public unsafe void TransformVectors(Span<Vector3> vectors)
         public Vector3 InverseTransformVector(float x, float y, float z) { return InverseTransformVector(new Vector3(x, y, z)); }
 
         // Transforms multiple vectors from world space to local space. The opposite of Transform.TransformVectors.
-        internal unsafe extern void InverseTransformVectors([Span("count", isReadOnly: true)] Vector3* vectors, int count, [Span("transformedCount", isReadOnly: false)] Vector3* transformedVectors, int transformedCount);
+        [NativeMethod(Name = "InverseTransformVectors")]
+        internal unsafe extern void InverseTransformVectorsInternal(ReadOnlySpan<Vector3> vectors, Span<Vector3> transformedVectors);
         public unsafe void InverseTransformVectors(ReadOnlySpan<Vector3> vectors, Span<Vector3> transformedVectors)
         {
             if (vectors.Length != transformedVectors.Length)
                 throw new InvalidOperationException($"Both spans passed to Transform.InverseTransformVectors() must be the same length");
 
-            fixed (Vector3* srcPtr = vectors)
-            {
-                fixed (Vector3* destPtr = transformedVectors)
-                {
-                    InverseTransformVectors(srcPtr, vectors.Length, destPtr, transformedVectors.Length);
-                }
-            }
+            InverseTransformVectorsInternal(vectors, transformedVectors);
         }
         public unsafe void InverseTransformVectors(Span<Vector3> vectors)
         {
-            InverseTransformVectors(vectors, vectors);
+            InverseTransformVectorsInternal(vectors, vectors);
         }
 
 
@@ -338,23 +321,18 @@ public unsafe void InverseTransformVectors(Span<Vector3> vectors)
         public Vector3 TransformPoint(float x, float y, float z) { return TransformPoint(new Vector3(x, y, z)); }
 
         // Transforms multiple positions from local space to world space.
-        internal unsafe extern void TransformPoints([Span("count", isReadOnly: true)] Vector3* positions, int count, [Span("transformedCount", isReadOnly: false)] Vector3* transformedPositions, int transformedCount);
+        [NativeMethod(Name = "TransformPoints")]
+        internal unsafe extern void TransformPointsInternal(ReadOnlySpan<Vector3> positions, Span<Vector3> transformedPositions);
         public unsafe void TransformPoints(ReadOnlySpan<Vector3> positions, Span<Vector3> transformedPositions)
         {
             if (positions.Length != transformedPositions.Length)
                 throw new InvalidOperationException($"Both spans passed to Transform.TransformPoints() must be the same length");
 
-            fixed (Vector3* srcPtr = positions)
-            {
-                fixed (Vector3* destPtr = transformedPositions)
-                {
-                    TransformPoints(srcPtr, positions.Length, destPtr, transformedPositions.Length);
-                }
-            }
+            TransformPointsInternal(positions, transformedPositions);
         }
         public unsafe void TransformPoints(Span<Vector3> positions)
         {
-            TransformPoints(positions, positions);
+            TransformPointsInternal(positions, positions);
         }
 
 
@@ -365,19 +343,14 @@ public unsafe void TransformPoints(Span<Vector3> positions)
         public Vector3 InverseTransformPoint(float x, float y, float z) { return InverseTransformPoint(new Vector3(x, y, z)); }
 
         // Transforms multiple positions from world space to local space. The opposite of Transform.TransformPoints.
-        internal unsafe extern void InverseTransformPoints([Span("count", isReadOnly: true)] Vector3* positions, int count, [Span("transformedCount", isReadOnly: false)] Vector3* transformedPositions, int transformedCount);
+        [NativeMethod(Name = "InverseTransformPoints")]
+        internal unsafe extern void InverseTransformPointsInternal(ReadOnlySpan<Vector3> positions, Span<Vector3> transformedPositions);
         public unsafe void InverseTransformPoints(ReadOnlySpan<Vector3> positions, Span<Vector3> transformedPositions)
         {
             if (positions.Length != transformedPositions.Length)
                 throw new InvalidOperationException($"Both spans passed to Transform.InverseTransformPoints() must be the same length");
 
-            fixed (Vector3* srcPtr = positions)
-            {
-                fixed (Vector3* destPtr = transformedPositions)
-                {
-                    InverseTransformPoints(srcPtr, positions.Length, destPtr, transformedPositions.Length);
-                }
-            }
+            InverseTransformPointsInternal(positions, transformedPositions);
         }
         public unsafe void InverseTransformPoints(Span<Vector3> positions)
         {
diff --git a/Runtime/Transform/ScriptBindings/TransformAccessArray.bindings.cs b/Runtime/Transform/ScriptBindings/TransformAccessArray.bindings.cs
index 3967ad1586..2657ceffdf 100644
--- a/Runtime/Transform/ScriptBindings/TransformAccessArray.bindings.cs
+++ b/Runtime/Transform/ScriptBindings/TransformAccessArray.bindings.cs
@@ -128,6 +128,42 @@ public Matrix4x4 worldToLocalMatrix
 
         public bool isValid => hierarchy != IntPtr.Zero;
 
+        public void SetPositionAndRotation(Vector3 position, Quaternion rotation)
+        {
+            CheckHierarchyValid();
+            SetPositionAndRotation_Internal(ref this, ref position, ref rotation);
+        }
+
+        public void SetLocalPositionAndRotation(Vector3 localPosition, Quaternion localRotation)
+        {
+            CheckHierarchyValid();
+            SetLocalPositionAndRotation_Internal(ref this, ref localPosition, ref localRotation);
+        }
+
+        public void GetPositionAndRotation(out Vector3 position, out Quaternion rotation)
+        {
+            CheckHierarchyValid();
+            GetPositionAndRotation_Internal(ref this, out position, out rotation);
+        }
+
+        public void GetLocalPositionAndRotation(out Vector3 localPosition, out Quaternion localRotation)
+        {
+            CheckHierarchyValid();
+            GetLocalPositionAndRotation_Internal(ref this, out localPosition, out localRotation);
+        }
+
+        [NativeMethod(Name = "TransformAccessBindings::SetPositionAndRotation", IsThreadSafe = true, IsFreeFunction = true, ThrowsException = true)]
+        private static extern void SetPositionAndRotation_Internal(ref TransformAccess access, ref Vector3 position, ref Quaternion rotation);
+
+        [NativeMethod(Name = "TransformAccessBindings::SetLocalPositionAndRotation", IsThreadSafe = true, IsFreeFunction = true, ThrowsException = true)]
+        private static extern void SetLocalPositionAndRotation_Internal(ref TransformAccess access, ref Vector3 localPosition, ref Quaternion localRotation);
+
+        [NativeMethod(Name = "TransformAccessBindings::GetPositionAndRotation", IsThreadSafe = true, IsFreeFunction = true, ThrowsException = true)]
+        private static extern void GetPositionAndRotation_Internal(ref TransformAccess access, out Vector3 position, out Quaternion rotation);
+
+        [NativeMethod(Name = "TransformAccessBindings::GetLocalPositionAndRotation", IsThreadSafe = true, IsFreeFunction = true, ThrowsException = true)]
+        private static extern void GetLocalPositionAndRotation_Internal(ref TransformAccess access, out Vector3 localPosition, out Quaternion localRotation);
+
         //@TODO: Static code analysis needs to prevent creation of TransformAccess except through TransformAccessArray accessor.
         // Code below assumes this to be true since it doesn't check if TransformAccess is valid
 
@@ -224,6 +260,7 @@ public TransformAccessArray(int capacity, int desiredJobCount = -1)
         public static void Allocate(int capacity, int desiredJobCount, out TransformAccessArray array)
         {
             array.m_TransformArray = Create(capacity, desiredJobCount);
+            UnsafeUtility.LeakRecord(array.m_TransformArray, LeakCategory.TransformAccessArray, 0);
 
             AtomicSafetyHandle.CreateHandle(out array.m_Safety, Allocator.Persistent);
         }
diff --git a/Tools/Bee/build/Distribution/BeeDriver2/Bee.BeeDriver2.dll b/Tools/Bee/build/Distribution/BeeDriver2/Bee.BeeDriver2.dll
index 1fca415091..4f063ea684 100644
Binary files a/Tools/Bee/build/Distribution/BeeDriver2/Bee.BeeDriver2.dll and b/Tools/Bee/build/Distribution/BeeDriver2/Bee.BeeDriver2.dll differ
diff --git a/Tools/Bee/build/Distribution/BeeDriver2/Bee.BinLog.dll b/Tools/Bee/build/Distribution/BeeDriver2/Bee.BinLog.dll
index 22004926df..ee4ad7a836 100644
Binary files a/Tools/Bee/build/Distribution/BeeDriver2/Bee.BinLog.dll and b/Tools/Bee/build/Distribution/BeeDriver2/Bee.BinLog.dll differ
diff --git a/Tools/Bee/build/Distribution/BeeTinyProfiler2/Bee.TinyProfiler2.dll b/Tools/Bee/build/Distribution/BeeTinyProfiler2/Bee.TinyProfiler2.dll
index df36c2bd98..a6bb3c741c 100644
Binary files a/Tools/Bee/build/Distribution/BeeTinyProfiler2/Bee.TinyProfiler2.dll and b/Tools/Bee/build/Distribution/BeeTinyProfiler2/Bee.TinyProfiler2.dll differ
diff --git a/Tools/Unity.CecilTools/Unity.CecilTools.gen.csproj b/Tools/Unity.CecilTools/Unity.CecilTools.gen.csproj
index b733c6bc5c..95b120e481 100644
--- a/Tools/Unity.CecilTools/Unity.CecilTools.gen.csproj
+++ b/Tools/Unity.CecilTools/Unity.CecilTools.gen.csproj
@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <EnableDefaultItems>false</EnableDefaultItems>
     <LangVersion>latest</LangVersion>
-    <NoWarn>1071;1701</NoWarn>
+    <NoWarn>1701</NoWarn>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Tools/Unity.SerializationLogic/Unity.SerializationLogic.gen.csproj b/Tools/Unity.SerializationLogic/Unity.SerializationLogic.gen.csproj
index acf05a5eb6..f3b67ab7be 100644
--- a/Tools/Unity.SerializationLogic/Unity.SerializationLogic.gen.csproj
+++ b/Tools/Unity.SerializationLogic/Unity.SerializationLogic.gen.csproj
@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <EnableDefaultItems>false</EnableDefaultItems>
     <LangVersion>latest</LangVersion>
-    <NoWarn>1071;1701</NoWarn>
+    <NoWarn>1701</NoWarn>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
diff --git a/artifacts/Stevedore/unity-compiler-linux-x64_f3f3/Unity.CompilationPipeline.Common/Unity.CompilationPipeline.Common.dll b/artifacts/Stevedore/unity-compiler-win-x64_dc19/Unity.CompilationPipeline.Common/Unity.CompilationPipeline.Common.dll
similarity index 70%
rename from artifacts/Stevedore/unity-compiler-linux-x64_f3f3/Unity.CompilationPipeline.Common/Unity.CompilationPipeline.Common.dll
rename to artifacts/Stevedore/unity-compiler-win-x64_dc19/Unity.CompilationPipeline.Common/Unity.CompilationPipeline.Common.dll
index 96549cbb8c..163925e40b 100644
Binary files a/artifacts/Stevedore/unity-compiler-linux-x64_f3f3/Unity.CompilationPipeline.Common/Unity.CompilationPipeline.Common.dll and b/artifacts/Stevedore/unity-compiler-win-x64_dc19/Unity.CompilationPipeline.Common/Unity.CompilationPipeline.Common.dll differ