diff --git a/Editor/Mono/Audio/AudioContainerWindow.cs b/Editor/Mono/Audio/AudioContainerWindow.cs
index be0861dcae..55e043b889 100644
--- a/Editor/Mono/Audio/AudioContainerWindow.cs
+++ b/Editor/Mono/Audio/AudioContainerWindow.cs
@@ -965,6 +965,11 @@ void OnAudioClipListChanged(SerializedProperty property)
         // Force a list rebuild when the list has changed or it will not always render correctly
         m_ClipsListView.Rebuild();
 
+        // This function is the first entry-point in `AudioContainerWindow` after an undo-event that alters the
+        // audio clip list has been triggered. And, whenever the list is altered, we need to make sure the state is stopped.
+        State.Stop();
+        ClearClipFieldProgressBars();
+
         UpdateTransportButtonStates();
         SetTitle();
     }
diff --git a/Editor/Mono/BuildPipeline.bindings.cs b/Editor/Mono/BuildPipeline.bindings.cs
index f159eb1b07..a114434beb 100644
--- a/Editor/Mono/BuildPipeline.bindings.cs
+++ b/Editor/Mono/BuildPipeline.bindings.cs
@@ -393,6 +393,24 @@ private static BuildReport BuildPlayer(string[] scenes, string locationPathName,
                     scenes[i] = scenes[i].Replace('\\', '/').Replace("//", "/");
             }
 
+            if ((options & BuildOptions.Development) == 0)
+            {
+                if ((options & BuildOptions.AllowDebugging) != 0)
+                {
+                    throw new ArgumentException("Non-development build cannot allow debugging. Either add the Development build option, or remove the AllowDebugging build option.");
+                }
+
+                if ((options & BuildOptions.EnableDeepProfilingSupport) != 0)
+                {
+                    throw new ArgumentException("Non-development build cannot allow deep profiling support. Either add the Development build option, or remove the EnableDeepProfilingSupport build option.");
+                }
+
+                if ((options & BuildOptions.ConnectWithProfiler) != 0)
+                {
+                    throw new ArgumentException("Non-development build cannot allow auto-connecting the profiler. Either add the Development build option, or remove the ConnectWithProfiler build option.");
+                }
+            }
+
             try
             {
                 return BuildPlayerInternal(scenes, locationPathName, assetBundleManifestPath, buildTargetGroup, target, subtarget, options, extraScriptingDefines);
diff --git a/Editor/Mono/BuildProfile/BuildProfile.cs b/Editor/Mono/BuildProfile/BuildProfile.cs
index baac9a08a6..9098b2e5ab 100644
--- a/Editor/Mono/BuildProfile/BuildProfile.cs
+++ b/Editor/Mono/BuildProfile/BuildProfile.cs
@@ -153,14 +153,23 @@ internal PlayerSettings playerSettings
         [VisibleToOtherModules]
         internal Action OnPlayerSettingsUpdatedFromYAML;
 
+        /// <summary>
+        /// Cross-pipeline graphics settings overrides in build profile
+        /// </summary>
+        [VisibleToOtherModules]
+        internal BuildProfileGraphicsSettings graphicsSettings;
+
         [VisibleToOtherModules]
         internal Action OnGraphicsSettingsSubAssetRemoved;
 
         /// <summary>
-        /// Cross-pipeline graphics settings overrides in build profile
+        /// Quality settings overrides in build profile
         /// </summary>
         [VisibleToOtherModules]
-        internal BuildProfileGraphicsSettings graphicsSettings;
+        internal BuildProfileQualitySettings qualitySettings;
+
+        [VisibleToOtherModules]
+        internal Action OnQualitySettingsSubAssetRemoved;
 
         // TODO: Return server IBuildTargets for server build profiles. (https://jira.unity3d.com/browse/PLAT-6612)
         /// <summary>
@@ -235,6 +244,7 @@ void OnEnable()
             LoadPlayerSettings();
 
             TryLoadGraphicsSettings();
+            TryLoadQualitySettings();
 
             if (!EditorUserBuildSettings.isBuildProfileAvailable
                 || BuildProfileContext.activeProfile != this)
@@ -266,6 +276,21 @@ void TryLoadGraphicsSettings()
             graphicsSettings = data;
         }
 
+        void TryLoadQualitySettings()
+        {
+            if (qualitySettings != null)
+                return;
+
+            var path = AssetDatabase.GetAssetPath(this);
+            var objects = AssetDatabase.LoadAllAssetsAtPath(path);
+
+            var data = Array.Find(objects, obj => obj is BuildProfileQualitySettings) as BuildProfileQualitySettings;
+            if (data == null)
+                return;
+
+            qualitySettings = data;
+        }
+
         void OnDisable()
         {
             if (BuildProfileContext.activeProfile == this)
@@ -297,6 +322,7 @@ static void ContextMenuReset(MenuCommand menuCommand)
             targetBuildProfile.scriptingDefines = Array.Empty<string>();
 
             BuildProfileModuleUtil.RemovePlayerSettings(targetBuildProfile);
+            targetBuildProfile.RemoveQualitySettings();
             targetBuildProfile.RemoveGraphicsSettings();
 
             AssetDatabase.SaveAssetIfDirty(targetBuildProfile);
diff --git a/Editor/Mono/BuildProfile/BuildProfileContext.cs b/Editor/Mono/BuildProfile/BuildProfileContext.cs
index 1c78527f6f..567fc10bba 100644
--- a/Editor/Mono/BuildProfile/BuildProfileContext.cs
+++ b/Editor/Mono/BuildProfile/BuildProfileContext.cs
@@ -314,6 +314,17 @@ internal static bool ActiveProfileHasGraphicsSettings()
             return activeProfile.graphicsSettings != null;
         }
 
+        /// <summary>
+        /// Check if the active build profile has quality settings
+        /// </summary>
+        internal static bool ActiveProfileHasQualitySettings()
+        {
+            if (activeProfile == null)
+                return false;
+
+            return activeProfile.qualitySettings != null;
+        }
+
         /// <summary>
         /// Sync the active build profile to EditorUserBuildSettings to ensure they are in a consistent state.
         /// </summary>
@@ -734,6 +745,24 @@ static bool SetActiveShaderVariantCollections(ShaderVariantCollection[] collecti
             return true;
         }
 
+        [RequiredByNativeCode, UsedImplicitly]
+        static string[] GetActiveProfileQualityLevels()
+        {
+            if (!ActiveProfileHasQualitySettings())
+                return Array.Empty<string>();
+
+            return activeProfile.qualitySettings.qualityLevels;
+        }
+
+        [RequiredByNativeCode, UsedImplicitly]
+        static string GetActiveProfileDefaultQualityLevel()
+        {
+            if (!ActiveProfileHasQualitySettings())
+                return string.Empty;
+
+            return activeProfile.qualitySettings.defaultQualityLevel;
+        }
+
         [RequiredByNativeCode]
         static string GetActiveBuildProfilePath()
         {
diff --git a/Editor/Mono/BuildProfile/BuildProfileCreate.cs b/Editor/Mono/BuildProfile/BuildProfileCreate.cs
index abdb4e306a..a3c0acd8e5 100644
--- a/Editor/Mono/BuildProfile/BuildProfileCreate.cs
+++ b/Editor/Mono/BuildProfile/BuildProfileCreate.cs
@@ -102,5 +102,20 @@ internal void RemoveGraphicsSettings()
 
             OnGraphicsSettingsSubAssetRemoved?.Invoke();
         }
+
+        /// <summary>
+        /// Remove the Quality Settings overrides from the build profile.
+        /// </summary>
+        internal void RemoveQualitySettings()
+        {
+            if (qualitySettings == null)
+                return;
+
+            AssetDatabase.RemoveObjectFromAsset(qualitySettings);
+            qualitySettings = null;
+            EditorUtility.SetDirty(this);
+
+            OnQualitySettingsSubAssetRemoved?.Invoke();
+        }
     }
 }
diff --git a/Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs b/Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs
index ae9f2df67c..d61c6de0e0 100644
--- a/Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs
+++ b/Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs
@@ -608,9 +608,81 @@ public static void OnActiveProfileGraphicsSettingsChanged(bool hasGraphicsSettin
             GraphicsSettingsInspector.OnActiveProfileGraphicsSettingsChanged?.Invoke();
         }
 
+        internal static void RemoveQualityLevelFromAllProfiles(string qualityLevelName)
+        {
+            var profiles = GetAllBuildProfiles();
+            foreach (var profile in profiles)
+            {
+                if (profile.qualitySettings == null)
+                    continue;
+
+                profile.qualitySettings.RemoveQualityLevel(qualityLevelName);
+            }
+        }
+
+        internal static void RenameQualityLevelInAllProfiles(string oldName, string newName)
+        {
+            var profiles = GetAllBuildProfiles();
+            foreach (var profile in profiles)
+            {
+                if (profile.qualitySettings == null)
+                    continue;
+
+                profile.qualitySettings.RenameQualityLevel(oldName, newName);
+            }
+        }
+
+        /// <summary>
+        /// Get all custom build profiles in the project.
+        /// </summary>
+        public static List<BuildProfile> GetAllBuildProfiles()
+        {
+            var alreadyLoadedBuildProfiles = Resources.FindObjectsOfTypeAll<BuildProfile>();
+
+            const string buildProfileAssetSearchString = $"t:{nameof(BuildProfile)}";
+            var assetsGuids = AssetDatabase.FindAssets(buildProfileAssetSearchString);
+            var result = new List<BuildProfile>(assetsGuids.Length);
+
+            // Suppress missing type warning thrown by serialization. This could happen
+            // when the build profile window is opened, then entering play mode and the
+            // module for that profile is not installed.
+            BuildProfileModuleUtil.SuppressMissingTypeWarning();
+
+            foreach (var guid in assetsGuids)
+            {
+                string path = AssetDatabase.GUIDToAssetPath(guid);
+                BuildProfile profile = AssetDatabase.LoadAssetAtPath<BuildProfile>(path);
+                if (profile == null)
+                {
+                    Debug.LogWarning($"[BuildProfile] Failed to load asset at path: {path}");
+                    continue;
+                }
+
+                result.Add(profile);
+            }
+
+            foreach (var buildProfile in alreadyLoadedBuildProfiles)
+            {
+                // Asset database will not give us any build profiles that get created in memory
+                // and we need to include them in this list as we use it to detect that build profiles
+                // have been destroyed and destroy their resources like PlayerSettings afterwards.
+                // Skipping the in-memory build profiles will result in us deleting their associated
+                // player settings object while it's being used and will lead to a crash (UUM-77423)
+                if (buildProfile &&
+                    !BuildProfileContext.IsClassicPlatformProfile(buildProfile) &&
+                    !BuildProfileContext.IsSharedProfile(buildProfile.buildTarget) &&
+                    !EditorUtility.IsPersistent(buildProfile))
+                {
+                    result.Add(buildProfile);
+                }
+            }
+
+            return result;
+        }
+
         public static string[] GetSettingsRequiringRestart(PlayerSettings previousProfileSettings, PlayerSettings newProfileSettings, BuildTarget oldBuildTarget, BuildTarget newBuildTarget)
         {
-            return  PlayerSettings.GetSettingsRequiringRestart(previousProfileSettings, newProfileSettings, oldBuildTarget, newBuildTarget);
+            return PlayerSettings.GetSettingsRequiringRestart(previousProfileSettings, newProfileSettings, oldBuildTarget, newBuildTarget);
         }
 
         public static PlayerSettings GetGlobalPlayerSettings()
