From 779edb7fe5fd54ab67c1acb2439522a5c13eded4 Mon Sep 17 00:00:00 2001
From: kritin <kritin@amazon.com>
Date: Thu, 30 Sep 2021 16:43:15 -0700
Subject: [PATCH 01/29] Sample Editor test for QA Automation project

Signed-off-by: kritin <kritin@amazon.com>
---
 .../EditorScripts/Sample_Editor_Tests.py      | 143 ++++++++++++++++++
 .../editor/TestSuite_Main_Optimized.py        |   3 +
 2 files changed, 146 insertions(+)
 create mode 100644 AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Sample_Editor_Tests.py

diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Sample_Editor_Tests.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Sample_Editor_Tests.py
new file mode 100644
index 0000000000..746c0a936d
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Sample_Editor_Tests.py
@@ -0,0 +1,143 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+
+Test Case: Creating tests for basic editor feature like creating a level, adding new entities, modifying the entities etc.
+"""
+
+
+class Tests:
+    create_level = ("Level created and loaded successfully", "Failed to create the level")
+    open_level = ("Level loaded successfully", "Failed to load the level")
+    create_entity = ("Parent entity created successfully", "Failed to create a parent entity")
+    set_entity_name = ("Entity name set successfully", "Failed to set entity name")
+    delete_entity = ("Parent entity deleted successfully", "Failed to delete parent entity")
+    game_mode_enter = ("Game Mode entered successfully", "Failed to enter the game mode")
+    game_mode_exit = ("Game mode exited successfully", "Failed to exit game mode")
+    create_child_entity = ("Child entity created successfully", "Failed to create a child entity")
+    delete_child_entity = ("Child entity deleted successfully", "Failed to delete child entity")
+    add_mesh_component = ("Mesh component added successfully", "Failed to add mesh component")
+    found_component_typeId = ("Found component typeId", "Unable to find component TypeId")
+    remove_mesh_component = ("Mesh component removed successfully", "Failed to remove mesh component")
+
+
+def sample_editor_tests():
+    """
+        Performing basic test in editor
+            01. create_level if it does not exist else 02. open exiting level
+
+            03. create parent entity and set name
+            04. create child entity
+            05. delete child entity
+            06. add mesh component
+            07. remove mesh component
+            08. enter game mode
+            09. exit game_mode
+            10. delete parent entity
+            11. save level
+
+    """
+    import os
+    from editor_python_test_tools.utils import Report
+    from editor_python_test_tools.utils import TestHelper as helper
+    import editor_python_test_tools.hydra_editor_utils as hydra
+
+    import azlmbr.math as math
+    import azlmbr.asset as asset
+    import azlmbr.bus as bus
+    import azlmbr.editor as editor
+    import azlmbr.entity as entity
+    import azlmbr.legacy.general as general
+    import azlmbr.object
+
+    def search_entity(entity_to_search, entity_name):
+        """
+
+        :param entity_to_search: entity to be searched
+        :param entity_name: name of the entity used in the set command
+        :return: True if entity id exists in the entity_list
+                 False if entity id does not exist in the entity_list
+        """
+        entity_list = []
+        entity_search_filter = entity.SearchFilter()
+        entity_search_filter.names = entity_name
+        entity_list = entity.SearchBus(bus.Broadcast, 'SearchEntities', entity_search_filter)
+        if entity_list:
+            if entity_to_search in entity_list:
+                return True
+            return False
+        return False
+
+    # 01. create_level
+
+    test_level = 'Simple'
+    general.open_level_no_prompt(test_level)
+    Report.result(Tests.create_level, general.get_current_level_name() == test_level)
+
+    # 02. load existing level - skipping this since this could alter existing level that other test depends on
+
+    # 03. create_entity and set name
+    # Delete any exiting entity and Create a new Entity at the root level
+    search_filter = azlmbr.entity.SearchFilter()
+    all_entities = entity.SearchBus(azlmbr.bus.Broadcast, "SearchEntities", search_filter)
+    editor.ToolsApplicationRequestBus(bus.Broadcast, "DeleteEntities", all_entities)
+    parent_entity = editor.ToolsApplicationRequestBus(bus.Broadcast, "CreateNewEntity", entity.EntityId())
+    Report.result(Tests.create_entity, parent_entity.IsValid())
+
+    # Setting a new name
+    parent_entity_name = "Parent_1"
+    editor.EditorEntityAPIBus(bus.Event, 'SetName', parent_entity, parent_entity_name)
+    Report.result(Tests.set_entity_name,
+                  editor.EditorEntityInfoRequestBus(bus.Event, 'GetName', parent_entity) == parent_entity_name)
+
+    # 04. Creating child Entity and setting name to above created parent entity
+    child_1_entity = editor.ToolsApplicationRequestBus(bus.Broadcast, 'CreateNewEntity', parent_entity)
+    Report.result(Tests.create_child_entity, child_1_entity.IsValid())
+    child_entity_name = "Child_1"
+    editor.EditorEntityAPIBus(bus.Event, 'SetName', child_1_entity, child_entity_name)
+    Report.result(Tests.set_entity_name,
+                  editor.EditorEntityInfoRequestBus(bus.Event, 'GetName', child_1_entity) == child_entity_name)
+
+    # 05. delete_Child_entity
+    editor.ToolsApplicationRequestBus(bus.Broadcast, 'DeleteEntityById', child_1_entity)
+    Report.result(Tests.delete_entity, search_entity(child_1_entity, "Child_1") == False)
+
+    # 06. add mesh component to parent entity
+    type_id_list = editor.EditorComponentAPIBus(bus.Broadcast, 'FindComponentTypeIdsByEntityType', ["Mesh"],
+                                                entity.EntityType().Game)
+    if type_id_list is not None:
+        component_outcome = editor.EditorComponentAPIBus(bus.Broadcast, 'AddComponentsOfType', parent_entity,
+                                                         type_id_list)
+        Report.result(Tests.add_mesh_component, component_outcome.IsSuccess())
+    else:
+        Report.result(Tests.found_component_typeId, type_id_list is not None)
+
+    # 09. remove mesh component
+    outcome_get_component = editor.EditorComponentAPIBus(bus.Broadcast, 'GetComponentOfType', parent_entity,
+                                                         type_id_list[0])
+    if outcome_get_component.IsSuccess():
+        component_entity_pair = outcome_get_component.GetValue()
+        editor.EditorComponentAPIBus(bus.Broadcast, 'RemoveComponents', [component_entity_pair])
+        component_exists = editor.EditorComponentAPIBus(bus.Broadcast, 'HasComponentOfType', parent_entity,
+                                                        type_id_list[0])
+        mesh_test = True
+        if component_exists:
+            mesh_test = False
+        Report.result(Tests.remove_mesh_component, mesh_test)
+    else:
+        Report.result(Tests.found_component_typeId, outcome_get_component.IsSuccess())
+
+    # 10. delete parent entity
+    editor.ToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'DeleteEntityById', parent_entity)
+    Report.result(Tests.delete_entity, search_entity(parent_entity, "Parent_1") == False)
+
+    # Close editor without saving
+    editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'ExitNoPrompt')
+
+
+if __name__ == "__main__":
+    from editor_python_test_tools.utils import Report
+
+    Report.start_test(sample_editor_tests)
diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
index 9c0b99daff..9aef8a8b2c 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
@@ -73,3 +73,6 @@ class TestAutomationAutoTestMode(EditorTestSuite):
     @pytest.mark.skip(reason="Times out due to dialogs failing to dismiss: LYN-4208")
     class test_Menus_FileMenuOptions_Work(EditorSharedTest):
         from .EditorScripts import Menus_FileMenuOptions as test_module
+    
+    class test_Sample_Editor_Tests(EditorSharedTest):
+        from .EditorScripts import Sample_Editor_Tests as test_module
\ No newline at end of file

From b7e3a63faea416a22ba8f3a7d13dc22728bfd64a Mon Sep 17 00:00:00 2001
From: kritin <kritin@amazon.com>
Date: Mon, 4 Oct 2021 23:18:31 -0700
Subject: [PATCH 02/29] responded to code reviews

Signed-off-by: kritin <kritin@amazon.com>
---
 ...flows_ExistingLevel_EntityComponentCRUD.py | 159 ++++++++++++++++++
 .../editor/TestSuite_Main_Optimized.py        |   3 +-
 2 files changed, 161 insertions(+), 1 deletion(-)
 create mode 100644 AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py

diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py
new file mode 100644
index 0000000000..451b3a6714
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py
@@ -0,0 +1,159 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+
+class Tests:
+    load_level = (
+        "Level loaded successfully",
+        "Failed to load the level"
+    )
+    create_entity = (
+        "Parent entity created successfully",
+        "Failed to create a parent entity"
+    )
+    set_entity_name = (
+        "Entity name set successfully",
+        "Failed to set entity name"
+    )
+    delete_entity = (
+        "Parent Entity deleted successfully",
+        "Failed to delete parent entity"
+    )
+    create_child_entity = (
+        "Child entity created successfully",
+        "Failed to create a child entity"
+    )
+    delete_child_entity = (
+        "Child entity deleted successfully",
+        "Failed to delete child entity"
+    )
+    add_mesh_component = (
+        "Mesh component added successfully",
+        "Failed to add mesh component"
+    )
+    found_component_typeId = (
+        "Found component typeId",
+        "Unable to find component TypeId"
+    )
+    remove_mesh_component = (
+        "Mesh component removed successfully",
+        "Failed to remove mesh component"
+    )
+
+
+def BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD():
+    """
+        Performing basic test in editor
+            01. Load exiting level
+            02. create parent entity and set name
+            03. create child entity and set a name
+            04. delete child entity
+            05. add mesh component to parent entity
+            06. remove mesh component
+            07. delete parent entity
+            Close editor without saving
+    """
+    import os
+    from editor_python_test_tools.utils import Report
+    from editor_python_test_tools.utils import TestHelper as helper
+    import editor_python_test_tools.hydra_editor_utils as hydra
+
+    import azlmbr.math as math
+    import azlmbr.asset as asset
+    import azlmbr.bus as bus
+    import azlmbr.editor as editor
+    import azlmbr.entity as entity
+    import azlmbr.legacy.general as general
+    import azlmbr.object
+
+    def search_entity(entity_to_search, entity_name):
+        """
+
+        :param entity_to_search: entity to be searched
+        :param entity_name: name of the entity used in the set command
+        :return: True if entity id exists in the entity_list
+                 False if entity id does not exist in the entity_list
+        """
+        entity_list = []
+        entity_search_filter = entity.SearchFilter()
+        entity_search_filter.names = entity_name
+        entity_list = entity.SearchBus(bus.Broadcast, 'SearchEntities', entity_search_filter)
+        if entity_list:
+            if entity_to_search in entity_list:
+                return True
+            return False
+        return False
+
+    # 01. load an existing level
+
+    test_level = 'Simple'
+    general.open_level_no_prompt(test_level)
+    Report.result(Tests.load_level, general.get_current_level_name() == test_level)
+
+    # 02. create parent entity and set name
+    # Delete any exiting entity and Create a new Entity at the root level
+    search_filter = azlmbr.entity.SearchFilter()
+    all_entities = entity.SearchBus(azlmbr.bus.Broadcast, "SearchEntities", search_filter)
+    editor.ToolsApplicationRequestBus(bus.Broadcast, "DeleteEntities", all_entities)
+    parent_entity = editor.ToolsApplicationRequestBus(bus.Broadcast, "CreateNewEntity", entity.EntityId())
+    Report.result(Tests.create_entity, parent_entity.IsValid())
+
+    # Setting a new name
+    parent_entity_name = "Parent_1"
+    editor.EditorEntityAPIBus(bus.Event, 'SetName', parent_entity, parent_entity_name)
+    Report.result(Tests.set_entity_name,
+                  editor.EditorEntityInfoRequestBus(bus.Event, 'GetName', parent_entity) == parent_entity_name)
+
+    # 03. Create child Entity to above created parent entity and set a name
+    child_1_entity = editor.ToolsApplicationRequestBus(bus.Broadcast, 'CreateNewEntity', parent_entity)
+    Report.result(Tests.create_child_entity, child_1_entity.IsValid())
+    child_entity_name = "Child_1"
+    editor.EditorEntityAPIBus(bus.Event, 'SetName', child_1_entity, child_entity_name)
+    Report.result(Tests.set_entity_name,
+                  editor.EditorEntityInfoRequestBus(bus.Event, 'GetName', child_1_entity) == child_entity_name)
+
+    # 04. delete_Child_entity
+    editor.ToolsApplicationRequestBus(bus.Broadcast, 'DeleteEntityById', child_1_entity)
+    Report.result(Tests.delete_child_entity, search_entity(child_1_entity, "Child_1") == False)
+
+    # 05. add mesh component to parent entity
+    type_id_list = editor.EditorComponentAPIBus(bus.Broadcast, 'FindComponentTypeIdsByEntityType', ["Mesh"],
+                                                entity.EntityType().Game)
+    if type_id_list is not None:
+        component_outcome = editor.EditorComponentAPIBus(bus.Broadcast, 'AddComponentsOfType', parent_entity,
+                                                         type_id_list)
+        Report.result(Tests.add_mesh_component, component_outcome.IsSuccess())
+    else:
+        Report.result(Tests.found_component_typeId, type_id_list is not None)
+
+    # 06. remove mesh component
+    outcome_get_component = editor.EditorComponentAPIBus(bus.Broadcast, 'GetComponentOfType', parent_entity,
+                                                         type_id_list[0])
+    if outcome_get_component.IsSuccess():
+        component_entity_pair = outcome_get_component.GetValue()
+        editor.EditorComponentAPIBus(bus.Broadcast, 'RemoveComponents', [component_entity_pair])
+        component_exists = editor.EditorComponentAPIBus(bus.Broadcast, 'HasComponentOfType', parent_entity,
+                                                        type_id_list[0])
+        mesh_test = True
+        if component_exists:
+            mesh_test = False
+        Report.result(Tests.remove_mesh_component, mesh_test)
+    else:
+        Report.result(Tests.found_component_typeId, outcome_get_component.IsSuccess())
+
+    # 7. delete parent entity
+    editor.ToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'DeleteEntityById', parent_entity)
+    Report.result(Tests.delete_entity, search_entity(parent_entity, "Parent_1") == False)
+
+    # Close editor without saving
+    editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'ExitNoPrompt')
+
+
+if __name__ == "__main__":
+    from editor_python_test_tools.utils import Report
+
+    Report.start_test(BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD)
diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
index 9aef8a8b2c..755f75216b 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
@@ -73,6 +73,7 @@ class TestAutomationAutoTestMode(EditorTestSuite):
     @pytest.mark.skip(reason="Times out due to dialogs failing to dismiss: LYN-4208")
     class test_Menus_FileMenuOptions_Work(EditorSharedTest):
         from .EditorScripts import Menus_FileMenuOptions as test_module
+
     
     class test_Sample_Editor_Tests(EditorSharedTest):
-        from .EditorScripts import Sample_Editor_Tests as test_module
\ No newline at end of file
+        from .EditorScripts import BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD as test_module

From f1fe2912e45ba6e493ba0fee3e6edd4876ccfc20 Mon Sep 17 00:00:00 2001
From: kritin <kritin@amazon.com>
Date: Tue, 5 Oct 2021 14:54:07 -0700
Subject: [PATCH 03/29] responded to code reviews

Signed-off-by: kritin <kritin@amazon.com>
---
 ...flows_ExistingLevel_EntityComponentCRUD.py |  80 +++-------
 .../EditorScripts/Sample_Editor_Tests.py      | 143 ------------------
 .../editor/TestSuite_Main_Optimized.py        |   2 +-
 3 files changed, 20 insertions(+), 205 deletions(-)
 delete mode 100644 AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Sample_Editor_Tests.py

diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py
index 451b3a6714..803b9e9a11 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py
@@ -53,40 +53,19 @@ def BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD():
             03. create child entity and set a name
             04. delete child entity
             05. add mesh component to parent entity
-            06. remove mesh component
             07. delete parent entity
             Close editor without saving
     """
     import os
     from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper
-    import editor_python_test_tools.hydra_editor_utils as hydra
+    from editor_python_test_tools.editor_entity_utils import EditorEntity
 
-    import azlmbr.math as math
-    import azlmbr.asset as asset
     import azlmbr.bus as bus
     import azlmbr.editor as editor
     import azlmbr.entity as entity
     import azlmbr.legacy.general as general
     import azlmbr.object
 
-    def search_entity(entity_to_search, entity_name):
-        """
-
-        :param entity_to_search: entity to be searched
-        :param entity_name: name of the entity used in the set command
-        :return: True if entity id exists in the entity_list
-                 False if entity id does not exist in the entity_list
-        """
-        entity_list = []
-        entity_search_filter = entity.SearchFilter()
-        entity_search_filter.names = entity_name
-        entity_list = entity.SearchBus(bus.Broadcast, 'SearchEntities', entity_search_filter)
-        if entity_list:
-            if entity_to_search in entity_list:
-                return True
-            return False
-        return False
 
     # 01. load an existing level
 
@@ -94,60 +73,39 @@ def BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD():
     general.open_level_no_prompt(test_level)
     Report.result(Tests.load_level, general.get_current_level_name() == test_level)
 
+
     # 02. create parent entity and set name
     # Delete any exiting entity and Create a new Entity at the root level
+
     search_filter = azlmbr.entity.SearchFilter()
     all_entities = entity.SearchBus(azlmbr.bus.Broadcast, "SearchEntities", search_filter)
     editor.ToolsApplicationRequestBus(bus.Broadcast, "DeleteEntities", all_entities)
-    parent_entity = editor.ToolsApplicationRequestBus(bus.Broadcast, "CreateNewEntity", entity.EntityId())
-    Report.result(Tests.create_entity, parent_entity.IsValid())
+    parent_entity = EditorEntity.create_editor_entity("Parent_1")
+    Report.result(Tests.create_entity, parent_entity.exists())
 
-    # Setting a new name
-    parent_entity_name = "Parent_1"
-    editor.EditorEntityAPIBus(bus.Event, 'SetName', parent_entity, parent_entity_name)
-    Report.result(Tests.set_entity_name,
-                  editor.EditorEntityInfoRequestBus(bus.Event, 'GetName', parent_entity) == parent_entity_name)
 
     # 03. Create child Entity to above created parent entity and set a name
-    child_1_entity = editor.ToolsApplicationRequestBus(bus.Broadcast, 'CreateNewEntity', parent_entity)
-    Report.result(Tests.create_child_entity, child_1_entity.IsValid())
-    child_entity_name = "Child_1"
-    editor.EditorEntityAPIBus(bus.Event, 'SetName', child_1_entity, child_entity_name)
-    Report.result(Tests.set_entity_name,
-                  editor.EditorEntityInfoRequestBus(bus.Event, 'GetName', child_1_entity) == child_entity_name)
+
+    child_1_entity = EditorEntity.create_editor_entity("Child_1", parent_entity.id )
+    Report.result(Tests.create_child_entity, child_1_entity.exists())
+
 
     # 04. delete_Child_entity
-    editor.ToolsApplicationRequestBus(bus.Broadcast, 'DeleteEntityById', child_1_entity)
-    Report.result(Tests.delete_child_entity, search_entity(child_1_entity, "Child_1") == False)
+
+    child_1_entity.delete()
+    Report.result(Tests.delete_child_entity, not child_1_entity.exists())
+
 
     # 05. add mesh component to parent entity
-    type_id_list = editor.EditorComponentAPIBus(bus.Broadcast, 'FindComponentTypeIdsByEntityType', ["Mesh"],
-                                                entity.EntityType().Game)
-    if type_id_list is not None:
-        component_outcome = editor.EditorComponentAPIBus(bus.Broadcast, 'AddComponentsOfType', parent_entity,
-                                                         type_id_list)
-        Report.result(Tests.add_mesh_component, component_outcome.IsSuccess())
-    else:
-        Report.result(Tests.found_component_typeId, type_id_list is not None)
 
-    # 06. remove mesh component
-    outcome_get_component = editor.EditorComponentAPIBus(bus.Broadcast, 'GetComponentOfType', parent_entity,
-                                                         type_id_list[0])
-    if outcome_get_component.IsSuccess():
-        component_entity_pair = outcome_get_component.GetValue()
-        editor.EditorComponentAPIBus(bus.Broadcast, 'RemoveComponents', [component_entity_pair])
-        component_exists = editor.EditorComponentAPIBus(bus.Broadcast, 'HasComponentOfType', parent_entity,
-                                                        type_id_list[0])
-        mesh_test = True
-        if component_exists:
-            mesh_test = False
-        Report.result(Tests.remove_mesh_component, mesh_test)
-    else:
-        Report.result(Tests.found_component_typeId, outcome_get_component.IsSuccess())
+    parent_entity.add_component("Mesh")
+    Report.result(Tests.add_mesh_component, parent_entity.has_component("Mesh"))
+
 
     # 7. delete parent entity
-    editor.ToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'DeleteEntityById', parent_entity)
-    Report.result(Tests.delete_entity, search_entity(parent_entity, "Parent_1") == False)
+
+    parent_entity.delete()
+    Report.result(Tests.delete_entity, not parent_entity.exists())
 
     # Close editor without saving
     editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'ExitNoPrompt')
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Sample_Editor_Tests.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Sample_Editor_Tests.py
deleted file mode 100644
index 746c0a936d..0000000000
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Sample_Editor_Tests.py
+++ /dev/null
@@ -1,143 +0,0 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-
-Test Case: Creating tests for basic editor feature like creating a level, adding new entities, modifying the entities etc.
-"""
-
-
-class Tests:
-    create_level = ("Level created and loaded successfully", "Failed to create the level")
-    open_level = ("Level loaded successfully", "Failed to load the level")
-    create_entity = ("Parent entity created successfully", "Failed to create a parent entity")
-    set_entity_name = ("Entity name set successfully", "Failed to set entity name")
-    delete_entity = ("Parent entity deleted successfully", "Failed to delete parent entity")
-    game_mode_enter = ("Game Mode entered successfully", "Failed to enter the game mode")
-    game_mode_exit = ("Game mode exited successfully", "Failed to exit game mode")
-    create_child_entity = ("Child entity created successfully", "Failed to create a child entity")
-    delete_child_entity = ("Child entity deleted successfully", "Failed to delete child entity")
-    add_mesh_component = ("Mesh component added successfully", "Failed to add mesh component")
-    found_component_typeId = ("Found component typeId", "Unable to find component TypeId")
-    remove_mesh_component = ("Mesh component removed successfully", "Failed to remove mesh component")
-
-
-def sample_editor_tests():
-    """
-        Performing basic test in editor
-            01. create_level if it does not exist else 02. open exiting level
-
-            03. create parent entity and set name
-            04. create child entity
-            05. delete child entity
-            06. add mesh component
-            07. remove mesh component
-            08. enter game mode
-            09. exit game_mode
-            10. delete parent entity
-            11. save level
-
-    """
-    import os
-    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper
-    import editor_python_test_tools.hydra_editor_utils as hydra
-
-    import azlmbr.math as math
-    import azlmbr.asset as asset
-    import azlmbr.bus as bus
-    import azlmbr.editor as editor
-    import azlmbr.entity as entity
-    import azlmbr.legacy.general as general
-    import azlmbr.object
-
-    def search_entity(entity_to_search, entity_name):
-        """
-
-        :param entity_to_search: entity to be searched
-        :param entity_name: name of the entity used in the set command
-        :return: True if entity id exists in the entity_list
-                 False if entity id does not exist in the entity_list
-        """
-        entity_list = []
-        entity_search_filter = entity.SearchFilter()
-        entity_search_filter.names = entity_name
-        entity_list = entity.SearchBus(bus.Broadcast, 'SearchEntities', entity_search_filter)
-        if entity_list:
-            if entity_to_search in entity_list:
-                return True
-            return False
-        return False
-
-    # 01. create_level
-
-    test_level = 'Simple'
-    general.open_level_no_prompt(test_level)
-    Report.result(Tests.create_level, general.get_current_level_name() == test_level)
-
-    # 02. load existing level - skipping this since this could alter existing level that other test depends on
-
-    # 03. create_entity and set name
-    # Delete any exiting entity and Create a new Entity at the root level
-    search_filter = azlmbr.entity.SearchFilter()
-    all_entities = entity.SearchBus(azlmbr.bus.Broadcast, "SearchEntities", search_filter)
-    editor.ToolsApplicationRequestBus(bus.Broadcast, "DeleteEntities", all_entities)
-    parent_entity = editor.ToolsApplicationRequestBus(bus.Broadcast, "CreateNewEntity", entity.EntityId())
-    Report.result(Tests.create_entity, parent_entity.IsValid())
-
-    # Setting a new name
-    parent_entity_name = "Parent_1"
-    editor.EditorEntityAPIBus(bus.Event, 'SetName', parent_entity, parent_entity_name)
-    Report.result(Tests.set_entity_name,
-                  editor.EditorEntityInfoRequestBus(bus.Event, 'GetName', parent_entity) == parent_entity_name)
-
-    # 04. Creating child Entity and setting name to above created parent entity
-    child_1_entity = editor.ToolsApplicationRequestBus(bus.Broadcast, 'CreateNewEntity', parent_entity)
-    Report.result(Tests.create_child_entity, child_1_entity.IsValid())
-    child_entity_name = "Child_1"
-    editor.EditorEntityAPIBus(bus.Event, 'SetName', child_1_entity, child_entity_name)
-    Report.result(Tests.set_entity_name,
-                  editor.EditorEntityInfoRequestBus(bus.Event, 'GetName', child_1_entity) == child_entity_name)
-
-    # 05. delete_Child_entity
-    editor.ToolsApplicationRequestBus(bus.Broadcast, 'DeleteEntityById', child_1_entity)
-    Report.result(Tests.delete_entity, search_entity(child_1_entity, "Child_1") == False)
-
-    # 06. add mesh component to parent entity
-    type_id_list = editor.EditorComponentAPIBus(bus.Broadcast, 'FindComponentTypeIdsByEntityType', ["Mesh"],
-                                                entity.EntityType().Game)
-    if type_id_list is not None:
-        component_outcome = editor.EditorComponentAPIBus(bus.Broadcast, 'AddComponentsOfType', parent_entity,
-                                                         type_id_list)
-        Report.result(Tests.add_mesh_component, component_outcome.IsSuccess())
-    else:
-        Report.result(Tests.found_component_typeId, type_id_list is not None)
-
-    # 09. remove mesh component
-    outcome_get_component = editor.EditorComponentAPIBus(bus.Broadcast, 'GetComponentOfType', parent_entity,
-                                                         type_id_list[0])
-    if outcome_get_component.IsSuccess():
-        component_entity_pair = outcome_get_component.GetValue()
-        editor.EditorComponentAPIBus(bus.Broadcast, 'RemoveComponents', [component_entity_pair])
-        component_exists = editor.EditorComponentAPIBus(bus.Broadcast, 'HasComponentOfType', parent_entity,
-                                                        type_id_list[0])
-        mesh_test = True
-        if component_exists:
-            mesh_test = False
-        Report.result(Tests.remove_mesh_component, mesh_test)
-    else:
-        Report.result(Tests.found_component_typeId, outcome_get_component.IsSuccess())
-
-    # 10. delete parent entity
-    editor.ToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'DeleteEntityById', parent_entity)
-    Report.result(Tests.delete_entity, search_entity(parent_entity, "Parent_1") == False)
-
-    # Close editor without saving
-    editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'ExitNoPrompt')
-
-
-if __name__ == "__main__":
-    from editor_python_test_tools.utils import Report
-
-    Report.start_test(sample_editor_tests)
diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
index 755f75216b..afc52f962d 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
@@ -75,5 +75,5 @@ class TestAutomationAutoTestMode(EditorTestSuite):
         from .EditorScripts import Menus_FileMenuOptions as test_module
 
     
-    class test_Sample_Editor_Tests(EditorSharedTest):
+    class test_BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD(EditorSharedTest):
         from .EditorScripts import BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD as test_module

From f009e06cab8f1af7e0c74a24421b97b38955e517 Mon Sep 17 00:00:00 2001
From: kritin <kritin@amazon.com>
Date: Wed, 6 Oct 2021 13:20:48 -0700
Subject: [PATCH 04/29] responding to code reviews

Signed-off-by: kritin <kritin@amazon.com>
---
 ...flows_ExistingLevel_EntityComponentCRUD.py | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py
index 803b9e9a11..39cacf9af5 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD.py
@@ -53,10 +53,9 @@ def BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD():
             03. create child entity and set a name
             04. delete child entity
             05. add mesh component to parent entity
-            07. delete parent entity
-            Close editor without saving
+            06. delete parent entity
     """
-    import os
+
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.editor_entity_utils import EditorEntity
 
@@ -66,50 +65,35 @@ def BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD():
     import azlmbr.legacy.general as general
     import azlmbr.object
 
-
     # 01. load an existing level
-
     test_level = 'Simple'
     general.open_level_no_prompt(test_level)
     Report.result(Tests.load_level, general.get_current_level_name() == test_level)
 
-
     # 02. create parent entity and set name
     # Delete any exiting entity and Create a new Entity at the root level
-
     search_filter = azlmbr.entity.SearchFilter()
     all_entities = entity.SearchBus(azlmbr.bus.Broadcast, "SearchEntities", search_filter)
     editor.ToolsApplicationRequestBus(bus.Broadcast, "DeleteEntities", all_entities)
     parent_entity = EditorEntity.create_editor_entity("Parent_1")
     Report.result(Tests.create_entity, parent_entity.exists())
 
-
     # 03. Create child Entity to above created parent entity and set a name
-
     child_1_entity = EditorEntity.create_editor_entity("Child_1", parent_entity.id )
     Report.result(Tests.create_child_entity, child_1_entity.exists())
 
-
     # 04. delete_Child_entity
-
     child_1_entity.delete()
     Report.result(Tests.delete_child_entity, not child_1_entity.exists())
 
-
     # 05. add mesh component to parent entity
-
     parent_entity.add_component("Mesh")
     Report.result(Tests.add_mesh_component, parent_entity.has_component("Mesh"))
 
-
-    # 7. delete parent entity
-
+    # 06. delete parent entity
     parent_entity.delete()
     Report.result(Tests.delete_entity, not parent_entity.exists())
 
-    # Close editor without saving
-    editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'ExitNoPrompt')
-
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report

From 2034cd3053d6d8af08135ded0cdb38c06381c15f Mon Sep 17 00:00:00 2001
From: sweeneys <sweeneys@amazon.com>
Date: Fri, 8 Oct 2021 15:36:52 -0700
Subject: [PATCH 05/29] Platform manager and sanity tests for Linux

Signed-off-by: sweeneys <sweeneys@amazon.com>
---
 Tools/LyTestTools/ly_test_tools/__init__.py   |   6 +-
 .../managers/abstract_resource_locator.py     |   2 +-
 .../_internal/managers/platforms/linux.py     |   3 -
 .../environment/process_utils.py              |  14 ++
 .../launchers/platforms/linux/launcher.py     |  28 ++-
 .../ly_test_tools/o3de/asset_processor.py     | 170 +++++++++---------
 .../o3de/asset_processor_utils.py             |  19 +-
 Tools/LyTestTools/tests/integ/sanity_tests.py |   3 +-
 .../tests/unit/test_asset_processor.py        |  14 +-
 9 files changed, 149 insertions(+), 110 deletions(-)

diff --git a/Tools/LyTestTools/ly_test_tools/__init__.py b/Tools/LyTestTools/ly_test_tools/__init__.py
index 58340342ab..972e97d488 100755
--- a/Tools/LyTestTools/ly_test_tools/__init__.py
+++ b/Tools/LyTestTools/ly_test_tools/__init__.py
@@ -16,7 +16,7 @@ ALL_PLATFORM_OPTIONS = ['android', 'ios', 'linux', 'mac', 'windows']
 ALL_LAUNCHER_OPTIONS = ['android', 'base', 'linux', 'mac', 'windows', 'windows_editor', 'windows_dedicated', 'windows_generic']
 ANDROID = False
 IOS = False  # Not implemented - see SPEC-2505
-LINUX = sys.platform.startswith('linux')  # Not implemented - see SPEC-2501
+LINUX = sys.platform.startswith('linux')
 MAC = sys.platform.startswith('darwin')
 WINDOWS = sys.platform.startswith('win')
 
@@ -54,9 +54,11 @@ elif LINUX:
     HOST_OS_PLATFORM = 'linux'
     HOST_OS_EDITOR = 'linux_editor'
     HOST_OS_DEDICATED_SERVER = 'linux_dedicated'
-    from ly_test_tools.launchers.platforms.linux.launcher import (LinuxLauncher, LinuxEditor, DedicatedLinuxLauncher)
+    HOST_OS_GENERIC_EXECUTABLE = 'linux_generic'
+    from ly_test_tools.launchers.platforms.linux.launcher import (LinuxLauncher, LinuxEditor, DedicatedLinuxLauncher, LinuxGenericLauncher)
     LAUNCHERS['linux'] = LinuxLauncher
     LAUNCHERS['linux_editor'] = LinuxEditor
     LAUNCHERS['linux_dedicated'] = DedicatedLinuxLauncher
+    LAUNCHERS['linux_generic'] = LinuxGenericLauncher
 else:
     logger.warning(f'WARNING: LyTestTools only supports Windows, Mac, and Linux. Unexpectedly detected HOST_OS_PLATFORM: "{HOST_OS_PLATFORM}".')
diff --git a/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py
index 77d58e3a48..fccc94bdcc 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py
@@ -265,7 +265,7 @@ class AbstractResourceLocator(object):
         Return path to AssetProcessor's log file using the project bin dir
         :return: path to 'AP_Gui.log' file in <ap_log_dir> folder
         """
-        return os.path.join(self.ap_log_dir(), 'AP_Gui.log')
+        return os.path.join(self.ap_log_dir(), 'AP_GUI.log')
 
     def project_cache(self):
         """
diff --git a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/linux.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/linux.py
index cdbd379183..fea60cc9cb 100644
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/linux.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/linux.py
@@ -23,9 +23,6 @@ class _LinuxResourceManager(AbstractResourceLocator):
     """
     Override for locating resources in a Linux operating system running LyTestTools.
     """
-    def __init__(self, build_directory: str, project: str):
-        pass
-
     def platform_config_file(self):
         """
         :return: path to the platform config file
diff --git a/Tools/LyTestTools/ly_test_tools/environment/process_utils.py b/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
index 1c0be299a8..79fc4f420a 100755
--- a/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
@@ -465,3 +465,17 @@ def close_windows_process(pid, timeout=20, raise_on_missing=False):
     # Wait for asyncronous termination
     waiter.wait_for(lambda: pid not in psutil.pids(), timeout=timeout,
                     exc=TimeoutError(f"Process {pid} never terminated"))
+
+
+def get_display_env():
+    """
+    Fetches environment variables with an appropriate display (monitor) configured,
+      useful for subprocess calls to UI applications
+    :return: A dictionary containing environment variables (per os.environ)
+    """
+    env = os.environ.copy()
+    if not ly_test_tools.WINDOWS:
+        if 'DISPLAY' not in env.keys():
+            # assume Display 1 is available in another session
+            env['DISPLAY'] = ':1'
+    return env
diff --git a/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py
index 210519d197..afee522daf 100644
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py
@@ -13,6 +13,7 @@ import subprocess
 
 import ly_test_tools.environment.waiter
 import ly_test_tools.launchers.exceptions
+import ly_test_tools.environment.process_utils as process_utils
 
 from ly_test_tools.launchers.platforms.base import Launcher
 from ly_test_tools.launchers.exceptions import TeardownError, ProcessNotStartedError
@@ -68,7 +69,7 @@ class LinuxLauncher(Launcher):
         """
         command = [self.binary_path()] + self.args
         self._tmpout = TemporaryFile()
-        self._proc = subprocess.Popen(command, stdout=self._tmpout, stderr=self._tmpout, universal_newlines=True)
+        self._proc = subprocess.Popen(command, stdout=self._tmpout, stderr=self._tmpout, universal_newlines=True, env=process_utils.get_display_env())
         log.debug(f"Started Linux Launcher with command: {command}")
 
     def get_output(self, encoding="utf-8"):
@@ -222,3 +223,28 @@ class LinuxEditor(LinuxLauncher):
         """
         assert self.workspace.project is not None
         return os.path.join(self.workspace.paths.build_directory(), "Editor")
+
+
+class LinuxGenericLauncher(LinuxLauncher):
+
+    def __init__(self, build, exe_file_name, args=None):
+        super(LinuxLauncher, self).__init__(build, args)
+        self.exe_file_name = exe_file_name
+        self.expected_executable_path = os.path.join(
+            self.workspace.paths.build_directory(), f"{self.exe_file_name}")
+
+        if not os.path.exists(self.expected_executable_path):
+            raise ProcessNotStartedError(
+                f"Unable to locate executable '{self.exe_file_name}' "
+                f"in path: '{self.expected_executable_path}'")
+
+    def binary_path(self):
+        """
+        Return full path to the executable file for this build's configuration and project
+        Relies on the build_directory() in self.workspace.paths to be accurate
+
+        :return: full path to the given exe file
+        """
+        assert self.workspace.project is not None, (
+            'Project cannot be NoneType - please specify a project name string.')
+        return self.expected_executable_path
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
index 57454930eb..0623715350 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
@@ -7,21 +7,22 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
 A class to control functionality of Lumberyard's asset processor.
 The class manages a workspace's asset processor and asset configurations.
 """
-import os
-import datetime
 import logging
-import subprocess
-import socket
-import time
-import tempfile
-import shutil
-import stat
-from typing import List, Tuple
+import os
 import psutil
+import shutil
+import socket
+import stat
+import subprocess
+import tempfile
+import time
+
+from typing import List, Tuple
 
 import ly_test_tools
-import ly_test_tools.environment.waiter as waiter
 import ly_test_tools.environment.file_system as file_system
+import ly_test_tools.environment.process_utils as process_utils
+import ly_test_tools.environment.waiter as waiter
 import ly_test_tools.o3de.pipeline_utils as utils
 from ly_test_tools.o3de.ap_log_parser import APLogParser
 
@@ -177,24 +178,26 @@ class AssetProcessor(object):
         """
         Read the a port chosen by AP from the log
         """
-        start_time = time.time()
-        read_port_timeout = 10
-        while (time.time() - start_time) < read_port_timeout:
+        port = None
+
+        def _get_port_from_log():
+            nonlocal port
             if not os.path.exists(self._workspace.paths.ap_gui_log()):
-                logger.debug(f"Log at {self._workspace.paths.ap_gui_log()} doesn't exist, sleeping")
-            else:
-                log = APLogParser(self._workspace.paths.ap_gui_log())
-                if len(log.runs):
-                    try:
-                        port = log.runs[-1][port_type]
-                        if port:
-                            logger.info(f"Read port type {port_type} : {port}")
-                            return port
-                    except Exception:  # intentionally broad
-                        pass
-            time.sleep(1)
-        logger.warning(f"Failed to read port type {port_type}")
-        return 0
+                return False
+
+            log = APLogParser(self._workspace.paths.ap_gui_log())
+            if len(log.runs):
+                try:
+                    port = log.runs[-1][port_type]
+                    logger.debug(f"Read port type {port_type} : {port}")
+                    return True
+                except Exception as ex:  # intentionally broad
+                    logger.debug("Failed to read port from file", exc_info=ex)
+            return False
+
+        err = AssetProcessorError(f"Failed to read port type {port_type} from {self._workspace.paths.ap_gui_log()}")
+        waiter.wait_for(_get_port_from_log, timeout=10, exc=err)
+        return port
 
     def set_control_connection(self, connection):
         self._control_connection = connection
@@ -206,13 +209,8 @@ class AssetProcessor(object):
         """
         if not self._control_connection:
             control_timeout = 60
-            try:
-                return self.connect_socket("Control Connection", self.read_control_port,
-                                           set_port_method=self.set_control_connection, timeout=control_timeout)
-            except AssetProcessorError as e:
-                # We dont want a failure of our test socket connection to fail the entire test automatically.
-                logger.error(f"Failed to connect control socket with error {e}")
-                pass
+            return self.connect_socket("Control Connection", self.read_control_port,
+                                       set_port_method=self.set_control_connection, timeout=control_timeout)
         return True, None
 
     def using_temp_workspace(self):
@@ -227,34 +225,40 @@ class AssetProcessor(object):
         :param set_port_method: If set, method to call with the established connection
         :param timeout: Max seconds to attempt connection for
         """
-
-        connection_timeout = timeout
         connect_port = read_port_method()
-        logger.debug(f"Waiting for connection to AP {port_name}: {host}:{connect_port}, "
-                     f"{connection_timeout} seconds remaining")
-        start_time = time.time()
-        while (time.time() - start_time) < connection_timeout:
+        logger.debug(f"Attempting to for connect to AP {port_name}: {host}:{connect_port} for {timeout} seconds")
+
+        def _attempt_connection():
+            nonlocal connect_port
+            if self._ap_proc.poll() is not None:
+                raise AssetProcessorError(f"Asset processor exited early with errorcode: {self._ap_proc.returncode}")
+
             connection_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            connection_socket.settimeout(10.0)
+            connection_socket.settimeout(timeout)
             try:
                 connection_socket.connect((host, connect_port))
                 logger.debug(f"Connection to AP {port_name} was successful")
                 if set_port_method is not None:
                     set_port_method(connection_socket)
-                return True, None
-            except Exception:  # Purposefully broad
-                # Short delay to prevent immediate failure due to slower starting applications such as debug builds
-                time.sleep(0.01)
+                return True
+            except Exception as ex:  # Purposefully broad
+                logger.debug(f"Failed to connect to {host}:{connect_port}", exc_info=ex)
                 if not connect_port or not self.using_temp_workspace():
                     # If we're not using a temp workspace with a fresh log it's possible we're reading a port from
                     # a previous run and the log just hasn't written yet, we need to keep checking the log for a new
                     # port to use
-                    new_connect_port = read_port_method()
-                    if new_connect_port != connect_port:
-                        logger.debug(
-                            f"Read new connect port for {port_name}: {host}:{new_connect_port}")
-                        connect_port = new_connect_port
-        raise AssetProcessorError(f"Could not connect to AP {port_name}")
+                    try:
+                        new_connect_port = read_port_method()
+                        if new_connect_port != connect_port:
+                            logger.debug(f"Found new connect port for {port_name}: {host}:{new_connect_port}")
+                            connect_port = new_connect_port
+                    except Exception as read_exception:  # Purposefully broad
+                        logger.debug(f"Failed to read port data", exc_info=read_exception)
+            return False
+
+        err = AssetProcessorError(f"Could not connect to AP {port_name} on {host}:{connect_port}")
+        waiter.wait_for(_attempt_connection, timeout=timeout, exc=err)
+        return True, None
 
     def stop(self, timeout=60):
         """
@@ -436,15 +440,14 @@ class AssetProcessor(object):
                     extra_params=None, add_gem_scan_folders=None, add_config_scan_folders=None, decode=True,
                     expect_failure=False, quitonidle=False, connect_to_ap=False, accept_input=True, run_until_idle=True,
                     scan_folder_pattern=None):
-        ap_path = self._workspace.paths.asset_processor()
+        ap_path = os.path.abspath(self._workspace.paths.asset_processor())
+        ap_exe_path = os.path.dirname(ap_path)
         extra_gui_params = []
         if quitonidle:
             extra_gui_params.append("--quitonidle")
         if accept_input:
             extra_gui_params.append("--acceptInput")
 
-        ap_exe_path = os.path.dirname(self._workspace.paths.asset_processor())
-
         logger.info("Starting asset processor")
         if self.process_exists():
             logger.error("Asset processor already started.  Stop first")
@@ -483,20 +486,30 @@ class AssetProcessor(object):
             logger.warning(f"Cannot capture output when leaving AP connection open.")
 
         logger.info(f"Launching AP with command: {command}")
-        self._ap_proc = subprocess.Popen(command, cwd=ap_exe_path)
+        try:
+            self._ap_proc = subprocess.Popen(command, cwd=ap_exe_path, env=process_utils.get_display_env())
 
-        if accept_input and not quitonidle:
-            self.connect_control()
+            if accept_input:
+                self.connect_control()
 
-        if connect_to_ap:
-            self.connect_listen()
+            if connect_to_ap:
+                self.connect_listen()
 
-        if quitonidle:
-            waiter.wait_for(lambda: not self.process_exists(), timeout=timeout)
-        elif run_until_idle and accept_input:
-            if not self.wait_for_idle():
-                return False, None
-        return True, None
+            if quitonidle:
+                waiter.wait_for(lambda: not self.process_exists(), timeout=timeout,
+                                exc=AssetProcessorError(f"Failed to quit on idle within {timeout} seconds"))
+            elif run_until_idle and accept_input:
+                if not self.wait_for_idle():
+                    return False, None
+            return True, None
+        except BaseException as be:  # purposefully broad
+            logger.exception("Exception while starting Asset Processor", be)
+            # clean up to avoid leaking open AP process to future tests
+            try:
+                self._ap_proc.kill()
+            except Exception as ex:
+                logger.exception("Ignoring exception while trying to terminate Asset Processor", ex)
+            raise  # raise whatever prompted us to clean up
 
     def connect_listen(self, timeout=DEFAULT_TIMEOUT_SECONDS):
         # Wait for the AP we launched to be ready to accept a connection
@@ -574,21 +587,17 @@ class AssetProcessor(object):
                                expect_failure=False):
         """
         In case of a timeout, the asset processor and associated processes are killed and the function returns False.
-        
+
         :param timeout: seconds to wait before aborting
         :param capture_output = Capture output which will be returned in the second of the return pair
         :param decode: decode byte strings from captured output to utf-8
         :param expect_failure: asset processing is expected to fail, so don't error on a failure, and assert on no failure.
         """
         logger.info(f"Launching AP with command: {command}")
-        start = datetime.datetime.now()
-        try:
-            duration = datetime.timedelta(seconds=timeout)
-        except TypeError:
-            logger.warning("Cannot set timeout value of '{}' seconds, defaulting to {} hours".format(
-                timeout, DEFAULT_TIMEOUT_HOURS))
-            duration = datetime.timedelta(hours=DEFAULT_TIMEOUT_HOURS)
-            timeout = duration.total_seconds()
+        start = time.time()
+        if type(timeout) not in [int, float] or timeout < 1:
+            logger.warning(f"Invalid timeout {timeout} - defaulting to {DEFAULT_TIMEOUT_SECONDS} seconds")
+            timeout = DEFAULT_TIMEOUT_SECONDS
 
         run_result = subprocess.run(command, close_fds=True, timeout=timeout, capture_output=capture_output)
         output_list = None
@@ -609,8 +618,7 @@ class AssetProcessor(object):
         elif expect_failure:
             logger.error(f"{command} was expected to fail, but instead ran without failure.")
             return True, output_list
-        logger.info(
-            f"{command} completed successfully in {(datetime.datetime.now() - start).seconds} seconds")
+        logger.info(f"{command} completed successfully in {time.time() - start} seconds")
         return True, output_list
 
     def set_failure_log_folder(self, log_root):
@@ -743,14 +751,14 @@ class AssetProcessor(object):
         :return: Absolute path of added scan folder
         """
         if os.path.isabs(folder_name):
-            if not folder_name in self._override_scan_folders:
+            if folder_name not in self._override_scan_folders:
                 self._override_scan_folders.append(folder_name)
                 logger.info(f'Adding override scan folder {folder_name}')
             return folder_name
         else:
             if not self._temp_asset_root:
-                logger.warning(f"Can't create scan folder, no temporary asset workspace has been created")
-                return
+                logger.warning(f"Can not create scan folder, no temporary asset workspace has been created")
+                return ""
             scan_folder = os.path.join(self._temp_asset_root if self._temp_asset_root else self._workspace.paths.engine_root(),
                                        folder_name)
             if not os.path.isdir(scan_folder):
@@ -802,9 +810,9 @@ class AssetProcessor(object):
         if not use_current_root:
             self.create_temp_asset_root()
         test_asset_root = os.path.join(self._temp_asset_root, self._workspace.project if relative_asset_root is None
-        else relative_asset_root)
+                                       else relative_asset_root)
         test_folder = os.path.join(test_asset_root, function_name if existing_function_name is None
-        else existing_function_name)
+                                   else existing_function_name)
         if not os.path.isdir(test_folder):
             os.makedirs(test_folder)
         if add_scan_folder:
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py
index 34ea5f4eb8..f30ed2f233 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py
@@ -9,8 +9,7 @@ import logging
 import os
 import subprocess
 
-import ly_test_tools
-from ly_test_tools.environment.process_utils import kill_processes_named as kill_processes_named
+import ly_test_tools.environment.process_utils as process_utils
 
 logger = logging.getLogger(__name__)
 
@@ -23,7 +22,7 @@ def start_asset_processor(bin_dir):
     :return: A subprocess.Popen object for the AssetProcessor process.
     """
     os.chdir(bin_dir)
-    asset_processor = subprocess.Popen(['AssetProcessor.exe'])
+    asset_processor = subprocess.Popen(['AssetProcessor'], env=process_utils.get_display_env())
     return_code = asset_processor.poll()
 
     if return_code is not None and return_code != 0:
@@ -40,11 +39,9 @@ def kill_asset_processor():
 
     :return: None
     """
-    
-    kill_processes_named('AssetProcessor_tmp', ignore_extensions=True)
-    kill_processes_named('AssetProcessor', ignore_extensions=True)
-    kill_processes_named('AssetProcessorBatch', ignore_extensions=True)
-    kill_processes_named('AssetBuilder', ignore_extensions=True)
-    kill_processes_named('rc', ignore_extensions=True)
-    kill_processes_named('Lua Editor', ignore_extensions=True)
-
+    process_utils.kill_processes_named('AssetProcessor_tmp', ignore_extensions=True)
+    process_utils.kill_processes_named('AssetProcessor', ignore_extensions=True)
+    process_utils.kill_processes_named('AssetProcessorBatch', ignore_extensions=True)
+    process_utils.kill_processes_named('AssetBuilder', ignore_extensions=True)
+    process_utils.kill_processes_named('rc', ignore_extensions=True)
+    process_utils.kill_processes_named('Lua Editor', ignore_extensions=True)
diff --git a/Tools/LyTestTools/tests/integ/sanity_tests.py b/Tools/LyTestTools/tests/integ/sanity_tests.py
index e27398c477..ed77d7b8db 100755
--- a/Tools/LyTestTools/tests/integ/sanity_tests.py
+++ b/Tools/LyTestTools/tests/integ/sanity_tests.py
@@ -58,12 +58,11 @@ class TestAutomatedTestingProject(object):
             # Call the game client executable
             with launcher.start():
                 # Wait for the process to exist
-                waiter.wait_for(lambda: process_utils.process_exists(f"{project}.GameLauncher.exe", ignore_extensions=True))
+                waiter.wait_for(lambda: process_utils.process_exists(f"{project}.GameLauncher", ignore_extensions=True))
         finally:
             # Clean up processes after the test is finished
             process_utils.kill_processes_named(names=process_utils.LY_PROCESS_KILL_LIST, ignore_extensions=True)
 
-    @pytest.mark.skipif(not ly_test_tools.WINDOWS, reason="Editor currently only functions on Windows")
     def test_StartEditor_Sanity(self, project):
         """
         The `test_StartEditor_Sanity` test function is similar to the previous example with minor adjustments. A
diff --git a/Tools/LyTestTools/tests/unit/test_asset_processor.py b/Tools/LyTestTools/tests/unit/test_asset_processor.py
index f487cc8537..aabbf2f2f5 100755
--- a/Tools/LyTestTools/tests/unit/test_asset_processor.py
+++ b/Tools/LyTestTools/tests/unit/test_asset_processor.py
@@ -58,10 +58,8 @@ class TestAssetProcessor(object):
         under_test.start(connect_to_ap=True)
 
         assert under_test._ap_proc is not None
-        mock_popen.assert_called_once_with([mock_ap_path, '--zeroAnalysisMode',
-                                            f'--regset="/Amazon/AzCore/Bootstrap/project_path={mock_project_path}"',
-                                            '--logDir', under_test.log_root(),
-                                            '--acceptInput', '--platforms', 'bar'], cwd=os.path.dirname(mock_ap_path))
+        mock_popen.assert_called_once()
+        assert '--zeroAnalysisMode' in mock_popen.call_args[0][0]
         mock_connect.assert_called()
 
     @mock.patch('ly_test_tools._internal.managers.workspace.AbstractWorkspaceManager')
@@ -114,7 +112,7 @@ class TestAssetProcessor(object):
 
         assert result
         mock_run.assert_called_once_with([apb_path,
-                                          f'--regset="/Amazon/AzCore/Bootstrap/project_path={mock_project_path}"', 
+                                          f'--regset="/Amazon/AzCore/Bootstrap/project_path={mock_project_path}"',
                                           '--logDir', under_test.log_root()],
                                          close_fds=True, capture_output=False,
                                          timeout=1)
@@ -150,10 +148,8 @@ class TestAssetProcessor(object):
         result, _ = under_test.batch_process(None, False)
 
         assert not result
-        mock_run.assert_called_once_with([apb_path,
-                                          f'--regset="/Amazon/AzCore/Bootstrap/project_path={mock_project_path}"',
-                                          '--logDir', under_test.log_root()],
-                                         close_fds=True, capture_output=False, timeout=28800.0)
+        mock_run.assert_called_once()
+        assert f'--regset="/Amazon/AzCore/Bootstrap/project_path={mock_project_path}"' in mock_run.call_args[0][0]
 
 
     @mock.patch('ly_test_tools._internal.managers.workspace.AbstractWorkspaceManager')

From 45def7440986934ed8cea07db62306506c262ad8 Mon Sep 17 00:00:00 2001
From: sweeneys <sweeneys@amazon.com>
Date: Mon, 11 Oct 2021 11:11:40 -0700
Subject: [PATCH 06/29] Fix extension ignoring between Windows and Linux

Signed-off-by: sweeneys <sweeneys@amazon.com>
---
 .../environment/process_utils.py              | 88 ++++++++++++-------
 Tools/LyTestTools/tests/integ/sanity_tests.py |  4 +-
 .../tests/unit/test_process_utils.py          | 51 +++++++++--
 3 files changed, 101 insertions(+), 42 deletions(-)

diff --git a/Tools/LyTestTools/ly_test_tools/environment/process_utils.py b/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
index 79fc4f420a..f8245495fa 100755
--- a/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/environment/process_utils.py
@@ -31,45 +31,59 @@ def kill_processes_named(names, ignore_extensions=False):
     Kills all processes with a given name
 
     :param names: string process name, or list of strings of process name
-    :param ignore_extensions: ignore trailing file extension
+    :param ignore_extensions: ignore trailing file extensions. By default 'abc.exe' will not match 'abc'. Note that
+        enabling this will cause 'abc.exe' to match 'abc', 'abc.bat', and 'abc.sh', though 'abc.GameLauncher.exe'
+        will not match 'abc.DedicatedServer'
     """
     if not names:
         return
 
-    names = [names] if isinstance(names, str) else names
+    name_set = set()
+    if isinstance(names, str):
+        name_set.add(names)
+    else:
+        name_set.update(names)
 
     if ignore_extensions:
-        names = [_remove_extension(name) for name in names]
+        # both exact matches and extensionless
+        stripped_names = set()
+        for name in name_set:
+            stripped_names.add(_remove_extension(name))
+        name_set.update(stripped_names)
 
     # remove any blank names, which may empty the list
-    names = list(filter(lambda x: not x.isspace(), names))
-    if not names:
+    name_set = set(filter(lambda x: not x.isspace(), name_set))
+    if not name_set:
         return
 
-    logger.info(f"Killing all processes named {names}")
-    process_list_to_kill = []
+    logger.info(f"Killing all processes named {name_set}")
+    process_set_to_kill = set()
     for process in _safe_get_processes(['name', 'pid']):
         try:
             proc_name = process.name()
         except psutil.AccessDenied:
-            logger.info(f"Process {process} permissions error during kill_processes_named()", exc_info=True)
+            logger.warning(f"Process {process} permissions error during kill_processes_named()", exc_info=True)
             continue
         except psutil.ProcessLookupError:
-            logger.debug(f"Process {process} could not be killed during kill_processes_named() and was likely already stopped", exc_info=True)
+            logger.debug(f"Process {process} could not be killed during kill_processes_named() and was likely already "
+                         f"stopped", exc_info=True)
             continue
         except psutil.NoSuchProcess:
             logger.debug(f"Process '{process}' was active when list of processes was requested but it was not found "
                          f"during kill_processes_named()", exc_info=True)
             continue
 
+        if proc_name in name_set:
+            logger.debug(f"Found process with name {proc_name}.")
+            process_set_to_kill.add(process)
+
         if ignore_extensions:
-            proc_name = _remove_extension(proc_name)
+            extensionless_name = _remove_extension(proc_name)
+            if extensionless_name in name_set:
+                process_set_to_kill.add(process)
 
-        if proc_name in names:
-            logger.debug(f"Found process with name {proc_name}.  Attempting to kill...")
-            process_list_to_kill.append(process)
-
-    _safe_kill_process_list(process_list_to_kill)
+    if process_set_to_kill:
+        _safe_kill_processes(process_set_to_kill)
 
 
 def kill_processes_started_from(path):
@@ -90,7 +104,7 @@ def kill_processes_started_from(path):
             if process_path.lower().startswith(path.lower()):
                 process_list.append(process)
 
-        _safe_kill_process_list(process_list)
+        _safe_kill_processes(process_list)
     else:
         logger.warning(f"Path:'{path}' not found")
 
@@ -118,7 +132,7 @@ def kill_processes_with_name_not_started_from(name, path):
                 logger.info("%s -> %s" % (os.path.dirname(process_path.lower()), path))
                 proccesses_to_kill.append(process)
 
-        _safe_kill_process_list(proccesses_to_kill)
+        _safe_kill_processes(proccesses_to_kill)
     else:
         logger.warning(f"Path:'{path}' not found")
 
@@ -151,10 +165,12 @@ def process_exists(name, ignore_extensions=False):
     :return: A boolean determining whether the process is alive or not
     """
     name = name.lower()
-    if ignore_extensions:
-        name = _remove_extension(name)
     if name.isspace():
         return False
+
+    if ignore_extensions:
+        name_extensionless = _remove_extension(name)
+
     for process in _safe_get_processes(["name"]):
         try:
             proc_name = process.name().lower()
@@ -165,10 +181,17 @@ def process_exists(name, ignore_extensions=False):
         except psutil.AccessDenied as e:
             logger.info(f"Permissions issue on {process} during process_exists check", exc_info=True)
             continue
-        if ignore_extensions:
-            proc_name = _remove_extension(proc_name)
-        if proc_name == name:
+
+        if proc_name == name:  # abc.exe matches abc.exe
             return True
+        if ignore_extensions:
+            proc_name_extensionless = _remove_extension(proc_name)
+            if proc_name_extensionless == name:  # abc matches abc.exe
+                return True
+            if proc_name == name_extensionless:  # abc.exe matches abc
+                return True
+            # don't check proc_name_extensionless against name_extensionless: abc.exe and abc.exe are already tested,
+            # however xyz.Gamelauncher should not match xyz.DedicatedServer
     return False
 
 
@@ -341,17 +364,14 @@ def _safe_kill_process(proc):
     except Exception:  # purposefully broad
         logger.warning("Unexpected exception while terminating process", exc_info=True)
 
-def _safe_kill_process_list(proc_list):
+
+def _safe_kill_processes(processes):
     """
     Kills a given process without raising an error
 
-    :param proc_list: The process list to kill
+    :param processes: An iterable of processes to kill
     """
-
-    def on_terminate(proc):
-        print(f"process '{proc.name()}' with id '{proc.pid}' terminated with exit code {proc.returncode}")
-
-    for proc in proc_list:
+    for proc in processes:
         try:
             logger.info(f"Terminating process '{proc.name()}' with id '{proc.pid}'")
             proc.kill()
@@ -360,12 +380,14 @@ def _safe_kill_process_list(proc_list):
         except psutil.NoSuchProcess:
             logger.debug("Termination request ignored, process was already terminated during iteration", exc_info=True)
         except Exception:  # purposefully broad
-            logger.warning("Unexpected exception while terminating process", exc_info=True)
+            logger.warning("Unexpected exception ignored while terminating process", exc_info=True)
 
+    def on_terminate(proc):
+        logger.info(f"process '{proc.name()}' with id '{proc.pid}' terminated with exit code {proc.returncode}")
     try:
-        psutil.wait_procs(proc_list, timeout=30, callback=on_terminate)
+        psutil.wait_procs(processes, timeout=30, callback=on_terminate)
     except Exception:  # purposefully broad
-        logger.warning("Unexpected exception while waiting for process to terminate", exc_info=True)
+        logger.warning("Unexpected exception while waiting for processes to terminate", exc_info=True)
 
 
 def _terminate_and_confirm_dead(proc):
@@ -383,7 +405,7 @@ def _terminate_and_confirm_dead(proc):
 
 def _remove_extension(filename):
     """
-    Returns a file name without its extension
+    Returns a file name without its extension, if any is present
 
     :param filename: The name of a file
     :return: The name of the file without the extension
diff --git a/Tools/LyTestTools/tests/integ/sanity_tests.py b/Tools/LyTestTools/tests/integ/sanity_tests.py
index ed77d7b8db..2e46d822c7 100755
--- a/Tools/LyTestTools/tests/integ/sanity_tests.py
+++ b/Tools/LyTestTools/tests/integ/sanity_tests.py
@@ -58,7 +58,7 @@ class TestAutomatedTestingProject(object):
             # Call the game client executable
             with launcher.start():
                 # Wait for the process to exist
-                waiter.wait_for(lambda: process_utils.process_exists(f"{project}.GameLauncher", ignore_extensions=True))
+                waiter.wait_for(lambda: process_utils.process_exists(f"{project}.GameLauncher.exe", ignore_extensions=True))
         finally:
             # Clean up processes after the test is finished
             process_utils.kill_processes_named(names=process_utils.LY_PROCESS_KILL_LIST, ignore_extensions=True)
@@ -85,7 +85,7 @@ class TestAutomatedTestingProject(object):
             # Call the Editor executable
             with editor.start():
                 # Wait for the process to exist
-                waiter.wait_for(lambda: process_utils.process_exists("Editor", ignore_extensions=True))
+                waiter.wait_for(lambda: process_utils.process_exists("Editor.exe", ignore_extensions=True))
         finally:
             # Clean up processes after the test is finished
             process_utils.kill_processes_named(names=process_utils.LY_PROCESS_KILL_LIST, ignore_extensions=True)
diff --git a/Tools/LyTestTools/tests/unit/test_process_utils.py b/Tools/LyTestTools/tests/unit/test_process_utils.py
index de40fb8e34..bd6a79fb09 100755
--- a/Tools/LyTestTools/tests/unit/test_process_utils.py
+++ b/Tools/LyTestTools/tests/unit/test_process_utils.py
@@ -223,7 +223,7 @@ class TestCloseWindowsProcess(unittest.TestCase):
         mock_enum.assert_called_once()
 
 
-class Test(unittest.TestCase):
+class TestProcessMatching(unittest.TestCase):
 
     @mock.patch("ly_test_tools.environment.process_utils._safe_get_processes")
     def test_ProcExists_HasExtension_Found(self, mock_get_proc):
@@ -261,18 +261,55 @@ class Test(unittest.TestCase):
         self.assertTrue(result)
         proc_mock.name.assert_called()
 
-    @mock.patch('ly_test_tools.environment.process_utils._safe_kill_process', mock.MagicMock)
+    @mock.patch('ly_test_tools.environment.process_utils._safe_kill_processes')
     @mock.patch('ly_test_tools.environment.process_utils._safe_get_processes')
-    def test_KillProcNamed_MockKill_SilentSuccess(self, mock_get_proc):
+    def test_KillProcNamed_ExactMatch_Killed(self, mock_get_proc, mock_kill_proc):
+        name = "dummy.exe"
+        proc_mock = mock.MagicMock()
+        proc_mock.name.return_value = name
+        mock_get_proc.return_value = [proc_mock]
+
+        process_utils.kill_processes_named("dummy.exe", ignore_extensions=False)
+        mock_kill_proc.assert_called()
+        proc_mock.name.assert_called()
+
+    @mock.patch('ly_test_tools.environment.process_utils._safe_kill_processes')
+    @mock.patch('ly_test_tools.environment.process_utils._safe_get_processes')
+    def test_KillProcNamed_NearMatch_Ignore(self, mock_get_proc, mock_kill_proc):
+        name = "dummy.exe"
+        proc_mock = mock.MagicMock()
+        proc_mock.name.return_value = name
+        mock_get_proc.return_value = [proc_mock]
+
+        process_utils.kill_processes_named("dummy", ignore_extensions=False)
+        mock_kill_proc.assert_not_called()
+        proc_mock.name.assert_called()
+
+    @mock.patch('ly_test_tools.environment.process_utils._safe_kill_processes')
+    @mock.patch('ly_test_tools.environment.process_utils._safe_get_processes')
+    def test_KillProcNamed_NearMatchIgnoreExtension_Kill(self, mock_get_proc, mock_kill_proc):
         name = "dummy.exe"
         proc_mock = mock.MagicMock()
         proc_mock.name.return_value = name
         mock_get_proc.return_value = [proc_mock]
 
         process_utils.kill_processes_named("dummy", ignore_extensions=True)
+        mock_kill_proc.assert_called()
         proc_mock.name.assert_called()
 
-    @mock.patch('ly_test_tools.environment.process_utils._safe_kill_process', mock.MagicMock)
+    @mock.patch('ly_test_tools.environment.process_utils._safe_kill_processes')
+    @mock.patch('ly_test_tools.environment.process_utils._safe_get_processes')
+    def test_KillProcNamed_ExactMatchIgnoreExtension_Killed(self, mock_get_proc, mock_kill_proc):
+        name = "dummy.exe"
+        proc_mock = mock.MagicMock()
+        proc_mock.name.return_value = name
+        mock_get_proc.return_value = [proc_mock]
+
+        process_utils.kill_processes_named("dummy.exe", ignore_extensions=True)
+        mock_kill_proc.assert_called()
+        proc_mock.name.assert_called()
+
+    @mock.patch('ly_test_tools.environment.process_utils._safe_kill_processes', mock.MagicMock)
     @mock.patch('ly_test_tools.environment.process_utils._safe_get_processes')
     @mock.patch('os.path.exists')
     def test_KillProcFrom_MockKill_SilentSuccess(self, mock_path, mock_get_proc):
@@ -293,7 +330,7 @@ class Test(unittest.TestCase):
 
         mock_kill.assert_called()
 
-    @mock.patch('ly_test_tools.environment.process_utils._safe_kill_process', mock.MagicMock)
+    @mock.patch('ly_test_tools.environment.process_utils._safe_kill_processes', mock.MagicMock)
     @mock.patch('psutil.Process')
     def test_KillProcPid_NoProc_SilentPass(self, mock_psutil):
         mock_proc = mock.MagicMock()
@@ -302,7 +339,7 @@ class Test(unittest.TestCase):
 
         process_utils.kill_process_with_pid(1)
 
-    @mock.patch('ly_test_tools.environment.process_utils._safe_kill_process', mock.MagicMock)
+    @mock.patch('ly_test_tools.environment.process_utils._safe_kill_processes', mock.MagicMock)
     @mock.patch('psutil.Process')
     def test_KillProcPidRaiseOnMissing_NoProc_Raises(self, mock_psutil):
         mock_proc = mock.MagicMock()
@@ -339,7 +376,7 @@ class Test(unittest.TestCase):
         mock_wait_procs.side_effect = psutil.PermissionError()
         proc_mock = mock.MagicMock()
 
-        process_utils._safe_kill_process_list(proc_mock)
+        process_utils._safe_kill_processes(proc_mock)
 
         mock_wait_procs.assert_called()
         mock_log_warn.assert_called()

From 94c938496eb3b78900000ded65fa3ab8696cd8ab Mon Sep 17 00:00:00 2001
From: Chris Galvan <chgalvan@amazon.com>
Date: Tue, 12 Oct 2021 13:46:54 -0500
Subject: [PATCH 07/29] Fixed logic error causing Python Scripts tree items to
 only show extension intead of filename.

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
---
 Code/Editor/Controls/FolderTreeCtrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Code/Editor/Controls/FolderTreeCtrl.cpp b/Code/Editor/Controls/FolderTreeCtrl.cpp
index 4088ab976f..1464580ffc 100644
--- a/Code/Editor/Controls/FolderTreeCtrl.cpp
+++ b/Code/Editor/Controls/FolderTreeCtrl.cpp
@@ -279,7 +279,7 @@ void CFolderTreeCtrl::LoadTreeRec(const QString& currentFolder)
 void CFolderTreeCtrl::AddItem(const QString& path)
 {
     AZ::IO::FixedMaxPath folder{ AZ::IO::PathView(path.toUtf8().constData()) };
-    AZ::IO::FixedMaxPath fileNameWithoutExtension = folder.Extension();
+    AZ::IO::FixedMaxPath fileNameWithoutExtension = folder.Stem();
     folder = folder.ParentPath();
 
     auto regex = QRegExp(m_fileNameSpec, Qt::CaseInsensitive, QRegExp::Wildcard);

From 8487373b0cf1fe02210a083a9548cfc8ad4b7b79 Mon Sep 17 00:00:00 2001
From: Guthrie Adams <guthadam@amazon.com>
Date: Tue, 12 Oct 2021 14:41:26 -0500
Subject: [PATCH 08/29] Updated thumbnail notification bus to use const
 QPixmap&

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
---
 .../AzToolsFramework/Thumbnails/ThumbnailerBus.h                | 2 +-
 .../Code/Source/Thumbnail/ImageThumbnail.cpp                    | 2 +-
 .../ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h  | 2 +-
 .../CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp   | 2 +-
 .../CommonFeatures/Code/Source/Material/MaterialThumbnail.h     | 2 +-
 .../CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp           | 2 +-
 .../CommonFeatures/Code/Source/Mesh/MeshThumbnail.h             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
index 6f074da878..acd8ba3966 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
@@ -90,7 +90,7 @@ namespace AzToolsFramework
             typedef SharedThumbnailKey BusIdType;
 
             //! notify product thumbnail that the data is ready
-            virtual void ThumbnailRendered(QPixmap& thumbnailImage) = 0;
+            virtual void ThumbnailRendered(const QPixmap& thumbnailImage) = 0;
             //! notify product thumbnail that the thumbnail failed to render
             virtual void ThumbnailFailedToRender() = 0;
         };
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
index 084e38a2db..cdd63dca18 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
@@ -67,7 +67,7 @@ namespace ImageProcessingAtom
             m_renderWait.acquire();
         }
 
-        void ImageThumbnail::ThumbnailRendered(QPixmap& thumbnailImage)
+        void ImageThumbnail::ThumbnailRendered(const QPixmap& thumbnailImage)
         {
             m_pixmap = thumbnailImage;
             m_renderWait.release();
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h
index 45fd178285..eadbfca945 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.h
@@ -34,7 +34,7 @@ namespace ImageProcessingAtom
             ~ImageThumbnail() override;
 
             //! AzToolsFramework::ThumbnailerRendererNotificationBus::Handler overrides...
-            void ThumbnailRendered(QPixmap& thumbnailImage) override;
+            void ThumbnailRendered(const QPixmap& thumbnailImage) override;
             void ThumbnailFailedToRender() override;
 
         protected:
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp
index 0723859ff5..2931b647e5 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.cpp
@@ -54,7 +54,7 @@ namespace AZ
                 AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
             }
 
-            void MaterialThumbnail::ThumbnailRendered(QPixmap& thumbnailImage)
+            void MaterialThumbnail::ThumbnailRendered(const QPixmap& thumbnailImage)
             {
                 m_pixmap = thumbnailImage;
                 m_renderWait.release();
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h
index dba922a1b2..8f2053ba67 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialThumbnail.h
@@ -36,7 +36,7 @@ namespace AZ
                 ~MaterialThumbnail() override;
 
                 //! AzToolsFramework::ThumbnailerRendererNotificationBus::Handler overrides...
-                void ThumbnailRendered(QPixmap& thumbnailImage) override;
+                void ThumbnailRendered(const QPixmap& thumbnailImage) override;
                 void ThumbnailFailedToRender() override;
 
             protected:
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp
index 658d420a16..845197d939 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.cpp
@@ -55,7 +55,7 @@ namespace AZ
                 AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
             }
 
-            void MeshThumbnail::ThumbnailRendered(QPixmap& thumbnailImage)
+            void MeshThumbnail::ThumbnailRendered(const QPixmap& thumbnailImage)
             {
                 m_pixmap = thumbnailImage;
                 m_renderWait.release();
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h
index 2975b6950c..872e1029d2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshThumbnail.h
@@ -35,7 +35,7 @@ namespace AZ
                 ~MeshThumbnail() override;
 
                 //! AzToolsFramework::ThumbnailerRendererNotificationBus::Handler overrides...
-                void ThumbnailRendered(QPixmap& thumbnailImage) override;
+                void ThumbnailRendered(const QPixmap& thumbnailImage) override;
                 void ThumbnailFailedToRender() override;
 
             protected:

From 5cefd552a64cd51826208b79a189b6593dd74848 Mon Sep 17 00:00:00 2001
From: moudgils <47460854+moudgils@users.noreply.github.com>
Date: Tue, 12 Oct 2021 13:24:40 -0700
Subject: [PATCH 09/29] - Optimize SRG compilation to not update the whole SRG
 if not needed across all backends (#4499)

- Each resource type is tracked and updated separately
- Added caching ability for Raytracing srg to save ~2ms for a scene containing 100 x 50 vegetation patch

Signed-off-by: moudgils <moudgils@amazon.com>
---
 .../RayTracing/RayTracingFeatureProcessor.cpp |  18 ++-
 .../RayTracing/RayTracingFeatureProcessor.h   |   4 +
 .../Atom/RHI/ShaderResourceGroupData.h        |  62 ++++++++++-
 .../Source/RHI/ShaderResourceGroupData.cpp    |  58 ++++++++++
 .../Source/RHI/ShaderResourceGroupPool.cpp    |  22 +++-
 .../Source/RHI/ShaderResourceGroupPool.cpp    |  65 +++++++----
 .../Source/RHI/ShaderResourceGroupPool.cpp    | 105 +++++++++++-------
 .../RPI.Public/Shader/ShaderResourceGroup.cpp |   4 +
 8 files changed, 259 insertions(+), 79 deletions(-)

diff --git a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
index 042e934eb0..6e78d3170c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
@@ -507,8 +507,13 @@ namespace AZ
                     }
                 }
 
-                RHI::ShaderInputBufferUnboundedArrayIndex bufferUnboundedArrayIndex = srgLayout->FindShaderInputBufferUnboundedArrayIndex(AZ::Name("m_meshBuffers"));
-                m_rayTracingSceneSrg->SetBufferViewUnboundedArray(bufferUnboundedArrayIndex, meshBuffers);
+                //Check if buffer view data changed from previous frame. 
+                if (m_meshBuffers.size() != meshBuffers.size() || m_meshBuffers != meshBuffers)
+                {
+                    m_meshBuffers = meshBuffers;
+                    RHI::ShaderInputBufferUnboundedArrayIndex bufferUnboundedArrayIndex = srgLayout->FindShaderInputBufferUnboundedArrayIndex(AZ::Name("m_meshBuffers"));
+                    m_rayTracingSceneSrg->SetBufferViewUnboundedArray(bufferUnboundedArrayIndex, m_meshBuffers);
+                }
             }
 
             m_rayTracingSceneSrg->Compile();
@@ -554,8 +559,13 @@ namespace AZ
                     }
                 }
 
-                RHI::ShaderInputImageUnboundedArrayIndex textureUnboundedArrayIndex = srgLayout->FindShaderInputImageUnboundedArrayIndex(AZ::Name("m_materialTextures"));
-                m_rayTracingMaterialSrg->SetImageViewUnboundedArray(textureUnboundedArrayIndex, materialTextures);
+                // Check if image view data changed from previous frame. 
+                if (m_materialTextures.size() != materialTextures.size() || m_materialTextures != materialTextures)
+                {
+                    m_materialTextures = materialTextures;
+                    RHI::ShaderInputImageUnboundedArrayIndex textureUnboundedArrayIndex = srgLayout->FindShaderInputImageUnboundedArrayIndex(AZ::Name("m_materialTextures"));
+                    m_rayTracingMaterialSrg->SetImageViewUnboundedArray(textureUnboundedArrayIndex, materialTextures);
+                }
             }
 
             m_rayTracingMaterialSrg->Compile();
diff --git a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.h
index 52bb67f547..c0ebd6a4e7 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.h
@@ -281,6 +281,10 @@ namespace AZ
 
             using BlasInstanceMap = AZStd::unordered_map<AZ::Data::AssetId, MeshBlasInstance>;
             BlasInstanceMap m_blasInstanceMap;
+
+            // Cache view pointers so we dont need to update them if none changed from frame to frame.
+            AZStd::vector<const RHI::BufferView*> m_meshBuffers;
+            AZStd::vector<const RHI::ImageView*> m_materialTextures;
         };
     }
 }
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupData.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupData.h
index cbb0db53c8..ef4e734c01 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupData.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/ShaderResourceGroupData.h
@@ -183,6 +183,42 @@ namespace AZ
             //! Returns the shader resource layout for this group.
             const ShaderResourceGroupLayout* GetLayout() const;
 
+            enum class ResourceType : uint32_t
+            {
+                ConstantData,
+                BufferView,
+                ImageView,
+                BufferViewUnboundedArray,
+                ImageViewUnboundedArray,
+                Sampler,
+                Count
+            };
+
+            enum class ResourceTypeMask : uint32_t
+            {
+                None = 0,
+                ConstantDataMask = AZ_BIT(static_cast<uint32_t>(ResourceType::ConstantData)),
+                BufferViewMask = AZ_BIT(static_cast<uint32_t>(ResourceType::BufferView)),
+                ImageViewMask = AZ_BIT(static_cast<uint32_t>(ResourceType::ImageView)),
+                BufferViewUnboundedArrayMask = AZ_BIT(static_cast<uint32_t>(ResourceType::BufferViewUnboundedArray)),
+                ImageViewUnboundedArrayMask = AZ_BIT(static_cast<uint32_t>(ResourceType::ImageViewUnboundedArray)),
+                SamplerMask = AZ_BIT(static_cast<uint32_t>(ResourceType::Sampler))
+            };
+
+            //! Returns true if a resource type specified by resourceTypeMask is enabled for compilation
+            bool IsResourceTypeEnabledForCompilation(uint32_t resourceTypeMask) const;
+
+            //! Disables all resource types for compilation after m_updateMaskResetLatency number of compiles
+            //! This allows higher level code to ensure that if SRG is multi-buffered it can compile multiple
+            //! times in order to ensure all SRG buffers are updated.
+            void DisableCompilationForAllResourceTypes();
+
+            //! Returns true if any of the resource type has been enabled for compilation. 
+            bool IsAnyResourceTypeUpdated() const;
+
+            //! Enable compilation for a resourceType specified by resourceType/resourceTypeMask
+            void EnableResourceTypeCompilation(ResourceTypeMask resourceTypeMask, ResourceType resourceType);
+
         private:
             static const ConstPtr<ImageView> s_nullImageView;
             static const ConstPtr<BufferView> s_nullBufferView;
@@ -207,23 +243,43 @@ namespace AZ
 
             //! The backing data store of constants for the shader resource group.
             ConstantsData m_constantsData;
+
+            //! Mask used to check whether to compile a specific resource type
+            uint32_t m_updateMask = 0;
+
+            //! Track iteration for each resource type in order to keep compiling it for m_updateMaskResetLatency number of times
+            uint32_t m_resourceTypeIteration[static_cast<uint32_t>(ResourceType::Count)] = { 0 };
+            uint32_t m_updateMaskResetLatency = RHI::Limits::Device::FrameCountMax;
         };
 
         template <typename T>
         bool ShaderResourceGroupData::SetConstant(ShaderInputConstantIndex inputIndex, const T& value)
         {
+            EnableResourceTypeCompilation(ResourceTypeMask::ConstantDataMask, ResourceType::ConstantData);
             return m_constantsData.SetConstant(inputIndex, value);
         }
 
         template <typename T>
         bool ShaderResourceGroupData::SetConstant(ShaderInputConstantIndex inputIndex, const T& value, uint32_t arrayIndex)
         {
+            EnableResourceTypeCompilation(ResourceTypeMask::ConstantDataMask, ResourceType::ConstantData);
             return m_constantsData.SetConstant(inputIndex, value, arrayIndex);
         }
+        
+        template<typename T>
+        bool ShaderResourceGroupData::SetConstantMatrixRows(ShaderInputConstantIndex inputIndex, const T& value, uint32_t rowCount)
+        {
+            EnableResourceTypeCompilation(ResourceTypeMask::ConstantDataMask, ResourceType::ConstantData);
+            return m_constantsData.SetConstantMatrixRows(inputIndex, value, rowCount);
+        }
 
         template <typename T>
         bool ShaderResourceGroupData::SetConstantArray(ShaderInputConstantIndex inputIndex, AZStd::array_view<T> values)
         {
+            if (!values.empty())
+            {
+                EnableResourceTypeCompilation(ResourceTypeMask::ConstantDataMask, ResourceType::ConstantData);
+            }
             return m_constantsData.SetConstantArray(inputIndex, values);
         }
 
@@ -245,12 +301,6 @@ namespace AZ
             return m_constantsData.GetConstant<T>(inputIndex, arrayIndex);
         }
 
-        template <typename T>
-        bool ShaderResourceGroupData::SetConstantMatrixRows(ShaderInputConstantIndex inputIndex, const T& value, uint32_t rowCount)
-        {
-            return m_constantsData.SetConstantMatrixRows(inputIndex, value, rowCount);
-        }
-
         template<typename TShaderInput, typename TShaderInputDescriptor>
         bool ShaderResourceGroupData::ValidateImageViewAccess(TShaderInput inputIndex, const ImageView* imageView, [[maybe_unused]] uint32_t arrayIndex) const
         {
diff --git a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp
index 18b292ac64..eed14b41b7 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp
@@ -7,6 +7,7 @@
  */
 #include <Atom/RHI/ShaderResourceGroupData.h>
 #include <Atom/RHI/ShaderResourceGroupPool.h>
+#include <Atom/RHI.Reflect/Bits.h>
 
 namespace AZ
 {
@@ -126,6 +127,12 @@ namespace AZ
                     }
                     isValidAll &= isValid;
                 }
+
+                if(!imageViews.empty())
+                {
+                    EnableResourceTypeCompilation(ResourceTypeMask::ImageViewMask, ResourceType::ImageView);
+                }
+                
                 return isValidAll;
             }
             return false;
@@ -146,6 +153,11 @@ namespace AZ
                     }
                     isValidAll &= isValid;
                 }
+
+                if (!imageViews.empty())
+                {
+                    EnableResourceTypeCompilation(ResourceTypeMask::ImageViewUnboundedArrayMask, ResourceType::ImageViewUnboundedArray);
+                }
                 return isValidAll;
             }
             return false;
@@ -172,6 +184,11 @@ namespace AZ
                     }
                     isValidAll &= isValid;
                 }
+
+                if (!bufferViews.empty())
+                {
+                    EnableResourceTypeCompilation(ResourceTypeMask::BufferViewMask, ResourceType::BufferView);
+                }
                 return isValidAll;
             }
             return false;
@@ -192,6 +209,11 @@ namespace AZ
                     }
                     isValidAll &= isValid;
                 }
+
+                if (!bufferViews.empty())
+                {
+                    EnableResourceTypeCompilation(ResourceTypeMask::BufferViewUnboundedArrayMask, ResourceType::BufferViewUnboundedArray);
+                }
                 return isValidAll;
             }
             return false;
@@ -211,6 +233,11 @@ namespace AZ
                 {
                     m_samplers[interval.m_min + arrayIndex + i] = samplers[i];
                 }
+
+                if (!samplers.empty())
+                {
+                    EnableResourceTypeCompilation(ResourceTypeMask::SamplerMask, ResourceType::Sampler);
+                }
                 return true;
             }
             return false;
@@ -223,16 +250,19 @@ namespace AZ
 
         bool ShaderResourceGroupData::SetConstantRaw(ShaderInputConstantIndex inputIndex, const void* bytes, uint32_t byteOffset, uint32_t byteCount)
         {
+            EnableResourceTypeCompilation(ResourceTypeMask::ConstantDataMask, ResourceType::ConstantData);
             return m_constantsData.SetConstantRaw(inputIndex, bytes, byteOffset, byteCount);
         }
 
         bool ShaderResourceGroupData::SetConstantData(const void* bytes, uint32_t byteCount)
         {
+            EnableResourceTypeCompilation(ResourceTypeMask::ConstantDataMask, ResourceType::ConstantData);
             return m_constantsData.SetConstantData(bytes, byteCount);
         }
 
         bool ShaderResourceGroupData::SetConstantData(const void* bytes, uint32_t byteOffset, uint32_t byteCount)
         {
+            EnableResourceTypeCompilation(ResourceTypeMask::ConstantDataMask, ResourceType::ConstantData);
             return m_constantsData.SetConstantData(bytes, byteOffset, byteCount);
         }
         
@@ -348,5 +378,33 @@ namespace AZ
             return m_constantsData;
         }
 
+        bool ShaderResourceGroupData::IsResourceTypeEnabledForCompilation(uint32_t resourceTypeMask) const
+        {
+            return RHI::CheckBitsAny(m_updateMask, resourceTypeMask);
+        }
+
+        bool ShaderResourceGroupData::IsAnyResourceTypeUpdated() const
+        {
+            return m_updateMask != 0;
+        }
+
+        void ShaderResourceGroupData::EnableResourceTypeCompilation(ResourceTypeMask resourceTypeMask, ResourceType resourceType)
+        {
+            AZ_Assert(static_cast<uint32_t>(resourceTypeMask) == AZ_BIT(static_cast<uint32_t>(resourceType)), "resourceType and resourceTypeMask should point to the same ResourceType");
+            m_updateMask = RHI::SetBits(m_updateMask, static_cast<uint32_t>(resourceTypeMask));
+            m_resourceTypeIteration[static_cast<uint32_t>(resourceType)] = 0;
+        }
+
+        void ShaderResourceGroupData::DisableCompilationForAllResourceTypes()
+        {
+            for (uint32_t i = 0; i < static_cast<uint32_t>(ResourceType::Count); i++)
+            {
+                if (m_resourceTypeIteration[i] == m_updateMaskResetLatency)
+                {
+                    m_updateMask = RHI::ResetBits(m_updateMask, AZ_BIT(i));
+                }
+                m_resourceTypeIteration[i]++;
+            }
+        }
     } // namespace RHI
 } // namespace AZ
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
index bd648cf535..087a36dc2f 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -206,12 +206,21 @@ namespace AZ
             auto& device = static_cast<Device&>(GetDevice());
             group.m_compiledDataIndex = (group.m_compiledDataIndex + 1) % RHI::Limits::Device::FrameCountMax;
 
-            if (m_constantBufferSize)
+            if (!groupData.IsAnyResourceTypeUpdated())
+            {
+                return RHI::ResultCode::Success;
+            }
+
+            if (m_constantBufferSize &&
+                groupData.IsResourceTypeEnabledForCompilation(static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::ConstantDataMask)))
             {
                 memcpy(group.GetCompiledData().m_cpuConstantAddress, groupData.GetConstantData().data(), groupData.GetConstantData().size());
             }
 
-            if (m_viewsDescriptorTableSize)
+            if (m_viewsDescriptorTableSize &&
+                groupData.IsResourceTypeEnabledForCompilation(
+                    static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::ImageViewMask) |
+                    static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::BufferViewMask)))
             {
                 //Lazy initialization for cbv/srv/uav Descriptor Tables
                 if (!group.m_viewsDescriptorTable.IsValid())
@@ -236,12 +245,17 @@ namespace AZ
                 UpdateViewsDescriptorTable(descriptorTable, groupData);
             }
 
-            if (m_unboundedArrayCount)
+            if (m_unboundedArrayCount &&
+                groupData.IsResourceTypeEnabledForCompilation(
+                    static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::ImageViewUnboundedArrayMask) |
+                    static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::BufferViewUnboundedArrayMask)))
             {
                 UpdateUnboundedArrayDescriptorTables(group, groupData);
             }
 
-            if (m_samplersDescriptorTableSize)
+            if (m_samplersDescriptorTableSize &&
+                groupData.IsResourceTypeEnabledForCompilation(
+                    static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::SamplerMask)))
             {
                 const DescriptorTable descriptorTable(
                     group.m_samplersDescriptorTable.GetOffset() + group.m_compiledDataIndex * m_samplersDescriptorTableSize,
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp
index 6be5ec7259..0a9c001868 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -63,39 +63,58 @@ namespace AZ
         {
             ShaderResourceGroup& group = static_cast<ShaderResourceGroup&>(groupBase);
             group.UpdateCompiledDataIndex();
-            
+
+            if (!groupData.IsAnyResourceTypeUpdated())
+            {
+                return RHI::ResultCode::Success;
+            }
+
             ArgumentBuffer& argBuffer = *group.m_compiledArgBuffers[group.m_compiledDataIndex];
             argBuffer.ClearResourceTracking();
-            argBuffer.UpdateConstantBufferViews(groupData.GetConstantData());
-            
+
+            auto constantData = groupData.GetConstantData();
+            if (!constantData.empty() && groupData.IsResourceTypeEnabledForCompilation(static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::ConstantDataMask)))
+            {
+                argBuffer.UpdateConstantBufferViews(groupData.GetConstantData());
+            }
+
             const RHI::ShaderResourceGroupLayout* layout = groupData.GetLayout();
             uint32_t shaderInputIndex = 0;
-            for (const RHI::ShaderInputImageDescriptor& shaderInputImage : layout->GetShaderInputListForImages())
+            if (groupData.IsResourceTypeEnabledForCompilation(static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::ImageViewMask)))
             {
-                const RHI::ShaderInputImageIndex imageInputIndex(shaderInputIndex);
-                AZStd::array_view<RHI::ConstPtr<RHI::ImageView>> imageViews = groupData.GetImageViewArray(imageInputIndex);
-                argBuffer.UpdateImageViews(shaderInputImage, imageInputIndex, imageViews);
-                ++shaderInputIndex;
+                for (const RHI::ShaderInputImageDescriptor& shaderInputImage : layout->GetShaderInputListForImages())
+                {
+                    const RHI::ShaderInputImageIndex imageInputIndex(shaderInputIndex);
+                    AZStd::array_view<RHI::ConstPtr<RHI::ImageView>> imageViews = groupData.GetImageViewArray(imageInputIndex);
+                    argBuffer.UpdateImageViews(shaderInputImage, imageInputIndex, imageViews);
+                    ++shaderInputIndex;
+                }
             }
-            
-            shaderInputIndex = 0;
-            for (const RHI::ShaderInputSamplerDescriptor& shaderInputSampler : layout->GetShaderInputListForSamplers())
+
+            if (groupData.IsResourceTypeEnabledForCompilation(static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::SamplerMask)))
             {
-                const RHI::ShaderInputSamplerIndex samplerInputIndex(shaderInputIndex);
-                AZStd::array_view<RHI::SamplerState> samplerStates= groupData.GetSamplerArray(samplerInputIndex);
-                argBuffer.UpdateSamplers(shaderInputSampler, samplerInputIndex, samplerStates);
-                ++shaderInputIndex;
+                shaderInputIndex = 0;
+                for (const RHI::ShaderInputSamplerDescriptor& shaderInputSampler : layout->GetShaderInputListForSamplers())
+                {
+                    const RHI::ShaderInputSamplerIndex samplerInputIndex(shaderInputIndex);
+                    AZStd::array_view<RHI::SamplerState> samplerStates = groupData.GetSamplerArray(samplerInputIndex);
+                    argBuffer.UpdateSamplers(shaderInputSampler, samplerInputIndex, samplerStates);
+                    ++shaderInputIndex;
+                }
             }
-            
-            shaderInputIndex = 0;
-            for (const RHI::ShaderInputBufferDescriptor& shaderInputBuffer : layout->GetShaderInputListForBuffers())
+
+            if (groupData.IsResourceTypeEnabledForCompilation(static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::BufferViewMask)))
             {
-                const RHI::ShaderInputBufferIndex bufferInputIndex(shaderInputIndex);
-                AZStd::array_view<RHI::ConstPtr<RHI::BufferView>> bufferViews = groupData.GetBufferViewArray(bufferInputIndex);
-                argBuffer.UpdateBufferViews(shaderInputBuffer, bufferInputIndex, bufferViews);
-                ++shaderInputIndex;
+                shaderInputIndex = 0;
+                for (const RHI::ShaderInputBufferDescriptor& shaderInputBuffer : layout->GetShaderInputListForBuffers())
+                {
+                    const RHI::ShaderInputBufferIndex bufferInputIndex(shaderInputIndex);
+                    AZStd::array_view<RHI::ConstPtr<RHI::BufferView>> bufferViews = groupData.GetBufferViewArray(bufferInputIndex);
+                    argBuffer.UpdateBufferViews(shaderInputBuffer, bufferInputIndex, bufferViews);
+                    ++shaderInputIndex;
+                }
             }
-            
+
             return RHI::ResultCode::Success;
         }
 
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp
index c5ca07eb27..59dbaf4377 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -105,66 +105,87 @@ namespace AZ
         {
             auto& group = static_cast<ShaderResourceGroup&>(groupBase);
             group.UpdateCompiledDataIndex(m_currentIteration);
+
+            if (!groupData.IsAnyResourceTypeUpdated())
+            {
+                return RHI::ResultCode::Success;
+            }
+
             DescriptorSet& descriptorSet = *group.m_compiledData[group.GetCompileDataIndex()];
 
             const RHI::ShaderResourceGroupLayout* layout = groupData.GetLayout();
 
-            for (uint32_t groupIndex = 0; groupIndex < static_cast<uint32_t>(layout->GetShaderInputListForBuffers().size()); ++groupIndex)
+            if (groupData.IsResourceTypeEnabledForCompilation(static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::BufferViewMask)))
             {
-                const RHI::ShaderInputBufferIndex index(groupIndex);
-                auto bufViews = groupData.GetBufferViewArray(index);
-                uint32_t layoutIndex = m_descriptorSetLayout->GetLayoutIndexFromGroupIndex(groupIndex, DescriptorSetLayout::ResourceType::BufferView);
-                descriptorSet.UpdateBufferViews(layoutIndex, bufViews);
-            }
-
-            auto const& shaderImageList = layout->GetShaderInputListForImages();
-            for (uint32_t groupIndex = 0; groupIndex < static_cast<uint32_t>(layout->GetShaderInputListForImages().size()); ++groupIndex)
-            {
-                const RHI::ShaderInputImageIndex index(groupIndex);
-                auto imgViews = groupData.GetImageViewArray(index);
-                uint32_t layoutIndex = m_descriptorSetLayout->GetLayoutIndexFromGroupIndex(groupIndex, DescriptorSetLayout::ResourceType::ImageView);
-                descriptorSet.UpdateImageViews(layoutIndex, imgViews, shaderImageList[groupIndex].m_type);
-            }
-
-            for (uint32_t groupIndex = 0; groupIndex < static_cast<uint32_t>(layout->GetShaderInputListForBufferUnboundedArrays().size()); ++groupIndex)
-            {
-                const RHI::ShaderInputBufferUnboundedArrayIndex index(groupIndex);
-                auto bufViews = groupData.GetBufferViewUnboundedArray(index);
-                if (bufViews.empty())
+                for (uint32_t groupIndex = 0; groupIndex < static_cast<uint32_t>(layout->GetShaderInputListForBuffers().size()); ++groupIndex)
                 {
-                    // skip empty unbounded arrays
-                    continue;
+                    const RHI::ShaderInputBufferIndex index(groupIndex);
+                    auto bufViews = groupData.GetBufferViewArray(index);
+                    uint32_t layoutIndex = m_descriptorSetLayout->GetLayoutIndexFromGroupIndex(groupIndex, DescriptorSetLayout::ResourceType::BufferView);
+                    descriptorSet.UpdateBufferViews(layoutIndex, bufViews);
                 }
-
-                uint32_t layoutIndex = m_descriptorSetLayout->GetLayoutIndexFromGroupIndex(groupIndex, DescriptorSetLayout::ResourceType::BufferViewUnboundedArray);
-                descriptorSet.UpdateBufferViews(layoutIndex, bufViews);
             }
 
-            auto const& shaderImageUnboundeArrayList = layout->GetShaderInputListForImageUnboundedArrays();
-            for (uint32_t groupIndex = 0; groupIndex < static_cast<uint32_t>(layout->GetShaderInputListForImageUnboundedArrays().size()); ++groupIndex)
+            if (groupData.IsResourceTypeEnabledForCompilation(static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::ImageViewMask)))
             {
-                const RHI::ShaderInputImageUnboundedArrayIndex index(groupIndex);
-                auto imgViews = groupData.GetImageViewUnboundedArray(index);
-                if (imgViews.empty())
+                auto const& shaderImageList = layout->GetShaderInputListForImages();
+                for (uint32_t groupIndex = 0; groupIndex < static_cast<uint32_t>(layout->GetShaderInputListForImages().size()); ++groupIndex)
                 {
-                    // skip empty unbounded arrays
-                    continue;
+                    const RHI::ShaderInputImageIndex index(groupIndex);
+                    auto imgViews = groupData.GetImageViewArray(index);
+                    uint32_t layoutIndex = m_descriptorSetLayout->GetLayoutIndexFromGroupIndex(groupIndex, DescriptorSetLayout::ResourceType::ImageView);
+                    descriptorSet.UpdateImageViews(layoutIndex, imgViews, shaderImageList[groupIndex].m_type);
                 }
-
-                uint32_t layoutIndex = m_descriptorSetLayout->GetLayoutIndexFromGroupIndex(groupIndex, DescriptorSetLayout::ResourceType::ImageViewUnboundedArray);
-                descriptorSet.UpdateImageViews(layoutIndex, imgViews, shaderImageUnboundeArrayList[groupIndex].m_type);
             }
 
-            for (uint32_t groupIndex = 0; groupIndex < static_cast<uint32_t>(layout->GetShaderInputListForSamplers().size()); ++groupIndex)
+            if (groupData.IsResourceTypeEnabledForCompilation(static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::BufferViewUnboundedArrayMask)))
             {
-                const RHI::ShaderInputSamplerIndex index(groupIndex);
-                auto samplerArray = groupData.GetSamplerArray(index);
-                uint32_t layoutIndex = m_descriptorSetLayout->GetLayoutIndexFromGroupIndex(groupIndex, DescriptorSetLayout::ResourceType::Sampler);
-                descriptorSet.UpdateSamplers(layoutIndex, samplerArray);
+                for (uint32_t groupIndex = 0; groupIndex < static_cast<uint32_t>(layout->GetShaderInputListForBufferUnboundedArrays().size()); ++groupIndex)
+                {
+                    const RHI::ShaderInputBufferUnboundedArrayIndex index(groupIndex);
+                    auto bufViews = groupData.GetBufferViewUnboundedArray(index);
+                    if (bufViews.empty())
+                    {
+                        // skip empty unbounded arrays
+                        continue;
+                    }
+
+                    uint32_t layoutIndex = m_descriptorSetLayout->GetLayoutIndexFromGroupIndex(groupIndex, DescriptorSetLayout::ResourceType::BufferViewUnboundedArray);
+                    descriptorSet.UpdateBufferViews(layoutIndex, bufViews);
+                }
+            }
+
+            if (groupData.IsResourceTypeEnabledForCompilation(static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::ImageViewUnboundedArrayMask)))
+            {
+                auto const& shaderImageUnboundeArrayList = layout->GetShaderInputListForImageUnboundedArrays();
+                for (uint32_t groupIndex = 0; groupIndex < static_cast<uint32_t>(layout->GetShaderInputListForImageUnboundedArrays().size()); ++groupIndex)
+                {
+                    const RHI::ShaderInputImageUnboundedArrayIndex index(groupIndex);
+                    auto imgViews = groupData.GetImageViewUnboundedArray(index);
+                    if (imgViews.empty())
+                    {
+                        // skip empty unbounded arrays
+                        continue;
+                    }
+
+                    uint32_t layoutIndex = m_descriptorSetLayout->GetLayoutIndexFromGroupIndex(groupIndex, DescriptorSetLayout::ResourceType::ImageViewUnboundedArray);
+                    descriptorSet.UpdateImageViews(layoutIndex, imgViews, shaderImageUnboundeArrayList[groupIndex].m_type);
+                }
+            }
+
+            if (groupData.IsResourceTypeEnabledForCompilation(static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::SamplerMask)))
+            {
+                for (uint32_t groupIndex = 0; groupIndex < static_cast<uint32_t>(layout->GetShaderInputListForSamplers().size()); ++groupIndex)
+                {
+                    const RHI::ShaderInputSamplerIndex index(groupIndex);
+                    auto samplerArray = groupData.GetSamplerArray(index);
+                    uint32_t layoutIndex = m_descriptorSetLayout->GetLayoutIndexFromGroupIndex(groupIndex, DescriptorSetLayout::ResourceType::Sampler);
+                    descriptorSet.UpdateSamplers(layoutIndex, samplerArray);
+                }
             }
 
             auto constantData = groupData.GetConstantData();
-            if (!constantData.empty())
+            if (!constantData.empty() && groupData.IsResourceTypeEnabledForCompilation(static_cast<uint32_t>(RHI::ShaderResourceGroupData::ResourceTypeMask::ConstantDataMask)))
             {
                 descriptorSet.UpdateConstantData(constantData);
             }
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp
index f95c6abfcd..df16b5cd08 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp
@@ -114,6 +114,10 @@ namespace AZ
         void ShaderResourceGroup::Compile()
         {
             m_shaderResourceGroup->Compile(m_data);
+
+            //Disable compilation for all resource types as a performance optimization
+            //No need to re-update SRG data on GPU timeline if nothing was updated.
+            m_data.DisableCompilationForAllResourceTypes();
         }
 
         bool ShaderResourceGroup::IsQueuedForCompile() const

From c38c9739da40e8613fefaf2b27f927cc1fad1adb Mon Sep 17 00:00:00 2001
From: mrieggeramzn <61609885+mrieggeramzn@users.noreply.github.com>
Date: Tue, 12 Oct 2021 13:32:47 -0700
Subject: [PATCH 10/29] Adding vertexNormal to the Surface structure and using
 it for shadows (#4617)

* Adding vertex shadow and using it for all shadows
* Fixing small issue with it not being initialized
* Adis recommendations for hair

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
---
 .../Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl | 2 +-
 Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl      | 1 +
 .../Materials/Types/StandardMultilayerPBR_ForwardPass.azsl     | 1 +
 .../Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl | 2 +-
 .../ShaderLib/Atom/Features/PBR/Lights/DirectionalLight.azsli  | 2 +-
 .../Assets/ShaderLib/Atom/Features/PBR/Lights/DiskLight.azsli  | 2 +-
 .../Assets/ShaderLib/Atom/Features/PBR/Lights/PointLight.azsli | 2 +-
 .../ShaderLib/Atom/Features/PBR/Surfaces/EnhancedSurface.azsli | 1 +
 .../ShaderLib/Atom/Features/PBR/Surfaces/SkinSurface.azsli     | 1 +
 .../ShaderLib/Atom/Features/PBR/Surfaces/StandardSurface.azsli | 1 +
 .../TestData/Materials/Types/AutoBrick_ForwardPass.azsl        | 1 +
 .../TestData/Materials/Types/MinimalPBR_ForwardPass.azsl       | 1 +
 Gems/AtomTressFX/Assets/Shaders/HairLightTypes.azsli           | 3 ++-
 Gems/AtomTressFX/Assets/Shaders/HairLighting.azsli             | 1 +
 Gems/AtomTressFX/Assets/Shaders/HairSurface.azsli              | 1 +
 .../Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl | 1 +
 16 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl
index 26a7e21a6a..11859de7d6 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl
@@ -185,7 +185,7 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
     float2 normalUv = IN.m_uv[MaterialSrg::m_normalMapUvIndex];
     float3x3 uvMatrix = MaterialSrg::m_normalMapUvIndex == 0 ? MaterialSrg::m_uvMatrix : CreateIdentity3x3(); // By design, only UV0 is allowed to apply transforms.
     float detailLayerNormalFactor = MaterialSrg::m_detail_normal_factor * detailLayerBlendFactor;
-
+    surface.vertexNormal = normalize(IN.m_normal);
     surface.normal = GetDetailedNormalInputWS(
         isFrontFace, IN.m_normal,
         tangents[MaterialSrg::m_normalMapUvIndex],      bitangents[MaterialSrg::m_normalMapUvIndex],      MaterialSrg::m_normalMap,             MaterialSrg::m_sampler, normalUv, MaterialSrg::m_normalFactor,  MaterialSrg::m_flipNormalX,         MaterialSrg::m_flipNormalY,         uvMatrix,                      o_normal_useTexture,
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl
index 97cbfb2622..05059aba6f 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl
@@ -237,6 +237,7 @@ PbrLightingOutput SkinPS_Common(VSOutput IN)
         normalMapSample = ApplyNormalWrinkleMap(o_wrinkleLayers_normal_useTexture4, normalMapSample, MaterialSrg::m_wrinkle_normal_texture4, MaterialSrg::m_sampler, normalUv, MaterialSrg::m_flipNormalX, MaterialSrg::m_flipNormalY, IN.m_wrinkleBlendFactors.a);
     }
 
+    surface.vertexNormal = normalize(IN.m_normal);
     if(o_detail_normal_useTexture)
     {
         float3 normalTS = GetTangentSpaceNormal(normalMapSample, uvMatrix, MaterialSrg::m_normalFactor);
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl
index 5d2aec063b..6a97c0e785 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl
@@ -445,6 +445,7 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
         normalTS = ReorientTangentSpaceNormal(normalTS, lightingInputLayer3.m_normalTS);
     }
     // [GFX TODO][ATOM-14591]: This will only work if the normal maps all use the same UV stream. We would need to add support for having them in different UV streams.
+    surface.vertexNormal = normalize(IN.m_normal);
     surface.normal = normalize(TangentSpaceToWorld(normalTS, IN.m_normal, tangents[MaterialSrg::m_parallaxUvIndex], bitangents[MaterialSrg::m_parallaxUvIndex]));
         
     // ------- Combine Albedo, roughness, specular, roughness ---------
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl
index 1fa5fc683c..8df5e1ba56 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl
@@ -146,7 +146,7 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
 
     float2 normalUv = IN.m_uv[MaterialSrg::m_normalMapUvIndex];
     float3x3 uvMatrix = MaterialSrg::m_normalMapUvIndex == 0 ? MaterialSrg::m_uvMatrix : CreateIdentity3x3(); // By design, only UV0 is allowed to apply transforms.
-
+    surface.vertexNormal = normalize(IN.m_normal);
     surface.normal = GetNormalInputWS(MaterialSrg::m_normalMap, MaterialSrg::m_sampler, normalUv, MaterialSrg::m_flipNormalX, MaterialSrg::m_flipNormalY, isFrontFace, IN.m_normal,
                                        tangents[MaterialSrg::m_normalMapUvIndex], bitangents[MaterialSrg::m_normalMapUvIndex], uvMatrix, o_normal_useTexture, MaterialSrg::m_normalFactor);
 
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DirectionalLight.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DirectionalLight.azsli
index 34c17e388c..1eee53a24f 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DirectionalLight.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DirectionalLight.azsli
@@ -24,7 +24,7 @@ void ApplyDirectionalLights(Surface surface, inout LightingData lightingData)
         litRatio = DirectionalLightShadow::GetVisibility(
             shadowIndex,
             lightingData.shadowCoords,
-            surface.normal,
+            surface.vertexNormal,
             debugInfo);
             
         if (o_transmission_mode == TransmissionMode::ThickObject)
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DiskLight.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DiskLight.azsli
index ac9227f64a..63f671f021 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DiskLight.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DiskLight.azsli
@@ -86,7 +86,7 @@ void ApplyDiskLight(ViewSrg::DiskLight light, Surface surface, inout LightingDat
                 light.m_position,
                 surface.position,
                 -dirToConeTip,
-                surface.normal);
+                surface.vertexNormal);
              
             // Use backShadowRatio to carry thickness from shadow map for thick mode
             backShadowRatio = 1.0 - litRatio;
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PointLight.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PointLight.azsli
index b88b6574a4..e6eea9728f 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PointLight.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/PointLight.azsli
@@ -83,7 +83,7 @@ void ApplyPointLight(ViewSrg::PointLight light, Surface surface, inout LightingD
                     light.m_position,
                     surface.position,
                     lightDir,
-                    surface.normal);
+                    surface.vertexNormal);
                         
             // Use backShadowRatio to carry thickness from shadow map for thick mode
             backShadowRatio = 1.0 - litRatio;
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/EnhancedSurface.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/EnhancedSurface.azsli
index 1b0ac3d76d..eb8c33cdce 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/EnhancedSurface.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/EnhancedSurface.azsli
@@ -23,6 +23,7 @@ class Surface
     
     float3 position;            //!< Position in world-space
     float3 normal;              //!< Normal in world-space
+    float3 vertexNormal;        //!< Vertex normal in world-space
     float3 albedo;              //!< Albedo color of the non-metallic material, will be multiplied against the diffuse lighting value
     float3 specularF0;          //!< Fresnel f0 spectral value of the surface
     float roughnessLinear;      //!< Perceptually linear roughness value authored by artists. Must be remapped to roughnessA before use
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/SkinSurface.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/SkinSurface.azsli
index 40f30d4f03..f82d80adee 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/SkinSurface.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/SkinSurface.azsli
@@ -22,6 +22,7 @@ class Surface
     
     float3 position;            //!< Position in world-space
     float3 normal;              //!< Normal in world-space
+    float3 vertexNormal;        //!< Vertex normal in world-space
     float3 albedo;              //!< Albedo color of the non-metallic material, will be multiplied against the diffuse lighting value
     float3 specularF0;          //!< Fresnel f0 spectral value of the surface
     float roughnessLinear;      //!< Perceptually linear roughness value authored by artists. Must be remapped to roughnessA before use
diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/StandardSurface.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/StandardSurface.azsli
index 30e90323a5..084943bf38 100644
--- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/StandardSurface.azsli
+++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Surfaces/StandardSurface.azsli
@@ -22,6 +22,7 @@ class Surface
     
     float3 position;            //!< Position in world-space
     float3 normal;              //!< Normal in world-space
+    float3 vertexNormal;        //!< Vertex normal in world-space
     float3 albedo;              //!< Albedo color of the non-metallic material, will be multiplied against the diffuse lighting value
     float3 specularF0;          //!< Fresnel f0 spectral value of the surface
     float roughnessLinear;      //!< Perceptually linear roughness value authored by artists. Must be remapped to roughnessA before use
diff --git a/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_ForwardPass.azsl b/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_ForwardPass.azsl
index 7be62c9343..2dbba46d8b 100644
--- a/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_ForwardPass.azsl
+++ b/Gems/Atom/TestData/TestData/Materials/Types/AutoBrick_ForwardPass.azsl
@@ -170,6 +170,7 @@ ForwardPassOutput AutoBrick_ForwardPassPS(VSOutput IN)
     // Position, Normal, Roughness
     surface.position = IN.m_worldPosition.xyz;
     surface.normal = normalize(normal);
+    surface.vertexNormal = surfaceNormal;
     surface.roughnessLinear = 1.0f;
     surface.CalculateRoughnessA();
 
diff --git a/Gems/Atom/TestData/TestData/Materials/Types/MinimalPBR_ForwardPass.azsl b/Gems/Atom/TestData/TestData/Materials/Types/MinimalPBR_ForwardPass.azsl
index 6f73b63ad7..2f6f038e4b 100644
--- a/Gems/Atom/TestData/TestData/Materials/Types/MinimalPBR_ForwardPass.azsl
+++ b/Gems/Atom/TestData/TestData/Materials/Types/MinimalPBR_ForwardPass.azsl
@@ -63,6 +63,7 @@ ForwardPassOutput MinimalPBR_MainPassPS(VSOutput IN)
     // Position, Normal, Roughness
     surface.position = IN.m_worldPosition.xyz;
     surface.normal = normalize(IN.m_normal);
+    surface.vertexNormal = normalize(IN.m_normal);
     surface.roughnessLinear = MinimalPBRSrg::m_roughness;
     surface.CalculateRoughnessA();
 
diff --git a/Gems/AtomTressFX/Assets/Shaders/HairLightTypes.azsli b/Gems/AtomTressFX/Assets/Shaders/HairLightTypes.azsli
index 535d1380e7..4b0fa654e3 100644
--- a/Gems/AtomTressFX/Assets/Shaders/HairLightTypes.azsli
+++ b/Gems/AtomTressFX/Assets/Shaders/HairLightTypes.azsli
@@ -135,6 +135,7 @@ void SetNormalAndUpdateLightingParams(
 
     float3 projectedNormal = cross(biNormal, tangent);
     surface.normal = normalize(projectedNormal);    // the normalization might be redundunt 
+    surface.vertexNormal = surface.normal; // [To Do] - support proper vertex normals in the hair shader.
 
     // Next is important in order to set NdotV and other PBR settings - needs to be set once per light
     UpdateLightingParameters(lightingData, surface.position, surface.normal, surface.roughnessLinear);
@@ -362,7 +363,7 @@ void ApplyDirectionalLights(Surface surface, inout LightingData lightingData)
         litRatio = DirectionalLightShadow::GetVisibility(
             shadowIndex,
             lightingData.shadowCoords,
-            surface.normal,
+            surface.vertexNormal,
             debugInfo);
     }
 
diff --git a/Gems/AtomTressFX/Assets/Shaders/HairLighting.azsli b/Gems/AtomTressFX/Assets/Shaders/HairLighting.azsli
index bf452e6ba8..dcdcf43243 100644
--- a/Gems/AtomTressFX/Assets/Shaders/HairLighting.azsli
+++ b/Gems/AtomTressFX/Assets/Shaders/HairLighting.azsli
@@ -197,6 +197,7 @@ float3 CalculateLighting(
     surface.position = vPositionWS;
     surface.tangent = vTangent;         // Redundant - will be calculated per light
     surface.normal = float3(0, 0, 0);   // Will fail lights that did not initialize properly. 
+    surface.vertexNormal = float3(0,0,0); // [To Do] - vertex normals are not handled yet in the hair shader.
     surface.roughnessLinear = material.m_roughness;
     surface.cuticleTilt = material.m_cuticleTilt;
     surface.thickness = thickness;
diff --git a/Gems/AtomTressFX/Assets/Shaders/HairSurface.azsli b/Gems/AtomTressFX/Assets/Shaders/HairSurface.azsli
index 16496f0dcd..6ffd342734 100644
--- a/Gems/AtomTressFX/Assets/Shaders/HairSurface.azsli
+++ b/Gems/AtomTressFX/Assets/Shaders/HairSurface.azsli
@@ -18,6 +18,7 @@ class Surface
     // ------- BasePbrSurfaceData -------
     float3 position;            //!< Position in world-space
     float3 normal;              //!< Normal in world-space
+    float3 vertexNormal;        //!< Vertex normal in world-space
     float3 albedo;              //!< Albedo color of the non-metallic material, will be multiplied against the diffuse lighting value
     float3 specularF0;          //!< Fresnel f0 spectral value of the surface
     float roughnessLinear;      //!< Perceptually linear roughness value authored by artists. Must be remapped to roughnessA before use
diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl
index df2a801969..fedd19a498 100644
--- a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl
+++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl
@@ -95,6 +95,7 @@ ForwardPassOutput TerrainPBR_MainPassPS(VSOutput IN)
     detailNormal = ReorientTangentSpaceNormal(macroNormal, detailNormal);
     surface.normal = lerp(detailNormal, macroNormal, detailFactor);
     surface.normal = normalize(surface.normal);
+    surface.vertexNormal = normalize(IN.m_normal);
 
     // ------- Macro Color -------
     float3 macroColor = GetBaseColorInput(TerrainMaterialSrg::m_macroColorMap, TerrainMaterialSrg::m_sampler, origUv, TerrainMaterialSrg::m_baseColor.rgb, o_baseColor_useTexture);

From 6318247b3dc43d92f2825ed7afcc51e83aabda50 Mon Sep 17 00:00:00 2001
From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
Date: Tue, 12 Oct 2021 13:34:51 -0700
Subject: [PATCH 11/29] LYN-7279 + LYN-7192 | Focus Mode - Container unit tests
 + Clear container entity open state on new level load (#4558)

* Change SetContainerOpenState to SetContainerOpen.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce Clear function to avoid retaining all lingering open states when switching contexts/loading a new level.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor FocusMode fixture refactors to support ContainerEntity tests

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce tests for the ContainerEntity API

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add include to fix issue with EntityContextId not being defined.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor comment fixes. Moved environment clear functions to TearDown function of test fixture.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Use default editor context id in ContainerEntitySystemComponent

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Revert previous change as the EditorEntityContextId would not be initialized correctly on ContainerEntitySystemComponent Activate.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
---
 .../ContainerEntityInterface.h                |  11 +-
 .../ContainerEntitySystemComponent.cpp        |  39 ++-
 .../ContainerEntitySystemComponent.h          |   8 +-
 .../Prefab/PrefabFocusHandler.cpp             |   7 +-
 .../ContainerEntitySelectionTests.cpp         |  99 ++++++
 .../Tests/FocusMode/ContainerEntityTests.cpp  | 293 ++++++++++++++++++
 .../FocusMode/EditorFocusModeFixture.cpp      |  37 ++-
 .../Tests/FocusMode/EditorFocusModeFixture.h  |  10 +-
 .../EditorFocusModeSelectionFixture.h         |  43 +++
 .../EditorFocusModeSelectionTests.cpp         |  82 +----
 .../Tests/FocusMode/EditorFocusModeTests.cpp  |  73 ++---
 .../Tests/aztoolsframeworktests_files.cmake   |   3 +
 12 files changed, 575 insertions(+), 130 deletions(-)
 create mode 100644 Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntitySelectionTests.cpp
 create mode 100644 Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntityTests.cpp
 create mode 100644 Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionFixture.h

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntityInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntityInterface.h
index 45da3a9d8f..95940e6dd6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntityInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntityInterface.h
@@ -11,6 +11,8 @@
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Serialization/SerializeContext.h>
 
+#include <AzFramework/Entity/EntityContextBus.h>
+
 namespace AzToolsFramework
 {
     //! Outcome object that returns an error message in case of failure to allow caller to handle internal errors.
@@ -43,7 +45,7 @@ namespace AzToolsFramework
         //! @param entityId The entityId whose open state will be set.
         //! @param open True if the container should be opened, false if it should be closed.
         //! @return An error message if the operation was invalid, success otherwise.
-        virtual ContainerEntityOperationResult SetContainerOpenState(AZ::EntityId entityId, bool open) = 0;
+        virtual ContainerEntityOperationResult SetContainerOpen(AZ::EntityId entityId, bool open) = 0;
 
         //! If the entity id provided is registered as a container, it returns whether it's open.
         //! @note the default value for non-containers is true, so this function can be called without
@@ -56,6 +58,13 @@ namespace AzToolsFramework
         //! @return The highest closed entity container id if any, or entityId otherwise.
         virtual AZ::EntityId FindHighestSelectableEntity(AZ::EntityId entityId) const = 0;
 
+        //! Clears all open state information for Container Entities for the EntityContextId provided.
+        //! Used when context is switched, for example in the case of a new root prefab being loaded
+        //! in place of an old one.
+        //! @note Clear is meant to be called when no container is registered for the context provided.
+        //! @return An error message if any container was registered for the context, success otherwise.
+        virtual ContainerEntityOperationResult Clear(AzFramework::EntityContextId entityContextId) = 0;
+
     };
 
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.cpp
index 0ea2eeb5f6..c5649c56df 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.cpp
@@ -10,16 +10,19 @@
 
 #include <AzCore/Component/TransformBus.h>
 #include <AzToolsFramework/ContainerEntity/ContainerEntityNotificationBus.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
 
 namespace AzToolsFramework
 {
     void ContainerEntitySystemComponent::Activate()
     {
         AZ::Interface<ContainerEntityInterface>::Register(this);
+        EditorEntityContextNotificationBus::Handler::BusConnect();
     }
 
     void ContainerEntitySystemComponent::Deactivate()
     {
+        EditorEntityContextNotificationBus::Handler::BusDisconnect();
         AZ::Interface<ContainerEntityInterface>::Unregister(this);
     }
 
@@ -63,7 +66,7 @@ namespace AzToolsFramework
         return m_containers.contains(entityId);
     }
 
-    ContainerEntityOperationResult ContainerEntitySystemComponent::SetContainerOpenState(AZ::EntityId entityId, bool open)
+    ContainerEntityOperationResult ContainerEntitySystemComponent::SetContainerOpen(AZ::EntityId entityId, bool open)
     {
         if (!IsContainer(entityId))
         {
@@ -87,7 +90,7 @@ namespace AzToolsFramework
 
     bool ContainerEntitySystemComponent::IsContainerOpen(AZ::EntityId entityId) const
     {
-        // If the entity is not a container, it should behave as open.
+        // Non-container entities behave the same as open containers. This saves the caller an additional check.
         if(!m_containers.contains(entityId))
         {
             return true;
@@ -117,4 +120,36 @@ namespace AzToolsFramework
         return highestSelectableEntityId;
     }
 
+    void ContainerEntitySystemComponent::OnEntityStreamLoadSuccess()
+    {
+        // We don't yet support multiple entity contexts, so just use the default.
+        auto editorEntityContextId = AzFramework::EntityContextId::CreateNull();
+        EditorEntityContextRequestBus::BroadcastResult(editorEntityContextId, &EditorEntityContextRequests::GetEditorEntityContextId);
+
+        Clear(editorEntityContextId);
+    }
+
+    ContainerEntityOperationResult ContainerEntitySystemComponent::Clear(AzFramework::EntityContextId entityContextId)
+    {
+        // We don't yet support multiple entity contexts, so only clear the default.
+        auto editorEntityContextId = AzFramework::EntityContextId::CreateNull();
+        EditorEntityContextRequestBus::BroadcastResult(editorEntityContextId, &EditorEntityContextRequests::GetEditorEntityContextId);
+
+        if (entityContextId != editorEntityContextId)
+        {
+            return AZ::Failure(AZStd::string(
+                "Error in ContainerEntitySystemComponent::Clear - cannot clear non-default Entity Context!"));
+        }
+
+        if (!m_containers.empty())
+        {
+            return AZ::Failure(AZStd::string(
+                "Error in ContainerEntitySystemComponent::Clear - cannot clear container states if entities are still registered!"));
+        }
+
+        m_openContainers.clear();
+
+        return AZ::Success();
+    }
+
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.h
index 18c0fb70c6..44261979ef 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.h
@@ -12,6 +12,7 @@
 #include <AzCore/Memory/SystemAllocator.h>
 
 #include <AzToolsFramework/ContainerEntity/ContainerEntityInterface.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
 
 namespace AzToolsFramework
 {
@@ -23,6 +24,7 @@ namespace AzToolsFramework
     class ContainerEntitySystemComponent final
         : public AZ::Component
         , private ContainerEntityInterface
+        , private EditorEntityContextNotificationBus::Handler
     {
     public:
         AZ_COMPONENT(ContainerEntitySystemComponent, "{74349759-B36B-44A6-B89F-F45D7111DD11}");
@@ -42,9 +44,13 @@ namespace AzToolsFramework
         ContainerEntityOperationResult RegisterEntityAsContainer(AZ::EntityId entityId) override;
         ContainerEntityOperationResult UnregisterEntityAsContainer(AZ::EntityId entityId) override;
         bool IsContainer(AZ::EntityId entityId) const override;
-        ContainerEntityOperationResult SetContainerOpenState(AZ::EntityId entityId, bool open) override;
+        ContainerEntityOperationResult SetContainerOpen(AZ::EntityId entityId, bool open) override;
         bool IsContainerOpen(AZ::EntityId entityId) const override;
         AZ::EntityId FindHighestSelectableEntity(AZ::EntityId entityId) const override;
+        ContainerEntityOperationResult Clear(AzFramework::EntityContextId entityContextId) override;
+
+        // EditorEntityContextNotificationBus overrides ...
+        void OnEntityStreamLoadSuccess() override;
 
     private:
         AZStd::unordered_set<AZ::EntityId> m_containers;      //!< All entities in this set are containers.
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
index 9ffc18af5a..fcec1edd54 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
@@ -196,6 +196,9 @@ namespace AzToolsFramework::Prefab
             Initialize();
         }
 
+        // Clear the old focus vector
+        m_instanceFocusVector.clear();
+
         // Focus on the root prefab (AZ::EntityId() will default to it)
         FocusOnOwningPrefab(AZ::EntityId());
     }
@@ -230,7 +233,7 @@ namespace AzToolsFramework::Prefab
         {
             if (instance.has_value())
             {
-                m_containerEntityInterface->SetContainerOpenState(instance->get().GetContainerEntityId(), true);
+                m_containerEntityInterface->SetContainerOpen(instance->get().GetContainerEntityId(), true);
             }
         }
     }
@@ -241,7 +244,7 @@ namespace AzToolsFramework::Prefab
         {
             if (instance.has_value())
             {
-                m_containerEntityInterface->SetContainerOpenState(instance->get().GetContainerEntityId(), false);
+                m_containerEntityInterface->SetContainerOpen(instance->get().GetContainerEntityId(), false);
             }
         }
     }
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntitySelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntitySelectionTests.cpp
new file mode 100644
index 0000000000..a47e41da42
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntitySelectionTests.cpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <Tests/FocusMode/EditorFocusModeSelectionFixture.h>
+
+namespace AzToolsFramework
+{
+    TEST_F(EditorFocusModeSelectionFixture, ContainerEntitySelectionTests_FindHighestSelectableEntityWithNoContainers)
+    {
+        // When no containers are in the way, the function will just return the entityId of the entity that was clicked.
+        
+        // Click on Car Entity
+        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+
+        // Verify the correct entity is selected
+        auto selectedEntitiesAfter = GetSelectedEntities();
+        EXPECT_EQ(selectedEntitiesAfter.size(), 1);
+        EXPECT_EQ(selectedEntitiesAfter.front(), m_entityMap[CarEntityName]);
+    }
+
+    TEST_F(EditorFocusModeSelectionFixture, ContainerEntitySelectionTests_FindHighestSelectableEntityWithClosedContainer)
+    {
+        // If a closed container is an ancestor of the queried entity, the closed container is selected.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[StreetEntityName]); // Containers are closed by default
+
+        // Click on Car Entity
+        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+
+        // Verify the correct entity is selected
+        auto selectedEntitiesAfter = GetSelectedEntities();
+        EXPECT_EQ(selectedEntitiesAfter.size(), 1);
+        EXPECT_EQ(selectedEntitiesAfter.front(), m_entityMap[StreetEntityName]);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[StreetEntityName]);
+    }
+
+    TEST_F(EditorFocusModeSelectionFixture, ContainerEntitySelectionTests_FindHighestSelectableEntityWithOpenContainer)
+    {
+        // If a closed container is an ancestor of the queried entity, the closed container is selected.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        m_containerEntityInterface->SetContainerOpen(m_entityMap[StreetEntityName], true);
+
+        // Click on Car Entity
+        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+
+        // Verify the correct entity is selected
+        auto selectedEntitiesAfter = GetSelectedEntities();
+        EXPECT_EQ(selectedEntitiesAfter.size(), 1);
+        EXPECT_EQ(selectedEntitiesAfter.front(), m_entityMap[CarEntityName]);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[StreetEntityName]);
+    }
+
+    TEST_F(EditorFocusModeSelectionFixture, ContainerEntitySelectionTests_FindHighestSelectableEntityWithMultipleClosedContainers)
+    {
+        // If multiple closed containers are ancestors of the queried entity, the highest closed container is selected.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CityEntityName]);
+
+        // Click on Car Entity
+        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+
+        // Verify the correct entity is selected
+        auto selectedEntitiesAfter = GetSelectedEntities();
+        EXPECT_EQ(selectedEntitiesAfter.size(), 1);
+        EXPECT_EQ(selectedEntitiesAfter.front(), m_entityMap[CityEntityName]);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CityEntityName]);
+    }
+
+    TEST_F(EditorFocusModeSelectionFixture, ContainerEntitySelectionTests_FindHighestSelectableEntityWithMultipleContainers)
+    {
+        // If multiple containers are ancestors of the queried entity, the highest closed container is selected.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CityEntityName]);
+        m_containerEntityInterface->SetContainerOpen(m_entityMap[CityEntityName], true);
+
+        // Click on Car Entity
+        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+
+        // Verify the correct entity is selected
+        auto selectedEntitiesAfter = GetSelectedEntities();
+        EXPECT_EQ(selectedEntitiesAfter.size(), 1);
+        EXPECT_EQ(selectedEntitiesAfter.front(), m_entityMap[StreetEntityName]);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CityEntityName]);
+    }
+}
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntityTests.cpp b/Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntityTests.cpp
new file mode 100644
index 0000000000..031062f027
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntityTests.cpp
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <Tests/FocusMode/EditorFocusModeFixture.h>
+
+namespace AzToolsFramework
+{
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_Register)
+    {
+        // Registering an entity is successful.
+        auto outcome = m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CarEntityName]);
+        EXPECT_TRUE(outcome.IsSuccess());
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CarEntityName]);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_RegisterTwice)
+    {
+        // Registering an entity twice fails.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CarEntityName]);
+        auto outcome = m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CarEntityName]);
+        EXPECT_FALSE(outcome.IsSuccess());
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CarEntityName]);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_Unregister)
+    {
+        // Unregistering a container entity is successful.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CarEntityName]);
+        auto outcome = m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CarEntityName]);
+        EXPECT_TRUE(outcome.IsSuccess());
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_UnregisterRegularEntity)
+    {
+        // Unregistering an entity that was not previously registered fails.
+        auto outcome = m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CarEntityName]);
+        EXPECT_FALSE(outcome.IsSuccess());
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_UnregisterTwice)
+    {
+        // Unregistering a container entity twice fails.
+        auto outcome = m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CarEntityName]);
+        EXPECT_FALSE(outcome.IsSuccess());
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_IsContainerOnRegularEntity)
+    {
+        // If a regular entity is passed, IsContainer returns false.
+        // Note that we use a different entity than the tests above to validate a completely new EntityId.
+        bool isContainer = m_containerEntityInterface->IsContainer(m_entityMap[SportsCarEntityName]);
+        EXPECT_FALSE(isContainer);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_IsContainerOnRegisteredContainer)
+    {
+        // If a container entity is passed, IsContainer returns true.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[SportsCarEntityName]);
+        bool isContainer = m_containerEntityInterface->IsContainer(m_entityMap[SportsCarEntityName]);
+        EXPECT_TRUE(isContainer);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[SportsCarEntityName]);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_IsContainerOnUnRegisteredContainer)
+    {
+        // If an entity that was previously a container but was then unregistered is passed, IsContainer returns false.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[SportsCarEntityName]);
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[SportsCarEntityName]);
+
+        bool isContainer = m_containerEntityInterface->IsContainer(m_entityMap[SportsCarEntityName]);
+        EXPECT_FALSE(isContainer);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_SetContainerOpenOnRegularEntity)
+    {
+        // Setting a regular entity to open should return a failure.
+        auto outcome = m_containerEntityInterface->SetContainerOpen(m_entityMap[StreetEntityName], true);
+        EXPECT_FALSE(outcome.IsSuccess());
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_SetContainerOpen)
+    {
+        // Set a container entity to open, and verify the operation was successful.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        auto outcome = m_containerEntityInterface->SetContainerOpen(m_entityMap[StreetEntityName], true);
+        EXPECT_TRUE(outcome.IsSuccess());
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[StreetEntityName]);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_SetContainerOpenTwice)
+    {
+        // Set a container entity to open twice, and verify that does not cause a failure (as intended).
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        m_containerEntityInterface->SetContainerOpen(m_entityMap[StreetEntityName], true);
+        auto outcome = m_containerEntityInterface->SetContainerOpen(m_entityMap[StreetEntityName], true);
+        EXPECT_TRUE(outcome.IsSuccess());
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[StreetEntityName]);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_SetContainerClosed)
+    {
+        // Set a container entity to closed, and verify the operation was successful.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        auto outcome = m_containerEntityInterface->SetContainerOpen(m_entityMap[StreetEntityName], true);
+        EXPECT_TRUE(outcome.IsSuccess());
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[StreetEntityName]);
+    }
+    
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_IsContainerOpenOnRegularEntity)
+    {
+        // Query open state on a regular entity, and verify it returns true.
+        // Open containers behave exactly as regular entities, so this is the expected return value.
+        bool isOpen = m_containerEntityInterface->IsContainerOpen(m_entityMap[CityEntityName]);
+        EXPECT_TRUE(isOpen);
+    }
+    
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_IsContainerOpenOnDefaultContainerEntity)
+    {
+        // Query open state on a newly registered container entity, and verify it returns false.
+        // Containers are registered closed by default.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CityEntityName]);
+        bool isOpen = m_containerEntityInterface->IsContainerOpen(m_entityMap[CityEntityName]);
+        EXPECT_FALSE(isOpen);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CityEntityName]);
+    }
+    
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_IsContainerOpenOnOpenContainerEntity)
+    {
+        // Query open state on a container entity that was opened, and verify it returns true.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CityEntityName]);
+        m_containerEntityInterface->SetContainerOpen(m_entityMap[CityEntityName], true);
+        bool isOpen = m_containerEntityInterface->IsContainerOpen(m_entityMap[CityEntityName]);
+        EXPECT_TRUE(isOpen);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CityEntityName]);
+    }
+    
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_IsContainerOpenOnClosedContainerEntity)
+    {
+        // Query open state on a container entity that was opened and then closed, and verify it returns false.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CityEntityName]);
+        m_containerEntityInterface->SetContainerOpen(m_entityMap[CityEntityName], true);
+        m_containerEntityInterface->SetContainerOpen(m_entityMap[CityEntityName], false);
+        bool isOpen = m_containerEntityInterface->IsContainerOpen(m_entityMap[CityEntityName]);
+        EXPECT_FALSE(isOpen);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CityEntityName]);
+    }
+    
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_ContainerOpenStateIsPreserved)
+    {
+        // Register an entity as container, open it, then unregister it.
+        // When the entity is registered again, the open state should be preserved.
+        // This behavior is necessary for the system to work alongside Prefab propagation refreshes.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CityEntityName]);
+        m_containerEntityInterface->SetContainerOpen(m_entityMap[CityEntityName], true);
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CityEntityName]);
+
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CityEntityName]);
+        bool isOpen = m_containerEntityInterface->IsContainerOpen(m_entityMap[CityEntityName]);
+        EXPECT_TRUE(isOpen);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[CityEntityName]);
+    }
+    
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_ClearSucceeds)
+    {
+        // The Clear function works if no container is registered.
+        auto outcome = m_containerEntityInterface->Clear(m_editorEntityContextId);
+        EXPECT_TRUE(outcome.IsSuccess());
+    }
+    
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_ClearFailsIfContainersAreStillRegistered)
+    {
+        // The Clear function fails if a container is registered.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[Passenger1EntityName]);
+        auto outcome = m_containerEntityInterface->Clear(m_editorEntityContextId);
+        EXPECT_FALSE(outcome.IsSuccess());
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[Passenger1EntityName]);
+    }
+    
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_ClearSucceedsIfContainersAreUnregistered)
+    {
+        // The Clear function fails if a container is registered.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[Passenger1EntityName]);
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[Passenger1EntityName]);
+        auto outcome = m_containerEntityInterface->Clear(m_editorEntityContextId);
+        EXPECT_TRUE(outcome.IsSuccess());
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_ClearDeletesPreservedOpenStates)
+    {
+        // Register an entity as container, open it, unregister it, then call clear.
+        // When the entity is registered again, the open state should not be preserved.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[Passenger1EntityName]);
+        m_containerEntityInterface->SetContainerOpen(m_entityMap[Passenger1EntityName], true);
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[Passenger1EntityName]);
+
+        m_containerEntityInterface->Clear(m_editorEntityContextId);
+
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[Passenger1EntityName]);
+        bool isOpen = m_containerEntityInterface->IsContainerOpen(m_entityMap[Passenger1EntityName]);
+        EXPECT_FALSE(isOpen);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[Passenger1EntityName]);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_FindHighestSelectableEntityWithNoContainers)
+    {
+        // When no containers are in the way, the function will just return the entityId that was passed to it.
+        AZ::EntityId selectedEntityId = m_containerEntityInterface->FindHighestSelectableEntity(m_entityMap[Passenger2EntityName]);
+        EXPECT_EQ(selectedEntityId, m_entityMap[Passenger2EntityName]);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_FindHighestSelectableEntityWithClosedContainer)
+    {
+        // If a closed container is an ancestor of the queried entity, the closed container is selected.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[SportsCarEntityName]); // Containers are closed by default
+        AZ::EntityId selectedEntityId = m_containerEntityInterface->FindHighestSelectableEntity(m_entityMap[Passenger2EntityName]);
+        EXPECT_EQ(selectedEntityId, m_entityMap[SportsCarEntityName]);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[SportsCarEntityName]);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_FindHighestSelectableEntityWithOpenContainer)
+    {
+        // If an open container is an ancestor of the queried entity, it is ignored.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[SportsCarEntityName]);
+        m_containerEntityInterface->SetContainerOpen(m_entityMap[SportsCarEntityName], true);
+
+        AZ::EntityId selectedEntityId = m_containerEntityInterface->FindHighestSelectableEntity(m_entityMap[Passenger2EntityName]);
+        EXPECT_EQ(selectedEntityId, m_entityMap[Passenger2EntityName]);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[SportsCarEntityName]);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_FindHighestSelectableEntityWithMultipleClosedContainers)
+    {
+        // If multiple closed containers are ancestors of the queried entity, the highest closed container is selected.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[SportsCarEntityName]);
+
+        AZ::EntityId selectedEntityId = m_containerEntityInterface->FindHighestSelectableEntity(m_entityMap[Passenger2EntityName]);
+        EXPECT_EQ(selectedEntityId, m_entityMap[StreetEntityName]);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[SportsCarEntityName]);
+    }
+
+    TEST_F(EditorFocusModeFixture, ContainerEntityTests_FindHighestSelectableEntityWithMultipleContainers)
+    {
+        // If multiple containers are ancestors of the queried entity, the highest closed container is selected.
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[SportsCarEntityName]);
+        m_containerEntityInterface->SetContainerOpen(m_entityMap[StreetEntityName], true);
+
+        AZ::EntityId selectedEntityId = m_containerEntityInterface->FindHighestSelectableEntity(m_entityMap[Passenger2EntityName]);
+        EXPECT_EQ(selectedEntityId, m_entityMap[SportsCarEntityName]);
+
+        // Restore default state for other tests.
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[StreetEntityName]);
+        m_containerEntityInterface->UnregisterEntityAsContainer(m_entityMap[SportsCarEntityName]);
+    }
+
+}
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.cpp b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.cpp
index c309261a27..49bf7cee15 100644
--- a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.cpp
@@ -14,6 +14,20 @@
 
 namespace AzToolsFramework
 {
+    void ClearSelectedEntities()
+    {
+        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+            &AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList());
+    }
+
+    AzToolsFramework::EntityIdList EditorFocusModeFixture::GetSelectedEntities()
+    {
+        AzToolsFramework::EntityIdList selectedEntities;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            selectedEntities, &AzToolsFramework::ToolsApplicationRequestBus::Events::GetSelectedEntities);
+        return selectedEntities;
+    }
+
     void EditorFocusModeFixture::SetUpEditorFixtureImpl()
     {
         // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
@@ -21,6 +35,9 @@ namespace AzToolsFramework
         // in the unit tests.
         AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
 
+        m_containerEntityInterface = AZ::Interface<ContainerEntityInterface>::Get();
+        ASSERT_TRUE(m_containerEntityInterface != nullptr);
+
         m_focusModeInterface = AZ::Interface<FocusModeInterface>::Get();
         ASSERT_TRUE(m_focusModeInterface != nullptr);
 
@@ -31,6 +48,24 @@ namespace AzToolsFramework
             m_editorEntityContextId, &AzToolsFramework::EditorEntityContextRequestBus::Events::GetEditorEntityContextId);
 
         GenerateTestHierarchy();
+
+        // Clear the focus, disabling focus mode
+        m_focusModeInterface->ClearFocusRoot(m_editorEntityContextId);
+
+        // Clear selection
+        ClearSelectedEntities();
+    }
+
+    void EditorFocusModeFixture::TearDownEditorFixtureImpl()
+    {
+        // Clear Container Entity preserved open states
+        m_containerEntityInterface->Clear(m_editorEntityContextId);
+
+        // Clear the focus, disabling focus mode
+        m_focusModeInterface->ClearFocusRoot(m_editorEntityContextId);
+
+        // Clear selection
+        ClearSelectedEntities();
     }
 
     void EditorFocusModeFixture::GenerateTestHierarchy() 
@@ -59,7 +94,7 @@ namespace AzToolsFramework
         entity->Activate();
 
         // Move the CarEntity so it's out of the way.
-        AZ::TransformBus::Event(m_entityMap[CarEntityName], &AZ::TransformBus::Events::SetWorldTranslation, CarEntityPosition);
+        AZ::TransformBus::Event(m_entityMap[CarEntityName], &AZ::TransformBus::Events::SetWorldTranslation, WorldCarEntityPosition);
 
         // Setup the camera so the Car entity is in view.
         AzFramework::SetCameraTransform(
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.h b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.h
index f038408012..c48795a3a4 100644
--- a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.h
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.h
@@ -14,6 +14,7 @@
 
 #include <AzTest/AzTest.h>
 
+#include <AzToolsFramework/ContainerEntity/ContainerEntityInterface.h>
 #include <AzToolsFramework/FocusMode/FocusModeInterface.h>
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
 
@@ -24,16 +25,20 @@ namespace AzToolsFramework
     {
     protected:
         void SetUpEditorFixtureImpl() override;
+        void TearDownEditorFixtureImpl() override;
 
         void GenerateTestHierarchy();
         AZ::EntityId CreateEditorEntity(const char* name, AZ::EntityId parentId);
 
         AZStd::unordered_map<AZStd::string, AZ::EntityId> m_entityMap;
+
+        ContainerEntityInterface* m_containerEntityInterface = nullptr;
         FocusModeInterface* m_focusModeInterface = nullptr;
 
     public:
-        AzFramework::EntityContextId m_editorEntityContextId = AzFramework::EntityContextId::CreateNull();
+        AzToolsFramework::EntityIdList GetSelectedEntities();
 
+        AzFramework::EntityContextId m_editorEntityContextId = AzFramework::EntityContextId::CreateNull();
         AzFramework::CameraState m_cameraState;
 
         inline static const AZ::Vector3 CameraPosition = AZ::Vector3(10.0f, 15.0f, 10.0f);
@@ -45,6 +50,7 @@ namespace AzToolsFramework
         inline static const char* Passenger1EntityName = "Passenger1";
         inline static const char* Passenger2EntityName = "Passenger2";
 
-        inline static AZ::Vector3 CarEntityPosition = AZ::Vector3(5.0f, 15.0f, 0.0f);
+        inline static AZ::Vector3 WorldCarEntityPosition = AZ::Vector3(5.0f, 15.0f, 0.0f);
     };
+
 }
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionFixture.h b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionFixture.h
new file mode 100644
index 0000000000..4c9369bc46
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionFixture.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <Tests/FocusMode/EditorFocusModeFixture.h>
+
+#include <AzCore/Component/TransformBus.h>
+#include <AzCore/std/string/string.h>
+
+#include <AzFramework/Viewport/ViewportScreen.h>
+
+#include <AzManipulatorTestFramework/AzManipulatorTestFramework.h>
+#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkTestHelpers.h>
+#include <AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h>
+#include <AzManipulatorTestFramework/ImmediateModeActionDispatcher.h>
+#include <AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h>
+
+#include <AzToolsFramework/Component/EditorComponentAPIBus.h>
+#include <AzToolsFramework/Manipulators/LinearManipulator.h>
+#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
+#include <AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h>
+
+namespace AzToolsFramework
+{
+    class EditorFocusModeSelectionFixture : public UnitTest::IndirectCallManipulatorViewportInteractionFixtureMixin<EditorFocusModeFixture>
+    {
+    public:
+        void ClickAtWorldPositionOnViewport(const AZ::Vector3& worldPosition)
+        {
+            // Calculate the world position in screen space
+            const auto carScreenPosition = AzFramework::WorldToScreen(worldPosition, m_cameraState);
+
+            // Click the entity in the viewport
+            m_actionDispatcher->CameraState(m_cameraState)->MousePosition(carScreenPosition)->MouseLButtonDown()->MouseLButtonUp();
+        }
+    };
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionTests.cpp
index 968bb3f293..2f746c9d63 100644
--- a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionTests.cpp
@@ -6,64 +6,14 @@
  *
  */
 
-#include <Tests/FocusMode/EditorFocusModeFixture.h>
-
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/std/string/string.h>
-
-#include <AzFramework/Viewport/ViewportScreen.h>
-
-#include <AzManipulatorTestFramework/AzManipulatorTestFramework.h>
-#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkTestHelpers.h>
-#include <AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h>
-#include <AzManipulatorTestFramework/ImmediateModeActionDispatcher.h>
-#include <AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h>
-
-#include <AzToolsFramework/Component/EditorComponentAPIBus.h>
-#include <AzToolsFramework/Manipulators/LinearManipulator.h>
-#include <AzToolsFramework/Manipulators/ManipulatorManager.h>
-#include <AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h>
-
+#include <Tests/FocusMode/EditorFocusModeSelectionFixture.h>
 
 namespace AzToolsFramework
 {
-    class EditorFocusModeSelectionFixture
-        : public UnitTest::IndirectCallManipulatorViewportInteractionFixtureMixin<EditorFocusModeFixture>
-    {
-    public:
-        void ClickAtWorldPositionOnViewport(const AZ::Vector3& worldPosition)
-        {
-            // Calculate the world position in screen space
-            const auto carScreenPosition = AzFramework::WorldToScreen(worldPosition, m_cameraState);
-
-            // Click the entity in the viewport
-            m_actionDispatcher->CameraState(m_cameraState)->MousePosition(carScreenPosition)->MouseLButtonDown()->MouseLButtonUp();
-        }
-    };
-
-    void ClearSelectedEntities()
-    {
-        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-            &AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList());
-    }
-
-    AzToolsFramework::EntityIdList GetSelectedEntities()
-    {
-        AzToolsFramework::EntityIdList selectedEntities;
-        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
-            selectedEntities, &AzToolsFramework::ToolsApplicationRequestBus::Events::GetSelectedEntities);
-        return selectedEntities;
-    }
-
     TEST_F(EditorFocusModeSelectionFixture, EditorFocusModeSelectionTests_SelectEntityWithFocusOnLevel)
     {
-        // Clear the focus, disabling focus mode
-        m_focusModeInterface->ClearFocusRoot(AzFramework::EntityContextId::CreateNull());
-        // Clear selection
-        ClearSelectedEntities();
-
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(CarEntityPosition);
+        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
 
         // Verify entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
@@ -75,73 +25,53 @@ namespace AzToolsFramework
     {
         // Set the focus on the Street Entity (parent of the test entity)
         m_focusModeInterface->SetFocusRoot(m_entityMap[StreetEntityName]);
-        // Clear selection
-        ClearSelectedEntities();
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(CarEntityPosition);
+        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
 
         // Verify entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
         EXPECT_EQ(selectedEntitiesAfter.size(), 1);
         EXPECT_EQ(selectedEntitiesAfter.front(), m_entityMap[CarEntityName]);
-
-        // Clear the focus, disabling focus mode
-        m_focusModeInterface->ClearFocusRoot(AzFramework::EntityContextId::CreateNull());
     }
 
     TEST_F(EditorFocusModeSelectionFixture, EditorFocusModeSelectionTests_SelectEntityWithFocusOnItself)
     {
         // Set the focus on the Car Entity (test entity)
         m_focusModeInterface->SetFocusRoot(m_entityMap[CarEntityName]);
-        // Clear selection
-        ClearSelectedEntities();
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(CarEntityPosition);
+        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
 
         // Verify entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
         EXPECT_EQ(selectedEntitiesAfter.size(), 1);
         EXPECT_EQ(selectedEntitiesAfter.front(), m_entityMap[CarEntityName]);
-
-        // Clear the focus, disabling focus mode
-        m_focusModeInterface->ClearFocusRoot(AzFramework::EntityContextId::CreateNull());
     }
 
     TEST_F(EditorFocusModeSelectionFixture, EditorFocusModeSelectionTests_SelectEntityWithFocusOnSibling)
     {
         // Set the focus on the SportsCar Entity (sibling of the test entity)
         m_focusModeInterface->SetFocusRoot(m_entityMap[SportsCarEntityName]);
-        // Clear selection
-        ClearSelectedEntities();
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(CarEntityPosition);
+        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
 
         // Verify entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
         EXPECT_EQ(selectedEntitiesAfter.size(), 0);
-
-        // Clear the focus, disabling focus mode
-        m_focusModeInterface->ClearFocusRoot(AzFramework::EntityContextId::CreateNull());
     }
 
     TEST_F(EditorFocusModeSelectionFixture, EditorFocusModeSelectionTests_SelectEntityWithFocusOnDescendant)
     {
         // Set the focus on the Passenger1 Entity (child of the entity)
         m_focusModeInterface->SetFocusRoot(m_entityMap[Passenger1EntityName]);
-        // Clear selection
-        ClearSelectedEntities();
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(CarEntityPosition);
+        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
 
         // Verify entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
         EXPECT_EQ(selectedEntitiesAfter.size(), 0);
-
-        // Clear the focus, disabling focus mode
-        m_focusModeInterface->ClearFocusRoot(AzFramework::EntityContextId::CreateNull());
     }
 }
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeTests.cpp b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeTests.cpp
index 22bc7a494c..eec3902f99 100644
--- a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeTests.cpp
@@ -33,55 +33,40 @@ namespace AzToolsFramework
     TEST_F(EditorFocusModeFixture, EditorFocusModeTests_IsInFocusSubTree_AncestorsDescendants)
     {
         // When the focus is set to an entity, all its descendants are in the focus subtree while the ancestors aren't.
-        {
-            m_focusModeInterface->SetFocusRoot(m_entityMap[StreetEntityName]);
+        m_focusModeInterface->SetFocusRoot(m_entityMap[StreetEntityName]);
 
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CityEntityName]), false);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[StreetEntityName]), true);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CarEntityName]), true);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger1EntityName]), true);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[SportsCarEntityName]), true);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger2EntityName]), true);
-        }
-
-        // Restore default expected focus.
-        m_focusModeInterface->ClearFocusRoot(m_editorEntityContextId);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CityEntityName]), false);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[StreetEntityName]), true);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CarEntityName]), true);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger1EntityName]), true);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[SportsCarEntityName]), true);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger2EntityName]), true);
     }
 
     TEST_F(EditorFocusModeFixture, EditorFocusModeTests_IsInFocusSubTree_Siblings)
     {
         // If the root entity has siblings, they are also outside of the focus subtree.
-        {
-            m_focusModeInterface->SetFocusRoot(m_entityMap[CarEntityName]);
+        m_focusModeInterface->SetFocusRoot(m_entityMap[CarEntityName]);
 
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CityEntityName]), false);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[StreetEntityName]), false);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CarEntityName]), true);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger1EntityName]), true);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[SportsCarEntityName]), false);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger2EntityName]), false);
-        }
-
-        // Restore default expected focus.
-        m_focusModeInterface->ClearFocusRoot(m_editorEntityContextId);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CityEntityName]), false);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[StreetEntityName]), false);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CarEntityName]), true);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger1EntityName]), true);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[SportsCarEntityName]), false);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger2EntityName]), false);
     }
 
     TEST_F(EditorFocusModeFixture, EditorFocusModeTests_IsInFocusSubTree_Leaf)
     {
         // If the root is a leaf, then the focus subtree will consists of just that entity.
-        {
-            m_focusModeInterface->SetFocusRoot(m_entityMap[Passenger2EntityName]);
+        m_focusModeInterface->SetFocusRoot(m_entityMap[Passenger2EntityName]);
 
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CityEntityName]), false);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[StreetEntityName]), false);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CarEntityName]), false);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger1EntityName]), false);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[SportsCarEntityName]), false);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger2EntityName]), true);
-        }
-
-        // Restore default expected focus.
-        m_focusModeInterface->ClearFocusRoot(m_editorEntityContextId);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CityEntityName]), false);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[StreetEntityName]), false);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CarEntityName]), false);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger1EntityName]), false);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[SportsCarEntityName]), false);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger2EntityName]), true);
     }
 
     TEST_F(EditorFocusModeFixture, EditorFocusModeTests_IsInFocusSubTree_Clear)
@@ -90,15 +75,13 @@ namespace AzToolsFramework
         m_focusModeInterface->SetFocusRoot(m_entityMap[StreetEntityName]);
 
         // When the focus is cleared, the whole level is in the focus subtree; so we expect all entities to return true.
-        {
-            m_focusModeInterface->ClearFocusRoot(m_editorEntityContextId);
+        m_focusModeInterface->ClearFocusRoot(m_editorEntityContextId);
 
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CityEntityName]), true);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[StreetEntityName]), true);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CarEntityName]), true);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger1EntityName]), true);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[SportsCarEntityName]), true);
-            EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger2EntityName]), true);
-        }
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CityEntityName]), true);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[StreetEntityName]), true);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[CarEntityName]), true);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger1EntityName]), true);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[SportsCarEntityName]), true);
+        EXPECT_EQ(m_focusModeInterface->IsInFocusSubTree(m_entityMap[Passenger2EntityName]), true);
     }
 }
diff --git a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
index 87d522c4a6..ef6774f620 100644
--- a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
+++ b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
@@ -37,8 +37,11 @@ set(FILES
     EntityTestbed.h
     FileFunc.cpp
     FingerprintingTests.cpp
+    FocusMode/ContainerEntitySelectionTests.cpp
+    FocusMode/ContainerEntityTests.cpp
     FocusMode/EditorFocusModeFixture.cpp
     FocusMode/EditorFocusModeFixture.h
+    FocusMode/EditorFocusModeSelectionFixture.h
     FocusMode/EditorFocusModeSelectionTests.cpp
     FocusMode/EditorFocusModeTests.cpp
     GenericComponentWrapperTest.cpp

From f7e08d1c4bcfc983fc8d5f035b03a81673bf00a6 Mon Sep 17 00:00:00 2001
From: Guthrie Adams <guthadam@amazon.com>
Date: Tue, 12 Oct 2021 15:36:19 -0500
Subject: [PATCH 12/29] =?UTF-8?q?PropertyAssetCtrl=20and=20ThumbnailProper?=
 =?UTF-8?q?tyCtrl=20support=20custom=20thumbnail=20images=20=E2=80=A2=20Pr?=
 =?UTF-8?q?opertyAssetCtrl=20was=20previously=20extended=20with=20Thumbnai?=
 =?UTF-8?q?lPropertyCtrl=20to=20optionally=20display=20a=20thumbnail=20and?=
 =?UTF-8?q?=20floating=20zoomed=20in=20preview=20of=20the=20selected=20ass?=
 =?UTF-8?q?et.=20=E2=80=A2=20This=20change=20allows=20overriding=20the=20i?=
 =?UTF-8?q?mage=20that=20comes=20from=20the=20thumbnail=20system=20with=20?=
 =?UTF-8?q?a=20custom=20image=20provided=20as=20an=20attribute.=20The=20cu?=
 =?UTF-8?q?stom=20image=20can=20be=20specified=20as=20either=20a=20file=20?=
 =?UTF-8?q?path=20or=20a=20buffer=20containing=20a=20serialized=20QPixmap.?=
 =?UTF-8?q?=20=E2=80=A2=20This=20will=20be=20used=20by=20the=20material=20?=
 =?UTF-8?q?system=20in=20the=20editor=20to=20provide=20a=20dynamically=20r?=
 =?UTF-8?q?endered=20image=20of=20the=20material=20with=20property=20overr?=
 =?UTF-8?q?ides=20applied=20so=20that=20the=20image=20will=20update=20as?=
 =?UTF-8?q?=20the=20user=20customizes=20their=20material.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
---
 .../UI/PropertyEditor/PropertyAssetCtrl.cpp   |  57 +++++++-
 .../UI/PropertyEditor/PropertyAssetCtrl.hxx   |   5 +
 .../PropertyEditor/ThumbnailPropertyCtrl.cpp  | 131 +++++++++++-------
 .../UI/PropertyEditor/ThumbnailPropertyCtrl.h |  25 +++-
 4 files changed, 161 insertions(+), 57 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
index ba84e662c1..7f3b9e61fd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
@@ -28,6 +28,9 @@ AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option")
 #include <QTableView>
 #include <QHeaderView>
 #include <QPainter>
+#include <QPixmap>
+#include <QByteArray>
+#include <QDataStream>
 AZ_POP_DISABLE_WARNING
 
 #include <AzCore/Asset/AssetManager.h>
@@ -1230,6 +1233,16 @@ namespace AzToolsFramework
         return m_showThumbnailDropDownButton;
     }
 
+    void PropertyAssetCtrl::SetCustomThumbnailEnabled(bool enabled)
+    {
+        m_thumbnail->SetCustomThumbnailEnabled(enabled);
+    }
+
+    void PropertyAssetCtrl::SetCustomThumbnailPixmap(const QPixmap& pixmap)
+    {
+        m_thumbnail->SetCustomThumbnailPixmap(pixmap);
+    }
+
     void PropertyAssetCtrl::SetThumbnailCallback(EditCallbackType* editNotifyCallback)
     {
         m_thumbnailCallback = editNotifyCallback;
@@ -1356,15 +1369,27 @@ namespace AzToolsFramework
                 GUI->SetClearNotifyCallback(nullptr);
             }
         }
-        else if (attrib == AZ_CRC("BrowseIcon", 0x507d7a4f))
+        else if (attrib == AZ_CRC_CE("BrowseIcon"))
         {
             AZStd::string iconPath;
-            attrValue->Read<AZStd::string>(iconPath);
-
-            if (!iconPath.empty())
+            if (attrValue->Read<AZStd::string>(iconPath) && !iconPath.empty())
             {
                 GUI->SetBrowseButtonIcon(QIcon(iconPath.c_str()));
             }
+            else
+            {
+                // A QPixmap object can't be assigned directly via an attribute.
+                // This allows dynamic icon data to be supplied as a buffer containing a serialized QPixmap.
+                AZStd::vector<char> pixmapBuffer;
+                if (attrValue->Read<AZStd::vector<char>>(pixmapBuffer) && !pixmapBuffer.empty())
+                {
+                    QByteArray pixmapBytes(pixmapBuffer.data(), aznumeric_cast<int>(pixmapBuffer.size()));
+                    QDataStream stream(&pixmapBytes, QIODevice::ReadOnly);
+                    QPixmap pixmap;
+                    stream >> pixmap;
+                    GUI->SetBrowseButtonIcon(pixmap);
+                }
+            }
         }
         else if (attrib == AZ_CRC_CE("BrowseButtonEnabled"))
         {
@@ -1390,6 +1415,30 @@ namespace AzToolsFramework
                 GUI->SetShowThumbnail(showThumbnail);
             }
         }
+        else if (attrib == AZ_CRC_CE("ThumbnailIcon"))
+        {
+            AZStd::string iconPath;
+            if (attrValue->Read<AZStd::string>(iconPath) && !iconPath.empty())
+            {
+                GUI->SetCustomThumbnailEnabled(true);
+                GUI->SetCustomThumbnailPixmap(QPixmap::fromImage(QImage(iconPath.c_str())));
+            }
+            else
+            {
+                // A QPixmap object can't be assigned directly via an attribute.
+                // This allows dynamic icon data to be supplied as a buffer containing a serialized QPixmap.
+                AZStd::vector<char> pixmapBuffer;
+                if (attrValue->Read<AZStd::vector<char>>(pixmapBuffer) && !pixmapBuffer.empty())
+                {
+                    QByteArray pixmapBytes(pixmapBuffer.data(), aznumeric_cast<int>(pixmapBuffer.size()));
+                    QDataStream stream(&pixmapBytes, QIODevice::ReadOnly);
+                    QPixmap pixmap;
+                    stream >> pixmap;
+                    GUI->SetCustomThumbnailEnabled(true);
+                    GUI->SetCustomThumbnailPixmap(pixmap);
+                }
+            }
+        }
         else if (attrib == AZ_CRC_CE("ThumbnailCallback"))
         {
             PropertyAssetCtrl::EditCallbackType* func = azdynamic_cast<PropertyAssetCtrl::EditCallbackType*>(attrValue->GetAttribute());
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
index cc4aff5649..0b98278bc5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
@@ -217,12 +217,17 @@ namespace AzToolsFramework
         void SetHideProductFilesInAssetPicker(bool hide);
         bool GetHideProductFilesInAssetPicker() const;
 
+        // Enable and configure a thumbnail widget that displays an asset preview and dropdown arrow for a dropdown menu
         void SetShowThumbnail(bool enable);
         bool GetShowThumbnail() const;
         void SetShowThumbnailDropDownButton(bool enable);
         bool GetShowThumbnailDropDownButton() const;
         void SetThumbnailCallback(EditCallbackType* editNotifyCallback);
 
+        // If enabled, replaces the thumbnail widget content with a custom pixmap
+        void SetCustomThumbnailEnabled(bool enabled);
+        void SetCustomThumbnailPixmap(const QPixmap& pixmap);
+
         void SetSelectedAssetID(const AZ::Data::AssetId& newID);
         void SetCurrentAssetType(const AZ::Data::AssetType& newType);
         void SetSelectedAssetID(const AZ::Data::AssetId& newID, const AZ::Data::AssetType& newType);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
index c458f7c47e..d8ddee6b76 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
@@ -7,75 +7,117 @@
  */
 
 #include <AzToolsFramework/Debug/TraceContext.h>
-AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // 4251: 'QRawFont::d': class 'QExplicitlySharedDataPointer<QRawFontPrivate>' needs to have dll-interface to be used by clients of class 'QRawFont'
-                                                               // 4800: 'QTextEngine *const ': forcing value to bool 'true' or 'false' (performance warning)
-#include <QLabel>
-#include <QHBoxLayout>
-#include <QEvent>
-#include <QPainter>
-#include <UI/UICore/AspectRatioAwarePixmapWidget.hxx>
-#include <Thumbnails/ThumbnailWidget.h>
+
+// 4251: 'QRawFont::d': class 'QExplicitlySharedDataPointer<QRawFontPrivate>' needs to have dll-interface to be used by clients of class
+// 'QRawFont' 4800: 'QTextEngine *const ': forcing value to bool 'true' or 'false' (performance warning)
+AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option")
 #include <QApplication>
+#include <QEvent>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPainter>
+#include <Thumbnails/ThumbnailWidget.h>
+#include <UI/UICore/AspectRatioAwarePixmapWidget.hxx>
 AZ_POP_DISABLE_WARNING
 #include "ThumbnailPropertyCtrl.h"
 
 namespace AzToolsFramework
 {
-
     ThumbnailPropertyCtrl::ThumbnailPropertyCtrl(QWidget* parent)
         : QWidget(parent)
     {
-        QHBoxLayout* pLayout = new QHBoxLayout();
-        pLayout->setContentsMargins(0, 0, 0, 0);
-        pLayout->setSpacing(0);
-
         m_thumbnail = new Thumbnailer::ThumbnailWidget(this);
         m_thumbnail->setFixedSize(QSize(24, 24));
 
+        m_thumbnailEnlarged = new Thumbnailer::ThumbnailWidget(this);
+        m_thumbnailEnlarged->setFixedSize(QSize(180, 180));
+        m_thumbnailEnlarged->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
+
+        m_customThumbnail = new QLabel(this);
+        m_customThumbnail->setFixedSize(QSize(24, 24));
+        m_customThumbnail->setScaledContents(true);
+
+        m_customThumbnailEnlarged = new QLabel(this);
+        m_customThumbnailEnlarged->setFixedSize(QSize(180, 180));
+        m_customThumbnailEnlarged->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
+        m_customThumbnailEnlarged->setScaledContents(true);
+
         m_dropDownArrow = new AspectRatioAwarePixmapWidget(this);
         m_dropDownArrow->setPixmap(QPixmap(":/stylesheet/img/triangle0.png"));
         m_dropDownArrow->setFixedSize(QSize(8, 24));
-        ShowDropDownArrow(false);
 
         m_emptyThumbnail = new QLabel(this);
         m_emptyThumbnail->setPixmap(QPixmap(":/stylesheet/img/line.png"));
         m_emptyThumbnail->setFixedSize(QSize(24, 24));
 
-        pLayout->addWidget(m_emptyThumbnail);
+        QHBoxLayout* pLayout = new QHBoxLayout();
+        pLayout->setContentsMargins(0, 0, 0, 0);
+        pLayout->setSpacing(0);
         pLayout->addWidget(m_thumbnail);
+        pLayout->addWidget(m_customThumbnail);
+        pLayout->addWidget(m_emptyThumbnail);
         pLayout->addSpacing(4);
         pLayout->addWidget(m_dropDownArrow);
         pLayout->addSpacing(4);
-
         setLayout(pLayout);
+
+        ShowDropDownArrow(false);
+        UpdateVisibility();
     }
 
     void ThumbnailPropertyCtrl::SetThumbnailKey(Thumbnailer::SharedThumbnailKey key, const char* contextName)
     {
-        m_key = key;
-        m_emptyThumbnail->setVisible(false);
-        m_thumbnail->SetThumbnailKey(key, contextName);
+        if (m_customThumbnailEnabled)
+        {
+            ClearThumbnail();
+        }
+        else
+        {
+            m_key = key;
+            m_thumbnail->SetThumbnailKey(m_key, contextName);
+            m_thumbnailEnlarged->SetThumbnailKey(m_key, contextName);
+        }
+        UpdateVisibility();
     }
 
     void ThumbnailPropertyCtrl::ClearThumbnail()
     {
-        m_emptyThumbnail->setVisible(true);
+        m_key.clear();
         m_thumbnail->ClearThumbnail();
+        m_thumbnailEnlarged->ClearThumbnail();
+        UpdateVisibility();
     }
 
     void ThumbnailPropertyCtrl::ShowDropDownArrow(bool visible)
     {
-        if (visible)
-        {
-            setFixedSize(QSize(40, 24));
-        }
-        else
-        {
-            setFixedSize(QSize(24, 24));
-        }
+        setFixedSize(QSize(visible ? 40 : 24, 24));
         m_dropDownArrow->setVisible(visible);
     }
 
+    void ThumbnailPropertyCtrl::SetCustomThumbnailEnabled(bool enabled)
+    {
+        m_customThumbnailEnabled = enabled;
+        UpdateVisibility();
+    }
+
+    void ThumbnailPropertyCtrl::SetCustomThumbnailPixmap(const QPixmap& pixmap)
+    {
+        m_customThumbnail->setPixmap(pixmap);
+        m_customThumbnailEnlarged->setPixmap(pixmap);
+        UpdateVisibility();
+    }
+
+    void ThumbnailPropertyCtrl::UpdateVisibility()
+    {
+        m_thumbnail->setVisible(m_key && !m_customThumbnailEnabled);
+        m_thumbnailEnlarged->setVisible(false);
+
+        m_customThumbnail->setVisible(m_customThumbnailEnabled);
+        m_customThumbnailEnlarged->setVisible(false);
+
+        m_emptyThumbnail->setVisible(!m_key && !m_customThumbnailEnabled);
+    }
+
     bool ThumbnailPropertyCtrl::event(QEvent* e)
     {
         if (isEnabled())
@@ -83,7 +125,7 @@ namespace AzToolsFramework
             if (e->type() == QEvent::MouseButtonPress)
             {
                 emit clicked();
-                return true; //ignore
+                return true; // ignore
             }
         }
 
@@ -94,37 +136,32 @@ namespace AzToolsFramework
     {
         QPainter p(this);
         QRect targetRect(QPoint(), QSize(40, 24));
-        p.fillRect(targetRect, QColor(17, 17, 17)); // #111111
+        p.fillRect(targetRect, QColor("#111111"));
         QWidget::paintEvent(e);
     }
 
     void ThumbnailPropertyCtrl::enterEvent(QEvent* e)
     {
         m_dropDownArrow->setPixmap(QPixmap(":/stylesheet/img/triangle0_highlighted.png"));
-        if (!m_thumbnailEnlarged && m_key)
-        {
-            QPoint position = mapToGlobal(pos() - QPoint(185, 0));
-            QSize size(180, 180);
-            m_thumbnailEnlarged.reset(new Thumbnailer::ThumbnailWidget());
-            m_thumbnailEnlarged->setFixedSize(size);
-            m_thumbnailEnlarged->move(position);
-            m_thumbnailEnlarged->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
-            m_thumbnailEnlarged->SetThumbnailKey(m_key);
-            m_thumbnailEnlarged->raise();
-            m_thumbnailEnlarged->show();
-        }
+        const QPoint offset(-m_thumbnailEnlarged->width() - 5, -m_thumbnailEnlarged->height() / 2 + m_thumbnail->height() / 2);
+
+        m_thumbnailEnlarged->move(mapToGlobal(pos()) + offset);
+        m_thumbnailEnlarged->raise();
+        m_thumbnailEnlarged->setVisible(m_key && !m_customThumbnailEnabled);
+
+        m_customThumbnailEnlarged->move(mapToGlobal(pos()) + offset);
+        m_customThumbnailEnlarged->raise();
+        m_customThumbnailEnlarged->setVisible(m_customThumbnailEnabled);
         QWidget::enterEvent(e);
     }
 
     void ThumbnailPropertyCtrl::leaveEvent(QEvent* e)
     {
         m_dropDownArrow->setPixmap(QPixmap(":/stylesheet/img/triangle0.png"));
-        if (m_thumbnailEnlarged)
-        {
-            m_thumbnailEnlarged.reset();
-        }
+        m_thumbnailEnlarged->setVisible(false);
+        m_customThumbnailEnlarged->setVisible(false);
         QWidget::leaveEvent(e);
     }
-}
+} // namespace AzToolsFramework
 
 #include "UI/PropertyEditor/moc_ThumbnailPropertyCtrl.cpp"
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
index 93f703c4c5..b1ce78b601 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
@@ -1,5 +1,3 @@
-#pragma once
-
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project.
  * For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -8,6 +6,8 @@
  *
  */
 
+#pragma once
+
 #if !defined(Q_MOC_RUN)
 #include <AzCore/PlatformDef.h>
 #include <AzToolsFramework/Thumbnails/Thumbnail.h>
@@ -35,25 +35,38 @@ namespace AzToolsFramework
 
         //! Call this to set what thumbnail widget will display
         void SetThumbnailKey(Thumbnailer::SharedThumbnailKey key, const char* contextName = "Default");
+
         //! Remove current thumbnail
         void ClearThumbnail();
 
+        //! Display a clickble dropdown arrow next to the thumbnail
         void ShowDropDownArrow(bool visible);
 
-        bool event(QEvent* e) override;
+        //! Override the thumbnail widget with a custom image
+        void SetCustomThumbnailEnabled(bool enabled);
+
+        //! Assign a custom image to dispsy in place of thumbnail
+        void SetCustomThumbnailPixmap(const QPixmap& pixmap);
 
     Q_SIGNALS:
         void clicked();
 
-    protected:
+    private:
+        void UpdateVisibility();
+
+        bool event(QEvent* e) override;
         void paintEvent(QPaintEvent* e) override;
         void enterEvent(QEvent* e) override;
         void leaveEvent(QEvent* e) override;
 
-    private:
         Thumbnailer::SharedThumbnailKey m_key;
         Thumbnailer::ThumbnailWidget* m_thumbnail = nullptr;
-        QScopedPointer<Thumbnailer::ThumbnailWidget> m_thumbnailEnlarged;
+        Thumbnailer::ThumbnailWidget* m_thumbnailEnlarged = nullptr;
+
+        QLabel* m_customThumbnail = nullptr;
+        QLabel* m_customThumbnailEnlarged = nullptr;
+        bool m_customThumbnailEnabled = false;
+
         QLabel* m_emptyThumbnail = nullptr;
         AspectRatioAwarePixmapWidget* m_dropDownArrow = nullptr;
     };

From 4f539b0eb7c123bb4e35bbc144db14479ad52924 Mon Sep 17 00:00:00 2001
From: Guthrie Adams <guthadam@amazon.com>
Date: Tue, 12 Oct 2021 16:17:19 -0500
Subject: [PATCH 13/29] fixed comments

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
---
 .../UI/PropertyEditor/ThumbnailPropertyCtrl.h                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
index b1ce78b601..ffd8234190 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
@@ -39,13 +39,13 @@ namespace AzToolsFramework
         //! Remove current thumbnail
         void ClearThumbnail();
 
-        //! Display a clickble dropdown arrow next to the thumbnail
+        //! Display a clickable dropdown arrow next to the thumbnail
         void ShowDropDownArrow(bool visible);
 
         //! Override the thumbnail widget with a custom image
         void SetCustomThumbnailEnabled(bool enabled);
 
-        //! Assign a custom image to dispsy in place of thumbnail
+        //! Assign a custom image to display in place of thumbnail
         void SetCustomThumbnailPixmap(const QPixmap& pixmap);
 
     Q_SIGNALS:

From 80db67e90a1aa44c954d3814eaefd12c345db2b3 Mon Sep 17 00:00:00 2001
From: Artur K <96597+nemerle@users.noreply.github.com>
Date: Wed, 13 Oct 2021 00:06:15 +0200
Subject: [PATCH 14/29] Remove many unused variables and unused setting files
 (#4607)

* Remove many unused variables and unused setting files

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove a few more dead config vars

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* fix android test_ConfigureSettings_DefaultValues_SetsValues

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
---
 Assets/Editor/MapScreenshotSettings.xml       |  13 --
 Assets/Editor/UserTools.xml                   |   2 -
 Assets/Engine/Config/AutoTestChain.cfg        |  11 --
 Assets/Engine/Config/AutoTestTimeDemo.cfg     |  10 --
 Assets/Engine/Config/AutotestPlaythrough.cfg  |   9 +-
 .../Config/CVarGroups/sys_spec_Full.cfg       |  97 -----------
 .../CVarGroups/sys_spec_GameEffects.cfg       |   8 -
 .../CVarGroups/sys_spec_ObjectDetail.cfg      | 160 ------------------
 .../Config/CVarGroups/sys_spec_Particles.cfg  |  94 ----------
 .../Config/CVarGroups/sys_spec_Physics.cfg    | 100 -----------
 .../CVarGroups/sys_spec_PostProcessing.cfg    | 114 -------------
 .../Config/CVarGroups/sys_spec_Quality.cfg    |  98 -----------
 .../Config/CVarGroups/sys_spec_Shading.cfg    | 120 -------------
 .../Config/CVarGroups/sys_spec_Shadows.cfg    | 116 -------------
 .../Config/CVarGroups/sys_spec_Sound.cfg      |  17 --
 .../Config/CVarGroups/sys_spec_Texture.cfg    |  94 ----------
 .../CVarGroups/sys_spec_TextureResolution.cfg |  52 ------
 .../CVarGroups/sys_spec_VolumetricEffects.cfg |  26 ---
 .../Config/CVarGroups/sys_spec_Water.cfg      |  81 ---------
 Assets/Engine/Config/aidebug.cfg              |   3 -
 Assets/Engine/Config/artprof.cfg              |  14 +-
 Assets/Engine/Config/artprof_user.cfg         |   3 -
 Assets/Engine/Config/benchmark_cpu.cfg        |  10 --
 Assets/Engine/Config/benchmark_gpu.cfg        |  12 +-
 Assets/Engine/Config/mgpu.cfg                 |   6 -
 Assets/Engine/Config/multiplayer.cfg          |  77 ---------
 Assets/Engine/Config/multiplayer_console.cfg  |  29 ----
 Assets/Engine/Config/recording.cfg            |  60 -------
 Assets/Engine/Config/singleplayer.cfg         |  15 --
 Assets/Engine/Config/sketch_off.cfg           |  24 ---
 Assets/Engine/Config/sketch_on.cfg            |  24 ---
 .../Engine/Config/spec/android_MaliT760.cfg   |  68 --------
 Assets/Engine/Config/spec/android_high.cfg    |  58 -------
 .../Config/spec/android_high_nogmem.cfg       |  53 ------
 Assets/Engine/Config/spec/android_low.cfg     |  69 --------
 Assets/Engine/Config/spec/android_medium.cfg  |  74 --------
 .../Engine/Config/spec/android_veryhigh.cfg   |  55 ------
 Assets/Engine/Config/spec/ios_high.cfg        |  90 ----------
 Assets/Engine/Config/spec/ios_low.cfg         |  93 ----------
 Assets/Engine/Config/spec/ios_medium.cfg      |  91 ----------
 Assets/Engine/Config/spec/ios_veryhigh.cfg    |  92 ----------
 Assets/Engine/Config/spec/osx_metal_high.cfg  |  38 -----
 Assets/Engine/Config/spec/osx_metal_low.cfg   |  37 ----
 .../Engine/Config/spec/osx_metal_medium.cfg   |  37 ----
 .../Engine/Config/spec/osx_metal_veryhigh.cfg |  37 ----
 Assets/Engine/Config/spec/pc_high.cfg         |   1 -
 Assets/Engine/Config/spec/pc_low.cfg          |   1 -
 Assets/Engine/Config/spec/pc_medium.cfg       |   1 -
 Assets/Engine/Config/spec/pc_veryhigh.cfg     |   1 -
 Assets/Engine/Config/statoscope.cfg           |   9 -
 Assets/Engine/Config/vr.cfg                   |  26 ---
 Assets/Engine/SeedAssetList.seed              | 152 -----------------
 .../Atom/atom_utils/atom_component_helper.py  |   1 -
 ...GPUTest_AtomFeatureIntegrationBenchmark.py |   1 -
 .../tests/hydra_GPUTest_BasicLevelSetup.py    |   1 -
 .../editor_python_test_tools/utils.py         |   1 -
 .../screenshot_utils.py                       |   4 -
 Code/Legacy/CrySystem/SystemInit.cpp          |  21 ---
 .../Code/Source/Processing/ImageFlags.h       |   2 +-
 .../Source/LYCommonMenu/ImGuiLYCommonMenu.cpp |  14 --
 .../launchers/platforms/android/launcher.py   |   7 -
 .../launchers/platforms/linux/launcher.py     |   1 -
 .../launchers/platforms/win/launcher.py       |   2 -
 .../tests/unit/test_launcher_android.py       |   2 +-
 cmake/Tools/layout_tool.py                    |  39 ++---
 editor.cfg                                    |  21 ---
 system_android_android.cfg                    |  30 +---
 system_ios_ios.cfg                            |  29 ----
 system_linux_pc.cfg                           |  22 ---
 system_mac_mac.cfg                            |  21 ---
 system_windows_pc.cfg                         |  20 ---
 71 files changed, 21 insertions(+), 2800 deletions(-)
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_GameEffects.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_Particles.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_Physics.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_Quality.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_Shading.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_Shadows.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_Sound.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_Texture.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg
 delete mode 100644 Assets/Engine/Config/CVarGroups/sys_spec_Water.cfg
 delete mode 100644 Assets/Engine/Config/sketch_off.cfg
 delete mode 100644 Assets/Engine/Config/sketch_on.cfg
 delete mode 100644 Assets/Engine/Config/spec/osx_metal_high.cfg
 delete mode 100644 Assets/Engine/Config/spec/osx_metal_low.cfg
 delete mode 100644 Assets/Engine/Config/spec/osx_metal_medium.cfg
 delete mode 100644 Assets/Engine/Config/spec/osx_metal_veryhigh.cfg

diff --git a/Assets/Editor/MapScreenshotSettings.xml b/Assets/Editor/MapScreenshotSettings.xml
index 01f90db4b3..88a8a49aef 100644
--- a/Assets/Editor/MapScreenshotSettings.xml
+++ b/Assets/Editor/MapScreenshotSettings.xml
@@ -1,18 +1,5 @@
 <settings>
-      <r_PostProcessEffects value="1"/>
-      <r_HDREyeAdaptationSpeed value="100000000"/>
-      <r_MotionBlur value="0"/>
-      <e_ScreenShotQuality value="0"/>
-      <e_ViewDistRatio value="100000000"/>
       <r_DisplayInfo value="0"/>
       <e_StreamCgfPoolSize value="128" />
-      <e_ViewDistRatioVegetation value="100"/>
-      <e_Lods value="0"/>
       <e_Vegetation value="0"/>
-      <e_TerrainOcclusionCulling value="0"/>
-      <e_OcclusionVolumes value="0"/>
-      <e_shadows value="0"/>
-      <e_portals value="3"/>
-      <e_fog value="0"/>
-      <r_hdrdebug value="0"/>
 </settings>
diff --git a/Assets/Editor/UserTools.xml b/Assets/Editor/UserTools.xml
index 8f971cbd5c..4cc197afbe 100644
--- a/Assets/Editor/UserTools.xml
+++ b/Assets/Editor/UserTools.xml
@@ -7,8 +7,6 @@
  <Tool Title="| Draw Helpers" Command="p_draw_helpers" EditorCmd="" ToggleVar="1"/>
  <Tool Title="| AI Debug Draw" Command="ai_DebugDraw" EditorCmd="" ToggleVar="1"/>
  <Tool Title="| Toggle Music" Command="s_MusicEnable" EditorCmd="" ToggleVar="1"/>
- <Tool Title="| Toggle Sound" Command="s_SoundEnable" EditorCmd="" ToggleVar="1"/>
- <Tool Title="| Toggle ForcefeedBack" Command="i_forcefeedback" EditorCmd="" ToggleVar="1"/>
  <Tool Title="| Freeze Camera " Command="e_CameraFreeze" EditorCmd="" ToggleVar="1"/>
  <Tool Title="| Log Verbosity 0" Command="log_Verbosity 0" EditorCmd="" ToggleVar="0"/>
  <Tool Title="| SaveLevelStats" Command="savelevelstats" EditorCmd="" ToggleVar="0"/>
diff --git a/Assets/Engine/Config/AutoTestChain.cfg b/Assets/Engine/Config/AutoTestChain.cfg
index 8c6fae9020..4164acb271 100644
--- a/Assets/Engine/Config/AutoTestChain.cfg
+++ b/Assets/Engine/Config/AutoTestChain.cfg
@@ -1,16 +1,5 @@
 ConsoleHide
-g_godMode=1
 sys_warnings=0
 con_showonload=1
-i_forcefeedback=0
-g_infiniteammo=1
-e_ObjectLayersActivation=0
-e_ObjectLayersActivationPhysics=0
-g_flashrenderingduringloading=0
 sys_maxfps=0
 r_vsync=0
-p_max_substeps=1
-demo_file=autotest
-demo_num_runs=0
-demo_quit=1
-demo_ai=1
diff --git a/Assets/Engine/Config/AutoTestTimeDemo.cfg b/Assets/Engine/Config/AutoTestTimeDemo.cfg
index 687158eda9..664ea94939 100644
--- a/Assets/Engine/Config/AutoTestTimeDemo.cfg
+++ b/Assets/Engine/Config/AutoTestTimeDemo.cfg
@@ -1,15 +1,5 @@
 ConsoleHide
-g_godMode=1
-g_infiniteammo=1
 r_displayinfo=1
 s_profiling=1
 sys_maxfps=0
-e_ObjectLayersActivation=0
-e_ObjectLayersActivationPhysics=0
-
-demo_file=autotest
-demo_num_runs=2
-demo_quit=1
-demo_savestats=1
-demo_profile=-1
 demo
diff --git a/Assets/Engine/Config/AutotestPlaythrough.cfg b/Assets/Engine/Config/AutotestPlaythrough.cfg
index f453097972..664ea94939 100644
--- a/Assets/Engine/Config/AutotestPlaythrough.cfg
+++ b/Assets/Engine/Config/AutotestPlaythrough.cfg
@@ -1,12 +1,5 @@
 ConsoleHide
-g_godMode=1
-g_infiniteammo=1
 r_displayinfo=1
 s_profiling=1
 sys_maxfps=0
-demo_file=playthru
-demo_num_runs=2
-demo_quit=1
-demo_savestats=1
-demo_profile=-1
-demo
\ No newline at end of file
+demo
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_Full.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Full.cfg
index 626dce3ee4..04fb56f3ca 100644
--- a/Assets/Engine/Config/CVarGroups/sys_spec_Full.cfg
+++ b/Assets/Engine/Config/CVarGroups/sys_spec_Full.cfg
@@ -11,113 +11,16 @@
 ; default of this CVarGroup
 = 7
 
-sys_spec_ObjectDetail=7
-sys_spec_Shading=7
-sys_spec_VolumetricEffects=7
-sys_spec_Shadows=7
-sys_spec_Texture=7
-sys_spec_Physics=7
-sys_spec_PostProcessing=7
-sys_spec_Particles=7
-sys_spec_Sound=7
-sys_spec_Water=7
-sys_spec_GameEffects=7
-sys_spec_light=7
-
 [1]
-sys_spec_ObjectDetail=1
-sys_spec_Shading=1
-sys_spec_VolumetricEffects=1
-sys_spec_Shadows=1
-sys_spec_Texture=1
-sys_spec_Physics=1
-sys_spec_PostProcessing=1
-sys_spec_Particles=1
-sys_spec_Sound=1
-sys_spec_Water=1
-sys_spec_GameEffects=1
-sys_spec_light=1
 
 [2]
-sys_spec_ObjectDetail=2
-sys_spec_Shading=2
-sys_spec_VolumetricEffects=2
-sys_spec_Shadows=2
-sys_spec_Texture=2
-sys_spec_Physics=2
-sys_spec_PostProcessing=2
-sys_spec_Particles=2
-sys_spec_Sound=2
-sys_spec_Water=2
-sys_spec_GameEffects=2
-sys_spec_light=2
 
 [3]
-sys_spec_ObjectDetail=3
-sys_spec_Shading=3
-sys_spec_VolumetricEffects=3
-sys_spec_Shadows=3
-sys_spec_Texture=3
-sys_spec_Physics=3
-sys_spec_PostProcessing=3
-sys_spec_Particles=3
-sys_spec_Sound=3
-sys_spec_Water=3
-sys_spec_GameEffects=3
-sys_spec_light=3
 
 [4]
-sys_spec_ObjectDetail=4
-sys_spec_Shading=4
-sys_spec_VolumetricEffects=4
-sys_spec_Shadows=4
-sys_spec_Texture=4
-sys_spec_Physics=4
-sys_spec_PostProcessing=4
-sys_spec_Particles=4
-sys_spec_Sound=4
-sys_spec_Water=4
-sys_spec_GameEffects=4
-sys_spec_light=4
 
 [5]
-sys_spec_ObjectDetail=5
-sys_spec_Shading=5
-sys_spec_VolumetricEffects=5
-sys_spec_Shadows=5
-sys_spec_Texture=5
-sys_spec_Physics=5
-sys_spec_PostProcessing=5
-sys_spec_Particles=5
-sys_spec_Sound=5
-sys_spec_Water=5
-sys_spec_GameEffects=5
-sys_spec_light=5
 
 [6]
-sys_spec_ObjectDetail=6
-sys_spec_Shading=6
-sys_spec_VolumetricEffects=6
-sys_spec_Shadows=6
-sys_spec_Texture=6
-sys_spec_Physics=6
-sys_spec_PostProcessing=6
-sys_spec_Particles=6
-sys_spec_Sound=6
-sys_spec_Water=6
-sys_spec_GameEffects=6
-sys_spec_light=6
 
 [8]
-sys_spec_ObjectDetail=8
-sys_spec_Shading=8
-sys_spec_VolumetricEffects=8
-sys_spec_Shadows=8
-sys_spec_Texture=8
-sys_spec_Physics=8
-sys_spec_PostProcessing=8
-sys_spec_Particles=8
-sys_spec_Sound=8
-sys_spec_Water=8
-sys_spec_GameEffects=8
-sys_spec_light=8
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_GameEffects.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_GameEffects.cfg
deleted file mode 100644
index 34e058d47d..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_GameEffects.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-mfx_Timeout = 0.01
-
-
-
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg
deleted file mode 100644
index a2996f7ded..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_ObjectDetail.cfg
+++ /dev/null
@@ -1,160 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-ca_AttachmentCullingRation=360
-es_DebrisLifetimeScale=1
-e_CoverageBufferReproj=6
-e_DecalsAllowGameDecals=1
-e_DecalsLifeTimeScale=2
-e_DecalsOverlapping=1
-e_Dissolve=2
-e_LightQuality=3
-e_LodMin=0
-e_LodRatio=20
-e_MaxViewDistSpecLerp=1
-e_MergedMeshesInstanceDist=1.0
-e_MergedMeshesPool=8192
-e_ObjQuality=3
-e_OcclusionCullingViewDistRatio=1
-e_ProcVegetation=1
-e_StatObjBufferRenderTasks=1
-e_StreamCgf=0
-e_TerrainLodRatio=1
-e_TerrainOcclusionCullingMaxDist=200
-e_Tessellation=0
-e_VegetationMinSize=0
-e_ViewDistMin=10
-e_ViewDistRatio=100
-e_ViewDistRatioCustom=100
-e_ViewDistRatioDetail=100
-e_ViewDistRatioLights=50
-e_ViewDistRatioVegetation=100
-r_DrawNearZRange=0.12
-r_FlaresTessellationRatio=1
-r_SilhouettePOM=0
-r_usezpass=2
-
-[1]
-ca_AttachmentCullingRation=145
-es_DebrisLifetimeScale=0.6
-e_DecalsLifeTimeScale=1
-e_Dissolve=0
-e_LightQuality=1
-e_LodRatio=10
-e_MaxViewDistSpecLerp=0.5
-e_ObjQuality=1
-e_TerrainOcclusionCullingMaxDist=130
-e_VegetationMinSize=0.5
-e_ViewDistRatioCustom=60
-e_ViewDistRatioDetail=25
-e_ViewDistRatioLights=25
-e_ViewDistRatioVegetation=21
-r_FlaresTessellationRatio=0.25
-r_usezpass=1
-e_ProcVegetation=0
-e_ViewDistRatio=50
-
-[2]
-ca_AttachmentCullingRation=145
-es_DebrisLifetimeScale=0.6
-e_DecalsLifeTimeScale=1
-e_Dissolve=0
-e_LightQuality=2
-e_LodRatio=10
-e_MaxViewDistSpecLerp=0.5
-e_ObjQuality=2
-e_TerrainOcclusionCullingMaxDist=130
-e_VegetationMinSize=0.5
-e_ViewDistRatioCustom=60
-e_ViewDistRatioDetail=25
-e_ViewDistRatioLights=25
-e_ViewDistRatioVegetation=50
-r_FlaresTessellationRatio=0.25
-r_usezpass=1
-e_ProcVegetation=1
-e_ViewDistRatio=50
-
-[3]
-ca_AttachmentCullingRation=145
-es_DebrisLifetimeScale=0.6
-e_DecalsLifeTimeScale=1
-e_Dissolve=0
-e_LightQuality=3
-e_LodRatio=10
-e_MaxViewDistSpecLerp=0.5
-e_ObjQuality=3
-e_TerrainOcclusionCullingMaxDist=130
-e_VegetationMinSize=0.5
-e_ViewDistRatioCustom=60
-e_ViewDistRatioDetail=25
-e_ViewDistRatioLights=25
-e_ViewDistRatioVegetation=50
-r_FlaresTessellationRatio=0.25
-r_usezpass=1
-e_ProcVegetation=1
-e_ViewDistRatio=75
-
-[4]
-ca_AttachmentCullingRation=145
-es_DebrisLifetimeScale=0.6
-e_DecalsLifeTimeScale=1
-e_Dissolve=0
-e_LightQuality=4
-e_LodRatio=10
-e_MaxViewDistSpecLerp=0.5
-e_ObjQuality=4
-e_TerrainOcclusionCullingMaxDist=130
-e_VegetationMinSize=0.5
-e_ViewDistRatioCustom=60
-e_ViewDistRatioDetail=25
-e_ViewDistRatioLights=25
-e_ViewDistRatioVegetation=50
-r_FlaresTessellationRatio=0.25
-r_usezpass=1
-e_ProcVegetation=1
-e_ViewDistRatio=75
-
-[5]
-ca_AttachmentCullingRation=145
-es_DebrisLifetimeScale=0.6
-e_DecalsLifeTimeScale=1
-e_LightQuality=1
-e_LodRatio=10
-e_MaxViewDistSpecLerp=0.5
-e_ObjQuality=1
-e_TerrainOcclusionCullingMaxDist=130
-e_VegetationMinSize=0.5
-e_ViewDistRatio=50
-e_ViewDistRatioCustom=60
-e_ViewDistRatioDetail=25
-e_ViewDistRatioLights=25
-e_ViewDistRatioVegetation=50
-r_FlaresTessellationRatio=0.25
-
-[6]
-ca_AttachmentCullingRation=300
-es_DebrisLifetimeScale=0.8
-e_LightQuality=2
-e_LodRatio=15
-e_ObjQuality=2
-e_ViewDistRatio=75
-e_ViewDistRatioDetail=35
-e_ViewDistRatioVegetation=75
-
-[8]
-ca_AttachmentCullingRation=400
-e_LightQuality=4
-e_LodRatio=40
-e_MergedMeshesInstanceDist=2.0
-e_MergedMeshesPool=16384
-e_ObjQuality=4
-e_TerrainLodRatio=0.5
-e_Tessellation=1
-e_ViewDistRatio=125
-e_ViewDistRatioCustom=125
-e_ViewDistRatioDetail=125
-e_ViewDistRatioLights=75
-e_ViewDistRatioVegetation=125
-r_DrawNearZRange = 0.08
-r_SilhouettePOM=1
\ No newline at end of file
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_Particles.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Particles.cfg
deleted file mode 100644
index 0a02170b97..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_Particles.cfg
+++ /dev/null
@@ -1,94 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-e_ParticlesGI=1
-e_ParticlesPreload=0
-e_ParticlesMaxScreenFill=128
-e_ParticlesMinDrawPixels=1
-e_ParticlesMotionBlur=0
-e_ParticlesObjectCollisions=2
-e_ParticlesQuality=3
-e_ParticlesSortQuality=0
-e_ParticlesPoolSize=16384
-r_ParticlesHalfRes=0
-r_ParticlesTessellation=1
-r_ParticlesInstanceVertices=1
-r_ParticlesGpuMaxEmitCount=10000
-
-[1]
-e_ParticlesGI=0
-e_ParticlesPreload=1
-e_ParticlesMaxScreenFill=16
-e_ParticlesMinDrawPixels=2
-e_ParticlesObjectCollisions=1
-e_ParticlesQuality=2
-e_ParticlesPoolSize=4096
-r_ParticlesHalfRes=1
-r_ParticlesTessellation=0
-r_ParticlesInstanceVertices=0
-r_ParticlesGpuMaxEmitCount=10
-
-
-[2]
-e_ParticlesGI=0
-e_ParticlesPreload=1
-e_ParticlesMaxScreenFill=16
-e_ParticlesMinDrawPixels=2
-e_ParticlesObjectCollisions=1
-e_ParticlesQuality=2
-e_ParticlesPoolSize=4096
-r_ParticlesHalfRes=1
-r_ParticlesTessellation=0
-r_ParticlesInstanceVertices=0
-r_ParticlesGpuMaxEmitCount=100
-
-
-[3]
-e_ParticlesGI=0
-e_ParticlesPreload=1
-e_ParticlesMaxScreenFill=16
-e_ParticlesMinDrawPixels=2
-e_ParticlesObjectCollisions=1
-e_ParticlesQuality=2
-e_ParticlesPoolSize=4096
-r_ParticlesHalfRes=1
-r_ParticlesTessellation=0
-r_ParticlesInstanceVertices=0
-r_ParticlesGpuMaxEmitCount=500
-
-
-[4]
-e_ParticlesGI=0
-e_ParticlesPreload=1
-e_ParticlesMaxScreenFill=16
-e_ParticlesMinDrawPixels=2
-e_ParticlesObjectCollisions=1
-e_ParticlesQuality=2
-e_ParticlesPoolSize=4096
-r_ParticlesHalfRes=1
-r_ParticlesTessellation=0
-r_ParticlesInstanceVertices=0
-r_ParticlesGpuMaxEmitCount=1000
-
-
-[5]
-e_ParticlesMaxScreenFill=32
-e_ParticlesMinDrawPixels=1.5
-e_ParticlesObjectCollisions=1
-e_ParticlesQuality=1
-r_ParticlesHalfRes=1
-r_ParticlesTessellation=0
-r_ParticlesGpuMaxEmitCount=3000
-
-[6]
-e_ParticlesMaxScreenFill=64
-e_ParticlesObjectCollisions=1
-e_ParticlesQuality=2
-r_ParticlesGpuMaxEmitCount=5000
-
-[8]
-e_ParticlesMaxScreenFill=160
-e_ParticlesMotionBlur=1
-e_ParticlesQuality=4
-r_ParticlesGpuMaxEmitCount=1048576
\ No newline at end of file
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_Physics.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Physics.cfg
deleted file mode 100644
index 15d9fc61e3..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_Physics.cfg
+++ /dev/null
@@ -1,100 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-es_MaxPhysDist=100
-es_MaxPhysDistInvisible=25
-e_CullVegActivation=50
-e_FoliageWindActivationDist=25
-e_PhysMinCellSize=4
-e_PhysOceanCell=0.5
-e_PhysProxyTriLimit=10000
-g_breakage_mem_limit=0
-g_breakage_particles_limit=160
-g_no_secondary_breaking=0
-g_tree_cut_reuse_dist=0
-p_gravity_z=-13
-p_max_entity_cells=300000
-p_max_MC_iters=6000
-p_max_object_splashes=3
-p_max_substeps=5
-p_max_substeps_large_group=5
-p_num_bodies_large_group=100
-p_splash_dist0=7
-p_splash_dist1=30
-p_splash_force0=10
-p_splash_force1=100
-p_splash_vel0=4.5
-p_splash_vel1=10
-v_vehicle_quality=4
-
-[1]
-es_MaxPhysDistInvisible=15
-e_CullVegActivation=30
-e_FoliageWindActivationDist=10
-e_PhysMinCellSize=16
-e_PhysOceanCell=1
-g_breakage_mem_limit=2000
-g_breakage_particles_limit=40
-g_no_secondary_breaking=1
-g_tree_cut_reuse_dist=1
-p_max_entity_cells=75000
-p_max_MC_iters=2000
-p_max_substeps=2
-
-[2]
-es_MaxPhysDistInvisible=15
-e_CullVegActivation=30
-e_FoliageWindActivationDist=10
-e_PhysMinCellSize=16
-e_PhysOceanCell=1
-g_breakage_mem_limit=2000
-g_breakage_particles_limit=40
-g_no_secondary_breaking=1
-g_tree_cut_reuse_dist=1
-p_max_entity_cells=75000
-p_max_MC_iters=2000
-p_max_substeps=2
-
-[3]
-es_MaxPhysDistInvisible=15
-e_CullVegActivation=30
-e_FoliageWindActivationDist=10
-e_PhysMinCellSize=16
-e_PhysOceanCell=1
-g_breakage_mem_limit=2000
-g_breakage_particles_limit=40
-g_no_secondary_breaking=1
-g_tree_cut_reuse_dist=1
-p_max_entity_cells=75000
-p_max_MC_iters=2000
-p_max_substeps=2
-
-[4]
-es_MaxPhysDistInvisible=15
-e_CullVegActivation=30
-e_FoliageWindActivationDist=10
-e_PhysMinCellSize=16
-e_PhysOceanCell=1
-g_breakage_mem_limit=2000
-g_breakage_particles_limit=40
-g_no_secondary_breaking=1
-g_tree_cut_reuse_dist=1
-p_max_entity_cells=75000
-p_max_MC_iters=2000
-p_max_substeps=2
-
-[5]
-es_MaxPhysDist=50
-es_MaxPhysDistInvisible=15
-e_CullVegActivation=30
-e_FoliageWindActivationDist=10
-e_PhysOceanCell=1
-g_breakage_particles_limit=80
-g_tree_cut_reuse_dist=0.35
-p_max_MC_iters=4000
-p_max_substeps=2
-
-[6]
-
-[8]
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg
deleted file mode 100644
index 9d2cd3754d..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_PostProcessing.cfg
+++ /dev/null
@@ -1,114 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-r_PostProcessEffects=1
-q_ShaderHDR=2
-q_ShaderPostProcess=2
-r_ChromaticAberration=0
-r_ColorGradingChartsCache=0
-r_DepthOfField=2
-r_Flares=1
-r_HDRBloomQuality=2
-r_MotionBlur=2
-r_MotionBlurMaxViewDist=100000
-r_MotionBlurQuality=1
-r_MotionBlurShutterSpeed=125
-r_Rain=2
-r_RainMaxViewDist_Deferred=150
-r_Sharpening=0
-r_Snow=2
-r_SunShafts=2
-r_TranspDepthFixup=1
-r_ToneMapTechnique=0
-r_ToneMapExposureType=0
-r_HDRBloom=1
-r_ColorGrading=1
-r_ColorSpace=0
-
-[1]
-q_ShaderHDR=1
-q_ShaderPostProcess=1
-r_ColorGrading=0
-r_DepthOfField=0
-r_Flares=0
-r_HDRBloom=0
-r_HDRBloomQuality=0
-r_MotionBlur=0
-r_MotionBlurMaxViewDist=16
-r_MotionBlurQuality=0
-r_Rain=1
-r_RainMaxViewDist_Deferred=40
-r_Snow=1
-r_SunShafts=0
-r_TranspDepthFixup=0
-r_ToneMapTechnique=3
-r_ToneMapExposureType=1
-r_ColorSpace=2
-
-
-[2]
-q_ShaderHDR=1
-q_ShaderPostProcess=1
-r_ColorGradingChartsCache=4
-r_DepthOfField=1
-r_Flares=0
-r_HDRBloomQuality=0
-r_MotionBlur=0
-r_MotionBlurMaxViewDist=16
-r_MotionBlurQuality=0
-r_Rain=1
-r_RainMaxViewDist_Deferred=40
-r_Snow=1
-r_SunShafts=1
-r_TranspDepthFixup=0
-
-
-[3]
-q_ShaderHDR=1
-q_ShaderPostProcess=2
-r_ColorGradingChartsCache=4
-r_DepthOfField=1
-r_HDRBloomQuality=1
-r_MotionBlur=0
-r_MotionBlurMaxViewDist=16
-r_MotionBlurQuality=0
-r_Rain=1
-r_RainMaxViewDist_Deferred=40
-r_Snow=1
-r_SunShafts=1
-r_TranspDepthFixup=0
-
-[4]
-q_ShaderHDR=1
-q_ShaderPostProcess=2
-r_ColorGradingChartsCache=4
-r_DepthOfField=1
-r_HDRBloomQuality=1
-r_MotionBlur=0
-r_MotionBlurMaxViewDist=16
-r_MotionBlurQuality=0
-r_Rain=1
-r_RainMaxViewDist_Deferred=40
-r_Snow=1
-r_SunShafts=1
-r_TranspDepthFixup=0
-
-[5]
-q_ShaderHDR=1
-q_ShaderPostProcess=1
-r_ColorGradingChartsCache=4
-r_MotionBlurMaxViewDist=16
-r_MotionBlurQuality=0
-r_RainMaxViewDist_Deferred=40
-r_TranspDepthFixup=0
-
-[6]
-q_ShaderHDR=1
-q_ShaderPostProcess=1
-r_RainMaxViewDist_Deferred=100
-
-[8]
-q_ShaderHDR=3
-q_ShaderPostProcess=3
-r_MotionBlurQuality=2
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_Quality.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Quality.cfg
deleted file mode 100644
index cf1bdf5184..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_Quality.cfg
+++ /dev/null
@@ -1,98 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-q_ShaderGeneral=2
-q_ShaderMetal=2
-q_ShaderGlass=2
-q_ShaderVegetation=2
-q_ShaderIce=2
-q_ShaderTerrain=2
-q_ShaderShadow=2
-q_ShaderFX=2
-q_ShaderSky=2
-q_Renderer=2
-
-[1]
-q_ShaderGeneral=1
-q_ShaderMetal=1
-q_ShaderGlass=1
-q_ShaderVegetation=1
-q_ShaderIce=1
-q_ShaderTerrain=1
-q_ShaderShadow=1
-q_ShaderFX=1
-q_ShaderSky=1
-q_Renderer=1
-
-[2]
-q_ShaderGeneral=1
-q_ShaderMetal=1
-q_ShaderGlass=1
-q_ShaderVegetation=1
-q_ShaderIce=1
-q_ShaderTerrain=1
-q_ShaderShadow=1
-q_ShaderFX=1
-q_ShaderSky=1
-q_Renderer=1
-
-[3]
-q_ShaderGeneral=1
-q_ShaderMetal=1
-q_ShaderGlass=1
-q_ShaderVegetation=1
-q_ShaderIce=1
-q_ShaderTerrain=1
-q_ShaderShadow=1
-q_ShaderFX=1
-q_ShaderSky=1
-q_Renderer=2
-
-[4]
-q_ShaderGeneral=1
-q_ShaderMetal=1
-q_ShaderGlass=1
-q_ShaderVegetation=1
-q_ShaderIce=1
-q_ShaderTerrain=1
-q_ShaderShadow=1
-q_ShaderFX=1
-q_ShaderSky=1
-q_Renderer=2
-
-[5]
-q_ShaderGeneral=1
-q_ShaderMetal=1
-q_ShaderGlass=1
-q_ShaderVegetation=1
-q_ShaderIce=1
-q_ShaderTerrain=1
-q_ShaderShadow=1
-q_ShaderFX=1
-q_ShaderSky=1
-q_Renderer=1
-
-[6]
-q_ShaderGeneral=1
-q_ShaderMetal=1
-q_ShaderGlass=1
-q_ShaderVegetation=1
-q_ShaderIce=1
-q_ShaderTerrain=1
-q_ShaderShadow=1
-q_ShaderFX=1
-q_ShaderSky=1
-q_Renderer=1
-
-[8]
-q_ShaderGeneral=3
-q_ShaderMetal=3
-q_ShaderGlass=3
-q_ShaderVegetation=3
-q_ShaderIce=3
-q_ShaderTerrain=3
-q_ShaderShadow=3
-q_ShaderFX=3
-q_ShaderSky=3
-q_Renderer=3
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_Shading.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Shading.cfg
deleted file mode 100644
index eb379a8583..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_Shading.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-e_CacheNearestCubePicking=1
-e_DynamicLightsMaxEntityLights=16
-e_GI=1
-e_LightVolumes=1
-e_SkyUpdateRate=1
-e_TerrainAo=0
-e_VegetationUseTerrainColor=1
-r_DeferredShadingDepthBoundsTest=1
-r_DeferredShadingTiled=2
-r_DeferredShadingTiledHairQuality=1
-r_deferredShadingFilterGBuffer=0
-r_DeferredShadingSSS=1
-r_AntialiasingMode=3
-r_DetailDistance=8
-r_EnvTexUpdateInterval=0.05
-r_Refraction=1
-r_RefractionPartialResolves=2
-r_ssdo=1
-r_ssdoHalfRes=2
-r_ssdoColorBleeding=1
-r_SSReflections=1
-r_SSReflHalfRes=1
-r_VisAreaClipLightsPerPixel=1
-sys_spec_Quality=7
-
-[1]
-e_DynamicLightsMaxEntityLights=2
-e_GI=0
-e_SkyUpdateRate=0.5
-e_VegetationUseTerrainColor=0
-r_DeferredShadingTiled=0
-r_DeferredShadingTiledHairQuality=0
-r_DeferredShadingSSS=0
-r_AntialiasingMode=0
-r_DetailDistance=4
-r_EnvTexUpdateInterval=0.075
-r_Refraction=0
-r_RefractionPartialResolves=0
-r_ssdo=0
-r_ssdoHalfRes=1
-r_ssdoColorBleeding=0
-r_SSReflections=0
-sys_spec_Quality=1
-
-[2]
-e_DynamicLightsMaxEntityLights=2
-e_GI=0
-e_SkyUpdateRate=0.5
-e_VegetationUseTerrainColor=0
-r_DeferredShadingTiled=0
-r_DeferredShadingTiledHairQuality=0
-r_DeferredShadingSSS=0
-r_AntialiasingMode=0
-r_DetailDistance=4
-r_EnvTexUpdateInterval=0.075
-r_RefractionPartialResolves=0
-r_ssdo=0
-r_ssdoHalfRes=1
-r_ssdoColorBleeding=0
-r_SSReflections=0
-sys_spec_Quality=2
-
-[3]
-e_DynamicLightsMaxEntityLights=2
-e_GI=0
-e_SkyUpdateRate=0.5
-e_VegetationUseTerrainColor=0
-r_DeferredShadingTiled=0
-r_DeferredShadingTiledHairQuality=0
-r_DeferredShadingSSS=0
-r_AntialiasingMode=0
-r_DetailDistance=4
-r_EnvTexUpdateInterval=0.075
-r_RefractionPartialResolves=0
-r_ssdo=0
-r_ssdoColorBleeding=0
-r_SSReflections=0
-sys_spec_Quality=3
-
-[4]
-e_DynamicLightsMaxEntityLights=2
-e_GI=0
-e_SkyUpdateRate=0.5
-e_VegetationUseTerrainColor=0
-r_DeferredShadingTiled=0
-r_DeferredShadingTiledHairQuality=0
-r_DeferredShadingSSS=0
-r_AntialiasingMode=0
-r_DetailDistance=4
-r_EnvTexUpdateInterval=0.075
-r_RefractionPartialResolves=0
-r_ssdo=1
-r_ssdoHalfRes=1
-r_ssdoColorBleeding=0
-r_SSReflections=0
-sys_spec_Quality=4
-
-[5]
-e_DynamicLightsMaxEntityLights=7
-e_GI=0
-e_SkyUpdateRate=0.5
-r_DetailDistance=4
-r_EnvTexUpdateInterval=0.075
-r_SSReflections=0
-r_DeferredShadingTiledHairQuality=0
-r_DeferredShadingSSS=0
-sys_spec_Quality=5
-
-[6]
-e_DynamicLightsMaxEntityLights=11
-sys_spec_Quality=6
-
-[8]
-r_DeferredShadingTiledHairQuality=2
-r_SSReflHalfRes=0
-sys_spec_Quality=8
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_Shadows.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Shadows.cfg
deleted file mode 100644
index d43c28c09d..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_Shadows.cfg
+++ /dev/null
@@ -1,116 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-e_GsmLodsNum=5
-e_GsmRange=3
-e_ParticlesShadows=1
-e_Shadows=1
-e_ShadowsBlendCascades=1
-e_ShadowsClouds=1
-e_ShadowsCastViewDistRatio=1
-e_ShadowsLodBiasFixed=0
-e_ShadowsMaxTexRes=1024
-e_ShadowsOnAlphaBlend=0
-e_ShadowsPoolSize=4096
-e_ShadowsResScale=4
-e_ShadowsTessellateCascades=1
-e_ShadowsTessellateDLights=0
-e_ShadowsUpdateViewDistRatio=256
-r_DrawNearShadows=1
-r_FogShadows=2
-r_FogShadowsWater=0
-r_ShadowJittering=2.5
-r_ShadowPoolMaxFrames=30
-r_ShadowPoolMaxTimeslicedUpdatesPerFrame=100
-r_ShadowsPCFiltering=1
-r_ShadowsCache=4
-r_ShadowsCacheFormat=1
-r_ShadowsCacheResolutions=6324,4214
-r_ShadowsUseClipVolume=1
-e_ObjShadowCastSpec=3
-
-[1]
-e_GsmLodsNum=3
-e_ParticlesShadows=0
-e_ShadowsBlendCascades=0
-e_ShadowsCastViewDistRatio=0.8
-e_ShadowsLodBiasFixed=1
-e_ShadowsMaxTexRes=512
-r_DrawNearShadows=0
-r_FogShadows=0
-r_ShadowJittering=0
-r_ShadowsCacheFormat=0
-r_ShadowsCacheResolutions=3162,2107
-e_ObjShadowCastSpec=1
-e_ShadowsPoolSize=1024
-
-[2]
-e_GsmLodsNum=4
-e_ParticlesShadows=0
-e_ShadowsBlendCascades=0
-e_ShadowsCastViewDistRatio=0.8
-e_ShadowsLodBiasFixed=1
-e_ShadowsMaxTexRes=512
-r_DrawNearShadows=0
-r_FogShadows=0
-r_ShadowJittering=0
-r_ShadowsCacheFormat=0
-r_ShadowsCacheResolutions=3162,2107
-e_ObjShadowCastSpec=1
-e_ShadowsPoolSize=1024
-
-[3]
-e_GsmLodsNum=4
-e_ParticlesShadows=0
-e_ShadowsBlendCascades=0
-e_ShadowsCastViewDistRatio=0.8
-e_ShadowsLodBiasFixed=1
-e_ShadowsMaxTexRes=512
-r_DrawNearShadows=0
-r_FogShadows=0
-r_ShadowJittering=0
-r_ShadowsCacheFormat=0
-r_ShadowsCacheResolutions=3162,2107
-e_ObjShadowCastSpec=1
-e_ShadowsPoolSize=1024
-
-[4]
-e_GsmLodsNum=4
-e_ParticlesShadows=0
-e_ShadowsBlendCascades=0
-e_ShadowsCastViewDistRatio=0.8
-e_ShadowsLodBiasFixed=1
-e_ShadowsMaxTexRes=512
-r_DrawNearShadows=0
-r_FogShadows=0
-r_ShadowJittering=0
-r_ShadowsCacheFormat=0
-r_ShadowsCacheResolutions=3162,2107
-e_ObjShadowCastSpec=1
-e_ShadowsPoolSize=1024
-
-[5]
-e_GsmLodsNum=4
-e_ParticlesShadows=0
-e_ShadowsBlendCascades=0
-e_ShadowsCastViewDistRatio=0.8
-e_ShadowsLodBiasFixed=1
-e_ShadowsMaxTexRes=512
-r_FogShadows=0
-r_ShadowJittering=1
-e_ObjShadowCastSpec=1
-r_ShadowsCacheResolutions=3162,2107
-
-[6]
-r_ShadowJittering=1
-e_ObjShadowCastSpec=2
-
-[8]
-r_FogShadows=1
-r_FogShadowsWater=1
-r_ShadowPoolMaxFrames=0
-r_ShadowPoolMaxTimeslicedUpdatesPerFrame=100
-e_ObjShadowCastSpec=4
-r_ShadowsCache=5
-r_ShadowsCacheResolutions=4214
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_Sound.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Sound.cfg
deleted file mode 100644
index 42bd4c7f02..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_Sound.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-[1]
-
-[2]
-
-[3]
-
-[4]
-
-[5]
-
-[6]
-
-[8]
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_Texture.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Texture.cfg
deleted file mode 100644
index 0e02c41ab2..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_Texture.cfg
+++ /dev/null
@@ -1,94 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-e_TerrainTextureStreamingPoolItemsNum=64
-r_DynTexAtlasCloudsMaxSize=32
-r_DynTexAtlasSpritesMaxSize=32
-r_DynTexMaxSize=80
-r_EnvCMResolution=2
-r_EnvTexResolution=3
-r_ImposterRatio=1
-r_TexAtlasSize=2048
-r_TexMaxAnisotropy=4
-r_TexMinAnisotropy=4
-r_TexNoAnisoAlphaTest=0
-
-[1]
-e_TerrainTextureStreamingPoolItemsNum=16
-r_DynTexAtlasCloudsMaxSize=8
-r_DynTexAtlasSpritesMaxSize=8
-r_DynTexMaxSize=20
-r_EnvCMResolution=0
-r_EnvTexResolution=1
-r_ImposterRatio=2
-r_TexAtlasSize=512
-r_TexMaxAnisotropy=2
-r_TexMinAnisotropy=2
-r_TexNoAnisoAlphaTest=1
-
-[2]
-e_TerrainTextureStreamingPoolItemsNum=16
-r_DynTexAtlasCloudsMaxSize=8
-r_DynTexAtlasSpritesMaxSize=8
-r_DynTexMaxSize=20
-r_EnvCMResolution=0
-r_EnvTexResolution=1
-r_ImposterRatio=2
-r_TexAtlasSize=512
-r_TexMaxAnisotropy=2
-r_TexMinAnisotropy=2
-r_TexNoAnisoAlphaTest=1
-
-[3]
-e_TerrainTextureStreamingPoolItemsNum=16
-r_DynTexAtlasCloudsMaxSize=8
-r_DynTexAtlasSpritesMaxSize=8
-r_DynTexMaxSize=20
-r_EnvCMResolution=0
-r_EnvTexResolution=1
-r_ImposterRatio=2
-r_TexAtlasSize=512
-r_TexMaxAnisotropy=2
-r_TexMinAnisotropy=2
-r_TexNoAnisoAlphaTest=1
-
-[4]
-e_TerrainTextureStreamingPoolItemsNum=16
-r_DynTexAtlasCloudsMaxSize=8
-r_DynTexAtlasSpritesMaxSize=8
-r_DynTexMaxSize=20
-r_EnvCMResolution=0
-r_EnvTexResolution=1
-r_ImposterRatio=2
-r_TexAtlasSize=512
-r_TexMaxAnisotropy=2
-r_TexMinAnisotropy=2
-r_TexNoAnisoAlphaTest=1
-
-[5]
-r_DynTexAtlasCloudsMaxSize=24
-r_DynTexAtlasSpritesMaxSize=16
-r_DynTexMaxSize=50
-r_EnvCMResolution=0
-r_EnvTexResolution=1
-r_ImposterRatio=2
-r_TexAtlasSize=512
-r_TexMaxAnisotropy=2
-r_TexMinAnisotropy=2
-r_TexNoAnisoAlphaTest=1
-
-[6]
-r_DynTexAtlasCloudsMaxSize=24
-r_DynTexAtlasSpritesMaxSize=16
-r_DynTexMaxSize=60
-r_EnvCMResolution=1
-r_EnvTexResolution=2
-r_ImposterRatio=1.5
-r_TexMaxAnisotropy=8
-r_TexMinAnisotropy=8
-r_TexNoAnisoAlphaTest=1
-
-[8]
-r_TexMaxAnisotropy=16
-r_TexMinAnisotropy=16
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg
deleted file mode 100644
index 6b6c11ddf6..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_TextureResolution.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-[default]
-; dummy default for this CVarGroup (will be auto initialized during streaming system init or overridden by user via system.cfg)
-= 0
-
-; VRAM 1.0 GB
-r_TexturesStreaming=1
-r_TexturesStreamingMipBias=0
-r_TexturesstreamingMinUsableMips=8
-r_TexturesStreamingSkipMips=2
-r_TexturesStreamPoolSize=256
-
-[1]
-; VRAM 1.0 GB
-r_TexturesStreaming=0
-r_TexturesStreamingSkipMips=0
-r_TexturesStreamPoolSize=384
-
-[2]
-; VRAM 1.0 GB
-r_TexturesStreaming=0
-r_TexturesStreamingSkipMips=0
-r_TexturesStreamPoolSize=384
-
-[3]
-; VRAM 1.0 GB
-r_TexturesStreaming=0
-r_TexturesStreamingSkipMips=0
-r_TexturesStreamPoolSize=384
-
-[4]
-; VRAM 1.0 GB
-r_TexturesStreaming=0
-r_TexturesStreamingSkipMips=0
-r_TexturesStreamPoolSize=384
-
-[5]
-; VRAM 1.0 GB
-
-[6]
-; VRAM 1.5 GB
-r_TexturesStreamingSkipMips=1
-r_TexturesStreamPoolSize=512
-
-[7]
-; VRAM 2.0 GB
-r_TexturesStreamingSkipMips=0
-r_TexturesStreamPoolSize=640
-
-[8]
-; VRAM 3.0 GB
-r_TexturesStreamingSkipMips=0
-r_TexturesStreamPoolSize=1536
\ No newline at end of file
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg
deleted file mode 100644
index b6fdfec33c..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_VolumetricEffects.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-e_Clouds=1
-r_Beams=1
-
-[1]
-r_Beams=0
-
-[2]
-r_Beams=0
-
-[3]
-r_Beams=0
-
-[4]
-r_Beams=0
-
-[5]
-r_Beams=0
-
-[6]
-r_Beams=0
-
-[8]
diff --git a/Assets/Engine/Config/CVarGroups/sys_spec_Water.cfg b/Assets/Engine/Config/CVarGroups/sys_spec_Water.cfg
deleted file mode 100644
index 720339dc98..0000000000
--- a/Assets/Engine/Config/CVarGroups/sys_spec_Water.cfg
+++ /dev/null
@@ -1,81 +0,0 @@
-[default]
-; default of this CVarGroup
-= 7
-
-e_WaterOceanFFT=1
-e_WaterTessellationAmount=10
-e_WaterTessellationSwathWidth=10
-q_ShaderWater=2
-r_WaterCaustics=1
-r_WaterReflections=1
-r_WaterReflectionsQuality=4
-r_WaterReflectionsMinVisiblePixelsUpdate=0.05
-r_WaterTessellationHW=0
-r_WaterUpdateDistance=0.2
-r_WaterUpdateFactor=0.0
-r_WaterVolumeCaustics=0
-r_WaterVolumeCausticsDensity=256
-r_WaterVolumeCausticsMaxDist=35
-r_WaterVolumeCausticsRes=1024
-r_WaterVolumeCausticsSnapFactor=1
-
-[1]
-e_WaterTessellationAmount=20
-q_ShaderWater=1
-r_WaterReflectionsQuality=0
-r_WaterUpdateDistance=1
-r_WaterUpdateFactor=0.1
-r_WaterVolumeCausticsDensity=64
-r_WaterVolumeCausticsMaxDist=20
-r_WaterVolumeCausticsRes=384
-
-[2]
-e_WaterTessellationAmount=20
-q_ShaderWater=1
-r_WaterReflectionsQuality=0
-r_WaterUpdateDistance=1
-r_WaterUpdateFactor=0.1
-r_WaterVolumeCausticsDensity=64
-r_WaterVolumeCausticsMaxDist=20
-r_WaterVolumeCausticsRes=384
-
-[3]
-e_WaterTessellationAmount=20
-q_ShaderWater=1
-r_WaterReflectionsQuality=0
-r_WaterUpdateDistance=1
-r_WaterUpdateFactor=0.05
-r_WaterVolumeCausticsDensity=64
-r_WaterVolumeCausticsMaxDist=20
-r_WaterVolumeCausticsRes=384
-
-[4]
-e_WaterTessellationAmount=20
-q_ShaderWater=1
-r_WaterReflectionsQuality=4
-r_WaterUpdateDistance=1
-r_WaterUpdateFactor=0.01
-r_WaterVolumeCausticsDensity=64
-r_WaterVolumeCausticsMaxDist=20
-r_WaterVolumeCausticsRes=384
-
-[5]
-e_WaterTessellationAmount=20
-q_ShaderWater=1
-r_WaterUpdateDistance=1
-r_WaterUpdateFactor=0.1
-r_WaterVolumeCausticsDensity=64
-r_WaterVolumeCausticsMaxDist=20
-r_WaterVolumeCausticsRes=384
-
-[6]
-r_WaterUpdateDistance=1
-r_WaterUpdateFactor=0.05
-r_WaterVolumeCausticsDensity=128
-r_WaterVolumeCausticsMaxDist=25
-r_WaterVolumeCausticsRes=512
-
-[8]
-e_WaterTessellationAmount=85
-r_WaterTessellationHW=1
-r_WaterVolumeCaustics=1
diff --git a/Assets/Engine/Config/aidebug.cfg b/Assets/Engine/Config/aidebug.cfg
index f8134c7461..b0eafaaa45 100644
--- a/Assets/Engine/Config/aidebug.cfg
+++ b/Assets/Engine/Config/aidebug.cfg
@@ -1,4 +1 @@
 ai_DebugDraw = 1
-ai_DebugDrawNavigation = 1
-ai_DrawPath all
-ai_debugMNMAgentType MediumSizedCharacters
\ No newline at end of file
diff --git a/Assets/Engine/Config/artprof.cfg b/Assets/Engine/Config/artprof.cfg
index 2e1cf55a54..92b91623bf 100644
--- a/Assets/Engine/Config/artprof.cfg
+++ b/Assets/Engine/Config/artprof.cfg
@@ -1,7 +1,6 @@
 ; Setup useful cvars for artists profiling GPU cost
 ; Once in level (e.g. map c3mp_rooftop_gardens from the frontend/cmdline), in the console:
 ;  exec artprof.cfg
-; Be sure also to set r_shadersAsyncActivation=0 in your user.cfg (or copy artprof_user.cfg -> user.cfg)
 
 ; used to allow loading of loose shaders
 sys_pakPriority=0
@@ -9,19 +8,8 @@ sys_pakPriority=0
 ; because it's annoying and not relevant for artists
 sys_pakLogInvalidFileAccess=0
 
-; disable fog volumes and particles as they can be misleading with r_measureOverdraw 4
-e_fogVolumes=0
-e_particles=0
-
 ; for convenience
-g_infiniteSuitEnergy=1
-g_infiniteAmmo=1
-g_timelimit=0
+
 bind o "r_measureOverdraw 0"
 bind p "r_measureOverdraw 4"
-bind k "r_artProfile 0"
-bind l "r_artProfile 1"
-
-; loading into an MP level with the map command stops you looking up and down unless you have a weapon
-i_giveitem scar
 
diff --git a/Assets/Engine/Config/artprof_user.cfg b/Assets/Engine/Config/artprof_user.cfg
index 673436f6f3..265021e120 100644
--- a/Assets/Engine/Config/artprof_user.cfg
+++ b/Assets/Engine/Config/artprof_user.cfg
@@ -1,6 +1,3 @@
-; disable async shader activation as it crashes when r_shadersAllowCompilation=1
-r_shadersAsyncActivation=0
-
 ; enable shader compiliation for r_measureOverdraw 4
 r_shadersAllowCompilation=1
 
diff --git a/Assets/Engine/Config/benchmark_cpu.cfg b/Assets/Engine/Config/benchmark_cpu.cfg
index c75619107f..bbb3c9db95 100644
--- a/Assets/Engine/Config/benchmark_cpu.cfg
+++ b/Assets/Engine/Config/benchmark_cpu.cfg
@@ -1,13 +1,3 @@
-demo_restart_level = 2
-g_godMode=1
-g_infiniteammo=1
 r_displayinfo=1
-demo_file = autotest
-demo_ai = 1
-demo_num_runs = 4
-demo_quit = 1
-hud_startPaused=0
 sys_maxfps=0
-e_ObjectLayersActivation=0
-sys_flash = 0
 r_vsync = 0
diff --git a/Assets/Engine/Config/benchmark_gpu.cfg b/Assets/Engine/Config/benchmark_gpu.cfg
index 7653b32d86..f0242d64d1 100644
--- a/Assets/Engine/Config/benchmark_gpu.cfg
+++ b/Assets/Engine/Config/benchmark_gpu.cfg
@@ -1,13 +1,3 @@
-demo_restart_level = 1
-g_godMode = 1
-g_infiniteammo = 1
 r_displayinfo = 2
-demo_file = timedemo_short
-demo_ai = 0
-demo_num_runs = 2
-demo_quit = 1
--- hud_startPaused = 0
 sys_maxfps = -1
--- e_ObjectLayersActivation = 0
--- sys_flash = 0
-r_vsync = 0
\ No newline at end of file
+r_vsync = 0
diff --git a/Assets/Engine/Config/mgpu.cfg b/Assets/Engine/Config/mgpu.cfg
index 93da7fdfd0..e69de29bb2 100644
--- a/Assets/Engine/Config/mgpu.cfg
+++ b/Assets/Engine/Config/mgpu.cfg
@@ -1,6 +0,0 @@
-r_ColorGradingChartsCache = 0
-r_waterupdateFactor = 0
-r_PostProcessHUD3DCache = 0
-e_gsmcache = 0
-r_ConditionalRendering = 0
-e_gicache = 0
\ No newline at end of file
diff --git a/Assets/Engine/Config/multiplayer.cfg b/Assets/Engine/Config/multiplayer.cfg
index eafa434f8e..e69de29bb2 100644
--- a/Assets/Engine/Config/multiplayer.cfg
+++ b/Assets/Engine/Config/multiplayer.cfg
@@ -1,77 +0,0 @@
-ag_turnSpeedParamScale=0.0
-aim_assistFalloffDistance=200
-aim_assistInputForFullFollow_Ironsight=0.20
-aim_assistMaxDistance=255
-aim_assistMaxDistance_ironsight=255
-aim_assistMinTurnScale=0.5
-aim_assistMinTurnScale_ironsight=0.5
-aim_assistSlowDisableDistance=255
-aim_assistSlowFalloffStartDistance=200
-aim_assistSlowThresholdOuter=2.5
-aim_assiststrength=0.7
-aim_assiststrength_ironsight=0.75
-br_breakmaxworldsize=511
-cl_sensitivityControllerMP=0.6
-cl_shallowWaterSpeedMulPlayer=1.0
-controller_multiplier_x=3
-controller_multiplier_z=4
-g_actorViewDistRatio=255
-
--- This forces broken trees to have spherical inertia, which makes them harder to rotate around their vertical axis.
-g_breakageMinAxisInertia=1.0
-g_glassAutoShatterMinArea=0.5
-
-g_distanceForceNoIk=35
-g_fpDbaManagementEnable=0
-g_godMode=0
-g_highlightingMaxDistanceToHighlightSquared=625
-g_hitDeathReactions_streaming=2
-g_mp_as_DefendersMaxHealth=150
-g_multiplayerDefault=1
-
--- Overriden in GameSDK\Difficulty\*.cfg
-g_playerLowHealthThreshold=20
-g_playerMidHealthThreshold=60
-
-g_spawn_vistable_numLineTestsPerFrame=3
-g_telemetryConfig="MP"
-g_telemetrySampleRateBandwidth=3
-g_telemetrySampleRateMemory=2
-g_telemetrySampleRatePerformance=1
-g_VTOLInsideBoundsScaleX=0.6
-g_VTOLInsideBoundsScaleY=1
-net_breakage_sync_entities=0
-net_enable_tfrc=0
-net_log=1
-
--- Make consoles match the PC gravity
-p_gravity_z="-13"
-
--- Sanity check for physics RepositionEntity
-p_max_entity_cells=10000
-
-pl_impulseEnabled=1
-pl_jump_maxTimerValue=0.0
-pl_jump_quickPressThresh=0.12
-pl_melee.angle_limit_from_behind=70
-pl_melee.impulses_enable=1
-pl_melee.melee_snap_angle_limit=45
-pl_melee.melee_snap_end_position_range=1.5
-pl_melee.melee_snap_move_speed_multiplier=10
-pl_melee.melee_snap_target_select_range=3.5
-pl_melee.mp_knockback_strength_hor=2
-pl_melee.mp_melee_system=1
-pl_melee.mp_victim_screenfx_blendout_duration=0.25
-pl_melee.mp_victim_screenfx_duration=0.1
-pl_nanovision_timetodrain=8
-pl_nanovision_timetorecharge=16
-pl_pickAndThrow.chargedThrowAutoAimConeSize=10
-pl_pickAndThrow.complexMelee_snap_angle_limit=25
-pl_sliding_control_mp.deceleration_speed=4
-pl_sliding_control_mp.max_downhill_acceleration=15
-pl_sliding_control_mp.min_speed=4
-pl_sliding_control_mp.min_speed_threshold=5
-pl_stealthKill_aimVsSpineLerp=0.65
-pl_stealthKill_useExtendedRange=1
-p_splash_vel0=0.5
-sv_bandwidth=2147483647
\ No newline at end of file
diff --git a/Assets/Engine/Config/multiplayer_console.cfg b/Assets/Engine/Config/multiplayer_console.cfg
index 0bed002497..e69de29bb2 100644
--- a/Assets/Engine/Config/multiplayer_console.cfg
+++ b/Assets/Engine/Config/multiplayer_console.cfg
@@ -1,29 +0,0 @@
-e_GI=0
-r_DeferredShadingIndexedAmbient=0
-e_ParticlesObjectCollisions=0 
-g_distanceForceNoLegRaycasts=0.00001
-g_telemetryDisplaySessionId=1
-g_breakageNoDebrisCollisions=1
-
-; Breakage throttling
-;	These are explained in ActionGame.cpp
-;	
-g_glassAutoShatterOnExplosions=1
-g_glassNoDecals=1
-g_glassMaxPanesToBreakPerFrame=2
-g_breakageTreeMax=100
-g_breakageTreeInc=101
-g_breakageTreeDec=25
-g_breakageTreeIncGlass=51
-
-sys_PakInMemoryPakSizeLimit=25
-
-r_TexturesStreamPoolSecondarySize=35
-r_MotionBlur=1
-
-e_CoverageBufferReproj=2
-
-osm_enabled = 1
-
-g_waterHitOnly = 1
-p_max_object_splashes=1
diff --git a/Assets/Engine/Config/recording.cfg b/Assets/Engine/Config/recording.cfg
index 42a0dfd9bd..931dbf0858 100644
--- a/Assets/Engine/Config/recording.cfg
+++ b/Assets/Engine/Config/recording.cfg
@@ -1,63 +1,3 @@
--- added this lines for proper 360 deg panorama renderings
-
-e_ScreenShotFileFormat = jpg
-demo_fixed_timestep = 60
-s_SoundEnable = 0
 r_DisplayInfo = 0
-e_PanoramaScreenShotHeight = 720
-e_PanoramaScreenShotWidth = 10053
 c_shakeMult = 0
-demo_ai = 1
-r_MotionBlur = 0
-
--- enables full water reflection
--- e_DebugMask = 2 -- e_DebugMask not allowed here
-
--- set weapong lighting effect to 0 to prevent flickering bug because of too much dynamic lights in the scene
-
-
 sys_spec = 2
-r_WaterRefractions = 1
-r_WaterReflections = 1
-r_WaterUpdateFactor = 0.01
-r_WaterReflections_ForceParticles = 0
-
-r_EnvCMResolution = 2
-r_EnvTexResolution = 3
-r_EnvTexUpdateInterval = 0.05
-e_Decals = 1
-e_DecalsLifeTimeScale = 2
-ca_EnableDecals = 1
-e_LodRatio = 10
-e_ViewDistRatio = 55
-e_Lods = 1
-e_VegetationMinSize = 0
-r_CloudsUpdateAlways = 0
-
-e_DynamicLightsMaxEntityLights = 3
-r_DepthOfField = 1
---r_MotionBlur = 1
-r_Flares = 1
-r_checkSunVis = 1
-r_Coronas = 1
-r_CoronaFade = 0.1625
-r_UseEdgeAA = 1
-e_Clouds = 1
-
-r_TexResolution = 0
-r_TexBumpResolution = 0
-r_DetailTextures = 1
-r_DetailNumLayers = 1
-r_DetailDistance = 8
-
-e_ParticlesLod = 0.9
-
-r_ShadowBlur = 3
-e_ShadowsMaxTexRes = 1024
-r_ShadowJittering = 1
-e_Shadows = 1
-e_VegetationBending = 1
-ai_UpdateAllAlways = 1
-r_refraction = 1
-r_sunshafts = 1
-r_ImposterRatio = 1
diff --git a/Assets/Engine/Config/singleplayer.cfg b/Assets/Engine/Config/singleplayer.cfg
index fc7a4f4c05..e69de29bb2 100644
--- a/Assets/Engine/Config/singleplayer.cfg
+++ b/Assets/Engine/Config/singleplayer.cfg
@@ -1,15 +0,0 @@
-ai_CompatibilityMode=crysis2
-ai_BurstWhileMovingDestinationRange=9999.0
-
-g_telemetryConfig=SP
-
-net_inactivitytimeout=3600
-net_inactivitytimeoutDevmode=3600
-
-pl_movement.nonCombat_heavy_weapon_speed_scale=1.0
-
--- BLM - Don't override game rules. The template project only has DummyRules.
--- Furthermore, multiplayer.cfg doesn't set sv_gamerules, so the inconsistency
--- is likely to create bugs.
---sv_gamerules=SinglePlayer
-ca_StreamCHR=1
\ No newline at end of file
diff --git a/Assets/Engine/Config/sketch_off.cfg b/Assets/Engine/Config/sketch_off.cfg
deleted file mode 100644
index 6b0562daab..0000000000
--- a/Assets/Engine/Config/sketch_off.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-r_UseZPass = 1
-r_GeomInstancing = 1
-
-e_Fog = 1
-e_Clouds = 1
-e_Decals = 1
-e_TerrainDetailMaterials = 1
-e_Dissolve = 1
-e_TerrainAo = 1
-
-r_WaterReflections = 1
-
-e_Shadows = 1
-e_VegetationBending = 1
-
-r_PostProcessEffects = 1
-r_Flares = 1
-r_Beams = 1
-r_Glow = 1
-
-r_DetailTextures = 1
-
-r_refraction = 1
-r_sunshafts = 1
\ No newline at end of file
diff --git a/Assets/Engine/Config/sketch_on.cfg b/Assets/Engine/Config/sketch_on.cfg
deleted file mode 100644
index 6759b5d4c8..0000000000
--- a/Assets/Engine/Config/sketch_on.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-r_UseZPass = 0
-r_GeomInstancing = 0
-
-e_Fog = 0
-e_Clouds = 0
-e_Decals = 0
-e_TerrainDetailMaterials = 0
-e_Dissolve = 0
-e_TerrainAo = 0
-
-r_WaterReflections = 0
-
-e_Shadows = 0
-e_VegetationBending = 0
-
-r_PostProcessEffects = 0
-r_Flares = 0
-r_Beams = 0
-r_Glow = 0
-
-r_DetailTextures = 0
-
-r_refraction = 0
-r_sunshafts = 0
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/android_MaliT760.cfg b/Assets/Engine/Config/spec/android_MaliT760.cfg
index f951e61eef..fd7c0a349d 100644
--- a/Assets/Engine/Config/spec/android_MaliT760.cfg
+++ b/Assets/Engine/Config/spec/android_MaliT760.cfg
@@ -1,76 +1,8 @@
-sys_spec_Full=2
-
 -- Cap frame rate at 30fps
 sys_maxfps=30
 r_vsync=0
 
--- Disable gmem for this device because it causes a crash
-r_EnableGMEMPath=0
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
-sys_job_system_max_worker=2
 sys_streaming_in_blocks=1
 
 sys_streaming_memory_budget=512
 
--- This allows the generation of reflections for the ocean water. Without it, the water looks really dark.
-e_recursion=1
-e_CheckOcclusion=1
-
-r_Fur=0
-az_Asset_EnableAsyncMeshLoading=0
-
-------------------------
--- Misc. memory buffers
-------------------------
-e_GeomCacheBufferSize=0
-e_CheckOcclusionQueueSize=512
-e_CheckOcclusionOutputQueueSize=1024
-
-------------------------
--- Animation
-------------------------
-ca_MemoryDefragPoolSize=33554432
-ca_StreamCHR=1
-
-------------------------
--- sys_spec_objectdetail
-------------------------
-e_Dissolve=2
-e_LodRatio=5
-e_ViewDistRatioDetail=19
-e_ViewDistRatioVegetation=21
-
-
-------------------------
--- sys_spec_postprocessing
-------------------------
-r_HDRBloom=0
-r_SunShafts=0
-r_ToneMapTechnique=3
-r_ToneMapExposureType=1
-r_ColorSpace=2
-
-------------------------
--- sys_spec_shading
-------------------------
-r_VisAreaClipLightsPerPixel=0
-
-------------------------
--- sys_spec_textureresolution
-------------------------
-r_TexturesstreamingMinUsableMips=7
-
-
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
-
---Use an optimized pixel format for the lighting rendertargets during the lighting pass. 
-r_DeferredShadingLBuffersFmt = 2
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/android_high.cfg b/Assets/Engine/Config/spec/android_high.cfg
index fc46adc491..0ab8ebc37b 100644
--- a/Assets/Engine/Config/spec/android_high.cfg
+++ b/Assets/Engine/Config/spec/android_high.cfg
@@ -1,65 +1,7 @@
-sys_spec_Full=3
-
 -- Cap frame rate at 30fps
 sys_maxfps=30
 r_vsync=0
 
--- Enable framebufferfetch(256bpp) or pls if applicable
-r_EnableGMEMPath=2
-
--- Skip the native upscale as a second upscale already occurs
-r_SkipNativeUpscale=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
-sys_job_system_max_worker=2
 sys_streaming_in_blocks=1
 
 sys_streaming_memory_budget=512
-
-e_CheckOcclusion=1
-
-r_Fur=0
-az_Asset_EnableAsyncMeshLoading=0
-
-------------------------
--- Misc. memory buffers
-------------------------
-e_GeomCacheBufferSize=0
-e_CheckOcclusionQueueSize=512
-e_CheckOcclusionOutputQueueSize=1024
-
-------------------------
--- Animation
-------------------------
-ca_MemoryDefragPoolSize=33554432
-ca_StreamCHR=1
-
-------------------------
--- sys_spec_objectdetail
-------------------------
-e_Dissolve=2
-e_LodRatio=5
-e_ViewDistRatioDetail=19
-
-
-------------------------
--- sys_spec_shading
-------------------------
-r_VisAreaClipLightsPerPixel=0
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
-
-r_ClearGMEMGBuffer=1
-
--- Sort ligths since we have limited space in the shadowmap pool texture
-r_DeferredShadingSortLights = 3
-
---Use an optimized pixel format for the lighting rendertargets during the lighting pass. 
-r_DeferredShadingLBuffersFmt = 2
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/android_high_nogmem.cfg b/Assets/Engine/Config/spec/android_high_nogmem.cfg
index ac718a57ee..fd7c0a349d 100644
--- a/Assets/Engine/Config/spec/android_high_nogmem.cfg
+++ b/Assets/Engine/Config/spec/android_high_nogmem.cfg
@@ -1,61 +1,8 @@
-sys_spec_Full=3
-
 -- Cap frame rate at 30fps
 sys_maxfps=30
 r_vsync=0
 
--- Disabling gmem for this configuration
-r_EnableGMEMPath=0
-
--- Skip the native upscale as a second upscale already occurs
-r_SkipNativeUpscale=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
-sys_job_system_max_worker=2
 sys_streaming_in_blocks=1
 
 sys_streaming_memory_budget=512
 
-e_CheckOcclusion=1
-
-r_Fur=0
-az_Asset_EnableAsyncMeshLoading=0
-
-------------------------
--- Misc. memory buffers
-------------------------
-e_GeomCacheBufferSize=0
-e_CheckOcclusionQueueSize=512
-e_CheckOcclusionOutputQueueSize=1024
-
-------------------------
--- Animation
-------------------------
-ca_MemoryDefragPoolSize=33554432
-ca_StreamCHR=1
-
-------------------------
--- sys_spec_objectdetail
-------------------------
-e_Dissolve=2
-e_LodRatio=5
-e_ViewDistRatioDetail=19
-
-
-------------------------
--- sys_spec_shading
-------------------------
-r_VisAreaClipLightsPerPixel=0
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
-
---Use an optimized pixel format for the lighting rendertargets during the lighting pass. 
-r_DeferredShadingLBuffersFmt = 2
-
diff --git a/Assets/Engine/Config/spec/android_low.cfg b/Assets/Engine/Config/spec/android_low.cfg
index 6f2a876877..0ab8ebc37b 100644
--- a/Assets/Engine/Config/spec/android_low.cfg
+++ b/Assets/Engine/Config/spec/android_low.cfg
@@ -1,76 +1,7 @@
-sys_spec_Full=1
-
 -- Cap frame rate at 30fps
 sys_maxfps=30
 r_vsync=0
 
--- Enable framebufferfetch(256bpp) or pls if applicable
-r_EnableGMEMPath=1
-
--- Skip the native upscale as a second upscale already occurs
-r_SkipNativeUpscale=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
-sys_job_system_max_worker=2
 sys_streaming_in_blocks=1
 
 sys_streaming_memory_budget=512
-
--- This allows the generation of reflections for the ocean water. Without it, the water looks really dark.
-e_recursion=0
-e_CheckOcclusion=1
-
-r_Fur=0
-
--- Water occlusion queries crash in some OpenGL ES 3.0 devices
-e_HwOcclusionCullingWater = 0
-az_Asset_EnableAsyncMeshLoading=0
-
-------------------------
--- Misc. memory buffers
-------------------------
-e_GeomCacheBufferSize=0
-e_CheckOcclusionQueueSize=512
-e_CheckOcclusionOutputQueueSize=1024
-
-------------------------
--- Animation
-------------------------
-ca_MemoryDefragPoolSize=33554432
-ca_StreamCHR=1
-
-------------------------
--- sys_spec_objectdetail
-------------------------
-e_Dissolve=2
-e_LodRatio=5
-e_ViewDistRatioDetail=19
-
-
-------------------------
--- sys_spec_shading
-------------------------
-r_VisAreaClipLightsPerPixel=0
-
-
-------------------------
--- sys_spec_textureresolution
-------------------------
-r_TexturesstreamingMinUsableMips=6
-
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
-
--- Sort ligths since we have limited space in the shadowmap pool texture
-r_DeferredShadingSortLights = 3
-r_ClearGMEMGBuffer=1
-
---Use an optimized pixel format for the lighting rendertargets during the lighting pass. 
-r_DeferredShadingLBuffersFmt = 2
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/android_medium.cfg b/Assets/Engine/Config/spec/android_medium.cfg
index f9d776efa7..0ab8ebc37b 100644
--- a/Assets/Engine/Config/spec/android_medium.cfg
+++ b/Assets/Engine/Config/spec/android_medium.cfg
@@ -1,81 +1,7 @@
-sys_spec_Full=2
-
 -- Cap frame rate at 30fps
 sys_maxfps=30
 r_vsync=0
 
--- Enable framebufferfetch(256bpp) or pls if applicable
-r_EnableGMEMPath=1
-
--- Skip the native upscale as a second upscale already occurs
-r_SkipNativeUpscale=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
-sys_job_system_max_worker=2
 sys_streaming_in_blocks=1
 
 sys_streaming_memory_budget=512
-
--- This allows the generation of reflections for the ocean water. Without it, the water looks really dark.
-e_recursion=1
-e_CheckOcclusion=1
-
-r_Fur=0
-az_Asset_EnableAsyncMeshLoading=0
-
-------------------------
--- Misc. memory buffers
-------------------------
-e_GeomCacheBufferSize=0
-e_CheckOcclusionQueueSize=512
-e_CheckOcclusionOutputQueueSize=1024
-
-------------------------
--- Animation
-------------------------
-ca_MemoryDefragPoolSize=33554432
-ca_StreamCHR=1
-
-------------------------
--- sys_spec_objectdetail
-------------------------
-e_Dissolve=2
-e_LodRatio=5
-e_ViewDistRatioDetail=19
-e_ViewDistRatioVegetation=21
-
-
-------------------------
--- sys_spec_postprocessing
-------------------------
-r_HDRBloom=0
-r_SunShafts=0
-r_ToneMapExposureType=1
-r_ColorSpace=2
-
-------------------------
--- sys_spec_shading
-------------------------
-r_VisAreaClipLightsPerPixel=0
-
-------------------------
--- sys_spec_textureresolution
-------------------------
-r_TexturesstreamingMinUsableMips=7
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
-
-r_ClearGMEMGBuffer=1
-
--- Sort ligths since we have limited space in the shadowmap pool texture
-r_DeferredShadingSortLights = 3
-
---Use an optimized pixel format for the lighting rendertargets during the lighting pass. 
-r_DeferredShadingLBuffersFmt = 2
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/android_veryhigh.cfg b/Assets/Engine/Config/spec/android_veryhigh.cfg
index d4f8e9cd47..d58e319706 100644
--- a/Assets/Engine/Config/spec/android_veryhigh.cfg
+++ b/Assets/Engine/Config/spec/android_veryhigh.cfg
@@ -1,60 +1,5 @@
-sys_spec_Full=4
-
 -- Cap frame rate at 30fps
 sys_maxfps=30
 r_vsync=0
-
--- Enable framebufferfetch(256bpp) or pls if applicable
-r_EnableGMEMPath=1
-
--- Skip the native upscale as a second upscale already occurs
-r_SkipNativeUpscale=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
-sys_job_system_max_worker=2
 sys_streaming_in_blocks=1
-
 sys_streaming_memory_budget=512
-
-e_CheckOcclusion=1
-
-r_Fur=0
-az_Asset_EnableAsyncMeshLoading=0
-
-------------------------
--- Misc. memory buffers
-------------------------
-e_GeomCacheBufferSize=0
-e_CheckOcclusionQueueSize=512
-e_CheckOcclusionOutputQueueSize=1024
-
-------------------------
--- Animation
-------------------------
-ca_MemoryDefragPoolSize=33554432
-ca_StreamCHR=1
-
-------------------------
--- sys_spec_objectdetail
-------------------------
-e_Dissolve=2
-e_LodRatio=5
-e_ViewDistRatioDetail=19
-
-
-------------------------
--- sys_spec_shading
-------------------------
-r_VisAreaClipLightsPerPixel=0
-
-r_ClearGMEMGBuffer=1
-
--- Sort ligths since we have limited space in the shadowmap pool texture
-r_DeferredShadingSortLights = 3
-
---Use an optimized pixel format for the lighting rendertargets during the lighting pass. 
-r_DeferredShadingLBuffersFmt = 2
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/ios_high.cfg b/Assets/Engine/Config/spec/ios_high.cfg
index 67fa99ca04..d0cf5b3bc5 100644
--- a/Assets/Engine/Config/spec/ios_high.cfg
+++ b/Assets/Engine/Config/spec/ios_high.cfg
@@ -1,100 +1,10 @@
-sys_spec_Full=3
-
 -- Cap frame rate at 30fps
 sys_maxfps=30
 r_vsync=1
 
--- Enable framebufferfetch or pls if applicable
-r_EnableGMEMPath=1
-
--- Skip the native upscale as a second upscale occurs on Metal Present
-r_SkipNativeUpscale=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
-
-------------------------
--- Job System
-------------------------
-sys_job_system_enable=0
-sys_job_system_max_worker=1
-
 ------------------------
 -- Streaming
 ------------------------
 sys_streaming_in_blocks=1
 sys_streaming_memory_budget=512
 
-------------------------
--- General Rendering
-------------------------
-r_Flush=0
--- Enabling this will clear the GMEM buffer before the z-pass
-r_ClearGMEMGBuffer=2
-r_Fur=0
-
-------------------------
--- VisArea / Portals
-------------------------
-e_PortalsBlend=0
-r_GMEMVisAreasBlendWeight=0.5
-
-------------------------
--- Misc. memory buffers
-------------------------
-e_AutoPrecacheCgf=2
-e_AutoPrecacheTerrainAndProcVeget=1
-e_GeomCacheBufferSize=0
-e_CheckOcclusionQueueSize=512
-e_CheckOcclusionOutputQueueSize=2048
-
-------------------------
--- Animation
-------------------------
-ca_MemoryDefragPoolSize=32
-ca_StreamCHR=1
-
-------------------------
--- sys_spec_water
-------------------------
-e_WaterOcean=2
-e_WaterVolumes=2
-e_WaterOceanBottom=0
-
-------------------------
--- batching
-------------------------
-r_Batching = 1
-r_BatchType = 0
-
-------------------------
--- geom instancing
-------------------------
-r_GeomInstancing=1
-r_GeomInstancingThreshold=5
-
-------------------------
--- Upscaling
-------------------------
---0 point, 1 bilinear, 2 bicubic, 3 lanczos
-r_UpscalingQuality=1
-
-------------------------
--- Geometry Cache
-------------------------
-e_GeomCaches=0
-
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
-
--- Sort ligths since we have limited space in the shadowmap pool texture
-r_DeferredShadingSortLights = 3
-
---Use an optimized pixel format for the lighting rendertargets during the lighting pass. 
-r_DeferredShadingLBuffersFmt = 2
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/ios_low.cfg b/Assets/Engine/Config/spec/ios_low.cfg
index 7870d65bd5..d0cf5b3bc5 100644
--- a/Assets/Engine/Config/spec/ios_low.cfg
+++ b/Assets/Engine/Config/spec/ios_low.cfg
@@ -1,103 +1,10 @@
-sys_spec_Full=1
-
 -- Cap frame rate at 30fps
 sys_maxfps=30
 r_vsync=1
 
--- Enable framebufferfetch or pls if applicable
-r_EnableGMEMPath=1
-
--- Skip the native upscale as a second upscale occurs on Metal Present
-r_SkipNativeUpscale=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
-
-------------------------
--- Job System
-------------------------
-sys_job_system_enable=0
-sys_job_system_max_worker=1
-
 ------------------------
 -- Streaming
 ------------------------
 sys_streaming_in_blocks=1
 sys_streaming_memory_budget=512
 
-------------------------
--- General Rendering
-------------------------
-r_Flush=0
--- Enabling this will clear the GMEM buffer before the z-pass
-r_ClearGMEMGBuffer=2
-r_Fur=0
-
-------------------------
--- VisArea / Portals
-------------------------
-e_PortalsBlend=0
-r_GMEMVisAreasBlendWeight=0.5
-
-------------------------
--- Misc. memory buffers
-------------------------
-e_AutoPrecacheCgf=2
-e_AutoPrecacheTerrainAndProcVeget=1
-e_GeomCacheBufferSize=0
-e_CheckOcclusionQueueSize=512
-e_CheckOcclusionOutputQueueSize=1024
-
-------------------------
--- Animation
-------------------------
-ca_MemoryDefragPoolSize=32
-ca_StreamCHR=1
-
-------------------------
--- sys_spec_water
-------------------------
-e_WaterOcean=2
-e_WaterVolumes=2
-e_WaterOceanBottom=0
-
-
-------------------------
--- batching
-------------------------
-r_Batching = 1
-r_BatchType = 0
-
-------------------------
--- geom instancing
-------------------------
-r_GeomInstancing=1
-r_GeomInstancingThreshold=5
-
-------------------------
--- Upscaling
-------------------------
---0 point, 1 bilinear, 2 bicubic, 3 lanczos
-r_UpscalingQuality=1
-
-------------------------
--- Geometry Cache
-------------------------
-e_GeomCaches=0
-
-
-
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
-
--- Sort ligths since we have limited space in the shadowmap pool texture
-r_DeferredShadingSortLights = 3
-
---Use an optimized pixel format for the lighting rendertargets during the lighting pass. 
-r_DeferredShadingLBuffersFmt = 2
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/ios_medium.cfg b/Assets/Engine/Config/spec/ios_medium.cfg
index 2eaecdef16..d0cf5b3bc5 100644
--- a/Assets/Engine/Config/spec/ios_medium.cfg
+++ b/Assets/Engine/Config/spec/ios_medium.cfg
@@ -1,101 +1,10 @@
-sys_spec_Full=2
-
 -- Cap frame rate at 30fps
 sys_maxfps=30
 r_vsync=1
 
--- Enable framebufferfetch or pls if applicable
-r_EnableGMEMPath=1
-
--- Skip the native upscale as a second upscale occurs on Metal Present
-r_SkipNativeUpscale=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
-
-------------------------
--- Job System
-------------------------
-sys_job_system_enable=0
-sys_job_system_max_worker=1
-
 ------------------------
 -- Streaming
 ------------------------
 sys_streaming_in_blocks=1
 sys_streaming_memory_budget=512
 
-------------------------
--- General Rendering
-------------------------
-r_Flush=0
--- Enabling this will clear the GMEM buffer before the z-pass
-r_ClearGMEMGBuffer=2
-r_Fur=0
-
-------------------------
--- VisArea / Portals
-------------------------
-e_PortalsBlend=0
-r_GMEMVisAreasBlendWeight=0.5
-
-------------------------
--- Misc. memory buffers
-------------------------
-e_AutoPrecacheCgf=2
-e_AutoPrecacheTerrainAndProcVeget=1
-e_GeomCacheBufferSize=0
-e_CheckOcclusionQueueSize=512
-e_CheckOcclusionOutputQueueSize=1024
-
-------------------------
--- Animation
-------------------------
-ca_MemoryDefragPoolSize=32
-ca_StreamCHR=1
-
-------------------------
--- sys_spec_water
-------------------------
-e_WaterOcean=2
-e_WaterVolumes=2
-e_WaterOceanBottom=0
-
-
-------------------------
--- batching
-------------------------
-r_Batching = 1
-r_BatchType = 0
-
-------------------------
--- geom instancing
-------------------------
-r_GeomInstancing=1
-r_GeomInstancingThreshold=5
-
-------------------------
--- Upscaling
-------------------------
---0 point, 1 bilinear, 2 bicubic, 3 lanczos
-r_UpscalingQuality=1
-
-------------------------
--- Geometry Cache
-------------------------
-e_GeomCaches=0
-
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
-
--- Sort ligths since we have limited space in the shadowmap pool texture
-r_DeferredShadingSortLights = 3
-
---Use an optimized pixel format for the lighting rendertargets during the lighting pass. 
-r_DeferredShadingLBuffersFmt = 2
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/ios_veryhigh.cfg b/Assets/Engine/Config/spec/ios_veryhigh.cfg
index 53937a77bf..d0cf5b3bc5 100644
--- a/Assets/Engine/Config/spec/ios_veryhigh.cfg
+++ b/Assets/Engine/Config/spec/ios_veryhigh.cfg
@@ -1,102 +1,10 @@
-sys_spec_Full=4
-
 -- Cap frame rate at 30fps
 sys_maxfps=30
 r_vsync=1
 
--- Enable framebufferfetch or pls if applicable
-r_EnableGMEMPath=1
-
--- Skip the native upscale as a second upscale occurs on Metal Present
-r_SkipNativeUpscale=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
-
-------------------------
--- Job System
-------------------------
-sys_job_system_enable=0
-sys_job_system_max_worker=1
-
 ------------------------
 -- Streaming
 ------------------------
 sys_streaming_in_blocks=1
 sys_streaming_memory_budget=512
 
-------------------------
--- General Rendering
-------------------------
-r_Flush=0
--- Enabling this will clear the GMEM buffer before the z-pass
-r_ClearGMEMGBuffer=2
-r_Fur=0
-
-------------------------
--- VisArea / Portals
-------------------------
-e_PortalsBlend=0
-r_GMEMVisAreasBlendWeight=0.5
-
-------------------------
--- Misc. memory buffers
-------------------------
-e_AutoPrecacheCgf=2
-e_AutoPrecacheTerrainAndProcVeget=1
-e_GeomCacheBufferSize=0
-e_CheckOcclusionQueueSize=512
-e_CheckOcclusionOutputQueueSize=2048
-
-------------------------
--- Animation
-------------------------
-ca_MemoryDefragPoolSize=32
-ca_StreamCHR=1
-
-------------------------
--- sys_spec_water
-------------------------
-e_WaterOcean=2
-e_WaterVolumes=2
-e_WaterOceanBottom=0
-
-
-------------------------
--- batching
-------------------------
-r_Batching = 1
-r_BatchType = 0
-
-------------------------
--- geom instancing
-------------------------
-r_GeomInstancing=1
-r_GeomInstancingThreshold=5
-
-------------------------
--- Upscaling
-------------------------
---0 point, 1 bilinear, 2 bicubic, 3 lanczos
-r_UpscalingQuality=1
-
-------------------------
--- Geometry Cache
-------------------------
-e_GeomCaches=0
-
-
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
-
--- Sort ligths since we have limited space in the shadowmap pool texture
-r_DeferredShadingSortLights = 3
-
---Use an optimized pixel format for the lighting rendertargets during the lighting pass. 
-r_DeferredShadingLBuffersFmt = 2
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/osx_metal_high.cfg b/Assets/Engine/Config/spec/osx_metal_high.cfg
deleted file mode 100644
index 8689e23c51..0000000000
--- a/Assets/Engine/Config/spec/osx_metal_high.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-
-sys_spec_Full=7
-r_ShadersMETAL=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
--- Skip the native upscale as a second upscale occurs on Metal Present
-r_SkipNativeUpscale=1
-
-------------------------
--- sys_spec_postprocessing
-------------------------
-r_SunShafts=1
-
-------------------------
--- sys_spec_shading
-------------------------
-r_DeferredShadingTiled=0
-r_RefractionPartialResolves=0
-e_GI = 0
-
-
-r_Fur=2
-
-
-------------------------
--- Upscaling
-------------------------
---0 point, 1 bilinear, 2 bicubic, 3 lanczos
-r_UpscalingQuality=1
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
diff --git a/Assets/Engine/Config/spec/osx_metal_low.cfg b/Assets/Engine/Config/spec/osx_metal_low.cfg
deleted file mode 100644
index a3084d48c5..0000000000
--- a/Assets/Engine/Config/spec/osx_metal_low.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-
-sys_spec_Full=5
-r_ShadersMETAL=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
--- Skip the native upscale as a second upscale occurs on Metal Present
-r_SkipNativeUpscale=1
-
-------------------------
--- sys_spec_postprocessing
-------------------------
-r_SunShafts=1
-
-------------------------
--- sys_spec_shading
-------------------------
-r_DeferredShadingTiled=0
-r_RefractionPartialResolves=0
-e_GI=0
-
-r_Fur=2
-
-
-------------------------
--- Upscaling
-------------------------
---0 point, 1 bilinear, 2 bicubic, 3 lanczos
-r_UpscalingQuality=1
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
diff --git a/Assets/Engine/Config/spec/osx_metal_medium.cfg b/Assets/Engine/Config/spec/osx_metal_medium.cfg
deleted file mode 100644
index 6477bbb217..0000000000
--- a/Assets/Engine/Config/spec/osx_metal_medium.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-
-sys_spec_Full=6
-r_ShadersMETAL=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
--- Skip the native upscale as a second upscale occurs on Metal Present
-r_SkipNativeUpscale=1
-
-------------------------
--- sys_spec_postprocessing
-------------------------
-r_SunShafts=1
-
-------------------------
--- sys_spec_shading
-------------------------
-r_DeferredShadingTiled=0
-r_RefractionPartialResolves=0
-e_GI = 0
-
-r_Fur=2
-
-
-------------------------
--- Upscaling
-------------------------
---0 point, 1 bilinear, 2 bicubic, 3 lanczos
-r_UpscalingQuality=1
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
diff --git a/Assets/Engine/Config/spec/osx_metal_veryhigh.cfg b/Assets/Engine/Config/spec/osx_metal_veryhigh.cfg
deleted file mode 100644
index 899c198f31..0000000000
--- a/Assets/Engine/Config/spec/osx_metal_veryhigh.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-
-sys_spec_Full=8
-r_ShadersMETAL=1
-
--- Default of 3 allocates all shaders (potentially >150 MB)
--- 1 is most memory efficient but definitely causes hitches when converting HLSL
--- shaders.  Recommend 1 during dev, and 3 with optimized caches for release.
-r_ShadersPreactivate=1
-
--- Skip the native upscale as a second upscale occurs on Metal Present
-r_SkipNativeUpscale=1
-
-------------------------
--- sys_spec_postprocessing
-------------------------
-r_SunShafts=1
-
-------------------------
--- sys_spec_shading
-------------------------
-r_DeferredShadingTiled=0
-r_RefractionPartialResolves=0
-e_GI = 0
-
-r_Fur=2
-
-
-------------------------
--- Upscaling
-------------------------
---0 point, 1 bilinear, 2 bicubic, 3 lanczos
-r_UpscalingQuality=1
-
--- Due to performance issues with incremental cached shadow map updates, enable this to prevent us from culling every object in the world vs each cached shadow map each frame. 
--- If no objects are present in the level this will eliminate the need to clear the massive cached textures each frame.
--- Set to 2 to allow distance-based updates along with script-based updates for the cached shadow maps
-e_ShadowsCacheRequireManualUpdate = 2
diff --git a/Assets/Engine/Config/spec/pc_high.cfg b/Assets/Engine/Config/spec/pc_high.cfg
index a62ed25a6a..e69de29bb2 100644
--- a/Assets/Engine/Config/spec/pc_high.cfg
+++ b/Assets/Engine/Config/spec/pc_high.cfg
@@ -1 +0,0 @@
-sys_spec_Full = 7
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/pc_low.cfg b/Assets/Engine/Config/spec/pc_low.cfg
index 068446e151..e69de29bb2 100644
--- a/Assets/Engine/Config/spec/pc_low.cfg
+++ b/Assets/Engine/Config/spec/pc_low.cfg
@@ -1 +0,0 @@
-sys_spec_Full = 5
diff --git a/Assets/Engine/Config/spec/pc_medium.cfg b/Assets/Engine/Config/spec/pc_medium.cfg
index 0d08b956b4..e69de29bb2 100644
--- a/Assets/Engine/Config/spec/pc_medium.cfg
+++ b/Assets/Engine/Config/spec/pc_medium.cfg
@@ -1 +0,0 @@
-sys_spec_Full = 6
\ No newline at end of file
diff --git a/Assets/Engine/Config/spec/pc_veryhigh.cfg b/Assets/Engine/Config/spec/pc_veryhigh.cfg
index 33959937e8..e69de29bb2 100644
--- a/Assets/Engine/Config/spec/pc_veryhigh.cfg
+++ b/Assets/Engine/Config/spec/pc_veryhigh.cfg
@@ -1 +0,0 @@
-sys_spec_Full = 8
diff --git a/Assets/Engine/Config/statoscope.cfg b/Assets/Engine/Config/statoscope.cfg
index d1d18c813c..ed2089bd67 100644
--- a/Assets/Engine/Config/statoscope.cfg
+++ b/Assets/Engine/Config/statoscope.cfg
@@ -1,12 +1,3 @@
 profile=-1 
-profile_allthreads=1 
-i_forcefeedback=0 
-g_godmode=1 
 log_verbosity=-1 
 sys_pakLogInvalidFileAccess=1
-e_StatoscopeDataGroups=fgmrtudlipny
-e_StatoscopeFilenameUseBuildInfo=0 
-e_StatoscopeFilenameUseMap=1 
-e_StatoscopeMinFuncLengthMs=0.1
-e_StatoscopeMaxNumFuncsPerFrame=60
-e_StatoscopeScreenshotCapturePeriod=5 
diff --git a/Assets/Engine/Config/vr.cfg b/Assets/Engine/Config/vr.cfg
index 989f55f345..80d4b7ce81 100644
--- a/Assets/Engine/Config/vr.cfg
+++ b/Assets/Engine/Config/vr.cfg
@@ -3,39 +3,13 @@
 -----------------------------------------------
 r_width = 960
 r_height = 1080
-r_backbufferWidth = 1920
-r_backbufferHeight = 1080
-
 
 -------------------------------------------
 -- Set the system Spec (Medium)
 -------------------------------------------
 sys_spec = 2
 
-
--------------------------------------------
--- HMD related
--------------------------------------------
-r_overrideDXGIoutput = 0
-r_stereodevice = 100
-r_stereomode = 1
-r_stereooutput = 7
-r_minimizeLatency = 1
-hmd_low_persistence = 1
-r_stereoScaleCoefficient = 1
-
-
 -------------------------------------------
 -- Set some video optimisations
 -------------------------------------------
 r_vsync = 0
-r_MotionBlur = 0
-r_ssdoHalfRes = 3
-r_Refraction = 0
-r_DeferredShadingTiled = 0
-r_CBufferUseNativeDepth = 0
-
--------------------------------------------
--- Hide the hud
--------------------------------------------
---hud_hide = 1
diff --git a/Assets/Engine/SeedAssetList.seed b/Assets/Engine/SeedAssetList.seed
index 579fd3c444..aafbffbe8f 100644
--- a/Assets/Engine/SeedAssetList.seed
+++ b/Assets/Engine/SeedAssetList.seed
@@ -48,22 +48,6 @@
 			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			<Class name="AZStd::string" field="pathHint" value="config/perfhud_pc.xml" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{6C3531BB-4A37-515B-86F6-4FC3A9ABEF9F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/sketch_off.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{EA424FC8-20C9-51D3-A4DD-08DA8B7F7FB3}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/sketch_on.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
 				<Class name="AZ::Uuid" field="guid" value="{34B60E74-28FA-57C4-9A2E-77515A083AC5}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
@@ -432,110 +416,6 @@
 			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_full.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{8A877B20-8B7D-5F61-93C9-FD02CB856165}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_gameeffects.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{5D7C3B35-E171-5A4B-8C36-1D22B3F7636F}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_objectdetail.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{8EAED4CA-6E4B-5F11-94E9-F4FB39E966C4}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_particles.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{437E9B76-BFC3-57AB-9993-9C249EEAEF97}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_physics.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{35B8614B-F080-5BE4-AD78-23F24E104C72}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_postprocessing.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{9CC310DD-0D00-555D-99A7-D339DF0E2A73}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_quality.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{2BD0EFEF-9DA5-5F48-B579-C500CA0D42AB}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_shading.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{979A2D8D-79B9-57E8-9250-A981538FA893}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_shadows.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{90964883-E22A-5D57-86FC-86571AD213BE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_sound.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{89BEF8A4-AA05-5339-B4DE-C475541FD532}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_texture.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{15CBF6A7-1107-55A9-A173-2F7AD1329589}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_textureresolution.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{4CD3711E-09EE-5F91-8688-FB523F350C43}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_volumetriceffects.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{F316DFFF-ABA2-5145-A637-2BBA2C86E7A0}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/cvargroups/sys_spec_water.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
 				<Class name="AZ::Uuid" field="guid" value="{FD38C182-1AFC-514C-99E5-BB1AB60C4A31}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
@@ -616,38 +496,6 @@
 			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 			<Class name="AZStd::string" field="pathHint" value="config/spec/ios_veryhigh.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{B9622C57-85C2-5C68-AFB8-35AA0D65FEC7}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/spec/osx_metal_high.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{E79532D9-BE8F-5969-B672-A2E8030578B9}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/spec/osx_metal_low.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{4B05219C-0D19-5A04-B029-8417CE06A243}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/spec/osx_metal_medium.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
-		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
-			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
-				<Class name="AZ::Uuid" field="guid" value="{C0F09A4E-A77A-5FFF-B1ED-DDB37DED623C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-				<Class name="unsigned int" field="subId" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			</Class>
-			<Class name="unsigned int" field="platformFlags" value="255" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="AZStd::string" field="pathHint" value="config/spec/osx_metal_veryhigh.cfg" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-		</Class>
 		<Class name="SeedInfo" field="element" version="2" type="{FACC3682-2ACA-4AA4-B85A-07AD276D18A0}">
 			<Class name="AssetId" field="assetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
 				<Class name="AZ::Uuid" field="guid" value="{B632E8B1-884A-5A65-BC01-D85F0FED1266}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py
index 821e0acfdb..11832f8846 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py
@@ -113,7 +113,6 @@ def create_basic_atom_level(level_name):
         general.close_pane("Error Log")
     general.idle_wait(1.0)
     general.run_console("r_displayInfo=0")
-    general.run_console("r_antialiasingmode=0")
     general.idle_wait(1.0)
 
     # Delete all existing entities & create default_level entity
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_AtomFeatureIntegrationBenchmark.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_AtomFeatureIntegrationBenchmark.py
index 92199bf196..fbd9f3459a 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_AtomFeatureIntegrationBenchmark.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_AtomFeatureIntegrationBenchmark.py
@@ -66,7 +66,6 @@ def run():
             general.close_pane("Error Log")
         general.idle_wait(1.0)
         general.run_console("r_displayInfo=0")
-        general.run_console("r_antialiasingmode=0")
         general.idle_wait(1.0)
 
         return True
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py
index ac28e67fa1..93e78a7c0a 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py
@@ -82,7 +82,6 @@ def run():
             general.close_pane("Error Log")
         general.idle_wait(1.0)
         general.run_console("r_displayInfo=0")
-        general.run_console("r_antialiasingmode=0")
         general.idle_wait(1.0)
 
         return True
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
index ef3048d8d4..1b094b1cfa 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
@@ -149,7 +149,6 @@ class TestHelper:
             general.idle_wait(1.0)
         general.idle_wait(1.0)
         general.run_console("r_displayInfo=0")
-        general.run_console("r_antialiasingmode=0")
         general.idle_wait(1.0)
 
 
diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/screenshot_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/screenshot_utils.py
index 49cf17855f..22fa3aca0d 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/screenshot_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/screenshot_utils.py
@@ -187,7 +187,3 @@ def prepare_for_screenshot_compare(remote_console_instance):
     """
     wait_for(lambda: _retry_command(remote_console_instance, 'r_displayinfo 0',
                                     '$3r_DisplayInfo = $60 $5[DUMPTODISK, RESTRICTEDMODE]$4'))
-    wait_for(lambda: _retry_command(remote_console_instance, 'r_antialiasingmode 0',
-                                    '$3r_AntialiasingMode = $60 $5[]$4'))
-    wait_for(lambda: _retry_command(remote_console_instance, 'e_WaterOcean 0',
-                                    '$3e_WaterOcean = $60 $5[]$4'))
diff --git a/Code/Legacy/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp
index 6de10f3855..ee1c498a9a 100644
--- a/Code/Legacy/CrySystem/SystemInit.cpp
+++ b/Code/Legacy/CrySystem/SystemInit.cpp
@@ -1273,17 +1273,6 @@ AZ_POP_DISABLE_WARNING
         //Load config files
         //////////////////////////////////////////////////////////////////////////
 
-        int curSpecVal = 0;
-        ICVar* pSysSpecCVar = gEnv->pConsole->GetCVar("r_GraphicsQuality");
-        if (gEnv->pSystem->IsDevMode())
-        {
-            if (pSysSpecCVar && pSysSpecCVar->GetFlags() & VF_WASINCONFIG)
-            {
-                curSpecVal = pSysSpecCVar->GetIVal();
-                pSysSpecCVar->SetFlags(pSysSpecCVar->GetFlags() | VF_SYSSPEC_OVERWRITE);
-            }
-        }
-
         // tools may not interact with @user@
         if (!gEnv->IsInToolMode())
         {
@@ -1293,16 +1282,6 @@ AZ_POP_DISABLE_WARNING
             }
         }
 
-        // If sys spec variable was specified, is not 0, and we are in devmode restore the value from before loading game.cfg
-        // This enables setting of a specific sys_spec outside menu and game.cfg
-        if (gEnv->pSystem->IsDevMode())
-        {
-            if (pSysSpecCVar && curSpecVal && curSpecVal != pSysSpecCVar->GetIVal())
-            {
-                pSysSpecCVar->Set(curSpecVal);
-            }
-        }
-
         {
             // We have to load this file again since first time we did it without devmode
             LoadConfiguration(m_systemConfigName.c_str());
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h
index 96393f4a1f..99e752c90a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h
@@ -22,7 +22,7 @@ namespace ImageProcessingAtom
     const static AZ::u32 EIF_UNUSED_BIT = 0x40;  // Free to use
     const static AZ::u32 EIF_AttachedAlpha = 0x400;  // info for the engine: it's a texture with attached alpha channel
     const static AZ::u32 EIF_SRGBRead = 0x800;  // info for the engine: if gamma corrected rendering is on, this texture requires SRGBRead (it's not stored in linear)
-    const static AZ::u32 EIF_DontResize = 0x8000; // info for the engine: for dds textures that shouldn't be resized with r_TexResolution
+    const static AZ::u32 EIF_DontResize = 0x8000; // info for the engine: for dds textures that shouldn't be resized
     const static AZ::u32 EIF_RenormalizedTexture = 0x10000;  // info for the engine: for dds textures that have renormalized color range
     const static AZ::u32 EIF_CafeNative = 0x20000;  // info for the engine: native Cafe texture format
     const static AZ::u32 EIF_RestrictedPlatformONative = 0x40000;  // native tiled texture for restrict platform O
diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
index 28a5a30e9c..81ec4b17c8 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
@@ -199,20 +199,6 @@ namespace ImGui
                         }
                     }
 
-                    // Lod Min
-                    static ICVar* eLodMinCVAR = gEnv->pConsole->GetCVar("e_LodMin");
-                    if (eLodMinCVAR)
-                    {
-                        int minLodValue = eLodMinCVAR->GetIVal();
-                        int dragIntVal = minLodValue;
-                        ImGui::Text("e_LodMin: %d ( Force a lowest LOD level )", minLodValue);
-                        ImGui::SliderInt("##LodMin", &dragIntVal, 0, 5);
-                        if (dragIntVal != minLodValue)
-                        {
-                            eLodMinCVAR->Set(dragIntVal);
-                        }
-                    }
-
                     // Texel Density
                     static ICVar* eTexelDensityCVAR = gEnv->pConsole->GetCVar("e_texeldensity");
                     if (eTexelDensityCVAR)
diff --git a/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py
index 42adee91ea..75eaa65e94 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py
@@ -208,13 +208,6 @@ class AndroidLauncher(Launcher):
         with self.android_vfs_setreg_path.open('w') as android_vfs_setreg:
             json.dump(vfs_settings, android_vfs_setreg, indent=4)
 
-        self.workspace.settings.modify_platform_setting('r_AssetProcessorShaderCompiler', 1)
-        self.workspace.settings.modify_platform_setting('r_ShadersAsyncCompiling', 0)
-        self.workspace.settings.modify_platform_setting('r_ShadersRemoteCompiler', 1)
-        self.workspace.settings.modify_platform_setting('r_ShadersAllowCompilation', 1)
-        self.workspace.settings.modify_platform_setting('r_ShadersAsyncActivation', 0)
-        self.workspace.settings.modify_platform_setting('r_ShaderCompilerServer', '127.0.0.1')
-        self.workspace.settings.modify_platform_setting('r_ShaderCompilerPort', '61453')
         self.workspace.settings.modify_platform_setting("log_RemoteConsoleAllowedAddresses", '127.0.0.1')
 
     def launch(self):
diff --git a/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py
index 210519d197..047e4fdeef 100644
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py
@@ -172,7 +172,6 @@ class LinuxLauncher(Launcher):
         self.args.append('--regset="/Amazon/AzCore/Bootstrap/wait_for_connect=1"')
         self.args.append(f'--regset="/Amazon/AzCore/Bootstrap/allowed_list={host_ip}"')
 
-        self.workspace.settings.modify_platform_setting("r_AssetProcessorShaderCompiler", 1)
         self.workspace.settings.modify_platform_setting("r_ShaderCompilerServer", host_ip)
         self.workspace.settings.modify_platform_setting("log_RemoteConsoleAllowedAddresses", host_ip)
 
diff --git a/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py
index 4f904b0a40..d18431ba82 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py
@@ -172,8 +172,6 @@ class WinLauncher(Launcher):
         self.args.append('--regset="/Amazon/AzCore/Bootstrap/wait_for_connect=1"')
         self.args.append(f'--regset="/Amazon/AzCore/Bootstrap/allowed_list={host_ip}"')
 
-        self.workspace.settings.modify_platform_setting("r_AssetProcessorShaderCompiler", 1)
-        self.workspace.settings.modify_platform_setting("r_ShaderCompilerServer", host_ip)
         self.workspace.settings.modify_platform_setting("log_RemoteConsoleAllowedAddresses", host_ip)
 
 
diff --git a/Tools/LyTestTools/tests/unit/test_launcher_android.py b/Tools/LyTestTools/tests/unit/test_launcher_android.py
index d2f700e35e..d1adccb096 100755
--- a/Tools/LyTestTools/tests/unit/test_launcher_android.py
+++ b/Tools/LyTestTools/tests/unit/test_launcher_android.py
@@ -238,7 +238,7 @@ class TestAndroidLauncher:
         launcher = ly_test_tools.launchers.AndroidLauncher(mock_workspace, ["dummy"])
         launcher.configure_settings()
 
-        assert mock_workspace.settings.modify_platform_setting.call_count == 8
+        assert mock_workspace.settings.modify_platform_setting.call_count == 1
 
     @mock.patch('ly_test_tools.launchers.platforms.base.Launcher._config_ini_to_dict')
     @mock.patch('ly_test_tools.environment.process_utils.check_output')
diff --git a/cmake/Tools/layout_tool.py b/cmake/Tools/layout_tool.py
index 62e3922770..8093f72e44 100755
--- a/cmake/Tools/layout_tool.py
+++ b/cmake/Tools/layout_tool.py
@@ -120,10 +120,7 @@ def verify_layout(layout_dir, platform_name, project_path, asset_mode, asset_typ
         warning_count += _warn(f"'system_{platform_name_lower}_{asset_type}.cfg' is missing from {str(layout_path)}")
         system_config_values = None
     else:
-        system_config_values = common.get_config_file_values(str(platform_system_cfg_file), ['r_ShadersRemoteCompiler',
-                                                                                             'r_ShadersAllowCompilation',
-                                                                                             'r_AssetProcessorShaderCompiler',
-                                                                                             'r_ShaderCompilerServer'])
+        system_config_values = common.get_config_file_values(str(platform_system_cfg_file), [])
 
     if bootstrap_values:
 
@@ -146,24 +143,23 @@ def verify_layout(layout_dir, platform_name, project_path, asset_mode, asset_typ
 
         elif system_config_values is not None:
 
-            shaders_remote_compiler = system_config_values.get('r_ShadersRemoteCompiler') or '0'
+            shaders_remote_compiler = '0'
             asset_processor_shader_compiler = system_config_values.get('r_AssetProcessorShaderCompiler') or '0'
-            shader_compiler_server = system_config_values.get('r_ShaderCompilerServer') or LOCAL_HOST
+            shader_compiler_server = LOCAL_HOST
             shaders_allow_compilation = system_config_values.get('r_ShadersAllowCompilation')
 
             def _validate_remote_shader_settings():
 
-                if shader_compiler_server == LOCAL_HOST:
-                    if asset_processor_shader_compiler != '1':
-                        return _warn(f"Connection to the remote shader compiler (r_ShaderCompilerServer) is not properly "
-                                     f"set in system_{platform_name_lower}_{asset_type}.cfg. If it is set to {LOCAL_HOST}, then "
-                                     f"r_AssetProcessorShaderCompiler must be set to 1.")
+                if asset_processor_shader_compiler != '1':
+                    return _warn(f"Connection to the remote shader compiler (r_ShaderCompilerServer) is not properly "
+                                 f"set in system_{platform_name_lower}_{asset_type}.cfg. If it is set to {LOCAL_HOST}, then "
+                                 f"r_AssetProcessorShaderCompiler must be set to 1.")
 
 
-                    else:
-                        if _validate_remote_ap(remote_ip, remote_connect, False) > 0:
-                            return _warn(f"The system_{platform_name_lower}_{asset_type}.cfg file is configured to connect to the"
-                                         f" shader compiler server through the remote connection to the Asset Processor.")
+                else:
+                    if _validate_remote_ap(remote_ip, remote_connect, False) > 0:
+                        return _warn(f"The system_{platform_name_lower}_{asset_type}.cfg file is configured to connect to the"
+                                     f" shader compiler server through the remote connection to the Asset Processor.")
                 return 0
 
             # Validation steps based on the asset mode
@@ -181,16 +177,9 @@ def verify_layout(layout_dir, platform_name, project_path, asset_mode, asset_typ
                     warning_count += _warn("No pak files found for PAK mode deployment")
                     # Check if the shader paks are set
                 if has_shader_pak:
-                    # If the shader paks are set, make sure that the remote shader compiler connection settings are set
-                    # or that it is going through AP
-                    if shaders_remote_compiler == '1':
-                        warning_count += _warn(f"Shader paks are set for project {project_name} but remote shader compiling "
-                                               f"(r_ShadersRemoteCompiler) is still enabled "
-                                               f"for it in system_{platform_name_lower}_{asset_type}.cfg.")
-                    else:
-                        # Since we are not connecting to the shader compiler, also make sure bootstrap is not configured to
-                        # connect to Asset Processor remotely
-                        warning_count += _validate_remote_ap(remote_ip, remote_connect, False)
+                    # Since we are not connecting to the shader compiler, also make sure bootstrap is not configured to
+                    # connect to Asset Processor remotely
+                    warning_count += _validate_remote_ap(remote_ip, remote_connect, False)
 
                     if shaders_allow_compilation is not None and shaders_allow_compilation == '1':
                         warning_count += _warn(f"Shader paks are set for project {project_name} but shader compiling "
diff --git a/editor.cfg b/editor.cfg
index 843a52824d..a8719590c5 100644
--- a/editor.cfg
+++ b/editor.cfg
@@ -1,33 +1,12 @@
 -- Settings stored here are only used in the Editor
 
--- Disable the Missing Asset Resolver by default
-ed_MissingAssetResolver = 0
-e_ShadowsCache=0
-r_MotionBlur=0
-r_HDRVignetting=0
--- For feature-test compatibility
-mn_FatalErrorOnInvalidEntity=0
-
 -- Do not warn on Pak file access issues
 sys_PakWarnOnPakAccessFailures=0
 
--- By default, disable any possible stereo output that might have been enabled via a GEM/other config file so that
--- the editor does not startup in stereo mode (which prevents actually editing the environment)
-r_StereoMode=0
-r_StereoOutput=0
-
 -- When editing terrain in the editor, the highest-detail octree nodes for any edited sector will be rendered until
 -- the level is exported and saved, which can cause an artificial increase in the number of nodes that can get 
 -- queued for visibility checks.  These numbers need to be set high enough to account for those increases.
 
--- The CheckOcclusionQueueSize should be at least (terrain height * terrain width) / (32 * 32) in size.
--- (Each queue entry is 64 bytes of RAM)
-e_CheckOcclusionQueueSize=32768
-
--- The CheckOcclusionOutputQueueSize should be at least double the above queue size for safety.
--- (Each queue entry is 64 bytes of RAM)
-e_CheckOcclusionOutputQueueSize=65536
-
 -- Enable warnings when asset loads take longer than the given millisecond threshold
 cl_assetLoadWarningEnable=true
 cl_assetLoadWarningMsThreshold=100
diff --git a/system_android_android.cfg b/system_android_android.cfg
index d5bfddeb73..10ab95abc4 100644
--- a/system_android_android.cfg
+++ b/system_android_android.cfg
@@ -6,40 +6,14 @@ sys_PakLogInvalidFileAccess=1
 r_WidthAndHeightAsFractionOfScreenSize=1.0
 r_MaxWidth=1280
 r_MaxHeight=1080
-
 r_fullscreen=0
+r_ShadersAllowCompilation=1
 
 -- Enable to prevent log spam, can cause missed messages
 -- log_spamdelay=1
 
--- DXGL
---r_Batching=0
-
--- Enabling aync shader compiling causes a hang on some Android devices.
-r_ShadersAsyncCompiling=0
-r_ShadersRemoteCompiler=1
-r_ShadersAllowCompilation=1
-r_ShadersAsyncActivation=0
-
--- Use the Asset Processor to route requests to compile shaders. This enables the Asset Processor
--- to forward the request to the real shader compiler server. Your device is no
--- longer required to be on the same network as the shader compiler server, as long as the device can contact the Asset Processor:
-r_AssetProcessorShaderCompiler=1
-
--- If you run your device locally on the same computer as the shader compiler server, you can use 127.0.0.1.
--- To connect to a shader compiler server that runs on another computer, change localhost to the IP address of that computer (61453 is the default port):
-r_ShaderCompilerServer=127.0.0.1
-
--- For Shader Compiler server running on other machines - 61453 is the default port
-r_ShaderCompilerPort=61453
-
--- Spec level: 0 = auto, 1 = low, 2 = medium, 3 = high, 4 = very high.
-r_GraphicsQuality = 2
-
-s_FileCacheManagerSize=262144
-
 -- Remote console inclusion list
 log_RemoteConsoleAllowedAddresses=127.0.0.1
 
 -- Localization Settings
-sys_localization_format=0
\ No newline at end of file
+sys_localization_format=0
diff --git a/system_ios_ios.cfg b/system_ios_ios.cfg
index 190ad4a121..abf08d0209 100644
--- a/system_ios_ios.cfg
+++ b/system_ios_ios.cfg
@@ -3,26 +3,7 @@
 ------------------------
 
 r_FullScreen=1
-
 r_ShadersAllowCompilation=1
-r_ShadersAsyncActivation=0
-r_ShadersAsyncCompiling=0
-r_ShadersRemoteCompiler=1
-r_ShadersUseLLVMDirectXCompiler=1
-
--- Spec level: 0 = auto, 1 = low, 2 = medium, 3 = high, 4 = very high.
-r_GraphicsQuality = 0
-
--- Use the Asset Processor to route requests to compile shaders. This enables the Asset Processor
--- to forward the request to the real shader compiler server. Your device is no
--- longer required to be on the same network as the shader compiler server, as long as the device can contact the Asset Processor:
-r_AssetProcessorShaderCompiler=1
-
--- If you run your device locally on the same computer as the shader compiler server, you can use 127.0.0.1.
--- To connect to a shader compiler server that runs on another computer, change localhost to the IP address of that computer (61453 is the default port):
-r_ShaderCompilerServer=127.0.0.1
-
---r_ShaderCompilerPort=61453
 
 ------------------------
 -- System
@@ -39,16 +20,6 @@ sys_physics_CPU=0
 -- log_spamdelay=1
 log_IncludeTime=1
 
-------------------------
--- Audio
-------------------------
-s_FileCacheManagerSize=262144
-------------------------
--- Auxiliary Geometry
-------------------------
-r_enableAuxGeom=0
-r_auxGeom=0
-
 -- Remote console inclusion list
 log_RemoteConsoleAllowedAddresses=127.0.0.1
 
diff --git a/system_linux_pc.cfg b/system_linux_pc.cfg
index 614bc44b49..5fec6b8dfd 100644
--- a/system_linux_pc.cfg
+++ b/system_linux_pc.cfg
@@ -10,8 +10,6 @@ sys_PakLogInvalidFileAccess = 0
 -- Remote console inclusion list
 log_RemoteConsoleAllowedAddresses=127.0.0.1
 
-gm_disconnectDetection = 1
-
 -- Localization Settings
 sys_localization_format=0
 
@@ -20,27 +18,7 @@ r_width = 1280
 r_height = 720
 r_fullscreen = 0
 
-r_ShadersAsyncCompiling = 3
-r_ShadersAsyncActivation = 3
-r_ShadersAsyncMaxThreads = 16
-r_ShadersRemoteCompiler = 1
 r_ShadersAllowCompilation = 1
 
--- Use the Asset Processor to route requests to compile shaders. This enables the Asset Processor
--- to forward the request to the real shader compiler server. Your device is no
--- longer required to be on the same network as the shader compiler server, as long as the device can contact the Asset Processor:
-r_AssetProcessorShaderCompiler=0
-
--- If you run your device locally on the same computer as the shader compiler server, you can use 127.0.0.1.
--- To connect to a shader compiler server that runs on another computer, change localhost to the IP address of that computer (61453 is the default port):
---r_ShaderCompilerServer=127.0.0.1
---r_ShaderCompilerPort = 61453
-
--- Spec level: 0 = auto, 1 = low, 2 = medium, 3 = high, 4 = very high. Autodetection not yet implemented for this platform.
-r_GraphicsQuality = 1
-
--- Texture streaming not supported on opengl
-r_TexturesStreaming=0
-
 -- Display FPS
 r_displayInfo = 3
diff --git a/system_mac_mac.cfg b/system_mac_mac.cfg
index 22fbca6e1e..ef145c890e 100644
--- a/system_mac_mac.cfg
+++ b/system_mac_mac.cfg
@@ -3,9 +3,6 @@ sys_float_exceptions=0
 log_IncludeTime=1
 sys_PakLogInvalidFileAccess=0
 
--- Spec level: 0 = auto, 1 = low, 2 = medium, 3 = high, 4 = very high. Currently overwritten by hardcoded value for this platform.
-r_GraphicsQuality = 0
-
 r_width=1280
 r_height=720
 r_fullscreen=0
@@ -13,25 +10,7 @@ r_fullscreen=0
 -- Enable to prevent log spam, can cause missed messages
 -- log_spamdelay=1
 
--- DXGL
-r_Batching=0
-
-r_ShadersAsyncCompiling=0
-r_ShadersRemoteCompiler=1
 r_ShadersAllowCompilation=1
-r_ShadersAsyncActivation=0
-r_ShadersUseLLVMDirectXCompiler=1
-
--- Use the Asset Processor to route requests to compile shaders. This enables the Asset Processor
--- to forward the request to the real shader compiler server. Your device is no
--- longer required to be on the same network as the shader compiler server, as long as the device can contact the Asset Processor:
-r_AssetProcessorShaderCompiler=1
-
--- If you run your device locally on the same computer as the shader compiler server, you can use 127.0.0.1.
--- To connect to a shader compiler server that runs on another computer, change localhost to the IP address of that computer (61453 is the default port):
-r_ShaderCompilerServer=127.0.0.1
-
---r_ShaderCompilerPort=61453
 
 -- Remote console inclusion list
 log_RemoteConsoleAllowedAddresses=127.0.0.1
diff --git a/system_windows_pc.cfg b/system_windows_pc.cfg
index 05210e02e0..aa53ed9323 100644
--- a/system_windows_pc.cfg
+++ b/system_windows_pc.cfg
@@ -11,27 +11,7 @@ r_fullscreen = 0
 -- Enable to prevent log spam, can cause missed messages
 -- log_spamdelay=1
 
-r_ShadersAsyncCompiling = 3
-r_ShadersAsyncActivation = 3
-r_ShadersAsyncMaxThreads = 16
-r_ShadersRemoteCompiler = 0
 r_ShadersAllowCompilation = 1
 
--- Use the Asset Processor to route requests to compile shaders. This enables the Asset Processor
--- to forward the request to the real shader compiler server. Your device is no
--- longer required to be on the same network as the shader compiler server, as long as the device can contact the Asset Processor:
-r_AssetProcessorShaderCompiler=0
-
--- If you run your device locally on the same computer as the shader compiler server, you can use 127.0.0.1.
--- To connect to a shader compiler server that runs on another computer, change localhost to the IP address of that computer (61453 is the default port):
-r_ShaderCompilerServer=127.0.0.1
---r_ShaderCompilerPort = 61453
-
--- Spec level: 0 = auto, 1 = low, 2 = medium, 3 = high, 4 = very high. Autodetection not yet implemented for this platform.
-r_GraphicsQuality = 4
-
---r_driver=GL
---r_ShadersGL4=1
-
 -- Localization Settings
 sys_localization_format=0

From 70636572ff259873a19dd6f8c384b3025c399df1 Mon Sep 17 00:00:00 2001
From: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Date: Tue, 12 Oct 2021 15:08:07 -0700
Subject: [PATCH 15/29] Fix casing of editor_xml filenames to match casing in
 .ly files (#4640)

Signed-off-by: Steve Pham <spham@amazon.com>
---
 Code/Editor/CryEditDoc.cpp      | 4 ++--
 Code/Editor/Util/XmlArchive.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Code/Editor/CryEditDoc.cpp b/Code/Editor/CryEditDoc.cpp
index 75bd0ad270..4944c3bff5 100644
--- a/Code/Editor/CryEditDoc.cpp
+++ b/Code/Editor/CryEditDoc.cpp
@@ -1273,7 +1273,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
         if (savedEntities)
         {
             AZ_PROFILE_SCOPE(AzToolsFramework, "CCryEditDoc::SaveLevel Updated PakFile levelEntities.editor_xml");
-            pakFile.UpdateFile("LevelEntities.editor_xml", entitySaveBuffer.begin(), static_cast<int>(entitySaveBuffer.size()));
+            pakFile.UpdateFile("levelentities.editor_xml", entitySaveBuffer.begin(), static_cast<int>(entitySaveBuffer.size()));
 
             // Save XML archive to pak file.
             bool bSaved = xmlAr.SaveToPak(Path::GetPath(tempSaveFile), pakFile);
@@ -1501,7 +1501,7 @@ bool CCryEditDoc::LoadEntitiesFromLevel(const QString& levelPakFile)
         bool pakOpened = pakSystem->OpenPack(levelPakFile.toUtf8().data());
         if (pakOpened)
         {
-            const QString entityFilename = Path::GetPath(levelPakFile) + "LevelEntities.editor_xml";
+            const QString entityFilename = Path::GetPath(levelPakFile) + "levelentities.editor_xml";
 
             CCryFile entitiesFile;
             if (entitiesFile.Open(entityFilename.toUtf8().data(), "rt"))
diff --git a/Code/Editor/Util/XmlArchive.cpp b/Code/Editor/Util/XmlArchive.cpp
index 18c3fc8e63..3a965fb239 100644
--- a/Code/Editor/Util/XmlArchive.cpp
+++ b/Code/Editor/Util/XmlArchive.cpp
@@ -119,7 +119,7 @@ bool CXmlArchive::SaveToPak([[maybe_unused]] const QString& levelPath, CPakFile&
     _smart_ptr<IXmlStringData> pXmlStrData = root->getXMLData(5000000);
 
     // Save xml file.
-    QString xmlFilename = "Level.editor_xml";
+    QString xmlFilename = "level.editor_xml";
     pakFile.UpdateFile(xmlFilename.toUtf8().data(), (void*)pXmlStrData->GetString(), static_cast<int>(pXmlStrData->GetStringLength()));
 
     if (pakFile.GetArchive())
@@ -134,7 +134,7 @@ bool CXmlArchive::SaveToPak([[maybe_unused]] const QString& levelPath, CPakFile&
 //////////////////////////////////////////////////////////////////////////
 bool CXmlArchive::LoadFromPak(const QString& levelPath, CPakFile& pakFile)
 {
-    QString xmlFilename = QDir(levelPath).absoluteFilePath("Level.editor_xml");
+    QString xmlFilename = QDir(levelPath).absoluteFilePath("level.editor_xml");
     root = XmlHelpers::LoadXmlFromFile(xmlFilename.toUtf8().data());
     if (!root)
     {

From 3b78132833f7537e7f5c107fa38b13987cd91f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Semp=C3=A9?=
 <58790905+lsemp3d@users.noreply.github.com>
Date: Tue, 12 Oct 2021 15:45:41 -0700
Subject: [PATCH 16/29] Split StyleHelper.h into a header and source file
 (#4614)

* Split StyleHelper.h into a header and source file

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Missing file from commit

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Removed incorrect path

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Fixed includes

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Removed unnecessary comment

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

* Missing include

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
---
 .../GraphCanvas/Styling/StyleHelper.cpp       | 470 +++++++++++++++++
 .../GraphCanvas/Styling/StyleHelper.h         | 480 ++----------------
 .../Code/graphcanvas_staticlib_files.cmake    |   1 +
 .../ContainerWizard/ContainerWizard.cpp       |   1 -
 .../Tools/UpgradeTool/UpgradeHelper.ui        |   3 -
 5 files changed, 510 insertions(+), 445 deletions(-)
 create mode 100644 Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.cpp

diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.cpp
new file mode 100644
index 0000000000..6313d6ec17
--- /dev/null
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.cpp
@@ -0,0 +1,470 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <GraphCanvas/Styling/StyleHelper.h>
+
+#include <QDebug>
+
+namespace GraphCanvas
+{
+    namespace Styling
+    {
+
+        StyleHelper::StyleHelper(const AZ::EntityId& styledEntity)
+        {
+            SetStyle(styledEntity);
+        }
+
+        StyleHelper::StyleHelper(const AZ::EntityId& realStyledEntity, const AZStd::string& virtualChildElement)
+        {
+            SetStyle(realStyledEntity, virtualChildElement);
+        }
+
+        StyleHelper::~StyleHelper()
+        {
+            ReleaseStyle();
+        }
+
+        void StyleHelper::OnStylesUnloaded()
+        {
+            ReleaseStyle();
+        }
+
+        void StyleHelper::SetEditorId(const EditorId& editorId)
+        {
+            if (m_editorId != editorId)
+            {
+                ReleaseStyle();
+                m_editorId = editorId;
+
+                RegisterStyleSheetBus(m_editorId);
+            }
+        }
+
+        void StyleHelper::SetScene(const AZ::EntityId& sceneId)
+        {
+            m_scene = sceneId;
+
+            EditorId editorId;
+            SceneRequestBus::EventResult(editorId, m_scene, &SceneRequests::GetEditorId);
+            SetEditorId(editorId);
+        }
+
+        void StyleHelper::SetStyle(const AZ::EntityId& styledEntity)
+        {
+            ReleaseStyle();
+
+            m_styledEntity = styledEntity;
+
+            AZ::EntityId sceneId;
+            SceneMemberRequestBus::EventResult(sceneId, m_styledEntity, &SceneMemberRequests::GetScene);
+            if (!sceneId.IsValid())
+            {
+                return;
+            }
+
+            SetScene(sceneId);
+
+            for (const auto& selector : m_styleSelectors)
+            {
+                StyledEntityRequestBus::Event(m_styledEntity, &StyledEntityRequests::AddSelectorState, selector.c_str());
+            }
+
+            UpdateStyle();
+        }
+
+        void StyleHelper::SetStyle(const AZStd::string& style)
+        {
+            ReleaseStyle();
+
+            m_deleteStyledEntity = true;
+
+            PseudoElementFactoryRequestBus::BroadcastResult(m_styledEntity, &PseudoElementFactoryRequests::CreateStyleEntity, style);
+
+            for (const auto& selector : m_styleSelectors)
+            {
+                StyledEntityRequestBus::Event(m_styledEntity, &StyledEntityRequests::AddSelectorState, selector.c_str());
+            }
+
+            // TODO: remove/replace OnSceneSet and fix any systems/components listening for that event.
+            SceneMemberNotificationBus::Event(m_styledEntity, &SceneMemberNotifications::OnSceneSet, m_scene);
+
+            UpdateStyle();
+
+            static bool enableDiagnostic = false;
+            if (enableDiagnostic)
+            {
+                AZStd::string description;
+                StyleRequestBus::EventResult(description, m_style, &StyleRequests::GetDescription);
+                qDebug() << description.c_str();
+            }
+        }
+
+        void StyleHelper::SetStyle(const AZ::EntityId& parentStyledEntity, const AZStd::string& virtualChildElement)
+        {
+            ReleaseStyle();
+
+            m_deleteStyledEntity = true;
+
+            AZ::EntityId sceneId;
+            SceneMemberRequestBus::EventResult(sceneId, parentStyledEntity, &SceneMemberRequests::GetScene);
+
+            SetScene(sceneId);
+
+            PseudoElementFactoryRequestBus::BroadcastResult(m_styledEntity, &PseudoElementFactoryRequests::CreateVirtualChild, parentStyledEntity, virtualChildElement);
+
+            for (const auto& selector : m_styleSelectors)
+            {
+                StyledEntityRequestBus::Event(m_styledEntity, &StyledEntityRequests::AddSelectorState, selector.c_str());
+            }
+
+            UpdateStyle();
+
+            static bool enableDiagnostic = false;
+            if (enableDiagnostic)
+            {
+                AZStd::string description;
+                StyleRequestBus::EventResult(description, m_style, &StyleRequests::GetDescription);
+                qDebug() << description.c_str();
+            }
+
+        }
+
+        void StyleHelper::RemoveAttributeOverride(Styling::Attribute attribute)
+        {
+            m_attributeOverride.erase(attribute);
+        }
+
+        bool StyleHelper::HasAttribute(Styling::Attribute attribute) const
+        {
+            bool hasAttribute = (m_attributeOverride.find(attribute) != m_attributeOverride.end());
+
+            if (!hasAttribute)
+            {
+                StyleRequestBus::EventResult(hasAttribute, m_style, &StyleRequests::HasAttribute, static_cast<AZ::u32>(attribute));
+            }
+
+            return hasAttribute;
+        }
+
+        QColor StyleHelper::GetColor(Styling::Attribute color, QColor defaultValue /*= QColor()*/) const
+        {
+            return GetAttribute(color, defaultValue);
+        }
+
+        QFont StyleHelper::GetFont() const
+        {
+            QFont font;
+            QFontInfo info(font);
+            info.pixelSize();
+
+            font.setFamily(GetAttribute(Attribute::FontFamily, font.family()));
+            font.setPixelSize(GetAttribute(Attribute::FontSize, info.pixelSize()));
+            font.setWeight(GetAttribute(Attribute::FontWeight, font.weight()));
+            font.setStyle(GetAttribute(Attribute::FontStyle, font.style()));
+            font.setCapitalization(GetAttribute(Attribute::FontVariant, font.capitalization()));
+
+            return font;
+        }
+
+        QString StyleHelper::GetFontStyleSheet() const
+        {
+            QFont font = GetFont();
+            QColor color = GetColor(Styling::Attribute::Color);
+
+            QStringList fields;
+
+            fields.push_back(QString("color: rgba(%1,%2,%3,%4)").arg(color.red()).arg(color.green()).arg(color.blue()).arg(color.alpha()));
+
+            fields.push_back(QString("font-family: %1").arg(font.family()));
+            fields.push_back(QString("font-size: %1px").arg(font.pixelSize()));
+
+            if (font.bold())
+            {
+                fields.push_back("font-weight: bold");
+            }
+
+            switch (font.style())
+            {
+            case QFont::StyleNormal:
+                break;
+            case QFont::StyleItalic:
+                fields.push_back("font-style: italic");
+                break;
+            case QFont::StyleOblique:
+                fields.push_back("font-style: italic");
+                break;
+            }
+
+            const bool underline = font.underline();
+            const bool strikeOut = font.strikeOut();
+
+            if (underline && strikeOut)
+            {
+                fields.push_back("text-decoration: underline line-through");
+            }
+            else if (underline)
+            {
+                fields.push_back("text-decoration: underline");
+            }
+            else if (strikeOut)
+            {
+                fields.push_back("text-decoration: line-through");
+            }
+
+            return fields.join("; ");
+        }
+
+        QPen StyleHelper::GetPen(Styling::Attribute width, Styling::Attribute style, Styling::Attribute color, Styling::Attribute cap, bool cosmetic /*= false*/) const
+        {
+            QPen pen;
+            pen.setColor(GetAttribute(color, QColor(Qt::black)));
+            pen.setWidth(GetAttribute(width, 1));
+            pen.setStyle(GetAttribute(style, Qt::SolidLine));
+            pen.setCapStyle(GetAttribute(cap, Qt::SquareCap));
+            pen.setCosmetic(cosmetic);
+
+            return pen;
+        }
+
+        QPen StyleHelper::GetBorder() const
+        {
+            return GetPen(Styling::Attribute::BorderWidth, Styling::Attribute::BorderStyle, Styling::Attribute::BorderColor, Styling::Attribute::CapStyle);
+        }
+
+        QBrush StyleHelper::GetBrush(Styling::Attribute color, QBrush defaultValue /*= QBrush()*/) const
+        {
+            return GetAttribute(color, defaultValue);
+        }
+
+        QSizeF StyleHelper::GetSize(QSizeF defaultSize) const
+        {
+            return{
+                GetAttribute(Styling::Attribute::Width, defaultSize.width()),
+                GetAttribute(Styling::Attribute::Height, defaultSize.height())
+            };
+        }
+
+        QSizeF StyleHelper::GetMinimumSize(QSizeF defaultSize /*= QSizeF(0,0)*/) const
+        {
+            return QSizeF(GetAttribute(Styling::Attribute::MinWidth, defaultSize.width()), GetAttribute(Styling::Attribute::MinHeight, defaultSize.height()));
+        }
+
+        QSizeF StyleHelper::GetMaximumSize(QSizeF defaultSize /*= QSizeF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)*/) const
+        {
+            return QSizeF(GetAttribute(Styling::Attribute::MaxWidth, defaultSize.width()), GetAttribute(Styling::Attribute::MaxHeight, defaultSize.height()));
+        }
+
+        QMarginsF StyleHelper::GetMargins(QMarginsF defaultMargins /*= QMarginsF()*/) const
+        {
+            bool hasMargin = false;
+            StyleRequestBus::EventResult(hasMargin, m_style, &StyleRequests::HasAttribute, static_cast<AZ::u32>(Styling::Attribute::Margin));
+
+            if (hasMargin)
+            {
+                qreal defaultMargin = GetAttribute(Styling::Attribute::Margin, 0);
+                defaultMargins = QMarginsF(defaultMargin, defaultMargin, defaultMargin, defaultMargin);
+            }
+
+            return QMarginsF(
+                GetAttribute(Styling::Attribute::Margin/*TODO Left*/, defaultMargins.left()),
+                GetAttribute(Styling::Attribute::Margin/*TODO Top*/, defaultMargins.top()),
+                GetAttribute(Styling::Attribute::Margin/*TODO Right*/, defaultMargins.right()),
+                GetAttribute(Styling::Attribute::Margin/*TODO Bottom*/, defaultMargins.bottom())
+            );
+        }
+
+        bool StyleHelper::HasTextAlignment() const
+        {
+            return HasAttribute(Styling::Attribute::TextAlignment) || HasAttribute(Styling::Attribute::TextVerticalAlignment);
+        }
+
+        Qt::Alignment StyleHelper::GetTextAlignment(Qt::Alignment defaultAlignment) const
+        {
+            bool horizontalAlignment = HasAttribute(Styling::Attribute::TextAlignment);
+            bool verticalAlignment = HasAttribute(Styling::Attribute::TextVerticalAlignment);
+
+            if (horizontalAlignment || verticalAlignment)
+            {
+                Qt::Alignment alignment = GetAttribute(Styling::Attribute::TextAlignment, Qt::AlignmentFlag::AlignLeft);
+                alignment = alignment | GetAttribute(Styling::Attribute::TextVerticalAlignment, Qt::AlignmentFlag::AlignTop);
+
+                return alignment;
+            }
+
+            return defaultAlignment;
+        }
+
+        void StyleHelper::AddSelector(const AZStd::string_view& selector)
+        {
+            auto insertResult = m_styleSelectors.insert(AZStd::string(selector));
+
+            if (insertResult.second && m_styledEntity.IsValid())
+            {
+                StyledEntityRequestBus::Event(m_styledEntity, &StyledEntityRequests::AddSelectorState, selector.data());
+
+                UpdateStyle();
+            }
+        }
+
+        void StyleHelper::RemoveSelector(const AZStd::string_view& selector)
+        {
+            AZStd::size_t elements = m_styleSelectors.erase(selector);
+
+            if (elements > 0)
+            {
+                StyledEntityRequestBus::Event(m_styledEntity, &StyledEntityRequests::RemoveSelectorState, selector.data());
+
+                UpdateStyle();
+            }
+        }
+
+        GraphCanvas::CandyStripeConfiguration StyleHelper::GetCandyStripeConfiguration() const
+        {
+            CandyStripeConfiguration config;
+
+            config.m_initialOffset = GetAttribute(Styling::Attribute::StripeOffset, 0);
+            config.m_maximumSize = GetAttribute(Styling::Attribute::MaximumStripeSize, 10);
+
+            if (config.m_maximumSize <= 0)
+            {
+                config.m_maximumSize = 1;
+            }
+
+            config.m_minStripes = GetAttribute(Styling::Attribute::MinimumStripes, 2);
+
+            if (config.m_minStripes <= 0)
+            {
+                config.m_minStripes = 1;
+            }
+
+            config.m_stripeAngle = GetAttribute(Styling::Attribute::StripeAngle, 60);
+
+            if (config.m_stripeAngle > 90)
+            {
+                config.m_stripeAngle = 89;
+            }
+            else if (config.m_stripeAngle < -90)
+            {
+                config.m_stripeAngle = -89;
+            }
+
+            if (!HasAttribute(Styling::Attribute::StripeColor))
+            {
+                QColor backgroundColor = GetAttribute(Styling::Attribute::BackgroundColor, QColor(0, 0, 0));
+
+                config.m_stripeColor = backgroundColor.darker();
+
+                int totalDifference = 0;
+
+                totalDifference += backgroundColor.red() - config.m_stripeColor.red();
+                totalDifference += backgroundColor.green() - config.m_stripeColor.green();
+                totalDifference += backgroundColor.blue() - config.m_stripeColor.blue();
+
+                if (totalDifference < 150)
+                {
+                    config.m_stripeColor = backgroundColor.lighter();
+                }
+            }
+            else
+            {
+                config.m_stripeColor = GetAttribute(Styling::Attribute::StripeColor, QColor(0, 0, 0));
+            }
+
+            return config;
+        }
+
+        GraphCanvas::PatternedFillGenerator StyleHelper::GetPatternedFillGenerator() const
+        {
+            PatternedFillGenerator generator;
+            generator.m_editorId = m_editorId;
+
+            generator.m_id = GetAttribute(Styling::Attribute::PatternTemplate, QString()).toUtf8().data();
+
+            if (HasAttribute(Styling::Attribute::PatternPalettes))
+            {
+                AZStd::string paletteStrings = GetAttribute(Styling::Attribute::PatternPalettes, QString()).toUtf8().data();
+
+                AzFramework::StringFunc::Tokenize(paletteStrings.c_str(), generator.m_palettes, ',');
+            }
+            else
+            {
+                QColor backgroundColor = GetAttribute(Styling::Attribute::BackgroundColor, QColor(0, 0, 0));
+
+                QColor patternColor = backgroundColor.darker();
+
+                int totalDifference = 0;
+
+                totalDifference += backgroundColor.red() - patternColor.red();
+                totalDifference += backgroundColor.green() - patternColor.green();
+                totalDifference += backgroundColor.blue() - patternColor.blue();
+
+                if (totalDifference < 150)
+                {
+                    patternColor = backgroundColor.lighter();
+                }
+
+                generator.m_colors.push_back(patternColor);
+            }
+
+            generator.m_configuration = GetPatternFillConfiguration();
+
+            return generator;
+        }
+
+        GraphCanvas::PatternFillConfiguration StyleHelper::GetPatternFillConfiguration() const
+        {
+            PatternFillConfiguration configuration;
+
+            configuration.m_minimumTileRepetitions = GetAttribute(Styling::Attribute::MinimumRepetitions, 1);
+            configuration.m_evenRowOffsetPercent = GetAttribute(Styling::Attribute::EvenOffsetPercent, 0.0f);
+            configuration.m_oddRowOffsetPercent = GetAttribute(Styling::Attribute::OddOffsetPercent, 0.0f);
+
+            return configuration;
+        }
+
+        void StyleHelper::PopulatePaletteConfiguration(PaletteIconConfiguration& configuration) const
+        {
+            AZStd::string stylePalette;
+            StyledEntityRequestBus::EventResult(stylePalette, m_styledEntity, &StyledEntityRequests::GetFullStyleElement);
+
+            if (!stylePalette.empty())
+            {
+                configuration.SetColorPalette(stylePalette);
+            }
+        }
+
+        void StyleHelper::UpdateStyle()
+        {
+            ReleaseStyle(false);
+            StyleManagerRequestBus::EventResult(m_style, m_editorId, &StyleManagerRequests::ResolveStyles, m_styledEntity);
+        }
+
+        void StyleHelper::ReleaseStyle(bool destroyChildElement /*= true*/)
+        {
+            if (m_style.IsValid())
+            {
+                if (m_deleteStyledEntity && destroyChildElement)
+                {
+                    m_deleteStyledEntity = false;
+                    AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationRequests::DeleteEntity, m_styledEntity);
+                }
+                AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationRequests::DeleteEntity, m_style);
+
+                m_style.SetInvalid();
+            }
+        }
+
+        void StyleHelper::RegisterStyleSheetBus(const EditorId& editorId)
+        {
+            StyleManagerNotificationBus::Handler::BusDisconnect();
+            StyleManagerNotificationBus::Handler::BusConnect(editorId);
+        }
+
+}
+}
diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.h
index cc7429f8fc..b500d4b197 100644
--- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.h
+++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Styling/StyleHelper.h
@@ -8,7 +8,8 @@
 
 #pragma once
 
-AZ_PUSH_DISABLE_WARNING(4251 4800 4244, "-Wunknown-warning-option")
+#if !defined(Q_MOC_RUN)
+
 #include <QColor>
 #include <QFont>
 #include <QFontInfo>
@@ -16,7 +17,6 @@ AZ_PUSH_DISABLE_WARNING(4251 4800 4244, "-Wunknown-warning-option")
 #include <QString>
 #include <QVariant>
 #include <QWidget>
-AZ_POP_DISABLE_WARNING
 
 #include <AzCore/EBus/EBus.h>
 #include <AzCore/Component/EntityId.h>
@@ -32,6 +32,8 @@ AZ_POP_DISABLE_WARNING
 #include <GraphCanvas/Types/Types.h>
 #include <GraphCanvas/Types/QtMetaTypes.h>
 
+#endif
+
 namespace GraphCanvas
 {
     namespace Styling
@@ -45,124 +47,49 @@ namespace GraphCanvas
             AZ_CLASS_ALLOCATOR(StyleHelper, AZ::SystemAllocator, 0);
 
             StyleHelper() = default;
-
-            StyleHelper(const AZ::EntityId& styledEntity)
-            {
-                SetStyle(styledEntity);
-            }
-
-            StyleHelper(const AZ::EntityId& realStyledEntity, const AZStd::string& virtualChildElement)
-            {
-                SetStyle(realStyledEntity, virtualChildElement);
-            }
-
-            virtual ~StyleHelper()
-            {
-                ReleaseStyle();
-            }
+            StyleHelper(const AZ::EntityId& styledEntity);
+            StyleHelper(const AZ::EntityId& realStyledEntity, const AZStd::string& virtualChildElement);
+            virtual ~StyleHelper();
 
             // StyleManagerNotificationBus
-            void OnStylesUnloaded() override
-            {
-                ReleaseStyle();
-            }
+            void OnStylesUnloaded() override;
             ////
 
-            void SetEditorId(const EditorId& editorId)
-            {
-                if (m_editorId != editorId)
-                {
-                    ReleaseStyle();
-                    m_editorId = editorId;
+            void SetEditorId(const EditorId& editorId);
+            void SetScene(const AZ::EntityId& sceneId);
 
-                    RegisterStyleSheetBus(m_editorId);
-                }
-            }
+            void SetStyle(const AZStd::string& style);
+            void SetStyle(const AZ::EntityId& styledEntity);
+            void SetStyle(const AZ::EntityId& parentStyledEntity, const AZStd::string& virtualChildElement);
 
-            // TODO: Get rid of this and m_scene once the OnSceneSet notification is removed (see below).
-            void SetScene(const AZ::EntityId& sceneId)
-            {
-                m_scene = sceneId;
+            bool HasAttribute(Styling::Attribute attribute) const;
+            void RemoveAttributeOverride(Styling::Attribute attribute);
 
-                EditorId editorId;
-                SceneRequestBus::EventResult(editorId, m_scene, &SceneRequests::GetEditorId);
-                SetEditorId(editorId);
-            }
+            QColor GetColor(Styling::Attribute color, QColor defaultValue = QColor()) const;
+            QFont GetFont() const;
 
-            void SetStyle(const AZ::EntityId& styledEntity)
-            {
-                ReleaseStyle();
+            //! Helper method which constructs a stylesheet based on the calculated font style.
+            //! We need this too pass along to certain Qt widgets because we use our own custom style parsing system.
+            QString GetFontStyleSheet() const;
 
-                m_styledEntity = styledEntity;
+            QPen GetPen(Styling::Attribute width, Styling::Attribute style, Styling::Attribute color, Styling::Attribute cap, bool cosmetic = false) const;
+            QPen GetBorder() const;
+            QBrush GetBrush(Styling::Attribute color, QBrush defaultValue = QBrush()) const;
+            QSizeF GetSize(QSizeF defaultSize) const;
+            QSizeF GetMinimumSize(QSizeF defaultSize = QSizeF(0,0)) const;
+            QSizeF GetMaximumSize(QSizeF defaultSize = QSizeF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)) const;
+            QMarginsF GetMargins(QMarginsF defaultMargins = QMarginsF()) const;
 
-                AZ::EntityId sceneId;
-                SceneMemberRequestBus::EventResult(sceneId, m_styledEntity, &SceneMemberRequests::GetScene);
-                if (!sceneId.IsValid())
-                {
-                    return;
-                }
+            bool HasTextAlignment() const;
+            Qt::Alignment GetTextAlignment(Qt::Alignment defaultAlignment) const;
 
-                SetScene(sceneId);
+            void AddSelector(const AZStd::string_view& selector);
+            void RemoveSelector(const AZStd::string_view& selector);
 
-                for (const auto& selector : m_styleSelectors)
-                {
-                    StyledEntityRequestBus::Event(m_styledEntity, &StyledEntityRequests::AddSelectorState, selector.c_str());
-                }
-
-                UpdateStyle();
-                
-#if 0
-                AZStd::string description;
-                StyleRequestBus::EventResult(description, m_style, &StyleRequests::GetDescription);
-                qDebug() << description.c_str();
-#endif
-            }
-
-            void SetStyle(const AZStd::string& style)
-            {
-                ReleaseStyle();
-
-                m_deleteStyledEntity = true;
-
-                PseudoElementFactoryRequestBus::BroadcastResult(m_styledEntity, &PseudoElementFactoryRequests::CreateStyleEntity, style);
-
-                for (const auto& selector : m_styleSelectors)
-                {
-                    StyledEntityRequestBus::Event(m_styledEntity, &StyledEntityRequests::AddSelectorState, selector.c_str());
-                }
-
-                // TODO: remove/replace OnSceneSet and fix any systems/components listening for that event.
-                SceneMemberNotificationBus::Event(m_styledEntity, &SceneMemberNotifications::OnSceneSet, m_scene);
-
-                UpdateStyle();
-            }
-
-            void SetStyle(const AZ::EntityId& parentStyledEntity, const AZStd::string& virtualChildElement)
-            {
-                ReleaseStyle();
-
-                m_deleteStyledEntity = true;
-                
-                AZ::EntityId sceneId;
-                SceneMemberRequestBus::EventResult(sceneId, parentStyledEntity, &SceneMemberRequests::GetScene);
-
-                SetScene(sceneId);
-
-                PseudoElementFactoryRequestBus::BroadcastResult(m_styledEntity, &PseudoElementFactoryRequests::CreateVirtualChild, parentStyledEntity, virtualChildElement);
-
-                for (const auto& selector : m_styleSelectors)
-                {
-                    StyledEntityRequestBus::Event(m_styledEntity, &StyledEntityRequests::AddSelectorState, selector.c_str());
-                }
-
-                UpdateStyle();
-
-#if 0
-                AZStd::string description;
-                StyleRequestBus::EventResult(description, m_style, &StyleRequests::GetDescription);
-                qDebug() << description.c_str();
-#endif
-            }
+            CandyStripeConfiguration GetCandyStripeConfiguration() const;
+            PatternedFillGenerator GetPatternedFillGenerator() const;
+            PatternFillConfiguration GetPatternFillConfiguration() const;
+            void PopulatePaletteConfiguration(PaletteIconConfiguration& configuration) const;
 
             template<typename Value>
             void AddAttributeOverride(Styling::Attribute attribute, const Value& defaultValue = Value())
@@ -170,23 +97,6 @@ namespace GraphCanvas
                 m_attributeOverride[attribute] = QVariant(defaultValue);
             }
 
-            void RemoveAttributeOverride(Styling::Attribute attribute)
-            {
-                m_attributeOverride.erase(attribute);
-            }
-
-            bool HasAttribute(Styling::Attribute attribute) const
-            {
-                bool hasAttribute = (m_attributeOverride.find(attribute) != m_attributeOverride.end());
-
-                if (!hasAttribute)
-                {
-                    StyleRequestBus::EventResult(hasAttribute, m_style, &StyleRequests::HasAttribute, static_cast<AZ::u32>(attribute));
-                }
-
-                return hasAttribute;
-            }
-
             template<typename Value>
             Value GetAttribute(Styling::Attribute attribute, const Value& defaultValue = Value()) const
             {
@@ -202,7 +112,7 @@ namespace GraphCanvas
                 {
                     bool hasAttribute = false;
                     auto rawAttribute = static_cast<AZ::u32>(attribute);
-                    
+
                     StyleRequestBus::EventResult(hasAttribute, m_style, &StyleRequests::HasAttribute, rawAttribute);
 
                     if (hasAttribute)
@@ -217,323 +127,11 @@ namespace GraphCanvas
                 return retVal;
             }
 
-            QColor GetColor(Styling::Attribute color, QColor defaultValue = QColor()) const
-            {
-                return GetAttribute(color, defaultValue);
-            }
-
-            QFont GetFont() const
-            {
-                QFont font;
-                QFontInfo info(font);
-                info.pixelSize();
-
-                font.setFamily(GetAttribute(Attribute::FontFamily, font.family()));
-                font.setPixelSize(GetAttribute(Attribute::FontSize, info.pixelSize()));
-                font.setWeight(GetAttribute(Attribute::FontWeight, font.weight()));
-                font.setStyle(GetAttribute(Attribute::FontStyle, font.style()));
-                font.setCapitalization(GetAttribute(Attribute::FontVariant, font.capitalization()));
-
-                return font;
-            }
-
-            //! Helper method which constructs a stylesheet based on the calculated font style.
-            //! We need this too pass along to certain Qt widgets because we use our own custom style parsing system.
-            QString GetFontStyleSheet() const
-            {
-                QFont font = GetFont();
-                QColor color = GetColor(Styling::Attribute::Color);
-
-                QStringList fields;
-
-                fields.push_back(QString("color: rgba(%1,%2,%3,%4)").arg(color.red()).arg(color.green()).arg(color.blue()).arg(color.alpha()));
-
-                fields.push_back(QString("font-family: %1").arg(font.family()));
-                fields.push_back(QString("font-size: %1px").arg(font.pixelSize()));
-
-                if (font.bold())
-                {
-                    fields.push_back("font-weight: bold");
-                }
-
-                switch (font.style())
-                {
-                case QFont::StyleNormal:
-                    break;
-                case QFont::StyleItalic:
-                    fields.push_back("font-style: italic");
-                    break;
-                case QFont::StyleOblique:
-                    fields.push_back("font-style: italic");
-                    break;
-                }
-
-                const bool underline = font.underline();
-                const bool strikeOut = font.strikeOut();
-
-                if (underline && strikeOut)
-                {
-                    fields.push_back("text-decoration: underline line-through");
-                }
-                else if (underline)
-                {
-                    fields.push_back("text-decoration: underline");
-                }
-                else if (strikeOut)
-                {
-                    fields.push_back("text-decoration: line-through");
-                }
-
-                return fields.join("; ");
-            }
-
-            QPen GetPen(Styling::Attribute width, Styling::Attribute style, Styling::Attribute color, Styling::Attribute cap, bool cosmetic = false) const
-            {
-                QPen pen;
-                pen.setColor(GetAttribute(color, QColor(Qt::black)));
-                pen.setWidth(GetAttribute(width, 1));
-                pen.setStyle(GetAttribute(style, Qt::SolidLine));
-                pen.setCapStyle(GetAttribute(cap, Qt::SquareCap));
-                pen.setCosmetic(cosmetic);
-
-                return pen;
-            }
-
-            QPen GetBorder() const
-            {
-                return GetPen(Styling::Attribute::BorderWidth, Styling::Attribute::BorderStyle, Styling::Attribute::BorderColor, Styling::Attribute::CapStyle);
-            }
-
-            QBrush GetBrush(Styling::Attribute color, QBrush defaultValue = QBrush()) const
-            {
-                return GetAttribute(color, defaultValue);
-            }
-
-            QSizeF GetSize(QSizeF defaultSize) const
-            {
-                return{
-                    GetAttribute(Styling::Attribute::Width, defaultSize.width()),
-                    GetAttribute(Styling::Attribute::Height, defaultSize.height())
-                };
-            }
-
-            QSizeF GetMinimumSize(QSizeF defaultSize = QSizeF(0,0)) const
-            {
-                return QSizeF(GetAttribute(Styling::Attribute::MinWidth, defaultSize.width()), GetAttribute(Styling::Attribute::MinHeight, defaultSize.height()));
-            }
-
-            QSizeF GetMaximumSize(QSizeF defaultSize = QSizeF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)) const
-            {
-                return QSizeF(GetAttribute(Styling::Attribute::MaxWidth, defaultSize.width()), GetAttribute(Styling::Attribute::MaxHeight, defaultSize.height()));
-            }
-
-            QMarginsF GetMargins(QMarginsF defaultMargins = QMarginsF()) const
-            {
-                bool hasMargin = false;
-                StyleRequestBus::EventResult(hasMargin, m_style, &StyleRequests::HasAttribute, static_cast<AZ::u32>(Styling::Attribute::Margin));
-
-                if (hasMargin)
-                {
-                    qreal defaultMargin = GetAttribute(Styling::Attribute::Margin, 0);
-                    defaultMargins = QMarginsF(defaultMargin, defaultMargin, defaultMargin, defaultMargin);
-                }
-
-                return QMarginsF(
-                    GetAttribute(Styling::Attribute::Margin/*TODO Left*/, defaultMargins.left()),
-                    GetAttribute(Styling::Attribute::Margin/*TODO Top*/, defaultMargins.top()),
-                    GetAttribute(Styling::Attribute::Margin/*TODO Right*/, defaultMargins.right()),
-                    GetAttribute(Styling::Attribute::Margin/*TODO Bottom*/, defaultMargins.bottom())
-                );
-            }
-
-            bool HasTextAlignment() const
-            {
-                return HasAttribute(Styling::Attribute::TextAlignment) || HasAttribute(Styling::Attribute::TextVerticalAlignment);
-            }
-
-            Qt::Alignment GetTextAlignment(Qt::Alignment defaultAlignment) const
-            {
-                bool horizontalAlignment = HasAttribute(Styling::Attribute::TextAlignment);
-                bool verticalAlignment = HasAttribute(Styling::Attribute::TextVerticalAlignment);
-
-                if (horizontalAlignment || verticalAlignment)
-                {
-                    Qt::Alignment alignment = GetAttribute(Styling::Attribute::TextAlignment, Qt::AlignmentFlag::AlignLeft);
-                    alignment = alignment | GetAttribute(Styling::Attribute::TextVerticalAlignment, Qt::AlignmentFlag::AlignTop);
-
-                    return alignment;
-                }
-
-                return defaultAlignment;
-            }
-
-            void AddSelector(const AZStd::string_view& selector)
-            {
-                auto insertResult = m_styleSelectors.insert(AZStd::string(selector));
-
-                if (insertResult.second && m_styledEntity.IsValid())
-                {
-                    StyledEntityRequestBus::Event(m_styledEntity, &StyledEntityRequests::AddSelectorState, selector.data());
-
-                    UpdateStyle();
-                }
-            }
-
-            void RemoveSelector(const AZStd::string_view& selector)
-            {
-                AZStd::size_t elements = m_styleSelectors.erase(selector);
-
-                if (elements > 0)
-                {
-                    StyledEntityRequestBus::Event(m_styledEntity, &StyledEntityRequests::RemoveSelectorState, selector.data());
-
-                    UpdateStyle();
-                }
-            }
-
-            CandyStripeConfiguration GetCandyStripeConfiguration() const
-            {
-                CandyStripeConfiguration config;
-
-                config.m_initialOffset = GetAttribute(Styling::Attribute::StripeOffset, 0);
-                config.m_maximumSize = GetAttribute(Styling::Attribute::MaximumStripeSize, 10);
-
-                if (config.m_maximumSize <= 0)
-                {
-                    config.m_maximumSize = 1;
-                }
-
-                config.m_minStripes = GetAttribute(Styling::Attribute::MinimumStripes, 2);
-
-                if (config.m_minStripes <= 0)
-                {
-                    config.m_minStripes = 1;
-                }
-
-                config.m_stripeAngle = GetAttribute(Styling::Attribute::StripeAngle, 60);
-
-                if (config.m_stripeAngle > 90)
-                {
-                    config.m_stripeAngle = 89;
-                }
-                else if (config.m_stripeAngle < -90)
-                {
-                    config.m_stripeAngle = -89;
-                }
-
-                if (!HasAttribute(Styling::Attribute::StripeColor))
-                {
-                    QColor backgroundColor = GetAttribute(Styling::Attribute::BackgroundColor, QColor(0,0,0));
-
-                    config.m_stripeColor = backgroundColor.darker();
-
-                    int totalDifference = 0;
-
-                    totalDifference += backgroundColor.red() - config.m_stripeColor.red();
-                    totalDifference += backgroundColor.green() - config.m_stripeColor.green();
-                    totalDifference += backgroundColor.blue() - config.m_stripeColor.blue();
-
-                    if (totalDifference < 150)
-                    {
-                        config.m_stripeColor = backgroundColor.lighter();
-                    }
-                }
-                else
-                {
-                    config.m_stripeColor = GetAttribute(Styling::Attribute::StripeColor, QColor(0, 0, 0));
-                }
-
-                return config;
-            }
-
-            PatternedFillGenerator GetPatternedFillGenerator() const
-            {
-                PatternedFillGenerator generator;
-                generator.m_editorId = m_editorId;
-
-                generator.m_id = GetAttribute(Styling::Attribute::PatternTemplate, QString()).toUtf8().data();
-
-                if (HasAttribute(Styling::Attribute::PatternPalettes))
-                {
-                    AZStd::string paletteStrings = GetAttribute(Styling::Attribute::PatternPalettes, QString()).toUtf8().data();
-
-                    AzFramework::StringFunc::Tokenize(paletteStrings.c_str(), generator.m_palettes, ',');
-                }
-                else
-                {
-                    QColor backgroundColor = GetAttribute(Styling::Attribute::BackgroundColor, QColor(0, 0, 0));
-
-                    QColor patternColor = backgroundColor.darker();
-
-                    int totalDifference = 0;
-
-                    totalDifference += backgroundColor.red() - patternColor.red();
-                    totalDifference += backgroundColor.green() - patternColor.green();
-                    totalDifference += backgroundColor.blue() - patternColor.blue();
-
-                    if (totalDifference < 150)
-                    {
-                        patternColor = backgroundColor.lighter();
-                    }
-
-                    generator.m_colors.push_back(patternColor);
-                }
-
-                generator.m_configuration = GetPatternFillConfiguration();
-
-                return generator;
-            }
-
-            PatternFillConfiguration GetPatternFillConfiguration() const
-            {
-                PatternFillConfiguration configuration;
-
-                configuration.m_minimumTileRepetitions = GetAttribute(Styling::Attribute::MinimumRepetitions, 1);
-                configuration.m_evenRowOffsetPercent = GetAttribute(Styling::Attribute::EvenOffsetPercent, 0.0f);
-                configuration.m_oddRowOffsetPercent = GetAttribute(Styling::Attribute::OddOffsetPercent, 0.0f);
-
-                return configuration;
-            }
-
-            void PopulatePaletteConfiguration(PaletteIconConfiguration& configuration) const
-            {
-                AZStd::string stylePalette;
-                StyledEntityRequestBus::EventResult(stylePalette, m_styledEntity, &StyledEntityRequests::GetFullStyleElement);
-
-                if (!stylePalette.empty())
-                {
-                    configuration.SetColorPalette(stylePalette);
-                }
-            }
-
         private:
 
-            void UpdateStyle()
-            {
-                ReleaseStyle(false);
-                StyleManagerRequestBus::EventResult(m_style, m_editorId, &StyleManagerRequests::ResolveStyles, m_styledEntity);
-            }
-
-            void ReleaseStyle(bool destroyChildElement = true)
-            {
-                if (m_style.IsValid())
-                {
-                    if (m_deleteStyledEntity && destroyChildElement)
-                    {
-                        m_deleteStyledEntity = false;
-                        AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationRequests::DeleteEntity, m_styledEntity);
-                    }
-                    AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationRequests::DeleteEntity, m_style);
-
-                    m_style.SetInvalid();
-                }
-            }
-
-            void RegisterStyleSheetBus(const EditorId& editorId)
-            {
-                StyleManagerNotificationBus::Handler::BusDisconnect();
-                StyleManagerNotificationBus::Handler::BusConnect(editorId);
-            }
+            void UpdateStyle();
+            void ReleaseStyle(bool destroyChildElement = true);
+            void RegisterStyleSheetBus(const EditorId& editorId);
             
             EditorId m_editorId;
             AZ::EntityId m_scene;
diff --git a/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake b/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake
index 58a28484f7..bedc6329d5 100644
--- a/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake
+++ b/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake
@@ -91,6 +91,7 @@ set(FILES
     StaticLib/GraphCanvas/Styling/Style.cpp
     StaticLib/GraphCanvas/Styling/Style.h
     StaticLib/GraphCanvas/Styling/StyleHelper.h
+    StaticLib/GraphCanvas/Styling/StyleHelper.cpp
     StaticLib/GraphCanvas/Styling/StyleManager.cpp
     StaticLib/GraphCanvas/Styling/StyleManager.h
     StaticLib/GraphCanvas/Types/ComponentSaveDataInterface.h
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp
index 940a2626f5..259efef392 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp
@@ -226,7 +226,6 @@ namespace ScriptCanvasEditor
             auto dataTypeIter = m_containerDataTypeSets.find(workingCrc);
             if (dataTypeIter == m_containerDataTypeSets.end())
             {
-                // No idea wtf do here we've managed to put ourselves into an invalid state
                 AZ_Error("ScriptCanvas", false, "Unknown partial type found in Container Creation. Aborting.");
                 close();
                 break;
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.ui b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.ui
index 15998bd83b..b5965c9746 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.ui
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.ui
@@ -184,8 +184,5 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="C:/Users/luissemp/test.qrc"/>
- </resources>
  <connections/>
 </ui>

From 1cb26a31f8d51087ae586b356e6a3de72e6e1487 Mon Sep 17 00:00:00 2001
From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
Date: Tue, 12 Oct 2021 15:53:38 -0700
Subject: [PATCH 17/29] LYN-7195 + LYN-7185 + LYN-5301 | Hide viewport helpers
 for entities out of focus + selection shortcut adjustments (#4615)

* Light refactoring of selection logic. Only draw helpers for selectable entities according to Editor Focus Mode and Container Entity systems.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* When Escape is pressed, clear the Prefab Focus.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Alter Ctrl+A and Ctrl+Shift+I to take editor focus mode and container entity behaviors into account.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove redundant comments and reduce footprint of tests.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce loop protection, as GetParentId is known to loop in some situations possibly causing timeouts.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
---
 .../ContainerEntityInterface.h                |  3 ++
 .../ContainerEntitySystemComponent.cpp        | 45 +++++++++++++++++++
 .../ContainerEntitySystemComponent.h          |  1 +
 .../Entity/EditorEntityHelpers.cpp            | 35 +++++++++++++--
 .../UI/Prefab/PrefabIntegrationManager.cpp    |  7 +++
 .../UI/Prefab/PrefabIntegrationManager.h      | 12 +++--
 .../ViewportSelection/EditorHelpers.cpp       | 27 +++++++++--
 .../ViewportSelection/EditorHelpers.h         | 12 +++++
 8 files changed, 130 insertions(+), 12 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntityInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntityInterface.h
index 95940e6dd6..2d7d9dc511 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntityInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntityInterface.h
@@ -65,6 +65,9 @@ namespace AzToolsFramework
         //! @return An error message if any container was registered for the context, success otherwise.
         virtual ContainerEntityOperationResult Clear(AzFramework::EntityContextId entityContextId) = 0;
 
+        //! Returns true if one of the ancestors of entityId is a closed container entity.
+        virtual bool IsUnderClosedContainerEntity(AZ::EntityId entityId) const = 0;
+
     };
 
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.cpp
index c5649c56df..61b257a189 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.cpp
@@ -102,8 +102,17 @@ namespace AzToolsFramework
 
     AZ::EntityId ContainerEntitySystemComponent::FindHighestSelectableEntity(AZ::EntityId entityId) const
     {
+        if (!entityId.IsValid())
+        {
+            return entityId;
+        }
+
+        // Return the highest closed container, or the entity if none is found.
         AZ::EntityId highestSelectableEntityId = entityId;
 
+        // Skip the queried entity, as we only want to check its ancestors.
+        AZ::TransformBus::EventResult(entityId, entityId, &AZ::TransformBus::Events::GetParentId);
+
         // Go up the hierarchy until you hit the root
         while (entityId.IsValid())
         {
@@ -152,4 +161,40 @@ namespace AzToolsFramework
         return AZ::Success();
     }
 
+    bool ContainerEntitySystemComponent::IsUnderClosedContainerEntity(AZ::EntityId entityId) const
+    {
+        if (!entityId.IsValid())
+        {
+            return false;
+        }
+
+        // Skip the queried entity, as we only want to check its ancestors.
+        AZ::TransformBus::EventResult(entityId, entityId, &AZ::TransformBus::Events::GetParentId);
+
+        // Go up the hierarchy until you hit the root.
+        while (entityId.IsValid())
+        {
+            if (!IsContainerOpen(entityId))
+            {
+                // One of the ancestors is a container and it's closed.
+                return true;
+            }
+
+            AZ::EntityId parentId;
+            AZ::TransformBus::EventResult(parentId, entityId, &AZ::TransformBus::Events::GetParentId);
+
+            if (parentId == entityId)
+            {
+                // In some circumstances, querying a root level entity with GetParentId will return
+                // the entity itself instead of an invalid entityId. 
+                break;
+            }
+
+            entityId = parentId;
+        }
+
+        // All ancestors are either regular entities or open containers.
+        return false;
+    }
+
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.h
index 44261979ef..7a11e05096 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ContainerEntity/ContainerEntitySystemComponent.h
@@ -48,6 +48,7 @@ namespace AzToolsFramework
         bool IsContainerOpen(AZ::EntityId entityId) const override;
         AZ::EntityId FindHighestSelectableEntity(AZ::EntityId entityId) const override;
         ContainerEntityOperationResult Clear(AzFramework::EntityContextId entityContextId) override;
+        bool IsUnderClosedContainerEntity(AZ::EntityId entityId) const override;
 
         // EditorEntityContextNotificationBus overrides ...
         void OnEntityStreamLoadSuccess() override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp
index 7789070209..8d40162f52 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp
@@ -16,9 +16,11 @@
 #include <AzCore/RTTI/AttributeReader.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzToolsFramework/Commands/EntityStateCommand.h>
+#include <AzToolsFramework/ContainerEntity/ContainerEntityInterface.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
 #include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
+#include <AzToolsFramework/FocusMode/FocusModeInterface.h>
 #include <AzToolsFramework/Slice/SliceMetadataEntityContextBus.h>
 #include <AzToolsFramework/Slice/SliceUtilities.h>
 #include <AzToolsFramework/ToolsComponents/EditorLockComponentBus.h>
@@ -588,15 +590,40 @@ namespace AzToolsFramework
     {
         AZ_PROFILE_FUNCTION(AzToolsFramework);
 
+        // Detect if the Entity is Visible
         bool visible = false;
         EditorEntityInfoRequestBus::EventResult(
             visible, entityId, &EditorEntityInfoRequestBus::Events::IsVisible);
 
-        bool locked = false;
-        EditorEntityInfoRequestBus::EventResult(
-            locked, entityId, &EditorEntityInfoRequestBus::Events::IsLocked);
+        if (!visible)
+        {
+            return false;
+        }
 
-        return visible && !locked;
+        // Detect if the Entity is Locked
+        bool locked = false;
+        EditorEntityInfoRequestBus::EventResult(locked, entityId, &EditorEntityInfoRequestBus::Events::IsLocked);
+
+        if (locked)
+        {
+            return false;
+        }
+
+        // Detect if the Entity is part of the Editor Focus
+        if (auto focusModeInterface = AZ::Interface<FocusModeInterface>::Get();
+            !focusModeInterface->IsInFocusSubTree(entityId))
+        {
+            return false;
+        }
+
+        // Detect if the Entity is a descendant of a closed container
+        if (auto containerEntityInterface = AZ::Interface<ContainerEntityInterface>::Get();
+            containerEntityInterface->IsUnderClosedContainerEntity(entityId))
+        {
+            return false;
+        }
+        
+        return true;
     }
 
     static void SetEntityLockStateRecursively(
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
index d4b227c4ff..9bd377e3e9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
@@ -137,6 +137,7 @@ namespace AzToolsFramework
             }
 
             EditorContextMenuBus::Handler::BusConnect();
+            EditorEventsBus::Handler::BusConnect();
             PrefabInstanceContainerNotificationBus::Handler::BusConnect();
             AZ::Interface<PrefabIntegrationInterface>::Register(this);
             AssetBrowser::AssetBrowserSourceDropBus::Handler::BusConnect(s_prefabFileExtension);
@@ -147,6 +148,7 @@ namespace AzToolsFramework
             AssetBrowser::AssetBrowserSourceDropBus::Handler::BusDisconnect();
             AZ::Interface<PrefabIntegrationInterface>::Unregister(this);
             PrefabInstanceContainerNotificationBus::Handler::BusDisconnect();
+            EditorEventsBus::Handler::BusDisconnect();
             EditorContextMenuBus::Handler::BusDisconnect();
         }
 
@@ -313,6 +315,11 @@ namespace AzToolsFramework
             }
         }
 
+        void PrefabIntegrationManager::OnEscape()
+        {
+            s_prefabFocusInterface->FocusOnOwningPrefab(AZ::EntityId());
+        }
+
         void PrefabIntegrationManager::HandleSourceFileType(AZStd::string_view sourceFilePath, AZ::EntityId parentId, AZ::Vector3 position) const
         {
             auto instantiatePrefabOutcome = s_prefabPublicInterface->InstantiatePrefab(sourceFilePath, parentId, position);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h
index 696c05991c..6788af31e9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h
@@ -51,6 +51,7 @@ namespace AzToolsFramework
 
         class PrefabIntegrationManager final
             : public EditorContextMenuBus::Handler
+            , public EditorEventsBus::Handler
             , public AssetBrowser::AssetBrowserSourceDropBus::Handler
             , public PrefabInstanceContainerNotificationBus::Handler
             , public PrefabIntegrationInterface
@@ -64,19 +65,22 @@ namespace AzToolsFramework
 
             static void Reflect(AZ::ReflectContext* context);
 
-            // EditorContextMenuBus...
+            // EditorContextMenuBus overrides ...
             int GetMenuPosition() const override;
             AZStd::string GetMenuIdentifier() const override;
             void PopulateEditorGlobalContextMenu(QMenu* menu, const AZ::Vector2& point, int flags) override;
 
-            // EntityOutlinerSourceDropHandlingBus...
+            // EditorEventsBus overrides ...
+            void OnEscape();
+
+            // EntityOutlinerSourceDropHandlingBus overrides ...
             void HandleSourceFileType(AZStd::string_view sourceFilePath, AZ::EntityId parentId, AZ::Vector3 position) const override;
 
-            // PrefabInstanceContainerNotificationBus...
+            // PrefabInstanceContainerNotificationBus overrides ...
             void OnPrefabComponentActivate(AZ::EntityId entityId) override;
             void OnPrefabComponentDeactivate(AZ::EntityId entityId) override;
 
-            // PrefabIntegrationInterface...
+            // PrefabIntegrationInterface overrides ...
             AZ::EntityId CreateNewEntityAtPosition(const AZ::Vector3& position, AZ::EntityId parentId) override;
             int ExecuteClosePrefabDialog(TemplateId templateId) override;
             void ExecuteSavePrefabDialog(TemplateId templateId, bool useSaveAllPrefabsPreference) override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
index 3ce350287f..bb718d0dc9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
@@ -187,15 +187,14 @@ namespace AzToolsFramework
         }
 
         // Verify if the entity Id corresponds to an entity that is focused; if not, halt selection.
-        if (!m_focusModeInterface->IsInFocusSubTree(entityIdUnderCursor))
+        if (!IsSelectableAccordingToFocusMode(entityIdUnderCursor))
         {
             return AZ::EntityId();
         }
 
         // Container Entity support - if the entity that is being selected is part of a closed container,
         // change the selection to the container instead.
-        ContainerEntityInterface* containerEntityInterface = AZ::Interface<ContainerEntityInterface>::Get();
-        if (containerEntityInterface)
+        if (ContainerEntityInterface* containerEntityInterface = AZ::Interface<ContainerEntityInterface>::Get())
         {
             return containerEntityInterface->FindHighestSelectableEntity(entityIdUnderCursor);
         }
@@ -217,7 +216,7 @@ namespace AzToolsFramework
             {
                 const AZ::EntityId entityId = m_entityDataCache->GetVisibleEntityId(entityCacheIndex);
 
-                if (!m_entityDataCache->IsVisibleEntityVisible(entityCacheIndex))
+                if (!m_entityDataCache->IsVisibleEntityVisible(entityCacheIndex) || !IsSelectableInViewport(entityId))
                 {
                     continue;
                 }
@@ -263,4 +262,24 @@ namespace AzToolsFramework
             }
         }
     }
+
+    bool EditorHelpers::IsSelectableInViewport(AZ::EntityId entityId)
+    {
+        return IsSelectableAccordingToFocusMode(entityId) && IsSelectableAccordingToContainerEntities(entityId);
+    }
+
+    bool EditorHelpers::IsSelectableAccordingToFocusMode(AZ::EntityId entityId)
+    {
+        return m_focusModeInterface->IsInFocusSubTree(entityId);
+    }
+
+    bool EditorHelpers::IsSelectableAccordingToContainerEntities(AZ::EntityId entityId)
+    {
+        if (ContainerEntityInterface* containerEntityInterface = AZ::Interface<ContainerEntityInterface>::Get())
+        {
+            return !containerEntityInterface->IsUnderClosedContainerEntity(entityId);
+        }
+
+        return true;
+    }
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
index a6a78a4e61..909a231635 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
@@ -58,7 +58,19 @@ namespace AzToolsFramework
             AzFramework::DebugDisplayRequests& debugDisplay,
             const AZStd::function<bool(AZ::EntityId)>& showIconCheck);
 
+        //! Returns whether the entityId can be selected in the viewport according
+        //! to the current Editor Focus Mode and Container Entity setup.
+        bool IsSelectableInViewport(AZ::EntityId entityId);
+
     private:
+        //! Returns whether the entityId can be selected in the viewport according
+        //! to the current Editor Focus Mode setup.
+        bool IsSelectableAccordingToFocusMode(AZ::EntityId entityId);
+
+        //! Returns whether the entityId can be selected in the viewport according
+        //! to the current Container Entityu setup.
+        bool IsSelectableAccordingToContainerEntities(AZ::EntityId entityId);
+
         const EditorVisibleEntityDataCache* m_entityDataCache = nullptr; //!< Entity Data queried by the EditorHelpers.
         const FocusModeInterface* m_focusModeInterface = nullptr;
     };

From ccd60513f1776231ba3dc1ed1fd512b3d29e972d Mon Sep 17 00:00:00 2001
From: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Date: Tue, 12 Oct 2021 18:34:55 -0700
Subject: [PATCH 18/29] Fix prefab close dialog Editor crash on Linux (#4623)

Signed-off-by: Steve Pham <spham@amazon.com>
---
 .../AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
index 9bd377e3e9..24cb71499e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
@@ -1400,7 +1400,7 @@ namespace AzToolsFramework
 
         AZStd::unique_ptr<AzQtComponents::Card> PrefabIntegrationManager::ConstructUnsavedPrefabsCard(TemplateId templateId)
         {
-            FlowLayout* unsavedPrefabsLayout = new FlowLayout(AzToolsFramework::GetActiveWindow());
+            FlowLayout* unsavedPrefabsLayout = new FlowLayout(nullptr);
 
             AZStd::set<AZ::IO::PathView> dirtyTemplatePaths = s_prefabSystemComponentInterface->GetDirtyTemplatePaths(templateId);
 

From 2b79abb8c450fefa2932b4676d4b9fccf37156a1 Mon Sep 17 00:00:00 2001
From: Benjamin Jillich <43751992+amzn-jillich@users.noreply.github.com>
Date: Wed, 13 Oct 2021 09:13:19 +0200
Subject: [PATCH 19/29] =?UTF-8?q?EMotion=20FX:=20A=20parameter=E2=80=99s?=
 =?UTF-8?q?=20text=20box=20of=20Blend=20Space=202D=20and=201D=20Motions=20?=
 =?UTF-8?q?only=20takes=20one=20numerical=20input=20value=20including=20fr?=
 =?UTF-8?q?actions=20(#4626)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The on value changed event was recevied too often - with every newly typed character. As we're updating elements outside of the value spinbox, we need to wait for the actual done editing signal. This can be achieved by not tracking the keyboard for the spinbox.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
---
 .../Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.cpp
index b534603be6..8cee46133e 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.cpp
@@ -55,6 +55,7 @@ namespace EMotionFX
         m_spinboxX->setDecimals(4);
         m_spinboxX->setRange(-FLT_MAX, FLT_MAX);
         m_spinboxX->setProperty("motionId", motionId.c_str());
+        m_spinboxX->setKeyboardTracking(false);
         layoutX->addWidget(m_spinboxX);
 
         layout->addLayout(layoutX, row, column);
@@ -76,6 +77,7 @@ namespace EMotionFX
             m_spinboxY->setDecimals(4);
             m_spinboxY->setRange(-FLT_MAX, FLT_MAX);
             m_spinboxY->setProperty("motionId", motionId.c_str());
+            m_spinboxX->setKeyboardTracking(false);
             layoutY->addWidget(m_spinboxY);
 
             layout->addLayout(layoutY, row, column);

From da1fde8314e58641bcb21ca76987c29a754fc610 Mon Sep 17 00:00:00 2001
From: Benjamin Jillich <43751992+amzn-jillich@users.noreply.github.com>
Date: Wed, 13 Oct 2021 09:57:15 +0200
Subject: [PATCH 20/29] ImGui histogram container improvements (#4630)

* Added auto scale mode that uses a running average to expand and shrink the visible vertical range.
* Added option to set the move direction and either push new values to the front of the buffer (left) and make the histogram move to the right or the inverse.
* Changed the camera monitor to use auto scaling as well as the current one was not showing anything because of an outlier.
* Pre-fill the histogram with zeros so that the first pushed sample moves in without horizontal scaling effects which made it hard to read out any information from the histogram.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
---
 .../Include/LYImGuiUtils/HistogramContainer.h | 40 +++++++--
 .../LYCommonMenu/ImGuiLYCameraMonitor.cpp     | 20 ++---
 .../LYImGuiUtils/HistogramContainer.cpp       | 90 ++++++++++++++++---
 3 files changed, 120 insertions(+), 30 deletions(-)

diff --git a/Gems/ImGui/Code/Include/LYImGuiUtils/HistogramContainer.h b/Gems/ImGui/Code/Include/LYImGuiUtils/HistogramContainer.h
index 101b123bb5..6129c3ec08 100644
--- a/Gems/ImGui/Code/Include/LYImGuiUtils/HistogramContainer.h
+++ b/Gems/ImGui/Code/Include/LYImGuiUtils/HistogramContainer.h
@@ -18,8 +18,7 @@ namespace ImGui
     namespace LYImGuiUtils
     {
         /**
-        * A small class to help manage values for an ImGui Histogram ( ImGui doesn't want to manage the values itself ).
-        *   Nothing crazy, just helps reduce boiler plate if you are ImGui::PlotHistogram()'ing
+        * A small class to help manage values for an ImGui Histogram (ImGui is not managing values itself).
         */
         class HistogramContainer
         {
@@ -40,9 +39,24 @@ namespace ImGui
             // Static Type to String function
             static const char* ViewTypeToString(ViewType viewType);
 
+            //! Horizontal move direction of the histogram when pushing new values.
+            enum MoveDirection : AZ::u8
+            {
+                PushLeftMoveRight = 0, //! Push new values to the front of the buffer, which corresponds to the left side, and make the histogram move to the right.
+                PushRightMoveLeft = 1, //! Push new values to the back of the buffer, which corresponds to the right side, and make the histogram move to the left.
+            };
+
+            //! Mode determining the min and max values for the visible range of the vertical axis for the histogram.
+            enum ScaleMode : AZ::u8
+            {
+                NoAutoScale = 0, //! Use the min and max values given by Init() as visible range.
+                AutoExpand = 1, //! Expand scale in case a sample is out of the current bounds. Does only expand the scale but not decrease it back again.
+                AutoScale = 2, //! Use a running average to expand and shrink the visible range.
+            };
+
             // Do all of the set up via Init
-            void Init(const char* histogramName, int maxValueCountSize, ViewType viewType, bool displayOverlays, float minScale, float maxScale
-                , bool autoExpandScale, bool startCollapsed = false, bool drawMostRecentValue = true);
+            void Init(const char* histogramName, int maxValueCountSize, ViewType viewType, bool displayOverlays, float minScale, float maxScale,
+                ScaleMode scaleMode = AutoScale, bool startCollapsed = false, bool drawMostRecentValue = true);
 
             // How many values are in the container currently
             int GetSize() { return static_cast<int>(m_values.size()); }
@@ -50,9 +64,6 @@ namespace ImGui
             // What is the max size of the container
             int GetMaxSize() { return m_maxSize; }
 
-            // Set the Max Size and clear the container
-            void SetMaxSize(int size) { m_values.clear();  m_maxSize = size; }
-
             // Push a value to this histogram container
             void PushValue(float val);
 
@@ -65,7 +76,18 @@ namespace ImGui
             // Draw this histogram with ImGui
             void Draw(float histogramWidth, float histogramHeight);
 
+            //! Adjust the scale mode to determine the min and max values for the visible range of the vertical axis for the histogram.
+            void SetScaleMode(ScaleMode scaleMode) { m_scaleMode = scaleMode; }
+
+            //! Adjust the horizontal move direction of the histogram when pushing new values.
+            void SetMoveDirection(MoveDirection moveDirection) { m_moveDirection = moveDirection; }
+
+            //! Calculate the min and maximum values for the present samples.
+            void CalcMinMaxValues(float& outMin, float& outMax);
+
         private:
+            // Set the Max Size and clear the container
+            void SetMaxSize(int size);
 
             AZStd::string m_histogramName;
             AZStd::deque<float> m_values;
@@ -73,8 +95,10 @@ namespace ImGui
             ViewType m_viewType = ViewType::Histogram;
             float m_minScale;
             float m_maxScale;
+            MoveDirection m_moveDirection = PushLeftMoveRight; //! Specify if values will be added on the left and the histogram moves right or the other way around.
             bool m_dispalyOverlays;
-            bool m_autoExpandScale;
+            ScaleMode m_scaleMode; //! Determines if the vertical range of the histogram will be manually specified, auto-expanded or automatically scaled based on the samples.
+            float m_autoScaleSpeed = 0.05f; //! Indicates how fast the min max values and the visible vertical range are adapting to new samples.
             bool m_collapsed;
             bool m_drawMostRecentValueText;
         };
diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp
index 1df74903e6..e079a01de1 100644
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp
@@ -34,13 +34,13 @@ namespace ImGui
         ImGuiCameraMonitorRequestBus::Handler::BusConnect();
 
         // Init Histogram Containers
-        m_dofMinZHisto.Init(             "DOF Min Z",            120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 0.0f,  0.0f,  true);
-        m_dofMinZBlendMultHisto.Init(    "DOF Min Z Blend Mult", 120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 50.0f, 50.0f, true);
-        m_dofMinZScaleHisto.Init(        "DOF Min Z Scale",      120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 50.0f, 50.0f, true);
+        m_dofMinZHisto.Init(             "DOF Min Z",            120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 0.0f,  0.0f);
+        m_dofMinZBlendMultHisto.Init(    "DOF Min Z Blend Mult", 120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 50.0f, 50.0f);
+        m_dofMinZScaleHisto.Init(        "DOF Min Z Scale",      120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 50.0f, 50.0f);
 
-        m_globalActiveCamInfo.m_fovHisto.Init(                  "FOV",                      120, LYImGuiUtils::HistogramContainer::ViewType::Lines,     true, 50.0f, 50.0f, true);
-        m_globalActiveCamInfo.m_facingVectorDeltaHisto.Init(    "Facing Vec Frame Delta",   120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 0.0f,  0.0f,  true);
-        m_globalActiveCamInfo.m_positionDeltaHisto.Init(        "Position Frame Delta",     120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 0.0f,  0.0f,  true);
+        m_globalActiveCamInfo.m_fovHisto.Init(                  "FOV",                      120, LYImGuiUtils::HistogramContainer::ViewType::Lines,     true, 50.0f, 50.0f);
+        m_globalActiveCamInfo.m_facingVectorDeltaHisto.Init(    "Facing Vec Frame Delta",   120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 0.0f,  0.0f);
+        m_globalActiveCamInfo.m_positionDeltaHisto.Init(        "Position Frame Delta",     120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 0.0f,  0.0f);
     }
 
     void ImGuiLYCameraMonitor::Shutdown()
@@ -214,7 +214,7 @@ namespace ImGui
         }
         // save this cam off as the current one
         m_currentCamera = newCamId;
-            
+
         // create a new empty CameraInfo in the queue
         m_cameraHistory.push_front(CameraInfo());
 
@@ -224,9 +224,9 @@ namespace ImGui
         AZ::ComponentApplicationBus::BroadcastResult(newCam.m_camName, &AZ::ComponentApplicationBus::Events::GetEntityName, m_currentCamera);
         newCam.m_activeTime = 0.0f;
         newCam.m_activeFrames = 0;
-        newCam.m_fovHisto.Init(                 "FOV",                      120, LYImGuiUtils::HistogramContainer::ViewType::Lines,     true, 50.0f, 50.0f, true);
-        newCam.m_facingVectorDeltaHisto.Init(   "Facing Vec Frame Delta",   120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 0.0f,  0.0f,  true);
-        newCam.m_positionDeltaHisto.Init(       "Position Frame Delta",     120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 0.0f,  0.0f,  true);
+        newCam.m_fovHisto.Init(                 "FOV",                      120, LYImGuiUtils::HistogramContainer::ViewType::Lines,     true, 50.0f, 50.0f);
+        newCam.m_facingVectorDeltaHisto.Init(   "Facing Vec Frame Delta",   120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 0.0f,  0.0f);
+        newCam.m_positionDeltaHisto.Init(       "Position Frame Delta",     120, LYImGuiUtils::HistogramContainer::ViewType::Histogram, true, 0.0f,  0.0f);
 
         // reset a few variables on the global camera info
         m_globalActiveCamInfo.m_camId = newCam.m_camId;
diff --git a/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp b/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp
index e3fd3f2054..1915cc3721 100644
--- a/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp
+++ b/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp
@@ -16,45 +16,92 @@ namespace ImGui
 {
     namespace LYImGuiUtils
     {
-        void HistogramContainer::Init(const char* histogramName, int maxValueCountSize, ViewType viewType, bool displayOverlays, float minScale, float maxScale
-            , bool autoExpandScale, bool startCollapsed/* = false*/, bool drawMostRecentValue/* = true*/)
+        void HistogramContainer::Init(const char* histogramName, int maxValueCountSize, ViewType viewType, bool displayOverlays, float minScale, float maxScale,
+            ScaleMode scaleMode, bool startCollapsed/* = false*/, bool drawMostRecentValue/* = true*/)
         {
             m_histogramName = histogramName;
             m_minScale = minScale;
             m_maxScale = maxScale;
             m_viewType = viewType;
             m_dispalyOverlays = displayOverlays;
-            m_autoExpandScale = autoExpandScale;
+            m_scaleMode = scaleMode;
             m_collapsed = startCollapsed;
             m_drawMostRecentValueText = drawMostRecentValue;
             SetMaxSize(maxValueCountSize);
         }
 
-        void HistogramContainer::PushValue(float val)
+        void HistogramContainer::SetMaxSize(int size)
+        {
+            m_values.resize(size);
+            m_maxSize = size;
+
+            // Pre-fill the histogram with zeros so that the bars do not fill the space and
+            // scale horizontally when there are not enough samples yet.
+            for (float& value : m_values)
+            {
+                value = 0.0f;
+            }
+        }
+
+        void HistogramContainer::PushValue(float value)
         {
             if (m_maxSize == 0)
             {
                 return;
             }
+
             if (m_values.size() == m_maxSize)
             {
-                m_values.pop_back();
+                if (m_moveDirection == PushLeftMoveRight)
+                {
+                    m_values.pop_back();
+                }
+                else
+                {
+                    m_values.pop_front();
+                }
             }
             else if (m_values.size() > m_maxSize)
             {
                 m_values.erase(m_values.begin() + (m_maxSize - 1), m_values.end());
             }
-            m_values.push_front(val);
 
-            if (m_autoExpandScale)
+            if (m_moveDirection == PushLeftMoveRight)
             {
-                if (val < m_minScale)
+                m_values.push_front(value);
+            }
+            else
+            {
+                m_values.push_back(value);
+            }
+
+            switch (m_scaleMode)
+            {
+                case AutoExpand:
                 {
-                    m_minScale = val;
+                    if (value < m_minScale)
+                    {
+                        m_minScale = value;
+                    }
+                    else if (value > m_maxScale)
+                    {
+                        m_maxScale = value;
+                    }
+                    break;
                 }
-                else if (val > m_maxScale)
+                case AutoScale:
                 {
-                    m_maxScale = val;
+                    float min = 0.0f;
+                    float max = 0.0f;
+                    CalcMinMaxValues(min, max);
+
+                    m_minScale = AZ::Lerp(m_minScale, min, m_autoScaleSpeed);
+                    m_maxScale = AZ::Lerp(m_maxScale, max, m_autoScaleSpeed);
+                    break;
+                }
+                default:
+                {
+                    break;
                 }
             }
         }
@@ -86,7 +133,6 @@ namespace ImGui
                 ImGui::DragInt("History Size", &m_maxSize, 1, 1, 1000, "%f");
                 ImGui::DragFloat("Max Scale", &m_maxScale, 0.0001f, -100.0f, 100.0f);
                 ImGui::DragFloat("Min Scale", &m_minScale, 0.0001f, -100.0f, 100.0f);
-                ImGui::Checkbox("Auto Expand Scale", &m_autoExpandScale);
 
                 ImGui::EndPopup();
             }
@@ -157,6 +203,26 @@ namespace ImGui
                     return "Lines";
             }
         }
+
+        void HistogramContainer::CalcMinMaxValues(float& outMin, float& outMax)
+        {
+            // Use the manually set min and max scale values in case there are no samples.
+            if (m_values.empty())
+            {
+                outMin = m_minScale;
+                outMax = m_maxScale;
+                return;
+            }
+
+            outMin = +AZ::Constants::FloatMax;
+            outMax = -AZ::Constants::FloatMax;
+
+            for (const float x : m_values)
+            {
+                outMin = AZ::GetMin(outMin, x);
+                outMax = AZ::GetMax(outMax, x);
+            }
+        }
     }
 }
 #endif // #ifdef IMGUI_ENABLED

From 48a74ca93d7df475a5ffbcfba45ad0fd95fa2604 Mon Sep 17 00:00:00 2001
From: hultonha <82228511+hultonha@users.noreply.github.com>
Date: Wed, 13 Oct 2021 10:18:21 +0100
Subject: [PATCH 21/29] Remove clearFocus from
 EditorTransformComponentSelection duplicate Entity (#4571)

* remove clearFocus from EditorTransformComponentSelection duplicate entity

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove extra unneeded calls to RequestWrite

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update PrefabPublicHandler to use SetSelectedEntities

Signed-off-by: hultonha <hultonha@amazon.co.uk>
---
 .../Prefab/PrefabPublicHandler.cpp            |  7 ++--
 .../UI/PropertyEditor/PropertyIntCtrlCommon.h |  5 +--
 .../UI/PropertyEditor/PropertyIntSpinCtrl.hxx |  5 ---
 .../EditorTransformComponentSelection.cpp     | 41 ++++++++-----------
 4 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
index 038f36eac9..b5f61b33bf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
@@ -257,9 +257,10 @@ namespace AzToolsFramework
 
                 // Select Container Entity
                 {
-                    auto selectionUndo = aznew SelectionCommand({ containerEntityId }, "Select Prefab Container Entity");
+                    const EntityIdList selectedEntities = EntityIdList{ containerEntityId };
+                    auto selectionUndo = aznew SelectionCommand(selectedEntities, "Select Prefab Container Entity");
                     selectionUndo->SetParent(undoBatch.GetUndoBatch());
-                    ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::RunRedoSeparately, selectionUndo);
+                    ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::SetSelectedEntities, selectedEntities);
                 }
             }
 
@@ -1097,7 +1098,7 @@ namespace AzToolsFramework
                 // Select the duplicated entities/instances
                 auto selectionUndo = aznew SelectionCommand(duplicatedEntityAndInstanceIds, "Select Duplicated Entities/Instances");
                 selectionUndo->SetParent(undoBatch.GetUndoBatch());
-                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::RunRedoSeparately, selectionUndo);
+                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::SetSelectedEntities, duplicatedEntityAndInstanceIds);
             }
 
             return AZ::Success();
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h
index eda8b482a1..01675e0044 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h
@@ -38,7 +38,7 @@ namespace AzToolsFramework
         static bool UnsignedToolTip(QWidget* widget, QString& toolTipString);
     };
 
-    //! Base class for integer widget handlers to provide functionality independant
+    //! Base class for integer widget handlers to provide functionality independent
     //! of widget type.
     //! @tparam ValueType The integer primitive type of the handler.
     //! @tparam PropertyControl The widget type of the handler.
@@ -167,8 +167,7 @@ namespace AzToolsFramework
         PropertyControl* newCtrl = aznew PropertyControl(pParent);
         this->connect(newCtrl, &PropertyControl::valueChanged, this, [newCtrl]()
         {
-            EBUS_EVENT(PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
-            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&PropertyEditorGUIMessages::Bus::Handler::RequestWrite, newCtrl);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&PropertyEditorGUIMessages::Bus::Events::RequestWrite, newCtrl);
         });
         // note:  Qt automatically disconnects objects from each other when either end is destroyed, no need to worry about delete.
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.hxx
index 1e1e6a9592..fef4639a9f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.hxx
@@ -98,11 +98,6 @@ namespace AzToolsFramework
     QWidget* IntSpinBoxHandler<ValueType>::CreateGUI(QWidget* parent)
     {
         PropertyIntSpinCtrl* newCtrl = static_cast<PropertyIntSpinCtrl*>(BaseHandler::CreateGUI(parent));
-        this->connect(newCtrl, &PropertyIntSpinCtrl::valueChanged, [newCtrl]()
-        {
-            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&PropertyEditorGUIMessages::Bus::Handler::RequestWrite, newCtrl);
-        });
-
         return newCtrl;
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
index 7015a25ce1..6ee5c97636 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
@@ -1113,7 +1113,7 @@ namespace AzToolsFramework
             });
 
         m_boxSelect.InstallLeftMouseUp(
-            [this, entityBoxSelectData]()
+            [this, entityBoxSelectData]
             {
                 entityBoxSelectData->m_boxSelectSelectionCommand->UpdateSelection(EntityIdVectorFromContainer(m_selectedEntityIds));
 
@@ -2171,7 +2171,7 @@ namespace AzToolsFramework
         // lock selection
         AddAction(
             m_actions, { QKeySequence(Qt::Key_L) }, LockSelection, LockSelectionTitle, LockSelectionDesc,
-            [lockUnlock]()
+            [lockUnlock]
             {
                 lockUnlock(true);
             });
@@ -2179,7 +2179,7 @@ namespace AzToolsFramework
         // unlock selection
         AddAction(
             m_actions, { QKeySequence(Qt::CTRL + Qt::Key_L) }, UnlockSelection, LockSelectionTitle, LockSelectionDesc,
-            [lockUnlock]()
+            [lockUnlock]
             {
                 lockUnlock(false);
             });
@@ -2209,7 +2209,7 @@ namespace AzToolsFramework
         // hide selection
         AddAction(
             m_actions, { QKeySequence(Qt::Key_H) }, HideSelection, HideSelectionTitle, HideSelectionDesc,
-            [showHide]()
+            [showHide]
             {
                 showHide(false);
             });
@@ -2217,7 +2217,7 @@ namespace AzToolsFramework
         // show selection
         AddAction(
             m_actions, { QKeySequence(Qt::CTRL + Qt::Key_H) }, ShowSelection, HideSelectionTitle, HideSelectionDesc,
-            [showHide]()
+            [showHide]
             {
                 showHide(true);
             });
@@ -2225,7 +2225,7 @@ namespace AzToolsFramework
         // unlock all entities in the level/scene
         AddAction(
             m_actions, { QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_L) }, UnlockAll, UnlockAllTitle, UnlockAllDesc,
-            []()
+            []
             {
                 AZ_PROFILE_FUNCTION(AzToolsFramework);
 
@@ -2242,14 +2242,14 @@ namespace AzToolsFramework
         // show all entities in the level/scene
         AddAction(
             m_actions, { QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_H) }, ShowAll, ShowAllTitle, ShowAllDesc,
-            []()
+            []
             {
                 AZ_PROFILE_FUNCTION(AzToolsFramework);
 
                 ScopedUndoBatch undoBatch(ShowAllEntitiesUndoRedoDesc);
 
                 EnumerateEditorEntities(
-                    [](AZ::EntityId entityId)
+                    [](const AZ::EntityId entityId)
                     {
                         ScopedUndoBatch::MarkEntityDirty(entityId);
                         SetEntityVisibility(entityId, true);
@@ -2259,7 +2259,7 @@ namespace AzToolsFramework
         // select all entities in the level/scene
         AddAction(
             m_actions, { QKeySequence(Qt::CTRL + Qt::Key_A) }, SelectAll, SelectAllTitle, SelectAllDesc,
-            [this]()
+            [this]
             {
                 AZ_PROFILE_FUNCTION(AzToolsFramework);
 
@@ -2299,7 +2299,7 @@ namespace AzToolsFramework
         // invert current selection
         AddAction(
             m_actions, { QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_I) }, InvertSelect, InvertSelectionTitle, InvertSelectionDesc,
-            [this]()
+            [this]
             {
                 AZ_PROFILE_FUNCTION(AzToolsFramework);
 
@@ -2346,17 +2346,10 @@ namespace AzToolsFramework
         // duplicate selection
         AddAction(
             m_actions, { QKeySequence(Qt::CTRL + Qt::Key_D) }, DuplicateSelect, DuplicateTitle, DuplicateDesc,
-            []()
+            []
             {
                 AZ_PROFILE_FUNCTION(AzToolsFramework);
 
-                // Clear Widget selection - Prevents issues caused by cloning entities while a property in the Reflected Property Editor
-                // is being edited.
-                if (QApplication::focusWidget())
-                {
-                    QApplication::focusWidget()->clearFocus();
-                }
-
                 ScopedUndoBatch undoBatch(DuplicateUndoRedoDesc);
                 auto selectionCommand = AZStd::make_unique<SelectionCommand>(EntityIdList(), DuplicateUndoRedoDesc);
                 selectionCommand->SetParent(undoBatch.GetUndoBatch());
@@ -2371,7 +2364,7 @@ namespace AzToolsFramework
         // delete selection
         AddAction(
             m_actions, { QKeySequence(Qt::Key_Delete) }, DeleteSelect, DeleteTitle, DeleteDesc,
-            [this]()
+            [this]
             {
                 AZ_PROFILE_FUNCTION(AzToolsFramework);
 
@@ -2388,21 +2381,21 @@ namespace AzToolsFramework
 
         AddAction(
             m_actions, { QKeySequence(Qt::Key_Space) }, EditEscaspe, "", "",
-            [this]()
+            [this]
             {
                 DeselectEntities();
             });
 
         AddAction(
             m_actions, { QKeySequence(Qt::Key_P) }, EditPivot, TogglePivotTitleEditMenu, TogglePivotDesc,
-            [this]()
+            [this]
             {
                 ToggleCenterPivotSelection();
             });
 
         AddAction(
             m_actions, { QKeySequence(Qt::Key_R) }, EditReset, ResetEntityTransformTitle, ResetEntityTransformDesc,
-            [this]()
+            [this]
             {
                 switch (m_mode)
                 {
@@ -2427,7 +2420,7 @@ namespace AzToolsFramework
 
         AddAction(
             m_actions, { QKeySequence(Qt::Key_U) }, ViewportUiVisible, "Toggle Viewport UI", "Hide/Show Viewport UI",
-            [this]()
+            [this]
             {
                 SetAllViewportUiVisible(!m_viewportUiVisible);
             });
@@ -3236,7 +3229,7 @@ namespace AzToolsFramework
         QAction* action = menu->addAction(QObject::tr(TogglePivotTitleRightClick));
         QObject::connect(
             action, &QAction::triggered, action,
-            [this]()
+            [this]
             {
                 ToggleCenterPivotSelection();
             });

From 5bf7330f3505d4ac7837766317fa8ed7ab44ad96 Mon Sep 17 00:00:00 2001
From: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
Date: Wed, 13 Oct 2021 12:50:11 +0100
Subject: [PATCH 22/29] made some physX tests less flaky (#4632)

Joints_BallLeadFollowerCollide - changed the idle_wait to a wait_for_condition of the lead and follower colliding with a 10 second timeout. It was a 2 second timeout which is on the edge of the time from start to collision (~1.5sec).

Joints_HingeNoLimitsConstrained - now measures the angle the joint is at and waits for the follower to raise up and over the lead, or fail after a 10sec timeout. This use to 'catch' the follower joint in a force region and check the position of the follower to determine pass/fail.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
---
 .../joints/Joints_BallLeadFollowerCollide.py  | 14 +----
 .../joints/Joints_HingeNoLimitsConstrained.py | 59 +++++++++++++++----
 .../Joints_HingeNoLimitsConstrained.ly        |  4 +-
 3 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/AutomatedTesting/Gem/PythonTests/Physics/tests/joints/Joints_BallLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/Physics/tests/joints/Joints_BallLeadFollowerCollide.py
index 0e8d7ea255..1209cb6caf 100644
--- a/AutomatedTesting/Gem/PythonTests/Physics/tests/joints/Joints_BallLeadFollowerCollide.py
+++ b/AutomatedTesting/Gem/PythonTests/Physics/tests/joints/Joints_BallLeadFollowerCollide.py
@@ -52,9 +52,6 @@ def Joints_BallLeadFollowerCollide():
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
-    import azlmbr.legacy.general as general
-    import azlmbr.bus
-
     from JointsHelper import JointEntityCollisionAware
 
     # Helper Entity class - self.collided flag is set when instance receives collision event.
@@ -75,17 +72,12 @@ def Joints_BallLeadFollowerCollide():
     lead = Entity("lead")
     follower = Entity("follower")
 
-    # 4) Wait for several seconds
-    general.idle_wait(2.0) # wait for lead and follower to move
+    # 4) Wait for collision between lead and follower or timeout
+    Report.critical_result(Tests.check_collision_happened, helper.wait_for_condition(lambda: lead.collided and follower.collided, 10.0))
 
-    # 5) Check to see if lead and follower behaved as expected
-    Report.critical_result(Tests.check_collision_happened, lead.collided and follower.collided)
-
-    # 6) Exit Game Mode
+    # 5) Exit Game Mode
     helper.exit_game_mode(Tests.exit_game_mode)
 
-
-
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
     Report.start_test(Joints_BallLeadFollowerCollide)
diff --git a/AutomatedTesting/Gem/PythonTests/Physics/tests/joints/Joints_HingeNoLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/Physics/tests/joints/Joints_HingeNoLimitsConstrained.py
index 0870a807fc..0b3f88b4f6 100644
--- a/AutomatedTesting/Gem/PythonTests/Physics/tests/joints/Joints_HingeNoLimitsConstrained.py
+++ b/AutomatedTesting/Gem/PythonTests/Physics/tests/joints/Joints_HingeNoLimitsConstrained.py
@@ -52,11 +52,13 @@ def Joints_HingeNoLimitsConstrained():
     """
     import os
     import sys
+    import math
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
     import azlmbr.legacy.general as general
     import azlmbr.bus
+    import azlmbr.math as azmath
 
     import JointsHelper
     from JointsHelper import JointEntity
@@ -84,28 +86,65 @@ def Joints_HingeNoLimitsConstrained():
     Report.info_vector3(lead.position, "lead initial position:")
     Report.info_vector3(follower.position, "follower initial position:")
     leadInitialPosition = lead.position
-    followerInitialPosition = follower.position
 
-    # 4) Wait for several seconds
-    general.idle_wait(4.0) # wait for lead and follower to move
+    # 4) Wait for the follower to move above and over the lead or Timeout
+    normalizedStartPos = JointsHelper.getRelativeVector(lead.position, follower.position)
+    normalizedStartPos = normalizedStartPos.GetNormalizedSafe()
+
+    class WaitCondition:
+        ANGLE_CHECKPOINT_1 = math.radians(90)
+        ANGLE_CHECKPOINT_2 = math.radians(200)
+
+        angleAchieved = 0.0
+        followerMovedAbove90Deg = False #this is expected to be true to pass the test
+        followerMovedAbove200Deg = False #this is expected to be true to pass the test
+
+        jointNormal = azmath.Vector3(0.0, -1.0, 0.0) # the joint rotates around the y axis
+        def checkConditionMet(self):
+            #calculate the current follower-lead vector
+            normalVec = JointsHelper.getRelativeVector(lead.position, follower.position)
+            normalVec = normalVec.GetNormalizedSafe()
+
+            #triple product and get the angle
+            tripleProduct = normalizedStartPos.dot(normalVec.cross(self.jointNormal))
+            currentAngle = math.acos(normalizedStartPos.Dot(normalVec))
+            if tripleProduct < 0:
+                currentAngle = (2*math.pi) - currentAngle
+
+            #if the angle is now less then last time, it is no longer rising, so end the test.
+            if currentAngle < self.angleAchieved:
+                return True
+            
+            #once we're passed the final check point, end the test
+            if currentAngle > self.ANGLE_CHECKPOINT_2:
+                self.followerMovedAbove200Deg = True
+                return True
+            
+            self.angleAchieved = currentAngle
+            self.followerMovedAbove90Deg = currentAngle > self.ANGLE_CHECKPOINT_1
+            return False
+
+        def isFollowerPositionCorrect(self):
+            return self.followerMovedAbove90Deg and self.followerMovedAbove200Deg
+
+    waitCondition = WaitCondition()
+
+    MAX_WAIT_TIME = 10.0 #seconds
+    conditionMet = helper.wait_for_condition(lambda: waitCondition.checkConditionMet(), MAX_WAIT_TIME)
 
     # 5) Check to see if lead and follower behaved as expected
-    Report.info_vector3(lead.position, "lead position after 1 second:")
-    Report.info_vector3(follower.position, "follower position after 1 second:")
+    Report.info_vector3(lead.position, "lead position after test run:")
+    Report.info_vector3(follower.position, "follower position after test run:")
 
     leadPositionDelta = lead.position.Subtract(leadInitialPosition)
     leadRemainedStill = JointsHelper.vector3SmallerThanScalar(leadPositionDelta, FLOAT_EPSILON)
     Report.critical_result(Tests.check_lead_position, leadRemainedStill)
 
-    followerSwingedOverLead = (follower.position.x < leadInitialPosition.x  and
-                        follower.position.z > leadInitialPosition.z)
-    Report.critical_result(Tests.check_follower_position, followerSwingedOverLead)
+    Report.critical_result(Tests.check_follower_position, conditionMet and waitCondition.isFollowerPositionCorrect())
 
     # 6) Exit Game Mode
     helper.exit_game_mode(Tests.exit_game_mode)
 
-
-
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
     Report.start_test(Joints_HingeNoLimitsConstrained)
diff --git a/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/Joints_HingeNoLimitsConstrained.ly b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/Joints_HingeNoLimitsConstrained.ly
index 86dd941423..9babf84ba4 100644
--- a/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/Joints_HingeNoLimitsConstrained.ly
+++ b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/Joints_HingeNoLimitsConstrained.ly
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:817bd8dd22e185136418b60fba5b3552993687515d3d5ae96791f2c3be907b92
-size 7233
+oid sha256:60276c07b45a734e4f71d695278167ea61e884f8b513906168c9642078ad5954
+size 6045

From 3af07e511764e7d617cfa9b13647405a6954e61f Mon Sep 17 00:00:00 2001
From: Adi Bar-Lev <82479970+Adi-Amazon@users.noreply.github.com>
Date: Wed, 13 Oct 2021 09:37:47 -0400
Subject: [PATCH 23/29] Hair - creating parent class for raster pass as prep
 for ShortCut technique (#4560)

Signed-off-by: Adi-Amazon <barlev@amazon.com>
---
 .../Code/Passes/HairGeometryRasterPass.cpp    | 301 ++++++++++++++++++
 .../Code/Passes/HairGeometryRasterPass.h      | 112 +++++++
 .../Code/Passes/HairPPLLRasterPass.cpp        | 269 +---------------
 .../Code/Passes/HairPPLLRasterPass.h          |  70 +---
 Gems/AtomTressFX/Hair_files.cmake             |   6 +
 5 files changed, 434 insertions(+), 324 deletions(-)
 create mode 100644 Gems/AtomTressFX/Code/Passes/HairGeometryRasterPass.cpp
 create mode 100644 Gems/AtomTressFX/Code/Passes/HairGeometryRasterPass.h

diff --git a/Gems/AtomTressFX/Code/Passes/HairGeometryRasterPass.cpp b/Gems/AtomTressFX/Code/Passes/HairGeometryRasterPass.cpp
new file mode 100644
index 0000000000..7af5903cf3
--- /dev/null
+++ b/Gems/AtomTressFX/Code/Passes/HairGeometryRasterPass.cpp
@@ -0,0 +1,301 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+//#include <Atom/RHI/CommandList.h>
+#include <Atom/RHI/RHISystemInterface.h>
+#include <Atom/RHI/DrawPacketBuilder.h>
+#include <Atom/RHI/PipelineState.h>
+
+#include <Atom/RPI.Public/View.h>
+#include <Atom/RPI.Public/RPIUtils.h>
+#include <Atom/RPI.Public/RenderPipeline.h>
+#include <Atom/RPI.Public/RPISystemInterface.h>
+#include <Atom/RPI.Public/Pass/PassUtils.h>
+#include <Atom/RPI.Public/Scene.h>
+
+#include <Atom/RPI.Reflect/Asset/AssetUtils.h>
+#include <Atom/RPI.Reflect/Pass/RasterPassData.h>
+#include <Atom/RPI.Reflect/Pass/PassTemplate.h>
+#include <Atom/RPI.Reflect/Shader/ShaderAsset.h>
+
+#include <Passes/HairGeometryRasterPass.h>
+#include <Rendering/HairRenderObject.h>
+#include <Rendering/HairFeatureProcessor.h>
+
+namespace AZ
+{
+    namespace Render
+    {
+        namespace Hair
+        {
+
+            // --- Creation & Initialization ---
+            RPI::Ptr<HairGeometryRasterPass> HairGeometryRasterPass::Create(const RPI::PassDescriptor& descriptor)
+            {
+                RPI::Ptr<HairGeometryRasterPass> pass = aznew HairGeometryRasterPass(descriptor);
+                return pass;
+            }
+
+            HairGeometryRasterPass::HairGeometryRasterPass(const RPI::PassDescriptor& descriptor)
+                : RasterPass(descriptor),
+                m_passDescriptor(descriptor)
+            {
+                // For inherited classes, override this method and set the proper path.
+                // Example: "Shaders/hairrenderingfillppll.azshader"
+                SetShaderPath("dummyShaderPath");
+            }
+
+            bool HairGeometryRasterPass::AcquireFeatureProcessor()
+            {
+                if (m_featureProcessor)
+                {
+                    return true;
+                }
+
+                RPI::Scene* scene = GetScene();
+                if (scene)
+                {
+                    m_featureProcessor = scene->GetFeatureProcessor<HairFeatureProcessor>();
+                }
+                else
+                {
+                    return false;
+                }
+
+                if (!m_featureProcessor)
+                {
+                    AZ_Warning("Hair Gem", false,
+                        "HairGeometryRasterPass [%s] - Failed to retrieve Hair feature processor from the scene",
+                        GetName().GetCStr());
+                    return false;
+                }
+                return true;
+            }
+
+            void HairGeometryRasterPass::InitializeInternal()
+            {
+                if (GetScene())
+                {
+                    RasterPass::InitializeInternal();
+                }
+            }
+
+            bool HairGeometryRasterPass::IsEnabled() const
+            {
+                return (RPI::RasterPass::IsEnabled() && m_initialized) ? true : false;
+            }
+
+            bool HairGeometryRasterPass::LoadShaderAndPipelineState()
+            {
+                RPI::ShaderReloadNotificationBus::Handler::BusDisconnect();
+
+                const RPI::RasterPassData* passData = RPI::PassUtils::GetPassData<RPI::RasterPassData>(m_passDescriptor);
+
+                // If we successfully retrieved our custom data, use it to set the DrawListTag
+                if (!passData)
+                {
+                    AZ_Error("Hair Gem", false, "Missing pass raster data");
+                    return false;
+                }
+
+                // Load Shader
+                const char* shaderFilePath = m_shaderPath.c_str();
+                Data::Asset<RPI::ShaderAsset> shaderAsset =
+                    RPI::AssetUtils::LoadAssetByProductPath<RPI::ShaderAsset>(shaderFilePath, RPI::AssetUtils::TraceLevel::Error);
+
+                if (!shaderAsset.GetId().IsValid())
+                {
+                    AZ_Error("Hair Gem", false, "Invalid shader asset for shader '%s'!", shaderFilePath);
+                    return false;
+                }
+
+                m_shader = RPI::Shader::FindOrCreate(shaderAsset);
+                if (m_shader == nullptr)
+                {
+                    AZ_Error("Hair Gem", false, "Pass failed to load shader '%s'!", shaderFilePath);
+                    return false;
+                }
+
+                // Per Pass Srg
+                {
+                    // Using 'PerPass' naming since currently RasterPass assumes that the pass Srg is always named 'PassSrg'
+                    // [To Do] - RasterPass should use srg slot index and not name - currently this will
+                    //  result in a crash in one of the Atom existing MSAA passes that requires further dive. 
+                    // m_shaderResourceGroup = UtilityClass::CreateShaderResourceGroup(m_shader, "HairPerPassSrg", "Hair Gem");
+                    m_shaderResourceGroup = UtilityClass::CreateShaderResourceGroup(m_shader, "PassSrg", "Hair Gem");
+                    if (!m_shaderResourceGroup)
+                    {
+                        AZ_Error("Hair Gem", false, "Failed to create the per pass srg");
+                        return false;
+                    }
+                }
+
+                const RPI::ShaderVariant& shaderVariant = m_shader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId);
+                RHI::PipelineStateDescriptorForDraw pipelineStateDescriptor;
+                shaderVariant.ConfigurePipelineState(pipelineStateDescriptor);
+
+                RPI::Scene* scene = GetScene();
+                if (!scene)
+                {
+                    AZ_Error("Hair Gem", false, "Scene could not be acquired" );
+                    return false;
+                }
+                RHI::DrawListTag drawListTag = m_shader->GetDrawListTag();
+                scene->ConfigurePipelineState(drawListTag, pipelineStateDescriptor);
+
+                pipelineStateDescriptor.m_renderAttachmentConfiguration = GetRenderAttachmentConfiguration();
+                pipelineStateDescriptor.m_inputStreamLayout.SetTopology(AZ::RHI::PrimitiveTopology::TriangleList);
+                pipelineStateDescriptor.m_inputStreamLayout.Finalize();
+
+                m_pipelineState = m_shader->AcquirePipelineState(pipelineStateDescriptor);
+                if (!m_pipelineState)
+                {
+                    AZ_Error("Hair Gem", false, "Pipeline state could not be acquired");
+                    return false;
+                }
+
+                RPI::ShaderReloadNotificationBus::Handler::BusConnect(shaderAsset.GetId());
+
+                m_initialized = true;
+                return true;
+            }
+
+            void HairGeometryRasterPass::SchedulePacketBuild(HairRenderObject* hairObject)
+            {
+                m_newRenderObjects.insert(hairObject);
+            }
+
+            bool HairGeometryRasterPass::BuildDrawPacket(HairRenderObject* hairObject)
+            {
+                if (!m_initialized)
+                {
+                    return false;
+                }
+
+                RHI::DrawPacketBuilder::DrawRequest drawRequest;
+                drawRequest.m_listTag = m_drawListTag;
+                drawRequest.m_pipelineState = m_pipelineState;
+//                drawRequest.m_streamBufferViews =  // no explicit vertex buffer.  shader is using the srg buffers
+                drawRequest.m_stencilRef = 0;
+                drawRequest.m_sortKey = 0;
+
+                // Seems that the PerView and PerScene are gathered through RenderPass::CollectSrgs()
+                // The PerPass is gathered through the RasterPass::m_shaderResourceGroup
+                AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
+
+                return hairObject->BuildPPLLDrawPacket(drawRequest);
+            }
+
+            bool HairGeometryRasterPass::AddDrawPackets(AZStd::list<Data::Instance<HairRenderObject>>& hairRenderObjects)
+            {
+                bool overallSuccess = true;
+
+                if (!m_currentView &&
+                    (!(m_currentView = GetView()) || !m_currentView->HasDrawListTag(m_drawListTag)))
+                {
+                    m_currentView = nullptr;    // set it to nullptr to prevent further attempts this frame
+                    AZ_Warning("Hair Gem", false, "AddDrawPackets: failed to acquire or match the DrawListTag - check that your pass and shader tag name match");
+                    return false;
+                }
+
+                for (auto& renderObject : hairRenderObjects)
+                {
+                    const RHI::DrawPacket* drawPacket = renderObject->GetFillDrawPacket();
+                    if (!drawPacket)
+                    {   // might not be an error - the object might have just been added and the DrawPacket is
+                        // scheduled to be built when the render frame begins
+                        AZ_Warning("Hair Gem", !m_newRenderObjects.empty(), "HairGeometryRasterPass - DrawPacket wasn't built");
+                        overallSuccess = false;
+                        continue;
+                    }
+
+                    m_currentView->AddDrawPacket(drawPacket);
+                }
+                return overallSuccess;
+            }
+
+            void HairGeometryRasterPass::FrameBeginInternal(FramePrepareParams params)
+            {
+                {
+                    AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
+                    if (!m_initialized && AcquireFeatureProcessor())
+                    {
+                        LoadShaderAndPipelineState();
+                        m_featureProcessor->ForceRebuildRenderData();
+                    }
+                }
+
+                if (!m_initialized)
+                {
+                    return;
+                }
+
+                // Bind the Per Object resources and trigger the RHI validation that will use attachment
+                // for its validation.  The attachments are invalidated outside the render begin/end frame.
+                for (HairRenderObject* newObject : m_newRenderObjects)
+                {
+                    newObject->BindPerObjectSrgForRaster();
+                    BuildDrawPacket(newObject);
+                }
+
+                // Clear the new added objects - BuildDrawPacket should only be carried out once per
+                // object/shader lifetime
+                m_newRenderObjects.clear();
+
+                // Refresh current view every frame
+                if (!(m_currentView = GetView()) || !m_currentView->HasDrawListTag(m_drawListTag))
+                {
+                    m_currentView = nullptr;    // set it to null if view exists but no tag match
+                    AZ_Warning("Hair Gem", false, "FrameBeginInternal: failed to acquire or match the DrawListTag - check that your pass and shader tag name match");
+                    return;
+                }
+
+                RPI::RasterPass::FrameBeginInternal(params);
+            }
+
+            void HairGeometryRasterPass::CompileResources(const RHI::FrameGraphCompileContext& context)
+            {
+                AZ_PROFILE_FUNCTION(AzRender);
+
+                if (!m_featureProcessor)
+                {
+                    return;
+                }
+
+                // Compilation of remaining srgs will be done by the parent class 
+                RPI::RasterPass::CompileResources(context);
+            }
+
+            void HairGeometryRasterPass::BuildShaderAndRenderData()
+            {
+                AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
+                m_initialized = false;  // make sure we initialize it even if not in this frame
+                if (AcquireFeatureProcessor())
+                {
+                    LoadShaderAndPipelineState();
+                    m_featureProcessor->ForceRebuildRenderData();
+                }
+            }
+
+            void HairGeometryRasterPass::OnShaderReinitialized([[maybe_unused]] const RPI::Shader & shader)
+            {
+                BuildShaderAndRenderData();
+            }
+
+            void HairGeometryRasterPass::OnShaderAssetReinitialized([[maybe_unused]] const Data::Asset<RPI::ShaderAsset>& shaderAsset)
+            {
+                BuildShaderAndRenderData();
+            }
+
+            void HairGeometryRasterPass::OnShaderVariantReinitialized([[maybe_unused]] const AZ::RPI::ShaderVariant& shaderVariant)
+            {
+                BuildShaderAndRenderData();
+            }
+        } // namespace Hair
+    }   // namespace Render
+}   // namespace AZ
diff --git a/Gems/AtomTressFX/Code/Passes/HairGeometryRasterPass.h b/Gems/AtomTressFX/Code/Passes/HairGeometryRasterPass.h
new file mode 100644
index 0000000000..a226d2c294
--- /dev/null
+++ b/Gems/AtomTressFX/Code/Passes/HairGeometryRasterPass.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AzCore/Memory/SystemAllocator.h>
+
+#include <Atom/RHI.Reflect/Size.h>
+
+#include <Atom/RPI.Public/Pass/RasterPass.h>
+#include <Atom/RPI.Public/Shader/Shader.h>
+#include <Atom/RPI.Public/Shader/ShaderResourceGroup.h>
+#include <Atom/RPI.Public/Shader/ShaderReloadNotificationBus.h>
+
+namespace AZ
+{
+    namespace RHI
+    {
+        struct DrawItem;
+    }
+
+    namespace Render
+    {
+        namespace Hair
+        {
+            class HairRenderObject;
+            class HairFeatureProcessor;
+
+            //! A HairGeometryRasterPass is used for the render of the hair geometries.  This is the base
+            //!  class that can be inherited - for example by the HiarPPLLRasterPass and have only the specific
+            //!  class data handling added on top.
+            class HairGeometryRasterPass
+                : public RPI::RasterPass
+                , private RPI::ShaderReloadNotificationBus::Handler
+            {
+                AZ_RPI_PASS(HairGeometryRasterPass);
+
+            public:
+                AZ_RTTI(HairGeometryRasterPass, "{0F07360A-A286-4060-8C62-137AFFA50561}", RasterPass);
+                AZ_CLASS_ALLOCATOR(HairGeometryRasterPass, SystemAllocator, 0);
+
+                //! Creates a HairGeometryRasterPass
+                static RPI::Ptr<HairGeometryRasterPass> Create(const RPI::PassDescriptor& descriptor);
+
+                bool AddDrawPackets(AZStd::list<Data::Instance<HairRenderObject>>& hairObjects);
+
+                //! The following will be called when an object was added or shader has been compiled
+                void SchedulePacketBuild(HairRenderObject* hairObject);
+
+                Data::Instance<RPI::Shader> GetShader() { return m_shader; }
+
+                void SetFeatureProcessor(HairFeatureProcessor* featureProcessor)
+                {
+                    m_featureProcessor = featureProcessor;
+                }
+
+                virtual bool IsEnabled() const override;
+
+            protected:
+                explicit HairGeometryRasterPass(const RPI::PassDescriptor& descriptor);
+
+                // ShaderReloadNotificationBus::Handler overrides...
+                void OnShaderReinitialized(const RPI::Shader& shader) override;
+                void OnShaderAssetReinitialized(const Data::Asset<RPI::ShaderAsset>& shaderAsset) override;
+                void OnShaderVariantReinitialized(const AZ::RPI::ShaderVariant& shaderVariant) override;
+
+                void SetShaderPath(const char* shaderPath) { m_shaderPath = shaderPath; }
+                bool LoadShaderAndPipelineState();
+                bool AcquireFeatureProcessor();
+                void BuildShaderAndRenderData();
+                bool BuildDrawPacket(HairRenderObject* hairObject);
+
+                // Pass behavior overrides
+                void InitializeInternal() override;
+//                void BuildInternal() override;
+                void FrameBeginInternal(FramePrepareParams params) override;
+
+                // Scope producer functions...
+                void CompileResources(const RHI::FrameGraphCompileContext& context) override;
+
+            protected:
+                HairFeatureProcessor* m_featureProcessor = nullptr;
+
+                // The  shader that will be used by the pass
+                Data::Instance<RPI::Shader> m_shader = nullptr;
+
+                // Override the following in the inherited class
+                AZStd::string m_shaderPath = "dummyShaderPath";
+
+                // To help create the pipeline state 
+                RPI::PassDescriptor m_passDescriptor;
+
+                const RHI::PipelineState* m_pipelineState = nullptr;
+                RPI::ViewPtr m_currentView = nullptr;
+
+                AZStd::mutex m_mutex;
+
+                //! List of new render objects introduced this frame so that their in order to identify 
+                //! that their PerObject (dynamic) Srg needs binding to the resources.
+                //! Done once per every new object introduced / requires update.
+                AZStd::unordered_set<HairRenderObject*> m_newRenderObjects;
+
+                bool m_initialized = false;
+            };
+
+        } // namespace Hair
+    } // namespace Render
+}   // namespace AZ
diff --git a/Gems/AtomTressFX/Code/Passes/HairPPLLRasterPass.cpp b/Gems/AtomTressFX/Code/Passes/HairPPLLRasterPass.cpp
index 746a3c2640..a677a929a2 100644
--- a/Gems/AtomTressFX/Code/Passes/HairPPLLRasterPass.cpp
+++ b/Gems/AtomTressFX/Code/Passes/HairPPLLRasterPass.cpp
@@ -34,61 +34,25 @@ namespace AZ
         namespace Hair
         {
 
-            // --- Creation & Initialization ---
+            HairPPLLRasterPass::HairPPLLRasterPass(const RPI::PassDescriptor& descriptor)
+                : HairGeometryRasterPass(descriptor)
+            {
+                SetShaderPath("Shaders/hairrenderingfillppll.azshader");  
+            }
+
             RPI::Ptr<HairPPLLRasterPass> HairPPLLRasterPass::Create(const RPI::PassDescriptor& descriptor)
             {
                 RPI::Ptr<HairPPLLRasterPass> pass = aznew HairPPLLRasterPass(descriptor);
                 return pass;
             }
 
-            HairPPLLRasterPass::HairPPLLRasterPass(const RPI::PassDescriptor& descriptor)
-                : RasterPass(descriptor),
-                m_passDescriptor(descriptor)
-            {
-            }
-
-            HairPPLLRasterPass::~HairPPLLRasterPass()
-            {
-            }
-
-            bool HairPPLLRasterPass::AcquireFeatureProcessor()
-            {
-                if (m_featureProcessor)
-                {
-                    return true;
-                }
-
-                RPI::Scene* scene = GetScene();
-                if (scene)
-                {
-                    m_featureProcessor = scene->GetFeatureProcessor<HairFeatureProcessor>();
-                }
-                else
-                {
-                    return false;
-                }
-
-                if (!m_featureProcessor)
-                {
-                    AZ_Warning("Hair Gem", false,
-                        "HairPPLLRasterPass [%s] - Failed to retrieve Hair feature processor from the scene",
-                        GetName().GetCStr());
-                    return false;
-                }
-                return true;
-            }
-
-            void HairPPLLRasterPass::InitializeInternal()
-            {
-                if (GetScene())
-                {
-                    RasterPass::InitializeInternal();
-                }
-            }
-
+            //! This method is used for attaching the PPLL data buffer which is a transient buffer.
+            //! It is done this ways because Atom doesn't support transient structured buffers declaration
+            //! via Pass yet.
+            //! Once supported, this will be done via data driven code and the method can be removed.
             void HairPPLLRasterPass::BuildInternal()
             {
-                RasterPass::BuildInternal();
+                RasterPass::BuildInternal();    // change this to call parent if the method exists
 
                 if (!AcquireFeatureProcessor())
                 {
@@ -104,217 +68,6 @@ namespace AZ
                 AttachBufferToSlot(Name{ "PerPixelLinkedList" }, m_featureProcessor->GetPerPixelListBuffer());
             }
 
-            bool HairPPLLRasterPass::IsEnabled() const
-            {
-                return (RPI::RasterPass::IsEnabled() && m_initialized) ? true : false;
-            }
-
-            bool HairPPLLRasterPass::LoadShaderAndPipelineState()
-            {
-                RPI::ShaderReloadNotificationBus::Handler::BusDisconnect();
-
-                const RPI::RasterPassData* passData = RPI::PassUtils::GetPassData<RPI::RasterPassData>(m_passDescriptor);
-
-                // If we successfully retrieved our custom data, use it to set the DrawListTag
-                if (!passData)
-                {
-                    AZ_Error("Hair Gem", false, "Missing pass raster data");
-                    return false;
-                }
-
-                // Load Shader
-                const char* shaderFilePath = "Shaders/hairrenderingfillppll.azshader";
-                Data::Asset<RPI::ShaderAsset> shaderAsset =
-                    RPI::AssetUtils::LoadAssetByProductPath<RPI::ShaderAsset>(shaderFilePath, RPI::AssetUtils::TraceLevel::Error);
-
-                if (!shaderAsset.GetId().IsValid())
-                {
-                    AZ_Error("Hair Gem", false, "Invalid shader asset for shader '%s'!", shaderFilePath);
-                    return false;
-                }
-
-                m_shader = RPI::Shader::FindOrCreate(shaderAsset);
-                if (m_shader == nullptr)
-                {
-                    AZ_Error("Hair Gem", false, "Pass failed to load shader '%s'!", shaderFilePath);
-                    return false;
-                }
-
-                // Per Pass Srg
-                {
-                    // Using 'PerPass' naming since currently RasterPass assumes that the pass Srg is always named 'PassSrg'
-                    // [To Do] - RasterPass should use srg slot index and not name - currently this will
-                    //  result in a crash in one of the Atom existing MSAA passes that requires further dive. 
-                    // m_shaderResourceGroup = UtilityClass::CreateShaderResourceGroup(m_shader, "HairPerPassSrg", "Hair Gem");
-                    m_shaderResourceGroup = UtilityClass::CreateShaderResourceGroup(m_shader, "PassSrg", "Hair Gem");
-                    if (!m_shaderResourceGroup)
-                    {
-                        AZ_Error("Hair Gem", false, "Failed to create the per pass srg");
-                        return false;
-                    }
-                }
-
-                const RPI::ShaderVariant& shaderVariant = m_shader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId);
-                RHI::PipelineStateDescriptorForDraw pipelineStateDescriptor;
-                shaderVariant.ConfigurePipelineState(pipelineStateDescriptor);
-
-                RPI::Scene* scene = GetScene();
-                if (!scene)
-                {
-                    AZ_Error("Hair Gem", false, "Scene could not be acquired" );
-                    return false;
-                }
-                RHI::DrawListTag drawListTag = m_shader->GetDrawListTag();
-                scene->ConfigurePipelineState(drawListTag, pipelineStateDescriptor);
-
-                pipelineStateDescriptor.m_renderAttachmentConfiguration = GetRenderAttachmentConfiguration();
-                pipelineStateDescriptor.m_inputStreamLayout.SetTopology(AZ::RHI::PrimitiveTopology::TriangleList);
-                pipelineStateDescriptor.m_inputStreamLayout.Finalize();
-
-                m_pipelineState = m_shader->AcquirePipelineState(pipelineStateDescriptor);
-                if (!m_pipelineState)
-                {
-                    AZ_Error("Hair Gem", false, "Pipeline state could not be acquired");
-                    return false;
-                }
-
-                RPI::ShaderReloadNotificationBus::Handler::BusConnect(shaderAsset.GetId());
-
-                m_initialized = true;
-                return true;
-            }
-
-            void HairPPLLRasterPass::SchedulePacketBuild(HairRenderObject* hairObject)
-            {
-                m_newRenderObjects.insert(hairObject);
-            }
-
-            bool HairPPLLRasterPass::BuildDrawPacket(HairRenderObject* hairObject)
-            {
-                if (!m_initialized)
-                {
-                    return false;
-                }
-
-                RHI::DrawPacketBuilder::DrawRequest drawRequest;
-                drawRequest.m_listTag = m_drawListTag;
-                drawRequest.m_pipelineState = m_pipelineState;
-//                drawRequest.m_streamBufferViews =  // no explicit vertex buffer.  shader is using the srg buffers
-                drawRequest.m_stencilRef = 0;
-                drawRequest.m_sortKey = 0;
-
-                // Seems that the PerView and PerScene are gathered through RenderPass::CollectSrgs()
-                // The PerPass is gathered through the RasterPass::m_shaderResourceGroup
-                AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
-
-                return hairObject->BuildPPLLDrawPacket(drawRequest);
-            }
-
-            bool HairPPLLRasterPass::AddDrawPackets(AZStd::list<Data::Instance<HairRenderObject>>& hairRenderObjects)
-            {
-                bool overallSuccess = true;
-
-                if (!m_currentView &&
-                    (!(m_currentView = GetView()) || !m_currentView->HasDrawListTag(m_drawListTag)))
-                {
-                    m_currentView = nullptr;    // set it to nullptr to prevent further attempts this frame
-                    AZ_Warning("Hair Gem", false, "HairPPLLRasterPass failed to acquire or match the DrawListTag - check that your pass and shader tag name match");
-                    return false;
-                }
-
-                for (auto& renderObject : hairRenderObjects)
-                {
-                    const RHI::DrawPacket* drawPacket = renderObject->GetFillDrawPacket();
-                    if (!drawPacket)
-                    {   // might not be an error - the object might have just been added and the DrawPacket is
-                        // scheduled to be built when the render frame begins
-                        AZ_Warning("Hair Gem", !m_newRenderObjects.empty(), "HairPPLLRasterPass - DrawPacket wasn't built");
-                        overallSuccess = false;
-                        continue;
-                    }
-
-                    m_currentView->AddDrawPacket(drawPacket);
-                }
-                return overallSuccess;
-            }
-
-            void HairPPLLRasterPass::FrameBeginInternal(FramePrepareParams params)
-            {
-                {
-                    AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
-                    if (!m_initialized && AcquireFeatureProcessor())
-                    {
-                        LoadShaderAndPipelineState();
-                        m_featureProcessor->ForceRebuildRenderData();
-                    }
-                }
-
-                if (!m_initialized)
-                {
-                    return;
-                }
-
-                // Bind the Per Object resources and trigger the RHI validation that will use attachment
-                // for its validation.  The attachments are invalidated outside the render begin/end frame.
-                for (HairRenderObject* newObject : m_newRenderObjects)
-                {
-                    newObject->BindPerObjectSrgForRaster();
-                    BuildDrawPacket(newObject);
-                }
-
-                // Clear the new added objects - BuildDrawPacket should only be carried out once per
-                // object/shader lifetime
-                m_newRenderObjects.clear();
-
-                // Refresh current view every frame
-                if (!(m_currentView = GetView()) || !m_currentView->HasDrawListTag(m_drawListTag))
-                {
-                    m_currentView = nullptr;    // set it to null if view exists but no tag match
-                    AZ_Warning("Hair Gem", false, "HairPPLLRasterPass failed to acquire or match the DrawListTag - check that your pass and shader tag name match");
-                    return;
-                }
-
-                RPI::RasterPass::FrameBeginInternal(params);
-            }
-
-            void HairPPLLRasterPass::CompileResources(const RHI::FrameGraphCompileContext& context)
-            {
-                AZ_PROFILE_FUNCTION(AzRender);
-
-                if (!m_featureProcessor)
-                {
-                    return;
-                }
-
-                // Compilation of remaining srgs will be done by the parent class 
-                RPI::RasterPass::CompileResources(context);
-            }
-
-            void HairPPLLRasterPass::BuildShaderAndRenderData()
-            {
-                AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
-                m_initialized = false;  // make sure we initialize it even if not in this frame
-                if (AcquireFeatureProcessor())
-                {
-                    LoadShaderAndPipelineState();
-                    m_featureProcessor->ForceRebuildRenderData();
-                }
-            }
-
-            void HairPPLLRasterPass::OnShaderReinitialized([[maybe_unused]] const RPI::Shader & shader)
-            {
-                BuildShaderAndRenderData();
-            }
-
-            void HairPPLLRasterPass::OnShaderAssetReinitialized([[maybe_unused]] const Data::Asset<RPI::ShaderAsset>& shaderAsset)
-            {
-                BuildShaderAndRenderData();
-            }
-
-            void HairPPLLRasterPass::OnShaderVariantReinitialized([[maybe_unused]] const AZ::RPI::ShaderVariant& shaderVariant)
-            {
-                BuildShaderAndRenderData();
-            }
         } // namespace Hair
     }   // namespace Render
 }   // namespace AZ
diff --git a/Gems/AtomTressFX/Code/Passes/HairPPLLRasterPass.h b/Gems/AtomTressFX/Code/Passes/HairPPLLRasterPass.h
index ef7167897f..bf90fe0521 100644
--- a/Gems/AtomTressFX/Code/Passes/HairPPLLRasterPass.h
+++ b/Gems/AtomTressFX/Code/Passes/HairPPLLRasterPass.h
@@ -7,14 +7,7 @@
  */
 #pragma once
 
-#include <AzCore/Memory/SystemAllocator.h>
-
-#include <Atom/RHI.Reflect/Size.h>
-
-#include <Atom/RPI.Public/Pass/RasterPass.h>
-#include <Atom/RPI.Public/Shader/Shader.h>
-#include <Atom/RPI.Public/Shader/ShaderResourceGroup.h>
-#include <Atom/RPI.Public/Shader/ShaderReloadNotificationBus.h>
+#include <Passes/HairGeometryRasterPass.h>
 
 namespace AZ
 {
@@ -27,11 +20,8 @@ namespace AZ
     {
         namespace Hair
         {
-            class HairRenderObject;
-            class HairFeatureProcessor;
-
             //! A HairPPLLRasterPass is used for the hair fragments fill render after the data
-            //!  went through the skinning and simulation passes.
+            //! went through the skinning and simulation passes.
             //! The output of this pass is the general list of fragment data that can now be
             //!  traversed for depth resolve and lighting.
             //! The Fill pass uses the following Srgs:
@@ -41,74 +31,22 @@ namespace AZ
             //!  - HairDynamicDataSrg (PerObjectSrg) - shared buffers views for this hair object only.
             //!  - PerViewSrg and PerSceneSrg - as per the data from Atom.
             class HairPPLLRasterPass
-                : public RPI::RasterPass
-                , private RPI::ShaderReloadNotificationBus::Handler
+                : public HairGeometryRasterPass
             {
                 AZ_RPI_PASS(HairPPLLRasterPass);
 
             public:
-                AZ_RTTI(HairPPLLRasterPass, "{6614D7DD-24EE-4A2B-B314-7C035E2FB3C4}", RasterPass);
+                AZ_RTTI(HairPPLLRasterPass, "{6614D7DD-24EE-4A2B-B314-7C035E2FB3C4}", HairGeometryRasterPass);
                 AZ_CLASS_ALLOCATOR(HairPPLLRasterPass, SystemAllocator, 0);
-                virtual ~HairPPLLRasterPass();
 
                 //! Creates a HairPPLLRasterPass
                 static RPI::Ptr<HairPPLLRasterPass> Create(const RPI::PassDescriptor& descriptor);
 
-                bool AddDrawPackets(AZStd::list<Data::Instance<HairRenderObject>>& hairObjects);
-
-                //! The following will be called when an object was added or shader has been compiled
-                void SchedulePacketBuild(HairRenderObject* hairObject);
-
-                Data::Instance<RPI::Shader> GetShader() { return m_shader; }
-
-                void SetFeatureProcessor(HairFeatureProcessor* featureProcessor)
-                {
-                    m_featureProcessor = featureProcessor;
-                }
-
-                virtual bool IsEnabled() const override;
             protected:
-                // ShaderReloadNotificationBus::Handler overrides...
-                void OnShaderReinitialized(const RPI::Shader& shader) override;
-                void OnShaderAssetReinitialized(const Data::Asset<RPI::ShaderAsset>& shaderAsset) override;
-                void OnShaderVariantReinitialized(const AZ::RPI::ShaderVariant& shaderVariant) override;
-
-            private:
                 explicit HairPPLLRasterPass(const RPI::PassDescriptor& descriptor);
 
-                bool LoadShaderAndPipelineState();
-                bool AcquireFeatureProcessor();
-                void BuildShaderAndRenderData();
-                bool BuildDrawPacket(HairRenderObject* hairObject);
-
                 // Pass behavior overrides
-                void InitializeInternal() override;
                 void BuildInternal() override;
-                void FrameBeginInternal(FramePrepareParams params) override;
-
-                // Scope producer functions...
-                void CompileResources(const RHI::FrameGraphCompileContext& context) override;
-
-            private:
-                HairFeatureProcessor* m_featureProcessor = nullptr;
-
-                // The  shader that will be used by the pass
-                Data::Instance<RPI::Shader> m_shader = nullptr;
-
-                // To help create the pipeline state 
-                RPI::PassDescriptor m_passDescriptor;
-
-                const RHI::PipelineState* m_pipelineState = nullptr;
-                RPI::ViewPtr m_currentView = nullptr;
-
-                AZStd::mutex m_mutex;
-
-                //! List of new render objects introduced this frame so that their
-                //!  Per Object (dynamic) Srg should be bound to the resources.
-                //! Done once per every new object introduced / requires update.
-                AZStd::unordered_set<HairRenderObject*> m_newRenderObjects;
-
-                bool m_initialized = false;
             };
 
         } // namespace Hair
diff --git a/Gems/AtomTressFX/Hair_files.cmake b/Gems/AtomTressFX/Hair_files.cmake
index c726d931f7..000abeb559 100644
--- a/Gems/AtomTressFX/Hair_files.cmake
+++ b/Gems/AtomTressFX/Hair_files.cmake
@@ -61,10 +61,16 @@ set(FILES
 #)
 #
 #set(atom_hair_passes
+    # The simulation pass class shared by all simulation / skinning compute passes
     Code/Passes/HairSkinningComputePass.h
     Code/Passes/HairSkinningComputePass.cpp
+    # Base class of all geometry raster passes
+    Code/Passes/HairGeometryRasterPass.h
+    Code/Passes/HairGeometryRasterPass.cpp
+    # PPLL rendering technique - geometry raster pass
     Code/Passes/HairPPLLRasterPass.h
     Code/Passes/HairPPLLRasterPass.cpp
+    # PP full screen resolve pass 
     Code/Passes/HairPPLLResolvePass.h
     Code/Passes/HairPPLLResolvePass.cpp
 #)

From 97e9f4dc7d7ce343c4a64547d30dc91d274c0277 Mon Sep 17 00:00:00 2001
From: lumberyard-employee-dm
 <56135373+lumberyard-employee-dm@users.noreply.github.com>
Date: Wed, 13 Oct 2021 09:38:36 -0500
Subject: [PATCH 24/29] [LYN-6838] Various Monolithic shutdown fixes for the
 GameLauncher (#4564)

* Added a stateless allocator which uses AZ_OS_MALLOC/AZ_OS_FREE to
allocate memory for objects in static memory.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the Maestro and LyShine Anim Nodes to use the
stateless_allocator for its static containers.

This prevents crashes in static de-init due to the SystemAllocator being
destroyed at that poitn

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the EBus AllocatorType to use the EBusEnvironmentAllocator

Because the EBus Context resides in static memory, the SystemAllocator
lifetime is shorter than the EBus Context.

This results in shutdown crashes in monolithic builds due to all of the
gem modules being linked in as static libraries and the EBus context now
destructing at the point of the executable static de-init, instead of
the module de-init, where the SystemAllocator would still be around.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed an assortment of shutdown issues due to deleting objects after
AZ allocators are no longer available

Fixed the NameDictionary IsReady() function to not assert when the
dictionary when invoked after the environment variable it was stored in
was destroyed.
Updated the NameData destructor to check that the NameDictionary
IsReady() before attempting to remove itself from the dictionary

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed NameDictionary destory workflow, to reset the EnvironmentVariable
instance

Updated the EnvironmentVariable instance to store the NameDictionary as a
value.

Added a rvalue reference `Set` function overload to the
EnvironmentVariable class to support move only types.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Clang 6.0.0 build fixes

The C++17 std::launder feature isn't available in that compiler version

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
---
 Code/Framework/AzCore/AzCore/EBus/EBus.h      |  6 +-
 .../AzCore/AzCore/Memory/AllocatorManager.h   |  4 +-
 .../AzCore/AzCore/Module/Environment.h        | 45 ++++-----
 .../AzCore/AzCore/Name/Internal/NameData.cpp  |  5 +-
 .../AzCore/AzCore/Name/NameDictionary.cpp     | 24 ++---
 .../AzCore/AzCore/Name/NameDictionary.h       | 21 +++--
 .../AzCore/AzCore/std/allocator_stateless.cpp | 94 +++++++++++++++++++
 .../AzCore/AzCore/std/allocator_stateless.h   | 61 ++++++++++++
 .../AzCore/AzCore/std/azstd_files.cmake       |  2 +
 .../AzCore/AzCore/std/createdestroy.h         |  6 +-
 Code/Legacy/CryCommon/IMovieSystem.h          |  5 +-
 Code/Legacy/CryCommon/StlUtils.h              |  8 ++
 .../DecalTextureArrayFeatureProcessor.cpp     |  4 +-
 .../ProjectedShadowFeatureProcessor.cpp       |  2 +-
 .../RHI/Vulkan/Code/Source/RHI/Instance.cpp   | 19 +++-
 .../RHI/Vulkan/Code/Source/RHI/Instance.h     |  1 +
 .../Code/Source/RHI/SystemComponent.cpp       |  1 +
 .../Source/AudioSystemGemSystemComponent.cpp  |  3 +
 Gems/ImGui/Code/Source/ImGuiManager.cpp       |  7 +-
 Gems/LyShine/Code/Source/Animation/AnimNode.h |  3 +-
 .../Source/Animation/UiAnimationSystem.cpp    | 33 ++++---
 .../Code/Source/Cinematics/AnimPostFXNode.cpp |  3 +-
 Gems/Maestro/Code/Source/Cinematics/Movie.cpp | 35 ++++---
 23 files changed, 302 insertions(+), 90 deletions(-)
 create mode 100644 Code/Framework/AzCore/AzCore/std/allocator_stateless.cpp
 create mode 100644 Code/Framework/AzCore/AzCore/std/allocator_stateless.h

diff --git a/Code/Framework/AzCore/AzCore/EBus/EBus.h b/Code/Framework/AzCore/AzCore/EBus/EBus.h
index a3dc10b103..67cffb4e41 100644
--- a/Code/Framework/AzCore/AzCore/EBus/EBus.h
+++ b/Code/Framework/AzCore/AzCore/EBus/EBus.h
@@ -77,9 +77,11 @@ namespace AZ
     public:
         /**
          * Allocator used by the EBus.
-         * The default setting is AZStd::allocator, which uses AZ::SystemAllocator.
+         * The default setting is Internal EBusEnvironmentAllocator
+         * EBus code stores their Context instances in static memory
+         * Therfore the configured allocator must last as long as the EBus in a module
          */
-        using AllocatorType = AZStd::allocator;
+        using AllocatorType = AZ::Internal::EBusEnvironmentAllocator;
 
         /**
          * Defines how many handlers can connect to an address on the EBus
diff --git a/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h b/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h
index be0ab4a0a0..14dec68ad1 100644
--- a/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h
+++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h
@@ -34,7 +34,9 @@ namespace AZ
         friend IAllocator;
         friend class AllocatorBase;
         friend class Debug::AllocationRecords;
-        friend class AZ::Internal::EnvironmentVariableHolder<AllocatorManager>;
+        template<typename T, typename... Args> friend constexpr auto AZStd::construct_at(T*, Args&&... args)
+            ->AZStd::enable_if_t<AZStd::is_void_v<AZStd::void_t<decltype(new (AZStd::declval<void*>()) T(AZStd::forward<Args>(args)...))>>, T*>;
+        template<typename T> constexpr friend void AZStd::destroy_at(T*);
 
     public:
         typedef AZStd::function<void (IAllocator* allocator, size_t /*byteSize*/, size_t /*alignment*/, int/* flags*/, const char* /*name*/, const char* /*fileName*/, int lineNum /*=0*/)>    OutOfMemoryCBType;
diff --git a/Code/Framework/AzCore/AzCore/Module/Environment.h b/Code/Framework/AzCore/AzCore/Module/Environment.h
index e87ff81446..a2dcfbd8fa 100644
--- a/Code/Framework/AzCore/AzCore/Module/Environment.h
+++ b/Code/Framework/AzCore/AzCore/Module/Environment.h
@@ -251,16 +251,15 @@ namespace AZ
         class EnvironmentVariableHolder
             : public EnvironmentVariableHolderBase
         {
-            void ConstructImpl(const AZStd::true_type& /* AZStd::has_trivial_constructor<T> */)
-            {
-                memset(&m_value, 0, sizeof(T));
-            }
-
             template<class... Args>
-            void ConstructImpl(const AZStd::false_type& /* AZStd::has_trivial_constructor<T> */, Args&&... args)
+            void ConstructImpl(Args&&... args)
             {
-                // Construction of non-trivial types is left up to the type's constructor.
-                new(&m_value) T(AZStd::forward<Args>(args)...);
+                // Use std::launder to ensure that the compiler treats the T* reinterpret_cast as a new object
+            #if __cpp_lib_launder
+                AZStd::construct_at(std::launder(reinterpret_cast<T*>(&m_value)), AZStd::forward<Args>(args)...);
+            #else
+                AZStd::construct_at(reinterpret_cast<T*>(&m_value), AZStd::forward<Args>(args)...);
+            #endif
             }
             static void DestructDispatchNoLock(EnvironmentVariableHolderBase *base, DestroyTarget selfDestruct)
             {
@@ -274,10 +273,12 @@ namespace AZ
                 AZ_Assert(self->m_isConstructed, "Variable is not constructed. Please check your logic and guard if needed!");
                 self->m_isConstructed = false;
                 self->m_moduleOwner = nullptr;
-                if constexpr(!AZStd::is_trivially_destructible_v<T>)
-                {
-                    reinterpret_cast<T*>(&self->m_value)->~T();
-                }
+                // Use std::launder to ensure that the compiler treats the T* reinterpret_cast as a new object
+            #if __cpp_lib_launder
+                AZStd::destroy_at(std::launder(reinterpret_cast<T*>(&self->m_value)));
+            #else
+                AZStd::destroy_at(reinterpret_cast<T*>(&self->m_value));
+            #endif
             }
         public:
             EnvironmentVariableHolder(u32 guid, bool isOwnershipTransfer, Environment::AllocatorInterface* allocator)
@@ -303,24 +304,13 @@ namespace AZ
                 UnregisterAndDestroy(DestructDispatchNoLock, moduleRelease);
             }
 
-            void Construct()
-            {
-                AZStd::lock_guard<AZStd::spin_mutex> lock(m_mutex);
-                if (!m_isConstructed)
-                {
-                    ConstructImpl(AZStd::is_trivially_constructible<T>{});
-                    m_isConstructed = true;
-                    m_moduleOwner = Environment::GetModuleId();
-                }
-            }
-
             template <class... Args>
             void Construct(Args&&... args)
             {
                 AZStd::lock_guard<AZStd::spin_mutex> lock(m_mutex);
                 if (!m_isConstructed)
                 {
-                    ConstructImpl(typename AZStd::false_type(), AZStd::forward<Args>(args)...);
+                    ConstructImpl(AZStd::forward<Args>(args)...);
                     m_isConstructed = true;
                     m_moduleOwner = Environment::GetModuleId();
                 }
@@ -333,7 +323,7 @@ namespace AZ
             }
 
             // variable storage
-            typename AZStd::aligned_storage<sizeof(T), AZStd::alignment_of<T>::value>::type m_value;
+            AZStd::aligned_storage_for_t<T> m_value;
             static int s_moduleUseCount;
         };
 
@@ -468,6 +458,11 @@ namespace AZ
             Get() = value;
         }
 
+        void Set(T&& value)
+        {
+            Get() = AZStd::move(value);
+        }
+
         explicit operator bool() const
         {
             return IsValid();
diff --git a/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp b/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp
index 0086e68c6d..574b0bcc7e 100644
--- a/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp
+++ b/Code/Framework/AzCore/AzCore/Name/Internal/NameData.cpp
@@ -42,7 +42,10 @@ namespace AZ
             AZ_Assert(m_useCount > 0, "m_useCount is already 0!");
             if (m_useCount.fetch_sub(1) == 1)
             {
-                AZ::NameDictionary::Instance().TryReleaseName(hash);
+                if (AZ::NameDictionary::IsReady())
+                {
+                    AZ::NameDictionary::Instance().TryReleaseName(hash);
+                }
             }
         }
     }
diff --git a/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp b/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp
index 8e8011add9..3047a2894e 100644
--- a/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp
+++ b/Code/Framework/AzCore/AzCore/Name/NameDictionary.cpp
@@ -21,23 +21,18 @@ namespace AZ
 
     namespace NameDictionaryInternal
     {
-        static AZ::EnvironmentVariable<NameDictionary*> s_instance = nullptr;
+        static AZ::EnvironmentVariable<NameDictionary> s_instance = nullptr;
     }
 
     void NameDictionary::Create()
     {
         using namespace NameDictionaryInternal;
 
-        AZ_Assert(!s_instance || !s_instance.Get(), "NameDictionary already created!");
+        AZ_Assert(!s_instance, "NameDictionary already created!");
 
         if (!s_instance)
         {
-            s_instance = AZ::Environment::CreateVariable<NameDictionary*>(NameDictionaryInstanceName);
-        }
-
-        if (!s_instance.Get())
-        {
-            s_instance.Set(aznew NameDictionary());
+            s_instance = AZ::Environment::CreateVariable<NameDictionary>(NameDictionaryInstanceName);
         }
     }
 
@@ -46,8 +41,7 @@ namespace AZ
         using namespace NameDictionaryInternal;
 
         AZ_Assert(s_instance, "NameDictionary not created!");
-        delete (*s_instance);
-        *s_instance = nullptr;
+        s_instance.Reset();
     }
 
     bool NameDictionary::IsReady()
@@ -56,10 +50,10 @@ namespace AZ
 
         if (!s_instance)
         {
-            s_instance = Environment::FindVariable<NameDictionary*>(NameDictionaryInstanceName);
+            s_instance = Environment::FindVariable<NameDictionary>(NameDictionaryInstanceName);
         }
 
-        return s_instance && *s_instance;
+        return s_instance.IsConstructed();
     }
 
     NameDictionary& NameDictionary::Instance()
@@ -68,12 +62,12 @@ namespace AZ
 
         if (!s_instance)
         {
-            s_instance = Environment::FindVariable<NameDictionary*>(NameDictionaryInstanceName);
+            s_instance = Environment::FindVariable<NameDictionary>(NameDictionaryInstanceName);
         }
 
-        AZ_Assert(s_instance && *s_instance, "NameDictionary has not been initialized yet.");
+        AZ_Assert(s_instance.IsConstructed(), "NameDictionary has not been initialized yet.");
 
-        return *(*s_instance);
+        return *s_instance;
     }
     
     NameDictionary::NameDictionary()
diff --git a/Code/Framework/AzCore/AzCore/Name/NameDictionary.h b/Code/Framework/AzCore/AzCore/Name/NameDictionary.h
index fa13dbd682..8f9af4be3a 100644
--- a/Code/Framework/AzCore/AzCore/Name/NameDictionary.h
+++ b/Code/Framework/AzCore/AzCore/Name/NameDictionary.h
@@ -16,7 +16,7 @@
 #include <AzCore/Memory/OSAllocator.h>
 #include <AzCore/Name/Name.h>
 
-namespace MaterialEditor 
+namespace MaterialEditor
 {
     class MaterialEditorCoreComponent;
 }
@@ -34,14 +34,14 @@ namespace AZ
     {
         class NameData;
     };
-    
+
     //! Maintains a list of unique strings for Name objects.
     //! The main benefit of the Name system is very fast string equality comparison, because every
-    //! unique name has a unique ID. The NameDictionary's purpose is to guarantee name IDs do not 
+    //! unique name has a unique ID. The NameDictionary's purpose is to guarantee name IDs do not
     //! collide. It also saves memory by removing duplicate strings.
     //!
-    //! Benchmarks have shown that creating a new Name object can be quite slow when the name doesn't 
-    //! already exist in the NameDictionary, but is comparable to creating an AZStd::string for names 
+    //! Benchmarks have shown that creating a new Name object can be quite slow when the name doesn't
+    //! already exist in the NameDictionary, but is comparable to creating an AZStd::string for names
     //! that already exist.
     class NameDictionary final
     {
@@ -51,7 +51,10 @@ namespace AZ
         friend Name;
         friend Internal::NameData;
         friend UnitTest::NameDictionaryTester;
-        
+        template<typename T, typename... Args> friend constexpr auto AZStd::construct_at(T*, Args&&... args)
+            -> AZStd::enable_if_t<AZStd::is_void_v<AZStd::void_t<decltype(new (AZStd::declval<void*>()) T(AZStd::forward<Args>(args)...))>>, T*>;
+        template<typename T> constexpr friend void AZStd::destroy_at(T*);
+
     public:
 
         static void Create();
@@ -62,7 +65,7 @@ namespace AZ
 
         //! Makes a Name from the provided raw string. If an entry already exists in the dictionary, it is shared.
         //! Otherwise, it is added to the internal dictionary.
-        //! 
+        //!
         //! @param name The name to resolve against the dictionary.
         //! @return A Name instance holding a dictionary entry associated with the provided raw string.
         Name MakeName(AZStd::string_view name);
@@ -84,13 +87,13 @@ namespace AZ
         // Attempts to release the name from the dictionary, but checks to make sure
         // a reference wasn't taken by another thread.
         void TryReleaseName(Name::Hash hash);
-        
+
         //////////////////////////////////////////////////////////////////////////
 
         // Calculates a hash for the provided name string.
         // Does not attempt to resolve hash collisions; that is handled elsewhere.
         Name::Hash CalcHash(AZStd::string_view name);
-                
+
         AZStd::unordered_map<Name::Hash, Internal::NameData*> m_dictionary;
         mutable AZStd::shared_mutex m_sharedMutex;
     };
diff --git a/Code/Framework/AzCore/AzCore/std/allocator_stateless.cpp b/Code/Framework/AzCore/AzCore/std/allocator_stateless.cpp
new file mode 100644
index 0000000000..5806cc485c
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/allocator_stateless.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/std/allocator_stateless.h>
+#include <AzCore/Memory/OSAllocator.h>
+
+namespace AZStd
+{
+    stateless_allocator::stateless_allocator(const char* name)
+        : m_name(name) {}
+
+    const char* stateless_allocator::get_name() const
+    {
+        return m_name;
+    }
+
+    void stateless_allocator::set_name(const char* name)
+    {
+        m_name = name;
+    }
+
+    auto stateless_allocator::allocate(size_type byteSize) -> pointer_type
+    {
+        return allocate(byteSize, AZ_DEFAULT_ALIGNMENT, 0);
+    }
+
+    auto stateless_allocator::allocate(size_type byteSize, size_type alignment, int) -> pointer_type
+    {
+        pointer_type address = AZ_OS_MALLOC(byteSize, alignment);
+
+        if (address == nullptr)
+        {
+            AZ_Error("Memory", false, "stateless_allocator ran out of system memory!\n");
+        }
+
+        return address;
+    }
+
+    void stateless_allocator::deallocate(pointer_type ptr, size_type)
+    {
+        AZ_OS_FREE(ptr);
+    }
+
+    void stateless_allocator::deallocate(pointer_type ptr, size_type, size_type)
+    {
+        AZ_OS_FREE(ptr);
+    }
+
+    auto stateless_allocator::max_size() const -> size_type
+    {
+        return AZ_CORE_MAX_ALLOCATOR_SIZE;
+    }
+
+    stateless_allocator stateless_allocator::select_on_container_copy_construction() const
+    {
+        return *this;
+    }
+
+    auto stateless_allocator::resize(pointer_type, size_type) -> size_type
+    {
+        return 0;
+    }
+
+    bool stateless_allocator::is_lock_free()
+    {
+        return false;
+    }
+
+    bool stateless_allocator::is_stale_read_allowed()
+    {
+        return false;
+    }
+
+    bool stateless_allocator::is_delayed_recycling()
+    {
+        return false;
+    }
+
+    // comparison operators
+    bool operator==(const stateless_allocator&, const stateless_allocator&)
+    {
+        return true;
+    }
+
+    bool operator!=(const stateless_allocator&, const stateless_allocator&)
+    {
+        return false;
+    }
+}
diff --git a/Code/Framework/AzCore/AzCore/std/allocator_stateless.h b/Code/Framework/AzCore/AzCore/std/allocator_stateless.h
new file mode 100644
index 0000000000..b73c680c32
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/allocator_stateless.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/std/base.h>
+#include <AzCore/std/typetraits/integral_constant.h>
+#include <AzCore/RTTI/TypeInfoSimple.h>
+
+namespace AZStd
+{
+    class stateless_allocator
+    {
+    public:
+
+        AZ_TYPE_INFO(stateless_allocator, "{E4976C53-0B20-4F39-8D41-0A76F59A7D68}");
+
+        using value_type = uint8_t;
+        using pointer_type = void*;
+        using size_type = size_t;
+        using difference_type = ptrdiff_t;
+        using allow_memory_leaks = AZStd::true_type;
+
+        stateless_allocator(const char* name = "AZStd::stateless_allocator");
+        stateless_allocator(const stateless_allocator& rhs) = default;
+
+        stateless_allocator& operator=(const stateless_allocator& rhs) = default;
+
+        const char* get_name() const;
+        void set_name(const char* name);
+
+        pointer_type allocate(size_type byteSize);
+        pointer_type allocate(size_type byteSize, size_type alignment, int flags = 0);
+        void deallocate(pointer_type ptr, size_type alignment);
+        void deallocate(pointer_type ptr, size_type byteSize, size_type alignment);
+
+        // max_size actually returns the true maximum size of a single allocation
+        size_type max_size() const;
+
+        // Returns a copy of the allocator
+        stateless_allocator select_on_container_copy_construction() const;
+
+        //! extensions
+        size_type resize(pointer_type ptr, size_type newSize);
+
+        bool is_lock_free();
+        bool is_stale_read_allowed();
+        bool is_delayed_recycling();
+
+    private:
+        const char* m_name;
+    };
+
+    bool operator==(const stateless_allocator& left, const stateless_allocator& right);
+    bool operator!=(const stateless_allocator& left, const stateless_allocator& right);
+}
diff --git a/Code/Framework/AzCore/AzCore/std/azstd_files.cmake b/Code/Framework/AzCore/AzCore/std/azstd_files.cmake
index 08e72c5649..2746489f8c 100644
--- a/Code/Framework/AzCore/AzCore/std/azstd_files.cmake
+++ b/Code/Framework/AzCore/AzCore/std/azstd_files.cmake
@@ -12,6 +12,8 @@ set(FILES
     allocator.h
     allocator_ref.h
     allocator_stack.h
+    allocator_stateless.cpp
+    allocator_stateless.h
     allocator_static.h
     allocator_traits.h
     any.h
diff --git a/Code/Framework/AzCore/AzCore/std/createdestroy.h b/Code/Framework/AzCore/AzCore/std/createdestroy.h
index 0fa6e4ed40..355374a13a 100644
--- a/Code/Framework/AzCore/AzCore/std/createdestroy.h
+++ b/Code/Framework/AzCore/AzCore/std/createdestroy.h
@@ -20,7 +20,7 @@
 
 namespace AZStd
 {
-    // alias std::pointer_traits into the AZStd::namespace 
+    // alias std::pointer_traits into the AZStd::namespace
     using std::pointer_traits;
 
     //! Bring the names of uninitialized_default_construct and
@@ -229,7 +229,7 @@ namespace AZStd
     //! `new (declval<void*>()) T(declval<Args>()...)` is well-formed
     template <typename T, typename... Args>
     constexpr auto construct_at(T* ptr, Args&&... args)
-        -> enable_if_t<is_void_v<void_t<decltype(new (declval<void*>()) T(AZStd::forward<Args>(args)...))>>, T*>
+        -> enable_if_t<AZStd::is_void_v<AZStd::void_t<decltype(new (AZStd::declval<void*>()) T(AZStd::forward<Args>(args)...))>>, T*>
     {
         return ::new (ptr) T(AZStd::forward<Args>(args)...);
     }
@@ -487,7 +487,7 @@ namespace AZStd
 {
     //! Implements the C++17 uninitialized_move function
     //! The functions accepts two input iterators and an output iterator
-    //! It performs an AZStd::move on each in in the range of the input iterator 
+    //! It performs an AZStd::move on each in in the range of the input iterator
     //! and stores the result in location pointed by the output iterator
     template <typename InputIt, typename ForwardIt>
     ForwardIt uninitialized_move(InputIt first, InputIt last, ForwardIt result)
diff --git a/Code/Legacy/CryCommon/IMovieSystem.h b/Code/Legacy/CryCommon/IMovieSystem.h
index 6cc5a06c8f..4da08d3bbf 100644
--- a/Code/Legacy/CryCommon/IMovieSystem.h
+++ b/Code/Legacy/CryCommon/IMovieSystem.h
@@ -13,6 +13,7 @@
 #include <AzCore/Math/Crc.h>
 #include <AzCore/Math/Quaternion.h>
 #include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/allocator_stateless.h>
 
 #include <Range.h>
 #include <AnimKey.h>
@@ -181,7 +182,7 @@ public:
 
 private:
     AnimParamType m_type;
-    AZStd::string m_name;
+    AZStd::basic_string<char, AZStd::char_traits<char>, AZStd::stateless_allocator> m_name;
 };
 
 namespace AZStd
@@ -617,7 +618,7 @@ public:
             , valueType(_valueType)
             , flags(_flags) {};
 
-        AZStd::string name;           // parameter name.
+        AZStd::basic_string<char, AZStd::char_traits<char>, AZStd::stateless_allocator> name;           // parameter name.
         CAnimParamType paramType;     // parameter id.
         AnimValueType valueType;       // value type, defines type of track to use for animating this parameter.
         ESupportedParamFlags flags; // combination of flags from ESupportedParamFlags.
diff --git a/Code/Legacy/CryCommon/StlUtils.h b/Code/Legacy/CryCommon/StlUtils.h
index 4aafd4dd0e..f5128a564f 100644
--- a/Code/Legacy/CryCommon/StlUtils.h
+++ b/Code/Legacy/CryCommon/StlUtils.h
@@ -13,6 +13,7 @@
 
 #include <unordered_map>
 #include <unordered_set>
+#include <AzCore/std/allocator_stateless.h>
 #include <AzCore/std/containers/unordered_map.h>
 #include <AzCore/std/containers/unordered_set.h>
 #include <AzCore/std/string/string.h>
@@ -491,6 +492,13 @@ namespace stl
         return type;
     }
 
+    //! Specialization of string to const char cast.
+    template <>
+    inline const char* constchar_cast(const AZStd::basic_string<char, AZStd::char_traits<char>, AZStd::stateless_allocator>& type)
+    {
+        return type.c_str();
+    }
+
     //! Specialization of string to const char cast.
     template <>
     inline const char* constchar_cast(const AZStd::string& type)
diff --git a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
index 472dbff5c8..e9bc1a1277 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
@@ -357,7 +357,7 @@ namespace AZ
             // Texture2DArray<float2> m_decalTextureArrayNormalMaps0;
             // Texture2DArray<float2> m_decalTextureArrayNormalMaps1;
             // Texture2DArray<float2> m_decalTextureArrayNormalMaps2;
-            static const AZStd::array<AZStd::string, DecalMapType_Num> ShaderNames = { "m_decalTextureArrayDiffuse",
+            static constexpr AZStd::array<AZStd::string_view, DecalMapType_Num> ShaderNames = { "m_decalTextureArrayDiffuse",
                                                                                        "m_decalTextureArrayNormalMaps" };
 
             for (int mapType = 0; mapType < DecalMapType_Num; ++mapType)
@@ -365,7 +365,7 @@ namespace AZ
                 for (int texArrayIdx = 0; texArrayIdx < NumTextureArrays; ++texArrayIdx)
                 {
                     const RHI::ShaderResourceGroupLayout* viewSrgLayout = RPI::RPISystemInterface::Get()->GetViewSrgLayout().get();
-                    const AZStd::string baseName = ShaderNames[mapType] + AZStd::to_string(texArrayIdx);
+                    const AZStd::string baseName = AZStd::string(ShaderNames[mapType]) + AZStd::to_string(texArrayIdx);
 
                     m_decalTextureArrayIndices[texArrayIdx][mapType] = viewSrgLayout->FindShaderInputImageIndex(Name(baseName.c_str()));
                     AZ_Warning(
diff --git a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
index c0202c7c74..6452b312c8 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
@@ -346,7 +346,7 @@ namespace AZ::Render
 
     void ProjectedShadowFeatureProcessor::CacheEsmShadowmapsPass(const AZStd::vector<RPI::RenderPipelineId>& validPipelineIds)
     {
-        static const Name LightTypeName = Name("projected");
+        const Name LightTypeName = Name("projected");
 
         const auto* passSystem = RPI::PassSystemInterface::Get();
         const AZStd::vector<RPI::Pass*> passes = passSystem->GetPassesForTemplateName(Name("EsmShadowmapsTemplate"));
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp
index c2fe16b551..2dce5d85f3 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp
@@ -16,12 +16,27 @@ namespace AZ
     {
         static const uint32_t s_minVulkanSupportedVersion = VK_API_VERSION_1_0;
 
+        static EnvironmentVariable<Instance> s_vulkanInstance;
+        static constexpr const char* s_vulkanInstanceKey = "VulkanInstance";
+
         Instance& Instance::GetInstance()
         {
-            static Instance s_instance;
-            return s_instance;
+            if (!s_vulkanInstance)
+            {
+                s_vulkanInstance = Environment::FindVariable<Instance>(s_vulkanInstanceKey);
+                if (!s_vulkanInstance)
+                {
+                    s_vulkanInstance = Environment::CreateVariable<Instance>(s_vulkanInstanceKey);
+                }
+            }
+
+            return s_vulkanInstance.Get();
         }
 
+        void Instance::Reset()
+        {
+            s_vulkanInstance.Reset();
+        }
 
         Instance::~Instance()
         {
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.h
index 40a6951c2d..efa8d36d2b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.h
@@ -34,6 +34,7 @@ namespace AZ
             };
 
             static Instance& GetInstance();
+            static void Reset();
             ~Instance();
             bool Init(const Descriptor& descriptor);
             void Shutdown();
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp
index 36e0c2b2f5..0d401003d9 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp
@@ -101,6 +101,7 @@ namespace AZ
             RHI::FactoryManagerBus::Broadcast(&RHI::FactoryManagerRequest::UnregisterFactory, this);
 
             Instance::GetInstance().Shutdown();
+            Instance::Reset();
         }
 
         Name SystemComponent::GetName()
diff --git a/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.cpp b/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.cpp
index b1e7e3ac18..1af927a7e7 100644
--- a/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.cpp
+++ b/Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.cpp
@@ -90,6 +90,9 @@ namespace AudioSystemGem
 
     AudioSystemGemSystemComponent::~AudioSystemGemSystemComponent()
     {
+        // The audio system uses the Audio::AudioSystemAllocator
+        // so it needs to be deleted before the allocator is shutdown
+        m_audioSystem.reset();
         Audio::Platform::ShutdownAudioAllocators();
     }
 
diff --git a/Gems/ImGui/Code/Source/ImGuiManager.cpp b/Gems/ImGui/Code/Source/ImGuiManager.cpp
index 6fc1ea8b71..d631e2f83e 100644
--- a/Gems/ImGui/Code/Source/ImGuiManager.cpp
+++ b/Gems/ImGui/Code/Source/ImGuiManager.cpp
@@ -15,6 +15,7 @@
 
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/std/containers/fixed_unordered_map.h>
 #include <AzFramework/Input/Buses/Requests/InputTextEntryRequestBus.h>
 #include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
 #include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
@@ -31,11 +32,11 @@ using namespace AzFramework;
 using namespace ImGui;
 
 // Wheel Delta const value.
-const constexpr uint32_t IMGUI_WHEEL_DELTA = 120; // From WinUser.h, for Linux
+static const constexpr uint32_t IMGUI_WHEEL_DELTA = 120; // From WinUser.h, for Linux
 
 // Typedef and local static map to hold LyInput->ImGui Nav mappings ( filled up in Initialize() )
-typedef AZStd::pair<AzFramework::InputChannelId, ImGuiNavInput_> LyButtonImGuiNavIndexPair;
-typedef AZStd::unordered_map<AzFramework::InputChannelId, ImGuiNavInput_> LyButtonImGuiNavIndexMap;
+using LyButtonImGuiNavIndexPair = AZStd::pair<AzFramework::InputChannelId, ImGuiNavInput_>;
+using LyButtonImGuiNavIndexMap = AZStd::fixed_unordered_map<AzFramework::InputChannelId, ImGuiNavInput_, 11, 32>;
 static LyButtonImGuiNavIndexMap s_lyInputToImGuiNavIndexMap;
 
 /**
diff --git a/Gems/LyShine/Code/Source/Animation/AnimNode.h b/Gems/LyShine/Code/Source/Animation/AnimNode.h
index 0076276204..4d139e99ca 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimNode.h
+++ b/Gems/LyShine/Code/Source/Animation/AnimNode.h
@@ -13,6 +13,7 @@
 
 #include <LyShine/Animation/IUiAnimation.h>
 #include "UiAnimationSystem.h"
+#include <AzCore/std/allocator_stateless.h>
 
 
 /*!
@@ -39,7 +40,7 @@ public:
             , valueType(_valueType)
             , flags(_flags) {};
 
-        AZStd::string name;               // parameter name.
+        AZStd::basic_string<char, AZStd::char_traits<char>, AZStd::stateless_allocator> name;               // parameter name.
         CUiAnimParamType paramType;     // parameter id.
         EUiAnimValue valueType;         // value type, defines type of track to use for animating this parameter.
         ESupportedParamFlags flags;     // combination of flags from ESupportedParamFlags.
diff --git a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
index 012eaacd1b..cab6ae3fa6 100644
--- a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
+++ b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
@@ -14,9 +14,11 @@
 #include "UiAnimSerialize.h"
 
 #include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/std/allocator_stateless.h>
+#include <AzCore/std/containers/map.h>
+#include <AzCore/std/containers/unordered_map.h>
 #include <StlUtils.h>
 
-#include <StaticInstance.h>
 #include <ISystem.h>
 #include <ILog.h>
 #include <IConsole.h>
@@ -25,22 +27,31 @@
 #include <IViewSystem.h>
 
 //////////////////////////////////////////////////////////////////////////
-// Serialization for anim nodes & param types
-#define REGISTER_NODE_TYPE(name) assert(g_animNodeEnumToStringMap.find(eUiAnimNodeType_ ## name) == g_animNodeEnumToStringMap.end()); \
-    g_animNodeEnumToStringMap[eUiAnimNodeType_ ## name] = AZ_STRINGIZE(name);                                                            \
-    g_animNodeStringToEnumMap[AZStd::string(AZ_STRINGIZE(name))] = eUiAnimNodeType_ ## name;
+namespace
+{
+    using UiAnimParamSystemString = AZStd::basic_string<char, AZStd::char_traits<char>, AZStd::stateless_allocator>;
 
-#define REGISTER_PARAM_TYPE(name) assert(g_animParamEnumToStringMap.find(eUiAnimParamType_ ## name) == g_animParamEnumToStringMap.end()); \
+    template <typename KeyType, typename MappedType, typename Compare = AZStd::less<KeyType>>
+    using UiAnimSystemOrderedMap = AZStd::map<KeyType, MappedType, Compare, AZStd::stateless_allocator>;
+    template <typename KeyType, typename MappedType, typename Hasher = AZStd::hash<KeyType>, typename EqualKey = AZStd::equal_to<KeyType>>
+    using UiAnimSystemUnorderedMap = AZStd::unordered_map<KeyType, MappedType, Hasher, EqualKey, AZStd::stateless_allocator>;
+}
+// Serialization for anim nodes & param types
+#define REGISTER_NODE_TYPE(name) assert(g_animNodeEnumToStringMap.contains(eUiAnimNodeType_ ## name)); \
+    g_animNodeEnumToStringMap[eUiAnimNodeType_ ## name] = AZ_STRINGIZE(name);                                                            \
+    g_animNodeStringToEnumMap[UiAnimParamSystemString(AZ_STRINGIZE(name))] = eUiAnimNodeType_ ## name;
+
+#define REGISTER_PARAM_TYPE(name) assert(g_animParamEnumToStringMap.contains(eUiAnimParamType_ ## name)); \
     g_animParamEnumToStringMap[eUiAnimParamType_ ## name] = AZ_STRINGIZE(name);                                                              \
-    g_animParamStringToEnumMap[AZStd::string(AZ_STRINGIZE(name))] = eUiAnimParamType_ ## name;
+    g_animParamStringToEnumMap[UiAnimParamSystemString(AZ_STRINGIZE(name))] = eUiAnimParamType_ ## name;
 
 namespace
 {
-    AZStd::unordered_map<int, AZStd::string> g_animNodeEnumToStringMap;
-    StaticInstance<std::map<AZStd::string, EUiAnimNodeType, stl::less_stricmp<AZStd::string> >> g_animNodeStringToEnumMap;
+    UiAnimSystemUnorderedMap<int, UiAnimParamSystemString> g_animNodeEnumToStringMap;
+    UiAnimSystemOrderedMap<UiAnimParamSystemString, EUiAnimNodeType, stl::less_stricmp<UiAnimParamSystemString>> g_animNodeStringToEnumMap;
 
-    AZStd::unordered_map<int, AZStd::string> g_animParamEnumToStringMap;
-    StaticInstance<std::map<AZStd::string, EUiAnimParamType, stl::less_stricmp<AZStd::string> >> g_animParamStringToEnumMap;
+    UiAnimSystemUnorderedMap<int, UiAnimParamSystemString> g_animParamEnumToStringMap;
+    UiAnimSystemOrderedMap<UiAnimParamSystemString, EUiAnimParamType, stl::less_stricmp<UiAnimParamSystemString>> g_animParamStringToEnumMap;
 
     // If you get an assert in this function, it means two node types have the same enum value.
     void RegisterNodeTypes()
diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp
index 7e32301b71..b535033351 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp
@@ -8,6 +8,7 @@
 
 
 #include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/allocator_stateless.h>
 #include "AnimPostFXNode.h"
 #include "AnimSplineTrack.h"
 #include "CompoundSplineTrack.h"
@@ -38,7 +39,7 @@ public:
         virtual void GetDefault(bool& val) const = 0;
         virtual void GetDefault(Vec4& val) const = 0;
 
-        AZStd::string m_name;
+        AZStd::basic_string<char, AZStd::char_traits<char>, AZStd::stateless_allocator> m_name;
 
     protected:
         virtual ~CControlParamBase(){}
diff --git a/Gems/Maestro/Code/Source/Cinematics/Movie.cpp b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp
index 3654af52dd..9c4356560d 100644
--- a/Gems/Maestro/Code/Source/Cinematics/Movie.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp
@@ -8,6 +8,9 @@
 
 
 #include <AzCore/Component/Entity.h>
+#include <AzCore/std/allocator_stateless.h>
+#include <AzCore/std/containers/map.h>
+#include <AzCore/std/containers/unordered_map.h>
 #include <AzFramework/Components/CameraBus.h>
 #include <Maestro/Bus/SequenceComponentBus.h>
 #include "Movie.h"
@@ -73,22 +76,32 @@ static SMovieSequenceAutoComplete s_movieSequenceAutoComplete;
 #endif
 
 //////////////////////////////////////////////////////////////////////////
-// Serialization for anim nodes & param types
-#define REGISTER_NODE_TYPE(name) assert(g_animNodeEnumToStringMap.find(AnimNodeType::name) == g_animNodeEnumToStringMap.end()); \
-    g_animNodeEnumToStringMap[AnimNodeType::name] = AZ_STRINGIZE(name);                                                         \
-    g_animNodeStringToEnumMap[AZStd::string(AZ_STRINGIZE(name))] = AnimNodeType::name;
+namespace
+{
+    using AnimParamSystemString = AZStd::basic_string<char, AZStd::char_traits<char>, AZStd::stateless_allocator>;
 
-#define REGISTER_PARAM_TYPE(name) assert(g_animParamEnumToStringMap.find(AnimParamType::name) == g_animParamEnumToStringMap.end()); \
-    g_animParamEnumToStringMap[AnimParamType::name] = AZ_STRINGIZE(name);                                                           \
-    g_animParamStringToEnumMap[AZStd::string(AZ_STRINGIZE(name))] = AnimParamType::name;
+    template <typename KeyType, typename MappedType, typename Compare = AZStd::less<KeyType>>
+    using AnimSystemOrderedMap = AZStd::map<KeyType, MappedType, Compare, AZStd::stateless_allocator>;
+    template <typename KeyType, typename MappedType, typename Hasher = AZStd::hash<KeyType>, typename EqualKey = AZStd::equal_to<KeyType>>
+    using AnimSystemUnorderedMap = AZStd::unordered_map<KeyType, MappedType, Hasher, EqualKey, AZStd::stateless_allocator>;
+}
+
+// Serialization for anim nodes & param types
+#define REGISTER_NODE_TYPE(name) assert(g_animNodeEnumToStringMap.contains(AnimNodeType::name)); \
+    g_animNodeEnumToStringMap[AnimNodeType::name] = AZ_STRINGIZE(name);                          \
+    g_animNodeStringToEnumMap[AnimParamSystemString(AZ_STRINGIZE(name))] = AnimNodeType::name;
+
+#define REGISTER_PARAM_TYPE(name) assert(g_animParamEnumToStringMap.contains(AnimParamType::name)); \
+    g_animParamEnumToStringMap[AnimParamType::name] = AZ_STRINGIZE(name);                           \
+    g_animParamStringToEnumMap[AnimParamSystemString(AZ_STRINGIZE(name))] = AnimParamType::name;
 
 namespace
 {
-    AZStd::unordered_map<AnimNodeType, AZStd::string> g_animNodeEnumToStringMap;
-    StaticInstance<std::map<AZStd::string, AnimNodeType, stl::less_stricmp<AZStd::string> >> g_animNodeStringToEnumMap;
+    AnimSystemUnorderedMap<AnimNodeType, AnimParamSystemString> g_animNodeEnumToStringMap;
+    AnimSystemOrderedMap<AnimParamSystemString, AnimNodeType, stl::less_stricmp<AnimParamSystemString>> g_animNodeStringToEnumMap;
 
-    AZStd::unordered_map<AnimParamType, AZStd::string> g_animParamEnumToStringMap;
-    StaticInstance<std::map<AZStd::string, AnimParamType, stl::less_stricmp<AZStd::string> >> g_animParamStringToEnumMap;
+    AnimSystemUnorderedMap<AnimParamType, AnimParamSystemString> g_animParamEnumToStringMap;
+    AnimSystemOrderedMap<AnimParamSystemString, AnimParamType, stl::less_stricmp<AnimParamSystemString>> g_animParamStringToEnumMap;
 
     // If you get an assert in this function, it means two node types have the same enum value.
     void RegisterNodeTypes()

From b6a1f62dec2c248606905bdc931ee4d795c148c2 Mon Sep 17 00:00:00 2001
From: Benjamin Jillich <43751992+amzn-jillich@users.noreply.github.com>
Date: Wed, 13 Oct 2021 18:20:48 +0200
Subject: [PATCH 25/29] EMotion FX: Fix for broken workspaces after asset path
 change (#4662)

Some days ago an impactful change deprecated @assets@ and @root@ keywords from paths which our workspaces used. Some workspaces used these and were broken. This change makes them backward compatible and loads the assets correctly again. It also auto fixes broken paths that were present in some of the saved workspaces + making sure new workspaces are saved correctly.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
---
 .../EMotionStudio/EMStudioSDK/Source/Workspace.cpp   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.cpp
index ea7c92b742..cada8c7f59 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Workspace.cpp
@@ -105,7 +105,9 @@ namespace EMStudio
             }
         }
 
-        commandString = AZStd::string::format("%s -filename \"%s\"", command, resultFileName.c_str());
+        AZStd::string resultFilenameString = resultFileName.c_str();
+        AzFramework::StringFunc::AssetDatabasePath::Normalize(resultFilenameString);
+        commandString = AZStd::string::format("%s -filename \"%s\"", command, resultFilenameString.c_str());
 
         if (additionalParameters)
         {
@@ -428,7 +430,13 @@ namespace EMStudio
                 continue;
             }
 
-            AzFramework::StringFunc::Replace(commands[i], "@products@/", assetCacheFolder.c_str(), true /* case sensitive */);
+            AzFramework::StringFunc::Replace(commands[i], "@products@", assetCacheFolder.c_str());
+            AzFramework::StringFunc::Replace(commands[i], "@assets@", assetCacheFolder.c_str());
+            AzFramework::StringFunc::Replace(commands[i], "@root@", assetCacheFolder.c_str());
+            AzFramework::StringFunc::Replace(commands[i], "@projectplatformcache@", assetCacheFolder.c_str());
+            AzFramework::StringFunc::Replace(commands[i], "//", AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING);
+            AzFramework::StringFunc::Replace(commands[i], "\\\\", AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING);
+            AzFramework::StringFunc::Replace(commands[i], "/\\", AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING);
 
             // add the command to the command group
             commandGroup->AddCommandString(commands[i]);

From 150060441eccb98318febe17d3915f0781823b19 Mon Sep 17 00:00:00 2001
From: jromnoa <80134229+jromnoa@users.noreply.github.com>
Date: Wed, 13 Oct 2021 09:50:44 -0700
Subject: [PATCH 26/29] Re-add pytest.mark.test_case_id markers (#4621)

* add some test case id markers

Signed-off-by: jromnoa <jromnoa@amazon.com>

* re-added pytest.mark.test_case_id markers for test cases

Signed-off-by: jromnoa <jromnoa@amazon.com>

* re-add directional light log lines that were missing and re-add directional light test case id

Signed-off-by: jromnoa <jromnoa@amazon.com>
---
 .../Gem/PythonTests/Atom/TestSuite_Main.py    | 44 ++++++++++++++-----
 .../PythonTests/Atom/TestSuite_Main_GPU.py    |  4 ++
 .../Atom/TestSuite_Main_GPU_Optimized.py      |  1 +
 .../Gem/PythonTests/Atom/TestSuite_Sandbox.py |  1 +
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py
index e4a77ca4ec..3403c938a8 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py
@@ -23,20 +23,20 @@ TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "tests")
 class TestAtomEditorComponentsMain(object):
     """Holds tests for Atom components."""
 
+    @pytest.mark.test_case_id("C32078118")  # Decal
+    @pytest.mark.test_case_id("C32078119")  # DepthOfField
+    @pytest.mark.test_case_id("C32078120")  # Directional Light
+    @pytest.mark.test_case_id("C32078121")  # Exposure Control
+    @pytest.mark.test_case_id("C32078115")  # Global Skylight (IBL)
+    @pytest.mark.test_case_id("C32078125")  # Physical Sky
+    @pytest.mark.test_case_id("C32078127")  # PostFX Layer
+    @pytest.mark.test_case_id("C32078131")  # PostFX Radius Weight Modifier
+    @pytest.mark.test_case_id("C32078117")  # Light
+    @pytest.mark.test_case_id("C36525660")  # Display Mapper
     def test_AtomEditorComponents_AddedToEntity(self, request, editor, level, workspace, project, launcher_platform):
         """
         Please review the hydra script run by this test for more specific test info.
-        Tests the following Atom components and verifies all "expected_lines" appear in Editor.log:
-        1. Display Mapper
-        2. Light
-        3. PostFX Radius Weight Modifier
-        4. PostFX Layer
-        5. Physical Sky
-        6. Global Skylight (IBL)
-        7. Exposure Control
-        8. Directional Light
-        9. DepthOfField
-        10. Decal
+        Tests the Atom components & verifies all "expected_lines" appear in Editor.log
         """
         cfg_args = [level]
 
@@ -69,6 +69,18 @@ class TestAtomEditorComponentsMain(object):
             "DepthOfField_test: Entity deleted: True",
             "DepthOfField_test: UNDO entity deletion works: True",
             "DepthOfField_test: REDO entity deletion works: True",
+            # Directional Light Component
+            "Directional Light Entity successfully created",
+            "Directional Light_test: Component added to the entity: True",
+            "Directional Light_test: Component removed after UNDO: True",
+            "Directional Light_test: Component added after REDO: True",
+            "Directional Light_test: Entered game mode: True",
+            "Directional Light_test: Exit game mode: True",
+            "Directional Light_test: Entity is hidden: True",
+            "Directional Light_test: Entity is shown: True",
+            "Directional Light_test: Entity deleted: True",
+            "Directional Light_test: UNDO entity deletion works: True",
+            "Directional Light_test: REDO entity deletion works: True",
             # Exposure Control Component
             "Exposure Control Entity successfully created",
             "Exposure Control_test: Component added to the entity: True",
@@ -180,6 +192,7 @@ class TestAtomEditorComponentsMain(object):
             cfg_args=cfg_args,
         )
 
+    @pytest.mark.test_case_id("C34525095")
     def test_AtomEditorComponents_LightComponent(
             self, request, editor, workspace, project, launcher_platform, level):
         """
@@ -266,6 +279,15 @@ class TestMaterialEditorBasicTests(object):
         request.addfinalizer(teardown)
 
     @pytest.mark.parametrize("exe_file_name", ["MaterialEditor"])
+    @pytest.mark.test_case_id("C34448113")  # Creating a New Asset.
+    @pytest.mark.test_case_id("C34448114")  # Opening an Existing Asset.
+    @pytest.mark.test_case_id("C34448115")  # Closing Selected Material.
+    @pytest.mark.test_case_id("C34448116")  # Closing All Materials.
+    @pytest.mark.test_case_id("C34448117")  # Closing all but Selected Material.
+    @pytest.mark.test_case_id("C34448118")  # Saving Material.
+    @pytest.mark.test_case_id("C34448119")  # Saving as a New Material.
+    @pytest.mark.test_case_id("C34448120")  # Saving as a Child Material.
+    @pytest.mark.test_case_id("C34448121")  # Saving all Open Materials.
     def test_MaterialEditorBasicTests(
             self, request, workspace, project, launcher_platform, generic_launcher, exe_file_name):
 
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py
index 220623af8b..74b064a555 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py
@@ -73,6 +73,7 @@ def create_screenshots_archive(screenshot_path):
 class TestAllComponentsIndepthTests(object):
 
     @pytest.mark.parametrize("screenshot_name", ["AtomBasicLevelSetup.ppm"])
+    @pytest.mark.test_case_id("C34603773")
     def test_BasicLevelSetup_SetsUpLevel(
             self, request, editor, workspace, project, launcher_platform, level, screenshot_name):
         """
@@ -115,6 +116,7 @@ class TestAllComponentsIndepthTests(object):
 
         create_screenshots_archive(screenshot_directory)
 
+    @pytest.mark.test_case_id("C34525095")
     def test_LightComponent_ScreenshotMatchesGoldenImage(
             self, request, editor, workspace, project, launcher_platform, level):
         """
@@ -225,6 +227,8 @@ class TestMaterialEditor(object):
         pytest.param("-rhi=Vulkan", ["Registering vulkan RHI"])
     ])
     @pytest.mark.parametrize("exe_file_name", ["MaterialEditor"])
+    @pytest.mark.test_case_id("C30973986")  # Material Editor Launching in Dx12
+    @pytest.mark.test_case_id("C30973987")  # Material Editor Launching in Vulkan
     def test_MaterialEditorLaunch_AllRHIOptionsSucceed(
             self, request, workspace, project, launcher_platform, generic_launcher, exe_file_name, cfg_args,
             expected_lines):
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py
index ef572d6e5c..568768e12e 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py
@@ -23,6 +23,7 @@ class TestAutomation(EditorTestSuite):
     # Remove -autotest_mode from global_extra_cmdline_args since we need rendering for these tests.
     global_extra_cmdline_args = ["-BatchMode"]  # Default is ["-BatchMode", "-autotest_mode"]
 
+    @pytest.mark.test_case_id("C34603773")
     class AtomGPU_BasicLevelSetup_SetsUpLevel(EditorSharedTest):
         use_null_renderer = False  # Default is True
         screenshot_name = "AtomBasicLevelSetup.ppm"
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py
index 79caf26784..58e5d00ff2 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py
@@ -30,6 +30,7 @@ class TestAtomEditorComponentsSandbox(object):
     class TestAtomEditorComponentsMain(object):
         """Holds tests for Atom components."""
 
+        @pytest.mark.test_case_id("C32078128")
         def test_AtomEditorComponents_ReflectionProbeAddedToEntity(
                 self, request, editor, level, workspace, project, launcher_platform):
             """

From 26d53690b95dfec555b1caf8c6df6b3c239b6835 Mon Sep 17 00:00:00 2001
From: Junbo Liang <68558268+junbo75@users.noreply.github.com>
Date: Wed, 13 Oct 2021 11:34:13 -0700
Subject: [PATCH 27/29] [GameLift][FlexMatch] Add client side change for match
 acceptance (#4634)

* [GameLift][FlexMatch] Add client side change for match acceptance required

Signed-off-by: Junbo Liang <junbo@amazon.com>
---
 .../AWSGameLiftClientLocalTicketTracker.cpp   |   2 +
 .../Source/AWSGameLiftClientManager.cpp       |  46 +++++++-
 .../Source/AWSGameLiftClientManager.h         |   2 +
 .../AWSGameLiftAcceptMatchActivity.cpp        |  76 +++++++++++++
 .../Activity/AWSGameLiftAcceptMatchActivity.h |  31 ++++++
 .../AWSGameLiftStartMatchmakingActivity.cpp   |   4 +
 .../AWSGameLiftStartMatchmakingActivity.h     |   3 -
 .../AWSGameLiftStopMatchmakingActivity.cpp    |   3 +
 .../AWSGameLiftStopMatchmakingActivity.h      |   3 -
 ...WSGameLiftClientLocalTicketTrackerTest.cpp |  38 +++++++
 .../Tests/AWSGameLiftClientManagerTest.cpp    | 104 ++++++++++++++++++
 .../Tests/AWSGameLiftClientMocks.h            |  21 ++++
 .../AWSGameLiftAcceptMatchActivityTest.cpp    |  77 +++++++++++++
 ...WSGameLiftStartMatchmakingActivityTest.cpp |   2 +
 ...AWSGameLiftStopMatchmakingActivityTest.cpp |   2 +
 .../awsgamelift_client_files.cmake            |   2 +
 .../awsgamelift_client_tests_files.cmake      |   1 +
 17 files changed, 409 insertions(+), 8 deletions(-)
 create mode 100644 Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.cpp
 create mode 100644 Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.h
 create mode 100644 Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftAcceptMatchActivityTest.cpp

diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.cpp
index b619a10d4a..af0cf1c35c 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.cpp
@@ -10,6 +10,7 @@
 #include <AzCore/std/bind/bind.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzFramework/Session/ISessionHandlingRequests.h>
+#include <AzFramework/Matchmaking/MatchmakingNotifications.h>
 
 #include <AWSGameLiftClientLocalTicketTracker.h>
 #include <AWSGameLiftSessionConstants.h>
@@ -109,6 +110,7 @@ namespace AWSGameLift
                         else if (ticket.GetStatus() == Aws::GameLift::Model::MatchmakingConfigurationStatus::REQUIRES_ACCEPTANCE)
                         {
                             // broadcast acceptance requires to player
+                            AzFramework::MatchAcceptanceNotificationBus::Broadcast(&AzFramework::MatchAcceptanceNotifications::OnMatchAcceptance);
                         }
                         else
                         {
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.cpp
index 91e76380eb..224f16481e 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.cpp
@@ -18,6 +18,7 @@
 
 #include <AWSGameLiftClientManager.h>
 #include <AWSGameLiftSessionConstants.h>
+#include <Activity/AWSGameLiftAcceptMatchActivity.h>
 #include <Activity/AWSGameLiftCreateSessionActivity.h>
 #include <Activity/AWSGameLiftCreateSessionOnQueueActivity.h>
 #include <Activity/AWSGameLiftJoinSessionActivity.h>
@@ -125,12 +126,53 @@ namespace AWSGameLift
 
     void AWSGameLiftClientManager::AcceptMatch(const AzFramework::AcceptMatchRequest& acceptMatchRequest)
     {
-        AZ_UNUSED(acceptMatchRequest);
+        if (AcceptMatchActivity::ValidateAcceptMatchRequest(acceptMatchRequest))
+        {
+            const AWSGameLiftAcceptMatchRequest& gameliftStartMatchmakingRequest =
+                static_cast<const AWSGameLiftAcceptMatchRequest&>(acceptMatchRequest);
+            AcceptMatchHelper(gameliftStartMatchmakingRequest);
+        }
     }
 
     void AWSGameLiftClientManager::AcceptMatchAsync(const AzFramework::AcceptMatchRequest& acceptMatchRequest)
     {
-        AZ_UNUSED(acceptMatchRequest);
+        if (!AcceptMatchActivity::ValidateAcceptMatchRequest(acceptMatchRequest))
+        {
+            AzFramework::MatchmakingAsyncRequestNotificationBus::Broadcast(
+                &AzFramework::MatchmakingAsyncRequestNotifications::OnAcceptMatchAsyncComplete);
+            return;
+        }
+
+        const AWSGameLiftAcceptMatchRequest& gameliftStartMatchmakingRequest = static_cast<const AWSGameLiftAcceptMatchRequest&>(acceptMatchRequest);
+
+        AZ::JobContext* jobContext = nullptr;
+        AWSCore::AWSCoreRequestBus::BroadcastResult(jobContext, &AWSCore::AWSCoreRequests::GetDefaultJobContext);
+        AZ::Job* acceptMatchJob = AZ::CreateJobFunction(
+            [this, gameliftStartMatchmakingRequest]()
+            {
+                AcceptMatchHelper(gameliftStartMatchmakingRequest);
+
+                AzFramework::MatchmakingAsyncRequestNotificationBus::Broadcast(
+                    &AzFramework::MatchmakingAsyncRequestNotifications::OnAcceptMatchAsyncComplete);
+            },
+            true, jobContext);
+
+        acceptMatchJob->Start(); 
+    }
+
+    void AWSGameLiftClientManager::AcceptMatchHelper(const AWSGameLiftAcceptMatchRequest& acceptMatchRequest)
+    {
+        auto gameliftClient = AZ::Interface<IAWSGameLiftInternalRequests>::Get()->GetGameLiftClient();
+
+        AZStd::string response;
+        if (!gameliftClient)
+        {
+            AZ_Error(AWSGameLiftClientManagerName, false, AWSGameLiftClientMissingErrorMessage);
+        }
+        else
+        {
+            AcceptMatchActivity::AcceptMatch(*gameliftClient, acceptMatchRequest);
+        }
     }
 
     AZStd::string AWSGameLiftClientManager::CreateSession(const AzFramework::CreateSessionRequest& createSessionRequest)
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.h
index ba81196b07..1f32b69f75 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientManager.h
@@ -15,6 +15,7 @@
 
 namespace AWSGameLift
 {
+    struct AWSGameLiftAcceptMatchRequest;
     struct AWSGameLiftCreateSessionRequest;
     struct AWSGameLiftCreateSessionOnQueueRequest;
     struct AWSGameLiftJoinSessionRequest;
@@ -158,6 +159,7 @@ namespace AWSGameLift
         void LeaveSession() override;
 
     private:
+        void AcceptMatchHelper(const AWSGameLiftAcceptMatchRequest& createSessionRequest);
         AZStd::string CreateSessionHelper(const AWSGameLiftCreateSessionRequest& createSessionRequest);
         AZStd::string CreateSessionOnQueueHelper(const AWSGameLiftCreateSessionOnQueueRequest& createSessionOnQueueRequest);
         bool JoinSessionHelper(const AWSGameLiftJoinSessionRequest& joinSessionRequest);
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.cpp
new file mode 100644
index 0000000000..25ba328fd0
--- /dev/null
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.AcceptMatch
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/Interface/Interface.h>
+
+#include <Activity/AWSGameLiftAcceptMatchActivity.h>
+#include <AWSGameLiftSessionConstants.h>
+
+#include <aws/core/utils/Outcome.h>
+#include <aws/gamelift/model/AcceptMatchRequest.h>
+
+namespace AWSGameLift
+{
+    namespace AcceptMatchActivity
+    {
+        Aws::GameLift::Model::AcceptMatchRequest BuildAWSGameLiftAcceptMatchRequest(
+            const AWSGameLiftAcceptMatchRequest& acceptMatchRequest)
+        {
+            Aws::GameLift::Model::AcceptMatchRequest request;
+            request.SetAcceptanceType(acceptMatchRequest.m_acceptMatch ?
+                Aws::GameLift::Model::AcceptanceType::ACCEPT : Aws::GameLift::Model::AcceptanceType::REJECT);
+
+            Aws::Vector<Aws::String> playerIds;
+            for (const AZStd::string& playerId : acceptMatchRequest.m_playerIds)
+            {
+                playerIds.emplace_back(playerId.c_str());
+            }
+            request.SetPlayerIds(playerIds);
+
+            if (!acceptMatchRequest.m_ticketId.empty())
+            {
+                request.SetTicketId(acceptMatchRequest.m_ticketId.c_str());
+            }
+
+            AZ_TracePrintf(AWSGameLiftAcceptMatchActivityName, "Built AcceptMatchRequest with TicketId=%s", request.GetTicketId().c_str());
+
+            return request;
+        }
+
+        void AcceptMatch(const Aws::GameLift::GameLiftClient& gameliftClient,
+            const AWSGameLiftAcceptMatchRequest& AcceptMatchRequest)
+        {
+            AZ_TracePrintf(AWSGameLiftAcceptMatchActivityName, "Requesting AcceptMatch against Amazon GameLift service ...");
+
+            Aws::GameLift::Model::AcceptMatchRequest request = BuildAWSGameLiftAcceptMatchRequest(AcceptMatchRequest);
+            auto AcceptMatchOutcome = gameliftClient.AcceptMatch(request);
+
+            if (AcceptMatchOutcome.IsSuccess())
+            {
+                AZ_TracePrintf(AWSGameLiftAcceptMatchActivityName, "AcceptMatch request against Amazon GameLift service is complete");
+            }
+            else
+            {
+                AZ_Error(AWSGameLiftAcceptMatchActivityName, false, AWSGameLiftErrorMessageTemplate,
+                    AcceptMatchOutcome.GetError().GetExceptionName().c_str(), AcceptMatchOutcome.GetError().GetMessage().c_str());
+            }
+        }
+
+        bool ValidateAcceptMatchRequest(const AzFramework::AcceptMatchRequest& AcceptMatchRequest)
+        {
+            auto gameliftAcceptMatchRequest = azrtti_cast<const AWSGameLiftAcceptMatchRequest*>(&AcceptMatchRequest);
+            bool isValid = gameliftAcceptMatchRequest &&
+                (gameliftAcceptMatchRequest->m_playerIds.size() > 0) &&
+                (!gameliftAcceptMatchRequest->m_ticketId.empty());
+
+            AZ_Error(AWSGameLiftAcceptMatchActivityName, isValid, AWSGameLiftAcceptMatchRequestInvalidErrorMessage);
+
+            return isValid;
+        }
+    } // namespace AcceptMatchActivity
+} // namespace AWSGameLift
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.h
new file mode 100644
index 0000000000..d5f28f92e2
--- /dev/null
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftAcceptMatchActivity.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <Request/AWSGameLiftAcceptMatchRequest.h>
+
+#include <aws/gamelift/GameLiftClient.h>
+
+namespace AWSGameLift
+{
+    namespace AcceptMatchActivity
+    {
+        static constexpr const char AWSGameLiftAcceptMatchActivityName[] = "AWSGameLiftAcceptMatchActivity";
+        static constexpr const char AWSGameLiftAcceptMatchRequestInvalidErrorMessage[] = "Invalid GameLift AcceptMatch request.";
+
+        // Build AWS GameLift AcceptMatchRequest by using AWSGameLiftAcceptMatchRequest
+        Aws::GameLift::Model::AcceptMatchRequest BuildAWSGameLiftAcceptMatchRequest(const AWSGameLiftAcceptMatchRequest& AcceptMatchRequest);
+
+        // Create AcceptMatchRequest and make a AcceptMatch call through GameLift client
+        void AcceptMatch(const Aws::GameLift::GameLiftClient& gameliftClient, const AWSGameLiftAcceptMatchRequest& AcceptMatchRequest);
+
+        // Validate AcceptMatchRequest and check required request parameters
+        bool ValidateAcceptMatchRequest(const AzFramework::AcceptMatchRequest& AcceptMatchRequest);
+    } // namespace AcceptMatchActivity
+} // namespace AWSGameLift
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.cpp
index 2b2a32f74b..e535ea0c55 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.cpp
@@ -5,12 +5,16 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
+
 #include <AzCore/Interface/Interface.h>
 
 #include <Activity/AWSGameLiftActivityUtils.h>
 #include <Activity/AWSGameLiftStartMatchmakingActivity.h>
 #include <AWSGameLiftSessionConstants.h>
 
+#include <aws/core/utils/Outcome.h>
+#include <aws/gamelift/model/StartMatchmakingRequest.h>
+
 namespace AWSGameLift
 {
     namespace StartMatchmakingActivity
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.h
index 5f8c4558f4..db814c14b2 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStartMatchmakingActivity.h
@@ -10,9 +10,7 @@
 
 #include <Request/AWSGameLiftStartMatchmakingRequest.h>
 
-#include <aws/core/utils/Outcome.h>
 #include <aws/gamelift/GameLiftClient.h>
-#include <aws/gamelift/model/StartMatchmakingRequest.h>
 
 namespace AWSGameLift
 {
@@ -25,7 +23,6 @@ namespace AWSGameLift
         Aws::GameLift::Model::StartMatchmakingRequest BuildAWSGameLiftStartMatchmakingRequest(const AWSGameLiftStartMatchmakingRequest& startMatchmakingRequest);
 
         // Create StartMatchmakingRequest and make a StartMatchmaking call through GameLift client
-        // Will also start polling the matchmaking ticket when get success outcome from GameLift client
         AZStd::string StartMatchmaking(const Aws::GameLift::GameLiftClient& gameliftClient, const AWSGameLiftStartMatchmakingRequest& startMatchmakingRequest);
 
         // Validate StartMatchmakingRequest and check required request parameters
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.cpp
index 204923fc02..b427d0323a 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.cpp
@@ -11,6 +11,9 @@
 #include <Activity/AWSGameLiftStopMatchmakingActivity.h>
 #include <AWSGameLiftSessionConstants.h>
 
+#include <aws/core/utils/Outcome.h>
+#include <aws/gamelift/model/StopMatchmakingRequest.h>
+
 namespace AWSGameLift
 {
     namespace StopMatchmakingActivity
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.h
index 9bfeb86343..0820f2c05e 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/Activity/AWSGameLiftStopMatchmakingActivity.h
@@ -10,9 +10,7 @@
 
 #include <Request/AWSGameLiftStopMatchmakingRequest.h>
 
-#include <aws/core/utils/Outcome.h>
 #include <aws/gamelift/GameLiftClient.h>
-#include <aws/gamelift/model/StopMatchmakingRequest.h>
 
 namespace AWSGameLift
 {
@@ -25,7 +23,6 @@ namespace AWSGameLift
         Aws::GameLift::Model::StopMatchmakingRequest BuildAWSGameLiftStopMatchmakingRequest(const AWSGameLiftStopMatchmakingRequest& stopMatchmakingRequest);
 
         // Create StopMatchmakingRequest and make a StopMatchmaking call through GameLift client
-        // Will also stop polling the matchmaking ticket when get success outcome from GameLift client
         void StopMatchmaking(const Aws::GameLift::GameLiftClient& gameliftClient, const AWSGameLiftStopMatchmakingRequest& stopMatchmakingRequest);
 
         // Validate StopMatchmakingRequest and check required request parameters
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientLocalTicketTrackerTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientLocalTicketTrackerTest.cpp
index 6506d70704..4dc4dd85f6 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientLocalTicketTrackerTest.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientLocalTicketTrackerTest.cpp
@@ -351,3 +351,41 @@ TEST_F(AWSGameLiftClientLocalTicketTrackerTest, StartPolling_CallAndTicketComple
     WaitForProcessFinish();
     ASSERT_TRUE(m_gameliftClientTicketTracker->IsTrackerIdle());
 }
+
+TEST_F(AWSGameLiftClientLocalTicketTrackerTest, StartPolling_RequiresAcceptanceAndTicketCompleteAtLast_ProcessContinuesAndStop)
+{
+    Aws::GameLift::Model::MatchmakingTicket ticket1;
+    ticket1.SetStatus(Aws::GameLift::Model::MatchmakingConfigurationStatus::REQUIRES_ACCEPTANCE);
+
+    Aws::GameLift::Model::DescribeMatchmakingResult result1;
+    result1.AddTicketList(ticket1);
+    Aws::GameLift::Model::DescribeMatchmakingOutcome outcome1(result1);
+
+    Aws::GameLift::Model::GameSessionConnectionInfo connectionInfo;
+    connectionInfo.SetIpAddress("DummyIpAddress");
+    connectionInfo.SetPort(123);
+    connectionInfo.AddMatchedPlayerSessions(
+        Aws::GameLift::Model::MatchedPlayerSession().WithPlayerId("player1").WithPlayerSessionId("playersession1"));
+
+    Aws::GameLift::Model::MatchmakingTicket ticket2;
+    ticket2.SetStatus(Aws::GameLift::Model::MatchmakingConfigurationStatus::COMPLETED);
+    ticket2.SetGameSessionConnectionInfo(connectionInfo);
+
+    Aws::GameLift::Model::DescribeMatchmakingResult result2;
+    result2.AddTicketList(ticket2);
+    Aws::GameLift::Model::DescribeMatchmakingOutcome outcome2(result2);
+
+    EXPECT_CALL(*m_gameliftClientMockPtr, DescribeMatchmaking(::testing::_))
+        .WillOnce(::testing::Return(outcome1))
+        .WillOnce(::testing::Return(outcome2));
+
+    MatchAcceptanceNotificationsHandlerMock handlerMock1;
+    EXPECT_CALL(handlerMock1, OnMatchAcceptance()).Times(1);
+
+    SessionHandlingClientRequestsMock handlerMock2;
+    EXPECT_CALL(handlerMock2, RequestPlayerJoinSession(::testing::_)).Times(1).WillOnce(::testing::Return(true));
+
+    m_gameliftClientTicketTracker->StartPolling("ticket1", "player1");
+    WaitForProcessFinish();
+    ASSERT_TRUE(m_gameliftClientTicketTracker->IsTrackerIdle());
+}
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientManagerTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientManagerTest.cpp
index 2fa332df72..3b7c7ee827 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientManagerTest.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientManagerTest.cpp
@@ -19,6 +19,7 @@
 #include <AWSGameLiftClientManager.h>
 #include <AWSGameLiftClientMocks.h>
 
+#include <Request/AWSGameLiftAcceptMatchRequest.h>
 #include <Request/AWSGameLiftCreateSessionOnQueueRequest.h>
 #include <Request/AWSGameLiftCreateSessionRequest.h>
 #include <Request/AWSGameLiftJoinSessionRequest.h>
@@ -1005,3 +1006,106 @@ TEST_F(AWSGameLiftClientManagerTest, StopMatchmakingAsync_CallWithValidRequest_G
     m_gameliftClientManager->StopMatchmakingAsync(request);
     AZ_TEST_STOP_TRACE_SUPPRESSION(1); // capture 1 error message
 }
+
+TEST_F(AWSGameLiftClientManagerTest, AcceptMatch_CallWithoutClientSetup_GetError)
+{
+    AZ_TEST_START_TRACE_SUPPRESSION;
+    m_gameliftClientManager->ConfigureGameLiftClient("");
+    AWSGameLiftAcceptMatchRequest request;
+    request.m_acceptMatch = true;
+    request.m_playerIds = { DummyPlayerId };
+    request.m_ticketId = DummyMatchmakingTicketId;
+
+    m_gameliftClientManager->AcceptMatch(request);
+    AZ_TEST_STOP_TRACE_SUPPRESSION(2); // capture 2 error message
+}
+TEST_F(AWSGameLiftClientManagerTest, AcceptMatch_CallWithInvalidRequest_GetError)
+{
+    AZ_TEST_START_TRACE_SUPPRESSION;
+    m_gameliftClientManager->AcceptMatch(AzFramework::AcceptMatchRequest());
+    AZ_TEST_STOP_TRACE_SUPPRESSION(1); // capture 1 error message
+}
+
+TEST_F(AWSGameLiftClientManagerTest, AcceptMatch_CallWithValidRequest_Success)
+{
+    AWSGameLiftAcceptMatchRequest request;
+    request.m_acceptMatch = true;
+    request.m_playerIds = { DummyPlayerId };
+    request.m_ticketId = DummyMatchmakingTicketId;
+
+    Aws::GameLift::Model::AcceptMatchResult result;
+    Aws::GameLift::Model::AcceptMatchResult outcome(result);
+    EXPECT_CALL(*m_gameliftClientMockPtr, AcceptMatch(::testing::_)).Times(1).WillOnce(::testing::Return(outcome));
+
+    m_gameliftClientManager->AcceptMatch(request);
+}
+
+TEST_F(AWSGameLiftClientManagerTest, AcceptMatch_CallWithValidRequest_GetError)
+{
+    AWSGameLiftAcceptMatchRequest request;
+    request.m_acceptMatch = true;
+    request.m_playerIds = { DummyPlayerId };
+    request.m_ticketId = DummyMatchmakingTicketId;
+
+    Aws::Client::AWSError<Aws::GameLift::GameLiftErrors> error;
+    Aws::GameLift::Model::AcceptMatchOutcome outcome(error);
+
+    EXPECT_CALL(*m_gameliftClientMockPtr, AcceptMatch(::testing::_)).Times(1).WillOnce(::testing::Return(outcome));
+    AZ_TEST_START_TRACE_SUPPRESSION;
+    m_gameliftClientManager->AcceptMatch(request);
+    AZ_TEST_STOP_TRACE_SUPPRESSION(1); // capture 1 error message
+}
+
+TEST_F(AWSGameLiftClientManagerTest, AcceptMatchAsync_CallWithInvalidRequest_GetNotificationWithError)
+{
+    AWSGameLiftAcceptMatchRequest request;
+
+    MatchmakingAsyncRequestNotificationsHandlerMock matchmakingHandlerMock;
+    EXPECT_CALL(matchmakingHandlerMock, OnAcceptMatchAsyncComplete()).Times(1);
+
+    AZ_TEST_START_TRACE_SUPPRESSION;
+    m_gameliftClientManager->AcceptMatchAsync(request);
+    AZ_TEST_STOP_TRACE_SUPPRESSION(1); // capture 1 error message
+}
+
+TEST_F(AWSGameLiftClientManagerTest, AcceptMatchAsync_CallWithValidRequest_GetNotification)
+{
+    AWSCoreRequestsHandlerMock handlerMock;
+    EXPECT_CALL(handlerMock, GetDefaultJobContext()).Times(1).WillOnce(::testing::Return(m_jobContext.get()));
+
+    AWSGameLiftAcceptMatchRequest request;
+    request.m_acceptMatch = true;
+    request.m_playerIds = { DummyPlayerId };
+    request.m_ticketId = DummyMatchmakingTicketId;
+
+    Aws::GameLift::Model::AcceptMatchResult result;
+    Aws::GameLift::Model::AcceptMatchOutcome outcome(result);
+    EXPECT_CALL(*m_gameliftClientMockPtr, AcceptMatch(::testing::_)).Times(1).WillOnce(::testing::Return(outcome));
+
+    MatchmakingAsyncRequestNotificationsHandlerMock matchmakingHandlerMock;
+    EXPECT_CALL(matchmakingHandlerMock, OnAcceptMatchAsyncComplete()).Times(1);
+
+    m_gameliftClientManager->AcceptMatchAsync(request);
+}
+
+TEST_F(AWSGameLiftClientManagerTest, AcceptMatchAsync_CallWithValidRequest_GetNotificationWithError)
+{
+    AWSCoreRequestsHandlerMock handlerMock;
+    EXPECT_CALL(handlerMock, GetDefaultJobContext()).Times(1).WillOnce(::testing::Return(m_jobContext.get()));
+
+    AWSGameLiftAcceptMatchRequest request;
+    request.m_acceptMatch = true;
+    request.m_playerIds = { DummyPlayerId };
+    request.m_ticketId = DummyMatchmakingTicketId;
+
+    Aws::Client::AWSError<Aws::GameLift::GameLiftErrors> error;
+    Aws::GameLift::Model::AcceptMatchOutcome outcome(error);
+    EXPECT_CALL(*m_gameliftClientMockPtr, AcceptMatch(::testing::_)).Times(1).WillOnce(::testing::Return(outcome));
+
+    MatchmakingAsyncRequestNotificationsHandlerMock matchmakingHandlerMock;
+    EXPECT_CALL(matchmakingHandlerMock, OnAcceptMatchAsyncComplete()).Times(1);
+
+    AZ_TEST_START_TRACE_SUPPRESSION;
+    m_gameliftClientManager->AcceptMatchAsync(request);
+    AZ_TEST_STOP_TRACE_SUPPRESSION(1); // capture 1 error message
+}
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientMocks.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientMocks.h
index 964b6a21c2..6ba05747aa 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientMocks.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientMocks.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <AzCore/Interface/Interface.h>
+#include <AzFramework/Matchmaking/MatchmakingNotifications.h>
 #include <AzFramework/Session/ISessionRequests.h>
 #include <AzFramework/Session/ISessionHandlingRequests.h>
 #include <AzFramework/Matchmaking/MatchmakingNotifications.h>
@@ -18,6 +19,8 @@
 #include <aws/core/utils/Outcome.h>
 #include <aws/gamelift/GameLiftClient.h>
 #include <aws/gamelift/GameLiftErrors.h>
+#include <aws/gamelift/model/AcceptMatchRequest.h>
+#include <aws/gamelift/model/AcceptMatchResult.h>
 #include <aws/gamelift/model/CreateGameSessionRequest.h>
 #include <aws/gamelift/model/CreateGameSessionResult.h>
 #include <aws/gamelift/model/CreatePlayerSessionRequest.h>
@@ -46,6 +49,7 @@ public:
     {
     }
 
+    MOCK_CONST_METHOD1(AcceptMatch, Model::AcceptMatchOutcome(const Model::AcceptMatchRequest&));
     MOCK_CONST_METHOD1(CreateGameSession, Model::CreateGameSessionOutcome(const Model::CreateGameSessionRequest&));
     MOCK_CONST_METHOD1(CreatePlayerSession, Model::CreatePlayerSessionOutcome(const Model::CreatePlayerSessionRequest&));
     MOCK_CONST_METHOD1(DescribeMatchmaking, Model::DescribeMatchmakingOutcome(const Model::DescribeMatchmakingRequest&));
@@ -74,6 +78,23 @@ public:
     MOCK_METHOD0(OnStopMatchmakingAsyncComplete, void());
 };
 
+class MatchAcceptanceNotificationsHandlerMock
+    : public AzFramework::MatchAcceptanceNotificationBus::Handler
+{
+public:
+    MatchAcceptanceNotificationsHandlerMock()
+    {
+        AzFramework::MatchAcceptanceNotificationBus::Handler::BusConnect();
+    }
+
+    ~MatchAcceptanceNotificationsHandlerMock()
+    {
+        AzFramework::MatchAcceptanceNotificationBus::Handler::BusDisconnect();
+    }
+
+    MOCK_METHOD0(OnMatchAcceptance, void());
+};
+
 class SessionAsyncRequestNotificationsHandlerMock
     : public AzFramework::SessionAsyncRequestNotificationBus::Handler
 {
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftAcceptMatchActivityTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftAcceptMatchActivityTest.cpp
new file mode 100644
index 0000000000..af78ca8c0c
--- /dev/null
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftAcceptMatchActivityTest.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <aws/gamelift/model/AcceptMatchRequest.h>
+
+#include <AWSGameLiftClientFixture.h>
+#include <Activity/AWSGameLiftAcceptMatchActivity.h>
+
+#include <aws/gamelift/model/AcceptMatchRequest.h>
+
+using namespace AWSGameLift;
+
+using AWSGameLiftAcceptMatchActivityTest = AWSGameLiftClientFixture;
+
+TEST_F(AWSGameLiftAcceptMatchActivityTest, BuildAWSGameLiftAcceptMatchRequest_Call_GetExpectedResult)
+{
+    AWSGameLiftAcceptMatchRequest request;
+    request.m_acceptMatch = true;
+    request.m_ticketId = "dummyTicketId";
+    request.m_playerIds = { "dummyPlayerId" };
+
+    auto awsRequest = AcceptMatchActivity::BuildAWSGameLiftAcceptMatchRequest(request);
+
+    EXPECT_EQ(awsRequest.GetAcceptanceType(), Aws::GameLift::Model::AcceptanceType::ACCEPT);
+    EXPECT_TRUE(strcmp(awsRequest.GetTicketId().c_str(), request.m_ticketId.c_str()) == 0);
+    EXPECT_EQ(awsRequest.GetPlayerIds().size(), request.m_playerIds.size());
+    EXPECT_TRUE(strcmp(awsRequest.GetPlayerIds().begin()->c_str(), request.m_playerIds.begin()->c_str()) == 0);
+}
+
+TEST_F(AWSGameLiftAcceptMatchActivityTest, ValidateAcceptMatchRequest_CallWithBaseType_GetFalseResult)
+{
+    AZ_TEST_START_TRACE_SUPPRESSION;
+    auto result = AcceptMatchActivity::ValidateAcceptMatchRequest(AzFramework::AcceptMatchRequest());
+    EXPECT_FALSE(result);
+    AZ_TEST_STOP_TRACE_SUPPRESSION(1); // capture 1 error message
+}
+
+TEST_F(AWSGameLiftAcceptMatchActivityTest, ValidateAcceptMatchRequest_CallWithoutTicketId_GetFalseResult)
+{
+    AWSGameLiftAcceptMatchRequest request;
+    request.m_acceptMatch = true;
+    request.m_playerIds = { "dummyPlayerId" };
+
+    AZ_TEST_START_TRACE_SUPPRESSION;
+    auto result = AcceptMatchActivity::ValidateAcceptMatchRequest(request);
+    EXPECT_FALSE(result);
+    AZ_TEST_STOP_TRACE_SUPPRESSION(1); // capture 1 error message
+}
+
+TEST_F(AWSGameLiftAcceptMatchActivityTest, ValidateAcceptMatchRequest_CallWithoutPlayerIds_GetFalseResult)
+{
+    AWSGameLiftAcceptMatchRequest request;
+    request.m_acceptMatch = true;
+    request.m_playerIds = { "dummyPlayerId" };
+
+    AZ_TEST_START_TRACE_SUPPRESSION;
+    auto result = AcceptMatchActivity::ValidateAcceptMatchRequest(request);
+    EXPECT_FALSE(result);
+    AZ_TEST_STOP_TRACE_SUPPRESSION(1); // capture 1 error message
+}
+
+TEST_F(AWSGameLiftAcceptMatchActivityTest, ValidateAcceptMatchRequest_CallWithValidAttributes_GetTrueResult)
+{
+
+    AWSGameLiftAcceptMatchRequest request;
+    request.m_acceptMatch = true;
+    request.m_ticketId = "dummyTicketId";
+    request.m_playerIds = { "dummyPlayerId" };
+
+    auto result = AcceptMatchActivity::ValidateAcceptMatchRequest(request);
+    EXPECT_TRUE(result);
+}
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftStartMatchmakingActivityTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftStartMatchmakingActivityTest.cpp
index 706aec04f2..3eed6b0448 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftStartMatchmakingActivityTest.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftStartMatchmakingActivityTest.cpp
@@ -9,6 +9,8 @@
 #include <Activity/AWSGameLiftStartMatchmakingActivity.h>
 #include <AWSGameLiftClientFixture.h>
 
+#include <aws/gamelift/model/StartMatchmakingRequest.h>
+
 using namespace AWSGameLift;
 
 using AWSGameLiftStartMatchmakingActivityTest = AWSGameLiftClientFixture;
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftStopMatchmakingActivityTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftStopMatchmakingActivityTest.cpp
index 6b53ed5055..ba0e40c7e6 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftStopMatchmakingActivityTest.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/Activity/AWSGameLiftStopMatchmakingActivityTest.cpp
@@ -9,6 +9,8 @@
 #include <Activity/AWSGameLiftStopMatchmakingActivity.h>
 #include <AWSGameLiftClientFixture.h>
 
+#include <aws/gamelift/model/StopMatchmakingRequest.h>
+
 using namespace AWSGameLift;
 
 using AWSGameLiftStopMatchmakingActivityTest = AWSGameLiftClientFixture;
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/awsgamelift_client_files.cmake b/Gems/AWSGameLift/Code/AWSGameLiftClient/awsgamelift_client_files.cmake
index 3122ff2261..0930c42370 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/awsgamelift_client_files.cmake
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/awsgamelift_client_files.cmake
@@ -18,6 +18,8 @@ set(FILES
     Include/Request/IAWSGameLiftRequests.h
     Source/Activity/AWSGameLiftActivityUtils.cpp
     Source/Activity/AWSGameLiftActivityUtils.h
+    Source/Activity/AWSGameLiftAcceptMatchActivity.cpp
+    Source/Activity/AWSGameLiftAcceptMatchActivity.h
     Source/Activity/AWSGameLiftCreateSessionActivity.cpp
     Source/Activity/AWSGameLiftCreateSessionActivity.h
     Source/Activity/AWSGameLiftCreateSessionOnQueueActivity.cpp
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/awsgamelift_client_tests_files.cmake b/Gems/AWSGameLift/Code/AWSGameLiftClient/awsgamelift_client_tests_files.cmake
index f8ef40d5df..3e73dd8a0a 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/awsgamelift_client_tests_files.cmake
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/awsgamelift_client_tests_files.cmake
@@ -7,6 +7,7 @@
 #
 
 set(FILES
+    Tests/Activity/AWSGameLiftAcceptMatchActivityTest.cpp    
     Tests/Activity/AWSGameLiftCreateSessionActivityTest.cpp
     Tests/Activity/AWSGameLiftCreateSessionOnQueueActivityTest.cpp
     Tests/Activity/AWSGameLiftJoinSessionActivityTest.cpp

From da3a39a6a040abddc6267a7750a65e20da4d878b Mon Sep 17 00:00:00 2001
From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
Date: Wed, 13 Oct 2021 12:37:07 -0700
Subject: [PATCH 28/29] LYN-7121 | Focus Mode - Make editing a prefab an
 undoable operation (#4582)

* Refactor the PrefabFocusInterface to differentiate between Public and Internal functions. Introduce PrefabFocusUndo nodes to allow undoing Prefab Edit operations.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix selection code to avoid warning message

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Removed changed property from PrefabFocusUndo node

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Switch from size == 0 to empty in EntityOutlinerWidget::OnSelectionChanged

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* condense if check on Prefab Edit context menu item setup

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Correct interface usage in PrefabIntegrationManager (interface was renamed to public)

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove rej file that was included by mistake

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix missing interface initialization in PrefabFocusTests

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
---
 .../Prefab/PrefabFocusHandler.cpp             | 74 ++++++++++++++-----
 .../Prefab/PrefabFocusHandler.h               | 10 ++-
 .../Prefab/PrefabFocusInterface.h             | 20 +----
 .../Prefab/PrefabFocusPublicInterface.h       | 53 +++++++++++++
 .../Prefab/PrefabFocusUndo.cpp                | 52 +++++++++++++
 .../AzToolsFramework/Prefab/PrefabFocusUndo.h | 39 ++++++++++
 .../UI/Outliner/EntityOutlinerWidget.cpp      |  3 +-
 .../UI/Prefab/PrefabIntegrationManager.cpp    | 27 +++----
 .../UI/Prefab/PrefabIntegrationManager.h      |  4 +-
 .../UI/Prefab/PrefabUiHandler.cpp             | 16 ++--
 .../UI/Prefab/PrefabUiHandler.h               |  4 +-
 .../Prefab/PrefabViewportFocusPathHandler.cpp | 14 ++--
 .../Prefab/PrefabViewportFocusPathHandler.h   |  4 +-
 .../aztoolsframework_files.cmake              |  3 +
 .../Prefab/PrefabFocus/PrefabFocusTests.cpp   | 43 ++++++-----
 15 files changed, 268 insertions(+), 98 deletions(-)
 create mode 100644 Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h
 create mode 100644 Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusUndo.cpp
 create mode 100644 Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusUndo.h

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
index fcec1edd54..a79b9eb73d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
@@ -8,12 +8,14 @@
 
 #include <AzToolsFramework/Prefab/PrefabFocusHandler.h>
 
+#include <AzToolsFramework/Commands/SelectionCommand.h>
 #include <AzToolsFramework/ContainerEntity/ContainerEntityInterface.h>
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 #include <AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h>
 #include <AzToolsFramework/Prefab/Instance/Instance.h>
 #include <AzToolsFramework/Prefab/Instance/InstanceEntityMapperInterface.h>
 #include <AzToolsFramework/Prefab/PrefabFocusNotificationBus.h>
+#include <AzToolsFramework/Prefab/PrefabFocusUndo.h>
 
 namespace AzToolsFramework::Prefab
 {
@@ -28,10 +30,12 @@ namespace AzToolsFramework::Prefab
 
         EditorEntityContextNotificationBus::Handler::BusConnect();
         AZ::Interface<PrefabFocusInterface>::Register(this);
+        AZ::Interface<PrefabFocusPublicInterface>::Register(this);
     }
 
     PrefabFocusHandler::~PrefabFocusHandler()
     {
+        AZ::Interface<PrefabFocusPublicInterface>::Unregister(this);
         AZ::Interface<PrefabFocusInterface>::Unregister(this);
         EditorEntityContextNotificationBus::Handler::BusDisconnect();
     }
@@ -61,6 +65,44 @@ namespace AzToolsFramework::Prefab
     }
 
     PrefabFocusOperationResult PrefabFocusHandler::FocusOnOwningPrefab(AZ::EntityId entityId)
+    {
+        // Initialize Undo Batch object
+        ScopedUndoBatch undoBatch("Edit Prefab");
+
+        // Clear selection
+        {
+            const EntityIdList selectedEntities = EntityIdList{};
+            auto selectionUndo = aznew SelectionCommand(selectedEntities, "Clear Selection");
+            selectionUndo->SetParent(undoBatch.GetUndoBatch());
+            ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::SetSelectedEntities, selectedEntities);
+        }
+
+        // Edit Prefab
+        {
+            auto editUndo = aznew PrefabFocusUndo("Edit Prefab");
+            editUndo->Capture(entityId);
+            editUndo->SetParent(undoBatch.GetUndoBatch());
+            ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::RunRedoSeparately, editUndo);
+        }
+
+        return AZ::Success();
+    }
+
+    PrefabFocusOperationResult PrefabFocusHandler::FocusOnPathIndex([[maybe_unused]] AzFramework::EntityContextId entityContextId, int index)
+    {
+        if (index < 0 || index >= m_instanceFocusVector.size())
+        {
+            return AZ::Failure(AZStd::string("Prefab Focus Handler: Invalid index on FocusOnPathIndex."));
+        }
+
+        InstanceOptionalReference focusedInstance = m_instanceFocusVector[index];
+
+        FocusOnOwningPrefab(focusedInstance->get().GetContainerEntityId());
+
+        return AZ::Success();
+    }
+
+    PrefabFocusOperationResult PrefabFocusHandler::FocusOnPrefabInstanceOwningEntityId(AZ::EntityId entityId)
     {
         InstanceOptionalReference focusedInstance;
 
@@ -85,18 +127,6 @@ namespace AzToolsFramework::Prefab
         return FocusOnPrefabInstance(focusedInstance);
     }
 
-    PrefabFocusOperationResult PrefabFocusHandler::FocusOnPathIndex([[maybe_unused]] AzFramework::EntityContextId entityContextId, int index)
-    {
-        if (index < 0 || index >= m_instanceFocusVector.size())
-        {
-            return AZ::Failure(AZStd::string("Prefab Focus Handler: Invalid index on FocusOnPathIndex."));
-        }
-
-        InstanceOptionalReference focusedInstance = m_instanceFocusVector[index];
-
-        return FocusOnPrefabInstance(focusedInstance);
-    }
-
     PrefabFocusOperationResult PrefabFocusHandler::FocusOnPrefabInstance(InstanceOptionalReference focusedInstance)
     {
         if (!focusedInstance.has_value())
@@ -122,17 +152,10 @@ namespace AzToolsFramework::Prefab
             if (focusedInstance->get().GetParentInstance() != AZStd::nullopt)
             {
                 containerEntityId = focusedInstance->get().GetContainerEntityId();
-
-                // Select the container entity
-                AzToolsFramework::SelectEntity(containerEntityId);
             }
             else
             {
                 containerEntityId = AZ::EntityId();
-
-                // Clear the selection
-                AzToolsFramework::SelectEntities({});
-                
             }
             
             // Focus on the descendants of the container entity
@@ -161,6 +184,17 @@ namespace AzToolsFramework::Prefab
         return m_focusedInstance;
     }
 
+    AZ::EntityId PrefabFocusHandler::GetFocusedPrefabContainerEntityId([[maybe_unused]] AzFramework::EntityContextId entityContextId) const
+    {
+        if (!m_focusedInstance.has_value())
+        {
+            // PrefabFocusHandler has not been initialized yet.
+            return AZ::EntityId();
+        }
+
+        return m_focusedInstance->get().GetContainerEntityId();
+    }
+
     bool PrefabFocusHandler::IsOwningPrefabBeingFocused(AZ::EntityId entityId) const
     {
         if (!m_focusedInstance.has_value())
@@ -200,7 +234,7 @@ namespace AzToolsFramework::Prefab
         m_instanceFocusVector.clear();
 
         // Focus on the root prefab (AZ::EntityId() will default to it)
-        FocusOnOwningPrefab(AZ::EntityId());
+        FocusOnPrefabInstanceOwningEntityId(AZ::EntityId());
     }
 
     void PrefabFocusHandler::RefreshInstanceFocusList()
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h
index 2f631f772d..80b7a6859c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h
@@ -13,6 +13,7 @@
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
 #include <AzToolsFramework/FocusMode/FocusModeInterface.h>
 #include <AzToolsFramework/Prefab/PrefabFocusInterface.h>
+#include <AzToolsFramework/Prefab/PrefabFocusPublicInterface.h>
 #include <AzToolsFramework/Prefab/Template/Template.h>
 
 namespace AzToolsFramework
@@ -28,6 +29,7 @@ namespace AzToolsFramework::Prefab
     //! Handles Prefab Focus mode, determining which prefab file entity changes will target.
     class PrefabFocusHandler final
         : private PrefabFocusInterface
+        , private PrefabFocusPublicInterface
         , private EditorEntityContextNotificationBus::Handler
     {
     public:
@@ -39,10 +41,14 @@ namespace AzToolsFramework::Prefab
         void Initialize();
 
         // PrefabFocusInterface overrides ...
-        PrefabFocusOperationResult FocusOnOwningPrefab(AZ::EntityId entityId) override;
-        PrefabFocusOperationResult FocusOnPathIndex(AzFramework::EntityContextId entityContextId, int index) override;
+        PrefabFocusOperationResult FocusOnPrefabInstanceOwningEntityId(AZ::EntityId entityId) override;
         TemplateId GetFocusedPrefabTemplateId(AzFramework::EntityContextId entityContextId) const override;
         InstanceOptionalReference GetFocusedPrefabInstance(AzFramework::EntityContextId entityContextId) const override;
+
+        // PrefabFocusPublicInterface overrides ...
+        PrefabFocusOperationResult FocusOnOwningPrefab(AZ::EntityId entityId) override;
+        PrefabFocusOperationResult FocusOnPathIndex(AzFramework::EntityContextId entityContextId, int index) override;
+        AZ::EntityId GetFocusedPrefabContainerEntityId(AzFramework::EntityContextId entityContextId) const override;
         bool IsOwningPrefabBeingFocused(AZ::EntityId entityId) const override;
         const AZ::IO::Path& GetPrefabFocusPath(AzFramework::EntityContextId entityContextId) const override;
         const int GetPrefabFocusPathLength(AzFramework::EntityContextId entityContextId) const override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusInterface.h
index 1c0f4f85e9..25c83b89bc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusInterface.h
@@ -20,7 +20,7 @@ namespace AzToolsFramework::Prefab
 {
     using PrefabFocusOperationResult = AZ::Outcome<void, AZStd::string>;
 
-    //! Interface to handle operations related to the Prefab Focus system.
+    //! Interface to handle internal operations related to the Prefab Focus system.
     class PrefabFocusInterface
     {
     public:
@@ -28,29 +28,13 @@ namespace AzToolsFramework::Prefab
 
         //! Set the focused prefab instance to the owning instance of the entityId provided.
         //! @param entityId The entityId of the entity whose owning instance we want the prefab system to focus on.
-        virtual PrefabFocusOperationResult FocusOnOwningPrefab(AZ::EntityId entityId) = 0;
-
-        //! Set the focused prefab instance to the instance at position index of the current path.
-        //! @param index The index of the instance in the current path that we want the prefab system to focus on.
-        virtual PrefabFocusOperationResult FocusOnPathIndex(AzFramework::EntityContextId entityContextId, int index) = 0;
+        virtual PrefabFocusOperationResult FocusOnPrefabInstanceOwningEntityId(AZ::EntityId entityId) = 0;
 
         //! Returns the template id of the instance the prefab system is focusing on.
         virtual TemplateId GetFocusedPrefabTemplateId(AzFramework::EntityContextId entityContextId) const = 0;
 
         //! Returns a reference to the instance the prefab system is focusing on.
         virtual InstanceOptionalReference GetFocusedPrefabInstance(AzFramework::EntityContextId entityContextId) const = 0;
-
-        //! Returns whether the entity belongs to the instance that is being focused on, or one of its descendants.
-        //! @param entityId The entityId of the queried entity.
-        //! @return true if the entity belongs to the focused instance or one of its descendants, false otherwise.
-        virtual bool IsOwningPrefabBeingFocused(AZ::EntityId entityId) const = 0;
-
-        //! Returns the path from the root instance to the currently focused instance.
-        //! @return A path composed from the names of the container entities for the instance path.
-        virtual const AZ::IO::Path& GetPrefabFocusPath(AzFramework::EntityContextId entityContextId) const = 0;
-
-        //! Returns the size of the path to the currently focused instance.
-        virtual const int GetPrefabFocusPathLength(AzFramework::EntityContextId entityContextId) const = 0;
     };
 
 } // namespace AzToolsFramework::Prefab
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h
new file mode 100644
index 0000000000..86e476b56f
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Serialization/SerializeContext.h>
+
+#include <AzFramework/Entity/EntityContext.h>
+
+#include <AzToolsFramework/Prefab/Instance/Instance.h>
+#include <AzToolsFramework/Prefab/Template/Template.h>
+
+namespace AzToolsFramework::Prefab
+{
+    using PrefabFocusOperationResult = AZ::Outcome<void, AZStd::string>;
+
+    //! Public Interface for external systems to utilize the Prefab Focus system.
+    class PrefabFocusPublicInterface
+    {
+    public:
+        AZ_RTTI(PrefabFocusPublicInterface, "{53EE1D18-A41F-4DB1-9B73-9448F425722E}");
+
+        //! Set the focused prefab instance to the owning instance of the entityId provided. Supports undo/redo.
+        //! @param entityId The entityId of the entity whose owning instance we want the prefab system to focus on.
+        virtual PrefabFocusOperationResult FocusOnOwningPrefab(AZ::EntityId entityId) = 0;
+
+        //! Set the focused prefab instance to the instance at position index of the current path. Supports undo/redo.
+        //! @param index The index of the instance in the current path that we want the prefab system to focus on.
+        virtual PrefabFocusOperationResult FocusOnPathIndex(AzFramework::EntityContextId entityContextId, int index) = 0;
+
+        //! Returns the entity id of the container entity for the instance the prefab system is focusing on.
+        virtual AZ::EntityId GetFocusedPrefabContainerEntityId(AzFramework::EntityContextId entityContextId) const = 0;
+
+        //! Returns whether the entity belongs to the instance that is being focused on, or one of its descendants.
+        //! @param entityId The entityId of the queried entity.
+        //! @return true if the entity belongs to the focused instance or one of its descendants, false otherwise.
+        virtual bool IsOwningPrefabBeingFocused(AZ::EntityId entityId) const = 0;
+
+        //! Returns the path from the root instance to the currently focused instance.
+        //! @return A path composed from the names of the container entities for the instance path.
+        virtual const AZ::IO::Path& GetPrefabFocusPath(AzFramework::EntityContextId entityContextId) const = 0;
+
+        //! Returns the size of the path to the currently focused instance.
+        virtual const int GetPrefabFocusPathLength(AzFramework::EntityContextId entityContextId) const = 0;
+    };
+
+} // namespace AzToolsFramework::Prefab
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusUndo.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusUndo.cpp
new file mode 100644
index 0000000000..e5f664ea38
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusUndo.cpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzToolsFramework/Prefab/PrefabFocusUndo.h>
+
+#include <AzCore/Interface/Interface.h>
+#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
+#include <AzToolsFramework/Prefab/PrefabFocusInterface.h>
+#include <AzToolsFramework/Prefab/PrefabFocusPublicInterface.h>
+
+namespace AzToolsFramework::Prefab
+{
+    PrefabFocusUndo::PrefabFocusUndo(const AZStd::string& undoOperationName)
+        : UndoSystem::URSequencePoint(undoOperationName)
+    {
+        m_prefabFocusInterface = AZ::Interface<PrefabFocusInterface>::Get();
+        AZ_Assert(m_prefabFocusInterface, "PrefabFocusUndo - Failed to grab prefab focus interface");
+
+        m_prefabFocusPublicInterface = AZ::Interface<PrefabFocusPublicInterface>::Get();
+        AZ_Assert(m_prefabFocusPublicInterface, "PrefabFocusUndo - Failed to grab prefab focus public interface");
+    }
+
+    bool PrefabFocusUndo::Changed() const
+    {
+        return true;
+    }
+
+    void PrefabFocusUndo::Capture(AZ::EntityId entityId)
+    {
+        auto entityContextId = AzFramework::EntityContextId::CreateNull();
+        EditorEntityContextRequestBus::BroadcastResult(entityContextId, &EditorEntityContextRequests::GetEditorEntityContextId);
+
+        m_beforeEntityId = m_prefabFocusPublicInterface->GetFocusedPrefabContainerEntityId(entityContextId);
+        m_afterEntityId = entityId;
+    }
+
+    void PrefabFocusUndo::Undo()
+    {
+        m_prefabFocusInterface->FocusOnPrefabInstanceOwningEntityId(m_beforeEntityId);
+    }
+
+    void PrefabFocusUndo::Redo()
+    {
+        m_prefabFocusInterface->FocusOnPrefabInstanceOwningEntityId(m_afterEntityId);
+    }
+
+} // namespace AzToolsFramework::Prefab
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusUndo.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusUndo.h
new file mode 100644
index 0000000000..3b257b6547
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusUndo.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Component/EntityId.h>
+#include <AzToolsFramework/Undo/UndoSystem.h>
+
+namespace AzToolsFramework::Prefab
+{
+    class PrefabFocusInterface;
+    class PrefabFocusPublicInterface;
+
+    //! Undo node for prefab focus change operations.
+    class PrefabFocusUndo
+        : public UndoSystem::URSequencePoint
+    {
+    public:
+        explicit PrefabFocusUndo(const AZStd::string& undoOperationName);
+
+        bool Changed() const override;
+        void Capture(AZ::EntityId entityId);
+
+        void Undo() override;
+        void Redo() override;
+
+    protected:
+        PrefabFocusInterface* m_prefabFocusInterface = nullptr;
+        PrefabFocusPublicInterface* m_prefabFocusPublicInterface = nullptr;
+
+        AZ::EntityId m_beforeEntityId;
+        AZ::EntityId m_afterEntityId;
+    };
+} // namespace AzToolsFramework::Prefab
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
index 459b39a290..3b48cc4967 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
@@ -324,7 +324,8 @@ namespace AzToolsFramework
     //  Currently, the first behavior is implemented.
     void EntityOutlinerWidget::OnSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
     {
-        if (m_selectionChangeInProgress || !m_enableSelectionUpdates)
+        if (m_selectionChangeInProgress || !m_enableSelectionUpdates
+            || (selected.empty() && deselected.empty()))
         {
             return;
         }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
index 24cb71499e..6ffa3aab69 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
@@ -24,11 +24,11 @@
 #include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
 #include <AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.h>
 #include <AzToolsFramework/ContainerEntity/ContainerEntityInterface.h>
-#include <AzToolsFramework/Prefab/PrefabFocusInterface.h>
+#include <AzToolsFramework/Prefab/EditorPrefabComponent.h>
+#include <AzToolsFramework/Prefab/Instance/InstanceEntityMapperInterface.h>
+#include <AzToolsFramework/Prefab/PrefabFocusPublicInterface.h>
 #include <AzToolsFramework/Prefab/PrefabLoaderInterface.h>
 #include <AzToolsFramework/Prefab/Procedural/ProceduralPrefabAsset.h>
-#include <AzToolsFramework/Prefab/Instance/InstanceEntityMapperInterface.h>
-#include <AzToolsFramework/Prefab/EditorPrefabComponent.h>
 #include <AzToolsFramework/ToolsComponents/EditorLayerComponentBus.h>
 #include <AzToolsFramework/UI/EditorEntityUi/EditorEntityUiInterface.h>
 #include <AzToolsFramework/UI/Prefab/PrefabIntegrationInterface.h>
@@ -39,7 +39,6 @@
 #include <AzQtComponents/Components/StyleManager.h>
 #include <AzQtComponents/Components/Widgets/CardHeader.h>
 
-
 #include <QApplication>
 #include <QCheckBox>
 #include <QDialog>
@@ -56,14 +55,13 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-
 namespace AzToolsFramework
 {
     namespace Prefab
     {
         ContainerEntityInterface* PrefabIntegrationManager::s_containerEntityInterface = nullptr;
         EditorEntityUiInterface* PrefabIntegrationManager::s_editorEntityUiInterface = nullptr;
-        PrefabFocusInterface* PrefabIntegrationManager::s_prefabFocusInterface = nullptr;
+        PrefabFocusPublicInterface* PrefabIntegrationManager::s_prefabFocusPublicInterface = nullptr;
         PrefabLoaderInterface* PrefabIntegrationManager::s_prefabLoaderInterface = nullptr;
         PrefabPublicInterface* PrefabIntegrationManager::s_prefabPublicInterface = nullptr;
         PrefabSystemComponentInterface* PrefabIntegrationManager::s_prefabSystemComponentInterface = nullptr;
@@ -129,10 +127,10 @@ namespace AzToolsFramework
                 return;
             }
 
-            s_prefabFocusInterface = AZ::Interface<PrefabFocusInterface>::Get();
-            if (s_prefabFocusInterface == nullptr)
+            s_prefabFocusPublicInterface = AZ::Interface<PrefabFocusPublicInterface>::Get();
+            if (s_prefabFocusPublicInterface == nullptr)
             {
-                AZ_Assert(false, "Prefab - could not get PrefabFocusInterface on PrefabIntegrationManager construction.");
+                AZ_Assert(false, "Prefab - could not get PrefabFocusPublicInterface on PrefabIntegrationManager construction.");
                 return;
             }
 
@@ -247,12 +245,8 @@ namespace AzToolsFramework
                     if (s_prefabPublicInterface->IsInstanceContainerEntity(selectedEntity))
                     {
                         // Edit Prefab
-                        if (prefabWipFeaturesEnabled)
+                        if (prefabWipFeaturesEnabled && !s_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(selectedEntity))
                         {
-                            bool beingEdited = s_prefabFocusInterface->IsOwningPrefabBeingFocused(selectedEntity);
-
-                            if (!beingEdited)
-                            {
                                 QAction* editAction = menu->addAction(QObject::tr("Edit Prefab"));
                                 editAction->setToolTip(QObject::tr("Edit the prefab in focus mode."));
 
@@ -261,7 +255,6 @@ namespace AzToolsFramework
                                 });
 
                                 itemWasShown = true;
-                            }
                         }
 
                         // Save Prefab
@@ -317,7 +310,7 @@ namespace AzToolsFramework
 
         void PrefabIntegrationManager::OnEscape()
         {
-            s_prefabFocusInterface->FocusOnOwningPrefab(AZ::EntityId());
+            s_prefabFocusPublicInterface->FocusOnOwningPrefab(AZ::EntityId());
         }
 
         void PrefabIntegrationManager::HandleSourceFileType(AZStd::string_view sourceFilePath, AZ::EntityId parentId, AZ::Vector3 position) const
@@ -490,7 +483,7 @@ namespace AzToolsFramework
 
         void PrefabIntegrationManager::ContextMenu_EditPrefab(AZ::EntityId containerEntity)
         {
-            s_prefabFocusInterface->FocusOnOwningPrefab(containerEntity);
+            s_prefabFocusPublicInterface->FocusOnOwningPrefab(containerEntity);
         }
 
         void PrefabIntegrationManager::ContextMenu_SavePrefab(AZ::EntityId containerEntity)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h
index 6788af31e9..e8c10c150a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.h
@@ -30,7 +30,7 @@ namespace AzToolsFramework
 
     namespace Prefab
     {
-        class PrefabFocusInterface;
+        class PrefabFocusPublicInterface;
         class PrefabLoaderInterface;
 
         //! Structure for saving/retrieving user settings related to prefab workflows.
@@ -144,7 +144,7 @@ namespace AzToolsFramework
 
             static ContainerEntityInterface* s_containerEntityInterface;
             static EditorEntityUiInterface* s_editorEntityUiInterface;
-            static PrefabFocusInterface* s_prefabFocusInterface;
+            static PrefabFocusPublicInterface* s_prefabFocusPublicInterface;
             static PrefabLoaderInterface* s_prefabLoaderInterface;
             static PrefabPublicInterface* s_prefabPublicInterface;
             static PrefabSystemComponentInterface* s_prefabSystemComponentInterface;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
index 7d1f3485aa..00522b29dc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
@@ -10,7 +10,7 @@
 
 #include <AzFramework/API/ApplicationAPI.h>
 
-#include <AzToolsFramework/Prefab/PrefabFocusInterface.h>
+#include <AzToolsFramework/Prefab/PrefabFocusPublicInterface.h>
 #include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
 #include <AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx>
 
@@ -35,10 +35,10 @@ namespace AzToolsFramework
             return;
         }
 
-        m_prefabFocusInterface = AZ::Interface<Prefab::PrefabFocusInterface>::Get();
-        if (m_prefabFocusInterface == nullptr)
+        m_prefabFocusPublicInterface = AZ::Interface<Prefab::PrefabFocusPublicInterface>::Get();
+        if (m_prefabFocusPublicInterface == nullptr)
         {
-            AZ_Assert(false, "PrefabUiHandler - could not get PrefabFocusInterface on PrefabUiHandler construction.");
+            AZ_Assert(false, "PrefabUiHandler - could not get PrefabFocusPublicInterface on PrefabUiHandler construction.");
             return;
         }
     }
@@ -83,7 +83,7 @@ namespace AzToolsFramework
 
     QIcon PrefabUiHandler::GenerateItemIcon(AZ::EntityId entityId) const
     {
-        if (m_prefabFocusInterface->IsOwningPrefabBeingFocused(entityId))
+        if (m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(entityId))
         {
             return QIcon(m_prefabEditIconPath);
         }
@@ -105,7 +105,7 @@ namespace AzToolsFramework
         const bool hasVisibleChildren = index.data(EntityOutlinerListModel::ExpandedRole).value<bool>() && index.model()->hasChildren(index);
 
         QColor backgroundColor = m_prefabCapsuleColor;
-        if (m_prefabFocusInterface->IsOwningPrefabBeingFocused(entityId))
+        if (m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(entityId))
         {
             backgroundColor = m_prefabCapsuleEditColor;
         }
@@ -191,7 +191,7 @@ namespace AzToolsFramework
         const bool isLastColumn = descendantIndex.column() == EntityOutlinerListModel::ColumnLockToggle;
 
         QColor borderColor = m_prefabCapsuleColor;
-        if (m_prefabFocusInterface->IsOwningPrefabBeingFocused(entityId))
+        if (m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(entityId))
         {
             borderColor = m_prefabCapsuleEditColor;
         }
@@ -329,7 +329,7 @@ namespace AzToolsFramework
         if (prefabWipFeaturesEnabled)
         {
             // Focus on this prefab
-            m_prefabFocusInterface->FocusOnOwningPrefab(entityId);
+            m_prefabFocusPublicInterface->FocusOnOwningPrefab(entityId);
         }
     }
 }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h
index bb7168f409..7c68d9fd95 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h
@@ -15,7 +15,7 @@ namespace AzToolsFramework
 
     namespace Prefab
     {
-        class PrefabFocusInterface;
+        class PrefabFocusPublicInterface;
         class PrefabPublicInterface;
     };
 
@@ -39,7 +39,7 @@ namespace AzToolsFramework
         void OnDoubleClick(AZ::EntityId entityId) const override;
 
     private:
-        Prefab::PrefabFocusInterface* m_prefabFocusInterface = nullptr;
+        Prefab::PrefabFocusPublicInterface* m_prefabFocusPublicInterface = nullptr;
         Prefab::PrefabPublicInterface* m_prefabPublicInterface = nullptr;
 
         static bool IsLastVisibleChild(const QModelIndex& parent, const QModelIndex& child);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.cpp
index 6b0de5dc53..21ada94184 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.cpp
@@ -8,7 +8,7 @@
 
 #include <AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.h>
 
-#include <AzToolsFramework/Prefab/PrefabFocusInterface.h>
+#include <AzToolsFramework/Prefab/PrefabFocusPublicInterface.h>
 
 namespace AzToolsFramework::Prefab
 {
@@ -31,8 +31,8 @@ namespace AzToolsFramework::Prefab
     void PrefabViewportFocusPathHandler::Initialize(AzQtComponents::BreadCrumbs* breadcrumbsWidget, QToolButton* backButton)
     {
         // Get reference to the PrefabFocusInterface handler
-        m_prefabFocusInterface = AZ::Interface<PrefabFocusInterface>::Get();
-        if (m_prefabFocusInterface == nullptr)
+        m_prefabFocusPublicInterface = AZ::Interface<PrefabFocusPublicInterface>::Get();
+        if (m_prefabFocusPublicInterface == nullptr)
         {
             AZ_Assert(false, "Prefab - could not get PrefabFocusInterface on PrefabViewportFocusPathHandler construction.");
             return;
@@ -46,7 +46,7 @@ namespace AzToolsFramework::Prefab
         connect(m_breadcrumbsWidget, &AzQtComponents::BreadCrumbs::linkClicked, this,
             [&](const QString&, int linkIndex)
             {
-                m_prefabFocusInterface->FocusOnPathIndex(m_editorEntityContextId, linkIndex);
+                m_prefabFocusPublicInterface->FocusOnPathIndex(m_editorEntityContextId, linkIndex);
             }
         );
 
@@ -54,9 +54,9 @@ namespace AzToolsFramework::Prefab
         connect(m_backButton, &QToolButton::clicked, this,
             [&]()
             {
-                if (int length = m_prefabFocusInterface->GetPrefabFocusPathLength(m_editorEntityContextId); length > 1)
+                if (int length = m_prefabFocusPublicInterface->GetPrefabFocusPathLength(m_editorEntityContextId); length > 1)
                 {
-                    m_prefabFocusInterface->FocusOnPathIndex(m_editorEntityContextId, length - 2);
+                    m_prefabFocusPublicInterface->FocusOnPathIndex(m_editorEntityContextId, length - 2);
                 }
             }
         );
@@ -65,7 +65,7 @@ namespace AzToolsFramework::Prefab
     void PrefabViewportFocusPathHandler::OnPrefabFocusChanged()
     {
         // Push new Path
-        m_breadcrumbsWidget->pushPath(m_prefabFocusInterface->GetPrefabFocusPath(m_editorEntityContextId).c_str());
+        m_breadcrumbsWidget->pushPath(m_prefabFocusPublicInterface->GetPrefabFocusPath(m_editorEntityContextId).c_str());
     }
 
 } // namespace AzToolsFramework::Prefab
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.h
index ce7744fb1b..a97db60e34 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabViewportFocusPathHandler.h
@@ -19,7 +19,7 @@
 
 namespace AzToolsFramework::Prefab
 {
-    class PrefabFocusInterface;
+    class PrefabFocusPublicInterface;
 
     class PrefabViewportFocusPathHandler
         : public PrefabFocusNotificationBus::Handler
@@ -40,6 +40,6 @@ namespace AzToolsFramework::Prefab
 
         AzFramework::EntityContextId m_editorEntityContextId = AzFramework::EntityContextId::CreateNull();
 
-        PrefabFocusInterface* m_prefabFocusInterface = nullptr;
+        PrefabFocusPublicInterface* m_prefabFocusPublicInterface = nullptr;
     };
 } // namespace AzToolsFramework::Prefab
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
index 37559564db..8dec7ab611 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
@@ -646,6 +646,9 @@ set(FILES
     Prefab/PrefabFocusHandler.cpp
     Prefab/PrefabFocusInterface.h
     Prefab/PrefabFocusNotificationBus.h
+    Prefab/PrefabFocusPublicInterface.h
+    Prefab/PrefabFocusUndo.h
+    Prefab/PrefabFocusUndo.cpp
     Prefab/PrefabIdTypes.h
     Prefab/PrefabLoader.h
     Prefab/PrefabLoader.cpp
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp
index 72489b07a1..86c73e72e5 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp
@@ -10,6 +10,7 @@
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 #include <AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h>
 #include <AzToolsFramework/Prefab/PrefabFocusInterface.h>
+#include <AzToolsFramework/Prefab/PrefabFocusPublicInterface.h>
 #include <Prefab/PrefabTestFixture.h>
 
 namespace UnitTest
@@ -72,6 +73,9 @@ namespace UnitTest
             m_prefabFocusInterface = AZ::Interface<PrefabFocusInterface>::Get();
             ASSERT_TRUE(m_prefabFocusInterface != nullptr);
 
+            m_prefabFocusPublicInterface = AZ::Interface<PrefabFocusPublicInterface>::Get();
+            ASSERT_TRUE(m_prefabFocusPublicInterface != nullptr);
+
             AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
                 m_editorEntityContextId, &AzToolsFramework::EditorEntityContextRequestBus::Events::GetEditorEntityContextId);
 
@@ -91,6 +95,7 @@ namespace UnitTest
         AZStd::unique_ptr<AzToolsFramework::Prefab::Instance> m_rootInstance;
 
         PrefabFocusInterface* m_prefabFocusInterface = nullptr;
+        PrefabFocusPublicInterface* m_prefabFocusPublicInterface = nullptr;
         AzFramework::EntityContextId m_editorEntityContextId = AzFramework::EntityContextId::CreateNull();
 
         inline static const char* CityEntityName = "City";
@@ -105,7 +110,7 @@ namespace UnitTest
     {
         // Verify FocusOnOwningPrefab works when passing the container entity of the root prefab.
         {
-            m_prefabFocusInterface->FocusOnOwningPrefab(m_instanceMap[CityEntityName]->GetContainerEntityId());
+            m_prefabFocusPublicInterface->FocusOnOwningPrefab(m_instanceMap[CityEntityName]->GetContainerEntityId());
             EXPECT_EQ(
                 m_prefabFocusInterface->GetFocusedPrefabTemplateId(m_editorEntityContextId),
                 m_instanceMap[CityEntityName]->GetTemplateId());
@@ -120,7 +125,7 @@ namespace UnitTest
     {
         // Verify FocusOnOwningPrefab works when passing a nested entity of the root prefab.
         {
-            m_prefabFocusInterface->FocusOnOwningPrefab(m_entityMap[CityEntityName]->GetId());
+            m_prefabFocusPublicInterface->FocusOnOwningPrefab(m_entityMap[CityEntityName]->GetId());
             EXPECT_EQ(
                 m_prefabFocusInterface->GetFocusedPrefabTemplateId(m_editorEntityContextId),
                 m_instanceMap[CityEntityName]->GetTemplateId());
@@ -135,7 +140,7 @@ namespace UnitTest
     {
         // Verify FocusOnOwningPrefab works when passing the container entity of a nested prefab.
         {
-            m_prefabFocusInterface->FocusOnOwningPrefab(m_instanceMap[CarEntityName]->GetContainerEntityId());
+            m_prefabFocusPublicInterface->FocusOnOwningPrefab(m_instanceMap[CarEntityName]->GetContainerEntityId());
             EXPECT_EQ(
                 m_prefabFocusInterface->GetFocusedPrefabTemplateId(m_editorEntityContextId), m_instanceMap[CarEntityName]->GetTemplateId());
 
@@ -149,7 +154,7 @@ namespace UnitTest
     {
         // Verify FocusOnOwningPrefab works when passing a nested entity of the a nested prefab.
         {
-            m_prefabFocusInterface->FocusOnOwningPrefab(m_entityMap[Passenger1EntityName]->GetId());
+            m_prefabFocusPublicInterface->FocusOnOwningPrefab(m_entityMap[Passenger1EntityName]->GetId());
             EXPECT_EQ(
                 m_prefabFocusInterface->GetFocusedPrefabTemplateId(m_editorEntityContextId), m_instanceMap[CarEntityName]->GetTemplateId());
 
@@ -169,7 +174,7 @@ namespace UnitTest
                 prefabEditorEntityOwnershipInterface->GetRootPrefabInstance();
             EXPECT_TRUE(rootPrefabInstance.has_value());
 
-            m_prefabFocusInterface->FocusOnOwningPrefab(AZ::EntityId());
+            m_prefabFocusPublicInterface->FocusOnOwningPrefab(AZ::EntityId());
             EXPECT_EQ(
                 m_prefabFocusInterface->GetFocusedPrefabTemplateId(m_editorEntityContextId), rootPrefabInstance->get().GetTemplateId());
 
@@ -183,10 +188,10 @@ namespace UnitTest
     {
         // Verify IsOwningPrefabBeingFocused returns true for all entities in a focused prefab (container/nested)
         {
-            m_prefabFocusInterface->FocusOnOwningPrefab(m_instanceMap[CityEntityName]->GetContainerEntityId());
+            m_prefabFocusPublicInterface->FocusOnOwningPrefab(m_instanceMap[CityEntityName]->GetContainerEntityId());
 
-            EXPECT_TRUE(m_prefabFocusInterface->IsOwningPrefabBeingFocused(m_instanceMap[CityEntityName]->GetContainerEntityId()));
-            EXPECT_TRUE(m_prefabFocusInterface->IsOwningPrefabBeingFocused(m_entityMap[CityEntityName]->GetId()));
+            EXPECT_TRUE(m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(m_instanceMap[CityEntityName]->GetContainerEntityId()));
+            EXPECT_TRUE(m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(m_entityMap[CityEntityName]->GetId()));
         }
     }
 
@@ -194,13 +199,13 @@ namespace UnitTest
     {
         // Verify IsOwningPrefabBeingFocused returns false for all entities not in a focused prefab (ancestors/descendants)
         {
-            m_prefabFocusInterface->FocusOnOwningPrefab(m_instanceMap[StreetEntityName]->GetContainerEntityId());
+            m_prefabFocusPublicInterface->FocusOnOwningPrefab(m_instanceMap[StreetEntityName]->GetContainerEntityId());
 
-            EXPECT_TRUE(m_prefabFocusInterface->IsOwningPrefabBeingFocused(m_instanceMap[StreetEntityName]->GetContainerEntityId()));
-            EXPECT_FALSE(m_prefabFocusInterface->IsOwningPrefabBeingFocused(m_instanceMap[CityEntityName]->GetContainerEntityId()));
-            EXPECT_FALSE(m_prefabFocusInterface->IsOwningPrefabBeingFocused(m_entityMap[CityEntityName]->GetId()));
-            EXPECT_FALSE(m_prefabFocusInterface->IsOwningPrefabBeingFocused(m_instanceMap[CarEntityName]->GetContainerEntityId()));
-            EXPECT_FALSE(m_prefabFocusInterface->IsOwningPrefabBeingFocused(m_entityMap[Passenger1EntityName]->GetId()));
+            EXPECT_TRUE(m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(m_instanceMap[StreetEntityName]->GetContainerEntityId()));
+            EXPECT_FALSE(m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(m_instanceMap[CityEntityName]->GetContainerEntityId()));
+            EXPECT_FALSE(m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(m_entityMap[CityEntityName]->GetId()));
+            EXPECT_FALSE(m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(m_instanceMap[CarEntityName]->GetContainerEntityId()));
+            EXPECT_FALSE(m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(m_entityMap[Passenger1EntityName]->GetId()));
         }
     }
 
@@ -208,12 +213,12 @@ namespace UnitTest
     {
         // Verify IsOwningPrefabBeingFocused returns false for all entities not in a focused prefab (siblings)
         {
-            m_prefabFocusInterface->FocusOnOwningPrefab(m_instanceMap[SportsCarEntityName]->GetContainerEntityId());
+            m_prefabFocusPublicInterface->FocusOnOwningPrefab(m_instanceMap[SportsCarEntityName]->GetContainerEntityId());
 
-            EXPECT_TRUE(m_prefabFocusInterface->IsOwningPrefabBeingFocused(m_instanceMap[SportsCarEntityName]->GetContainerEntityId()));
-            EXPECT_TRUE(m_prefabFocusInterface->IsOwningPrefabBeingFocused(m_entityMap[Passenger2EntityName]->GetId()));
-            EXPECT_FALSE(m_prefabFocusInterface->IsOwningPrefabBeingFocused(m_instanceMap[CarEntityName]->GetContainerEntityId()));
-            EXPECT_FALSE(m_prefabFocusInterface->IsOwningPrefabBeingFocused(m_entityMap[Passenger1EntityName]->GetId()));
+            EXPECT_TRUE(m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(m_instanceMap[SportsCarEntityName]->GetContainerEntityId()));
+            EXPECT_TRUE(m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(m_entityMap[Passenger2EntityName]->GetId()));
+            EXPECT_FALSE(m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(m_instanceMap[CarEntityName]->GetContainerEntityId()));
+            EXPECT_FALSE(m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(m_entityMap[Passenger1EntityName]->GetId()));
         }
     }
 

From 10ab1a369fed6767a371b6afa89371ba6cb9ef01 Mon Sep 17 00:00:00 2001
From: AMZN-nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
Date: Wed, 13 Oct 2021 12:52:44 -0700
Subject: [PATCH 29/29] Adds Download status info UI to Gem Catalog  (#4602)

* Adds Download status info UI to Gem Catalog

Signed-off-by: nggieber <nggieber@amazon.com>

* Removed test code

Signed-off-by: nggieber <nggieber@amazon.com>

* Remove unused variable

Signed-off-by: nggieber <nggieber@amazon.com>

* Addressed PR feedback

Signed-off-by: nggieber <nggieber@amazon.com>

* Fixed Open3DEngine spelling

Signed-off-by: nggieber <nggieber@amazon.com>
---
 .../ProjectManager/Resources/Download.svg     |  3 +
 .../Resources/ProjectManager.qrc              |  4 +-
 .../Resources/{FeatureTagClose.svg => X.svg}  |  0
 .../ProjectManager/Resources/in_progress.gif  |  3 +
 .../Source/GemCatalog/GemFilterTagWidget.cpp  |  2 +-
 .../Source/GemCatalog/GemInfo.cpp             | 48 ++++++++----
 .../Source/GemCatalog/GemInfo.h               | 15 +++-
 .../Source/GemCatalog/GemItemDelegate.cpp     | 77 ++++++++++++++++++-
 .../Source/GemCatalog/GemItemDelegate.h       | 23 ++++--
 .../Source/GemCatalog/GemListHeaderWidget.cpp |  4 +-
 .../Source/GemCatalog/GemListView.cpp         | 15 +++-
 .../Source/GemCatalog/GemModel.cpp            | 11 +++
 .../Source/GemCatalog/GemModel.h              |  5 +-
 .../ProjectManager/Source/PythonBindings.cpp  | 16 +++-
 14 files changed, 194 insertions(+), 32 deletions(-)
 create mode 100644 Code/Tools/ProjectManager/Resources/Download.svg
 rename Code/Tools/ProjectManager/Resources/{FeatureTagClose.svg => X.svg} (100%)
 create mode 100644 Code/Tools/ProjectManager/Resources/in_progress.gif

diff --git a/Code/Tools/ProjectManager/Resources/Download.svg b/Code/Tools/ProjectManager/Resources/Download.svg
new file mode 100644
index 0000000000..c2b0c2ce3c
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/Download.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="11" viewBox="0 0 16 11" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.7872 2.91865C11.4965 1.25029 10.0476 0 8.31169 0C6.91408 0 5.66005 0.823481 5.09382 2.08042C5.05787 2.07875 5.02234 2.07792 4.98701 2.07792C3.81195 2.07792 2.7921 2.8241 2.42743 3.92062C0.986389 4.39377 0 5.73881 0 7.27273C0 9.22057 1.58462 10.8052 3.53247 10.8052H12.0519C14.229 10.8052 16 9.03418 16 6.85714C16 4.59242 14.085 2.75595 11.7872 2.91865ZM8.31169 9.35065L5.61039 6.44156H7.27273V4.57143H9.35065V6.44156H11.013L8.31169 9.35065Z" fill="#E4E8EB"/>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qrc b/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
index 30bcc1ace5..aeaf9a9248 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
@@ -34,9 +34,11 @@
         <file>Warning.svg</file>
         <file>Backgrounds/DefaultBackground.jpg</file>
         <file>Backgrounds/FtueBackground.jpg</file>
-        <file>FeatureTagClose.svg</file>
+        <file>X.svg</file>
         <file>Refresh.svg</file>
         <file>Edit.svg</file>
         <file>Delete.svg</file>
+        <file>Download.svg</file>
+        <file>in_progress.gif</file>
     </qresource>
 </RCC>
diff --git a/Code/Tools/ProjectManager/Resources/FeatureTagClose.svg b/Code/Tools/ProjectManager/Resources/X.svg
similarity index 100%
rename from Code/Tools/ProjectManager/Resources/FeatureTagClose.svg
rename to Code/Tools/ProjectManager/Resources/X.svg
diff --git a/Code/Tools/ProjectManager/Resources/in_progress.gif b/Code/Tools/ProjectManager/Resources/in_progress.gif
new file mode 100644
index 0000000000..eb392a9b89
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/in_progress.gif
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64985a78205da45f4bb92b040c348d96fe7cd7277549c1f79c430469a0d3bab7
+size 166393
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterTagWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterTagWidget.cpp
index 138880f44e..69a883d169 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterTagWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterTagWidget.cpp
@@ -33,7 +33,7 @@ namespace O3DE::ProjectManager
 
         m_closeButton = new QPushButton();
         m_closeButton->setFlat(true);
-        m_closeButton->setIcon(QIcon(":/FeatureTagClose.svg"));
+        m_closeButton->setIcon(QIcon(":/X.svg"));
         m_closeButton->setIconSize(QSize(12, 12));
         m_closeButton->setStyleSheet("QPushButton { background-color: transparent; border: 0px }");
         layout->addWidget(m_closeButton);
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.cpp
index 771d644617..cbdcf64162 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.cpp
@@ -8,6 +8,8 @@
 
 #include "GemInfo.h"
 
+#include <QObject>
+
 namespace O3DE::ProjectManager
 {
     GemInfo::GemInfo(const QString& name, const QString& creator, const QString& summary, Platforms platforms, bool isAdded)
@@ -29,17 +31,17 @@ namespace O3DE::ProjectManager
         switch (platform)
         {
         case Android:
-            return "Android";
+            return QObject::tr("Android");
         case iOS:
-            return "iOS";
+            return QObject::tr("iOS");
         case Linux:
-            return "Linux";
+            return QObject::tr("Linux");
         case macOS:
-            return "macOS";
+            return QObject::tr("macOS");
         case Windows:
-            return "Windows";
+            return QObject::tr("Windows");
         default:
-            return "<Unknown Platform>";
+            return QObject::tr("<Unknown Platform>");
         }
     }
 
@@ -48,13 +50,13 @@ namespace O3DE::ProjectManager
         switch (type)
         {
         case Asset:
-            return "Asset";
+            return QObject::tr("Asset");
         case Code:
-            return "Code";
+            return QObject::tr("Code");
         case Tool:
-            return "Tool";
+            return QObject::tr("Tool");
         default:
-            return "<Unknown Type>";
+            return QObject::tr("<Unknown Type>");
         }
     }
 
@@ -62,15 +64,33 @@ namespace O3DE::ProjectManager
     {
         switch (origin)
         {
-        case Open3DEEngine:
-            return "Open 3D Engine";
+        case Open3DEngine:
+            return QObject::tr("Open 3D Engine");
         case Local:
-            return "Local";
+            return QObject::tr("Local");
+        case Remote:
+            return QObject::tr("Remote");
         default:
-            return "<Unknown Gem Origin>";
+            return QObject::tr("<Unknown Gem Origin>");
         }
     }
 
+    QString GemInfo::GetDownloadStatusString(DownloadStatus status)
+    {
+        switch (status)
+        {
+        case NotDownloaded:
+            return QObject::tr("Not Downloaded");
+        case Downloading:
+            return QObject::tr("Downloading");
+        case Downloaded:
+            return QObject::tr("Downloaded");
+        case UnknownDownloadStatus:
+        default:
+            return QObject::tr("<Unknown Download Status>");
+        }
+    };
+
     bool GemInfo::IsPlatformSupported(Platform platform) const
     {
         return (m_platforms & platform);
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
index 311eeb93f6..8c6d40505a 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
@@ -44,13 +44,23 @@ namespace O3DE::ProjectManager
 
         enum GemOrigin
         {
-            Open3DEEngine = 1 << 0,
+            Open3DEngine = 1 << 0,
             Local = 1 << 1,
-            NumGemOrigins = 2
+            Remote = 1 << 2,
+            NumGemOrigins = 3
         };
         Q_DECLARE_FLAGS(GemOrigins, GemOrigin)
         static QString GetGemOriginString(GemOrigin origin);
 
+        enum DownloadStatus
+        {
+            UnknownDownloadStatus = -1,
+            NotDownloaded,
+            Downloading,
+            Downloaded,
+        };
+        static QString GetDownloadStatusString(DownloadStatus status);
+
         GemInfo() = default;
         GemInfo(const QString& name, const QString& creator, const QString& summary, Platforms platforms, bool isAdded);
         bool IsPlatformSupported(Platform platform) const;
@@ -68,6 +78,7 @@ namespace O3DE::ProjectManager
         QString m_summary = "No summary provided.";
         Platforms m_platforms;
         Types m_types; //! Asset and/or Code and/or Tool
+        DownloadStatus m_downloadStatus = UnknownDownloadStatus;
         QStringList m_features;
         QString m_requirement;
         QString m_directoryLink;
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
index 2c7f17db32..e15c4b3b39 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
@@ -10,6 +10,7 @@
 #include <GemCatalog/GemModel.h>
 #include <GemCatalog/GemSortFilterProxyModel.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
+
 #include <QEvent>
 #include <QAbstractItemView>
 #include <QPainter>
@@ -20,6 +21,7 @@
 #include <QTextDocument>
 #include <QAbstractTextDocumentLayout>
 #include <QDesktopServices>
+#include <QMovie>
 
 namespace O3DE::ProjectManager
 {
@@ -32,6 +34,11 @@ namespace O3DE::ProjectManager
         AddPlatformIcon(GemInfo::Linux, ":/Linux.svg");
         AddPlatformIcon(GemInfo::macOS, ":/macOS.svg");
         AddPlatformIcon(GemInfo::Windows, ":/Windows.svg");
+
+        SetStatusIcon(m_notDownloadedPixmap, ":/Download.svg");
+        SetStatusIcon(m_unknownStatusPixmap, ":/X.svg");
+
+        m_downloadingMovie = new QMovie(":/in_progress.gif");
     }
 
     void GemItemDelegate::AddPlatformIcon(GemInfo::Platform platform, const QString& iconPath)
@@ -41,6 +48,25 @@ namespace O3DE::ProjectManager
         m_platformIcons.insert(platform, QIcon(iconPath).pixmap(static_cast<int>(static_cast<qreal>(s_platformIconSize) * aspectRatio), s_platformIconSize));
     }
 
+    void GemItemDelegate::SetStatusIcon(QPixmap& m_iconPixmap, const QString& iconPath)
+    {
+        QPixmap pixmap(iconPath);
+        float aspectRatio = static_cast<float>(pixmap.width()) / pixmap.height();
+        int xScaler = s_statusIconSize;
+        int yScaler = s_statusIconSize;
+
+        if (aspectRatio > 1.0f)
+        {
+            yScaler = static_cast<int>(1.0f / aspectRatio * s_statusIconSize);
+        }
+        else if (aspectRatio < 1.0f)
+        {
+            xScaler = static_cast<int>(aspectRatio * s_statusIconSize);
+        }
+
+        m_iconPixmap = QPixmap(QIcon(iconPath).pixmap(xScaler, yScaler));
+    }
+
     void GemItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) const
     {
         if (!modelIndex.isValid())
@@ -56,6 +82,8 @@ namespace O3DE::ProjectManager
         QRect fullRect, itemRect, contentRect;
         CalcRects(options, fullRect, itemRect, contentRect);
 
+        QRect buttonRect = CalcButtonRect(contentRect);
+
         QFont standardFont(options.font);
         standardFont.setPixelSize(static_cast<int>(s_fontSize));
         QFontMetrics standardFontMetrics(standardFont);
@@ -114,7 +142,8 @@ namespace O3DE::ProjectManager
         const QRect summaryRect = CalcSummaryRect(contentRect, hasTags);
         DrawText(summary, painter, summaryRect, standardFont);
 
-        DrawButton(painter, contentRect, modelIndex);
+        DrawDownloadStatusIcon(painter, contentRect, buttonRect, modelIndex);
+        DrawButton(painter, buttonRect, modelIndex);
         DrawPlatformIcons(painter, contentRect, modelIndex);
         DrawFeatureTags(painter, contentRect, featureTags, standardFont, summaryRect);
 
@@ -270,7 +299,7 @@ namespace O3DE::ProjectManager
 
     QRect GemItemDelegate::CalcButtonRect(const QRect& contentRect) const
     {
-        const QPoint topLeft = QPoint(contentRect.right() - s_buttonWidth - s_itemMargins.right(), contentRect.top() + contentRect.height() / 2 - s_buttonHeight / 2);
+        const QPoint topLeft = QPoint(contentRect.right() - s_buttonWidth, contentRect.center().y() - s_buttonHeight / 2);
         const QSize size = QSize(s_buttonWidth, s_buttonHeight);
         return QRect(topLeft, size);
     }
@@ -378,10 +407,9 @@ namespace O3DE::ProjectManager
         painter->restore();
     }
 
-    void GemItemDelegate::DrawButton(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const
+    void GemItemDelegate::DrawButton(QPainter* painter, const QRect& buttonRect, const QModelIndex& modelIndex) const
     {
         painter->save();
-        const QRect buttonRect = CalcButtonRect(contentRect);
         QPoint circleCenter;
 
         if (GemModel::IsAdded(modelIndex))
@@ -427,4 +455,45 @@ namespace O3DE::ProjectManager
 
         return QString();
     }
+
+    void GemItemDelegate::DrawDownloadStatusIcon(QPainter* painter, const QRect& contentRect, const QRect& buttonRect, const QModelIndex& modelIndex) const
+    {
+        const GemInfo::DownloadStatus downloadStatus = GemModel::GetDownloadStatus(modelIndex);
+
+        // Show no icon if gem is already downloaded
+        if (downloadStatus == GemInfo::DownloadStatus::Downloaded)
+        {
+            return;
+        }
+
+        QPixmap currentFrame;
+        const QPixmap* statusPixmap;
+        if (downloadStatus == GemInfo::DownloadStatus::Downloading)
+        {
+            if (m_downloadingMovie->state() != QMovie::Running)
+            {
+                m_downloadingMovie->start();
+                emit MovieStartedPlaying(m_downloadingMovie);
+            }
+
+            currentFrame = m_downloadingMovie->currentPixmap();
+            currentFrame = currentFrame.scaled(s_statusIconSize, s_statusIconSize);
+            statusPixmap = &currentFrame;
+        }
+        else if (downloadStatus == GemInfo::DownloadStatus::NotDownloaded)
+        {
+            statusPixmap = &m_notDownloadedPixmap;
+        }
+        else
+        {
+            statusPixmap = &m_unknownStatusPixmap;
+        }
+
+        QSize statusSize = statusPixmap->size();
+
+        painter->drawPixmap(
+            buttonRect.left() - s_statusButtonSpacing - statusSize.width(),
+            contentRect.center().y() - statusSize.height() / 2,
+            *statusPixmap);
+    }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
index 52b5a4f58e..c013be0d9e 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
@@ -49,13 +49,13 @@ namespace O3DE::ProjectManager
 
         // Margin and borders
         inline constexpr static QMargins s_itemMargins = QMargins(/*left=*/16, /*top=*/8, /*right=*/16, /*bottom=*/8); // Item border distances
-        inline constexpr static QMargins s_contentMargins = QMargins(/*left=*/20, /*top=*/12, /*right=*/15, /*bottom=*/12); // Distances of the elements within an item to the item borders
+        inline constexpr static QMargins s_contentMargins = QMargins(/*left=*/20, /*top=*/12, /*right=*/20, /*bottom=*/12); // Distances of the elements within an item to the item borders
         inline constexpr static int s_borderWidth = 4;
 
         // Button
-        inline constexpr static int s_buttonWidth = 55;
-        inline constexpr static int s_buttonHeight = 18;
-        inline constexpr static int s_buttonBorderRadius = 9;
+        inline constexpr static int s_buttonWidth = 32;
+        inline constexpr static int s_buttonHeight = 16;
+        inline constexpr static int s_buttonBorderRadius = s_buttonHeight / 2;
         inline constexpr static int s_buttonCircleRadius = s_buttonBorderRadius - 2;
         inline constexpr static qreal s_buttonFontSize = 10.0;
 
@@ -65,6 +65,9 @@ namespace O3DE::ProjectManager
         inline constexpr static int s_featureTagBorderMarginY = 3;
         inline constexpr static int s_featureTagSpacing = 7;
 
+    signals:
+        void MovieStartedPlaying(const QMovie* playingMovie) const;
+
     protected:
         bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) override;
         bool helpEvent(QHelpEvent* event, QAbstractItemView* view, const QStyleOptionViewItem& option, const QModelIndex& index) override;
@@ -74,9 +77,10 @@ namespace O3DE::ProjectManager
         QRect CalcButtonRect(const QRect& contentRect) const;
         QRect CalcSummaryRect(const QRect& contentRect, bool hasTags) const;
         void DrawPlatformIcons(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const;
-        void DrawButton(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const;
+        void DrawButton(QPainter* painter, const QRect& buttonRect, const QModelIndex& modelIndex) const;
         void DrawFeatureTags(QPainter* painter, const QRect& contentRect, const QStringList& featureTags, const QFont& standardFont, const QRect& summaryRect) const;
         void DrawText(const QString& text, QPainter* painter, const QRect& rect, const QFont& standardFont) const;
+        void DrawDownloadStatusIcon(QPainter* painter, const QRect& contentRect, const QRect& buttonRect, const QModelIndex& modelIndex) const;
 
         QAbstractItemModel* m_model = nullptr;
 
@@ -85,5 +89,14 @@ namespace O3DE::ProjectManager
         void AddPlatformIcon(GemInfo::Platform platform, const QString& iconPath);
         inline constexpr static int s_platformIconSize = 12;
         QHash<GemInfo::Platform, QPixmap> m_platformIcons;
+
+        // Status icons
+        void SetStatusIcon(QPixmap& m_iconPixmap, const QString& iconPath);
+        inline constexpr static int s_statusIconSize = 16;
+        inline constexpr static int s_statusButtonSpacing = 5;
+
+        QPixmap m_unknownStatusPixmap;
+        QPixmap m_notDownloadedPixmap;
+        QMovie* m_downloadingMovie = nullptr;
     };
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
index ab51c7511c..10ff31f33b 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
@@ -103,11 +103,11 @@ namespace O3DE::ProjectManager
         QSpacerItem* horizontalSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
         columnHeaderLayout->addSpacerItem(horizontalSpacer);
 
-        QLabel* gemSelectedLabel = new QLabel(tr("Selected"));
+        QLabel* gemSelectedLabel = new QLabel(tr("Status"));
         gemSelectedLabel->setObjectName("GemCatalogHeaderLabel");
         columnHeaderLayout->addWidget(gemSelectedLabel);
 
-        columnHeaderLayout->addSpacing(65);
+        columnHeaderLayout->addSpacing(72);
 
         vLayout->addLayout(columnHeaderLayout);
     }
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.cpp
index f5b54a364b..cfdf7fa5b3 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemListView.cpp
@@ -9,6 +9,8 @@
 #include <GemCatalog/GemListView.h>
 #include <GemCatalog/GemItemDelegate.h>
 
+#include <QMovie>
+
 namespace O3DE::ProjectManager
 {
     GemListView::GemListView(QAbstractItemModel* model, QItemSelectionModel* selectionModel, QWidget* parent)
@@ -19,6 +21,17 @@ namespace O3DE::ProjectManager
 
         setModel(model);
         setSelectionModel(selectionModel);
-        setItemDelegate(new GemItemDelegate(model, this));
+        GemItemDelegate* itemDelegate = new GemItemDelegate(model, this);
+        
+        connect(itemDelegate, &GemItemDelegate::MovieStartedPlaying, [=](const QMovie* playingMovie)
+            {
+                // Force redraw when movie is playing so animation is smooth
+                connect(playingMovie, &QMovie::frameChanged, this, [=]
+                    {
+                        this->viewport()->repaint();
+                    });
+            });
+
+        setItemDelegate(itemDelegate);
     }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp
index c8911de360..35491f4ddd 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp
@@ -48,6 +48,7 @@ namespace O3DE::ProjectManager
         item->setData(gemInfo.m_features, RoleFeatures);
         item->setData(gemInfo.m_path, RolePath);
         item->setData(gemInfo.m_requirement, RoleRequirement);
+        item->setData(gemInfo.m_downloadStatus, RoleDownloadStatus);
 
         appendRow(item);
 
@@ -132,6 +133,11 @@ namespace O3DE::ProjectManager
         return static_cast<GemInfo::Types>(modelIndex.data(RoleTypes).toInt());
     }
 
+    GemInfo::DownloadStatus GemModel::GetDownloadStatus(const QModelIndex& modelIndex)
+    {
+        return static_cast<GemInfo::DownloadStatus>(modelIndex.data(RoleDownloadStatus).toInt());
+    }
+
     QString GemModel::GetSummary(const QModelIndex& modelIndex)
     {
         return modelIndex.data(RoleSummary).toString();
@@ -373,6 +379,11 @@ namespace O3DE::ProjectManager
         return previouslyAdded && !added;
     }
 
+    void GemModel::SetDownloadStatus(QAbstractItemModel& model, const QModelIndex& modelIndex, GemInfo::DownloadStatus status)
+    {
+        model.setData(modelIndex, status, RoleDownloadStatus);
+    }
+
     bool GemModel::HasRequirement(const QModelIndex& modelIndex)
     {
         return !modelIndex.data(RoleRequirement).toString().isEmpty();
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h
index ef2d1a903d..0d1c225f74 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h
@@ -40,6 +40,7 @@ namespace O3DE::ProjectManager
         static GemInfo::GemOrigin GetGemOrigin(const QModelIndex& modelIndex);
         static GemInfo::Platforms GetPlatforms(const QModelIndex& modelIndex);
         static GemInfo::Types GetTypes(const QModelIndex& modelIndex);
+        static GemInfo::DownloadStatus GetDownloadStatus(const QModelIndex& modelIndex);
         static QString GetSummary(const QModelIndex& modelIndex);
         static QString GetDirectoryLink(const QModelIndex& modelIndex);
         static QString GetDocLink(const QModelIndex& modelIndex);
@@ -64,6 +65,7 @@ namespace O3DE::ProjectManager
         static bool NeedsToBeRemoved(const QModelIndex& modelIndex, bool includeDependencies = false);
         static bool HasRequirement(const QModelIndex& modelIndex);
         static void UpdateDependencies(QAbstractItemModel& model, const QModelIndex& modelIndex);
+        static void SetDownloadStatus(QAbstractItemModel& model, const QModelIndex& modelIndex, GemInfo::DownloadStatus status);
 
         bool DoGemsToBeAddedHaveRequirements() const;
         bool HasDependentGemsToRemove() const;
@@ -101,7 +103,8 @@ namespace O3DE::ProjectManager
             RoleFeatures,
             RoleTypes,
             RolePath,
-            RoleRequirement
+            RoleRequirement,
+            RoleDownloadStatus
         };
 
         QHash<QString, QModelIndex> m_nameToIndexMap;
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
index 83f93630ac..d91f08c73e 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
@@ -668,7 +668,21 @@ namespace O3DE::ProjectManager
 
                 if (gemInfo.m_creator.contains("Open 3D Engine"))
                 {
-                    gemInfo.m_gemOrigin = GemInfo::GemOrigin::Open3DEEngine;
+                    gemInfo.m_gemOrigin = GemInfo::GemOrigin::Open3DEngine;
+                }
+                else if (gemInfo.m_creator.contains("Amazon Web Services"))
+                {
+                    gemInfo.m_gemOrigin = GemInfo::GemOrigin::Local;
+                }
+                else if (data.contains("origin"))
+                {
+                    gemInfo.m_gemOrigin = GemInfo::GemOrigin::Remote;
+                }
+
+                // As long Base Open3DEngine gems are installed before first startup non-remote gems will be downloaded
+                if (gemInfo.m_gemOrigin != GemInfo::GemOrigin::Remote)
+                {
+                    gemInfo.m_downloadStatus = GemInfo::DownloadStatus::Downloaded;
                 }
 
                 if (data.contains("user_tags"))