diff --git a/Editor/Mono/BuildProfile/BuildProfileQualitySettings.cs b/Editor/Mono/BuildProfile/BuildProfileQualitySettings.cs
new file mode 100644
index 0000000000..7d841df0ad
--- /dev/null
+++ b/Editor/Mono/BuildProfile/BuildProfileQualitySettings.cs
@@ -0,0 +1,66 @@
+// Unity 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.Bindings;
+
+namespace UnityEditor.Build.Profile
+{
+    [VisibleToOtherModules("UnityEditor.BuildProfileModule")]
+    sealed class BuildProfileQualitySettings : ScriptableObject
+    {
+        [SerializeField] string m_DefaultQualityLevel = string.Empty;
+        [SerializeField] string[] m_QualityLevels = Array.Empty<string>();
+
+        public string defaultQualityLevel
+        {
+            get => m_DefaultQualityLevel;
+            set => m_DefaultQualityLevel = value;
+        }
+
+        public string[] qualityLevels
+        {
+            get => m_QualityLevels;
+            set => m_QualityLevels = value;
+        }
+
+        public void Instantiate()
+        {
+            name = "Quality Settings";
+            hideFlags = HideFlags.HideInHierarchy | HideFlags.HideInInspector;
+        }
+
+        public void RemoveQualityLevel(string qualityLevel)
+        {
+            var index = Array.IndexOf(qualityLevels, qualityLevel);
+            if (index == -1)
+                return;
+
+            var newQualityLevels = new string[qualityLevels.Length - 1];
+            Array.Copy(qualityLevels, 0, newQualityLevels, 0, index);
+            Array.Copy(qualityLevels, index + 1, newQualityLevels, index, qualityLevels.Length - index - 1);
+            qualityLevels = newQualityLevels;
+
+            if (defaultQualityLevel == qualityLevel)
+                defaultQualityLevel = qualityLevels.Length > 0 ? qualityLevels[0] : string.Empty;
+
+            EditorUtility.SetDirty(this);
+        }
+
+        public void RenameQualityLevel(string oldName, string newName)
+        {
+            var index = Array.IndexOf(qualityLevels, oldName);
+            if (index == -1)
+                return;
+
+            qualityLevels[index] = newName;
+
+            if (defaultQualityLevel == oldName)
+                defaultQualityLevel = newName;
+
+            EditorUtility.SetDirty(this);
+        }
+    }
+}
diff --git a/Editor/Mono/BuildProfile/BuildProfileQualitySettingsEditor.cs b/Editor/Mono/BuildProfile/BuildProfileQualitySettingsEditor.cs
new file mode 100644
index 0000000000..a6fa7ad028
--- /dev/null
+++ b/Editor/Mono/BuildProfile/BuildProfileQualitySettingsEditor.cs
@@ -0,0 +1,293 @@
+// Unity 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.UIElements;
+using UnityEngine;
+using UnityEngine.Bindings;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Build.Profile
+{
+    [VisibleToOtherModules("UnityEditor.BuildProfileModule")]
+    [CustomEditor(typeof(BuildProfileQualitySettings))]
+    sealed class BuildProfileQualitySettingsEditor : Editor
+    {
+        const string k_Uxml = "BuildProfile/UXML/BuildProfileQualitySettings.uxml";
+        const string k_StyleSheet = "BuildProfile/StyleSheets/BuildProfile.uss";
+        const string k_QualitySettingsWindow = "Project/Quality";
+        static readonly GUIContent k_qualitySettingsWindow = EditorGUIUtility.TrTextContent("Quality...");
+        static readonly string k_InvalidQualityLevelWarning =
+            L10n.Tr("The Quality levels in this profile do not match those that exist in the project. This may result in unexpected results on build.");
+        static readonly string k_EmptyQualitySettingsWarning =
+            L10n.Tr("When no Quality levels are listed, the build will take from the global list of Quality levels.");
+        static readonly string k_SetDefaultQualityLevelMenuText = L10n.Tr("Set as Default");
+
+        SerializedProperty m_QualityLevels;
+        SerializedProperty m_DefaultQualityLevel;
+        HelpBox warning;
+
+        public override VisualElement CreateInspectorGUI()
+        {
+            var root = new VisualElement();
+            var visualTree = EditorGUIUtility.LoadRequired(k_Uxml) as VisualTreeAsset;
+            var windowUss = EditorGUIUtility.LoadRequired(k_StyleSheet) as StyleSheet;
+            visualTree.CloneTree(root);
+            root.styleSheets.Add(windowUss);
+
+            m_QualityLevels = serializedObject.FindProperty("m_QualityLevels");
+            m_DefaultQualityLevel = serializedObject.FindProperty("m_DefaultQualityLevel");
+
+            root.Bind(serializedObject);
+            SetupQualityLevelsList(root);
+
+            return root;
+        }
+
+        void SetupQualityLevelsList(VisualElement root)
+        {
+            warning = root.Q<HelpBox>("invalid-quality-levels-warning-help-box");
+            UpdateInvalidQualityLevelsWarning();
+
+            var qualityLevelsList = root.Q<ListView>("quality-levels");
+            root.TrackPropertyValue(m_QualityLevels, sp => {
+                UpdateInvalidQualityLevelsWarning();
+                qualityLevelsList.RefreshItems();
+            });
+            root.TrackPropertyValue(m_DefaultQualityLevel, sp => qualityLevelsList.RefreshItems());
+
+            qualityLevelsList.makeItem = () => new QualityLevelItem(SetDefaultQualityLevelContextMenu());
+            qualityLevelsList.bindItem = (element, index) =>
+            {
+                if (m_QualityLevels.arraySize == 0 || index >= m_QualityLevels.arraySize)
+                    return;
+
+                var item = element as QualityLevelItem;
+                var qualityLevelName = m_QualityLevels.GetArrayElementAtIndex(index).stringValue;
+
+                item.text = qualityLevelName;
+                if (IsDefaultQualityLevel(qualityLevelName))
+                    item.SetDefaultIndicator(true);
+                else
+                    item.SetDefaultIndicator(false);
+            };
+            qualityLevelsList.onAdd = list =>
+            {
+                var menu = new GenericMenu();
+                var allQualityLevels = QualitySettings.names;
+                foreach (var level in allQualityLevels)
+                {
+                    if (!IsQualityLevelAdded(level))
+                        menu.AddItem(new GUIContent(level), false, () => AddQualityLevel(level));
+                }
+
+                menu.AddSeparator(string.Empty);
+                menu.AddItem(k_qualitySettingsWindow, false, () => SettingsService.OpenProjectSettings(k_QualitySettingsWindow));
+                menu.ShowAsContext();
+            };
+            qualityLevelsList.onRemove = list =>
+            {
+                RemoveQualityLevel();
+            };
+
+            void AddQualityLevel(string newLevel)
+            {
+                m_QualityLevels.InsertArrayElementAtIndex(m_QualityLevels.arraySize);
+                m_QualityLevels.GetArrayElementAtIndex(m_QualityLevels.arraySize - 1).stringValue = newLevel;
+
+                if (m_QualityLevels.arraySize == 1)
+                    m_DefaultQualityLevel.stringValue = newLevel;
+
+                serializedObject.ApplyModifiedProperties();
+            }
+
+            void RemoveQualityLevel()
+            {
+                if (m_QualityLevels.arraySize == 0)
+                    return;
+
+                var selectedIndex = qualityLevelsList.selectedIndex;
+
+                if (selectedIndex < 0 || selectedIndex >= m_QualityLevels.arraySize)
+                    selectedIndex = m_QualityLevels.arraySize - 1;
+
+                if (selectedIndex >= 0)
+                {
+                    var deletedQualityLevel = m_QualityLevels.GetArrayElementAtIndex(selectedIndex).stringValue;
+                    m_QualityLevels.DeleteArrayElementAtIndex(selectedIndex);
+
+                    if (IsDefaultQualityLevel(deletedQualityLevel))
+                        m_DefaultQualityLevel.stringValue = m_QualityLevels.arraySize > 0 ?
+                            m_QualityLevels.GetArrayElementAtIndex(0).stringValue : string.Empty;
+
+                    serializedObject.ApplyModifiedProperties();
+                }
+            }
+        }
+
+        bool IsDefaultQualityLevel(string qualityLevel) => m_DefaultQualityLevel.stringValue == qualityLevel;
+
+        bool IsQualityLevelAdded(string level)
+        {
+            for (var i = 0; i < m_QualityLevels.arraySize; i++)
+            {
+                if (m_QualityLevels.GetArrayElementAtIndex(i).stringValue == level)
+                    return true;
+            }
+
+            return false;
+        }
+
+        void UpdateInvalidQualityLevelsWarning()
+        {
+            if (m_QualityLevels.arraySize == 0)
+            {
+                warning.text = k_EmptyQualitySettingsWarning;
+                warning.style.display = DisplayStyle.Flex;
+            }
+            else if (HasInvalidQualityLevels())
+            {
+                warning.text = k_InvalidQualityLevelWarning;
+                warning.style.display = DisplayStyle.Flex;
+            }
+            else
+                warning.style.display = DisplayStyle.None;
+        }
+
+        bool HasInvalidQualityLevels()
+        {
+            var allQualityLevels = QualitySettings.names;
+            for (var i = 0; i < m_QualityLevels.arraySize; i++)
+            {
+                var level = m_QualityLevels.GetArrayElementAtIndex(i).stringValue;
+                if (Array.IndexOf(allQualityLevels, level) == -1)
+                    return true;
+            }
+
+            return false;
+        }
+
+        ContextualMenuManipulator SetDefaultQualityLevelContextMenu()
+        {
+            var menu = new ContextualMenuManipulator(evt =>
+            {
+                var selectedQualityLevel = evt.target as QualityLevelItem;
+                if (selectedQualityLevel == null)
+                    return;
+
+                evt.menu.AppendAction(k_SetDefaultQualityLevelMenuText, action =>
+                {
+                    m_DefaultQualityLevel.stringValue = selectedQualityLevel.text;
+                    serializedObject.ApplyModifiedProperties();
+                });
+            });
+
+            return menu;
+        }
+
+        public bool IsDataEqualToGlobalQualitySettings(BuildProfile profile)
+        {
+            var buildTarget = profile.buildTarget;
+            var buildTargetGroupString = BuildPipeline.GetBuildTargetGroup(buildTarget).ToString();
+
+            var globalQualityLevels = QualitySettings.GetActiveQualityLevelsForPlatform(buildTargetGroupString);
+            if (m_QualityLevels.arraySize != globalQualityLevels.Length)
+                return false;
+
+            var allQualityLevels = QualitySettings.names;
+            for (var i = 0; i < m_QualityLevels.arraySize; i++)
+            {
+                var levelIndex = globalQualityLevels[i];
+                if (m_QualityLevels.GetArrayElementAtIndex(i).stringValue != allQualityLevels[levelIndex])
+                    return false;
+            }
+
+            var globalDefaultQualityLevelIndex = GetDefaultQualityForPlatform(buildTargetGroupString);
+            if (globalDefaultQualityLevelIndex != -1)
+            {
+                var globalDefaultQualityLevel = allQualityLevels[globalDefaultQualityLevelIndex];
+                if (m_DefaultQualityLevel.stringValue != globalDefaultQualityLevel)
+                    return false;
+            }
+
+            return true;
+        }
+
+        public void ResetToGlobalQualitySettingsValues(BuildProfile profile)
+        {
+            var qualityLevels = serializedObject.FindProperty("m_QualityLevels");
+            var defaultQualityLevel = serializedObject.FindProperty("m_DefaultQualityLevel");
+            var buildTarget = profile.buildTarget;
+            var buildTargetGroupString = BuildPipeline.GetBuildTargetGroup(buildTarget).ToString();
+
+            var globalQualityLevels = QualitySettings.GetActiveQualityLevelsForPlatform(buildTargetGroupString);
+            qualityLevels.ClearArray();
+            foreach (var level in globalQualityLevels)
+            {
+                qualityLevels.InsertArrayElementAtIndex(qualityLevels.arraySize);
+                qualityLevels.GetArrayElementAtIndex(qualityLevels.arraySize - 1).stringValue = QualitySettings.names[level];
+            }
+
+            var globalDefaultQualityLevelIndex = GetDefaultQualityForPlatform(buildTargetGroupString);
+            if (globalDefaultQualityLevelIndex != -1)
+                defaultQualityLevel.stringValue = QualitySettings.names[globalDefaultQualityLevelIndex];
+            else
+                defaultQualityLevel.stringValue = qualityLevels.arraySize > 0 ? QualitySettings.names[globalQualityLevels[0]] : string.Empty;
+
+            serializedObject.ApplyModifiedProperties();
+        }
+
+        int GetDefaultQualityForPlatform(string buildTargetGroupName)
+        {
+            var qualitySettings = QualitySettings.GetQualitySettings();
+            var qualitySettingsSO = new SerializedObject(qualitySettings);
+            var perPlatformDefaultQualityProperty = qualitySettingsSO.FindProperty("m_PerPlatformDefaultQuality");
+
+            foreach (SerializedProperty prop in perPlatformDefaultQualityProperty)
+            {
+                if (prop.FindPropertyRelative("first").stringValue == buildTargetGroupName)
+                    return prop.FindPropertyRelative("second").intValue;
+            }
+            return -1;
+        }
+
+        class QualityLevelItem : VisualElement
+        {
+            const string k_Uxml = "BuildProfile/UXML/BuildProfileQualitySettingsListElement.uxml";
+            const string k_StyleSheet = "BuildProfile/StyleSheets/BuildProfile.uss";
+            static readonly string k_DefaultIndicatorText = L10n.Tr("Default");
+            protected readonly Label m_Text;
+            protected readonly Label m_DefaultIndicator;
+
+            internal string text
+            {
+                get => m_Text.text;
+                set => m_Text.text = value;
+            }
+
+            internal QualityLevelItem(IManipulator manipulator)
+            {
+                var uxml = EditorGUIUtility.LoadRequired(k_Uxml) as VisualTreeAsset;
+                var stylesheet = EditorGUIUtility.LoadRequired(k_StyleSheet) as StyleSheet;
+                styleSheets.Add(stylesheet);
+                uxml.CloneTree(this);
+
+                m_Text = this.Q<Label>("quality-level-name");
+                m_DefaultIndicator = this.Q<Label>("default-quality-level-indicator");
+                m_DefaultIndicator.text = k_DefaultIndicatorText;
+                SetDefaultIndicator(false);
+
+                this.AddManipulator(manipulator);
+            }
+
+            internal void SetDefaultIndicator(bool isDefault)
+            {
+                if (isDefault)
+                    m_DefaultIndicator.style.display = DisplayStyle.Flex;
+                else
+                    m_DefaultIndicator.style.display = DisplayStyle.None;
+            }
+        }
+    }
+}
diff --git a/Editor/Mono/ConsoleWindow.cs b/Editor/Mono/ConsoleWindow.cs
index 69a6ba0425..fecd04b9e6 100644
--- a/Editor/Mono/ConsoleWindow.cs
+++ b/Editor/Mono/ConsoleWindow.cs
@@ -1200,6 +1200,18 @@ private void AddStackTraceLoggingMenu(GenericMenu menu)
             }
         }
 
+        internal static void ClearConsoleOnRecompile()
+        {
+            // During build process, there are multiple compilation events that can trigger console clearing
+            // We don't want to lose the log entries during build process so we re-enable the flag only when editor is not building
+            // For clearing on build we have a separate option
+            if (HasFlag(ConsoleFlags.ClearOnRecompile) && !BuildPipeline.isBuildingPlayer)
+            {
+                LogEntries.Clear();
+            }
+
+        }
+
         private void SetFilter(string filteringText)
         {
             m_RestoreLatestSelection = String.IsNullOrEmpty(filteringText) && !String.IsNullOrEmpty(m_SearchText) && m_LastActiveEntryIndex != -1;
diff --git a/Editor/Mono/GUI/PackageImport.cs b/Editor/Mono/GUI/PackageImport.cs
index 1f5710cfe6..60f8ccd2ab 100644
--- a/Editor/Mono/GUI/PackageImport.cs
+++ b/Editor/Mono/GUI/PackageImport.cs
@@ -182,7 +182,8 @@ void TopArea()
 
                 var textContentWidth = r.width - iconRect.width;
                 var textContentX = iconRect.xMax + margin;
-                if (!PackageImportWizard.instance.IsMultiStepWizard)
+                var packageImportWizard = PackageImportWizard.instance;
+                if (!packageImportWizard.IsMultiStepWizard)
                     titleRect = new Rect(textContentX, iconRect.yMin, textContentWidth, iconRect.height);
                 else
                 {
@@ -190,12 +191,12 @@ void TopArea()
 
                     // Subtitle
                     var subtitleRect = new Rect(textContentX + 1f, iconRect.yMin + iconRect.height * 0.50f, textContentWidth, iconRect.height / 4);
-                    var subtitleText = PackageImportWizard.instance.IsProjectSettingStep ? "Import Settings Overrides" : "Import Content";
+                    var subtitleText = packageImportWizard.IsProjectSettingStep ? "Import Settings Overrides" : "Import Content";
                     GUI.Label(subtitleRect, EditorGUIUtility.TrTextContent(subtitleText), ms_Constants.subtitle);
 
                     // "Step x of y" label
                     var stepInfoRect = new Rect(textContentX, iconRect.yMin + iconRect.height * 0.75f, textContentWidth, iconRect.height / 4);
-                    var stepInfoText = PackageImportWizard.instance.IsProjectSettingStep ? "Step 2 of 2" : "Step 1 of 2";
+                    var stepInfoText = packageImportWizard.IsProjectSettingStep ? "Step 2 of 2" : "Step 1 of 2";
                     GUI.Label(stepInfoRect, EditorGUIUtility.TrTextContent(stepInfoText), ms_Constants.stepInfo);
                 }
             }
@@ -243,26 +244,28 @@ void BottomArea()
             GUILayout.BeginHorizontal();
             GUILayout.Space(10);
 
+            var packageImportWizard = PackageImportWizard.instance;
             GUILayout.FlexibleSpace();
             if (GUILayout.Button(EditorGUIUtility.TrTextContent("Cancel")))
             {
-                PackageImportWizard.instance.CancelImport();
+                packageImportWizard.CancelImport();
             }
 
-            var isSecondStep = PackageImportWizard.instance.IsMultiStepWizard &&
-                               PackageImportWizard.instance.IsProjectSettingStep;
-            if (isSecondStep && GUILayout.Button(EditorGUIUtility.TrTextContent("Back")))
+            var hasPreviousStep = packageImportWizard.IsMultiStepWizard && packageImportWizard.IsProjectSettingStep;
+            var hasNextStep = packageImportWizard.IsMultiStepWizard && !packageImportWizard.IsProjectSettingStep;
+            var anyElementsSelected = packageImportWizard.AreAnyElementsSelected();
+            if (hasPreviousStep && GUILayout.Button(EditorGUIUtility.TrTextContent("Back")))
             {
-                PackageImportWizard.instance.DoPreviousStep(m_ImportPackageItems);
+                packageImportWizard.DoPreviousStep(m_ImportPackageItems);
             }
-            var buttonText = isSecondStep || !PackageImportWizard.instance.IsMultiStepWizard ? "Import" : "Next";
-            GUI.enabled = m_Tree.isAnyItemEnabled;
-            if (GUILayout.Button(EditorGUIUtility.TrTextContent(buttonText)))
+            if (hasNextStep && GUILayout.Button(EditorGUIUtility.TrTextContent("Next")))
             {
-                if (m_ImportPackageItems != null)
-                    PackageImportWizard.instance.DoNextStep(m_ImportPackageItems);
-                else
-                    PackageImportWizard.instance.CloseImportWindow();
+                packageImportWizard.DoNextStep(m_ImportPackageItems);
+            }
+            GUI.enabled = anyElementsSelected;
+            if (!hasNextStep && GUILayout.Button(EditorGUIUtility.TrTextContent("Import")))
+            {
+                packageImportWizard.DoImportStep(m_ImportPackageItems);
             }
             GUI.enabled = true;
 
@@ -464,19 +467,21 @@ public void StartImport(string packagePath, ImportPackageItem[] items, string pa
 
         public void DoNextStep(ImportPackageItem[] importPackageItems)
         {
-            if (IsProjectSettingStep)
-                m_ProjectSettingItems = new List<ImportPackageItem>(importPackageItems);
-            else
-                m_AssetContentItems = new List<ImportPackageItem>(importPackageItems);
+            if (!IsMultiStepWizard && IsProjectSettingStep)
+                return;
 
+            m_AssetContentItems = new List<ImportPackageItem>(importPackageItems);
+            m_IsProjectSettingStep = true;
+            ShowImportWindow(m_ProjectSettingItems.ToArray());
+        }
 
-            if (!IsMultiStepWizard || IsProjectSettingStep)
-                FinishImport();
-            else
-            {
-                m_IsProjectSettingStep = true;
-                ShowImportWindow(m_ProjectSettingItems.ToArray());
-            }
+        public void DoImportStep(ImportPackageItem[] importPackageItems)
+        {
+            if (IsMultiStepWizard && !IsProjectSettingStep)
+                return;
+
+            m_ProjectSettingItems = new List<ImportPackageItem>(importPackageItems);
+            FinishImport();
         }
 
         public void DoPreviousStep(ImportPackageItem[] importPackageItems)
@@ -530,5 +535,10 @@ private void ClearImportData()
             m_IsMultiStepWizard = false;
             m_IsProjectSettingStep = false;
         }
+
+        public bool AreAnyElementsSelected()
+        {
+            return m_AssetContentItems.Exists(i => i.enabledStatus == 1) || m_ProjectSettingItems.Exists(i => i.enabledStatus == 1);
+        }
     }
 }
diff --git a/Editor/Mono/Graphics/RenderPipelineGraphicsSettingsEditorUtility.cs b/Editor/Mono/Graphics/RenderPipelineGraphicsSettingsEditorUtility.cs
index c08ba5c1b3..4124b7b077 100644
--- a/Editor/Mono/Graphics/RenderPipelineGraphicsSettingsEditorUtility.cs
+++ b/Editor/Mono/Graphics/RenderPipelineGraphicsSettingsEditorUtility.cs
@@ -4,12 +4,16 @@
 
 using System;
 using System.Reflection;
+using UnityEditor.Inspector.GraphicsSettingsInspectors;
+using UnityEditor.Rendering.Settings;
 using UnityEngine.Rendering;
 
 namespace UnityEditor.Rendering
 {
     public static class RenderPipelineGraphicsSettingsEditorUtility
     {
+        internal const string undoRebindName = "Update IRenderPipelineGraphicsSettings: ";
+
         public static void ForEachFieldOfType<T>(this IRenderPipelineResources resource, Action<T> callback, BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)
         {
             if (resource == null)
@@ -57,6 +61,35 @@ public static void RemoveRenderPipelineGraphicsSettingsWithMissingScript()
         {
             EditorGraphicsSettings.ForEachPipelineSettings((settings) => settings.CleanNullSettings());
         }
+
+        public static void Rebind(IRenderPipelineGraphicsSettings settings, Type renderPipelineType)
+        {
+            if (settings == null || renderPipelineType == null || !typeof(RenderPipeline).IsAssignableFrom(renderPipelineType))
+                return;
+
+            var renderPipelineGlobalSettings = EditorGraphicsSettings.GetRenderPipelineGlobalSettingsAsset(renderPipelineType);
+            var serializedGlobalSettings = new SerializedObject(renderPipelineGlobalSettings);
+            var settingsIterator = serializedGlobalSettings.FindProperty(RenderPipelineGraphicsSettingsManager.serializationPathToCollection);
+            var end = settingsIterator.GetEndProperty();
+            settingsIterator.NextVisible(true); //enter the collection
+            while (true)
+            {
+                if (SerializedProperty.EqualContents(settingsIterator, end))
+                    return;
+
+                if (settingsIterator.boxedValue?.GetType() == settings.GetType())
+                    break;
+
+                settingsIterator.NextVisible(false);
+            }
+            
+            using (var notifier = new Notifier.Scope(settingsIterator))
+            {
+                settingsIterator.boxedValue = settings;
+                if (serializedGlobalSettings.ApplyModifiedProperties())
+                    Undo.SetCurrentGroupName($"{undoRebindName}{settings.GetType().Name}");
+            }
+        }
     }
 
 }
diff --git a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs
index 2cf5ea295e..a96fecff67 100644
--- a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs
+++ b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs
@@ -86,6 +86,12 @@ class SettingsContent
             public static readonly GUIContent publishingSettingsTitle = EditorGUIUtility.TrTextContent("Publishing Settings");
             public static readonly GUIContent captureLogsTitle = EditorGUIUtility.TrTextContent("Capture Logs");
 
+            public static readonly GUIContent usePlayerLog = EditorGUIUtility.TrTextContent("Use Player Log");
+            public static readonly GUIContent resizableWindow = EditorGUIUtility.TrTextContent("Resizable Window");
+            public static readonly GUIContent forceSingleInstance = EditorGUIUtility.TrTextContent("Force Single Instance");
+            public static readonly GUIContent overrideDefaultApplicationIdentifier = EditorGUIUtility.TrTextContent("Override Default Bundle Identifier");
+            public static readonly GUIContent bundleIdentifier = EditorGUIUtility.TrTextContent("Bundle Identifier");
+
             public static readonly GUIContent shaderSectionTitle = EditorGUIUtility.TrTextContent("Shader Settings");
             public static readonly GUIContent shaderVariantLoadingTitle = EditorGUIUtility.TrTextContent("Shader Variant Loading Settings");
             public static readonly GUIContent defaultShaderChunkSize = EditorGUIUtility.TrTextContent("Default chunk size (MB)*", "Use this setting to control how much memory is used when loading shader variants.");
@@ -114,6 +120,7 @@ class SettingsContent
             public static readonly GUIContent defaultScreenHeight = EditorGUIUtility.TrTextContent("Default Screen Height");
             public static readonly GUIContent macRetinaSupport = EditorGUIUtility.TrTextContent("Mac Retina Support");
             public static readonly GUIContent runInBackground = EditorGUIUtility.TrTextContent("Run In Background*");
+            public static readonly GUIContent defaultIsNativeResolution = EditorGUIUtility.TrTextContent("Default Is Native Resolution");
             public static readonly GUIContent defaultScreenOrientation = EditorGUIUtility.TrTextContent("Default Orientation*");
             public static readonly GUIContent allowedAutoRotateToPortrait = EditorGUIUtility.TrTextContent("Portrait");
             public static readonly GUIContent allowedAutoRotateToPortraitUpsideDown = EditorGUIUtility.TrTextContent("Portrait Upside Down");
@@ -187,6 +194,11 @@ class SettingsContent
                 EditorGUIUtility.TrTextContent("Allowed in development builds"),
                 EditorGUIUtility.TrTextContent("Always allowed"),
             };
+
+            public static readonly GUIContent autoGraphicsAPIForWindows = EditorGUIUtility.TrTextContent("Auto Graphics API for Windows");
+            public static readonly GUIContent autoGraphicsAPIForMac = EditorGUIUtility.TrTextContent("Auto Graphics API for Mac");
+            public static readonly GUIContent autoGraphicsAPIForLinux = EditorGUIUtility.TrTextContent("Auto Graphics API for Linux");
+
             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 and Prepare iOS for Recording are both off.");
             public static readonly GUIContent require31 = EditorGUIUtility.TrTextContent("Require ES3.1");
@@ -1252,7 +1264,7 @@ public void ResolutionSectionGUI(BuildPlatform platform, ISettingEditorExtension
                         bool defaultIsFullScreen = fullscreenModeNew != FullScreenMode.Windowed;
                         m_ShowDefaultIsNativeResolution.target = defaultIsFullScreen;
                         if (EditorGUILayout.BeginFadeGroup(m_ShowDefaultIsNativeResolution.faded))
-                            EditorGUILayout.PropertyField(m_DefaultIsNativeResolution);
+                            EditorGUILayout.PropertyField(m_DefaultIsNativeResolution, SettingsContent.defaultIsNativeResolution);
                         EditorGUILayout.EndFadeGroup();
 
                         m_ShowResolution.target = !(defaultIsFullScreen && m_DefaultIsNativeResolution.boolValue);
@@ -1333,15 +1345,15 @@ public void ResolutionSectionGUI(BuildPlatform platform, ISettingEditorExtension
                     {
                         GUILayout.Label(SettingsContent.standalonePlayerOptionsTitle, EditorStyles.boldLabel);
 
-                        EditorGUILayout.PropertyField(m_UsePlayerLog);
+                        EditorGUILayout.PropertyField(m_UsePlayerLog, SettingsContent.usePlayerLog);
 
-                        EditorGUILayout.PropertyField(m_ResizableWindow);
+                        EditorGUILayout.PropertyField(m_ResizableWindow, SettingsContent.resizableWindow);
 
                         EditorGUILayout.PropertyField(m_VisibleInBackground, SettingsContent.visibleInBackground);
 
                         EditorGUILayout.PropertyField(m_AllowFullscreenSwitch, SettingsContent.allowFullscreenSwitch);
 
-                        EditorGUILayout.PropertyField(m_ForceSingleInstance);
+                        EditorGUILayout.PropertyField(m_ForceSingleInstance, SettingsContent.forceSingleInstance);
                         EditorGUILayout.PropertyField(m_UseFlipModelSwapchain, SettingsContent.useFlipModelSwapChain);
 
                         if (!PlayerSettings.useFlipModelSwapchain)
@@ -1679,7 +1691,7 @@ void ExclusiveGraphicsAPIsGUI(BuildTarget targetPlatform, string displayTitle)
             }
         }
 
-        void GraphicsAPIsGUIOnePlatform(BuildTargetGroup targetGroup, BuildTarget targetPlatform, string platformTitle)
+        void GraphicsAPIsGUIOnePlatform(BuildTargetGroup targetGroup, BuildTarget targetPlatform, GUIContent platformTitleContent)
         {
             if (IsPreset())
                 return;
@@ -1693,7 +1705,7 @@ void GraphicsAPIsGUIOnePlatform(BuildTargetGroup targetGroup, BuildTarget target
             // toggle for automatic API selection
             EditorGUI.BeginChangeCheck();
             var automatic = m_CurrentTarget.GetUseDefaultGraphicsAPIs_Internal(targetPlatform);
-            automatic = EditorGUILayout.Toggle(string.Format(L10n.Tr("Auto Graphics API {0}"), (platformTitle ?? string.Empty)), automatic);
+            automatic = EditorGUILayout.Toggle(platformTitleContent ?? GUIContent.none, automatic);
             if (EditorGUI.EndChangeCheck())
             {
                 Undo.RecordObject(target, SettingsContent.undoChangedGraphicsAPIString);
@@ -1710,9 +1722,13 @@ void GraphicsAPIsGUIOnePlatform(BuildTargetGroup targetGroup, BuildTarget target
                     EditorGUILayout.HelpBox(SettingsContent.recordingInfo.text, MessageType.Info, true);
                 }
 
-                var displayTitle = "Graphics APIs";
-                if (platformTitle != null)
-                    displayTitle += platformTitle;
+                string displayTitle = String.Empty;
+                if (platformTitleContent != null)
+                {
+                    displayTitle = platformTitleContent.text;
+                    if (displayTitle.StartsWith("Auto "))
+                        displayTitle = displayTitle.Substring(5);
+                }
 
                 if (targetPlatform == BuildTarget.PS5)
                 {
@@ -1757,9 +1773,9 @@ void GraphicsAPIsGUI(BuildTargetGroup targetGroup, BuildTarget target)
             // split it into win/mac/linux manually
             if (targetGroup == BuildTargetGroup.Standalone)
             {
-                GraphicsAPIsGUIOnePlatform(targetGroup, BuildTarget.StandaloneWindows, " for Windows");
-                GraphicsAPIsGUIOnePlatform(targetGroup, BuildTarget.StandaloneOSX, " for Mac");
-                GraphicsAPIsGUIOnePlatform(targetGroup, BuildTarget.StandaloneLinux64, " for Linux");
+                GraphicsAPIsGUIOnePlatform(targetGroup, BuildTarget.StandaloneWindows, SettingsContent.autoGraphicsAPIForWindows);
+                GraphicsAPIsGUIOnePlatform(targetGroup, BuildTarget.StandaloneOSX, SettingsContent.autoGraphicsAPIForMac);
+                GraphicsAPIsGUIOnePlatform(targetGroup, BuildTarget.StandaloneLinux64, SettingsContent.autoGraphicsAPIForLinux);
             }
             else
             {
@@ -2794,7 +2810,7 @@ private void OtherSectionIdentificationGUI(BuildPlatform platform, ISettingEdito
                 // TODO this should be move to an extension if we have one for MacOS or Standalone target at some point.
                 GUILayout.Label(SettingsContent.macAppStoreTitle, EditorStyles.boldLabel);
 
-                EditorGUILayout.PropertyField(m_OverrideDefaultApplicationIdentifier, EditorGUIUtility.TrTextContent("Override Default Bundle Identifier"));
+                EditorGUILayout.PropertyField(m_OverrideDefaultApplicationIdentifier, SettingsContent.overrideDefaultApplicationIdentifier);
 
                 using (var horizontal = new EditorGUILayout.HorizontalScope())
                 {
@@ -2802,7 +2818,7 @@ private void OtherSectionIdentificationGUI(BuildPlatform platform, ISettingEdito
                     {
                         using (new EditorGUI.IndentLevelScope())
                         {
-                            ShowApplicationIdentifierUI(BuildTargetGroup.Standalone, "Bundle Identifier", "'CFBundleIdentifier'");
+                            ShowApplicationIdentifierUI(BuildTargetGroup.Standalone, SettingsContent.bundleIdentifier.text, "'CFBundleIdentifier'");
                         }
                     }
                 }
@@ -3958,12 +3974,12 @@ public void BrowseablePathProperty(string propertyLabel, SerializedProperty prop
             EditorGUILayout.Space();
         }
 
-        internal static bool BuildPathBoxButton(SerializedProperty prop, string uiString, string directory)
+        internal static void BuildPathBoxButton(SerializedProperty prop, string uiString, string directory)
         {
-            return BuildPathBoxButton(prop, uiString, directory, null);
+            BuildPathBoxButton(prop, uiString, directory, null, null);
         }
 
-        internal static bool BuildPathBoxButton(SerializedProperty prop, string uiString, string directory, Action onSelect)
+        internal static void BuildPathBoxButton(SerializedProperty prop, string uiString, string directory, Action onSelect, Action onChanged)
         {
             float h = EditorGUI.kSingleLineHeight;
             float kLabelFloatMinW = EditorGUI.kLabelW + EditorGUIUtility.fieldWidth + EditorGUI.kSpacing;
@@ -3992,19 +4008,21 @@ internal static bool BuildPathBoxButton(SerializedProperty prop, string uiString
 
                 prop.serializedObject.ApplyModifiedProperties();
 
+                if (changed && onChanged != null)
+                    onChanged();
+
+                // Necessary to avoid the error "BeginLayoutGroup must be called first".
                 GUIUtility.ExitGUI();
             }
-
-            return changed;
         }
 
-        internal static bool BuildFileBoxButton(SerializedProperty prop, string uiString, string directory, string ext)
+        internal static void BuildFileBoxButton(SerializedProperty prop, string uiString, string directory, string ext)
         {
-            return BuildFileBoxButton(prop, uiString, directory, ext, null);
+            BuildFileBoxButton(prop, uiString, directory, ext, null, null);
         }
 
-        internal static bool BuildFileBoxButton(SerializedProperty prop, string uiString, string directory,
-            string ext, Action onSelect)
+        internal static void BuildFileBoxButton(SerializedProperty prop, string uiString, string directory,
+            string ext, Action onSelect, Action onChanged)
         {
             bool changed = false;
             using (var vertical = new EditorGUILayout.VerticalScope())
@@ -4036,11 +4054,13 @@ internal static bool BuildFileBoxButton(SerializedProperty prop, string uiString
 
                     prop.serializedObject.ApplyModifiedProperties();
 
+                    if (changed && onChanged != null)
+                        onChanged();
+
+                    // Necessary to avoid the error "BeginLayoutGroup must be called first".
                     GUIUtility.ExitGUI();
                 }
             }
-
-            return changed;
         }
 
         public void PublishSectionGUI(BuildPlatform platform, ISettingEditorExtension settingsExtension, int sectionIndex = 5)
@@ -4071,9 +4091,15 @@ protected override bool ShouldHideOpenButton()
         [SettingsProvider]
         internal static SettingsProvider CreateProjectSettingsProvider()
         {
+            var keywordsList = new List<string>();
+
+            keywordsList.AddRange(SettingsProvider.GetSearchKeywordsFromGUIContentProperties<SettingsContent>());
+            keywordsList.AddRange(SettingsProvider.GetSearchKeywordsFromGUIContentProperties<PlayerSettingsSplashScreenEditor.Texts>());
+            keywordsList.AddRange(SettingsProvider.GetSearchKeywordsFromGUIContentProperties<PlayerSettingsIconsEditor.SettingsContent>());
+
             var provider = AssetSettingsProvider.CreateProviderFromAssetPath(
                 "Project/Player", "ProjectSettings/ProjectSettings.asset",
-                SettingsProvider.GetSearchKeywordsFromGUIContentProperties<SettingsContent>());
+                keywordsList);
             provider.activateHandler = (searchContext, rootElement) =>
             {
                 var playerSettingsProvider = provider.settingsEditor as PlayerSettingsEditor;
diff --git a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsIconsEditor.cs b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsIconsEditor.cs
index 8ad82c28b2..ee22510fbc 100644
--- a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsIconsEditor.cs
+++ b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsIconsEditor.cs
@@ -14,7 +14,7 @@ namespace UnityEditor
 {
     internal class PlayerSettingsIconsEditor
     {
-        class SettingsContent
+        internal class SettingsContent
         {
             public static readonly GUIContent iconTitle = EditorGUIUtility.TrTextContent("Icon");
             public static readonly GUIContent defaultIcon = EditorGUIUtility.TrTextContent("Default Icon");
diff --git a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs
index 5ae057fdc2..a4dbd07948 100644
--- a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs
+++ b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs
@@ -77,32 +77,31 @@ static AssetDeleteResult OnWillDeleteAsset(string asset, RemoveAssetOptions opti
             }
         }
 
-        class Texts
+        internal class Texts
         {
-            public GUIContent animate = EditorGUIUtility.TrTextContent("Animation");
-            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*");
-            public GUIContent backgroundZoom = EditorGUIUtility.TrTextContent("Background Zoom");
-            public GUIContent blurBackground = EditorGUIUtility.TrTextContent("Blur Background Image");
-            public GUIContent cancelPreviewSplash = EditorGUIUtility.TrTextContent("Cancel Preview");
-            public GUIContent configDialogBanner = EditorGUIUtility.TrTextContent("Application Config Dialog Banner");
-            public GUIContent configDialogBannerDeprecationWarning = EditorGUIUtility.TrTextContent("Application Config Dialog Banner is deprecated and will be removed in future versions.");
-            public GUIContent drawMode = EditorGUIUtility.TrTextContent("Draw Mode");
-            public GUIContent logoDuration = EditorGUIUtility.TrTextContent("Logo Duration", "The time the logo will be shown for.");
-            public GUIContent logosTitle = EditorGUIUtility.TrTextContent("Logos*");
-            public GUIContent logoZoom = EditorGUIUtility.TrTextContent("Logo Zoom");
-            public GUIContent overlayOpacity = EditorGUIUtility.TrTextContent("Overlay Opacity", "Overlay strength applied to improve logo visibility.");
-            public GUIContent previewSplash = EditorGUIUtility.TrTextContent("Preview", "Preview the splash screen in the game view.");
-            public GUIContent showLogo = EditorGUIUtility.TrTextContent("Show Unity Logo");
-            public GUIContent showSplash = EditorGUIUtility.TrTextContent("Show Splash Screen");
-            public GUIContent splashStyle = EditorGUIUtility.TrTextContent("Splash Style");
-            public GUIContent splashTitle = EditorGUIUtility.TrTextContent("Splash Screen");
-            public GUIContent title = EditorGUIUtility.TrTextContent("Splash Image");
-            public GUIContent vrSplashScreen = EditorGUIUtility.TrTextContent("Virtual Reality Splash Image");
+            public static readonly GUIContent animate = EditorGUIUtility.TrTextContent("Animation");
+            public static readonly 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 static readonly GUIContent backgroundImage = EditorGUIUtility.TrTextContent("Background Image", "Image to be used in landscape and portrait (when portrait image is not set).");
+            public static readonly GUIContent backgroundPortraitImage = EditorGUIUtility.TrTextContent("Alternate Portrait Image*", "Optional image to be used in portrait mode.");
+            public static readonly GUIContent backgroundTitle = EditorGUIUtility.TrTextContent("Background*");
+            public static readonly GUIContent backgroundZoom = EditorGUIUtility.TrTextContent("Background Zoom");
+            public static readonly GUIContent blurBackground = EditorGUIUtility.TrTextContent("Blur Background Image");
+            public static readonly GUIContent cancelPreviewSplash = EditorGUIUtility.TrTextContent("Cancel Preview");
+            public static readonly GUIContent configDialogBanner = EditorGUIUtility.TrTextContent("Application Config Dialog Banner");
+            public static readonly GUIContent configDialogBannerDeprecationWarning = EditorGUIUtility.TrTextContent("Application Config Dialog Banner is deprecated and will be removed in future versions.");
+            public static readonly GUIContent drawMode = EditorGUIUtility.TrTextContent("Draw Mode");
+            public static readonly GUIContent logoDuration = EditorGUIUtility.TrTextContent("Logo Duration", "The time the logo will be shown for.");
+            public static readonly GUIContent logosTitle = EditorGUIUtility.TrTextContent("Logos*");
+            public static readonly GUIContent logoZoom = EditorGUIUtility.TrTextContent("Logo Zoom");
+            public static readonly GUIContent overlayOpacity = EditorGUIUtility.TrTextContent("Overlay Opacity", "Overlay strength applied to improve logo visibility.");
+            public static readonly GUIContent previewSplash = EditorGUIUtility.TrTextContent("Preview", "Preview the splash screen in the game view.");
+            public static readonly GUIContent showLogo = EditorGUIUtility.TrTextContent("Show Unity Logo");
+            public static readonly GUIContent showSplash = EditorGUIUtility.TrTextContent("Show Splash Screen");
+            public static readonly GUIContent splashStyle = EditorGUIUtility.TrTextContent("Splash Style");
+            public static readonly GUIContent splashTitle = EditorGUIUtility.TrTextContent("Splash Screen");
+            public static readonly GUIContent title = EditorGUIUtility.TrTextContent("Splash Image");
+            public static readonly GUIContent vrSplashScreen = EditorGUIUtility.TrTextContent("Virtual Reality Splash Image");
         }
-        static readonly Texts k_Texts = new Texts();
 
         public PlayerSettingsSplashScreenEditor(PlayerSettingsEditor owner)
         {
@@ -180,7 +179,7 @@ private void DrawElementUnityLogo(Rect rect, int index, bool isActive, bool isFo
             EditorGUIUtility.labelWidth = k_LogoListPropertyLabelWidth;
             var propertyRect = new Rect(rect.x + logoWidth, rect.y + EditorGUIUtility.standardVerticalSpacing + EditorGUIUtility.singleLineHeight, rect.width - logoWidth, EditorGUIUtility.singleLineHeight);
             EditorGUI.BeginChangeCheck();
-            var durationLabel = EditorGUI.BeginProperty(propertyRect, k_Texts.logoDuration, duration);
+            var durationLabel = EditorGUI.BeginProperty(propertyRect, Texts.logoDuration, duration);
             var newDurationVal = EditorGUI.Slider(propertyRect, durationLabel, duration.floatValue, k_MinLogoTime, k_MaxLogoTime);
             if (EditorGUI.EndChangeCheck())
                 duration.floatValue = newDurationVal;
@@ -218,7 +217,7 @@ private void DrawLogoListElementCallback(Rect rect, int index, bool isActive, bo
             EditorGUI.BeginChangeCheck();
             var oldLabelWidth = EditorGUIUtility.labelWidth;
             EditorGUIUtility.labelWidth = k_LogoListPropertyLabelWidth;
-            var newDurationVal = EditorGUI.Slider(propertyRect, k_Texts.logoDuration, duration.floatValue, k_MinLogoTime, k_MaxLogoTime);
+            var newDurationVal = EditorGUI.Slider(propertyRect, Texts.logoDuration, duration.floatValue, k_MinLogoTime, k_MaxLogoTime);
             EditorGUIUtility.labelWidth = oldLabelWidth;
             if (EditorGUI.EndChangeCheck())
                 duration.floatValue = newDurationVal;
@@ -309,7 +308,7 @@ private static void ObjectReferencePropertyField<T>(SerializedProperty property,
 
         public void SplashSectionGUI(BuildPlatform platform, ISettingEditorExtension settingsExtension, int sectionIndex = 2)
         {
-            if (m_Owner.BeginSettingsBox(sectionIndex, k_Texts.title))
+            if (m_Owner.BeginSettingsBox(sectionIndex, Texts.title))
             {
                 if (platform.namedBuildTarget == NamedBuildTarget.Server)
                 {
@@ -321,7 +320,7 @@ public void SplashSectionGUI(BuildPlatform platform, ISettingEditorExtension set
                     bool VREnabled = BuildPipeline.IsFeatureSupported("ENABLE_VR", platform.defaultTarget);
 
                     if (VREnabled)
-                        ObjectReferencePropertyField<Texture2D>(m_VirtualRealitySplashScreen, k_Texts.vrSplashScreen);
+                        ObjectReferencePropertyField<Texture2D>(m_VirtualRealitySplashScreen, Texts.vrSplashScreen);
 
                     if (TargetSupportsOptionalBuiltinSplashScreen(platform.namedBuildTarget.ToBuildTargetGroup(), settingsExtension))
                         BuiltinCustomSplashScreenGUI(platform.namedBuildTarget.ToBuildTargetGroup(), settingsExtension);
@@ -330,7 +329,7 @@ public void SplashSectionGUI(BuildPlatform platform, ISettingEditorExtension set
                     {
                         settingsExtension.SplashSectionGUI();
                         if (!m_ShowUnitySplashScreen.boolValue && settingsExtension.SupportsStaticSplashScreenBackgroundColor())
-                            EditorGUILayout.PropertyField(m_SplashScreenBackgroundColor, k_Texts.backgroundColor);
+                            EditorGUILayout.PropertyField(m_SplashScreenBackgroundColor, Texts.backgroundColor);
                     }
 
                     if (m_ShowUnitySplashScreen.boolValue)
@@ -342,13 +341,13 @@ public void SplashSectionGUI(BuildPlatform platform, ISettingEditorExtension set
 
         private void BuiltinCustomSplashScreenGUI(BuildTargetGroup targetGroup, ISettingEditorExtension settingsExtension)
         {
-            EditorGUILayout.LabelField(k_Texts.splashTitle, EditorStyles.boldLabel);
+            EditorGUILayout.LabelField(Texts.splashTitle, EditorStyles.boldLabel);
 
-            EditorGUILayout.PropertyField(m_ShowUnitySplashScreen, k_Texts.showSplash);
+            EditorGUILayout.PropertyField(m_ShowUnitySplashScreen, Texts.showSplash);
             if (!m_ShowUnitySplashScreen.boolValue)
                 return;
 
-            GUIContent buttonLabel = SplashScreen.isFinished ? k_Texts.previewSplash : k_Texts.cancelPreviewSplash;
+            GUIContent buttonLabel = SplashScreen.isFinished ? Texts.previewSplash : Texts.cancelPreviewSplash;
             Rect previewButtonRect = GUILayoutUtility.GetRect(buttonLabel, "button");
             previewButtonRect = EditorGUI.PrefixLabel(previewButtonRect, new GUIContent(" "));
             if (GUI.Button(previewButtonRect, buttonLabel))
@@ -374,7 +373,7 @@ private void BuiltinCustomSplashScreenGUI(BuildTargetGroup targetGroup, ISetting
             }
 
             EditorGUI.BeginChangeCheck();
-            EditorGUILayout.PropertyField(m_SplashScreenLogoStyle, k_Texts.splashStyle);
+            EditorGUILayout.PropertyField(m_SplashScreenLogoStyle, Texts.splashStyle);
             if (EditorGUI.EndChangeCheck())
             {
                 if (m_SplashScreenLogoStyle.intValue == (int)PlayerSettings.SplashScreen.UnityLogoStyle.DarkOnLight)
@@ -384,14 +383,14 @@ private void BuiltinCustomSplashScreenGUI(BuildTargetGroup targetGroup, ISetting
             }
 
             // Animation
-            EditorGUILayout.PropertyField(m_SplashScreenAnimation, k_Texts.animate);
+            EditorGUILayout.PropertyField(m_SplashScreenAnimation, Texts.animate);
             m_ShowAnimationControlsAnimator.target = m_SplashScreenAnimation.intValue == (int)PlayerSettings.SplashScreen.AnimationMode.Custom;
 
             if (EditorGUILayout.BeginFadeGroup(m_ShowAnimationControlsAnimator.faded))
             {
                 EditorGUI.indentLevel++;
-                EditorGUILayout.Slider(m_SplashScreenLogoAnimationZoom, 0.0f, 1.0f, k_Texts.logoZoom);
-                EditorGUILayout.Slider(m_SplashScreenBackgroundAnimationZoom, 0.0f, 1.0f, k_Texts.backgroundZoom);
+                EditorGUILayout.Slider(m_SplashScreenLogoAnimationZoom, 0.0f, 1.0f, Texts.logoZoom);
+                EditorGUILayout.Slider(m_SplashScreenBackgroundAnimationZoom, 0.0f, 1.0f, Texts.backgroundZoom);
                 EditorGUI.indentLevel--;
             }
             EditorGUILayout.EndFadeGroup();
@@ -399,10 +398,10 @@ private void BuiltinCustomSplashScreenGUI(BuildTargetGroup targetGroup, ISetting
             EditorGUILayout.Space();
 
             // Logos
-            EditorGUILayout.LabelField(k_Texts.logosTitle, EditorStyles.boldLabel);
+            EditorGUILayout.LabelField(Texts.logosTitle, EditorStyles.boldLabel);
 
             EditorGUI.BeginChangeCheck();
-            EditorGUILayout.PropertyField(m_ShowUnitySplashLogo, k_Texts.showLogo);
+            EditorGUILayout.PropertyField(m_ShowUnitySplashLogo, Texts.showLogo);
             if (EditorGUI.EndChangeCheck())
             {
                 if (!m_ShowUnitySplashLogo.boolValue)
@@ -417,7 +416,7 @@ private void BuiltinCustomSplashScreenGUI(BuildTargetGroup targetGroup, ISetting
             {
                 EditorGUI.BeginChangeCheck();
                 var oldDrawmode = m_SplashScreenDrawMode.intValue;
-                EditorGUILayout.PropertyField(m_SplashScreenDrawMode, k_Texts.drawMode);
+                EditorGUILayout.PropertyField(m_SplashScreenDrawMode, Texts.drawMode);
                 if (oldDrawmode != m_SplashScreenDrawMode.intValue)
                 {
                     if (m_SplashScreenDrawMode.intValue == (int)PlayerSettings.SplashScreen.DrawMode.UnityLogoBelow)
@@ -438,23 +437,23 @@ private void BuiltinCustomSplashScreenGUI(BuildTargetGroup targetGroup, ISetting
             EditorGUILayout.Space();
 
             // Background
-            EditorGUILayout.LabelField(k_Texts.backgroundTitle, EditorStyles.boldLabel);
-            EditorGUILayout.Slider(m_SplashScreenOverlayOpacity, k_MinOverlayOpacity, 1.0f, k_Texts.overlayOpacity);
+            EditorGUILayout.LabelField(Texts.backgroundTitle, EditorStyles.boldLabel);
+            EditorGUILayout.Slider(m_SplashScreenOverlayOpacity, k_MinOverlayOpacity, 1.0f, Texts.overlayOpacity);
             m_ShowBackgroundColorAnimator.target = m_SplashScreenBackgroundLandscape.objectReferenceValue == null ||
                 (settingsExtension?.SupportsStaticSplashScreenBackgroundColor() ?? false);
             if (EditorGUILayout.BeginFadeGroup(m_ShowBackgroundColorAnimator.faded))
-                EditorGUILayout.PropertyField(m_SplashScreenBackgroundColor, k_Texts.backgroundColor);
+                EditorGUILayout.PropertyField(m_SplashScreenBackgroundColor, Texts.backgroundColor);
             EditorGUILayout.EndFadeGroup();
 
-            EditorGUILayout.PropertyField(m_SplashScreenBlurBackground, k_Texts.blurBackground);
+            EditorGUILayout.PropertyField(m_SplashScreenBlurBackground, Texts.blurBackground);
             EditorGUI.BeginChangeCheck();
-            ObjectReferencePropertyField<Sprite>(m_SplashScreenBackgroundLandscape, k_Texts.backgroundImage);
+            ObjectReferencePropertyField<Sprite>(m_SplashScreenBackgroundLandscape, Texts.backgroundImage);
             if (EditorGUI.EndChangeCheck() && m_SplashScreenBackgroundLandscape.objectReferenceValue == null)
                 m_SplashScreenBackgroundPortrait.objectReferenceValue = null;
 
             using (new EditorGUI.DisabledScope(m_SplashScreenBackgroundLandscape.objectReferenceValue == null))
             {
-                ObjectReferencePropertyField<Sprite>(m_SplashScreenBackgroundPortrait, k_Texts.backgroundPortraitImage);
+                ObjectReferencePropertyField<Sprite>(m_SplashScreenBackgroundPortrait, Texts.backgroundPortraitImage);
             }
         }
 
diff --git a/Editor/Mono/Inspector/QualitySettingsEditor.cs b/Editor/Mono/Inspector/QualitySettingsEditor.cs
index 07dc2178b0..c62acc2331 100644
--- a/Editor/Mono/Inspector/QualitySettingsEditor.cs
+++ b/Editor/Mono/Inspector/QualitySettingsEditor.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor.Build;
+using UnityEditor.Build.Profile;
 using UnityEditor.Modules;
 using UnityEditorInternal;
 using UnityEngine;
@@ -96,6 +97,10 @@ private class Content
             public static readonly GUIContent kTerrainMaxTrees = EditorGUIUtility.TrTextContent("Max Mesh Trees", "Value set to Terrain max mesh trees (See Terrain settings)");
 
             public static readonly GUIContent kRenderPipelineObject = EditorGUIUtility.TrTextContent("Render Pipeline Asset", "Specifies the Render Pipeline Asset to use for this quality level. It overrides the value set in the Graphics Settings Window.");
+
+            public static readonly string buildProfileQualitySettingsOverrideWarning = L10n.Tr("The current active build profile has overridden Quality levels inclusion. To ensure that the correct levels are included in your build, see the Build Profiles...");
+            public static readonly string buildProfileQualitySettingsInformationSingular = L10n.Tr("Renaming and deleting Quality levels will impact one build profile. To edit Quality levels included in build profiles, go to Build Profiles...");
+            public static readonly string buildProfileQualitySettingsInformationPlural = L10n.Tr("Renaming and deleting Quality levels will impact {0} build profiles. To edit Quality levels included in build profiles, go to Build Profiles...");
         }
 
         private class Styles
@@ -147,6 +152,11 @@ private class Styles
         IAdaptiveVsyncSetting[] m_AdaptiveVsyncSettings;
         bool m_AdaptiveVSyncVisible;
 
+        bool m_QualityLevelRenameJustStarted = true;
+        bool m_QualityLevelNeedsRenameInAllProfiles = false;
+        string m_OriginalQualityLevelName = string.Empty;
+        string m_NewQualityLevelName = string.Empty;
+
         public void OnEnable()
         {
             m_QualitySettings = new SerializedObject(target);
@@ -171,6 +181,13 @@ public void OnEnable()
                 string module = ModuleManager.GetTargetStringFromBuildTargetGroup(validPlatforms[i].namedBuildTarget.ToBuildTargetGroup());
                 m_AdaptiveVsyncSettings[i] = ModuleManager.GetAdaptiveSettingEditorExtension(module);
             }
+
+            ResetQualityLevelRenameTracking();
+        }
+
+        public void OnDestroy()
+        {
+            ResolvePendingQualityLevelRename();
         }
 
         private struct QualitySetting
@@ -334,7 +351,9 @@ private int DoQualityLevelSelection(int currentQualitylevel, IList<QualitySettin
                 if (Event.current.type == EventType.Repaint)
                     bgStyle.Draw(deleteButton, GUIContent.none, false, false, selected, false);
                 if (GUI.Button(deleteButton, Content.kIconTrash, GUIStyle.none))
+                {
                     m_DeleteLevel = i;
+                }
 
                 GUILayout.EndHorizontal();
             }
@@ -444,7 +463,9 @@ private void HandleAddRemoveQualitySetting(ref int selectedLevel, Dictionary<str
                 //Always ensure there is one quality setting
                 if (m_QualitySettingsProperty.arraySize > 1 && m_DeleteLevel >= 0 && m_DeleteLevel < m_QualitySettingsProperty.arraySize)
                 {
+                    var deleteLevelName = m_QualitySettingsProperty.GetArrayElementAtIndex(m_DeleteLevel).FindPropertyRelative("name")?.stringValue;
                     m_QualitySettingsProperty.DeleteArrayElementAtIndex(m_DeleteLevel);
+                    BuildProfileModuleUtil.RemoveQualityLevelFromAllProfiles(deleteLevelName);
 
                     // Fix defaults offset
                     List<string> keys = new List<string>(platformDefaults.Keys);
@@ -622,6 +643,49 @@ void CheckSameRenderPipelineAssetForOverridenQualityLevels()
             }
         }
 
+        private void ResetQualityLevelRenameTracking()
+        {
+            m_QualityLevelRenameJustStarted = true;
+            m_QualityLevelNeedsRenameInAllProfiles = false;
+            m_OriginalQualityLevelName = string.Empty;
+            m_NewQualityLevelName = string.Empty;
+        }
+
+        // We defer the actual renaming in all build profiles because renaming them with every keystroke is
+        // prohibitively slow. As a result, we perform the rename when the quality level selection changes,
+        // when the user selects a different control, and when the inspector window is closed or loses focus.
+        private void ResolvePendingQualityLevelRename()
+        {
+            if (m_QualityLevelNeedsRenameInAllProfiles)
+            {
+                if (m_OriginalQualityLevelName != m_NewQualityLevelName)
+                {
+                    BuildProfileModuleUtil.RenameQualityLevelInAllProfiles(m_OriginalQualityLevelName, m_NewQualityLevelName);
+                }
+            }
+            ResetQualityLevelRenameTracking();
+        }
+
+        private void ShowAffectedBuildProfileInformation()
+        {
+            var buildProfiles = BuildProfileModuleUtil.GetAllBuildProfiles();
+            var profilesWithQualityLevelOverrides = 0;
+            foreach (var profile in buildProfiles)
+            {
+                if (profile.qualitySettings != null)
+                {
+                    profilesWithQualityLevelOverrides++;
+                }
+            }
+            if (profilesWithQualityLevelOverrides > 0)
+            {
+                if (profilesWithQualityLevelOverrides == 1)
+                    EditorGUILayout.HelpBox(string.Format(Content.buildProfileQualitySettingsInformationSingular), MessageType.Info);
+                else
+                    EditorGUILayout.HelpBox(string.Format(Content.buildProfileQualitySettingsInformationPlural, profilesWithQualityLevelOverrides), MessageType.Info);
+            }
+        }
+
         public override void OnInspectorGUI()
         {
             if (EditorApplication.isPlayingOrWillChangePlaymode)
@@ -647,7 +711,10 @@ public override void OnInspectorGUI()
             SetQualitySettings(settings);
             HandleAddRemoveQualitySetting(ref selectedLevel, defaults);
             SetDefaultQualityForPlatforms(defaults);
+
             GUILayout.Space(10.0f);
+            ShowAffectedBuildProfileInformation();
+
             DrawHorizontalDivider();
             GUILayout.Space(10.0f);
 
@@ -706,11 +773,41 @@ public override void OnInspectorGUI()
                 nameProperty.stringValue = "Level " + selectedLevel;
 
             GUILayout.Label(EditorGUIUtility.TempContent("Current Build Target: " + Modules.ModuleManager.GetTargetStringFromBuildTarget(EditorUserBuildSettings.activeBuildTarget)), EditorStyles.boldLabel);
+            if (BuildProfileContext.ActiveProfileHasQualitySettings())
+            {
+                EditorGUILayout.HelpBox(Content.buildProfileQualitySettingsOverrideWarning, MessageType.Warning, true);
+            }
             if (m_AdaptiveVSyncVisible)
                 EditorGUILayout.HelpBox("There are settings below that are only applicable to the current Build Target such as Adaptive Vsync. To change the Build Target, go to the Build Settings", MessageType.Info);
             GUILayout.Label(EditorGUIUtility.TempContent("Current Active Quality Level"), EditorStyles.boldLabel);
 
+            const string QualityLevelNamePropertyControlName = "QualityLevelNamePropertyControl";
+            var previousName = nameProperty.stringValue;
+            EditorGUI.BeginChangeCheck();
+            GUI.SetNextControlName(QualityLevelNamePropertyControlName);
             EditorGUILayout.PropertyField(nameProperty);
+            var qualityLevelNameControlChanged = EditorGUI.EndChangeCheck();
+            var qualityLevelNameControlIsFocused = GUI.GetNameOfFocusedControl() == QualityLevelNamePropertyControlName;
+            var inspectorIsFocused = EditorWindow.focusedWindow is ProjectSettingsWindow;
+            if (qualityLevelNameControlChanged)
+            {
+                if (m_QualityLevelRenameJustStarted)
+                {
+                    m_OriginalQualityLevelName = previousName;
+                    m_QualityLevelRenameJustStarted = false;
+                }
+
+                m_QualityLevelNeedsRenameInAllProfiles = true;
+
+                if (string.IsNullOrEmpty(nameProperty.stringValue))
+                    nameProperty.stringValue = "Level " + selectedLevel;
+
+                m_NewQualityLevelName = nameProperty.stringValue;
+            }
+            if (m_QualityLevelNeedsRenameInAllProfiles && !(qualityLevelNameControlIsFocused && inspectorIsFocused))
+            {
+                ResolvePendingQualityLevelRename();
+            }
 
             if (usingSRP)
                 EditorGUILayout.HelpBox("A Scriptable Render Pipeline is in use, some settings will not be used and are hidden", MessageType.Info);
diff --git a/Editor/Mono/ObjectSelector.cs b/Editor/Mono/ObjectSelector.cs
index a8f3f3489e..9296ad772d 100644
--- a/Editor/Mono/ObjectSelector.cs
+++ b/Editor/Mono/ObjectSelector.cs
@@ -230,6 +230,8 @@ public void SetupPreview()
         void ListAreaItemSelectedCallback(bool doubleClicked)
         {
             m_LastSelectedInstanceId = GetInternalSelectedInstanceID();
+            m_ListArea.m_SelectedObjectIcon = AssetDatabase.GetCachedIcon(AssetDatabase.GetAssetPath(m_LastSelectedInstanceId));
+
             if (doubleClicked)
             {
                 ItemWasDoubleClicked();
@@ -941,7 +943,7 @@ void DrawObjectIcon(Rect position, Texture icon)
                 size = icon.width * 2;
 
             FilterMode temp = icon.filterMode;
-            icon.filterMode = FilterMode.Point;
+            icon.filterMode = FilterMode.Bilinear;
             GUI.DrawTexture(new Rect(position.x + ((int)position.width - size) / 2, position.y + ((int)position.height - size) / 2, size, size), icon, ScaleMode.ScaleToFit);
             icon.filterMode = temp;
         }
diff --git a/Editor/Mono/SceneModeWindows/OcclusionCullingWindow.cs b/Editor/Mono/SceneModeWindows/OcclusionCullingWindow.cs
index 469be94249..a4a720fcdd 100644
--- a/Editor/Mono/SceneModeWindows/OcclusionCullingWindow.cs
+++ b/Editor/Mono/SceneModeWindows/OcclusionCullingWindow.cs
@@ -239,6 +239,7 @@ void BakeSettings()
             // Edit Smallest Occluder
             EditorGUI.BeginChangeCheck();
             float smallestOccluder = EditorGUILayout.FloatField(s_Styles.smallestOccluder, StaticOcclusionCulling.smallestOccluder);
+            smallestOccluder = Math.Clamp(smallestOccluder, 0.0f, float.MaxValue);
             if (EditorGUI.EndChangeCheck())
             {
                 Undo.RegisterCompleteObjectUndo(StaticOcclusionCulling.occlusionCullingSettings, "Change Smallest Occluder");
@@ -248,6 +249,7 @@ void BakeSettings()
             // Edit smallest hole
             EditorGUI.BeginChangeCheck();
             float smallestHole = EditorGUILayout.FloatField(s_Styles.smallestHole, StaticOcclusionCulling.smallestHole);
+            smallestHole = Math.Clamp(smallestHole, 0.0f, float.MaxValue);
             if (EditorGUI.EndChangeCheck())
             {
                 Undo.RegisterCompleteObjectUndo(StaticOcclusionCulling.occlusionCullingSettings, "Change Smallest Hole");
diff --git a/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs b/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs
index a5cdec378a..b09f831d6a 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs
@@ -1086,6 +1086,7 @@ public CompileStatus TickCompilationPipeline(EditorScriptCompilationOptions opti
             if (!IsCompilationTaskCompiling() && IsScriptCompilationRequested())
             {
                 Profiler.BeginSample("CompilationPipeline.CompileScripts");
+
                 CompileStatus compileStatus;
                 try
                 {
@@ -1150,6 +1151,8 @@ public CompileStatus TickCompilationPipeline(EditorScriptCompilationOptions opti
                     }
             }
 
+            ConsoleWindow.ClearConsoleOnRecompile();
+
             var messagesForNodeResults = ProcessCompilationResult(scriptCompilationState.ScriptAssemblies, result, scriptCompilationState.Settings.BuildingForEditor, scriptCompilationState.ActiveBuild);
             var compilerMessages = messagesForNodeResults.SelectMany(a => a).ToArray();
 
diff --git a/Editor/Mono/Selection/ActiveEditorTracker.bindings.cs b/Editor/Mono/Selection/ActiveEditorTracker.bindings.cs
index 7b4c27233b..86f06fca74 100644
--- a/Editor/Mono/Selection/ActiveEditorTracker.bindings.cs
+++ b/Editor/Mono/Selection/ActiveEditorTracker.bindings.cs
@@ -208,9 +208,23 @@ public static ActiveEditorTracker sharedTracker
             }
         }
 
+        // Only valid and rebuilds when sharedTracker is locked
+        internal static ActiveEditorTracker fallbackTracker
+        {
+            get
+            {
+                var tracker = new ActiveEditorTracker();
+                SetupFallbackTracker(tracker);
+                return tracker;
+            }
+        }
+
         [FreeFunction("Internal_SetupSharedTracker")]
         static extern void SetupSharedTracker(ActiveEditorTracker sharedTracker);
 
+        [FreeFunction("Internal_SetupFallbackTracker")]
+        static extern void SetupFallbackTracker(ActiveEditorTracker fallbackTracker);
+
         [RequiredByNativeCode]
         static void Internal_OnTrackerRebuild()
         {
diff --git a/Editor/Mono/Tools/EditorToolCache.cs b/Editor/Mono/Tools/EditorToolCache.cs
index a455381dd8..7f12b503d5 100644
--- a/Editor/Mono/Tools/EditorToolCache.cs
+++ b/Editor/Mono/Tools/EditorToolCache.cs
@@ -122,8 +122,10 @@ public UnityObject[] targets
                 if (additionalEditors == null)
                     return inspector.targets;
                 List<UnityObject> objects = new List<UnityObject>(inspector.targets);
-                foreach (var insp in additionalEditors)
-                    objects.AddRange(insp.targets);
+                foreach (var additionalInspector in additionalEditors)
+                    foreach (var additionalTarget in additionalInspector.targets)
+                        if (!objects.Contains(additionalTarget))
+                            objects.Add(additionalTarget);
                 return objects.ToArray();
             }
         }
@@ -172,20 +174,6 @@ class EditorToolCache
         Dictionary<Type, EditorTypeAssociation> m_ToolMetaData = new Dictionary<Type, EditorTypeAssociation>();
         Dictionary<Type, List<EditorTypeAssociation>> s_EditorTargetCache = new Dictionary<Type, List<EditorTypeAssociation>>();
 
-        // Static fields in generic classes result in multiple static field instances. In this case that's fine.
-        // ReSharper disable once StaticMemberInGenericType
-        static ActiveEditorTracker m_Tracker;
-
-        static ActiveEditorTracker sharedTracker
-        {
-            get
-            {
-                if (m_Tracker == null)
-                    m_Tracker = new ActiveEditorTracker();
-                return m_Tracker;
-            }
-        }
-
         public EditorToolCache(Type attributeType)
         {
             if (!typeof(ToolAttribute).IsAssignableFrom(attributeType))
@@ -299,10 +287,10 @@ public void InstantiateEditors(EditorToolContext ctx, List<ComponentEditor> edit
         {
             editors.Clear();
 
-            // If the shared tracker is locked, use our own tracker instance so that the current selection is always
+            // If the shared tracker is locked, use fallback tracker instance so that the current selection is always
             // represented. Addresses case where a single locked inspector is open.
             var shared = ActiveEditorTracker.sharedTracker;
-            var activeTracker = shared.isLocked ? sharedTracker : shared;
+            var activeTracker = shared.isLocked ? ActiveEditorTracker.fallbackTracker : shared;
             var propertyEditors = PropertyEditor.GetPropertyEditors();
 
             // Collect editor tools for the shared tracker first, then any locked inspectors or open properties editors
diff --git a/Modules/Animation/ScriptBindings/HumanPoseHandler.bindings.cs b/Modules/Animation/ScriptBindings/HumanPoseHandler.bindings.cs
index 98c7fdc08b..c9f0f6e05a 100644
--- a/Modules/Animation/ScriptBindings/HumanPoseHandler.bindings.cs
+++ b/Modules/Animation/ScriptBindings/HumanPoseHandler.bindings.cs
@@ -4,11 +4,7 @@
 
 using System;
 using UnityEngine.Bindings;
-using UnityEngine.Internal;
-using UnityEngine.Scripting;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Collections.Generic;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 
@@ -16,9 +12,22 @@ namespace UnityEngine
 {
     public struct HumanPose
     {
+        static int k_NumIkGoals = Enum.GetValues(typeof(AvatarIKGoal)).Length;
+        //These must stay in sync with the definition in HumanGetGoalOrientationOffset in human.cpp
+        internal static Quaternion[] s_IKGoalOffsets = { new Quaternion(0.5f, -0.5f, 0.5f, 0.5f), new Quaternion(0.5f, -0.5f, 0.5f, 0.5f), new Quaternion(0.707107f, 0, 0.707107f, 0), new Quaternion(0, 0.707107f, 0, 0.707107f) };
+
         public Vector3 bodyPosition;
         public Quaternion bodyRotation;
         public float[] muscles;
+        internal Vector3 [] m_IkGoalPositions;
+        internal Quaternion[] m_IkGoalRotations;
+        internal Quaternion[] m_OffsetIkGoalRotations;
+
+
+        public ReadOnlySpan<Vector3> ikGoalPositions => new ReadOnlySpan<Vector3>(m_IkGoalPositions);
+        public ReadOnlySpan<Quaternion> internalIkGoalRotations => new ReadOnlySpan<Quaternion>(m_IkGoalRotations);
+        public ReadOnlySpan<Quaternion> ikGoalRotations => new ReadOnlySpan<Quaternion>(m_OffsetIkGoalRotations);
+
 
         internal void Init()
         {
@@ -39,6 +48,36 @@ internal void Init()
                     bodyRotation.w = 1;
                 }
             }
+            
+            if (m_IkGoalPositions != null && m_IkGoalPositions.Length != k_NumIkGoals)
+            {
+                throw new InvalidOperationException("Bad array size for HumanPose.ikGoalPositions. Size must equal AvatakIKGoal size");
+            }
+
+            if (m_IkGoalPositions == null)
+            {
+                m_IkGoalPositions = new Vector3[k_NumIkGoals];
+            }
+
+            if (m_IkGoalRotations != null && m_IkGoalRotations.Length != k_NumIkGoals)
+            {
+                throw new InvalidOperationException("Bad array size for HumanPose.ikGoalPositions. Size must equal AvatakIKGoal size");
+            }
+
+            if (m_IkGoalRotations == null)
+            {
+                m_IkGoalRotations = new Quaternion[k_NumIkGoals];
+            }
+
+            if (m_OffsetIkGoalRotations != null && m_OffsetIkGoalRotations.Length != k_NumIkGoals)
+            {
+                throw new InvalidOperationException("Bad array size for HumanPose.ikGoalPositions. Size must equal AvatakIKGoal size");
+            }
+
+            if (m_OffsetIkGoalRotations == null)
+            {
+                m_OffsetIkGoalRotations = new Quaternion[k_NumIkGoals];
+            }
         }
     }
 
@@ -57,11 +96,11 @@ public class HumanPoseHandler : IDisposable
         [FreeFunction("AnimationBindings::DestroyHumanPoseHandler")]
         extern private static void Internal_Destroy(IntPtr ptr);
 
-        extern private void GetHumanPose(out Vector3 bodyPosition, out Quaternion bodyRotation, [Out] float[] muscles);
+        extern private void GetHumanPose(out Vector3 bodyPosition, out Quaternion bodyRotation, [Out] float[] muscles, [Out] Vector3[] ikGoalPositions, [Out] Quaternion[] ikGoalRotations);
         extern private void SetHumanPose(ref Vector3 bodyPosition, ref Quaternion bodyRotation, float[] muscles);
 
         [ThreadSafe]
-        extern private void GetInternalHumanPose(out Vector3 bodyPosition, out Quaternion bodyRotation, [Out] float[] muscles);
+        extern private void GetInternalHumanPose(out Vector3 bodyPosition, out Quaternion bodyRotation, [Out] float[] muscles, [Out] Vector3[] ikGoalPositions, [Out] Quaternion[] ikGoalRotation);
 
         [ThreadSafe]
         extern private void SetInternalHumanPose(ref Vector3 bodyPosition, ref Quaternion bodyRotation, float[] muscles);
@@ -121,13 +160,20 @@ public HumanPoseHandler(Avatar avatar, string[] jointPaths)
             m_Ptr = Internal_CreateFromJointPaths(avatar, jointPaths);
         }
 
+        static void CalculateIKOffsets(in Quaternion[] sourceRotations, ref Quaternion[] destRotations)
+        {
+            for (int i = 0; i < 4; i++)
+                destRotations[i] = sourceRotations[i] * HumanPose.s_IKGoalOffsets[i];
+        }
+
         public void GetHumanPose(ref HumanPose humanPose)
         {
             if (m_Ptr == IntPtr.Zero)
                 throw new NullReferenceException("HumanPoseHandler is not initialized properly");
 
             humanPose.Init();
-            GetHumanPose(out humanPose.bodyPosition, out humanPose.bodyRotation, humanPose.muscles);
+            GetHumanPose(out humanPose.bodyPosition, out humanPose.bodyRotation, humanPose.muscles, humanPose.m_IkGoalPositions, humanPose.m_IkGoalRotations);
+            CalculateIKOffsets(humanPose.m_IkGoalRotations, ref humanPose.m_OffsetIkGoalRotations); 
         }
 
         public void SetHumanPose(ref HumanPose humanPose)
@@ -145,7 +191,8 @@ public void GetInternalHumanPose(ref HumanPose humanPose)
                 throw new NullReferenceException("HumanPoseHandler is not initialized properly");
 
             humanPose.Init();
-            GetInternalHumanPose(out humanPose.bodyPosition, out humanPose.bodyRotation, humanPose.muscles);
+            GetInternalHumanPose(out humanPose.bodyPosition, out humanPose.bodyRotation, humanPose.muscles, humanPose.m_IkGoalPositions, humanPose.m_IkGoalRotations);
+            CalculateIKOffsets(humanPose.m_IkGoalRotations, ref humanPose.m_OffsetIkGoalRotations);
         }
 
         public void SetInternalHumanPose(ref HumanPose humanPose)
diff --git a/Modules/BuildProfileEditor/BuildProfileEditor.cs b/Modules/BuildProfileEditor/BuildProfileEditor.cs
index 174319eb22..983aa5a390 100644
--- a/Modules/BuildProfileEditor/BuildProfileEditor.cs
+++ b/Modules/BuildProfileEditor/BuildProfileEditor.cs
@@ -134,7 +134,7 @@ public override VisualElement CreateInspectorGUI()
                 sharedSettingsInfoHelpBox.Hide();
                 m_ProfilePlayerSettingsEditor = BuildProfilePlayerSettingsEditor
                     .CreatePlayerSettingsUI(root, hasErrors ? null : serializedObject);
-                BuildProfileGraphicsSettingsOverridesView.CreateGUI(profile, root);
+                ShowGraphicsSettingsSection(profile, root);
             }
             else
             {
@@ -464,5 +464,17 @@ void RevertScriptingDefines()
             recompileDefinesButton.SetEnabled(false);
             revertDefinesButton.SetEnabled(false);
         }
+
+        void ShowGraphicsSettingsSection(BuildProfile profile, VisualElement root)
+        {
+            var graphicsSettingsSection = root.Q<VisualElement>("editor-graphics-settings");
+            graphicsSettingsSection.Show();
+
+            var graphicsSettingsTitle = root.Q<Label>("graphics-settings-label");
+            graphicsSettingsTitle.text = TrText.graphicsSettings;
+
+            BuildProfileGraphicsSettingsOverridesView.CreateGUI(profile, root);
+            BuildProfileQualitySettingsOverridesView.CreateGUI(profile, root);
+        }
     }
 }
diff --git a/Modules/BuildProfileEditor/Elements/BuildProfileQualitySettingsOverridesView.cs b/Modules/BuildProfileEditor/Elements/BuildProfileQualitySettingsOverridesView.cs
new file mode 100644
index 0000000000..3476007fcd
--- /dev/null
+++ b/Modules/BuildProfileEditor/Elements/BuildProfileQualitySettingsOverridesView.cs
@@ -0,0 +1,128 @@
+// 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.Build.Profile.Elements
+{
+    class BuildProfileQualitySettingsOverridesView
+    {
+        /// <summary>
+        /// Show the Quality Settings section in the build profile editor.
+        /// </summary>
+        internal static void CreateGUI(BuildProfile profile, VisualElement root)
+        {
+            var overrideToggle = root.Q<Toggle>("quality-settings-override-toggle");
+            var overrideRoot = root.Q<VisualElement>("quality-settings-override-root");
+            var overrideFoldout = root.Q<Foldout>("quality-settings-override-foldout");
+            var editorVisualElement = root.Q<VisualElement>("quality-settings-override-editor");
+            var optionsButton = root.Q<Button>("quality-settings-override-options");
+
+            overrideToggle.label = TrText.overrideQualitySettingsToggleLabel;
+            overrideFoldout.text = TrText.overrideQualitySettingsFoldoutLabel;
+
+            var qualitySettings = profile.qualitySettings;
+            BuildProfileQualitySettingsEditor editor = null;
+
+            if (qualitySettings == null)
+            {
+                overrideToggle.value = false;
+                overrideRoot.Hide();
+            }
+            else
+            {
+                overrideToggle.value = true;
+                editor = Editor.CreateEditor(qualitySettings) as BuildProfileQualitySettingsEditor;
+                var inspectorGUI = editor.CreateInspectorGUI();
+                editorVisualElement.Add(inspectorGUI);
+            }
+
+            overrideToggle.RegisterValueChangedCallback((evt) =>
+            {
+                if (evt.newValue == true)
+                    AddQualitySettings();
+                else
+                    RemoveQualitySettings();
+            });
+
+            optionsButton.clicked += () =>
+            {
+                var menu = new GenericMenu();
+                menu.AddItem(TrText.resetToGlobals, false, editor.IsDataEqualToGlobalQualitySettings(profile) ? null : ResetQualitySettings);
+                menu.ShowAsContext();
+            };
+
+            profile.OnQualitySettingsSubAssetRemoved -= UpdateViewOnQualitySettingsSubAssetRemoved;
+            profile.OnQualitySettingsSubAssetRemoved += UpdateViewOnQualitySettingsSubAssetRemoved;
+
+            void AddQualitySettings()
+            {
+                if (qualitySettings != null)
+                    return;
+
+                qualitySettings = ScriptableObject.CreateInstance<BuildProfileQualitySettings>();
+                qualitySettings.Instantiate();
+                profile.qualitySettings = qualitySettings;
+                AssetDatabase.AddObjectToAsset(qualitySettings, profile);
+                EditorUtility.SetDirty(profile);
+
+                editor = Editor.CreateEditor(qualitySettings) as BuildProfileQualitySettingsEditor;
+                editor.ResetToGlobalQualitySettingsValues(profile);
+
+                var inspectorGUI = editor.CreateInspectorGUI();
+                editorVisualElement.Add(inspectorGUI);
+                overrideRoot.Show();
+            }
+
+            void RemoveQualitySettings()
+            {
+                if (qualitySettings == null)
+                    return;
+
+                bool removeQualitySettings = EditorUtility.DisplayDialog(TrText.removeQualitySettingsDialogTitle,
+                    TrText.removeQualitySettingsDialogMessage,
+                    TrText.continueButtonText, TrText.cancelButtonText);
+
+                if (!removeQualitySettings)
+                {
+                    overrideToggle.value = true;
+                    return;
+                }
+
+                AssetDatabase.RemoveObjectFromAsset(qualitySettings);
+                profile.qualitySettings = null;
+                EditorUtility.SetDirty(profile);
+
+                UpdateViewOnQualitySettingsSubAssetRemoved();
+            }
+
+            void UpdateViewOnQualitySettingsSubAssetRemoved()
+            {
+                qualitySettings = null;
+                editor = null;
+
+                overrideToggle.value = false;
+                editorVisualElement.Clear();
+                overrideRoot.Hide();
+            }
+
+            void ResetQualitySettings()
+            {
+                bool resetQualitySettings = EditorUtility.DisplayDialog(TrText.resetQualitySettingsDialogTitle,
+                    TrText.resetQualitySettingsDialogMessage,
+                    TrText.continueButtonText, TrText.cancelButtonText);
+
+                if (!resetQualitySettings)
+                    return;
+
+                editor.ResetToGlobalQualitySettingsValues(profile);
+
+                editorVisualElement.Clear();
+                var inspectorGUI = editor.CreateInspectorGUI();
+                editorVisualElement.Add(inspectorGUI);
+            }
+        }
+    }
+}
diff --git a/Modules/BuildProfileEditor/Handlers/BuildProfileDataSource.cs b/Modules/BuildProfileEditor/Handlers/BuildProfileDataSource.cs
index 85c50faa09..ff709513a3 100644
--- a/Modules/BuildProfileEditor/Handlers/BuildProfileDataSource.cs
+++ b/Modules/BuildProfileEditor/Handlers/BuildProfileDataSource.cs
@@ -132,6 +132,12 @@ internal static BuildProfile DuplicateAsset(BuildProfile buildProfile, bool isCl
             if (duplicatedProfile.graphicsSettings != null)
                 AssetDatabase.AddObjectToAsset(duplicatedProfile.graphicsSettings, duplicatedProfile);
 
+            if (buildProfile.qualitySettings != null)
+            {
+                duplicatedProfile.qualitySettings = UnityEngine.Object.Instantiate(buildProfile.qualitySettings);
+                AssetDatabase.AddObjectToAsset(duplicatedProfile.qualitySettings, duplicatedProfile);
+            }
+
             EditorAnalytics.SendAnalytic(new BuildProfileCreatedEvent(new BuildProfileCreatedEvent.Payload
             {
                 creationType = (isClassic)
@@ -283,48 +289,9 @@ bool AddNewToCustomProfilesInOrder(BuildProfile profile)
 
         static List<BuildProfile> FindAllBuildProfiles()
         {
-            var alreadyLoadedBuildProfiles = Resources.FindObjectsOfTypeAll<BuildProfile>();
-
-            const string buildProfileAssetSearchString = $"t:{nameof(BuildProfile)}";
-            var assetsGuids = AssetDatabase.FindAssets(buildProfileAssetSearchString);
-            var result = new List<BuildProfile>(assetsGuids.Length);
-
-            // Suppress missing type warning thrown by serialization. This could happen
-            // when the build profile window is opened, then entering play mode and the
-            // module for that profile is not installed.
-            BuildProfileModuleUtil.SuppressMissingTypeWarning();
-
-            foreach (var guid in assetsGuids)
-            {
-                string path = AssetDatabase.GUIDToAssetPath(guid);
-                BuildProfile profile = AssetDatabase.LoadAssetAtPath<BuildProfile>(path);
-                if (profile == null)
-                {
-                    Debug.LogWarning($"[BuildProfile] Failed to load asset at path: {path}");
-                    continue;
-                }
-
-                result.Add(profile);
-            }
-
-            foreach (var buildProfile in alreadyLoadedBuildProfiles)
-            {
-                // Asset database will not give us any build profiles that get created in memory
-                // and we need to include them in this list as we use it to detect that build profiles
-                // have been destroyed and destroy their resources like PlayerSettings afterwards.
-                // Skipping the in-memory build profiles will result in us deleting their associated
-                // player settings object while it's being used and will lead to a crash (UUM-77423)
-                if (buildProfile &&
-                    !BuildProfileContext.IsClassicPlatformProfile(buildProfile) &&
-                    !BuildProfileContext.IsSharedProfile(buildProfile.buildTarget) &&
-                    !EditorUtility.IsPersistent(buildProfile))
-                {
-                    result.Add(buildProfile);
-                }
-            }
-
-            result.Sort((lhs, rhs) => EditorUtility.NaturalCompare(lhs.name, rhs.name));
-            return result;
+            var profiles = BuildProfileModuleUtil.GetAllBuildProfiles();
+            profiles.Sort((lhs, rhs) => EditorUtility.NaturalCompare(lhs.name, rhs.name));
+            return profiles;
         }
 
         static string ReplaceFileNameInPath(string originalPath, string newName)
diff --git a/Modules/BuildProfileEditor/TrText.cs b/Modules/BuildProfileEditor/TrText.cs
index 73207636c0..49a73c8e1b 100644
--- a/Modules/BuildProfileEditor/TrText.cs
+++ b/Modules/BuildProfileEditor/TrText.cs
@@ -73,6 +73,14 @@ internal class TrText
         public static readonly string resetGraphicsSettingsDialogTitle = L10n.Tr("Reset Graphics Settings to Globals");
         public static readonly string resetGraphicsSettingsDialogMessage = L10n.Tr("This will reset all Graphics Settings overrides to the original globals.");
 
+        // Build Profile Quality Settings
+        public static readonly string overrideQualitySettingsToggleLabel = L10n.Tr("Override Global Quality Settings");
+        public static readonly string overrideQualitySettingsFoldoutLabel = L10n.Tr("Included Quality Levels");
+        public static readonly string removeQualitySettingsDialogTitle = L10n.Tr("Remove Quality Settings Overrides");
+        public static readonly string removeQualitySettingsDialogMessage = L10n.Tr("This will remove all Quality Settings overrides");
+        public static readonly string resetQualitySettingsDialogTitle = L10n.Tr("Reset Quality Settings to Globals");
+        public static readonly string resetQualitySettingsDialogMessage = L10n.Tr("This will reset all Quality Settings overrides to the original globals.");
+
         // Platform Discovery Window
         public static readonly string platformDiscoveryTitle = L10n.Tr("Platform Browser");
         public static readonly string noModuleFoundWarning = L10n.Tr("No module found for the selected profile.");
diff --git a/Modules/IMGUI/TextSelectingUtilities.cs b/Modules/IMGUI/TextSelectingUtilities.cs
index 7e77f22b5f..864fd02120 100644
--- a/Modules/IMGUI/TextSelectingUtilities.cs
+++ b/Modules/IMGUI/TextSelectingUtilities.cs
@@ -763,6 +763,8 @@ protected internal bool IsOverSelection(Vector2 cursorPosition)
         // Do a drag selection. Used to expand the selection in MouseDrag events.
         public void SelectToPosition(Vector2 cursorPosition)
         {
+            if (characterCount == 0)
+                return;
             if (!m_MouseDragSelectsWholeWords)
                 cursorIndex = textHandle.GetCursorIndexFromPosition(cursorPosition);
             else // snap to words/paragraphs
diff --git a/Modules/PackageManager/Editor/Managed/Client.cs b/Modules/PackageManager/Editor/Managed/Client.cs
index f0e3fcedd3..4ef3e0e63b 100644
--- a/Modules/PackageManager/Editor/Managed/Client.cs
+++ b/Modules/PackageManager/Editor/Managed/Client.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Linq;
 using UnityEditor.PackageManager.Requests;
-using UnityEngine;
 
 namespace UnityEditor.PackageManager
 {
@@ -173,13 +172,6 @@ public static SearchRequest SearchAll()
             return SearchAll(false);
         }
 
-        internal static PerformSearchRequest Search(SearchOptions options)
-        {
-            long operationId;
-            var status = Search(out operationId, options);
-            return new PerformSearchRequest(operationId, status);
-        }
-
         internal static SetCacheRootRequest SetCacheRoot(string newPath)
         {
             long operationId;
diff --git a/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs b/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs
index 974c0c9094..e59c719f99 100644
--- a/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs
+++ b/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs
@@ -2,10 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using UnityEngine;
 using UnityEngine.Bindings;
-using UnityEngine.Scripting;
-using System;
 using System.Runtime.InteropServices;
 
 namespace UnityEditor.PackageManager
@@ -75,9 +72,6 @@ internal static void Resolve(bool force)
             Resolve_Internal(force);
         }
 
-        [FreeFunction("PackageManager::Search::StartOperation")]
-        private static extern NativeStatusCode Search([Out] out long operationId, SearchOptions options);
-
         [FreeFunction("PackageManager::SetCacheRoot::StartOperation")]
         private static extern NativeStatusCode SetCacheRoot([Out] out long operationId, string newPath);
 
diff --git a/Modules/PackageManager/Editor/Managed/Requests/PerformSearchRequest.cs b/Modules/PackageManager/Editor/Managed/Requests/PerformSearchRequest.cs
deleted file mode 100644
index 7195700a93..0000000000
--- a/Modules/PackageManager/Editor/Managed/Requests/PerformSearchRequest.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 UnityEngine;
-
-namespace UnityEditor.PackageManager.Requests
-{
-    [Serializable]
-    internal sealed partial class PerformSearchRequest : Request<SearchResults>
-    {
-        /// <summary>
-        /// Constructor to support serialization
-        /// </summary>
-        private PerformSearchRequest()
-        {
-        }
-
-        internal PerformSearchRequest(long operationId, NativeStatusCode initialStatus)
-            : base(operationId, initialStatus)
-        {
-        }
-
-        protected override SearchResults 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 45a5f705b7..4694af0020 100644
--- a/Modules/PackageManager/Editor/Managed/Requests/Requests.bindings.cs
+++ b/Modules/PackageManager/Editor/Managed/Requests/Requests.bindings.cs
@@ -89,13 +89,6 @@ public partial class PackRequest
         private static extern PackOperationResult GetOperationData(long operationId);
     }
 
-    internal partial class PerformSearchRequest
-    {
-        [NativeHeader("Modules/PackageManager/Editor/Public/PackageManager.h")]
-        [StaticAccessor("PackageManager::Search", StaticAccessorType.DoubleColon)]
-        private static extern SearchResults GetOperationData(long operationId);
-    }
-
     public sealed partial class SearchRequest
     {
         [NativeHeader("Modules/PackageManager/Editor/Public/PackageManager.h")]
diff --git a/Modules/PackageManager/Editor/Managed/Search/SearchEntitlement.cs b/Modules/PackageManager/Editor/Managed/Search/SearchEntitlement.cs
deleted file mode 100644
index 02c712eedf..0000000000
--- a/Modules/PackageManager/Editor/Managed/Search/SearchEntitlement.cs
+++ /dev/null
@@ -1,13 +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 UnityEditor.PackageManager
-{
-    internal enum SearchEntitlement
-    {
-        Any,
-        None,
-        AssetStore,
-    }
-}
diff --git a/Modules/PackageManager/Editor/Managed/Search/SearchOptions.cs b/Modules/PackageManager/Editor/Managed/Search/SearchOptions.cs
deleted file mode 100644
index b2679db266..0000000000
--- a/Modules/PackageManager/Editor/Managed/Search/SearchOptions.cs
+++ /dev/null
@@ -1,80 +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]
-    [NativeType(IntermediateScriptingStructName = "PackageManager_SearchOptions")]
-    internal sealed class SearchOptions
-    {
-        [SerializeField]
-        [NativeName("query")]
-        private string m_Query = "";
-
-        [SerializeField]
-        [NativeName("type")]
-        private string m_Type = "";
-
-        [SerializeField]
-        [NativeName("entitlement")]
-        private SearchEntitlement m_Entitlement;
-
-        [SerializeField]
-        [NativeName("offset")]
-        private long m_Offset = -1;
-
-        [SerializeField]
-        [NativeName("limit")]
-        private long m_Limit = -1;
-
-        [SerializeField]
-        [NativeName("orderBy")]
-        private SearchOrderBy m_OrderBy;
-
-        [SerializeField]
-        [NativeName("order")]
-        private SearchOrder m_Order;
-
-        [SerializeField]
-        [NativeName("registry")]
-        private string m_Registry = "";
-
-        internal SearchOptions(string query = "",
-                               string type = "",
-                               SearchEntitlement entitlement = default(SearchEntitlement),
-                               long offset = -1,
-                               long limit = -1,
-                               SearchOrderBy orderBy = default(SearchOrderBy),
-                               SearchOrder order = default(SearchOrder),
-                               string registry = "")
-        {
-            m_Query = query;
-            m_Type = type;
-            m_Entitlement = entitlement;
-            m_Offset = offset;
-            m_Limit = limit;
-            m_OrderBy = orderBy;
-            m_Order = order;
-            m_Registry = registry;
-        }
-
-        public string query { get { return m_Query; } }
-        public string type { get { return m_Type; } }
-        public SearchEntitlement entitlement { get { return m_Entitlement; } }
-        public long offset { get { return m_Offset; } }
-        public long limit { get { return m_Limit; } }
-        public SearchOrderBy orderBy { get { return m_OrderBy; } }
-        public SearchOrder order { get { return m_Order; } }
-        public string registry { get { return m_Registry; } }
-    }
-}
diff --git a/Modules/PackageManager/Editor/Managed/Search/SearchOrder.cs b/Modules/PackageManager/Editor/Managed/Search/SearchOrder.cs
deleted file mode 100644
index e561db65ad..0000000000
--- a/Modules/PackageManager/Editor/Managed/Search/SearchOrder.cs
+++ /dev/null
@@ -1,12 +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 UnityEditor.PackageManager
-{
-    internal enum SearchOrder
-    {
-        Ascending,
-        Descending,
-    }
-}
diff --git a/Modules/PackageManager/Editor/Managed/Search/SearchResultEntry.cs b/Modules/PackageManager/Editor/Managed/Search/SearchResultEntry.cs
deleted file mode 100644
index 798072245b..0000000000
--- a/Modules/PackageManager/Editor/Managed/Search/SearchResultEntry.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 SearchResultEntry
-    {
-        [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/Search/SearchResults.cs b/Modules/PackageManager/Editor/Managed/Search/SearchResults.cs
deleted file mode 100644
index 56211e9e41..0000000000
--- a/Modules/PackageManager/Editor/Managed/Search/SearchResults.cs
+++ /dev/null
@@ -1,52 +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]
-    [RequiredByNativeCode]
-    [StructLayout(LayoutKind.Sequential)]
-    [NativeAsStruct]
-    [NativeType(IntermediateScriptingStructName = "PackageManager_SearchResults")]
-    internal sealed class SearchResults
-    {
-        [SerializeField]
-        [NativeName("capabilities")]
-        private SearchCapabilities m_Capabilities = new SearchCapabilities();
-
-        [SerializeField]
-        [NativeName("packages")]
-        private SearchResultEntry[] m_Packages;
-
-        [SerializeField]
-        [NativeName("total")]
-        private ulong m_Total = 0;
-
-        internal SearchResults() {}
-
-        public ulong total { get { return m_Total;  } }
-
-        public SearchCapabilities capabilities
-        {
-            get
-            {
-                return m_Capabilities;
-            }
-        }
-
-        public SearchResultEntry[] packages
-        {
-            get
-            {
-                return m_Packages;
-            }
-        }
-    }
-}
diff --git a/Modules/PhysicsEditor/PhysicsManagerInspector.cs b/Modules/PhysicsEditor/PhysicsManagerInspector.cs
index 69e3c94d58..23c1e8ff8b 100644
--- a/Modules/PhysicsEditor/PhysicsManagerInspector.cs
+++ b/Modules/PhysicsEditor/PhysicsManagerInspector.cs
@@ -467,7 +467,6 @@ static void SetupClassicTab(VisualElement tab, SerializedObject serializedObject
             tab.Add(new PropertyField(serializedObject.FindProperty("m_BroadphaseType")));
             tab.Add(new PropertyField(serializedObject.FindProperty("m_FrictionType")));
             tab.Add(new PropertyField(serializedObject.FindProperty("m_EnableEnhancedDeterminism")));
-            tab.Add(new PropertyField(serializedObject.FindProperty("m_EnableUnifiedHeightmaps")));
             tab.Add(new PropertyField(serializedObject.FindProperty("m_ImprovedPatchFriction")));
             tab.Add(new PropertyField(serializedObject.FindProperty("m_SolverType")));
             tab.Add(new PropertyField(serializedObject.FindProperty("m_DefaultMaxAngularSpeed")));
diff --git a/Modules/TextCoreTextEngine/Managed/TextAssets/FontAsset.cs b/Modules/TextCoreTextEngine/Managed/TextAssets/FontAsset.cs
index 4df9b7ecde..1ac938ab32 100644
--- a/Modules/TextCoreTextEngine/Managed/TextAssets/FontAsset.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextAssets/FontAsset.cs
@@ -898,6 +898,36 @@ internal static FontAsset GetFontAssetByID(int id)
         internal static Func<Font, string> SetSourceFontGUID;
         internal static Func<bool> EditorApplicationIsUpdating;
 
+        /// <summary>
+        /// Weak reference to all <see cref="FontAsset"/> instances.
+        /// </summary>
+        static readonly List<WeakReference<FontAsset>> s_CallbackInstances = new();
+
+        /// <summary>
+        /// Register an instance for static lookup.
+        /// </summary>
+        /// <param name="instance">The instance to register.</param>
+        void RegisterCallbackInstance(FontAsset instance)
+        {
+            // Verify that it is not already registered.
+            for (var i = 0; i < s_CallbackInstances.Count; i++)
+            {
+                if (s_CallbackInstances[i].TryGetTarget(out FontAsset fa) && fa == instance)
+                    return;
+            }
+
+            for (var i = 0; i < s_CallbackInstances.Count; i++)
+            {
+                if (!s_CallbackInstances[i].TryGetTarget(out _))
+                {
+                    s_CallbackInstances[i] = new WeakReference<FontAsset>(instance);
+                    return;
+                }
+            }
+
+            s_CallbackInstances.Add(new WeakReference<FontAsset>(this));
+        }
+
         // Profiler Marker declarations
         private static ProfilerMarker k_ReadFontAssetDefinitionMarker = new ProfilerMarker("FontAsset.ReadFontAssetDefinition");
         private static ProfilerMarker k_AddSynthesizedCharactersMarker = new ProfilerMarker("FontAsset.AddSynthesizedCharacters");
@@ -1022,6 +1052,8 @@ public void ReadFontAssetDefinition()
 
             IsFontAssetLookupTablesDirty = false;
 
+            RegisterCallbackInstance(this);
+
             k_ReadFontAssetDefinitionMarker.End();
         }
 
@@ -1119,6 +1151,28 @@ internal void InitializeCharacterLookupDictionary()
             m_MissingUnicodesFromFontFile?.Clear();
         }
 
+        internal void ClearFallbackCharacterTable()
+        {
+            var keysToRemove = new List<uint>();
+
+            foreach (var characterLookup in m_CharacterLookupDictionary)
+            {
+                var character = characterLookup.Value;
+
+                // Collect the keys to remove
+                if (character.textAsset != this)
+                {
+                    keysToRemove.Add(characterLookup.Key);
+                }
+            }
+
+            // Now remove the collected keys
+            foreach (var key in keysToRemove)
+            {
+                m_CharacterLookupDictionary.Remove(key);
+            }
+        }
+
         internal void InitializeLigatureSubstitutionLookupDictionary()
         {
             var substitutionRecords = m_FontFeatureTable.m_LigatureSubstitutionRecords;
@@ -1847,7 +1901,12 @@ public void ClearFontAssetData(bool setAtlasSizeToZero = false)
 
                 ReadFontAssetDefinition();
 
-                //TextResourceManager.RebuildFontAssetCache();
+                // Clear fallback character table for all other fontAssets, in case they were refereing this one.
+                for (var i = 0; i < s_CallbackInstances.Count; i++)
+                    if (s_CallbackInstances[i].TryGetTarget(out var target) && target != this)
+                        target.ClearFallbackCharacterTable();
+
+                TextEventManager.ON_FONT_PROPERTY_CHANGED(true, this);
 
                 // Makes the changes to the font asset persistent.
                 RegisterResourceForUpdate?.Invoke(this);
diff --git a/Modules/TextCoreTextEngine/Managed/TextAssets/FontAsset/FontAssetFactory.cs b/Modules/TextCoreTextEngine/Managed/TextAssets/FontAsset/FontAssetFactory.cs
index 8ba9ba4cf1..d910022c90 100644
--- a/Modules/TextCoreTextEngine/Managed/TextAssets/FontAsset/FontAssetFactory.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextAssets/FontAsset/FontAssetFactory.cs
@@ -209,7 +209,6 @@ static void SetupFontAssetForBitmapSettings(FontAsset fontAsset)
 
         fontAsset.IsEditorFont = true;
         fontAsset.isMultiAtlasTexturesEnabled = true;
-        fontAsset.atlasTexture.filterMode = FilterMode.Point;
     }
 
     public static void SetHideFlags(FontAsset fontAsset)
diff --git a/Modules/TextCoreTextEngine/Managed/TextHandle.cs b/Modules/TextCoreTextEngine/Managed/TextHandle.cs
index 152d374554..33cd5d8d43 100644
--- a/Modules/TextCoreTextEngine/Managed/TextHandle.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextHandle.cs
@@ -219,7 +219,7 @@ internal bool IsTextInfoAllocated()
 
         protected internal static List<OTL_FeatureTag> m_ActiveFontFeatures = new List<OTL_FeatureTag>() { OTL_FeatureTag.kern };
 
-        private bool isDirty;
+        protected bool isDirty;
         public void SetDirty()
         {
             isDirty = true;
diff --git a/Modules/TextCoreTextEngine/Managed/UnicodeLineBreakingRules.cs b/Modules/TextCoreTextEngine/Managed/UnicodeLineBreakingRules.cs
index ac81de2f73..f09e8b5076 100644
--- a/Modules/TextCoreTextEngine/Managed/UnicodeLineBreakingRules.cs
+++ b/Modules/TextCoreTextEngine/Managed/UnicodeLineBreakingRules.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using UnityEngine.Bindings;
 
 
 namespace UnityEngine.TextCore.Text
@@ -92,9 +93,7 @@ public bool useModernHangulLineBreakingRules
         HashSet<uint> m_LeadingCharactersLookup;
         HashSet<uint> m_FollowingCharactersLookup;
 
-        /// <summary>
-        ///
-        /// </summary>
+        [VisibleToOtherModules("UnityEngine.UIElementsModule")]
         internal void LoadLineBreakingRules()
         {
             if (m_LeadingCharactersLookup == null)
diff --git a/Modules/TreeEditor/TreeEditor.cs b/Modules/TreeEditor/TreeEditor.cs
index 9758773cc3..76aecb98c0 100644
--- a/Modules/TreeEditor/TreeEditor.cs
+++ b/Modules/TreeEditor/TreeEditor.cs
@@ -953,19 +953,22 @@ void OnSceneGUI()
             Event evt = Event.current;
 
             #region Do Root Handles
-            if (s_SelectedGroup.GetType() == typeof(TreeGroupRoot))
+            if (Event.current.type == EventType.Repaint)
             {
-                Tools.s_Hidden = false;
+                if (s_SelectedGroup.GetType() == typeof(TreeGroupRoot))
+                {
+                    Tools.s_Hidden = false;
 
-                Handles.color = s_NormalColor;
-                Handles.DrawWireDisc(treeTransform.position, treeTransform.up, treeData.root.rootSpread);
-            }
-            else
-            {
-                Tools.s_Hidden = true;
+                    Handles.color = s_NormalColor;
+                    Handles.DrawWireDisc(treeTransform.position, treeTransform.up, treeData.root.rootSpread);
+                }
+                else
+                {
+                    Tools.s_Hidden = true;
 
-                Handles.color = Handles.secondaryColor;
-                Handles.DrawWireDisc(treeTransform.position, treeTransform.up, treeData.root.rootSpread);
+                    Handles.color = Handles.secondaryColor;
+                    Handles.DrawWireDisc(treeTransform.position, treeTransform.up, treeData.root.rootSpread);
+                }
             }
             #endregion
 
@@ -979,35 +982,38 @@ void OnSceneGUI()
                     oldEventType = evt.rawType;
 
                 // Draw all splines in a single GL.Begin / GL.End
-                Handles.DrawLine(Vector3.zero, Vector3.zero);
-                HandleUtility.ApplyWireMaterial();
-                GL.Begin(GL.LINES);
-                for (int nodeIndex = 0; nodeIndex < s_SelectedGroup.nodeIDs.Length; nodeIndex++)
+                if (Event.current.type == EventType.Repaint)
                 {
-                    TreeNode branch = treeData.GetNode(s_SelectedGroup.nodeIDs[nodeIndex]);
-                    TreeSpline spline = branch.spline;
-                    if (spline == null) continue;
+                    Handles.DrawLine(Vector3.zero, Vector3.zero);
+                    HandleUtility.ApplyWireMaterial();
+                    GL.Begin(GL.LINES);
+                    for (int nodeIndex = 0; nodeIndex < s_SelectedGroup.nodeIDs.Length; nodeIndex++)
+                    {
+                        TreeNode branch = treeData.GetNode(s_SelectedGroup.nodeIDs[nodeIndex]);
+                        TreeSpline spline = branch.spline;
+                        if (spline == null) continue;
 
-                    Handles.color = (branch == s_SelectedNode) ? s_NormalColor : s_GroupColor;
+                        Handles.color = (branch == s_SelectedNode) ? s_NormalColor : s_GroupColor;
 
-                    Matrix4x4 branchMatrix = treeMatrix * branch.matrix;
+                        Matrix4x4 branchMatrix = treeMatrix * branch.matrix;
 
-                    // Draw Spline
-                    Vector3 prevPos = branchMatrix.MultiplyPoint(spline.GetPositionAtTime(0.0f));
+                        // Draw Spline
+                        Vector3 prevPos = branchMatrix.MultiplyPoint(spline.GetPositionAtTime(0.0f));
 
-                    GL.Color(Handles.color);
-                    for (float t = 0.01f; t <= 1.0f; t += 0.01f)
-                    {
-                        Vector3 currPos = branchMatrix.MultiplyPoint(spline.GetPositionAtTime(t));
-                        //Handles.DrawLine(prevPos, currPos);
+                        GL.Color(Handles.color);
+                        for (float t = 0.01f; t <= 1.0f; t += 0.01f)
+                        {
+                            Vector3 currPos = branchMatrix.MultiplyPoint(spline.GetPositionAtTime(t));
+                            //Handles.DrawLine(prevPos, currPos);
 
-                        GL.Vertex(prevPos);
-                        GL.Vertex(currPos);
+                            GL.Vertex(prevPos);
+                            GL.Vertex(currPos);
 
-                        prevPos = currPos;
+                            prevPos = currPos;
+                        }
                     }
+                    GL.End();
                 }
-                GL.End();
 
                 // Draw all handles
                 for (int nodeIndex = 0; nodeIndex < s_SelectedGroup.nodeIDs.Length; nodeIndex++)
diff --git a/Modules/UIElements/Core/Text/UITKTextHandle.cs b/Modules/UIElements/Core/Text/UITKTextHandle.cs
index 4403f2c6c9..c47559c91d 100644
--- a/Modules/UIElements/Core/Text/UITKTextHandle.cs
+++ b/Modules/UIElements/Core/Text/UITKTextHandle.cs
@@ -77,7 +77,7 @@ public void UpdateMesh()
             var hashCode = settings.GetHashCode();
 
             // this should be a dynamic asset
-            if (m_PreviousGenerationSettingsHash == hashCode)
+            if (m_PreviousGenerationSettingsHash == hashCode && !isDirty)
                 AddTextInfoToTemporaryCache(hashCode);
             else
             {
@@ -98,8 +98,8 @@ public override void AddTextInfoToPermanentCache()
                 return;
             }
 
-            ConvertUssToTextGenerationSettings();
-            base.AddTextInfoToPermanentCache();
+            if (ConvertUssToTextGenerationSettings())
+                base.AddTextInfoToPermanentCache();
         }
 
         TextOverflowMode GetTextOverflowMode()
@@ -129,11 +129,11 @@ internal virtual bool ConvertUssToTextGenerationSettings()
             tgs.isIMGUI = false;
             tgs.textSettings = TextUtilities.GetTextSettingsFrom(m_TextElement);
             if (tgs.textSettings == null)
-                return true;
+                return false;
 
             tgs.fontAsset = TextUtilities.GetFontAsset(m_TextElement);
             if (tgs.fontAsset == null)
-                return true;
+                return false;
 
             // 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);
diff --git a/Modules/UIElements/Core/Text/UITKTextJobSystem.cs b/Modules/UIElements/Core/Text/UITKTextJobSystem.cs
index 6e9e65e60f..b30038dd00 100644
--- a/Modules/UIElements/Core/Text/UITKTextJobSystem.cs
+++ b/Modules/UIElements/Core/Text/UITKTextJobSystem.cs
@@ -166,6 +166,10 @@ private void GenerateTextJobified(MeshGenerationContext mgc, object _)
             k_UpdateMainThreadMarker.Begin();
             foreach (var textData in textJobDatas)
             {
+                // Loading line breaking rules is done here because it requires the main thread
+                var settings = TextUtilities.GetTextSettingsFrom(textData.visualElement);
+                settings?.lineBreakingRules?.LoadLineBreakingRules();
+
                 if (textData.prepareSuccess)
                     continue;
 
diff --git a/Modules/UIElementsEditor/VisualTreeAssetEditor.cs b/Modules/UIElementsEditor/VisualTreeAssetEditor.cs
index 2a7740779a..8e63256006 100644
--- a/Modules/UIElementsEditor/VisualTreeAssetEditor.cs
+++ b/Modules/UIElementsEditor/VisualTreeAssetEditor.cs
@@ -10,40 +10,35 @@ namespace UnityEditor.UIElements
     [CustomEditor(typeof(VisualTreeAsset))]
     internal class VisualTreeAssetEditor : ScriptableObjectAssetEditor
     {
-        private Panel m_Panel;
-        private VisualElement m_Tree;
-        private VisualTreeAsset m_LastTree;
+        private VisualTreeAsset m_VTA;
+        private VisualElement m_VisualTree;
         protected Texture2D m_FileTypeIcon;
         protected RenderTexture m_preview_texture;
         private Event m_evt = new Event();//Dummy event to fake rendering, cached to reduce memory allocation.
         private int m_LastDirtyCount;
         private int m_LastContentHash;
 
+        // Used by tests
+        internal VisualElement visualTree => m_VisualTree;
+
         //Currently just uses a fixed size texture to minimize lag/jitter as we are not integrated in the update loop. (instead of the real preview size)
         private Vector2Int m_TextureSize = new Vector2Int(512, 512);
 
-        // Used in tests
-        internal Panel panel => m_Panel;
-
         protected void OnEnable()
         {
             m_FileTypeIcon = EditorGUIUtility.FindTexture(typeof(VisualTreeAsset));
             EditorApplication.update += Update;
-            m_LastTree = null;//Force redraw;
+            m_VTA = null;//Force redraw;
         }
 
         protected void OnDisable()
         {
             EditorApplication.update -= Update;
-            if (m_Panel != null)
+
+            if (m_VisualTree != null)
             {
-                if (m_Tree != null)
-                {
-                    m_Tree.RemoveFromHierarchy();
-                    m_Tree = null;
-                }
-                m_Panel.Dispose();
-                m_Panel = null;
+                m_VisualTree.RemoveFromHierarchy();
+                m_VisualTree = null;
             }
         }
 
@@ -61,11 +56,6 @@ void Update()
 
         protected void OnDestroy()
         {
-            if (m_LastTree != null)
-            {
-                UIElementsUtility.RemoveCachedPanel(m_LastTree.GetInstanceID());
-            }
-
             if (m_preview_texture != null)
             {
                 m_preview_texture.Release();
@@ -91,17 +81,28 @@ private void RenderStaticPreview(int width, int height, ref RenderTexture tex)
             //It is not necessary if rendereing to a rendertexture in the editor update loop but mandatory to do an IM rendering
             //RectInt oldViewport = UnityEngine.UIElements.UIR.Utility.GetActiveViewport();
 
+            m_VisualTree = m_VTA.Instantiate();
+            m_VisualTree.StretchToParentSize();
+
+            // Create a transient panel to render the visual tree asset
+            var panel = EditorPanel.FindOrCreate(m_VTA);
+            var visualTree = panel.visualTree;
+            visualTree.Add(m_VisualTree);
+
+            Binding.SetPanelLogLevel(panel, BindingLogLevel.None); // We don't want preview to log errors.
+            UIElementsEditorUtility.AddDefaultEditorStyleSheets(visualTree);
+
             var r = new Rect(0, 0, width, height);
             var viewportRect = GUIClip.UnclipToWindow(r); // Still in points, not pixels
-            m_Panel.pixelsPerPoint = 1;
-            m_Panel.UpdateScalingFromEditorWindow = false;
-            m_Panel.visualTree.SetSize(viewportRect.size); // We will draw relative to a viewport covering the preview area, so draw at 0,0
-            m_Panel.visualTree.IncrementVersion(VersionChangeType.Repaint);
+            panel.pixelsPerPoint = 1;
+            panel.UpdateScalingFromEditorWindow = false;
+            panel.visualTree.SetSize(viewportRect.size); // We will draw relative to a viewport covering the preview area, so draw at 0,0
+            panel.visualTree.IncrementVersion(VersionChangeType.Repaint);
 
             var backup = RenderTexture.active;
             GL.PushMatrix();
             var oldState = SavedGUIState.Create();
-            PanelClearSettings oldClearSettings = m_Panel.clearSettings;
+            PanelClearSettings oldClearSettings = panel.clearSettings;
 
             try
             {
@@ -128,16 +129,19 @@ private void RenderStaticPreview(int width, int height, ref RenderTexture tex)
                     clips--;
                 }
 
-                m_Panel.clearSettings = new PanelClearSettings();
+                panel.clearSettings = new PanelClearSettings();
 
                 //Use a dummy repaint event, otherwise imgui element wont be shown when using event.current and rendered in the editor update loop
                 m_evt.type = EventType.Repaint;
-                m_Panel.Repaint(m_evt);
-                m_Panel.Render();
+                panel.Repaint(m_evt);
+                panel.Render();
+
+                panel.Dispose();
+                UIElementsUtility.RemoveCachedPanel(m_VTA.GetInstanceID());
             }
             finally
             {
-                m_Panel.clearSettings = oldClearSettings;
+                panel.clearSettings = oldClearSettings;
                 oldState.ApplyAndForget();
                 GL.PopMatrix();
                 RenderTexture.active = backup;
@@ -171,29 +175,16 @@ internal bool UpdatePreviewTexture(int width, int height)
             var vta = target as VisualTreeAsset;
             bool dirty = false;
             int currentDirtyCount = EditorUtility.GetDirtyCount(target);
-            if (vta != m_LastTree || !m_LastTree || currentDirtyCount != m_LastDirtyCount || vta.contentHash != m_LastContentHash)
+            if (vta != m_VTA || !m_VTA || currentDirtyCount != m_LastDirtyCount || vta.contentHash != m_LastContentHash)
             {
-                m_LastTree = vta;
-                m_Tree = vta.Instantiate();
-                m_Tree.StretchToParentSize();
+                m_VTA = vta;
                 m_LastDirtyCount = currentDirtyCount;
                 m_LastContentHash = vta.contentHash;
                 dirty = true;
             }
 
-            if (m_Panel == null)
-            {
-                m_Panel = EditorPanel.FindOrCreate(m_LastTree);
-                Binding.SetPanelLogLevel(m_Panel, BindingLogLevel.None); // We don't want preview to log errors.
-                var visualTree = m_Panel.visualTree;
-                UIElementsEditorUtility.AddDefaultEditorStyleSheets(visualTree);
-                dirty = true;
-            }
-
             if (dirty)
             {
-                m_Panel.visualTree.Clear();
-                m_Panel.visualTree.Add(m_Tree);
                 RenderStaticPreview(width, height, ref m_preview_texture);
             }
 
diff --git a/Projects/CSharp/UnityEditor.csproj b/Projects/CSharp/UnityEditor.csproj
index 95713041aa..6467b8da74 100644
--- a/Projects/CSharp/UnityEditor.csproj
+++ b/Projects/CSharp/UnityEditor.csproj
@@ -762,6 +762,12 @@
     <Compile Include="..\..\Editor\Mono\BuildProfile\BuildProfilePlayerSettings.cs">
       <Link>Editor\Mono\BuildProfile\BuildProfilePlayerSettings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\BuildProfile\BuildProfileQualitySettings.cs">
+      <Link>Editor\Mono\BuildProfile\BuildProfileQualitySettings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\BuildProfile\BuildProfileQualitySettingsEditor.cs">
+      <Link>Editor\Mono\BuildProfile\BuildProfileQualitySettingsEditor.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\BuildProfile\BuildProfileRenameOverlay.cs">
       <Link>Editor\Mono\BuildProfile\BuildProfileRenameOverlay.cs</Link>
     </Compile>
@@ -4524,6 +4530,9 @@
     <Compile Include="..\..\Modules\BuildProfileEditor\Elements\BuildProfileListLabel.cs">
       <Link>Modules\BuildProfileEditor\Elements\BuildProfileListLabel.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\BuildProfileEditor\Elements\BuildProfileQualitySettingsOverridesView.cs">
+      <Link>Modules\BuildProfileEditor\Elements\BuildProfileQualitySettingsOverridesView.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\BuildProfileEditor\Elements\BuildProfileSceneList.cs">
       <Link>Modules\BuildProfileEditor\Elements\BuildProfileSceneList.cs</Link>
     </Compile>
@@ -6210,9 +6219,6 @@
     <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Requests\PackRequest.cs">
       <Link>Modules\PackageManager\Editor\Managed\Requests\PackRequest.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Requests\PerformSearchRequest.cs">
-      <Link>Modules\PackageManager\Editor\Managed\Requests\PerformSearchRequest.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Requests\RemoveRequest.cs">
       <Link>Modules\PackageManager\Editor\Managed\Requests\RemoveRequest.cs</Link>
     </Compile>
@@ -6243,24 +6249,9 @@
     <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Search\SearchCapabilities.cs">
       <Link>Modules\PackageManager\Editor\Managed\Search\SearchCapabilities.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Search\SearchEntitlement.cs">
-      <Link>Modules\PackageManager\Editor\Managed\Search\SearchEntitlement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Search\SearchOptions.cs">
-      <Link>Modules\PackageManager\Editor\Managed\Search\SearchOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Search\SearchOrder.cs">
-      <Link>Modules\PackageManager\Editor\Managed\Search\SearchOrder.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Search\SearchOrderBy.cs">
       <Link>Modules\PackageManager\Editor\Managed\Search\SearchOrderBy.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Search\SearchResultEntry.cs">
-      <Link>Modules\PackageManager\Editor\Managed\Search\SearchResultEntry.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\PackageManager\Editor\Managed\Search\SearchResults.cs">
-      <Link>Modules\PackageManager\Editor\Managed\Search\SearchResults.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\PackageManager\Editor\Managed\SemVersionHelper.cs">
       <Link>Modules\PackageManager\Editor\Managed\SemVersionHelper.cs</Link>
     </Compile>
diff --git a/README.md b/README.md
index 920610df74..77d5e0ca8a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Unity 6000.1.0a2 C# reference source code
+## Unity 6000.1.0a3 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/Export/Graphics/RayTracingAccelerationStructure.bindings.cs b/Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.cs
index 2c9cc25f38..2620660dd5 100644
--- a/Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.cs
+++ b/Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.cs
@@ -899,6 +899,9 @@ public void UpdateInstanceMask(int handle, uint mask)
         [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::ClearInstances", HasExplicitThis = true)]
         extern public void ClearInstances();
 
+        [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::RemoveInstances", HasExplicitThis = true)]
+        extern public void RemoveInstances(int layerMask, RayTracingModeMask rayTracingModeMask);
+
         public RayTracingInstanceCullingResults CullInstances(ref RayTracingInstanceCullingConfig cullingConfig) => Internal_CullInstances(in cullingConfig);