diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/material_editor_utils.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/material_editor_utils.py
index c3c1c76611..90f9399c1c 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/material_editor_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/material_editor_utils.py
@@ -162,11 +162,11 @@ def select_model_config(configname):
     azlmbr.materialeditor.MaterialViewportRequestBus(azlmbr.bus.Broadcast, "SelectModelPresetByName", configname)
 
 
-def destroy_main_window():
+def exit():
     """
-    Closes the Material Editor window
+    Closes the Material Editor
     """
-    azlmbr.atomtools.AtomToolsMainWindowFactoryRequestBus(azlmbr.bus.Broadcast, "DestroyMainWindow")
+    azlmbr.atomtools.general.exit()
 
 
 def wait_for_condition(function, timeout_in_seconds=1.0):
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomMaterialEditor_BasicTests.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomMaterialEditor_BasicTests.py
index bd00a84919..f881660f33 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomMaterialEditor_BasicTests.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomMaterialEditor_BasicTests.py
@@ -214,7 +214,7 @@ def run():
                                        (not material_editor.is_open(document1_id)) and
                                        (not material_editor.is_open(document2_id)) and
                                        (not material_editor.is_open(document3_id)), 2.0)
-    material_editor.destroy_main_window()
+    material_editor.exit()
 
 
 if __name__ == "__main__":
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py
index 887bfe2426..58a0b42394 100755
--- a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py
@@ -61,6 +61,7 @@ class TestAutomation(TestAutomationBase):
         from . import Graph_HappyPath_ZoomInZoomOut as test_module
         self._run_test(request, workspace, editor, test_module)
 
+    @pytest.mark.xfail(reason="Test fails on nightly build builds, it needs to be fixed.")
     def test_NodePalette_HappyPath_CanSelectNode(self, request, workspace, editor, launcher_platform):
         from . import NodePalette_HappyPath_CanSelectNode as test_module
         self._run_test(request, workspace, editor, test_module)
@@ -113,6 +114,7 @@ class TestAutomation(TestAutomationBase):
         from . import Debugger_HappyPath_TargetMultipleGraphs as test_module
         self._run_test(request, workspace, editor, test_module)
 
+    @pytest.mark.xfail(reason="Test fails on nightly build builds, it needs to be fixed.")
     @pytest.mark.parametrize("level", ["tmp_level"])
     def test_Debugger_HappyPath_TargetMultipleEntities(self, request, workspace, editor, launcher_platform, project, level):
         def teardown():
@@ -174,6 +176,7 @@ class TestAutomation(TestAutomationBase):
         from . import ScriptEvents_ReturnSetType_Successfully as test_module
         self._run_test(request, workspace, editor, test_module)
 
+    @pytest.mark.xfail(reason="Test fails on nightly build builds, it needs to be fixed.")
     def test_NodeCategory_ExpandOnClick(self, request, workspace, editor, launcher_platform):
         from . import NodeCategory_ExpandOnClick as test_module
         self._run_test(request, workspace, editor, test_module)
@@ -187,6 +190,7 @@ class TestAutomation(TestAutomationBase):
         from . import VariableManager_UnpinVariableType_Works as test_module
         self._run_test(request, workspace, editor, test_module)
 
+    @pytest.mark.xfail(reason="Test fails on nightly build builds, it needs to be fixed.")
     def test_Node_HappyPath_DuplicateNode(self, request, workspace, editor, launcher_platform):
         from . import Node_HappyPath_DuplicateNode as test_module
         self._run_test(request, workspace, editor, test_module)
@@ -263,6 +267,7 @@ class TestScriptCanvasTests(object):
             timeout=60,
         )
 
+    @pytest.mark.xfail(reason="Test fails on nightly build builds, it needs to be fixed.")
     def test_VariableManager_Default_CreateDeleteVars(self, request, editor, launcher_platform):
         var_types = ["Boolean", "Color", "EntityID", "Number", "String", "Transform", "Vector2", "Vector3", "Vector4"]
         expected_lines = [f"Success: {var_type} variable is created" for var_type in var_types]
diff --git a/AutomatedTesting/Levels/Graphics/macbeth_shaderballs/macbeth_shaderballs.prefab b/AutomatedTesting/Levels/Graphics/macbeth_shaderballs/macbeth_shaderballs.prefab
index 22504f168a..69b1eac762 100644
--- a/AutomatedTesting/Levels/Graphics/macbeth_shaderballs/macbeth_shaderballs.prefab
+++ b/AutomatedTesting/Levels/Graphics/macbeth_shaderballs/macbeth_shaderballs.prefab
@@ -38,7 +38,10 @@
             },
             "Component_[7874177159288365422]": {
                 "$type": "EditorEntitySortComponent",
-                "Id": 7874177159288365422
+                "Id": 7874177159288365422,
+                "Child Entity Order": [
+                    "Entity_[471076350497]"
+                ]
             },
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
@@ -110,34 +113,14 @@
                 "Component_[16871442125196328877]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 16871442125196328877,
-                    "ChildEntityOrderEntryArray": [
-                        {
-                            "EntityId": "Entity_[604220336673]"
-                        },
-                        {
-                            "EntityId": "Entity_[599925369377]",
-                            "SortIndex": 1
-                        },
-                        {
-                            "EntityId": "Entity_[475371317793]",
-                            "SortIndex": 2
-                        },
-                        {
-                            "EntityId": "Entity_[509731056161]",
-                            "SortIndex": 3
-                        },
-                        {
-                            "EntityId": "Entity_[505436088865]",
-                            "SortIndex": 4
-                        },
-                        {
-                            "EntityId": "Entity_[539795827233]",
-                            "SortIndex": 5
-                        },
-                        {
-                            "EntityId": "Entity_[569860598305]",
-                            "SortIndex": 6
-                        }
+                    "Child Entity Order": [
+                        "Entity_[604220336673]",
+                        "Entity_[599925369377]",
+                        "Entity_[475371317793]",
+                        "Entity_[509731056161]",
+                        "Entity_[505436088865]",
+                        "Entity_[539795827233]",
+                        "Entity_[569860598305]"
                     ]
                 },
                 "Component_[18389136819207633744]": {
@@ -263,10 +246,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -370,10 +353,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -477,10 +460,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -584,10 +567,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -691,10 +674,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -798,10 +781,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -905,10 +888,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -944,30 +927,13 @@
                 "Component_[11056805018150955063]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 11056805018150955063,
-                    "ChildEntityOrderEntryArray": [
-                        {
-                            "EntityId": "Entity_[488256219681]"
-                        },
-                        {
-                            "EntityId": "Entity_[483961252385]",
-                            "SortIndex": 1
-                        },
-                        {
-                            "EntityId": "Entity_[479666285089]",
-                            "SortIndex": 2
-                        },
-                        {
-                            "EntityId": "Entity_[492551186977]",
-                            "SortIndex": 3
-                        },
-                        {
-                            "EntityId": "Entity_[496846154273]",
-                            "SortIndex": 4
-                        },
-                        {
-                            "EntityId": "Entity_[501141121569]",
-                            "SortIndex": 5
-                        }
+                    "Child Entity Order": [
+                        "Entity_[488256219681]",
+                        "Entity_[483961252385]",
+                        "Entity_[479666285089]",
+                        "Entity_[492551186977]",
+                        "Entity_[496846154273]",
+                        "Entity_[501141121569]"
                     ]
                 },
                 "Component_[11466054095979053511]": {
@@ -1028,30 +994,13 @@
                 "Component_[11056805018150955063]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 11056805018150955063,
-                    "ChildEntityOrderEntryArray": [
-                        {
-                            "EntityId": "Entity_[522615958049]"
-                        },
-                        {
-                            "EntityId": "Entity_[518320990753]",
-                            "SortIndex": 1
-                        },
-                        {
-                            "EntityId": "Entity_[514026023457]",
-                            "SortIndex": 2
-                        },
-                        {
-                            "EntityId": "Entity_[526910925345]",
-                            "SortIndex": 3
-                        },
-                        {
-                            "EntityId": "Entity_[531205892641]",
-                            "SortIndex": 4
-                        },
-                        {
-                            "EntityId": "Entity_[535500859937]",
-                            "SortIndex": 5
-                        }
+                    "Child Entity Order": [
+                        "Entity_[522615958049]",
+                        "Entity_[518320990753]",
+                        "Entity_[514026023457]",
+                        "Entity_[526910925345]",
+                        "Entity_[531205892641]",
+                        "Entity_[535500859937]"
                     ]
                 },
                 "Component_[11466054095979053511]": {
@@ -1180,10 +1129,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -1287,10 +1236,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -1394,10 +1343,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -1501,10 +1450,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -1608,10 +1557,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -1715,10 +1664,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -1754,30 +1703,13 @@
                 "Component_[11056805018150955063]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 11056805018150955063,
-                    "ChildEntityOrderEntryArray": [
-                        {
-                            "EntityId": "Entity_[552680729121]"
-                        },
-                        {
-                            "EntityId": "Entity_[548385761825]",
-                            "SortIndex": 1
-                        },
-                        {
-                            "EntityId": "Entity_[544090794529]",
-                            "SortIndex": 2
-                        },
-                        {
-                            "EntityId": "Entity_[556975696417]",
-                            "SortIndex": 3
-                        },
-                        {
-                            "EntityId": "Entity_[561270663713]",
-                            "SortIndex": 4
-                        },
-                        {
-                            "EntityId": "Entity_[565565631009]",
-                            "SortIndex": 5
-                        }
+                    "Child Entity Order": [
+                        "Entity_[552680729121]",
+                        "Entity_[548385761825]",
+                        "Entity_[544090794529]",
+                        "Entity_[556975696417]",
+                        "Entity_[561270663713]",
+                        "Entity_[565565631009]"
                     ]
                 },
                 "Component_[11466054095979053511]": {
@@ -1906,10 +1838,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -2013,10 +1945,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -2120,10 +2052,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -2227,10 +2159,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -2334,10 +2266,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -2441,10 +2373,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -2480,30 +2412,13 @@
                 "Component_[11056805018150955063]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 11056805018150955063,
-                    "ChildEntityOrderEntryArray": [
-                        {
-                            "EntityId": "Entity_[582745500193]"
-                        },
-                        {
-                            "EntityId": "Entity_[578450532897]",
-                            "SortIndex": 1
-                        },
-                        {
-                            "EntityId": "Entity_[574155565601]",
-                            "SortIndex": 2
-                        },
-                        {
-                            "EntityId": "Entity_[587040467489]",
-                            "SortIndex": 3
-                        },
-                        {
-                            "EntityId": "Entity_[591335434785]",
-                            "SortIndex": 4
-                        },
-                        {
-                            "EntityId": "Entity_[595630402081]",
-                            "SortIndex": 5
-                        }
+                    "Child Entity Order": [
+                        "Entity_[582745500193]",
+                        "Entity_[578450532897]",
+                        "Entity_[574155565601]",
+                        "Entity_[587040467489]",
+                        "Entity_[591335434785]",
+                        "Entity_[595630402081]"
                     ]
                 },
                 "Component_[11466054095979053511]": {
@@ -2632,10 +2547,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -2739,10 +2654,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -2846,10 +2761,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -2953,10 +2868,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -3060,10 +2975,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
@@ -3167,10 +3082,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
-                                    "subId": 268677693
+                                    "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}",
+                                    "subId": 281415304
                                 },
-                                "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+                                "assetHint": "objects/shaderball/shaderball_default_1m.azmodel"
                             },
                             "LodOverride": 255
                         }
diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path.h b/Code/Framework/AzCore/AzCore/IO/Path/Path.h
index 235310a5da..3c2c4f0a8c 100644
--- a/Code/Framework/AzCore/AzCore/IO/Path/Path.h
+++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.h
@@ -709,7 +709,10 @@ namespace AZ::IO
 
         constexpr reference operator*() const;
 
-        constexpr pointer operator->() const;
+        constexpr pointer operator->() const
+        {
+            return &m_stashed_elem;
+        }
 
         constexpr PathIterator& operator++();
 
diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path.inl b/Code/Framework/AzCore/AzCore/IO/Path/Path.inl
index bde2353112..5046b43127 100644
--- a/Code/Framework/AzCore/AzCore/IO/Path/Path.inl
+++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.inl
@@ -1397,12 +1397,6 @@ namespace AZ::IO
         return m_stashed_elem;
     }
 
-    template <typename PathType>
-    constexpr auto PathIterator<PathType>::operator->() const -> pointer
-    {
-        return &m_stashed_elem;
-    }
-
     template <typename PathType>
     constexpr auto PathIterator<PathType>::operator++() -> PathIterator&
     {
@@ -1542,3 +1536,13 @@ namespace AZ::IO
     extern template bool operator!=<const FixedMaxPath>(const PathIterator<const FixedMaxPath>& lhs,
         const PathIterator<const FixedMaxPath>& rhs);
 }
+
+namespace AZStd::ranges
+{
+    // A PathView is a borrowed range, it does not own the content of the Path it is viewing
+    template<>
+    inline constexpr bool enable_borrowed_range<AZ::IO::PathView> = true;
+
+    template<>
+    inline constexpr bool enable_view<AZ::IO::PathView> = true;
+}
diff --git a/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp b/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp
index 5e0e3e2de8..9af99a05b9 100644
--- a/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/HphaSchema.cpp
@@ -13,6 +13,7 @@
 #include <AzCore/Memory/OSAllocator.h> // required by certain platforms
 #include <AzCore/std/parallel/mutex.h>
 #include <AzCore/std/parallel/lock.h>
+#include <AzCore/std/containers/intrusive_list.h>
 #include <AzCore/std/containers/intrusive_set.h>
 
 #ifdef _DEBUG
@@ -56,212 +57,6 @@ namespace AZ {
 // Enabled mutex per bucket
 #define USE_MUTEX_PER_BUCKET
 
-    //////////////////////////////////////////////////////////////////////////
-    // TODO: Replace with AZStd::intrusive_list
-    class intrusive_list_base
-    {
-    public:
-        class node_base
-        {
-            node_base* mPrev;
-            node_base* mNext;
-        public:
-            node_base* next() const {return mNext; }
-            node_base* prev() const {return mPrev; }
-            void reset()
-            {
-                mPrev = this;
-                mNext = this;
-            }
-            void unlink()
-            {
-                mNext->mPrev = mPrev;
-                mPrev->mNext = mNext;
-            }
-            void link(node_base* node)
-            {
-                mPrev = node->mPrev;
-                mNext = node;
-                node->mPrev = this;
-                mPrev->mNext = this;
-            }
-        };
-        intrusive_list_base()
-        {
-            mHead.reset();
-        }
-        intrusive_list_base(const intrusive_list_base&)
-        {
-            mHead.reset();
-        }
-        bool empty() const {return mHead.next() == &mHead; }
-        void swap(intrusive_list_base& other)
-        {
-            node_base* node = &other.mHead;
-            if (!empty())
-            {
-                node = mHead.next();
-                mHead.unlink();
-                mHead.reset();
-            }
-            node_base* other_node = &mHead;
-            if (!other.empty())
-            {
-                other_node = other.mHead.next();
-                other.mHead.unlink();
-                other.mHead.reset();
-            }
-            mHead.link(other_node);
-            other.mHead.link(node);
-        }
-    protected:
-        node_base mHead;
-    };
-
-    //////////////////////////////////////////////////////////////////////////
-    // TODO: Replace with AZStd::intrusive_list
-    template<class T>
-    class intrusive_list
-        : public intrusive_list_base
-    {
-        intrusive_list(const intrusive_list& rhs);
-        intrusive_list& operator=(const intrusive_list& rhs);
-    public:
-        class node
-            : public node_base
-        {
-        public:
-            T* next() const {return static_cast<T*>(node_base::next()); }
-            T* prev() const {return static_cast<T*>(node_base::prev()); }
-            const T& data() const {return *static_cast<const T*>(this); }
-            T& data() {return *static_cast<T*>(this); }
-        };
-
-        class const_iterator;
-        class iterator
-        {
-            using reference = T&;
-            using pointer = T*;
-            friend class const_iterator;
-            T* mPtr;
-        public:
-            iterator()
-                : mPtr(0) {}
-            explicit iterator(T* ptr)
-                : mPtr(ptr) {}
-            reference operator*() const {return mPtr->data(); }
-            pointer operator->() const {return &mPtr->data(); }
-            operator pointer() const {
-                return &mPtr->data();
-            }
-            iterator& operator++()
-            {
-                mPtr = mPtr->next();
-                return *this;
-            }
-            iterator& operator--()
-            {
-                mPtr = mPtr->prev();
-                return *this;
-            }
-            bool operator==(const iterator& rhs) const {return mPtr == rhs.mPtr; }
-            bool operator!=(const iterator& rhs) const {return mPtr != rhs.mPtr; }
-            T* ptr() const {return mPtr; }
-        };
-
-        class const_iterator
-        {
-            using reference = const T &;
-            using pointer = const T *;
-            const T* mPtr;
-        public:
-            const_iterator()
-                : mPtr(0) {}
-            explicit const_iterator(const T* ptr)
-                : mPtr(ptr) {}
-            const_iterator(const iterator& it)
-                : mPtr(it.mPtr) {}
-            reference operator*() const {return mPtr->data(); }
-            pointer operator->() const {return &mPtr->data(); }
-            operator pointer() const {
-                return &mPtr->data();
-            }
-            const_iterator& operator++()
-            {
-                mPtr = mPtr->next();
-                return *this;
-            }
-            const_iterator& operator--()
-            {
-                mPtr = mPtr->prev();
-                return *this;
-            }
-            bool operator==(const const_iterator& rhs) const {return mPtr == rhs.mPtr; }
-            bool operator!=(const const_iterator& rhs) const {return mPtr != rhs.mPtr; }
-            const T* ptr() const {return mPtr; }
-        };
-
-        intrusive_list()
-            : intrusive_list_base() {}
-        ~intrusive_list() {clear(); }
-
-        const_iterator begin() const {return const_iterator((const T*)mHead.next()); }
-        iterator begin() {return iterator((T*)mHead.next()); }
-        const_iterator end() const {return const_iterator((const T*)&mHead); }
-        iterator end() {return iterator((T*)&mHead); }
-
-        const T& front() const
-        {
-            HPPA_ASSERT(!empty());
-            return *begin();
-        }
-        T& front()
-        {
-            HPPA_ASSERT(!empty());
-            return *begin();
-        }
-        const T& back() const
-        {
-            HPPA_ASSERT(!empty());
-            return *(--end());
-        }
-        T& back()
-        {
-            HPPA_ASSERT(!empty());
-            return *(--end());
-        }
-
-        void push_front(T* v) {insert(this->begin(), v); }
-        void pop_front() {erase(this->begin()); }
-        void push_back(T* v) {insert(this->end(), v); }
-        void pop_back() {erase(--(this->end())); }
-
-        iterator insert(iterator where, T* node)
-        {
-            T* newLink = node;
-            newLink->link(where.ptr());
-            return iterator(newLink);
-        }
-        iterator erase(iterator where)
-        {
-            T* node = where.ptr();
-            ++where;
-            node->unlink();
-            return where;
-        }
-        void erase(T* node)
-        {
-            node->unlink();
-        }
-        void clear()
-        {
-            while (!this->empty())
-            {
-                this->pop_back();
-            }
-        }
-    };
-
     //////////////////////////////////////////////////////////////////////////
     class HpAllocator
     {
@@ -376,7 +171,7 @@ namespace AZ {
         };
         struct page
             : public block_header_proxy     /* must be first */
-            , public intrusive_list<page>::node
+            , public AZStd::list_base_hook<page>::node_type
         {
             page(size_t elemSize, size_t pageSize, size_t marker)
                 : mBucketIndex((unsigned short)bucket_spacing_function_aligned(elemSize))
@@ -415,7 +210,7 @@ namespace AZ {
             void dec_ref()                          { HPPA_ASSERT(mUseCount > 0); mUseCount--; }
             bool check_marker(size_t marker) const  { return mMarker == (marker ^ ((size_t)this)); }
         };
-        using page_list = intrusive_list<page>;
+        using page_list = AZStd::intrusive_list<page, AZStd::list_base_hook<page>>;
         class bucket
         {
             page_list mPageList;
@@ -442,16 +237,17 @@ namespace AZ {
     #endif
 #endif
             size_t marker() const {return mMarker; }
-            const page* page_list_begin() const {return mPageList.begin(); }
-            page* page_list_begin() {return mPageList.begin(); }
-            const page* page_list_end() const {return mPageList.end(); }
-            page* page_list_end() {return mPageList.end(); }
+            auto page_list_begin() const {return mPageList.begin(); }
+            auto page_list_begin() {return mPageList.begin(); }
+            auto page_list_end() const {return mPageList.end(); }
+            auto page_list_end() {return mPageList.end(); }
             bool page_list_empty() const {return mPageList.empty(); }
-            void add_free_page(page* p) {mPageList.push_front(p); }
+            void add_free_page(page* p) {mPageList.push_front(*p); }
             page* get_free_page();
             const page* get_free_page() const;
             void* alloc(page* p);
             void free(page* p, void* ptr);
+            void unlink(page* p);
         };
         void* bucket_system_alloc();
         void bucket_system_free(void* ptr);
@@ -1278,8 +1074,8 @@ namespace AZ {
         if (!next)
         {
             // if full, auto sort to back
-            p->unlink();
-            mPageList.push_back(p);
+            mPageList.erase(*p);
+            mPageList.push_back(*p);
         }
         return (void*)free;
     }
@@ -1295,11 +1091,16 @@ namespace AZ {
         if (!free)
         {
             // if the page was previously full, auto sort to front
-            p->unlink();
-            mPageList.push_front(p);
+            mPageList.erase(*p);
+            mPageList.push_front(*p);
         }
     }
 
+    void HpAllocator::bucket::unlink(page* p)
+    {
+        mPageList.erase(*p);
+    }
+
     void* HpAllocator::bucket_system_alloc()
     {
         void* ptr;
@@ -1522,8 +1323,8 @@ namespace AZ {
             AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
     #endif
 #endif
-            const page* pageEnd = mBuckets[i].page_list_end();
-            for (const page* p = mBuckets[i].page_list_begin(); p != pageEnd; )
+            auto pageEnd = mBuckets[i].page_list_end();
+            for (auto p = mBuckets[i].page_list_begin(); p != pageEnd; )
             {
                 // early out if we reach fully occupied page (the remaining should all be full)
                 if (p->mFreeList == nullptr)
@@ -1537,7 +1338,7 @@ namespace AZ {
                 {
                     AZ_TracePrintf("System", "Unused Bucket %d page %p elementSize: %d available: %d elements\n", i, p, elementSize, availableMemory / elementSize);
                 }
-                p = p->next();
+                p = p->m_next;
             }
         }
         return unusedMemory;
@@ -1554,21 +1355,21 @@ namespace AZ {
             AZStd::lock_guard<AZStd::mutex> lock(m_mutex);
     #endif
 #endif
-            page* pageEnd = mBuckets[i].page_list_end();
-            for (page* p = mBuckets[i].page_list_begin(); p != pageEnd; )
+            auto pageEnd = mBuckets[i].page_list_end();
+            for (auto p = mBuckets[i].page_list_begin(); p != pageEnd; )
             {
                 // early out if we reach fully occupied page (the remaining should all be full)
                 if (p->mFreeList == nullptr)
                 {
                     break;
                 }
-                page* next = p->next();
+                page* next = p->m_next;
                 if (p->empty())
                 {
                     HPPA_ASSERT(p->mFreeList);
-                    p->unlink();
+                    mBuckets[i].unlink(AZStd::to_address(p));
                     p->setInvalid();
-                    bucket_system_free(p);
+                    bucket_system_free(AZStd::to_address(p));
                 }
                 p = next;
             }
@@ -2239,11 +2040,17 @@ namespace AZ {
 
     size_t HpAllocator::tree_get_max_allocation() const
     {
+#ifdef MULTITHREADED
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(mTreeMutex);
+#endif
         return mFreeTree.maximum()->get_block()->size();
     }
 
     size_t HpAllocator::tree_get_unused_memory(bool isPrint) const
     {
+#ifdef MULTITHREADED
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(mTreeMutex);
+#endif
         size_t unusedMemory = 0;
         for (free_node_tree::const_iterator it = mFreeTree.begin(); it != mFreeTree.end(); ++it)
         {
diff --git a/Code/Framework/AzCore/AzCore/PlatformDef.h b/Code/Framework/AzCore/AzCore/PlatformDef.h
index 8416099f15..d10b155127 100644
--- a/Code/Framework/AzCore/AzCore/PlatformDef.h
+++ b/Code/Framework/AzCore/AzCore/PlatformDef.h
@@ -83,7 +83,7 @@
 #define AZ_PUSH_DISABLE_WARNING_GCC(_gccOption)
 
 /// Compiler specific AZ_POP_DISABLE_WARNING. This needs to be matched with the compiler specific AZ_PUSH_DISABLE_WARNINGs
-#define AZ_POP_DISABLE_WARNING_CLANG                     
+#define AZ_POP_DISABLE_WARNING_CLANG
 #define AZ_POP_DISABLE_WARNING_MSVC                     \
     __pragma(warning(pop))
 #define AZ_POP_DISABLE_WARNING_GCC
@@ -176,7 +176,7 @@
 #define AZ_PUSH_DISABLE_WARNING_3(_1, _2, _gccOption)   AZ_PUSH_DISABLE_WARNING_GCC(_gccOption)
 
 /// Pops the warning stack. For use matched with an AZ_PUSH_DISABLE_WARNING
-#define AZ_POP_DISABLE_WARNING                              
+#define AZ_POP_DISABLE_WARNING
     _Pragma("GCC diagnostic pop")
 
 #endif // defined(AZ_COMPILER_CLANG)
@@ -303,3 +303,10 @@
 #if !defined(az_has_builtin_wmemmove)
     #define az_has_builtin_wmemmove false
 #endif
+
+// no unique address attribute support in C++17
+#if __has_cpp_attribute(no_unique_address)
+    #define AZ_NO_UNIQUE_ADDRESS [[no_unique_address]]
+#else
+    #define AZ_NO_UNIQUE_ADDRESS
+#endif
diff --git a/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl b/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl
index bba79e36f7..af814fbd32 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl
+++ b/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl
@@ -13,6 +13,7 @@
 #include <AzCore/ScriptCanvas/ScriptCanvasOnDemandNames.h>
 #include <AzCore/RTTI/AzStdOnDemandPrettyName.inl>
 #include <AzCore/RTTI/AzStdOnDemandReflectionLuaFunctions.inl>
+#include <AzCore/std/optional.h>
 
 #ifndef AZ_USE_CUSTOM_SCRIPT_BIND
 struct lua_State;
@@ -47,10 +48,6 @@ namespace AZStd
     class intrusive_ptr;
     template<class T>
     class shared_ptr;
-
-    // Wrapper types
-    template <typename T>
-    class optional;
 }
 
 namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h b/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
index 2cff17a638..0f292140dc 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
+++ b/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h
@@ -18,6 +18,7 @@
 #include <AzCore/std/typetraits/has_member_function.h>
 #include <AzCore/std/typetraits/void_t.h>
 #include <AzCore/std/function/invoke.h>
+#include <AzCore/std/optional.h>
 
 #include <AzCore/Math/Uuid.h>
 #include <AzCore/Math/Crc.h>
@@ -89,9 +90,6 @@ namespace AZStd
     template<class Signature>
     class function;
 
-    template<class T>
-    class optional;
-
     struct monostate;
 
     template<class... Types>
@@ -150,7 +148,7 @@ namespace AZ
         template <template <typename...> class> constexpr bool false_v1 = false;
 #if defined(AZ_COMPILER_MSVC)
         // There is a bug with the MSVC compiler when using the 'auto' keyword here. It appears that MSVC is unable to distinguish between a template
-        // template argument with a type variadic pack vs a template template argument with a non-type auto variadic pack. 
+        // template argument with a type variadic pack vs a template template argument with a non-type auto variadic pack.
         template<template<AZStd::size_t...> class> constexpr bool false_v2 = false;
 #else
         template<template<auto...> class> constexpr bool false_v2 = false;
@@ -176,7 +174,7 @@ namespace AZ
         }
 #if defined(AZ_COMPILER_MSVC)
         // There is a bug with the MSVC compiler when using the 'auto' keyword here. It appears that MSVC is unable to distinguish between a template
-        // template argument with a type variadic pack vs a template template argument with a non-type auto variadic pack. 
+        // template argument with a type variadic pack vs a template template argument with a non-type auto variadic pack.
         template<template<AZStd::size_t...> class T>
 #else
         template<template<auto...> class T>
@@ -326,7 +324,7 @@ namespace AZ
         using TypeIdHolder = AZ::TypeId;
 #endif
 
-        // Represents the "*" typeid that can be combined with non-pointer types T to form a unique T* typeid 
+        // Represents the "*" typeid that can be combined with non-pointer types T to form a unique T* typeid
         inline static const AZ::TypeId& PointerTypeId()
         {
             static TypeIdHolder s_uuid("{35C8A027-FE00-4769-AE36-6997CFFAF8AE}");
@@ -977,7 +975,7 @@ namespace AZ
     AZ_TYPE_INFO_INTERNAL_SPECIALIZE_CV(T, const T&, "const ", "&");
     AZ_TYPE_INFO_INTERNAL_SPECIALIZE_CV(T, const T&&, "const ", "&&");
     AZ_TYPE_INFO_INTERNAL_SPECIALIZE_CV(T, const T, "const ", "");
-    
+
     AZ_TYPE_INFO_INTERNAL_SPECIALIZED_TEMPLATE_POSTFIX_UUID(AZStd::less,                "{41B40AFC-68FD-4ED9-9EC7-BA9992802E1B}", AZ_TYPE_INFO_INTERNAL_TYPENAME);
     AZ_TYPE_INFO_INTERNAL_SPECIALIZED_TEMPLATE_POSTFIX_UUID(AZStd::less_equal,          "{91CC0BDC-FC46-4617-A405-D914EF1C1902}", AZ_TYPE_INFO_INTERNAL_TYPENAME);
     AZ_TYPE_INFO_INTERNAL_SPECIALIZED_TEMPLATE_POSTFIX_UUID(AZStd::greater,             "{907F012A-7A4F-4B57-AC23-48DC08D0782E}", AZ_TYPE_INFO_INTERNAL_TYPENAME);
@@ -1014,7 +1012,7 @@ namespace AZ
 
     static constexpr const char* s_variantTypeId{ "{1E8BB1E5-410A-4367-8FAA-D43A4DE14D4B}" };
     AZ_TYPE_INFO_INTERNAL_SPECIALIZED_TEMPLATE_PREFIX_UUID(AZStd::variant, "variant", s_variantTypeId, AZ_TYPE_INFO_INTERNAL_TYPENAME_VARARGS);
-    
+
     AZ_TYPE_INFO_INTERNAL_FUNCTION_VARIATION_SPECIALIZATION(AZStd::function, "{C9F9C644-CCC3-4F77-A792-F5B5DBCA746E}");
 } // namespace AZ
 
diff --git a/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl b/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl
index c1ecd3634a..5c623122d7 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl
+++ b/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl
@@ -11,6 +11,7 @@
 #include <AzCore/Outcome/Outcome.h>
 #include <AzCore/Memory/OSAllocator.h>
 #include <AzCore/std/containers/stack.h>
+#include <AzCore/std/optional.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzCore/std/tuple.h>
 
@@ -47,9 +48,6 @@ namespace AZStd
     class intrusive_ptr;
     template<class T>
     class shared_ptr;
-
-    template<class T>
-    class optional;
 }
 
 namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.h b/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.h
index 1b3a0bb5cc..b3f0297a04 100644
--- a/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.h
+++ b/Code/Framework/AzCore/AzCore/Threading/ThreadSafeObject.h
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <AzCore/std/parallel/mutex.h>
 #include <AzCore/std/parallel/scoped_lock.h>
 
 namespace AZ
diff --git a/Code/Framework/AzCore/AzCore/UnitTest/TestTypes.h b/Code/Framework/AzCore/AzCore/UnitTest/TestTypes.h
index db8aaadaa1..51838a9626 100644
--- a/Code/Framework/AzCore/AzCore/UnitTest/TestTypes.h
+++ b/Code/Framework/AzCore/AzCore/UnitTest/TestTypes.h
@@ -159,6 +159,36 @@ namespace UnitTest
             TeardownAllocator();
         }
     };
+
+    /**
+    * RAII wrapper around a BenchmarkEnvironmentBase to encapsulate
+    * the creation and destuction of the SystemAllocator
+    * SetUpBenchmark and TearDownBenchmark can still be used for custom
+    * benchmark environment setup
+    */
+    class ScopedAllocatorBenchmarkEnvironment
+        : public AZ::Test::BenchmarkEnvironmentBase
+    {
+    public:
+        ScopedAllocatorBenchmarkEnvironment()
+        {
+            // Only create the allocator if it doesn't exist
+            if (!AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady())
+            {
+                AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
+                m_ownsAllocator = true;
+            }
+        }
+        ~ScopedAllocatorBenchmarkEnvironment() override
+        {
+            if (m_ownsAllocator)
+            {
+                AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
+            }
+        }
+    private:
+        bool m_ownsAllocator{};
+    };
 #endif
 
     class DLLTestVirtualClass
diff --git a/Code/Framework/AzCore/AzCore/std/azstd_files.cmake b/Code/Framework/AzCore/AzCore/std/azstd_files.cmake
index fe169c4964..ba19a3bd70 100644
--- a/Code/Framework/AzCore/AzCore/std/azstd_files.cmake
+++ b/Code/Framework/AzCore/AzCore/std/azstd_files.cmake
@@ -20,6 +20,10 @@ set(FILES
     base.h
     config.h
     concepts/concepts.h
+    concepts/concepts_assignable.h
+    concepts/concepts_constructible.h
+    concepts/concepts_copyable.h
+    concepts/concepts_movable.h
     createdestroy.h
     docs.h
     exceptions.h
@@ -34,8 +38,24 @@ set(FILES
     numeric.h
     math.h
     optional.h
+    ranges/all_view.h
+    ranges/elements_view.h
+    ranges/empty_view.h
     ranges/iter_move.h
+    ranges/iter_swap.h
+    ranges/join_view.h
+    ranges/owning_view.h
     ranges/ranges.h
+    ranges/ranges_adaptor.h
+    ranges/ranges_algorithm.h
+    ranges/ranges_functional.h
+    ranges/ref_view.h
+    ranges/single_view.h
+    ranges/subrange.h
+    ranges/split_view.h
+    ranges/swap.h
+    ranges/zip_view.h
+    ranges/zip_view.inl
     ratio.h
     reference_wrapper.h
     sort.h
diff --git a/Code/Framework/AzCore/AzCore/std/concepts/concepts.h b/Code/Framework/AzCore/AzCore/std/concepts/concepts.h
index 420b671f31..dfc0f93487 100644
--- a/Code/Framework/AzCore/AzCore/std/concepts/concepts.h
+++ b/Code/Framework/AzCore/AzCore/std/concepts/concepts.h
@@ -7,20 +7,21 @@
  */
 #pragma once
 
+#include <AzCore/std/concepts/concepts_assignable.h>
+#include <AzCore/std/concepts/concepts_constructible.h>
+#include <AzCore/std/concepts/concepts_copyable.h>
+#include <AzCore/std/concepts/concepts_movable.h>
 #include <AzCore/std/function/invoke.h>
 #include <AzCore/std/iterator/iterator_primitives.h>
+#include <AzCore/std/ranges/swap.h>
 #include <AzCore/std/ranges/iter_move.h>
+#include <AzCore/std/ranges/iter_swap.h>
 
 #include <AzCore/std/typetraits/add_pointer.h>
 #include <AzCore/std/typetraits/common_reference.h>
-#include <AzCore/std/typetraits/extent.h>
 #include <AzCore/std/typetraits/is_array.h>
-#include <AzCore/std/typetraits/is_assignable.h>
 #include <AzCore/std/typetraits/is_class.h>
-#include <AzCore/std/typetraits/is_constructible.h>
-#include <AzCore/std/typetraits/is_destructible.h>
 #include <AzCore/std/typetraits/is_enum.h>
-#include <AzCore/std/typetraits/is_floating_point.h>
 #include <AzCore/std/typetraits/is_function.h>
 #include <AzCore/std/typetraits/is_integral.h>
 #include <AzCore/std/typetraits/is_object.h>
@@ -54,21 +55,11 @@ namespace AZStd
 
 namespace AZStd::Internal
 {
-    template <typename T, typename = void>
-    constexpr bool pointer_traits_has_to_address_v = false;
-
-    template <typename T>
-    constexpr bool pointer_traits_has_to_address_v<T, enable_if_t<
-        is_void_v<void_t<decltype(pointer_traits<T>::to_address(declval<const T&>()))>>> > = true;
-
-
-    // pointer_traits isn't SFINAE friendly https://cplusplus.github.io/LWG/lwg-active.html#3545
-    // So working around that by checking if type T has an element_type alias
-    template <typename T, typename = void>
-    constexpr bool pointer_traits_valid_and_has_to_address_v = false;
-    template <typename T>
-    constexpr bool pointer_traits_valid_and_has_to_address_v<T, enable_if_t<has_element_type_v<T>> >
-        = pointer_traits_has_to_address_v<T>;
+    // Variadic template which maps types to true For SFINAE
+    template <class... Args>
+    using sfinae_trigger = true_type;
+    template <class... Args>
+    constexpr bool sfinae_trigger_v = true;
 }
 
 namespace AZStd
@@ -76,60 +67,98 @@ namespace AZStd
     //! Implements the C++20 to_address function
     //! This obtains the address represented by ptr without forming a reference
     //! to the pointee type
-    template <typename T>
-    constexpr T* to_address(T* ptr) noexcept
+    namespace Internal
     {
-        static_assert(!AZStd::is_function_v<T>, "Invoking to address on a function pointer is not allowed");
-        return ptr;
+        template <class T, class = void, class = void>
+        constexpr bool pointer_traits_has_to_address_v = false;
+
+        // pointer_traits isn't SFINAE friendly https://cplusplus.github.io/LWG/lwg-active.html#3545
+        // working around that by checking if type T has an element_type alias
+        template <class T>
+        constexpr bool pointer_traits_has_to_address_v<T, enable_if_t<has_element_type_v<T>>,
+            void_t<decltype(pointer_traits<T>::to_address(declval<const T&>()))>> = true;
+
+        // fancy pointer helper
+        template <class T, class = void>
+        struct to_address_fancy_pointer_fn;
+
+        struct to_address_fn
+        {
+        public:
+            template <class T>
+            constexpr T* operator()(T* ptr) const noexcept
+            {
+                static_assert(!AZStd::is_function_v<T>, "Invoking to address on a function pointer is not allowed");
+                return ptr;
+            }
+
+            //! Fancy pointer overload which delegates to using a specialization of pointer_traits<T>::to_address
+            //! if that is a well-formed expression, otherwise it returns ptr->operator->()
+            //! For example invoking `to_address(AZStd::reverse_iterator<const char*>(char_ptr))`
+            //! Returns an element of type const char*
+            template <class T, class = enable_if_t<conjunction_v<
+                bool_constant<!is_pointer_v<T>>,
+                bool_constant<!is_array_v<T>>,
+                bool_constant<!is_function_v<T>>,
+                sfinae_trigger<decltype(declval<to_address_fancy_pointer_fn<T>>().operator()(declval<T>()))>
+                >>>
+            constexpr auto operator()(const T& ptr) const noexcept;
+        };
+
+        template <class T>
+        struct to_address_fancy_pointer_fn<T, enable_if_t<
+            sfinae_trigger_v<decltype(declval<const T&>().operator->())>>>
+        {
+            constexpr auto operator()(const T& ptr) const noexcept
+            {
+                return to_address_fn{}(ptr.operator->());
+            }
+        };
+
+        
+        template <class T>
+        struct to_address_fancy_pointer_fn<T, enable_if_t<
+            pointer_traits_has_to_address_v<T>>>
+        {
+            constexpr auto operator()(const T& ptr) const noexcept
+            {
+                return pointer_traits<T>::to_address(ptr);
+            }
+        };
+
+        template <class T, class>
+        constexpr auto to_address_fn::operator()(const T& ptr) const noexcept
+        {
+            return to_address_fancy_pointer_fn<T>{}(ptr);
+        }
     }
-    //! Fancy pointer overload which delegates to using a specialization of pointer_traits<T>::to_address
-    //! if that is a well-formed expression, otherwise it returns ptr->operator->()
-    //! For example invoking `to_address(AZStd::reverse_iterator<const char*>(char_ptr))`
-    //! Returns an element of type const char*
-    template <typename T>
-    constexpr auto to_address(const T& ptr) noexcept
+
+    inline namespace customization_point_object
     {
-        if constexpr (AZStd::Internal::pointer_traits_valid_and_has_to_address_v<T>)
-        {
-            return pointer_traits<T>::to_address(ptr);
-        }
-        else
-        {
-            return to_address(ptr.operator->());
-        }
+        constexpr Internal::to_address_fn to_address{};
     }
 }
 
 namespace AZStd::Internal
 {
-    // Variadic template which maps types to true For SFINAE
-    template <class... Args>
-    constexpr bool sfinae_trigger_v = true;
-
     template <class It, class = void>
     constexpr bool is_class_or_enum = false;
     template <class It>
-    constexpr bool is_class_or_enum<It, enable_if_t<
-        (is_class_v<remove_cvref_t<It>> || is_enum_v<remove_cvref_t<It>>)>> = true;
-
-    template<class LHS, class RHS, class = void>
-    constexpr bool assignable_from_impl = false;
-    template<class LHS, class RHS>
-    constexpr bool assignable_from_impl<LHS, RHS, enable_if_t<is_lvalue_reference_v<LHS>
-        && common_reference_with<const remove_reference_t<LHS>&, const remove_reference_t<RHS>&>
-        && same_as<decltype(declval<LHS>() = declval<RHS>()), LHS> >> = true;
+    constexpr bool is_class_or_enum<It, enable_if_t<disjunction_v<
+        is_class<remove_cvref_t<It>>, is_enum<remove_cvref_t<It>> >>> = true;
 
 
     template<class T, class U, class = void>
     constexpr bool common_with_impl = false;
     template<class T, class U>
-    constexpr bool common_with_impl<T, U, enable_if_t<
-        same_as<common_type_t<T, U>, common_type_t<U, T>>
-        && sfinae_trigger_v<decltype(static_cast<common_type_t<T, U>>(declval<T>()))>
-        && sfinae_trigger_v<decltype(static_cast<common_type_t<T, U>>(declval<U>()))>
-        && common_reference_with<add_lvalue_reference_t<const T>, add_lvalue_reference_t<const U>>
-        && common_reference_with<add_lvalue_reference_t<common_type_t<T, U>>, common_reference_t<add_lvalue_reference_t<const T>, add_lvalue_reference_t<const U>>>
-        >> = true;
+    constexpr bool common_with_impl<T, U, enable_if_t<conjunction_v<
+        bool_constant<same_as<common_type_t<T, U>, common_type_t<U, T>>>,
+        sfinae_trigger<decltype(static_cast<common_type_t<T, U>>(declval<T>()))>,
+        sfinae_trigger<decltype(static_cast<common_type_t<T, U>>(declval<U>()))>,
+        bool_constant<common_reference_with<add_lvalue_reference_t<const T>, add_lvalue_reference_t<const U>>>,
+        bool_constant<common_reference_with<add_lvalue_reference_t<common_type_t<T, U>>,
+            common_reference_t<add_lvalue_reference_t<const T>, add_lvalue_reference_t<const U>>>>
+        >>> = true;
 }
 
 namespace AZStd
@@ -137,99 +166,18 @@ namespace AZStd
     template<class T, class U>
     /*concept*/ constexpr bool common_with = Internal::common_with_impl<T, U>;
 
-    template<class LHS, class RHS>
-    /*concept*/ constexpr bool assignable_from = Internal::assignable_from_impl<LHS, RHS>;
-
-    template<class T, class... Args>
-    /*concept*/ constexpr bool constructible_from = destructible<T> && is_constructible_v<T, Args...>;
-
-    template<class T>
-    /*concept*/ constexpr bool move_constructible = constructible_from<T, T> && convertible_to<T, T>;
 
     template<class Derived, class Base>
-    /*concept*/ constexpr bool derived_from = is_base_of_v<Base, Derived> && is_convertible_v<const volatile Derived*, const volatile Base*>;
+    /*concept*/ constexpr bool derived_from = conjunction_v<is_base_of<Base, Derived>,
+        is_convertible<const volatile Derived*, const volatile Base*>>;
 }
 
-namespace AZStd::ranges::Internal
-{
-    template <class T, class U, class = void>
-    constexpr bool is_class_or_enum_with_swap_adl = false;
-    template <class T, class U>
-    constexpr bool is_class_or_enum_with_swap_adl<T, U, enable_if_t<
-        (is_class_v<remove_cvref_t<T>> || is_enum_v<remove_cvref_t<T>>
-            || is_class_v<remove_cvref_t<U>> || is_enum_v<remove_cvref_t<T>>)
-        && is_void_v<void_t<decltype(swap(declval<T&>(), declval<U&>()))>>
-        >> = true;
-
-    template <class T>
-    void swap(T&, T&) = delete;
-
-    struct swap_fn
-    {
-        template <class T, class U>
-        constexpr auto operator()(T&& t, U&& u) const noexcept(noexcept(swap(AZStd::forward<T>(t), AZStd::forward<U>(u))))
-            ->enable_if_t<is_class_or_enum_with_swap_adl<T, U>>
-        {
-            swap(AZStd::forward<T>(t), AZStd::forward<U>(u));
-        }
-
-        // ranges::swap customization point https://eel.is/c++draft/concepts#concept.swappable-2.2
-        // Implemented in ranges.h as to prevent circular dependency.
-        // ranges::swap_ranges depends on the range concepts that can't be defined here
-        template <class T, class U>
-        constexpr auto operator()(T&& t, U&& u) const noexcept(noexcept((*this)(*t, *u)))
-            ->enable_if_t<!is_class_or_enum_with_swap_adl<T, U>
-            && is_array_v<T> && is_array_v<U> && (extent_v<T> == extent_v<U>)
-            >;
-
-        template <class T>
-        constexpr auto operator()(T& t1, T& t2) const noexcept(noexcept(is_nothrow_move_constructible_v<T>&& is_nothrow_move_assignable_v<T>))
-            ->enable_if_t<move_constructible<T>&& assignable_from<T&, T>>
-        {
-            auto temp(AZStd::move(t1));
-            t1 = AZStd::move(t2);
-            t2 = AZStd::move(temp);
-        }
-    };
-}
-
-namespace AZStd::ranges
-{
-    inline namespace customization_point_object
-    {
-        inline constexpr auto swap = Internal::swap_fn{};
-    }
-}
-
-namespace AZStd::Internal
-{
-    template <class T, class = void>
-    constexpr bool swappable_impl = false;
-    template <class T>
-    constexpr bool swappable_impl<T, void_t<decltype(AZStd::ranges::swap(declval<T&>(), declval<T&>()))>> = true;
-
-    template <class T, class U, class = void>
-    constexpr bool swappable_with_impl = false;
-    template <class T, class U>
-    constexpr bool swappable_with_impl<T, U, enable_if_t<common_reference_with<T, U>
-        && sfinae_trigger_v<
-        decltype(AZStd::ranges::swap(declval<T&>(), declval<T&>())),
-        decltype(AZStd::ranges::swap(declval<U&>(), declval<U&>())),
-        decltype(AZStd::ranges::swap(declval<T&>(), declval<U&>())),
-        decltype(AZStd::ranges::swap(declval<U&>(), declval<T&>()))>>> = true;
-}
 namespace AZStd
 {
     template <class T>
-    /*concept*/ constexpr bool signed_integral = integral<T> && is_signed_v<T>;
+    /*concept*/ constexpr bool signed_integral = conjunction_v<bool_constant<integral<T>>, is_signed<T>>;
     template <class T>
-    /*concept*/ constexpr bool unsigned_integral = integral<T> && !signed_integral<T>;
-
-    template<class T>
-    /*concept*/ constexpr bool swappable = Internal::swappable_impl<T>;
-
-    template<class T, class U>
-    /*concept*/ constexpr bool swappable_with = Internal::swappable_with_impl<T, U>;
+    /*concept*/ constexpr bool unsigned_integral = conjunction_v<bool_constant<integral<T>>, bool_constant<!signed_integral<T>>>;
 }
 
 
@@ -242,33 +190,34 @@ namespace AZStd::Internal
     template<class T, class = void>
     constexpr bool boolean_testable = false;
     template<class T>
-    constexpr bool boolean_testable<T, enable_if_t<boolean_testable_impl<T> && boolean_testable_impl<decltype(!declval<T>())>>> = true;
+    constexpr bool boolean_testable<T, enable_if_t<conjunction_v<bool_constant<boolean_testable_impl<T>>,
+        bool_constant<boolean_testable_impl<decltype(!declval<T>())>> >>> = true;
 
     // weakly comparable ==, !=
     template<class T, class U, class = void>
     constexpr bool weakly_equality_comparable_with = false;
     template<class T, class U>
-    constexpr bool weakly_equality_comparable_with<T, U, enable_if_t<
-        boolean_testable<decltype(declval<AZStd::remove_reference_t<T>&>() == declval<AZStd::remove_reference_t<U>&>())>
-        && boolean_testable<decltype(declval<AZStd::remove_reference_t<T>&>() != declval<AZStd::remove_reference_t<U>&>())>
-        && boolean_testable<decltype(declval<AZStd::remove_reference_t<U>&>() == declval<AZStd::remove_reference_t<T>&>())>
-        && boolean_testable<decltype(declval<AZStd::remove_reference_t<U>&>() != declval<AZStd::remove_reference_t<T>&>())>
-        >> = true;
+    constexpr bool weakly_equality_comparable_with<T, U, enable_if_t<conjunction_v<
+        bool_constant<boolean_testable<decltype(declval<const AZStd::remove_reference_t<T>&>() == declval<const AZStd::remove_reference_t<U>&>())>>,
+        bool_constant<boolean_testable<decltype(declval<const AZStd::remove_reference_t<T>&>() != declval<const AZStd::remove_reference_t<U>&>())>>,
+        bool_constant<boolean_testable<decltype(declval<const AZStd::remove_reference_t<U>&>() == declval<const AZStd::remove_reference_t<T>&>())>>,
+        bool_constant<boolean_testable<decltype(declval<const AZStd::remove_reference_t<U>&>() != declval<const AZStd::remove_reference_t<T>&>())>>
+        >>> = true;
 
     // partially ordered <, >, <=, >=
     template<class, class U, class = void>
     constexpr bool partially_ordered_with_impl = false;
     template<class T, class U>
-    constexpr bool partially_ordered_with_impl<T, U, enable_if_t<
-        boolean_testable<decltype(declval<const remove_reference_t<T>&>() < declval<const remove_reference_t<U>&>())>
-        && boolean_testable<decltype(declval<const remove_reference_t<T>&>() > declval<const remove_reference_t<U>&>())>
-        && boolean_testable<decltype(declval<const remove_reference_t<T>&>() <= declval<const remove_reference_t<U>&>())>
-        && boolean_testable<decltype(declval<const remove_reference_t<T>&>() >= declval<const remove_reference_t<U>&>())>
-        && boolean_testable<decltype(declval<const remove_reference_t<U>&>() < declval<const remove_reference_t<T>&>())>
-        && boolean_testable<decltype(declval<const remove_reference_t<U>&>() > declval<const remove_reference_t<T>&>())>
-        && boolean_testable<decltype(declval<const remove_reference_t<U>&>() <= declval<const remove_reference_t<T>&>())>
-        && boolean_testable<decltype(declval<const remove_reference_t<U>&>() >= declval<const remove_reference_t<T>&>())>
-        >> = true;
+    constexpr bool partially_ordered_with_impl<T, U, enable_if_t<conjunction_v<
+        bool_constant<boolean_testable<decltype(declval<const remove_reference_t<T>&>() < declval<const remove_reference_t<U>&>())>>,
+        bool_constant<boolean_testable<decltype(declval<const remove_reference_t<T>&>() > declval<const remove_reference_t<U>&>())>>,
+        bool_constant<boolean_testable<decltype(declval<const remove_reference_t<T>&>() <= declval<const remove_reference_t<U>&>())>>,
+        bool_constant<boolean_testable<decltype(declval<const remove_reference_t<T>&>() >= declval<const remove_reference_t<U>&>())>>,
+        bool_constant<boolean_testable<decltype(declval<const remove_reference_t<U>&>() < declval<const remove_reference_t<T>&>())>>,
+        bool_constant<boolean_testable<decltype(declval<const remove_reference_t<U>&>() > declval<const remove_reference_t<T>&>())>>,
+        bool_constant<boolean_testable<decltype(declval<const remove_reference_t<U>&>() <= declval<const remove_reference_t<T>&>())>>,
+        bool_constant<boolean_testable<decltype(declval<const remove_reference_t<U>&>() >= declval<const remove_reference_t<T>&>())>>
+        >>> = true;
 }
 
 namespace AZStd
@@ -283,12 +232,13 @@ namespace AZStd::Internal
     template<class, class U, class = void>
     constexpr bool equally_comparable_with_impl = false;
     template<class T, class U>
-    constexpr bool equally_comparable_with_impl<T, U, enable_if_t<equality_comparable<T>
-        && equality_comparable<U>
-        && common_reference_with<const remove_reference_t<T>&, const remove_reference_t<U>&>
-        && equality_comparable<common_reference_t<const remove_reference_t<T>&, const remove_reference_t<U>&>>
-        && Internal::weakly_equality_comparable_with<T, U>
-        >> = true;
+    constexpr bool equally_comparable_with_impl<T, U, enable_if_t<conjunction_v<
+        bool_constant<equality_comparable<T>>,
+        bool_constant<equality_comparable<U>>,
+        bool_constant<common_reference_with<const remove_reference_t<T>&, const remove_reference_t<U>&>>,
+        bool_constant<equality_comparable<common_reference_t<const remove_reference_t<T>&, const remove_reference_t<U>&>>>,
+        bool_constant<Internal::weakly_equality_comparable_with<T, U>>
+        >>> = true;
 }
 
 namespace AZStd
@@ -300,7 +250,8 @@ namespace AZStd
     /*concept*/ constexpr bool partially_ordered_with = Internal::partially_ordered_with_impl<T, U>;
 
     template<class T>
-    /*concept*/ constexpr bool totally_ordered = equality_comparable<T> && partially_ordered_with<T, T>;
+    /*concept*/ constexpr bool totally_ordered = conjunction_v<bool_constant<equality_comparable<T>>,
+        bool_constant<partially_ordered_with<T, T>>>;
 }
 
 namespace AZStd::Internal
@@ -309,11 +260,13 @@ namespace AZStd::Internal
     template<class, class U, class = void>
     constexpr bool totally_ordered_with_impl = false;
     template<class T, class U>
-    constexpr bool totally_ordered_with_impl<T, U, enable_if_t<totally_ordered<T>&& totally_ordered<U>
-        && equality_comparable_with<T, U>
-        && totally_ordered<common_reference_t<const remove_reference_t<T>&, const remove_reference_t<U>&>>
-        && partially_ordered_with<T, U>
-        >> = true;
+    constexpr bool totally_ordered_with_impl<T, U, enable_if_t<conjunction_v<
+        bool_constant<totally_ordered<T>>,
+        bool_constant<totally_ordered<U>>,
+        bool_constant<equality_comparable_with<T, U>>,
+        bool_constant<totally_ordered<common_reference_t<const remove_reference_t<T>&, const remove_reference_t<U>&>>>,
+        bool_constant<partially_ordered_with<T, U>>
+        >>> = true;
 }
 
 namespace AZStd
@@ -332,68 +285,37 @@ namespace AZStd::Internal
     template<class T, class = void>
     constexpr bool default_initializable_impl = false;
     template<class T>
-    constexpr bool default_initializable_impl < T, enable_if_t < constructible_from<T>
-        && sfinae_trigger_v<decltype(T{}) > && Internal::is_default_initializable<T> >> = true;
-
-    template <class T, class = void>
-    constexpr bool movable_impl = false;
-    template <class T>
-    constexpr bool movable_impl<T, enable_if_t<is_object_v<T> && move_constructible<T> &&
-        assignable_from<T&, T> && swappable<T>> > = true;
-
-    template <class T, class = void>
-    constexpr bool copy_constructible_impl = false;
-    template <class T>
-    constexpr bool copy_constructible_impl<T, enable_if_t<move_constructible<T> &&
-        constructible_from<T, T&> && convertible_to<T&, T> &&
-        constructible_from<T, const T&> && convertible_to<const T&, T> &&
-        constructible_from<T, const T> && convertible_to<const T, T>> > = true;
+    constexpr bool default_initializable_impl<T, enable_if_t<conjunction_v<
+        bool_constant<constructible_from<T>>,
+        sfinae_trigger<decltype(T{})>,
+        bool_constant<is_default_initializable<T>>
+        >>> = true;
 }
 
 namespace AZStd
 {
-    // movable
-    template <class T>
-    /*concept*/ constexpr bool movable = Internal::movable_impl<T>;
-
     // default_initializable
     template<class T>
     /*concept*/ constexpr bool default_initializable = Internal::default_initializable_impl<T>;
-
-    //  copy constructible
-    template<class T>
-    /*concept*/ constexpr bool copy_constructible = Internal::copy_constructible_impl<T>;
 }
 
-namespace AZStd::Internal
-{
-    template <class T, class = void>
-    constexpr bool copyable_impl = false;
-    template <class T>
-    constexpr bool copyable_impl<T, enable_if_t<copy_constructible<T> && movable<T> && assignable_from<T&, T&> &&
-        assignable_from<T&, const T&> && assignable_from<T&, const T>> > = true;
-}
 
 namespace AZStd
 {
-    // copyable
-    template<class T>
-    /*concept*/ constexpr bool copyable = Internal::copyable_impl<T>;
-
     // semiregular
     template<class T>
-    /*concept*/ constexpr bool semiregular = copyable<T> && default_initializable<T>;
+    /*concept*/ constexpr bool semiregular = conjunction_v<bool_constant<copyable<T>>, bool_constant<default_initializable<T>>>;
 
     // regular
     template<class T>
-    /*concept*/ constexpr bool regular = semiregular<T> && equality_comparable<T>;
+    /*concept*/ constexpr bool regular = conjunction_v<bool_constant<semiregular<T>>, bool_constant<equality_comparable<T>>>;
 }
 
 // Iterator Concepts
 namespace AZStd::Internal
 {
     template <class T>
-    constexpr bool is_integer_like = integral<T> && !same_as<T, bool>;
+    constexpr bool is_integer_like = conjunction_v<bool_constant<integral<T>>, bool_constant<!same_as<T, bool>>>;
 
     template <class T>
     constexpr bool is_signed_integer_like = signed_integral<T>;
@@ -401,10 +323,12 @@ namespace AZStd::Internal
     template <class T, class = void>
     constexpr bool weakly_incrementable_impl = false;
     template <class T>
-    constexpr bool weakly_incrementable_impl<T, enable_if_t<movable<T>
-        && is_signed_integer_like<iter_difference_t<T>>
-        && same_as<decltype(++declval<T&>()), T&>
-        && sfinae_trigger_v<decltype(declval<T&>()++)> >> = true;
+    constexpr bool weakly_incrementable_impl<T, enable_if_t<conjunction_v<
+        bool_constant<movable<T>>,
+        bool_constant<is_signed_integer_like<iter_difference_t<T>>>,
+        bool_constant<same_as<decltype(++declval<T&>()), T&>>,
+        sfinae_trigger<decltype(declval<T&>()++)>
+        >>> = true;
 }
 
 namespace AZStd
@@ -415,8 +339,8 @@ namespace AZStd
 
     // models input_or_output_iterator concept
     template <class T>
-    /*concept*/ constexpr bool input_or_output_iterator = !is_void_v<T>
-        && weakly_incrementable<T>;
+    /*concept*/ constexpr bool input_or_output_iterator = conjunction_v<bool_constant<!is_void_v<T>>,
+        bool_constant<weakly_incrementable<T>>>;
 }
 
 namespace AZStd::Internal
@@ -424,9 +348,11 @@ namespace AZStd::Internal
     template <class T, class = void>
     constexpr bool incrementable_impl = false;
     template <class T>
-    constexpr bool incrementable_impl<T, enable_if_t<regular<T>
-        && weakly_incrementable<T>
-        && same_as<decltype(declval<T&>()++), T> >> = true;
+    constexpr bool incrementable_impl<T, enable_if_t<conjunction_v<
+        bool_constant<regular<T>>,
+        bool_constant<weakly_incrementable<T>>,
+        bool_constant<same_as<decltype(declval<T&>()++), T>>
+        >>> = true;
 }
 
 namespace AZStd
@@ -438,9 +364,11 @@ namespace AZStd
 namespace AZStd
 {
     template<class S, class I>
-    /*concept*/ constexpr bool sentinel_for = semiregular<S> &&
-        input_or_output_iterator<I> &&
-        Internal::weakly_equality_comparable_with<S, I>;
+    /*concept*/ constexpr bool sentinel_for = conjunction_v<
+        bool_constant<semiregular<S>>,
+        bool_constant<input_or_output_iterator<I>>,
+        bool_constant<Internal::weakly_equality_comparable_with<S, I>>>;
+
     template<class S, class I>
     inline constexpr bool disable_sized_sentinel_for = false;
 }
@@ -450,11 +378,12 @@ namespace AZStd::Internal
     template<class S, class I, class = void>
     /*concept*/ constexpr bool sized_sentinel_for_impl = false;
     template<class S, class I>
-    /*concept*/ constexpr bool sized_sentinel_for_impl<S, I, enable_if_t<
-        sentinel_for<S, I>
-        && !disable_sized_sentinel_for<remove_cv_t<S>, remove_cv_t<I>>
-        && same_as<decltype(declval<S>() - declval<I>()), iter_difference_t<I>>
-        && same_as<decltype(declval<I>() - declval<S>()), iter_difference_t<I>> >> = true;
+    /*concept*/ constexpr bool sized_sentinel_for_impl<S, I, enable_if_t<conjunction_v<
+        bool_constant<sentinel_for<S, I>>,
+        bool_constant<!disable_sized_sentinel_for<remove_cv_t<S>, remove_cv_t<I>>>,
+        bool_constant<same_as<decltype(declval<S>() - declval<I>()), iter_difference_t<I>>>,
+        bool_constant<same_as<decltype(declval<I>() - declval<S>()), iter_difference_t<I>>>
+        >>> = true;
 }
 
 namespace AZStd
@@ -477,15 +406,17 @@ namespace AZStd::Internal
     template<class I, class = void>
     constexpr bool use_traits_iterator_category_for_concept = false;
     template<class I>
-    constexpr bool use_traits_iterator_category_for_concept<I,
-        void_t<typename iterator_traits<I>::iterator_category>> = !use_traits_iterator_concept_for_concept<I>;
+    constexpr bool use_traits_iterator_category_for_concept<I, enable_if_t<conjunction_v<
+        sfinae_trigger<typename iterator_traits<I>::iterator_category>,
+        bool_constant<!use_traits_iterator_concept_for_concept<I>> >>> = true;
 
     template<class I, class = void>
     constexpr bool use_random_access_iterator_tag_for_concept = false;
     template<class I>
-    constexpr bool use_random_access_iterator_tag_for_concept<I,
-        void_t<iterator_traits<I>>> = !use_traits_iterator_concept_for_concept<I>
-        && !use_traits_iterator_category_for_concept<I>;
+    constexpr bool use_random_access_iterator_tag_for_concept<I, enable_if_t<conjunction_v<
+        sfinae_trigger<iterator_traits<I>>,
+        bool_constant<!use_traits_iterator_concept_for_concept<I>>,
+        bool_constant<!use_traits_iterator_category_for_concept<I>> >>> = true;
 
     template<class I, class = void>
     struct iter_concept;
@@ -510,197 +441,18 @@ namespace AZStd::Internal
     using iter_concept_t = typename iter_concept<I>::type;
 }
 
-namespace AZStd
-{
-    // indirectly readable
-    template <class In>
-    /*concept*/ constexpr bool indirectly_readable = Internal::indirectly_readable_impl<remove_cvref_t<In>>;
-}
 
-namespace AZStd::Internal
-{
-    // model the indirectly writable concept
-    template <class Out, class T, class = void>
-    constexpr bool indirectly_writable_impl = false;
-
-    template <class Out, class T>
-    constexpr bool indirectly_writable_impl<Out, T, void_t<
-        decltype(*declval<Out&>() = declval<T>()),
-        decltype(*declval<Out>() = declval<T>()),
-        decltype(const_cast<const iter_reference_t<Out>&&>(*declval<Out&>()) = declval<T>()),
-        decltype(const_cast<const iter_reference_t<Out>&&>(*declval<Out>()) = declval<T>())>
-        > = true;
-}
-namespace AZStd
-{
-    // indirectly writable
-    template <class Out, class T>
-    /*concept*/ constexpr bool indirectly_writable = Internal::indirectly_writable_impl<Out, T>;
-
-    // indirectly movable
-    template<class In, class Out>
-    /*concept*/ constexpr bool indirectly_movable = indirectly_readable<In> && indirectly_writable<Out, iter_rvalue_reference_t<In>>;
-}
-
-namespace AZStd::Internal
-{
-    template<class In, class Out, class = void>
-    constexpr bool indirectly_movable_storage_impl = false;
-
-    template<class In, class Out>
-    constexpr bool indirectly_movable_storage_impl<In, Out, enable_if_t<
-        indirectly_movable<In, Out> &&
-        indirectly_writable<Out, iter_value_t<In>> &&
-        movable<iter_value_t<In>> &&
-        constructible_from<iter_value_t<In>, iter_rvalue_reference_t<In>> &&
-        assignable_from<iter_value_t<In>&, iter_rvalue_reference_t<In>>> > = true;
-}
-
-namespace AZStd
-{
-    template<class In, class Out>
-    /*concept*/ constexpr bool indirectly_movable_storable = Internal::indirectly_movable_storage_impl<In, Out>;
-}
-
-namespace AZStd::Internal
-{
-    template<class In, class Out, class = void>
-    constexpr bool indirectly_copyable_impl = false;
-
-    template<class In, class Out>
-    constexpr bool indirectly_copyable_impl<In, Out, enable_if_t<
-        indirectly_readable<In> &&
-        indirectly_writable<Out, iter_reference_t<In>>> > = true;
-}
-
-namespace AZStd
-{
-    // indirectly copyable
-    template<class In, class Out>
-    /*concept*/ constexpr bool indirectly_copyable = Internal::indirectly_copyable_impl<In, Out>;
-}
-namespace AZStd::Internal
-{
-    template<class In, class Out, class = void>
-    constexpr bool indirectly_copyable_storable_impl = false;
-
-    template<class In, class Out>
-    constexpr bool indirectly_copyable_storable_impl<In, Out, enable_if_t<
-        indirectly_copyable<In, Out> &&
-        indirectly_writable<Out, iter_value_t<In>&> &&
-        indirectly_writable<Out, const iter_value_t<In>&> &&
-        indirectly_writable<Out, iter_value_t<In>&&> &&
-        indirectly_writable<Out, const iter_value_t<In>&&> &&
-        copyable<iter_value_t<In>> &&
-        constructible_from<iter_value_t<In>, iter_reference_t<In>> &&
-        assignable_from<iter_value_t<In>&, iter_reference_t<In>>> > = true;
-}
-
-namespace AZStd
-{
-    template<class In, class Out>
-    /*concept*/ constexpr bool indirectly_copyable_storable = Internal::indirectly_copyable_storable_impl<In, Out>;
-}
-
-namespace AZStd::ranges::Internal
-{
-    template<class I1, class I2>
-    void iter_swap(I1, I2) = delete;
-
-    template <class I1, class I2, class = void>
-    constexpr bool iter_swap_adl = false;
-
-    template <class I1, class I2>
-    constexpr bool iter_swap_adl<I1, I2, void_t<decltype(iter_swap(declval<I1>(), declval<I2>()))>> = true;
-
-    template <class I1, class I2, class = void>
-    constexpr bool is_class_or_enum_with_iter_swap_adl = false;
-
-    template <class I1, class I2>
-    constexpr bool is_class_or_enum_with_iter_swap_adl<I1, I2, enable_if_t<iter_swap_adl<I1, I2>
-        && (is_class_v<remove_cvref_t<I1>> || is_enum_v<remove_cvref_t<I1>>)
-        && (is_class_v<remove_cvref_t<I2>> || is_enum_v<remove_cvref_t<I2>>)>> = true;
-
-    struct iter_swap_fn
-    {
-        template <class I1, class I2>
-        constexpr auto operator()(I1&& i1, I2&& i2) const
-            ->enable_if_t<is_class_or_enum_with_iter_swap_adl<I1, I2>
-            >
-        {
-            iter_swap(AZStd::forward<I1>(i1), AZStd::forward<I1>(i2));
-        }
-        template <class I1, class I2>
-        constexpr auto operator()(I1&& i1, I2&& i2) const
-            ->enable_if_t<!is_class_or_enum_with_iter_swap_adl<I1, I2>
-            && indirectly_readable<I1>
-            && indirectly_readable<I2>
-            && swappable_with<iter_reference_t<I1>, iter_reference_t<I2>>
-            >
-        {
-            ranges::swap(*i1, *i2);
-        }
-
-        template <class I1, class I2>
-        constexpr auto operator()(I1&& i1, I2&& i2) const
-            ->enable_if_t<!is_class_or_enum_with_iter_swap_adl<I1, I2>
-            && indirectly_movable_storable<I1, I2>
-            && indirectly_movable_storable<I2, I1>
-            >
-        {
-            *AZStd::forward<I1>(i1) = iter_exchange_move(AZStd::forward<I2>(i2), AZStd::forward<I1>(i1));
-        }
-
-    private:
-        template<class X, class Y>
-        static constexpr iter_value_t<X> iter_exchange_move(X&& x, Y&& y)
-            noexcept(noexcept(iter_value_t<X>(iter_move(x))) && noexcept(*x = iter_move(y)))
-        {
-            iter_value_t<X> old_value(iter_move(x));
-            *x = iter_move(y);
-            return old_value;
-        }
-    };
-}
-
-namespace AZStd::ranges
-{
-    inline namespace customization_point_object
-    {
-        inline constexpr Internal::iter_swap_fn iter_swap{};
-    }
-}
-
-
-namespace AZStd::Internal
-{
-    template <class I1, class I2, class = void>
-    constexpr bool indirectly_swappable_impl = false;
-    template <class I1, class I2>
-    constexpr bool indirectly_swappable_impl<I1, I2, enable_if_t<
-        indirectly_readable<I1>&& indirectly_readable<I2>
-        && sfinae_trigger_v<
-        decltype(AZStd::ranges::iter_swap(declval<I1>(), declval<I1>())),
-        decltype(AZStd::ranges::iter_swap(declval<I2>(), declval<I2>())),
-        decltype(AZStd::ranges::iter_swap(declval<I1>(), declval<I2>())),
-        decltype(AZStd::ranges::iter_swap(declval<I2>(), declval<I1>()))>>> = true;
-}
-
-namespace AZStd
-{
-    template<class I1, class I2 = I1>
-    /*concept*/ constexpr bool indirectly_swappable = Internal::indirectly_swappable_impl<I1, I2>;
-}
 
 namespace AZStd::Internal
 {
     template<class I, class = void>
     constexpr bool input_iterator_impl = false;
     template<class I>
-    constexpr bool input_iterator_impl<I, enable_if_t<input_or_output_iterator<I>
-        && derived_from<iter_concept_t<I>, input_iterator_tag>
-        && indirectly_readable<I>
-        >> = true;
+    constexpr bool input_iterator_impl<I, enable_if_t<conjunction_v<
+        bool_constant<input_or_output_iterator<I>>,
+        bool_constant<derived_from<iter_concept_t<I>, input_iterator_tag>>,
+        bool_constant<indirectly_readable<I>>
+        >>> = true;
 }
 
 namespace AZStd
@@ -715,10 +467,11 @@ namespace AZStd::Internal
     template<class I, class T, class = void>
     constexpr bool output_iterator_impl = false;
     template<class I, class T>
-    constexpr bool output_iterator_impl<I, T, enable_if_t<input_or_output_iterator<I>
-        && indirectly_writable<I, T>
-        && sfinae_trigger_v<decltype(*declval<I&>()++ = AZStd::declval<T>())>
-        >> = true;
+    constexpr bool output_iterator_impl<I, T, enable_if_t<conjunction_v<
+        bool_constant<input_or_output_iterator<I>>,
+        bool_constant<indirectly_writable<I, T>>,
+        sfinae_trigger<decltype(*declval<I&>()++ = AZStd::declval<T>())>
+        >>> = true;
 }
 
 namespace AZStd
@@ -733,10 +486,11 @@ namespace AZStd::Internal
     template<class I, class = void>
     constexpr bool forward_iterator_impl = false;
     template<class I>
-    constexpr bool forward_iterator_impl<I, enable_if_t<input_iterator<I>
-        && derived_from<Internal::iter_concept_t<I>, forward_iterator_tag>
-        && incrementable<I>
-        && sentinel_for<I, I>> > = true;
+    constexpr bool forward_iterator_impl<I, enable_if_t<conjunction_v<
+        bool_constant<input_iterator<I>>,
+        bool_constant<derived_from<Internal::iter_concept_t<I>, forward_iterator_tag>>,
+        bool_constant<incrementable<I>>,
+        bool_constant<sentinel_for<I, I>> >>> = true;
 }
 
 namespace AZStd
@@ -751,10 +505,11 @@ namespace AZStd::Internal
     template<class I, class = void>
     constexpr bool bidirectional_iterator_impl = false;
     template<class I>
-    constexpr bool bidirectional_iterator_impl<I, enable_if_t<forward_iterator<I>
-        && derived_from<iter_concept_t<I>, bidirectional_iterator_tag>
-        && same_as<decltype(--declval<I&>()), I&>
-        && same_as<decltype(declval<I&>()--), I> >> = true;
+    constexpr bool bidirectional_iterator_impl<I, enable_if_t<conjunction_v<
+        bool_constant<forward_iterator<I>>,
+        bool_constant<derived_from<iter_concept_t<I>, bidirectional_iterator_tag>>,
+        bool_constant<same_as<decltype(--declval<I&>()), I&>>,
+        bool_constant<same_as<decltype(declval<I&>()--), I>> >>> = true;
 }
 
 namespace AZStd
@@ -769,17 +524,18 @@ namespace AZStd::Internal
     template<class I, class = void>
     constexpr bool random_access_iterator_impl = false;
     template<class I>
-    constexpr bool random_access_iterator_impl<I, enable_if_t<bidirectional_iterator<I>
-        && derived_from<iter_concept_t<I>, random_access_iterator_tag>
-        && totally_ordered<I>
-        && sized_sentinel_for<I, I>
-        && same_as<decltype(declval<I&>() += declval<const iter_difference_t<I>>()), I&>
-        && same_as<decltype(declval<const I>() + declval<const iter_difference_t<I>>()), I>
-        && same_as<decltype(declval<iter_difference_t<I>>() + declval<const I>()), I>
-        && same_as<decltype(declval<I&>() -= declval<const iter_difference_t<I>>()), I&>
-        && same_as<decltype(declval<const I>() - declval<const iter_difference_t<I>>()), I>
-        && same_as<decltype(declval<const I&>()[declval<iter_difference_t<I>>()]), iter_reference_t<I>>>>
-        = true;
+    constexpr bool random_access_iterator_impl<I, enable_if_t < conjunction_v <
+        bool_constant<bidirectional_iterator<I>>,
+        bool_constant<derived_from<iter_concept_t<I>, random_access_iterator_tag>>,
+        bool_constant<totally_ordered<I>>,
+        bool_constant<sized_sentinel_for<I, I>>,
+        bool_constant<same_as<decltype(declval<I&>() += declval<const iter_difference_t<I>>()), I&>>,
+        bool_constant<same_as<decltype(declval<const I>() + declval<const iter_difference_t<I>>()), I>>,
+        bool_constant<same_as<decltype(declval<iter_difference_t<I>>() + declval<const I>()), I>>,
+        bool_constant<same_as<decltype(declval<I&>() -= declval<const iter_difference_t<I>>()), I&>>,
+        bool_constant<same_as<decltype(declval<const I>() - declval<const iter_difference_t<I>>()), I>>,
+        bool_constant<same_as<decltype(declval<const I&>()[declval<iter_difference_t<I>>()]), iter_reference_t<I>>>
+        >>> = true;
 }
 
 namespace AZStd
@@ -793,13 +549,14 @@ namespace AZStd::Internal
     template<class I, class = void>
     constexpr bool contiguous_iterator_impl = false;
     template<class I>
-    constexpr bool contiguous_iterator_impl<I, enable_if_t<random_access_iterator<I>
-        && derived_from<iter_concept_t<I>, contiguous_iterator_tag>
-        && is_lvalue_reference_v<iter_reference_t<I>>
-        && indirectly_readable<I>
-        && same_as<iter_value_t<I>, remove_cvref_t<iter_reference_t<I>>>
-        > >
-        = same_as<decltype(to_address(declval<const I&>())), add_pointer_t<iter_reference_t<I>>>;
+    constexpr bool contiguous_iterator_impl<I, enable_if_t<conjunction_v<
+        bool_constant<random_access_iterator<I>>,
+        bool_constant<derived_from<iter_concept_t<I>, contiguous_iterator_tag>>,
+        bool_constant<is_lvalue_reference_v<iter_reference_t<I>>>,
+        bool_constant<indirectly_readable<I>>,
+        bool_constant<same_as<iter_value_t<I>, remove_cvref_t<iter_reference_t<I>>>>,
+        bool_constant<same_as<decltype(to_address(declval<const I&>())), add_pointer_t<iter_reference_t<I>>>>
+        >>> = true;
 }
 
 namespace AZStd
@@ -826,15 +583,151 @@ namespace AZStd
 
     // models the relation concept
     template <class R, class T, class U>
-    /*concept*/ constexpr bool relation = predicate<R, T, T> && predicate<R, U, U>
-        && predicate<R, T, U> && predicate<R, U, T>;
+    /*concept*/ constexpr bool relation = conjunction_v<
+        bool_constant<predicate<R, T, T>>,
+        bool_constant<predicate<R, U, U>>,
+        bool_constant<predicate<R, T, U>>,
+        bool_constant<predicate<R, U, T>>>;
 
     // models the equivalence_relation concept
+    // Note: semantically this is different than relation
+    // since it can't be enforced at compile time
     template <class R, class T, class U>
     /*concept*/ constexpr bool equivalence_relation = relation<R, T, U>;
 
     // models the strict_weak_order concept
-    // Note: semantically this is different than equivalence_relation
+    // Note: semantically this is different than relation
+    // since it can't be enforced at compile time
     template <class R, class T, class U>
     /*concept*/ constexpr bool strict_weak_order = relation<R, T, U>;
 }
+
+namespace AZStd
+{
+    // https://eel.is/c++draft/iterators#indirectcallable.indirectinvocable
+    template<class F, class I, class = void>
+    /*concept*/ constexpr bool indirectly_unary_invocable = false;
+    template<class F, class I>
+    /*concept*/ constexpr bool indirectly_unary_invocable<F, I, enable_if_t<conjunction_v<
+        bool_constant<indirectly_readable<I>>,
+        bool_constant<copy_constructible<F>>,
+        bool_constant<invocable<F&, iter_value_t<I>&>>,
+        bool_constant<invocable<F&, iter_reference_t<I>>>,
+        bool_constant<invocable<F&, iter_common_reference_t<I>>>,
+        bool_constant<common_reference_with<invoke_result_t<F&, iter_value_t<I>&>, invoke_result_t<F&, iter_reference_t<I>>>>
+        >>> = true;
+
+    template<class F, class I, class = void>
+    /*concept*/ constexpr bool indirectly_regular_unary_invocable = false;
+    template<class F, class I>
+    /*concept*/ constexpr bool indirectly_regular_unary_invocable<
+        F,
+        I,
+        enable_if_t<conjunction_v<
+            bool_constant<indirectly_readable<I>>,
+            bool_constant<copy_constructible<F>>,
+            bool_constant<regular_invocable<F&, iter_value_t<I>&>>,
+            bool_constant<regular_invocable<F&, iter_reference_t<I>>>,
+            bool_constant<regular_invocable<F&, iter_common_reference_t<I>>>,
+            bool_constant<common_reference_with<invoke_result_t<F&, iter_value_t<I>&>, invoke_result_t<F&, iter_reference_t<I>>>>>>> = true;
+
+    template<class F, class I, class = void>
+    /*concept*/ constexpr bool indirect_unary_predicate = false;
+    template<class F, class I>
+    /*concept*/ constexpr bool indirect_unary_predicate<
+        F,
+        I,
+        enable_if_t<conjunction_v<
+            bool_constant<indirectly_readable<I>>,
+            bool_constant<copy_constructible<F>>,
+            bool_constant<predicate<F&, iter_value_t<I>&>>,
+            bool_constant<predicate<F&, iter_reference_t<I>>>,
+            bool_constant<predicate<F&, iter_common_reference_t<I>>>>>> = true;
+
+    template<class F, class I1, class I2, class = void>
+    /*concept*/ constexpr bool indirect_binary_predicate = false;
+    template<class F, class I1, class I2>
+    /*concept*/ constexpr bool indirect_binary_predicate<
+        F,
+        I1,
+        I2,
+        enable_if_t<conjunction_v<
+            bool_constant<indirectly_readable<I1>>,
+            bool_constant<indirectly_readable<I2>>,
+            bool_constant<copy_constructible<F>>,
+            bool_constant<predicate<F&, iter_value_t<I1>&, iter_value_t<I2>&>>,
+            bool_constant<predicate<F&, iter_value_t<I1>&, iter_reference_t<I2>>>,
+            bool_constant<predicate<F&, iter_reference_t<I1>, iter_value_t<I2>&>>,
+            bool_constant<predicate<F&, iter_reference_t<I1>, iter_reference_t<I2>>>,
+            bool_constant<predicate<F&, iter_common_reference_t<I1>, iter_common_reference_t<I2>>>>>> = true;
+
+    template<class F, class I1, class I2 = I1, class = void>
+    /*concept*/ constexpr bool indirect_equivalence_relation = false;
+    template<class F, class I1, class I2>
+    /*concept*/ constexpr bool indirect_equivalence_relation<
+        F,
+        I1,
+        I2,
+        enable_if_t<conjunction_v<
+            bool_constant<indirectly_readable<I1>>,
+            bool_constant<indirectly_readable<I2>>,
+            bool_constant<copy_constructible<F>>,
+            bool_constant<equivalence_relation<F&, iter_value_t<I1>&, iter_value_t<I2>&>>,
+            bool_constant<equivalence_relation<F&, iter_value_t<I1>&, iter_reference_t<I2>>>,
+            bool_constant<equivalence_relation<F&, iter_reference_t<I1>, iter_value_t<I2>&>>,
+            bool_constant<equivalence_relation<F&, iter_reference_t<I1>, iter_reference_t<I2>>>,
+            bool_constant<equivalence_relation<F&, iter_common_reference_t<I1>, iter_common_reference_t<I2>>>>>> = true;
+
+    template<class F, class I1, class I2 = I1, class = void>
+    /*concept*/ constexpr bool indirect_strict_weak_order = false;
+    template<class F, class I1, class I2>
+    /*concept*/ constexpr bool indirect_strict_weak_order<
+        F,
+        I1,
+        I2,
+        enable_if_t<conjunction_v<
+            bool_constant<indirectly_readable<I1>>,
+            bool_constant<indirectly_readable<I2>>,
+            bool_constant<copy_constructible<F>>,
+            bool_constant<strict_weak_order<F&, iter_value_t<I1>&, iter_value_t<I2>&>>,
+            bool_constant<strict_weak_order<F&, iter_value_t<I1>&, iter_reference_t<I2>>>,
+            bool_constant<strict_weak_order<F&, iter_reference_t<I1>, iter_value_t<I2>&>>,
+            bool_constant<strict_weak_order<F&, iter_reference_t<I1>, iter_reference_t<I2>>>,
+            bool_constant<strict_weak_order<F&, iter_common_reference_t<I1>, iter_common_reference_t<I2>>>>>> = true;
+
+    namespace Internal
+    {
+        template<bool Invocable, class F, class... Is>
+        struct indirect_result;
+        template<class F, class... Is>
+        struct indirect_result<true, F, Is...>
+        {
+            using type = invoke_result_t<F, iter_reference_t<Is>...>;
+        };
+    }
+    template<class F, class... Is>
+    using indirect_result_t = typename Internal::indirect_result<conjunction_v<
+            bool_constant<indirectly_readable<Is>>...,
+            bool_constant<AZStd::invocable<F, iter_reference_t<Is>...>>>,
+        F, Is...>::type;
+
+    // https://eel.is/c++draft/iterators#projected
+    template<class I, class Proj, class = void>
+    struct projected;
+
+    template<class I, class Proj>
+    struct projected<
+        I,
+        Proj,
+        enable_if_t<conjunction_v<bool_constant<indirectly_readable<I>>, bool_constant<indirectly_regular_unary_invocable<Proj, I>>>>>
+    {
+        using value_type = remove_cvref_t<indirect_result_t<Proj&, I>>;
+        indirect_result_t<Proj&, I> operator*() const; // not defined
+    };
+
+    template <class I, class Proj>
+    struct incrementable_traits<projected<I, Proj>, enable_if_t<weakly_incrementable<I>>>
+    {
+        using difference_type = iter_difference_t<I>;
+    };
+}
diff --git a/Code/Framework/AzCore/AzCore/std/concepts/concepts_assignable.h b/Code/Framework/AzCore/AzCore/std/concepts/concepts_assignable.h
new file mode 100644
index 0000000000..f2e59d306d
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/concepts/concepts_assignable.h
@@ -0,0 +1,34 @@
+/*
+ * 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/typetraits/common_reference.h>
+#include <AzCore/std/typetraits/conjunction.h>
+#include <AzCore/std/typetraits/integral_constant.h>
+#include <AzCore/std/typetraits/is_same.h>
+#include <AzCore/std/typetraits/remove_cvref.h>
+#include <AzCore/std/utility/declval.h>
+
+namespace AZStd::Internal
+{
+
+    template<class LHS, class RHS, class = void>
+    constexpr bool assignable_from_impl = false;
+    template<class LHS, class RHS>
+    constexpr bool assignable_from_impl<LHS, RHS, enable_if_t<conjunction_v<
+        is_lvalue_reference<LHS>,
+        bool_constant<common_reference_with<const remove_reference_t<LHS>&, const remove_reference_t<RHS>&>>,
+        bool_constant<same_as<decltype(declval<LHS>() = declval<RHS>()), LHS>> >>> = true;
+}
+
+namespace AZStd
+{
+    template<class LHS, class RHS>
+    /*concept*/ constexpr bool assignable_from = Internal::assignable_from_impl<LHS, RHS>;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/concepts/concepts_constructible.h b/Code/Framework/AzCore/AzCore/std/concepts/concepts_constructible.h
new file mode 100644
index 0000000000..c1cc0d7be7
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/concepts/concepts_constructible.h
@@ -0,0 +1,26 @@
+/*
+ * 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/typetraits/conjunction.h>
+#include <AzCore/std/typetraits/integral_constant.h>
+#include <AzCore/std/typetraits/is_constructible.h>
+#include <AzCore/std/typetraits/is_convertible.h>
+#include <AzCore/std/typetraits/is_destructible.h>
+
+namespace AZStd
+{
+
+    template<class T, class... Args>
+    /*concept*/ constexpr bool constructible_from = conjunction_v<bool_constant<destructible<T>>,
+        is_constructible<T, Args...> >;
+
+    template<class T>
+    /*concept*/ constexpr bool move_constructible = conjunction_v<bool_constant<constructible_from<T, T>>,
+        bool_constant<convertible_to<T, T>>>;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/concepts/concepts_copyable.h b/Code/Framework/AzCore/AzCore/std/concepts/concepts_copyable.h
new file mode 100644
index 0000000000..8ca949e959
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/concepts/concepts_copyable.h
@@ -0,0 +1,60 @@
+/*
+ * 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/concepts/concepts_assignable.h>
+#include <AzCore/std/concepts/concepts_constructible.h>
+#include <AzCore/std/concepts/concepts_movable.h>
+#include <AzCore/std/typetraits/integral_constant.h>
+#include <AzCore/std/typetraits/is_convertible.h>
+#include <AzCore/std/typetraits/conjunction.h>
+
+namespace AZStd::Internal
+{
+    template <class T, class = void>
+    constexpr bool copy_constructible_impl = false;
+    template <class T>
+    constexpr bool copy_constructible_impl<T, enable_if_t<conjunction_v<
+        bool_constant<move_constructible<T>>,
+        bool_constant<constructible_from<T, T&>>,
+        bool_constant<convertible_to<T&, T>>,
+        bool_constant<constructible_from<T, const T&>>,
+        bool_constant<convertible_to<const T&, T>>,
+        bool_constant<constructible_from<T, const T>>,
+        bool_constant<convertible_to<const T, T>>
+        >>> = true;
+}
+
+namespace AZStd
+{
+    //  copy constructible
+    template<class T>
+    /*concept*/ constexpr bool copy_constructible = Internal::copy_constructible_impl<T>;
+}
+
+namespace AZStd::Internal
+{
+    template <class T, class = void>
+    constexpr bool copyable_impl = false;
+    template <class T>
+    constexpr bool copyable_impl<T, enable_if_t<conjunction_v<
+        bool_constant<copy_constructible<T>>,
+        bool_constant<movable<T>>,
+        bool_constant<assignable_from<T&, T&>>,
+        bool_constant<assignable_from<T&, const T&>>,
+        bool_constant<assignable_from<T&, const T>>
+        >>> = true;
+}
+
+namespace AZStd
+{
+    // copyable
+    template<class T>
+    /*concept*/ constexpr bool copyable = Internal::copyable_impl<T>;
+
+}
diff --git a/Code/Framework/AzCore/AzCore/std/concepts/concepts_movable.h b/Code/Framework/AzCore/AzCore/std/concepts/concepts_movable.h
new file mode 100644
index 0000000000..81db9a9306
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/concepts/concepts_movable.h
@@ -0,0 +1,35 @@
+/*
+ * 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/concepts/concepts_assignable.h>
+#include <AzCore/std/concepts/concepts_constructible.h>
+#include <AzCore/std/typetraits/integral_constant.h>
+#include <AzCore/std/ranges/swap.h>
+#include <AzCore/std/typetraits/conjunction.h>
+#include <AzCore/std/typetraits/is_object.h>
+
+namespace AZStd::Internal
+{
+    template <class T, class = void>
+    constexpr bool movable_impl = false;
+    template <class T>
+    constexpr bool movable_impl<T, enable_if_t<conjunction_v<
+        is_object<T>,
+        bool_constant<move_constructible<T>>,
+        bool_constant<assignable_from<T&, T>>,
+        bool_constant<swappable<T>>
+        >>> = true;
+}
+
+namespace AZStd
+{
+    // movable
+    template <class T>
+    /*concept*/ constexpr bool movable = Internal::movable_impl<T>;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/containers/intrusive_set.h b/Code/Framework/AzCore/AzCore/std/containers/intrusive_set.h
index 3e6dae84d3..4a00d2a081 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/intrusive_set.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/intrusive_set.h
@@ -42,20 +42,13 @@ namespace AZStd
         template<class U, class Hook, class Compare>
         friend class intrusive_multiset;
 
-#ifdef AZ_DEBUG_BUILD
-        intrusive_multiset_node()
-        {
-            m_children[0] = nullptr;
-            m_children[1] = nullptr;
-            m_neighbours[0] = nullptr;
-            m_neighbours[1] = nullptr;
-            m_parentColorSide = nullptr;
-        }
+        intrusive_multiset_node() = default;
         ~intrusive_multiset_node()
         {
+#if defined(AZ_DEBUG_BUILD)
             AZSTD_CONTAINER_ASSERT(m_children[0] == nullptr && m_children[1] == nullptr && m_parentColorSide == nullptr, "AZStd::intrusive_multiset_node - intrusive list node is being destroyed while still in a container!");
-        }
 #endif
+        }
         // We use the lower 2 bits of the parent pointer to store
         enum Bits
         {
@@ -95,9 +88,9 @@ namespace AZStd
         AZ_FORCE_INLINE T*      next() const { return m_neighbours[AZSTD_RBTREE_RIGHT];  }
 
     protected:
-        T* m_children[2];
-        T* m_neighbours[2];
-        T* m_parentColorSide;
+        T* m_children[2]{};
+        T* m_neighbours[2]{};
+        T* m_parentColorSide{};
     } AZ_MAY_ALIAS; // we access the object in such way that we potentially can break strict aliasing rules
 
     /**
@@ -659,12 +652,10 @@ namespace AZStd
 
             --m_numElements;
 
-#ifdef AZ_DEBUG_BUILD
             nodeHook->m_children[0] = nodeHook->m_children[1] = nullptr;
             nodeHook->m_parentColorSide = nullptr;
-#ifdef DEBUG_INTRUSIVE_MULTISET
+#if defined(AZ_DEBUG_BUILD) && defined(DEBUG_INTRUSIVE_MULTISET)
             validate();
-#endif
 #endif
         }
 
@@ -955,8 +946,11 @@ namespace AZStd
             hookNode->setParentSide(side);
         }
 
+        //! pre-condition
+        //! @param node must be non-nullptr
         inline static node_ptr_type MinOrMax(const_node_ptr_type node, SideType side)
         {
+            AZSTD_CONTAINER_ASSERT(node != nullptr, "MinOrMax can only be called with a non-nullptr node")
             const_node_ptr_type cur = node;
             const_node_ptr_type minMax = cur;
             while (!iterator_impl::isNil(cur))
diff --git a/Code/Framework/AzCore/AzCore/std/containers/map.h b/Code/Framework/AzCore/AzCore/std/containers/map.h
index 143292eb3b..6598c0c5f4 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/map.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/map.h
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#ifndef AZSTD_ORDERED_MAP_H
-#define AZSTD_ORDERED_MAP_H 1
+#pragma once
 
 #include <AzCore/std/containers/rbtree.h>
 #include <AzCore/std/containers/node_handle.h>
@@ -392,6 +391,26 @@ namespace AZStd
         return originalSize - container.size();
     }
 
+
+    // deduction guides
+    template<class InputIterator, class Compare = less<iter_key_type<InputIterator>>,
+        class Allocator = allocator>
+        map(InputIterator, InputIterator, Compare = Compare(), Allocator = Allocator())
+        ->map<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>, Compare, Allocator>;
+
+    template<class Key, class T, class Compare = less<Key>,
+        class Allocator = allocator>
+        map(initializer_list<pair<Key, T>>, Compare = Compare(), Allocator = Allocator())
+        ->map<Key, T, Compare, Allocator>;
+
+    template<class InputIterator, class Allocator>
+    map(InputIterator, InputIterator, Allocator)
+        ->map<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+        less<iter_key_type<InputIterator>>, Allocator>;
+
+    template<class Key, class T, class Allocator>
+    map(initializer_list<pair<Key, T>>, Allocator)->map<Key, T, less<Key>, Allocator>;
+
     /**
     * Ordered multimap container is complaint with \ref C++0x (23.4.2)
     * This is an associative container, key can be equivalent (multiple copies of the same key value).
@@ -684,7 +703,26 @@ namespace AZStd
 
         return originalSize - container.size();
     }
-}
 
-#endif // AZSTD_ORDERED_MAP_H
-#pragma once
+    // deduction guides
+    template<class InputIterator, class Compare = less<iter_key_type<InputIterator>>,
+        class Allocator = allocator>
+        multimap(InputIterator, InputIterator, Compare = Compare(), Allocator = Allocator())
+        ->multimap<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+        Compare, Allocator>;
+
+    template<class Key, class T, class Compare = less<Key>,
+        class Allocator = allocator>
+        multimap(initializer_list<pair<Key, T>>, Compare = Compare(), Allocator = Allocator())
+        ->multimap<Key, T, Compare, Allocator>;
+
+    template<class InputIterator, class Allocator>
+    multimap(InputIterator, InputIterator, Allocator)
+        ->multimap<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+        less<iter_key_type<InputIterator>>, Allocator>;
+
+    template<class Key, class T, class Allocator>
+    multimap(initializer_list<pair<Key, T>>, Allocator)
+        ->multimap<Key, T, less<Key>, Allocator>;
+
+}
diff --git a/Code/Framework/AzCore/AzCore/std/containers/node_handle.h b/Code/Framework/AzCore/AzCore/std/containers/node_handle.h
index f94cdd0faf..97a944bab9 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/node_handle.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/node_handle.h
@@ -7,8 +7,10 @@
  */
 #pragma once
 
-#include <AzCore/std/optional.h>
 #include <AzCore/std/allocator_traits.h>
+#include <AzCore/std/iterator.h>
+#include <AzCore/std/optional.h>
+#include <AzCore/std/utils.h>
 
 namespace AZStd
 {
@@ -193,4 +195,23 @@ namespace AZStd
         template <typename NodeTraits>
         using map_node_handle = node_handle<NodeTraits, map_node_base>;
     }
+
+    inline namespace AssociativeInternal
+    {
+        // deduction guide helpers
+        template<class InputIterator>
+        using iter_value_type = typename iterator_traits<InputIterator>::value_type::second_type;
+
+        template<class InputIterator>
+        using iter_key_type = remove_const_t<typename iterator_traits<InputIterator>::value_type::first_type>;
+
+        template<class InputIterator>
+        using iter_mapped_type = typename iterator_traits<InputIterator>::value_type::second_type;
+
+        template<class InputIterator>
+        using iter_to_alloc_type = pair<
+            add_const_t<typename iterator_traits<InputIterator>::value_type::first_type>,
+            typename iterator_traits<InputIterator>::value_type::second_type
+        >;
+    }
 }
diff --git a/Code/Framework/AzCore/AzCore/std/containers/set.h b/Code/Framework/AzCore/AzCore/std/containers/set.h
index 06275097a8..af56261d1d 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/set.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/set.h
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#ifndef AZSTD_ORDERED_SET_H
-#define AZSTD_ORDERED_SET_H 1
+#pragma once
 
 #include <AzCore/std/containers/node_handle.h>
 #include <AzCore/std/containers/rbtree.h>
@@ -300,6 +299,26 @@ namespace AZStd
         return originalSize - container.size();
     }
 
+    // deduction guides
+    template<class InputIterator,
+        class Compare = less<iter_value_type<InputIterator>>,
+        class Allocator = allocator>
+        set(InputIterator, InputIterator,
+            Compare = Compare(), Allocator = Allocator())
+        ->set<iter_value_type<InputIterator>, Compare, Allocator>;
+
+    template<class Key, class Compare = less<Key>, class Allocator = allocator>
+    set(initializer_list<Key>, Compare = Compare(), Allocator = Allocator())
+        ->set<Key, Compare, Allocator>;
+
+    template<class InputIterator, class Allocator>
+    set(InputIterator, InputIterator, Allocator)
+        ->set<iter_value_type<InputIterator>,
+        less<iter_value_type<InputIterator>>, Allocator>;
+
+    template<class Key, class Allocator>
+    set(initializer_list<Key>, Allocator)->set<Key, less<Key>, Allocator>;
+
     /**
     * Ordered multiset container is complaint with \ref C++0x (23.4.4)
     * This is an associative container, key can be equivalent (multiple copies of the same key value).
@@ -573,7 +592,24 @@ namespace AZStd
 
         return originalSize - container.size();
     }
-}
 
-#endif // AZSTD_ORDERED_SET_H
-#pragma once
+    // deduction guides
+    template<class InputIterator,
+        class Compare = less<iter_value_type<InputIterator>>,
+        class Allocator = allocator>
+        multiset(InputIterator, InputIterator,
+            Compare = Compare(), Allocator = Allocator())
+        ->multiset<iter_value_type<InputIterator>, Compare, Allocator>;
+
+    template<class Key, class Compare = less<Key>, class Allocator = allocator>
+    multiset(initializer_list<Key>, Compare = Compare(), Allocator = Allocator())
+        ->multiset<Key, Compare, Allocator>;
+
+    template<class InputIterator, class Allocator>
+    multiset(InputIterator, InputIterator, Allocator)
+        ->multiset<iter_value_type<InputIterator>,
+        less<iter_value_type<InputIterator>>, Allocator>;
+
+    template<class Key, class Allocator>
+    multiset(initializer_list<Key>, Allocator)->multiset<Key, less<Key>, Allocator>;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/containers/unordered_map.h b/Code/Framework/AzCore/AzCore/std/containers/unordered_map.h
index 046d3a212b..b56877903c 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/unordered_map.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/unordered_map.h
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#ifndef AZSTD_UNORDERED_MAP_H
-#define AZSTD_UNORDERED_MAP_H 1
+#pragma once
 
 #include <AzCore/std/containers/node_handle.h>
 #include <AzCore/std/hash_table.h>
@@ -344,6 +343,66 @@ namespace AZStd
         return originalSize - container.size();
     }
 
+    // deduction guides
+    template<class InputIterator,
+        class Hash = hash<iter_key_type<InputIterator>>,
+        class Pred = equal_to<iter_key_type<InputIterator>>,
+        class Allocator = allocator>
+        unordered_map(InputIterator, InputIterator,
+            typename Internal::UnorderedMapTableTraits<iter_key_type<InputIterator>,
+                iter_mapped_type<InputIterator>, Hash, Pred, Allocator, false>::size_type = {},
+            Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+        ->unordered_map<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>, Hash, Pred,
+        Allocator>;
+
+    template<class Key, class T, class Hash = hash<Key>,
+        class Pred = equal_to<Key>, class Allocator = allocator>
+        unordered_map(initializer_list<pair<Key, T>>,
+            typename Internal::UnorderedMapTableTraits<Key, T, Hash, Pred, Allocator, false>::size_type = {},
+            Hash = Hash(),
+            Pred = Pred(), Allocator = Allocator())
+        ->unordered_map<Key, T, Hash, Pred, Allocator>;
+
+    template<class InputIterator, class Allocator>
+    unordered_map(InputIterator, InputIterator,
+        typename Internal::UnorderedMapTableTraits<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+            hash<iter_key_type<InputIterator>>, equal_to<iter_key_type<InputIterator>>, Allocator, false>::size_type,
+        Allocator)
+        ->unordered_map<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+        hash<iter_key_type<InputIterator>>,
+        equal_to<iter_key_type<InputIterator>>, Allocator>;
+
+    template<class InputIterator, class Allocator>
+    unordered_map(InputIterator, InputIterator, Allocator)
+        ->unordered_map<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+        hash<iter_key_type<InputIterator>>,
+        equal_to<iter_key_type<InputIterator>>, Allocator>;
+
+    template<class InputIterator, class Hash, class Allocator>
+    unordered_map(InputIterator, InputIterator,
+        typename Internal::UnorderedMapTableTraits<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+            Hash, equal_to<iter_key_type<InputIterator>>, Allocator, false>::size_type,
+        Hash, Allocator)
+        ->unordered_map<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>, Hash,
+        equal_to<iter_key_type<InputIterator>>, Allocator>;
+
+    template<class Key, class T, class Allocator>
+    unordered_map(initializer_list<pair<Key, T>>, typename Internal::UnorderedMapTableTraits<Key, T,
+        hash<Key>, equal_to<Key>, Allocator, false>::size_type,
+        Allocator)
+        ->unordered_map<Key, T, hash<Key>, equal_to<Key>, Allocator>;
+
+    template<class Key, class T, class Allocator>
+    unordered_map(initializer_list<pair<Key, T>>, Allocator)
+        ->unordered_map<Key, T, hash<Key>, equal_to<Key>, Allocator>;
+
+    template<class Key, class T, class Hash, class Allocator>
+    unordered_map(initializer_list<pair<Key, T>>, typename Internal::UnorderedMapTableTraits<Key, T,
+        Hash, equal_to<Key>, Allocator, true>::size_type,
+        Hash, Allocator)
+        ->unordered_map<Key, T, Hash, equal_to<Key>, Allocator>;
+
+
     /**
      * Unordered multi map container is complaint with \ref CTR1 (6.2.4.6)
      * The only difference from the unordered_map is that we allow multiple entries with
@@ -560,7 +619,63 @@ namespace AZStd
 
         return originalSize - container.size();
     }
+
+    // deduction guides
+    template<class InputIterator,
+        class Hash = hash<iter_key_type<InputIterator>>,
+        class Pred = equal_to<iter_key_type<InputIterator>>,
+        class Allocator = allocator>
+        unordered_multimap(InputIterator, InputIterator,
+            typename Internal::UnorderedMapTableTraits<iter_key_type<InputIterator>,
+                iter_mapped_type<InputIterator>, Hash, Pred, Allocator, true>::size_type = {},
+            Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+        ->unordered_multimap<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+        Hash, Pred, Allocator>;
+
+    template<class Key, class T, class Hash = hash<Key>,
+        class Pred = equal_to<Key>, class Allocator = allocator>
+        unordered_multimap(initializer_list<pair<Key, T>>,
+            typename Internal::UnorderedMapTableTraits<Key, T, Hash, Pred, Allocator, true>::size_type = {},
+            Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+        ->unordered_multimap<Key, T, Hash, Pred, Allocator>;
+
+    template<class InputIterator, class Allocator>
+    unordered_multimap(InputIterator, InputIterator,
+        typename Internal::UnorderedMapTableTraits<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+            hash<iter_key_type<InputIterator>>, equal_to<iter_key_type<InputIterator>>, Allocator, true>::size_type,
+        Allocator)
+        ->unordered_multimap<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+        hash<iter_key_type<InputIterator>>,
+        equal_to<iter_key_type<InputIterator>>, Allocator>;
+
+    template<class InputIterator, class Allocator>
+    unordered_multimap(InputIterator, InputIterator, Allocator)
+        ->unordered_multimap<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+        hash<iter_key_type<InputIterator>>,
+        equal_to<iter_key_type<InputIterator>>, Allocator>;
+
+    template<class InputIterator, class Hash, class Allocator>
+    unordered_multimap(InputIterator, InputIterator,
+        typename Internal::UnorderedMapTableTraits<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>,
+            Hash, equal_to<iter_key_type<InputIterator>>, Allocator, true>::size_type,
+        Hash, Allocator)
+        ->unordered_multimap<iter_key_type<InputIterator>, iter_mapped_type<InputIterator>, Hash,
+        equal_to<iter_key_type<InputIterator>>, Allocator>;
+
+    template<class Key, class T, class Allocator>
+    unordered_multimap(initializer_list<pair<Key, T>>, typename Internal::UnorderedMapTableTraits<Key, T,
+            hash<Key>, equal_to<Key>, Allocator, true>::size_type,
+        Allocator)
+        ->unordered_multimap<Key, T, hash<Key>, equal_to<Key>, Allocator>;
+
+    template<class Key, class T, class Allocator>
+    unordered_multimap(initializer_list<pair<Key, T>>, Allocator)
+        ->unordered_multimap<Key, T, hash<Key>, equal_to<Key>, Allocator>;
+
+    template<class Key, class T, class Hash, class Allocator>
+    unordered_multimap(initializer_list<pair<Key, T>>, typename Internal::UnorderedMapTableTraits<Key, T,
+        Hash, equal_to<Key>, Allocator, true>::size_type,
+        Hash, Allocator)
+        ->unordered_multimap<Key, T, Hash, equal_to<Key>, Allocator>;
 }
 
-#endif // AZSTD_UNORDERED_MAP_H
-#pragma once
diff --git a/Code/Framework/AzCore/AzCore/std/containers/unordered_set.h b/Code/Framework/AzCore/AzCore/std/containers/unordered_set.h
index 2d85813692..b5ee214d65 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/unordered_set.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/unordered_set.h
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#ifndef AZSTD_UNORDERED_SET_H
-#define AZSTD_UNORDERED_SET_H 1
+#pragma once
 
 #include <AzCore/std/containers/node_handle.h>
 #include <AzCore/std/hash_table.h>
@@ -253,6 +252,55 @@ namespace AZStd
         return originalSize - container.size();
     }
 
+    // deduction guides
+    template<class InputIterator,
+        class Hash = hash<iter_value_type<InputIterator>>,
+        class Pred = equal_to<iter_value_type<InputIterator>>,
+        class Allocator = allocator>
+        unordered_set(InputIterator, InputIterator,
+            typename Internal::UnorderedSetTableTraits<iter_value_type<InputIterator>, Hash, Pred, Allocator, false>::size_type = {},
+            Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+        ->unordered_set<iter_value_type<InputIterator>,
+        Hash, Pred, Allocator>;
+
+    template<class T, class Hash = hash<T>,
+        class Pred = equal_to<T>, class Allocator = allocator>
+        unordered_set(initializer_list<T>,
+            typename Internal::UnorderedSetTableTraits<T, Hash, Pred, Allocator, false>::size_type = {},
+            Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+        ->unordered_set<T, Hash, Pred, Allocator>;
+
+    template<class InputIterator, class Allocator>
+    unordered_set(InputIterator, InputIterator,
+        typename Internal::UnorderedSetTableTraits<iter_value_type<InputIterator>, hash<iter_value_type<InputIterator>>,
+        equal_to<iter_value_type<InputIterator>>, Allocator, false>::size_type,
+        Allocator)
+        ->unordered_set<iter_value_type<InputIterator>,
+        hash<iter_value_type<InputIterator>>,
+        equal_to<iter_value_type<InputIterator>>,
+        Allocator>;
+
+    template<class InputIterator, class Hash, class Allocator>
+    unordered_set(InputIterator, InputIterator,
+        typename Internal::UnorderedSetTableTraits<iter_value_type<InputIterator>, Hash,
+        equal_to<iter_value_type<InputIterator>>, Allocator, false>::size_type,
+        Hash, Allocator)
+        ->unordered_set<iter_value_type<InputIterator>, Hash,
+        equal_to<iter_value_type<InputIterator>>,
+        Allocator>;
+
+    template<class T, class Allocator>
+    unordered_set(initializer_list<T>,
+        typename Internal::UnorderedSetTableTraits<T, hash<T>, equal_to<T>, Allocator, false>::size_type,
+        Allocator)
+        ->unordered_set<T, hash<T>, equal_to<T>, Allocator>;
+
+    template<class T, class Hash, class Allocator>
+    unordered_set(initializer_list<T>,
+        typename Internal::UnorderedSetTableTraits<T, Hash, equal_to<T>, Allocator, false>::size_type,
+        Hash, Allocator)
+        ->unordered_set<T, Hash, equal_to<T>, Allocator>;
+
     /**
     * Unordered multi set container is complaint with \ref CTR1 (6.2.4.5)
     * The only difference from the unordered_set is that we allow multiple entries with
@@ -448,7 +496,52 @@ namespace AZStd
         return originalSize - container.size();
     }
 
-}
+    // deduction guides
+    template<class InputIterator,
+        class Hash = hash<iter_value_type<InputIterator>>,
+        class Pred = equal_to<iter_value_type<InputIterator>>,
+        class Allocator = allocator>
+        unordered_multiset(InputIterator, InputIterator,
+            typename Internal::UnorderedSetTableTraits<iter_value_type<InputIterator>, Hash, Pred, Allocator, true>::size_type = {},
+            Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+        ->unordered_multiset<iter_value_type<InputIterator>,
+        Hash, Pred, Allocator>;
 
-#endif // AZSTD_UNORDERED_SET_H
-#pragma once
+    template<class T, class Hash = hash<T>,
+        class Pred = equal_to<T>, class Allocator = allocator>
+        unordered_multiset(initializer_list<T>,
+            typename Internal::UnorderedSetTableTraits<T, Hash, Pred, Allocator, true>::size_type = {},
+            Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+        ->unordered_multiset<T, Hash, Pred, Allocator>;
+
+    template<class InputIterator, class Allocator>
+    unordered_multiset(InputIterator, InputIterator,
+        typename Internal::UnorderedSetTableTraits<iter_value_type<InputIterator>, hash<iter_value_type<InputIterator>>,
+        equal_to<iter_value_type<InputIterator>>, Allocator, true>::size_type,
+        Allocator)
+        ->unordered_multiset<iter_value_type<InputIterator>,
+        hash<iter_value_type<InputIterator>>,
+        equal_to<iter_value_type<InputIterator>>,
+        Allocator>;
+
+    template<class InputIterator, class Hash, class Allocator>
+    unordered_multiset(InputIterator, InputIterator,
+        typename Internal::UnorderedSetTableTraits<iter_value_type<InputIterator>, Hash,
+        equal_to<iter_value_type<InputIterator>>, Allocator, true>::size_type,
+        Hash, Allocator)
+        ->unordered_multiset<iter_value_type<InputIterator>, Hash,
+        equal_to<iter_value_type<InputIterator>>,
+        Allocator>;
+
+    template<class T, class Allocator>
+    unordered_multiset(initializer_list<T>,
+        typename Internal::UnorderedSetTableTraits<T, hash<T>, equal_to<T>, Allocator, true>::size_type,
+        Allocator)
+        ->unordered_multiset<T, hash<T>, equal_to<T>, Allocator>;
+
+    template<class T, class Hash, class Allocator>
+    unordered_multiset(initializer_list<T>,
+        typename Internal::UnorderedSetTableTraits<T, Hash, equal_to<T>, Allocator, true>::size_type,
+        Hash, Allocator)
+        ->unordered_multiset<T, Hash, equal_to<T>, Allocator>;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/function/identity.h b/Code/Framework/AzCore/AzCore/std/function/identity.h
index 58c680ae1d..845932dbe2 100644
--- a/Code/Framework/AzCore/AzCore/std/function/identity.h
+++ b/Code/Framework/AzCore/AzCore/std/function/identity.h
@@ -20,7 +20,7 @@ namespace AZStd
         using is_transparent = void;
 
         template <typename T>
-        T&& operator()(T&& t) const
+        constexpr T&& operator()(T&& t) const
         {
             return AZStd::forward<T>(t);
         }
diff --git a/Code/Framework/AzCore/AzCore/std/function/invoke.h b/Code/Framework/AzCore/AzCore/std/function/invoke.h
index 6dccb43e36..7e3636a4ee 100644
--- a/Code/Framework/AzCore/AzCore/std/function/invoke.h
+++ b/Code/Framework/AzCore/AzCore/std/function/invoke.h
@@ -19,12 +19,28 @@ namespace AZStd
     template <class R, class Fn, class... ArgTypes>
     struct is_invocable_r : Internal::invocable_r<R, Fn, ArgTypes...>::type {};
 
+    template <class Fn, class... ArgTypes>
+    struct is_nothrow_invocable
+        : bool_constant<noexcept(Internal::invocable<Fn, ArgTypes...>::value)>
+    {};
+
+    template <class R, class Fn, class... ArgTypes>
+    struct is_nothrow_invocable_r
+        : bool_constant<noexcept(Internal::invocable_r<R, Fn, ArgTypes...>::value)>
+    {};
+
     template <class Fn, class... ArgTypes>
     constexpr bool is_invocable_v = is_invocable<Fn, ArgTypes...>::value;
 
     template <class R, class Fn, class ...ArgTypes>
     constexpr bool is_invocable_r_v = is_invocable_r<R, Fn, ArgTypes...>::value;
 
+    template <class Fn, class... ArgTypes>
+    constexpr bool is_nothrow_invocable_v = is_nothrow_invocable<Fn, ArgTypes...>::value;
+
+    template <class R, class Fn, class ...ArgTypes>
+    constexpr bool is_nothrow_invocable_r_v = is_nothrow_invocable_r<R, Fn, ArgTypes...>::value;
+
     template<class Fn, class... ArgTypes>
     struct invoke_result
         : AZStd::enable_if<Internal::invocable<Fn, ArgTypes...>::value, typename Internal::invocable<Fn, ArgTypes...>::result_type>
diff --git a/Code/Framework/AzCore/AzCore/std/iterator.h b/Code/Framework/AzCore/AzCore/std/iterator.h
index 5bc653e3b6..07fabae71a 100644
--- a/Code/Framework/AzCore/AzCore/std/iterator.h
+++ b/Code/Framework/AzCore/AzCore/std/iterator.h
@@ -197,9 +197,5 @@ namespace AZStd
             return *reinterpret_cast<Iterator*>(&iter);
         }
     }
-
-    using std::size;
-    using std::empty;
-    using std::data;
 } // namespace AZStd
 
diff --git a/Code/Framework/AzCore/AzCore/std/iterator/iterator_primitives.h b/Code/Framework/AzCore/AzCore/std/iterator/iterator_primitives.h
index 39d89e1f2f..3e23dcd397 100644
--- a/Code/Framework/AzCore/AzCore/std/iterator/iterator_primitives.h
+++ b/Code/Framework/AzCore/AzCore/std/iterator/iterator_primitives.h
@@ -9,9 +9,14 @@
 
 #include <AzCore/std/base.h>
 
+#include <AzCore/std/concepts/concepts_constructible.h>
+#include <AzCore/std/concepts/concepts_copyable.h>
+#include <AzCore/std/concepts/concepts_movable.h>
 #include <AzCore/std/ranges/iter_move.h>
 #include <AzCore/std/typetraits/common_reference.h>
 #include <AzCore/std/typetraits/conditional.h>
+#include <AzCore/std/typetraits/conjunction.h>
+#include <AzCore/std/typetraits/integral_constant.h>
 #include <AzCore/std/typetraits/is_array.h>
 #include <AzCore/std/typetraits/is_class.h>
 #include <AzCore/std/typetraits/is_enum.h>
@@ -124,21 +129,24 @@ namespace AZStd::Internal
     struct incrementable_requires {};
     // iterator_traits has been specialized
     template <typename T>
-    struct incrementable_requires<T, enable_if_t<!is_primary_template_v<iterator_traits<T>>
-        && is_void_v<void_t<typename iterator_traits<T>::difference_type>> >>
+    struct incrementable_requires<T, enable_if_t<conjunction_v<
+        bool_constant<!is_primary_template_v<iterator_traits<T>>>,
+        bool_constant<is_void_v<void_t<typename iterator_traits<T>::difference_type>>>> >>
     {
         using difference_type = typename iterator_traits<T>::difference_type;
     };
     template <typename T>
-    struct incrementable_requires<T, enable_if_t<is_primary_template_v<iterator_traits<T>>
-        && has_difference_type_v<T>>>
+    struct incrementable_requires<T, enable_if_t<conjunction_v<
+        bool_constant<is_primary_template_v<iterator_traits<T>>>,
+        bool_constant<has_difference_type_v<T>>> >>
     {
         using difference_type = typename T::difference_type;
     };
     template <typename T>
-    struct incrementable_requires<T, enable_if_t<is_primary_template_v<iterator_traits<T>>
-        && !has_difference_type_v<T>
-        && integral<decltype(declval<T>() - declval<T>())> >>
+    struct incrementable_requires<T, enable_if_t< conjunction_v<
+        bool_constant<is_primary_template_v<iterator_traits<T>>>,
+        bool_constant<!has_difference_type_v<T>>,
+        bool_constant<integral<decltype(declval<T>() - declval<T>())>>> >>
     {
         using difference_type = make_signed_t<decltype(declval<T>() - declval<T>())>;
     };
@@ -164,7 +172,7 @@ namespace AZStd
     using iter_reference_t = enable_if_t<Internal::dereferenceable<T>, decltype(*declval<T&>())>;
 
     // incrementable_traits for iter_difference_t
-    template <typename T>
+    template <typename T, class = void>
     struct incrementable_traits
         : Internal::incrementable_requires<T> {};
     template <typename T>
@@ -187,14 +195,109 @@ namespace AZStd
         constexpr bool indirectly_readable_impl = false;
 
         template <class In>
-        constexpr bool indirectly_readable_impl<In, enable_if_t<same_as<decltype(*declval<In>()), iter_reference_t<In>>
-            && same_as<decltype(AZStd::ranges::iter_move(declval<In>())), iter_rvalue_reference_t<In>>
-            && common_reference_with<iter_reference_t<In>&&, iter_value_t<In>&>
-            && common_reference_with<iter_reference_t<In>&&, iter_rvalue_reference_t<In>&>
-            && common_reference_with<iter_rvalue_reference_t<In>&&, const iter_value_t<In>&>>> = true;
+        constexpr bool indirectly_readable_impl<In, enable_if_t<conjunction_v<
+            bool_constant<same_as<decltype(*declval<In>()), iter_reference_t<In>>>,
+            bool_constant<same_as<decltype(AZStd::ranges::iter_move(declval<In>())), iter_rvalue_reference_t<In>>>,
+            bool_constant<common_reference_with<iter_reference_t<In>&&, iter_value_t<In>&>>,
+            bool_constant<common_reference_with<iter_reference_t<In>&&, iter_rvalue_reference_t<In>&>>,
+            bool_constant<common_reference_with<iter_rvalue_reference_t<In>&&, const iter_value_t<In>&>> >>> = true;
     }
 
     template <typename T>
     using iter_common_reference_t = enable_if_t<Internal::indirectly_readable_impl<T>,
         common_reference_t<iter_reference_t<T>, iter_value_t<T>&>>;
 }
+
+namespace AZStd
+{
+    // indirectly readable
+    template <class In>
+    /*concept*/ constexpr bool indirectly_readable = Internal::indirectly_readable_impl<remove_cvref_t<In>>;
+}
+
+namespace AZStd::Internal
+{
+    // model the indirectly writable concept
+    template <class Out, class T, class = void>
+    constexpr bool indirectly_writable_impl = false;
+
+    template <class Out, class T>
+    constexpr bool indirectly_writable_impl<Out, T, void_t<
+        decltype(*declval<Out&>() = declval<T>()),
+        decltype(*declval<Out>() = declval<T>()),
+        decltype(const_cast<const iter_reference_t<Out>&&>(*declval<Out&>()) = declval<T>()),
+        decltype(const_cast<const iter_reference_t<Out>&&>(*declval<Out>()) = declval<T>())>
+    > = true;
+}
+namespace AZStd
+{
+    // indirectly writable
+    template <class Out, class T>
+    /*concept*/ constexpr bool indirectly_writable = Internal::indirectly_writable_impl<Out, T>;
+
+    // indirectly movable
+    template<class In, class Out>
+    /*concept*/ constexpr bool indirectly_movable = conjunction_v<bool_constant<indirectly_readable<In>>,
+        bool_constant<indirectly_writable<Out, iter_rvalue_reference_t<In>>>>;
+}
+
+namespace AZStd::Internal
+{
+    template<class In, class Out, class = void>
+    constexpr bool indirectly_movable_storage_impl = false;
+
+    template<class In, class Out>
+    constexpr bool indirectly_movable_storage_impl<In, Out, enable_if_t<conjunction_v<
+        bool_constant<indirectly_movable<In, Out>>,
+        bool_constant<indirectly_writable<Out, iter_value_t<In>>>,
+        bool_constant<movable<iter_value_t<In>>>,
+        bool_constant<constructible_from<iter_value_t<In>, iter_rvalue_reference_t<In>>>,
+        bool_constant<assignable_from<iter_value_t<In>&, iter_rvalue_reference_t<In>>> >>> = true;
+}
+
+namespace AZStd
+{
+    template<class In, class Out>
+    /*concept*/ constexpr bool indirectly_movable_storable = Internal::indirectly_movable_storage_impl<In, Out>;
+}
+
+namespace AZStd::Internal
+{
+    template<class In, class Out, class = void>
+    constexpr bool indirectly_copyable_impl = false;
+
+    template<class In, class Out>
+    constexpr bool indirectly_copyable_impl<In, Out, enable_if_t<conjunction_v<
+        bool_constant<indirectly_readable<In>>,
+        bool_constant<indirectly_writable<Out, iter_reference_t<In>>> >>> = true;
+}
+
+namespace AZStd
+{
+    // indirectly copyable
+    template<class In, class Out>
+    /*concept*/ constexpr bool indirectly_copyable = Internal::indirectly_copyable_impl<In, Out>;
+}
+namespace AZStd::Internal
+{
+    template<class In, class Out, class = void>
+    constexpr bool indirectly_copyable_storable_impl = false;
+
+    template<class In, class Out>
+    constexpr bool indirectly_copyable_storable_impl<In, Out, enable_if_t < conjunction_v <
+        bool_constant<indirectly_copyable<In, Out>>,
+        bool_constant<indirectly_writable<Out, iter_value_t<In>&>>,
+        bool_constant<indirectly_writable<Out, const iter_value_t<In>&>>,
+        bool_constant<indirectly_writable<Out, iter_value_t<In>&&>>,
+        bool_constant<indirectly_writable<Out, const iter_value_t<In>&&>>,
+        bool_constant<copyable<iter_value_t<In>>>,
+        bool_constant<constructible_from<iter_value_t<In>, iter_reference_t<In>>>,
+        bool_constant<assignable_from<iter_value_t<In>&, iter_reference_t<In>>>
+        >>> = true;
+}
+
+namespace AZStd
+{
+    template<class In, class Out>
+    /*concept*/ constexpr bool indirectly_copyable_storable = Internal::indirectly_copyable_storable_impl<In, Out>;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/optional.h b/Code/Framework/AzCore/AzCore/std/optional.h
index 4ab32c9102..df8e43a0c4 100644
--- a/Code/Framework/AzCore/AzCore/std/optional.h
+++ b/Code/Framework/AzCore/AzCore/std/optional.h
@@ -8,1012 +8,22 @@
 
 #pragma once
 
-#include <initializer_list>
-#include <AzCore/std/typetraits/is_scalar.h>
+#include <optional>
 #include <AzCore/std/utils.h>
-#include <AzCore/Memory/Memory.h>
-#include <AzCore/Memory/SystemAllocator.h>
 
 namespace AZStd
 {
-    // 23.6.4, no-value state indicator
-    struct nullopt_t{
-        struct UniqueTag {};
-        // nullopt_t does not have a default constructor, and is not an
-        // aggregate
-        constexpr explicit nullopt_t(UniqueTag) {}
-    };
-    static constexpr nullopt_t nullopt {nullopt_t::UniqueTag()};
 
-    namespace Internal
-    {
-        template<class T, bool = std::is_trivially_destructible<T>::value>
-        class OptionalDestructBase
-        {
-        public:
-            union
-            {
-                char m_empty;
-                T m_object;
-            };
-            bool m_engaged;
+    using std::nullopt_t;
+    using std::nullopt;
+    using std::optional;
+    using std::make_optional;
 
-            constexpr OptionalDestructBase()
-                : m_empty()
-                , m_engaged(false)
-            {
-            }
-
-            template<class... Args>
-            constexpr explicit OptionalDestructBase(in_place_t, Args&&... args)
-                : m_object(forward<Args>(args)...)
-                , m_engaged(true)
-            {
-            }
-
-            void reset()
-            {
-                m_engaged = false;
-            }
-        };
-
-        template<class T>
-        class OptionalDestructBase<T, false>
-        {
-        public:
-            union
-            {
-                char m_empty;
-                T m_object;
-            };
-            bool m_engaged;
-
-            constexpr OptionalDestructBase()
-                : m_empty()
-                , m_engaged(false)
-            {
-            }
-
-            template<class... Args>
-            constexpr explicit OptionalDestructBase(in_place_t, Args&&... args)
-                : m_object(forward<Args>(args)...)
-                , m_engaged(true)
-            {
-            }
-
-            ~OptionalDestructBase()
-            {
-                reset();
-            }
-
-            void reset()
-            {
-                if (m_engaged)
-                {
-                    m_object.T::~T();
-                    m_engaged = false;
-                }
-            }
-        };
-
-        template<class T>
-        class OptionalImplBase
-            : public OptionalDestructBase<T>
-        {
-            using base = OptionalDestructBase<T>;
-        public:
-            using base::base;
-
-            constexpr bool has_value() const
-            {
-                return this->m_engaged;
-            }
-
-            constexpr const T& value() const&
-            {
-                AZ_Assert(this->m_engaged, "Optional does not have a value");
-                return this->m_object;
-            }
-            /*constexpr*/ T& value()&
-            {
-                AZ_Assert(this->m_engaged, "Optional does not have a value");
-                return this->m_object;
-            }
-
-            constexpr const T&& value() const&&
-            {
-                AZ_Assert(this->m_engaged, "Optional does not have a value");
-                return AZStd::move(this->m_object);
-            }
-            /*constexpr*/ T&& value()&&
-            {
-                AZ_Assert(this->m_engaged, "Optional does not have a value");
-                return AZStd::move(this->m_object);
-            }
-
-            template<class... Args>
-            void construct(Args&&... args)
-            {
-                ::new((void*)AZStd::addressof(this->m_object)) T(forward<Args>(args)...);
-                this->m_engaged = true;
-            }
-
-            template<class U>
-            void construct_from(U&& that)
-            {
-                if (that.has_value())
-                {
-                    this->construct(forward<U>(that).value());
-                }
-            }
-
-            template<class U>
-            void assign_from(U&& that)
-            {
-                if (this->has_value() == that.has_value())
-                {
-                    if (this->has_value())
-                    {
-                        this->m_object = forward<U>(that).value();
-                    }
-                }
-                else
-                {
-                    if (this->has_value())
-                    {
-                        this->reset();
-                    }
-                    else
-                    {
-                        this->construct(forward<U>(that).value());
-                    }
-                }
-            }
-        };
-
-        template<class T, bool = std::is_trivially_copy_constructible<T>::value>
-        class OptionalCopyBase : public OptionalImplBase<T>
-        {
-            using base = OptionalImplBase<T>;
-        public:
-            using base::base;
-        };
-
-        template<class T>
-        class OptionalCopyBase<T, false> : public OptionalImplBase<T>
-        {
-            using base = OptionalImplBase<T>;
-        public:
-            using base::base;
-
-            OptionalCopyBase() = default;
-            OptionalCopyBase(const OptionalCopyBase& rhs)
-            {
-                this->construct_from(rhs);
-            }
-            OptionalCopyBase(OptionalCopyBase&&) = default;
-            OptionalCopyBase& operator=(const OptionalCopyBase&) = default;
-            OptionalCopyBase& operator=(OptionalCopyBase&&) = default;
-        };
-
-        template<class T, bool = std::is_trivially_move_constructible<T>::value>
-        class OptionalMoveBase : public OptionalCopyBase<T>
-        {
-            using base = OptionalCopyBase<T>;
-        public:
-            using base::base;
-        };
-
-        template<class T>
-        class OptionalMoveBase<T, false> : public OptionalCopyBase<T>
-        {
-            using base = OptionalCopyBase<T>;
-        public:
-            using base::base;
-
-            OptionalMoveBase() = default;
-            OptionalMoveBase(const OptionalMoveBase&) = default;
-            OptionalMoveBase(OptionalMoveBase&& rhs)
-            {
-                this->construct_from(AZStd::move(rhs));
-            }
-            OptionalMoveBase& operator=(const OptionalMoveBase&) = default;
-            OptionalMoveBase& operator=(OptionalMoveBase&&) = default;
-        };
-
-        template<class T, bool =
-               std::is_trivially_destructible<T>::value
-            && std::is_trivially_copy_constructible<T>::value
-            && std::is_trivially_copy_assignable<T>::value
-        >
-        class OptionalCopyAssignBase : public OptionalMoveBase<T>
-        {
-            using base = OptionalMoveBase<T>;
-        public:
-            using base::base;
-        };
-
-        template<class T>
-        class OptionalCopyAssignBase<T, false> : public OptionalMoveBase<T>
-        {
-            using base = OptionalMoveBase<T>;
-        public:
-            using base::base;
-
-            OptionalCopyAssignBase() = default;
-            OptionalCopyAssignBase(const OptionalCopyAssignBase&) = default;
-            OptionalCopyAssignBase(OptionalCopyAssignBase&&) = default;
-            OptionalCopyAssignBase& operator=(const OptionalCopyAssignBase& rhs)
-            {
-                this->assign_from(rhs);
-                return *this;
-            }
-            OptionalCopyAssignBase& operator=(OptionalCopyAssignBase&&) = default;
-        };
-
-        template<class T, bool =
-               std::is_trivially_destructible<T>::value
-            && std::is_trivially_move_constructible<T>::value
-            && std::is_trivially_move_assignable<T>::value
-        >
-        class OptionalMoveAssignBase : public OptionalCopyAssignBase<T>
-        {
-            using base = OptionalCopyAssignBase<T>;
-        public:
-            using base::base;
-        };
-
-        template<class T>
-        class OptionalMoveAssignBase<T, false> : public OptionalCopyAssignBase<T>
-        {
-            using base = OptionalCopyAssignBase<T>;
-        public:
-            using base::base;
-
-            OptionalMoveAssignBase() = default;
-            OptionalMoveAssignBase(const OptionalMoveAssignBase&) = default;
-            OptionalMoveAssignBase(OptionalMoveAssignBase&&) = default;
-            OptionalMoveAssignBase& operator=(const OptionalMoveAssignBase&) = default;
-            OptionalMoveAssignBase& operator=(OptionalMoveAssignBase&& rhs)
-            {
-                this->assign_from(AZStd::move(rhs));
-                return *this;
-            }
-        };
-
-        // The following templates define types with certain special
-        // constructors deleted. The deleted constructors are the same ones
-        // that are deleted in the source type T used in optional<T>. They
-        // trigger SFINAE so that type traits like
-        // AZStd::is_assignable<optional<T>&, optional<T>&> yield the same
-        // value as AZStd::is_assignable<T&, T&>
-        template <bool CanCopy, bool CanMove>
-        struct SFINAECtorBase {};
-        template <>
-        struct SFINAECtorBase<false, false> {
-          SFINAECtorBase() = default;
-          SFINAECtorBase(SFINAECtorBase const&) = delete;
-          SFINAECtorBase(SFINAECtorBase &&) = delete;
-          SFINAECtorBase& operator=(SFINAECtorBase const&) = default;
-          SFINAECtorBase& operator=(SFINAECtorBase&&) = default;
-        };
-        template <>
-        struct SFINAECtorBase<true, false> {
-          SFINAECtorBase() = default;
-          SFINAECtorBase(SFINAECtorBase const&) = default;
-          SFINAECtorBase(SFINAECtorBase &&) = delete;
-          SFINAECtorBase& operator=(SFINAECtorBase const&) = default;
-          SFINAECtorBase& operator=(SFINAECtorBase&&) = default;
-        };
-        template <>
-        struct SFINAECtorBase<false, true> {
-          SFINAECtorBase() = default;
-          SFINAECtorBase(SFINAECtorBase const&) = delete;
-          SFINAECtorBase(SFINAECtorBase &&) = default;
-          SFINAECtorBase& operator=(SFINAECtorBase const&) = default;
-          SFINAECtorBase& operator=(SFINAECtorBase&&) = default;
-        };
-
-        template <bool CanCopy, bool CanMove>
-        struct SFINAEAssignBase {};
-        template <>
-        struct SFINAEAssignBase<false, false> {
-          SFINAEAssignBase() = default;
-          SFINAEAssignBase(SFINAEAssignBase const&) = default;
-          SFINAEAssignBase(SFINAEAssignBase &&) = default;
-          SFINAEAssignBase& operator=(SFINAEAssignBase const&) = delete;
-          SFINAEAssignBase& operator=(SFINAEAssignBase&&) = delete;
-        };
-        template <>
-        struct SFINAEAssignBase<true, false> {
-          SFINAEAssignBase() = default;
-          SFINAEAssignBase(SFINAEAssignBase const&) = default;
-          SFINAEAssignBase(SFINAEAssignBase &&) = default;
-          SFINAEAssignBase& operator=(SFINAEAssignBase const&) = default;
-          SFINAEAssignBase& operator=(SFINAEAssignBase&&) = delete;
-        };
-        template <>
-        struct SFINAEAssignBase<false, true> {
-          SFINAEAssignBase() = default;
-          SFINAEAssignBase(SFINAEAssignBase const&) = default;
-          SFINAEAssignBase(SFINAEAssignBase &&) = default;
-          SFINAEAssignBase& operator=(SFINAEAssignBase const&) = delete;
-          SFINAEAssignBase& operator=(SFINAEAssignBase&&) = default;
-        };
-        template <class _Tp>
-        using OptionalSFINAECtorBase_t = SFINAECtorBase<
-            is_copy_constructible<_Tp>::value,
-            is_move_constructible<_Tp>::value
-        >;
-
-        template <class _Tp>
-        using OptionalSFINAEAssignBase_t = SFINAEAssignBase<
-            (is_copy_constructible<_Tp>::value && is_copy_assignable<_Tp>::value),
-            (is_move_constructible<_Tp>::value && is_move_assignable<_Tp>::value)
-        >;
-    }// end namespace Internal
-
-    template<class T>
-    class optional
-        : private Internal::OptionalMoveAssignBase<T>
-        , private Internal::OptionalSFINAECtorBase_t<T>
-        , private Internal::OptionalSFINAEAssignBase_t<T>
-    {
-        using base = Internal::OptionalMoveAssignBase<T>;
-    public:
-        AZ_CLASS_ALLOCATOR(optional, AZ::SystemAllocator, 0);
-
-        using value_type = T;
-
-        // 23.6.3.1, constructors
-        constexpr optional() = default;
-        constexpr optional(nullopt_t) {}
-        constexpr optional(const optional& rhs) = default;
-        constexpr optional(optional&& rhs) = default;
-
-        template<class... Args, class = typename enable_if<std::is_constructible<T, Args...>::value>::type>
-        constexpr explicit optional(in_place_t, Args&&... args)
-            : base(in_place, forward<Args>(args)...)
-        {
-        }
-
-        template<class U, class... Args, class = typename enable_if<std::is_constructible<T, std::initializer_list<U>&, Args...>::value>::type>
-        constexpr explicit optional(in_place_t, std::initializer_list<U> il, Args&&... args)
-            : base(in_place, il, forward<Args>(args)...)
-        {
-        }
-
-        template<class U = T, typename enable_if<
-               std::is_constructible<T, U&&>::value
-            && !is_same<typename remove_cv<typename remove_reference<U>::type>::type, in_place_t>::value
-            && !is_same<typename remove_cv<typename remove_reference<U>::type>::type, optional>::value
-            && std::is_convertible<U&&, T>::value
-        >::type * = nullptr>
-        constexpr optional(U&& v)
-            : base(in_place, forward<U>(v))
-        {
-        }
-
-        template<class U = T, typename enable_if<
-               std::is_constructible<T, U&&>::value
-            && !is_same<typename remove_cv<typename remove_reference<U>::type>::type, in_place_t>::value
-            && !is_same<typename remove_cv<typename remove_reference<U>::type>::type, optional>::value
-            && !std::is_convertible<U&&, T>::value
-        >::type * = nullptr>
-        constexpr explicit optional(U&& v)
-            : base(in_place, forward<U>(v))
-        {
-        }
-
-        template<class U, typename enable_if<
-               std::is_constructible<T, const U&>::value
-            && !std::is_constructible<T, optional<U>&>::value
-            && !std::is_constructible<T, optional<U>&&>::value
-            && !std::is_constructible<T, const optional<U>&>::value
-            && !std::is_constructible<T, const optional<U>&&>::value
-            && !std::is_convertible<optional<U>&, T>::value
-            && !std::is_convertible<optional<U>&&, T>::value
-            && !std::is_convertible<const optional<U>&, T>::value
-            && !std::is_convertible<const optional<U>&&, T>::value
-            && std::is_convertible<const U&, T>::value
-        >::type * = nullptr>
-        optional(const optional<U>& rhs)
-        {
-            this->construct_from(rhs);
-        }
-
-        template<class U, typename enable_if<
-               std::is_constructible<T, const U&>::value
-            && !std::is_constructible<T, optional<U>&>::value
-            && !std::is_constructible<T, optional<U>&&>::value
-            && !std::is_constructible<T, const optional<U>&>::value
-            && !std::is_constructible<T, const optional<U>&&>::value
-            && !std::is_convertible<optional<U>&, T>::value
-            && !std::is_convertible<optional<U>&&, T>::value
-            && !std::is_convertible<const optional<U>&, T>::value
-            && !std::is_convertible<const optional<U>&&, T>::value
-            && !std::is_convertible<const U&, T>::value
-        >::type * = nullptr>
-        explicit optional(const optional<U>& rhs)
-        {
-            this->construct_from(rhs);
-        }
-
-        template<class U, typename enable_if<
-               std::is_constructible<T, U&&>::value
-            && !std::is_constructible<T, optional<U>&>::value
-            && !std::is_constructible<T, optional<U>&&>::value
-            && !std::is_constructible<T, const optional<U>&>::value
-            && !std::is_constructible<T, const optional<U>&&>::value
-            && !std::is_convertible<optional<U>&, T>::value
-            && !std::is_convertible<optional<U>&&, T>::value
-            && !std::is_convertible<const optional<U>&, T>::value
-            && !std::is_convertible<const optional<U>&&, T>::value
-            && std::is_convertible<const U&, T>::value
-        >::type * = nullptr>
-        optional(optional<U>&& rhs)
-        {
-            this->construct_from(AZStd::move(rhs));
-        }
-
-        template<class U, typename enable_if<
-               std::is_constructible<T, U&&>::value
-            && !std::is_constructible<T, optional<U>&>::value
-            && !std::is_constructible<T, optional<U>&&>::value
-            && !std::is_constructible<T, const optional<U>&>::value
-            && !std::is_constructible<T, const optional<U>&&>::value
-            && !std::is_convertible<optional<U>&, T>::value
-            && !std::is_convertible<optional<U>&&, T>::value
-            && !std::is_convertible<const optional<U>&, T>::value
-            && !std::is_convertible<const optional<U>&&, T>::value
-            && !std::is_convertible<const U&, T>::value
-        >::type * = nullptr>
-        explicit optional(optional<U>&& rhs)
-        {
-            this->construct_from(AZStd::move(rhs));
-        }
-
-        // 23.6.3.2 Destructor
-        // The destructor is conditionally trivial, and is handled by
-        // OptionalDestructBase
-
-        // 23.6.3.3 Assignment
-        optional<T>& operator=(nullopt_t)
-        {
-            this->reset();
-            return *this;
-        }
-
-        optional<T>& operator=(const optional& rhs) = default;
-        optional<T>& operator=(optional&& rhs) = default;
-
-        template<class U = T, class = typename enable_if<
-               !is_same<typename remove_cv<typename remove_reference<U>::type>::type, optional>::value
-               // !conjunction_v<is_scalar<T>, is_same<T, decay_t<U>>>
-            && !(is_scalar<value_type>::value && is_same<T, typename decay<U>::type>::value)
-            && is_constructible<T, U>::value
-            && is_assignable<T&, U>::value
-        >::type>
-        optional<T>& operator=(U&& v)
-        {
-            if (this->has_value())
-            {
-                this->value() = forward<U>(v);
-            }
-            else
-            {
-                this->construct(forward<U>(v));
-            }
-            return *this;
-        }
-
-        template<class U, class = typename enable_if<
-               std::is_constructible<T, const U&>::value
-            && std::is_assignable<T, U&>::value
-            && !std::is_constructible<T, optional<U>&>::value
-            && !std::is_constructible<T, optional<U>&&>::value
-            && !std::is_constructible<T, const optional<U>&>::value
-            && !std::is_constructible<T, const optional<U>&&>::value
-            && !std::is_convertible<optional<U>&, T>::value
-            && !std::is_convertible<optional<U>&&, T>::value
-            && !std::is_convertible<const optional<U>&, T>::value
-            && !std::is_convertible<const optional<U>&&, T>::value
-            && !std::is_assignable<T&, optional<U>&>::value
-            && !std::is_assignable<T&, optional<U>&&>::value
-            && !std::is_assignable<T&, const optional<U>&>::value
-            && !std::is_assignable<T&, const optional<U>&&>::value
-        >::type>
-        optional<T>& operator=(const optional<U>& rhs)
-        {
-            this->assign_from(rhs);
-            return *this;
-        }
-
-        template<class U, class = typename enable_if<
-               std::is_constructible<T, U>::value
-            && std::is_assignable<T&, U>::value
-            && !std::is_constructible<T, optional<U>&>::value
-            && !std::is_constructible<T, optional<U>&&>::value
-            && !std::is_constructible<T, const optional<U>&>::value
-            && !std::is_constructible<T, const optional<U>&&>::value
-            && !std::is_convertible<optional<U>&, T>::value
-            && !std::is_convertible<optional<U>&&, T>::value
-            && !std::is_convertible<const optional<U>&, T>::value
-            && !std::is_convertible<const optional<U>&&, T>::value
-            && !std::is_assignable<T&, optional<U>&>::value
-            && !std::is_assignable<T&, optional<U>&&>::value
-            && !std::is_assignable<T&, const optional<U>&>::value
-            && !std::is_assignable<T&, const optional<U>&&>::value
-        >::type>
-        optional<T>& operator=(optional<U>&& rhs)
-        {
-            this->assign_from(AZStd::move(rhs));
-            return *this;
-        }
-
-        template<class... Args, class = typename enable_if<
-            std::is_constructible<T, Args&&...>::value
-        >::type>
-        T& emplace(Args&&... args)
-        {
-            this->reset();
-            this->construct(forward<Args>(args)...);
-            return this->value();
-        }
-
-        template<class U, class... Args, class = typename enable_if<
-            std::is_constructible<T, Args&&...>::value
-        >::type>
-        T& emplace(std::initializer_list<U> il, Args&&... args)
-        {
-            this->reset();
-            this->construct(il, forward<Args>(args)...);
-            return this->value();
-        }
-
-        // 23.6.3.4 Swap
-        void swap(optional& rhs)
-        {
-            using AZStd::swap;
-            if (this->has_value())
-            {
-                if (rhs.has_value())
-                {
-                    swap(this->value(), rhs.value());
-                }
-                else
-                {
-                    rhs.construct(AZStd::move(this->value()));
-                    this->reset();
-                }
-            }
-            else
-            {
-                if (rhs.has_value())
-                {
-                    this->construct(AZStd::move(rhs.value()));
-                    rhs.reset();
-                }
-            }
-        }
-
-        // 23.6.3.5 observers
-        constexpr const T* operator->() const
-        {
-            return AZStd::addressof(this->value());
-        }
-        /*constexpr*/ T* operator->() // not constexpr because constexpr implies const in c++11, yielding methods differing only by return type
-        {
-            return AZStd::addressof(this->value());
-        }
-
-        constexpr const T& operator*() const&
-        {
-            return this->value();
-        }
-        /*constexpr*/ T& operator*() &
-        {
-            return this->value();
-        }
-
-        constexpr const T&& operator*() const&&
-        {
-            return AZStd::move(this->value());
-        }
-        /*constexpr*/ T&& operator*() &&
-        {
-            return AZStd::move(this->value());
-        }
-
-        constexpr explicit operator bool() const
-        {
-            return has_value();
-        }
-
-        using base::has_value;
-        using base::value;
-
-        template<class U, class = typename enable_if<std::is_copy_constructible<T>::value && std::is_convertible<U, T>::value>::type>
-        constexpr T value_or(U&& v) const&
-        {
-            return this->m_engaged ? this->value() : static_cast<T>(forward<U>(v));
-        }
-
-        template<class U, class = typename enable_if<std::is_move_constructible<T>::value && std::is_convertible<U, T>::value>::type>
-        /*constexpr*/ T value_or(U&& v) &&
-        {
-            return this->m_engaged ? AZStd::move(this->value()) : static_cast<T>(forward<U>(v));
-        }
-
-        // 23.6.3.6 Modifiers
-        using base::reset;
-    };
-
-    // 23.6.6 Relational operators
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        // Template function is only enabled if the result of T() == U() is
-        // convertible to bool
-        is_convertible<
-            decltype(declval<T>() == declval<U>()), bool
-        >::value,
-        bool // bool is the return type of operator==
-    >::type
-    operator==(const optional<T>& lhs, const optional<U>& rhs)
-    {
-        // MSVC2015 says that constexpr functions can only have 1 return
-        // statement
-        return (static_cast<bool>(lhs) != static_cast<bool>(rhs))
-            ? false
-            : (!static_cast<bool>(lhs))
-                ? true
-                : *lhs == *rhs;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() != declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator!=(const optional<T>& lhs, const optional<U>& rhs)
-    {
-        return (static_cast<bool>(lhs) != static_cast<bool>(rhs))
-            ? true
-            : (!static_cast<bool>(lhs))
-                ? false
-                : *lhs != *rhs;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() < declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator<(const optional<T>& lhs, const optional<U>& rhs)
-    {
-        // MSVC2015 constexpr functions can only have one return statement
-        return (!static_cast<bool>(rhs))
-            ? false
-            : (!static_cast<bool>(lhs))
-                ? true
-                : *lhs < *rhs;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() > declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator>(const optional<T>& lhs, const optional<U>& rhs)
-    {
-        // MSVC2015 constexpr functions can only have one return statement
-        return (!static_cast<bool>(lhs))
-            ? false
-            : (!static_cast<bool>(rhs))
-                ? true
-                : *lhs > *rhs;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() <= declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator<=(const optional<T>& lhs, const optional<U>& rhs)
-    {
-        // MSVC2015 constexpr functions can only have one return statement
-        return (!static_cast<bool>(lhs))
-            ? true
-            : (!static_cast<bool>(rhs))
-                ? false
-                : *lhs <= *rhs;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() >= declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator>=(const optional<T>& lhs, const optional<U>& rhs)
-    {
-        // MSVC2015 constexpr functions can only have one return statement
-        return (!static_cast<bool>(rhs))
-            ? true
-            : (!static_cast<bool>(lhs))
-                ? false
-                : *lhs >= *rhs;
-    }
-
-    // 23.6.7 Comparison with nullopt
-    template <class T>
-    constexpr bool operator==(const optional<T>& lhs, nullopt_t)
-    {
-        return !static_cast<bool>(lhs);
-    }
-    template <class T>
-    constexpr bool operator==(nullopt_t, const optional<T>& rhs)
-    {
-        return !static_cast<bool>(rhs);
-    }
-
-    template <class T>
-    constexpr bool operator!=(const optional<T>& lhs, nullopt_t)
-    {
-        return static_cast<bool>(lhs);
-    }
-    template <class T>
-    constexpr bool operator!=(nullopt_t, const optional<T>& rhs)
-    {
-        return static_cast<bool>(rhs);
-    }
-
-    template <class T>
-    constexpr bool operator<(const optional<T>&, nullopt_t)
-    {
-        return false;
-    }
-    template <class T>
-    constexpr bool operator<(nullopt_t, const optional<T>& rhs)
-    {
-        return static_cast<bool>(rhs);
-    }
-
-    template <class T>
-    constexpr bool operator<=(const optional<T>& lhs, nullopt_t)
-    {
-        return !static_cast<bool>(lhs);
-    }
-    template <class T>
-    constexpr bool operator<=(nullopt_t, const optional<T>&)
-    {
-        return true;
-    }
-
-    template <class T>
-    constexpr bool operator>(const optional<T>& lhs, nullopt_t)
-    {
-        return static_cast<bool>(lhs);
-    }
-    template <class T>
-    constexpr bool operator>(nullopt_t, const optional<T>&)
-    {
-        return false;
-    }
-
-    template <class T>
-    constexpr bool operator>=(const optional<T>&, nullopt_t)
-    {
-        return true;
-    }
-    template <class T>
-    constexpr bool operator>=(nullopt_t, const optional<T>& rhs)
-    {
-        return !static_cast<bool>(rhs);
-    }
-
-    // 23.6.8 Comparison with T
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() == declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator==(const optional<T>& lhs, const U& rhs)
-    {
-        return static_cast<bool>(lhs) ? (*lhs == rhs) : false;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() == declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator==(const T& lhs, const optional<U>& rhs)
-    {
-        return static_cast<bool>(rhs) ? (lhs == *rhs) : false;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() != declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator!=(const optional<T>& lhs, const U& rhs)
-    {
-        return static_cast<bool>(lhs) ? (*lhs != rhs) : true;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() != declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator!=(const T& lhs, const optional<U>& rhs)
-    {
-        return static_cast<bool>(rhs) ? (lhs != *rhs) : true;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() < declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator<(const optional<T>& lhs, const U& rhs)
-    {
-        return static_cast<bool>(lhs) ? (*lhs < rhs) : true;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() < declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator<(const T& lhs, const optional<U>& rhs)
-    {
-        return static_cast<bool>(rhs) ? (lhs < *rhs) : false;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() <= declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator<=(const optional<T>& lhs, const U& rhs)
-    {
-        return static_cast<bool>(lhs) ? (*lhs <= rhs) : true;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() <= declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator<=(const T& lhs, const optional<U>& rhs)
-    {
-        return static_cast<bool>(rhs) ? (lhs <= *rhs) : false;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() > declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator>(const optional<T>& lhs, const U& rhs)
-    {
-        return static_cast<bool>(lhs) ? (*lhs > rhs) : false;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() > declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator>(const T& lhs, const optional<U>& rhs)
-    {
-        return static_cast<bool>(rhs) ? (lhs > *rhs) : true;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() >= declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator>=(const optional<T>& lhs, const U& rhs)
-    {
-        return static_cast<bool>(lhs) ? (*lhs >= rhs) : false;
-    }
-
-    template <class T, class U>
-    constexpr
-    typename enable_if<
-        is_convertible<
-            decltype(declval<T>() >= declval<U>()), bool
-        >::value,
-        bool
-    >::type
-    operator>=(const T& lhs, const optional<U>& rhs)
-    {
-        return static_cast<bool>(rhs) ? (lhs >= *rhs) : true;
-    }
-
-    // 23.6.9 Specialized algorithms
-    template <class T>
-    typename enable_if<
-        is_move_constructible<T>::value,// && std::is_swappable_v<T>,
-        void
-    >::type
-    swap(optional<T>& lhs, optional<T>& rhs)
-    {
-        lhs.swap(rhs);
-    }
-
-    template <class T>
-    constexpr optional<typename decay<T>::type> make_optional(T&& v)
-    {
-        return optional<typename decay<T>::type>(forward<T>(v));
-    }
-
-    template <class T, class... Args>
-    constexpr optional<T> make_optional(Args&&... args)
-    {
-        return optional<T>(in_place, forward<Args>(args)...);
-    }
-
-    template <class T, class U, class... Args>
-    constexpr optional<T> make_optional(std::initializer_list<U> il, Args&&... args)
-    {
-        return optional<T>(in_place, il, forward<Args>(args)...);
-    }
 
     // 23.6.10 Hash support
+    template<class T>
+    struct hash;
+
     template<class T>
     struct hash<optional<T>>
     {
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/all_view.h b/Code/Framework/AzCore/AzCore/std/ranges/all_view.h
new file mode 100644
index 0000000000..40091e8844
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/all_view.h
@@ -0,0 +1,67 @@
+/*
+ * 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/ranges/owning_view.h>
+#include <AzCore/std/ranges/ref_view.h>
+
+namespace AZStd::ranges::views
+{
+    namespace Internal
+    {
+        template<class T, class = void>
+        constexpr bool convertible_to_ref_view = false;
+        template<class T>
+        constexpr bool convertible_to_ref_view<T, void_t<decltype(ranges::ref_view(declval<T>()))>> = true;
+
+        struct all_fn
+            : Internal::range_adaptor_closure<all_fn>
+        {
+            template<class View> 
+            constexpr auto operator()(View&& t) const noexcept(noexcept(static_cast<decay_t<View>>(AZStd::forward<View>(t))))
+                ->enable_if_t<ranges::view<decay_t<View>>, decltype(static_cast<decay_t<View>>(AZStd::forward<View>(t)))>
+            {
+                return static_cast<decay_t<View>>(AZStd::forward<View>(t));
+            }
+            template<class View>
+            constexpr auto operator()(View&& t) const noexcept(noexcept(ranges::ref_view(AZStd::forward<View>(t))))
+                ->enable_if_t<conjunction_v<
+                bool_constant<!ranges::view<decay_t<View>>>,
+                bool_constant<convertible_to_ref_view<View>>>, decltype(ranges::ref_view(AZStd::forward<View>(t)))>
+            {
+                return ranges::ref_view(AZStd::forward<View>(t));
+            }
+            template<class View>
+            constexpr auto operator()(View&& t) const noexcept(noexcept(ranges::owning_view(AZStd::forward<View>(t))))
+                ->enable_if_t<conjunction_v<
+                bool_constant<!ranges::view<decay_t<View>>>,
+                bool_constant<!convertible_to_ref_view<View>>>, decltype(ranges::owning_view(AZStd::forward<View>(t)))>
+            {
+                return ranges::owning_view(AZStd::forward<View>(t));
+            }
+        };
+    }
+
+    inline namespace customization_point_object
+    {
+        constexpr Internal::all_fn all{};
+    }
+
+    namespace Internal
+    {
+        template <class R, class = void>
+        struct all_t {};
+        template <class R>
+        struct all_t<R, enable_if_t<ranges::viewable_range<R>>>
+        {
+            using type = decltype(views::all(declval<R>()));
+        };
+    }
+    template<class R>
+    using all_t = typename Internal::all_t<R>::type;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/elements_view.h b/Code/Framework/AzCore/AzCore/std/ranges/elements_view.h
new file mode 100644
index 0000000000..3d16dd6086
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/elements_view.h
@@ -0,0 +1,475 @@
+/*
+ * 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/ranges/all_view.h>
+#include <AzCore/std/ranges/ranges_adaptor.h>
+
+namespace AZStd::ranges
+{
+    namespace Internal
+    {
+        template<class T, size_t N, class = void>
+        /*concept*/ constexpr bool has_tuple_element = false;
+
+        template<class T, size_t N>
+        /*concept*/ constexpr bool has_tuple_element<T, N, enable_if_t<conjunction_v<
+            sfinae_trigger<typename tuple_size<T>::type>,
+            bool_constant<(N < tuple_size_v<T>)>,
+            sfinae_trigger<tuple_element_t<N, T>>,
+            bool_constant<convertible_to<decltype(AZStd::get<N>(declval<T>())), const tuple_element_t<N, T>&>> >
+        >> = true;
+
+        template<class T, size_t N, class = void>
+        /*concept*/ constexpr bool returnable_element = false;
+
+        template<class T, size_t N>
+        /*concept*/ constexpr bool returnable_element<T, N, enable_if_t<
+            is_reference_v<T>> > = true;
+
+        template<class T, size_t N>
+        /*concept*/ constexpr bool returnable_element<T, N, enable_if_t<
+            move_constructible<tuple_element_t<N, T>>> > = true;
+    }
+
+    template<class View, size_t N, class = enable_if_t<conjunction_v<
+        bool_constant<input_range<View>>,
+        bool_constant<view<View>>,
+        bool_constant<Internal::has_tuple_element<range_value_t<View>, N>>,
+        bool_constant<Internal::has_tuple_element<remove_reference_t<range_reference_t<View>>, N>>,
+        bool_constant<Internal::returnable_element<range_reference_t<View>, N>> >
+        >>
+    class elements_view;
+
+    // Alias for elements_view which is useful for extracting keys from associative containers
+    template<class View>
+    using keys_view = elements_view<View, 0>;
+    // Alias for elements_view which is useful for extracting values from associative containers
+    template<class View>
+    using values_view = elements_view<View, 1>;
+
+    template<class T, size_t N>
+    inline constexpr bool enable_borrowed_range<elements_view<T, N>> = enable_borrowed_range<T>;
+
+    // views::elements customization point
+    namespace views
+    {
+        namespace Internal
+        {
+            template<size_t N>
+            struct elements_fn
+                : Internal::range_adaptor_closure<elements_fn<N>>
+            {
+                template <class View, class = enable_if_t<conjunction_v<
+                    bool_constant<viewable_range<View>>
+                    >>>
+                constexpr auto operator()(View&& view) const
+                {
+                    return elements_view<views::all_t<View>, N>(AZStd::forward<View>(view));
+                }
+            };
+        }
+        inline namespace customization_point_object
+        {
+            template<size_t N>
+            constexpr Internal::elements_fn<N> elements{};
+
+            constexpr auto keys = elements<0>;
+            constexpr auto values = elements<1>;
+        }
+    }
+
+    template<class View, size_t N, class>
+    class elements_view
+        : public view_interface<elements_view<View, N>>
+    {
+        template<bool>
+        struct iterator;
+        template<bool>
+        struct sentinel;
+
+    public:
+        template <bool Enable = default_initializable<View>,
+            class = enable_if_t<Enable>>
+        elements_view() {}
+
+        explicit constexpr elements_view(View base)
+            : m_base(AZStd::move(base))
+        {
+        }
+
+        template <bool Enable = copy_constructible<View>, class = enable_if_t<Enable>>
+        constexpr View base() const&
+        {
+            return m_base;
+        }
+        constexpr View base()&&
+        {
+            return AZStd::move(m_base);
+        }
+
+        template<bool Enable = !Internal::simple_view<View>, class = enable_if_t<Enable>>
+        constexpr auto begin()
+        {
+            return iterator<false>{ ranges::begin(m_base) };
+        }
+
+        template<bool Enable = range<const View>, class = enable_if_t<Enable>>
+        constexpr auto begin() const
+        {
+            return iterator<true>{ ranges::begin(m_base) };
+        }
+
+        template<bool Enable = !Internal::simple_view<View>, class = enable_if_t<Enable>>
+        constexpr auto end()
+        {
+            if constexpr (!common_range<View>)
+            {
+                return sentinel<false>{ ranges::end(m_base) };
+            }
+            else
+            {
+                return iterator<false>{ ranges::end(m_base) };
+            }
+        }
+
+        template<bool Enable = range<const View>>
+        constexpr auto end() const
+        {
+            if constexpr (!common_range<const View>)
+            {
+                return sentinel<true>{ ranges::end(m_base) };
+            }
+            else
+            {
+                return iterator<true>{ ranges::end(m_base) };
+            }
+        }
+
+        template<bool Enable = sized_range<View>, class = enable_if_t<Enable>>
+        constexpr auto size()
+        {
+            return ranges::size(m_base);
+        }
+
+        template<bool Enable = sized_range<const View>, class = enable_if_t<Enable>>
+        constexpr auto size() const
+        {
+            return ranges::size(m_base);
+        }
+
+    private:
+        View m_base{};
+    };
+
+    template<class View, size_t N, bool Const, class = void>
+    struct elements_view_iterator_category {};
+
+    template<class View, size_t N, bool Const>
+    struct elements_view_iterator_category<View, N, Const, enable_if_t<forward_range<Internal::maybe_const<Const, View>> >>
+    {
+    private:
+        using Base = Internal::maybe_const<Const, View>;
+        using IterCategory = typename iterator_traits<iterator_t<Base>>::iterator_category;
+    public:
+        using iterator_category = conditional_t<
+            !is_lvalue_reference_v<decltype(AZStd::get<N>(*declval<iterator_t<Base>>()))>,
+            input_iterator_tag,
+            conditional_t<derived_from<IterCategory, random_access_iterator_tag>,
+                random_access_iterator_tag,
+                IterCategory>>;
+    };
+
+    template<class View, size_t N, class ViewEnable>
+    template<bool Const>
+    struct elements_view<View, N, ViewEnable>::iterator
+        : enable_if_t<conjunction_v<
+        bool_constant<input_range<View>>,
+        bool_constant<view<View>>,
+        bool_constant<Internal::has_tuple_element<range_value_t<View>, N>>,
+        bool_constant<Internal::has_tuple_element<remove_reference_t<range_reference_t<View>>, N>>,
+        bool_constant<Internal::returnable_element<range_reference_t<View>, N>> >
+        , elements_view_iterator_category<View, N, Const>
+       >
+    {
+    private:
+        template <bool>
+        friend struct sentinel;
+
+        using Base = Internal::maybe_const<Const, View>;
+    public:
+
+        using iterator_concept = conditional_t<random_access_range<Base>,
+            random_access_iterator_tag,
+            conditional_t<bidirectional_range<Base>,
+                bidirectional_iterator_tag,
+                conditional_t<forward_range<Base>,
+                    forward_iterator_tag,
+                    input_iterator_tag>>>;
+
+        using value_type = remove_cvref_t<tuple_element_t<N, range_value_t<Base>>>;
+        using difference_type = range_difference_t<Base>;
+
+        template<class BaseIter = iterator_t<Base>, class = enable_if_t<default_initializable<BaseIter>>>
+        iterator() {}
+
+        constexpr iterator(iterator_t<Base> current)
+            : m_current(AZStd::move(current))
+        {
+        }
+        template<class ViewIter = iterator_t<View>, class BaseIter = iterator_t<Base>,
+            class = enable_if_t<Const && convertible_to<ViewIter, BaseIter>>>
+        iterator(iterator<!Const> i)
+            : m_current(i.m_current)
+        {
+        }
+
+        constexpr iterator_t<View> base() const& noexcept
+        {
+            return m_current;
+        }
+
+        constexpr iterator_t<View> base() &&
+        {
+            return AZStd::move(m_current);
+        }
+
+        constexpr decltype(auto) operator*() const
+        {
+            return get_element(m_current);
+        }
+
+        constexpr iterator& operator++()
+        {
+            ++m_current;
+            return *this;
+        }
+
+        constexpr decltype(auto) operator++(int)
+        {
+            if constexpr (!forward_range<Base>)
+            {
+                ++m_current;
+            }
+            else
+            {
+                auto tmp = *this;
+                ++(*this);
+                return tmp;
+            }
+        }
+
+        template<bool Enable = bidirectional_range<Base>, class = enable_if_t<Enable>>
+        constexpr iterator& operator--() const
+        {
+            --m_current;
+            return *this;
+        }
+
+        template<bool Enable = bidirectional_range<Base>, class = enable_if_t<Enable>>
+        constexpr iterator operator--(int) const
+        {
+            auto tmp = *this;
+            --(*this);
+            return tmp;
+        }
+
+        template<bool Enable = random_access_range<Base>, class = enable_if_t<Enable>>
+        constexpr iterator& operator+=(difference_type n)
+        {
+            m_current += n;
+            return *this;
+        }
+
+        template<bool Enable = random_access_range<Base>, class = enable_if_t<Enable>>
+        constexpr iterator& operator-=(difference_type n)
+        {
+            m_current -= n;
+            return *this;
+        }
+
+        template<bool Enable = random_access_range<Base>, class = enable_if_t<Enable>>
+        constexpr decltype(auto) operator[](difference_type n) const
+        {
+            return get_element(m_current + n);
+        }
+
+        // equality_comparable
+        template<class BaseIter = iterator_t<Base>, class = enable_if_t<equality_comparable<BaseIter>>>
+        friend constexpr bool operator==(const iterator& x, const iterator& y)
+        {
+            return x.m_current == y.m_current;
+        }
+        friend constexpr bool operator!=(const iterator& y, const iterator& x)
+        {
+            return !operator==(x, y);
+        }
+
+        // strict_weak_order
+        template<bool Enable = random_access_range<Base>, class = enable_if_t<Enable>>
+        friend constexpr bool operator<(const iterator& x, const iterator& y)
+        {
+            return x.m_current < y.m_current;
+        }
+        template<bool Enable = random_access_range<Base>, class = enable_if_t<Enable>>
+        friend constexpr bool operator>(const iterator& x, const iterator& y)
+        {
+            return y < x;
+        }
+        template<bool Enable = random_access_range<Base>, class = enable_if_t<Enable>>
+        friend constexpr bool operator<=(const iterator& x, const iterator& y)
+        {
+            return !(y < x);
+        }
+        template<bool Enable = random_access_range<Base>, class = enable_if_t<Enable>>
+        friend constexpr bool operator>=(const iterator& x, const iterator& y)
+        {
+            return !(x < y);
+        }
+
+        template<bool Enable = random_access_range<Base>, class = enable_if_t<Enable>>
+        friend constexpr iterator operator+(const iterator& x, difference_type n)
+        {
+            iterator iterCopy(x);
+            iterCopy += n;
+            return iterCopy;
+        }
+
+        template<bool Enable = random_access_range<Base>, class = enable_if_t<Enable>>
+        friend constexpr iterator operator+(difference_type n, const iterator& x)
+        {
+            return n + x;
+        }
+
+        template<bool Enable = random_access_range<Base>, class = enable_if_t<Enable>>
+        friend constexpr iterator operator-(const iterator& x, difference_type n)
+        {
+            iterator iterCopy(x);
+            iterCopy -= n;
+            return iterCopy;
+        }
+
+        template<class BaseIter = iterator_t<Base>, class = enable_if_t<sized_sentinel_for<BaseIter, BaseIter>>>
+        friend constexpr difference_type operator-(const iterator& x, const iterator& y)
+        {
+            return x.m_current - y.m_current;
+        }
+    private:
+        static constexpr decltype(auto) get_element(const iterator_t<Base>& i)
+        {
+            if constexpr (is_reference_v<range_reference_t<Base>>)
+            {
+                // Return a reference to the element of the tuple like type
+                return AZStd::get<N>(*i);
+            }
+            else
+            {
+                // Cast the result of calling AZStd::get on value type reference
+                using E = remove_cv_t<tuple_element_t<N, range_reference_t<Base>>>;
+                return static_cast<E>(AZStd::get<N>(*i));
+            }
+        }
+
+        //! iterator to range being viewed
+        iterator_t<Base> m_current{};
+    };
+
+    namespace ElementsViewInternal
+    {
+        struct requirements_fulfilled {};
+    }
+
+    template<class View, size_t N, class ViewEnable>
+    template<bool Const>
+    struct elements_view<View, N, ViewEnable>::sentinel
+        : enable_if_t<conjunction_v<
+        bool_constant<input_range<View>>,
+        bool_constant<view<View>>,
+        bool_constant<Internal::has_tuple_element<range_value_t<View>, N>>,
+        bool_constant<Internal::has_tuple_element<remove_reference_t<range_reference_t<View>>, N>>,
+        bool_constant<Internal::returnable_element<range_reference_t<View>, N>> >
+        , ElementsViewInternal::requirements_fulfilled>
+    {
+    private:
+        using Base = Internal::maybe_const<Const, View>;
+
+    public:
+        sentinel() = default;
+
+        explicit constexpr sentinel(sentinel_t<View> end)
+            : m_end(end)
+        {
+        }
+        template<class SentinelView = sentinel_t<View>, class SentinelBase = sentinel_t<Base>,
+            class = enable_if_t<Const && convertible_to<SentinelView, SentinelBase>>>
+        constexpr sentinel(sentinel<!Const> s)
+            : m_end(AZStd::move(s.m_end))
+        {
+        }
+
+        constexpr sentinel_t<View> base() const
+        {
+            return m_end;
+        }
+
+        // comparison operators
+        template<bool OtherConst, class = enable_if_t<
+            sentinel_for<sentinel_t<Base>, iterator_t<Internal::maybe_const<OtherConst, Base>>>
+        >>
+        friend constexpr bool operator==(const iterator<OtherConst>& x, const sentinel& y)
+        {
+            return iterator_accessor(x) == y.m_end;
+        }
+        template<bool OtherConst>
+        friend constexpr bool operator==(const sentinel& y, const iterator<OtherConst>& x)
+        {
+            return operator==(x, y);
+        }
+        template<bool OtherConst>
+        friend constexpr bool operator!=(const iterator<OtherConst>& x, const sentinel& y)
+        {
+            return !operator==(x, y);
+        }
+        template<bool OtherConst>
+        friend constexpr bool operator!=(const sentinel& y, const iterator<OtherConst>& x)
+        {
+            return !operator==(x, y);
+        }
+
+        // difference operator
+        template<bool OtherConst, class = enable_if_t<
+            sized_sentinel_for<sentinel_t<Base>, iterator_t<Internal::maybe_const<OtherConst, Base>>>
+            >>
+        friend constexpr range_difference_t<Internal::maybe_const<OtherConst, Base >>
+            operator-(const iterator<OtherConst>& x, const sentinel& y)
+        {
+            return iterator_accessor(x) - y.m_end;
+        }
+
+        template<bool OtherConst, class = enable_if_t<
+            sized_sentinel_for<sentinel_t<Base>, iterator_t<Internal::maybe_const<OtherConst, Base>>>
+            >>
+        friend constexpr range_difference_t<Internal::maybe_const<OtherConst, Base>>
+            operator-(const sentinel& x, const iterator<OtherConst>& y)
+        {
+            return x.m_end - iterator_accessor(y);
+        }
+    private:
+        // On MSVC The friend functions are can only access the sentinel struct members
+        // The iterator struct which is a friend of the sentinel struct is NOT a friend
+        // of the friend functions
+        // So a shim is added to provide access to the iterator m_current member
+        template<bool OtherConst>
+        static constexpr auto iterator_accessor(const iterator<OtherConst>& it)
+        {
+            return it.m_current;
+        }
+
+        sentinel_t<Base> m_end{};
+    };
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/empty_view.h b/Code/Framework/AzCore/AzCore/std/ranges/empty_view.h
new file mode 100644
index 0000000000..be4fdc92ee
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/empty_view.h
@@ -0,0 +1,37 @@
+/*
+ * 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/ranges/ranges.h>
+
+namespace AZStd::ranges
+{
+    template<class T, class = void>
+    class empty_view;
+
+    template<class T>
+    class empty_view<T, enable_if_t<is_object_v<T>>>
+        : public view_interface<empty_view<T>>
+    {
+    public:
+        static constexpr T* begin() noexcept { return nullptr; }
+        static constexpr T* end() noexcept { return nullptr; }
+        static constexpr T* data() noexcept { return nullptr; }
+        static constexpr size_t size() noexcept { return 0; }
+        static constexpr bool empty() noexcept { return true; }
+    };
+
+    namespace views
+    {
+        template<class T>
+        constexpr empty_view<T> empty{};
+    }
+
+    template<class T>
+    inline constexpr bool enable_borrowed_range<empty_view<T>> = true;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/iter_move.h b/Code/Framework/AzCore/AzCore/std/ranges/iter_move.h
index a9519f03c5..ae1f994f6b 100644
--- a/Code/Framework/AzCore/AzCore/std/ranges/iter_move.h
+++ b/Code/Framework/AzCore/AzCore/std/ranges/iter_move.h
@@ -74,8 +74,16 @@ namespace AZStd::ranges::Internal
 
 namespace AZStd::ranges
 {
-    inline namespace customization_point_object
+    // Workaround for clang bug https://bugs.llvm.org/show_bug.cgi?id=37556
+    // Adding placing the inline customization_point_object namespace
+    // under a regular namespace and then aliasing that into the AZStd::ranges namespace
+    namespace workaround
     {
-        inline constexpr auto iter_move = Internal::iter_move_fn{};
+        inline namespace customization_point_object
+        {
+            inline constexpr auto iter_move = Internal::iter_move_fn{};
+        }
     }
+
+    using namespace workaround;
 }
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/iter_swap.h b/Code/Framework/AzCore/AzCore/std/ranges/iter_swap.h
new file mode 100644
index 0000000000..fa11be2be8
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/iter_swap.h
@@ -0,0 +1,120 @@
+/*
+ * 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/iterator/iterator_primitives.h>
+#include <AzCore/std/ranges/swap.h>
+#include <AzCore/std/typetraits/conjunction.h>
+#include <AzCore/std/typetraits/disjunction.h>
+#include <AzCore/std/typetraits/extent.h>
+#include <AzCore/std/typetraits/integral_constant.h>
+#include <AzCore/std/typetraits/is_class.h>
+#include <AzCore/std/typetraits/is_enum.h>
+#include <AzCore/std/typetraits/is_void.h>
+#include <AzCore/std/typetraits/remove_cvref.h>
+#include <AzCore/std/typetraits/void_t.h>
+#include <AzCore/std/utility/declval.h>
+
+
+namespace AZStd::ranges::Internal
+{
+    template<class I1, class I2>
+    void iter_swap(I1, I2) = delete;
+
+    template <class I1, class I2, class = void>
+    constexpr bool is_class_or_enum_with_iter_swap_adl = false;
+
+    template <class I1, class I2>
+    constexpr bool is_class_or_enum_with_iter_swap_adl<I1, I2, enable_if_t<conjunction_v<
+        disjunction<
+        disjunction<is_class<remove_cvref_t<I1>>, is_enum<remove_cvref_t<I1>>>,
+        disjunction<is_class<remove_cvref_t<I2>>, is_enum<remove_cvref_t<I2>>>>,
+        is_void<void_t<decltype(iter_swap(declval<I1>(), declval<I2>()))>>
+        >>> = true;
+
+    struct iter_swap_fn
+    {
+        template <class I1, class I2>
+        constexpr auto operator()(I1&& i1, I2&& i2) const
+            ->enable_if_t<is_class_or_enum_with_iter_swap_adl<I1, I2>
+            >
+        {
+            iter_swap(AZStd::forward<I1>(i1), AZStd::forward<I1>(i2));
+        }
+        template <class I1, class I2>
+        constexpr auto operator()(I1&& i1, I2&& i2) const
+            ->enable_if_t<conjunction_v<bool_constant<!is_class_or_enum_with_iter_swap_adl<I1, I2>>,
+            bool_constant<indirectly_readable<I1>>,
+            bool_constant<indirectly_readable<I2>>,
+            bool_constant<swappable_with<iter_reference_t<I1>, iter_reference_t<I2>>>
+            >>
+        {
+            ranges::swap(*i1, *i2);
+        }
+
+        template <class I1, class I2>
+        constexpr auto operator()(I1&& i1, I2&& i2) const
+            ->enable_if_t<conjunction_v<bool_constant<!is_class_or_enum_with_iter_swap_adl<I1, I2>>,
+            bool_constant<!swappable_with<iter_reference_t<I1>, iter_reference_t<I2>>>,
+            bool_constant<indirectly_movable_storable<I1, I2>>,
+            bool_constant<indirectly_movable_storable<I2, I1>>
+            >>
+        {
+            *AZStd::forward<I1>(i1) = iter_exchange_move(AZStd::forward<I2>(i2), AZStd::forward<I1>(i1));
+        }
+
+    private:
+        template<class X, class Y>
+        static constexpr iter_value_t<X> iter_exchange_move(X&& x, Y&& y)
+            noexcept(noexcept(iter_value_t<X>(iter_move(x))) && noexcept(*x = iter_move(y)))
+        {
+            iter_value_t<X> old_value(iter_move(x));
+            *x = iter_move(y);
+            return old_value;
+        }
+    };
+}
+
+namespace AZStd::ranges
+{
+    // Workaround for clang bug https://bugs.llvm.org/show_bug.cgi?id=37556
+    // Using a placeholder namespace to wrap the customization point object
+    // inline namespce and then bring that placeholder namespace into scope
+    namespace workaround
+    {
+        inline namespace customization_point_object
+        {
+            inline constexpr Internal::iter_swap_fn iter_swap{};
+        }
+    }
+}
+
+namespace AZStd::Internal
+{
+    template <class I1, class I2, class = void>
+    constexpr bool indirectly_swappable_impl = false;
+    template <class I1, class I2>
+    constexpr bool indirectly_swappable_impl<I1, I2, enable_if_t<conjunction_v<
+        bool_constant<indirectly_readable<I1>>,
+        bool_constant<indirectly_readable<I2>>,
+        is_void<void_t<
+        decltype(AZStd::ranges::iter_swap(declval<I1>(), declval<I1>())),
+        decltype(AZStd::ranges::iter_swap(declval<I2>(), declval<I2>())),
+        decltype(AZStd::ranges::iter_swap(declval<I1>(), declval<I2>())),
+        decltype(AZStd::ranges::iter_swap(declval<I2>(), declval<I1>()))>>
+        >>> = true;
+}
+
+namespace AZStd
+{
+    template<class I1, class I2 = I1>
+    /*concept*/ constexpr bool indirectly_swappable = Internal::indirectly_swappable_impl<I1, I2>;
+}
+
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/join_view.h b/Code/Framework/AzCore/AzCore/std/ranges/join_view.h
new file mode 100644
index 0000000000..5b8e7de3c7
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/join_view.h
@@ -0,0 +1,430 @@
+/*
+ * 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/ranges/all_view.h>
+#include <AzCore/std/ranges/ranges_adaptor.h>
+#include <AzCore/std/ranges/ranges_functional.h>
+
+namespace AZStd::ranges
+{
+    template<class View, class = enable_if_t<conjunction_v<
+        bool_constant<input_range<View>>,
+        bool_constant<view<View>>,
+        bool_constant<input_range<range_reference_t<View>>>
+        >>>
+        class join_view;
+
+    // views::join customization point
+    namespace views
+    {
+        namespace Internal
+        {
+            struct join_view_fn
+                : Internal::range_adaptor_closure<join_view_fn>
+            {
+                template <class View, class = enable_if_t<conjunction_v<
+                    bool_constant<viewable_range<View>>
+                    >>>
+                constexpr auto operator()(View&& view) const
+                {
+                    return join_view(views::all(AZStd::forward<View>(view)));
+                }
+            };
+        }
+        inline namespace customization_point_object
+        {
+            constexpr Internal::join_view_fn join{};
+        }
+    }
+
+    template<class View, class>
+    class join_view
+        : public view_interface<join_view<View>>
+    {
+        template<bool>
+        struct iterator;
+        template<bool>
+        struct sentinel;
+
+    public:
+        template <bool Enable = default_initializable<View>,
+            class = enable_if_t<Enable>>
+        join_view() {}
+
+        explicit constexpr join_view(View base)
+            : m_base(AZStd::move(base))
+        {}
+
+
+        template <bool Enable = copy_constructible<View>, class = enable_if_t<Enable>>
+        constexpr View base() const&
+        {
+            return m_base;
+        }
+        constexpr View base() &&
+        {
+            return AZStd::move(m_base);
+        }
+
+        constexpr auto begin()
+        {
+            constexpr bool UseConst = Internal::simple_view<View> && is_reference_v<range_reference_t<View>>;
+            return iterator<UseConst>{ *this, ranges::begin(m_base) };
+        }
+
+        template<class ConstView = const View,
+            class = enable_if_t<input_range<ConstView> && is_reference_v<range_reference_t<ConstView>>>>
+        constexpr auto begin() const
+        {
+            return iterator<true>{ *this, ranges::begin(m_base) };
+        }
+
+        constexpr decltype(auto) end()
+        {
+            if constexpr (forward_range<View> && is_reference_v<InnerRange> &&
+                forward_range<InnerRange> && common_range<View> && common_range<InnerRange>)
+            {
+                return iterator<Internal::simple_view<View>>{ *this, ranges::end(m_base) };
+            }
+            else
+            {
+                return sentinel<Internal::simple_view<View>>{ *this };
+            }
+        }
+        template<class ConstView = const View,
+            class = enable_if_t<input_range<ConstView> && is_reference_v<range_reference_t<ConstView>>>>
+        constexpr auto end() const
+        {
+            if constexpr (forward_range<const View> && forward_range<range_reference_t<const View>> &&
+                common_range<const View> && common_range<range_reference_t<const View>>)
+            {
+                return iterator<true>{ *this, ranges::end(m_base) };
+            }
+            else
+            {
+                return sentinel<true>{ *this };
+            }
+        }
+    private:
+        View m_base{};
+
+        using InnerRange = range_reference_t<View>;
+        // When the inner range for the view is a reference it doesn't need to be stored
+        struct InnerRangeIsReference {};
+        using InnerRange_t = conditional_t<is_reference_v<InnerRange>, InnerRangeIsReference,
+            Internal::non_propagating_cache<remove_cv_t<InnerRange>>>;
+        AZ_NO_UNIQUE_ADDRESS InnerRange_t m_inner{};
+    };
+
+    template<class View, bool Const, class = void>
+    struct join_view_iterator_category {};
+    template<class View, bool Const>
+    struct join_view_iterator_category<View, Const, enable_if_t<conjunction_v<
+        is_reference<range_reference_t<Internal::maybe_const<Const, View>>>,
+        bool_constant<forward_range<Internal::maybe_const<Const, View>>>,
+        bool_constant<forward_range<range_reference_t<Internal::maybe_const<Const, View>>>>
+        >>>
+    {
+    private:
+        using Base = Internal::maybe_const<Const, View>;
+        using OuterC = typename iterator_traits<iterator_t<Base>>::iterator_category;
+        using InnerC = typename iterator_traits<iterator_t<range_reference_t<Base>>>::iterator_category;
+    public:
+        using iterator_category = conditional_t<conjunction_v<
+                bool_constant<derived_from<OuterC, bidirectional_iterator_tag>>,
+                bool_constant<derived_from<InnerC, bidirectional_iterator_tag>>,
+                bool_constant<common_range<range_reference_t<Base>>> >,
+                bidirectional_iterator_tag,
+                conditional_t<conjunction_v<
+                    bool_constant<derived_from<OuterC, forward_iterator_tag>>,
+                    bool_constant<derived_from<InnerC, forward_iterator_tag>> >,
+                    forward_iterator_tag,
+                    input_iterator_tag>>;
+    };
+
+
+    template<class R>
+    join_view(R&&) -> join_view<views::all_t<R>>;
+
+    template<class View, class ViewEnable>
+    template<bool Const>
+    struct join_view<View, ViewEnable>::iterator
+        : enable_if_t<conjunction_v<
+        bool_constant<input_range<View>>,
+        bool_constant<view<View>>,
+        bool_constant<input_range<range_reference_t<View>>>
+        >, join_view_iterator_category<View, Const>
+       >
+    {
+    private:
+        template<bool>
+        friend struct sentinel;
+
+        using Parent = Internal::maybe_const<Const, join_view>;
+        using Base = Internal::maybe_const<Const, View>;
+        using OuterIter = iterator_t<Base>;
+        using InnerIter = iterator_t<range_reference_t<Base>>;
+        static constexpr bool ref_is_glvalue = is_reference_v<range_reference_t<Base>>;
+    public:
+
+        using iterator_concept = conditional_t<ref_is_glvalue && bidirectional_range<Base>
+            && common_range<Base>, bidirectional_iterator_tag,
+            conditional_t<ref_is_glvalue && forward_range<Base> && forward_range<range_reference_t<Base>>,
+            forward_iterator_tag,
+            input_iterator_tag>>;
+
+        using value_type = range_value_t<range_reference_t<Base>>;
+        using difference_type = common_type_t<range_difference_t<Base>,
+            range_difference_t<range_reference_t<Base>>>;
+
+        template<bool Enable = default_initializable<OuterIter> && default_initializable<InnerIter>,
+            class = enable_if_t<Enable>>
+        iterator() {}
+
+        constexpr iterator(join_view& parent, OuterIter outer)
+            : m_parent(addressof(parent))
+            , m_outer(AZStd::move(outer))
+        {
+            satisfy();
+        }
+        template<bool Enable = convertible_to<iterator_t<View>, OuterIter> &&
+            convertible_to<iterator_t<InnerRange>, InnerIter>,
+            class = enable_if_t<Enable>>
+        iterator(iterator<!Const> i)
+            : m_parent(i.m_parent)
+            , m_outer(i.m_outer)
+            , m_inner(i.m_inner)
+        {}
+
+        constexpr iterator_t<View> base() const
+        {
+            return m_inner;
+        }
+
+        constexpr decltype(auto) operator*() const
+        {
+            return *m_inner;
+        }
+
+        template<bool Enable = Internal::has_arrow<InnerIter> && copyable<InnerIter>,
+            class = enable_if_t<Enable>>
+        constexpr InnerIter operator->() const
+        {
+            return m_inner;
+        }
+
+        constexpr iterator& operator++()
+        {
+            if constexpr (ref_is_glvalue)
+            {
+                auto&& innerRange = *m_outer;
+                if (++m_inner == ranges::end(innerRange))
+                {
+                    ++m_outer;
+                    satisfy();
+                }
+            }
+            else
+            {
+                auto&& innerRange = *m_parent->m_inner;
+                if (++m_inner == ranges::end(innerRange))
+                {
+                    ++m_outer;
+                    satisfy();
+
+                }
+            }
+            return *this;
+        }
+
+        constexpr void operator++(int)
+        {
+            ++(*this);
+        }
+
+        template<bool Enable = ref_is_glvalue && bidirectional_range<Base> && bidirectional_range<range_reference_t<Base>>,
+            class = enable_if_t<Enable && common_range<range_reference_t<Base>>>>
+        constexpr iterator& operator--() const
+        {
+            if (m_outer == ranges::end(m_parent->m_base))
+            {
+                m_inner = ranges::end(*--m_outer);
+            }
+            // Move inner iterator backwards to the last element of the first non-empty outer iterator
+            // by iterating backwards
+            while (m_inner == ranges::begin(*m_outer))
+            {
+                m_inner = ranges::end(*--m_outer);
+                --m_inner;
+            }
+            return *this;
+        }
+
+        template<bool Enable = ref_is_glvalue && bidirectional_range<Base> && bidirectional_range<range_reference_t<Base>>,
+            class = enable_if_t<Enable && common_range<range_reference_t<Base>>>>
+        constexpr iterator operator--(int) const
+        {
+            auto tmp = *this;
+            --(*this);
+            return tmp;
+        }
+
+        template<class OtherBase = Base,
+            class = enable_if_t<ref_is_glvalue && equality_comparable<iterator_t<OtherBase>> &&
+            equality_comparable<iterator_t<range_reference_t<OtherBase>>>>>
+        friend constexpr bool operator==(const iterator& x, const iterator& y)
+        {
+            return x.m_outer == y.m_outer && x.m_inner == y.m_inner;
+        }
+        template<class OtherBase = Base,
+            class = enable_if_t<ref_is_glvalue && equality_comparable<iterator_t<OtherBase>>&&
+            equality_comparable<iterator_t<range_reference_t<OtherBase>>>>>
+        friend constexpr bool operator!=(const iterator& x, const iterator& y)
+        {
+            return !operator==(x, y);
+        }
+
+        // customization of iter_move and iter_swap
+
+        friend constexpr decltype(auto) iter_move(
+            iterator& i)
+            noexcept(noexcept(ranges::iter_move(i.m_inner)))
+        {
+            return ranges::iter_move(i.m_inner);
+        }
+
+
+        friend constexpr void iter_swap(
+            iterator& x,
+            iterator& y)
+            noexcept(noexcept(ranges::iter_swap(x.m_inner, y.m_inner)))
+        {
+            return ranges::iter_swap(x.m_inner, y.m_inner);
+        }
+
+    private:
+        constexpr void satisfy()
+        {
+            // dereference the outer iterator if the inner iterato is a reference
+            // or make a copy of deref ference of outer iterator
+            auto update_inner = [this](const iterator_t<Base>& x) constexpr -> auto&&
+            {
+                if constexpr (ref_is_glvalue)     // *x is a reference
+                {
+                    // workaround clang 9.0.0 bug where this is unused because
+                    // of not being used in one block of the if constexpr
+                    (void)this;
+                    return *x;
+                }
+                else
+                {
+                    return m_parent->m_inner.emplace_deref(x);
+                }
+            };
+
+            for (; m_outer != ranges::end(m_parent->m_base); ++m_outer)
+            {
+
+                auto&& inner = update_inner(m_outer);
+                m_inner = ranges::begin(inner);
+                // m_inner is end then the inner range is empty
+                // and the next outer element is iterated over
+                if (m_inner != ranges::end(inner))
+                {
+                    return;
+                }
+            }
+            if constexpr (ref_is_glvalue)
+            {
+                m_inner = InnerIter();
+            }
+        }
+
+        //! iterator to the outer view element of the view wrapped by the join view
+        OuterIter m_outer{};
+        //! iterator to the actually range element which is wrapped by the view
+        InnerIter m_inner{};
+        //! reference to parent join_view
+        join_view<View>* m_parent{};
+    };
+
+
+    // sentinel type for iterator
+    namespace JoinViewInternal
+    {
+        struct requirements_fulfilled {};
+    }
+
+    template<class View, class ViewEnable>
+    template<bool Const>
+    struct join_view<View, ViewEnable>::sentinel
+        : enable_if_t<conjunction_v<
+        bool_constant<input_range<View>>,
+        bool_constant<view<View>>,
+        bool_constant<input_range<range_reference_t<View>>>
+        >, JoinViewInternal::requirements_fulfilled>
+    {
+    private:
+        using Parent = Internal::maybe_const<Const, join_view>;
+        using Base = Internal::maybe_const<Const, View>;
+
+    public:
+        sentinel() = default;
+        explicit constexpr sentinel(Parent& parent)
+            : m_end(ranges::end(parent.m_base))
+        {}
+        template<bool Enable = Const,
+            class = enable_if_t<Enable && convertible_to<sentinel_t<View>, sentinel_t<Base>>>>
+        constexpr sentinel(sentinel<!Const> s)
+            : m_end(AZStd::move(s.m_end))
+        {
+        }
+
+        // comparison operators
+        template<bool OtherConst, class = enable_if_t<
+            sentinel_for<sentinel_t<Base>, iterator_t<Internal::maybe_const<OtherConst, Base>>>
+        >>
+        friend constexpr bool operator==(const iterator<OtherConst>& x, const sentinel& y)
+        {
+            return iterator_accessor(x) == y.m_end;
+        }
+        template<bool OtherConst, class = enable_if_t<
+            sentinel_for<sentinel_t<Base>, iterator_t<Internal::maybe_const<OtherConst, Base>>>
+        >>
+        friend constexpr bool operator==(const sentinel& y, const iterator<OtherConst>& x)
+        {
+            return operator==(x, y);
+        }
+        template<bool OtherConst, class = enable_if_t<
+            sentinel_for<sentinel_t<Base>, iterator_t<Internal::maybe_const<OtherConst, Base>>>
+        >>
+        friend constexpr bool operator!=(const iterator<OtherConst>& x, const sentinel& y)
+        {
+            return !operator==(x, y);
+        }
+        template<bool OtherConst, class = enable_if_t<
+            sentinel_for<sentinel_t<Base>, iterator_t<Internal::maybe_const<OtherConst, Base>>>
+        >>
+        friend constexpr bool operator!=(const sentinel& y, const iterator<OtherConst>& x)
+        {
+            return !operator==(x, y);
+        }
+    private:
+        // On MSVC The friend functions are can only access the sentinel struct members
+        // The iterator struct which is a friend of the sentinel struct is NOT a friend
+        // of the friend functions
+        // So a shim is added to provide access to the iterator m_current member
+        template<bool OtherConst>
+        static constexpr auto iterator_accessor(const iterator<OtherConst>& it)
+        {
+            return it.m_outer;
+        }
+        sentinel_t<Base> m_end{};
+    };
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/owning_view.h b/Code/Framework/AzCore/AzCore/std/ranges/owning_view.h
new file mode 100644
index 0000000000..8172b59f56
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/owning_view.h
@@ -0,0 +1,114 @@
+/*
+ * 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/ranges/ranges_adaptor.h>
+
+namespace AZStd::ranges
+{
+    template<class R, class = void>
+    class owning_view;
+
+    template<class R>
+    class owning_view<R, enable_if_t<ranges::range<R> && movable<R> &&
+        !Internal::is_initializer_list<remove_cvref_t<R>> >>
+        : public ranges::view_interface<owning_view<R>>
+    {
+    public:
+
+        template<class T = R, enable_if_t<default_initializable<T>>>
+        constexpr owning_view() {}
+
+        constexpr owning_view(R&& t)
+            : m_range{ AZStd::move(t) }
+        {}
+
+        constexpr owning_view(owning_view&&) = default;
+        constexpr owning_view& operator=(owning_view&&) = default;
+
+        constexpr R& base() & noexcept
+        {
+            return m_range;
+        }
+        constexpr const R& base() const& noexcept
+        {
+            return m_range;
+        }
+        constexpr R&& base() && noexcept
+        {
+            return AZStd::move(m_range);
+        }
+        constexpr const R&& base() const&& noexcept
+        {
+            return AZStd::move(m_range);
+        }
+
+        constexpr iterator_t<R> begin()
+        {
+            return ranges::begin(m_range);
+        }
+        constexpr sentinel_t<R> end()
+        {
+            return ranges::end(m_range);
+        }
+
+        template<class Rn = R>
+        constexpr auto begin() const -> enable_if_t<range<const R>, decltype(ranges::begin(declval<Rn>()))>
+        {
+            return ranges::begin(m_range);
+        }
+        template<class Rn = R>
+        constexpr auto end() const -> enable_if_t<range<const R>, decltype(ranges::end(declval<Rn>()))>
+        {
+            return ranges::end(m_range);
+        }
+
+        template<class Rn = R>
+        constexpr auto empty() -> enable_if_t<Internal::sfinae_trigger_v<decltype(ranges::empty(declval<Rn>()))>, bool>
+        {
+            return ranges::empty(m_range);
+        }
+        template<class Rn = R>
+        constexpr auto empty() const -> enable_if_t<Internal::sfinae_trigger_v<decltype(ranges::empty(declval<Rn>()))>, bool>
+        {
+            return ranges::empty(m_range);
+        }
+
+        template<class Rn = R>
+        constexpr auto size() -> enable_if_t<sized_range<R>, decltype(ranges::size(declval<Rn>()))>
+        {
+            return ranges::size(m_range);
+        }
+        template<class Rn = R>
+        constexpr auto size() const -> enable_if_t<sized_range<const R>, decltype(ranges::size(declval<Rn>()))>
+        {
+            return ranges::size(m_range);
+        }
+
+        template<class Rn = R>
+        constexpr auto data() -> enable_if_t<contiguous_range<R>, decltype(ranges::data(declval<Rn>()))>
+        {
+            return ranges::data(m_range);
+        }
+        template<class Rn = R>
+        constexpr auto data() const -> enable_if_t<contiguous_range<const R>, decltype(ranges::data(declval<Rn>()))>
+        {
+            return ranges::data(m_range);
+        }
+
+    private:
+        R m_range;
+    };
+
+    //! deduction guides
+    template<class R>
+    owning_view(R&&) -> owning_view<R>;
+
+    template<class T>
+    inline constexpr bool enable_borrowed_range<owning_view<T>> = enable_borrowed_range<T>;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/ranges.h b/Code/Framework/AzCore/AzCore/std/ranges/ranges.h
index a3ead81456..c947d128a2 100644
--- a/Code/Framework/AzCore/AzCore/std/ranges/ranges.h
+++ b/Code/Framework/AzCore/AzCore/std/ranges/ranges.h
@@ -36,10 +36,12 @@ namespace AZStd::ranges
     {
         // Variadic template which maps types to true For SFINAE
         template <class... Args>
+        using sfinae_trigger = true_type;
+        template <class... Args>
         constexpr bool sfinae_trigger_v = true;
 
         template <class T>
-        constexpr bool is_lvalue_or_borrowable = is_lvalue_reference_v<T> || enable_borrowed_range<remove_cv_t<T>>;
+        constexpr bool is_lvalue_or_borrowable = disjunction_v<is_lvalue_reference<T>, bool_constant<enable_borrowed_range<remove_cv_t<T>>>>;
 
         //! begin
         template <class T, typename = void>
@@ -50,8 +52,11 @@ namespace AZStd::ranges
         template <class T, typename = void>
         constexpr bool has_unqualified_begin = false;
         template <class T>
-        constexpr bool has_unqualified_begin<T, void_t<decltype(begin(declval<T&>()))>>
-            = !has_member_begin<T> && AZStd::Internal::is_class_or_enum<T>;
+        constexpr bool has_unqualified_begin<T, enable_if_t<conjunction_v<
+            bool_constant<!has_member_begin<T>>,
+            bool_constant<AZStd::Internal::is_class_or_enum<T>>,
+            sfinae_trigger<decltype(begin(declval<T&>()))>
+            >>> = true;
 
         template<class T>
         void begin(T&) = delete;
@@ -62,7 +67,7 @@ namespace AZStd::ranges
         {
             template<class T>
             constexpr auto operator()(T& t) const noexcept ->
-                enable_if_t<is_array_v<T> && sfinae_trigger_v<remove_all_extents_t<T>>,
+                enable_if_t<conjunction_v<is_array<T>, sfinae_trigger<remove_all_extents_t<T>>>,
                 decltype(t + 0)>
             {
                 return t + 0;
@@ -70,8 +75,11 @@ namespace AZStd::ranges
 
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(AZStd::forward<T>(t).begin())) ->
-                enable_if_t<input_or_output_iterator<decltype(t.begin())>&& is_lvalue_or_borrowable<T>
-                && !is_array_v<T>&& has_member_begin<T>,
+                enable_if_t<conjunction_v<
+                bool_constant<input_or_output_iterator<decltype(AZStd::forward<T>(t).begin())>>,
+                bool_constant<is_lvalue_or_borrowable<T>>,
+                bool_constant<!is_array_v<T>>,
+                bool_constant<has_member_begin<T>>>,
                 decltype(AZStd::forward<T>(t).begin())>
             {
                 return AZStd::forward<T>(t).begin();
@@ -79,8 +87,11 @@ namespace AZStd::ranges
 
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(begin(AZStd::forward<T>(t)))) ->
-                enable_if_t<input_or_output_iterator<decltype(begin(t))>&& is_lvalue_or_borrowable<T>
-                && !is_array_v<T> && has_unqualified_begin<T>,
+                enable_if_t<conjunction_v<
+                bool_constant<input_or_output_iterator<decltype(begin(AZStd::forward<T>(t)))>>,
+                bool_constant<is_lvalue_or_borrowable<T>>,
+                bool_constant<!is_array_v<T>>,
+                bool_constant<has_unqualified_begin<T>>>,
                 decltype(begin(AZStd::forward<T>(t)))>
             {
                 return begin(AZStd::forward<T>(t));
@@ -109,8 +120,11 @@ namespace AZStd::ranges
         template <class T, typename = void>
         constexpr bool has_unqualified_end = false;
         template <class T>
-        constexpr bool has_unqualified_end<T, void_t<decltype(end(declval<T&>()))>>
-            = !has_member_end<T> && AZStd::Internal::is_class_or_enum<T>;
+        constexpr bool has_unqualified_end<T, enable_if_t<conjunction_v<
+            bool_constant<!has_member_end<T>>,
+            bool_constant<AZStd::Internal::is_class_or_enum<T>>,
+            sfinae_trigger<decltype(end(declval<T&>()))>
+            >>> = true;
 
         template<class T>
         void end(T&) = delete;
@@ -121,7 +135,7 @@ namespace AZStd::ranges
         {
             template<class T>
             constexpr auto operator()(T& t) const noexcept ->
-                enable_if_t<is_array_v<T> && extent_v<T> != 0,
+                enable_if_t<conjunction_v<is_array<T>, bool_constant<extent_v<T> != 0>>,
                 decltype(t + extent_v<T>)>
             {
                 return t + extent_v<T>;
@@ -129,8 +143,11 @@ namespace AZStd::ranges
 
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(AZStd::forward<T>(t).end())) ->
-                enable_if_t<sentinel_for<decltype(t.end()), iterator_t<T>>&& is_lvalue_or_borrowable<T>
-                && !is_array_v<T> && has_member_end<T>,
+                enable_if_t<conjunction_v<
+                bool_constant<sentinel_for<decltype(AZStd::forward<T>(t).end()), iterator_t<T>>>,
+                bool_constant<is_lvalue_or_borrowable<T>>,
+                bool_constant<!is_array_v<T>>,
+                bool_constant<has_member_end<T>>>,
                 decltype(AZStd::forward<T>(t).end())>
             {
                 return AZStd::forward<T>(t).end();
@@ -138,8 +155,11 @@ namespace AZStd::ranges
 
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(end(AZStd::forward<T>(t)))) ->
-                enable_if_t<sentinel_for<decltype(end(t)), iterator_t<T>>&& is_lvalue_or_borrowable<T>
-                && !is_array_v<T> && has_unqualified_end<T>,
+                enable_if_t<conjunction_v<
+                bool_constant<sentinel_for<decltype(end(AZStd::forward<T>(t))), iterator_t<T>>>,
+                bool_constant<is_lvalue_or_borrowable<T>>,
+                bool_constant<!is_array_v<T>>,
+                bool_constant<has_unqualified_end<T>>>,
                 decltype(end(AZStd::forward<T>(t)))>
             {
                 return end(AZStd::forward<T>(t));
@@ -212,17 +232,22 @@ namespace AZStd::ranges
         template <class T, class = void>
         constexpr bool has_unqualified_rbegin = false;
         template <class T>
-        constexpr bool has_unqualified_rbegin<T, void_t<decltype(rbegin(declval<T&>()))>>
-            = !has_member_rbegin<T> && AZStd::Internal::is_class_or_enum<T>;
+        constexpr bool has_unqualified_rbegin<T, enable_if_t<conjunction_v<
+            bool_constant<!has_member_rbegin<T>>,
+            sfinae_trigger<decltype(rbegin(declval<T&>()))>,
+            bool_constant<::AZStd::Internal::is_class_or_enum<T>>
+            >>> = true;
 
         template <class T, class = void>
         constexpr bool has_bidirectional_rbegin = false;
         template <class T>
-        constexpr bool has_bidirectional_rbegin<T, enable_if_t<
-            same_as<decltype(ranges::begin(declval<T&>())), decltype(ranges::end(declval<T&>()))>
-            && bidirectional_iterator<decltype(ranges::begin(declval<T&>()))>
-            && bidirectional_iterator<decltype(ranges::end(declval<T&>()))>
-            >> = !has_member_rbegin<T> && !has_unqualified_rbegin<T>;
+        constexpr bool has_bidirectional_rbegin<T, enable_if_t<conjunction_v<
+            bool_constant<!has_member_rbegin<T>>,
+            bool_constant<!has_unqualified_rbegin<T>>,
+            bool_constant<same_as<decltype(ranges::begin(declval<T&>())), decltype(ranges::end(declval<T&>()))>>,
+            bool_constant<bidirectional_iterator<decltype(ranges::begin(declval<T&>()))>>,
+            bool_constant<bidirectional_iterator<decltype(ranges::end(declval<T&>()))>>
+            >>> = true;
 
 
         template<class T>
@@ -234,8 +259,10 @@ namespace AZStd::ranges
         {
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(AZStd::forward<T>(t).rbegin())) ->
-                enable_if_t<input_or_output_iterator<decltype(t.rbegin())> && is_lvalue_or_borrowable<T>
-                && has_member_rbegin<T>,
+                enable_if_t<conjunction_v<
+                bool_constant<input_or_output_iterator<decltype(AZStd::forward<T>(t).rbegin())>>,
+                bool_constant<is_lvalue_or_borrowable<T>>,
+                bool_constant<has_member_rbegin<T>>>,
                 decltype(AZStd::forward<T>(t).rbegin())>
             {
                 return AZStd::forward<T>(t).rbegin();
@@ -243,8 +270,10 @@ namespace AZStd::ranges
 
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(rbegin(AZStd::forward<T>(t)))) ->
-                enable_if_t<input_or_output_iterator<decltype(rbegin(t))> && is_lvalue_or_borrowable<T>
-                && has_unqualified_rbegin<T>,
+                enable_if_t<conjunction_v<
+                bool_constant<input_or_output_iterator<decltype(rbegin(AZStd::forward<T>(t)))>>,
+                bool_constant<is_lvalue_or_borrowable<T>>,
+                bool_constant<has_unqualified_rbegin<T>>>,
                 decltype(rbegin(AZStd::forward<T>(t)))>
             {
                 return rbegin(AZStd::forward<T>(t));
@@ -276,17 +305,22 @@ namespace AZStd::ranges
         template <class T, class = void>
         constexpr bool has_unqualified_rend = false;
         template <class T>
-        constexpr bool has_unqualified_rend<T, void_t<decltype(rend(declval<T&>()))>>
-            = !has_member_rend<T> && AZStd::Internal::is_class_or_enum<T>;
+        constexpr bool has_unqualified_rend<T, enable_if_t<conjunction_v<
+            bool_constant<!has_member_rend<T>>,
+            sfinae_trigger<decltype(rend(declval<T&>()))>,
+            bool_constant<::AZStd::Internal::is_class_or_enum<T>>
+            >>> = true;
 
         template <class T, class = void>
         constexpr bool has_bidirectional_rend = false;
         template <class T>
-        constexpr bool has_bidirectional_rend<T, enable_if_t<
-            same_as<decltype(ranges::begin(declval<T&>())), decltype(ranges::end(declval<T&>()))>
-            && bidirectional_iterator<decltype(ranges::begin(declval<T&>()))>
-            && bidirectional_iterator<decltype(ranges::end(declval<T&>()))>
-            >> = !has_member_rend<T> && !has_unqualified_rend<T>;
+        constexpr bool has_bidirectional_rend<T, enable_if_t<conjunction_v<
+            bool_constant<!has_member_rend<T>>,
+            bool_constant<!has_unqualified_rend<T>>,
+            bool_constant<same_as<decltype(ranges::begin(declval<T&>())), decltype(ranges::end(declval<T&>()))>>,
+            bool_constant<bidirectional_iterator<decltype(ranges::begin(declval<T&>()))>>,
+            bool_constant<bidirectional_iterator<decltype(ranges::end(declval<T&>()))>>
+            >>> = true;
 
         template<class T>
         void rend(T&) = delete;
@@ -297,8 +331,10 @@ namespace AZStd::ranges
         {
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(AZStd::forward<T>(t).rend())) ->
-                enable_if_t<sentinel_for<decltype(t.rend()), decltype(ranges::rbegin(t))> && is_lvalue_or_borrowable<T>
-                && has_member_rend<T>,
+                enable_if_t<conjunction_v<
+                bool_constant<sentinel_for<decltype(t.rend()), decltype(ranges::rbegin(AZStd::forward<T>(t)))>>,
+                bool_constant<is_lvalue_or_borrowable<T>>,
+                bool_constant<has_member_rend<T>>>,
                 decltype(AZStd::forward<T>(t).rend())>
             {
                 return AZStd::forward<T>(t).rend();
@@ -306,8 +342,10 @@ namespace AZStd::ranges
 
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(rend(AZStd::forward<T>(t)))) ->
-                enable_if_t<sentinel_for<decltype(rend(t)), decltype(ranges::rbegin(t))> && is_lvalue_or_borrowable<T>
-                && has_unqualified_rend<T>,
+                enable_if_t<conjunction_v<
+                bool_constant<sentinel_for<decltype(rend(t)), decltype(ranges::rbegin(AZStd::forward<T>(t)))>>,
+                bool_constant<is_lvalue_or_borrowable<T>>,
+                bool_constant<has_unqualified_rend<T>>>,
                 decltype(rend(AZStd::forward<T>(t)))>
             {
                 return rend(AZStd::forward<T>(t));
@@ -389,14 +427,20 @@ namespace AZStd::ranges
         template <class T, class = void>
         constexpr bool has_unqualified_size = false;
         template <class T>
-        constexpr bool has_unqualified_size<T, void_t<decltype(size(declval<T&>()))>>
-            = !has_member_size<T> && AZStd::Internal::is_class_or_enum<T>;
+        constexpr bool has_unqualified_size<T, enable_if_t<conjunction_v<
+            sfinae_trigger<decltype(size(declval<T&>()))>,
+            bool_constant<!has_member_size<T>>,
+            bool_constant<::AZStd::Internal::is_class_or_enum<T>>
+            >>> = true;
 
         template <class T, class = void>
         constexpr bool has_end_subtract_begin = false;
         template <class T>
-        constexpr bool has_end_subtract_begin<T, void_t<decltype(ranges::end(declval<T&>()) - ranges::begin(declval<T&>()))>>
-            = !has_member_size<T> && !has_unqualified_size<T>;
+        constexpr bool has_end_subtract_begin<T, enable_if_t<conjunction_v<
+            sfinae_trigger<decltype(ranges::end(declval<T&>()) - ranges::begin(declval<T&>()))>,
+            bool_constant<!has_member_size<T>>,
+            bool_constant<!has_unqualified_size<T>>
+            >>> = true;
 
         template<class T>
         void size(T&) = delete;
@@ -407,7 +451,7 @@ namespace AZStd::ranges
         {
             template<class T>
             constexpr auto operator()(T&) const noexcept ->
-                enable_if_t<is_array_v<T> && extent_v<T> != 0,
+                enable_if_t<conjunction_v<is_array<T>, bool_constant<extent_v<T> != 0>>,
                 decltype(extent_v<T>)>
             {
                 return extent_v<T>;
@@ -415,8 +459,9 @@ namespace AZStd::ranges
 
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(AZStd::forward<T>(t).size())) ->
-                enable_if_t<!disable_sized_range<remove_cv_t<T>> && has_member_size<T>
-                && AZStd::Internal::is_integer_like<decltype(AZStd::forward<T>(t).size())>,
+                enable_if_t<conjunction_v<bool_constant<!disable_sized_range<remove_cv_t<T>>>,
+                bool_constant<has_member_size<T>>,
+                bool_constant<::AZStd::Internal::is_integer_like<decltype(AZStd::forward<T>(t).size())>>>,
                 decltype(AZStd::forward<T>(t).size())>
             {
                 return AZStd::forward<T>(t).size();
@@ -424,9 +469,9 @@ namespace AZStd::ranges
 
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(size(AZStd::forward<T>(t)))) ->
-                enable_if_t<!disable_sized_range<remove_cv_t<T>>
-                && has_unqualified_size<T>
-                && AZStd::Internal::is_integer_like<decltype(size(AZStd::forward<T>(t)))>,
+                enable_if_t<conjunction_v<bool_constant<!disable_sized_range<remove_cv_t<T>>>,
+                bool_constant<has_unqualified_size<T>>,
+                bool_constant<::AZStd::Internal::is_integer_like<decltype(size(AZStd::forward<T>(t)))>>>,
                 decltype(size(AZStd::forward<T>(t)))>
             {
                 return size(AZStd::forward<T>(t));
@@ -434,10 +479,10 @@ namespace AZStd::ranges
 
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(ranges::end(AZStd::forward<T>(t)) - ranges::begin(AZStd::forward<T>(t)))) ->
-                enable_if_t<
-                has_end_subtract_begin<T>
-                && sized_sentinel_for<decltype(ranges::end(AZStd::forward<T>(t))), decltype(ranges::begin(AZStd::forward<T>(t)))>
-                && forward_iterator<decltype(ranges::begin(AZStd::forward<T>(t)))>,
+                enable_if_t<conjunction_v<
+                bool_constant<has_end_subtract_begin<T>>,
+                bool_constant<sized_sentinel_for<decltype(ranges::end(AZStd::forward<T>(t))), decltype(ranges::begin(AZStd::forward<T>(t)))>>,
+                bool_constant<forward_iterator<decltype(ranges::begin(AZStd::forward<T>(t)))>>>,
                 AZStd::make_unsigned_t<decltype(ranges::end(AZStd::forward<T>(t)) - ranges::begin(AZStd::forward<T>(t)))>>
             {
                 using size_type = AZStd::make_unsigned_t<decltype(ranges::end(AZStd::forward<T>(t)) - ranges::begin(AZStd::forward<T>(t)))>;
@@ -456,17 +501,17 @@ namespace AZStd::ranges
         struct ssize_fn
         {
             template<class T>
-            constexpr auto operator()(T&& t) const noexcept(noexcept(ranges::size(t))) ->
-                enable_if_t<(sizeof(ptrdiff_t) > sizeof(make_signed_t<decltype(ranges::size(t))>)), ptrdiff_t>
+            constexpr auto operator()(T&& t) const noexcept(noexcept(ranges::size(AZStd::forward<T>(t)))) ->
+                enable_if_t<(sizeof(ptrdiff_t) > sizeof(make_signed_t<decltype(ranges::size(AZStd::forward<T>(t)))>)), ptrdiff_t>
             {
-                return static_cast<ptrdiff_t>(ranges::size(t));
+                return static_cast<ptrdiff_t>(ranges::size(AZStd::forward<T>(t)));
             }
 
             template<class T>
-            constexpr auto operator()(T&& t) const noexcept(noexcept(ranges::size(t))) ->
-                enable_if_t<sizeof(ptrdiff_t) <= sizeof(make_signed_t<decltype(ranges::size(t))>), make_signed_t<decltype(ranges::size(t))>>
+            constexpr auto operator()(T&& t) const noexcept(noexcept(ranges::size(AZStd::forward<T>(t)))) ->
+                enable_if_t<sizeof(ptrdiff_t) <= sizeof(make_signed_t<decltype(ranges::size(AZStd::forward<T>(t)))>), make_signed_t<decltype(ranges::size(t))>>
             {
-                using ssize_type = make_signed_t<decltype(ranges::size(t))>;
+                using ssize_type = make_signed_t<decltype(ranges::size(AZStd::forward<T>(t)))>;
                 return static_cast<ssize_type>(ranges::size(t));
             }
         };
@@ -487,36 +532,41 @@ namespace AZStd::ranges
         template <class T, class = void>
         constexpr bool has_size_compare_to_0 = false;
         template <class T>
-        constexpr bool has_size_compare_to_0<T, enable_if_t<convertible_to<decltype(ranges::size(declval<T&>()) == 0), bool> >>
-            = !has_member_empty<T>;
+        constexpr bool has_size_compare_to_0<T, enable_if_t<conjunction_v<
+            bool_constant<!has_member_empty<T>>,
+            bool_constant<convertible_to<decltype(ranges::size(declval<T&>()) == 0), bool>>
+            >>> = true;
 
         template <class T, class = void>
         constexpr bool has_begin_compare_to_end = false;
 
         template <class T>
         constexpr bool has_begin_compare_to_end<T,
-            enable_if_t<convertible_to<decltype(ranges::begin(declval<T&>()) == ranges::end(declval<T&>())), bool> >>
-            = !has_member_empty<T> && !has_size_compare_to_0<T>;
+            enable_if_t<conjunction_v<
+            bool_constant<!has_member_empty<T>>,
+            bool_constant<!has_size_compare_to_0<T>>,
+            bool_constant<convertible_to<decltype(ranges::begin(declval<T&>()) == ranges::end(declval<T&>())), bool>>
+            >>> = true;
 
         struct empty_fn
         {
             template<class T>
             [[nodiscard]] constexpr auto operator()(T&& t) const noexcept(noexcept(AZStd::forward<T>(t).empty())) ->
-                enable_if_t<is_lvalue_or_borrowable<T> && has_member_empty<T>, bool>
+                enable_if_t<conjunction_v<bool_constant<is_lvalue_or_borrowable<T>>, bool_constant<has_member_empty<T>>>, bool>
             {
                 return AZStd::forward<T>(t).empty();
             }
 
             template<class T>
             [[nodiscard]] constexpr auto operator()(T&& t) const noexcept(noexcept(ranges::size(AZStd::forward<T>(t)) == 0)) ->
-                enable_if_t<is_lvalue_or_borrowable<T> && has_size_compare_to_0<T>, bool>
+                enable_if_t<conjunction_v<bool_constant<is_lvalue_or_borrowable<T>>, bool_constant<has_size_compare_to_0<T>>>, bool>
             {
                 return ranges::size(AZStd::forward<T>(t)) == 0;
             }
 
             template<class T>
             [[nodiscard]] constexpr auto operator()(T&& t) const noexcept(noexcept(ranges::begin(AZStd::forward<T>(t)) == ranges::end(AZStd::forward<T>(t)))) ->
-                enable_if_t<is_lvalue_or_borrowable<T> && has_begin_compare_to_end<T>, bool>
+                enable_if_t<conjunction_v<bool_constant<is_lvalue_or_borrowable<T>>, bool_constant<has_begin_compare_to_end<T>>>, bool>
             {
                 return ranges::begin(AZStd::forward<T>(t)) == ranges::end(AZStd::forward<T>(t));
             }
@@ -538,14 +588,16 @@ namespace AZStd::ranges
         template <class T, class = void>
         constexpr bool has_qualified_ranges_begin = false;
         template <class T>
-        constexpr bool has_qualified_ranges_begin<T, enable_if_t<contiguous_iterator<decltype(ranges::begin(declval<T&>()))>> >
-            = !has_member_data<T>;
+        constexpr bool has_qualified_ranges_begin<T, enable_if_t<conjunction_v<
+            bool_constant<!has_member_data<T>>,
+            bool_constant<contiguous_iterator<decltype(ranges::begin(declval<T&>()))>>
+            >>> = true;
 
         struct data_fn
         {
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(AZStd::forward<T>(t).data())) ->
-                enable_if_t<is_lvalue_or_borrowable<T> && has_member_data<T>,
+                enable_if_t<conjunction_v<bool_constant<is_lvalue_or_borrowable<T>>, bool_constant<has_member_data<T>>>,
                 decltype(AZStd::forward<T>(t).data())>
             {
                 return AZStd::forward<T>(t).data();
@@ -553,7 +605,7 @@ namespace AZStd::ranges
 
             template<class T>
             constexpr auto operator()(T&& t) const noexcept(noexcept(AZStd::to_address(ranges::begin(AZStd::forward<T>(t))))) ->
-                enable_if_t<is_lvalue_or_borrowable<T> && has_qualified_ranges_begin<T>,
+                enable_if_t<conjunction_v<bool_constant<is_lvalue_or_borrowable<T>>, bool_constant<has_qualified_ranges_begin<T>>>,
                 decltype(AZStd::to_address(ranges::begin(AZStd::forward<T>(t))))>
             {
                 return AZStd::to_address(ranges::begin(AZStd::forward<T>(t)));
@@ -612,8 +664,8 @@ namespace AZStd::ranges
 
     // Models borrowed range concept
     template<class T>
-    /*concept*/ constexpr bool borrowed_range = range<T>
-        && (is_lvalue_reference_v<T> || enable_borrowed_range<remove_cvref_t<T>>);
+    /*concept*/ constexpr bool borrowed_range = conjunction_v<bool_constant<range<T>>,
+        disjunction<is_lvalue_reference<T>, bool_constant<enable_borrowed_range<remove_cvref_t<T>>>>>;
 
     struct dangling
     {
@@ -622,9 +674,23 @@ namespace AZStd::ranges
         constexpr dangling(T&&...) noexcept {}
     };
 
+
+    enum class subrange_kind : bool
+    {
+        unsized,
+        sized
+    };
+    template<class I, class S = I,
+        subrange_kind K = sized_sentinel_for<S, I> ? subrange_kind::sized : subrange_kind::unsized,
+        class = void>
+        class subrange;
+
     template<class R>
     using borrowed_iterator_t = conditional_t<borrowed_range<R>, iterator_t<R>, dangling>;
 
+    template<class R>
+    using borrowed_subrange_t = conditional_t<borrowed_range<R>, subrange<iterator_t<R>>, dangling>;
+
     // Models sized range concept
     namespace Internal
     {
@@ -643,7 +709,11 @@ namespace AZStd::ranges
         template<class R, class T, class = void>
         constexpr bool output_range_impl = false;
         template<class R, class T>
-        constexpr bool output_range_impl<R, T, enable_if_t<has_iterator_t<R>>> = range<R> && output_iterator<iterator_t<R>, T>;
+        constexpr bool output_range_impl<R, T, enable_if_t<conjunction_v<
+            bool_constant<has_iterator_t<R>>,
+            bool_constant<range<R>>,
+            bool_constant<output_iterator<iterator_t<R>, T>>
+            >>> = true;
     }
 
     template<class R, class T>
@@ -654,7 +724,11 @@ namespace AZStd::ranges
         template<class T, class = void>
         constexpr bool input_range_impl = false;
         template<class T>
-        constexpr bool input_range_impl<T, enable_if_t<has_iterator_t<T>>> = range<T> && input_iterator<iterator_t<T>>;
+        constexpr bool input_range_impl<T, enable_if_t<conjunction_v<
+            bool_constant<has_iterator_t<T>>,
+            bool_constant<range<T>>,
+            bool_constant<input_iterator<iterator_t<T>>>
+            >>> = true;
     }
 
     template<class T>
@@ -665,7 +739,11 @@ namespace AZStd::ranges
         template<class T, class = void>
         constexpr bool forward_range_impl = false;
         template<class T>
-        constexpr bool forward_range_impl<T, enable_if_t<has_iterator_t<T>>> = input_range<T> && forward_iterator<iterator_t<T>>;
+        constexpr bool forward_range_impl<T, enable_if_t<conjunction_v<
+            bool_constant<has_iterator_t<T>>,
+            bool_constant<input_range<T>>,
+            bool_constant<forward_iterator<iterator_t<T>>>
+            >>> = true;
     }
 
     template<class T>
@@ -676,7 +754,11 @@ namespace AZStd::ranges
         template<class T, class = void>
         constexpr bool bidirectional_range_impl = false;
         template<class T>
-        constexpr bool bidirectional_range_impl<T, enable_if_t<has_iterator_t<T>>> = forward_range<T> && bidirectional_iterator<iterator_t<T>>;
+        constexpr bool bidirectional_range_impl<T, enable_if_t<conjunction_v<
+            bool_constant<has_iterator_t<T>>,
+            bool_constant<forward_range<T>>,
+            bool_constant<bidirectional_iterator<iterator_t<T>>>
+            >>> = true;
     }
 
     template<class T>
@@ -687,7 +769,11 @@ namespace AZStd::ranges
         template<class T, class = void>
         constexpr bool random_access_range_impl = false;
         template<class T>
-        constexpr bool random_access_range_impl<T, enable_if_t<has_iterator_t<T>>> = bidirectional_range<T> && random_access_iterator<iterator_t<T>>;
+        constexpr bool random_access_range_impl<T, enable_if_t<conjunction_v<
+            bool_constant<has_iterator_t<T>>,
+            bool_constant<bidirectional_range<T>>,
+            bool_constant<random_access_iterator<iterator_t<T>>>
+            >>> = true;
     }
 
     template<class T>
@@ -710,16 +796,19 @@ namespace AZStd::ranges
         template<class T, class = void>
         constexpr bool contiguous_range_impl = false;
         template<class T>
-        constexpr bool contiguous_range_impl<T, enable_if_t<random_access_range<T>
-            && contiguous_iterator<iterator_t<T>>
-            && same_as<decltype(ranges::data(declval<T&>())), add_pointer_t<range_reference_t<T>>> >> = true;
+        constexpr bool contiguous_range_impl<T, enable_if_t<conjunction_v<
+            bool_constant<random_access_range<T>>,
+            bool_constant<contiguous_iterator<iterator_t<T>>>,
+            bool_constant<same_as<decltype(ranges::data(declval<T&>())), add_pointer_t<range_reference_t<T>>>>
+            >>> = true;
     }
 
     template<class T>
     /*concept*/ constexpr bool contiguous_range = Internal::contiguous_range_impl<T>;
 
     template<class T>
-    /*concept*/ constexpr bool common_range = range<T> && same_as<iterator_t<T>, sentinel_t<T>>;
+    /*concept*/ constexpr bool common_range = conjunction_v<bool_constant<range<T>>,
+        bool_constant<same_as<iterator_t<T>, sentinel_t<T>>>>;
 }
 
 namespace AZStd::ranges
@@ -752,7 +841,7 @@ namespace AZStd::ranges
 
             template<class I, class S>
             constexpr auto operator()(I& i, S bound) const ->
-                enable_if_t<input_or_output_iterator<I>&& sentinel_for<S, I>>
+                enable_if_t<conjunction_v<bool_constant<input_or_output_iterator<I>>, bool_constant<sentinel_for<S, I>>>>
             {
                 if constexpr (assignable_from<I&, S>)
                 {
@@ -770,7 +859,8 @@ namespace AZStd::ranges
 
             template<class I, class S>
             constexpr auto operator()(I& i, iter_difference_t<I> n, S bound) const ->
-                enable_if_t<input_or_output_iterator<I>&& sentinel_for<S, I>, iter_difference_t<I>>
+                enable_if_t<conjunction_v<bool_constant<input_or_output_iterator<I>>, bool_constant<sentinel_for<S, I>>>,
+                iter_difference_t<I>>
             {
                 if constexpr (sized_sentinel_for<S, I>)
                 {
@@ -816,7 +906,9 @@ namespace AZStd::ranges
         {
             template<class I, class S>
             constexpr auto operator()(I first, S last) const ->
-                enable_if_t<input_or_output_iterator<I> && sentinel_for<S, I> && !sized_sentinel_for<S, I>,
+                enable_if_t<conjunction_v<bool_constant<input_or_output_iterator<I>>,
+                bool_constant<sentinel_for<S, I>>,
+                bool_constant<!sized_sentinel_for<S, I>>>,
                 iter_difference_t<I>>
             {
                 // Since S is not a sized sentinel, can only increment from first to last
@@ -828,7 +920,9 @@ namespace AZStd::ranges
 
             template<class I, class S>
             constexpr auto operator()(const I& first, const S& last) const ->
-                enable_if_t<input_or_output_iterator<I> && sentinel_for<S, I> && sized_sentinel_for<S, I>,
+                enable_if_t<conjunction_v<bool_constant<input_or_output_iterator<I>>,
+                bool_constant<sentinel_for<S, I>>,
+                bool_constant<sized_sentinel_for<S, I>>>,
                 iter_difference_t<I>>
             {
                 return last - first;
@@ -878,7 +972,7 @@ namespace AZStd::ranges
 
             template<class I, class S>
             constexpr auto operator()(I x, S bound) const ->
-                enable_if_t<input_or_output_iterator<I>&& sentinel_for<S, I>, I>
+                enable_if_t<conjunction_v<bool_constant<input_or_output_iterator<I>>, bool_constant<sentinel_for<S, I>>>, I>
             {
                 ranges::advance(x, bound);
                 return x;
@@ -886,7 +980,7 @@ namespace AZStd::ranges
 
             template<class I, class S>
             constexpr auto operator()(I x, iter_difference_t<I> n, S bound) const ->
-                enable_if_t<input_or_output_iterator<I>&& sentinel_for<S, I>, I>
+                enable_if_t<conjunction_v<bool_constant<input_or_output_iterator<I>>, bool_constant<sentinel_for<S, I>>>, I>
             {
                 ranges::advance(x, n, bound);
                 return x;
@@ -922,7 +1016,7 @@ namespace AZStd::ranges
 
             template<class I, class S>
             constexpr auto operator()(I x, iter_difference_t<I> n, S bound) const ->
-                enable_if_t<input_or_output_iterator<I>&& sentinel_for<S, I>, I>
+                enable_if_t<conjunction_v<bool_constant<input_or_output_iterator<I>>, bool_constant<sentinel_for<S, I>>>, I>
             {
                 ranges::advance(x, -n, bound);
                 return x;
@@ -950,16 +1044,51 @@ namespace AZStd::ranges
     // view interface can be used with non-constant class types
     template<class D, class = void>
     class view_interface;
+
+    struct view_base {};
+    namespace Internal
+    {
+        template<class D>
+        void derived_from_view_interface_template(view_interface<D>&);
+        template<class T, class = void>
+        inline constexpr bool is_derived_from_view_interface = false;
+        template<class T>
+        inline constexpr bool is_derived_from_view_interface<T,
+            decltype(derived_from_view_interface_template(declval<remove_cvref_t<T>&>()))> = true;
+    }
+    template<class T>
+    inline constexpr bool enable_view = derived_from<T, view_base> || Internal::is_derived_from_view_interface<T>;
+
+    template<class T>
+    /*concept*/ constexpr bool view = conjunction_v<bool_constant<range<T>>, bool_constant<movable<T>>, bool_constant<enable_view<T>>>;
+
+    template<class T>
+    /*concept*/ constexpr bool viewable_range = conjunction_v<bool_constant<range<T>>,
+        disjunction<
+            conjunction<bool_constant<view<remove_cvref_t<T>>>, bool_constant<constructible_from<remove_cvref_t<T>, T>>>,
+            conjunction<bool_constant<!view<remove_cvref_t<T>>>,
+                disjunction<is_lvalue_reference<T>,
+                    conjunction<bool_constant<movable<remove_reference_t<T>>>,
+                    bool_constant<!Internal::is_initializer_list<T>>
+                    >
+                >
+            >
+        >
+    >;
+
     template<class D>
-    class view_interface< D, enable_if_t<is_class_v<D> && same_as<D, remove_cv_t<D>> >>
+    class view_interface<D, enable_if_t<is_class_v<D> && same_as<D, remove_cv_t<D>> >>
     {
     private:
         constexpr D& derived() noexcept
         {
+            // Make sure that the derived type is complete
+            static_assert(sizeof(D) > 0 && derived_from<D, view_interface> && view<D>);
             return static_cast<D&>(*this);
         }
         constexpr const D& derived() const noexcept
         {
+            static_assert(sizeof(D) > 0 && derived_from<D, view_interface> && view<D>);
             return static_cast<const D&>(*this);
         }
 
@@ -975,134 +1104,141 @@ namespace AZStd::ranges
             return ranges::begin(derived()) == ranges::end(derived());
         }
 
-        template <class Derived = D, class = void_t<decltype(ranges::empty(declval<Derived>()))>>
-        constexpr explicit operator bool() const noexcept(noexcept(ranges::empty(derived())))
+        template <class Derived = D>
+        constexpr explicit operator bool() const noexcept(noexcept(ranges::empty(static_cast<const Derived&>(*this))))
         {
             return !ranges::empty(derived());
         }
 
         template <class Derived = D>
         constexpr auto data() ->
-            enable_if_t<contiguous_iterator<iterator_t<Derived>>, decltype(to_address(ranges::begin(derived())))>
+            enable_if_t<contiguous_iterator<iterator_t<Derived>>, decltype(to_address(ranges::begin(static_cast<Derived&>(*this))))>
         {
             return to_address(ranges::begin(derived()));
         }
         template <class Derived = D>
         constexpr auto data() const ->
-            enable_if_t<contiguous_iterator<iterator_t<const Derived>>, decltype(to_address(ranges::begin(derived())))>
+            enable_if_t<range<const Derived> && contiguous_iterator<iterator_t<const Derived>>,
+            decltype(to_address(ranges::begin(static_cast<const Derived&>(*this))))>
         {
             return to_address(ranges::begin(derived()));
         }
 
         template <class Derived = D>
         constexpr auto size() ->
-            enable_if_t<forward_range<Derived> && sized_sentinel_for<sentinel_t<Derived>, iterator_t<Derived>>,
-            decltype(ranges::end(derived()) - ranges::begin(derived()))>
+            enable_if_t<conjunction_v<bool_constant<forward_range<Derived>>,
+            bool_constant<sized_sentinel_for<sentinel_t<Derived>, iterator_t<Derived>>>>,
+            decltype(ranges::end(static_cast<Derived&>(*this)) - ranges::begin(static_cast<Derived&>(*this)))>
         {
             return ranges::end(derived()) - ranges::begin(derived());
         }
         template <class Derived = D>
         constexpr auto size() const ->
-            enable_if_t<forward_range<const Derived>&& sized_sentinel_for<sentinel_t<const Derived>, iterator_t<const Derived>>,
-            decltype(ranges::end(derived()) - ranges::begin(derived()))>
+            enable_if_t<conjunction_v<bool_constant<forward_range<const Derived>>,
+            bool_constant<sized_sentinel_for<sentinel_t<const Derived>, iterator_t<const Derived>>>>,
+            decltype(ranges::end(static_cast<const Derived&>(*this)) - ranges::begin(static_cast<const Derived&>(*this)))>
         {
             return ranges::end(derived()) - ranges::begin(derived());
         }
 
         template <class Derived = D>
         constexpr auto front() ->
-            enable_if_t<forward_range<Derived>, decltype(*ranges::begin(derived()))>
+            enable_if_t<forward_range<Derived>, decltype(*ranges::begin(static_cast<Derived&>(*this)))>
         {
             return *ranges::begin(derived());
         }
         template <class Derived = D>
         constexpr auto front() const ->
-            enable_if_t<forward_range<const Derived>, decltype(*ranges::begin(derived()))>
+            enable_if_t<forward_range<const Derived>, decltype(*ranges::begin(static_cast<const Derived&>(*this)))>
         {
             return *ranges::begin(derived());
         }
 
         template <class Derived = D>
         constexpr auto back() ->
-            enable_if_t<bidirectional_range<Derived> && common_range<Derived>, decltype(*ranges::prev(ranges::end(derived())))>
+            enable_if_t<conjunction_v<bool_constant<bidirectional_range<Derived>>,
+            bool_constant<common_range<Derived>>>,
+            decltype(*ranges::prev(ranges::end(static_cast<Derived&>(*this))))>
         {
             return *ranges::prev(ranges::end(derived()));
         }
 
         template <class Derived = D>
         constexpr auto back() const ->
-            enable_if_t<bidirectional_range<const Derived>&& common_range<const Derived>, decltype(*ranges::prev(ranges::end(derived())))>
+            enable_if_t<conjunction_v<bool_constant<bidirectional_range<const Derived>>,
+            bool_constant<common_range<const Derived>>>,
+            decltype(*ranges::prev(ranges::end(static_cast<const Derived&>(*this))))>
         {
             return *ranges::prev(ranges::end(derived()));
         }
 
         template<class R = D>
         constexpr auto operator[](range_difference_t<R> n) ->
-            enable_if_t<random_access_range<R>, decltype(ranges::begin(derived())[n])>
+            enable_if_t<random_access_range<R>, decltype(ranges::begin(static_cast<R&>(*this))[n])>
         {
             return ranges::begin(derived())[n];
         }
         template<class R = const D>
         constexpr auto operator[](range_difference_t<R> n) const ->
-            enable_if_t<random_access_range<R>, decltype(ranges::begin(derived())[n])>
+            enable_if_t<random_access_range<R>, decltype(ranges::begin(static_cast<R&>(*this))[n])>
         {
             return ranges::begin(derived())[n];
         }
     };
 
-    struct view_base {};
+    // Helper Concepts - https://eel.is/c++draft/ranges#range.utility.helpers
     namespace Internal
     {
-        template<class D>
-        void derived_from_view_interface_template(view_interface<D>&);
-        template<class T, class = void>
-        inline constexpr bool is_derived_from_view_interface = false;
-        template<class T>
-        inline constexpr bool is_derived_from_view_interface<T,
-            decltype(derived_from_view_interface_template(declval<T&>()))> = true;
+        // Helper concepts that are used by range adaptor classes
+        template<bool Const, class T>
+        using maybe_const = conditional_t<Const, const T, T>;
+
+        template<class R, class = void>
+        /*concept*/ constexpr bool simple_view = false;
+        template<class R>
+        /*concept*/ inline constexpr bool simple_view<R, enable_if_t<conjunction_v<
+            bool_constant<view<R>>,
+            bool_constant<range<const R>>,
+            bool_constant<same_as<iterator_t<R>, iterator_t<const R>>>,
+            bool_constant<same_as<sentinel_t<R>, sentinel_t<const R>>> >>> = true;
+
+        template<class I, class = void>
+        /*concept*/ constexpr bool has_arrow = false;
+        template<class I>
+        /*concept*/ inline constexpr bool has_arrow<I, enable_if_t<conjunction_v<
+            bool_constant<input_iterator<I>>,
+            disjunction<is_pointer<I>, sfinae_trigger<decltype(declval<I>().operator->())>>
+            >>> = true;
+
+        template<class T, class U>
+        /*concept*/ constexpr bool different_from = !same_as<remove_cvref_t<T>, remove_cvref_t<U>>;
     }
-    template<class T>
-    inline constexpr bool enable_view = derived_from<T, view_base> || Internal::is_derived_from_view_interface<T>;
-
-    template<class T>
-    /*concept*/ constexpr bool view = range<T> && movable<T> && enable_view<T>;
-
-    template<class T>
-    /*concept*/ constexpr bool viewable_range = range<T> &&
-        ((view<remove_cvref_t<T>> && constructible_from<remove_cvref_t<T>, T>) ||
-            (!view<remove_cvref_t<T>> &&
-                (is_lvalue_reference_v<T> || (movable<remove_reference_t<T>> && !Internal::is_initializer_list<T>))));
 }
 
 
 namespace AZStd::ranges
 {
-#if __has_cpp_attribute(no_unique_address)
-#define az_no_unique_address [[no_unique_address]]
-#else
-#define az_no_unique_address
-#endif
     template<class I1, class I2>
     struct in_in_result
     {
-        az_no_unique_address I1 in1;
-        az_no_unique_address I2 in2;
+        AZ_NO_UNIQUE_ADDRESS I1 in1;
+        AZ_NO_UNIQUE_ADDRESS I2 in2;
 
-        template<class II1, class II2, class = enable_if_t<convertible_to<const I1&, II1>&& convertible_to<const I2&, II2>> >
+        template<class II1, class II2, class = enable_if_t<conjunction_v<
+            bool_constant<convertible_to<const I1&, II1>>, bool_constant<convertible_to<const I2&, II2>>>> >
         constexpr operator in_in_result<II1, II2>() const&
         {
             return { in1, in2 };
         }
 
-        template<class II1, class II2, class = enable_if_t<convertible_to<I1, II1>&& convertible_to<I2, II2>> >
+        template<class II1, class II2, class = enable_if_t<conjunction_v<
+            bool_constant<convertible_to<I1, II1>>, bool_constant<convertible_to<I2, II2>>>> >
         constexpr operator in_in_result<II1, II2>()&&
         {
             return { AZStd::move(in1), AZStd::move(in2) };
         }
     };
 
-#undef az_no_unique_address
-
     template<class I1, class I2>
     using swap_ranges_result = in_in_result<I1, I2>;
 
@@ -1112,9 +1248,11 @@ namespace AZStd::ranges
         {
             template<class I1, class S1, class I2, class S2>
             constexpr auto operator()(I1 first1, S1 last1, I2 first2, S2 last2) const ->
-                enable_if_t<input_iterator<I1>&& sentinel_for<S1, I1>
-                && input_iterator<I2>&& sentinel_for<S2, I2>
-                && indirectly_swappable<I1, I2>,
+                enable_if_t<conjunction_v<bool_constant<input_iterator<I1>>,
+                bool_constant<sentinel_for<S1, I1>>,
+                bool_constant<input_iterator<I2>>,
+                bool_constant<sentinel_for<S2, I2>>,
+                bool_constant<indirectly_swappable<I1, I2>>>,
                 swap_ranges_result<I1, I2>>
             {
                 for (; !(first1 == last1 or first2 == last2); ++first1, ++first2)
@@ -1126,8 +1264,10 @@ namespace AZStd::ranges
 
             template<class R1, class R2>
             constexpr auto operator()(R1&& r1, R2&& r2) const ->
-                enable_if_t<input_range<R1>&& input_range<R2>
-                && indirectly_swappable<iterator_t<R1>, iterator_t<R2>>,
+                enable_if_t<conjunction_v<
+                bool_constant<input_range<R1>>,
+                bool_constant<input_range<R2>>,
+                bool_constant<indirectly_swappable<iterator_t<R1>, iterator_t<R2>>>>,
                 swap_ranges_result<borrowed_iterator_t<R1>, borrowed_iterator_t<R2>>>
             {
                 return operator()(ranges::begin(r1), ranges::end(r1),
@@ -1148,10 +1288,21 @@ namespace AZStd::ranges::Internal
     // ranges::swap customization point https://eel.is/c++draft/concepts#concept.swappable-2.2
     template <class T, class U>
     constexpr auto swap_fn::operator()(T&& t, U&& u) const noexcept(noexcept((*this)(*t, *u)))
-        ->enable_if_t<!is_class_or_enum_with_swap_adl<T, U>
-        && is_array_v<T> && is_array_v<U> && (extent_v<T> == extent_v<U>)
-        >
+        ->enable_if_t<conjunction_v<
+        bool_constant<!is_class_or_enum_with_swap_adl<T, U>>,
+        is_array<T>,
+        is_array<U>,
+        bool_constant<extent_v<T> == extent_v<U>>
+        >>
     {
         ranges::swap_ranges(t, u);
     }
 }
+
+// Opening AZStd::ranges::views namespace to provide access to it in AZStd
+namespace AZStd::ranges::views{}
+
+namespace AZStd
+{
+      namespace views = ranges::views;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/ranges_adaptor.h b/Code/Framework/AzCore/AzCore/std/ranges/ranges_adaptor.h
new file mode 100644
index 0000000000..6c814def5d
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/ranges_adaptor.h
@@ -0,0 +1,333 @@
+/*
+ * 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/ranges/ranges.h>
+#include <AzCore/std/optional.h>
+
+namespace AZStd::ranges::views::Internal
+{
+    // Call wrapping that performs perfecting forwarding of arguments
+    // and take const and ref function qualifiers into account(rvalue functions will move)
+    template<class Outer, class Inner>
+    struct perfect_forwarding_call_wrapper
+    {
+        perfect_forwarding_call_wrapper(Outer&& outer, Inner&& inner)
+            : m_outer{ AZStd::forward<Outer>(outer) }
+            , m_inner{ AZStd::forward<Inner>(inner) }
+        {}
+        template<class... Args>
+        constexpr decltype(auto) operator()(Args&&... args) &
+            noexcept(noexcept(AZStd::invoke(m_outer, AZStd::invoke(m_inner, AZStd::forward<Args>(args)...))))
+        {
+            return AZStd::invoke(m_outer, AZStd::invoke(m_inner, AZStd::forward<Args>(args)...));
+        }
+        template<class... Args>
+        constexpr decltype(auto) operator()(Args&&... args) const&
+            noexcept(noexcept(AZStd::invoke(m_outer, AZStd::invoke(m_inner, AZStd::forward<Args>(args)...))))
+        {
+            return AZStd::invoke(m_outer, AZStd::invoke(m_inner, AZStd::forward<Args>(args)...));
+        }
+        //
+        template<class... Args>
+        constexpr decltype(auto) operator()(Args&&... args) &&
+            noexcept(noexcept(AZStd::invoke(AZStd::move(m_outer),
+                AZStd::invoke(AZStd::move(m_inner), AZStd::forward<Args>(args)...))))
+        {
+            return AZStd::invoke(AZStd::move(m_outer), AZStd::invoke(AZStd::move(m_inner), AZStd::forward<Args>(args)...));
+        }
+        template<class... Args>
+        constexpr decltype(auto) operator()(Args&&... args) const&&
+            noexcept(noexcept(AZStd::invoke(AZStd::move(m_outer),
+                AZStd::invoke(AZStd::move(m_inner), AZStd::forward<Args>(args)...))))
+        {
+            return AZStd::invoke(AZStd::move(m_outer), AZStd::invoke(AZStd::move(m_inner), AZStd::forward<Args>(args)...));
+        }
+    private:
+        Outer m_outer;
+        Inner m_inner;
+    };
+
+    // base class which provides the bitwise OR operator to
+    // any derived classes
+    // This can be used by inherited by range adaptor classes
+    // to implement their to allow for changing
+    // https://eel.is/c++draft/ranges#range.adaptor.object-1.3
+    template<class RangeAdaptor>
+    struct range_adaptor_closure;
+
+    // Return a closure new in which the outer range adaptor invokes the inner range adaptor
+    template<class RangeAdaptorFunctor>
+    struct range_adaptor_closure_forwarder
+        : RangeAdaptorFunctor
+        , range_adaptor_closure_forwarder<range_adaptor_closure<RangeAdaptorFunctor>>
+    {
+        constexpr explicit range_adaptor_closure_forwarder(RangeAdaptorFunctor&& closure)
+            : RangeAdaptorFunctor{ AZStd::forward<RangeAdaptorFunctor>(closure) }
+        {}
+    };
+
+    template<class RangeAdaptor>
+    using is_range_closure_t = bool_constant<derived_from<remove_cvref_t<RangeAdaptor>,
+        range_adaptor_closure<remove_cvref_t<RangeAdaptor>>>>;
+
+    template<class T>
+    struct range_adaptor_closure
+    {
+        template<class View, class U>
+        friend constexpr auto operator|(View&& view, U&& closure) noexcept(is_nothrow_invocable_v<View, U>)
+            -> enable_if_t<conjunction_v<
+            bool_constant<viewable_range<View>>,
+            is_range_closure_t<U>,
+            bool_constant<same_as<T, remove_cvref_t<U>>>,
+            bool_constant<invocable<U, View>>>,
+            decltype(AZStd::invoke(AZStd::forward<U>(closure), AZStd::forward<View>(view)))>
+        {
+            return AZStd::invoke(AZStd::forward<U>(closure), AZStd::forward<View>(view));
+        }
+
+        template<class U, class Target>
+        friend constexpr auto operator|(U&& closure, Target&& outerClosure)
+            noexcept(is_nothrow_constructible_v<remove_cvref_t<U>> && is_nothrow_constructible_v<remove_cvref_t<Target>>)
+            ->enable_if_t<conjunction_v<
+            is_range_closure_t<U>,
+            is_range_closure_t<Target>,
+            bool_constant<same_as<T, remove_cvref_t<U>>>,
+            bool_constant<constructible_from<decay_t<U>, U>>,
+            bool_constant<constructible_from<decay_t<Target>, Target>>>,
+            decltype(range_adaptor_closure_forwarder{
+                perfect_forwarding_call_wrapper{AZStd::forward<Target>(outerClosure), AZStd::forward<U>(closure) }
+                })>
+        {
+            // Create a perfect_forwarding_wrapper that wraps the outer adaptor around the inner adaptor
+            // and then pass that to the range_adaptor_closure_forward struct which inherits from
+            // range_adaptor_closure class template so that it is_range_closure_t template succeeds
+            return range_adaptor_closure_forwarder{
+                perfect_forwarding_call_wrapper{AZStd::forward<Target>(outerClosure), AZStd::forward<U>(closure) }
+            };
+        }
+    };
+} // namespace AZStd::ranges::views::Internal
+
+namespace AZStd::ranges::Internal
+{
+    // Copyable Wrapper - https://eel.is/c++draft/ranges#range.copy.wrap
+    // Used to wrap a class that copy constructible, but not necessarily copy assignable
+    // and implements a copy assignment operator using the optional emplace function
+    // to construct in place
+    template<class T, class = void>
+    class copyable_box;
+
+    template<class T>
+    class copyable_box<T, enable_if_t<is_copy_constructible_v<T>&& is_object_v<T>>>
+    {
+    public:
+        template<class U = T, class = enable_if_t<default_initializable<U>>>
+        constexpr copyable_box() noexcept(is_nothrow_constructible_v<T>)
+            : copyable_box{ in_place }
+        {}
+
+        template<class... Args>
+        explicit constexpr copyable_box(in_place_t, Args&&... args) noexcept(is_nothrow_constructible_v<T>)
+            : m_copyable_wrapper{ in_place, AZStd::forward<Args>(args)... }
+        {}
+
+        constexpr copyable_box(const copyable_box&) = default;
+        constexpr copyable_box(copyable_box&&) = default;
+
+        constexpr copyable_box& operator=(const copyable_box& other) noexcept(is_nothrow_copy_constructible_v<T>)
+        {
+            if (this != &other)
+            {
+                if constexpr (copyable<T>)
+                {
+                    m_copyable_wrapper = other.m_copyable_wrapper;
+                }
+                else
+                {
+                    if (other)
+                    {
+                        emplace(other.m_copyable_wrapper);
+                    }
+                    else
+                    {
+                        reset();
+                    }
+                }
+            }
+
+            return *this;
+        }
+
+        constexpr copyable_box& operator=(copyable_box&& other) noexcept(is_nothrow_move_constructible_v<T>)
+        {
+            if (this != &other)
+            {
+                if constexpr (movable<T>)
+                {
+                    m_copyable_wrapper = AZStd::move(other.m_copyable_wrapper);
+                }
+                else
+                {
+                    if (other)
+                    {
+                        emplace(AZStd::move(other.m_copyable_wrapper));
+                    }
+                    else
+                    {
+                        reset();
+                    }
+                }
+            }
+
+            return *this;
+        }
+        constexpr T& operator*() & noexcept
+        {
+            return *m_copyable_wrapper;
+        }
+        constexpr const T& operator*() const& noexcept
+        {
+            return *m_copyable_wrapper;
+        }
+        constexpr T&& operator*() && noexcept
+        {
+            return AZStd::move(*m_copyable_wrapper);
+        }
+        constexpr const T&& operator*() const&& noexcept
+        {
+            return AZStd::move(*m_copyable_wrapper);
+        }
+
+        constexpr T* operator->() noexcept
+        {
+            return m_copyable_wrapper.operator->();
+        }
+        constexpr const T* operator->() const noexcept
+        {
+            return m_copyable_wrapper.operator->();
+        }
+
+        constexpr explicit operator bool()
+        {
+            return m_copyable_wrapper.has_value();
+        }
+
+        template<class... Args>
+        constexpr T& emplace(Args&&... args)
+        {
+            return m_copyable_wrapper.emplace(AZStd::forward<Args>(args)...);
+        }
+
+        constexpr void reset() noexcept
+        {
+            m_copyable_wrapper.reset();
+        }
+    private:
+        optional<T> m_copyable_wrapper;
+    };
+
+    // Non-propagating cache - https://eel.is/c++draft/ranges#range.nonprop.cache
+    // Enables an input view to temporarily cache values over as it is iterated over.
+    // For copy construction, a current instance is default initialized
+    // For move construction, the input object is reset
+    // On copy assignment, the current instance is reset
+    // Onmove assignment, both the current and input are reset
+
+    template<class T, class = void>
+    class non_propagating_cache;
+
+    template<class T>
+    class non_propagating_cache<T, enable_if_t<is_object_v<T>>>
+    {
+    public:
+        template<class U = T, class = enable_if_t<default_initializable<U>>>
+        constexpr non_propagating_cache() noexcept(is_nothrow_constructible_v<T>)
+            : non_propagating_cache{ in_place }
+        {}
+
+        template<class... Args>
+        explicit constexpr non_propagating_cache(in_place_t, Args&&... args) noexcept
+            : m_cache{ in_place, AZStd::forward<Args>(args)... }
+        {}
+
+        // Purposely does not initialize the wrapper
+        constexpr non_propagating_cache(const non_propagating_cache&)
+        {}
+        constexpr non_propagating_cache(non_propagating_cache&& other)
+        {
+            other.reset();
+        }
+
+        constexpr auto operator=(const non_propagating_cache& other) noexcept
+        {
+            if (this != &other)
+            {
+                reset();
+            }
+
+            return *this;
+        }
+
+        constexpr auto operator=(non_propagating_cache&& other) noexcept
+        {
+            reset();
+            other.reset();
+            return *this;
+        }
+
+        constexpr T& operator*() & noexcept
+        {
+            return *m_cache;
+        }
+        constexpr const T& operator*() const& noexcept
+        {
+            return *m_cache;
+        }
+        constexpr T&& operator*() && noexcept
+        {
+            return AZStd::move(*m_cache);
+        }
+        constexpr const T&& operator*() const&& noexcept
+        {
+            return AZStd::move(*m_cache);
+        }
+
+        constexpr T* operator->() noexcept
+        {
+            return m_cache.operator->();
+        }
+        constexpr const T* operator->() const noexcept
+        {
+            return m_cache.operator->();
+        }
+
+        constexpr explicit operator bool()
+        {
+            return m_cache.has_value();
+        }
+
+        template<class... Args>
+        constexpr T& emplace(Args&&... args)
+        {
+            return m_cache.emplace(AZStd::forward<Args>(args)...);
+        }
+        template<class I>
+        constexpr auto emplace_deref(const I& i) -> enable_if_t<constructible_from<T, decltype(*i)>, T&>
+        {
+            return m_cache.emplace(*i);
+        }
+
+        constexpr void reset() noexcept
+        {
+            m_cache.reset();
+        }
+    private:
+        optional<T> m_cache;
+    };
+}  // namespace AZStd::ranges::Internal
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/ranges_algorithm.h b/Code/Framework/AzCore/AzCore/std/ranges/ranges_algorithm.h
new file mode 100644
index 0000000000..c01364e103
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/ranges_algorithm.h
@@ -0,0 +1,996 @@
+/*
+ * 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/function/identity.h>
+#include <AzCore/std/ranges/ranges.h>
+#include <AzCore/std/ranges/ranges_functional.h>
+#include <AzCore/std/ranges/subrange.h>
+
+namespace AZStd::ranges
+{
+    template<class T>
+    struct min_max_result
+    {
+        AZ_NO_UNIQUE_ADDRESS T min;
+        AZ_NO_UNIQUE_ADDRESS T max;
+
+        template<class T2, class = enable_if_t<convertible_to<const T&, T2>>>
+        constexpr operator min_max_result<T2>() const&
+        {
+            return { min, max };
+        }
+
+        template<class T2, class = enable_if_t<convertible_to<T, T2>>>
+        constexpr operator min_max_result<T2>()&&
+        {
+            return { std::move(min), std::move(max) };
+        }
+    };
+    template<class T>
+    using minmax_result = min_max_result<T>;
+
+    template<class I>
+    using minmax_element_result = min_max_result<I>;
+
+    namespace Internal
+    {
+        struct min_fn
+        {
+            template<class T, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(const T& a, const T& b, Comp comp = {}, Proj proj = {}) const
+                -> enable_if_t<indirect_strict_weak_order<Comp, projected<const T*, Proj>>, const T&>
+            {
+                return AZStd::invoke(comp, AZStd::invoke(proj, b), AZStd::invoke(proj, a)) ? b : a;
+            }
+
+            template<class T, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(initializer_list<T> r, Comp comp = {}, Proj proj = {}) const
+                ->enable_if_t<conjunction_v<
+                bool_constant<copyable<T>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<const T*, Proj>>>>, T>
+            {
+                AZ_Assert(r.size() > 0, "ranges::min cannot be invoked with an empty initializer_list");
+                auto it = r.begin();
+                auto last = r.end();
+                T result{ *it };
+                for (; it != last; ++it)
+                {
+                    if (AZStd::invoke(comp, AZStd::invoke(proj, *it), AZStd::invoke(proj, result)))
+                    {
+                        result = *it;
+                    }
+                }
+                return result;
+            }
+
+            template<class R, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(R&& r, Comp comp = {}, Proj proj = {}) const
+                ->enable_if_t<conjunction_v<
+                bool_constant<input_range<R>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<iterator_t<R>, Proj>>>,
+                bool_constant<indirectly_copyable_storable<iterator_t<R>, range_value_t<R>*>>>, range_value_t<R>>
+            {
+                AZ_Assert(ranges::distance(r) > 0, "ranges::min cannot be invoked with an empty range");
+                auto it = ranges::begin(r);
+                auto last = ranges::end(r);
+                range_value_t<R> result{ *it };
+                for (; it != last; ++it)
+                {
+                    if (AZStd::invoke(comp, AZStd::invoke(proj, *it), AZStd::invoke(proj, result)))
+                    {
+                        result = *it;
+                    }
+                }
+                return result;
+            }
+        };
+    } // namespace Internal
+
+    inline namespace customization_point_object
+    {
+        constexpr Internal::min_fn min{};
+    }
+
+    namespace Internal
+    {
+        struct max_fn
+        {
+            template<class T, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(const T& a, const T& b, Comp comp = {}, Proj proj = {}) const
+                -> enable_if_t<indirect_strict_weak_order<Comp, projected<const T*, Proj>>, const T&>
+            {
+                return AZStd::invoke(comp, AZStd::invoke(proj, a), AZStd::invoke(proj, b)) ? b : a;
+            }
+
+            template<class T, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(initializer_list<T> r, Comp comp = {}, Proj proj = {}) const
+                ->enable_if_t<conjunction_v<
+                bool_constant<copyable<T>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<const T*, Proj>>>>, T>
+            {
+                AZ_Assert(r.size() > 0, "ranges::max cannot be invoked with an empty initializer_list");
+                auto it = r.begin();
+                auto last = r.end();
+                T result{ *it };
+                for (; it != last; ++it)
+                {
+                    if (AZStd::invoke(comp, AZStd::invoke(proj, result), AZStd::invoke(proj, *it)))
+                    {
+                        result = *it;
+                    }
+                }
+                return result;
+            }
+
+            template<class R, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(R&& r, Comp comp = {}, Proj proj = {}) const
+                ->enable_if_t<conjunction_v<
+                bool_constant<input_range<R>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<iterator_t<R>, Proj>>>,
+                bool_constant<indirectly_copyable_storable<iterator_t<R>, range_value_t<R>*>>>, range_value_t<R>>
+            {
+                AZ_Assert(ranges::distance(r) > 0, "ranges::max cannot be invoked with an empty range");
+                auto it = ranges::begin(r);
+                auto last = ranges::end(r);
+                range_value_t<R> result{ *it };
+                for (; it != last; ++it)
+                {
+                    if (AZStd::invoke(comp, AZStd::invoke(proj, result), AZStd::invoke(proj, *it)))
+                    {
+                        result = *it;
+                    }
+                }
+                return result;
+            }
+        };
+    } // namespace Internal
+
+    inline namespace customization_point_object
+    {
+        constexpr Internal::max_fn max{};
+    }
+
+
+    namespace Internal
+    {
+        struct minmax_fn
+        {
+            template<class T, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(const T& a, const T& b, Comp comp = {}, Proj proj = {}) const
+                -> enable_if_t<indirect_strict_weak_order<Comp, projected<const T*, Proj>>, minmax_result<const T&>>
+            {
+                return AZStd::invoke(comp, AZStd::invoke(proj, b), AZStd::invoke(proj, a)) ?
+                    minmax_result<const T&>{b, a} : minmax_result<const T&>{a, b};
+            }
+
+            template<class T, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(initializer_list<T> r, Comp comp = {}, Proj proj = {}) const
+                ->enable_if_t<conjunction_v<
+                bool_constant<copyable<T>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<const T*, Proj>>>>,
+                minmax_result<T>>
+            {
+                AZ_Assert(r.size() > 0, "ranges::minmax cannot be invoked with an empty initializer_list");
+                auto first = r.begin();
+                minmax_result<T> result{ *first, *first };
+                auto last = r.end();
+                for (; first != last; ++first)
+                {
+                    // Algorithm requires at most (3/2 * ranges::distance(r)) comparisons
+                    if (auto prevIt = first++; first == last)
+                    {
+                        // Find the leftmost smallest element
+                        if (AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, result.min)))
+                        {
+                            result.min = *prevIt;
+                        }
+                        // Find the rightmost largest element
+                        else if (!AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, result.max)))
+                        {
+                            result.max = *prevIt;
+                        }
+                        break;
+                    }
+                    else
+                    {
+                        // For every two elements performs a transitive comparisons to calculate either new
+                        // leftmost min or rightmost max using at most three comparisons
+                        // (*first < *prevIt) && (*first < result.min), then *first = leftmost min
+                        // (*first < *prevIt) && (*prevIt >= result.max), then *prevIt = rightmost max
+                        // else
+                        // (*first >= *prevIt) && (*prevIt < result.min), then *prevIt = leftmost min
+                        // (*first >= *prevIt) && (*first >= result.max), then *first = rightmost max
+                        if (AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, *prevIt)))
+                        {
+                            if (AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, result.min)))
+                            {
+                                result.min = *first;
+                            }
+                            if (!AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, result.max)))
+                            {
+                                result.max = *prevIt;
+                            }
+                        }
+                        else
+                        {
+                            if (AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, result.min)))
+                            {
+                                result.min = *prevIt;
+                            }
+                            if (!AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, result.max)))
+                            {
+                                result.max = *first;
+                            }
+                        }
+                    }
+                }
+                return result;
+            }
+            template<class R, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(R&& r, Comp comp = {}, Proj proj = {}) const
+                -> enable_if_t<conjunction_v<
+                bool_constant<input_range<R>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<iterator_t<R>, Proj>>>,
+                bool_constant<indirectly_copyable_storable<iterator_t<R>, range_value_t<R>*>>>,
+                minmax_result<range_value_t<R>>>
+            {
+                AZ_Assert(ranges::distance(r) > 0, "ranges::minmax cannot be invoked with an empty range");
+                auto first = ranges::begin(r);
+                minmax_result<range_value_t<R>> result{ *first, *first };
+                auto last = ranges::end(r);
+                for (; first != last; ++first)
+                {
+                    // Algorithm requires at most (3/2 * ranges::distance(r)) comparisons
+                    if (auto prevIt = first++; first == last)
+                    {
+                        // Find the leftmost smallest element
+                        if (AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, result.min)))
+                        {
+                            result.min = *prevIt;
+                        }
+                        // Find the rightmost largest element
+                        else if (!AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, result.max)))
+                        {
+                            result.max = *prevIt;
+                        }
+                        break;
+                    }
+                    else
+                    {
+                        // For every two elements performs a transitive comparisons to calculate either new
+                        // leftmost min or rightmost max using at most three comparisons
+                        // (*first < *prevIt) && (*first < result.min), then *first = leftmost min
+                        // (*first < *prevIt) && (*prevIt >= result.max), then *prevIt = rightmost max
+                        // else
+                        // (*first >= *prevIt) && (*prevIt < result.min), then *prevIt = leftmost min
+                        // (*first >= *prevIt) && (*first >= result.max), then *first = rightmost max
+                        if (AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, *prevIt)))
+                        {
+                            if (AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, result.min)))
+                            {
+                                result.min = *first;
+                            }
+                            if (!AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, result.max)))
+                            {
+                                result.max = *prevIt;
+                            }
+                        }
+                        else
+                        {
+                            if (AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, result.min)))
+                            {
+                                result.min = *prevIt;
+                            }
+                            if (!AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, result.max)))
+                            {
+                                result.max = *first;
+                            }
+                        }
+                    }
+                }
+                return result;
+            }
+        };
+    }
+
+    inline namespace customization_point_object
+    {
+        constexpr Internal::minmax_fn minmax{};
+    }
+
+    namespace Internal
+    {
+        struct min_element_fn
+        {
+            template<class I, class S, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(I first, S last, Comp comp = {}, Proj proj = {}) const
+                -> enable_if_t<conjunction_v<
+                bool_constant<forward_iterator<I>>,
+                bool_constant<sentinel_for<S, I>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<I, Proj>>>
+                >, I>
+            {
+                I result{ first };
+                for (; first != last; ++first)
+                {
+                    if (AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, *result)))
+                    {
+                        result = first;
+                    }
+                }
+                return result;
+            }
+            template<class R, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(R&& r, Comp comp = {}, Proj proj = {}) const
+                ->enable_if_t<conjunction_v<
+                bool_constant<forward_range<R>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<iterator_t<R>, Proj>>>
+                >, borrowed_iterator_t<R>>
+            {
+                auto it = ranges::begin(r);
+                auto last = ranges::end(r);
+                borrowed_iterator_t<R> result{ it };
+                for (; it != last; ++it)
+                {
+                    if (AZStd::invoke(comp, AZStd::invoke(proj, *it), AZStd::invoke(proj, *result)))
+                    {
+                        result = it;
+                    }
+                }
+                return result;
+            }
+        };
+    }
+
+    inline namespace customization_point_object
+    {
+        constexpr Internal::min_element_fn min_element{};
+    }
+
+    namespace Internal
+    {
+        struct max_element_fn
+        {
+            template<class I, class S, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(I first, S last, Comp comp = {}, Proj proj = {}) const
+                -> enable_if_t<conjunction_v<
+                bool_constant<forward_iterator<I>>,
+                bool_constant<sentinel_for<S, I>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<I, Proj>>>
+                >, I>
+            {
+                I result{ first };
+                for (; first != last; ++first)
+                {
+                    if (AZStd::invoke(comp, AZStd::invoke(proj, *result), AZStd::invoke(proj, *first)))
+                    {
+                        result = first;
+                    }
+                }
+                return result;
+            }
+            template<class R, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(R&& r, Comp comp = {}, Proj proj = {}) const
+                ->enable_if_t<conjunction_v<
+                bool_constant<forward_range<R>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<iterator_t<R>, Proj>>>
+                >, borrowed_iterator_t<R>>
+            {
+                auto first = ranges::begin(r);
+                auto last = ranges::end(r);
+                borrowed_iterator_t<R> result{ first };
+                for (; first != last; ++first)
+                {
+                    if (AZStd::invoke(comp, AZStd::invoke(proj, *result), AZStd::invoke(proj, *first)))
+                    {
+                        result = first;
+                    }
+                }
+                return result;
+            }
+        };
+    }
+
+    inline namespace customization_point_object
+    {
+        constexpr Internal::max_element_fn max_element{};
+    }
+
+    namespace Internal
+    {
+        // C++ Standard footnote
+        // minmax_element returns the rightmost iterator with the largest value
+        // and is intentionally different from max_element which returns
+        // the leftmost iterator with the largest value
+        // https://eel.is/c++draft/algorithms#footnoteref-225
+        struct minmax_element_fn
+        {
+            template<
+                class I,
+                class S,
+                class Proj = identity,
+                class Comp = ranges::less>
+                constexpr auto operator()(I first, S last, Comp comp = {}, Proj proj = {}) const
+                ->enable_if_t<conjunction_v<
+                bool_constant<forward_iterator<I>>,
+                bool_constant<sentinel_for<S, I>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<I, Proj>>>
+                >, minmax_element_result<I>>
+            {
+                minmax_element_result<I> result{ first, first };
+                for (; first != last; ++first)
+                {
+                    // Algorithm requires at most (3/2 * ranges::distance(r)) comparisons
+                    if (auto prevIt = first++; first == last)
+                    {
+                        // Find the leftmost smallest element
+                        if (AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, *result.min)))
+                        {
+                            result.min = prevIt;
+                        }
+                        // Find the rightmost largest element
+                        else if (!AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, *result.max)))
+                        {
+                            result.max = prevIt;
+                        }
+                        break;
+                    }
+                    else
+                    {
+                        // For every two elements performs a transitive comparisons to calculate either new
+                        // leftmost min or rightmost max using at most three comparisons
+                        // (*first < *prevIt) && (*first < result.min), then *first = leftmost min
+                        // (*first < *prevIt) && (*prevIt >= result.max), then *prevIt = rightmost max
+                        // else
+                        // (*first >= *prevIt) && (*prevIt < result.min), then *prevIt = leftmost min
+                        // (*first >= *prevIt) && (*first >= result.max), then *first = rightmost max
+                        if (AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, *prevIt)))
+                        {
+                            if (AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, *result.min)))
+                            {
+                                result.min = first;
+                            }
+                            if (!AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, *result.max)))
+                            {
+                                result.max = prevIt;
+                            }
+                        }
+                        else
+                        {
+                            if (AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, *result.min)))
+                            {
+                                result.min = prevIt;
+                            }
+                            if (!AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, *result.max)))
+                            {
+                                result.max = first;
+                            }
+                        }
+                    }
+                }
+                return result;
+            }
+            template<class R, class Proj = identity, class Comp = ranges::less>
+            constexpr auto operator()(R&& r, Comp comp = {}, Proj proj = {}) const
+                ->enable_if_t<conjunction_v<
+                bool_constant<forward_range<R>>,
+                bool_constant<indirect_strict_weak_order<Comp, projected<iterator_t<R>, Proj>>>
+                >, minmax_element_result<borrowed_iterator_t<R>>>
+            {
+                auto first = ranges::begin(r);
+                minmax_element_result<borrowed_iterator_t<R>> result{ first, first };
+                auto last = ranges::end(r);
+                for (; first != last; ++first)
+                {
+                    // Algorithm requires at most (3/2 * ranges::distance(r)) comparisons
+                    if (auto prevIt = first++; first == last)
+                    {
+                        // Find the leftmost smallest element
+                        if (AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, *result.min)))
+                        {
+                            result.min = prevIt;
+                        }
+                        // Find the rightmost largest element
+                        else if (!AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, *result.max)))
+                        {
+                            result.max = prevIt;
+                        }
+                        break;
+                    }
+                    else
+                    {
+                        // For every two elements performs a transitive comparisons to calculate either new
+                        // leftmost min or rightmost max using at most three comparisons
+                        // (*first < *prevIt) && (*first < result.min), then *first = leftmost min
+                        // (*first < *prevIt) && (*prevIt >= result.max), then *prevIt = rightmost max
+                        // else
+                        // (*first >= *prevIt) && (*prevIt < result.min), then *prevIt = leftmost min
+                        // (*first >= *prevIt) && (*first >= result.max), then *first = rightmost max
+                        if (AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, *prevIt)))
+                        {
+                            if (AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, *result.min)))
+                            {
+                                result.min = first;
+                            }
+                            if (!AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, *result.max)))
+                            {
+                                result.max = prevIt;
+                            }
+                        }
+                        else
+                        {
+                            if (AZStd::invoke(comp, AZStd::invoke(proj, *prevIt), AZStd::invoke(proj, *result.min)))
+                            {
+                                result.min = prevIt;
+                            }
+                            if (!AZStd::invoke(comp, AZStd::invoke(proj, *first), AZStd::invoke(proj, *result.max)))
+                            {
+                                result.max = first;
+                            }
+                        }
+                    }
+                }
+                return result;
+            }
+        };
+    }
+
+    inline namespace customization_point_object
+    {
+        constexpr Internal::minmax_element_fn minmax_element{};
+    }
+
+    // find algorithms
+    namespace Internal
+    {
+        struct find_fn
+        {
+            template<class I, class S, class T, class Proj = identity, class = enable_if_t<conjunction_v<
+                bool_constant<input_iterator<I>>,
+                bool_constant<sentinel_for<S, I>>,
+                bool_constant<indirect_binary_predicate<ranges::equal_to, projected<I, Proj>, const T*>>
+                >>>
+            constexpr I operator()(I first, S last, const T& value, Proj proj = {}) const
+            {
+                for (; first != last; ++first)
+                {
+                    if (AZStd::invoke(proj, *first) == value)
+                    {
+                        return first;
+                    }
+                }
+
+                return first;
+            }
+            template<class R, class T, class Proj = identity, class = enable_if_t<conjunction_v<
+                bool_constant<input_range<R>>,
+                bool_constant<indirect_binary_predicate<equal_to, projected<iterator_t<R>, Proj>, const T*>>
+                >>>
+            constexpr borrowed_iterator_t<R> operator()(R&& r, const T& value, Proj proj = {}) const
+            {
+                return operator()(ranges::begin(r), ranges::end(r),
+                    value, AZStd::move(proj));
+            }
+        };
+    }
+    inline namespace customization_point_object
+    {
+        constexpr Internal::find_fn find{};
+    }
+
+    namespace Internal
+    {
+        struct find_if_fn
+        {
+            template<class I, class S, class Proj = identity, class Pred, class = enable_if_t<conjunction_v<
+                bool_constant<input_iterator<I>>,
+                bool_constant<sentinel_for<S, I>>,
+                bool_constant<indirect_unary_predicate<Pred, projected<I, Proj>>>
+                >>>
+            constexpr I operator()(I first, S last, Pred pred, Proj proj = {}) const
+            {
+                for (; first != last; ++first)
+                {
+                    if (AZStd::invoke(pred, AZStd::invoke(proj, *first)))
+                    {
+                        return first;
+                    }
+                }
+
+                return first;
+            }
+            template<class R,  class Proj = identity, class Pred, class = enable_if_t<conjunction_v<
+                bool_constant<input_range<R>>,
+                bool_constant<indirect_unary_predicate<Pred, projected<iterator_t<R>, Proj>>>
+                >>>
+            constexpr borrowed_iterator_t<R> operator()(R&& r, Pred pred, Proj proj = {}) const
+            {
+                return operator()(ranges::begin(r), ranges::end(r),
+                    AZStd::move(pred), AZStd::move(proj));
+            }
+        };
+    }
+    inline namespace customization_point_object
+    {
+        constexpr Internal::find_if_fn find_if{};
+    }
+
+    namespace Internal
+    {
+        struct find_if_not_fn
+        {
+            template<class I, class S, class Proj = identity, class Pred, class = enable_if_t<conjunction_v<
+                bool_constant<input_iterator<I>>,
+                bool_constant<sentinel_for<S, I>>,
+                bool_constant<indirect_unary_predicate<Pred, projected<I, Proj>>>
+                >>>
+            constexpr I operator()(I first, S last, Pred pred, Proj proj = {}) const
+            {
+                for (; first != last; ++first)
+                {
+                    if (!AZStd::invoke(pred, AZStd::invoke(proj, *first)))
+                    {
+                        return first;
+                    }
+                }
+
+                return first;
+            }
+            template<class R, class Proj = identity, class Pred, class = enable_if_t<conjunction_v<
+                bool_constant<input_range<R>>,
+                bool_constant<indirect_unary_predicate<Pred, projected<iterator_t<R>, Proj>>>
+                >>>
+            constexpr borrowed_iterator_t<R>
+                operator()(R&& r, Pred pred, Proj proj = {}) const
+            {
+                return operator()(ranges::begin(r), ranges::end(r),
+                    AZStd::move(pred), AZStd::move(proj));
+            }
+        };
+    }
+    inline namespace customization_point_object
+    {
+        constexpr Internal::find_if_not_fn find_if_not{};
+    }
+
+    namespace Internal
+    {
+        struct find_first_of_fn
+        {
+            template<class I1, class S1, class I2, class S2, class Pred = equal_to, class Proj1 = identity, class Proj2 = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<input_iterator<I1>>,
+                bool_constant<sentinel_for<S1, I1>>,
+                bool_constant<forward_iterator<I2>>,
+                bool_constant<sentinel_for<S2, I2>>,
+                bool_constant<indirectly_comparable<I1, I2, Pred, Proj1, Proj2>>
+                >>>
+                constexpr I1 operator()(I1 first1, S1 last1, I2 first2, S2 last2,
+                    Pred pred = {},
+                    Proj1 proj1 = {}, Proj2 proj2 = {}) const
+            {
+                for (; first1 != last1; ++first1)
+                {
+                    for (I2 elementIt = first2; elementIt != last2; ++elementIt)
+                    {
+                        if (AZStd::invoke(pred, AZStd::invoke(proj1, *first1), AZStd::invoke(proj2, *elementIt)))
+                        {
+                            return first1;
+                        }
+                    }
+                }
+
+                return first1;
+            }
+            template<class R1, class R2,class Pred = equal_to, class Proj1 = identity, class Proj2 = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<input_range<R1>>,
+                bool_constant<forward_range<R2>>,
+                bool_constant<indirectly_comparable<iterator_t<R1>, iterator_t<R2>, Pred, Proj1, Proj2>>
+            >>>
+            constexpr borrowed_iterator_t<R1> operator()(R1&& r1, R2&& r2,
+                    Pred pred = {}, Proj1 proj1 = {}, Proj2 proj2 = {}) const
+            {
+                return operator()(ranges::begin(r1), ranges::end(r1),
+                    ranges::begin(r2), ranges::end(r2),
+                        AZStd::move(pred), AZStd::move(proj1), AZStd::move(proj2));
+            }
+        };
+    }
+    inline namespace customization_point_object
+    {
+        constexpr Internal::find_first_of_fn find_first_of{};
+    }
+
+    // ranges::mismatch
+    template<class I1, class I2>
+    using mismatch_result = in_in_result<I1, I2>;
+
+    namespace Internal
+    {
+        struct mismatch_fn
+        {
+            template<class I1, class S1, class I2, class S2, class Pred = equal_to, class Proj1 = identity, class Proj2 = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<input_iterator<I1>>,
+                bool_constant<sentinel_for<S1, I1>>,
+                bool_constant<input_iterator<I2>>,
+                bool_constant<sentinel_for<S2, I2>>,
+                bool_constant<indirectly_comparable<I1, I2, Pred, Proj1, Proj2>>
+                >>>
+            constexpr mismatch_result<I1, I2> operator()(I1 first1, S1 last1, I2 first2, S2 last2,
+                Pred pred = {}, Proj1 proj1 = {}, Proj2 proj2 = {}) const
+            {
+                for (; first1 != last1 && first2 != last2; ++first1, ++first2)
+                {
+                    if (!AZStd::invoke(pred, AZStd::invoke(proj1, *first1), AZStd::invoke(proj2, *first2)))
+                    {
+                        return { first1, first2 };
+                    }
+                }
+
+                return { first1, first2 };
+            }
+
+            template<class R1, class R2, class Pred = equal_to, class Proj1 = identity, class Proj2 = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<input_range<R1>>,
+                bool_constant<input_range<R2>>,
+                bool_constant<indirectly_comparable<iterator_t<R1>, iterator_t<R2>, Pred, Proj1, Proj2>>
+                >>>
+            constexpr mismatch_result<borrowed_iterator_t<R1>, borrowed_iterator_t<R2>> operator()(R1&& r1, R2&& r2,
+                Pred pred = {}, Proj1 proj1 = {}, Proj2 proj2 = {}) const
+            {
+                return operator()(ranges::begin(r1), ranges::end(r1),
+                    ranges::begin(r2), ranges::end(r2),
+                    AZStd::move(pred), AZStd::move(proj1), AZStd::move(proj2));
+            }
+        };
+    }
+    inline namespace customization_point_object
+    {
+        constexpr Internal::mismatch_fn mismatch{};
+    }
+
+    namespace Internal
+    {
+        struct equal_fn
+        {
+            template<class I1, class S1, class I2, class S2, class Pred = equal_to, class Proj1 = identity, class Proj2 = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<input_iterator<I1>>,
+                bool_constant<sentinel_for<S1, I1>>,
+                bool_constant<input_iterator<I2>>,
+                bool_constant<sentinel_for<S2, I2>>,
+                bool_constant<indirectly_comparable<I1, I2, Pred, Proj1, Proj2>>
+                >>>
+                constexpr bool operator()(I1 first1, S1 last1, I2 first2, S2 last2,
+                    Pred pred = {},
+                    Proj1 proj1 = {}, Proj2 proj2 = {}) const
+            {
+                if constexpr (sized_sentinel_for<S1, I1> && sized_sentinel_for<S2, I2>)
+                {
+                    if (ranges::distance(first1, last1) != ranges::distance(first2, last2))
+                    {
+                        return false;
+                    }
+                }
+
+                for (; first1 != last1 && first2 != last2; ++first1, ++first2)
+                {
+                    if (!AZStd::invoke(pred, AZStd::invoke(proj1, *first1), AZStd::invoke(proj2, *first2)))
+                    {
+                        return false;
+                    }
+                }
+
+                return first1 == last1 && first2 == last2;
+            }
+
+            template<class R1, class R2, class Pred = equal_to, class Proj1 = identity, class Proj2 = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<input_range<R1>>,
+                bool_constant<input_range<R2>>,
+                bool_constant<indirectly_comparable<iterator_t<R1>, iterator_t<R2>, Pred, Proj1, Proj2>>
+                >>>
+                constexpr bool operator()(R1&& r1, R2&& r2, Pred pred = {},
+                    Proj1 proj1 = {}, Proj2 proj2 = {}) const
+            {
+                return operator()(ranges::begin(r1), ranges::end(r1),
+                    ranges::begin(r2), ranges::end(r2),
+                    AZStd::move(pred), AZStd::move(proj1), AZStd::move(proj2));
+            }
+        };
+    }
+    inline namespace customization_point_object
+    {
+        constexpr Internal::equal_fn equal{};
+    }
+
+    namespace Internal
+    {
+        struct search_fn
+        {
+            template<class I1, class S1, class I2, class S2, class Pred = equal_to, class Proj1 = identity, class Proj2 = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<forward_iterator<I1>>,
+                bool_constant<sentinel_for<S1, I1>>,
+                bool_constant<forward_iterator<I2>>,
+                bool_constant<sentinel_for<S2, I2>>,
+                bool_constant<indirectly_comparable<I1, I2, Pred, Proj1, Proj2>>
+                >>>
+            constexpr subrange<I1> operator()(I1 first1, S1 last1, I2 first2, S2 last2, Pred pred = {},
+                Proj1 proj1 = {}, Proj2 proj2 = {}) const
+            {
+                do
+                {
+                    I1 it1 = first1;
+                    I2 it2 = first2;
+                    for (;; ++it1, ++it2)
+                    {
+                        if (it2 == last2)
+                        {
+                            // Reached the end of the second iteator sequence
+                            // Therefore the search has succeeded. return the matching range from the first sequence
+                            return { first1, it1 };
+                        }
+                        if (it1 == last1)
+                        {
+                            // The search has failed to find the second iterator sequence within the first
+                            return { last1, last1 };
+                        }
+                        if (!AZStd::invoke(pred, AZStd::invoke(proj1, *it1), AZStd::invoke(proj2, *it2)))
+                        {
+                            // Mismatch found break out of iteration of loop
+                            break;
+                        }
+                    }
+                    // Increment to the next element in the range of [first1, last1) and restart the search
+                    ++first1;
+                } while (true);
+            }
+
+            template<class R1, class R2, class Pred = equal_to, class Proj1 = identity, class Proj2 = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<forward_range<R1>>,
+                bool_constant<forward_range<R2>>,
+                bool_constant<indirectly_comparable<iterator_t<R1>, iterator_t<R2>, Pred, Proj1, Proj2>>
+                >>>
+            constexpr borrowed_subrange_t<R1>
+                operator()(R1&& r1, R2&& r2, Pred pred = {},
+                    Proj1 proj1 = {}, Proj2 proj2 = {}) const
+            {
+                return operator()(ranges::begin(r1), ranges::end(r1),
+                    ranges::begin(r2), ranges::end(r2),
+                        AZStd::move(pred), AZStd::move(proj1), AZStd::move(proj2));
+            }
+
+        };
+    }
+    inline namespace customization_point_object
+    {
+        constexpr Internal::search_fn search{};
+    }
+
+    namespace Internal
+    {
+        struct search_n_fn
+        {
+            template<class I, class S, class T, class Pred = equal_to, class Proj = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<forward_iterator<I>>,
+                bool_constant<sentinel_for<S, I>>,
+                bool_constant<indirectly_comparable<I, const T*, Pred, Proj>>
+                >>>
+                constexpr subrange<I> operator()(I first, S last, iter_difference_t<I> count,
+                    const T& value, Pred pred = {}, Proj proj = {}) const
+            {
+                for (; first != last; ++first)
+                {
+                    iter_difference_t<I> foundCount{};
+                    I searchFirst = first;
+                    for (; foundCount != count && first != last; ++first, ++foundCount)
+                    {
+                        if (!AZStd::invoke(pred, AZStd::invoke(proj, *first), value))
+                        {
+                            break;
+                        }
+                    }
+                    if (foundCount == count)
+                    {
+                        // count consecutive elements matching value have been found
+                        return { searchFirst, first };
+                    }
+                    if (first == last)
+                    {
+                        // search has failed to find count matching elements over the range.
+                        break;
+                    }
+                }
+
+                return { last, last };
+            }
+            template<class R, class T, class Pred = equal_to, class Proj = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<forward_range<R>>,
+                bool_constant<indirectly_comparable<iterator_t<R>, const T*, Pred, Proj>>
+                >>>
+                constexpr borrowed_subrange_t<R> operator()(R&& r, range_difference_t<R> count,
+                    const T& value, Pred pred = {}, Proj proj = {}) const
+            {
+                return operator()(ranges::begin(r), ranges::end(r),
+                    AZStd::move(count), value, AZStd::move(pred), AZStd::move(proj));
+            }
+        };
+    }
+    inline namespace customization_point_object
+    {
+        constexpr Internal::search_n_fn search_n{};
+    }
+
+    // ranges::find_end_fn
+    // use ranges::search
+    namespace Internal
+    {
+        struct find_end_fn
+        {
+            template<class I1, class S1, class I2, class S2, class Pred = equal_to, class Proj1 = identity, class Proj2 = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<forward_iterator<I1>>,
+                bool_constant<sentinel_for<S1, I1>>,
+                bool_constant<forward_iterator<I2>>,
+                bool_constant<sentinel_for<S2, I2>>,
+                bool_constant<indirectly_comparable<I1, I2, Pred, Proj1, Proj2>>
+                >>>
+                constexpr subrange<I1> operator()(I1 first1, S1 last1, I2 first2, S2 last2, Pred pred = {},
+                    Proj1 proj1 = {}, Proj2 proj2 = {}) const
+            {
+                if (first2 == last2)
+                {
+                    return { last1, last1 };
+                }
+                auto foundSubrange = ranges::search(first1, last1, first2, last2, pred, proj1, proj2);
+                if (foundSubrange.empty())
+                {
+                    return foundSubrange;
+                }
+                do
+                {
+                    auto nextIt = ranges::next(foundSubrange.begin());
+                    auto nextSubrange = ranges::search(nextIt, last1, first2, last2, pred, proj1, proj2);
+                    if (nextSubrange.empty())
+                    {
+                        return foundSubrange;
+                    }
+
+                    foundSubrange = AZStd::move(nextSubrange);
+
+                } while (true);
+            }
+            template<class R1, class R2, class Pred = equal_to, class Proj1 = identity, class Proj2 = identity,
+                class = enable_if_t<conjunction_v<
+                bool_constant<forward_range<R1>>,
+                bool_constant<forward_range<R2>>,
+                bool_constant<indirectly_comparable<iterator_t<R1>, iterator_t<R2>, Pred, Proj1, Proj2>>
+                >>>
+                constexpr borrowed_subrange_t<R1> operator()(R1&& r1, R2&& r2, Pred pred = {},
+                    Proj1 proj1 = {}, Proj2 proj2 = {}) const
+            {
+                return operator()(ranges::begin(r1), ranges::end(r1),
+                    ranges::begin(r2), ranges::end(r2),
+                        AZStd::move(pred), AZStd::move(proj1), AZStd::move(proj2));
+            }
+        };
+    }
+    inline namespace customization_point_object
+    {
+        constexpr Internal::find_end_fn find_end{};
+    }
+} // namespace AZStd::ranges
+
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/ranges_functional.h b/Code/Framework/AzCore/AzCore/std/ranges/ranges_functional.h
new file mode 100644
index 0000000000..29d49dae57
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/ranges_functional.h
@@ -0,0 +1,121 @@
+/*
+ * 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/function/identity.h>
+#include <AzCore/std/ranges/ranges.h>
+
+namespace AZStd::ranges
+{
+    struct equal_to
+    {
+        template<class T, class U>
+        constexpr auto operator()(T&& t, U&& u) const ->
+            enable_if_t<equality_comparable_with<T, U>, decltype(AZStd::forward<T>(t) == AZStd::forward<U>(u))>
+        {
+            return AZStd::forward<T>(t) == AZStd::forward<U>(u);
+        }
+        using is_transparent = void;
+    };
+
+    struct not_equal_to
+    {
+        template<class T, class U>
+        constexpr auto operator()(T&& t, U&& u) const ->
+            enable_if_t<equality_comparable_with<T, U>, decltype(!ranges::equal_to{}(AZStd::forward<T>(t), AZStd::forward<U>(u)))>
+        {
+            return !ranges::equal_to{}(AZStd::forward<T>(t), AZStd::forward<U>(u));
+        }
+        using is_transparent = void;
+    };
+    
+    struct less
+    {
+        template<class T, class U>
+        constexpr auto operator()(T&& t, U&& u) const ->
+            enable_if_t<totally_ordered_with<T, U>, decltype(AZStd::forward<T>(t) < AZStd::forward<U>(u))>
+        {
+            return AZStd::forward<T>(t) < AZStd::forward<U>(u);
+        }
+        using is_transparent = void;
+    };
+
+    struct greater
+    {
+        template<class T, class U>
+        constexpr auto operator()(T&& t, U&& u) const ->
+            enable_if_t<totally_ordered_with<T, U>, decltype(ranges::less{}(AZStd::forward<T>(t) < AZStd::forward<U>(u)))>
+        {
+            return ranges::less{}(AZStd::forward<U>(u) < AZStd::forward<T>(t));
+        }
+        using is_transparent = void;
+    };
+    
+    struct greater_equal
+    {
+        template<class T, class U>
+        constexpr auto operator()(T&& t, U&& u) const ->
+            enable_if_t<totally_ordered_with<T, U>, decltype(!ranges::less{}(AZStd::forward<T>(t), AZStd::forward<U>(u)))>
+        {
+            return !ranges::less{}(AZStd::forward<T>(t), AZStd::forward<U>(u));
+        }
+        using is_transparent = void;
+    };
+    
+    struct less_equal
+    {
+        template<class T, class U>
+        constexpr auto operator()(T&& t, U&& u) const ->
+            enable_if_t<totally_ordered_with<T, U>, decltype(!ranges::less{}(AZStd::forward<U>(u), AZStd::forward<T>(t)))>
+        {
+            return !ranges::less{}(AZStd::forward<U>(u), AZStd::forward<T>(t));
+        }
+        using is_transparent = void;
+    };
+} // namespace AZStd::ranges
+
+
+// Iterator Common algorithm requirement concepts
+// https://eel.is/c++draft/alg.req
+namespace AZStd
+{
+    template<class I1, class I2, class R, class P1 = identity, class P2 = identity, class = void>
+    /*concept*/ constexpr bool indirectly_comparable = false;
+
+    template<class I1, class I2, class R, class P1, class P2>
+    /*concept*/ constexpr bool indirectly_comparable<I1, I2, R, P1, P2, enable_if_t<
+        indirect_binary_predicate<R, projected<I1, P1>, projected<I2, P2>>>> = true;
+
+    template<class I, class = void>
+    /*concept*/ constexpr bool permutable = false;
+
+    template<class I>
+    /*concept*/ constexpr bool permutable<I, enable_if_t<conjunction_v<
+        bool_constant<forward_iterator<I>>,
+        bool_constant<indirectly_movable_storable<I, I>>,
+        bool_constant<indirectly_swappable<I, I>> >>> = true;
+
+    template<class I1, class I2, class Out, class R = ranges::less, class P1 = identity, class P2 = identity, class = void>
+    /*concept*/ constexpr bool mergeable = false;
+
+    template<class I1, class I2, class Out, class R, class P1, class P2>
+    /*concept*/ constexpr bool mergeable<I1, I2, Out, R, P1, P2, enable_if_t<conjunction_v<
+        bool_constant<input_iterator<I1>>,
+        bool_constant<input_iterator<I2>>,
+        bool_constant<weakly_incrementable<Out>>,
+        bool_constant<indirectly_copyable<I1, Out>>,
+        bool_constant<indirectly_copyable<I2, Out>>,
+        bool_constant<indirect_strict_weak_order<R, projected<I1, P1>, projected<I2, P2>>> >>> = true;
+
+    template<class I, class R = ranges::less, class P = identity, class = void>
+    /*concept*/ constexpr bool sortable = false;
+    template<class I, class R, class P>
+    /*concept*/ constexpr bool sortable<I, R, P, enable_if_t<conjunction_v<
+        bool_constant<permutable<I>>,
+        bool_constant<indirect_strict_weak_order<R, projected<I, P>>> >>> = true;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/ref_view.h b/Code/Framework/AzCore/AzCore/std/ranges/ref_view.h
new file mode 100644
index 0000000000..095e3d77b6
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/ref_view.h
@@ -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
+ *
+ */
+#pragma once
+
+#include <AzCore/std/ranges/ranges.h>
+#include <AzCore/std/optional.h>
+
+namespace AZStd::ranges
+{
+    template<class R, class = void>
+    class ref_view;
+
+    template<class R>
+    class ref_view<R, enable_if_t<ranges::range<R> && is_object_v<R>>>
+        : public ranges::view_interface<ref_view<R>>
+    {
+    private:
+        static void bindable_to_range(R&);
+        static void bindable_to_range(R&&) = delete;
+    public:
+        template<class T, class = enable_if_t<conjunction_v<
+            bool_constant<Internal::different_from<T, ref_view>>,
+            bool_constant<convertible_to<T, R&>>,
+            Internal::sfinae_trigger<decltype(bindable_to_range(declval<T>()))>
+            >>>
+        constexpr ref_view(T&& t)
+            : m_range{ addressof(static_cast<R&>(AZStd::forward<T>(t))) }
+        {}
+
+        constexpr R& base() const
+        {
+            return *m_range;
+        }
+
+        constexpr iterator_t<R> begin() const
+        {
+            return ranges::begin(*m_range);
+        }
+        constexpr sentinel_t<R> end() const
+        {
+            return ranges::end(*m_range);
+        }
+
+        template<class Rn = R>
+        constexpr auto empty() const -> enable_if_t<Internal::sfinae_trigger_v<decltype(ranges::empty(*declval<Rn*>()))>, bool>
+        {
+            return ranges::empty(*m_range);
+        }
+
+        template<class Rn = R>
+        constexpr auto size() const -> enable_if_t<sized_range<R>, decltype(ranges::size(*declval<Rn*>()))>
+        {
+            return ranges::size(*m_range);
+        }
+
+        template<class Rn = R>
+        constexpr auto data() const -> enable_if_t<contiguous_range<R>, decltype(ranges::data(*declval<Rn*>()))>
+        {
+            return ranges::data(*m_range);
+        }
+
+    private:
+        R* m_range{};
+    };
+
+    //! deduction guides
+    template<class R>
+    ref_view(R&) -> ref_view<R>;
+
+    template<class T>
+    inline constexpr bool enable_borrowed_range<ref_view<T>> = true;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/single_view.h b/Code/Framework/AzCore/AzCore/std/ranges/single_view.h
new file mode 100644
index 0000000000..e033f0102d
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/single_view.h
@@ -0,0 +1,89 @@
+/*
+ * 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/ranges/ranges_adaptor.h>
+
+namespace AZStd::ranges
+{
+    template<class T, class = void>
+    class single_view;
+
+    namespace views
+    {
+        namespace Internal
+        {
+            struct single_view_fn
+            {
+                template <class View>
+                constexpr decltype(auto) operator()(View&& view) const
+                {
+                    return single_view<decay_t<View>>(AZStd::forward<View>(view));
+                }
+            };
+        }
+        inline namespace customization_point_object
+        {
+            constexpr Internal::single_view_fn single{};
+        }
+    }
+
+    template<class T>
+    class single_view<T, enable_if_t<copy_constructible<T>&& is_object_v<T>>>
+        : public view_interface<single_view<T>>
+    {
+    public:
+
+        template<class T2 = T, class = enable_if_t<default_initializable<T2>>>
+        single_view() {}
+        constexpr explicit single_view(const T& t)
+            : m_value(in_place, t)
+        {}
+        constexpr explicit single_view(T&& t)
+            : m_value(in_place, AZStd::move(t))
+        {}
+        template<class... Args, enable_if_t<constructible_from<T, Args...>>* = nullptr>
+        constexpr explicit single_view(in_place_t, Args&&... args)
+            : m_value{ in_place, AZStd::forward<Args>(args)... }
+        {}
+
+        constexpr T* begin() noexcept
+        {
+            return data();
+        }
+        constexpr const T* begin() const noexcept
+        {
+            return data();
+        }
+        constexpr T* end() noexcept
+        {
+            return data() + 1;
+        }
+        constexpr const T* end() const noexcept
+        {
+            return data() + 1;
+        }
+        static constexpr size_t size() noexcept
+        {
+            return 1;
+        }
+        constexpr T* data() noexcept
+        {
+            return m_value.operator->();
+        }
+        constexpr const T* data() const noexcept
+        {
+            return m_value.operator->();
+        }
+    private:
+        Internal::copyable_box<T> m_value;
+    };
+
+    template<class T>
+    single_view(T) -> single_view<T>;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/split_view.h b/Code/Framework/AzCore/AzCore/std/ranges/split_view.h
new file mode 100644
index 0000000000..cee3c3e568
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/split_view.h
@@ -0,0 +1,235 @@
+/*
+ * 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/ranges/all_view.h>
+#include <AzCore/std/ranges/ranges_adaptor.h>
+#include <AzCore/std/ranges/ranges_algorithm.h>
+#include <AzCore/std/ranges/ranges_functional.h>
+#include <AzCore/std/ranges/single_view.h>
+
+namespace AZStd::ranges
+{
+    template<class View, class Pattern, class = enable_if_t<conjunction_v<
+        bool_constant<forward_range<View>>,
+        bool_constant<forward_range<Pattern>>,
+        bool_constant<view<View>>,
+        bool_constant<view<Pattern>>,
+        bool_constant<indirectly_comparable<iterator_t<View>, iterator_t<Pattern>, ranges::equal_to>>
+        >>>
+        class split_view;
+
+    // views::split customization point
+    namespace views
+    {
+        namespace Internal
+        {
+            struct split_view_fn
+                : Internal::range_adaptor_closure<split_view_fn>
+            {
+                template <class View, class Pattern, class = enable_if_t<conjunction_v<
+                    bool_constant<viewable_range<View>>
+                    >>>
+                constexpr auto operator()(View&& view, Pattern&& pattern) const
+                {
+                    return split_view(AZStd::forward<View>(view), AZStd::forward<Pattern>(pattern));
+                }
+
+            };
+        }
+        inline namespace customization_point_object
+        {
+            constexpr Internal::split_view_fn split{};
+        }
+    }
+
+    template<class View, class Pattern, class>
+    class split_view
+        : public view_interface<split_view<View, Pattern>>
+    {
+        struct iterator;
+        struct sentinel;
+    public:
+        template <bool Enable = default_initializable<View> && default_initializable<Pattern>,
+            class = enable_if_t<Enable>>
+        split_view() {}
+
+        constexpr split_view(View base, Pattern pattern)
+            : m_base(AZStd::move(base))
+            , m_pattern(AZStd::move(pattern))
+        {}
+
+        template<class R, class = enable_if_t<conjunction_v<
+            bool_constant<forward_range<R>>,
+            bool_constant<constructible_from<View, views::all_t<R>>>,
+            bool_constant<constructible_from<Pattern, single_view<range_value_t<R>>>>
+            >>>
+        constexpr split_view(R&& r, range_value_t<R> e)
+            : m_base{ views::all(AZStd::forward<R>(r)) }
+            , m_pattern{ views::single(AZStd::move(e)) }
+        {
+        }
+
+        template <bool Enable = copy_constructible<View>, class = enable_if_t<Enable>>
+        constexpr View base() const&
+        {
+            return m_base;
+        }
+        constexpr View base()&&
+        {
+            return AZStd::move(m_base);
+        }
+
+        constexpr iterator begin()
+        {
+            return { *this, ranges::begin(m_base), find_next(ranges::begin(m_base)) };
+        }
+
+        constexpr auto end()
+        {
+            if constexpr (common_range<View>)
+            {
+                return iterator{ *this, ranges::end(m_base), {} };
+            }
+            else
+            {
+                return sentinel{ *this };
+            }
+        }
+
+        constexpr subrange<iterator_t<View>> find_next(iterator_t<View> it)
+        {
+            auto [first, last] = ranges::search(subrange(it, ranges::end(m_base)), m_pattern);
+            if (first != ranges::end(m_base) && ranges::empty(m_pattern))
+            {
+                ++first;
+                ++last;
+            }
+
+            return { first, last };
+        }
+    private:
+        View m_base;
+        Pattern m_pattern;
+    };
+
+    template<class R, class P>
+    split_view(R&&, P&&)->split_view<views::all_t<R>, views::all_t<P>>;
+
+    template<class R, class = enable_if_t<forward_range<R>>>
+    split_view(R&&, range_value_t<R>)
+        -> split_view<views::all_t<R>, single_view<range_value_t<R>>>;
+
+    template<class View, class Pattern, class Enable>
+    struct split_view<View, Pattern, Enable>::iterator
+    {
+        using iterator_concept = forward_iterator_tag;
+        using iterator_category = input_iterator_tag;
+        using value_type = subrange<iterator_t<View>>;
+        using difference_type = range_difference_t<View>;
+
+        iterator() = default;
+
+        constexpr iterator(split_view& parent, iterator_t<View> current, subrange<iterator_t<View>> patternSubrange)
+            : m_parent(&parent)
+            , m_current(AZStd::move(current))
+            , m_next(AZStd::move(patternSubrange))
+        {
+        }
+        constexpr iterator_t<View> base() const
+        {
+            return m_current;
+        }
+
+        constexpr value_type operator*() const
+        {
+            return { m_current, m_next.begin() };
+        }
+
+        constexpr iterator& operator++()
+        {
+            m_current = m_next.begin();
+            if (m_current != ranges::end(m_parent->m_base))
+            {
+                m_current = m_next.end();
+                if (m_current == ranges::end(m_parent->m_base))
+                {
+                    m_trailing_empty = true;
+                    m_next = { m_current, m_current };
+                }
+                else
+                {
+                    m_next = m_parent->find_next(m_current);
+                }
+            }
+            else
+            {
+                m_trailing_empty = false;
+            }
+
+            return *this;
+        }
+
+        constexpr iterator operator++(int)
+        {
+            auto tmp = *this;
+            ++(*this);
+            return tmp;
+        }
+
+        friend constexpr bool operator==(const iterator& x, const iterator& y)
+        {
+            return x.m_current == y.m_current && x.m_trailing_empty == y.m_trailing_empty;
+        }
+        friend constexpr bool operator!=(const iterator& y, const iterator& x)
+        {
+            return !operator==(x, y);
+        }
+    private:
+        //! reference to parent split_view
+        split_view<View, Pattern>* m_parent{};
+        //! iterator of the current split content of the view
+        iterator_t<View> m_current{};
+        //! The next subrange within the view that matches the pattern
+        subrange<iterator_t<View>> m_next{};
+        //! Set to true to indicate an iterator
+        //! pointing to the empty after the last pattern if the pattern is at the end of the view
+        //! For a View="a,b,c," and Pattern=",", the last iterator will point to the empty element
+        //! after the last comma. This iteator will not match the sentinel iterator to allow users
+        //! to know between the end of the View and an empty element after the last pattern
+        bool m_trailing_empty{};
+    };
+
+    template<class View, class Pattern, class Enable>
+    struct split_view<View, Pattern, Enable>::sentinel
+    {
+        sentinel() = default;
+        explicit constexpr sentinel(split_view& parent)
+            : m_end{ ranges::end(parent.m_base) }
+        {}
+
+        friend constexpr bool operator==(const iterator& x, const sentinel& y)
+        {
+            return x.m_current == y.m_end && !x.m_trailing_empty;
+        }
+        friend constexpr bool operator==(const sentinel& y, const iterator& x)
+        {
+            return operator==(x, y);
+        }
+        friend constexpr bool operator!=(const iterator& x, const sentinel& y)
+        {
+            return !operator==(x, y);
+        }
+        friend constexpr bool operator!=(const sentinel& y, const iterator& x)
+        {
+            return !operator==(x, y);
+        }
+    private:
+        sentinel_t<View> m_end;
+    };
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/subrange.h b/Code/Framework/AzCore/AzCore/std/ranges/subrange.h
new file mode 100644
index 0000000000..4e6cd053d9
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/subrange.h
@@ -0,0 +1,290 @@
+/*
+ * 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/ranges/ranges_adaptor.h>
+#include <AzCore/std/tuple.h>
+
+// Specializing tuple in std:: namespace since tuple_size and tuple_element structs
+// are alias templates inside of the AZStd:: namespace
+namespace std
+{
+    AZ_PUSH_DISABLE_WARNING(, "-Wmismatched-tags")
+    template<class I, class S, AZStd::ranges::subrange_kind K>
+    struct tuple_size<AZStd::ranges::subrange<I, S, K>>
+        : integral_constant<size_t, 2> {};
+    template<class I, class S, AZStd::ranges::subrange_kind K>
+    struct tuple_element<0, AZStd::ranges::subrange<I, S, K>>
+    {
+        using type = I;
+    };
+    template<class I, class S, AZStd::ranges::subrange_kind K>
+    struct tuple_element<1, AZStd::ranges::subrange<I, S, K>>
+    {
+        using type = S;
+    };
+    template<class I, class S, AZStd::ranges::subrange_kind K>
+    struct tuple_element<0, const AZStd::ranges::subrange<I, S, K>>
+    {
+        using type = I;
+    };
+    template<class I, class S, AZStd::ranges::subrange_kind K>
+    struct tuple_element<1, const AZStd::ranges::subrange<I, S, K>>
+    {
+        using type = S;
+    };
+    AZ_POP_DISABLE_WARNING
+}
+
+namespace AZStd::ranges
+{
+    namespace Internal
+    {
+        template <typename From, typename To>
+        /*concept*/ constexpr bool uses_nonqualification_pointer_conversion =
+            is_pointer_v<From> && is_pointer_v<To> &&
+            !convertible_to<remove_pointer_t<From>(*)[], remove_pointer_t<To>(*)[]>;
+
+        template<class From, class To>
+        /*concept*/ constexpr bool convertible_to_non_slicing =
+            convertible_to<From, To> &&
+            !uses_nonqualification_pointer_conversion<decay_t<From>, decay_t<To>>;
+
+        template<class T, class = void>
+        /*concept*/ constexpr bool pair_like = false;
+
+        template<class T>
+        /*concept*/ constexpr bool pair_like<T, enable_if_t<conjunction_v<
+            bool_constant<!is_reference_v<T>>,
+            sfinae_trigger<typename tuple_size<T>::type>,
+            bool_constant<derived_from<tuple_size<T>, integral_constant<size_t, 2>>>,
+            sfinae_trigger<
+            tuple_element_t<0, remove_const_t<T>>,
+            tuple_element_t<1, remove_const_t<T>>>,
+            bool_constant<convertible_to<decltype(AZStd::get<0>(declval<T>())), const tuple_element_t<0, T>&>>,
+            bool_constant<convertible_to<decltype(AZStd::get<1>(declval<T>())), const tuple_element_t<1, T>&>>>
+            >> = true;
+
+        template<class T, class U, class V, class = void>
+        /*concept*/ constexpr bool pair_like_convertible_from = false;
+        template<class T, class U, class V>
+        /*concept*/ constexpr bool pair_like_convertible_from<T, U, V, enable_if_t<
+            !range<T> && pair_like<T> && constructible_from<T, U, V>>> =
+            convertible_to_non_slicing<U, tuple_element_t<0, T>> &&
+            convertible_to<V, tuple_element_t<1, T>>;
+    }
+
+    template<class I, class S, subrange_kind K>
+    class subrange<I, S, K, enable_if_t<conjunction_v<
+        bool_constant<input_or_output_iterator<I>>,
+        bool_constant<sentinel_for<S, I>>,
+        bool_constant<(K == subrange_kind::sized || !sized_sentinel_for<S, I>)>>
+        >>
+        : public view_interface<subrange<I, S, K>>
+    {
+        static constexpr bool StoreSize = K == subrange_kind::sized && !sized_sentinel_for<S, I>;
+
+    public:
+        template<class I2 = I, class = enable_if_t<default_initializable<I2>>>
+        constexpr subrange() {}
+
+        template<class I2, class = enable_if_t<Internal::convertible_to_non_slicing<I2, I> && !StoreSize>>
+        constexpr subrange(I2 i, S s)
+            : m_begin(AZStd::move(i))
+            , m_end(s)
+        {
+        }
+        template<class I2, class = enable_if_t<Internal::convertible_to_non_slicing<I2, I> && K == subrange_kind::sized>>
+        constexpr subrange(I2 i, S s, make_unsigned_t<iter_difference_t<I>> n)
+            : m_begin(AZStd::move(i))
+            , m_end(s)
+        {
+            if constexpr (StoreSize)
+            {
+                m_size = n;
+            }
+        }
+
+        template<class R, class = enable_if_t<conjunction_v<
+            bool_constant<Internal::different_from<R, subrange>>,
+            bool_constant<borrowed_range<R>>,
+            bool_constant<Internal::convertible_to_non_slicing<iterator_t<R>, I>>,
+            bool_constant<convertible_to<sentinel_t<R>, S>>,
+            bool_constant<(!StoreSize || sized_range<R>)>>
+            >>
+        constexpr subrange(R&& r)
+            : m_begin{ ranges::begin(AZStd::forward<R>(r)) }
+            , m_end{ ranges::end(AZStd::forward<R>(r)) }
+        {
+            if constexpr (StoreSize)
+            {
+                m_size = ranges::size(AZStd::forward<R>(r));
+            }
+        }
+
+        template<class R, class = enable_if_t<conjunction_v<
+            bool_constant<borrowed_range<R>>,
+            bool_constant<Internal::convertible_to_non_slicing<iterator_t<R>, I>>,
+            bool_constant<convertible_to<sentinel_t<R>, S>>,
+            bool_constant<(K == subrange_kind::sized)>>
+            >>
+        constexpr subrange(R&& r, make_unsigned_t<iter_difference_t<I>> n)
+            : subrange{ ranges::begin(r), ranges::end(r), n }
+        {
+        }
+
+        template<class PairLike, class = enable_if_t<conjunction_v<
+            bool_constant<Internal::different_from<PairLike, subrange>>,
+            bool_constant<Internal::pair_like_convertible_from<PairLike, const I&, const S&>>>
+            >>
+        constexpr operator PairLike() const
+        {
+            return PairLike{ m_begin, m_end };
+        }
+
+        template<bool Enable = copyable<I>, class = enable_if_t<Enable>>
+        constexpr I begin() const
+        {
+            return m_begin;
+        }
+        template<bool Enable = !copyable<I>, class = enable_if_t<Enable>>
+        [[nodiscard]] constexpr I begin()
+        {
+            return AZStd::move(m_begin);
+        }
+        constexpr S end() const
+        {
+            return m_end;
+        }
+
+        constexpr bool empty() const
+        {
+            return m_begin == m_end;
+        }
+        template<bool Enable = (K == subrange_kind::sized), class = enable_if_t<Enable>>
+        constexpr make_unsigned_t<iter_difference_t<I>> size() const
+        {
+            if constexpr (StoreSize)
+            {
+                return m_size;
+            }
+            else
+            {
+                using unsigned_difference_type = make_unsigned_t<iter_difference_t<I>>;
+                return static_cast<unsigned_difference_type>(m_end - m_begin);
+            }
+        }
+
+        template<bool Enable = forward_iterator<I>, class = enable_if_t<Enable>>
+        [[nodiscard]] constexpr subrange next(iter_difference_t<I> n = 1) const&
+        {
+            auto tmp = *this;
+            tmp.advance(n);
+            return tmp;
+        }
+        [[nodiscard]] constexpr subrange next(iter_difference_t<I> n = 1)&&
+        {
+            advance(n);
+            return AZStd::move(*this);
+        }
+        template<bool Enable = bidirectional_iterator<I>, class = enable_if_t<Enable>>
+        [[nodiscard]] constexpr subrange prev(iter_difference_t<I> n = 1) const
+        {
+            auto tmp = *this;
+            tmp.advance(-n);
+            return tmp;
+        }
+        constexpr subrange& advance(iter_difference_t<I> n)
+        {
+            using unsigned_difference_type = AZStd::make_unsigned_t<iter_difference_t<I>>;
+            if constexpr (bidirectional_iterator<I>)
+            {
+                if (n < 0)
+                {
+                    ranges::advance(m_begin, n);
+                    if constexpr (StoreSize)
+                    {
+                        m_size += static_cast<unsigned_difference_type>(-n);
+                    }
+                    return *this;
+                }
+            }
+
+            auto actualAdvanceDist = n - ranges::advance(m_begin, n, m_end);
+            if constexpr (StoreSize)
+            {
+                m_size -= static_cast<unsigned_difference_type>(actualAdvanceDist);
+            }
+
+            return *this;
+        }
+
+    private:
+        I m_begin{};
+        S m_end{};
+
+        // Size member will not count against the size of the class when using no_unique_address
+        struct SizeNotStored
+        {
+            constexpr SizeNotStored() noexcept = default;
+        };
+        using size_type = AZStd::conditional_t<StoreSize, make_unsigned_t<iter_difference_t<I>>, SizeNotStored>;
+        AZ_NO_UNIQUE_ADDRESS size_type m_size{};
+    };
+
+    template<class I, class S, class = enable_if_t<input_or_output_iterator<I> && sentinel_for<S, I>>>
+    subrange(I, S) -> subrange<I, S>;
+
+    template<class I, class S, class = enable_if_t<input_or_output_iterator<I>&& sentinel_for<S, I>>>
+    subrange(I, S, make_unsigned_t<iter_difference_t<I>>) -> subrange<I, S, subrange_kind::sized>;
+
+    template<class R, class = enable_if_t<borrowed_range<R>> >
+    subrange(R&&) -> subrange<iterator_t<R>, sentinel_t<R>,
+        (sized_range<R> || sized_sentinel_for<sentinel_t<R>, iterator_t<R>>)
+        ? subrange_kind::sized : subrange_kind::unsized>;
+
+    template<class R, class = enable_if_t<borrowed_range<R>> >
+    subrange(R&&, make_unsigned_t<range_difference_t<R>>) ->
+        subrange<iterator_t<R>, sentinel_t<R>, subrange_kind::sized>;
+
+    template<size_t N, class I, class S, subrange_kind K, class = enable_if_t<((N == 0 && copyable<I>) || N == 1)>>
+    constexpr auto get(const subrange<I, S, K>& r)
+    {
+        if constexpr (N == 0)
+        {
+            return r.begin();
+        }
+        else
+        {
+            return r.end();
+        }
+    }
+
+    template<size_t N, class I, class S, subrange_kind K, class = enable_if_t<(N < 2)>>
+    constexpr auto get(subrange<I, S, K>&& r)
+    {
+        if constexpr (N == 0)
+        {
+            return r.begin();
+        }
+        else
+        {
+            return r.end();
+        }
+    }
+
+
+    template<class I, class S, subrange_kind K>
+    inline constexpr bool enable_borrowed_range<subrange<I, S, K>> = true;
+
+}
+
+namespace AZStd
+{
+    using ranges::get;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/swap.h b/Code/Framework/AzCore/AzCore/std/ranges/swap.h
new file mode 100644
index 0000000000..0f7e3b49fd
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/swap.h
@@ -0,0 +1,116 @@
+/*
+ * 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/concepts/concepts_assignable.h>
+#include <AzCore/std/concepts/concepts_constructible.h>
+#include <AzCore/std/typetraits/conjunction.h>
+#include <AzCore/std/typetraits/disjunction.h>
+#include <AzCore/std/typetraits/extent.h>
+#include <AzCore/std/typetraits/integral_constant.h>
+#include <AzCore/std/typetraits/is_assignable.h>
+#include <AzCore/std/typetraits/is_array.h>
+#include <AzCore/std/typetraits/is_class.h>
+#include <AzCore/std/typetraits/is_enum.h>
+#include <AzCore/std/typetraits/is_void.h>
+#include <AzCore/std/typetraits/remove_cvref.h>
+#include <AzCore/std/typetraits/void_t.h>
+#include <AzCore/std/utility/move.h>
+#include <AzCore/std/utility/declval.h>
+
+
+namespace AZStd
+{
+    // Bring std utility functions into AZStd namespace
+    using std::forward;
+}
+
+namespace AZStd::ranges::Internal
+{
+    template <class T, class U, class = void>
+    constexpr bool is_class_or_enum_with_swap_adl = false;
+    template <class T, class U>
+    constexpr bool is_class_or_enum_with_swap_adl<T, U, enable_if_t<conjunction_v<
+        disjunction<
+            disjunction<is_class<remove_cvref_t<T>>, is_enum<remove_cvref_t<T>>>,
+            disjunction<is_class<remove_cvref_t<U>>, is_enum<remove_cvref_t<U>>>>,
+        is_void<void_t<decltype(swap(declval<T&>(), declval<U&>()))>>
+        >>> = true;
+
+    template <class T>
+    void swap(T&, T&) = delete;
+
+    struct swap_fn
+    {
+        template <class T, class U>
+        constexpr auto operator()(T&& t, U&& u) const noexcept(noexcept(swap(AZStd::forward<T>(t), AZStd::forward<U>(u))))
+            ->enable_if_t<is_class_or_enum_with_swap_adl<T, U>>
+        {
+            swap(AZStd::forward<T>(t), AZStd::forward<U>(u));
+        }
+
+        // ranges::swap customization point https://eel.is/c++draft/concepts#concept.swappable-2.2
+        // Implemented in ranges.h as to prevent circular dependency.
+        // ranges::swap_ranges depends on the range concepts that can't be defined here
+        template <class T, class U>
+        constexpr auto operator()(T&& t, U&& u) const noexcept(noexcept((*this)(*t, *u)))
+            ->enable_if_t<conjunction_v<
+            bool_constant<!is_class_or_enum_with_swap_adl<T, U>>,
+            is_array<T>,
+            is_array<U>,
+            bool_constant<extent_v<T> == extent_v<U>>
+            >>;
+
+        template <class T>
+        constexpr auto operator()(T& t1, T& t2) const noexcept(noexcept(is_nothrow_move_constructible_v<T> && is_nothrow_move_assignable_v<T>))
+            ->enable_if_t<conjunction_v<bool_constant<move_constructible<T>>, bool_constant<assignable_from<T&, T>> >>
+        {
+            auto temp(AZStd::move(t1));
+            t1 = AZStd::move(t2);
+            t2 = AZStd::move(temp);
+        }
+    };
+}
+
+namespace AZStd::ranges
+{
+    inline namespace customization_point_object
+    {
+        inline constexpr auto swap = Internal::swap_fn{};
+    }
+}
+
+namespace AZStd::Internal
+{
+    template <class T, class = void>
+    constexpr bool swappable_impl = false;
+    template <class T>
+    constexpr bool swappable_impl<T, void_t<decltype(AZStd::ranges::swap(declval<T&>(), declval<T&>()))>> = true;
+
+    template <class T, class U, class = void>
+    constexpr bool swappable_with_impl = false;
+    template <class T, class U>
+    constexpr bool swappable_with_impl<T, U, enable_if_t<conjunction_v<
+        bool_constant<common_reference_with<T, U>>,
+        is_void<void_t<
+        decltype(AZStd::ranges::swap(declval<T&>(), declval<T&>())),
+        decltype(AZStd::ranges::swap(declval<U&>(), declval<U&>())),
+        decltype(AZStd::ranges::swap(declval<T&>(), declval<U&>())),
+        decltype(AZStd::ranges::swap(declval<U&>(), declval<T&>()))>> >>> = true;
+}
+
+namespace AZStd
+{
+    template<class T>
+    /*concept*/ constexpr bool swappable = Internal::swappable_impl<T>;
+
+    template<class T, class U>
+    /*concept*/ constexpr bool swappable_with = Internal::swappable_with_impl<T, U>;
+}
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/zip_view.h b/Code/Framework/AzCore/AzCore/std/ranges/zip_view.h
new file mode 100644
index 0000000000..4e67ad83a0
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/zip_view.h
@@ -0,0 +1,395 @@
+/*
+ * 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/ranges/all_view.h>
+#include <AzCore/std/ranges/empty_view.h>
+#include <AzCore/std/ranges/ranges_algorithm.h>
+#include <AzCore/std/tuple.h>
+
+namespace AZStd::ranges
+{
+    template<class... Views>
+    class zip_view;
+
+    template<class... Views>
+    inline constexpr bool enable_borrowed_range<zip_view<Views...>> = (enable_borrowed_range<Views> && ...);
+
+    // views::zip customization point
+    namespace views
+    {
+        namespace Internal
+        {
+            struct zip_view_fn
+            {
+                template <class... Views>
+                constexpr auto operator()(Views&&... views) const
+                {
+                    if constexpr (sizeof...(Views) == 0)
+                    {
+                        return views::empty<tuple<>>;
+                    }
+                    else
+                    {
+                        return zip_view<views::all_t<decltype((declval<Views>()))>...>(AZStd::forward<Views>(views)...);
+                    }
+                }
+
+            };
+        }
+        inline namespace customization_point_object
+        {
+            constexpr Internal::zip_view_fn zip{};
+        }
+    }
+
+    namespace ZipViewInternal
+    {
+        template<class... Rs>
+        /*concept*/ constexpr bool zip_is_common = (sizeof...(Rs) == 1 && (common_range<Rs> && ...)) ||
+            (!(bidirectional_range<Rs> && ...) && (common_range<Rs> && ...)) ||
+            ((random_access_range<Rs> && ...) && (sized_range<Rs> && ...));
+
+        template<class... Ts>
+        using tuple_or_pair = tuple<Ts...>;
+
+        template<class F, class Tuple>
+        constexpr auto tuple_transform(F&& f, Tuple&& tuple)
+        {
+            auto TransformToResultTuple = [&](auto&&... elements)
+            {
+                return tuple_or_pair<invoke_result_t<F&, decltype(elements)>...>(
+                    AZStd::invoke(f, AZStd::forward<decltype(elements)>(elements))...);
+            };
+            return AZStd::apply(AZStd::move(TransformToResultTuple), AZStd::forward<Tuple>(tuple));
+        }
+
+        template<class F, class Tuple>
+        constexpr void tuple_for_each(F&& f, Tuple&& tuple)
+        {
+            auto InvokeTupleElement = [&](auto&&... elements)
+            {
+                (AZStd::invoke(f, AZStd::forward<decltype(elements)>(elements)), ...);
+            };
+            AZStd::apply(AZStd::move(InvokeTupleElement), AZStd::forward<Tuple>(tuple));
+        }
+
+        template<class F, class Tuple1, class Tuple2, size_t... Indices>
+        constexpr decltype(auto) tuple_zip(F&& f, AZStd::index_sequence<Indices...>,
+            Tuple1&& tuple1, Tuple2&& tuple2)
+        {
+            (AZStd::invoke(AZStd::forward<F>(f), AZStd::get<Indices>(tuple1), AZStd::get<Indices>(tuple2)), ...);
+        }
+    }
+
+    template<class... Views>
+    class zip_view
+        : public enable_if_t<conjunction_v<
+        bool_constant<(sizeof...(Views) > 0)>,
+        bool_constant<input_range<Views>>...,
+        bool_constant<view<Views>>...
+    >, view_interface<zip_view<Views...>>>
+    {
+        // [range.zip.iterator], class template zip_view::iterator
+        template<bool>
+        class iterator;
+
+        // [range.zip.sentinel], class template zip_view::sentinel
+        template<bool>
+        class sentinel; // exposition only
+
+    public:
+        zip_view() = default;
+        constexpr explicit zip_view(Views... views);
+
+        template<bool Enable = !conjunction_v<bool_constant<Internal::simple_view<Views>>...>, class = enable_if_t<Enable>>
+        constexpr auto begin();
+        template<bool Enable = conjunction_v<bool_constant<range<const Views>>...>, class = enable_if_t<Enable>>
+        constexpr auto begin() const;
+
+        template<bool Enable = !conjunction_v<bool_constant<Internal::simple_view<Views>>...>, class = enable_if_t<Enable>>
+        constexpr auto end();
+        template<bool Enable = conjunction_v<bool_constant<range<const Views>>...>, class = enable_if_t<Enable>>
+        constexpr auto end() const;
+
+        template<bool Enable = conjunction_v<bool_constant<sized_range<Views>>...>, class = enable_if_t<Enable>>
+        constexpr auto size();
+        template<bool Enable = conjunction_v<bool_constant<sized_range<const Views>>...>, class = enable_if_t<Enable>>
+        constexpr auto size() const;
+
+    private:
+        tuple<Views...> m_views;
+    };
+
+    template<class... Rs>
+    zip_view(Rs&&...)->zip_view<views::all_t<Rs>...>;
+
+    namespace ZipViewInternal
+    {
+        template<bool Const, class... Views>
+        /*concept*/ constexpr bool all_random_access = (random_access_range<::AZStd::ranges::Internal::maybe_const<Const, Views>>&&...);
+        template<bool Const, class... Views>
+        /*concept*/ constexpr bool all_bidirectional = (bidirectional_range<::AZStd::ranges::Internal::maybe_const<Const, Views>>&&...);
+        template<bool Const, class... Views>
+        /*concept*/ constexpr bool all_forward = (forward_range<::AZStd::ranges::Internal::maybe_const<Const, Views>>&&...);
+
+        struct requirements_fulfilled {};
+    }
+
+    template<class... Views>
+    template<bool Const>
+    class zip_view<Views...>::iterator
+        : public enable_if_t<(conjunction_v<
+            bool_constant<(sizeof...(Views) > 0)>,
+            bool_constant<input_range<Views>>...,
+            bool_constant<view<Views>>...>),
+        ZipViewInternal::requirements_fulfilled>
+    {
+        friend class zip_view<Views...>;
+        template<bool>
+        friend class zip_view<Views...>::sentinel;
+        constexpr explicit iterator(ZipViewInternal::tuple_or_pair<iterator_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>...>);
+    public:
+        using iterator_category = input_iterator_tag; // not always present
+        using iterator_concept = conditional_t<ZipViewInternal::all_random_access<Const, Views...>, random_access_iterator_tag,
+            conditional_t<ZipViewInternal::all_bidirectional<Const, Views...>, bidirectional_iterator_tag,
+            conditional_t<ZipViewInternal::all_forward<Const, Views...>, forward_iterator_tag, input_iterator_tag>>>;
+        using value_type = ZipViewInternal::tuple_or_pair<range_value_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>...>;
+        using difference_type = common_type_t<range_difference_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>...>;
+
+    private:
+        constexpr auto view_iterator_to_value_tuple(difference_type n) const;
+        template<size_t... Indices>
+        static constexpr auto any_iterator_equal(const iterator& x, const iterator& y, AZStd::index_sequence<Indices...>);
+        template<size_t... Indices>
+        static constexpr auto min_distance_in_views(const iterator& x, const iterator& y, AZStd::index_sequence<Indices...>);
+    public:
+
+        iterator() = default;
+        template<bool Enable = Const && conjunction_v<
+            bool_constant<convertible_to<iterator_t<Views>, iterator_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>>>...>,
+            class = enable_if_t<Enable>>
+        constexpr iterator(iterator<!Const> other);
+
+        constexpr auto operator*() const;
+        constexpr iterator& operator++();
+        constexpr decltype(auto) operator++(int);
+
+        template<bool Enable = ZipViewInternal::all_bidirectional<Const, Views...>, class = enable_if_t<Enable>>
+        constexpr auto operator--()->iterator&;
+        template<bool Enable = ZipViewInternal::all_bidirectional<Const, Views...>, class = enable_if_t<Enable>>
+        constexpr auto operator--(int)->iterator;
+
+        template<bool Enable = ZipViewInternal::all_random_access<Const, Views...>, class = enable_if_t<Enable>>
+        constexpr auto operator+=(difference_type x)->iterator&;
+        template<bool Enable = ZipViewInternal::all_random_access<Const, Views...>, class = enable_if_t<Enable>>
+        constexpr auto operator-=(difference_type x)->iterator&;
+
+        template<bool Enable = ZipViewInternal::all_random_access<Const, Views...>, class = enable_if_t<Enable>>
+        constexpr auto operator[](difference_type n) const;
+
+        // Out-of-line defintions with these friend functions are possible, but quite a mess signature wise
+        // that is why the defintions are inline, instead of
+        // template<bool Const, class... Views>
+        // constexpr auto operator==(const typename zip_views<Views...>::template iterator<Const>& x,
+        //     const typename zip_views<Views...>::template iterator<Const>& y){}
+        template<bool Enable = conjunction_v<bool_constant<equality_comparable<iterator_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>>>...>,
+            class = enable_if_t<Enable>>
+        friend constexpr auto operator==(const iterator& x, const iterator& y) -> bool
+        {
+            if constexpr (ZipViewInternal::all_bidirectional<Const, Views...>)
+            {
+                return x.m_current == y.m_current;
+            }
+            else
+            {
+                // Returns true if it at least one of the iterator views are equal
+                return any_iterator_equal(x, y, AZStd::index_sequence_for<Views...>{});
+            }
+        }
+
+        template<bool Enable = conjunction_v<bool_constant<equality_comparable<iterator_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>>>...>,
+            class = enable_if_t<Enable>>
+        friend constexpr auto operator!=(const iterator& x, const iterator& y) -> bool
+        {
+            return !(x == y);
+        }
+
+        template<bool Enable = ZipViewInternal::all_random_access<Const, Views...>, class = enable_if_t<Enable>>
+        friend constexpr auto operator<(const iterator& x, const iterator& y) -> bool
+        {
+            return x.m_current < y.m_current;
+        }
+        template<bool Enable = ZipViewInternal::all_random_access<Const, Views...>, class = enable_if_t<Enable>>
+        friend constexpr auto operator>(const iterator& x, const iterator& y) -> bool
+        {
+            return y.m_current < x.m_current;
+        }
+        template<bool Enable = ZipViewInternal::all_random_access<Const, Views...>, class = enable_if_t<Enable>>
+        friend constexpr auto operator<=(const iterator& x, const iterator& y) -> bool
+        {
+            return !(y.m_current < x.m_current);
+        }
+        template<bool Enable = ZipViewInternal::all_random_access<Const, Views...>, class = enable_if_t<Enable>>
+        friend constexpr auto operator>=(const iterator& x, const iterator& y) -> bool
+        {
+            return !(x.m_current < y.m_current);
+        }
+        /* Requires C++20 compiler support
+        friend constexpr auto operator<=>(const iterator& x, const iterator& y) requires ZipViewInternal::all_random_access<Const, Views...> &&
+            (three_way_comparable<iterator_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>> && ...);
+        */
+
+        template<bool Enable = ZipViewInternal::all_random_access<Const, Views...>, class = enable_if_t<Enable>>
+        friend constexpr auto operator+(const iterator& i, difference_type n) -> iterator
+        {
+            auto r = i;
+            r += n;
+            return r;
+        }
+        template<bool Enable = ZipViewInternal::all_random_access<Const, Views...>, class = enable_if_t<Enable>>
+        friend constexpr auto operator+(difference_type n, const iterator& i) -> iterator
+        {
+            auto r = i;
+            r += n;
+            return r;
+        }
+        template<bool Enable = ZipViewInternal::all_random_access<Const, Views...>, class = enable_if_t<Enable>>
+        friend constexpr auto operator-(const iterator& i, difference_type n) -> iterator
+        {
+            auto r = i;
+            r -= n;
+            return r;
+        }
+        template<bool Enable = conjunction_v<
+            bool_constant<sized_sentinel_for<
+            iterator_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>,
+            iterator_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>>>...
+            >, class = enable_if_t<Enable>>
+            friend constexpr auto operator-(const iterator& x, const iterator& y) -> difference_type
+        {
+            return min_distance_in_views(x, y, AZStd::index_sequence_for<Views...>{});
+        }
+
+        // customization of iter_move and iter_swap
+        friend constexpr auto iter_move(
+            iterator& i) noexcept(
+            noexcept(ZipViewInternal::tuple_transform(ranges::iter_move, i.m_current)))
+        {
+            return ZipViewInternal::tuple_transform(ranges::iter_move, i.m_current);
+        }
+
+        friend constexpr auto iter_swap(
+            iterator& l,
+            iterator& r) noexcept
+        {
+            static_assert(!conjunction_v<
+                bool_constant<indirectly_swappable<iterator_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>>>...>);
+
+            ZipViewInternal::tuple_zip(ranges::iter_swap, l.m_current, r.m_current,
+                AZStd::index_sequence_for<Views...>{});
+        }
+
+    private:
+        ZipViewInternal::tuple_or_pair<iterator_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>...> m_current;
+    };
+
+    // sentinel type for iterator
+    template<class... Views>
+    template<bool Const>
+    class zip_view<Views...>::sentinel
+        : public enable_if_t<conjunction_v<
+        bool_constant<(sizeof...(Views) > 0)>,
+        bool_constant<input_range<Views>>...,
+        bool_constant<view<Views>>...
+            >, ZipViewInternal::requirements_fulfilled>
+    {
+        friend class zip_view<Views...>;
+        constexpr explicit sentinel(ZipViewInternal::tuple_or_pair<sentinel_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>...> end);
+
+        template<bool OtherConst, size_t... Indices>
+        static constexpr auto min_distance_between_view_iterators(const iterator<OtherConst>& x,
+            const sentinel& y, AZStd::index_sequence<Indices...>) ->
+            common_type_t<range_difference_t<::AZStd::ranges::Internal::maybe_const<OtherConst, Views>>...>;
+
+        // On MSVC The friend functions are can only access the sentinel struct members
+        // The iterator struct which is a friend of the sentinel struct is NOT a friend
+        // of the friend functions
+        // So a shim is added to provide access to the iterator m_current member
+        template<bool OtherConst>
+        static constexpr auto iterator_accessor(const iterator<OtherConst>& it);
+    public:
+        sentinel() = default;
+        template<bool Enable = Const && conjunction_v<
+            bool_constant<convertible_to<sentinel_t<Views>, sentinel_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>>>...>,
+            class = enable_if_t<Enable>>
+        constexpr sentinel(sentinel<!Const> i);
+
+        template<bool OtherConst, class = enable_if_t<conjunction_v<
+            bool_constant<sentinel_for<
+            sentinel_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>,
+            iterator_t<::AZStd::ranges::Internal::maybe_const<OtherConst, Views>>>>...>
+            >>
+        friend constexpr auto operator==(const iterator<OtherConst>&x, const sentinel & y) -> bool
+        {
+            // Tracks if any iterator of the Views is equal to a sentinel of the views
+            bool anyIteratorEqual = false;
+            auto CompareIterator = [&anyIteratorEqual](auto&& lhs, auto&& rhs)
+            {
+                anyIteratorEqual = anyIteratorEqual || AZStd::forward<decltype(lhs)>(lhs) == AZStd::forward<decltype(rhs)>(rhs);
+            };
+            ZipViewInternal::tuple_zip(AZStd::move(CompareIterator), AZStd::index_sequence_for<Views...>{},
+                iterator_accessor(x), y.m_end);
+
+            return anyIteratorEqual;
+        }
+
+        template<bool OtherConst>
+        friend constexpr auto operator==(const sentinel & y, const iterator<OtherConst>&x) -> bool
+        {
+            return x == y;
+        }
+        template<bool OtherConst>
+        friend constexpr auto operator!=(const iterator<OtherConst>&x, const sentinel & y) -> bool
+        {
+            return !(x == y);
+        }
+        template<bool OtherConst>
+        friend constexpr auto operator!=(const sentinel & y, const iterator<OtherConst>&x) -> bool
+        {
+            return !(x == y);
+        }
+
+        template<bool OtherConst, class = enable_if_t<conjunction_v<
+            bool_constant<sentinel_for<
+            sentinel_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>,
+            iterator_t<::AZStd::ranges::Internal::maybe_const<OtherConst, Views>>>>...>
+            >>
+        friend constexpr auto operator-(const iterator<OtherConst>&x, const sentinel & y) ->
+            common_type_t<range_difference_t<::AZStd::ranges::Internal::maybe_const<OtherConst, Views>>...>
+        {
+            return min_distance_between_view_iterators(x, y, AZStd::index_sequence_for<Views...>{});
+        }
+
+        template<bool OtherConst, class = enable_if_t<conjunction_v<
+            bool_constant<sentinel_for<
+            sentinel_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>,
+            iterator_t<::AZStd::ranges::Internal::maybe_const<OtherConst, Views>>>>...>
+            >>
+        friend constexpr auto operator-(const sentinel & y, const iterator<OtherConst>&x) ->
+            common_type_t<range_difference_t<::AZStd::ranges::Internal::maybe_const<OtherConst, Views>>...>
+        {
+            return -(x - y);
+        }
+
+    private:
+        ZipViewInternal::tuple_or_pair<sentinel_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>...> m_end;
+    };
+} // namespace AZStd::ranges
+
+#include <AzCore/std/ranges/zip_view.inl>
diff --git a/Code/Framework/AzCore/AzCore/std/ranges/zip_view.inl b/Code/Framework/AzCore/AzCore/std/ranges/zip_view.inl
new file mode 100644
index 0000000000..c41b1cb54a
--- /dev/null
+++ b/Code/Framework/AzCore/AzCore/std/ranges/zip_view.inl
@@ -0,0 +1,308 @@
+/*
+ * 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/ranges/all_view.h>
+#include <AzCore/std/ranges/ranges_algorithm.h>
+#include <AzCore/std/tuple.h>
+
+namespace AZStd::ranges
+{
+    // public zip_view functions
+    template<class... Views>
+    constexpr zip_view<Views...>::zip_view(Views... views)
+        : m_views{ AZStd::move(views)... }
+    {
+    }
+
+    template<class... Views>
+    template<bool, class>
+    constexpr auto zip_view<Views...>::begin()
+    {
+        return iterator<false>(ZipViewInternal::tuple_transform(ranges::begin, m_views));
+    }
+    template<class... Views>
+    template<bool, class>
+    constexpr auto zip_view<Views...>::begin() const
+    {
+        return iterator<true>(ZipViewInternal::tuple_transform(ranges::begin, m_views));
+    }
+
+    template<class... Views>
+    template<bool, class>
+    constexpr auto zip_view<Views...>::end()
+    {
+        if constexpr (!ZipViewInternal::zip_is_common<Views...>)
+        {
+            return sentinel<false>(ZipViewInternal::tuple_transform(ranges::end, m_views));
+        }
+        else if constexpr ((random_access_range<Views> && ...))
+        {
+            return begin() + iter_difference_t<iterator<false>>(size());
+        }
+        else
+        {
+            return iterator<false>(ZipViewInternal::tuple_transform(ranges::end, m_views));
+        }
+    }
+    template<class... Views>
+    template<bool, class>
+    constexpr auto zip_view<Views...>::end() const
+    {
+        if constexpr (!ZipViewInternal::zip_is_common<const Views...>)
+        {
+            return sentinel<true>(ZipViewInternal::tuple_transform(ranges::end, m_views));
+        }
+        else if constexpr ((random_access_range<const Views> && ...))
+        {
+            return begin() + iter_difference_t<iterator<true>>(size());
+        }
+        else
+        {
+            return iterator<true>(ZipViewInternal::tuple_transform(ranges::end, m_views));
+        }
+    }
+
+    template<class... Views>
+    template<bool, class>
+    constexpr auto zip_view<Views...>::size()
+    {
+        auto GetSizeForViews = [](auto... sizes)
+        {
+            using CommonType = make_unsigned_t<common_type_t<decltype(sizes)...>>;
+            return ranges::min({ CommonType(sizes)... });
+        };
+        return AZStd::apply(AZStd::move(GetSizeForViews), ZipViewInternal::tuple_transform(ranges::size, m_views));
+    }
+    template<class... Views>
+    template<bool, class>
+    constexpr auto zip_view<Views...>::size() const
+    {
+        auto GetSizeForViews = [](auto... sizes)
+        {
+            using CommonType = make_unsigned_t<common_type_t<decltype(sizes)...>>;
+            return ranges::min({ CommonType(sizes)... });
+        };
+        return AZStd::apply(AZStd::move(GetSizeForViews), ZipViewInternal::tuple_transform(ranges::size, m_views));
+    }
+
+
+    // public zip_view::iterator functions
+    template<class... Views>
+    template<bool Const>
+    template<bool, class>
+    constexpr zip_view<Views...>::iterator<Const>::iterator(iterator<!Const> other)
+        : m_current(AZStd::move(other.m_current))
+    {
+    }
+
+    template<class... Views>
+    template<bool Const>
+    constexpr auto zip_view<Views...>::iterator<Const>::operator*() const
+    {
+        auto TransformToReference = [](auto& i) -> decltype(auto)
+        {
+            return *i;
+        };
+        return ZipViewInternal::tuple_transform(AZStd::move(TransformToReference), m_current);
+    }
+    template<class... Views>
+    template<bool Const>
+    constexpr auto zip_view<Views...>::iterator<Const>::operator++() -> iterator&
+    {
+        auto PreIncrementIterator = [](auto& i)
+        {
+            ++i;
+        };
+        ZipViewInternal::tuple_for_each(AZStd::move(PreIncrementIterator), m_current);
+        return *this;
+    }
+
+    template<class... Views>
+    template<bool Const>
+    constexpr decltype(auto) zip_view<Views...>::iterator<Const>::operator++(int)
+    {
+        if constexpr (ZipViewInternal::all_forward<Const, Views...>)
+        {
+            auto tmp = *this;
+            ++(*this);
+            return tmp;
+        }
+        else
+        {
+            ++(*this);
+        }
+    }
+
+    template<class... Views>
+    template<bool Const>
+    template<bool, class>
+    constexpr auto zip_view<Views...>::iterator<Const>::operator--() -> iterator&
+    {
+        auto PreDecrementIterator = [](auto& i)
+        {
+            --i;
+        };
+        ZipViewInternal::tuple_for_each(AZStd::move(PreDecrementIterator), m_current);
+        return *this;
+    }
+    template<class... Views>
+    template<bool Const>
+    template<bool, class>
+    constexpr auto zip_view<Views...>::iterator<Const>::operator--(int) -> iterator
+    {
+        auto tmp = *this;
+        --* this;
+        return tmp;
+    }
+
+    template<class... Views>
+    template<bool Const>
+    template<bool, class>
+    constexpr auto zip_view<Views...>::iterator<Const>::operator+=(difference_type x) -> iterator&
+    {
+        auto AddIterator = [&](auto& i)
+        {
+            i += iter_difference_t<decltype(i)>(x);
+        };
+        ZipViewInternal::tuple_for_each(AZStd::move(AddIterator), m_current);
+        return *this;
+    }
+    template<class... Views>
+    template<bool Const>
+    template<bool, class>
+    constexpr auto zip_view<Views...>::iterator<Const>::operator-=(difference_type x) -> iterator&
+    {
+        auto AddIterator = [&](auto& i)
+        {
+            i -= iter_difference_t<decltype(i)>(x);
+        };
+        ZipViewInternal::tuple_for_each(AZStd::move(AddIterator), m_current);
+        return *this;
+    }
+
+    template<class... Views>
+    template<bool Const>
+    template<bool, class>
+    constexpr auto zip_view<Views...>::iterator<Const>::operator[](difference_type n) const
+    {
+        return view_iterator_to_value_tuple(n);
+    }
+
+    // private zip_view::iterator functions
+    template<class... Views>
+    template<bool Const>
+    constexpr zip_view<Views...>::iterator<Const>::iterator(
+        ZipViewInternal::tuple_or_pair<iterator_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>...> current)
+        : m_current(AZStd::move(current))
+    {
+    }
+
+    template<class... Views>
+    template<bool Const>
+    constexpr auto zip_view<Views...>::iterator<Const>::view_iterator_to_value_tuple(difference_type n) const
+    {
+        auto TransformToValue = [&](auto& i) -> decltype(auto)
+        {
+            using I = decltype(i);
+            return i[iter_difference_t<I>(n)];
+        };
+        return ZipViewInternal::tuple_transform(AZStd::move(TransformToValue), m_current);
+    }
+
+    template<class... Views>
+    template<bool Const>
+    template<size_t... Indices>
+    constexpr auto zip_view<Views...>::iterator<Const>::any_iterator_equal(const iterator& x, const iterator& y,
+        AZStd::index_sequence<Indices...>)
+    {
+        return (... || (AZStd::get<Indices>(x.m_current) == AZStd::get<Indices>(y.m_current)));
+    }
+
+    template<class... Views>
+    template<bool Const>
+    template<size_t... Indices>
+    constexpr auto zip_view<Views...>::iterator<Const>::min_distance_in_views(const iterator& x, const iterator& y,
+        AZStd::index_sequence<Indices...>)
+    {
+        AZStd::array iterDistances{
+            ((AZStd::get<Indices>(x.m_current) - AZStd::get<Indices>(y.m_current)), ...) };
+        if (iterDistances.empty())
+        {
+            return difference_type{};
+        }
+
+        auto first = iterDistances.begin();
+        difference_type minDistance = *first++;
+        auto last = iterDistances.end();
+        for (; first != last; ++first)
+        {
+            difference_type absMinDistance = minDistance < 0 ? -minDistance : minDistance;
+            difference_type absDistance = *first < 0 ? -*first : *first;
+            minDistance = absDistance < absMinDistance ? *first : minDistance;
+        }
+
+        return minDistance;
+    }
+
+    // private zip_view::sentinel functions
+    template<class... Views>
+    template<bool Const>
+    constexpr zip_view<Views...>::sentinel<Const>::sentinel(
+        ZipViewInternal::tuple_or_pair<sentinel_t<::AZStd::ranges::Internal::maybe_const<Const, Views>>...> end)
+        : m_end(end)
+    {
+    }
+
+    template<class... Views>
+    template<bool Const>
+    template<bool, class>
+    constexpr zip_view<Views...>::sentinel<Const>::sentinel(sentinel<!Const> other)
+        : m_end(AZStd::move(other.m_end))
+    {
+    }
+
+    template<class... Views>
+    template<bool Const>
+    template<bool OtherConst, size_t... Indices>
+    constexpr auto zip_view<Views...>::sentinel<Const>::min_distance_between_view_iterators(
+        const typename zip_view<Views...>::template iterator<OtherConst>& x,
+        const typename zip_view<Views...>::template sentinel<Const>& y,
+        AZStd::index_sequence<Indices...>) ->
+        common_type_t<range_difference_t<::AZStd::ranges::Internal::maybe_const<OtherConst, Views>>...>
+    {
+        using difference_type = common_type_t<range_difference_t<::AZStd::ranges::Internal::maybe_const<OtherConst, Views>>...>;
+        // Tracks if any iterator of the Views is equal to a sentinel of the views
+        AZStd::array iterDistances{
+            ((AZStd::get<Indices>(x.m_current) - AZStd::get<Indices>(y.m_end)), ...) };
+        if (iterDistances.empty())
+        {
+            return difference_type{};
+        }
+
+        auto first = iterDistances.begin();
+        difference_type minDistance = *first++;
+        auto last = iterDistances.end();
+        for (; first != last; ++first)
+        {
+            difference_type absMinDistance = minDistance < 0 ? -minDistance : minDistance;
+            difference_type absDistance = *first < 0 ? -*first : *first;
+            minDistance = absDistance < absMinDistance ? *first : minDistance;
+        }
+
+        return minDistance;
+    }
+    
+    template<class... Views>
+    template<bool Const>
+    template<bool OtherConst>
+    constexpr auto zip_view<Views...>::sentinel<Const>::iterator_accessor(const iterator<OtherConst>& it)
+    {
+        return it.m_current;
+    }
+} // namespace AZStd::ranges
diff --git a/Code/Framework/AzCore/AzCore/std/string/string_view.h b/Code/Framework/AzCore/AzCore/std/string/string_view.h
index daa00d98d3..af1482b05b 100644
--- a/Code/Framework/AzCore/AzCore/std/string/string_view.h
+++ b/Code/Framework/AzCore/AzCore/std/string/string_view.h
@@ -603,6 +603,23 @@ namespace AZStd
     template <class Element, class Traits = AZStd::char_traits<Element>>
     class basic_string_view
     {
+        template <class R, class = void>
+        static constexpr bool has_operator_basic_string_view = false;
+        template <class R>
+        static constexpr bool has_operator_basic_string_view<R, void_t<
+            decltype(declval<remove_cvref_t<R>>().operator basic_string_view<Element, Traits>())
+            >> = true;
+
+        // If the range has a traits_type element, it must match
+        template <class R, class = void>
+        static constexpr bool range_trait_type_matches = true;
+        template <class R>
+        static constexpr bool range_trait_type_matches<R,
+            enable_if_t<conjunction_v<
+            Internal::sfinae_trigger<typename remove_reference_t<R>::traits_type>,
+            bool_constant<!same_as<typename remove_reference_t<R>::traits_type, Traits>>
+            >>> = false;
+
     public:
         using traits_type = Traits;
         using value_type = Element;
@@ -646,6 +663,25 @@ namespace AZStd
             , m_size(AZStd::to_address(last) - AZStd::to_address(first))
         {}
 
+        // double SFINAE is used to defer evaluation of the contiguous range
+        // until after validating the input type isn't basic_string_view
+        template <typename R,
+            typename = enable_if_t<conjunction_v<
+            bool_constant<!same_as<remove_cvref_t<R>, basic_string_view>>,
+            bool_constant<!convertible_to<const_pointer, R>>
+            >>,
+            typename = enable_if_t<conjunction_v<
+            bool_constant<ranges::contiguous_range<R>>,
+            bool_constant<ranges::sized_range<R>>,
+            bool_constant<same_as<ranges::range_value_t<R>, value_type>>,
+            bool_constant<!has_operator_basic_string_view<R>>,
+            bool_constant<range_trait_type_matches<R>>
+            >>>
+        constexpr basic_string_view(R&& r)
+            : m_begin(ranges::data(r))
+            , m_size(ranges::size(r))
+        {}
+
         constexpr basic_string_view(const basic_string_view&) noexcept = default;
         constexpr basic_string_view(basic_string_view&& other)
         {
@@ -982,6 +1018,11 @@ namespace AZStd
         size_type m_size{};
     };
 
+    template<class It, class End>
+    basic_string_view(It, End)->basic_string_view<iter_value_t<It>>;
+    template<class R>
+    basic_string_view(R&&)->basic_string_view<ranges::range_value_t<R>>;
+
     using string_view = basic_string_view<char>;
     using wstring_view = basic_string_view<wchar_t>;
 
diff --git a/Code/Framework/AzCore/AzCore/std/tuple.h b/Code/Framework/AzCore/AzCore/std/tuple.h
index 492a833f82..b98344fea6 100644
--- a/Code/Framework/AzCore/AzCore/std/tuple.h
+++ b/Code/Framework/AzCore/AzCore/std/tuple.h
@@ -19,22 +19,14 @@
 
 namespace AZStd
 {
-    template<class... Types>
-    using tuple = std::tuple<Types...>;
-
-    template<class T>
-    using tuple_size = std::tuple_size<T>;
-
-    template<size_t I, class T>
-    using tuple_element = std::tuple_element<I, T>;
-
-    template<size_t I, class T>
-    using tuple_element_t = typename std::tuple_element<I, T>::type;
+    using std::tuple;
+    using std::tuple_size;
+    using std::tuple_size_v;
+    using std::tuple_element;
+    using std::tuple_element_t;
 
     // Placeholder structure that can be assigned any value with no effect.
-    // This is used by AZStd::tie as placeholder for unused arugments
-    using ignore_t = AZStd::decay_t<decltype(std::ignore)>;
-    decltype(std::ignore) ignore = std::ignore;
+    using std::ignore;
 
     using std::make_tuple;
     using std::tie;
diff --git a/Code/Framework/AzCore/AzCore/std/typetraits/conjunction.h b/Code/Framework/AzCore/AzCore/std/typetraits/conjunction.h
index fd5ca37df7..fc594641b9 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/conjunction.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/conjunction.h
@@ -7,30 +7,10 @@
  */
 #pragma once
 
-#include <AzCore/std/typetraits/typetraits.h>
-#include <AzCore/std/typetraits/conditional.h>
-#include <AzCore/std/typetraits/integral_constant.h> // for true_type
+#include <type_traits>
 
 namespace AZStd
 {
-    template<class... Bases>
-    struct conjunction
-        : true_type
-    {
-    };
-
-    template<class B1>
-    struct conjunction<B1>
-        : B1
-    {
-    };
-
-    template<class B1, class... Bases>
-    struct conjunction<B1, Bases...>
-        : conditional_t<!B1::value, B1, conjunction<Bases...>>
-    {
-    };
-
-    template<class... Bases>
-    constexpr bool conjunction_v = conjunction<Bases...>::value;
+    using std::conjunction;
+    using std::conjunction_v;
 } // namespace AZStd
diff --git a/Code/Framework/AzCore/AzCore/std/typetraits/disjunction.h b/Code/Framework/AzCore/AzCore/std/typetraits/disjunction.h
index 808cd15214..a8b22da209 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/disjunction.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/disjunction.h
@@ -7,29 +7,10 @@
  */
 #pragma once
 
-#include <AzCore/std/typetraits/integral_constant.h>
-#include <AzCore/std/typetraits/conditional.h>
+#include <type_traits>
 
 namespace AZStd
 {
-    template<class... Bases>
-    struct disjunction
-        : false_type
-    {
-    };
-
-    template<class B1>
-    struct disjunction<B1>
-        : B1
-    {
-    };
-
-    template<class B1, class... Bases>
-    struct disjunction<B1, Bases...>
-        : conditional_t<B1::value, B1, disjunction<Bases...>>
-    {
-    };
-
-    template<class... Bases>
-    constexpr bool disjunction_v = disjunction<Bases...>::value;
+    using std::disjunction;
+    using std::disjunction_v;
 }
diff --git a/Code/Framework/AzCore/AzCore/std/typetraits/is_constructible.h b/Code/Framework/AzCore/AzCore/std/typetraits/is_constructible.h
index 0946a58671..3ecd6692b2 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/is_constructible.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/is_constructible.h
@@ -13,49 +13,30 @@
 namespace AZStd
 {
     using std::is_constructible;
+    using std::is_constructible_v;
     using std::is_trivially_constructible;
+    using std::is_trivially_constructible_v;
     using std::is_nothrow_constructible;
+    using std::is_nothrow_constructible_v;
 
     using std::is_default_constructible;
+    using std::is_default_constructible_v;
     using std::is_trivially_default_constructible;
+    using std::is_trivially_default_constructible_v;
     using std::is_nothrow_default_constructible;
+    using std::is_nothrow_default_constructible_v;
 
     using std::is_copy_constructible;
+    using std::is_copy_constructible_v;
     using std::is_trivially_copy_constructible;
+    using std::is_trivially_copy_constructible_v;
     using std::is_nothrow_copy_constructible;
+    using std::is_nothrow_copy_constructible_v;
 
     using std::is_move_constructible;
+    using std::is_move_constructible_v;
     using std::is_trivially_move_constructible;
+    using std::is_trivially_move_constructible_v;
     using std::is_nothrow_move_constructible;
-
-    template<class T, class... Args>
-    constexpr bool is_constructible_v = std::is_constructible<T, Args...>::value;
-
-    template<class T, class... Args>
-    constexpr bool is_trivially_constructible_v = std::is_trivially_constructible<T, Args...>::value;
-
-    template<class T, class... Args>
-    constexpr bool is_nothrow_constructible_v = std::is_nothrow_constructible<T, Args...>::value;
-
-    template<class T>
-    constexpr bool is_default_constructible_v = std::is_default_constructible<T>::value;
-    template<class T>
-    constexpr bool is_trivially_default_constructible_v = std::is_trivially_default_constructible<T>::value;
-    template<class T>
-    constexpr bool is_nothrow_default_constructible_v = std::is_nothrow_default_constructible<T>::value;
-
-    template<class T>
-    constexpr bool is_copy_constructible_v = std::is_copy_constructible<T>::value;
-    template<class T>
-    constexpr bool is_trivially_copy_constructible_v = std::is_trivially_copy_constructible<T>::value;
-    template<class T>
-    constexpr bool is_nothrow_copy_constructible_v = std::is_nothrow_copy_constructible<T>::value;
-
-    template<class T>
-    constexpr bool is_move_constructible_v = std::is_move_constructible<T>::value;
-    template<class T>
-    constexpr bool is_trivially_move_constructible_v = std::is_trivially_move_constructible<T>::value;
-    template<class T>
-    constexpr bool is_nothrow_move_constructible_v = std::is_nothrow_move_constructible<T>::value;
-
+    using std::is_nothrow_move_constructible_v;
 }
diff --git a/Code/Framework/AzCore/AzCore/std/typetraits/negation.h b/Code/Framework/AzCore/AzCore/std/typetraits/negation.h
index 42a2f048b2..0400cccd73 100644
--- a/Code/Framework/AzCore/AzCore/std/typetraits/negation.h
+++ b/Code/Framework/AzCore/AzCore/std/typetraits/negation.h
@@ -7,16 +7,10 @@
  */
 #pragma once
 
-#include <AzCore/std/typetraits/integral_constant.h>
+#include <type_traits>
 
 namespace AZStd
 {
-    template<class B>
-    struct negation
-        : integral_constant<bool, !B::value>
-    {
-    };
-
-    template<class B>
-    constexpr bool negation_v = negation<B>::value;
+    using std::negation;
+    using std::negation_v;
 }
diff --git a/Code/Framework/AzCore/AzCore/std/utils.h b/Code/Framework/AzCore/AzCore/std/utils.h
index d3ead8022b..c4eb1f79f5 100644
--- a/Code/Framework/AzCore/AzCore/std/utils.h
+++ b/Code/Framework/AzCore/AzCore/std/utils.h
@@ -92,36 +92,13 @@ namespace AZStd
     //////////////////////////////////////////////////////////////////////////
 
     // The structure that encapsulates index lists
-    template <size_t... Is>
-    struct index_sequence
-    {
-        static constexpr size_t size = sizeof...(Is);
-    };
-
-    // Collects internal details for generating index ranges [MIN, MAX)
-    namespace Internal
-    {
-        // Declare primary template for index range builder
-        template <size_t MIN, size_t N, size_t... Is>
-        struct range_builder;
-
-        // Base step
-        template <size_t MIN, size_t... Is>
-        struct range_builder<MIN, MIN, Is...>
-        {
-            typedef index_sequence<Is...> type;
-        };
-
-        // Induction step
-        template <size_t MIN, size_t N, size_t... Is>
-        struct range_builder : public range_builder<MIN, N - 1, N - 1, Is...>
-        {
-        };
-    }
+    using std::integer_sequence;
+    using std::index_sequence;
+    using std::index_sequence_for;
 
     // Create index range [0,N]
-    template<size_t N>
-    using make_index_sequence = typename Internal::range_builder<0, N>::type;
+    using std::make_index_sequence;
+    using std::make_integer_sequence;
 
     struct piecewise_construct_t {};
     static constexpr piecewise_construct_t piecewise_construct{};
@@ -279,31 +256,7 @@ namespace AZStd
     //////////////////////////////////////////////////////////////////////////
     // Address of
     //////////////////////////////////////////////////////////////////////////
-    namespace Internal
-    {
-        template<class T>
-        struct addr_impl_ref
-        {
-            T& m_v;
-            constexpr addr_impl_ref(T& v)
-                : m_v(v) {}
-            constexpr addr_impl_ref& operator=(const addr_impl_ref& v) { m_v = v; return *this; }
-            constexpr operator T& () const { return m_v; }
-        };
-
-        template<class T>
-        struct addressof_impl
-        {
-            static AZ_FORCE_INLINE T* f(T& v, long) { return reinterpret_cast<T*>(&const_cast<char&>(reinterpret_cast<const volatile char&>(v))); }
-            static constexpr T* f(T* v, int)  { return v; }
-        };
-    }
-
-    template<class T>
-    T* addressof(T& v)
-    {
-        return Internal::addressof_impl<T>::f(Internal::addr_impl_ref<T>(v), 0);
-    }
+    using std::addressof;
     // End addressof
     //////////////////////////////////////////////////////////////////////////
 
@@ -446,57 +399,14 @@ namespace AZStd
     };
 #endif
 
-    template <template <class> class, typename...>
-    struct sequence_and;
+    using std::in_place_t;
+    using std::in_place;
 
-    template <template <class> class trait, typename T1, typename... Ts>
-    struct sequence_and<trait, T1, Ts...>
-    {
-        static const bool value = trait<T1>::value && sequence_and<trait, Ts...>::value;
-    };
+    using std::in_place_type_t;
+    using std::in_place_type;
 
-    template <template <class> class trait>
-    struct sequence_and<trait>
-    {
-        static const bool value = true;
-    };
-
-    template <template <class> class, typename...>
-    struct sequence_or;
-
-    template <template <class> class trait, typename T1, typename... Ts>
-    struct sequence_or<trait, T1, Ts...>
-    {
-        static const bool value = trait<T1>::value || sequence_or<trait, Ts...>::value;
-    };
-
-    template <template <class> class trait>
-    struct sequence_or<trait>
-    {
-        static const bool value = false;
-    };
-
-    struct in_place_t
-    {
-        explicit constexpr in_place_t() = default;
-    };
-    constexpr in_place_t in_place{};
-
-    template<typename T>
-    struct in_place_type_t
-    {
-        explicit constexpr in_place_type_t() = default;
-    };
-    template <typename T>
-    constexpr in_place_type_t<T> in_place_type{};
-
-    template<size_t I>
-    struct in_place_index_t
-    {
-        explicit constexpr in_place_index_t() = default;
-    };
-    template<size_t I>
-    constexpr in_place_index_t<I> in_place_index{}; 
+    using std::in_place_index_t;
+    using std::in_place_index;
 
     namespace Internal
     {
diff --git a/Code/Framework/AzCore/Tests/AZStd/ConceptsTests.cpp b/Code/Framework/AzCore/Tests/AZStd/ConceptsTests.cpp
index 718edfcde4..b9184167d1 100644
--- a/Code/Framework/AzCore/Tests/AZStd/ConceptsTests.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/ConceptsTests.cpp
@@ -8,6 +8,7 @@
 
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/std/concepts/concepts.h>
+#include <AzCore/std/ranges/ranges_functional.h>
 
 namespace UnitTest
 {
@@ -199,4 +200,122 @@ namespace UnitTest
         static_assert(!AZStd::strict_weak_order<RelationPredicate, int, Base>);
         static_assert(!AZStd::strict_weak_order<RelationPredicate, Base, int>);
     }
+
+    TEST_F(ConceptsTestFixture, IteratorInvocableConcepts)
+    {
+        // concept indirectly unary invocable
+        // i.e Is deferencing an iterator like type and invoking
+        // a unary callable a well formed expression
+        auto CharUnaryCallable = [](const char) -> int { return {}; };
+        auto IntUnaryCallable = [](int) -> int { return {}; };
+        auto IntRefUnaryCallable = [](int&) -> int { return {}; };
+        static_assert(AZStd::indirectly_unary_invocable<decltype(CharUnaryCallable), AZStd::string_view::iterator>);
+        static_assert(AZStd::indirectly_unary_invocable<decltype(IntUnaryCallable), AZStd::string_view::iterator>);
+        static_assert(!AZStd::indirectly_unary_invocable<decltype(IntRefUnaryCallable), AZStd::string_view::iterator>);
+
+        // concept indirectly regular unary invocable
+        // i.e Is deferencing an iterator like type and invoking with a unary callable
+        // which will not modify the input arguments(hence the term "regular") a well formed expression
+        static_assert(AZStd::indirectly_regular_unary_invocable<decltype(CharUnaryCallable), AZStd::string_view::iterator>);
+        static_assert(AZStd::indirectly_regular_unary_invocable<decltype(IntUnaryCallable), AZStd::string_view::iterator>);
+        static_assert(!AZStd::indirectly_regular_unary_invocable<decltype(IntRefUnaryCallable), AZStd::string_view::iterator>);
+
+        // concept indirect unary predicate
+        // i.e Is deferencing an iterator like type and invoking with a unary predicate
+        // i.e which is a callable that accepts one argument and returns value testable in a boolean context
+        auto CharUnaryPredicate = [](const char) -> bool { return {}; };
+        auto IntUnaryPredicate = [](int) -> int { return {}; };// Return value is an int which is convertible to bool
+        auto IntRefUnaryPredicate = [](int&) -> int { return {}; }; // string_view iterator value type(char) can't bind to an int&
+        auto CharUnaryNonPredicate = [](const char) -> AZStd::string_view { return {}; }; // string_view is not convertible to bool
+
+        static_assert(AZStd::indirect_unary_predicate<decltype(CharUnaryPredicate), AZStd::string_view::iterator>);
+        static_assert(AZStd::indirect_unary_predicate<decltype(IntUnaryPredicate), AZStd::string_view::iterator>);
+        static_assert(!AZStd::indirect_unary_predicate<decltype(IntRefUnaryPredicate), AZStd::string_view::iterator>);
+        static_assert(!AZStd::indirect_unary_predicate<decltype(CharUnaryNonPredicate), AZStd::string_view::iterator>);
+
+        // concept indirect binary predicate
+        // i.e Is deferencing two iterator like types and invoking a binary predicate with those values
+        // well formed and returns value testable in a boolean context.
+        auto CharIntBinaryPredicate = [](const char, int) -> bool { return{}; };
+        auto CharCharRefBinaryPredicate = [](const char, const char&) -> uint32_t { return{}; };
+        auto UIntRefCharBinaryPredicate = [](uint32_t&, char) -> bool { return{}; };
+        auto CharCharBinaryNonPredicate = [](const char, const char) -> AZStd::string_view { return {}; };
+
+        static_assert(AZStd::indirect_binary_predicate<decltype(CharIntBinaryPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        static_assert(AZStd::indirect_binary_predicate<decltype(CharCharRefBinaryPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        // string_view iterator value type(char) cannot bind to int&
+        static_assert(!AZStd::indirect_binary_predicate<decltype(UIntRefCharBinaryPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        // string_view is not convertible to bool
+        static_assert(!AZStd::indirect_binary_predicate<decltype(CharCharBinaryNonPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        // Ok - iter_reference_t<uint32_t*> = uint32_t&
+        static_assert(AZStd::indirect_binary_predicate<decltype(UIntRefCharBinaryPredicate),
+            uint32_t*, AZStd::string_view::iterator>);
+
+        // concept indirect equivalence relation
+        // i.e Is deferencing two iterator like types and invoking a binary predicate with those values
+        // well formed and returns value testable in a boolean context.
+        // The dereferenced iterator types should be model an equivalence relationship
+        // (a == b) && (b == c) == (a ==c)
+        static_assert(AZStd::indirect_equivalence_relation<decltype(CharIntBinaryPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        static_assert(AZStd::indirect_equivalence_relation<decltype(CharCharRefBinaryPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        static_assert(!AZStd::indirect_equivalence_relation<decltype(UIntRefCharBinaryPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        static_assert(!AZStd::indirect_equivalence_relation<decltype(CharCharBinaryNonPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        // The "relation" concept requires that both both arguments can be bind to
+        // either of the two binary parameters
+        static_assert(!AZStd::indirect_equivalence_relation<decltype(UIntRefCharBinaryPredicate),
+            uint32_t*, AZStd::string_view::iterator>);
+
+        // concept indirect strict weak order
+        // i.e Is deferencing two iterator like types and invoking a binary predicate with those values
+        // well formed and returns value testable in a boolean context.
+        // The dereferenced iterator types should be model a strict weak order relation
+        // (a < b) && (b < c) == (a < c)
+        static_assert(AZStd::indirect_strict_weak_order<decltype(CharIntBinaryPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        static_assert(AZStd::indirect_strict_weak_order<decltype(CharCharRefBinaryPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        static_assert(!AZStd::indirect_strict_weak_order<decltype(UIntRefCharBinaryPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        static_assert(!AZStd::indirect_strict_weak_order<decltype(CharCharBinaryNonPredicate),
+            AZStd::string_view::iterator, AZStd::string_view::iterator>);
+        // The "relation" concept requires that both both arguments can be bind to
+        // either of the two binary parameters
+        static_assert(!AZStd::indirect_strict_weak_order<decltype(UIntRefCharBinaryPredicate),
+            uint32_t*, AZStd::string_view::iterator>);
+
+        // indirect_result_t type alias
+        static_assert(AZStd::same_as<AZStd::indirect_result_t<decltype(CharCharRefBinaryPredicate),
+            AZStd::string_view::iterator, const char*>, uint32_t>);
+
+        // projected operator* returns indirect result of the projection function
+        static_assert(AZStd::same_as<AZStd::iter_reference_t<AZStd::projected<int*, AZStd::identity>>, int&>);
+    }
+
+    TEST_F(ConceptsTestFixture, IteratorAlgorithmConcepts)
+    {
+        static_assert(AZStd::indirectly_swappable<int*, int*>);
+        static_assert(!AZStd::indirectly_swappable<int*, const int*>);
+        auto CharIntIndirectlyComparable = [](const char lhs, int rhs) -> bool { return lhs == rhs; };
+        static_assert(AZStd::indirectly_comparable<const char*, int*, decltype(CharIntIndirectlyComparable)>);
+        static_assert(!AZStd::indirectly_comparable<AZStd::string_view, int*, decltype(CharIntIndirectlyComparable)>);
+
+        static_assert(AZStd::permutable<typename AZStd::vector<int>::iterator>);
+        // const iterator isn't indirectlly swappable or indirectly movable
+        static_assert(!AZStd::permutable<typename AZStd::vector<int>::const_iterator>);
+
+        static_assert(AZStd::mergeable<AZStd::vector<int>::iterator, AZStd::string_view::iterator, AZStd::vector<int>::iterator>);
+        static_assert(!AZStd::mergeable<AZStd::vector<int>::iterator, AZStd::string_view::iterator, AZStd::string_view::iterator>);
+
+        static_assert(AZStd::sortable<int*>);
+        // Not sortable becaue the iter_reference_t<const int*> = const int& which isn't swappable
+        static_assert(!AZStd::sortable<const int*>);
+    }
 }
diff --git a/Code/Framework/AzCore/Tests/AZStd/RangesAlgorithmTests.cpp b/Code/Framework/AzCore/Tests/AZStd/RangesAlgorithmTests.cpp
new file mode 100644
index 0000000000..a06ebf3bdf
--- /dev/null
+++ b/Code/Framework/AzCore/Tests/AZStd/RangesAlgorithmTests.cpp
@@ -0,0 +1,250 @@
+/*
+ * 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/UnitTest/TestTypes.h>
+#include <AzCore/std/string/string_view.h>
+#include <AzCore/std/ranges/ranges_algorithm.h>
+
+namespace UnitTest
+{
+    class RangesAlgorithmTestFixture
+        : public ScopedAllocatorSetupFixture
+    {};
+
+    // range algorithm min and max
+    TEST_F(RangesAlgorithmTestFixture, RangesMin_ReturnsSmallestElement)
+    {
+        // Simple Elements
+        EXPECT_EQ(-1, AZStd::ranges::min(5, -1));
+        EXPECT_EQ(78235, AZStd::ranges::min(78235, 124785));
+        EXPECT_EQ(7, AZStd::ranges::min(7, 7));
+
+        // Initializer list
+        AZStd::initializer_list<int> testIList{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, 1000, 45 };
+        EXPECT_EQ(-8, AZStd::ranges::min(testIList));
+
+        // Range
+        AZStd::vector testVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, 1000, 45 };
+        EXPECT_EQ(-8, AZStd::ranges::min(testVector));
+    }
+
+    TEST_F(RangesAlgorithmTestFixture, RangesMax_ReturnsLargestElement)
+    {
+        // Simple Elements
+        EXPECT_EQ(5, AZStd::ranges::max(5, -1));
+        EXPECT_EQ(124785, AZStd::ranges::max(78235, 124785));
+        EXPECT_EQ(7, AZStd::ranges::max(7, 7));
+
+        // Initializer list
+        AZStd::initializer_list<int> testIList{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, 1000, 45 };
+        EXPECT_EQ(1000, AZStd::ranges::max(testIList));
+
+        // Range
+        AZStd::vector testVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, 1000, 45 };
+        EXPECT_EQ(1000, AZStd::ranges::max(testVector));
+    }
+
+    TEST_F(RangesAlgorithmTestFixture, RangesMinMax_ReturnsSmallestAndLargestValue)
+    {
+        // Simple Elements
+        AZStd::ranges::minmax_result<int> expectedMinMax{ -1, 5 };
+        AZStd::ranges::minmax_result<int> testMinMax = AZStd::ranges::minmax(5, -1);
+        EXPECT_EQ(expectedMinMax.min, testMinMax.min);
+        EXPECT_EQ(expectedMinMax.max, testMinMax.max);
+
+        expectedMinMax = { 78235, 124785 };
+        testMinMax = AZStd::ranges::minmax(78235, 124785);
+        EXPECT_EQ(expectedMinMax.min, testMinMax.min);
+        EXPECT_EQ(expectedMinMax.max, testMinMax.max);
+
+        expectedMinMax = { 7, 7 };
+        testMinMax = AZStd::ranges::minmax(7, 7);
+        EXPECT_EQ(expectedMinMax.min, testMinMax.min);
+        EXPECT_EQ(expectedMinMax.max, testMinMax.max);
+
+        // Initializer list
+        AZStd::initializer_list<int> testIList{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, 1000, 45 };
+        expectedMinMax = { -8, 1000 };
+        testMinMax = AZStd::ranges::minmax(testIList);
+        EXPECT_EQ(expectedMinMax.min, testMinMax.min);
+        EXPECT_EQ(expectedMinMax.max, testMinMax.max);
+
+        // Range
+        AZStd::vector testVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, 1000, 45 };
+        expectedMinMax = { -8, 1000 };
+        testMinMax = AZStd::ranges::minmax(testVector);
+        EXPECT_EQ(expectedMinMax.min, testMinMax.min);
+        EXPECT_EQ(expectedMinMax.max, testMinMax.max);
+    }
+
+    TEST_F(RangesAlgorithmTestFixture, RangesMinElement_ReturnsIteratorToLeftmostSmallestElement)
+    {
+        AZStd::vector testVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, 1000, 45 };
+        // iterator
+        auto leftmostSmallestIt = AZStd::ranges::min_element(testVector.begin(), testVector.end());
+        ASSERT_EQ(testVector.begin() + 4, leftmostSmallestIt);
+        EXPECT_EQ(-8, *leftmostSmallestIt);
+
+        // Range
+        leftmostSmallestIt = AZStd::ranges::min_element(testVector);
+        ASSERT_EQ(testVector.begin() + 4, leftmostSmallestIt);
+        EXPECT_EQ(-8, *leftmostSmallestIt);
+    }
+
+    TEST_F(RangesAlgorithmTestFixture, RangesMaxElement_ReturnsIteratorToLeftmostLargestElement)
+    {
+        AZStd::vector testVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, 1000, 45 };
+        // iterator
+        auto leftmostLargestIt = AZStd::ranges::max_element(testVector.begin(), testVector.end());
+        ASSERT_EQ(testVector.begin() + 6, leftmostLargestIt);
+        EXPECT_EQ(1000, *leftmostLargestIt);
+
+        // Range
+        leftmostLargestIt = AZStd::ranges::max_element(testVector);
+        ASSERT_EQ(testVector.begin() + 6, leftmostLargestIt);
+        EXPECT_EQ(1000, *leftmostLargestIt);
+    }
+    TEST_F(RangesAlgorithmTestFixture, RangesMinMaxElement_ReturnsIteratorToLeftmostSmallestElement_IteratorToRightmostLargestElement)
+    {
+        // The behavior of minmax_element is explicitly different from max_element
+        // as it relates to the max element being returned
+        // mixmax_element returns the rightmost largest element(assuming comparison function object is ranges::less)
+        // https://eel.is/c++draft/algorithms#footnoteref-225
+        AZStd::vector testVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, 1000, 45 };
+        // iterator
+        {
+            auto [leftmostSmallestIt, rightmostLargestIt] = AZStd::ranges::minmax_element(testVector.begin(), testVector.end());
+            ASSERT_EQ(testVector.begin() + 4, leftmostSmallestIt);
+            ASSERT_EQ(testVector.begin() + 10, rightmostLargestIt);
+            EXPECT_EQ(-8, *leftmostSmallestIt);
+            EXPECT_EQ(1000, *rightmostLargestIt);
+        }
+
+        // Range
+        auto [leftmostSmallestIt, rightmostLargestIt] = AZStd::ranges::minmax_element(testVector);
+        ASSERT_EQ(testVector.begin() + 4, leftmostSmallestIt);
+        ASSERT_EQ(testVector.begin() + 10, rightmostLargestIt);
+        EXPECT_EQ(-8, *leftmostSmallestIt);
+        EXPECT_EQ(1000, *rightmostLargestIt);
+    }
+
+    TEST_F(RangesAlgorithmTestFixture, RangesFind_LocatesElementInContainer_Succeeds)
+    {
+        AZStd::vector testVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, 1000, 45 };
+
+        auto foundIt = AZStd::ranges::find(testVector, 22);
+        ASSERT_NE(testVector.end(), foundIt);
+        EXPECT_EQ(22, *foundIt);
+
+        foundIt = AZStd::ranges::find_if(testVector, [](int value) { return value < 0; });
+        ASSERT_NE(testVector.end(), foundIt);
+        EXPECT_EQ(-8, *foundIt);
+
+        foundIt = AZStd::ranges::find_if_not(testVector, [](int value) { return value < 1000; });
+        ASSERT_NE(testVector.end(), foundIt);
+        EXPECT_EQ(1000, *foundIt);
+    }
+
+    TEST_F(RangesAlgorithmTestFixture, RangesFindFirstOf_LocatesElementInContainer_Succeeds)
+    {
+        AZStd::vector testVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, 1000, 45 };
+
+        AZStd::array testArray{ -8, 47 };
+        auto foundIt = AZStd::ranges::find_first_of(testVector, testArray);
+        ASSERT_NE(testVector.end(), foundIt);
+        EXPECT_EQ(47, *foundIt);
+
+        AZStd::array<int, 0> emptyArray{};
+        foundIt = AZStd::ranges::find_first_of(testVector, emptyArray);
+        EXPECT_EQ(testVector.end(), foundIt);
+    }
+
+    TEST_F(RangesAlgorithmTestFixture, RangesSearch_LocatesElementInContainer_Succeeds)
+    {
+        AZStd::vector testVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, -8, 1000, 45 };
+
+        AZStd::array testArray{ 1000 };
+        auto testSubrange = AZStd::ranges::search(testVector, testArray);
+        ASSERT_FALSE(testSubrange.empty());
+        EXPECT_EQ(1000, testSubrange.front());
+
+        AZStd::array testArray2{ 1000, 45 };
+        testSubrange = AZStd::ranges::search(testVector, testArray2);
+        ASSERT_EQ(2, testSubrange.size());
+        EXPECT_EQ(1000, testSubrange[0]);
+        EXPECT_EQ(45, testSubrange[1]);
+
+        testSubrange = AZStd::ranges::search_n(testVector, 1, 22);
+        ASSERT_FALSE(testSubrange.empty());
+        EXPECT_EQ(22, testSubrange.front());
+
+        // 2 Consecutive values of 22 does not exist in vector
+        testSubrange = AZStd::ranges::search_n(testVector, 2, 22);
+        EXPECT_TRUE(testSubrange.empty());
+
+        // 2 Consecutive values of -8 does exist in vector
+        testSubrange = AZStd::ranges::search_n(testVector, 2,- 8);
+        ASSERT_EQ(2, testSubrange.size());
+        EXPECT_EQ(-8, testSubrange[0]);
+        EXPECT_EQ(-8, testSubrange[1]);
+    }
+
+    TEST_F(RangesAlgorithmTestFixture, RangesFindEnd_LocatesElementLastElement_Succeeds)
+    {
+        AZStd::vector testVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, -8, 1000, 45 };
+
+        AZStd::array testArray{ -8 };
+        auto testSubrange = AZStd::ranges::find_end(testVector, testArray);
+        ASSERT_FALSE(testSubrange.empty());
+        EXPECT_EQ(-8, testSubrange.front());
+        EXPECT_EQ(testVector.end() - 3, testSubrange.begin());
+    }
+
+    TEST_F(RangesAlgorithmTestFixture, RangesEqual_IsAbleToCompareTwoRanges_Succeeds)
+    {
+        AZStd::vector testVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, -8, 1000, 45 };
+        AZStd::vector longerVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, -8, 1000, 45, 929 };
+        AZStd::vector shorterVector{ 5, 1, 22, 47, -8, -5, 1000, 687, 22, -8, -8, 1000 };
+        AZStd::vector unequalVector{ 5, 1, 22, 47, -8, -5, 1000, 14, 22, -8, -8, 1000, 25 };
+
+        EXPECT_TRUE(AZStd::ranges::equal(testVector, testVector));
+        EXPECT_FALSE(AZStd::ranges::equal(testVector, longerVector));
+        EXPECT_FALSE(AZStd::ranges::equal(longerVector, testVector));
+        EXPECT_FALSE(AZStd::ranges::equal(testVector, shorterVector));
+        EXPECT_FALSE(AZStd::ranges::equal(shorterVector, testVector));
+        EXPECT_FALSE(AZStd::ranges::equal(testVector, unequalVector));
+    }
+
+    TEST_F(RangesAlgorithmTestFixture, RangesMismatch_Returns_IteratorsToMismatchElements)
+    {
+        AZStd::vector testVector{ 1, 2, 3, 4, 5 ,6 };
+        AZStd::vector secondVector{ 1, 2, 3, 14, 5, 6 };
+        AZStd::vector<int> emptyVector;
+        AZStd::vector<int> longerVector{ 1, 2, 3, 4, 5, 6, 7 };
+
+        {
+            auto [mismatchIt1, mismatchIt2] = AZStd::ranges::mismatch(testVector, secondVector);
+            ASSERT_NE(testVector.end(), mismatchIt1);
+            EXPECT_EQ(4, *mismatchIt1);
+            ASSERT_NE(secondVector.end(), mismatchIt2);
+            EXPECT_EQ(14, *mismatchIt2);
+        }
+        {
+            auto [mismatchIt1, mismatchIt2] = AZStd::ranges::mismatch(testVector, emptyVector);
+            ASSERT_NE(testVector.end(), mismatchIt1);
+            EXPECT_EQ(1, *mismatchIt1);
+            EXPECT_EQ(emptyVector.end(), mismatchIt2);
+        }
+        {
+            auto [mismatchIt1, mismatchIt2] = AZStd::ranges::mismatch(testVector, longerVector);
+            EXPECT_EQ(testVector.end(), mismatchIt1);
+            ASSERT_NE(longerVector.end(), mismatchIt2);
+            EXPECT_EQ(7, *mismatchIt2);
+        }
+    }
+}
diff --git a/Code/Framework/AzCore/Tests/AZStd/RangesViewTests.cpp b/Code/Framework/AzCore/Tests/AZStd/RangesViewTests.cpp
new file mode 100644
index 0000000000..972bfff5e8
--- /dev/null
+++ b/Code/Framework/AzCore/Tests/AZStd/RangesViewTests.cpp
@@ -0,0 +1,483 @@
+/*
+ * 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/UnitTest/TestTypes.h>
+#include <AzCore/std/containers/list.h>
+#include <AzCore/std/containers/map.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/ranges/all_view.h>
+#include <AzCore/std/ranges/elements_view.h>
+#include <AzCore/std/ranges/empty_view.h>
+#include <AzCore/std/ranges/join_view.h>
+#include <AzCore/std/ranges/ranges_adaptor.h>
+#include <AzCore/std/ranges/single_view.h>
+#include <AzCore/std/ranges/split_view.h>
+#include <AzCore/std/ranges/subrange.h>
+#include <AzCore/std/ranges/zip_view.h>
+#include <AzCore/std/string/string_view.h>
+
+namespace UnitTest
+{
+    class RangesViewTestFixture
+        : public ScopedAllocatorSetupFixture
+    {};
+
+    TEST_F(RangesViewTestFixture, AllRangeAdaptor_Succeeds)
+    {
+        AZStd::string_view testString{ "Hello World" };
+        auto testAllView = AZStd::ranges::views::all(testString);
+        EXPECT_EQ(testString.size(), testAllView.size());
+        EXPECT_EQ(testString.data(), testAllView.data());
+        EXPECT_EQ(testString.begin(), testAllView.begin());
+        EXPECT_EQ(testString.end(), testAllView.end());
+        EXPECT_EQ(testString.empty(), testAllView.empty());
+        EXPECT_EQ(testString.front(), testAllView.front());
+        EXPECT_EQ(testString.back(), testAllView.back());
+        EXPECT_EQ(testString[5], testAllView[5]);
+
+        auto testAllViewChain = testString | AZStd::ranges::views::all;
+        EXPECT_EQ(testString.size(), testAllViewChain.size());
+        EXPECT_EQ(testString.data(), testAllViewChain.data());
+        EXPECT_EQ(testString.begin(), testAllViewChain.begin());
+        EXPECT_EQ(testString.end(), testAllViewChain.end());
+        EXPECT_EQ(testString.empty(), testAllViewChain.empty());
+        EXPECT_EQ(testString.front(), testAllViewChain.front());
+        EXPECT_EQ(testString.back(), testAllViewChain.back());
+        EXPECT_EQ(testString[5], testAllViewChain[5]);
+    }
+
+    TEST_F(RangesViewTestFixture, Subrange_DeductionGuides_Compile)
+    {
+        AZStd::string_view testString{ "Hello World" };
+        AZStd::ranges::subrange rangeDeduction(testString);
+        AZStd::ranges::subrange rangeDeductionWithSize(testString, testString.size());
+        AZStd::ranges::subrange iteratorDeduction(testString.begin(), testString.end());
+        AZStd::ranges::subrange iteratorDeductionWithSize(testString.begin(), testString.end(),
+            testString.size());
+        EXPECT_TRUE(rangeDeduction);
+        EXPECT_TRUE(rangeDeductionWithSize);
+        EXPECT_TRUE(iteratorDeduction);
+        EXPECT_TRUE(iteratorDeductionWithSize);
+    }
+
+    TEST_F(RangesViewTestFixture, Subrange_CanTakeSubsetOfContainer_Succeeds)
+    {
+        AZStd::vector<int> testVector{ 1, 3, 5, 6, 7, 6, 89, -178 };
+        AZStd::ranges::subrange subVector(testVector);
+        EXPECT_TRUE(subVector);
+        ASSERT_FALSE(subVector.empty());
+        EXPECT_EQ(testVector.data(), subVector.data());
+        EXPECT_EQ(testVector.begin(), subVector.begin());
+        EXPECT_EQ(testVector.end(), subVector.end());
+        EXPECT_EQ(testVector.size(), subVector.size());
+        EXPECT_EQ(testVector[0], subVector[0]);
+        EXPECT_EQ(testVector.front(), subVector.front());
+        EXPECT_EQ(testVector.back(), subVector.back());
+
+        // Now validate the iterator operations
+        subVector.advance(2);
+        subVector = subVector.prev();
+        subVector.advance(2);
+        subVector = subVector.next();
+        subVector.advance(-4);
+        EXPECT_EQ(testVector.begin(), subVector.begin());
+
+        // Obtain a copy of the subrange with the first and last elements removed
+        AZStd::ranges::subrange subVectorSplice(subVector.begin() + 1, subVector.end() - 1);
+        EXPECT_TRUE(subVectorSplice);
+        ASSERT_FALSE(subVector.empty());
+        EXPECT_LT(testVector.data(), subVectorSplice.data());
+        EXPECT_EQ(testVector.begin() + 1, subVectorSplice.begin());
+        EXPECT_EQ(testVector.end() - 1, subVectorSplice.end());
+        ASSERT_EQ(testVector.size() - 2, subVectorSplice.size());
+        EXPECT_EQ(testVector[1], subVectorSplice.front());
+        EXPECT_EQ(testVector[testVector.size() - 2], subVectorSplice.back());
+        EXPECT_NE(testVector.front(), subVectorSplice.front());
+        EXPECT_NE(testVector.back(), subVectorSplice.back());
+
+
+    }
+
+    TEST_F(RangesViewTestFixture, EmptyView_ReturnsEmptyViewRange_Succeeds)
+    {
+        AZStd::ranges::empty_view<int> emptyView;
+
+        EXPECT_EQ(nullptr, emptyView.data());
+        EXPECT_EQ(0, emptyView.size());
+        EXPECT_TRUE(emptyView.empty());
+        EXPECT_EQ(emptyView.end(), emptyView.begin());
+
+        EXPECT_EQ(nullptr, AZStd::ranges::views::empty<AZStd::string_view>.data());
+        EXPECT_EQ(0, AZStd::ranges::views::empty<AZStd::string_view>.size());
+        EXPECT_TRUE(AZStd::ranges::views::empty<AZStd::string_view>.empty());
+        EXPECT_EQ(AZStd::ranges::views::empty<AZStd::string_view>.end(), AZStd::ranges::views::empty<AZStd::string_view>.begin());
+    }
+
+    TEST_F(RangesViewTestFixture, SingleView_ReturnsViewOverSingleElement_Succeeds)
+    {
+        AZStd::string_view testString{ "Hello World" };
+        AZStd::ranges::single_view singleView{ AZStd::move(testString) };
+        EXPECT_NE(nullptr, singleView.data());
+        EXPECT_EQ(1, singleView.size());
+        EXPECT_FALSE(singleView.empty());
+        ASSERT_NE(singleView.end(), singleView.begin());
+
+        auto singleViewStringIt = singleView.begin();
+        EXPECT_EQ("Hello World", *singleViewStringIt);
+    }
+
+    TEST_F(RangesViewTestFixture, RefView_CanWrapStringView_Succeeds)
+    {
+        AZStd::string_view testString{ "Hello World" };
+        AZStd::ranges::ref_view refView(testString);
+        EXPECT_EQ(testString.size(), refView.size());
+        EXPECT_EQ(testString.data(), refView.data());
+        EXPECT_EQ(testString.begin(), refView.begin());
+        EXPECT_EQ(testString.end(), refView.end());
+        EXPECT_EQ(testString.empty(), refView.empty());
+        EXPECT_EQ(testString.front(), refView.front());
+        EXPECT_EQ(testString.back(), refView.back());
+        EXPECT_EQ(testString[5], refView[5]);
+    }
+
+    TEST_F(RangesViewTestFixture, OwningView_CanWrapStringView_Succeeds)
+    {
+        AZStd::string_view sourceView{ "Hello World" };
+        AZStd::string_view testString{ sourceView };
+        AZStd::ranges::owning_view owningView(AZStd::move(testString));
+        EXPECT_TRUE(testString.empty());
+        EXPECT_FALSE(owningView.empty());
+        EXPECT_EQ(sourceView.size(), owningView.size());
+        EXPECT_EQ(sourceView.data(), owningView.data());
+        EXPECT_EQ(sourceView.begin(), owningView.begin());
+        EXPECT_EQ(sourceView.end(), owningView.end());
+        EXPECT_EQ(sourceView.empty(), owningView.empty());
+        EXPECT_EQ(sourceView.front(), owningView.front());
+        EXPECT_EQ(sourceView.back(), owningView.back());
+        EXPECT_EQ(sourceView[5], owningView[5]);
+    }
+
+    MATCHER_P(ZipViewAtSentinel, sentinel, "") {
+        *result_listener << "zip view has iterated to sentinel";
+        return !(arg == sentinel);
+    }
+    TEST_F(RangesViewTestFixture, ZipView_CompilesWithRange_Succeeds)
+    {
+        AZStd::string_view sourceView{ "Hello World" };
+        AZStd::ranges::zip_view zipView(AZStd::move(sourceView));
+        auto zipItTuple = zipView.begin();
+        auto zipSentinelTuple = zipView.end();
+        ASSERT_THAT(zipItTuple, ZipViewAtSentinel(zipSentinelTuple));
+        EXPECT_EQ('H', AZStd::get<0>(*zipItTuple));
+        ptrdiff_t zipDistance = zipSentinelTuple - zipItTuple;
+        EXPECT_EQ(11, zipDistance);
+
+        AZStd::list<int> sourceList{ 1, 2, 3, 4, 5 };
+        AZStd::ranges::zip_view zipView2(AZStd::move(sourceList));
+        auto zipListTupleIt = zipView2.begin();
+        auto zipListTupleEnd = zipView2.end();
+        ASSERT_THAT(zipListTupleIt, ZipViewAtSentinel(zipListTupleEnd));
+    }
+
+    TEST_F(RangesViewTestFixture, ZipView_CanIteratOverMultipleContainers_Succeeds)
+    {
+        AZStd::string_view sourceView{ "abcdef" };
+        AZStd::vector intVector{ 1, 2, 3, 4, 5 };
+        AZStd::list<uint32_t> uintList{ 2, 4, 6, 8, 10 };
+        constexpr int expectedIterations = 5;
+
+        int iterationCount{};
+        for (auto [charX, intY, uintZ] : (AZStd::ranges::views::zip(sourceView, AZStd::move(intVector), AZStd::move(uintList))))
+        {
+            ++iterationCount;
+            switch (charX)
+            {
+            case 'a':
+                EXPECT_EQ(1, intY);
+                EXPECT_EQ(2, uintZ);
+                break;
+            case 'b':
+                EXPECT_EQ(2, intY);
+                EXPECT_EQ(4, uintZ);
+                break;
+            case 'c':
+                EXPECT_EQ(3, intY);
+                EXPECT_EQ(6, uintZ);
+                break;
+            case 'd':
+                EXPECT_EQ(4, intY);
+                EXPECT_EQ(8, uintZ);
+                break;
+            case 'e':
+                EXPECT_EQ(5, intY);
+                EXPECT_EQ(10, uintZ);
+                break;
+            default:
+                ADD_FAILURE() << "Unexpected character value " << charX << " found when iterating zip view";
+            }
+        }
+
+        EXPECT_EQ(expectedIterations, iterationCount);
+    }
+
+    TEST_F(RangesViewTestFixture, SplitView_CanSplitPatterns_Succeeds)
+    {
+        AZStd::string_view emptyView{ "" };
+        auto splitView = AZStd::ranges::views::split(emptyView, " ");
+        auto splitIt = splitView.begin();
+        EXPECT_EQ(splitView.end(), splitIt);
+
+        AZStd::string_view testView1{ "Hello" };
+        auto splitViewCharPattern = AZStd::ranges::views::split(testView1, ' ');
+        auto splitCharIt = splitViewCharPattern.begin();
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("Hello", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        EXPECT_EQ(splitViewCharPattern.end(), splitCharIt);
+
+        AZStd::string_view testView2{ "Hello World" };
+        splitViewCharPattern = AZStd::ranges::views::split(testView2, ' ');
+        splitCharIt = splitViewCharPattern.begin();
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("Hello", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("World", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        EXPECT_EQ(splitViewCharPattern.end(), splitCharIt);
+
+        AZStd::string_view testView3{ "Hello World Moon" };
+        splitViewCharPattern = AZStd::ranges::views::split(testView3, ' ');
+        splitCharIt = splitViewCharPattern.begin();
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("Hello", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("World", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("Moon", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        EXPECT_EQ(splitViewCharPattern.end(), splitCharIt);
+
+
+        AZStd::string_view testView4{ "Hello World Moon " };
+        splitViewCharPattern = AZStd::ranges::views::split(testView4, ' ');
+        splitCharIt = splitViewCharPattern.begin();
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("Hello", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("World", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("Moon", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        EXPECT_EQ(splitViewCharPattern.end(), splitCharIt);
+
+        AZStd::string_view testView5{ "Hello World Moon  " };
+        splitViewCharPattern = AZStd::ranges::views::split(testView5, ' ');
+        splitCharIt = splitViewCharPattern.begin();
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("Hello", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("World", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("Moon", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        EXPECT_EQ(splitViewCharPattern.end(), splitCharIt);
+
+        AZStd::string_view testView6{ "Hello  World Moon" };
+        splitViewCharPattern = AZStd::ranges::views::split(testView6, ' ');
+        splitCharIt = splitViewCharPattern.begin();
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("Hello", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("World", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        ASSERT_NE(splitViewCharPattern.end(), splitCharIt);
+        EXPECT_EQ("Moon", AZStd::string_view(*splitCharIt));
+        ++splitCharIt;
+        EXPECT_EQ(splitViewCharPattern.end(), splitCharIt);
+    }
+
+    TEST_F(RangesViewTestFixture, SplitView_SplitsFromNonString_Succeeds)
+    {
+        const AZStd::vector<int> testVector{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+        // Split the vector on 3
+        auto splitView = AZStd::ranges::views::split(testVector, 3);
+        auto splitIt = splitView.begin();
+        ASSERT_NE(splitView.end(), splitIt);
+        auto splitSubrange = *splitIt;
+        {
+            AZStd::array expectedValue{ 1, 2 };
+            EXPECT_TRUE(AZStd::ranges::equal(expectedValue, splitSubrange));
+        }
+
+        ++splitIt;
+        ASSERT_NE(splitView.end(), splitIt);
+        splitSubrange = *splitIt;
+        {
+            AZStd::array expectedValue{ 4, 5, 6, 7, 8, 9, 10 };
+            EXPECT_TRUE(AZStd::ranges::equal(expectedValue, splitSubrange));
+        }
+    }
+
+    TEST_F(RangesViewTestFixture, JoinView_IteratesOverInnerViews_Succeeds)
+    {
+        constexpr AZStd::string_view expectedString = "HelloWorldMoonSun";
+        using Rope = AZStd::fixed_vector<AZStd::string_view, 32>;
+        Rope rope{ "Hello", "World", "Moon", "Sun" };
+        AZStd::fixed_string<128> accumString;
+        for (auto&& charElement : AZStd::ranges::join_view(rope))
+        {
+            accumString.push_back(charElement);
+        }
+
+        EXPECT_EQ(expectedString, accumString);
+    }
+
+    TEST_F(RangesViewTestFixture, JoinView_IteratesCanIterateOverSplitView_Succeeds)
+    {
+        constexpr AZStd::string_view expectedString = "HelloWorldMoonSun";
+        constexpr AZStd::string_view splitExpression = "Hello,World,Moon,Sun";
+        AZStd::fixed_string<128> accumString;
+
+        for (auto&& charElement : AZStd::ranges::views::join(AZStd::ranges::views::split(splitExpression, ',')))
+        {
+            accumString.push_back(charElement);
+        }
+
+        EXPECT_EQ(expectedString, accumString);
+    }
+
+    TEST_F(RangesViewTestFixture, JoinView_IterSwapCustomization_Succeeds)
+    {
+        AZStd::fixed_vector<AZStd::string, 8> testVector1{ "World", "Hello" };
+        AZStd::fixed_vector<AZStd::string, 8> testVector2{ "Value", "First" };
+        auto joinView1 = AZStd::ranges::views::join(testVector1);
+        auto joinView2 = AZStd::ranges::views::join(testVector2);
+        auto joinViewIter1 = joinView1.begin();
+        auto joinViewIter2 = joinView2.begin();
+        // swaps the 'W' and 'V'
+        AZStd::ranges::iter_swap(joinViewIter1, joinViewIter2);
+        AZStd::ranges::advance(joinViewIter1, 5, joinView1.end());
+        AZStd::ranges::advance(joinViewIter2, 5, joinView2.end());
+        // swaps the 'H' and 'F' of the second string of each vector
+        AZStd::ranges::iter_swap(joinViewIter1, joinViewIter2);
+        EXPECT_EQ("Vorld", testVector1[0]);
+        EXPECT_EQ("Fello", testVector1[1]);
+        EXPECT_EQ("Walue", testVector2[0]);
+        EXPECT_EQ("Hirst", testVector2[1]);
+    }
+
+    TEST_F(RangesViewTestFixture, JoinView_IterMoveCustomization_Succeeds)
+    {
+        using StringWrapper = AZStd::ranges::single_view<AZStd::string>;
+
+        AZStd::fixed_vector<StringWrapper, 8> testVector1{ StringWrapper{"5"}, StringWrapper{"10"} };
+        AZStd::fixed_vector<StringWrapper, 8> testVector2{ StringWrapper{"15"}, StringWrapper{"20"} };
+        auto joinView1 = AZStd::ranges::views::join(testVector1);
+        auto joinView2 = AZStd::ranges::views::join(testVector2);
+        auto joinViewIter1 = joinView1.begin();
+        auto joinViewIter2 = joinView2.begin();
+        AZStd::string value = AZStd::ranges::iter_move(joinViewIter1);
+
+        EXPECT_EQ("5", value);
+        EXPECT_TRUE((*joinViewIter1).empty());
+        ++joinViewIter2;
+        value = AZStd::ranges::iter_move(joinViewIter2);
+        EXPECT_EQ("20", value);
+        EXPECT_TRUE((*joinViewIter2).empty());
+    }
+
+    TEST_F(RangesViewTestFixture, ElementsView_CanIterateVectorOfTuple_Succeeds)
+    {
+        using TestTuple = AZStd::tuple<int, AZStd::string, bool>;
+        AZStd::vector testVector{ TestTuple{1, "hello", false}, TestTuple{2, "world", true},
+            TestTuple{3, "Moon", false} };
+
+        auto firstElementView = AZStd::ranges::views::elements<0>(testVector);
+        auto firstElementBegin = AZStd::ranges::begin(firstElementView);
+        auto firstElementEnd = AZStd::ranges::end(firstElementView);
+        EXPECT_NE(firstElementEnd, firstElementBegin);
+        ASSERT_EQ(3, firstElementView.size());
+        EXPECT_EQ(1, firstElementView[0]);
+        EXPECT_EQ(2, firstElementView[1]);
+        EXPECT_EQ(3, firstElementView[2]);
+
+        auto secondElementView = AZStd::ranges::views::elements<1>(testVector);
+        ASSERT_EQ(3, secondElementView.size());
+        EXPECT_EQ("hello", secondElementView[0]);
+        EXPECT_EQ("world", secondElementView[1]);
+        EXPECT_EQ("Moon", secondElementView[2]);
+
+        auto thirdElementView = AZStd::ranges::views::elements<2>(testVector);
+        ASSERT_EQ(3, thirdElementView.size());
+        EXPECT_FALSE(thirdElementView[0]);
+        EXPECT_TRUE(thirdElementView[1]);
+        EXPECT_FALSE(thirdElementView[2]);
+
+        using TestPair = AZStd::pair<AZStd::string, int>;
+        AZStd::vector testPairVector{ TestPair{"hello", 5}, TestPair{"world", 10}, TestPair{"Sun", 15} };
+        using ElementsViewBase = AZStd::ranges::views::all_t<decltype((testPairVector))>;
+        using ElementsViewType = AZStd::ranges::elements_view<ElementsViewBase, 0>;
+
+        constexpr AZStd::string_view expectedString = "helloworldSun";
+        AZStd::string accumString;
+        for (auto&& stringValue : ElementsViewType(testPairVector))
+        {
+            accumString += stringValue;
+        }
+
+        EXPECT_EQ(expectedString, accumString);
+    }
+
+    TEST_F(RangesViewTestFixture, ElementsView_KeysAlias_CanIterateAssociativeContainerKeyType)
+    {
+        using PairType = AZStd::pair<int, const char*>;
+        AZStd::map testMap{ PairType{1, "Hello"}, PairType{2, "World"}, PairType{3, "Sun"}, PairType{45, "RandomText"} };
+
+        int accumResult{};
+        for (int key : AZStd::ranges::views::keys(testMap))
+        {
+            accumResult += key;
+        }
+
+        EXPECT_EQ(51, accumResult);
+    }
+
+    TEST_F(RangesViewTestFixture, ElementsView_ValuesAlias_CanIterateAssociativeContainerMappedType)
+    {
+        using PairType = AZStd::pair<int, const char*>;
+        AZStd::map testMap{ PairType{1, "Hello"}, PairType{2, "World"}, PairType{3, "Sun"}, PairType{45, "RandomText"} };
+
+        AZStd::string accumResult{};
+        for (const char* value : AZStd::ranges::views::values(testMap))
+        {
+            accumResult += value;
+        }
+
+        EXPECT_EQ("HelloWorldSunRandomText", accumResult);
+    }
+}
diff --git a/Code/Framework/AzCore/Tests/Main.cpp b/Code/Framework/AzCore/Tests/Main.cpp
index e2ad1c3b58..ee23d4ceab 100644
--- a/Code/Framework/AzCore/Tests/Main.cpp
+++ b/Code/Framework/AzCore/Tests/Main.cpp
@@ -7,28 +7,13 @@
  */
 
 #include <AzCore/UnitTest/UnitTest.h>
+#include <AzCore/UnitTest/TestTypes.h>
 #include <AzTest/AzTest.h>
 
 
 #if defined(HAVE_BENCHMARK)
 
-namespace AzCore
-{
-    class AzCoreBenchmarkEnvironment
-        : public AZ::Test::BenchmarkEnvironmentBase
-    {
-        void SetUpBenchmark() override
-        {
-            AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
-        }
-        void TearDownBenchmark() override
-        {
-            AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
-        }
-    };
-}
-
-AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV, AzCore::AzCoreBenchmarkEnvironment)
+AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV, UnitTest::ScopedAllocatorBenchmarkEnvironment)
 
 #else
 
diff --git a/Code/Framework/AzCore/Tests/Memory/AllocatorBenchmarks.cpp b/Code/Framework/AzCore/Tests/Memory/AllocatorBenchmarks.cpp
index e027b03a49..9ddd6ebf6b 100644
--- a/Code/Framework/AzCore/Tests/Memory/AllocatorBenchmarks.cpp
+++ b/Code/Framework/AzCore/Tests/Memory/AllocatorBenchmarks.cpp
@@ -291,7 +291,7 @@ namespace Benchmark
             for (auto _ : state)
             {
                 state.PauseTiming();
-                
+
                 AZStd::vector<void*>& perThreadAllocations = base::GetPerThreadAllocations(state.thread_index);
                 const size_t numberOfAllocations = perThreadAllocations.size();
                 size_t totalAllocationSize = 0;
@@ -300,7 +300,7 @@ namespace Benchmark
                     const AllocationSizeArray& allocationArray = s_allocationSizes[TAllocationSize];
                     const size_t allocationSize = allocationArray[allocationIndex % allocationArray.size()];
                     totalAllocationSize += allocationSize;
-                    
+
                     state.ResumeTiming();
                     perThreadAllocations[allocationIndex] = TestAllocatorType::Allocate(allocationSize, 0);
                     state.PauseTiming();
@@ -319,6 +319,8 @@ namespace Benchmark
                 TestAllocatorType::GarbageCollect();
 
                 state.SetItemsProcessed(numberOfAllocations);
+
+                state.ResumeTiming();
             }
         }
     };
@@ -364,6 +366,8 @@ namespace Benchmark
                 state.SetItemsProcessed(numberOfAllocations);
 
                 TestAllocatorType::GarbageCollect();
+
+                state.ResumeTiming();
             }
         }
     };
@@ -519,6 +523,8 @@ namespace Benchmark
                 state.SetItemsProcessed(itemsProcessed);
 
                 TestAllocatorType::GarbageCollect();
+
+                state.ResumeTiming();
             }
         }
     };
diff --git a/Code/Framework/AzCore/Tests/azcoretests_files.cmake b/Code/Framework/AzCore/Tests/azcoretests_files.cmake
index b8c13b5f40..aeff04b952 100644
--- a/Code/Framework/AzCore/Tests/azcoretests_files.cmake
+++ b/Code/Framework/AzCore/Tests/azcoretests_files.cmake
@@ -207,7 +207,9 @@ set(FILES
     AZStd/Optional.cpp
     AZStd/Pair.cpp
     AZStd/Parallel.cpp
+    AZStd/RangesAlgorithmTests.cpp
     AZStd/RangesTests.cpp
+    AZStd/RangesViewTests.cpp
     AZStd/ScopedLockTests.cpp
     AZStd/SetsIntrusive.cpp
     AZStd/SmartPtr.cpp
diff --git a/Code/Framework/AzFramework/AzFramework/SurfaceData/SurfaceData.cpp b/Code/Framework/AzFramework/AzFramework/SurfaceData/SurfaceData.cpp
index 55fec57bb6..e287c8d948 100644
--- a/Code/Framework/AzFramework/AzFramework/SurfaceData/SurfaceData.cpp
+++ b/Code/Framework/AzFramework/AzFramework/SurfaceData/SurfaceData.cpp
@@ -37,6 +37,7 @@ namespace AzFramework::SurfaceData
     {
         if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
+            serializeContext->Class<AZStd::fixed_vector<SurfaceTagWeight, Constants::MaxSurfaceWeights>>();
             serializeContext->Class<SurfacePoint>()
                 ->Field("m_position", &SurfacePoint::m_position)
                 ->Field("m_normal", &SurfacePoint::m_normal)
@@ -46,6 +47,7 @@ namespace AzFramework::SurfaceData
 
         if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
         {
+            behaviorContext->Class<AZStd::fixed_vector<SurfaceTagWeight, Constants::MaxSurfaceWeights>>();
             behaviorContext->Class<SurfacePoint>("AzFramework::SurfaceData::SurfacePoint")
                 ->Attribute(AZ::Script::Attributes::Category, "SurfaceData")
                 ->Constructor()
diff --git a/Code/Framework/AzFramework/AzFramework/SurfaceData/SurfaceData.h b/Code/Framework/AzFramework/AzFramework/SurfaceData/SurfaceData.h
index 9faa03f921..45e2ad3abb 100644
--- a/Code/Framework/AzFramework/AzFramework/SurfaceData/SurfaceData.h
+++ b/Code/Framework/AzFramework/AzFramework/SurfaceData/SurfaceData.h
@@ -10,13 +10,19 @@
 #include <AzCore/Math/Crc.h>
 #include <AzCore/Math/Vector2.h>
 #include <AzCore/Math/Vector3.h>
-#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/containers/fixed_vector.h>
 
 namespace AzFramework::SurfaceData
 {
     namespace Constants
     {
         static constexpr const char* s_unassignedTagName = "(unassigned)";
+
+        //! The maximum number of surface weights that we can store.
+        //! For performance reasons, we want to limit this so that we can preallocate the max size in advance.
+        //! The current number is chosen to be higher than expected needs, but small enough to avoid being excessively wasteful.
+        //! (Dynamic structures would end up taking more memory than what we're preallocating)
+        static constexpr size_t MaxSurfaceWeights = 16;
     }
 
     struct SurfaceTagWeight
@@ -70,7 +76,7 @@ namespace AzFramework::SurfaceData
         }
     };
 
-    using SurfaceTagWeightList = AZStd::vector<SurfaceTagWeight>;
+    using SurfaceTagWeightList = AZStd::fixed_vector<SurfaceTagWeight, Constants::MaxSurfaceWeights>;
 
     struct SurfacePoint final
     {
diff --git a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
index 7909a7ec83..a7d65e2bb5 100644
--- a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
@@ -8,10 +8,12 @@
 #pragma once
 
 #include <AzCore/EBus/EBus.h>
+#include <AzCore/Jobs/JobContext.h>
 #include <AzCore/Math/Vector2.h>
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Aabb.h>
 #include <AzCore/std/containers/span.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzFramework/Entity/EntityContextBus.h>
 #include <AzFramework/Render/GeometryIntersectionStructures.h>
 #include <AzFramework/SurfaceData/SurfaceData.h>
@@ -193,6 +195,147 @@ namespace AzFramework
             //! Given a ray, return the closest intersection with terrain.
             virtual RenderGeometry::RayResult GetClosestIntersection(const RenderGeometry::RayRequest& ray) const = 0;
 
+            //! A JobContext used to run jobs spawned by calls to the various Process*Async functions.
+            class TerrainJobContext : public AZ::JobContext
+            {
+            public:
+                TerrainJobContext(AZ::JobManager& jobManager,
+                                  int numJobsToComplete)
+                    : JobContext(jobManager)
+                    , m_numJobsToComplete(numJobsToComplete)
+                {
+                }
+
+                // When a terrain job context is cancelled, all associated
+                // jobs are still guaranteed to at least begin processing,
+                // and if any ProcessAsyncParams::m_completionCallback was
+                // set it's guaranteed to be called even in the event of a
+                // cancellation. If a job only begins processing after its
+                // associated job context has been cancelled, no processing
+                // will occur and the callback will be invoked immediately,
+                // otherwise the job may either run to completion or cease
+                // processing early; the callback is invoked in all cases,
+                // provided one was specified with the original request.
+                void Cancel() { m_isCancelled = true; }
+
+                // Was this TerrainJobContext cancelled?
+                bool IsCancelled() const { return m_isCancelled; }
+
+                // Called by the TerrainSystem when a job associated with
+                // this TerrainJobContext completes. Returns true if this
+                // was the final job to be completed, or false otherwise.
+                bool OnJobCompleted() { return (--m_numJobsToComplete == 0); }
+
+            private:
+                AZStd::atomic_int m_numJobsToComplete = 0;
+                AZStd::atomic_bool m_isCancelled = false;
+            };
+
+            //! Alias for an optional callback function to invoke when the various Process*Async functions complete.
+            //! The TerrainJobContext, returned from the original Process*Async function call, is passed as a param
+            //! to the callback function so it can be queried to see if the job was cancelled or completed normally.
+            typedef AZStd::function<void(AZStd::shared_ptr<TerrainJobContext>)> ProcessAsyncCompleteCallback;
+
+            //! A parameter group struct that can optionally be passed to the various Process*Async API functions.
+            struct ProcessAsyncParams
+            {
+                //! The default minimum  number ofpositions per async terrain request job.
+                static constexpr int32_t MinPositionsPerJobDefault = 8;
+
+                //! The default number of jobs which async terrain requests will be split into.
+                static constexpr int32_t NumJobsDefault = 1;
+
+                //! The maximum number of jobs which async terrain requests will be split into.
+                //! This is not the value itself, rather a constant that can be used to request
+                //! the work be split into the maximum number of job manager threads available.
+                static constexpr int32_t NumJobsMax = -1;
+
+                //! The desired number of jobs to split async terrain requests into.
+                //! The actual value used will be clamped to the number of available job manager threads.
+                //!
+                //! Note: Currently, splitting the work over multiple threads causes contention when
+                //! locking various mutexes, resulting in slower overall wall time for async
+                //! requests split over multiple threads vs one where all the work is done on
+                //! a single thread. The latter is still preferable over a regular synchronous
+                //! call because it is just as quick and prevents the main thread from blocking.
+                //! This note should be removed once the mutex contention issues have been addressed.
+                int32_t m_desiredNumberOfJobs = NumJobsDefault;
+
+                //! The minimum number of positions per async terrain request job.
+                int32_t m_minPositionsPerJob = MinPositionsPerJobDefault;
+
+                //! The callback function that will be invoked when a call to a Process*Async function completes.
+                //! If the job is cancelled, the completion callback will not be invoked.
+                ProcessAsyncCompleteCallback m_completionCallback = nullptr;
+            };
+
+            //! Asynchronous versions of the various 'Process*' API functions declared above.
+            //! It's the responsibility of the caller to ensure all callbacks are threadsafe.
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessHeightsFromListAsync(
+                const AZStd::span<AZ::Vector3>& inPositions,
+                SurfacePointListFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessNormalsFromListAsync(
+                const AZStd::span<AZ::Vector3>& inPositions,
+                SurfacePointListFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessSurfaceWeightsFromListAsync(
+                const AZStd::span<AZ::Vector3>& inPositions,
+                SurfacePointListFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessSurfacePointsFromListAsync(
+                const AZStd::span<AZ::Vector3>& inPositions,
+                SurfacePointListFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessHeightsFromListOfVector2Async(
+                const AZStd::span<AZ::Vector2>& inPositions,
+                SurfacePointListFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessNormalsFromListOfVector2Async(
+                const AZStd::span<AZ::Vector2>& inPositions,
+                SurfacePointListFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessSurfaceWeightsFromListOfVector2Async(
+                const AZStd::span<AZ::Vector2>& inPositions,
+                SurfacePointListFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessSurfacePointsFromListOfVector2Async(
+                const AZStd::span<AZ::Vector2>& inPositions,
+                SurfacePointListFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessHeightsFromRegionAsync(
+                const AZ::Aabb& inRegion,
+                const AZ::Vector2& stepSize,
+                SurfacePointRegionFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessNormalsFromRegionAsync(
+                const AZ::Aabb& inRegion,
+                const AZ::Vector2& stepSize,
+                SurfacePointRegionFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessSurfaceWeightsFromRegionAsync(
+                const AZ::Aabb& inRegion,
+                const AZ::Vector2& stepSize,
+                SurfacePointRegionFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+            virtual AZStd::shared_ptr<TerrainJobContext> ProcessSurfacePointsFromRegionAsync(
+                const AZ::Aabb& inRegion,
+                const AZ::Vector2& stepSize,
+                SurfacePointRegionFillCallback perPositionCallback,
+                Sampler sampleFilter = Sampler::DEFAULT,
+                AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const = 0;
+
         private:
             // Private variations of the GetSurfacePoint API exposed to BehaviorContext that returns a value instead of
             // using an "out" parameter. The "out" parameter is useful for reusing memory allocated in SurfacePoint when
diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
index 544afe6d69..4e230e2ad8 100644
--- a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
+++ b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h
@@ -8,11 +8,10 @@
 
 #pragma once
 
+#include <AzCore/std/chrono/chrono.h>
 #include <AzCore/std/functional.h>
 #include <AzCore/std/optional.h>
 
-#include <chrono>
-
 namespace AzFramework
 {
     //! Default value to use for detecting if the mouse has moved far enough after a mouse down to no longer
diff --git a/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h b/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h
index 4b9658eebb..8f130ceeae 100644
--- a/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h
+++ b/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h
@@ -106,5 +106,30 @@ namespace UnitTest
             GetTerrainRaycastEntityContextId, AzFramework::EntityContextId());
         MOCK_CONST_METHOD1(
             GetClosestIntersection, AzFramework::RenderGeometry::RayResult(const AzFramework::RenderGeometry::RayRequest&));
+        MOCK_CONST_METHOD4(
+            ProcessHeightsFromListAsync, AZStd::shared_ptr<TerrainJobContext>(const AZStd::span<AZ::Vector3>&, AzFramework::Terrain::SurfacePointListFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        MOCK_CONST_METHOD4(
+            ProcessNormalsFromListAsync, AZStd::shared_ptr<TerrainJobContext>(const AZStd::span<AZ::Vector3>&, AzFramework::Terrain::SurfacePointListFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        MOCK_CONST_METHOD4(
+            ProcessSurfaceWeightsFromListAsync, AZStd::shared_ptr<TerrainJobContext>(const AZStd::span<AZ::Vector3>&, AzFramework::Terrain::SurfacePointListFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        MOCK_CONST_METHOD4(
+            ProcessSurfacePointsFromListAsync, AZStd::shared_ptr<TerrainJobContext>(const AZStd::span<AZ::Vector3>&, AzFramework::Terrain::SurfacePointListFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        MOCK_CONST_METHOD4(
+            ProcessHeightsFromListOfVector2Async, AZStd::shared_ptr<TerrainJobContext>(const AZStd::span<AZ::Vector2>&, AzFramework::Terrain::SurfacePointListFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        MOCK_CONST_METHOD4(
+            ProcessNormalsFromListOfVector2Async, AZStd::shared_ptr<TerrainJobContext>(const AZStd::span<AZ::Vector2>&, AzFramework::Terrain::SurfacePointListFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        MOCK_CONST_METHOD4(
+            ProcessSurfaceWeightsFromListOfVector2Async, AZStd::shared_ptr<TerrainJobContext>(const AZStd::span<AZ::Vector2>&, AzFramework::Terrain::SurfacePointListFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        MOCK_CONST_METHOD4(
+            ProcessSurfacePointsFromListOfVector2Async, AZStd::shared_ptr<TerrainJobContext>(const AZStd::span<AZ::Vector2>&, AzFramework::Terrain::SurfacePointListFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        MOCK_CONST_METHOD5(
+            ProcessHeightsFromRegionAsync, AZStd::shared_ptr<TerrainJobContext>(const AZ::Aabb&, const AZ::Vector2&, AzFramework::Terrain::SurfacePointRegionFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        MOCK_CONST_METHOD5(
+            ProcessNormalsFromRegionAsync, AZStd::shared_ptr<TerrainJobContext>(const AZ::Aabb&, const AZ::Vector2&, AzFramework::Terrain::SurfacePointRegionFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        MOCK_CONST_METHOD5(
+            ProcessSurfaceWeightsFromRegionAsync, AZStd::shared_ptr<TerrainJobContext>(const AZ::Aabb&, const AZ::Vector2&, AzFramework::Terrain::SurfacePointRegionFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        MOCK_CONST_METHOD5(
+            ProcessSurfacePointsFromRegionAsync, AZStd::shared_ptr<TerrainJobContext>(const AZ::Aabb&, const AZ::Vector2&, AzFramework::Terrain::SurfacePointRegionFillCallback, Sampler, AZStd::shared_ptr<ProcessAsyncParams>));
+        
     };
 } // namespace UnitTest
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
index cbdf0d6996..207baa9a36 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h
@@ -46,9 +46,9 @@ namespace AzManipulatorTestFramework
         //! Send a double click event.
         DerivedDispatcherT* MouseLButtonDoubleClick();
         //! Set the keyboard modifier button down.
-        DerivedDispatcherT* KeyboardModifierDown(const AzToolsFramework::ViewportInteraction::KeyboardModifier& keyModifier);
+        DerivedDispatcherT* KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier keyModifier);
         //! Set the keyboard modifier button up.
-        DerivedDispatcherT* KeyboardModifierUp(const AzToolsFramework::ViewportInteraction::KeyboardModifier& keyModifier);
+        DerivedDispatcherT* KeyboardModifierUp(AzToolsFramework::ViewportInteraction::KeyboardModifier keyModifier);
         //! Set the mouse position to the specified screen space position.
         DerivedDispatcherT* MousePosition(const AzFramework::ScreenPoint& position);
         //! Expect the selected manipulator to be interacting.
@@ -81,8 +81,8 @@ namespace AzManipulatorTestFramework
         virtual void MouseMButtonUpImpl() = 0;
         virtual void MouseLButtonDoubleClickImpl() = 0;
         virtual void MousePositionImpl(const AzFramework::ScreenPoint& position) = 0;
-        virtual void KeyboardModifierDownImpl(const AzToolsFramework::ViewportInteraction::KeyboardModifier& keyModifier) = 0;
-        virtual void KeyboardModifierUpImpl(const AzToolsFramework::ViewportInteraction::KeyboardModifier& keyModifier) = 0;
+        virtual void KeyboardModifierDownImpl(AzToolsFramework::ViewportInteraction::KeyboardModifier keyModifier) = 0;
+        virtual void KeyboardModifierUpImpl(AzToolsFramework::ViewportInteraction::KeyboardModifier keyModifier) = 0;
         virtual void ExpectManipulatorBeingInteractedImpl() = 0;
         virtual void ExpectManipulatorNotBeingInteractedImpl() = 0;
         virtual void SetEntityWorldTransformImpl(AZ::EntityId entityId, const AZ::Transform& transform) = 0;
@@ -94,7 +94,7 @@ namespace AzManipulatorTestFramework
         bool m_logging = false;
 
     private:
-        const char* KeyboardModifierString(const AzToolsFramework::ViewportInteraction::KeyboardModifier& keyModifier);
+        const char* KeyboardModifierString(AzToolsFramework::ViewportInteraction::KeyboardModifier keyModifier);
         static void DebugPrint(const char* format, ...);
     };
 
@@ -215,7 +215,7 @@ namespace AzManipulatorTestFramework
 
     template<typename DerivedDispatcherT>
     const char* ActionDispatcher<DerivedDispatcherT>::KeyboardModifierString(
-        const AzToolsFramework::ViewportInteraction::KeyboardModifier& keyModifier)
+        const AzToolsFramework::ViewportInteraction::KeyboardModifier keyModifier)
     {
         using namespace AzToolsFramework::ViewportInteraction;
         switch (keyModifier)
@@ -235,7 +235,7 @@ namespace AzManipulatorTestFramework
 
     template<typename DerivedDispatcherT>
     DerivedDispatcherT* ActionDispatcher<DerivedDispatcherT>::KeyboardModifierDown(
-        const AzToolsFramework::ViewportInteraction::KeyboardModifier& keyModifier)
+        const AzToolsFramework::ViewportInteraction::KeyboardModifier keyModifier)
     {
         Log("Keyboard modifier down: %s", KeyboardModifierString(keyModifier));
         KeyboardModifierDownImpl(keyModifier);
@@ -244,7 +244,7 @@ namespace AzManipulatorTestFramework
 
     template<typename DerivedDispatcherT>
     DerivedDispatcherT* ActionDispatcher<DerivedDispatcherT>::KeyboardModifierUp(
-        const AzToolsFramework::ViewportInteraction::KeyboardModifier& keyModifier)
+        const AzToolsFramework::ViewportInteraction::KeyboardModifier keyModifier)
     {
         Log("Keyboard modifier up: %s", KeyboardModifierString(keyModifier));
         KeyboardModifierUpImpl(keyModifier);
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
index 8a05a15fd9..16b8966ba4 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h
@@ -66,8 +66,8 @@ namespace AzManipulatorTestFramework
         void MouseMButtonUpImpl() override;
         void MouseLButtonDoubleClickImpl() override;
         void MousePositionImpl(const AzFramework::ScreenPoint& position) override;
-        void KeyboardModifierDownImpl(const KeyboardModifier& keyModifier) override;
-        void KeyboardModifierUpImpl(const KeyboardModifier& keyModifier) override;
+        void KeyboardModifierDownImpl(KeyboardModifier keyModifier) override;
+        void KeyboardModifierUpImpl(KeyboardModifier keyModifier) override;
         void ExpectManipulatorBeingInteractedImpl() override;
         void ExpectManipulatorNotBeingInteractedImpl() override;
         void SetEntityWorldTransformImpl(AZ::EntityId entityId, const AZ::Transform& transform) override;
diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
index 715c2b1083..eb578162a6 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp
@@ -126,12 +126,12 @@ namespace AzManipulatorTestFramework
         m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event);
     }
 
-    void ImmediateModeActionDispatcher::KeyboardModifierDownImpl(const KeyboardModifier& keyModifier)
+    void ImmediateModeActionDispatcher::KeyboardModifierDownImpl(const KeyboardModifier keyModifier)
     {
         ToggleOn(GetMouseInteractionEvent()->m_mouseInteraction.m_keyboardModifiers.m_keyModifiers, keyModifier);
     }
 
-    void ImmediateModeActionDispatcher::KeyboardModifierUpImpl(const KeyboardModifier& keyModifier)
+    void ImmediateModeActionDispatcher::KeyboardModifierUpImpl(const KeyboardModifier keyModifier)
     {
         ToggleOff(GetMouseInteractionEvent()->m_mouseInteraction.m_keyboardModifiers.m_keyModifiers, keyModifier);
     }
diff --git a/Code/Framework/AzTest/AzTest/AzTest.h b/Code/Framework/AzTest/AzTest/AzTest.h
index 4b038cabd4..d40eb0eb75 100644
--- a/Code/Framework/AzTest/AzTest/AzTest.h
+++ b/Code/Framework/AzTest/AzTest/AzTest.h
@@ -164,6 +164,16 @@ namespace AZ
                 m_envs.push_back(std::move(env));
             }
 
+            // Remove a registered benchmark from the registry
+            void RemoveBenchmarkEnvironment(BenchmarkEnvironmentBase* env)
+            {
+                auto RemoveBenchmarkFunc = [env](const std::unique_ptr<BenchmarkEnvironmentBase>& envElement)
+                {
+                    return envElement.get() == env;
+                };
+                m_envs.erase(std::remove_if(m_envs.begin(), m_envs.end(), std::move(RemoveBenchmarkFunc)));
+            }
+
             std::vector<std::unique_ptr<BenchmarkEnvironmentBase>>& GetBenchmarkEnvironments()
             {
                 return m_envs;
@@ -194,21 +204,26 @@ namespace AZ
             return *benchmarkEnv;
         }
 
-        template<typename... Ts>
-        std::array<BenchmarkEnvironmentBase*, sizeof...(Ts)> RegisterBenchmarkEnvironments()
+        /*
+         * An RAII wrapper about registering a BenchmarkEnvironment with the BenchmarkRegistry
+         * It will unregister the BenchmarkEnvironment with the BenchmarkRegistry on destruction
+         */
+        struct ScopedRegisterBenchmarkEnvironment
         {
-            constexpr size_t EnvironmentCount{ sizeof...(Ts) };
-            if constexpr (EnvironmentCount)
+            template<typename T>
+            ScopedRegisterBenchmarkEnvironment(T& benchmarkEnv)
+                : m_benchmarkEnv(benchmarkEnv)
+            {}
+            ~ScopedRegisterBenchmarkEnvironment()
             {
-                std::array<BenchmarkEnvironmentBase*, EnvironmentCount> benchmarkEnvs{ { &RegisterBenchmarkEnvironment<Ts>()... } };
-                return benchmarkEnvs;
+                if (auto benchmarkRegistry = AZ::Environment::FindVariable<BenchmarkEnvironmentRegistry>(s_benchmarkEnvironmentName);
+                    benchmarkRegistry != nullptr)
+                {
+                    benchmarkRegistry->RemoveBenchmarkEnvironment(&m_benchmarkEnv);
+                }
             }
-            else
-            {
-                std::array<BenchmarkEnvironmentBase*, EnvironmentCount> benchmarkEnvs{};
-                return benchmarkEnvs;
-            }
-        }
+            BenchmarkEnvironmentBase& m_benchmarkEnv;
+        };
 #endif
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         //! listener class to capture and print test output for embedded platforms
@@ -276,7 +291,7 @@ namespace AZ
 #define AZ_BENCHMARK_HOOK_ENV(TEST_ENV) \
 AZTEST_EXPORT int AzRunBenchmarks(int argc, char** argv) \
 { \
-    AZ::Test::RegisterBenchmarkEnvironments<TEST_ENV>(); \
+    AZ::Test::ScopedRegisterBenchmarkEnvironment scopedBenchmarkEnv(AZ::Test::RegisterBenchmarkEnvironment<TEST_ENV>()); \
     auto benchmarkEnvRegistry = AZ::Environment::FindVariable<AZ::Test::BenchmarkEnvironmentRegistry>(AZ::Test::s_benchmarkEnvironmentName); \
     std::vector<std::unique_ptr<AZ::Test::BenchmarkEnvironmentBase>>* benchmarkEnvs = benchmarkEnvRegistry ? &(benchmarkEnvRegistry->GetBenchmarkEnvironments()) : nullptr; \
     if (benchmarkEnvs != nullptr) \
@@ -307,7 +322,6 @@ AZTEST_EXPORT int AzRunBenchmarks(int argc, char** argv) \
 #define AZ_BENCHMARK_HOOK() \
 AZTEST_EXPORT int AzRunBenchmarks(int argc, char** argv) \
 { \
-    AZ::Test::RegisterBenchmarkEnvironments<>(); \
     auto benchmarkEnvRegistry = AZ::Environment::FindVariable<AZ::Test::BenchmarkEnvironmentRegistry>(AZ::Test::s_benchmarkEnvironmentName); \
     std::vector<std::unique_ptr<AZ::Test::BenchmarkEnvironmentBase>>* benchmarkEnvs = benchmarkEnvRegistry ? &(benchmarkEnvRegistry->GetBenchmarkEnvironments()) : nullptr; \
     if (benchmarkEnvs != nullptr) \
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
index 172bd3a29c..a91102b85c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp
@@ -21,7 +21,6 @@
 #include <AzToolsFramework/AssetBrowser/AssetEntryChangeset.h>
 #include <AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntryCache.h>
 #include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailContext.h>
 #include <AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h>
 #include <AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h>
 #include <AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h>
@@ -71,9 +70,9 @@ namespace AzToolsFramework
             AssetBrowserInteractionNotificationBus::Handler::BusConnect();
 
             using namespace Thumbnailer;
-            ThumbnailerRequestBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(FolderThumbnailCache), ThumbnailContext::DefaultContext);
-            ThumbnailerRequestBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(SourceThumbnailCache), ThumbnailContext::DefaultContext);
-            ThumbnailerRequestBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(ProductThumbnailCache), ThumbnailContext::DefaultContext);
+            ThumbnailerRequestBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(FolderThumbnailCache));
+            ThumbnailerRequestBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(SourceThumbnailCache));
+            ThumbnailerRequestBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(ProductThumbnailCache));
 
             AzFramework::SocketConnection* socketConn = AzFramework::SocketConnection::GetInstance();
             AZ_Assert(socketConn, "AzToolsFramework::AssetBrowser::AssetBrowserComponent requires a valid socket conection!");
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp
index 4e3b8ee745..a37efbd565 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.cpp
@@ -82,7 +82,7 @@ namespace AzToolsFramework
             });
             connect(m_ui->m_assetBrowserTreeViewWidget, &QAbstractItemView::doubleClicked, this, &AssetPickerDialog::DoubleClickedSlot);
             connect(m_ui->m_assetBrowserTreeViewWidget, &AssetBrowserTreeView::selectionChangedSignal, this,
-                [this](const QItemSelection&, const QItemSelection&){ AssetPickerDialog::SelectionChangedSlot(); });
+                [this](const QItemSelection&, const QItemSelection&){ SelectionChangedSlot(); });
             connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
             connect(m_ui->m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
@@ -153,7 +153,7 @@ namespace AzToolsFramework
                     m_ui->m_assetBrowserTableViewWidget, &AssetBrowserTableView::selectionChangedSignal, this,
                     [this](const QItemSelection&, const QItemSelection&)
                     {
-                        AssetPickerDialog::SelectionChangedSlot();
+                        SelectionChangedSlot();
                     });
 
                 connect(m_ui->m_assetBrowserTableViewWidget, &QAbstractItemView::doubleClicked, this, &AssetPickerDialog::DoubleClickedSlot);
@@ -174,8 +174,15 @@ namespace AzToolsFramework
                 m_tableModel->UpdateTableModelMaps();
             }
 
-            QTimer::singleShot(0, this, &AssetPickerDialog::RestoreState);
-            SelectionChangedSlot();
+            QTimer::singleShot(0, this, [this]() {
+                RestoreState();
+
+                // The selection doesn't propagate immediately, so we need to delay
+                // it as well so that the OK button can be updated appropriately.
+                // Otherwise, it will always be disabled when you first launch
+                // the asset picker dialog.
+                SelectionChangedSlot();
+            });
         }
 
         AssetPickerDialog::~AssetPickerDialog() = default;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.h
index f8ec6077ce..af8f636f37 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.h
@@ -58,16 +58,16 @@ namespace AzToolsFramework
             void keyPressEvent(QKeyEvent* e) override;
             void resizeEvent(QResizeEvent* resizeEvent) override;
 
-        private Q_SLOTS:
+        protected Q_SLOTS:
             void DoubleClickedSlot(const QModelIndex& index);
             void SelectionChangedSlot();
             void RestoreState();
             void OnFilterUpdated();
 
-        private:
+        protected:
             //! Evaluate whether current selection is valid.
             //! Valid selection requires exactly one item to be selected, must be source or product type, and must match the wildcard filter
-            bool EvaluateSelection() const;
+            virtual bool EvaluateSelection() const;
             void UpdatePreview() const;
             void SaveState();
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp
index 5dd0cf5170..bc7ad75957 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp
@@ -75,7 +75,9 @@ namespace AzToolsFramework
                     bool foundIt = false;
                     AZStd::string watchFolder;
                     AZ::Data::AssetInfo assetInfo;
-                    AzToolsFramework::AssetSystemRequestBus::BroadcastResult(foundIt, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath, iconPath.toUtf8().constData(), assetInfo, watchFolder);
+                    AssetSystemRequestBus::BroadcastResult(
+                        foundIt, &AssetSystemRequestBus::Events::GetSourceInfoBySourcePath, iconPath.toUtf8().constData(), assetInfo,
+                        watchFolder);
 
                     if (foundIt)
                     {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
index 4869e0d09f..d7eb83a0bb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp
@@ -67,7 +67,8 @@ namespace AzToolsFramework
             bool foundIt = false;
             AZStd::string watchFolder;
             AZ::Data::AssetInfo assetInfo;
-            AssetSystemRequestBus::BroadcastResult(foundIt, &AssetSystemRequestBus::Events::GetSourceInfoBySourceUUID, sourceKey->GetSourceUuid(), assetInfo, watchFolder);
+            AssetSystemRequestBus::BroadcastResult(
+                foundIt, &AssetSystemRequestBus::Events::GetSourceInfoBySourceUUID, sourceKey->GetSourceUuid(), assetInfo, watchFolder);
 
             QString iconPathToUse;
             if (foundIt)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp
index 93a153cc16..c976f01fde 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp
@@ -203,11 +203,6 @@ namespace AzToolsFramework
             return selectionModel()->selectedIndexes();
         }
 
-        void AssetBrowserTreeView::SetThumbnailContext(const char* thumbnailContext) const
-        {
-            m_delegate->SetThumbnailContext(thumbnailContext);
-        }
-
         void AssetBrowserTreeView::SetShowSourceControlIcons(bool showSourceControlsIcons)
         {
             m_delegate->SetShowSourceControlIcons(showSourceControlsIcons);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h
index cae50efe17..ea13c0d2a6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h
@@ -73,7 +73,6 @@ namespace AzToolsFramework
             void OnAssetBrowserComponentReady() override;
             //////////////////////////////////////////////////////////////////////////
 
-            void SetThumbnailContext(const char* context) const;
             void SetShowSourceControlIcons(bool showSourceControlsIcons);
             void UpdateAfterFilter(bool hasFilter, bool selectFirstValidEntry);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp
index 5eca1f457f..c4ce1012c1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp
@@ -112,11 +112,6 @@ namespace AzToolsFramework
             }
         }
 
-        void EntryDelegate::SetThumbnailContext(const char* thumbnailContext)
-        {
-            m_thumbnailContext = thumbnailContext;
-        }
-
         void EntryDelegate::SetShowSourceControlIcons(bool showSourceControl)
         {
             m_showSourceControl = showSourceControl;
@@ -125,8 +120,8 @@ namespace AzToolsFramework
         int EntryDelegate::DrawThumbnail(QPainter* painter, const QPoint& point, const QSize& size, Thumbnailer::SharedThumbnailKey thumbnailKey) const
         {
             SharedThumbnail thumbnail;
-            ThumbnailerRequestsBus::BroadcastResult(thumbnail, &ThumbnailerRequests::GetThumbnail, thumbnailKey, m_thumbnailContext.c_str());
-            AZ_Assert(thumbnail, "The shared numbernail was not available from the ThumbnailerRequestsBus.");
+            ThumbnailerRequestBus::BroadcastResult(thumbnail, &ThumbnailerRequests::GetThumbnail, thumbnailKey);
+            AZ_Assert(thumbnail, "The shared numbernail was not available from the ThumbnailerRequestBus.");
             AZ_Assert(painter, "A null QPainter was passed in to DrawThumbnail.");
             if (!painter || !thumbnail || thumbnail->GetState() == Thumbnail::State::Failed)
             {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.h
index 7c7d919f2d..be7f919462 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.h
@@ -11,7 +11,6 @@
 #if !defined(Q_MOC_RUN)
 #include <AzCore/std/function/function_fwd.h>
 #include <AzToolsFramework/Thumbnails/Thumbnail.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailContext.h>
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // 4251: class 'QScopedPointer<QBrushData,QBrushDataPointerDeleter>' needs to have dll-interface to be used by clients of class 'QBrush'
                                                                // 4800: 'uint': forcing value to bool 'true' or 'false' (performance warning)
 #include <QStyledItemDelegate>
@@ -50,14 +49,11 @@ namespace AzToolsFramework
 
             QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
             void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-            //! Set location where thumbnails are located for this instance of asset browser
-            void SetThumbnailContext(const char* thumbnailContext);
             //! Set whether to show source control icons, this is still temporary mainly to support existing functionality of material browser
             void SetShowSourceControlIcons(bool showSourceControl);
 
         protected:
             int m_iconSize;
-            AZStd::string m_thumbnailContext = ThumbnailContext::DefaultContext;
             bool m_showSourceControl = false;
             //! Draw a thumbnail and return its width
             int DrawThumbnail(QPainter* painter, const QPoint& point, const QSize& size, Thumbnailer::SharedThumbnailKey thumbnailKey) const;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.cpp
index 7e496390c8..4c08ef6855 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.cpp
@@ -14,6 +14,8 @@
 #include <AzToolsFramework/Manipulators/ManipulatorSnapping.h>
 #include <AzFramework/Viewport/ViewportColors.h>
 #include <AzFramework/Viewport/ViewportConstants.h>
+#include <AzCore/Component/TransformBus.h>
+#include <AzCore/Component/NonUniformScaleBus.h>
 
 namespace AzToolsFramework
 {
@@ -37,20 +39,20 @@ namespace AzToolsFramework
     void BoxViewportEdit::UpdateManipulators()
     {
         AZ::Transform boxWorldFromLocal = AZ::Transform::CreateIdentity();
-        BoxManipulatorRequestBus::EventResult(
-            boxWorldFromLocal, m_entityComponentIdPair, &BoxManipulatorRequests::GetCurrentTransform);
+        AZ::TransformBus::EventResult(
+            boxWorldFromLocal, m_entityComponentIdPair.GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
 
-        AZ::Vector3 boxScale = AZ::Vector3::CreateOne();
-        BoxManipulatorRequestBus::EventResult(
-            boxScale, m_entityComponentIdPair, &BoxManipulatorRequests::GetBoxScale);
+        AZ::Vector3 nonUniformScale = AZ::Vector3::CreateOne();
+        AZ::NonUniformScaleRequestBus::EventResult(
+            nonUniformScale, m_entityComponentIdPair.GetEntityId(), &AZ::NonUniformScaleRequestBus::Events::GetScale);
 
         AZ::Vector3 boxDimensions = AZ::Vector3::CreateZero();
         BoxManipulatorRequestBus::EventResult(
-            boxDimensions, m_entityComponentIdPair, &BoxManipulatorRequests::GetDimensions);
+            boxDimensions, m_entityComponentIdPair, &BoxManipulatorRequestBus::Events::GetDimensions);
 
-        // ensure we apply the entity scale to the box dimensions so
-        // the manipulators appear in the correct location
-        boxDimensions *= boxScale;
+        AZ::Transform boxLocalTransform = AZ::Transform::CreateIdentity();
+        BoxManipulatorRequestBus::EventResult(
+            boxLocalTransform, m_entityComponentIdPair, &BoxManipulatorRequestBus::Events::GetCurrentLocalTransform);
 
         for (size_t manipulatorIndex = 0; manipulatorIndex < m_linearManipulators.size(); ++manipulatorIndex)
         {
@@ -58,7 +60,8 @@ namespace AzToolsFramework
             {
                 linearManipulator->SetSpace(boxWorldFromLocal);
                 linearManipulator->SetLocalTransform(
-                    AZ::Transform::CreateTranslation(s_boxAxes[manipulatorIndex] * 0.5f * boxDimensions));
+                    boxLocalTransform * AZ::Transform::CreateTranslation(s_boxAxes[manipulatorIndex] * 0.5f * boxDimensions));
+                linearManipulator->SetNonUniformScale(nonUniformScale);
                 linearManipulator->SetBoundsDirty();
             }
         }
@@ -69,8 +72,8 @@ namespace AzToolsFramework
         m_entityComponentIdPair = entityComponentIdPair;
 
         AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity();
-        BoxManipulatorRequestBus::EventResult(
-            worldFromLocal, entityComponentIdPair, &BoxManipulatorRequests::GetCurrentTransform);
+        AZ::TransformBus::EventResult(
+            worldFromLocal, entityComponentIdPair.GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
 
         for (size_t manipulatorIndex = 0; manipulatorIndex < m_linearManipulators.size(); ++manipulatorIndex)
         {
@@ -85,36 +88,35 @@ namespace AzToolsFramework
 
                 ManipulatorViews views;
                 views.emplace_back(CreateManipulatorViewQuadBillboard(
-                    AzFramework::ViewportColors::DefaultManipulatorHandleColor, AzFramework::ViewportConstants::DefaultManipulatorHandleSize));
+                    AzFramework::ViewportColors::DefaultManipulatorHandleColor,
+                    AzFramework::ViewportConstants::DefaultManipulatorHandleSize));
                 linearManipulator->SetViews(AZStd::move(views));
 
                 linearManipulator->InstallMouseMoveCallback(
-                    [this, entityComponentIdPair](
-                        const LinearManipulator::Action& action)
+                    [this, entityComponentIdPair,
+                     transformScale{ linearManipulator->GetSpace().GetUniformScale() }](const LinearManipulator::Action& action)
                 {
+                    AZ::Transform boxLocalTransform = AZ::Transform::CreateIdentity();
+                    BoxManipulatorRequestBus::EventResult(
+                        boxLocalTransform, entityComponentIdPair, &BoxManipulatorRequestBus::Events::GetCurrentLocalTransform);
+
+                    const AZ::Vector3 manipulatorPosition = GetPositionInManipulatorFrame(transformScale, boxLocalTransform, action);
+
                     // calculate the amount of displacement along an axis this manipulator has moved
                     // clamp movement so it cannot go negative based on axis direction
                     const AZ::Vector3 axisDisplacement =
-                        action.LocalPosition().GetAbs() * 2.0f
-                        * AZ::GetMax<float>(0.0f, action.LocalPosition().GetNormalized().Dot(action.m_fixed.m_axis));
-
-                    AZ::Vector3 boxScale = AZ::Vector3::CreateOne();
-                    BoxManipulatorRequestBus::EventResult(
-                        boxScale, entityComponentIdPair, &BoxManipulatorRequests::GetBoxScale);
+                        manipulatorPosition.GetAbs() * 2.0f
+                        * AZ::GetMax(0.0f, manipulatorPosition.GetNormalized().Dot(action.m_fixed.m_axis));
 
                     AZ::Vector3 boxDimensions = AZ::Vector3::CreateZero();
                     BoxManipulatorRequestBus::EventResult(
-                        boxDimensions, entityComponentIdPair, &BoxManipulatorRequests::GetDimensions);
-
-                    // ensure we take into account the entity scale using the axis displacement
-                    const AZ::Vector3 scaledAxisDisplacement =
-                        axisDisplacement / boxScale;
+                        boxDimensions, entityComponentIdPair, &BoxManipulatorRequestBus::Events::GetDimensions);
 
                     // update dimensions - preserve dimensions not effected by this
                     // axis, and update current axis displacement
                     BoxManipulatorRequestBus::Event(
-                        entityComponentIdPair, &BoxManipulatorRequests::SetDimensions,
-                        (NotAxis(action.m_fixed.m_axis) * boxDimensions).GetMax(scaledAxisDisplacement));
+                        entityComponentIdPair, &BoxManipulatorRequestBus::Events::SetDimensions,
+                        (NotAxis(action.m_fixed.m_axis) * boxDimensions).GetMax(axisDisplacement));
 
                     UpdateManipulators();
                 });
@@ -137,4 +139,12 @@ namespace AzToolsFramework
             }
         }
     }
+
+    AZ::Vector3 GetPositionInManipulatorFrame(float worldUniformScale, const AZ::Transform& manipulatorLocalTransform,
+        const LinearManipulator::Action& action)
+    {
+        return manipulatorLocalTransform.GetInverse().TransformPoint(
+            action.m_start.m_localPosition +
+            action.m_current.m_localPositionOffset / AZ::GetClamp(worldUniformScale, AZ::MinTransformScale, AZ::MaxTransformScale));
+    }
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.h
index 98ef17e547..66ea626e12 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/BoxViewportEdit.h
@@ -31,4 +31,10 @@ namespace AzToolsFramework
         using BoxManipulators = AZStd::array<AZStd::shared_ptr<LinearManipulator>, 6>;
         BoxManipulators m_linearManipulators; ///< Manipulators for editing box size.
     };
+
+    /// Calculates the position of the manipulator in its own reference frame.
+    /// Removes the effects of the manipulator local transform, and accounts for world transform scale in
+    /// the action local offset.
+    AZ::Vector3 GetPositionInManipulatorFrame(float worldUniformScale, const AZ::Transform& manipulatorLocalTransform,
+        const LinearManipulator::Action& action);
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h
index 07a622c936..1b76ca7a85 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BaseManipulator.h
@@ -54,7 +54,8 @@ namespace AzToolsFramework
 
         virtual ~BaseManipulator();
 
-        using EntityComponentIds = AZStd::unordered_set<AZ::EntityComponentIdPair>;
+        using UniqueEntityIds = AZStd::unordered_set<AZ::EntityId>;
+        using UniqueEntityComponentIds = AZStd::unordered_set<AZ::EntityComponentIdPair>;
 
         //! Callback for the event when the mouse pointer is over this manipulator and the left mouse button is pressed.
         //! @param interaction It contains various mouse states when the event happens, as well as a ray shooting from the viewing camera
@@ -137,7 +138,7 @@ namespace AzToolsFramework
         }
 
         //! Returns all EntityComponentIdPairs associated with this manipulator.
-        const EntityComponentIds& EntityComponentIdPairs() const
+        const UniqueEntityComponentIds& EntityComponentIdPairs() const
         {
             return m_entityComponentIdPairs;
         }
@@ -147,10 +148,10 @@ namespace AzToolsFramework
 
         //! Remove an entity from being affected by this manipulator.
         //! @note All components on this entity registered with the manipulator will be removed.
-        EntityComponentIds::iterator RemoveEntityId(AZ::EntityId entityId);
+        UniqueEntityComponentIds::iterator RemoveEntityId(AZ::EntityId entityId);
 
         //! Remove a specific component (via a EntityComponentIdPair) being affected by this manipulator.
-        EntityComponentIds::iterator RemoveEntityComponentIdPair(const AZ::EntityComponentIdPair& entityComponentIdPair);
+        UniqueEntityComponentIds::iterator RemoveEntityComponentIdPair(const AZ::EntityComponentIdPair& entityComponentIdPair);
 
         //! Is this entity currently being tracked by this manipulator.
         bool HasEntityId(AZ::EntityId entityId) const;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h
index b0bcdf47f2..0d6299f5d4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h
@@ -26,11 +26,21 @@ namespace AzToolsFramework
         virtual AZ::Vector3 GetDimensions() = 0;
         //! Set the X/Y/Z dimensions of the box shape/collider.
         virtual void SetDimensions(const AZ::Vector3& dimensions) = 0;
+        // O3DE_DEPRECATION_NOTICE(GHI-7572)
+        //! @deprecated Because non-uniform scale effects can be complex, it is recommended to separately use
+        //! AZ::TransformBus::Events::GetWorldTM, AZ::NonUniformScaleRequests::GetScale and GetCurrentLocalTransform
+        //! and combine their effects.
         //! Get the transform of the box shape/collider.
         //! This is used by \ref BoxComponentMode instead of the \ref \AZ::TransformBus
         //! because a collider may have an additional translation/orientation offset from
         //! the Entity transform.
         virtual AZ::Transform GetCurrentTransform() = 0;
+        //! Get the transform of the box relative to the entity.
+        virtual AZ::Transform GetCurrentLocalTransform() = 0;
+        // O3DE_DEPRECATION_NOTICE(GHI-7572)
+        //! @deprecated Because non-uniform scale effects can be complex, it is recommended to separately use
+        //! AZ::TransformBus::Events::GetWorldTM, AZ::NonUniformScaleRequests::GetScale and GetCurrentLocalTransform
+        //! and combine their effects.
         //! Get the scale currently applied to the box.
         //! With the Box Shape, the largest x/y/z component is taken
         //! so scale is always uniform, with colliders the scale may
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
index 58d579b20c..7de1703769 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp
@@ -80,23 +80,18 @@ namespace AzToolsFramework
         m_onMouseMoveCallback = onMouseMoveCallback;
     }
 
+    void SurfaceManipulator::InstallEntityIdsToIgnoreFn(EntityIdsToIgnoreFn entityIdsToIgnoreCallback)
+    {
+        m_entityIdsToIgnoreFn = AZStd::move(entityIdsToIgnoreCallback);
+    }
+
     void SurfaceManipulator::OnLeftMouseDownImpl(
         const ViewportInteraction::MouseInteraction& interaction, [[maybe_unused]] float rayIntersectionDistance)
     {
         const AZ::Transform worldFromLocalUniformScale = TransformUniformScale(GetSpace());
-
         const AzFramework::ViewportId viewportId = interaction.m_interactionId.m_viewportId;
 
-        const auto& entityComponentIdPairs = EntityComponentIdPairs();
-        m_rayRequest.m_entityFilter.m_ignoreEntities.clear();
-        m_rayRequest.m_entityFilter.m_ignoreEntities.reserve(entityComponentIdPairs.size());
-        AZStd::transform(
-            entityComponentIdPairs.begin(), entityComponentIdPairs.end(),
-            AZStd::inserter(m_rayRequest.m_entityFilter.m_ignoreEntities, m_rayRequest.m_entityFilter.m_ignoreEntities.begin()),
-            [](const AZ::EntityComponentIdPair& entityComponentIdPair)
-            {
-                return entityComponentIdPair.GetEntityId();
-            });
+        m_rayRequest.m_entityFilter.m_ignoreEntities = m_entityIdsToIgnoreFn(interaction);
 
         // calculate the start and end of the ray
         RefreshRayRequest(
@@ -139,6 +134,8 @@ namespace AzToolsFramework
         {
             const AzFramework::ViewportId viewportId = interaction.m_interactionId.m_viewportId;
 
+            m_rayRequest.m_entityFilter.m_ignoreEntities = m_entityIdsToIgnoreFn(interaction);
+
             // update the start and end of the ray
             RefreshRayRequest(
                 m_rayRequest, ViewportInteraction::ViewportScreenToWorldRay(viewportId, interaction.m_mousePick.m_screenCoordinates),
@@ -162,12 +159,12 @@ namespace AzToolsFramework
         const ManipulatorManagerState& managerState,
         AzFramework::DebugDisplayRequests& debugDisplay,
         const AzFramework::CameraState& cameraState,
-        const ViewportInteraction::MouseInteraction& mouseInteraction)
+        const ViewportInteraction::MouseInteraction& interaction)
     {
         m_manipulatorView->Draw(
             GetManipulatorManagerId(), managerState, GetManipulatorId(),
             ManipulatorState{ TransformUniformScale(GetSpace()), GetNonUniformScale(), GetLocalPosition(), MouseOver() }, debugDisplay,
-            cameraState, mouseInteraction);
+            cameraState, interaction);
     }
 
     void SurfaceManipulator::InvalidateImpl()
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
index 091a71d8da..314ad7b253 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h
@@ -40,6 +40,9 @@ namespace AzToolsFramework
         //! A Manipulator must only be created and managed through a shared_ptr.
         static AZStd::shared_ptr<SurfaceManipulator> MakeShared(const AZ::Transform& worldFromLocal);
 
+        //! Callback function to determine which EntityIds to ignore when performing the ray intersection.
+        using EntityIdsToIgnoreFn = AZStd::function<UniqueEntityIds(const ViewportInteraction::MouseInteraction&)>;
+
         //! The state of the manipulator at the start of an interaction.
         struct Start
         {
@@ -77,11 +80,13 @@ namespace AzToolsFramework
         void InstallLeftMouseUpCallback(const MouseActionCallback& onMouseUpCallback);
         void InstallMouseMoveCallback(const MouseActionCallback& onMouseMoveCallback);
 
+        void InstallEntityIdsToIgnoreFn(EntityIdsToIgnoreFn entityIdsToIgnoreFn);
+
         void Draw(
             const ManipulatorManagerState& managerState,
             AzFramework::DebugDisplayRequests& debugDisplay,
             const AzFramework::CameraState& cameraState,
-            const ViewportInteraction::MouseInteraction& mouseInteraction) override;
+            const ViewportInteraction::MouseInteraction& interaction) override;
 
         void SetView(AZStd::unique_ptr<ManipulatorView>&& view);
 
@@ -109,6 +114,9 @@ namespace AzToolsFramework
         MouseActionCallback m_onLeftMouseUpCallback = nullptr;
         MouseActionCallback m_onMouseMoveCallback = nullptr;
 
+        //! Customization point to determine which (if any) EntityIds to ignore while performing the ray intersection.
+        EntityIdsToIgnoreFn m_entityIdsToIgnoreFn = nullptr;
+
         //! Cached ray request initialized at mouse down and updated during mouse move.
         AzFramework::RenderGeometry::RayRequest m_rayRequest;
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp
index 5810662e57..c6e9403f5f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp
@@ -145,6 +145,15 @@ namespace AzToolsFramework
         }
     }
 
+    void TranslationManipulators::InstallSurfaceManipulatorEntityIdsToIgnoreFn(
+        SurfaceManipulator::EntityIdsToIgnoreFn entityIdsToIgnoreFn)
+    {
+        if (m_surfaceManipulator)
+        {
+            m_surfaceManipulator->InstallEntityIdsToIgnoreFn(AZStd::move(entityIdsToIgnoreFn));
+        }
+    }
+
     void TranslationManipulators::SetLocalTransformImpl(const AZ::Transform& localTransform)
     {
         for (AZStd::shared_ptr<LinearManipulator>& manipulator : m_linearManipulators)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h
index ea8dbb7975..6c841d16f6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h
@@ -61,6 +61,8 @@ namespace AzToolsFramework
         void InstallSurfaceManipulatorMouseMoveCallback(const SurfaceManipulator::MouseActionCallback& onMouseMoveCallback);
         void InstallSurfaceManipulatorMouseUpCallback(const SurfaceManipulator::MouseActionCallback& onMouseUpCallback);
 
+        void InstallSurfaceManipulatorEntityIdsToIgnoreFn(SurfaceManipulator::EntityIdsToIgnoreFn entityIdsToIgnoreFn);
+
         void SetSpaceImpl(const AZ::Transform& worldFromLocal) override;
         void SetLocalTransformImpl(const AZ::Transform& localTransform) override;
         void SetLocalPositionImpl(const AZ::Vector3& localPosition) override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp
index 0762a07493..d6e39a5027 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.cpp
@@ -23,7 +23,15 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // ThumbnailKey
         //////////////////////////////////////////////////////////////////////////
-        bool ThumbnailKey::IsReady() const { return m_ready; }
+        void ThumbnailKey::SetReady(bool ready)
+        {
+            m_ready = ready;
+        }
+
+        bool ThumbnailKey::IsReady() const
+        {
+            return m_ready;
+        }
 
         bool ThumbnailKey::UpdateThumbnail()
         {
@@ -75,10 +83,8 @@ namespace AzToolsFramework
             if (m_state == State::Unloaded)
             {
                 m_state = State::Loading;
-                QThreadPool* threadPool;
-                ThumbnailContextRequestBus::BroadcastResult(
-                    threadPool,
-                    &ThumbnailContextRequestBus::Handler::GetThreadPool);
+                QThreadPool* threadPool = {};
+                ThumbnailerRequestBus::BroadcastResult(threadPool, &ThumbnailerRequestBus::Handler::GetThreadPool);
                 QFuture<void> future = QtConcurrent::run(threadPool, [this](){ LoadThread(); });
                 m_watcher.setFuture(future);
             }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h
index d3351959db..e76e90cec8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/Thumbnail.h
@@ -26,13 +26,11 @@ namespace AzToolsFramework
         //! ThumbnailKey is used to locate thumbnails in thumbnail cache
         /*
             ThumbnailKey contains any kind of identifiable information to retrieve thumbnails (e.g. assetId, assetType, filename, etc.)
-            To use thumbnail system, keep reference to your thumbnail key, and retrieve Thumbnail via ThumbnailerRequestsBus
+            To use thumbnail system, keep reference to your thumbnail key, and retrieve Thumbnail via ThumbnailerRequestBus
         */
         class ThumbnailKey
             : public QObject
         {
-            friend class ThumbnailContext;
-
             Q_OBJECT
         public:
             AZ_RTTI(ThumbnailKey, "{43F20F6B-333D-4226-8E4F-331A62315255}");
@@ -40,6 +38,8 @@ namespace AzToolsFramework
             ThumbnailKey() = default;
             virtual ~ThumbnailKey() = default;
 
+            void SetReady(bool ready);
+
             bool IsReady() const;
 
             virtual bool UpdateThumbnail();
@@ -47,13 +47,13 @@ namespace AzToolsFramework
             virtual size_t GetHash() const;
 
             virtual bool Equals(const ThumbnailKey* other) const;
+
         Q_SIGNALS:
             //! Updated signal is dispatched whenever thumbnail data was changed. Anyone using this thumbnail should listen to this.
             void ThumbnailUpdatedSignal() const;
             //! Force update mapped thumbnails
             void UpdateThumbnailSignal() const;
 
-
         private:
             bool m_ready = false;
         };
@@ -114,11 +114,14 @@ namespace AzToolsFramework
             ThumbnailProvider() = default;
             virtual ~ThumbnailProvider() = default;
             virtual bool GetThumbnail(SharedThumbnailKey key, SharedThumbnail& thumbnail) = 0;
-            //! Priority identifies ThumbnailProvider order in ThumbnailContext
-            //! Higher priority means this ThumbnailProvider will take precedence in generating a thumbnail when
-            //! a supplied ThumbnailKey is supported by multiple providers.
-            virtual int GetPriority() const { return 0; }
-            //! A unique ThumbnailProvider name identifying it in a ThumbnailContext
+            //! Priority identifies ThumbnailProvider order
+            //! Higher priority means this ThumbnailProvider will take precedence in generating a thumbnail when a supplied ThumbnailKey is
+            //! supported by multiple providers.
+            virtual int GetPriority() const
+            {
+                return 0;
+            }
+            //! A unique ThumbnailProvider name identifyier
             virtual const char* GetProviderName() const = 0;
         };
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp
deleted file mode 100644
index cd2c673a24..0000000000
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.cpp
+++ /dev/null
@@ -1,132 +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
- *
- */
-
-#include <AzFramework/StringFunc/StringFunc.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailContext.h>
-#include <AzToolsFramework/Thumbnails/MissingThumbnail.h>
-#include <AzToolsFramework/Thumbnails/LoadingThumbnail.h>
-#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
-
-AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option") // 4251: 'QImageIOHandler::d_ptr': class 'QScopedPointer<QImageIOHandlerPrivate,QScopedPointerDeleter<T>>' needs to have dll-interface to be used by clients of class 'QImageIOHandler'
-#include <AzQtComponents/Components/StyledBusyLabel.h>
-AZ_POP_DISABLE_WARNING
-
-namespace AzToolsFramework
-{
-    namespace Thumbnailer
-    {
-        ThumbnailContext::ThumbnailContext()
-            : m_missingThumbnail(new MissingThumbnail())
-            , m_loadingThumbnail(new LoadingThumbnail())
-            , m_threadPool(this)
-        {
-            ThumbnailContextRequestBus::Handler::BusConnect();
-        }
-
-        ThumbnailContext::~ThumbnailContext()
-        {
-            ThumbnailContextRequestBus::Handler::BusDisconnect();
-        }
-
-        bool ThumbnailContext::IsLoading(SharedThumbnailKey key)
-        {
-            SharedThumbnail thumbnail;
-
-            for (auto& provider : m_providers)
-            {
-                if (provider->GetThumbnail(key, thumbnail))
-                {
-                    return thumbnail->GetState() == Thumbnail::State::Unloaded ||
-                        thumbnail->GetState() == Thumbnail::State::Loading;
-                }
-            }
-            return false;
-        }
-
-        void ThumbnailContext::RedrawThumbnail()
-        {
-            AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Broadcast(&AzToolsFramework::AssetBrowser::AssetBrowserViewRequests::Update);
-        }
-
-        QThreadPool* ThumbnailContext::GetThreadPool()
-        {
-            return &m_threadPool;
-        }
-
-        SharedThumbnail ThumbnailContext::GetThumbnail(SharedThumbnailKey key)
-        {
-            SharedThumbnail thumbnail;
-            // find provider who can handle supplied key
-            for (auto& provider : m_providers)
-            {
-                if (provider->GetThumbnail(key, thumbnail))
-                {
-                    // if thumbnail is ready return it
-                    if (thumbnail->GetState() == Thumbnail::State::Ready)
-                    {
-                        return thumbnail;
-                    }
-                    // if thumbnail is not loaded, start loading it, meanwhile return loading thumbnail
-                    if (thumbnail->GetState() == Thumbnail::State::Unloaded)
-                    {
-                        // listen to the loading signal, so the anyone using it will update loading animation
-                        connect(m_loadingThumbnail.data(), &Thumbnail::Updated, key.data(), &ThumbnailKey::ThumbnailUpdatedSignal);
-                        AzQtComponents::StyledBusyLabel* busyLabel;
-                        AzToolsFramework::AssetBrowser::AssetBrowserComponentRequestBus::BroadcastResult(busyLabel, &AzToolsFramework::AssetBrowser::AssetBrowserComponentRequests::GetStyledBusyLabel);
-                        connect(busyLabel, &AzQtComponents::StyledBusyLabel::repaintNeeded, this, &ThumbnailContext::RedrawThumbnail);
-                        // once the thumbnail is loaded, disconnect it from loading thumbnail
-                        connect(thumbnail.data(), &Thumbnail::Updated, this , [this, key, thumbnail, busyLabel]()
-                            {
-                                disconnect(m_loadingThumbnail.data(), &Thumbnail::Updated, key.data(), &ThumbnailKey::ThumbnailUpdatedSignal);
-                                disconnect(busyLabel, &AzQtComponents::StyledBusyLabel::repaintNeeded, this, &ThumbnailContext::RedrawThumbnail);
-                                thumbnail->disconnect();
-                                connect(thumbnail.data(), &Thumbnail::Updated, key.data(), &ThumbnailKey::ThumbnailUpdatedSignal);
-                                connect(key.data(), &ThumbnailKey::UpdateThumbnailSignal, thumbnail.data(), &Thumbnail::Update);
-                                key->m_ready = true;
-                                Q_EMIT key->ThumbnailUpdatedSignal();
-                            });
-                        thumbnail->Load();
-                    }
-                    if (thumbnail->GetState() == Thumbnail::State::Failed)
-                    {
-                        return m_missingThumbnail;
-                    }
-                    return m_loadingThumbnail;
-                }
-            }
-            return m_missingThumbnail;
-        }
-
-        void ThumbnailContext::RegisterThumbnailProvider(SharedThumbnailProvider providerToAdd)
-        {
-            auto it = AZStd::find_if(m_providers.begin(), m_providers.end(), [providerToAdd](const SharedThumbnailProvider& provider)
-                {
-                    return AZ::StringFunc::Equal(provider->GetProviderName(), providerToAdd->GetProviderName());
-                });
-
-            if (it != m_providers.end())
-            {
-                AZ_Error("ThumbnailContext", false, "Provider with name %s is already registered with context.", providerToAdd->GetProviderName());
-                return;
-            }
-
-            m_providers.insert(providerToAdd);
-        }
-
-        void ThumbnailContext::UnregisterThumbnailProvider(const char* providerName)
-        {
-            auto it = AZStd::remove_if(m_providers.begin(), m_providers.end(), [providerName](const SharedThumbnailProvider& provider)
-                {
-                    return AZ::StringFunc::Equal(provider->GetProviderName(), providerName);
-                });
-            m_providers.erase(it, m_providers.end());
-        }
-    } // namespace Thumbnailer
-} // namespace AzToolsFramework
-
-#include "Thumbnails/moc_ThumbnailContext.cpp"
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h
deleted file mode 100644
index 77d56b7831..0000000000
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailContext.h
+++ /dev/null
@@ -1,86 +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
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <AzCore/Memory/SystemAllocator.h>
-#include <AzCore/std/containers/set.h>
-#include <AzToolsFramework/Thumbnails/Thumbnail.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
-
-#include <QObject>
-#include <QList>
-#include <QThreadPool>
-#endif
-
-class QString;
-class QPixmap;
-
-namespace AzToolsFramework
-{
-    namespace Thumbnailer
-    {
-        class ThumbnailProvider;
-
-        //! ThumbnailContext provides distinct thumbnail location for specific context
-        /*
-            There can be any number of contexts for every unique feature that may need different types of thumbnails.
-            For example 'AssetBrowser' context provides thumbnails specific to Asset Browser
-            'PreviewContext' may provide thumbnails for Preview Widget
-            'MaterialBrowser' may provide thumbnails for Material Browser
-            etc.
-        */
-        class ThumbnailContext
-            : public QObject
-            , public ThumbnailContextRequestBus::Handler
-        {
-            Q_OBJECT
-        public:
-            AZ_CLASS_ALLOCATOR(ThumbnailContext, AZ::SystemAllocator, 0);
-
-            ThumbnailContext();
-            ~ThumbnailContext() override;
-
-            //! Is the thumbnail currently loading or is about to load.
-            bool IsLoading(SharedThumbnailKey key);
-            //! Retrieve thumbnail by key, generate one if needed
-            SharedThumbnail GetThumbnail(SharedThumbnailKey key);
-            //! Add new thumbnail cache
-            void RegisterThumbnailProvider(SharedThumbnailProvider providerToAdd);
-            //! Remove thumbnail cache by name if found
-            void UnregisterThumbnailProvider(const char* providerName);
-
-            void RedrawThumbnail();
-
-            //! Default context used for most thumbnails
-            static constexpr const char* DefaultContext = "Default";
-
-            // ThumbnailContextRequestBus::Handler interface overrides...
-            QThreadPool* GetThreadPool() override;
-
-        private:
-            struct ProviderCompare {
-                bool operator() (const SharedThumbnailProvider& lhs, const SharedThumbnailProvider& rhs) const
-                {
-                    // sorting in reverse, higher priority means the provider should be considered first
-                    return lhs->GetPriority() > rhs->GetPriority();
-                }
-            };
-
-            //! Collection of thumbnail caches provided by this context
-            AZStd::multiset<SharedThumbnailProvider, ProviderCompare> m_providers;
-            //! Default missing thumbnail used when no thumbnail for given key can be found within this context
-            SharedThumbnail m_missingThumbnail;
-            //! Default loading thumbnail used when thumbnail is found by is not yet generated
-            SharedThumbnail m_loadingThumbnail;
-            //! There is only a limited number of threads on global threadPool, because there can be many thumbnails rendering at once
-            //! an individual threadPool is needed to avoid deadlocks
-            QThreadPool m_threadPool;
-        };
-    } // namespace Thumbnailer
-} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.cpp
index 38bd854f17..e7c31fd1e1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.cpp
@@ -30,14 +30,13 @@ namespace AzToolsFramework
         {
         }
 
-        void ThumbnailWidget::SetThumbnailKey(SharedThumbnailKey key, const char* contextName)
+        void ThumbnailWidget::SetThumbnailKey(SharedThumbnailKey key)
         {
             if (m_key)
             {
                 disconnect(m_key.data(), &ThumbnailKey::ThumbnailUpdatedSignal, this, &ThumbnailWidget::KeyUpdatedSlot);
             }
             m_key = key;
-            m_contextName = contextName;
             connect(m_key.data(), &ThumbnailKey::ThumbnailUpdatedSignal, this, &ThumbnailWidget::KeyUpdatedSlot);
             repaint();
         }
@@ -65,7 +64,7 @@ namespace AzToolsFramework
             {
                 // thumbnail instance is not stored locally, but retrieved each paintEvent since thumbnail mapped to a specific key may change
                 SharedThumbnail thumbnail;
-                ThumbnailerRequestsBus::BroadcastResult(thumbnail, &ThumbnailerRequests::GetThumbnail, m_key, m_contextName.c_str());
+                ThumbnailerRequestBus::BroadcastResult(thumbnail, &ThumbnailerRequests::GetThumbnail, m_key);
                 QPainter painter(this);
 
                 // Scaling and centering pixmap within bounds to preserve aspect ratio
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.h
index 6dab575af5..a916673702 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailWidget.h
@@ -32,7 +32,7 @@ namespace AzToolsFramework
             ~ThumbnailWidget() override = default;
 
             //! Call this to set what thumbnail widget will display
-            void SetThumbnailKey(SharedThumbnailKey key, const char* contextName = "Default");
+            void SetThumbnailKey(SharedThumbnailKey key);
             //! Remove current thumbnail
             void ClearThumbnail();
 
@@ -44,7 +44,6 @@ namespace AzToolsFramework
 
         private:
             SharedThumbnailKey m_key;
-            AZStd::string m_contextName;
 
         private Q_SLOTS:
             void KeyUpdatedSlot();
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
index acd8ba3966..75aa21af2d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerBus.h
@@ -19,48 +19,30 @@ namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
-        //! Interaction with thumbnail context
-        class ThumbnailContextRequests
-            : public AZ::EBusTraits
-        {
-        public:
-            //! Get thread pool for drawing thumbnails
-            virtual QThreadPool* GetThreadPool() = 0;
-        };
-
-        using ThumbnailContextRequestBus = AZ::EBus<ThumbnailContextRequests>;
-
         //! Interaction with thumbnailer
         class ThumbnailerRequests
             : public AZ::EBusTraits
         {
         public:
-            //! Add thumbnail context
-            virtual void RegisterContext(const char* contextName) = 0;
+            //! Add new thumbnail provider
+            virtual void RegisterThumbnailProvider(SharedThumbnailProvider provider) = 0;
 
-            //! Remove thumbnail context and all associated ThumbnailProviders
-            virtual void UnregisterContext(const char* contextName) = 0;
-
-            //! Return whether a given ThumbnailContext has been registered
-            virtual bool HasContext(const char* contextName) const = 0;
-
-            //! Add new thumbnail provider to ThumbnailContext
-            virtual void RegisterThumbnailProvider(SharedThumbnailProvider provider, const char* contextName) = 0;
-
-            //! Remove thumbnail provider from ThumbnailContext
-            virtual void UnregisterThumbnailProvider(const char* providerName, const char* contextName) = 0;
+            //! Remove thumbnail provider
+            virtual void UnregisterThumbnailProvider(const char* providerName) = 0;
 
             //! Retrieve thumbnail by key,
             //! if no thumbnail matching found, one of ThumbnailProviders will attempt to create
             //! If no compatible providers found, MissingThumbnail will be returned
-            virtual SharedThumbnail GetThumbnail(SharedThumbnailKey thumbnailKey, const char* contextName) = 0;
+            virtual SharedThumbnail GetThumbnail(SharedThumbnailKey thumbnailKey) = 0;
 
             //! Return whether the thumbnail is loading.
-           virtual bool IsLoading(SharedThumbnailKey thumbnailKey, const char* contextName) = 0;
+            virtual bool IsLoading(SharedThumbnailKey thumbnailKey) = 0;
+
+            //! Get thread pool for drawing thumbnails
+            virtual QThreadPool* GetThreadPool() = 0;
         };
 
         using ThumbnailerRequestBus = AZ::EBus<ThumbnailerRequests>;
-        using ThumbnailerRequestsBus = AZ::EBus<ThumbnailerRequests>; //deprecated
 
         //! Request product thumbnail to be rendered
         class ThumbnailerRendererRequests
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp
index 170785b631..50504d3652 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.cpp
@@ -6,11 +6,14 @@
  *
  */
 
-#include <AzCore/std/smart_ptr/make_shared.h>
-
 #include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzQtComponents/Components/StyledBusyLabel.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
+#include <AzToolsFramework/Thumbnails/LoadingThumbnail.h>
+#include <AzToolsFramework/Thumbnails/MissingThumbnail.h>
 #include <AzToolsFramework/Thumbnails/ThumbnailerComponent.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailContext.h>
 
 #include <QApplication>
 #include <QStyle>
@@ -19,8 +22,10 @@ namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
-
         ThumbnailerComponent::ThumbnailerComponent()
+            : m_missingThumbnail(new MissingThumbnail())
+            , m_loadingThumbnail(new LoadingThumbnail())
+            , m_threadPool(this)
         {
         }
 
@@ -28,14 +33,13 @@ namespace AzToolsFramework
 
         void ThumbnailerComponent::Activate()
         {
-            RegisterContext(ThumbnailContext::DefaultContext);
-            BusConnect();
+            ThumbnailerRequestBus::Handler::BusConnect();
         }
 
         void ThumbnailerComponent::Deactivate()
         {
-            BusDisconnect();
-            m_thumbnails.clear();
+            ThumbnailerRequestBus::Handler::BusDisconnect();
+            m_providers.clear();
         }
 
         void ThumbnailerComponent::Reflect(AZ::ReflectContext* context)
@@ -49,59 +53,114 @@ namespace AzToolsFramework
 
         void ThumbnailerComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
+            incompatible.push_back(AZ_CRC_CE("ThumbnailerService"));
         }
 
         void ThumbnailerComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
+            provided.push_back(AZ_CRC_CE("ThumbnailerService"));
         }
 
-        void ThumbnailerComponent::RegisterContext(const char* contextName)
+        void ThumbnailerComponent::RegisterThumbnailProvider(SharedThumbnailProvider provider)
         {
-            AZ_Assert(m_thumbnails.find(contextName) == m_thumbnails.end(), "Context %s already registered", contextName);
-            m_thumbnails[contextName] = AZStd::make_shared<ThumbnailContext>();
+            auto it = AZStd::find_if(m_providers.begin(), m_providers.end(), [provider](const SharedThumbnailProvider& existingProvider)
+                {
+                    return AZ::StringFunc::Equal(provider->GetProviderName(), existingProvider->GetProviderName());
+                });
+
+            if (it != m_providers.end())
+            {
+                AZ_Error("ThumbnailerComponent", false, "Provider with name %s is already registered with context.", provider->GetProviderName());
+                return;
+            }
+
+            m_providers.insert(provider);
         }
 
-        void ThumbnailerComponent::UnregisterContext(const char* contextName)
+        void ThumbnailerComponent::UnregisterThumbnailProvider(const char* providerName)
         {
-            AZ_Assert(m_thumbnails.find(contextName) != m_thumbnails.end(), "Context %s not registered", contextName);
-            m_thumbnails.erase(contextName);
+            AZStd::erase_if(
+                m_providers,
+                [providerName](const SharedThumbnailProvider& provider)
+                {
+                    return AZ::StringFunc::Equal(provider->GetProviderName(), providerName);
+                });
+
         }
 
-        bool ThumbnailerComponent::HasContext(const char* contextName) const
+        SharedThumbnail ThumbnailerComponent::GetThumbnail(SharedThumbnailKey key)
         {
-            return m_thumbnails.find(contextName) != m_thumbnails.end();
+            // find provider who can handle supplied key
+            for (auto& provider : m_providers)
+            {
+                SharedThumbnail thumbnail;
+                if (provider->GetThumbnail(key, thumbnail))
+                {
+                    // if thumbnail is ready return it
+                    if (thumbnail->GetState() == Thumbnail::State::Ready)
+                    {
+                        return thumbnail;
+                    }
+
+                    // if thumbnail is not loaded, start loading it, meanwhile return loading thumbnail
+                    if (thumbnail->GetState() == Thumbnail::State::Unloaded)
+                    {
+                        // listen to the loading signal, so the anyone using it will update loading animation
+                        AzQtComponents::StyledBusyLabel* busyLabel;
+                        AssetBrowser::AssetBrowserComponentRequestBus::BroadcastResult(busyLabel, &AssetBrowser::AssetBrowserComponentRequests::GetStyledBusyLabel);
+                        QObject::connect(m_loadingThumbnail.data(), &Thumbnail::Updated, key.data(), &ThumbnailKey::ThumbnailUpdatedSignal);
+                        QObject::connect(busyLabel, &AzQtComponents::StyledBusyLabel::repaintNeeded, this, &ThumbnailerComponent::RedrawThumbnail);
+
+                        // once the thumbnail is loaded, disconnect it from loading thumbnail
+                        QObject::connect(thumbnail.data(), &Thumbnail::Updated, this , [this, key, thumbnail, busyLabel]()
+                            {
+                                QObject::disconnect(m_loadingThumbnail.data(), &Thumbnail::Updated, key.data(), &ThumbnailKey::ThumbnailUpdatedSignal);
+                                QObject::disconnect(busyLabel, &AzQtComponents::StyledBusyLabel::repaintNeeded, this, &ThumbnailerComponent::RedrawThumbnail);
+
+                                thumbnail->disconnect();
+                                QObject::connect(thumbnail.data(), &Thumbnail::Updated, key.data(), &ThumbnailKey::ThumbnailUpdatedSignal);
+                                QObject::connect(key.data(), &ThumbnailKey::UpdateThumbnailSignal, thumbnail.data(), &Thumbnail::Update);
+
+                                key->SetReady(true);
+                                Q_EMIT key->ThumbnailUpdatedSignal();
+                            });
+
+                        thumbnail->Load();
+                    }
+
+                    if (thumbnail->GetState() == Thumbnail::State::Failed)
+                    {
+                        return m_missingThumbnail;
+                    }
+
+                    return m_loadingThumbnail;
+                }
+            }
+            return m_missingThumbnail;
         }
 
-        void ThumbnailerComponent::RegisterThumbnailProvider(SharedThumbnailProvider provider, const char* contextName)
+        bool ThumbnailerComponent::IsLoading(SharedThumbnailKey key)
         {
-            auto it = m_thumbnails.find(contextName);
-            AZ_Assert(it != m_thumbnails.end(), "Context %s not registered", contextName);
-            it->second->RegisterThumbnailProvider(provider);
+            for (auto& provider : m_providers)
+            {
+                SharedThumbnail thumbnail;
+                if (provider->GetThumbnail(key, thumbnail))
+                {
+                    return thumbnail->GetState() == Thumbnail::State::Unloaded || thumbnail->GetState() == Thumbnail::State::Loading;
+                }
+            }
+            return false;
         }
 
-        void ThumbnailerComponent::UnregisterThumbnailProvider(const char* providerName, const char* contextName)
+        QThreadPool* ThumbnailerComponent::GetThreadPool()
         {
-            auto it = m_thumbnails.find(contextName);
-            AZ_Assert(it != m_thumbnails.end(), "Context %s not registered", contextName);
-            it->second->UnregisterThumbnailProvider(providerName);
+            return &m_threadPool;
         }
 
-        SharedThumbnail ThumbnailerComponent::GetThumbnail(SharedThumbnailKey key, const char* contextName)
+        void ThumbnailerComponent::RedrawThumbnail()
         {
-            auto it = m_thumbnails.find(contextName);
-            AZ_Assert(it != m_thumbnails.end(), "Context %s not registered", contextName);
-            return it->second->GetThumbnail(key);
+            AssetBrowser::AssetBrowserViewRequestBus::Broadcast(&AssetBrowser::AssetBrowserViewRequests::Update);
         }
-
-        bool ThumbnailerComponent::IsLoading(SharedThumbnailKey key, const char* contextName)
-        {
-            auto it = m_thumbnails.find(contextName);
-            AZ_Assert(it != m_thumbnails.end(), "Context %s not registered", contextName);
-            return it->second->IsLoading(key);
-        }
-
     } // namespace Thumbnailer
 } // namespace AzToolsFramework
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h
index bd075e28da..33184fa748 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerComponent.h
@@ -7,19 +7,29 @@
  */
 #pragma once
 
-#include <AzCore/Memory/SystemAllocator.h>
+#if !defined(Q_MOC_RUN)
 #include <AzCore/Component/Component.h>
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/std/containers/set.h>
+#include <AzToolsFramework/Thumbnails/Thumbnail.h>
 #include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
 
+#include <QList>
+#include <QObject>
+#include <QThreadPool>
+#endif
+
+class QString;
+class QPixmap;
+
 namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
-        class ThumbnailContext;
-
         class ThumbnailerComponent
             : public AZ::Component
-            , public ThumbnailerRequestsBus::Handler
+            , public ThumbnailerRequestBus::Handler
+            , public QObject
         {
         public:
             AZ_COMPONENT(ThumbnailerComponent, "{80090CA5-6A3A-4554-B5FE-A6D74ECB2D84}")
@@ -27,28 +37,41 @@ namespace AzToolsFramework
             ThumbnailerComponent();
             virtual ~ThumbnailerComponent();
 
-            //////////////////////////////////////////////////////////////////////////
-            // AZ::Component
-            //////////////////////////////////////////////////////////////////////////
+            // AZ::Component overrides...
             void Activate() override;
             void Deactivate() override;
             static void Reflect(AZ::ReflectContext* context);
             static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
             static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
 
-            //////////////////////////////////////////////////////////////////////////
-            // ThumbnailerRequests
-            //////////////////////////////////////////////////////////////////////////
-            void RegisterContext(const char* contextName) override;
-            void UnregisterContext(const char* contextName) override;
-            bool HasContext(const char* contextName) const override;
-            void RegisterThumbnailProvider(SharedThumbnailProvider provider, const char* contextName) override;
-            void UnregisterThumbnailProvider(const char* providerName, const char* contextName) override;
-            SharedThumbnail GetThumbnail(SharedThumbnailKey thumbnailKey, const char* contextName) override;
-            bool IsLoading(SharedThumbnailKey thumbnailKey, const char* contextName) override;
+            // ThumbnailerRequestBus::Handler interface overrides...
+            void RegisterThumbnailProvider(SharedThumbnailProvider provider) override;
+            void UnregisterThumbnailProvider(const char* providerName) override;
+            SharedThumbnail GetThumbnail(SharedThumbnailKey thumbnailKey) override;
+            bool IsLoading(SharedThumbnailKey thumbnailKey) override;
+            QThreadPool* GetThreadPool() override;
+
+            void RedrawThumbnail();
 
         private:
-            AZStd::unordered_map<AZStd::string, AZStd::shared_ptr<ThumbnailContext>> m_thumbnails;
+            struct ProviderCompare
+            {
+                bool operator()(const SharedThumbnailProvider& lhs, const SharedThumbnailProvider& rhs) const
+                {
+                    // sorting in reverse, higher priority means the provider should be considered first
+                    return lhs->GetPriority() > rhs->GetPriority();
+                }
+            };
+
+            //! Collection of thumbnail caches provided by this context
+            AZStd::multiset<SharedThumbnailProvider, ProviderCompare> m_providers;
+            //! Default missing thumbnail used when no thumbnail for given key can be found within this context
+            SharedThumbnail m_missingThumbnail;
+            //! Default loading thumbnail used when thumbnail is found by is not yet generated
+            SharedThumbnail m_loadingThumbnail;
+            //! There is only a limited number of threads on global threadPool, because there can be many thumbnails rendering at once
+            //! an individual threadPool is needed to avoid deadlocks
+            QThreadPool m_threadPool;
         };
     } // Thumbnailer
 } // namespace AssetBrowser
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.cpp
index 2be634d379..e2d40030c3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.cpp
@@ -9,7 +9,6 @@
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzToolsFramework/Thumbnails/ThumbnailerNullComponent.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailContext.h>
 #include <AzToolsFramework/Thumbnails/MissingThumbnail.h>
 
 namespace AzToolsFramework
@@ -47,35 +46,27 @@ namespace AzToolsFramework
             services.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
         }
 
-        void ThumbnailerNullComponent::RegisterContext(const char* /*contextName*/)
+        void ThumbnailerNullComponent::RegisterThumbnailProvider(AzToolsFramework::Thumbnailer::SharedThumbnailProvider /*provider*/)
         {
         }
 
-        void ThumbnailerNullComponent::UnregisterContext(const char* /*contextName*/)
+        void ThumbnailerNullComponent::UnregisterThumbnailProvider(const char* /*providerName*/)
         {
         }
 
-        bool ThumbnailerNullComponent::HasContext(const char* /*contextName*/) const
-        {
-            return false;
-        }
-
-        void ThumbnailerNullComponent::RegisterThumbnailProvider(AzToolsFramework::Thumbnailer::SharedThumbnailProvider /*provider*/, const char* /*contextName*/)
-        {
-        }
-
-        void ThumbnailerNullComponent::UnregisterThumbnailProvider(const char* /*providerName*/, const char* /*contextName*/)
-        {
-        }
-
-        AzToolsFramework::Thumbnailer::SharedThumbnail ThumbnailerNullComponent::GetThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey /*key*/, const char* /*contextName*/)
+        AzToolsFramework::Thumbnailer::SharedThumbnail ThumbnailerNullComponent::GetThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey /*key*/)
         {
             return m_nullThumbnail;
         }
 
-        bool ThumbnailerNullComponent::IsLoading(AzToolsFramework::Thumbnailer::SharedThumbnailKey /*thumbnailKey*/, const char* /*contextName*/)
+        bool ThumbnailerNullComponent::IsLoading(AzToolsFramework::Thumbnailer::SharedThumbnailKey /*thumbnailKey*/)
         {
             return false;
         }
+
+        QThreadPool* ThumbnailerNullComponent::GetThreadPool()
+        {
+            return nullptr;
+        }
     } // namespace Thumbnailer
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.h
index 41ae051b0d..5fec43ee7c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.h
@@ -19,11 +19,9 @@ namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
-        class ThumbnailContext;
-
         class ThumbnailerNullComponent
             : public AZ::Component
-            , public AzToolsFramework::Thumbnailer::ThumbnailerRequestsBus::Handler
+            , public AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Handler
         {
         public:
             AZ_COMPONENT(ThumbnailerNullComponent, "{8009D651-3FAA-9815-B99E-AF174A3B29D4}")
@@ -42,13 +40,12 @@ namespace AzToolsFramework
             //////////////////////////////////////////////////////////////////////////
             // ThumbnailerRequests
             //////////////////////////////////////////////////////////////////////////
-            void RegisterContext(const char* contextName) override;
-            void UnregisterContext(const char* contextName) override;
-            bool HasContext(const char* contextName) const override;
-            void RegisterThumbnailProvider(AzToolsFramework::Thumbnailer::SharedThumbnailProvider provider, const char* contextName) override;
-            void UnregisterThumbnailProvider(const char* providerName, const char* contextName) override;
-            AzToolsFramework::Thumbnailer::SharedThumbnail GetThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, const char* contextName) override;
-            bool IsLoading(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, const char* contextName) override;
+            void RegisterThumbnailProvider(AzToolsFramework::Thumbnailer::SharedThumbnailProvider provider) override;
+            void UnregisterThumbnailProvider(const char* providerName) override;
+            AzToolsFramework::Thumbnailer::SharedThumbnail GetThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey) override;
+            bool IsLoading(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey) override;
+            QThreadPool* GetThreadPool() override;
+
         private:
             AzToolsFramework::Thumbnailer::SharedThumbnail m_nullThumbnail;
         };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.cpp
index 866080a83f..4896a5af49 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.cpp
@@ -7,6 +7,7 @@
  */
 
 #include <AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.h>
+#include <AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx>
 
 #include <AzCore/Interface/Interface.h>
 
@@ -117,9 +118,16 @@ namespace AzToolsFramework
     {
     }
 
-    bool EditorEntityUiHandlerBase::OnEntityDoubleClick([[maybe_unused]] AZ::EntityId entityId) const
+    bool EditorEntityUiHandlerBase::OnOutlinerItemDoubleClick([[maybe_unused]] const QModelIndex& index) const
     {
         return false;
     }
 
+    AZ::EntityId EditorEntityUiHandlerBase::GetEntityIdFromIndex(const QModelIndex& index)
+    {
+        QModelIndex firstColumnIndex = index.siblingAtColumn(EntityOutlinerListModel::ColumnName);
+
+        return AZ::EntityId(firstColumnIndex.data(EntityOutlinerListModel::EntityIdRole).value<AZ::u64>());
+    }
+
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.h
index 96d393efa1..948c26d710 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/EditorEntityUi/EditorEntityUiHandlerBase.h
@@ -21,7 +21,6 @@ class QTreeView;
 namespace AzToolsFramework
 {
     //! Defines a handler that can customize entity UI appearance and behavior in the Entity Outliner.
-    //! This class is meant to be abstract, entities do not have a handler by default.
     class EditorEntityUiHandlerBase
     {
     protected:
@@ -33,7 +32,7 @@ namespace AzToolsFramework
     public:
         EditorEntityUiHandlerId GetHandlerId();
 
-        // # Entity Outliner
+        // # Entity Outliner Item
 
         //! Returns the item info string that is appended to the item name in the Outliner.
         virtual QString GenerateItemInfoString(AZ::EntityId entityId) const;
@@ -41,10 +40,12 @@ namespace AzToolsFramework
         virtual QString GenerateItemTooltip(AZ::EntityId entityId) const;
         //! Returns the item icon pixmap to display in the Outliner.
         virtual QIcon GenerateItemIcon(AZ::EntityId entityId) const;
-        //! Returns whether the element's lock and visibility state should be accessible in the Outliner
-        virtual bool CanToggleLockVisibility(AZ::EntityId entityId) const;
         //! Returns whether the element's name should be editable
         virtual bool CanRename(AZ::EntityId entityId) const;
+        //! Returns whether the element's lock and visibility state should be accessible in the Outliner
+        virtual bool CanToggleLockVisibility(AZ::EntityId entityId) const;
+
+        // Qt-specific painting functions
 
         //! Paints the background of the item in the Outliner.
         virtual void PaintItemBackground(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
@@ -54,24 +55,27 @@ namespace AzToolsFramework
         //! Paints the background of the descendant branches of the item in the Outliner.
         virtual void PaintDescendantBranchBackground(QPainter* painter, const QTreeView* view, const QRect& rect,
             const QModelIndex& index, const QModelIndex& descendantIndex) const;
-
         //! Paints visual elements on the foreground of the item in the Outliner.
         virtual void PaintItemForeground(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
         //! Paints visual elements on the foreground of the descendants of the item in the Outliner.
         virtual void PaintDescendantForeground(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index,
             const QModelIndex& descendantIndex) const;
 
+        // Outliner-specific interactions
+
         //! Triggered when the entity is clicked in the Outliner.
         //! @return True if the click has been handled and should not be propagated, false otherwise.
         virtual bool OnOutlinerItemClick(const QPoint& position, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+        //! Triggered when the entity is double-clicked in the Outliner.
+        //! @return True if the double-click has been handled and should not be propagated, false otherwise.
+        virtual bool OnOutlinerItemDoubleClick(const QModelIndex& index) const;
         //! Triggered when an entity's children are expanded in the Outliner.
         virtual void OnOutlinerItemExpand(const QModelIndex& index) const;
         //! Triggered when an entity's children are collapsed in the Outliner.
         virtual void OnOutlinerItemCollapse(const QModelIndex& index) const;
 
-        //! Triggered when the entity is double clicked in the Outliner or in the Viewport.
-        //! @return True if the double click has been handled and should not be propagated, false otherwise.
-        virtual bool OnEntityDoubleClick(AZ::EntityId entityId) const;
+    protected:
+        static AZ::EntityId GetEntityIdFromIndex(const QModelIndex& index);
 
     private:
         EditorEntityUiHandlerId m_handlerId = 0;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
index 45363f4bb5..ac7d832c66 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
@@ -2091,8 +2091,14 @@ namespace AzToolsFramework
             customOption.state ^= QStyle::State_HasFocus;
         }
 
+        // Don't allow to paint on the spacing column
+        if (index.column() == EntityOutlinerListModel::ColumnSpacing)
+        {
+            return;
+        }
+
         // Retrieve the Entity UI Handler
-        auto firstColumnIndex = index.siblingAtColumn(0);
+        auto firstColumnIndex = index.siblingAtColumn(EntityOutlinerListModel::ColumnName);
         AZ::EntityId entityId(firstColumnIndex.data(EntityOutlinerListModel::EntityIdRole).value<AZ::u64>());
         auto entityUiHandler = m_editorEntityFrameworkInterface->GetHandler(entityId);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx
index 51d047e81a..5c93d11c37 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx
@@ -69,6 +69,7 @@ namespace AzToolsFramework
             ColumnName,                 //!< Entity name
             ColumnVisibilityToggle,     //!< Visibility Icons
             ColumnLockToggle,           //!< Lock Icons
+            ColumnSpacing,              //!< Spacing to allow for drag select
             ColumnSortIndex,            //!< Index of sort order
             ColumnCount                 //!< Total number of columns
         };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
index c2bbebb72e..8f0d541017 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
@@ -30,7 +30,6 @@ namespace AzToolsFramework
     EntityOutlinerTreeView::EntityOutlinerTreeView(QWidget* pParent)
         : AzQtComponents::StyledTreeView(pParent)
         , m_queuedMouseEvent(nullptr)
-        , m_draggingUnselectedItem(false)
     {
         setUniformRowHeights(true);
         setHeaderHidden(true);
@@ -65,22 +64,6 @@ namespace AzToolsFramework
         m_expandOnlyDelay = delay;
     }
 
-    void EntityOutlinerTreeView::ClearQueuedMouseEvent()
-    {
-        if (m_queuedMouseEvent)
-        {
-            delete m_queuedMouseEvent;
-            m_queuedMouseEvent = nullptr;
-        }
-    }
-
-    void EntityOutlinerTreeView::leaveEvent([[maybe_unused]] QEvent* event)
-    {
-        m_mousePosition = QPoint(-1, -1);
-        m_currentHoveredIndex = QModelIndex();
-        update();
-    }
-
     void EntityOutlinerTreeView::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)
     {
         AzQtComponents::StyledTreeView::dataChanged(topLeft, bottomRight, roles);
@@ -93,7 +76,7 @@ namespace AzToolsFramework
                 auto modelRow = topLeft.sibling(i, EntityOutlinerListModel::ColumnName);
                 if (modelRow.isValid())
                 {
-                    checkExpandedState(modelRow);
+                    CheckExpandedState(modelRow);
                 }
             }
         }
@@ -108,15 +91,15 @@ namespace AzToolsFramework
                 auto modelRow = model()->index(i, EntityOutlinerListModel::ColumnName, parent);
                 if (modelRow.isValid())
                 {
-                    checkExpandedState(modelRow);
-                    recursiveCheckExpandedStates(modelRow);
+                    CheckExpandedState(modelRow);
+                    RecursiveCheckExpandedStates(modelRow);
                 }
             }
         }
         AzQtComponents::StyledTreeView::rowsInserted(parent, start, end);
     }
 
-    void EntityOutlinerTreeView::recursiveCheckExpandedStates(const QModelIndex& current)
+    void EntityOutlinerTreeView::RecursiveCheckExpandedStates(const QModelIndex& current)
     {
         const int rowCount = model()->rowCount(current);
         for (int i = 0; i < rowCount; i++)
@@ -124,13 +107,13 @@ namespace AzToolsFramework
             auto modelRow = model()->index(i, EntityOutlinerListModel::ColumnName, current);
             if (modelRow.isValid())
             {
-                checkExpandedState(modelRow);
-                recursiveCheckExpandedStates(modelRow);
+                CheckExpandedState(modelRow);
+                RecursiveCheckExpandedStates(modelRow);
             }
         }
     }
 
-    void EntityOutlinerTreeView::checkExpandedState(const QModelIndex& current)
+    void EntityOutlinerTreeView::CheckExpandedState(const QModelIndex& current)
     {
         const bool expandState = current.data(EntityOutlinerListModel::ExpandedRole).template value<bool>();
         setExpanded(current, expandState);
@@ -138,116 +121,102 @@ namespace AzToolsFramework
 
     void EntityOutlinerTreeView::mousePressEvent(QMouseEvent* event)
     {
-        //postponing normal mouse pressed logic until mouse is released or dragged
-        //this means selection occurs on mouse released now
-        //this is to support drag/drop of non-selected items
+        // Postponing normal mouse press logic until mouse is released or dragged.
+        // This allows drag/drop of non-selected items.
         ClearQueuedMouseEvent();
         m_queuedMouseEvent = new QMouseEvent(*event);
     }
 
+    void EntityOutlinerTreeView::mouseMoveEvent(QMouseEvent* event)
+    {
+        // Prevent multiple updates throughout the function for changing UIs.
+        bool forceUpdate = false;
+
+        QModelIndex previousHoveredIndex = m_currentHoveredIndex;
+        m_mousePosition = event->pos();
+
+        if (QModelIndex hoveredIndex = indexAt(m_mousePosition);
+            m_currentHoveredIndex != hoveredIndex)
+        {
+            m_currentHoveredIndex = hoveredIndex;
+        }
+        
+        if (m_queuedMouseEvent)
+        {
+            if (!m_isDragSelectActive)
+            {
+                // Determine whether the mouse move should trigger a rect selection or an entity drag.
+                QModelIndex clickedIndex = indexAt(m_queuedMouseEvent->pos());
+                // Even though the drag started on an index, we want to trigger a drag select from the last column.
+                // This is to allow drag selection to be triggered from anywhere in the hierarchy.
+                if (clickedIndex.isValid() && clickedIndex.column() != EntityOutlinerListModel::ColumnSpacing)
+                {
+                    HandleDrag();
+                }
+                else
+                {
+                    m_isDragSelectActive = true;
+                    forceUpdate = true;
+                }
+            }
+            else
+            {
+                SelectAllEntitiesInSelectionRect();
+                forceUpdate = true;
+            }
+        }
+
+        if (previousHoveredIndex != m_currentHoveredIndex)
+        {
+            forceUpdate = true;
+        }
+
+        if (forceUpdate)
+        {
+            update();
+        }
+    }
+
     void EntityOutlinerTreeView::mouseReleaseEvent(QMouseEvent* event)
     {
-        if (m_queuedMouseEvent && !m_draggingUnselectedItem)
+        if (m_isDragSelectActive)
         {
-            // mouseMoveEvent will set the state to be DraggingState, which will make Qt ignore 
-            // mousePressEvent in QTreeViewPrivate::expandOrCollapseItemAtPos. So we manually 
-            // and temporarily set it to EditingState.
-            QAbstractItemView::State stateBefore = QAbstractItemView::state();
-            QAbstractItemView::setState(QAbstractItemView::State::EditingState);
-
-            //treat this as a mouse pressed event to process selection etc
-            processQueuedMousePressedEvent(m_queuedMouseEvent);
-
-            QAbstractItemView::setState(stateBefore);
+            SelectAllEntitiesInSelectionRect();
+            update();
+        }
+        else if (m_queuedMouseEvent)
+        {
+            ProcessQueuedMousePressedEvent(m_queuedMouseEvent);
         }
 
         ClearQueuedMouseEvent();
-        m_draggingUnselectedItem = false;
+        m_isDragSelectActive = false;
 
         QTreeView::mouseReleaseEvent(event);
     }
 
     void EntityOutlinerTreeView::mouseDoubleClickEvent(QMouseEvent* event)
     {
-        //cancel pending mouse press
+        // Cancel pending mouse press.
         ClearQueuedMouseEvent();
         QTreeView::mouseDoubleClickEvent(event);
     }
 
-    void EntityOutlinerTreeView::mouseMoveEvent(QMouseEvent* event)
-    {
-        if (m_queuedMouseEvent)
-        {
-            //disable selection for the pending click if the mouse moved so selection is maintained for dragging
-            QAbstractItemView::SelectionMode selectionModeBefore = selectionMode();
-            setSelectionMode(QAbstractItemView::NoSelection);
-
-            //treat this as a mouse pressed event to process everything but selection, but use the position data from the mousePress message
-            processQueuedMousePressedEvent(m_queuedMouseEvent);
-
-            //restore selection state
-            setSelectionMode(selectionModeBefore);
-        }
-
-        m_mousePosition = event->pos();
-        if (QModelIndex hoveredIndex = indexAt(m_mousePosition); m_currentHoveredIndex != indexAt(m_mousePosition))
-        {
-            m_currentHoveredIndex = hoveredIndex;
-            update();
-        }
-
-        //process mouse movement as normal, potentially triggering drag and drop
-        QTreeView::mouseMoveEvent(event);
-    }
-
     void EntityOutlinerTreeView::focusInEvent(QFocusEvent* event)
     {
-        //cancel pending mouse press
+        // Cancel pending mouse press.
         ClearQueuedMouseEvent();
         QTreeView::focusInEvent(event);
     }
 
     void EntityOutlinerTreeView::focusOutEvent(QFocusEvent* event)
     {
-        //cancel pending mouse press
+        // Cancel pending mouse press.
         ClearQueuedMouseEvent();
         QTreeView::focusOutEvent(event);
     }
 
-    void EntityOutlinerTreeView::startDrag(Qt::DropActions supportedActions)
-    {
-        QModelIndex index = indexAt(m_queuedMouseEvent->pos());
-        AZ::EntityId entityId(index.data(EntityOutlinerListModel::EntityIdRole).value<AZ::u64>());
-
-        AZ::EntityId parentEntityId;
-        EditorEntityInfoRequestBus::EventResult(parentEntityId, entityId, &EditorEntityInfoRequestBus::Events::GetParent);
-
-        // If the entity is parented to a read-only entity, cancel the drag operation.
-        if (m_readOnlyEntityPublicInterface->IsReadOnly(parentEntityId))
-        {
-            return;
-        }
-
-        //if we are attempting to drag an unselected item then we must special case drag and drop logic
-        //QAbstractItemView::startDrag only supports selected items
-        if (m_queuedMouseEvent)
-        {
-            if (!index.isValid() || index.column() != 0)
-            {
-                return;
-            }
-
-            if (!selectionModel()->isSelected(index))
-            {
-                StartCustomDrag({ index }, supportedActions);
-                return;
-            }
-        }
-
-        StyledTreeView::startDrag(supportedActions);
-    }
-
-    void EntityOutlinerTreeView::dragMoveEvent(QDragMoveEvent* event)
+    void EntityOutlinerTreeView::dragMoveEvent([[maybe_unused]] QDragMoveEvent* event)
     {
         if (m_expandOnlyDelay >= 0)
         {
@@ -257,12 +226,139 @@ namespace AzToolsFramework
         QTreeView::dragMoveEvent(event);
     }
 
-    void EntityOutlinerTreeView::dropEvent(QDropEvent* event)
+    void EntityOutlinerTreeView::dropEvent([[maybe_unused]] QDropEvent* event)
     {
         emit ItemDropped();
         QTreeView::dropEvent(event);
 
-        m_draggingUnselectedItem = false;
+        ClearQueuedMouseEvent();
+    }
+
+    void EntityOutlinerTreeView::HandleDrag()
+    {
+        // Retrieve the index at the click position.
+        QModelIndex indexAtClick = indexAt(m_queuedMouseEvent->pos()).siblingAtColumn(EntityOutlinerListModel::ColumnName);
+
+        AZ::EntityId entityId(indexAtClick.data(EntityOutlinerListModel::EntityIdRole).value<AZ::u64>());
+        AZ::EntityId parentEntityId;
+        EditorEntityInfoRequestBus::EventResult(parentEntityId, entityId, &EditorEntityInfoRequestBus::Events::GetParent);
+
+        // If the entity is parented to a read-only entity, cancel the drag operation.
+        if (m_readOnlyEntityPublicInterface->IsReadOnly(parentEntityId))
+        {
+            return;
+        }
+
+        // If the index is selected, we should move the whole selection.
+        if (selectionModel()->isSelected(indexAtClick))
+        {
+            StartCustomDrag(selectionModel()->selectedIndexes(), defaultDropAction());
+        }
+        else
+        {
+            StartCustomDrag(QModelIndexList{ indexAtClick }, defaultDropAction());
+        }
+    }
+
+    void EntityOutlinerTreeView::SelectAllEntitiesInSelectionRect()
+    {
+        if (!m_queuedMouseEvent)
+        {
+            return;
+        }
+
+        // Retrieve the two opposing corners of the rect.
+        const QPoint point1 = (m_queuedMouseEvent->pos());  // The position the drag operation started at.
+        const QPoint point2 = (m_mousePosition);            // The current mouse position.
+
+        // Determine which point's y is the top and which is the bottom.
+        const int top(AZStd::min(point1.y(), point2.y()));
+        const int bottom(AZStd::max(point1.y(), point2.y()));
+        // We don't really need the x values for the rect, just use the center of the viewport.
+        const int middle(viewport()->rect().center().x());
+
+        // Find the extremes of the range of indices that are in the selection rect.
+        QModelIndex topIndex = indexAt(QPoint(middle, top));
+        const QModelIndex bottomIndex = indexAt(QPoint(middle, bottom));
+
+        // If we have no top index, the mouse may have been dragged above the top item. Let's try to course correct.
+        const int topDistanceForFirstItem = 10; // A reasonable distance from the top we're sure to encounter the first item.
+        const QModelIndex firstIndex = indexAt(QPoint(middle, topDistanceForFirstItem));
+
+        if (!topIndex.isValid() && top < topDistanceForFirstItem)
+        {
+            topIndex = firstIndex;
+        }
+
+        // We can assume that if topIndex is still invalid, it was below the last item in the hierarchy, hence no selection is made.
+        if (!topIndex.isValid())
+        {
+            return;
+        }
+
+        QItemSelection selection;
+
+        // Starting from the top index, traverse all visible elements of the list and select them until the bottom index is hit.
+        // If the bottom index is undefined, just keep going to the end.
+        QModelIndex iter = topIndex;
+        selection.select(iter, iter);
+
+        while (iter.isValid() && iter != bottomIndex)
+        {
+            iter = indexBelow(iter);
+            selection.select(iter, iter);
+        }
+
+        selectionModel()->select(selection, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+    }
+
+    void EntityOutlinerTreeView::ClearQueuedMouseEvent()
+    {
+        if (m_queuedMouseEvent)
+        {
+            delete m_queuedMouseEvent;
+            m_queuedMouseEvent = nullptr;
+        }
+    }
+
+    void EntityOutlinerTreeView::leaveEvent([[maybe_unused]] QEvent* event)
+    {
+        ClearQueuedMouseEvent();
+
+        // Only clear the mouse position if the last mouse position registered is inside.
+        // This allows drag to select to work correctly in all situations.
+        if(this->viewport()->rect().contains(m_mousePosition))
+        {
+            m_mousePosition = QPoint(-1, -1);
+        }
+        m_currentHoveredIndex = QModelIndex();
+        update();
+    }
+
+    void EntityOutlinerTreeView::paintEvent(QPaintEvent* event)
+    {
+        AzQtComponents::StyledTreeView::paintEvent(event);
+
+        // Draw the drag selection rect.
+        if (m_isDragSelectActive && m_queuedMouseEvent)
+        {
+            // Create a painter to draw on the viewport.
+            QPainter painter(viewport());
+
+            // Retrieve the two corners of the rect.
+            const QPoint point1 = (m_queuedMouseEvent->pos());  // The position the drag operation started at.
+            const QPoint point2 = (m_mousePosition);            // The current mouse position.
+
+            // We need the top left and bottom right corners, which may not be the two corners we got above.
+            // So we composite the corners based on the coordinates of the points.
+            const QPoint topLeft(AZStd::min(point1.x(), point2.x()), AZStd::min(point1.y(), point2.y()));
+            const QPoint bottomRight(AZStd::max(point1.x(), point2.x()), AZStd::max(point1.y(), point2.y()));
+
+            // Paint the rect.
+            painter.setBrush(m_dragSelectRectColor);
+            painter.setPen(m_dragSelectBorderColor);
+            painter.drawRect(QRect(topLeft, bottomRight));
+        }
     }
 
     void EntityOutlinerTreeView::drawBranches(QPainter* painter, const QRect& rect, const QModelIndex& index) const
@@ -270,7 +366,7 @@ namespace AzToolsFramework
         const bool isEnabled = (this->model()->flags(index) & Qt::ItemIsEnabled);
 
         const bool isSelected = selectionModel()->isSelected(index);
-        const bool isHovered = (index == indexAt(m_mousePosition).siblingAtColumn(0)) && isEnabled;
+        const bool isHovered = (index == m_currentHoveredIndex.siblingAtColumn(0)) && isEnabled;
 
         // Paint the branch Selection/Hover Rect
         PaintBranchSelectionHoverRect(painter, rect, isSelected, isHovered);
@@ -352,25 +448,27 @@ namespace AzToolsFramework
         QTreeView::timerEvent(event);
     }
 
-    void EntityOutlinerTreeView::processQueuedMousePressedEvent(QMouseEvent* event)
+    void EntityOutlinerTreeView::ProcessQueuedMousePressedEvent(QMouseEvent* event)
     {
-        //interpret the mouse event as a button press
-        QMouseEvent mousePressedEvent(
-            QEvent::MouseButtonPress,
-            event->localPos(),
-            event->windowPos(),
-            event->screenPos(),
-            event->button(),
-            event->buttons(),
-            event->modifiers(),
-            event->source());
-        QTreeView::mousePressEvent(&mousePressedEvent);
+        QModelIndex clickedIndex = indexAt(m_queuedMouseEvent->pos());
+        if (!clickedIndex.isValid() || clickedIndex.column() != EntityOutlinerListModel::ColumnSpacing)
+        {
+            //interpret the mouse event as a button press
+            QMouseEvent mousePressedEvent(
+                QEvent::MouseButtonPress,
+                event->localPos(),
+                event->windowPos(),
+                event->screenPos(),
+                event->button(),
+                event->buttons(),
+                event->modifiers(),
+                event->source());
+            QTreeView::mousePressEvent(&mousePressedEvent);
+        }
     }
 
     void EntityOutlinerTreeView::StartCustomDrag(const QModelIndexList& indexList, Qt::DropActions supportedActions)
     {
-        m_draggingUnselectedItem = true;
-
         //sort by container entity depth and order in hierarchy for proper drag image and drop order
         QModelIndexList indexListSorted = indexList;
         AZStd::unordered_map<AZ::EntityId, AZStd::list<AZ::u64>> locations;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx
index 014bb7bd48..6b4fa656e5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx
@@ -63,7 +63,6 @@ namespace AzToolsFramework
         void mouseMoveEvent(QMouseEvent* event) override;
         void focusInEvent(QFocusEvent* event) override;
         void focusOutEvent(QFocusEvent* event) override;
-        void startDrag(Qt::DropActions supportedActions) override;
         void dragMoveEvent(QDragMoveEvent* event) override;
         void dropEvent(QDropEvent* event) override;
         void leaveEvent(QEvent* event) override;
@@ -71,33 +70,39 @@ namespace AzToolsFramework
         // FocusModeNotificationBus overrides ...
         void OnEditorFocusChanged(AZ::EntityId previousFocusEntityId, AZ::EntityId newFocusEntityId) override;
 
+        void paintEvent(QPaintEvent* event) override;
+
         //! Renders the left side of the item: appropriate background, branch lines, icons.
         void drawBranches(QPainter* painter, const QRect& rect, const QModelIndex& index) const override;
 
         void timerEvent(QTimerEvent* event) override;
     private:
         void ClearQueuedMouseEvent();
+        void ProcessQueuedMousePressedEvent(QMouseEvent* event);
 
-        void processQueuedMousePressedEvent(QMouseEvent* event);
-        void recursiveCheckExpandedStates(const QModelIndex& parent);
-        void checkExpandedState(const QModelIndex& current);
+        void SelectAllEntitiesInSelectionRect();
 
+        void HandleDrag();
         void StartCustomDrag(const QModelIndexList& indexList, Qt::DropActions supportedActions) override;
 
+        void RecursiveCheckExpandedStates(const QModelIndex& parent);
+        void CheckExpandedState(const QModelIndex& current);
+
         void PaintBranchBackground(QPainter* painter, const QRect& rect, const QModelIndex& index) const;
         void PaintBranchSelectionHoverRect(QPainter* painter, const QRect& rect, bool isSelected, bool isHovered) const;
         
         QMouseEvent* m_queuedMouseEvent;
+        QModelIndex m_currentHoveredIndex;
         QPoint m_mousePosition;
-        bool m_draggingUnselectedItem; // This is set when an item is dragged outside its bounding box.
 
+        bool m_isDragSelectActive = false;
         int m_expandOnlyDelay = -1;
         QBasicTimer m_expandTimer;
 
         const QColor m_selectedColor = QColor(255, 255, 255, 45);
         const QColor m_hoverColor = QColor(255, 255, 255, 30);
-
-        QModelIndex m_currentHoveredIndex;
+        const QColor m_dragSelectRectColor = QColor(255, 255, 255, 20);
+        const QColor m_dragSelectBorderColor = QColor(255, 255, 255);
 
         EditorEntityUiInterface* m_editorEntityFrameworkInterface = nullptr;
         ReadOnlyEntityPublicInterface* m_readOnlyEntityPublicInterface = nullptr;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
index 52b688543a..604c3660e6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
@@ -193,7 +193,6 @@ namespace AzToolsFramework
         m_listModel->SetSortMode(m_sortMode);
 
         const int autoExpandDelayMilliseconds = 2500;
-        m_gui->m_objectTree->setSelectionMode(QAbstractItemView::ExtendedSelection);
         SetDefaultTreeViewEditTriggers();
         m_gui->m_objectTree->setAutoExpandDelay(autoExpandDelayMilliseconds);
         m_gui->m_objectTree->setDragEnabled(true);
@@ -208,6 +207,7 @@ namespace AzToolsFramework
         m_gui->m_objectTree->setAutoScrollMargin(20);
         m_gui->m_objectTree->setIndentation(24);
         m_gui->m_objectTree->setRootIsDecorated(false);
+        m_gui->m_objectTree->setSelectionMode(QAbstractItemView::ExtendedSelection);
         connect(m_gui->m_objectTree, &QTreeView::customContextMenuRequested, this, &EntityOutlinerWidget::OnOpenTreeContextMenu);
 
         // custom item delegate
@@ -260,6 +260,8 @@ namespace AzToolsFramework
         m_gui->m_objectTree->header()->resizeSection(EntityOutlinerListModel::ColumnVisibilityToggle, 20);
         m_gui->m_objectTree->header()->setSectionResizeMode(EntityOutlinerListModel::ColumnLockToggle, QHeaderView::Fixed);
         m_gui->m_objectTree->header()->resizeSection(EntityOutlinerListModel::ColumnLockToggle, 24);
+        m_gui->m_objectTree->header()->setSectionResizeMode(EntityOutlinerListModel::ColumnSpacing, QHeaderView::Fixed);
+        m_gui->m_objectTree->header()->resizeSection(EntityOutlinerListModel::ColumnSpacing, 16);
 
         connect(m_gui->m_objectTree->selectionModel(),
             &QItemSelectionModel::selectionChanged,
@@ -945,7 +947,7 @@ namespace AzToolsFramework
     {
         if (AZ::EntityId entityId = GetEntityIdFromIndex(index); auto entityUiHandler = m_editorEntityUiInterface->GetHandler(entityId))
         {
-            entityUiHandler->OnEntityDoubleClick(entityId);
+            entityUiHandler->OnOutlinerItemDoubleClick(index);
         }
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp
index b34bbff298..9c5c478a2f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp
@@ -33,7 +33,7 @@ namespace AzToolsFramework
         }
     }
 
-    QIcon LevelRootUiHandler::GenerateItemIcon(AZ::EntityId /*entityId*/) const
+    QIcon LevelRootUiHandler::GenerateItemIcon([[maybe_unused]] AZ::EntityId entityId) const
     {
         return QIcon(m_levelRootIconPath);
     }
@@ -62,17 +62,18 @@ namespace AzToolsFramework
         return infoString;
     }
 
-    bool LevelRootUiHandler::CanToggleLockVisibility(AZ::EntityId /*entityId*/) const
+    bool LevelRootUiHandler::CanToggleLockVisibility([[maybe_unused]] AZ::EntityId entityId) const
     {
         return false;
     }
 
-    bool LevelRootUiHandler::CanRename(AZ::EntityId /*entityId*/) const
+    bool LevelRootUiHandler::CanRename([[maybe_unused]] AZ::EntityId entityId) const
     {
         return false;
     }
 
-    void LevelRootUiHandler::PaintItemBackground(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& /*index*/) const
+    void LevelRootUiHandler::PaintItemBackground(
+        QPainter* painter, const QStyleOptionViewItem& option, [[maybe_unused]] const QModelIndex& index) const
     {
         if (!painter)
         {
@@ -94,8 +95,10 @@ namespace AzToolsFramework
         painter->restore();
     }
 
-    bool LevelRootUiHandler::OnEntityDoubleClick(AZ::EntityId entityId) const
+    bool LevelRootUiHandler::OnOutlinerItemDoubleClick(const QModelIndex& index) const
     {
+        AZ::EntityId entityId = GetEntityIdFromIndex(index);
+
         if (auto prefabFocusPublicInterface = AZ::Interface<Prefab::PrefabFocusPublicInterface>::Get();
             !prefabFocusPublicInterface->IsOwningPrefabBeingFocused(entityId))
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.h
index 3f7f56670e..a43aa0606a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.h
@@ -33,7 +33,7 @@ namespace AzToolsFramework
         bool CanToggleLockVisibility(AZ::EntityId entityId) const override;
         bool CanRename(AZ::EntityId entityId) const override;
         void PaintItemBackground(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-        bool OnEntityDoubleClick(AZ::EntityId entityId) const override;
+        bool OnOutlinerItemDoubleClick(const QModelIndex& index) const override;
 
     private:
         Prefab::PrefabPublicInterface* m_prefabPublicInterface = nullptr;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
index 69d6ae82ca..f3579c223c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
@@ -99,7 +99,7 @@ namespace AzToolsFramework
             return;
         }
 
-        AZ::EntityId entityId(index.data(EntityOutlinerListModel::EntityIdRole).value<AZ::u64>());
+        AZ::EntityId entityId = GetEntityIdFromIndex(index);
         const bool isFirstColumn = index.column() == EntityOutlinerListModel::ColumnName;
         const bool isLastColumn = index.column() == EntityOutlinerListModel::ColumnLockToggle;
         QModelIndex firstColumnIndex = index.siblingAtColumn(EntityOutlinerListModel::ColumnName);
@@ -183,7 +183,7 @@ namespace AzToolsFramework
             return;
         }
 
-        AZ::EntityId entityId(index.data(EntityOutlinerListModel::EntityIdRole).value<AZ::u64>());
+        AZ::EntityId entityId = GetEntityIdFromIndex(index);
 
         const QTreeView* outlinerTreeView(qobject_cast<const QTreeView*>(option.widget));
         const int ancestorLeft = outlinerTreeView->visualRect(index).left() + (m_prefabBorderThickness / 2) - 1;
@@ -283,7 +283,7 @@ namespace AzToolsFramework
 
     void PrefabUiHandler::PaintItemForeground(QPainter* painter, const QStyleOptionViewItem& option, [[maybe_unused]] const QModelIndex& index) const
     {
-        AZ::EntityId entityId(index.data(EntityOutlinerListModel::EntityIdRole).value<AZ::u64>());
+        AZ::EntityId entityId = GetEntityIdFromIndex(index);
         const QPoint offset = QPoint(-18, 3);
         QModelIndex firstColumnIndex = index.siblingAtColumn(EntityOutlinerListModel::ColumnName);
         const int iconSize = 16;
@@ -385,7 +385,7 @@ namespace AzToolsFramework
 
     bool PrefabUiHandler::OnOutlinerItemClick(const QPoint& position, const QStyleOptionViewItem& option, const QModelIndex& index) const
     {
-        AZ::EntityId entityId(index.data(EntityOutlinerListModel::EntityIdRole).value<AZ::u64>());
+        AZ::EntityId entityId = GetEntityIdFromIndex(index);
         const QPoint offset = QPoint(-18, 3);
 
         if (m_prefabFocusPublicInterface->IsOwningPrefabInFocusHierarchy(entityId))
@@ -411,7 +411,7 @@ namespace AzToolsFramework
 
     void PrefabUiHandler::OnOutlinerItemCollapse(const QModelIndex& index) const
     {
-        AZ::EntityId entityId(index.data(EntityOutlinerListModel::EntityIdRole).value<AZ::u64>());
+        AZ::EntityId entityId = GetEntityIdFromIndex(index);
 
         if (m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(entityId))
         {
@@ -420,8 +420,10 @@ namespace AzToolsFramework
         }
     }
 
-    bool PrefabUiHandler::OnEntityDoubleClick(AZ::EntityId entityId) const
+    bool PrefabUiHandler::OnOutlinerItemDoubleClick(const QModelIndex& index) const
     {
+        AZ::EntityId entityId = GetEntityIdFromIndex(index);
+
         if (!m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(entityId))
         {
             // Focus on this prefab
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h
index a1c624f85a..7166629cf3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.h
@@ -43,8 +43,8 @@ namespace AzToolsFramework
             const QModelIndex& index,
             const QModelIndex& descendantIndex) const override;
         bool OnOutlinerItemClick(const QPoint& position, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+        bool OnOutlinerItemDoubleClick(const QModelIndex& index) const override;
         void OnOutlinerItemCollapse(const QModelIndex& index) const override;
-        bool OnEntityDoubleClick(AZ::EntityId entityId) const override;
 
     protected:
         Prefab::PrefabFocusPublicInterface* m_prefabFocusPublicInterface = nullptr;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
index bd0cb3844a..d57d16fd74 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
@@ -52,7 +52,6 @@ AZ_POP_DISABLE_WARNING
 #include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 #include <AzToolsFramework/Thumbnails/ThumbnailWidget.h>
 #include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailContext.h>
 #include <AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h>
 
 #include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
@@ -102,7 +101,7 @@ namespace AzToolsFramework
         m_editButton->setAutoRaise(true);
         m_editButton->setIcon(QIcon(":/stylesheet/img/UI20/open-in-internal-app.svg"));
         m_editButton->setToolTip("Edit asset");
-        m_editButton->setVisible(false);
+        SetEditButtonVisible(false);
 
         connect(m_editButton, &QToolButton::clicked, this, &PropertyAssetCtrl::OnEditButtonClicked);
 
@@ -813,7 +812,7 @@ namespace AzToolsFramework
             selection.SetDisplayFilter(FilterConstType(compFilter));
         }
 
-        AssetBrowserComponentRequestBus::Broadcast(&AssetBrowserComponentRequests::PickAssets, selection, parentWidget());
+        PickAssetSelectionFromDialog(selection, parentWidget());
         if (selection.IsValid())
         {
             const auto product = azrtti_cast<const ProductAssetBrowserEntry*>(selection.GetResult());
@@ -831,6 +830,11 @@ namespace AzToolsFramework
         }
     }
 
+    void PropertyAssetCtrl::PickAssetSelectionFromDialog(AssetSelectionModel& selection, QWidget* parent)
+    {
+        AssetBrowserComponentRequestBus::Broadcast(&AssetBrowserComponentRequests::PickAssets, selection, parent);
+    }
+
     void PropertyAssetCtrl::OnClearButtonClicked()
     {
         ClearAssetInternal();
@@ -961,12 +965,16 @@ namespace AzToolsFramework
             AzFramework::StringFunc::Path::GetFileName(assetPath.c_str(), m_defaultAssetHint);
         }
         m_browseEdit->setPlaceholderText((m_defaultAssetHint + m_DefaultSuffix).c_str());
+
+        UpdateEditButton();
     }
 
     void PropertyAssetCtrl::UpdateAssetDisplay()
     {
         UpdateThumbnail();
 
+        UpdateEditButton();
+
         if (m_currentAssetType == AZ::Data::s_invalidAssetType)
         {
             return;
@@ -1109,7 +1117,9 @@ namespace AzToolsFramework
 
     void PropertyAssetCtrl::SetEditButtonVisible(bool visible)
     {
-        m_editButton->setVisible(visible);
+        m_showEditButton = visible;
+        m_editButton->setVisible(m_showEditButton);
+        UpdateEditButton();
     }
 
     void PropertyAssetCtrl::SetEditButtonIcon(const QIcon& icon)
@@ -1195,7 +1205,7 @@ namespace AzToolsFramework
                     SharedThumbnailKey thumbnailKey = MAKE_TKEY(AzToolsFramework::AssetBrowser::ProductThumbnailKey, assetID);
                     if (m_showThumbnail)
                     {
-                        m_thumbnail->SetThumbnailKey(thumbnailKey, Thumbnailer::ThumbnailContext::DefaultContext);
+                        m_thumbnail->SetThumbnailKey(thumbnailKey);
                     }
                     return;
                 }
@@ -1205,6 +1215,15 @@ namespace AzToolsFramework
         m_thumbnail->ClearThumbnail();
     }
 
+    void PropertyAssetCtrl::UpdateEditButton()
+    {
+        // if Edit button is in use (shown), enable/disable it depending on the current asset id.
+        if (m_showEditButton && m_disableEditButtonWhenNoAssetSelected)
+        {
+            m_editButton->setEnabled(GetCurrentAssetID().IsValid());
+        }
+    }
+
     void PropertyAssetCtrl::SetClearButtonEnabled(bool enable)
     {
         m_browseEdit->setClearButtonEnabled(enable);
@@ -1236,6 +1255,17 @@ namespace AzToolsFramework
         return m_hideProductFilesInAssetPicker;
     }
 
+    void PropertyAssetCtrl::SetDisableEditButtonWhenNoAssetSelected(bool disableEditButtonWhenNoAssetSelected)
+    {
+        m_disableEditButtonWhenNoAssetSelected = disableEditButtonWhenNoAssetSelected;
+        UpdateEditButton();
+    }
+
+    bool PropertyAssetCtrl::GetDisableEditButtonWhenNoAssetSelected() const
+    {
+        return m_disableEditButtonWhenNoAssetSelected;
+    }
+
     void PropertyAssetCtrl::SetShowThumbnail(bool enable)
     {
         m_showThumbnail = enable;
@@ -1349,6 +1379,12 @@ namespace AzToolsFramework
                 GUI->SetEditButtonTooltip(tr(buttonTooltip.c_str()));
             }
         }
+        else if (attrib == AZ_CRC_CE("DisableEditButtonWhenNoAssetSelected"))
+        {
+            bool disableEditButtonWhenNoAssetSelected = false;
+            attrValue->Read<bool>(disableEditButtonWhenNoAssetSelected);
+            GUI->SetDisableEditButtonWhenNoAssetSelected(disableEditButtonWhenNoAssetSelected);
+        }
         else if (attrib == AZ::Edit::Attributes::DefaultAsset)
         {
             AZ::Data::AssetId assetId;
@@ -1492,7 +1528,7 @@ namespace AzToolsFramework
         ConsumeAttributeInternal(GUI, attrib, attrValue, debugName);
     }
 
-    void AssetPropertyHandlerDefault::WriteGUIValuesIntoProperty(size_t index, PropertyAssetCtrl* GUI, property_t& instance, InstanceDataNode* node)
+    void AssetPropertyHandlerDefault::WriteGUIValuesIntoPropertyInternal(size_t index, PropertyAssetCtrl* GUI, property_t& instance, InstanceDataNode* node)
     {
         (void)index;
         (void)node;
@@ -1507,7 +1543,12 @@ namespace AzToolsFramework
         }
     }
 
-    bool AssetPropertyHandlerDefault::ReadValuesIntoGUI(size_t index, PropertyAssetCtrl* GUI, const property_t& instance, InstanceDataNode* node)
+    void AssetPropertyHandlerDefault::WriteGUIValuesIntoProperty(size_t index, PropertyAssetCtrl* GUI, property_t& instance, InstanceDataNode* node)
+    {
+        WriteGUIValuesIntoPropertyInternal(index, GUI, instance, node);
+    }
+
+    bool AssetPropertyHandlerDefault::ReadValuesIntoGUIInternal(size_t index, PropertyAssetCtrl* GUI, const property_t& instance, InstanceDataNode* node)
     {
         (void)index;
         (void)node;
@@ -1527,6 +1568,11 @@ namespace AzToolsFramework
         return false;
     }
 
+    bool AssetPropertyHandlerDefault::ReadValuesIntoGUI(size_t index, PropertyAssetCtrl* GUI, const property_t& instance, InstanceDataNode* node)
+    {
+        return ReadValuesIntoGUIInternal(index, GUI, instance, node);
+    }
+
     QWidget* SimpleAssetPropertyHandlerDefault::CreateGUI(QWidget* pParent)
     {
         PropertyAssetCtrl* newCtrl = aznew PropertyAssetCtrl(pParent);
@@ -1597,6 +1643,12 @@ namespace AzToolsFramework
                 GUI->SetEditButtonTooltip(tr(buttonTooltip.c_str()));
             }
         }
+        else if (attrib == AZ_CRC_CE("DisableEditButtonWhenNoAssetSelected"))
+        {
+            bool disableEditButtonWhenNoAssetSelected = false;
+            attrValue->Read<bool>(disableEditButtonWhenNoAssetSelected);
+            GUI->SetDisableEditButtonWhenNoAssetSelected(disableEditButtonWhenNoAssetSelected);
+        }
     }
 
     void SimpleAssetPropertyHandlerDefault::WriteGUIValuesIntoProperty(size_t index, PropertyAssetCtrl* GUI, property_t& instance, InstanceDataNode* node)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
index d6ff1b8de6..14326fcc6e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
@@ -159,6 +159,10 @@ namespace AzToolsFramework
         //! By default the asset picker shows both on an AZ::Asset<> property. You can hide product assets with this flag.
         bool m_hideProductFilesInAssetPicker = false;
 
+        //! True to disable the edit button when there is no asset currently selected.
+        bool m_disableEditButtonWhenNoAssetSelected = false;
+
+        bool m_showEditButton = false;
         bool m_showThumbnail = false;
         bool m_showThumbnailDropDownButton = false;
         EditCallbackType* m_thumbnailCallback = nullptr;
@@ -220,6 +224,9 @@ namespace AzToolsFramework
         void SetHideProductFilesInAssetPicker(bool hide);
         bool GetHideProductFilesInAssetPicker() const;
 
+        void SetDisableEditButtonWhenNoAssetSelected(bool disableEditButtonWhenNoAssetSelected);
+        bool GetDisableEditButtonWhenNoAssetSelected() 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;
@@ -237,6 +244,7 @@ namespace AzToolsFramework
         void SetCurrentAssetHint(const AZStd::string& hint);
         void SetDefaultAssetID(const AZ::Data::AssetId& defaultID);
         virtual void PopupAssetPicker();
+        virtual void PickAssetSelectionFromDialog(AssetSelectionModel& selection, QWidget* parent);
         void OnClearButtonClicked();
         void UpdateAssetDisplay();
         void OnLineEditFocus(bool focus);
@@ -250,6 +258,7 @@ namespace AzToolsFramework
 
     private:
         void UpdateThumbnail();
+        void UpdateEditButton();
     };
 
     class AssetPropertyHandlerDefault
@@ -272,7 +281,9 @@ namespace AzToolsFramework
         virtual QWidget* CreateGUI(QWidget* pParent) override;
         static void ConsumeAttributeInternal(PropertyAssetCtrl* GUI, AZ::u32 attrib, PropertyAttributeReader* attrValue, const char* debugName);
         void ConsumeAttribute(PropertyAssetCtrl* GUI, AZ::u32 attrib, PropertyAttributeReader* attrValue, const char* debugName) override;
+        static void WriteGUIValuesIntoPropertyInternal(size_t index, PropertyAssetCtrl* GUI, property_t& instance, InstanceDataNode* node);
         virtual void WriteGUIValuesIntoProperty(size_t index, PropertyAssetCtrl* GUI, property_t& instance, InstanceDataNode* node) override;
+        static bool ReadValuesIntoGUIInternal(size_t index, PropertyAssetCtrl* GUI, const property_t& instance, InstanceDataNode* node);
         virtual bool ReadValuesIntoGUI(size_t index, PropertyAssetCtrl* GUI, const property_t& instance, InstanceDataNode* node)  override;
     };
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals.h
index ecd27baed4..f1ddc2268d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals.h
@@ -154,6 +154,16 @@ namespace AzToolsFramework
             (void)debugName;
         }
 
+        // provides an option to specify reading parent element attributes.
+        // This allows parent elements to override attributes of their children if needed.
+        virtual void ConsumeParentAttribute(WidgetType* widget, AZ::u32 attrib, PropertyAttributeReader* attrValue, const char* debugName)
+        {
+            (void)widget;
+            (void)attrib;
+            (void)attrValue;
+            (void)debugName;
+        }
+
         // override GetFirstInTabOrder, GetLastInTabOrder in your base class to define which widget gets focus first when pressing tab,
         // and also what widget is last.
         // for example, if your widget is a compound widget and contains, say, 5 buttons
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals_Impl.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals_Impl.h
index 2ebacfa558..ec428de951 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals_Impl.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals_Impl.h
@@ -40,7 +40,14 @@ namespace AzToolsFramework
         }
 
         void* classInstance = parent->FirstInstance(); // pointer to the owner class so we can read member variables and functions
-        auto consumeAttributes = [&](const auto& attributes, const char* name)
+
+        void* parentClassInstance = nullptr;
+        if (InstanceDataNode* parentInstanceDataNode = parent->GetParent())
+        {
+            parentClassInstance = parentInstanceDataNode->FirstInstance();
+        }
+
+        auto consumeAttributes = [this, classInstance, wid](const auto& attributes, const char* name)
         {
             for (size_t i = 0; i < attributes.size(); ++i)
             {
@@ -50,25 +57,43 @@ namespace AzToolsFramework
             }
         };
 
+        auto consumeParentAttributes = [this, parentClassInstance, wid](const auto& attributes, const char* name)
+        {
+            if (parentClassInstance)
+            {
+                for (size_t i = 0; i < attributes.size(); ++i)
+                {
+                    const auto& attrPair = attributes[i];
+                    PropertyAttributeReader reader(parentClassInstance, &*attrPair.second);
+                    ConsumeParentAttribute(wid, attrPair.first, &reader, name);
+                }
+            }
+        };
+
         const AZ::SerializeContext::ClassElement* element = dataNode->GetElementMetadata();
         if (element)
         {
             consumeAttributes(element->m_attributes, element->m_name);
-            const AZ::Edit::ElementData* elementEdit = dataNode->GetElementEditMetadata();
-            if (elementEdit)
+
+            if (const AZ::Edit::ElementData* elementEdit = dataNode->GetElementEditMetadata();
+                elementEdit != nullptr)
             {
                 consumeAttributes(elementEdit->m_attributes, elementEdit->m_name);
             }
-        }
 
-        if (dataNode->GetClassMetadata())
-        {
-            const AZ::Edit::ClassData* classEditData = dataNode->GetClassMetadata()->m_editData;
-            if (classEditData)
+            const AZ::SerializeContext::ClassElement* parentElement = parent != dataNode ?
+                dataNode->GetElementMetadata() :
+                nullptr;
+
+            if (parentElement != nullptr)
             {
-                for (auto it = classEditData->m_elements.begin(); it != classEditData->m_elements.end(); ++it)
+                // Reuse the current instance element name for the debug name
+                consumeParentAttributes(parentElement->m_attributes, element->m_name);
+
+                if (const AZ::Edit::ElementData* elementEdit = parent->GetElementEditMetadata();
+                    elementEdit != nullptr)
                 {
-                    consumeAttributes(it->m_attributes, it->m_name);
+                    consumeParentAttributes(elementEdit->m_attributes, elementEdit->m_name);
                 }
             }
         }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.hxx
index 206b972b37..fc1d24b7a5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.hxx
@@ -66,6 +66,12 @@ namespace AzToolsFramework
     class GenericEnumPropertyComboBoxHandler
         : public GenericComboBoxHandler<ValueType>
     {
+        virtual void ConsumeParentAttribute(GenericComboBoxCtrlBase* GUI, AZ::u32 attrib, PropertyAttributeReader* attrValue, const char* debugName) override
+        {
+            // Simply re-route to ConsumeAttribute since no special logic is needed.
+            ConsumeAttribute(GUI, attrib, attrValue, debugName);
+        }
+
         virtual void ConsumeAttribute(GenericComboBoxCtrlBase* GUI, AZ::u32 attrib, PropertyAttributeReader* attrValue, const char* debugName) override
         {
             (void)debugName;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
index ec817f4ae1..683a7b8005 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
@@ -65,11 +65,11 @@ namespace AzToolsFramework
         UpdateVisibility();
     }
 
-    void ThumbnailPropertyCtrl::SetThumbnailKey(Thumbnailer::SharedThumbnailKey key, const char* contextName)
+    void ThumbnailPropertyCtrl::SetThumbnailKey(Thumbnailer::SharedThumbnailKey key)
     {
         m_key = key;
-        m_thumbnail->SetThumbnailKey(m_key, contextName);
-        m_thumbnailEnlarged->SetThumbnailKey(m_key, contextName);
+        m_thumbnail->SetThumbnailKey(m_key);
+        m_thumbnailEnlarged->SetThumbnailKey(m_key);
         UpdateVisibility();
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
index ffd8234190..be317b8a92 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h
@@ -34,7 +34,7 @@ namespace AzToolsFramework
         explicit ThumbnailPropertyCtrl(QWidget* parent = nullptr);
 
         //! Call this to set what thumbnail widget will display
-        void SetThumbnailKey(Thumbnailer::SharedThumbnailKey key, const char* contextName = "Default");
+        void SetThumbnailKey(Thumbnailer::SharedThumbnailKey key);
 
         //! Remove current thumbnail
         void ClearThumbnail();
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
index 5c5cdcb4b4..c1037dd1ba 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
@@ -1360,6 +1360,19 @@ namespace AzToolsFramework
                 EndRecordManipulatorCommand();
             });
 
+        translationManipulators->InstallSurfaceManipulatorEntityIdsToIgnoreFn(
+            [this](const ViewportInteraction::MouseInteraction& interaction)
+            {
+                if (interaction.m_keyboardModifiers.Ctrl())
+                {
+                    return AZStd::unordered_set<AZ::EntityId>();
+                }
+                else
+                {
+                    return m_selectedEntityIds;
+                }
+            });
+
         // transfer ownership
         m_entityIdManipulators.m_manipulators = AZStd::move(translationManipulators);
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
index 53e9a97b1d..3947008ce7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
@@ -86,8 +86,6 @@ set(FILES
     Thumbnails/Thumbnail.cpp
     Thumbnails/Thumbnail.h
     Thumbnails/Thumbnail.inl
-    Thumbnails/ThumbnailContext.cpp
-    Thumbnails/ThumbnailContext.h
     Thumbnails/ThumbnailerBus.h
     Thumbnails/ThumbnailWidget.cpp
     Thumbnails/ThumbnailWidget.h
diff --git a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
index 006999e8b7..2c396d4236 100644
--- a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
@@ -3276,4 +3276,45 @@ namespace UnitTest
         const AZ::Transform finalEntityTransform = AzToolsFramework::GetWorldTransform(m_entityIdBox);
         EXPECT_THAT(finalEntityTransform.GetTranslation(), IsCloseTolerance(expectedWorldPosition, 0.01f));
     }
+
+    TEST_F(
+        EditorTransformComponentSelectionRenderGeometryIntersectionManipulatorFixture, SurfaceManipulatorSelfIntersectsMeshWhenCtrlIsHeld)
+    {
+        // camera (go to position format) - 47.00, -52.00, 20.00, 0.00, -60.00
+        m_cameraState.m_viewportSize = AZ::Vector2(1280.0f, 720.0f);
+        // position camera
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromMatrix3x3AndTranslation(
+                AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(-60.0f)), AZ::Vector3(47.0f, -52.0f, 20.0f)));
+        // position box
+        AzToolsFramework::SetWorldTransform(m_entityIdBox, AZ::Transform::CreateTranslation(AZ::Vector3(50.0f, -50.0f, 20.0f)));
+
+        // the initial starting position of the entity
+        const auto initialTransformWorld = AzToolsFramework::GetWorldTransform(m_entityIdBox);
+        // where the surface manipulator should end up (surface of the box)
+        const auto finalTransformWorld = AZ::Transform::CreateTranslation(AZ::Vector3(49.5f, -49.6337357f, 19.5793953f));
+
+        // calculate the position in screen space of the initial position of the entity
+        const auto initialPositionScreen = AzFramework::WorldToScreen(initialTransformWorld.GetTranslation(), m_cameraState);
+        // calculate the position in screen space of the final position of the entity
+        const auto finalPositionScreen = AzFramework::WorldToScreen(finalTransformWorld.GetTranslation(), m_cameraState);
+
+        // select the entity (this will cause the manipulators to appear in EditorTransformComponentSelection)
+        AzToolsFramework::SelectEntity(m_entityIdBox);
+
+        // press and drag the mouse (starting where the surface manipulator is)
+        m_actionDispatcher->CameraState(m_cameraState)
+            ->MousePosition(initialPositionScreen)
+            ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Control)
+            ->MouseLButtonDown()
+            ->MousePosition(finalPositionScreen)
+            ->MouseLButtonUp();
+
+        // read back the position of the entity now
+        const AZ::Transform finalManipulatorTransform = GetManipulatorTransform().value_or(AZ::Transform::CreateIdentity());
+
+        // ensure final world positions match
+        EXPECT_THAT(finalManipulatorTransform, IsCloseTolerance(finalTransformWorld, 0.01f));
+    }
 } // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntitySelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntitySelectionTests.cpp
index 0ad61b924b..483db4076e 100644
--- a/Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntitySelectionTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/ContainerEntitySelectionTests.cpp
@@ -15,7 +15,7 @@ namespace UnitTest
         // 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);
+        ClickAtWorldPositionOnViewport(s_worldCarEntityPosition);
 
         // Verify the correct entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
@@ -29,7 +29,7 @@ namespace UnitTest
         m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[StreetEntityName]); // Containers are closed by default
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+        ClickAtWorldPositionOnViewport(s_worldCarEntityPosition);
 
         // Verify the correct entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
@@ -47,7 +47,7 @@ namespace UnitTest
         m_containerEntityInterface->SetContainerOpen(m_entityMap[StreetEntityName], true);
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+        ClickAtWorldPositionOnViewport(s_worldCarEntityPosition);
 
         // Verify the correct entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
@@ -65,7 +65,7 @@ namespace UnitTest
         m_containerEntityInterface->RegisterEntityAsContainer(m_entityMap[CityEntityName]);
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+        ClickAtWorldPositionOnViewport(s_worldCarEntityPosition);
 
         // Verify the correct entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
@@ -85,7 +85,7 @@ namespace UnitTest
         m_containerEntityInterface->SetContainerOpen(m_entityMap[CityEntityName], true);
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+        ClickAtWorldPositionOnViewport(s_worldCarEntityPosition);
 
         // Verify the correct entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.cpp b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.cpp
index 90becfa46f..374b85c01d 100644
--- a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.cpp
@@ -8,6 +8,7 @@
 
 #include <Tests/FocusMode/EditorFocusModeFixture.h>
 
+#include <AzCore/Component/TransformBus.h>
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 
 #include <Tests/BoundsTestComponent.h>
@@ -93,10 +94,13 @@ namespace UnitTest
         entity->CreateComponent<UnitTest::BoundsTestComponent>();
         entity->Activate();
 
-        // Move the CarEntity so it's out of the way.
-        AZ::TransformBus::Event(m_entityMap[CarEntityName], &AZ::TransformBus::Events::SetWorldTranslation, WorldCarEntityPosition);
+        // Move the City so that it is in view
+        AZ::TransformBus::Event(m_entityMap[CityEntityName], &AZ::TransformBus::Events::SetWorldTranslation, s_worldCityEntityPosition);
 
-        // Setup the camera so the Car entity is in view.
+        // Move the CarEntity so that it's not overlapping with the rest
+        AZ::TransformBus::Event(m_entityMap[CarEntityName], &AZ::TransformBus::Events::SetWorldTranslation, s_worldCarEntityPosition);
+
+        // Setup the camera so the entities is in view.
         AzFramework::SetCameraTransform(
             m_cameraState,
             AZ::Transform::CreateFromQuaternionAndTranslation(
@@ -113,4 +117,5 @@ namespace UnitTest
 
         return entity->GetId();
     }
+
 } // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.h b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.h
index 0cf1be6ffd..88cc5ac921 100644
--- a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.h
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeFixture.h
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include <AzCore/Component/TransformBus.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 
@@ -38,9 +37,6 @@ namespace UnitTest
         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);
 
         inline static const char* CityEntityName = "City";
         inline static const char* StreetEntityName = "Street";
@@ -49,7 +45,11 @@ namespace UnitTest
         inline static const char* Passenger1EntityName = "Passenger1";
         inline static const char* Passenger2EntityName = "Passenger2";
 
-        inline static AZ::Vector3 WorldCarEntityPosition = AZ::Vector3(5.0f, 15.0f, 0.0f);
+        AzFramework::CameraState m_cameraState;
+
+        inline static const AZ::Vector3 CameraPosition = AZ::Vector3(10.0f, 15.0f, 10.0f);
+        inline static AZ::Vector3 s_worldCityEntityPosition = AZ::Vector3(5.0f, 10.0f, 0.0f);
+        inline static AZ::Vector3 s_worldCarEntityPosition = AZ::Vector3(5.0f, 15.0f, 0.0f);
     };
 
 } // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionFixture.h b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionFixture.h
index fe1de9b122..5dc323dd8c 100644
--- a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionFixture.h
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionFixture.h
@@ -45,5 +45,20 @@ namespace UnitTest
             // Click the entity in the viewport
             m_actionDispatcher->CameraState(m_cameraState)->MousePosition(carScreenPosition)->MouseLButtonDown()->MouseLButtonUp();
         }
+
+        void BoxSelectOnViewport()
+        {
+            // Calculate the position in screen space of where to begin and end the box select action
+            const auto beginningPositionWorldBoxSelect = AzFramework::WorldToScreen(AZ::Vector3(-10.0f, 15.0f, 5.0f), m_cameraState);
+            const auto endingPositionWorldBoxSelect = AzFramework::WorldToScreen(AZ::Vector3(10.0f, 15.0f, -5.0f), m_cameraState);
+
+            // Perform a box select in the viewport
+            m_actionDispatcher->SetStickySelect(true)
+                ->CameraState(m_cameraState)
+                ->MousePosition(beginningPositionWorldBoxSelect)
+                ->MouseLButtonDown()
+                ->MousePosition(endingPositionWorldBoxSelect)
+                ->MouseLButtonUp();
+        }
     };
 } // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionTests.cpp
index 1efcb15b30..ee338539a8 100644
--- a/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeSelectionTests.cpp
@@ -13,7 +13,7 @@ namespace UnitTest
     TEST_F(EditorFocusModeSelectionFixture, EditorFocusModeSelectionSelectEntityWithFocusOnLevel)
     {
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+        ClickAtWorldPositionOnViewport(s_worldCarEntityPosition);
 
         // Verify entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
@@ -27,7 +27,7 @@ namespace UnitTest
         m_focusModeInterface->SetFocusRoot(m_entityMap[StreetEntityName]);
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+        ClickAtWorldPositionOnViewport(s_worldCarEntityPosition);
 
         // Verify entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
@@ -41,7 +41,7 @@ namespace UnitTest
         m_focusModeInterface->SetFocusRoot(m_entityMap[CarEntityName]);
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+        ClickAtWorldPositionOnViewport(s_worldCarEntityPosition);
 
         // Verify entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
@@ -55,7 +55,7 @@ namespace UnitTest
         m_focusModeInterface->SetFocusRoot(m_entityMap[SportsCarEntityName]);
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+        ClickAtWorldPositionOnViewport(s_worldCarEntityPosition);
 
         // Verify entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
@@ -68,10 +68,71 @@ namespace UnitTest
         m_focusModeInterface->SetFocusRoot(m_entityMap[Passenger1EntityName]);
 
         // Click on Car Entity
-        ClickAtWorldPositionOnViewport(WorldCarEntityPosition);
+        ClickAtWorldPositionOnViewport(s_worldCarEntityPosition);
 
         // Verify entity is selected
         auto selectedEntitiesAfter = GetSelectedEntities();
         EXPECT_EQ(selectedEntitiesAfter.size(), 0);
     }
+
+    TEST_F(EditorFocusModeSelectionFixture, EditorFocusModeSelectionBoxSelectWithFocusOnLevel)
+    {
+        // Do a box select that includes all entities in the fixture
+        BoxSelectOnViewport();
+
+        // Entities are selected
+        using ::testing::UnorderedElementsAre;
+        auto selectedEntitiesAfter = GetSelectedEntities();
+        EXPECT_THAT(selectedEntitiesAfter,
+            UnorderedElementsAre(
+                m_entityMap[CityEntityName],
+                m_entityMap[StreetEntityName],
+                m_entityMap[CarEntityName],
+                m_entityMap[Passenger1EntityName],
+                m_entityMap[SportsCarEntityName],
+                m_entityMap[Passenger2EntityName]
+            )
+        );
+    }
+
+    TEST_F(EditorFocusModeSelectionFixture, EditorFocusModeSelectionBoxSelectWithFocusOnChild)
+    {
+        // Set the focus on the Passenger1 Entity (child of the entity)
+        m_focusModeInterface->SetFocusRoot(m_entityMap[StreetEntityName]);
+
+        // Do a box select that includes all entities in the fixture
+        BoxSelectOnViewport();
+
+        // Entities are selected
+        using ::testing::UnorderedElementsAre;
+        auto selectedEntitiesAfter = GetSelectedEntities();
+        EXPECT_THAT(selectedEntitiesAfter,
+            UnorderedElementsAre(
+                m_entityMap[StreetEntityName],
+                m_entityMap[CarEntityName],
+                m_entityMap[Passenger1EntityName],
+                m_entityMap[SportsCarEntityName],
+                m_entityMap[Passenger2EntityName]
+            )
+        );
+    }
+
+    TEST_F(EditorFocusModeSelectionFixture, EditorFocusModeSelectionBoxSelectWithFocusOnLeaf)
+    {
+        // Set the focus on the Passenger1 Entity (child of the entity)
+        m_focusModeInterface->SetFocusRoot(m_entityMap[Passenger1EntityName]);
+
+        // Do a box select that includes all entities in the fixture
+        BoxSelectOnViewport();
+
+        // Entities are selected
+        using ::testing::UnorderedElementsAre;
+        auto selectedEntitiesAfter = GetSelectedEntities();
+        EXPECT_THAT(selectedEntitiesAfter,
+            UnorderedElementsAre(
+                m_entityMap[Passenger1EntityName]
+            )
+        );
+    }
+
 } // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp b/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp
index 2a7b370684..c6e4defcc1 100644
--- a/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp
@@ -71,83 +71,4 @@ namespace UnitTest
 
         AZ::Entity* m_testEntity = nullptr;
     };
-
-    TEST_F(ThumbnailerTests, ThumbnailerComponent_RegisterUnregisterContext)
-    {
-        constexpr const char* contextName1 = "Context1";
-        constexpr const char* contextName2 = "Context2";
-
-        auto checkHasContext = [](const char* contextName)
-        {
-            bool hasContext = false;
-            AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::BroadcastResult(hasContext, &AzToolsFramework::Thumbnailer::ThumbnailerRequests::HasContext, contextName);
-            return hasContext;
-        };
-
-        EXPECT_FALSE(checkHasContext(contextName1));
-        EXPECT_FALSE(checkHasContext(contextName2));
-
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
-
-        EXPECT_TRUE(checkHasContext(contextName1));
-        EXPECT_FALSE(checkHasContext(contextName2));
-
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2);
-
-        EXPECT_TRUE(checkHasContext(contextName1));
-        EXPECT_TRUE(checkHasContext(contextName2));
-
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::UnregisterContext, contextName1);
-
-        EXPECT_FALSE(checkHasContext(contextName1));
-        EXPECT_TRUE(checkHasContext(contextName2));
-
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::UnregisterContext, contextName2);
-
-        EXPECT_FALSE(checkHasContext(contextName1));
-        EXPECT_FALSE(checkHasContext(contextName2));
-    }
-
-    TEST_F(ThumbnailerTests, ThumbnailerComponent_Deactivate_ClearTumbnailContexts)
-    {
-        constexpr const char* contextName1 = "Context1";
-        constexpr const char* contextName2 = "Context2";
-
-        auto checkHasContext = [](const char* contextName)
-        {
-            bool hasContext = false;
-            AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::BroadcastResult(hasContext, &AzToolsFramework::Thumbnailer::ThumbnailerRequests::HasContext, contextName);
-            return hasContext;
-        };
-
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2);
-
-        EXPECT_TRUE(checkHasContext(contextName1));
-        EXPECT_TRUE(checkHasContext(contextName2));
-
-        m_testEntity->Deactivate();
-        m_testEntity->Activate();
-
-        EXPECT_FALSE(checkHasContext(contextName1));
-        EXPECT_FALSE(checkHasContext(contextName2));
-    }
-
-    TEST_F(ThumbnailerTests, ThumbnailerComponent_RegisterContextTwice_Assert)
-    {
-        constexpr const char* contextName1 = "Context1";
-
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
-
-        AZ_TEST_START_TRACE_SUPPRESSION;
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
-        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
-    }
-
-    TEST_F(ThumbnailerTests, ThumbnailerComponent_UnregisterUnknownContext_Assert)
-    {
-        AZ_TEST_START_TRACE_SUPPRESSION;
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::UnregisterContext, "ContextDoesNotExist");
-        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
-    }
 } // namespace UnitTest
diff --git a/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
index bc7b16cc79..20bfc4221c 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
@@ -32,6 +32,12 @@ set(FILES
     native/tests/assetmanager/AssetProcessorManagerTest.h
     native/tests/assetmanager/ModtimeScanningTests.cpp
     native/tests/assetmanager/ModtimeScanningTests.h
+    native/tests/assetmanager/MockAssetProcessorManager.cpp
+    native/tests/assetmanager/MockAssetProcessorManager.h
+    native/tests/assetmanager/MockFileProcessor.h
+    native/tests/assetmanager/MockFileProcessor.cpp
+    native/tests/assetmanager/TestEventSignal.cpp
+    native/tests/assetmanager/TestEventSignal.h
     native/tests/utilities/assetUtilsTest.cpp
     native/tests/platformconfiguration/platformconfigurationtests.cpp
     native/tests/platformconfiguration/platformconfigurationtests.h
@@ -51,6 +57,8 @@ set(FILES
     native/tests/SourceFileRelocatorTests.cpp
     native/tests/PathDependencyManagerTests.cpp
     native/tests/AssetProcessorMessagesTests.cpp
+    native/tests/ApplicationManagerTests.cpp
+    native/tests/ApplicationManagerTests.h
     native/unittests/AssetProcessingStateDataUnitTests.cpp
     native/unittests/AssetProcessingStateDataUnitTests.h
     native/unittests/AssetProcessorManagerUnitTests.cpp
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
index eb40b476b1..a4035b3951 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
@@ -205,7 +205,7 @@ namespace AssetProcessor
         void EmitResolvedDependency(const AZ::Data::AssetId& assetId, const AzToolsFramework::AssetDatabase::ProductDependencyDatabaseEntry& entry);
 
         //! Internal structure that will hold all the necessary information to process jobs later.
-        //! We need to hold these jobs because they have declared either source dependency on other sources 
+        //! We need to hold these jobs because they have declared either source dependency on other sources
         //! or a job dependency and we can only resolve these dependencies once all the create jobs are completed.
         struct JobToProcessEntry
         {
@@ -229,14 +229,14 @@ namespace AssetProcessor
 
         //! Emit whenever a new asset is found or an existing asset is updated
         void AssetMessage(AzFramework::AssetSystem::AssetNotificationMessage message);
-        
+
         // InputAssetProcessed - uses absolute asset path of input file
         void InputAssetProcessed(QString fullAssetPath, QString platform);
 
         void RequestInputAssetStatus(QString inputAssetPath, QString platform, QString jobDescription);
         void RequestPriorityAssetCompile(QString inputAssetPath, QString platform, QString jobDescription);
 
-        //! AssetProcessorManagerIdleState is emitted when APM idle state changes, we emit true when 
+        //! AssetProcessorManagerIdleState is emitted when APM idle state changes, we emit true when
         //! APM is waiting for outside stimulus i.e its has eaten through all of its queues and is only waiting for
         //! responses back from other systems (like its waiting for responses back from the compiler)
         void AssetProcessorManagerIdleState(bool state);
@@ -272,12 +272,12 @@ namespace AssetProcessor
 
         void AssessFilesFromScanner(QSet<AssetFileInfo> filePaths);
 
-        void AssessModifiedFile(QString filePath);
-        void AssessAddedFile(QString filePath);
-        void AssessDeletedFile(QString filePath);
+        virtual void AssessModifiedFile(QString filePath);
+        virtual void AssessAddedFile(QString filePath);
+        virtual void AssessDeletedFile(QString filePath);
         void OnAssetScannerStatusChange(AssetProcessor::AssetScanningStatus status);
         void OnJobStatusChanged(JobEntry jobEntry, JobStatus status);
-        
+
         void CheckAssetProcessorIdleState();
 
         void QuitRequested();
@@ -290,7 +290,7 @@ namespace AssetProcessor
 
         //! A network request came in asking for asset database location
         GetAbsoluteAssetDatabaseLocationResponse ProcessGetAbsoluteAssetDatabaseLocationRequest(MessageData<GetAbsoluteAssetDatabaseLocationRequest> messageData);
-        
+
         //! This request comes in and is expected to do whatever heuristic is required in order to determine if an asset actually exists in the database.
         void OnRequestAssetExists(NetworkRequestID requestId, QString platform, QString searchTerm, AZ::Data::AssetId assetId);
 
@@ -329,7 +329,7 @@ namespace AssetProcessor
         bool InitializeCacheRoot();
         void PopulateJobStateCache();
         void AutoFailJob(const AZStd::string& consoleMsg, const AZStd::string& autoFailReason, const AZStd::vector<AssetProcessedEntry>::iterator& assetIter);
-        
+
         using ProductInfoList = AZStd::vector<AZStd::pair<AzToolsFramework::AssetDatabase::ProductDatabaseEntry, const AssetBuilderSDK::JobProduct*>>;
 
         void WriteProductTableInfo(AZStd::pair<AzToolsFramework::AssetDatabase::ProductDatabaseEntry, const AssetBuilderSDK::JobProduct*>& pair, AZStd::vector<AZ::u32>& subIds, AZStd::unordered_set<AzToolsFramework::AssetDatabase::ProductDependencyDatabaseEntry>& dependencyContainer, const AZStd::string& platform);
@@ -362,7 +362,7 @@ namespace AssetProcessor
 
         //! Search the database and the the source dependency maps for the the sourceUuid. if found returns the cached info
         bool SearchSourceInfoBySourceUUID(const AZ::Uuid& sourceUuid, AssetProcessorManager::SourceInfo& result);
-        
+
         //!  Adds the source to the database and returns the corresponding sourceDatabase Entry
         void AddSourceToDatabase(AzToolsFramework::AssetDatabase::SourceDatabaseEntry& sourceDatabaseEntry, const ScanFolderInfo* scanFolder, QString relativeSourceFilePath);
 
@@ -378,8 +378,8 @@ namespace AssetProcessor
         // Load the old scan folders and match them up with new scan folders.  Make sure they're
         bool MigrateScanFolders();
 
-        //! Checks whether the AP is aware of any source file that has indicated the inputted 
-        //! source file as its dependency, and if found do we need to put that file back in the asset pipeline queue again  
+        //! Checks whether the AP is aware of any source file that has indicated the inputted
+        //! source file as its dependency, and if found do we need to put that file back in the asset pipeline queue again
         QStringList GetSourceFilesWhichDependOnSourceFile(const QString& sourcePath);
 
         /** Given a BuilderSDK SourceFileDependency, try to find out what actual database source name is.
@@ -399,9 +399,9 @@ namespace AssetProcessor
         void UpdateWildcardDependencies(JobDetails& job, size_t jobDependencySlot, QStringList& resolvedDependencyList);
 
         //! Check whether the job can be analyzed by APM,
-        //! A job cannot be analyzed if any of its dependent job hasn't been fingerprinted  
+        //! A job cannot be analyzed if any of its dependent job hasn't been fingerprinted
         bool CanAnalyzeJob(const JobDetails& jobDetails);
-        
+
         //! Analyzes and forward the job to the RCController if the job requires processing
         void ProcessJob(JobDetails& jobDetails);
 
@@ -417,7 +417,7 @@ namespace AssetProcessor
         ThreadController<AssetCatalog>* m_assetCatalog;
         typedef QHash<QString, FileEntry> FileExamineContainer;
         FileExamineContainer m_filesToExamine; // order does not actually matter in this (yet)
-        
+
         // this map contains a list of source files that were discovered in the database before asset scanning began.
         // (so files from a previous run).
         // as asset scanning encounters files, it will remove them from this map, and when its done,
@@ -455,20 +455,20 @@ namespace AssetProcessor
         AZ::s64 m_highestJobRunKeySoFar = 0;
         AZStd::vector<JobToProcessEntry> m_jobEntries;
         AZStd::unordered_set<JobDetails> m_jobsToProcess;
-        //! This map is required to prevent multiple sourceFile modified events been send by the APM 
+        //! This map is required to prevent multiple sourceFile modified events been send by the APM
         AZStd::unordered_map<AZ::Uuid, qint64> m_sourceFileModTimeMap;
-        AZStd::unordered_map<JobIndentifier, AZ::u32> m_jobFingerprintMap; 
+        AZStd::unordered_map<JobIndentifier, AZ::u32> m_jobFingerprintMap;
         AZStd::unordered_map<JobDesc, AZStd::unordered_set<AZ::Uuid>> m_jobDescToBuilderUuidMap;
-        
+
         AZStd::unique_ptr<PathDependencyManager> m_pathDependencyManager;
         AZStd::unique_ptr<SourceFileRelocator> m_sourceFileRelocator;
 
         JobDiagnosticTracker m_jobDiagnosticTracker{};
-        
-        QSet<QString> m_checkFoldersToRemove; //!< List of folders that needs to be checked for removal later by AP  
+
+        QSet<QString> m_checkFoldersToRemove; //!< List of folders that needs to be checked for removal later by AP
         //! List of all scanfolders that are present in the database but not currently watched by AP
         AZStd::unordered_map<AZStd::string, AzToolsFramework::AssetDatabase::ScanFolderDatabaseEntry> m_scanFoldersInDatabase;
-        
+
         int m_numOfJobsToAnalyze = 0;
         bool m_alreadyQueuedCheckForIdle = false;
 
@@ -502,7 +502,7 @@ namespace AssetProcessor
           * full absolute paths.
           */
         void QueryAbsolutePathDependenciesRecursive(QString inputDatabasePath, SourceFilesForFingerprintingContainer& finalDependencyList, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::TypeOfDependency dependencyType, bool reverseQuery);
-        
+
         // we can't write a job to the database as not needing analysis the next time around,
         // until all jobs related to it are finished.  This is becuase the jobs themselves are not written to the database
         // so until all jobs are finished, we need to re-analyze the source file next time.
@@ -529,7 +529,7 @@ namespace AssetProcessor
             JobStarted,
             JobFinished,
         };
-        
+
         // ideally you would already have the absolute path to the file, and call this function with it:
         void UpdateAnalysisTrackerForFile(const char* fullPathToFile, AnalysisTrackerUpdateType updateType);
 
diff --git a/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.h b/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.h
index e455fe91cf..f09d424a47 100644
--- a/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.h
+++ b/Code/Tools/AssetProcessor/native/FileProcessor/FileProcessor.h
@@ -19,7 +19,7 @@
 
 namespace AzToolsFramework
 {
-    namespace AssetDatabase 
+    namespace AssetDatabase
     {
         class FileDatabaseEntry;
     }
@@ -40,17 +40,17 @@ namespace AssetProcessor
     public Q_SLOTS:
         //! AssetScanner changed its status
         void OnAssetScannerStatusChange(AssetScanningStatus status);
-        
+
         //! AssetScanner found a file
         void AssessFilesFromScanner(QSet<AssetFileInfo> files);
-        
+
         //! AssetScanner found a folder
         void AssessFoldersFromScanner(QSet<AssetFileInfo> folders);
 
         //! FileWatcher detected added file
-        void AssessAddedFile(QString fileName);
+        virtual void AssessAddedFile(QString fileName);
         //! FileWatcher detected removed file
-        void AssessDeletedFile(QString fileName);
+        virtual void AssessDeletedFile(QString fileName);
         //! Synchronize AssetScanner data with Files table
         void Sync();
 
diff --git a/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.cpp b/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.cpp
index 993e7f2760..2eb56487d9 100644
--- a/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.cpp
+++ b/Code/Tools/AssetProcessor/native/FileWatcher/FileWatcher.cpp
@@ -148,7 +148,6 @@ void FileWatcher::StopWatching()
 {
     if (!m_startedWatching)
     {
-        AZ_Warning("FileWatcher", false, "StopWatching() called when is not watching for file changes.");
         return;
     }
 
diff --git a/Code/Tools/AssetProcessor/native/tests/ApplicationManagerTests.cpp b/Code/Tools/AssetProcessor/native/tests/ApplicationManagerTests.cpp
new file mode 100644
index 0000000000..37717897ef
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/tests/ApplicationManagerTests.cpp
@@ -0,0 +1,91 @@
+/*
+ * 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 "ApplicationManagerTests.h"
+
+#include <QCoreApplication>
+#include <tests/assetmanager/MockAssetProcessorManager.h>
+#include <tests/assetmanager/MockFileProcessor.h>
+
+namespace UnitTests
+{
+    bool DatabaseLocationListener::GetAssetDatabaseLocation(AZStd::string& location)
+    {
+        location = m_databaseLocation;
+        return true;
+    }
+
+    void ApplicationManagerTest::SetUp()
+    {
+        ScopedAllocatorSetupFixture::SetUp();
+        
+        AZ::IO::Path tempDir(m_tempDir.GetDirectory());
+        m_databaseLocationListener.m_databaseLocation = (tempDir / "test_database.sqlite").Native();
+
+        // We need a QCoreApplication to run the event loop
+        int argc = 0;
+        m_coreApplication = AZStd::make_unique<QCoreApplication>(argc, nullptr);
+
+        m_applicationManager = AZStd::make_unique<MockBatchApplicationManager>(&argc, nullptr);
+        m_applicationManager->m_platformConfiguration = new AssetProcessor::PlatformConfiguration{ nullptr };
+        m_applicationManager->m_fileStateCache = AZStd::make_unique<AssetProcessor::FileStateCache>();
+
+        m_mockAPM = AZStd::make_unique<MockAssetProcessorManager>(m_applicationManager->m_platformConfiguration, nullptr);
+        m_applicationManager->m_assetProcessorManager = m_mockAPM.get();
+
+        AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
+        m_applicationManager->m_platformConfiguration->EnablePlatform(AssetBuilderSDK::PlatformInfo{ "pc", { "tag" } });
+        m_applicationManager->m_platformConfiguration->PopulatePlatformsForScanFolder(platforms);
+        m_applicationManager->m_platformConfiguration->AddScanFolder(
+            AssetProcessor::ScanFolderInfo{ tempDir.c_str(), "test", "test", true, true, platforms });
+        
+        m_apmThread = AZStd::make_unique<QThread>(nullptr);
+        m_apmThread->setObjectName("APM Thread");
+        m_applicationManager->m_assetProcessorManager->moveToThread(m_apmThread.get());
+        m_apmThread->start();
+
+        m_fileProcessorThread = AZStd::make_unique<QThread>(nullptr);
+        m_fileProcessorThread->setObjectName("File Processor Thread");
+        auto fileProcessor = AZStd::make_unique<MockFileProcessor>(m_applicationManager->m_platformConfiguration);
+        fileProcessor->moveToThread(m_fileProcessorThread.get());
+        m_mockFileProcessor = fileProcessor.get();
+        m_applicationManager->m_fileProcessor = AZStd::move(fileProcessor); // The manager is taking ownership
+        m_fileProcessorThread->start();
+
+        auto fileWatcher = AZStd::make_unique<FileWatcher>();
+        m_fileWatcher = fileWatcher.get();
+
+        // This is what we're testing, it will set up connections between the fileWatcher and the 2 QObject handlers we'll check
+        m_applicationManager->InitFileMonitor(AZStd::move(fileWatcher)); // The manager is going to take ownership of the file watcher
+    }
+
+    void ApplicationManagerTest::TearDown()
+    {
+        m_apmThread->exit();
+        m_fileProcessorThread->exit();
+        m_mockAPM = nullptr;
+
+        ScopedAllocatorSetupFixture::TearDown();
+    }
+
+    TEST_F(ApplicationManagerTest, FileWatcherEventsTriggered_ProperlySignalledOnCorrectThread)
+    {
+        AZ::IO::Path tempDir(m_tempDir.GetDirectory());
+
+        Q_EMIT m_fileWatcher->fileAdded((tempDir / "test").c_str());
+        Q_EMIT m_fileWatcher->fileModified((tempDir / "test2").c_str());
+        Q_EMIT m_fileWatcher->fileRemoved((tempDir / "test3").c_str());
+        
+        EXPECT_TRUE(m_mockAPM->m_events[Added].WaitAndCheck()) << "APM Added event failed";
+        EXPECT_TRUE(m_mockAPM->m_events[Modified].WaitAndCheck()) << "APM Modified event failed";
+        EXPECT_TRUE(m_mockAPM->m_events[Deleted].WaitAndCheck()) << "APM Deleted event failed";
+
+        EXPECT_TRUE(m_mockFileProcessor->m_events[Added].WaitAndCheck()) << "File Processor Added event failed";
+        EXPECT_TRUE(m_mockFileProcessor->m_events[Deleted].WaitAndCheck()) << "File Processor Deleted event failed";
+    }
+}
diff --git a/Code/Tools/AssetProcessor/native/tests/ApplicationManagerTests.h b/Code/Tools/AssetProcessor/native/tests/ApplicationManagerTests.h
new file mode 100644
index 0000000000..fea10b224b
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/tests/ApplicationManagerTests.h
@@ -0,0 +1,64 @@
+/*
+ * 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 <utilities/BatchApplicationManager.h>
+#include <AzCore/UnitTest/TestTypes.h>
+#include "assetmanager/MockAssetProcessorManager.h"
+#include "assetmanager/MockFileProcessor.h"
+
+namespace UnitTests
+{
+    struct MockBatchApplicationManager : BatchApplicationManager
+    {
+        using ApplicationManagerBase::InitFileMonitor;
+        using ApplicationManagerBase::m_assetProcessorManager;
+        using ApplicationManagerBase::m_fileProcessor;
+        using ApplicationManagerBase::m_fileStateCache;
+        using ApplicationManagerBase::m_platformConfiguration;
+        using BatchApplicationManager::BatchApplicationManager;
+    };
+
+    class DatabaseLocationListener : public AzToolsFramework::AssetDatabase::AssetDatabaseRequests::Bus::Handler
+    {
+    public:
+        DatabaseLocationListener()
+        {
+            BusConnect();
+        }
+        ~DatabaseLocationListener() override
+        {
+            BusDisconnect();
+        }
+
+        bool GetAssetDatabaseLocation(AZStd::string& location) override;
+
+        AZStd::string m_databaseLocation;
+    };
+
+    struct ApplicationManagerTest : ::UnitTest::ScopedAllocatorSetupFixture
+    {
+    protected:
+        void SetUp() override;
+        void TearDown() override;
+
+        AZ::Test::ScopedAutoTempDirectory m_tempDir;
+        DatabaseLocationListener m_databaseLocationListener;
+
+        AZStd::unique_ptr<QCoreApplication> m_coreApplication;
+        AZStd::unique_ptr<MockBatchApplicationManager> m_applicationManager;
+        AZStd::unique_ptr<QThread> m_apmThread;
+        AZStd::unique_ptr<QThread> m_fileProcessorThread;
+        AZStd::unique_ptr<MockAssetProcessorManager> m_mockAPM;
+
+        // These are just aliases, no need to manage/delete them
+        FileWatcher* m_fileWatcher{};
+        MockFileProcessor* m_mockFileProcessor{};
+    };
+}
diff --git a/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp b/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
index 6a0da96151..c6105142f1 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
@@ -126,18 +126,18 @@ namespace AssetProcessorMessagesTests
             m_batchApplicationManager->InitAssetProcessorManager();
 
             m_assetCatalog = AZStd::make_unique<MockAssetCatalog>(nullptr, m_batchApplicationManager->m_platformConfiguration);
-            
+
             m_batchApplicationManager->m_assetCatalog = m_assetCatalog.get();
             m_batchApplicationManager->InitRCController();
             m_batchApplicationManager->InitFileStateCache();
-            m_batchApplicationManager->InitFileMonitor();
+            m_batchApplicationManager->InitFileMonitor(AZStd::make_unique<FileWatcher>());
             m_batchApplicationManager->InitApplicationServer();
             m_batchApplicationManager->InitConnectionManager();
             // Note this must be constructed after InitConnectionManager is called since it will interact with the connection manager
             m_assetRequestHandler = new MockAssetRequestHandler();
             m_batchApplicationManager->InitAssetRequestHandler(m_assetRequestHandler);
 
-            m_batchApplicationManager->m_fileWatcher.StartWatching();
+            m_batchApplicationManager->m_fileWatcher->StartWatching();
 
             QObject::connect(m_batchApplicationManager->m_connectionManager, &ConnectionManager::ConnectionError, [](unsigned /*connId*/, QString error)
                 {
@@ -222,7 +222,7 @@ namespace AssetProcessorMessagesTests
 
             thread.join();
         }
-        
+
     protected:
 
         MockAssetRequestHandler* m_assetRequestHandler{}; // Not owned, AP will delete this pointer
@@ -246,7 +246,7 @@ namespace AssetProcessorMessagesTests
     {
         // Test that we can successfully send network messages and have them arrive for processing
         // For messages that have a response, it also verifies the response comes back
-        // Note that several harmless warnings will be triggered due to the messages not having any data set 
+        // Note that several harmless warnings will be triggered due to the messages not having any data set
         using namespace AzFramework::AssetSystem;
         using namespace AzToolsFramework::AssetSystem;
 
diff --git a/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.cpp b/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.cpp
index c4288860c3..718f41a7b7 100644
--- a/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.cpp
@@ -12,10 +12,12 @@
 
 namespace UnitTests
 {
+    using AssetFileInfo = AssetProcessor::AssetFileInfo;
+
     void FileStateCacheTests::SetUp()
     {
         m_temporarySourceDir = QDir(m_temporaryDir.path());
-        m_fileStateCache = AZStd::make_unique<FileStateCache>();
+        m_fileStateCache = AZStd::make_unique<AssetProcessor::FileStateCache>();
     }
 
     void FileStateCacheTests::TearDown()
@@ -26,9 +28,9 @@ namespace UnitTests
     void FileStateCacheTests::CheckForFile(QString path, bool shouldExist)
     {
         bool exists = false;
-        FileStateInfo fileInfo;
+        AssetProcessor::FileStateInfo fileInfo;
 
-        auto* fileStateInterface = AZ::Interface<IFileStateRequests>::Get();
+        auto* fileStateInterface = AZ::Interface<AssetProcessor::IFileStateRequests>::Get();
 
         ASSERT_NE(fileStateInterface, nullptr);
         exists = fileStateInterface->Exists(path);
@@ -142,7 +144,7 @@ namespace UnitTests
     TEST_F(FileStateCacheTests, PassthroughTest)
     {
         m_fileStateCache = nullptr; // Need to release the existing one first since only one handler can exist for the ebus
-        m_fileStateCache = AZStd::make_unique<FileStatePassthrough>();
+        m_fileStateCache = AZStd::make_unique<AssetProcessor::FileStatePassthrough>();
         QString testPath = m_temporarySourceDir.absoluteFilePath("test.txt");
 
         CheckForFile(testPath, false);
diff --git a/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.h b/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.h
index 78ddc6aaed..14e4763d29 100644
--- a/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.h
+++ b/Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.h
@@ -16,7 +16,6 @@ namespace UnitTests
 {
     using namespace testing;
     using ::testing::NiceMock;
-    using namespace AssetProcessor;
 
     class FileStateCacheTests : public ::testing::Test
     {
@@ -29,6 +28,6 @@ namespace UnitTests
     protected:
         QTemporaryDir m_temporaryDir;
         QDir m_temporarySourceDir;
-        AZStd::unique_ptr<FileStateBase> m_fileStateCache;
+        AZStd::unique_ptr<AssetProcessor::FileStateBase> m_fileStateCache;
     };
 }
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/MockAssetProcessorManager.cpp b/Code/Tools/AssetProcessor/native/tests/assetmanager/MockAssetProcessorManager.cpp
new file mode 100644
index 0000000000..8b14ef0915
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/MockAssetProcessorManager.cpp
@@ -0,0 +1,27 @@
+/*
+ * 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/assetmanager/MockAssetProcessorManager.h>
+
+namespace UnitTests
+{
+    void MockAssetProcessorManager::AssessAddedFile(QString filePath)
+    {
+        m_events[TestEvents::Added].Signal();
+    }
+
+    void MockAssetProcessorManager::AssessModifiedFile(QString filePath)
+    {
+        m_events[TestEvents::Modified].Signal();
+    }
+
+    void MockAssetProcessorManager::AssessDeletedFile(QString filePath)
+    {
+        m_events[TestEvents::Deleted].Signal();
+    }
+}
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/MockAssetProcessorManager.h b/Code/Tools/AssetProcessor/native/tests/assetmanager/MockAssetProcessorManager.h
new file mode 100644
index 0000000000..dadb62d18d
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/MockAssetProcessorManager.h
@@ -0,0 +1,32 @@
+/*
+ * 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 <QObject>
+#include <native/AssetManager/assetProcessorManager.h>
+#include <tests/assetmanager/TestEventSignal.h>
+
+namespace UnitTests
+{
+    struct MockAssetProcessorManager : ::AssetProcessor::AssetProcessorManager
+    {
+        Q_OBJECT
+
+        using AssetProcessorManager::AssetProcessorManager;
+
+    public Q_SLOTS:
+        void AssessAddedFile(QString filePath) override;
+        void AssessModifiedFile(QString filePath) override;
+        void AssessDeletedFile(QString filePath) override;
+
+    public:
+
+        TestEventPair m_events[TestEvents::NumEvents];
+    };
+}
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/MockFileProcessor.cpp b/Code/Tools/AssetProcessor/native/tests/assetmanager/MockFileProcessor.cpp
new file mode 100644
index 0000000000..ed16a4cf7f
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/MockFileProcessor.cpp
@@ -0,0 +1,22 @@
+/*
+ * 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 "MockFileProcessor.h"
+
+namespace UnitTests
+{
+     void MockFileProcessor::AssessAddedFile(QString fileName)
+    {
+        m_events[TestEvents::Added].Signal();
+    }
+
+     void MockFileProcessor::AssessDeletedFile(QString fileName)
+    {
+        m_events[TestEvents::Deleted].Signal();
+    }
+}
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/MockFileProcessor.h b/Code/Tools/AssetProcessor/native/tests/assetmanager/MockFileProcessor.h
new file mode 100644
index 0000000000..604b5d84cd
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/MockFileProcessor.h
@@ -0,0 +1,30 @@
+/*
+ * 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 <QObject>
+#include <FileProcessor/FileProcessor.h>
+#include <tests/assetmanager/TestEventSignal.h>
+
+namespace UnitTests
+{
+    struct MockFileProcessor : ::AssetProcessor::FileProcessor
+    {
+        Q_OBJECT
+
+        using FileProcessor::FileProcessor;
+
+    public Q_SLOTS:
+        void AssessAddedFile(QString fileName) override;
+        void AssessDeletedFile(QString fileName) override;
+
+    public:
+        TestEventPair m_events[TestEvents::NumEvents];
+    };
+}
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/TestEventSignal.cpp b/Code/Tools/AssetProcessor/native/tests/assetmanager/TestEventSignal.cpp
new file mode 100644
index 0000000000..df5c676a66
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/TestEventSignal.cpp
@@ -0,0 +1,37 @@
+/*
+ * 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 <native/tests/assetmanager/TestEventSignal.h>
+#include <AzCore/std/parallel/thread.h>
+#include <AzCore/UnitTest/TestTypes.h>
+
+namespace UnitTests
+{
+    void TestEventPair::Signal()
+    {
+        bool expected = false;
+        ASSERT_TRUE(m_signaled.compare_exchange_strong(expected, true));
+        ASSERT_EQ(m_threadId, AZStd::thread_id{});
+        m_threadId = AZStd::this_thread::get_id();
+        m_event.release();
+    }
+
+    bool TestEventPair::WaitAndCheck()
+    {
+        constexpr int MaxWaitTimeMilliseconds = 100;
+
+        auto thisThreadId = AZStd::this_thread::get_id();
+        bool acquireSuccess = m_event.try_acquire_for(AZStd::chrono::milliseconds(MaxWaitTimeMilliseconds));
+
+        EXPECT_TRUE(acquireSuccess);
+        EXPECT_NE(m_threadId, AZStd::thread_id{});
+        EXPECT_TRUE(m_threadId != thisThreadId);
+
+        return acquireSuccess && m_threadId != AZStd::thread_id{} && m_threadId != thisThreadId;
+    }
+}
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/TestEventSignal.h b/Code/Tools/AssetProcessor/native/tests/assetmanager/TestEventSignal.h
new file mode 100644
index 0000000000..5251be5b3f
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/TestEventSignal.h
@@ -0,0 +1,33 @@
+/*
+ * 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/parallel/binary_semaphore.h>
+
+namespace UnitTests
+{
+    class TestEventPair
+    {
+        AZStd::atomic_bool m_signaled{ false };
+        AZStd::thread_id m_threadId;
+        AZStd::binary_semaphore m_event;
+
+    public:
+        void Signal();
+        bool WaitAndCheck();
+    };
+
+    enum TestEvents : int
+    {
+        Added = 0,
+        Modified,
+        Deleted,
+        NumEvents
+    };
+}
diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
index 634fdbd3bb..93cc533702 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
@@ -431,79 +431,114 @@ void ApplicationManagerBase::DestroyPlatformConfiguration()
     }
 }
 
-void ApplicationManagerBase::InitFileMonitor()
+void ApplicationManagerBase::InitFileMonitor(AZStd::unique_ptr<FileWatcher> fileWatcher)
 {
+    m_fileWatcher = AZStd::move(fileWatcher);
+
     for (int folderIdx = 0; folderIdx < m_platformConfiguration->GetScanFolderCount(); ++folderIdx)
     {
         const AssetProcessor::ScanFolderInfo& info = m_platformConfiguration->GetScanFolderAt(folderIdx);
-        m_fileWatcher.AddFolderWatch(info.ScanPath(), info.RecurseSubFolders());
+        m_fileWatcher->AddFolderWatch(info.ScanPath(), info.RecurseSubFolders());
     }
 
     QDir cacheRoot;
     if (AssetUtilities::ComputeProjectCacheRoot(cacheRoot))
     {
-        m_fileWatcher.AddFolderWatch(cacheRoot.absolutePath(), true);
+        m_fileWatcher->AddFolderWatch(cacheRoot.absolutePath(), true);
     }
 
     if (m_platformConfiguration->GetScanFolderCount() || !cacheRoot.path().isEmpty())
     {
         const auto cachePath = QDir::toNativeSeparators(cacheRoot.absolutePath());
 
+        // For the handlers below, we need to make sure to use invokeMethod on any QObjects so Qt can queue
+        // the callback to run on the QObject's thread if needed.  The APM methods for example are not thread-safe.
+
         const auto OnFileAdded = [this, cachePath](QString path)
         {
             const bool isCacheRoot = path.startsWith(cachePath);
-            if (isCacheRoot)
+            if (!isCacheRoot)
             {
-                m_fileStateCache->AddFile(path);
-            }
-            else
-            {
-                m_assetProcessorManager->AssessAddedFile(path);
-                m_fileStateCache->AddFile(path);
-                AZ::Interface<AssetProcessor::ExcludedFolderCacheInterface>::Get()->FileAdded(path);
-                m_fileProcessor->AssetProcessor::FileProcessor::AssessAddedFile(path);
+                [[maybe_unused]] bool result = QMetaObject::invokeMethod(m_assetProcessorManager, [this, path]()
+                {
+                    m_assetProcessorManager->AssessAddedFile(path);
+                }, Qt::QueuedConnection);
+                AZ_Assert(result, "Failed to invoke m_assetProcessorManager::AssessAddedFile");
+
+                result = QMetaObject::invokeMethod(m_fileProcessor.get(), [this, path]()
+                {
+                    m_fileProcessor->AssessAddedFile(path);
+                }, Qt::QueuedConnection);
+                AZ_Assert(result, "Failed to invoke m_fileProcessor::AssessAddedFile");
+
+                auto cache = AZ::Interface<AssetProcessor::ExcludedFolderCacheInterface>::Get();
+
+                if(cache)
+                {
+                    cache->FileAdded(path);
+                }
+                else
+                {
+                    AZ_Error("AssetProcessor", false, "ExcludedFolderCacheInterface not found");
+                }
             }
+
+            m_fileStateCache->AddFile(path);
         };
 
         const auto OnFileModified = [this, cachePath](QString path)
         {
             const bool isCacheRoot = path.startsWith(cachePath);
-            if (isCacheRoot)
+            if (!isCacheRoot)
             {
-                m_assetProcessorManager->AssessModifiedFile(path);
-            }
-            else
-            {
-                m_assetProcessorManager->AssessModifiedFile(path);
                 m_fileStateCache->UpdateFile(path);
             }
+            
+            [[maybe_unused]] bool result = QMetaObject::invokeMethod(
+                m_assetProcessorManager,
+                [this, path]
+                {
+                    m_assetProcessorManager->AssessModifiedFile(path);
+                }, Qt::QueuedConnection);
+
+            AZ_Assert(result, "Failed to invoke m_assetProcessorManager::AssessModifiedFile");
         };
 
         const auto OnFileRemoved = [this, cachePath](QString path)
         {
+            [[maybe_unused]] bool result = false;
             const bool isCacheRoot = path.startsWith(cachePath);
-            if (isCacheRoot)
+            if (!isCacheRoot)
             {
-                m_fileStateCache->RemoveFile(path);
-                m_assetProcessorManager->AssessDeletedFile(path);
+                result = QMetaObject::invokeMethod(m_fileProcessor.get(), [this, path]()
+                {
+                    m_fileProcessor->AssessDeletedFile(path);
+                }, Qt::QueuedConnection);
+                AZ_Assert(result, "Failed to invoke m_fileProcessor::AssessDeletedFile");
             }
-            else
+
+            result = QMetaObject::invokeMethod(m_assetProcessorManager, [this, path]()
             {
                 m_assetProcessorManager->AssessDeletedFile(path);
-                m_fileStateCache->RemoveFile(path);
-                m_fileProcessor->AssessDeletedFile(path);
-            }
+            }, Qt::QueuedConnection);
+            AZ_Assert(result, "Failed to invoke m_assetProcessorManager::AssessDeletedFile");
+
+            m_fileStateCache->RemoveFile(path);
         };
 
-        connect(&m_fileWatcher, &FileWatcher::fileAdded, OnFileAdded);
-        connect(&m_fileWatcher, &FileWatcher::fileModified, OnFileModified);
-        connect(&m_fileWatcher, &FileWatcher::fileRemoved, OnFileRemoved);
+        connect(m_fileWatcher.get(), &FileWatcher::fileAdded, OnFileAdded);
+        connect(m_fileWatcher.get(), &FileWatcher::fileModified, OnFileModified);
+        connect(m_fileWatcher.get(), &FileWatcher::fileRemoved, OnFileRemoved);
     }
 }
 
 void ApplicationManagerBase::DestroyFileMonitor()
 {
-    m_fileWatcher.ClearFolderWatches();
+    if(m_fileWatcher)
+    {
+        m_fileWatcher->ClearFolderWatches();
+        m_fileWatcher = nullptr;
+    }
 }
 
 void ApplicationManagerBase::DestroyApplicationServer()
@@ -1357,7 +1392,7 @@ bool ApplicationManagerBase::Activate()
     InitFileProcessor();
 
     InitAssetCatalog();
-    InitFileMonitor();
+    InitFileMonitor(AZStd::make_unique<FileWatcher>());
     InitAssetScanner();
     InitAssetServerHandler();
     InitRCController();
diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.h b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.h
index 8591228375..23600963f6 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.h
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.h
@@ -134,7 +134,7 @@ protected:
     virtual void DestroyAssetScanner();
     virtual bool InitPlatformConfiguration();
     virtual void DestroyPlatformConfiguration();
-    virtual void InitFileMonitor();
+    virtual void InitFileMonitor(AZStd::unique_ptr<FileWatcher> fileWatcher);
     virtual void DestroyFileMonitor();
     virtual bool InitBuilderConfiguration();
     virtual void InitControlRequestHandler();
@@ -191,7 +191,7 @@ protected:
     bool m_sourceControlReady = false;
     bool m_fullIdle = false;
 
-    FileWatcher m_fileWatcher;
+    AZStd::unique_ptr<FileWatcher> m_fileWatcher;
     AssetProcessor::PlatformConfiguration* m_platformConfiguration = nullptr;
     AssetProcessor::AssetProcessorManager* m_assetProcessorManager = nullptr;
     AssetProcessor::AssetCatalog* m_assetCatalog = nullptr;
diff --git a/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp
index 13a6b0699a..6a918b3a89 100644
--- a/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp
@@ -479,7 +479,7 @@ bool GUIApplicationManager::PostActivate()
         return false;
     }
 
-    m_fileWatcher.StartWatching();
+    m_fileWatcher->StartWatching();
 
     return true;
 }
diff --git a/Code/Tools/LuaIDE/Source/LUA/BreakpointPanel.cpp b/Code/Tools/LuaIDE/Source/LUA/BreakpointPanel.cpp
index cb8fffffc7..c2445fc582 100644
--- a/Code/Tools/LuaIDE/Source/LUA/BreakpointPanel.cpp
+++ b/Code/Tools/LuaIDE/Source/LUA/BreakpointPanel.cpp
@@ -185,5 +185,5 @@ void DHBreakpointsWidget::RemoveRow(int which)
     QByteArray fileName = file->data(Qt::DisplayRole).toString().toUtf8().data();
     int lineNumber = line->data(Qt::DisplayRole).toInt();
 
-    EBUS_EVENT(LUAEditor::LUABreakpointRequestMessages::Bus, RequestDeleteBreakpoint, AZStd::string(fileName), lineNumber);
+    EBUS_EVENT(LUAEditor::LUABreakpointRequestMessages::Bus, RequestDeleteBreakpoint, AZStd::string(fileName.constData()), lineNumber);
 }
diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qss b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
index b2217435b2..db33d196fe 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qss
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
@@ -482,10 +482,10 @@ QTabBar::tab:focus {
 
 #labelButtonOverlay {
     background-color: rgba(50,50,50,200);
-    min-width:210px;
-    max-width:210px;;
-    min-height:278px;
-    max-height:278px;
+    min-width:208px;
+    max-width:208px;;
+    min-height:270px;
+    max-height:270px;
 }
 
 QProgressBar {
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
index 8f8c8fb3cb..cbb0398f5f 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
@@ -81,7 +81,7 @@ namespace O3DE::ProjectManager
         m_rightPanelStack = new QStackedWidget(this);
         m_rightPanelStack->setFixedWidth(sidePanelWidth);
 
-        m_gemInspector = new GemInspector(m_gemModel, this);
+        m_gemInspector = new GemInspector(m_gemModel, m_rightPanelStack);
 
         connect(m_gemInspector, &GemInspector::TagClicked, [=](const Tag& tag) { SelectGem(tag.id); });
         connect(m_gemInspector, &GemInspector::UpdateGem, this, &GemCatalogScreen::UpdateGem);
@@ -233,7 +233,12 @@ namespace O3DE::ProjectManager
             const QVector<GemInfo>& gemInfos = allGemInfosResult.GetValue();
             for (const GemInfo& gemInfo : gemInfos)
             {
-                gemInfoHash.insert(gemInfo.m_name, gemInfo);
+                // ${Name} is a special name used for templates and should be ignored
+                // eventually we should handle this in Python instead of here
+                if (gemInfo.m_name != "${Name}")
+                {
+                    gemInfoHash.insert(gemInfo.m_name, gemInfo);
+                }
             }
         }
 
@@ -503,7 +508,10 @@ namespace O3DE::ProjectManager
             const QVector<GemInfo>& allGemInfos = allGemInfosResult.GetValue();
             for (const GemInfo& gemInfo : allGemInfos)
             {
-                m_gemModel->AddGem(gemInfo);
+                if (gemInfo.m_name != "${Name}")
+                {
+                    m_gemModel->AddGem(gemInfo);
+                }
             }
 
             const AZ::Outcome<QVector<GemInfo>, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetGemInfosForAllRepos();
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
index f6689281b8..2ded6442bd 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
@@ -30,6 +30,10 @@ namespace O3DE::ProjectManager
         setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 
         m_mainWidget = new QWidget();
+        if (parent)
+        {
+            m_mainWidget->setFixedWidth(parent->width());
+        }
         setWidget(m_mainWidget);
 
         m_mainLayout = new QVBoxLayout();
diff --git a/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
index f1f56993ca..d45cbaf612 100644
--- a/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
@@ -207,6 +207,7 @@ namespace O3DE::ProjectManager
         {
             m_templateDisplayName = new QLabel(this);
             m_templateDisplayName->setObjectName("displayName");
+            m_templateDisplayName->setWordWrap(true);
             templateDetailsLayout->addWidget(m_templateDisplayName);
 
             m_templateSummary = new QLabel(this);
diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
index 39980e1d11..7f2b47f8bf 100644
--- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
@@ -330,6 +330,11 @@ namespace O3DE::ProjectManager
 
     void ProjectButton::ShowWarning(bool show, const QString& warning)
     {
+        if (show)
+        {
+            // hide any overlay text, we cannot show the warning and an overlay at the same time 
+            m_projectImageLabel->GetOverlayLabel()->setVisible(false);
+        }
         m_projectImageLabel->GetWarningLabel()->setTextInteractionFlags(Qt::LinksAccessibleByMouse);
         m_projectImageLabel->GetWarningLabel()->setText(warning);
         m_projectImageLabel->GetWarningLabel()->setVisible(show);
@@ -362,6 +367,9 @@ namespace O3DE::ProjectManager
         m_projectImageLabel->SetOverlayText(tr("Building...\n\n"));
         m_projectMenuButton->setVisible(false);
 
+        // hide the warning label about this project needing to be built while building 
+        ShowWarning(false, "");
+
         QProgressBar* progressBar = m_projectImageLabel->GetProgressBar();
         progressBar->setVisible(true);
         progressBar->setValue(0);
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
index 695479c493..f2fd7cbec5 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
@@ -1356,11 +1356,18 @@ namespace O3DE::ProjectManager
 
     IPythonBindings::ErrorPair PythonBindings::GetErrorPair()
     {
-        AZStd::string detailedString = m_pythonErrorStrings.size() == 1
-            ? ""
-            : AZStd::accumulate(m_pythonErrorStrings.begin(), m_pythonErrorStrings.end(), AZStd::string(""));
+        if (const size_t errorSize = m_pythonErrorStrings.size())
+        {
+            AZStd::string detailedString =
+                errorSize == 1 ? "" : AZStd::accumulate(m_pythonErrorStrings.begin(), m_pythonErrorStrings.end(), AZStd::string(""));
 
-        return IPythonBindings::ErrorPair(m_pythonErrorStrings.front(), detailedString);
+            return IPythonBindings::ErrorPair(m_pythonErrorStrings.front(), detailedString);
+        }
+        // If no error was found
+        else
+        {
+            return IPythonBindings::ErrorPair(AZStd::string("Unknown Python Bindings Error"), AZStd::string(""));
+        }
     }
 
     void PythonBindings::AddErrorString(AZStd::string errorString)
diff --git a/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp b/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp
index 57501b162f..51dde9bf97 100644
--- a/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/TemplateButtonWidget.cpp
@@ -38,6 +38,7 @@ namespace O3DE::ProjectManager
 
         QLabel* label = new QLabel(labelText, this);
         label->setObjectName("templateLabel");
+        label->setWordWrap(true);
         vLayout->addWidget(label);
 
         connect(this, &QAbstractButton::toggled, this, &TemplateButton::onToggled);
diff --git a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.h b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.h
index 806bd2a4ca..0148cc723b 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.h
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.h
@@ -25,7 +25,9 @@ namespace AZ
             public:
                 ProxyPointer(const Type& value);
                 Type& operator*();
+                const Type& operator*() const;
                 Type* operator->();
+                const Type* operator->() const;
 
             private:
                 Type m_value;
@@ -36,8 +38,10 @@ namespace AZ
             {
             public:
                 ProxyPointer(Type& value);
-                Type& operator*();
                 Type* operator->();
+                const Type& operator*() const;
+                Type& operator*();
+                const Type* operator->() const;
 
             private:
                 Type& m_value;
diff --git a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.inl b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.inl
index ecfd8d11c9..edc3e154e7 100644
--- a/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.inl
+++ b/Code/Tools/SceneAPI/SceneCore/Containers/Utilities/ProxyPointer.inl
@@ -23,12 +23,22 @@ namespace AZ
             {
                 return m_value;
             }
+            template<typename Type>
+            const Type& ProxyPointer<Type>::operator*() const
+            {
+                return m_value;
+            }
 
             template<typename Type>
             Type* ProxyPointer<Type>::operator->()
             {
                 return &m_value;
             }
+            template<typename Type>
+            const Type* ProxyPointer<Type>::operator->() const
+            {
+                return &m_value;
+            }
 
             template<typename Type>
             ProxyPointer<Type&>::ProxyPointer(Type& value)
@@ -41,12 +51,22 @@ namespace AZ
             {
                 return m_value;
             }
+            template<typename Type>
+            const Type& ProxyPointer<Type&>::operator*() const
+            {
+                return m_value;
+            }
 
             template<typename Type>
             Type* ProxyPointer<Type&>::operator->()
             {
                 return &m_value;
             }
+            template<typename Type>
+            const Type* ProxyPointer<Type&>::operator->() const
+            {
+                return &m_value;
+            }
         } // Containers
     } // SceneAPI
 } // AZ
diff --git a/Code/Tools/TestImpactFramework/Frontend/Console/Code/Source/TestImpactCommandLineOptions.h b/Code/Tools/TestImpactFramework/Frontend/Console/Code/Source/TestImpactCommandLineOptions.h
index 36ca4231b9..33a22e0b3c 100644
--- a/Code/Tools/TestImpactFramework/Frontend/Console/Code/Source/TestImpactCommandLineOptions.h
+++ b/Code/Tools/TestImpactFramework/Frontend/Console/Code/Source/TestImpactCommandLineOptions.h
@@ -11,6 +11,7 @@
 #include <TestImpactFramework/TestImpactTestSequence.h>
 #include <TestImpactFramework/TestImpactRepoPath.h>
 
+#include <AzCore/std/chrono/chrono.h>
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/optional.h>
 #include <AzCore/std/containers/vector.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
index cdd63dca18..44653db0a3 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnail.cpp
@@ -59,10 +59,11 @@ namespace ImageProcessingAtom
 
         void ImageThumbnail::LoadThread()
         {
+            m_state = State::Loading;
             AzToolsFramework::Thumbnailer::ThumbnailerRendererRequestBus::Event(
                 AZ::RPI::StreamingImageAsset::RTTI_Type(), &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail,
-                m_key,
-                ImageThumbnailSize);
+                m_key, ImageThumbnailSize);
+
             // wait for response from thumbnail renderer
             m_renderWait.acquire();
         }
@@ -70,6 +71,7 @@ namespace ImageProcessingAtom
         void ImageThumbnail::ThumbnailRendered(const QPixmap& thumbnailImage)
         {
             m_pixmap = thumbnailImage;
+            m_state = State::Ready;
             m_renderWait.release();
         }
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
index 5a41411d86..f3458196d0 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
@@ -17,7 +17,6 @@
 #include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
 #include <AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h>
 #include <AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailContext.h>
 #include <ImageLoader/ImageLoaders.h>
 #include <Processing/ImageConvert.h>
 #include <Processing/ImageToProcess.h>
@@ -84,18 +83,15 @@ namespace ImageProcessingAtom
         {
             using namespace AzToolsFramework::Thumbnailer;
 
-            ThumbnailerRequestsBus::Broadcast(
-                &ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(Thumbnails::ImageThumbnailCache),
-                ThumbnailContext::DefaultContext);
+            ThumbnailerRequestBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(Thumbnails::ImageThumbnailCache));
         }
 
         void ImageThumbnailSystemComponent::TeardownThumbnails()
         {
             using namespace AzToolsFramework::Thumbnailer;
 
-            ThumbnailerRequestsBus::Broadcast(
-                &ThumbnailerRequests::UnregisterThumbnailProvider, Thumbnails::ImageThumbnailCache::ProviderName,
-                ThumbnailContext::DefaultContext);
+            ThumbnailerRequestBus::Broadcast(
+                &ThumbnailerRequests::UnregisterThumbnailProvider, Thumbnails::ImageThumbnailCache::ProviderName);
         }
 
         void ImageThumbnailSystemComponent::OnApplicationAboutToStop()
diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp
index 7e510e2e3a..43d67cc95c 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/AzslShaderBuilderSystemComponent.cpp
@@ -82,7 +82,7 @@ namespace AZ
             // Register Shader Asset Builder
             AssetBuilderSDK::AssetBuilderDesc shaderAssetBuilderDescriptor;
             shaderAssetBuilderDescriptor.m_name = "Shader Asset Builder";
-            shaderAssetBuilderDescriptor.m_version = 110; // Add "Definitions" field to shader asset to support convenient addition of preprocessor definitions
+            shaderAssetBuilderDescriptor.m_version = 111; // Enable shader PDB generation globally if Atom/GraphicsDevMode settings registry key is set
             shaderAssetBuilderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern( AZStd::string::format("*.%s", RPI::ShaderSourceData::Extension), AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
             shaderAssetBuilderDescriptor.m_busId = azrtti_typeid<ShaderAssetBuilder>();
             shaderAssetBuilderDescriptor.m_createJobFunction = AZStd::bind(&ShaderAssetBuilder::CreateJobs, &m_shaderAssetBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
diff --git a/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp b/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp
index ef03a839d7..60ca6ff429 100644
--- a/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp
+++ b/Gems/Atom/Bootstrap/Code/Source/BootstrapSystemComponent.cpp
@@ -318,10 +318,8 @@ namespace AZ
                 RPI::RenderPipelineDescriptor renderPipelineDescriptor = *RPI::GetDataFromAnyAsset<RPI::RenderPipelineDescriptor>(pipelineAsset);
                 renderPipelineDescriptor.m_name = AZStd::string::format("%s_%i", renderPipelineDescriptor.m_name.c_str(), viewportContext->GetId());
 
-                // Make sure non-msaa super variant is used for non-msaa pipeline
-                bool isNonMsaaPipeline = (renderPipelineDescriptor.m_renderSettings.m_multisampleState.m_samples == 1);
-                const char* supervariantName = isNonMsaaPipeline ? AZ::RPI::NoMsaaSupervariantName : "";
-                AZ::RPI::ShaderSystemInterface::Get()->SetSupervariantName(AZ::Name(supervariantName));
+                // The default pipeline determines the initial MSAA state for the application
+                AZ::RPI::RPISystemInterface::Get()->SetApplicationMultisampleState(renderPipelineDescriptor.m_renderSettings.m_multisampleState);
 
                 if (!scene->GetRenderPipeline(AZ::Name(renderPipelineDescriptor.m_name)))
                 {
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapDepthMSAA.pass b/Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapDepthMSAA.pass
index 5abbe7d62d..cb94e75389 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapDepthMSAA.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapDepthMSAA.pass
@@ -34,11 +34,11 @@
                             "Attachment": "Output"
                         }
                     },
+                    "MultisampleSource": {
+                        "Pass": "Pipeline"
+                    },
                     "ImageDescriptor": {
                         "Format": "D32_FLOAT_S8X24_UINT",
-                        "MultisampleState": {
-                            "samples": 4
-                        },
                         "SharedQueueMask": "Graphics"
                     }
                 }
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRender.precompiledshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRender.precompiledshader
index 97c58091a2..613714b0b6 100644
--- a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRender.precompiledshader
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRender.precompiledshader
@@ -29,6 +29,24 @@
                         "RootShaderVariantAssetFileName": "diffuseprobegridrender_null_0.azshadervariant"
                     }
                 ]
+            },
+            {
+                "Name": "NoMSAA",
+                "RootShaderVariantAssets": 
+                [
+                    {
+                        "APIName": "dx12",
+                        "RootShaderVariantAssetFileName": "diffuseprobegridrender-nomsaa_dx12_0.azshadervariant"
+                    },
+                    {
+                        "APIName": "vulkan",
+                        "RootShaderVariantAssetFileName": "diffuseprobegridrender-nomsaa_vulkan_0.azshadervariant"
+                    },
+                    {
+                        "APIName": "null",
+                        "RootShaderVariantAssetFileName": "diffuseprobegridrender-nomsaa_null_0.azshadervariant"
+                    }
+                ]
             }
         ]
     }
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender-nomsaa_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender-nomsaa_dx12_0.azshadervariant
new file mode 100644
index 0000000000..31ca52ba02
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender-nomsaa_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender-nomsaa_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender-nomsaa_null_0.azshadervariant
new file mode 100644
index 0000000000..299490c1bd
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender-nomsaa_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender-nomsaa_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender-nomsaa_vulkan_0.azshadervariant
new file mode 100644
index 0000000000..1e0c497d0b
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender-nomsaa_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader
index 4676c42e8d..16db49af1b 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_dx12_0.azshadervariant
index 9bf8e7f53f..23b0c807bf 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_null_0.azshadervariant
index 98402384db..299490c1bd 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_vulkan_0.azshadervariant
index 5caf308476..447f0712d3 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/ShadowConstants.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/ShadowConstants.h
index 309331dcf5..0d6de84f52 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/ShadowConstants.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/ShadowConstants.h
@@ -9,6 +9,7 @@
 
 #include <AzCore/base.h>
 #include <AzCore/Preprocessor/Enum.h>
+#include <AzCore/RTTI/TypeInfo.h>
 
 namespace AZ
 {
@@ -47,5 +48,5 @@ namespace AZ
     } // namespace Render
 
     AZ_TYPE_INFO_SPECIALIZE(Render::ShadowmapSize, "{3EC1CE83-483D-41FD-9909-D22B03E56F4E}");
-    
+
 } // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp
index 84c066604a..5e85c3b247 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp
@@ -92,21 +92,24 @@ namespace AZ
                 AZ_Error("DiffuseProbeGridFeatureProcessor", m_probeGridRenderData.m_srgLayout != nullptr, "Failed to find ObjectSrg layout");
             }
 
-            // initialize the buffer pools for the DiffuseProbeGrid visualization
-            m_visualizationBufferPools = RHI::RayTracingBufferPools::CreateRHIRayTracingBufferPools();
-            m_visualizationBufferPools->Init(device);
-
-            // load probe visualization model, the BLAS will be created in OnAssetReady()
-            m_visualizationModelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>(
-                "Models/DiffuseProbeSphere.azmodel",
-                AZ::RPI::AssetUtils::TraceLevel::Assert);
-
-            if (!m_visualizationModelAsset.IsReady())
+            if (device->GetFeatures().m_rayTracing)
             {
-                m_visualizationModelAsset.QueueLoad();
-            }
+                // initialize the buffer pools for the DiffuseProbeGrid visualization
+                m_visualizationBufferPools = RHI::RayTracingBufferPools::CreateRHIRayTracingBufferPools();
+                m_visualizationBufferPools->Init(device);
 
-            Data::AssetBus::MultiHandler::BusConnect(m_visualizationModelAsset.GetId());
+                // load probe visualization model, the BLAS will be created in OnAssetReady()
+                m_visualizationModelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>(
+                    "Models/DiffuseProbeSphere.azmodel",
+                    AZ::RPI::AssetUtils::TraceLevel::Assert);
+
+                if (!m_visualizationModelAsset.IsReady())
+                {
+                    m_visualizationModelAsset.QueueLoad();
+                }
+
+                Data::AssetBus::MultiHandler::BusConnect(m_visualizationModelAsset.GetId());
+            }
 
             EnableSceneNotification();
         }
diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.cpp
index 140dfe8c6b..89b9362b07 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.cpp
@@ -82,9 +82,9 @@ namespace AZ
             AddMaterialPropertyDependency(functor, functor->m_scatterDistanceColor);
             AddMaterialPropertyDependency(functor, functor->m_scatterDistanceIntensity);
 
-            functor->m_scatterDistance = context.GetShaderResourceGroupLayout()->FindShaderInputConstantIndex(Name{ m_scatterDistance });
-            functor->m_transmissionParams = context.GetShaderResourceGroupLayout()->FindShaderInputConstantIndex(Name{ m_transmissionParams });
-            functor->m_transmissionTintThickness = context.GetShaderResourceGroupLayout()->FindShaderInputConstantIndex(Name{ m_transmissionTintThickness });
+            functor->m_scatterDistance = context.FindShaderInputConstantIndex(Name{ m_scatterDistance });
+            functor->m_transmissionParams = context.FindShaderInputConstantIndex(Name{ m_transmissionParams });
+            functor->m_transmissionTintThickness = context.FindShaderInputConstantIndex(Name{ m_transmissionTintThickness });
 
             if (functor->m_scatterDistance.IsNull())
             {
diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.cpp
index 7436cb06b7..ad6078b444 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Material/Transform2DFunctorSourceData.cpp
@@ -62,7 +62,7 @@ namespace AZ
             AddMaterialPropertyDependency(functor, functor->m_translateY);
             AddMaterialPropertyDependency(functor, functor->m_rotateDegrees);
 
-            functor->m_transformMatrix = context.GetShaderResourceGroupLayout()->FindShaderInputConstantIndex(Name{m_transformMatrix});
+            functor->m_transformMatrix = context.FindShaderInputConstantIndex(Name{m_transformMatrix});
 
             if (functor->m_transformMatrix.IsNull())
             {
@@ -74,7 +74,7 @@ namespace AZ
             // In that case, the.materialtype file will not provide the name of an inverse matrix because it doesn't have one.
             if (!m_transformMatrixInverse.empty())
             {
-                functor->m_transformMatrixInverse = context.GetShaderResourceGroupLayout()->FindShaderInputConstantIndex(Name{m_transformMatrixInverse});
+                functor->m_transformMatrixInverse = context.FindShaderInputConstantIndex(Name{m_transformMatrixInverse});
 
                 if (functor->m_transformMatrixInverse.IsNull())
                 {
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
index f5aaec4faa..539531b5a0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
@@ -115,10 +115,6 @@ namespace AZ
                     // all faces of the cubemap have been rendered, invoke the callback
                     m_callback(m_environmentCubeMapPass->GetTextureData(), m_environmentCubeMapPass->GetTextureFormat());
 
-                    // remove the pipeline
-                    m_scene->RemoveRenderPipeline(m_environmentCubeMapPipelineId);
-                    m_environmentCubeMapPass = nullptr;
-
                     // restore exposures
                     sceneSrg->SetConstant(m_globalIblExposureConstantIndex, m_previousGlobalIblExposure);
                     sceneSrg->SetConstant(m_skyBoxExposureConstantIndex, m_previousSkyBoxExposure);
@@ -223,6 +219,16 @@ namespace AZ
             }
         }
 
+        void ReflectionProbe::OnRenderEnd()
+        {
+            if (m_environmentCubeMapPass && m_environmentCubeMapPass->IsFinished())
+            {
+                // remove the cubemap pipeline
+                // Note: this must be done here (not in Simulate) to avoid a race condition with other feature processors
+                m_scene->RemoveRenderPipeline(m_environmentCubeMapPipelineId);
+                m_environmentCubeMapPass = nullptr;
+            }
+        }
 
         void ReflectionProbe::SetTransform(const AZ::Transform& transform)
         {
@@ -282,7 +288,7 @@ namespace AZ
 
             AZ::RPI::RenderPipelineDescriptor environmentCubeMapPipelineDesc;
             environmentCubeMapPipelineDesc.m_mainViewTagName = "MainCamera";
-            environmentCubeMapPipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
+            environmentCubeMapPipelineDesc.m_renderSettings.m_multisampleState = RPI::RPISystemInterface::Get()->GetApplicationMultisampleState();
             environmentCubeMapPipelineDesc.m_renderSettings.m_size.m_width = RPI::EnvironmentCubeMapPass::CubeMapFaceSize;
             environmentCubeMapPipelineDesc.m_renderSettings.m_size.m_height = RPI::EnvironmentCubeMapPass::CubeMapFaceSize;
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
index 17ef54367b..6ec9368167 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.h
@@ -75,6 +75,7 @@ namespace AZ
 
             void Init(RPI::Scene* scene, ReflectionRenderData* reflectionRenderData);
             void Simulate(uint32_t probeIndex);
+            void OnRenderEnd();
 
             const Vector3& GetPosition() const { return m_transform.GetTranslation(); }
             const AZ::Transform& GetTransform() const { return m_transform; }
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
index 155a159447..cfe807610b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
@@ -166,6 +166,18 @@ namespace AZ
             }
         }
 
+        void ReflectionProbeFeatureProcessor::OnRenderEnd()
+        {
+            // call OnRenderEnd on all reflection probes
+            for (uint32_t probeIndex = 0; probeIndex < m_reflectionProbes.size(); ++probeIndex)
+            {
+                AZStd::shared_ptr<ReflectionProbe>& reflectionProbe = m_reflectionProbes[probeIndex];
+                AZ_Assert(reflectionProbe.use_count() > 1, "ReflectionProbe found with no corresponding owner, ensure that RemoveProbe() is called before releasing probe handles");
+
+                reflectionProbe->OnRenderEnd();
+            }
+        }
+
         ReflectionProbeHandle ReflectionProbeFeatureProcessor::AddProbe(const AZ::Transform& transform, bool useParallaxCorrection)
         {
             AZStd::shared_ptr<ReflectionProbe> reflectionProbe = AZStd::make_shared<ReflectionProbe>();
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.h
index ded36f5496..92fb3fe604 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.h
@@ -46,6 +46,7 @@ namespace AZ
             void Activate() override;
             void Deactivate() override;
             void Simulate(const FeatureProcessor::SimulatePacket& packet) override;
+            void OnRenderEnd() override;
 
             // find the reflection probe volumes that contain the position
             using ReflectionProbeVector = AZStd::vector<AZStd::shared_ptr<ReflectionProbe>>;
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/RHIUtils.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/RHIUtils.h
index 73e8e1ad56..48a041ad7d 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI/RHIUtils.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/RHIUtils.h
@@ -42,6 +42,9 @@ namespace AZ
 
         //! Returns if the current bakcend is a null renderer
         bool IsNullRenderer();
+
+        //! Returns true if the Atom/GraphicsDevMode settings registry key is set
+        bool IsGraphicsDevModeEnabled();
     }
 }
 
diff --git a/Gems/Atom/RHI/Code/Source/RHI/RHIUtils.cpp b/Gems/Atom/RHI/Code/Source/RHI/RHIUtils.cpp
index bc4cde9406..de27f4ce18 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/RHIUtils.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/RHIUtils.cpp
@@ -9,9 +9,12 @@
 #include <Atom/RHI/RHIUtils.h>
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI/Factory.h>
+#include <AzCore/Settings/SettingsRegistry.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/CommandLine/CommandLine.h>
 
+static constexpr char GraphicsDevModeSetting[] = "/Atom/GraphicsDevMode";
+
 namespace AZ
 {
     namespace RHI
@@ -134,5 +137,16 @@ namespace AZ
             }
             return false;
         }
+
+        bool IsGraphicsDevModeEnabled()
+        {
+            AZ::SettingsRegistryInterface* settingsRegistry = AZ::SettingsRegistry::Get();
+            bool graphicsDevMode = false;
+            if (settingsRegistry)
+            {
+                settingsRegistry->Get(graphicsDevMode, GraphicsDevModeSetting);
+            }
+            return graphicsDevMode;
+        }
     }
 }
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
index ee293292e1..287c8e4fd5 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
@@ -12,10 +12,10 @@
 #include <Atom/RHI.Edit/Utils.h>
 #include <Atom/RHI.Reflect/DX12/PipelineLayoutDescriptor.h>
 #include <Atom/RHI.Reflect/DX12/ShaderStageFunction.h>
+#include <Atom/RHI/RHIUtils.h>
 
 #include <AzCore/IO/FileIO.h>
 #include <AzCore/IO/SystemFile.h>
-
 #include <AzFramework/StringFunc/StringFunc.h>
 
 namespace AZ
@@ -253,9 +253,11 @@ namespace AZ
                 return false;
             }
 
+            const bool graphicsDevMode = RHI::IsGraphicsDevModeEnabled();
+
             // Compilation parameters
             AZStd::string params = shaderCompilerArguments.MakeAdditionalDxcCommandLineString();
-            if (BuildHasDebugInfo(shaderCompilerArguments))
+            if (graphicsDevMode || BuildHasDebugInfo(shaderCompilerArguments))
             {
                 params += " -Zi";  // Generate debug information
                 params += " -Zss"; // Compute Shader Hash considering source information
@@ -284,7 +286,7 @@ namespace AZ
             // If we use the auto-name (hash), there is no way we can retrieve that name apart from listing the directory.
             // Instead, let's just generate that hash ourselves.
             AZStd::string symbolDatabaseFileCliArgument{" "};  // when not debug: still insert a space between 5.dxil and 7.hlsl-in
-            if (BuildHasDebugInfo(shaderCompilerArguments))
+            if (graphicsDevMode || BuildHasDebugInfo(shaderCompilerArguments))
             {
                 // prepare .pdb filename:
                 AZStd::string md5hex = RHI::ByteToHexString(md5);
@@ -353,7 +355,7 @@ namespace AZ
                 byProducts.m_dynamicBranchCount = ByProducts::UnknownDynamicBranchCount;
             }
 
-            if (BuildHasDebugInfo(shaderCompilerArguments))
+            if (graphicsDevMode || BuildHasDebugInfo(shaderCompilerArguments))
             {
                 byProducts.m_intermediatePaths.emplace(AZStd::move(objectCodeOutputFile));
             }
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
index c5f1060ca3..f5716f384f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
@@ -11,6 +11,7 @@
 
 #include <Atom/RHI.Reflect/Vulkan/Base.h>
 #include <Atom/RHI.Reflect/Vulkan/ShaderStageFunction.h>
+#include <Atom/RHI/RHIUtils.h>
 
 #include <AzCore/IO/FileIO.h>
 #include <AzCore/IO/SystemFile.h>
@@ -281,7 +282,9 @@ namespace AZ
             args.m_destinationFolder = tempFolder.c_str();
 
             const auto dxcInputFile = RHI::PrependFile(args);  // Prepend header
-            if (BuildHasDebugInfo(shaderCompilerArguments))
+            const bool graphicsDevMode = RHI::IsGraphicsDevModeEnabled();
+
+            if (graphicsDevMode || BuildHasDebugInfo(shaderCompilerArguments))
             {
                 // dump intermediate "true final HLSL" file (shadername.vulkan.shadersource.prepend)
                 byProducts.m_intermediatePaths.insert(dxcInputFile);
@@ -334,7 +337,7 @@ namespace AZ
                 byProducts.m_dynamicBranchCount = ByProducts::UnknownDynamicBranchCount;
             }
 
-            if (BuildHasDebugInfo(shaderCompilerArguments))
+            if (graphicsDevMode || BuildHasDebugInfo(shaderCompilerArguments))
             {
                 byProducts.m_intermediatePaths.emplace(AZStd::move(objectCodeOutputFile));
             }
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonFileLoadContext.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonFileLoadContext.h
deleted file mode 100644
index 90267010a7..0000000000
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonFileLoadContext.h
+++ /dev/null
@@ -1,36 +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
- *
- */
-
-#pragma once
-
-#include <AzCore/RTTI/TypeInfo.h>
-#include <AzCore/std/string/string.h>
-#include <AzCore/std/string/string_view.h>
-#include <AzCore/std/containers/vector.h>
-
-namespace AZ
-{
-    namespace RPI
-    {
-        //! Settings for custom JSON serializers to get context about loading a file
-        class JsonFileLoadContext final
-        {
-        public:
-            AZ_TYPE_INFO(JsonFileLoadContext, "{314942B3-A74A-49D2-822D-CD56F8E3C0F8}");
-
-            void PushFilePath(AZStd::string path);
-            AZStd::string_view GetFilePath() const;
-            void PopFilePath();
-
-        private:
-            // Using vector instead of stack because stack doesn't have a copy constructor
-            AZStd::vector<AZStd::string> m_thisFilePath;
-        };
-
-    } // namespace RPI
-} // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonUtils.h
index 9f4cdcf31b..5550013038 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonUtils.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/JsonUtils.h
@@ -11,7 +11,6 @@
 #include <AzCore/JSON/document.h>
 #include <AzCore/Serialization/Json/JsonSerialization.h>
 #include <AzCore/Serialization/Json/JsonUtils.h>
-#include <Atom/RPI.Edit/Common/JsonFileLoadContext.h>
 #include <Atom/RPI.Edit/Common/JsonReportingHelper.h>
 
 namespace AZ
@@ -52,13 +51,9 @@ namespace AZ
 
                 rapidjson::Document& document = loadOutcome.GetValue();
 
-                AZ::RPI::JsonFileLoadContext fileLoadContext;
-                fileLoadContext.PushFilePath(path);
-
                 AZ::JsonDeserializerSettings jsonSettings;
                 AZ::RPI::JsonReportingHelper reportingHelper;
                 reportingHelper.Attach(jsonSettings);
-                jsonSettings.m_metadata.Add(AZStd::move(fileLoadContext));
 
                 AZ::JsonSerialization::Load(objectData, document, jsonSettings);
                 if (reportingHelper.ErrorsReported())
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/LuaMaterialFunctorSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/LuaMaterialFunctorSourceData.h
index 7deda73c05..e08ee90fda 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/LuaMaterialFunctorSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/LuaMaterialFunctorSourceData.h
@@ -41,7 +41,10 @@ namespace AZ
             // Calls a lua function that returns a list of strings.
             Outcome<AZStd::vector<Name>, void> GetNameListFromLuaScript(AZ::ScriptContext& scriptContext, const char* luaFunctionName) const;
 
-            FunctorResult CreateFunctor(const AZStd::string& materialTypeSourceFilePath, const MaterialPropertiesLayout* propertiesLayout) const;
+            FunctorResult CreateFunctor(
+                const AZStd::string& materialTypeSourceFilePath,
+                const MaterialPropertiesLayout* propertiesLayout,
+                const MaterialNameContext* materialNameContext) const;
 
             // Only one of these should have data
             AZStd::string m_luaSourceFile;
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceData.h
index a8f4f4c524..d26e70831b 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialFunctorSourceData.h
@@ -31,6 +31,7 @@ namespace AZ
         class MaterialPropertiesLayout;
         class ShaderOptionGroupLayout;
         class JsonMaterialFunctorSourceDataSerializer;
+        class MaterialNameContext;
 
         //! This is an abstract base class for initializing MaterialFunctor objects.
         //! Material functors provide custom logic and calculations to configure shaders, render states, and more.
@@ -54,11 +55,17 @@ namespace AZ
             struct RuntimeContext
             {
             public:
-                RuntimeContext(const AZStd::string& materialTypeFilePath, const MaterialPropertiesLayout* materialPropertiesLayout, const RHI::ShaderResourceGroupLayout* shaderResourceGroupLayout, const ShaderCollection* shaderCollection)
+                RuntimeContext(
+                    const AZStd::string& materialTypeFilePath,
+                    const MaterialPropertiesLayout* materialPropertiesLayout,
+                    const RHI::ShaderResourceGroupLayout* shaderResourceGroupLayout,
+                    const ShaderCollection* shaderCollection,
+                    const MaterialNameContext* materialNameContext)
                     : m_materialTypeFilePath(materialTypeFilePath)
                     , m_materialPropertiesLayout(materialPropertiesLayout)
                     , m_shaderResourceGroupLayout(shaderResourceGroupLayout)
                     , m_shaderCollection(shaderCollection)
+                    , m_materialNameContext(materialNameContext)
                 {}
 
                 const AZStd::string& GetMaterialTypeSourceFilePath() const { return m_materialTypeFilePath; }
@@ -66,6 +73,10 @@ namespace AZ
                 const MaterialPropertiesLayout* GetMaterialPropertiesLayout() const;
                 const RHI::ShaderResourceGroupLayout* GetShaderResourceGroupLayout() const;
 
+                //! Find the index of a ShaderResourceGroup input. This will automatically apply the MaterialNameContext.
+                RHI::ShaderInputConstantIndex FindShaderInputConstantIndex(Name inputName) const;
+                RHI::ShaderInputImageIndex FindShaderInputImageIndex(Name inputName) const;
+
                 //! Returns the number of shaders available in this material type.
                 AZStd::size_t GetShaderCount() const;
 
@@ -77,16 +88,18 @@ namespace AZ
                 AZStd::vector<AZ::Name> GetShaderTags() const;
 
                 //! Find a property's index by its name. It will report error and return a Null index if it fails.
-                MaterialPropertyIndex FindMaterialPropertyIndex(const Name& propertyName) const;
+                //! This will also automatically apply the MaterialNameContext.
+                MaterialPropertyIndex FindMaterialPropertyIndex(Name propertyId) const;
 
                 //! Find a shader option index using an option name from the shader by index or tag.
+                //! This will also automatically apply the MaterialNameContext.
                 //! @param shaderIndex index into the material type's list of shader options
                 //! @param shaderTag tag name to index into the material type's list of shader options
                 //! @param optionName the name of the option to find
                 //! @param reportErrors if true, report an error message when if the option name was not found.
                 //! @return the found index, or an empty handle if the option could not be found
-                ShaderOptionIndex FindShaderOptionIndex(AZStd::size_t shaderIndex, const Name& optionName, bool reportErrors = true) const;
-                ShaderOptionIndex FindShaderOptionIndex(const AZ::Name& shaderTag, const Name& optionName, bool reportErrors = true) const;
+                ShaderOptionIndex FindShaderOptionIndex(AZStd::size_t shaderIndex, Name optionName, bool reportErrors = true) const;
+                ShaderOptionIndex FindShaderOptionIndex(const AZ::Name& shaderTag, Name optionName, bool reportErrors = true) const;
 
                 //! Return true if a shaderIndex is within the range of the number of shaders defined in this material.
                 //! And also report an error message if the index is invalid.
@@ -96,19 +109,32 @@ namespace AZ
                 //! And also report an error message if shaderTag is invalid.
                 bool CheckShaderTagValid(const AZ::Name& shaderTag) const;
 
+                //! Returns the name context for the functor.
+                //! It acts like a namespace for any names that the MaterialFunctorSourceData might reference. The namespace
+                //! is automatically applied by the other relevant functions of this RuntimeContext class.
+                //! Note that by default the MaterialNameContext is not saved as part of the final MaterialFunctor class
+                //! (most CreateFunctor() implementations should convert names to indexes anyway) but CreateFunctor() can
+                //! copy it to the created MaterialFunctor for use at runtime if needed.
+                const MaterialNameContext* GetNameContext() const { return m_materialNameContext; }
+
             private:
                 const AZStd::string m_materialTypeFilePath;
                 const MaterialPropertiesLayout*       m_materialPropertiesLayout;
                 const RHI::ShaderResourceGroupLayout* m_shaderResourceGroupLayout;
                 const ShaderCollection*               m_shaderCollection;
+                const MaterialNameContext*            m_materialNameContext;
             };
 
             struct EditorContext
             {
             public:
-                EditorContext(const AZStd::string& materialTypeFilePath, const MaterialPropertiesLayout* materialPropertiesLayout)
+                EditorContext(
+                    const AZStd::string& materialTypeFilePath,
+                    const MaterialPropertiesLayout* materialPropertiesLayout,
+                    const MaterialNameContext* materialNameContext)
                     : m_materialTypeFilePath(materialTypeFilePath)
                     , m_materialPropertiesLayout(materialPropertiesLayout)
+                    , m_materialNameContext(materialNameContext)
                 {}
 
                 const AZStd::string& GetMaterialTypeSourceFilePath() const { return m_materialTypeFilePath; }
@@ -116,11 +142,21 @@ namespace AZ
                 const MaterialPropertiesLayout* GetMaterialPropertiesLayout() const;
 
                 //! Find a property's index by its name. It will report error and return a Null index if it fails.
-                MaterialPropertyIndex FindMaterialPropertyIndex(const Name& propertyName) const;
+                //! This will also automatically apply the MaterialNameContext.
+                MaterialPropertyIndex FindMaterialPropertyIndex(Name propertyId) const;
+                
+                //! Returns the name context for the functor.
+                //! It acts like a namespace for any names that the MaterialFunctorSourceData might reference. The namespace
+                //! is automatically applied by the other relevant functions of this RuntimeContext class.
+                //! Note that by default the MaterialNameContext is not saved as part of the final MaterialFunctor class
+                //! (most CreateFunctor() implementations should convert names to indexes anyway) but CreateFunctor() can
+                //! copy it to the created MaterialFunctor for use at runtime if needed.
+                const MaterialNameContext* GetNameContext() const { return m_materialNameContext; }
 
             private:
                 const AZStd::string m_materialTypeFilePath;
                 const MaterialPropertiesLayout* m_materialPropertiesLayout;
+                const MaterialNameContext* m_materialNameContext;
             };
 
             //! Creates a fully initialized MaterialFunctor object that is ready to be serialized to the cache.
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyId.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyId.h
index 8c78d4b491..424a3a187a 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyId.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyId.h
@@ -22,9 +22,14 @@ namespace AZ
         //! The groups are optional, in which case the full property ID will just be like "propertyName".
         class MaterialPropertyId
         {
-        public:                
+        public:
+            //! Returns whether the name is a valid C-style identifier
             static bool IsValidName(AZStd::string_view name);
             static bool IsValidName(const AZ::Name& name);
+            
+            //! Returns whether the name is a valid C-style identifier, and reports errors if it is not.
+            static bool CheckIsValidName(AZStd::string_view name);
+            static bool CheckIsValidName(const AZ::Name& name);
 
             //! Creates a MaterialPropertyId from a full name string like "groupA.groupB.[...].propertyName" or just "propertyName".
             //! Also checks the name for validity.
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h
index 23219cfa89..f1e92a70ea 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h
@@ -131,15 +131,17 @@ namespace AZ
                 PropertyGroup() = default;
                 AZ_DISABLE_COPY(PropertyGroup)
 
-                const AZStd::string& GetName() const { return m_name; }
-                const AZStd::string& GetDisplayName() const { return m_displayName; }
-                const AZStd::string& GetDescription() const { return m_description; }
-                const PropertyList& GetProperties() const { return m_properties; }
-                const AZStd::vector<AZStd::unique_ptr<PropertyGroup>>& GetPropertyGroups() const { return m_propertyGroups; }
-                const AZStd::vector<Ptr<MaterialFunctorSourceDataHolder>>& GetFunctors() const { return m_materialFunctorSourceData; }
+                const AZStd::string& GetName() const;
+                const AZStd::string& GetDisplayName() const;
+                const AZStd::string& GetDescription() const;
+                const PropertyList& GetProperties() const;
+                const AZStd::string& GetShaderInputsPrefix() const;
+                const AZStd::string& GetShaderOptionsPrefix() const;
+                const AZStd::vector<AZStd::unique_ptr<PropertyGroup>>& GetPropertyGroups() const;
+                const AZStd::vector<Ptr<MaterialFunctorSourceDataHolder>>& GetFunctors() const;
                 
-                void SetDisplayName(AZStd::string_view displayName) { m_displayName = displayName; }
-                void SetDescription(AZStd::string_view description) { m_description = description; }
+                void SetDisplayName(AZStd::string_view displayName);
+                void SetDescription(AZStd::string_view description);
 
                 //! Add a new property to this PropertyGroup.
                 //! @param name a unique for the property. Must be a C-style identifier.
@@ -158,6 +160,8 @@ namespace AZ
                 AZStd::string m_name;
                 AZStd::string m_displayName;
                 AZStd::string m_description;
+                AZStd::string m_shaderInputsPrefix;  //!< The name of all SRG inputs under this group will get this prefix.
+                AZStd::string m_shaderOptionsPrefix; //!< The name of all shader options under this group will get this prefix.
                 PropertyList m_properties;
                 AZStd::vector<AZStd::unique_ptr<PropertyGroup>> m_propertyGroups;
                 AZStd::vector<Ptr<MaterialFunctorSourceDataHolder>> m_materialFunctorSourceData;
@@ -279,12 +283,13 @@ namespace AZ
             //! Splits an ID string like "itemA.itemB.itemC" into a vector like ["itemA.itemB", "itemC"].
             static AZStd::vector<AZStd::string_view> SplitId(AZStd::string_view id);
 
+            //! Describes a path in the hierarchy of property groups, with the top level group at the beginning and a leaf-most group at the end.
+            using PropertyGroupStack = AZStd::vector<const PropertyGroup*>;
+
             //! Call back function type used with the enumeration functions.
+            //! The PropertyGroupStack contains the stack of property groups at the current point in the traversal.
             //! Return false to terminate the traversal.
-            using EnumeratePropertyGroupsCallback = AZStd::function<bool(
-                const AZStd::string&, // The property ID context (i.e. "levelA.levelB.")
-                const PropertyGroup* // the next property group in the tree
-                )>;
+            using EnumeratePropertyGroupsCallback = AZStd::function<bool(const PropertyGroupStack&)>;
 
             //! Recursively traverses all of the property groups contained in the material type, executing a callback function for each.
             //! @return false if the enumeration was terminated early by the callback returning false.
@@ -293,14 +298,17 @@ namespace AZ
             //! Call back function type used with the numeration functions.
             //! Return false to terminate the traversal.
             using EnumeratePropertiesCallback = AZStd::function<bool(
-                const AZStd::string&, // The property ID context (i.e. "levelA.levelB."
-                const PropertyDefinition* // the property definition object 
+                const PropertyDefinition*, // the property definition object 
+                const MaterialNameContext& // The name context that the property is in, used to scope properties and shader connections (i.e. "levelA.levelB.")
                 )>;
             
             //! Recursively traverses all of the properties contained in the material type, executing a callback function for each.
             //! @return false if the enumeration was terminated early by the callback returning false.
             bool EnumerateProperties(const EnumeratePropertiesCallback& callback) const;
 
+            //! Returns a MaterialNameContext for a specific path through the property group hierarchy.
+            static MaterialNameContext MakeMaterialNameContext(const MaterialTypeSourceData::PropertyGroupStack& propertyGroupStack);
+
             Outcome<Data::Asset<MaterialTypeAsset>> CreateMaterialTypeAsset(Data::AssetId assetId, AZStd::string_view materialTypeSourceFilePath = "", bool elevateWarnings = true) const;
 
             //! If the data was loaded from an old format file (i.e. where "groups" and "properties" were separate sections),
@@ -316,18 +324,21 @@ namespace AZ
             PropertyDefinition* FindProperty(AZStd::span<AZStd::string_view> parsedPropertyId, AZStd::span<AZStd::unique_ptr<PropertyGroup>> inPropertyGroupList);
             
             // Function overloads for recursion, returns false to indicate that recursion should end.
-            bool EnumeratePropertyGroups(const EnumeratePropertyGroupsCallback& callback, AZStd::string propertyIdContext, const AZStd::vector<AZStd::unique_ptr<PropertyGroup>>& inPropertyGroupList) const;
-            bool EnumerateProperties(const EnumeratePropertiesCallback& callback, AZStd::string propertyIdContext, const AZStd::vector<AZStd::unique_ptr<PropertyGroup>>& inPropertyGroupList) const;
+            bool EnumeratePropertyGroups(const EnumeratePropertyGroupsCallback& callback, PropertyGroupStack& propertyGroupStack, const AZStd::vector<AZStd::unique_ptr<PropertyGroup>>& inPropertyGroupList) const;
+            bool EnumerateProperties(const EnumeratePropertiesCallback& callback, MaterialNameContext nameContext, const AZStd::vector<AZStd::unique_ptr<PropertyGroup>>& inPropertyGroupList) const;
+            
+            static void ExtendNameContext(MaterialNameContext& nameContext, const MaterialTypeSourceData::PropertyGroup& propertyGroup);
 
-            //! Recursively populates a material asset with properties from the tree of material property groups.
+            //! Recursively populates a material type asset with properties from the tree of material property groups.
             //! @param materialTypeSourceFilePath path to the material type file that is being processed, used to look up relative paths
-            //! @param propertyNameContext the accumulated prefix that should be applied to any property names encountered in the current @propertyGroup
+            //! @param materialTypeAssetCreator properties will be added to this creator
+            //! @param materialNameContext the accumulated name context that should be applied to any property names or connection names encountered in the current @propertyGroup
             //! @param propertyGroup the current PropertyGroup that is being processed
             //! @return false if errors are detected and processing should abort
             bool BuildPropertyList(
                 const AZStd::string& materialTypeSourceFilePath,
                 MaterialTypeAssetCreator& materialTypeAssetCreator,
-                AZStd::vector<AZStd::string>& propertyNameContext,
+                MaterialNameContext materialNameContext,
                 const MaterialTypeSourceData::PropertyGroup* propertyGroup) const;
                             
             //! Construct a complete list of group definitions, including implicit groups, arranged in the same order as the source data.
@@ -337,7 +348,7 @@ namespace AZ
             
             PropertyLayout m_propertyLayout;
         };
-
+        
         //! The wrapper class for derived material functors.
         //! It is used in deserialization so that derived material functors can be deserialized by name.
         class MaterialFunctorSourceDataHolder final
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h
index f6c10e003e..e8568306e3 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h
@@ -29,6 +29,8 @@ namespace AZ
 
         namespace MaterialUtils
         {
+            using ImportedJsonFiles = AZStd::unordered_set<AZStd::string>;
+
             enum class GetImageAssetResult
             {
                 Empty,             //! No image was actually requested, the path was empty
@@ -49,12 +51,13 @@ namespace AZ
             //! @return if resolving is successful. An error will be reported if it fails.
             bool ResolveMaterialPropertyEnumValue(const MaterialPropertyDescriptor* propertyDescriptor, const AZ::Name& enumName, MaterialPropertyValue& outResolvedValue);
 
-            //! Load a material type from a json file. If the file path is relative, the loaded json document must be provided.
+            //! Load a material type from a json file or document.
             //! Otherwise, it will use the passed in document first if not null, or load the json document from the path.
-            //! @param filePath a relative path if document is provided, an absolute path if document is not provided.
-            //! @param document the loaded json document.
-            AZ::Outcome<MaterialTypeSourceData> LoadMaterialTypeSourceData(const AZStd::string& filePath, const rapidjson::Value* document = nullptr);
-            
+            //! @param filePath path to the JSON file to load, unless the @document is already provided. In either case, this path will be used to resolve any relative file references.
+            //! @param document an optional already loaded json document.
+            //! @param importedFiles receives the list of files that were imported by the JSON serializer
+            AZ::Outcome<MaterialTypeSourceData> LoadMaterialTypeSourceData(const AZStd::string& filePath, rapidjson::Document* document = nullptr, ImportedJsonFiles* importedFiles = nullptr);
+
             //! Load a material from a json file.
             AZ::Outcome<MaterialSourceData> LoadMaterialSourceData(const AZStd::string& filePath, const rapidjson::Value* document = nullptr, bool warningsAsErrors = false);
 
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h
index 51fc563a06..8bb1fa23e0 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h
@@ -9,6 +9,7 @@
 
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/Memory/SystemAllocator.h>
 
 namespace AZ
 {
@@ -44,6 +45,6 @@ namespace AZ
             AZStd::vector<VariantInfo> m_shaderVariants;
 
         };
-        
+
     } // namespace RPI
 } // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h
index 57f595ccba..dbf70fb0cc 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystem.h
@@ -86,6 +86,8 @@ namespace AZ
             const RPISystemDescriptor& GetDescriptor() const override;
             Name GetRenderApiName() const override;
             uint64_t GetCurrentTick() const override;
+            void SetApplicationMultisampleState(const RHI::MultisampleState& multisampleState) override;
+            const RHI::MultisampleState& GetApplicationMultisampleState() const override;
 
             // AZ::Debug::TraceMessageBus::Handler overrides...
             bool OnPreAssert(const char* fileName, int line, const char* func, const char* message) override;
@@ -136,6 +138,9 @@ namespace AZ
             bool m_systemAssetsInitialized = false;
 
             uint64_t m_renderTick = 0;
+
+            // Application multisample state
+            RHI::MultisampleState m_multisampleState;
         };
 
     } // namespace RPI
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystemInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystemInterface.h
index 693185b6d2..7853e8f51e 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystemInterface.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPISystemInterface.h
@@ -90,6 +90,10 @@ namespace AZ
 
             //! Get the index of current render tick
             virtual uint64_t GetCurrentTick() const = 0;
+
+            //! Application multisample state
+            virtual void SetApplicationMultisampleState(const RHI::MultisampleState& multisampleState) = 0;
+            virtual const RHI::MultisampleState& GetApplicationMultisampleState() const = 0;
         };
 
     } // namespace RPI
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h
index 6516407265..463a9ee871 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h
@@ -60,6 +60,10 @@ namespace AZ
         //! Same as above. Provided as a convenience when all arguments of the 'numthreads' attributes should be assigned to RHI::DispatchDirect::m_threadsPerGroup* variables.
         AZ::Outcome<void, AZStd::string> GetComputeShaderNumThreads(const Data::Asset<ShaderAsset>& shaderAsset, RHI::DispatchDirect& dispatchDirect);
 
+        //! Returns true/false if the specified format is supported by the image data pixel retrieval APIs
+        //!     GetImageDataPixelValue, GetSubImagePixelValue, and GetSubImagePixelValues
+        bool IsImageDataPixelAPISupported(AZ::RHI::Format format);
+
         //! Get single image pixel value from raw image data
         //! This assumes the imageData is not empty
         template<typename T>
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/LuaMaterialFunctor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/LuaMaterialFunctor.h
index 5f4dce40e5..1bce036c73 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/LuaMaterialFunctor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/LuaMaterialFunctor.h
@@ -10,6 +10,7 @@
 
 #include <Atom/RPI.Reflect/Material/MaterialFunctor.h>
 #include <Atom/RPI.Reflect/Material/MaterialPropertyDescriptor.h>
+#include <Atom/RPI.Reflect/Material/MaterialNameContext.h>
 #include <Atom/RHI.Reflect/Limits.h>
 
 namespace UnitTest
@@ -60,12 +61,8 @@ namespace AZ
             AZStd::unique_ptr<AZ::BehaviorContext> m_sriptBehaviorContext;
             AZStd::unique_ptr<AZ::ScriptContext> m_scriptContext;
             
-            // These are prefix strings that will be applied to every name lookup in the lua functor.
-            // This allows the lua script to be reused in different contexts.
-            AZStd::string m_propertyNamePrefix;
-            AZStd::string m_srgNamePrefix;
-            AZStd::string m_optionsNamePrefix;
-
+            MaterialNameContext m_materialNameContext;
+            
             enum class ScriptStatus
             {
                 Uninitialized,
@@ -84,15 +81,11 @@ namespace AZ
 
             explicit LuaMaterialFunctorCommonContext(MaterialFunctor::RuntimeContext* runtimeContextImpl,
                 const MaterialPropertyFlags* materialPropertyDependencies,
-                const AZStd::string& propertyNamePrefix,
-                const AZStd::string& srgNamePrefix,
-                const AZStd::string& optionsNamePrefix);
+                const MaterialNameContext &materialNameContext);
 
             explicit LuaMaterialFunctorCommonContext(MaterialFunctor::EditorContext* editorContextImpl,
                 const MaterialPropertyFlags* materialPropertyDependencies,
-                const AZStd::string& propertyNamePrefix,
-                const AZStd::string& srgNamePrefix,
-                const AZStd::string& optionsNamePrefix);
+                const MaterialNameContext &materialNameContext);
             
             //! Returns false if PSO changes are not allowed, and may report errors or warnings
             bool CheckPsoChangesAllowed();
@@ -112,11 +105,7 @@ namespace AZ
 
             AZStd::string GetMaterialPropertyDependenciesString() const;
 
-            // These are prefix strings that will be applied to every name lookup in the lua functor.
-            // This allows the lua script to be reused in different contexts.
-            const AZStd::string& m_propertyNamePrefix;
-            const AZStd::string& m_srgNamePrefix;
-            const AZStd::string& m_optionsNamePrefix;
+            const MaterialNameContext &m_materialNameContext;
 
         private:
 
@@ -284,9 +273,7 @@ namespace AZ
 
             explicit LuaMaterialFunctorRuntimeContext(MaterialFunctor::RuntimeContext* runtimeContextImpl,
                 const MaterialPropertyFlags* materialPropertyDependencies,
-                const AZStd::string& propertyNamePrefix,
-                const AZStd::string& srgNamePrefix,
-                const AZStd::string& optionsNamePrefix);
+                const MaterialNameContext &materialNameContext);
 
             template<typename Type>
             Type GetMaterialPropertyValue(const char* name) const;
@@ -324,9 +311,7 @@ namespace AZ
 
             explicit LuaMaterialFunctorEditorContext(MaterialFunctor::EditorContext* editorContextImpl,
                 const MaterialPropertyFlags* materialPropertyDependencies,
-                const AZStd::string& propertyNamePrefix,
-                const AZStd::string& srgNamePrefix,
-                const AZStd::string& optionsNamePrefix);
+                const MaterialNameContext &materialNameContext);
 
             template<typename Type>
             Type GetMaterialPropertyValue(const char* name) const;
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialFunctor.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialFunctor.h
index 09d10bf538..459dd601f9 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialFunctor.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialFunctor.h
@@ -49,8 +49,8 @@ namespace AZ
 
         //! MaterialFunctor objects provide custom logic and calculations to configure shaders, render states,
         //! editor metadata, and more.
-        //! Atom will provide an implementation of this class that uses a script to define the custom logic
-        //! for a convenient workflow. Clients may also provide their own custom hard-coded implementations
+        //! Atom provides a LuaMaterialFunctor subclass that uses a script to define the custom logic
+        //! for a convenient workflow. Developers may also provide their own custom hard-coded implementations
         //! as an optimization rather than taking the scripted approach.
         //! Any custom subclasses of MaterialFunctor will also need a corresponding MaterialFunctorSourceData subclass
         //! to create the functor at build-time. Depending on the builder context, clients can choose to create a runtime
@@ -91,11 +91,11 @@ namespace AZ
                 //! Get the property value. The type must be one of those in MaterialPropertyValue.
                 //! Otherwise, a compile error will be reported.
                 template<typename Type>
-                const Type& GetMaterialPropertyValue(const Name& propertyName) const;
+                const Type& GetMaterialPropertyValue(const Name& propertyId) const;
                 template<typename Type>
                 const Type& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const;
                 //! Get the property value. GetMaterialPropertyValue<T>() is equivalent to GetMaterialPropertyValue().GetValue<T>().
-                const MaterialPropertyValue& GetMaterialPropertyValue(const Name& propertyName) const;
+                const MaterialPropertyValue& GetMaterialPropertyValue(const Name& propertyId) const;
                 const MaterialPropertyValue& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const;
 
                 const MaterialPropertiesLayout* GetMaterialPropertiesLayout() const { return m_materialPropertiesLayout.get(); }
@@ -164,19 +164,19 @@ namespace AZ
             {
                 friend class LuaMaterialFunctorEditorContext;
             public:
-                const MaterialPropertyDynamicMetadata* GetMaterialPropertyMetadata(const Name& propertyName) const;
+                const MaterialPropertyDynamicMetadata* GetMaterialPropertyMetadata(const Name& propertyId) const;
                 const MaterialPropertyDynamicMetadata* GetMaterialPropertyMetadata(const MaterialPropertyIndex& index) const;
 
-                const MaterialPropertyGroupDynamicMetadata* GetMaterialPropertyGroupMetadata(const Name& propertyName) const;
+                const MaterialPropertyGroupDynamicMetadata* GetMaterialPropertyGroupMetadata(const Name& propertyId) const;
 
                 //! Get the property value. The type must be one of those in MaterialPropertyValue.
                 //! Otherwise, a compile error will be reported.
                 template<typename Type>
-                const Type& GetMaterialPropertyValue(const Name& propertyName) const;
+                const Type& GetMaterialPropertyValue(const Name& propertyId) const;
                 template<typename Type>
                 const Type& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const;
                 //! Get the property value. GetMaterialPropertyValue<T>() is equivalent to GetMaterialPropertyValue().GetValue<T>().
-                const MaterialPropertyValue& GetMaterialPropertyValue(const Name& propertyName) const;
+                const MaterialPropertyValue& GetMaterialPropertyValue(const Name& propertyId) const;
                 const MaterialPropertyValue& GetMaterialPropertyValue(const MaterialPropertyIndex& index) const;
 
                 const MaterialPropertiesLayout* GetMaterialPropertiesLayout() const { return m_materialPropertiesLayout.get(); }
@@ -184,22 +184,22 @@ namespace AZ
                 MaterialPropertyPsoHandling GetMaterialPropertyPsoHandling() const { return MaterialPropertyPsoHandling::Allowed; }
 
                 //! Set the visibility dynamic metadata of a material property.
-                bool SetMaterialPropertyVisibility(const Name& propertyName, MaterialPropertyVisibility visibility);
+                bool SetMaterialPropertyVisibility(const Name& propertyId, MaterialPropertyVisibility visibility);
                 bool SetMaterialPropertyVisibility(const MaterialPropertyIndex& index, MaterialPropertyVisibility visibility);
 
-                bool SetMaterialPropertyDescription(const Name& propertyName, AZStd::string description);
+                bool SetMaterialPropertyDescription(const Name& propertyId, AZStd::string description);
                 bool SetMaterialPropertyDescription(const MaterialPropertyIndex& index, AZStd::string description);
 
-                bool SetMaterialPropertyMinValue(const Name& propertyName, const MaterialPropertyValue& min);
+                bool SetMaterialPropertyMinValue(const Name& propertyId, const MaterialPropertyValue& min);
                 bool SetMaterialPropertyMinValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& min);
 
-                bool SetMaterialPropertyMaxValue(const Name& propertyName, const MaterialPropertyValue& max);
+                bool SetMaterialPropertyMaxValue(const Name& propertyId, const MaterialPropertyValue& max);
                 bool SetMaterialPropertyMaxValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& max);
 
-                bool SetMaterialPropertySoftMinValue(const Name& propertyName, const MaterialPropertyValue& min);
+                bool SetMaterialPropertySoftMinValue(const Name& propertyId, const MaterialPropertyValue& min);
                 bool SetMaterialPropertySoftMinValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& min);
 
-                bool SetMaterialPropertySoftMaxValue(const Name& propertyName, const MaterialPropertyValue& max);
+                bool SetMaterialPropertySoftMaxValue(const Name& propertyId, const MaterialPropertyValue& max);
                 bool SetMaterialPropertySoftMaxValue(const MaterialPropertyIndex& index, const MaterialPropertyValue& max);
 
                 bool SetMaterialPropertyGroupVisibility(const Name& propertyGroupName, MaterialPropertyGroupVisibility visibility);
@@ -218,8 +218,8 @@ namespace AZ
                 );
 
             private:
-                MaterialPropertyDynamicMetadata* QueryMaterialPropertyMetadata(const Name& propertyName) const;
-                MaterialPropertyGroupDynamicMetadata* QueryMaterialPropertyGroupMetadata(const Name& propertyGroupName) const;
+                MaterialPropertyDynamicMetadata* QueryMaterialPropertyMetadata(const Name& propertyId) const;
+                MaterialPropertyGroupDynamicMetadata* QueryMaterialPropertyGroupMetadata(const Name& propertyGroupId) const;
 
                 const AZStd::vector<MaterialPropertyValue>& m_materialPropertyValues;
                 RHI::ConstPtr<MaterialPropertiesLayout> m_materialPropertiesLayout;
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialNameContext.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialNameContext.h
new file mode 100644
index 0000000000..ac6adffe2b
--- /dev/null
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Material/MaterialNameContext.h
@@ -0,0 +1,62 @@
+/*
+ * 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/string/string.h>
+
+namespace AZ
+{
+    class ReflectContext;
+    class Name;
+
+    namespace RPI
+    {
+        //! This acts like a namespace description for various types of identifiers that appear in .materialtype files.
+        //! When reusable property groups are nested inside other property groups, they usually need alternate naming
+        //! to connect to the appropriate shader inputs. For example, a baseColor property group inside a "layer1" group
+        //! needs to connect to "m_layer1_baseColor_texture" and the same property definition is repeated inside a "layer2"
+        //! group where it connects to "m_layer2_baseColor_texture". This data structure provides the name context, like
+        //! "m_layer1_" or "m_layer2_".
+        class MaterialNameContext
+        {
+        public:
+            AZ_TYPE_INFO(MaterialNameContext, "{AAC9BB28-F463-455D-8467-F877E50E1FA7}")
+                
+            static void Reflect(ReflectContext* context);
+
+            MaterialNameContext() = default;
+
+            //! Extends the name context to a deeper property group.
+            void ExtendPropertyIdContext(AZStd::string_view nameContext, bool insertDelimiter=true);
+            void ExtendSrgInputContext(AZStd::string_view nameContext);
+            void ExtendShaderOptionContext(AZStd::string_view nameContext);
+            
+            //! Applies the name context to a given leaf name.
+            bool ContextualizeProperty(Name& propertyName) const;
+            bool ContextualizeSrgInput(Name& srgInputName) const;
+            bool ContextualizeShaderOption(Name& shaderOptionName) const;
+            bool ContextualizeProperty(AZStd::string& propertyName) const;
+            bool ContextualizeSrgInput(AZStd::string& srgInputName) const;
+            bool ContextualizeShaderOption(AZStd::string& shaderOptionName) const;
+            
+            //! Returns true if there is some non-default name context.
+            bool HasContextForProperties() const;
+            bool HasContextForSrgInputs() const;
+            bool HasContextForShaderOptions() const;
+
+            //! Returns true if the name context is empty.
+            bool IsDefault() const;
+
+        private:
+            AZStd::string m_propertyIdContext;
+            AZStd::string m_srgInputNameContext;
+            AZStd::string m_shaderOptionNameContext;
+        };
+
+    } // namespace RPI
+} // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp
index bb0330e7b6..a610501f13 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp
@@ -11,7 +11,6 @@
 #include <Atom/RPI.Edit/Material/MaterialTypeSourceData.h>
 #include <Atom/RPI.Edit/Material/MaterialUtils.h>
 #include <Atom/RPI.Edit/Common/AssetUtils.h>
-#include <Atom/RPI.Edit/Common/JsonFileLoadContext.h>
 #include <Atom/RPI.Edit/Common/JsonReportingHelper.h>
 #include <Atom/RPI.Edit/Common/JsonUtils.h>
 #include <AzCore/Serialization/Json/JsonUtils.h>
@@ -52,7 +51,7 @@ namespace AZ
         {
             AssetBuilderSDK::AssetBuilderDesc materialBuilderDescriptor;
             materialBuilderDescriptor.m_name = JobKey;
-            materialBuilderDescriptor.m_version = 119; // new material file format
+            materialBuilderDescriptor.m_version = 123; // nested property layers
             materialBuilderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern("*.material", AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
             materialBuilderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern("*.materialtype", AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
             materialBuilderDescriptor.m_busId = azrtti_typeid<MaterialBuilder>();
@@ -161,13 +160,21 @@ namespace AZ
                 const bool isMaterialTypeFile = AzFramework::StringFunc::Path::IsExtension(request.m_sourceFile.c_str(), MaterialTypeSourceData::Extension);
                 if (isMaterialTypeFile)
                 {
-                    auto materialTypeSourceData = MaterialUtils::LoadMaterialTypeSourceData(fullSourcePath, &document);
+                    MaterialUtils::ImportedJsonFiles importedJsonFiles;
+                    auto materialTypeSourceData = MaterialUtils::LoadMaterialTypeSourceData(fullSourcePath, &document, &importedJsonFiles);
 
                     if (!materialTypeSourceData.IsSuccess())
                     {
                         return;
                     }
 
+                    for (auto& importedJsonFile : importedJsonFiles)
+                    {
+                        AssetBuilderSDK::SourceFileDependency sourceDependency;
+                        sourceDependency.m_sourceFileDependencyPath = importedJsonFile;
+                        response.m_sourceFileDependencyList.push_back(sourceDependency);
+                    }
+
                     for (auto& shader : materialTypeSourceData.GetValue().m_shaderCollection)
                     {
                         AddPossibleDependencies(request.m_sourceFile,
@@ -243,7 +250,7 @@ namespace AZ
             response.m_result = AssetBuilderSDK::CreateJobsResultCode::Success;
         }
 
-        AZ::Data::Asset<MaterialTypeAsset> CreateMaterialTypeAsset(AZStd::string_view materialTypeSourceFilePath, const rapidjson::Value& json)
+        AZ::Data::Asset<MaterialTypeAsset> CreateMaterialTypeAsset(AZStd::string_view materialTypeSourceFilePath, rapidjson::Document& json)
         {
             auto materialType = MaterialUtils::LoadMaterialTypeSourceData(materialTypeSourceFilePath, &json);
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonFileLoadContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonFileLoadContext.cpp
deleted file mode 100644
index fb5f7b09a9..0000000000
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/JsonFileLoadContext.cpp
+++ /dev/null
@@ -1,39 +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
- *
- */
-
-#include <Atom/RPI.Edit/Common/JsonFileLoadContext.h>
-
-namespace AZ
-{
-    namespace RPI
-    {
-        // Note, we use string not string_view on purpose because m_thisFilePath.push_back() will make a new string anyway.
-        void JsonFileLoadContext::PushFilePath(AZStd::string path)
-        {
-            m_thisFilePath.push_back(AZStd::move(path));
-        }
-
-        AZStd::string_view JsonFileLoadContext::GetFilePath() const
-        {
-            if (m_thisFilePath.empty())
-            {
-                return "";
-            }
-            else
-            {
-                return m_thisFilePath.back();
-            }
-        }
-
-        void JsonFileLoadContext::PopFilePath()
-        {
-            m_thisFilePath.pop_back();
-        }
-
-    } // namespace RPI
-} // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/LuaMaterialFunctorSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/LuaMaterialFunctorSourceData.cpp
index 14ef3bb17d..790b721fb7 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/LuaMaterialFunctorSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/LuaMaterialFunctorSourceData.cpp
@@ -115,16 +115,26 @@ namespace AZ
 
         RPI::LuaMaterialFunctorSourceData::FunctorResult LuaMaterialFunctorSourceData::CreateFunctor(
                 const AZStd::string& materialTypeSourceFilePath,
-                const MaterialPropertiesLayout* propertiesLayout
+                const MaterialPropertiesLayout* propertiesLayout,
+                const MaterialNameContext* materialNameContext
             ) const
         {
             using namespace RPI;
 
             RPI::Ptr<LuaMaterialFunctor> functor = aznew LuaMaterialFunctor;
 
-            functor->m_propertyNamePrefix = m_propertyNamePrefix;
-            functor->m_srgNamePrefix = m_srgNamePrefix;
-            functor->m_optionsNamePrefix = m_optionsNamePrefix;
+            if (materialNameContext->IsDefault())
+            {
+                // This is a legacy feature that was used for a while to support reusing the same functor for multiple layers in StandardMultilayerPbr.materialtype.
+                // Now that we have support for nested property groups, this functionality is only supported for functors at the top level, for backward compatibility.
+                functor->m_materialNameContext.ExtendPropertyIdContext(m_propertyNamePrefix, false);
+                functor->m_materialNameContext.ExtendSrgInputContext(m_srgNamePrefix);
+                functor->m_materialNameContext.ExtendShaderOptionContext(m_optionsNamePrefix);
+            }
+            else
+            {
+                functor->m_materialNameContext = *materialNameContext;
+            }
 
             if (!m_luaScript.empty() && !m_luaSourceFile.empty())
             {
@@ -188,7 +198,10 @@ namespace AZ
 
             for (const Name& materialProperty : materialPropertyDependencies.GetValue())
             {
-                MaterialPropertyIndex index = propertiesLayout->FindPropertyIndex(Name{m_propertyNamePrefix + materialProperty.GetCStr()});
+                Name propertyName{materialProperty};
+                functor->m_materialNameContext.ContextualizeProperty(propertyName);
+
+                MaterialPropertyIndex index = propertiesLayout->FindPropertyIndex(propertyName);
                 if (!index.IsValid())
                 {
                     AZ_Error("LuaMaterialFunctorSourceData", false, "Property '%s' is not found in material type.", materialProperty.GetCStr());
@@ -205,14 +218,16 @@ namespace AZ
         {
             return CreateFunctor(
                 context.GetMaterialTypeSourceFilePath(),
-                context.GetMaterialPropertiesLayout());
+                context.GetMaterialPropertiesLayout(),
+                context.GetNameContext());
         }
 
         RPI::LuaMaterialFunctorSourceData::FunctorResult LuaMaterialFunctorSourceData::CreateFunctor(const EditorContext& context) const
         {
             return CreateFunctor(
                 context.GetMaterialTypeSourceFilePath(),
-                context.GetMaterialPropertiesLayout());
+                context.GetMaterialPropertiesLayout(),
+                context.GetNameContext());
         }
     }
 }
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceData.cpp
index 36217af1b6..cdc75b8c05 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceData.cpp
@@ -10,6 +10,7 @@
 #include <Atom/RPI.Reflect/Material/MaterialFunctor.h>
 #include <Atom/RPI.Reflect/Material/ShaderCollection.h>
 #include <Atom/RPI.Reflect/Material/MaterialPropertiesLayout.h>
+#include <Atom/RPI.Reflect/Material/MaterialNameContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/Json/RegistrationContext.h>
 
@@ -66,17 +67,20 @@ namespace AZ
             return m_shaderResourceGroupLayout;
         }
 
-        MaterialPropertyIndex MaterialFunctorSourceData::RuntimeContext::FindMaterialPropertyIndex(const Name& propertyName) const
+        MaterialPropertyIndex MaterialFunctorSourceData::RuntimeContext::FindMaterialPropertyIndex(Name propertyId) const
         {
-            MaterialPropertyIndex propertyIndex = m_materialPropertiesLayout->FindPropertyIndex(propertyName);
+            m_materialNameContext->ContextualizeProperty(propertyId);
+            MaterialPropertyIndex propertyIndex = m_materialPropertiesLayout->FindPropertyIndex(propertyId);
 
-            AZ_Error("MaterialFunctorSourceData", propertyIndex.IsValid(), "Could not find property '%s'.", propertyName.GetCStr());
+            AZ_Error("MaterialFunctorSourceData", propertyIndex.IsValid(), "Could not find property '%s'.", propertyId.GetCStr());
 
             return propertyIndex;
         }
 
-        ShaderOptionIndex MaterialFunctorSourceData::RuntimeContext::FindShaderOptionIndex(AZStd::size_t shaderIndex, const Name& optionName, bool reportErrors) const
+        ShaderOptionIndex MaterialFunctorSourceData::RuntimeContext::FindShaderOptionIndex(AZStd::size_t shaderIndex, Name optionName, bool reportErrors) const
         {
+            m_materialNameContext->ContextualizeShaderOption(optionName);
+
             const ShaderOptionGroupLayout* shaderOptionGroupLayout = GetShaderOptionGroupLayout(shaderIndex);
 
             if (shaderOptionGroupLayout)
@@ -92,8 +96,10 @@ namespace AZ
             return ShaderOptionIndex();
         }
 
-        AZ::RPI::ShaderOptionIndex MaterialFunctorSourceData::RuntimeContext::FindShaderOptionIndex(const AZ::Name& shaderTag, const Name& optionName, bool reportErrors /*= true*/) const
+        AZ::RPI::ShaderOptionIndex MaterialFunctorSourceData::RuntimeContext::FindShaderOptionIndex(const AZ::Name& shaderTag, Name optionName, bool reportErrors /*= true*/) const
         {
+            m_materialNameContext->ContextualizeShaderOption(optionName);
+
             const ShaderOptionGroupLayout* shaderOptionGroupLayout = GetShaderOptionGroupLayout(shaderTag);
 
             if (shaderOptionGroupLayout)
@@ -122,19 +128,33 @@ namespace AZ
             AZ_Error("MaterialFunctorSourceData", valid, "Shader tag '%s' is invalid", shaderTag.GetCStr());
             return valid;
         }
+        
+        RHI::ShaderInputConstantIndex MaterialFunctorSourceData::RuntimeContext::FindShaderInputConstantIndex(Name inputName) const
+        {
+            m_materialNameContext->ContextualizeSrgInput(inputName);
+            return m_shaderResourceGroupLayout->FindShaderInputConstantIndex(inputName);
+        }
+
+        RHI::ShaderInputImageIndex MaterialFunctorSourceData::RuntimeContext::FindShaderInputImageIndex(Name inputName) const
+        {
+            m_materialNameContext->ContextualizeSrgInput(inputName);
+            return m_shaderResourceGroupLayout->FindShaderInputImageIndex(inputName);
+        }
 
         const MaterialPropertiesLayout* MaterialFunctorSourceData::EditorContext::GetMaterialPropertiesLayout() const
         {
             return m_materialPropertiesLayout;
         }
 
-        MaterialPropertyIndex MaterialFunctorSourceData::EditorContext::FindMaterialPropertyIndex(const Name& propertyName) const
+        MaterialPropertyIndex MaterialFunctorSourceData::EditorContext::FindMaterialPropertyIndex(Name propertyId) const
         {
-            MaterialPropertyIndex propertyIndex = m_materialPropertiesLayout->FindPropertyIndex(propertyName);
+            m_materialNameContext->ContextualizeProperty(propertyId);
+            MaterialPropertyIndex propertyIndex = m_materialPropertiesLayout->FindPropertyIndex(propertyId);
 
-            AZ_Error("MaterialFunctorSourceData", propertyIndex.IsValid(), "Could not find property '%s'", propertyName.GetCStr());
+            AZ_Error("MaterialFunctorSourceData", propertyIndex.IsValid(), "Could not find property '%s'", propertyId.GetCStr());
 
             return propertyIndex;
         }
+
     } // namespace RPI
 } // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.cpp
index a944a35162..ceb7093362 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.cpp
@@ -9,7 +9,6 @@
 #include <Atom/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.h>
 #include <Atom/RPI.Edit/Material/MaterialTypeSourceData.h>
 #include <Atom/RPI.Edit/Common/AssetUtils.h>
-#include <Atom/RPI.Edit/Common/JsonFileLoadContext.h>
 #include <Atom/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.h>
 #include <AzCore/Serialization/Json/JsonUtils.h>
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyId.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyId.cpp
index 1f5581e417..843fa44dd7 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyId.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyId.cpp
@@ -25,11 +25,29 @@ namespace AZ
             return IsValidName(name.GetStringView());
         }
 
+        bool MaterialPropertyId::CheckIsValidName(AZStd::string_view name)
+        {
+            if (IsValidName(name))
+            {
+                return true;
+            }
+            else
+            {
+                AZ_Error("MaterialPropertyId", false, "'%.*s' is not a valid identifier", AZ_STRING_ARG(name));
+                return false;
+            }
+        }
+
+        bool MaterialPropertyId::CheckIsValidName(const AZ::Name& name)
+        {
+            return CheckIsValidName(name.GetStringView());
+        }
+        
         bool MaterialPropertyId::IsValid() const
         {
             return !m_fullName.IsEmpty();
         }
-
+        
         MaterialPropertyId MaterialPropertyId::Parse(AZStd::string_view fullPropertyId)
         {
             AZStd::vector<AZStd::string> tokens;
@@ -94,14 +112,14 @@ namespace AZ
             {
                 if (!IsValidName(name))
                 {
-                    AZ_Error("MaterialPropertyId", false, "'%s' is not a valid identifier.", name.c_str());
+                    AZ_Error("MaterialPropertyId", false, "Group name '%s' is not a valid identifier.", name.c_str());
                     return;
                 }
             }
             
             if (!IsValidName(propertyName))
             {
-                AZ_Error("MaterialPropertyId", false, "'%.*s' is not a valid identifier.", AZ_STRING_ARG(propertyName));
+                AZ_Error("MaterialPropertyId", false, "Property name '%.*s' is not a valid identifier.", AZ_STRING_ARG(propertyName));
                 return;
             }
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
index fe6ec415a3..91a7092362 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
@@ -14,7 +14,6 @@
 #include <Atom/RPI.Edit/Material/MaterialConverterBus.h>
 
 #include <Atom/RPI.Edit/Common/AssetUtils.h>
-#include <Atom/RPI.Edit/Common/JsonFileLoadContext.h>
 #include <Atom/RPI.Edit/Common/JsonReportingHelper.h>
 #include <Atom/RPI.Edit/Common/JsonUtils.h>
 
@@ -263,7 +262,7 @@ namespace AZ
                 return Failure();
             }
 
-            auto materialTypeLoadOutcome = MaterialUtils::LoadMaterialTypeSourceData(materialTypeSourcePath);
+            auto materialTypeLoadOutcome = MaterialUtils::LoadMaterialTypeSourceData(materialTypeSourcePath, nullptr, sourceDependencies);
             if (!materialTypeLoadOutcome)
             {
                 AZ_Error("MaterialSourceData", false, "Failed to load MaterialTypeSourceData: '%s'.", materialTypeSourcePath.c_str());
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
index 23976cf357..3d40e5551e 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
@@ -17,6 +17,7 @@
 #include <Atom/RPI.Reflect/Material/MaterialTypeAssetCreator.h>
 #include <Atom/RPI.Reflect/Material/MaterialFunctor.h>
 #include <Atom/RPI.Reflect/Material/MaterialVersionUpdate.h>
+#include <Atom/RPI.Reflect/Material/MaterialNameContext.h>
 #include <Atom/RPI.Reflect/Shader/ShaderOptionGroup.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/Json/RegistrationContext.h>
@@ -89,10 +90,12 @@ namespace AZ
                     ;
 
                 serializeContext->Class<PropertyGroup>()
-                    ->Version(1)
+                    ->Version(2)
                     ->Field("name", &PropertyGroup::m_name)
                     ->Field("displayName", &PropertyGroup::m_displayName)
                     ->Field("description", &PropertyGroup::m_description)
+                    ->Field("shaderInputsPrefix", &PropertyGroup::m_shaderInputsPrefix)
+                    ->Field("shaderOptionsPrefix", &PropertyGroup::m_shaderOptionsPrefix)
                     ->Field("properties", &PropertyGroup::m_properties)
                     ->Field("propertyGroups", &PropertyGroup::m_propertyGroups)
                     ->Field("functors", &PropertyGroup::m_materialFunctorSourceData)
@@ -134,30 +137,84 @@ namespace AZ
         
         /*static*/ MaterialTypeSourceData::PropertyGroup* MaterialTypeSourceData::PropertyGroup::AddPropertyGroup(AZStd::string_view name, AZStd::vector<AZStd::unique_ptr<PropertyGroup>>& toPropertyGroupList)
         {
+            if (!MaterialPropertyId::CheckIsValidName(name))
+            {
+                return nullptr;
+            }
+
             auto iter = AZStd::find_if(toPropertyGroupList.begin(), toPropertyGroupList.end(), [name](const AZStd::unique_ptr<PropertyGroup>& existingPropertyGroup)
                 {
                     return existingPropertyGroup->m_name == name;
                 });
-
+            
             if (iter != toPropertyGroupList.end())
             {
                 AZ_Error("Material source data", false, "PropertyGroup named '%.*s' already exists", AZ_STRING_ARG(name));
                 return nullptr;
             }
-            
-            if (!MaterialPropertyId::IsValidName(name))
-            {
-                AZ_Error("Material source data", false, "'%.*s' is not a valid identifier", AZ_STRING_ARG(name));
-                return nullptr;
-            }
 
             toPropertyGroupList.push_back(AZStd::make_unique<PropertyGroup>());
             toPropertyGroupList.back()->m_name = name;
             return toPropertyGroupList.back().get();
         }
+        
+        const AZStd::string& MaterialTypeSourceData::PropertyGroup::GetName() const
+        {
+            return m_name;
+        }
+
+        const AZStd::string& MaterialTypeSourceData::PropertyGroup::GetDisplayName() const
+        {
+            return m_displayName;
+        }
+
+        const AZStd::string& MaterialTypeSourceData::PropertyGroup::GetDescription() const
+        {
+            return m_description;
+        }
+
+        const MaterialTypeSourceData::PropertyList& MaterialTypeSourceData::PropertyGroup::GetProperties() const
+        {
+            return m_properties;
+        }
+
+        const AZStd::string& MaterialTypeSourceData::PropertyGroup::GetShaderInputsPrefix() const
+        {
+            return m_shaderInputsPrefix;
+        }
+
+        const AZStd::string& MaterialTypeSourceData::PropertyGroup::GetShaderOptionsPrefix() const
+        {
+            return m_shaderOptionsPrefix;
+        }
+
+        const AZStd::vector<AZStd::unique_ptr<MaterialTypeSourceData::PropertyGroup>>& MaterialTypeSourceData::PropertyGroup::GetPropertyGroups() const
+        {
+            return m_propertyGroups;
+        }
+
+        const AZStd::vector<Ptr<MaterialFunctorSourceDataHolder>>& MaterialTypeSourceData::PropertyGroup::GetFunctors() const
+        {
+            return m_materialFunctorSourceData;
+        }
+
+        void MaterialTypeSourceData::PropertyGroup::SetDisplayName(AZStd::string_view displayName)
+        {
+            m_displayName = displayName;
+        }
+
+        void MaterialTypeSourceData::PropertyGroup::SetDescription(AZStd::string_view description)
+        {
+            m_description = description;
+        }
 
         MaterialTypeSourceData::PropertyDefinition* MaterialTypeSourceData::PropertyGroup::AddProperty(AZStd::string_view name)
         {
+            if (!MaterialPropertyId::CheckIsValidName(name))
+            {
+                return nullptr;
+            }
+
             auto propertyIter = AZStd::find_if(m_properties.begin(), m_properties.end(), [name](const AZStd::unique_ptr<PropertyDefinition>& existingProperty)
                 {
                     return existingProperty->GetName() == name;    
@@ -180,12 +237,6 @@ namespace AZ
                 return nullptr;
             }
 
-            if (!MaterialPropertyId::IsValidName(name))
-            {
-                AZ_Error("Material source data", false, "'%.*s' is not a valid identifier", AZ_STRING_ARG(name));
-                return nullptr;
-            }
-
             m_properties.emplace_back(AZStd::make_unique<PropertyDefinition>(name));
             return m_properties.back().get();
         }
@@ -265,10 +316,10 @@ namespace AZ
 
                     if (!subPath.empty())
                     {
-                        const MaterialTypeSourceData::PropertyGroup* propertySubset = FindPropertyGroup(subPath, propertyGroup->m_propertyGroups);
-                        if (propertySubset)
+                        const MaterialTypeSourceData::PropertyGroup* propertySubgroup = FindPropertyGroup(subPath, propertyGroup->m_propertyGroups);
+                        if (propertySubgroup)
                         {
-                            return propertySubset;
+                            return propertySubgroup;
                         }
                     }
                 }
@@ -376,21 +427,23 @@ namespace AZ
             return parts;
         }
 
-        bool MaterialTypeSourceData::EnumeratePropertyGroups(const EnumeratePropertyGroupsCallback& callback, AZStd::string propertyNameContext, const AZStd::vector<AZStd::unique_ptr<PropertyGroup>>& inPropertyGroupList) const
+        bool MaterialTypeSourceData::EnumeratePropertyGroups(const EnumeratePropertyGroupsCallback& callback, PropertyGroupStack& propertyGroupStack, const AZStd::vector<AZStd::unique_ptr<PropertyGroup>>& inPropertyGroupList) const
         {
             for (auto& propertyGroup : inPropertyGroupList)
             {
-                if (!callback(propertyNameContext, propertyGroup.get()))
+                propertyGroupStack.push_back(propertyGroup.get());
+
+                if (!callback(propertyGroupStack))
+                {
+                    return false;  // Stop processing
+                }
+                
+                if (!EnumeratePropertyGroups(callback, propertyGroupStack, propertyGroup->m_propertyGroups))
                 {
                     return false; // Stop processing
                 }
 
-                const AZStd::string propertyNameContext2 = propertyNameContext + propertyGroup->m_name + ".";
-
-                if (!EnumeratePropertyGroups(callback, propertyNameContext2, propertyGroup->m_propertyGroups))
-                {
-                    return false; // Stop processing
-                }
+                propertyGroupStack.pop_back();
             }
 
             return true;
@@ -403,25 +456,26 @@ namespace AZ
                 return false;
             }
 
-            return EnumeratePropertyGroups(callback, {}, m_propertyLayout.m_propertyGroups);
+            PropertyGroupStack propertyGroupStack;
+            return EnumeratePropertyGroups(callback, propertyGroupStack, m_propertyLayout.m_propertyGroups);
         }
 
-        bool MaterialTypeSourceData::EnumerateProperties(const EnumeratePropertiesCallback& callback, AZStd::string propertyNameContext, const AZStd::vector<AZStd::unique_ptr<PropertyGroup>>& inPropertyGroupList) const
+        bool MaterialTypeSourceData::EnumerateProperties(const EnumeratePropertiesCallback& callback, MaterialNameContext nameContext, const AZStd::vector<AZStd::unique_ptr<PropertyGroup>>& inPropertyGroupList) const
         {
-
             for (auto& propertyGroup : inPropertyGroupList)
             {
-                const AZStd::string propertyNameContext2 = propertyNameContext + propertyGroup->m_name + ".";
+                MaterialNameContext groupNameContext = nameContext;
+                ExtendNameContext(groupNameContext, *propertyGroup);
 
                 for (auto& property : propertyGroup->m_properties)
                 {
-                    if (!callback(propertyNameContext2, property.get()))
+                    if (!callback(property.get(), groupNameContext))
                     {
                         return false; // Stop processing
                     }
                 }
 
-                if (!EnumerateProperties(callback, propertyNameContext2, propertyGroup->m_propertyGroups))
+                if (!EnumerateProperties(callback, groupNameContext, propertyGroup->m_propertyGroups))
                 {
                     return false; // Stop processing
                 }
@@ -483,7 +537,7 @@ namespace AZ
                 enumValues.push_back(uvNamePair.second);
             }
             
-            EnumerateProperties([&enumValues](const AZStd::string&, const MaterialTypeSourceData::PropertyDefinition* property)
+            EnumerateProperties([&enumValues](const MaterialTypeSourceData::PropertyDefinition* property, const MaterialNameContext&)
                 {
                     if (property->m_dataType == AZ::RPI::MaterialPropertyDataType::Enum && property->m_enumIsUv)
                     {
@@ -529,24 +583,48 @@ namespace AZ
             return groupDefinitions;
         }
 
+        void MaterialTypeSourceData::ExtendNameContext(MaterialNameContext& nameContext, const MaterialTypeSourceData::PropertyGroup& propertyGroup)
+        {
+            nameContext.ExtendPropertyIdContext(propertyGroup.m_name);
+            nameContext.ExtendShaderOptionContext(propertyGroup.m_shaderOptionsPrefix);
+            nameContext.ExtendSrgInputContext(propertyGroup.m_shaderInputsPrefix);
+        }
+        
+        /*static*/ MaterialNameContext MaterialTypeSourceData::MakeMaterialNameContext(const MaterialTypeSourceData::PropertyGroupStack& propertyGroupStack)
+        {
+            MaterialNameContext nameContext;
+            for (auto& group : propertyGroupStack)
+            {
+                ExtendNameContext(nameContext, *group);
+            }
+            return nameContext;
+        }
+
         bool MaterialTypeSourceData::BuildPropertyList(
             const AZStd::string& materialTypeSourceFilePath,
             MaterialTypeAssetCreator& materialTypeAssetCreator,
-            AZStd::vector<AZStd::string>& propertyNameContext,
+            MaterialNameContext materialNameContext,
             const MaterialTypeSourceData::PropertyGroup* propertyGroup) const
-        {            
+        {
+            if (!MaterialPropertyId::CheckIsValidName(propertyGroup->m_name))
+            {
+                return false;
+            }
+
+            ExtendNameContext(materialNameContext, *propertyGroup);
+
             for (const AZStd::unique_ptr<PropertyDefinition>& property : propertyGroup->m_properties)
             {
                 // Register the property...
 
-                MaterialPropertyId propertyId{propertyNameContext, property->GetName()};
-
-                if (!propertyId.IsValid())
+                if (!MaterialPropertyId::CheckIsValidName(property->GetName()))
                 {
-                    // MaterialPropertyId reports an error message
                     return false;
                 }
 
+                Name propertyId{property->GetName()};
+                materialNameContext.ContextualizeProperty(propertyId);
+
                 auto propertyGroupIter = AZStd::find_if(propertyGroup->GetPropertyGroups().begin(), propertyGroup->GetPropertyGroups().end(),
                     [&property](const AZStd::unique_ptr<PropertyGroup>& existingPropertyGroup)
                     {
@@ -572,18 +650,23 @@ namespace AZ
                     {
                     case MaterialPropertyOutputType::ShaderInput:
                     {
-                        materialTypeAssetCreator.ConnectMaterialPropertyToShaderInput(Name{output.m_fieldName});
+                        Name fieldName{output.m_fieldName};
+                        materialNameContext.ContextualizeSrgInput(fieldName);
+                        materialTypeAssetCreator.ConnectMaterialPropertyToShaderInput(fieldName);
                         break;
                     }
                     case MaterialPropertyOutputType::ShaderOption:
                     {
+                        Name fieldName{output.m_fieldName};
+                        materialNameContext.ContextualizeShaderOption(fieldName);
+
                         if (output.m_shaderIndex >= 0)
                         {
-                            materialTypeAssetCreator.ConnectMaterialPropertyToShaderOption(Name{output.m_fieldName}, output.m_shaderIndex);
+                            materialTypeAssetCreator.ConnectMaterialPropertyToShaderOption(fieldName, output.m_shaderIndex);
                         }
                         else
                         {
-                            materialTypeAssetCreator.ConnectMaterialPropertyToShaderOptions(Name{output.m_fieldName});
+                            materialTypeAssetCreator.ConnectMaterialPropertyToShaderOptions(fieldName);
                         }
                         break;
                     }
@@ -650,17 +733,13 @@ namespace AZ
                 }
             }
             
-            for (const AZStd::unique_ptr<PropertyGroup>& propertySubset : propertyGroup->m_propertyGroups)
+            for (const AZStd::unique_ptr<PropertyGroup>& propertySubgroup : propertyGroup->m_propertyGroups)
             {
-                propertyNameContext.push_back(propertySubset->m_name);
-
                 bool success = BuildPropertyList(
                     materialTypeSourceFilePath,
                     materialTypeAssetCreator,
-                    propertyNameContext,
-                    propertySubset.get());
-
-                propertyNameContext.pop_back();
+                    materialNameContext,
+                    propertySubgroup.get());
 
                 if (!success)
                 {
@@ -677,7 +756,8 @@ namespace AZ
                         materialTypeSourceFilePath,
                         materialTypeAssetCreator.GetMaterialPropertiesLayout(),
                         materialTypeAssetCreator.GetMaterialShaderResourceGroupLayout(),
-                        materialTypeAssetCreator.GetShaderCollection()
+                        materialTypeAssetCreator.GetShaderCollection(),
+                        &materialNameContext
                     )
                 );
 
@@ -688,9 +768,10 @@ namespace AZ
                     {
                         materialTypeAssetCreator.AddMaterialFunctor(functor);
 
-                        for (const AZ::Name& optionName : functorData->GetActualSourceData()->GetShaderOptionDependencies())
+                        for (AZ::Name optionName : functorData->GetActualSourceData()->GetShaderOptionDependencies())
                         {
-                            materialTypeAssetCreator.ClaimShaderOptionOwnership(Name{optionName.GetCStr()});
+                            materialNameContext.ContextualizeShaderOption(optionName);
+                            materialTypeAssetCreator.ClaimShaderOptionOwnership(optionName);
                         }
                     }
                 }
@@ -795,11 +876,9 @@ namespace AZ
                 }
             }
             
-            for (const AZStd::unique_ptr<PropertyGroup>& propertyGroup : m_propertyLayout.m_propertyGroups)
+            for (const AZStd::unique_ptr<PropertyGroup>& propertyGroup : m_propertyLayout.m_propertyGroups) 
             {
-                AZStd::vector<AZStd::string> propertyNameContext;
-                propertyNameContext.push_back(propertyGroup->m_name);
-                bool success = BuildPropertyList(materialTypeSourceFilePath, materialTypeAssetCreator, propertyNameContext, propertyGroup.get());
+                bool success = BuildPropertyList(materialTypeSourceFilePath, materialTypeAssetCreator, MaterialNameContext{}, propertyGroup.get());
 
                 if (!success)
                 {
@@ -807,6 +886,8 @@ namespace AZ
                 }
             }
 
+            MaterialNameContext nameContext;
+
             // We cannot create the MaterialFunctor until after all the properties are added because 
             // CreateFunctor() may need to look up properties in the MaterialPropertiesLayout
             for (auto& functorData : m_materialFunctorSourceData)
@@ -816,7 +897,8 @@ namespace AZ
                         materialTypeSourceFilePath,
                         materialTypeAssetCreator.GetMaterialPropertiesLayout(),
                         materialTypeAssetCreator.GetMaterialShaderResourceGroupLayout(),
-                        materialTypeAssetCreator.GetShaderCollection()
+                        materialTypeAssetCreator.GetShaderCollection(),
+                        &nameContext
                     )
                 );
 
@@ -866,6 +948,6 @@ namespace AZ
                 return Failure();
             }
         }
-
+        
     } // namespace RPI
 } // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp
index 3855a0a222..f4653a076e 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp
@@ -15,11 +15,11 @@
 #include <Atom/RPI.Edit/Material/MaterialSourceData.h>
 #include <Atom/RPI.Edit/Material/MaterialTypeSourceData.h>
 #include <Atom/RPI.Edit/Common/JsonReportingHelper.h>
-#include <Atom/RPI.Edit/Common/JsonFileLoadContext.h>
 #include <Atom/RPI.Edit/Common/JsonUtils.h>
 #include <AzCore/Serialization/Json/JsonUtils.h>
 #include <AzCore/Serialization/Json/BaseJsonSerializer.h>
 #include <AzCore/Serialization/Json/JsonSerializationResult.h>
+#include <AzCore/Serialization/Json/JsonImporter.h>
 #include <AzCore/Settings/SettingsRegistry.h>
 
 #include <AzCore/std/string/string.h>
@@ -74,20 +74,38 @@ namespace AZ
                 outResolvedValue = enumValue;
                 return true;
             }
-
-            AZ::Outcome<MaterialTypeSourceData> LoadMaterialTypeSourceData(const AZStd::string& filePath, const rapidjson::Value* document)
+            
+            AZ::Outcome<MaterialTypeSourceData> LoadMaterialTypeSourceData(const AZStd::string& filePath, rapidjson::Document* document, ImportedJsonFiles* importedFiles)
             {
-                AZ::Outcome<rapidjson::Document, AZStd::string> loadOutcome;
+                rapidjson::Document localDocument;
+
                 if (document == nullptr)
                 {
-                    loadOutcome = AZ::JsonSerializationUtils::ReadJsonFile(filePath, AZ::RPI::JsonUtils::DefaultMaxFileSize);
+                    AZ::Outcome<rapidjson::Document, AZStd::string> loadOutcome = AZ::JsonSerializationUtils::ReadJsonFile(filePath, AZ::RPI::JsonUtils::DefaultMaxFileSize);
                     if (!loadOutcome.IsSuccess())
                     {
                         AZ_Error("MaterialUtils", false, "%s", loadOutcome.GetError().c_str());
                         return AZ::Failure();
                     }
 
-                    document = &loadOutcome.GetValue();
+                    localDocument = loadOutcome.TakeValue();
+                    document = &localDocument;
+                }
+                
+                AZ::BaseJsonImporter jsonImporter;
+                AZ::JsonImportSettings importSettings;
+                importSettings.m_importer = &jsonImporter;
+                importSettings.m_loadedJsonPath = filePath;
+                AZ::JsonSerializationResult::ResultCode result = AZ::JsonSerialization::ResolveImports(document->GetObject(), document->GetAllocator(), importSettings);
+                if (result.GetProcessing() != AZ::JsonSerializationResult::Processing::Completed)
+                {
+                    AZ_Error("MaterialUtils", false, "%s", result.ToString(filePath).c_str());
+                    return AZ::Failure();
+                }
+
+                if (importedFiles)
+                {
+                    *importedFiles = importSettings.m_importer->GetImportedFiles();
                 }
 
                 MaterialTypeSourceData materialType;
@@ -97,11 +115,6 @@ namespace AZ
                 JsonReportingHelper reportingHelper;
                 reportingHelper.Attach(settings);
 
-                // This is required by some custom material serializers to support relative path references.
-                JsonFileLoadContext fileLoadContext;
-                fileLoadContext.PushFilePath(filePath);
-                settings.m_metadata.Add(fileLoadContext);
-
                 JsonSerialization::Load(materialType, *document, settings);
                 materialType.ConvertToNewDataFormat();
                 materialType.ResolveUvEnums();
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Material/MaterialSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Material/MaterialSystem.cpp
index b76fa9d676..ae7fe6cc60 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Material/MaterialSystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Material/MaterialSystem.cpp
@@ -27,6 +27,7 @@ namespace AZ
             MaterialAsset::Reflect(context);
             MaterialPropertiesLayout::Reflect(context);
             MaterialFunctor::Reflect(context);
+            MaterialNameContext::Reflect(context);
             LuaMaterialFunctor::Reflect(context);
             ReflectMaterialDynamicMetadata(context);
         }
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp
index 3416b2895d..57bef2c7e5 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp
@@ -434,5 +434,29 @@ namespace AZ
             return m_renderTick;
         }
 
+        void RPISystem::SetApplicationMultisampleState(const RHI::MultisampleState& multisampleState)
+        {
+            m_multisampleState = multisampleState;
+
+            bool isNonMsaaPipeline = (m_multisampleState.m_samples == 1);
+            const char* supervariantName = isNonMsaaPipeline ? AZ::RPI::NoMsaaSupervariantName : "";
+            AZ::RPI::ShaderSystemInterface::Get()->SetSupervariantName(AZ::Name(supervariantName));
+
+            // reinitialize pipelines for all scenes
+            for (auto& scene : m_scenes)
+            {
+                for (auto& renderPipeline : scene->GetRenderPipelines())
+                {
+                    renderPipeline->GetRenderSettings().m_multisampleState = multisampleState;
+                    renderPipeline->SetPassNeedsRecreate();
+                }
+            }
+        }
+
+        const RHI::MultisampleState& RPISystem::GetApplicationMultisampleState() const
+        {
+            return m_multisampleState;
+        }
+
     } //namespace RPI
 } //namespace AZ
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp
index 8a6cc80cfe..a92d0e5ee8 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp
@@ -443,6 +443,61 @@ namespace AZ
             return GetComputeShaderNumThreads(shaderAsset, &dispatchDirect.m_threadsPerGroupX, &dispatchDirect.m_threadsPerGroupY, &dispatchDirect.m_threadsPerGroupZ);
         }
 
+        bool IsImageDataPixelAPISupported(AZ::RHI::Format format)
+        {
+            switch (format)
+            {
+            // Float types
+            case AZ::RHI::Format::R8_UNORM:
+            case AZ::RHI::Format::A8_UNORM:
+            case AZ::RHI::Format::R8G8_UNORM:
+            case AZ::RHI::Format::R8G8B8A8_UNORM:
+            case AZ::RHI::Format::R8_SNORM:
+            case AZ::RHI::Format::R8G8_SNORM:
+            case AZ::RHI::Format::R8G8B8A8_SNORM:
+            case AZ::RHI::Format::D16_UNORM:
+            case AZ::RHI::Format::R16_UNORM:
+            case AZ::RHI::Format::R16G16_UNORM:
+            case AZ::RHI::Format::R16G16B16A16_UNORM:
+            case AZ::RHI::Format::R16_SNORM:
+            case AZ::RHI::Format::R16G16_SNORM:
+            case AZ::RHI::Format::R16G16B16A16_SNORM:
+            case AZ::RHI::Format::R16_FLOAT:
+            case AZ::RHI::Format::R16G16_FLOAT:
+            case AZ::RHI::Format::R16G16B16A16_FLOAT:
+            case AZ::RHI::Format::D32_FLOAT:
+            case AZ::RHI::Format::R32_FLOAT:
+            case AZ::RHI::Format::R32G32_FLOAT:
+            case AZ::RHI::Format::R32G32B32_FLOAT:
+            case AZ::RHI::Format::R32G32B32A32_FLOAT:
+            // Unsigned integer types
+            case AZ::RHI::Format::R8_UINT:
+            case AZ::RHI::Format::R8G8_UINT:
+            case AZ::RHI::Format::R8G8B8A8_UINT:
+            case AZ::RHI::Format::R16_UINT:
+            case AZ::RHI::Format::R16G16_UINT:
+            case AZ::RHI::Format::R16G16B16A16_UINT:
+            case AZ::RHI::Format::R32_UINT:
+            case AZ::RHI::Format::R32G32_UINT:
+            case AZ::RHI::Format::R32G32B32_UINT:
+            case AZ::RHI::Format::R32G32B32A32_UINT:
+            // Signed integer types
+            case AZ::RHI::Format::R8_SINT:
+            case AZ::RHI::Format::R8G8_SINT:
+            case AZ::RHI::Format::R8G8B8A8_SINT:
+            case AZ::RHI::Format::R16_SINT:
+            case AZ::RHI::Format::R16G16_SINT:
+            case AZ::RHI::Format::R16G16B16A16_SINT:
+            case AZ::RHI::Format::R32_SINT:
+            case AZ::RHI::Format::R32G32_SINT:
+            case AZ::RHI::Format::R32G32B32_SINT:
+            case AZ::RHI::Format::R32G32B32A32_SINT:
+                return true;
+            }
+
+            return false;
+        }
+
         template<>
         float GetImageDataPixelValue<float>(AZStd::span<const uint8_t> imageData, const AZ::RHI::ImageDescriptor& imageDescriptor, uint32_t x, uint32_t y, uint32_t componentIndex)
         {
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp
index 4212583e60..7eedb82ecc 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp
@@ -29,9 +29,7 @@ namespace AZ
                 serializeContext->Class<LuaMaterialFunctor, RPI::MaterialFunctor>()
                     ->Version(1)
                     ->Field("scriptAsset", &LuaMaterialFunctor::m_scriptAsset)
-                    ->Field("propertyNamePrefix", &LuaMaterialFunctor::m_propertyNamePrefix)
-                    ->Field("srgNamePrefix", &LuaMaterialFunctor::m_srgNamePrefix)
-                    ->Field("optionsNamePrefix", &LuaMaterialFunctor::m_optionsNamePrefix)
+                    ->Field("materialNameContext", &LuaMaterialFunctor::m_materialNameContext)
                     ;
             }
         }
@@ -127,7 +125,7 @@ namespace AZ
 
             if (m_scriptStatus == ScriptStatus::Ready)
             {
-                LuaMaterialFunctorRuntimeContext luaContext{&context, &GetMaterialPropertyDependencies(), m_propertyNamePrefix, m_srgNamePrefix, m_optionsNamePrefix};
+                LuaMaterialFunctorRuntimeContext luaContext{&context, &GetMaterialPropertyDependencies(), m_materialNameContext};
                 AZ::ScriptDataContext call;
                 if (m_scriptContext->Call("Process", call))
                 {
@@ -145,7 +143,7 @@ namespace AZ
 
             if (m_scriptStatus == ScriptStatus::Ready)
             {
-                LuaMaterialFunctorEditorContext luaContext{&context, &GetMaterialPropertyDependencies(), m_propertyNamePrefix, m_srgNamePrefix, m_optionsNamePrefix};
+                LuaMaterialFunctorEditorContext luaContext{&context, &GetMaterialPropertyDependencies(), m_materialNameContext};
                 AZ::ScriptDataContext call;
                 if (m_scriptContext->Call("ProcessEditor", call))
                 {
@@ -157,27 +155,19 @@ namespace AZ
 
         LuaMaterialFunctorCommonContext::LuaMaterialFunctorCommonContext(MaterialFunctor::RuntimeContext* runtimeContextImpl,
             const MaterialPropertyFlags* materialPropertyDependencies,
-            const AZStd::string& propertyNamePrefix,
-            const AZStd::string& srgNamePrefix,
-            const AZStd::string& optionsNamePrefix)
+            const MaterialNameContext& materialNameContext)
             : m_runtimeContextImpl(runtimeContextImpl)
             , m_materialPropertyDependencies(materialPropertyDependencies)
-            , m_propertyNamePrefix(propertyNamePrefix)
-            , m_srgNamePrefix(srgNamePrefix)
-            , m_optionsNamePrefix(optionsNamePrefix)
+            , m_materialNameContext(materialNameContext)
         {
         }
 
         LuaMaterialFunctorCommonContext::LuaMaterialFunctorCommonContext(MaterialFunctor::EditorContext* editorContextImpl,
             const MaterialPropertyFlags* materialPropertyDependencies,
-            const AZStd::string& propertyNamePrefix,
-            const AZStd::string& srgNamePrefix,
-            const AZStd::string& optionsNamePrefix)
+            const MaterialNameContext& materialNameContext)
             : m_editorContextImpl(editorContextImpl)
             , m_materialPropertyDependencies(materialPropertyDependencies)
-            , m_propertyNamePrefix(propertyNamePrefix)
-            , m_srgNamePrefix(srgNamePrefix)
-            , m_optionsNamePrefix(optionsNamePrefix)
+            , m_materialNameContext(materialNameContext)
         {
         }
         
@@ -256,7 +246,8 @@ namespace AZ
         {
             MaterialPropertyIndex propertyIndex;
 
-            Name propertyFullName{m_propertyNamePrefix + name};
+            Name propertyFullName{name};
+            m_materialNameContext.ContextualizeProperty(propertyFullName);
             
             propertyIndex = GetMaterialPropertiesLayout()->FindPropertyIndex(propertyFullName);
 
@@ -361,10 +352,8 @@ namespace AZ
 
         LuaMaterialFunctorRuntimeContext::LuaMaterialFunctorRuntimeContext(MaterialFunctor::RuntimeContext* runtimeContextImpl,
             const MaterialPropertyFlags* materialPropertyDependencies,
-            const AZStd::string& propertyNamePrefix,
-            const AZStd::string& srgNamePrefix,
-            const AZStd::string& optionsNamePrefix)
-            : LuaMaterialFunctorCommonContext(runtimeContextImpl, materialPropertyDependencies, propertyNamePrefix, srgNamePrefix, optionsNamePrefix)
+            const MaterialNameContext& materialNameContext)
+            : LuaMaterialFunctorCommonContext(runtimeContextImpl, materialPropertyDependencies, materialNameContext)
             , m_runtimeContextImpl(runtimeContextImpl)
         {
         }
@@ -379,7 +368,8 @@ namespace AZ
         {
             bool didSetOne = false;
 
-            Name fullOptionName{m_optionsNamePrefix + name};
+            Name fullOptionName{name};
+            m_materialNameContext.ContextualizeShaderOption(fullOptionName);
 
             for (AZStd::size_t i = 0; i < m_runtimeContextImpl->m_shaderCollection->size(); ++i)
             {
@@ -429,7 +419,8 @@ namespace AZ
 
         RHI::ShaderInputConstantIndex LuaMaterialFunctorRuntimeContext::GetShaderInputConstantIndex(const char* name, const char* functionName) const
         {
-            Name fullInputName{m_srgNamePrefix + name};
+            Name fullInputName{name};
+            m_materialNameContext.ContextualizeSrgInput(fullInputName);
 
             RHI::ShaderInputConstantIndex index = m_runtimeContextImpl->m_shaderResourceGroup->FindShaderInputConstantIndex(fullInputName);
 
@@ -524,10 +515,8 @@ namespace AZ
 
         LuaMaterialFunctorEditorContext::LuaMaterialFunctorEditorContext(MaterialFunctor::EditorContext* editorContextImpl,
             const MaterialPropertyFlags* materialPropertyDependencies,
-            const AZStd::string& propertyNamePrefix,
-            const AZStd::string& srgNamePrefix,
-            const AZStd::string& optionsNamePrefix)
-            : LuaMaterialFunctorCommonContext(editorContextImpl, materialPropertyDependencies, propertyNamePrefix, srgNamePrefix, optionsNamePrefix)
+            const MaterialNameContext& materialNameContext)
+            : LuaMaterialFunctorCommonContext(editorContextImpl, materialPropertyDependencies, materialNameContext)
             , m_editorContextImpl(editorContextImpl)
         {
         }
@@ -598,7 +587,9 @@ namespace AZ
         {
             if (m_editorContextImpl)
             {
-                return m_editorContextImpl->SetMaterialPropertyGroupVisibility(Name{m_propertyNamePrefix + name}, visibility);
+                Name fullName{name};
+                m_materialNameContext.ContextualizeProperty(fullName);
+                return m_editorContextImpl->SetMaterialPropertyGroupVisibility(fullName, visibility);
             }
             return false;
         }
@@ -607,7 +598,9 @@ namespace AZ
         {
             if (m_editorContextImpl)
             {
-                return m_editorContextImpl->SetMaterialPropertyVisibility(Name{m_propertyNamePrefix + name}, visibility);
+                Name fullName{name};
+                m_materialNameContext.ContextualizeProperty(fullName);
+                return m_editorContextImpl->SetMaterialPropertyVisibility(fullName, visibility);
             }
             return false;
         }
@@ -616,7 +609,9 @@ namespace AZ
         {
             if (m_editorContextImpl)
             {
-                return m_editorContextImpl->SetMaterialPropertyDescription(Name{m_propertyNamePrefix + name}, description);
+                Name fullName{name};
+                m_materialNameContext.ContextualizeProperty(fullName);
+                return m_editorContextImpl->SetMaterialPropertyDescription(fullName, description);
             }
             return false;
         }
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialFunctor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialFunctor.cpp
index 52b6349ca0..3d280b8d60 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialFunctor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialFunctor.cpp
@@ -155,9 +155,9 @@ namespace AZ
             , m_materialPropertyDependencies(materialPropertyDependencies)
         {}
 
-        const MaterialPropertyDynamicMetadata* MaterialFunctor::EditorContext::GetMaterialPropertyMetadata(const Name& propertyName) const
+        const MaterialPropertyDynamicMetadata* MaterialFunctor::EditorContext::GetMaterialPropertyMetadata(const Name& propertyId) const
         {
-            return QueryMaterialPropertyMetadata(propertyName);
+            return QueryMaterialPropertyMetadata(propertyId);
         }
 
         const MaterialPropertyDynamicMetadata* MaterialFunctor::EditorContext::GetMaterialPropertyMetadata(const MaterialPropertyIndex& index) const
@@ -166,9 +166,9 @@ namespace AZ
             return GetMaterialPropertyMetadata(name);
         }
         
-        const MaterialPropertyGroupDynamicMetadata* MaterialFunctor::EditorContext::GetMaterialPropertyGroupMetadata(const Name& propertyName) const
+        const MaterialPropertyGroupDynamicMetadata* MaterialFunctor::EditorContext::GetMaterialPropertyGroupMetadata(const Name& propertyId) const
         {
-            return QueryMaterialPropertyGroupMetadata(propertyName);
+            return QueryMaterialPropertyGroupMetadata(propertyId);
         }
         
         bool MaterialFunctor::EditorContext::SetMaterialPropertyGroupVisibility(const Name& propertyGroupName, MaterialPropertyGroupVisibility visibility)
@@ -188,9 +188,9 @@ namespace AZ
             return true;
         }
 
-        bool MaterialFunctor::EditorContext::SetMaterialPropertyVisibility(const Name& propertyName, MaterialPropertyVisibility visibility)
+        bool MaterialFunctor::EditorContext::SetMaterialPropertyVisibility(const Name& propertyId, MaterialPropertyVisibility visibility)
         {
-            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName);
+            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
             if (!metadata)
             {
                 return false;
@@ -199,7 +199,7 @@ namespace AZ
             if (metadata->m_visibility != visibility)
             {
                 metadata->m_visibility = visibility;
-                m_updatedPropertiesOut.insert(propertyName);
+                m_updatedPropertiesOut.insert(propertyId);
             }
 
             return true;
@@ -211,9 +211,9 @@ namespace AZ
             return SetMaterialPropertyVisibility(name, visibility);
         }
 
-        bool MaterialFunctor::EditorContext::SetMaterialPropertyDescription(const Name& propertyName, AZStd::string description)
+        bool MaterialFunctor::EditorContext::SetMaterialPropertyDescription(const Name& propertyId, AZStd::string description)
         {
-            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName);
+            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
             if (!metadata)
             {
                 return false;
@@ -222,7 +222,7 @@ namespace AZ
             if (metadata->m_description != description)
             {
                 metadata->m_description = description;
-                m_updatedPropertiesOut.insert(propertyName);
+                m_updatedPropertiesOut.insert(propertyId);
             }
 
             return true;
@@ -234,9 +234,9 @@ namespace AZ
             return SetMaterialPropertyDescription(name, description);
         }
 
-        bool MaterialFunctor::EditorContext::SetMaterialPropertyMinValue(const Name& propertyName, const MaterialPropertyValue& min)
+        bool MaterialFunctor::EditorContext::SetMaterialPropertyMinValue(const Name& propertyId, const MaterialPropertyValue& min)
         {
-            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName);
+            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
             if (!metadata)
             {
                 return false;
@@ -245,7 +245,7 @@ namespace AZ
             if(metadata->m_propertyRange.m_min != min)
             {
                 metadata->m_propertyRange.m_min = min;
-                m_updatedPropertiesOut.insert(propertyName);
+                m_updatedPropertiesOut.insert(propertyId);
             }
 
             return true;
@@ -257,9 +257,9 @@ namespace AZ
             return SetMaterialPropertyMinValue(name, min);
         }
 
-        bool MaterialFunctor::EditorContext::SetMaterialPropertyMaxValue(const Name& propertyName, const MaterialPropertyValue& max)
+        bool MaterialFunctor::EditorContext::SetMaterialPropertyMaxValue(const Name& propertyId, const MaterialPropertyValue& max)
         {
-            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName);
+            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
             if (!metadata)
             {
                 return false;
@@ -268,7 +268,7 @@ namespace AZ
             if (metadata->m_propertyRange.m_max != max)
             {
                 metadata->m_propertyRange.m_max = max;
-                m_updatedPropertiesOut.insert(propertyName);
+                m_updatedPropertiesOut.insert(propertyId);
             }
 
             return true;
@@ -280,9 +280,9 @@ namespace AZ
             return SetMaterialPropertyMaxValue(name, max);
         }
 
-        bool MaterialFunctor::EditorContext::SetMaterialPropertySoftMinValue(const Name& propertyName, const MaterialPropertyValue& min)
+        bool MaterialFunctor::EditorContext::SetMaterialPropertySoftMinValue(const Name& propertyId, const MaterialPropertyValue& min)
         {
-            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName);
+            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
             if (!metadata)
             {
                 return false;
@@ -291,7 +291,7 @@ namespace AZ
             if (metadata->m_propertyRange.m_softMin != min)
             {
                 metadata->m_propertyRange.m_softMin = min;
-                m_updatedPropertiesOut.insert(propertyName);
+                m_updatedPropertiesOut.insert(propertyId);
             }
 
             return true;
@@ -303,9 +303,9 @@ namespace AZ
             return SetMaterialPropertySoftMinValue(name, min);
         }
 
-        bool MaterialFunctor::EditorContext::SetMaterialPropertySoftMaxValue(const Name& propertyName, const MaterialPropertyValue& max)
+        bool MaterialFunctor::EditorContext::SetMaterialPropertySoftMaxValue(const Name& propertyId, const MaterialPropertyValue& max)
         {
-            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyName);
+            MaterialPropertyDynamicMetadata* metadata = QueryMaterialPropertyMetadata(propertyId);
             if (!metadata)
             {
                 return false;
@@ -314,7 +314,7 @@ namespace AZ
             if (metadata->m_propertyRange.m_softMax != max)
             {
                 metadata->m_propertyRange.m_softMax = max;
-                m_updatedPropertiesOut.insert(propertyName);
+                m_updatedPropertiesOut.insert(propertyId);
             }
 
             return true;
@@ -326,24 +326,24 @@ namespace AZ
             return SetMaterialPropertySoftMaxValue(name, max);
         }
 
-        MaterialPropertyDynamicMetadata* MaterialFunctor::EditorContext::QueryMaterialPropertyMetadata(const Name& propertyName) const
+        MaterialPropertyDynamicMetadata* MaterialFunctor::EditorContext::QueryMaterialPropertyMetadata(const Name& propertyId) const
         {
-            auto it = m_propertyMetadata.find(propertyName);
+            auto it = m_propertyMetadata.find(propertyId);
             if (it == m_propertyMetadata.end())
             {
-                AZ_Error("MaterialFunctor", false, "Couldn't find metadata for material property: %s.", propertyName.GetCStr());
+                AZ_Error("MaterialFunctor", false, "Couldn't find metadata for material property: %s.", propertyId.GetCStr());
                 return nullptr;
             }
 
             return &it->second;
         }
         
-        MaterialPropertyGroupDynamicMetadata* MaterialFunctor::EditorContext::QueryMaterialPropertyGroupMetadata(const Name& propertyGroupName) const
+        MaterialPropertyGroupDynamicMetadata* MaterialFunctor::EditorContext::QueryMaterialPropertyGroupMetadata(const Name& propertyGroupId) const
         {
-            auto it = m_propertyGroupMetadata.find(propertyGroupName);
+            auto it = m_propertyGroupMetadata.find(propertyGroupId);
             if (it == m_propertyGroupMetadata.end())
             {
-                AZ_Error("MaterialFunctor", false, "Couldn't find metadata for material property group: %s.", propertyGroupName.GetCStr());
+                AZ_Error("MaterialFunctor", false, "Couldn't find metadata for material property group: %s.", propertyGroupId.GetCStr());
                 return nullptr;
             }
 
@@ -357,20 +357,20 @@ namespace AZ
         }
 
         // explicit template instantiation
-        template const bool&     MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<bool>     (const Name& propertyName) const;
-        template const int32_t&  MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<int32_t>  (const Name& propertyName) const;
-        template const uint32_t& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<uint32_t> (const Name& propertyName) const;
-        template const float&    MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<float>    (const Name& propertyName) const;
-        template const Vector2&  MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector2>  (const Name& propertyName) const;
-        template const Vector3&  MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector3>  (const Name& propertyName) const;
-        template const Vector4&  MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector4>  (const Name& propertyName) const;
-        template const Color&    MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Color>    (const Name& propertyName) const;
-        template const Data::Instance<Image>& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Data::Instance<Image>>(const Name& propertyName) const;
+        template const bool&     MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<bool>     (const Name& propertyId) const;
+        template const int32_t&  MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<int32_t>  (const Name& propertyId) const;
+        template const uint32_t& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<uint32_t> (const Name& propertyId) const;
+        template const float&    MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<float>    (const Name& propertyId) const;
+        template const Vector2&  MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector2>  (const Name& propertyId) const;
+        template const Vector3&  MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector3>  (const Name& propertyId) const;
+        template const Vector4&  MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Vector4>  (const Name& propertyId) const;
+        template const Color&    MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Color>    (const Name& propertyId) const;
+        template const Data::Instance<Image>& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue<Data::Instance<Image>>(const Name& propertyId) const;
 
         template<typename Type>
-        const Type& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue(const Name& propertyName) const
+        const Type& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue(const Name& propertyId) const
         {
-            return GetMaterialPropertyValue(propertyName).GetValue<Type>();
+            return GetMaterialPropertyValue(propertyId).GetValue<Type>();
         }
 
         // explicit template instantiation
@@ -391,19 +391,19 @@ namespace AZ
         }
 
         // explicit template instantiation
-        template const bool&     MaterialFunctor::EditorContext::GetMaterialPropertyValue<bool>     (const Name& propertyName) const;
-        template const int32_t&  MaterialFunctor::EditorContext::GetMaterialPropertyValue<int32_t>  (const Name& propertyName) const;
-        template const uint32_t& MaterialFunctor::EditorContext::GetMaterialPropertyValue<uint32_t> (const Name& propertyName) const;
-        template const float&    MaterialFunctor::EditorContext::GetMaterialPropertyValue<float>    (const Name& propertyName) const;
-        template const Vector2&  MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector2>  (const Name& propertyName) const;
-        template const Vector3&  MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector3>  (const Name& propertyName) const;
-        template const Vector4&  MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector4>  (const Name& propertyName) const;
-        template const Color&    MaterialFunctor::EditorContext::GetMaterialPropertyValue<Color>    (const Name& propertyName) const;
+        template const bool&     MaterialFunctor::EditorContext::GetMaterialPropertyValue<bool>     (const Name& propertyId) const;
+        template const int32_t&  MaterialFunctor::EditorContext::GetMaterialPropertyValue<int32_t>  (const Name& propertyId) const;
+        template const uint32_t& MaterialFunctor::EditorContext::GetMaterialPropertyValue<uint32_t> (const Name& propertyId) const;
+        template const float&    MaterialFunctor::EditorContext::GetMaterialPropertyValue<float>    (const Name& propertyId) const;
+        template const Vector2&  MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector2>  (const Name& propertyId) const;
+        template const Vector3&  MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector3>  (const Name& propertyId) const;
+        template const Vector4&  MaterialFunctor::EditorContext::GetMaterialPropertyValue<Vector4>  (const Name& propertyId) const;
+        template const Color&    MaterialFunctor::EditorContext::GetMaterialPropertyValue<Color>    (const Name& propertyId) const;
 
         template<typename Type>
-        const Type& MaterialFunctor::EditorContext::GetMaterialPropertyValue(const Name& propertyName) const
+        const Type& MaterialFunctor::EditorContext::GetMaterialPropertyValue(const Name& propertyId) const
         {
-            return GetMaterialPropertyValue(propertyName).GetValue<Type>();
+            return GetMaterialPropertyValue(propertyId).GetValue<Type>();
         }
 
         // explicit template instantiation
@@ -436,9 +436,9 @@ namespace AZ
             return m_materialPropertyValues[index.GetIndex()];
         }
 
-        const MaterialPropertyValue& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue(const Name& propertyName) const
+        const MaterialPropertyValue& MaterialFunctor::RuntimeContext::GetMaterialPropertyValue(const Name& propertyId) const
         {
-            MaterialPropertyIndex index = m_materialPropertiesLayout->FindPropertyIndex(propertyName);
+            MaterialPropertyIndex index = m_materialPropertiesLayout->FindPropertyIndex(propertyId);
             return GetMaterialPropertyValue(index);
         }
 
@@ -449,9 +449,9 @@ namespace AZ
             return m_materialPropertyValues[index.GetIndex()];
         }
 
-        const MaterialPropertyValue& MaterialFunctor::EditorContext::GetMaterialPropertyValue(const Name& propertyName) const
+        const MaterialPropertyValue& MaterialFunctor::EditorContext::GetMaterialPropertyValue(const Name& propertyId) const
         {
-            MaterialPropertyIndex index = m_materialPropertiesLayout->FindPropertyIndex(propertyName);
+            MaterialPropertyIndex index = m_materialPropertiesLayout->FindPropertyIndex(propertyId);
             return GetMaterialPropertyValue(index);
         }
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialNameContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialNameContext.cpp
new file mode 100644
index 0000000000..9ef97c8785
--- /dev/null
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialNameContext.cpp
@@ -0,0 +1,136 @@
+/*
+ * 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/RPI.Reflect/Material/MaterialNameContext.h>
+#include <AzCore/RTTI/ReflectContext.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Name/Name.h>
+
+namespace AZ
+{
+    namespace RPI
+    {
+        void MaterialNameContext::Reflect(ReflectContext* context)
+        {
+            if (auto* serializeContext = azrtti_cast<SerializeContext*>(context))
+            {
+                serializeContext->Class<MaterialNameContext>()
+                    ->Version(1) 
+                    ->Field("propertyIdContext", &MaterialNameContext::m_propertyIdContext)
+                    ->Field("srgInputNameContext", &MaterialNameContext::m_srgInputNameContext)
+                    ->Field("shaderOptionNameContext", &MaterialNameContext::m_shaderOptionNameContext)
+                    ;
+            }
+        }
+        
+        bool MaterialNameContext::IsDefault() const
+        {
+            return m_propertyIdContext.empty() && m_srgInputNameContext.empty() && m_shaderOptionNameContext.empty();
+        }
+        
+        void MaterialNameContext::ExtendPropertyIdContext(AZStd::string_view nameContext, bool insertDelimiter)
+        {
+            m_propertyIdContext += nameContext;
+            if (insertDelimiter && !nameContext.empty() && !nameContext.ends_with("."))
+            {
+                m_propertyIdContext += ".";
+            }
+        }
+
+        void MaterialNameContext::ExtendSrgInputContext(AZStd::string_view nameContext)
+        {
+            m_srgInputNameContext += nameContext;
+        }
+
+        void MaterialNameContext::ExtendShaderOptionContext(AZStd::string_view nameContext)
+        {
+            m_shaderOptionNameContext += nameContext;
+        }
+
+        bool MaterialNameContext::ContextualizeProperty(Name& propertyName) const
+        {
+            if (m_propertyIdContext.empty())
+            {
+                return false;
+            }
+
+            propertyName = m_propertyIdContext + propertyName.GetCStr();
+            return true;
+        }
+
+        bool MaterialNameContext::ContextualizeSrgInput(Name& srgInputName) const
+        {
+            if (m_srgInputNameContext.empty())
+            {
+                return false;
+            }
+
+            srgInputName = m_srgInputNameContext + srgInputName.GetCStr();
+            return true;
+        }
+
+        bool MaterialNameContext::ContextualizeShaderOption(Name& shaderOptionName) const
+        {
+            if (m_shaderOptionNameContext.empty())
+            {
+                return false;
+            }
+
+            shaderOptionName = m_shaderOptionNameContext + shaderOptionName.GetCStr();
+            return true;
+        }
+        
+        bool MaterialNameContext::ContextualizeProperty(AZStd::string& propertyName) const
+        {
+            if (m_propertyIdContext.empty())
+            {
+                return false;
+            }
+
+            propertyName = m_propertyIdContext + propertyName;
+            return true;
+        }
+
+        bool MaterialNameContext::ContextualizeSrgInput(AZStd::string& srgInputName) const
+        {
+            if (m_srgInputNameContext.empty())
+            {
+                return false;
+            }
+
+            srgInputName = m_srgInputNameContext + srgInputName;
+            return true;
+        }
+
+        bool MaterialNameContext::ContextualizeShaderOption(AZStd::string& shaderOptionName) const
+        {
+            if (m_shaderOptionNameContext.empty())
+            {
+                return false;
+            }
+
+            shaderOptionName = m_shaderOptionNameContext + shaderOptionName;
+            return true;
+        }
+        
+        bool MaterialNameContext::HasContextForProperties() const
+        {
+            return !m_propertyIdContext.empty();
+        }
+
+        bool MaterialNameContext::HasContextForSrgInputs() const
+        {
+            return !m_srgInputNameContext.empty();
+        }
+
+        bool MaterialNameContext::HasContextForShaderOptions() const
+        {
+            return !m_shaderOptionNameContext.empty();
+        }
+    } // namespace RPI
+} // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp
index 6780763d7c..5685dfece2 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp
@@ -15,6 +15,7 @@
 
 #include <AzCore/RTTI/ReflectContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
 
 namespace AZ
 {
@@ -35,6 +36,15 @@ namespace AZ
                     ->Field("MaterialSlots", &ModelAsset::m_materialSlots)
                     ->Field("LodAssets", &ModelAsset::m_lodAssets)
                     ;
+
+                // Note: This class needs to have edit context reflection so PropertyAssetCtrl::OnEditButtonClicked
+                //       can open the asset with the preferred asset editor (Scene Settings).
+                if (auto* editContext = serializeContext->GetEditContext())
+                {
+                    editContext->Class<ModelAsset>("Model Asset", "")
+                        ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                        ;
+                }
             }
         }
 
diff --git a/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.h b/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.h
index 56d537f236..94616b23e9 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/JsonTestUtils.h
@@ -16,7 +16,6 @@
 #include <AzCore/IO/ByteContainerStream.h>
 #include <AzCore/JSON/prettywriter.h>
 #include <AzCore/Serialization/Json/JsonUtils.h>
-#include <Atom/RPI.Edit/Common/JsonFileLoadContext.h>
 
 namespace UnitTest
 {
@@ -46,17 +45,12 @@ namespace UnitTest
 
     //! Uses JsonSerialization to load JSON data into a reflected object
     template<typename T>
-    JsonTestResult LoadTestDataFromJson(T& object, rapidjson::Value& json, AZ::RPI::JsonFileLoadContext* jsonFileLoadContext = nullptr)
+    JsonTestResult LoadTestDataFromJson(T& object, rapidjson::Value& json)
     {
         JsonTestResult result;
 
         AZ::JsonDeserializerSettings settings;
 
-        if (jsonFileLoadContext)
-        {
-            settings.m_metadata.Add(*jsonFileLoadContext);
-        }
-        
         settings.m_reporting = [&result](AZStd::string_view message, AZ::JsonSerializationResult::ResultCode resultCode, AZStd::string_view path)
         {
             JsonTestResult::Report report;
@@ -74,14 +68,14 @@ namespace UnitTest
 
     //! Uses JsonSerialization to load JSON data from a string into a reflected object
     template<typename T>
-    JsonTestResult LoadTestDataFromJson(T& object, AZStd::string_view jsonText, AZ::RPI::JsonFileLoadContext* jsonFileLoadContext = nullptr)
+    JsonTestResult LoadTestDataFromJson(T& object, AZStd::string_view jsonText)
     {
         auto parseResult = AZ::JsonSerializationUtils::ReadJsonString(jsonText);
 
         EXPECT_TRUE(parseResult.IsSuccess()) << parseResult.GetError().c_str();
         if (parseResult.IsSuccess())
         {
-            return LoadTestDataFromJson(object, parseResult.GetValue(), jsonFileLoadContext);
+            return LoadTestDataFromJson(object, parseResult.GetValue());
         }
         else
         {
diff --git a/Gems/Atom/RPI/Code/Tests/Material/LuaMaterialFunctorTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/LuaMaterialFunctorTests.cpp
index 15f66916a6..1ed920ebc0 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/LuaMaterialFunctorTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/LuaMaterialFunctorTests.cpp
@@ -35,11 +35,14 @@ namespace UnitTest
             LuaMaterialFunctorSourceData functorSourceData;
             functorSourceData.m_luaScript = script;
 
+            MaterialNameContext nameContext;
+
             MaterialFunctorSourceData::RuntimeContext createFunctorContext{
                 "Dummy.materialtype",
                 materialTypeCreator.GetMaterialPropertiesLayout(),
                 materialTypeCreator.GetMaterialShaderResourceGroupLayout(),
-                materialTypeCreator.GetShaderCollection()
+                materialTypeCreator.GetShaderCollection(),
+                &nameContext
             };
 
             MaterialFunctorSourceData::FunctorResult result = functorSourceData.CreateFunctor(createFunctorContext);
diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorTests.cpp
index 08049f3393..dbf911b09a 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialFunctorTests.cpp
@@ -15,6 +15,8 @@
 #include <Atom/RPI.Reflect/Material/MaterialTypeAsset.h>
 #include <Atom/RPI.Reflect/Material/MaterialTypeAssetCreator.h>
 #include <Atom/RPI.Reflect/Material/MaterialAssetCreator.h>
+#include <Atom/RPI.Reflect/Material/MaterialNameContext.h>
+#include <Atom/RPI.Reflect/Shader/ShaderAssetCreator.h>
 #include <Atom/RPI.Edit/Material/MaterialFunctorSourceData.h>
 #include <Atom/RPI.Public/Material/Material.h>
 #include <Material/MaterialAssetTestUtils.h>
@@ -256,12 +258,15 @@ namespace UnitTest
         functorSourceData.m_registedPropertyName = registedPropertyName.GetStringView();
         functorSourceData.m_unregistedPropertyName = unregistedPropertyName.GetStringView();
 
+        MaterialNameContext nameContext;
+
         MaterialFunctorSourceData::FunctorResult result = functorSourceData.CreateFunctor(
             MaterialFunctorSourceData::RuntimeContext(
                 "Dummy.materialtype",
                 materialTypeCreator.GetMaterialPropertiesLayout(),
                 materialTypeCreator.GetMaterialShaderResourceGroupLayout(),
-                materialTypeCreator.GetShaderCollection()
+                materialTypeCreator.GetShaderCollection(),
+                &nameContext
             )
         );
 
@@ -310,4 +315,169 @@ namespace UnitTest
         m_testMaterialTypeAsset = {};
         m_testMaterialAsset = {};
     }
+    
+    TEST_F(MaterialFunctorTests, UseNameContextInFunctorSourceData_PropertyLookup)
+    {
+        class FindPropertyIndexTestFunctor : public MaterialFunctor
+        {
+        public:
+            MaterialPropertyIndex m_foundIndex;
+        };
+
+        class FindPropertyIndexTestFunctorSourceData : public MaterialFunctorSourceData
+        {
+        public:
+            Name m_materialPropertyName;
+
+            using MaterialFunctorSourceData::CreateFunctor;
+            FunctorResult CreateFunctor(const RuntimeContext& runtimeContext) const override
+            {
+                RPI::Ptr<FindPropertyIndexTestFunctor> functor = aznew FindPropertyIndexTestFunctor;
+                functor->m_foundIndex = runtimeContext.FindMaterialPropertyIndex(m_materialPropertyName);
+                return Success(RPI::Ptr<MaterialFunctor>(functor));
+            }
+        };
+        
+        Data::Asset<MaterialTypeAsset> materialTypeAsset;
+        MaterialTypeAssetCreator materialTypeCreator;
+        materialTypeCreator.Begin(Uuid::CreateRandom());
+        materialTypeCreator.BeginMaterialProperty(Name{"layer1.baseColor.factor"}, MaterialPropertyDataType::Float);
+        materialTypeCreator.EndMaterialProperty();
+        materialTypeCreator.End(materialTypeAsset);
+
+        FindPropertyIndexTestFunctorSourceData sourceData;
+        sourceData.m_materialPropertyName = "factor";
+
+        MaterialNameContext nameContext;
+        nameContext.ExtendPropertyIdContext("layer1");
+        nameContext.ExtendPropertyIdContext("baseColor");
+
+        MaterialFunctorSourceData::RuntimeContext createFunctorContext(
+            "",
+            materialTypeAsset->GetMaterialPropertiesLayout(),
+            nullptr,
+            nullptr,
+            &nameContext);
+
+        RPI::Ptr<MaterialFunctor> functor = sourceData.CreateFunctor(createFunctorContext).TakeValue();
+
+        EXPECT_TRUE(reinterpret_cast<FindPropertyIndexTestFunctor*>(functor.get())->m_foundIndex.IsValid());
+    }
+    
+    TEST_F(MaterialFunctorTests, UseNameContextInFunctorSourceData_ShaderOptionLookup)
+    {
+        class FindShaderOptionIndexTestFunctor : public MaterialFunctor
+        {
+        public:
+            ShaderOptionIndex m_foundIndex;
+        };
+
+        class FindShaderOptionIndexTestFunctorSourceData : public MaterialFunctorSourceData
+        {
+        public:
+            Name m_shaderOptionName;
+            
+            using MaterialFunctorSourceData::CreateFunctor;
+            FunctorResult CreateFunctor(const RuntimeContext& runtimeContext) const override
+            {
+                RPI::Ptr<FindShaderOptionIndexTestFunctor> functor = aznew FindShaderOptionIndexTestFunctor;
+                functor->m_foundIndex = runtimeContext.FindShaderOptionIndex(0, m_shaderOptionName);
+                return Success(RPI::Ptr<MaterialFunctor>(functor));
+            }
+        };
+        
+        RPI::Ptr<RPI::ShaderOptionGroupLayout> shaderOptionLayout = RPI::ShaderOptionGroupLayout::Create();
+        shaderOptionLayout->AddShaderOption(
+            RPI::ShaderOptionDescriptor{Name("o_layer1_baseColor_useTexture"), RPI::ShaderOptionType::Boolean, 0, 0, CreateBoolShaderOptionValues()});
+        shaderOptionLayout->Finalize();
+
+        Data::Asset<ShaderAsset> shaderAsset = CreateTestShaderAsset(Uuid::CreateRandom(), nullptr, shaderOptionLayout);
+
+        Data::Asset<MaterialTypeAsset> materialTypeAsset;
+        MaterialTypeAssetCreator materialTypeCreator;
+        materialTypeCreator.Begin(Uuid::CreateRandom());
+        materialTypeCreator.AddShader(shaderAsset);
+        materialTypeCreator.End(materialTypeAsset);
+
+        FindShaderOptionIndexTestFunctorSourceData sourceData;
+        sourceData.m_shaderOptionName = "useTexture";
+
+        MaterialNameContext nameContext;
+        nameContext.ExtendShaderOptionContext("o_layer1_baseColor_");
+
+        MaterialFunctorSourceData::RuntimeContext createFunctorContext(
+            "",
+            nullptr,
+            nullptr,
+            &materialTypeAsset->GetShaderCollection(),
+            &nameContext);
+
+        RPI::Ptr<MaterialFunctor> functor = sourceData.CreateFunctor(createFunctorContext).TakeValue();
+
+        EXPECT_TRUE(reinterpret_cast<FindShaderOptionIndexTestFunctor*>(functor.get())->m_foundIndex.IsValid());
+    }
+    
+    TEST_F(MaterialFunctorTests, UseNameContextInFunctorSourceData_ShaderConstantLookup)
+    {
+        class FindShaderInputIndexTestFunctor : public MaterialFunctor
+        {
+        public:
+            RHI::ShaderInputConstantIndex m_foundConstantIndex;
+            RHI::ShaderInputImageIndex m_foundImageIndex;
+        };
+
+        class FindShaderInputIndexTestFunctorSourceData : public MaterialFunctorSourceData
+        {
+        public:
+            Name m_shaderConstantName;
+            Name m_shaderImageName;
+            
+            using MaterialFunctorSourceData::CreateFunctor;
+            FunctorResult CreateFunctor(const RuntimeContext& runtimeContext) const override
+            {
+                RPI::Ptr<FindShaderInputIndexTestFunctor> functor = aznew FindShaderInputIndexTestFunctor;
+                functor->m_foundConstantIndex = runtimeContext.FindShaderInputConstantIndex(m_shaderConstantName);
+                functor->m_foundImageIndex = runtimeContext.FindShaderInputImageIndex(m_shaderImageName);
+                return Success(RPI::Ptr<MaterialFunctor>(functor));
+            }
+        };
+
+        AZ::RHI::Ptr<AZ::RHI::ShaderResourceGroupLayout> srgLayout = RHI::ShaderResourceGroupLayout::Create();
+        srgLayout->SetName(Name("MaterialSrg"));
+        srgLayout->SetUniqueId(Uuid::CreateRandom().ToString<AZStd::string>()); // Any random string will suffice.
+        srgLayout->SetBindingSlot(SrgBindingSlot::Material);
+        srgLayout->AddShaderInput(RHI::ShaderInputConstantDescriptor{Name{ "m_layer1_baseColor_factor" }, 0, 4, 0});
+        srgLayout->AddShaderInput(RHI::ShaderInputImageDescriptor{Name{ "m_layer1_baseColor_texture" }, RHI::ShaderInputImageAccess::Read, RHI::ShaderInputImageType::Image2D, 1, 1});
+        srgLayout->Finalize();
+
+        Data::Asset<ShaderAsset> shaderAsset = CreateTestShaderAsset(Uuid::CreateRandom(), srgLayout);
+
+        Data::Asset<MaterialTypeAsset> materialTypeAsset;
+        MaterialTypeAssetCreator materialTypeCreator;
+        materialTypeCreator.Begin(Uuid::CreateRandom());
+        materialTypeCreator.AddShader(shaderAsset);
+        materialTypeCreator.End(materialTypeAsset);
+
+        FindShaderInputIndexTestFunctorSourceData sourceData;
+        sourceData.m_shaderConstantName = "factor";
+        sourceData.m_shaderImageName = "texture";
+
+        MaterialNameContext nameContext;
+        nameContext.ExtendSrgInputContext("m_layer1_baseColor_");
+
+        MaterialFunctorSourceData::RuntimeContext createFunctorContext(
+            "",
+            nullptr,
+            srgLayout.get(),
+            nullptr,
+            &nameContext);
+
+        RPI::Ptr<MaterialFunctor> functor = sourceData.CreateFunctor(createFunctorContext).TakeValue();
+        
+        EXPECT_TRUE(reinterpret_cast<FindShaderInputIndexTestFunctor*>(functor.get())->m_foundConstantIndex.IsValid());
+        EXPECT_TRUE(reinterpret_cast<FindShaderInputIndexTestFunctor*>(functor.get())->m_foundImageIndex.IsValid());
+    }
+
+
+
 }
diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertyValueSourceDataTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertyValueSourceDataTests.cpp
index 5dde21ece1..f67a58cf97 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertyValueSourceDataTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialPropertyValueSourceDataTests.cpp
@@ -19,6 +19,7 @@
 #include <Atom/RPI.Reflect/Material/MaterialTypeAsset.h>
 #include <Atom/RPI.Reflect/Material/MaterialPropertiesLayout.h>
 #include <Atom/RPI.Reflect/Material/MaterialTypeAssetCreator.h>
+#include <Atom/RPI.Reflect/Material/MaterialNameContext.h>
 
 namespace JsonSerializationTests
 {
@@ -256,13 +257,16 @@ namespace UnitTest
 
             JsonTestResult loadResult = LoadTestDataFromJson(*functorData, inputJson);
 
+            MaterialNameContext nameContext;
+
             // Where type resolving happens.
             MaterialFunctorSourceData::FunctorResult functorResult = functorData->CreateFunctor(
                 MaterialFunctorSourceData::RuntimeContext(
                     "Dummy.materialtype",
                     m_materialTypeCreator.GetMaterialPropertiesLayout(),
                     m_materialTypeCreator.GetMaterialShaderResourceGroupLayout(),
-                    m_materialTypeCreator.GetShaderCollection()
+                    m_materialTypeCreator.GetShaderCollection(),
+                    &nameContext
                 )
             );
 
diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeSourceDataTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeSourceDataTests.cpp
index 948a56f557..85d1a4ccd9 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeSourceDataTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeSourceDataTests.cpp
@@ -16,11 +16,14 @@
 #include <Atom/RPI.Edit/Material/MaterialTypeSourceData.h>
 #include <Atom/RPI.Edit/Common/AssetUtils.h>
 #include <Atom/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.h>
+#include <Atom/RPI.Edit/Material/MaterialUtils.h>
 #include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>
 #include <Atom/RPI.Reflect/Shader/ShaderOptionGroup.h>
+#include <Atom/RPI.Reflect/Material/MaterialNameContext.h>
 #include <Atom/RPI.Public/Shader/ShaderResourceGroup.h>
 #include <Atom/RPI.Public/Material/Material.h>
 
+#include <AzCore/Utils/Utils.h>
 #include <AzCore/Serialization/Json/JsonUtils.h>
 #include <AzCore/Serialization/Json/JsonSerialization.h>
 #include <AzFramework/StringFunc/StringFunc.h>
@@ -35,6 +38,7 @@ namespace UnitTest
     {
     protected:
 
+        AZ::IO::FixedMaxPath m_tempFolder;
         RHI::Ptr<RHI::ShaderResourceGroupLayout> m_testMaterialSrgLayout;
         Data::Asset<ShaderAsset> m_testShaderAsset;
         Data::Asset<ShaderAsset> m_testShaderAsset2;
@@ -249,6 +253,59 @@ namespace UnitTest
             AZStd::string m_enablePropertyName;
         };
 
+        // All this functor does is save the MaterialNameContext
+        class SaveNameContextTestFunctor final
+            : public AZ::RPI::MaterialFunctor
+        {
+        public:
+            AZ_RTTI(SaveNameContextTestFunctor, "{FD680069-B430-4278-9E5B-A2B9617627D5}", AZ::RPI::MaterialFunctor);
+
+            static void Reflect(AZ::ReflectContext* context)
+            {
+                if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+                {
+                    serializeContext->Class<SaveNameContextTestFunctor, AZ::RPI::MaterialFunctor>()
+                    ->Version(1)
+                    ->Field("nameContext", &SaveNameContextTestFunctor::m_nameContext);
+                }
+            }
+
+            using AZ::RPI::MaterialFunctor::Process;
+            void Process(AZ::RPI::MaterialFunctor::RuntimeContext&) override
+            {
+                // Intentionally empty, this is where the functor would do it's normal processing,
+                // but all this test functor does is store the MaterialNameContext.
+            }
+            
+            MaterialNameContext m_nameContext;
+        };
+        
+        // All this functor does is save the MaterialNameContext
+        class SaveNameContextTestFunctorSourceData final
+            : public MaterialFunctorSourceData
+        {
+        public:
+            AZ_RTTI(SaveNameContextTestFunctorSourceData, "{4261A2EC-4AB6-420E-884A-18D1A36500BE}", MaterialFunctorSourceData);
+
+            static void Reflect(AZ::ReflectContext* context)
+            {
+                if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+                {
+                    serializeContext->Class<SaveNameContextTestFunctorSourceData>()
+                        ->Version(1)
+                        ;
+                }
+            }
+
+            using MaterialFunctorSourceData::CreateFunctor;
+            FunctorResult CreateFunctor([[maybe_unused]] const RuntimeContext& context) const override
+            {
+                Ptr<SaveNameContextTestFunctor> functor = aznew SaveNameContextTestFunctor;
+                functor->m_nameContext = *context.GetNameContext();
+                return Success(Ptr<MaterialFunctor>(functor));
+            }
+        };
+
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         void Reflect(ReflectContext* context) override
@@ -262,6 +319,7 @@ namespace UnitTest
             Splat3FunctorSourceData::Reflect(context);
             EnableShaderFunctorSourceData::Reflect(context);
             SetShaderOptionFunctorSourceData::Reflect(context);
+            SaveNameContextTestFunctorSourceData::Reflect(context);
         }
 
         void SetUp() override
@@ -273,6 +331,7 @@ namespace UnitTest
             AZ::RPI::MaterialFunctorSourceDataRegistration::Get()->RegisterMaterialFunctor("Splat3", azrtti_typeid<Splat3FunctorSourceData>());
             AZ::RPI::MaterialFunctorSourceDataRegistration::Get()->RegisterMaterialFunctor("EnableShader", azrtti_typeid<EnableShaderFunctorSourceData>());
             AZ::RPI::MaterialFunctorSourceDataRegistration::Get()->RegisterMaterialFunctor("SetShaderOption", azrtti_typeid<SetShaderOptionFunctorSourceData>());
+            AZ::RPI::MaterialFunctorSourceDataRegistration::Get()->RegisterMaterialFunctor("SaveNameContext", azrtti_typeid<SaveNameContextTestFunctorSourceData>());
 
             const Name materialSrgId{"MaterialSrg"};
             m_testMaterialSrgLayout = RHI::ShaderResourceGroupLayout::Create();
@@ -326,6 +385,9 @@ namespace UnitTest
             AZStd::string testImageFilepathAbsolute(TestImageFilepathAbsolute);
             AzFramework::StringFunc::Path::Normalize(testImageFilepathAbsolute);
             m_assetSystemStub.RegisterSourceInfo(testImageFilepathAbsolute.c_str(), testImageAssetInfo2, "");
+
+            m_tempFolder = AZ::Utils::GetExecutableDirectory();
+            m_tempFolder = m_tempFolder/"temp"/"MaterialTypeSourceDataTest";
         }
 
         void TearDown() override
@@ -426,54 +488,62 @@ namespace UnitTest
 
         struct EnumeratePropertyGroupsResult
         {
-            AZStd::string m_propertyIdContext;
-            const MaterialTypeSourceData::PropertyGroup* m_propertyGroup;
+            MaterialNameContext m_nameContext;
 
-            void Check(AZStd::string expectedIdContext, const MaterialTypeSourceData::PropertyGroup* expectedPropertyGroup)
+            void Check(AZStd::string expectedGroupId)
             {
-                EXPECT_EQ(expectedIdContext, m_propertyIdContext);
-                EXPECT_EQ(expectedPropertyGroup, m_propertyGroup);
+                Name imaginaryProperty{"someChildProperty"};
+                m_nameContext.ContextualizeProperty(imaginaryProperty);
+
+                EXPECT_EQ(expectedGroupId + ".someChildProperty", imaginaryProperty.GetStringView());
             }
         };
         AZStd::vector<EnumeratePropertyGroupsResult> enumeratePropertyGroupsResults;
 
-        sourceData.EnumeratePropertyGroups([&enumeratePropertyGroupsResults](const AZStd::string& propertyIdContext, const MaterialTypeSourceData::PropertyGroup* propertyGroup)
+        sourceData.EnumeratePropertyGroups([&enumeratePropertyGroupsResults](
+            const MaterialTypeSourceData::PropertyGroupStack& propertyGroupStack)
             {
-                enumeratePropertyGroupsResults.push_back(EnumeratePropertyGroupsResult{propertyIdContext, propertyGroup});
+                MaterialNameContext nameContext = MaterialTypeSourceData::MakeMaterialNameContext(propertyGroupStack);
+                enumeratePropertyGroupsResults.push_back(EnumeratePropertyGroupsResult{nameContext});
                 return true;
             });
 
         int resultIndex = 0;
-        enumeratePropertyGroupsResults[resultIndex++].Check("", layer1);
-        enumeratePropertyGroupsResults[resultIndex++].Check("layer1.", layer1_baseColor);
-        enumeratePropertyGroupsResults[resultIndex++].Check("layer1.", layer1_roughness);
-        enumeratePropertyGroupsResults[resultIndex++].Check("", layer2);
-        enumeratePropertyGroupsResults[resultIndex++].Check("layer2.", layer2_baseColor);
-        enumeratePropertyGroupsResults[resultIndex++].Check("layer2.", layer2_roughness);
-        enumeratePropertyGroupsResults[resultIndex++].Check("layer2.", layer2_clearCoat);
-        enumeratePropertyGroupsResults[resultIndex++].Check("layer2.clearCoat.", layer2_clearCoat_roughness);
-        enumeratePropertyGroupsResults[resultIndex++].Check("layer2.clearCoat.", layer2_clearCoat_normal);
-        enumeratePropertyGroupsResults[resultIndex++].Check("", blend);
+        enumeratePropertyGroupsResults[resultIndex++].Check("layer1");
+        enumeratePropertyGroupsResults[resultIndex++].Check("layer1.baseColor");
+        enumeratePropertyGroupsResults[resultIndex++].Check("layer1.roughness");
+        enumeratePropertyGroupsResults[resultIndex++].Check("layer2");
+        enumeratePropertyGroupsResults[resultIndex++].Check("layer2.baseColor");
+        enumeratePropertyGroupsResults[resultIndex++].Check("layer2.roughness");
+        enumeratePropertyGroupsResults[resultIndex++].Check("layer2.clearCoat");
+        enumeratePropertyGroupsResults[resultIndex++].Check("layer2.clearCoat.roughness");
+        enumeratePropertyGroupsResults[resultIndex++].Check("layer2.clearCoat.normal");
+        enumeratePropertyGroupsResults[resultIndex++].Check("blend");
         EXPECT_EQ(resultIndex, enumeratePropertyGroupsResults.size());
 
         // Check EnumerateProperties
         
         struct EnumeratePropertiesResult
         {
-            AZStd::string m_propertyIdContext;
             const MaterialTypeSourceData::PropertyDefinition* m_propertyDefinition;
+            MaterialNameContext m_materialNameContext;
 
             void Check(AZStd::string expectedIdContext, const MaterialTypeSourceData::PropertyDefinition* expectedPropertyDefinition)
             {
-                EXPECT_EQ(expectedIdContext, m_propertyIdContext);
+                Name propertyFullId{m_propertyDefinition->GetName()};
+                m_materialNameContext.ContextualizeProperty(propertyFullId);
+
+                AZStd::string expectedPropertyId = expectedIdContext + expectedPropertyDefinition->GetName();
+
+                EXPECT_EQ(expectedPropertyId, propertyFullId.GetStringView());
                 EXPECT_EQ(expectedPropertyDefinition, m_propertyDefinition);
             }
         };
         AZStd::vector<EnumeratePropertiesResult> enumeratePropertiesResults;
 
-        sourceData.EnumerateProperties([&enumeratePropertiesResults](const AZStd::string& propertyIdContext, const MaterialTypeSourceData::PropertyDefinition* propertyDefinition)
+        sourceData.EnumerateProperties([&enumeratePropertiesResults](const MaterialTypeSourceData::PropertyDefinition* propertyDefinition, const MaterialNameContext& nameContext)
             {
-                enumeratePropertiesResults.push_back(EnumeratePropertiesResult{propertyIdContext, propertyDefinition});
+                enumeratePropertiesResults.push_back(EnumeratePropertiesResult{propertyDefinition, nameContext});
                 return true;
             });
         
@@ -1462,6 +1532,8 @@ namespace UnitTest
     {
         // Note that serialization of individual fields within material properties is thoroughly tested in
         // MaterialPropertySerializerTests, so the sample property data used here is cursory.
+        // We also don't cover fields related to providing name contexts for nested property groups, like
+        // "shaderInputsPrefix" and "shaderOptionsPrefix" as those are covered in CreateMaterialTypeAsset_NestedGroups*.
 
         const AZStd::string inputJson = R"(
             {
@@ -1690,7 +1762,7 @@ namespace UnitTest
         JsonTestResult storeResult = StoreTestDataToJson(material, outputJson);
         ExpectSimilarJson(inputJson, outputJson);
     }
-    
+
     TEST_F(MaterialTypeSourceDataTests, LoadAllFieldsUsingOldFormat)
     {
         // The content of this test was copied from LoadAndStoreJson_AllFields to prove backward compatibility.
@@ -1952,4 +2024,213 @@ namespace UnitTest
 
         errorMessageFinder.CheckExpectedErrorsFound();
     }
+    
+    TEST_F(MaterialTypeSourceDataTests, LoadWithImportedJson)
+    {
+        const AZStd::string propertyGroupJson = R"(
+            {
+                "name": "myGroup",
+                "displayName": "My Group",
+                "description": "This group is defined in a separate JSON file",
+                "properties": [
+                    {
+                        "name": "foo",
+                        "type": "Bool"
+                    },
+                    {
+                        "name": "bar",
+                        "type": "Float"
+                    }
+                ]
+            }
+        )";
+
+        IO::FixedMaxPath propertyGroupJsonFilePath = m_tempFolder/"MyPropertyGroup.json";
+        AZ::Utils::WriteFile(propertyGroupJson, propertyGroupJsonFilePath.c_str());
+
+        const AZStd::string materialTypeJson = R"(
+            {
+                "propertyLayout": {
+                    "propertyGroups": [
+                        { "$import": "MyPropertyGroup.json" }
+                    ]
+                }
+            }
+        )";
+        
+        IO::FixedMaxPath materialTypeJsonFilePath = m_tempFolder/"TestImport.materialtype";
+        AZ::Utils::WriteFile(materialTypeJson, materialTypeJsonFilePath.c_str());
+
+        auto loadMaterialTypeResult = MaterialUtils::LoadMaterialTypeSourceData(materialTypeJsonFilePath.c_str());
+        EXPECT_TRUE(loadMaterialTypeResult);
+        MaterialTypeSourceData materialType = loadMaterialTypeResult.TakeValue();
+
+        EXPECT_EQ(materialType.GetPropertyLayout().m_propertyGroups.size(), 1);
+        EXPECT_TRUE(materialType.FindPropertyGroup("myGroup") != nullptr);
+        EXPECT_EQ(materialType.FindPropertyGroup("myGroup")->GetDisplayName(), "My Group");
+        EXPECT_EQ(materialType.FindPropertyGroup("myGroup")->GetDescription(), "This group is defined in a separate JSON file");
+        EXPECT_EQ(materialType.FindPropertyGroup("myGroup")->GetProperties().size(), 2);
+        EXPECT_NE(materialType.FindProperty("myGroup.foo"), nullptr);
+        EXPECT_NE(materialType.FindProperty("myGroup.bar"), nullptr);
+        EXPECT_EQ(materialType.FindProperty("myGroup.foo")->GetName(), "foo");
+        EXPECT_EQ(materialType.FindProperty("myGroup.bar")->GetName(), "bar");
+        EXPECT_EQ(materialType.FindProperty("myGroup.foo")->m_dataType, MaterialPropertyDataType::Bool);
+        EXPECT_EQ(materialType.FindProperty("myGroup.bar")->m_dataType, MaterialPropertyDataType::Float);
+    }
+
+    TEST_F(MaterialTypeSourceDataTests, CreateMaterialTypeAsset_NestedGroupNameContext)
+    {
+        const Name materialSrgId{"MaterialSrg"};
+        RHI::Ptr<RHI::ShaderResourceGroupLayout> materialSrgLayout = RHI::ShaderResourceGroupLayout::Create();
+        materialSrgLayout->SetName(materialSrgId);
+        materialSrgLayout->SetBindingSlot(SrgBindingSlot::Material);
+        materialSrgLayout->AddShaderInput(RHI::ShaderInputImageDescriptor{ Name{ "m_unused1" }, RHI::ShaderInputImageAccess::Read, RHI::ShaderInputImageType::Image2D, 1, 1 });
+        materialSrgLayout->AddShaderInput(RHI::ShaderInputImageDescriptor{ Name{ "m_unused2" }, RHI::ShaderInputImageAccess::Read, RHI::ShaderInputImageType::Image2D, 1, 1 });
+        materialSrgLayout->AddShaderInput(RHI::ShaderInputImageDescriptor{ Name{ "m_groupA_m_groupB_m_texture" }, RHI::ShaderInputImageAccess::Read, RHI::ShaderInputImageType::Image2D, 1, 1 });
+        materialSrgLayout->AddShaderInput(RHI::ShaderInputConstantDescriptor{ Name{ "m_unused3" }, 0, 4, 0 });
+        materialSrgLayout->AddShaderInput(RHI::ShaderInputConstantDescriptor{ Name{ "m_groupA_m_groupB_m_number" }, 4, 4, 0 });
+        EXPECT_TRUE(materialSrgLayout->Finalize());
+
+        Ptr<ShaderOptionGroupLayout> shaderOptions = ShaderOptionGroupLayout::Create();
+        shaderOptions->AddShaderOption(ShaderOptionDescriptor{Name{"o_unused"}, ShaderOptionType::Boolean, 0, 0, CreateBoolShaderOptionValues()});
+        shaderOptions->AddShaderOption(ShaderOptionDescriptor{Name{"o_groupA_o_groupB_o_useTexture"}, ShaderOptionType::Boolean, 1, 1, CreateBoolShaderOptionValues()});
+        shaderOptions->AddShaderOption(ShaderOptionDescriptor{Name{"o_groupA_o_groupB_o_useTextureAlt"}, ShaderOptionType::Boolean, 2, 2, CreateBoolShaderOptionValues()});
+        shaderOptions->Finalize();
+
+        Data::Asset<ShaderAsset> shaderAsset = CreateTestShaderAsset(Uuid::CreateRandom(), materialSrgLayout, shaderOptions);
+
+        Data::AssetInfo testShaderAssetInfo;
+        testShaderAssetInfo.m_assetId = shaderAsset.GetId();
+        m_assetSystemStub.RegisterSourceInfo("NestedGroupNameContext.shader", testShaderAssetInfo, "");
+
+        const AZStd::string materialTypeJson = R"(
+            {
+                "propertyLayout": {
+                    "propertyGroups": [
+                        {
+                            "name": "groupA",
+                            "shaderInputsPrefix": "m_groupA_",
+                            "shaderOptionsPrefix": "o_groupA_",
+                            "propertyGroups": [
+                                {
+                                    "name": "groupB",
+                                    "shaderInputsPrefix": "m_groupB_",
+                                    "shaderOptionsPrefix": "o_groupB_",
+                                    "properties": [
+                                        {
+                                            "name": "number",
+                                            "type": "Float",
+                                            "connection": {
+                                                "type": "ShaderInput",
+                                                "name": "m_number"
+                                            }
+                                        }
+                                    ],
+                                    "propertyGroups": [
+                                        {
+                                            "name": "groupC",
+                                            "properties": [
+                                                {
+                                                    "name": "textureMap",
+                                                    "type": "Image",
+                                                    "connection": {
+                                                        "type": "ShaderInput",
+                                                        "name": "m_texture"
+                                                    }
+                                                },
+                                                {
+                                                    "name": "useTextureMap",
+                                                    "type": "Bool",
+                                                    "connection": [
+                                                        {
+                                                            "type": "ShaderOption",
+                                                            "name": "o_useTexture"
+                                                        },
+                                                        {
+                                                            "type": "ShaderOption",
+                                                            "name": "o_useTextureAlt", 
+                                                            "shaderIndex": 0 // Having a specific shaderIndex traverses a different code path
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "functors": [
+                                                {
+                                                    "type": "SaveNameContext"
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                "shaders": [
+                    {
+                        "file": "NestedGroupNameContext.shader"
+                    }
+                ]
+            }
+        )";
+        
+        MaterialTypeSourceData materialTypeSourceData;
+        JsonTestResult loadResult = LoadTestDataFromJson(materialTypeSourceData, materialTypeJson);
+        
+        auto materialTypeAssetOutcome = materialTypeSourceData.CreateMaterialTypeAsset(Uuid::CreateRandom());
+        EXPECT_TRUE(materialTypeAssetOutcome.IsSuccess());
+
+        Data::Asset<MaterialTypeAsset> materialTypeAsset = materialTypeAssetOutcome.TakeValue();
+        const MaterialPropertiesLayout* propertiesLayout = materialTypeAsset->GetMaterialPropertiesLayout();
+
+        EXPECT_EQ(3, propertiesLayout->GetPropertyCount());
+        
+        EXPECT_EQ(0, propertiesLayout->FindPropertyIndex(Name("groupA.groupB.number")).GetIndex());
+        EXPECT_EQ(1, propertiesLayout->FindPropertyIndex(Name("groupA.groupB.groupC.textureMap")).GetIndex());
+        EXPECT_EQ(2, propertiesLayout->FindPropertyIndex(Name("groupA.groupB.groupC.useTextureMap")).GetIndex());
+        
+        // groupA.groupB.number has a connection to m_groupA_m_groupB_m_number
+        MaterialPropertyIndex numberPropertyIndex{0};
+        EXPECT_EQ(1, propertiesLayout->GetPropertyDescriptor(numberPropertyIndex)->GetOutputConnections().size());
+        EXPECT_EQ(materialSrgLayout->FindShaderInputConstantIndex(Name("m_groupA_m_groupB_m_number")).GetIndex(),
+            propertiesLayout->GetPropertyDescriptor(numberPropertyIndex)->GetOutputConnections()[0].m_itemIndex.GetIndex());
+
+        // groupA.gropuB.groupC.textureMap has a connection to m_groupA_m_groupB_m_texture
+        MaterialPropertyIndex texturePropertyIndex{1};
+        EXPECT_EQ(1, propertiesLayout->GetPropertyDescriptor(texturePropertyIndex)->GetOutputConnections().size());
+        EXPECT_EQ(materialSrgLayout->FindShaderInputImageIndex(Name("m_groupA_m_groupB_m_texture")).GetIndex(),
+            propertiesLayout->GetPropertyDescriptor(texturePropertyIndex)->GetOutputConnections()[0].m_itemIndex.GetIndex());
+        
+        // groupA.gropuB.groupC.useTextureMap has a connection to o_groupA_o_groupB_o_useTexture and o_groupA_o_groupB_o_useTextureAlt
+        MaterialPropertyIndex useTexturePropertyIndex{2};
+        EXPECT_EQ(2, propertiesLayout->GetPropertyDescriptor(useTexturePropertyIndex)->GetOutputConnections().size());
+        EXPECT_EQ(shaderOptions->FindShaderOptionIndex(Name("o_groupA_o_groupB_o_useTexture")).GetIndex(),
+            propertiesLayout->GetPropertyDescriptor(useTexturePropertyIndex)->GetOutputConnections()[0].m_itemIndex.GetIndex());
+        EXPECT_EQ(shaderOptions->FindShaderOptionIndex(Name("o_groupA_o_groupB_o_useTextureAlt")).GetIndex(),
+            propertiesLayout->GetPropertyDescriptor(useTexturePropertyIndex)->GetOutputConnections()[1].m_itemIndex.GetIndex());
+        
+        // There should be one functor, which processes useTextureMap, and it should have the appropriate name context for constructing the correct full names.
+        EXPECT_EQ(1, materialTypeAsset->GetMaterialFunctors().size());
+
+        EXPECT_TRUE(azrtti_istypeof<SaveNameContextTestFunctor>(materialTypeAsset->GetMaterialFunctors()[0].get()));
+
+        auto saveNameContextFunctor = azrtti_cast<SaveNameContextTestFunctor*>(materialTypeAsset->GetMaterialFunctors()[0].get());
+        const MaterialNameContext& nameContext = saveNameContextFunctor->m_nameContext;
+        
+        Name textureMapProperty{"textureMap"};
+        Name textureMapShaderInput{"m_texture"};
+        Name useTextureMapProperty{"useTextureMap"};
+        Name useTextureShaderOption{"o_useTexture"};
+        
+        nameContext.ContextualizeProperty(textureMapProperty);
+        nameContext.ContextualizeProperty(useTextureMapProperty);
+        nameContext.ContextualizeSrgInput(textureMapShaderInput);
+        nameContext.ContextualizeShaderOption(useTextureShaderOption);
+
+        EXPECT_EQ("groupA.groupB.groupC.useTextureMap", useTextureMapProperty.GetStringView());
+        EXPECT_EQ("o_groupA_o_groupB_o_useTexture", useTextureShaderOption.GetStringView());
+        EXPECT_EQ("groupA.groupB.groupC.textureMap", textureMapProperty.GetStringView());
+        EXPECT_EQ("m_groupA_m_groupB_m_texture", textureMapShaderInput.GetStringView());
+    }
+
 }
diff --git a/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake
index 3c345cc00b..84d423127a 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake
@@ -11,7 +11,6 @@ set(FILES
     Include/Atom/RPI.Edit/Common/AssetAliasesSourceData.h
     Include/Atom/RPI.Edit/Common/ColorUtils.h
     Include/Atom/RPI.Edit/Common/ConvertibleSource.h
-    Include/Atom/RPI.Edit/Common/JsonFileLoadContext.h
     Include/Atom/RPI.Edit/Common/JsonReportingHelper.h
     Include/Atom/RPI.Edit/Common/JsonUtils.h
     Include/Atom/RPI.Edit/Material/LuaMaterialFunctorSourceData.h
@@ -56,7 +55,6 @@ set(FILES
     Source/RPI.Edit/Common/AssetAliasesSourceData.cpp
     Source/RPI.Edit/Common/ColorUtils.cpp
     Source/RPI.Edit/Common/ConvertibleSource.cpp
-    Source/RPI.Edit/Common/JsonFileLoadContext.cpp
     Source/RPI.Edit/Common/JsonReportingHelper.cpp
     Source/RPI.Edit/Common/JsonUtils.cpp
 )
diff --git a/Gems/Atom/RPI/Code/atom_rpi_reflect_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_reflect_files.cmake
index 6e9cdfeb4e..c28911f4af 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_reflect_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_reflect_files.cmake
@@ -53,6 +53,7 @@ set(FILES
     Include/Atom/RPI.Reflect/Material/MaterialAsset.h
     Include/Atom/RPI.Reflect/Material/MaterialAssetCreator.h
     Include/Atom/RPI.Reflect/Material/MaterialDynamicMetadata.h
+    Include/Atom/RPI.Reflect/Material/MaterialNameContext.h
     Include/Atom/RPI.Reflect/Material/MaterialPropertyDescriptor.h
     Include/Atom/RPI.Reflect/Material/MaterialPropertiesLayout.h
     Include/Atom/RPI.Reflect/Material/MaterialPropertyValue.h
@@ -133,6 +134,7 @@ set(FILES
     Source/RPI.Reflect/Material/MaterialPropertyValue.cpp
     Source/RPI.Reflect/Material/MaterialAsset.cpp
     Source/RPI.Reflect/Material/MaterialAssetCreator.cpp
+    Source/RPI.Reflect/Material/MaterialNameContext.cpp
     Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp
     Source/RPI.Reflect/Material/MaterialDynamicMetadata.cpp
     Source/RPI.Reflect/Material/MaterialPropertyDescriptor.cpp
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Application/AtomToolsApplication.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Application/AtomToolsApplication.h
index 016bc5c5e2..5d2c1ce4e0 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Application/AtomToolsApplication.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Application/AtomToolsApplication.h
@@ -39,16 +39,16 @@ namespace AtomToolsFramework
     {
     public:
         AZ_TYPE_INFO(AtomTools::AtomToolsApplication, "{A0DF25BA-6F74-4F11-9F85-0F99278D5986}");
+        AZ_DISABLE_COPY_MOVE(AtomToolsApplication);
 
         using Base = AzFramework::Application;
 
-        AtomToolsApplication(int* argc, char*** argv);
+        AtomToolsApplication(const char* targetName, int* argc, char*** argv);
         ~AtomToolsApplication();
 
         virtual bool LaunchLocalServer();
 
-        //////////////////////////////////////////////////////////////////////////
-        // AzFramework::Application
+        // AzFramework::Application overrides...
         void CreateReflectionManager() override;
         void Reflect(AZ::ReflectContext* context) override;
         void RegisterCoreComponents() override;
@@ -57,43 +57,25 @@ namespace AtomToolsFramework
         const char* GetCurrentConfigurationName() const override;
         void StartCommon(AZ::Entity* systemEntity) override;
         void Tick() override;
-        void Stop() override;
+        void Destroy() override;
 
     protected:
-        //////////////////////////////////////////////////////////////////////////
         // AtomsToolMainWindowNotificationBus::Handler overrides...
         void OnMainWindowClosing() override;
-        //////////////////////////////////////////////////////////////////////////
 
-        //////////////////////////////////////////////////////////////////////////
         // AssetDatabaseRequestsBus::Handler overrides...
         bool GetAssetDatabaseLocation(AZStd::string& result) override;
-        //////////////////////////////////////////////////////////////////////////
 
-        //////////////////////////////////////////////////////////////////////////
-        // AzFramework::Application overrides...
-        void Destroy() override;
-        //////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
         // AZ::ComponentApplication overrides...
         void QueryApplicationType(AZ::ApplicationTypeQuery& appType) const override;
-        //////////////////////////////////////////////////////////////////////////
 
-        //////////////////////////////////////////////////////////////////////////
         // AZ::UserSettingsOwnerRequestBus::Handler overrides...
         void SaveSettings() override;
-        //////////////////////////////////////////////////////////////////////////
 
-        ////////////////////////////////////////////////////////////////////////
         // EditorPythonConsoleNotificationBus::Handler overrides...
         void OnTraceMessage(AZStd::string_view message) override;
         void OnErrorMessage(AZStd::string_view message) override;
         void OnExceptionMessage(AZStd::string_view message) override;
-        ////////////////////////////////////////////////////////////////////////
-
-        //! Executable target name generally used as a prefix for logging and other saved files
-        virtual AZStd::string GetBuildTargetName() const;
 
         //! List of filters for assets that need to be pre-built to run the application
         virtual AZStd::vector<AZStd::string> GetCriticalAssetFilters() const;
@@ -121,5 +103,8 @@ namespace AtomToolsFramework
 
         AtomToolsFramework::LocalSocket m_socket;
         AtomToolsFramework::LocalServer m_server;
+
+        const AZStd::string m_targetName;
+        const AZ::Crc32 m_toolId = {};
     };
 } // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/AssetBrowser/AtomToolsAssetBrowserInteractions.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/AssetBrowser/AtomToolsAssetBrowserInteractions.h
index 1892b1ca0c..82cd6a7a2f 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/AssetBrowser/AtomToolsAssetBrowserInteractions.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/AssetBrowser/AtomToolsAssetBrowserInteractions.h
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <AzCore/Memory/SystemAllocator.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 #include <AzToolsFramework/SourceControl/SourceControlAPI.h>
 
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocument.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocument.h
index 2c9497df8e..7f51dc3c57 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocument.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocument.h
@@ -23,9 +23,9 @@ namespace AtomToolsFramework
     public:
         AZ_RTTI(AtomToolsDocument, "{8992DF74-88EC-438C-B280-6E71D4C0880B}");
         AZ_CLASS_ALLOCATOR(AtomToolsDocument, AZ::SystemAllocator, 0);
-        AZ_DISABLE_COPY(AtomToolsDocument);
+        AZ_DISABLE_COPY_MOVE(AtomToolsDocument);
 
-        AtomToolsDocument();
+        AtomToolsDocument(const AZ::Crc32& toolId);
         virtual ~AtomToolsDocument();
 
         const AZ::Uuid& GetId() const;
@@ -66,8 +66,10 @@ namespace AtomToolsFramework
         //! This can be overridden to restore additional data.
         virtual bool ReopenRestoreState();
 
+        const AZ::Crc32 m_toolId = {};
+
         //! The unique id of this document, used for all bus notifications and requests.
-        AZ::Uuid m_id = AZ::Uuid::CreateRandom();
+        const AZ::Uuid m_id = AZ::Uuid::CreateRandom();
 
         //! The absolute path to the document source file.
         AZStd::string m_absolutePath;
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentApplication.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentApplication.h
index 7b9327337c..095b62dfc9 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentApplication.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentApplication.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <AtomToolsFramework/Application/AtomToolsApplication.h>
+#include <AtomToolsFramework/Document/AtomToolsDocumentSystem.h>
 
 namespace AtomToolsFramework
 {
@@ -16,13 +17,20 @@ namespace AtomToolsFramework
         : public AtomToolsApplication
     {
     public:
-        AZ_TYPE_INFO(AtomToolsDocumentApplication, "{F4B43677-EB95-4CBB-8B8E-9EF4247E6F0D}");
+        AZ_TYPE_INFO(AtomToolsDocumentApplication, "{AC892170-D353-404A-A3D8-BB039C717295}");
+        AZ_DISABLE_COPY_MOVE(AtomToolsDocumentApplication);
 
         using Base = AtomToolsApplication;
 
-        AtomToolsDocumentApplication(int* argc, char*** argv);
+        AtomToolsDocumentApplication(const char* targetName, int* argc, char*** argv);
 
+    protected:
         // AtomToolsApplication overrides...
+        void Reflect(AZ::ReflectContext* context) override;
+        void StartCommon(AZ::Entity* systemEntity) override;
+        void Destroy() override;
         void ProcessCommandLine(const AZ::CommandLine& commandLine) override;
+
+        AZStd::unique_ptr<AtomToolsDocumentSystem> m_documentSystem; 
     };
 } // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentMainWindow.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentMainWindow.h
index 826d2427b1..75c129e10e 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentMainWindow.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentMainWindow.h
@@ -28,7 +28,7 @@ namespace AtomToolsFramework
 
         using Base = AtomToolsMainWindow;
 
-        AtomToolsDocumentMainWindow(QWidget* parent = 0);
+        AtomToolsDocumentMainWindow(const AZ::Crc32& toolId, QWidget* parent = 0);
         ~AtomToolsDocumentMainWindow();
 
     protected:
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h
index b9af219b9e..4fdd1f8aa9 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h
@@ -18,8 +18,9 @@ namespace AtomToolsFramework
         : public AZ::EBusTraits
     {
     public:
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
         static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        typedef AZ::Crc32 BusIdType;
 
         //! Signal that a document was created
         //! @param documentId unique id of document for which the notification is sent
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentSystem.h
similarity index 55%
rename from Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.h
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentSystem.h
index 5eb531ef25..64109ba80a 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentSystem.h
@@ -8,60 +8,34 @@
 
 #pragma once
 
-#include <AzCore/Component/Component.h>
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-#include <AzCore/Asset/AssetCommon.h>
-
 #include <AtomToolsFramework/Document/AtomToolsDocument.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h>
-
-AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
-#include <QFileInfo>
-#include <QString>
-AZ_POP_DISABLE_WARNING
+#include <AzCore/Asset/AssetCommon.h>
+#include <AzCore/Memory/Memory.h>
+#include <AzCore/RTTI/RTTI.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 
 namespace AtomToolsFramework
 {
-    //! AtomToolsDocumentSystemComponent is the central component for managing documents
-    class AtomToolsDocumentSystemComponent
-        : public AZ::Component
-        , private AtomToolsDocumentNotificationBus::Handler
-        , private AtomToolsDocumentSystemRequestBus::Handler
+    //! AtomToolsDocumentSystem Is responsible for creation, management, and requests related to documents
+    class AtomToolsDocumentSystem
+        : public AtomToolsDocumentNotificationBus::Handler
+        , public AtomToolsDocumentSystemRequestBus::Handler
     {
     public:
-        AZ_COMPONENT(AtomToolsDocumentSystemComponent, "{343A3383-6A59-4343-851B-BF84FC6CB18E}");
-
-        AtomToolsDocumentSystemComponent();
-        ~AtomToolsDocumentSystemComponent() = default;
-        AtomToolsDocumentSystemComponent(const AtomToolsDocumentSystemComponent&) = delete;
-        AtomToolsDocumentSystemComponent& operator=(const AtomToolsDocumentSystemComponent&) = delete;
+        AZ_CLASS_ALLOCATOR(AtomToolsFramework::AtomToolsDocumentSystem, AZ::SystemAllocator, 0);
+        AZ_RTTI(AtomToolsFramework::AtomToolsDocumentSystem, "{9D31F309-6B20-40C5-813C-F1226180E1F8}");
+        AZ_DISABLE_COPY_MOVE(AtomToolsDocumentSystem);
 
         static void Reflect(AZ::ReflectContext* context);
 
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
-        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
+        AtomToolsDocumentSystem() = default;
+        AtomToolsDocumentSystem(const AZ::Crc32& toolId);
+        ~AtomToolsDocumentSystem();
 
-    private:
-        ////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
-        void Init() override;
-        void Activate() override;
-        void Deactivate() override;
-        ////////////////////////////////////////////////////////////////////////
-
-        //////////////////////////////////////////////////////////////////////////
-        // AtomToolsDocumentNotificationBus::Handler overrides...
-        void OnDocumentDependencyModified(const AZ::Uuid& documentId) override;
-        void OnDocumentExternallyModified(const AZ::Uuid& documentId) override;
-        //////////////////////////////////////////////////////////////////////////
-
-        void QueueReopenDocuments();
-        void ReopenDocuments();
-
-        ////////////////////////////////////////////////////////////////////////
         // AtomToolsDocumentSystemRequestBus::Handler overrides...
-        void RegisterDocumentType(AZStd::function<AtomToolsDocument*()> documentCreator) override;
+        void RegisterDocumentType(const AtomToolsDocumentFactoryCallback& documentCreator) override;
         AZ::Uuid CreateDocument() override;
         bool DestroyDocument(const AZ::Uuid& documentId) override;
         AZ::Uuid OpenDocument(AZStd::string_view sourcePath) override;
@@ -74,11 +48,19 @@ namespace AtomToolsFramework
         bool SaveDocumentAsChild(const AZ::Uuid& documentId, AZStd::string_view targetPath) override;
         bool SaveAllDocuments() override;
         AZ::u32 GetDocumentCount() const override;
-        ////////////////////////////////////////////////////////////////////////
+
+    private:
+        // AtomToolsDocumentNotificationBus::Handler overrides...
+        void OnDocumentDependencyModified(const AZ::Uuid& documentId) override;
+        void OnDocumentExternallyModified(const AZ::Uuid& documentId) override;
+
+        void QueueReopenDocuments();
+        void ReopenDocuments();
 
         AZ::Uuid OpenDocumentImpl(AZStd::string_view sourcePath, bool checkIfAlreadyOpen);
 
-        AZStd::function<AtomToolsDocument*()> m_documentCreator;
+        const AZ::Crc32 m_toolId = {};
+        AtomToolsDocumentFactoryCallback m_documentCreator;
         AZStd::unordered_map<AZ::Uuid, AZStd::shared_ptr<AtomToolsDocument>> m_documentMap;
         AZStd::unordered_set<AZ::Uuid> m_documentIdsWithExternalChanges;
         AZStd::unordered_set<AZ::Uuid> m_documentIdsWithDependencyChanges;
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h
index 88b5acd3be..d59dc64034 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h
@@ -14,16 +14,19 @@ namespace AtomToolsFramework
 {
     class AtomToolsDocument;
 
-    //! AtomToolsDocumentSystemRequestBus provides high level requests for menus, scripts, etc.
+    using AtomToolsDocumentFactoryCallback = AZStd::function<AtomToolsDocument*(const AZ::Crc32&)>;
+
+    //! AtomToolsDocumentSystemRequestBus is an interface that provides requests for high level user interactions with a system of documents
     class AtomToolsDocumentSystemRequests
         : public AZ::EBusTraits
     {
     public:
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        typedef AZ::Crc32 BusIdType;
 
         //! Register a document factory function used to create specific document types
-        virtual void RegisterDocumentType(AZStd::function<AtomToolsDocument*()> documentCreator) = 0;
+        virtual void RegisterDocumentType(const AtomToolsDocumentFactoryCallback& documentCreator) = 0;
 
         //! Create a document
         //! @return Uuid of new document, or null Uuid if failed
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/DollyCameraBehavior.h
similarity index 67%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/DollyCameraBehavior.h
index 5debfc4dd1..770c0e108a 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/DollyCameraBehavior.h
@@ -5,19 +5,20 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
+
 #pragma once
 
-#include <Viewport/InputController/Behavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
     //! Moves(zooms) camera back and forth towards the target
-    class DollyCameraBehavior final
-        : public Behavior
+    class DollyCameraBehavior final : public ViewportInputBehavior
     {
     public:
-        DollyCameraBehavior() = default;
+        DollyCameraBehavior(ViewportInputBehaviorControllerInterface* controller);
         virtual ~DollyCameraBehavior() = default;
+
     protected:
         void TickInternal(float x, float y, float z) override;
         float GetSensitivityX() override;
@@ -27,4 +28,4 @@ namespace MaterialEditor
         static constexpr float SensitivityX = 0;
         static constexpr float SensitivityY = 0.005f;
     };
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/MoveCameraBehavior.h
similarity index 69%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/MoveCameraBehavior.h
index ea0850ba16..011f12def2 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/MoveCameraBehavior.h
@@ -5,18 +5,18 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
+
 #pragma once
 
-#include <Viewport/InputController/Behavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
     //! Moves camera along its vertical and horizontal axis
-    class MoveCameraBehavior final
-        : public Behavior
+    class MoveCameraBehavior final : public ViewportInputBehavior
     {
     public:
-        MoveCameraBehavior() = default;
+        MoveCameraBehavior(ViewportInputBehaviorControllerInterface* controller);
         virtual ~MoveCameraBehavior() = default;
         void End() override;
 
@@ -29,4 +29,4 @@ namespace MaterialEditor
         static constexpr float SensitivityX = 0.01f;
         static constexpr float SensitivityY = 0.01f;
     };
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/OrbitCameraBehavior.h
similarity index 71%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/OrbitCameraBehavior.h
index a312d22e73..e7e20d665d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/OrbitCameraBehavior.h
@@ -5,19 +5,19 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
+
 #pragma once
 
-#include <Viewport/InputController/Behavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
     //! Rotates the camera around target position,
     //! this can either be model center or any position in world
-    class OrbitCameraBehavior final
-        : public Behavior
+    class OrbitCameraBehavior final : public ViewportInputBehavior
     {
     public:
-        OrbitCameraBehavior() = default;
+        OrbitCameraBehavior(ViewportInputBehaviorControllerInterface* controller);
         virtual ~OrbitCameraBehavior() = default;
 
     protected:
@@ -30,7 +30,6 @@ namespace MaterialEditor
 
         static constexpr float SensitivityX = 0.005f;
         static constexpr float SensitivityY = 0.005f;
-        
         bool m_aligned = false;
     };
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/PanCameraBehavior.h
similarity index 69%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/PanCameraBehavior.h
index 93233511f0..c4351f0854 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/PanCameraBehavior.h
@@ -5,20 +5,20 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
+
 #pragma once
 
-#include <Viewport/InputController/Behavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
     //! Rotates camera around its own axis, allowing to look up/down/left/right
-    class PanCameraBehavior final
-        : public Behavior
+    class PanCameraBehavior final : public ViewportInputBehavior
     {
     public:
-        PanCameraBehavior() = default;
+        PanCameraBehavior(ViewportInputBehaviorControllerInterface* controller);
         virtual ~PanCameraBehavior() = default;
-        
+
         void End() override;
 
     protected:
@@ -30,4 +30,4 @@ namespace MaterialEditor
         static constexpr float SensitivityX = 0.005f;
         static constexpr float SensitivityY = 0.005f;
     };
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateEnvironmentBehavior.h
similarity index 66%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateEnvironmentBehavior.h
index 56c7a5190a..ef90139750 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateEnvironmentBehavior.h
@@ -5,9 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
+
 #pragma once
 
-#include <Viewport/InputController/Behavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h>
 
 namespace AZ
 {
@@ -15,16 +16,15 @@ namespace AZ
     {
         class SkyBoxFeatureProcessorInterface;
     }
-}
+} // namespace AZ
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
     //! Rotates lighting and skybox around vertical axis
-    class RotateEnvironmentBehavior final
-        : public Behavior
+    class RotateEnvironmentBehavior final : public ViewportInputBehavior
     {
     public:
-        RotateEnvironmentBehavior() = default;
+        RotateEnvironmentBehavior(ViewportInputBehaviorControllerInterface* controller);
         virtual ~RotateEnvironmentBehavior() = default;
 
         void Start() override;
@@ -38,8 +38,8 @@ namespace MaterialEditor
         static constexpr float SensitivityX = 0.01f;
         static constexpr float SensitivityY = 0;
 
-        AZ::EntityId m_iblEntityId;
-        AZ::Render::SkyBoxFeatureProcessorInterface* m_skyBoxFeatureProcessorInterface = nullptr;
-        float m_rotation = 0;
+        AZ::EntityId m_environmentEntityId;
+        AZ::Render::SkyBoxFeatureProcessorInterface* m_skyBoxFeatureProcessor = {};
+        float m_rotation = {};
     };
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateModelBehavior.h
similarity index 71%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateModelBehavior.h
index e2c20ab5fd..a77b840052 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateModelBehavior.h
@@ -5,18 +5,18 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
+
 #pragma once
 
-#include <Viewport/InputController/Behavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
     //! Rotates target model in viewport
-    class RotateModelBehavior final
-        : public Behavior
+    class RotateModelBehavior final : public ViewportInputBehavior
     {
     public:
-        RotateModelBehavior() = default;
+        RotateModelBehavior(ViewportInputBehaviorControllerInterface* controller);
         virtual ~RotateModelBehavior() = default;
 
         void Start() override;
@@ -33,4 +33,4 @@ namespace MaterialEditor
         AZ::EntityId m_targetEntityId;
         AZ::Vector3 m_cameraRight = AZ::Vector3::CreateAxisX();
     };
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h
similarity index 76%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.h
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h
index 8b5ff1745e..007f72a7e2 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h
@@ -5,22 +5,24 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
+
 #pragma once
 
 #include <AzCore/Component/EntityId.h>
-#include <AzCore/Math/Quaternion.h>
 #include <AzCore/Component/TickBus.h>
+#include <AzCore/Math/Quaternion.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
-    //! Performs a single type of action for MaterialEditorViewportInputController based on input
+    class ViewportInputBehaviorControllerInterface;
+
+    //! Performs a single type of action for ViewportInputBehaviorController based on input
     //! See derived behaviors for specific details
-    class Behavior
-        : public AZ::TickBus::Handler
+    class ViewportInputBehavior : public AZ::TickBus::Handler
     {
     public:
-        Behavior();
-        virtual ~Behavior();
+        ViewportInputBehavior(ViewportInputBehaviorControllerInterface* controller);
+        virtual ~ViewportInputBehavior();
 
         virtual void Start();
         virtual void End();
@@ -45,20 +47,21 @@ namespace MaterialEditor
         //! If delta transform less than this, snap instantly
         static constexpr float SnapInterval = 0.01f;
         //! delta x movement accumulated during current frame
-        float m_x = 0;
+        float m_x = {};
         //! delta y movement accumulated during current frame
-        float m_y = 0;
+        float m_y = {};
         //! delta scroll wheel accumulated during current frame
-        float m_z = 0;
+        float m_z = {};
         //! Model radius
         float m_radius = 1.0f;
 
         AZ::EntityId m_cameraEntityId;
         AZ::Vector3 m_targetPosition = AZ::Vector3::CreateZero();
-        float m_distanceToTarget = 0;
+        float m_distanceToTarget = {};
+        ViewportInputBehaviorControllerInterface* m_controller = {};
 
     private:
         // AZ::TickBus::Handler interface overrides...
         void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
     };
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorController.h
similarity index 68%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorController.h
index a68666f06d..631a4465eb 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorController.h
@@ -7,48 +7,25 @@
  */
 #pragma once
 
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h>
 #include <AzFramework/Input/Events/InputChannelEventListener.h>
 #include <AzFramework/Viewport/SingleViewportController.h>
-#include <Viewport/InputController/Behavior.h>
-#include <Viewport/InputController/MaterialEditorViewportInputControllerBus.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
-    class Behavior;
+    class ViewportInputBehavior;
 
     //! Provides controls for manipulating camera, model, and environment in Material Editor
-    class MaterialEditorViewportInputController
+    class ViewportInputBehaviorController
         : public AzFramework::SingleViewportController
-        , public MaterialEditorViewportInputControllerRequestBus::Handler
+        , public ViewportInputBehaviorControllerInterface
     {
     public:
+        AZ_TYPE_INFO(ViewportInputBehaviorController, "{569A0544-7654-4DCE-8156-00A71B408374}");
+        AZ_CLASS_ALLOCATOR(ViewportInputBehaviorController, AZ::SystemAllocator, 0)
+        AZ_DISABLE_COPY_MOVE(ViewportInputBehaviorController);
 
-        AZ_TYPE_INFO(MaterialEditorViewportInputController, "{569A0544-7654-4DCE-8156-00A71B408374}");
-        AZ_CLASS_ALLOCATOR(MaterialEditorViewportInputController, AZ::SystemAllocator, 0)
-
-        MaterialEditorViewportInputController();
-        virtual ~MaterialEditorViewportInputController();
-
-        void Init(const AZ::EntityId& cameraEntityId, const AZ::EntityId& targetEntityId, const AZ::EntityId& iblEntityId);
-
-        // MaterialEditorViewportInputControllerRequestBus::Handler interface overrides...
-        const AZ::EntityId& GetCameraEntityId() const override;
-        const AZ::EntityId& GetTargetEntityId() const override;
-        const AZ::EntityId& GetIblEntityId() const override;
-        const AZ::Vector3& GetTargetPosition() const override;
-        void SetTargetPosition(const AZ::Vector3& targetPosition) override;
-        float GetDistanceToTarget() const override;
-        void GetExtents(float& distanceMin, float& distanceMax) const override;
-        float GetRadius() const override;
-        void Reset() override;
-        void SetFieldOfView(float value) override;
-        bool IsCameraCentered() const override;
-
-        // AzFramework::ViewportControllerInstance interface overrides...
-        bool HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event) override;
-        void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override;
-
-    private:
         using KeyMask = uint32_t;
 
         enum Keys
@@ -62,13 +39,36 @@ namespace MaterialEditor
             Shift = 1 << 5
         };
 
+        ViewportInputBehaviorController(
+            const AZ::EntityId& cameraEntityId, const AZ::EntityId& targetEntityId, const AZ::EntityId& environmentEntityId);
+        virtual ~ViewportInputBehaviorController();
+
+        void AddBehavior(KeyMask mask, AZStd::shared_ptr<ViewportInputBehavior> behavior);
+
+        // ViewportInputBehaviorControllerInterface overrides...
+        const AZ::EntityId& GetCameraEntityId() const override;
+        const AZ::EntityId& GetTargetEntityId() const override;
+        const AZ::EntityId& GetEnvironmentEntityId() const override;
+        const AZ::Vector3& GetTargetPosition() const override;
+        void SetTargetPosition(const AZ::Vector3& targetPosition) override;
+        void SetTargetBounds(const AZ::Aabb& targetBounds) override;
+        float GetDistanceToTarget() const override;
+        void GetExtents(float& distanceMin, float& distanceMax) const override;
+        float GetRadius() const override;
+        void Reset() override;
+        void SetFieldOfView(float value) override;
+        bool IsCameraCentered() const override;
+
+        // AzFramework::ViewportControllerInstance overrides...
+        bool HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event) override;
+        void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override;
+
+    private:
         //! Calculate min and max dist and center based on mesh size of target model
         void CalculateExtents();
         //! Determine which behavior to set based on mouse/keyboard input
         void EvaluateControlBehavior();
 
-        bool m_initialized = false;
-
         //! Input keys currently pressed
         KeyMask m_keys = None;
         //! Input key sequence changed
@@ -77,16 +77,18 @@ namespace MaterialEditor
         float m_timeToBehaviorSwitchMs = 0;
 
         //! Current behavior of the controller
-        AZStd::shared_ptr<Behavior> m_behavior;
-        AZStd::unordered_map<KeyMask, AZStd::shared_ptr<Behavior>> m_behaviorMap;
+        AZStd::shared_ptr<ViewportInputBehavior> m_behavior;
+        AZStd::unordered_map<KeyMask, AZStd::shared_ptr<ViewportInputBehavior>> m_behaviorMap;
 
         AZ::EntityId m_cameraEntityId;
         //! Target entity is looking at
         AZ::EntityId m_targetEntityId;
         //! IBL entity for rotating environment lighting
-        AZ::EntityId m_iblEntityId;
+        AZ::EntityId m_environmentEntityId;
         //! Target position camera is pointed towards
         AZ::Vector3 m_targetPosition;
+        //! Target bounds
+        AZ::Aabb m_targetBounds = AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
         //! Center of the model observed
         AZ::Vector3 m_modelCenter;
         //! Minimum distance from camera to target
@@ -106,4 +108,4 @@ namespace MaterialEditor
         //! e.g. pressing RMB+LMB shouldn't switch into RMB behavior (or LMB behavior) first because it's virtually impossible to press both mouse buttons on the same frame
         static constexpr float BehaviorSwitchDelayMs = 0.1f;
     };
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputControllerBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h
similarity index 78%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputControllerBus.h
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h
index dbc33bf8d4..e6e5734469 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputControllerBus.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h
@@ -8,16 +8,15 @@
 #pragma once
 
 #include <AzCore/EBus/EBus.h>
+#include <AzCore/Math/Aabb.h>
 #include <AzCore/Math/Vector3.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
-    class MaterialEditorViewportInputControllerRequests
-        : public AZ::EBusTraits
+    class ViewportInputBehaviorControllerInterface
     {
     public:
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        virtual ~ViewportInputBehaviorControllerInterface() = default;
 
         //! Get entityId of viewport camera
         virtual const AZ::EntityId& GetCameraEntityId() const = 0;
@@ -26,7 +25,7 @@ namespace MaterialEditor
         virtual const AZ::EntityId& GetTargetEntityId() const = 0;
 
         //! Get entityId of scene's IBL entity
-        virtual const AZ::EntityId& GetIblEntityId() const = 0;
+        virtual const AZ::EntityId& GetEnvironmentEntityId() const = 0;
 
         //! Get actual position where the camera is facing
         virtual const AZ::Vector3& GetTargetPosition() const = 0;
@@ -35,6 +34,10 @@ namespace MaterialEditor
         //! @param targetPosition world space position to point camera at
         virtual void SetTargetPosition(const AZ::Vector3& targetPosition) = 0;
 
+        //! Set camera target bounds
+        //! @param targetBounds AABB of target
+        virtual void SetTargetBounds(const AZ::Aabb& targetBounds) = 0;
+
         //! Get distance between camera and its target
         virtual float GetDistanceToTarget() const = 0;
 
@@ -56,6 +59,4 @@ namespace MaterialEditor
         //! Check if camera is looking directly at a model
         virtual bool IsCameraCentered() const = 0;
     };
-
-    using MaterialEditorViewportInputControllerRequestBus = AZ::EBus<MaterialEditorViewportInputControllerRequests>;
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindow.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindow.h
index 86e9e2f291..558447998b 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindow.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindow.h
@@ -25,7 +25,7 @@ namespace AtomToolsFramework
         , protected AtomToolsMainWindowRequestBus::Handler
     {
     public:
-        AtomToolsMainWindow(QWidget* parent = 0);
+        AtomToolsMainWindow(const AZ::Crc32& toolId, QWidget* parent = 0);
         ~AtomToolsMainWindow();
 
     protected:
@@ -48,6 +48,9 @@ namespace AtomToolsFramework
 
         virtual void SetupMetrics();
         virtual void UpdateMetrics();
+        virtual void UpdateWindowTitle();
+
+        const AZ::Crc32 m_toolId = {};
 
         AzQtComponents::FancyDocking* m_advancedDockManager = {};
 
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h
deleted file mode 100644
index c93b4ba4b9..0000000000
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h
+++ /dev/null
@@ -1,30 +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
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-
-namespace AtomToolsFramework
-{
-    //! AtomToolsMainWindowFactoryRequestBus provides
-    class AtomToolsMainWindowFactoryRequests : public AZ::EBusTraits
-    {
-    public:
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-
-        /// Creates and shows main window
-        virtual void CreateMainWindow() = 0;
-
-        //! Destroys main window and releases all cached assets
-        virtual void DestroyMainWindow() = 0;
-    };
-    using AtomToolsMainWindowFactoryRequestBus = AZ::EBus<AtomToolsMainWindowFactoryRequests>;
-
-} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindowNotificationBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindowNotificationBus.h
index cadd3440d9..996396aaa2 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindowNotificationBus.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindowNotificationBus.h
@@ -16,7 +16,8 @@ namespace AtomToolsFramework
     {
     public:
         static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        typedef AZ::Crc32 BusIdType;
 
         virtual void OnMainWindowClosing(){};
     };
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindowRequestBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindowRequestBus.h
index cb63ff295c..e744ac92ed 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindowRequestBus.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Window/AtomToolsMainWindowRequestBus.h
@@ -16,12 +16,14 @@ class QWidget;
 
 namespace AtomToolsFramework
 {
-    //! AtomToolsMainWindowRequestBus provides
+    //! AtomToolsMainWindowRequestBus provides an interface to common main application window functions like adding docked windows,
+    //! resizing the viewport, and other operations 
     class AtomToolsMainWindowRequests : public AZ::EBusTraits
     {
     public:
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        typedef AZ::Crc32 BusIdType;
 
         //! Bring main window to foreground
         virtual void ActivateWindow() = 0;
@@ -58,6 +60,7 @@ namespace AtomToolsFramework
         //! Releases the viewport's render target resolution lock, allowing it to match the viewport widget again.
         virtual void UnlockViewportRenderTargetSize() {};
     };
+
     using AtomToolsMainWindowRequestBus = AZ::EBus<AtomToolsMainWindowRequests>;
 
 } // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp
index 4ba1d04b71..e35e120fbe 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp
@@ -9,7 +9,6 @@
 #include <Atom/RPI.Public/RPISystemInterface.h>
 #include <AtomToolsFramework/Application/AtomToolsApplication.h>
 #include <AtomToolsFramework/Util/Util.h>
-#include <AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h>
 #include <AtomToolsFramework/Window/AtomToolsMainWindowRequestBus.h>
 
 #include <AzCore/Component/ComponentApplicationLifecycle.h>
@@ -46,26 +45,16 @@ AZ_POP_DISABLE_WARNING
 
 namespace AtomToolsFramework
 {
-    AZStd::string AtomToolsApplication::GetBuildTargetName() const
-    {
-        return AZStd::string("AtomTools");
-    }
-
-    const char* AtomToolsApplication::GetCurrentConfigurationName() const
-    {
-#if defined(_RELEASE)
-        return "ReleaseAtomTools";
-#elif defined(_DEBUG)
-        return "DebugAtomTools";
-#else
-        return "ProfileAtomTools";
-#endif
-    }
-
-    AtomToolsApplication::AtomToolsApplication(int* argc, char*** argv)
+    AtomToolsApplication::AtomToolsApplication(const char* targetName, int* argc, char*** argv)
         : Application(argc, argv)
         , AzQtApplication(*argc, *argv)
+        , m_targetName(targetName)
+        , m_toolId(targetName)
     {
+        // The settings registry has been created at this point, so add the CMake target
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization(
+            *AZ::SettingsRegistry::Get(), m_targetName);
+
         // Suppress spam from the Source Control system
         m_traceLogger.AddWindowFilter(AzToolsFramework::SCC_WINDOW);
 
@@ -80,18 +69,26 @@ namespace AtomToolsFramework
         m_styleManager.reset(new AzQtComponents::StyleManager(this));
         m_styleManager->initialize(this, engineRootPath);
 
-        m_timer.setInterval(1);
+        const int updateIntervalWhenActive =
+            aznumeric_cast<int>(GetSettingOrDefault<AZ::u64>("/O3DE/AtomToolsFramework/Application/UpdateIntervalWhenActive", 1));
+        const int updateIntervalWhenNotActive =
+            aznumeric_cast<int>(GetSettingOrDefault<AZ::u64>("/O3DE/AtomToolsFramework/Application/UpdateIntervalWhenNotActive", 64));
+
+        m_timer.setInterval(updateIntervalWhenActive);
         connect(&m_timer, &QTimer::timeout, this, [this]()
         {
             this->PumpSystemEventLoopUntilEmpty();
             this->Tick();
         });
 
-        connect(this, &QGuiApplication::applicationStateChanged, this, [this]()
+        connect(this, &QGuiApplication::applicationStateChanged, this, [this, updateIntervalWhenActive, updateIntervalWhenNotActive]()
         {
             // Limit the update interval when not in focus to reduce power consumption and interference with other applications
-            this->m_timer.setInterval((applicationState() & Qt::ApplicationActive) ? 1 : 32);
+            this->m_timer.setInterval(
+                (applicationState() & Qt::ApplicationActive) ? updateIntervalWhenActive : updateIntervalWhenNotActive);
         });
+
+        AtomToolsMainWindowNotificationBus::Handler::BusConnect(m_toolId);
     }
 
     AtomToolsApplication ::~AtomToolsApplication()
@@ -108,6 +105,17 @@ namespace AtomToolsFramework
         GetSerializeContext()->CreateEditContext();
     }
 
+    const char* AtomToolsApplication::GetCurrentConfigurationName() const
+    {
+#if defined(_RELEASE)
+        return "ReleaseAtomTools";
+#elif defined(_DEBUG)
+        return "DebugAtomTools";
+#else
+        return "ProfileAtomTools";
+#endif
+    }
+
     void AtomToolsApplication::Reflect(AZ::ReflectContext* context)
     {
         Base::Reflect(context);
@@ -181,7 +189,7 @@ namespace AtomToolsFramework
         Base::StartCommon(systemEntity);
 
         const bool clearLogFile = GetSettingOrDefault("/O3DE/AtomToolsFramework/Application/ClearLogOnStart", false);
-        m_traceLogger.OpenLogFile(GetBuildTargetName() + ".log", clearLogFile);
+        m_traceLogger.OpenLogFile(m_targetName + ".log", clearLogFile);
 
         ConnectToAssetProcessor();
 
@@ -200,9 +208,6 @@ namespace AtomToolsFramework
 
         LoadSettings();
 
-        AtomToolsMainWindowNotificationBus::Handler::BusConnect();
-        AtomToolsMainWindowFactoryRequestBus::Broadcast(&AtomToolsMainWindowFactoryRequestBus::Handler::CreateMainWindow);
-
         auto editorPythonEventsInterface = AZ::Interface<AzToolsFramework::EditorPythonEventsInterface>::Get();
         if (editorPythonEventsInterface)
         {
@@ -218,16 +223,22 @@ namespace AtomToolsFramework
         m_timer.start();
     }
 
-    void AtomToolsApplication::OnMainWindowClosing()
+    void AtomToolsApplication::Tick()
     {
-        ExitMainLoop();
+        TickSystem();
+        Base::Tick();
+
+        if (WasExitMainLoopRequested())
+        {
+            m_timer.disconnect();
+            quit();
+        }
     }
 
     void AtomToolsApplication::Destroy()
     {
-        // before modules are unloaded, destroy UI to free up any assets it cached
-        AtomToolsMainWindowFactoryRequestBus::Broadcast(&AtomToolsMainWindowFactoryRequestBus::Handler::DestroyMainWindow);
         m_styleManager.reset();
+        UnloadSettings();
 
         AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
         AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler::BusDisconnect();
@@ -241,6 +252,11 @@ namespace AtomToolsFramework
 #endif
     }
 
+    void AtomToolsApplication::OnMainWindowClosing()
+    {
+        ExitMainLoop();
+    }
+
     AZStd::vector<AZStd::string> AtomToolsApplication::GetCriticalAssetFilters() const
     {
         return AZStd::vector<AZStd::string>({});
@@ -255,14 +271,12 @@ namespace AtomToolsFramework
         // and able to negotiate a connection when running a debug build
         // and to negotiate a connection
 
-        const auto targetName = GetBuildTargetName();
-
         AzFramework::AssetSystem::ConnectionSettings connectionSettings;
         AzFramework::AssetSystem::ReadConnectionSettingsFromSettingsRegistry(connectionSettings);
         connectionSettings.m_connectionDirection =
             AzFramework::AssetSystem::ConnectionSettings::ConnectionDirection::ConnectToAssetProcessor;
-        connectionSettings.m_connectionIdentifier = targetName;
-        connectionSettings.m_loggingCallback = [targetName]([[maybe_unused]] AZStd::string_view logData)
+        connectionSettings.m_connectionIdentifier = m_targetName;
+        connectionSettings.m_loggingCallback = [targetName = m_targetName]([[maybe_unused]] AZStd::string_view logData)
         {
             AZ_UNUSED(targetName);  // Prevent unused warning in release builds
             AZ_TracePrintf(targetName.c_str(), "%.*s", aznumeric_cast<int>(logData.size()), logData.data());
@@ -279,7 +293,7 @@ namespace AtomToolsFramework
 
     void AtomToolsApplication::CompileCriticalAssets()
     {
-        AZ_TracePrintf(GetBuildTargetName().c_str(), "Compiling critical assets.\n");
+        AZ_TracePrintf(m_targetName.c_str(), "Compiling critical assets.\n");
 
         QStringList failedAssets;
 
@@ -288,7 +302,7 @@ namespace AtomToolsFramework
         // So the asset id won't be found right after CompileAssetSync call.
         for (const AZStd::string& assetFilters : GetCriticalAssetFilters())
         {
-            AZ_TracePrintf(GetBuildTargetName().c_str(), "Compiling critical asset matching: %s.\n", assetFilters.c_str());
+            AZ_TracePrintf(m_targetName.c_str(), "Compiling critical asset matching: %s.\n", assetFilters.c_str());
 
             // Wait for the asset be compiled
             AzFramework::AssetSystem::AssetStatus status = AzFramework::AssetSystem::AssetStatus_Unknown;
@@ -335,7 +349,7 @@ namespace AtomToolsFramework
             AZ_Assert(context, "No serialize context");
 
             char resolvedPath[AZ_MAX_PATH_LEN] = "";
-            AZStd::string fileName = "@user@/" + GetBuildTargetName() + "UserSettings.xml";
+            AZStd::string fileName = "@user@/" + m_targetName + "UserSettings.xml";
 
             AZ::IO::FileIOBase::GetInstance()->ResolvePath(
                 fileName.c_str(), resolvedPath, AZ_ARRAY_SIZE(resolvedPath));
@@ -350,7 +364,7 @@ namespace AtomToolsFramework
         AZ_Assert(context, "No serialize context");
 
         char resolvedPath[AZ_MAX_PATH_LEN] = "";
-        AZStd::string fileName = "@user@/" + GetBuildTargetName() + "UserSettings.xml";
+        AZStd::string fileName = "@user@/" + m_targetName + "UserSettings.xml";
 
         AZ::IO::FileIOBase::GetInstance()->ResolvePath(fileName.c_str(), resolvedPath, AZ_MAX_PATH_LEN);
 
@@ -376,8 +390,7 @@ namespace AtomToolsFramework
         const AZStd::string activateWindowSwitchName = "activatewindow";
         if (commandLine.HasSwitch(activateWindowSwitchName))
         {
-            AtomToolsFramework::AtomToolsMainWindowRequestBus::Broadcast(
-                &AtomToolsFramework::AtomToolsMainWindowRequestBus::Handler::ActivateWindow);
+            AtomToolsMainWindowRequestBus::Event(m_toolId, &AtomToolsMainWindowRequestBus::Handler::ActivateWindow);
         }
 
         const AZStd::string timeoputSwitchName = "timeout";
@@ -385,14 +398,11 @@ namespace AtomToolsFramework
         {
             const AZStd::string& timeoutValue = commandLine.GetSwitchValue(timeoputSwitchName, 0);
             const uint32_t timeoutInMs = atoi(timeoutValue.c_str());
-            AZ_Printf(GetBuildTargetName().c_str(), "Timeout scheduled, shutting down in %u ms", timeoutInMs);
-            QTimer::singleShot(
-                timeoutInMs,
-                [this]
-                {
-                    AZ_Printf(GetBuildTargetName().c_str(), "Timeout reached, shutting down");
-                    ExitMainLoop();
-                });
+            AZ_Printf(m_targetName.c_str(), "Timeout scheduled, shutting down in %u ms", timeoutInMs);
+            QTimer::singleShot(timeoutInMs, [this] {
+                AZ_Printf(m_targetName.c_str(), "Timeout reached, shutting down");
+                ExitMainLoop();
+            });
         }
 
         // Process command line options for running one or more python scripts on startup
@@ -403,7 +413,7 @@ namespace AtomToolsFramework
             const AZStd::string runPythonScriptPath = commandLine.GetSwitchValue(runPythonScriptSwitchName, runPythonScriptIndex);
             AZStd::vector<AZStd::string_view> runPythonArgs;
 
-            AZ_Printf(GetBuildTargetName().c_str(), "Launching script: %s", runPythonScriptPath.c_str());
+            AZ_Printf(m_targetName.c_str(), "Launching script: %s", runPythonScriptPath.c_str());
             AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(
                 &AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilenameWithArgs, runPythonScriptPath, runPythonArgs);
         }
@@ -486,27 +496,6 @@ namespace AtomToolsFramework
         return false;
     }
 
-    void AtomToolsApplication::Tick()
-    {
-        TickSystem();
-        Base::Tick();
-
-        if (WasExitMainLoopRequested())
-        {
-            m_timer.disconnect();
-            quit();
-        }
-    }
-
-    void AtomToolsApplication::Stop()
-    {
-        AtomToolsMainWindowFactoryRequestBus::Broadcast(&AtomToolsMainWindowFactoryRequestBus::Handler::DestroyMainWindow);
-        m_styleManager.reset();
-
-        UnloadSettings();
-        Base::Stop();
-    }
-
     void AtomToolsApplication::QueryApplicationType(AZ::ApplicationTypeQuery& appType) const
     {
         appType.m_maskValue = AZ::ApplicationTypeQuery::Masks::Tool;
@@ -524,7 +513,7 @@ namespace AtomToolsFramework
 
         for (auto& line : lines)
         {
-            AZ_TracePrintf(GetBuildTargetName().c_str(), "Python: %s\n", line.c_str());
+            AZ_TracePrintf(m_targetName.c_str(), "Python: %s\n", line.c_str());
         }
 #endif
     }
@@ -537,7 +526,7 @@ namespace AtomToolsFramework
 
     void AtomToolsApplication::OnExceptionMessage([[maybe_unused]] AZStd::string_view message)
     {
-        AZ_Error(GetBuildTargetName().c_str(), false, "Python: " AZ_STRING_FORMAT, AZ_STRING_ARG(message));
+        AZ_Error(m_targetName.c_str(), false, "Python: " AZ_STRING_FORMAT, AZ_STRING_ARG(message));
     }
 
     // Copied from PyIdleWaitFrames in CryEdit.cpp
@@ -577,6 +566,8 @@ namespace AtomToolsFramework
 
     void AtomToolsApplication::PyExit()
     {
-        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::ExitMainLoop);
+        QTimer::singleShot(0, []() { 
+            AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::ExitMainLoop);
+        });
     }
 } // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AssetBrowser/AtomToolsAssetBrowser.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AssetBrowser/AtomToolsAssetBrowser.cpp
index 8394efa46f..81bdaf380f 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AssetBrowser/AtomToolsAssetBrowser.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AssetBrowser/AtomToolsAssetBrowser.cpp
@@ -89,13 +89,14 @@ namespace AtomToolsFramework
 
     void AtomToolsAssetBrowser::SelectEntries(const AZStd::string& absolutePath)
     {
-        if (!absolutePath.empty())
+        AZ::TickBus::Handler::BusDisconnect();
+
+        m_pathToSelect = absolutePath;
+        if (!m_pathToSelect.empty() && AzFramework::StringFunc::Path::Normalize(m_pathToSelect))
         {
             // Selecting a new asset in the browser is not guaranteed to happen immediately.
             // The asset browser model notifications are sent before the model is updated.
             // Instead of relying on the notifications, queue the selection and process it on tick until this change occurs.
-            m_pathToSelect = absolutePath;
-            AzFramework::StringFunc::Path::Normalize(m_pathToSelect);
             AZ::TickBus::Handler::BusConnect();
         }
     }
@@ -201,25 +202,29 @@ namespace AtomToolsFramework
         AZ_UNUSED(time);
         AZ_UNUSED(deltaTime);
 
-        if (!m_pathToSelect.empty())
+        if (m_pathToSelect.empty())
         {
-            // Attempt to select the new path
-            AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Broadcast(
-                &AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Events::SelectFileAtPath, m_pathToSelect);
+            AZ::TickBus::Handler::BusDisconnect();
+            m_pathToSelect.clear();
+            return;
+        }
 
-            // Iterate over the selected entries to verify if the selection was made
-            for (const AssetBrowserEntry* entry : m_ui->m_assetBrowserTreeViewWidget->GetSelectedAssets())
+        // Attempt to select the new path
+        AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Broadcast(
+            &AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Events::SelectFileAtPath, m_pathToSelect);
+
+        // Iterate over the selected entries to verify if the selection was made
+        for (const AssetBrowserEntry* entry : m_ui->m_assetBrowserTreeViewWidget->GetSelectedAssets())
+        {
+            if (entry)
             {
-                if (entry)
+                AZStd::string sourcePath = entry->GetFullPath();
+                AzFramework::StringFunc::Path::Normalize(sourcePath);
+                if (m_pathToSelect == sourcePath)
                 {
-                    AZStd::string sourcePath = entry->GetFullPath();
-                    AzFramework::StringFunc::Path::Normalize(sourcePath);
-                    if (m_pathToSelect == sourcePath)
-                    {
-                        // Once the selection is confirmed, cancel the operation and disconnect
-                        AZ::TickBus::Handler::BusDisconnect();
-                        m_pathToSelect.clear();
-                    }
+                    // Once the selection is confirmed, cancel the operation and disconnect
+                    AZ::TickBus::Handler::BusDisconnect();
+                    m_pathToSelect.clear();
                 }
             }
         }
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AssetGridDialog/AssetGridDialog.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AssetGridDialog/AssetGridDialog.cpp
index ed19c4890d..806c5fddbc 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AssetGridDialog/AssetGridDialog.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AssetGridDialog/AssetGridDialog.cpp
@@ -13,7 +13,6 @@
 #include <AzQtComponents/Components/Widgets/LineEdit.h>
 #include <AzQtComponents/Components/Widgets/Text.h>
 #include <AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailContext.h>
 #include <AzToolsFramework/Thumbnails/ThumbnailWidget.h>
 #include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
 
@@ -105,9 +104,7 @@ namespace AtomToolsFramework
 
         AzToolsFramework::Thumbnailer::ThumbnailWidget* thumbnail = new AzToolsFramework::Thumbnailer::ThumbnailWidget(itemWidget);
         thumbnail->setFixedSize(m_tileSize);
-        thumbnail->SetThumbnailKey(
-            MAKE_TKEY(AzToolsFramework::AssetBrowser::ProductThumbnailKey, selectableAsset.m_assetId),
-            AzToolsFramework::Thumbnailer::ThumbnailContext::DefaultContext);
+        thumbnail->SetThumbnailKey(MAKE_TKEY(AzToolsFramework::AssetBrowser::ProductThumbnailKey, selectableAsset.m_assetId));
         thumbnail->updateGeometry();
         itemWidget->layout()->addWidget(thumbnail);
 
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.cpp
index 978ac52cca..a67e00a955 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.cpp
@@ -8,7 +8,6 @@
 
 #include <AtomToolsFrameworkModule.h>
 #include <AtomToolsFrameworkSystemComponent.h>
-#include <Document/AtomToolsDocumentSystemComponent.h>
 #include <Window/AtomToolsMainWindowSystemComponent.h>
 #include <PerformanceMonitor/PerformanceMonitorSystemComponent.h>
 #include <PreviewRenderer/PreviewRendererSystemComponent.h>
@@ -19,7 +18,6 @@ namespace AtomToolsFramework
     {
         m_descriptors.insert(m_descriptors.end(), {
                 AtomToolsFrameworkSystemComponent::CreateDescriptor(),
-                AtomToolsDocumentSystemComponent::CreateDescriptor(),
                 AtomToolsMainWindowSystemComponent::CreateDescriptor(),
                 PerformanceMonitorSystemComponent::CreateDescriptor(),
                 PreviewRendererSystemComponent::CreateDescriptor(),
@@ -30,7 +28,6 @@ namespace AtomToolsFramework
     {
         return AZ::ComponentTypeList{
             azrtti_typeid<AtomToolsFrameworkSystemComponent>(),
-            azrtti_typeid<AtomToolsDocumentSystemComponent>(),
             azrtti_typeid<AtomToolsMainWindowSystemComponent>(),
             azrtti_typeid<PerformanceMonitorSystemComponent>(),
             azrtti_typeid<PreviewRendererSystemComponent>(),
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocument.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocument.cpp
index 2660a1e8fb..d99369958c 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocument.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocument.cpp
@@ -13,17 +13,18 @@
 
 namespace AtomToolsFramework
 {
-    AtomToolsDocument::AtomToolsDocument()
+    AtomToolsDocument::AtomToolsDocument(const AZ::Crc32& toolId)
+        : m_toolId(toolId)
     {
         AtomToolsDocumentRequestBus::Handler::BusConnect(m_id);
-        AtomToolsDocumentNotificationBus::Broadcast(&AtomToolsDocumentNotificationBus::Events::OnDocumentCreated, m_id);
+        AtomToolsDocumentNotificationBus::Event(m_toolId, &AtomToolsDocumentNotificationBus::Events::OnDocumentCreated, m_id);
     }
 
     AtomToolsDocument::~AtomToolsDocument()
     {
-        AzToolsFramework::AssetSystemBus::Handler::BusDisconnect();
-        AtomToolsDocumentNotificationBus::Broadcast(&AtomToolsDocumentNotificationBus::Events::OnDocumentDestroyed, m_id);
+        AtomToolsDocumentNotificationBus::Event(m_toolId, &AtomToolsDocumentNotificationBus::Events::OnDocumentDestroyed, m_id);
         AtomToolsDocumentRequestBus::Handler::BusDisconnect();
+        AzToolsFramework::AssetSystemBus::Handler::BusDisconnect();
     }
 
     const AZ::Uuid& AtomToolsDocument::GetId() const
@@ -80,10 +81,10 @@ namespace AtomToolsFramework
             return false;
         }
 
-        AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-            &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentModified, m_id);
-        AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-            &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentUndoStateChanged, m_id);
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+            m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentModified, m_id);
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+            m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentUndoStateChanged, m_id);
         return true;
     }
 
@@ -169,8 +170,8 @@ namespace AtomToolsFramework
 
         AZ_TracePrintf("AtomToolsDocument", "Document closed: '%s'.\n", m_absolutePath.c_str());
 
-        AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-            &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentClosed, m_id);
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+            m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentClosed, m_id);
 
         // Clearing after notification so paths are still available
         Clear();
@@ -211,8 +212,8 @@ namespace AtomToolsFramework
             // The history index is one beyond the last executed command. Decrement the index then execute undo.
             m_undoHistory[--m_undoHistoryIndex].first();
             AZ_TracePrintf("AtomToolsDocument", "Document undo: '%s'.\n", m_absolutePath.c_str());
-            AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-                &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentUndoStateChanged, m_id);
+            AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+                m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentUndoStateChanged, m_id);
             return true;
         }
         return false;
@@ -225,8 +226,8 @@ namespace AtomToolsFramework
             // Execute the current redo command then move the history index to the next position.
             m_undoHistory[m_undoHistoryIndex++].second();
             AZ_TracePrintf("AtomToolsDocument", "Document redo: '%s'.\n", m_absolutePath.c_str());
-            AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-                &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentUndoStateChanged, m_id);
+            AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+                m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentUndoStateChanged, m_id);
             return true;
         }
         return false;
@@ -259,8 +260,8 @@ namespace AtomToolsFramework
     {
         AZ_TracePrintf("AtomToolsDocument", "Document opened: '%s'.\n", m_absolutePath.c_str());
         AzToolsFramework::AssetSystemBus::Handler::BusConnect();
-        AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-            &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentOpened, m_id);
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+            m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentOpened, m_id);
         return true;
     }
 
@@ -282,8 +283,8 @@ namespace AtomToolsFramework
             &AzToolsFramework::SourceControlCommandBus::Events::RequestEdit, m_savePathNormalized.c_str(), true,
             [](bool, const AzToolsFramework::SourceControlFileInfo&) {});
 
-        AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-            &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentSaved, m_id);
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+            m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentSaved, m_id);
         return true;
     }
 
@@ -319,8 +320,8 @@ namespace AtomToolsFramework
 
         // Assign the index to the end of history
         m_undoHistoryIndex = aznumeric_cast<int>(m_undoHistory.size());
-        AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-            &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentUndoStateChanged, m_id);
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+            m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentUndoStateChanged, m_id);
     }
 
     void AtomToolsDocument::SourceFileChanged(AZStd::string relativePath, AZStd::string scanFolder, [[maybe_unused]] AZ::Uuid sourceUUID)
@@ -333,16 +334,16 @@ namespace AtomToolsFramework
             if (!m_ignoreSourceFileChangeToSelf)
             {
                 AZ_TracePrintf("AtomToolsDocument", "Document changed externally: '%s'.\n", m_absolutePath.c_str());
-                AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-                    &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentExternallyModified, m_id);
+                AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+                    m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentExternallyModified, m_id);
             }
             m_ignoreSourceFileChangeToSelf = false;
         }
         else if (m_sourceDependencies.find(sourcePath) != m_sourceDependencies.end())
         {
             AZ_TracePrintf("AtomToolsDocument", "Document dependency changed: '%s'.\n", m_absolutePath.c_str());
-            AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-                &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentDependencyModified, m_id);
+            AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+                m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentDependencyModified, m_id);
         }
     }
 
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentApplication.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentApplication.cpp
index beb414bb6c..f0dea20402 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentApplication.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentApplication.cpp
@@ -11,11 +11,29 @@
 
 namespace AtomToolsFramework
 {
-    AtomToolsDocumentApplication::AtomToolsDocumentApplication(int* argc, char*** argv)
-        : Base(argc, argv)
+    AtomToolsDocumentApplication::AtomToolsDocumentApplication(const char* targetName, int* argc, char*** argv)
+        : Base(targetName, argc, argv)
     {
     }
 
+    void AtomToolsDocumentApplication::Reflect(AZ::ReflectContext* context)
+    {
+        Base::Reflect(context);
+        AtomToolsDocumentSystem::Reflect(context);
+    }
+
+    void AtomToolsDocumentApplication::StartCommon(AZ::Entity* systemEntity)
+    {
+        Base::StartCommon(systemEntity);
+        m_documentSystem.reset(aznew AtomToolsDocumentSystem(m_toolId));
+    }
+
+    void AtomToolsDocumentApplication::Destroy()
+    {
+        m_documentSystem.reset();
+        Base::Destroy();
+    }
+
     void AtomToolsDocumentApplication::ProcessCommandLine(const AZ::CommandLine& commandLine)
     {
         // Process command line options for opening documents on startup
@@ -24,8 +42,8 @@ namespace AtomToolsFramework
         {
             const AZStd::string openDocumentPath = commandLine.GetMiscValue(openDocumentIndex);
 
-            AZ_Printf(GetBuildTargetName().c_str(), "Opening document: %s", openDocumentPath.c_str());
-            AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::OpenDocument, openDocumentPath);
+            AZ_Printf(m_targetName.c_str(), "Opening document: %s", openDocumentPath.c_str());
+            AtomToolsDocumentSystemRequestBus::Event(m_toolId, &AtomToolsDocumentSystemRequestBus::Events::OpenDocument, openDocumentPath);
         }
 
         Base::ProcessCommandLine(commandLine);
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentMainWindow.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentMainWindow.cpp
index e8be20097f..f2db527ea8 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentMainWindow.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentMainWindow.cpp
@@ -25,13 +25,13 @@ AZ_POP_DISABLE_WARNING
 
 namespace AtomToolsFramework
 {
-    AtomToolsDocumentMainWindow::AtomToolsDocumentMainWindow(QWidget* parent /* = 0 */)
-        : AtomToolsMainWindow(parent)
+    AtomToolsDocumentMainWindow::AtomToolsDocumentMainWindow(const AZ::Crc32& toolId, QWidget* parent /* = 0 */)
+        : AtomToolsMainWindow(toolId, parent)
     {
         setObjectName("AtomToolsDocumentMainWindow");
         AddDocumentMenus();
         AddDocumentTabBar();
-        AtomToolsDocumentNotificationBus::Handler::BusConnect();
+        AtomToolsDocumentNotificationBus::Handler::BusConnect(m_toolId);
     }
 
     AtomToolsDocumentMainWindow::~AtomToolsDocumentMainWindow()
@@ -49,8 +49,8 @@ namespace AtomToolsFramework
             AZStd::string savePath;
             if (GetCreateDocumentParams(openPath, savePath))
             {
-                AtomToolsDocumentSystemRequestBus::Broadcast(
-                    &AtomToolsDocumentSystemRequestBus::Events::CreateDocumentFromFile, openPath, savePath);
+                AtomToolsDocumentSystemRequestBus::Event(
+                    m_toolId, &AtomToolsDocumentSystemRequestBus::Events::CreateDocumentFromFile, openPath, savePath);
             }
         }, QKeySequence::New);
         m_menuFile->insertAction(insertPostion, m_actionNew);
@@ -59,7 +59,7 @@ namespace AtomToolsFramework
             AZStd::string openPath;
             if (GetOpenDocumentParams(openPath))
             {
-                AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::OpenDocument, openPath);
+                AtomToolsDocumentSystemRequestBus::Event(m_toolId, &AtomToolsDocumentSystemRequestBus::Events::OpenDocument, openPath);
             }
         }, QKeySequence::Open);
         m_menuFile->insertAction(insertPostion, m_actionOpen);
@@ -68,7 +68,8 @@ namespace AtomToolsFramework
         m_actionSave = CreateAction("&Save", [this]() {
             const AZ::Uuid documentId = GetDocumentTabId(m_tabWidget->currentIndex());
             bool result = false;
-            AtomToolsDocumentSystemRequestBus::BroadcastResult(result, &AtomToolsDocumentSystemRequestBus::Events::SaveDocument, documentId);
+            AtomToolsDocumentSystemRequestBus::EventResult(
+                result, m_toolId, &AtomToolsDocumentSystemRequestBus::Events::SaveDocument, documentId);
             if (!result)
             {
                 SetStatusError(tr("Document save failed: %1").arg(GetDocumentPath(documentId)));
@@ -81,8 +82,9 @@ namespace AtomToolsFramework
             const QString documentPath = GetDocumentPath(documentId);
 
             bool result = false;
-            AtomToolsDocumentSystemRequestBus::BroadcastResult(result, &AtomToolsDocumentSystemRequestBus::Events::SaveDocumentAsCopy,
-                documentId, GetSaveFileInfo(documentPath).absoluteFilePath().toUtf8().constData());
+            AtomToolsDocumentSystemRequestBus::EventResult(
+                result, m_toolId, &AtomToolsDocumentSystemRequestBus::Events::SaveDocumentAsCopy, documentId,
+                GetSaveFileInfo(documentPath).absoluteFilePath().toUtf8().constData());
             if (!result)
             {
                 SetStatusError(tr("Document save failed: %1").arg(GetDocumentPath(documentId)));
@@ -95,8 +97,9 @@ namespace AtomToolsFramework
             const QString documentPath = GetDocumentPath(documentId);
 
             bool result = false;
-            AtomToolsDocumentSystemRequestBus::BroadcastResult(result, &AtomToolsDocumentSystemRequestBus::Events::SaveDocumentAsChild,
-                documentId, GetSaveFileInfo(documentPath).absoluteFilePath().toUtf8().constData());
+            AtomToolsDocumentSystemRequestBus::EventResult(
+                result, m_toolId, &AtomToolsDocumentSystemRequestBus::Events::SaveDocumentAsChild, documentId,
+                GetSaveFileInfo(documentPath).absoluteFilePath().toUtf8().constData());
             if (!result)
             {
                 SetStatusError(tr("Document save failed: %1").arg(GetDocumentPath(documentId)));
@@ -106,7 +109,8 @@ namespace AtomToolsFramework
 
         m_actionSaveAll = CreateAction("Save A&ll", [this]() {
             bool result = false;
-            AtomToolsDocumentSystemRequestBus::BroadcastResult(result, &AtomToolsDocumentSystemRequestBus::Events::SaveAllDocuments);
+            AtomToolsDocumentSystemRequestBus::EventResult(
+                result, m_toolId, &AtomToolsDocumentSystemRequestBus::Events::SaveAllDocuments);
             if (!result)
             {
                 SetStatusError(tr("Document save all failed"));
@@ -117,18 +121,19 @@ namespace AtomToolsFramework
 
         m_actionClose = CreateAction("&Close", [this]() {
             const AZ::Uuid documentId = GetDocumentTabId(m_tabWidget->currentIndex());
-            AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::CloseDocument, documentId);
+            AtomToolsDocumentSystemRequestBus::Event(m_toolId, &AtomToolsDocumentSystemRequestBus::Events::CloseDocument, documentId);
         }, QKeySequence::Close);
         m_menuFile->insertAction(insertPostion, m_actionClose);
 
-        m_actionCloseAll = CreateAction("Close All", []() {
-            AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::CloseAllDocuments);
+        m_actionCloseAll = CreateAction("Close All", [this]() {
+            AtomToolsDocumentSystemRequestBus::Event(m_toolId, &AtomToolsDocumentSystemRequestBus::Events::CloseAllDocuments);
         });
         m_menuFile->insertAction(insertPostion, m_actionCloseAll);
 
         m_actionCloseOthers = CreateAction("Close Others", [this]() {
             const AZ::Uuid documentId = GetDocumentTabId(m_tabWidget->currentIndex());
-            AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::CloseAllDocumentsExcept, documentId);
+            AtomToolsDocumentSystemRequestBus::Event(
+                m_toolId, &AtomToolsDocumentSystemRequestBus::Events::CloseAllDocumentsExcept, documentId);
         });
         m_menuFile->insertAction(insertPostion, m_actionCloseOthers);
         m_menuFile->insertSeparator(insertPostion);
@@ -194,12 +199,12 @@ namespace AtomToolsFramework
         // This should automatically clear the active document
         connect(m_tabWidget, &QTabWidget::currentChanged, this, [this](int tabIndex) {
             const AZ::Uuid documentId = GetDocumentTabId(tabIndex);
-            AtomToolsDocumentNotificationBus::Broadcast(&AtomToolsDocumentNotificationBus::Events::OnDocumentOpened, documentId);
+            AtomToolsDocumentNotificationBus::Event(m_toolId,&AtomToolsDocumentNotificationBus::Events::OnDocumentOpened, documentId);
         });
 
         connect(m_tabWidget, &QTabWidget::tabCloseRequested, this, [this](int tabIndex) {
             const AZ::Uuid documentId = GetDocumentTabId(tabIndex);
-            AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::CloseDocument, documentId);
+            AtomToolsDocumentSystemRequestBus::Event(m_toolId, &AtomToolsDocumentSystemRequestBus::Events::CloseDocument, documentId);
         });
 
         // Add context menu for right-clicking on tabs
@@ -341,15 +346,18 @@ namespace AtomToolsFramework
             const QString selectActionName = (currentTabIndex == clickedTabIndex) ? "Select in Browser" : "Select";
             tabMenu.addAction(selectActionName, [this, clickedTabIndex]() {
                 const AZ::Uuid documentId = GetDocumentTabId(clickedTabIndex);
-                AtomToolsDocumentNotificationBus::Broadcast(&AtomToolsDocumentNotificationBus::Events::OnDocumentOpened, documentId);
+                AtomToolsDocumentNotificationBus::Event(
+                    m_toolId, &AtomToolsDocumentNotificationBus::Events::OnDocumentOpened, documentId);
             });
             tabMenu.addAction("Close", [this, clickedTabIndex]() {
                 const AZ::Uuid documentId = GetDocumentTabId(clickedTabIndex);
-                AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::CloseDocument, documentId);
+                AtomToolsDocumentSystemRequestBus::Event(
+                    m_toolId, &AtomToolsDocumentSystemRequestBus::Events::CloseDocument, documentId);
             });
             auto closeOthersAction = tabMenu.addAction("Close Others", [this, clickedTabIndex]() {
                 const AZ::Uuid documentId = GetDocumentTabId(clickedTabIndex);
-                AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::CloseAllDocumentsExcept, documentId);
+                AtomToolsDocumentSystemRequestBus::Event(
+                    m_toolId, &AtomToolsDocumentSystemRequestBus::Events::CloseAllDocumentsExcept, documentId);
             });
             closeOthersAction->setEnabled(tabBar->count() > 1);
             tabMenu.exec(QCursor::pos());
@@ -472,14 +480,14 @@ namespace AtomToolsFramework
     void AtomToolsDocumentMainWindow::closeEvent(QCloseEvent* closeEvent)
     {
         bool didClose = true;
-        AtomToolsDocumentSystemRequestBus::BroadcastResult(didClose, &AtomToolsDocumentSystemRequestBus::Events::CloseAllDocuments);
+        AtomToolsDocumentSystemRequestBus::EventResult(didClose, m_toolId, &AtomToolsDocumentSystemRequestBus::Events::CloseAllDocuments);
         if (!didClose)
         {
             closeEvent->ignore();
             return;
         }
 
-        AtomToolsMainWindowNotificationBus::Broadcast(&AtomToolsMainWindowNotifications::OnMainWindowClosing);
+        AtomToolsMainWindowNotificationBus::Event(m_toolId, &AtomToolsMainWindowNotifications::OnMainWindowClosing);
     }
 
     template<typename Functor>
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystem.cpp
similarity index 65%
rename from Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystem.cpp
index 329bc1b1b3..2254e92490 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystem.cpp
@@ -9,6 +9,7 @@
 #include <AtomToolsFramework/Debug/TraceRecorder.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h>
+#include <AtomToolsFramework/Document/AtomToolsDocumentSystem.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h>
 #include <AtomToolsFramework/Util/Util.h>
 #include <AzCore/RTTI/BehaviorContext.h>
@@ -17,7 +18,6 @@
 #include <AzFramework/Asset/AssetSystemBus.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
-#include <Document/AtomToolsDocumentSystemComponent.h>
 
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
 #include <QApplication>
@@ -28,20 +28,16 @@ AZ_POP_DISABLE_WARNING
 
 namespace AtomToolsFramework
 {
-    AtomToolsDocumentSystemComponent::AtomToolsDocumentSystemComponent()
+    void AtomToolsDocumentSystem::Reflect(AZ::ReflectContext* context)
     {
-    }
-
-    void AtomToolsDocumentSystemComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context))
+        if (auto serialize = azrtti_cast<AZ::SerializeContext*>(context))
         {
-            serialize->Class<AtomToolsDocumentSystemComponent, AZ::Component>()
+            serialize->Class<AtomToolsDocumentSystem>()
                 ->Version(0);
 
-            if (AZ::EditContext* ec = serialize->GetEditContext())
+            if (auto editContext = serialize->GetEditContext())
             {
-                ec->Class<AtomToolsDocumentSystemComponent>("AtomToolsDocumentSystemComponent", "")
+                editContext->Class<AtomToolsDocumentSystem>("AtomToolsDocumentSystem", "")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("System"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
@@ -49,7 +45,7 @@ namespace AtomToolsFramework
             }
         }
 
-        if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
         {
             behaviorContext->EBus<AtomToolsDocumentSystemRequestBus>("AtomToolsDocumentSystemRequestBus")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
@@ -93,40 +89,26 @@ namespace AtomToolsFramework
         }
     }
 
-    void AtomToolsDocumentSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+    AtomToolsDocumentSystem::AtomToolsDocumentSystem(const AZ::Crc32& toolId)
+        : m_toolId(toolId)
     {
-        provided.push_back(AZ_CRC_CE("AtomToolsDocumentSystemService"));
+        AtomToolsDocumentSystemRequestBus::Handler::BusConnect(m_toolId);
+        AtomToolsDocumentNotificationBus::Handler::BusConnect(m_toolId);
     }
 
-    void AtomToolsDocumentSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
-    {
-        incompatible.push_back(AZ_CRC_CE("AtomToolsDocumentSystemService"));
-    }
-
-    void AtomToolsDocumentSystemComponent::Init()
-    {
-    }
-
-    void AtomToolsDocumentSystemComponent::Activate()
+    AtomToolsDocumentSystem::~AtomToolsDocumentSystem()
     {
         m_documentMap.clear();
-        AtomToolsDocumentSystemRequestBus::Handler::BusConnect();
-        AtomToolsDocumentNotificationBus::Handler::BusConnect();
-    }
-
-    void AtomToolsDocumentSystemComponent::Deactivate()
-    {
         AtomToolsDocumentNotificationBus::Handler::BusDisconnect();
         AtomToolsDocumentSystemRequestBus::Handler::BusDisconnect();
-        m_documentMap.clear();
     }
 
-    void AtomToolsDocumentSystemComponent::RegisterDocumentType(AZStd::function<AtomToolsDocument*()> documentCreator)
+    void AtomToolsDocumentSystem::RegisterDocumentType(const AtomToolsDocumentFactoryCallback& documentCreator)
     {
         m_documentCreator = documentCreator;
     }
 
-    AZ::Uuid AtomToolsDocumentSystemComponent::CreateDocument()
+    AZ::Uuid AtomToolsDocumentSystem::CreateDocument()
     {
         if (!m_documentCreator)
         {
@@ -134,7 +116,7 @@ namespace AtomToolsFramework
             return AZ::Uuid::CreateNull();
         }
 
-        AZStd::unique_ptr<AtomToolsDocument> document(m_documentCreator());
+        AZStd::unique_ptr<AtomToolsDocument> document(m_documentCreator(m_toolId));
         if (!document)
         {
             AZ_Error("AtomToolsDocument", false, "Failed to create new document");
@@ -146,112 +128,17 @@ namespace AtomToolsFramework
         return documentId;
     }
 
-    bool AtomToolsDocumentSystemComponent::DestroyDocument(const AZ::Uuid& documentId)
+    bool AtomToolsDocumentSystem::DestroyDocument(const AZ::Uuid& documentId)
     {
         return m_documentMap.erase(documentId) != 0;
     }
 
-    void AtomToolsDocumentSystemComponent::OnDocumentExternallyModified(const AZ::Uuid& documentId)
-    {
-        m_documentIdsWithExternalChanges.insert(documentId);
-        QueueReopenDocuments();
-    }
-
-    void AtomToolsDocumentSystemComponent::OnDocumentDependencyModified(const AZ::Uuid& documentId)
-    {
-        m_documentIdsWithDependencyChanges.insert(documentId);
-        QueueReopenDocuments();
-    }
-
-    void AtomToolsDocumentSystemComponent::QueueReopenDocuments()
-    {
-        if (!m_queueReopenDocuments)
-        {
-            m_queueReopenDocuments = true;
-            QTimer::singleShot(0, [this] { ReopenDocuments(); });
-        }
-    }
-
-    void AtomToolsDocumentSystemComponent::ReopenDocuments()
-    {
-        const bool enableHotReload = GetSettingOrDefault<bool>("/O3DE/AtomToolsFramework/DocumentSystem/EnableHotReload", true);
-        if (!enableHotReload)
-        {
-            m_documentIdsWithDependencyChanges.clear();
-            m_documentIdsWithExternalChanges.clear();
-            m_queueReopenDocuments = false;
-        }
-
-        const bool enableHotReloadPrompts =
-            GetSettingOrDefault<bool>("/O3DE/AtomToolsFramework/DocumentSystem/EnableHotReloadPrompts", true);
-
-        for (const AZ::Uuid& documentId : m_documentIdsWithExternalChanges)
-        {
-            m_documentIdsWithDependencyChanges.erase(documentId);
-
-            AZStd::string documentPath;
-            AtomToolsDocumentRequestBus::EventResult(documentPath, documentId, &AtomToolsDocumentRequestBus::Events::GetAbsolutePath);
-
-            if (enableHotReloadPrompts &&
-                (QMessageBox::question(QApplication::activeWindow(),
-                QString("Document was externally modified"),
-                QString("Would you like to reopen the document:\n%1?").arg(documentPath.c_str()),
-                QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes))
-            {
-                continue;
-            }
-
-            AtomToolsFramework::TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
-
-            bool openResult = false;
-            AtomToolsDocumentRequestBus::EventResult(openResult, documentId, &AtomToolsDocumentRequestBus::Events::Open, documentPath);
-            if (!openResult)
-            {
-                QMessageBox::critical(
-                    QApplication::activeWindow(), QString("Document could not be opened"),
-                    QString("Failed to open: \n%1\n\n%2").arg(documentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
-                AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::CloseDocument, documentId);
-            }
-        }
-
-        for (const AZ::Uuid& documentId : m_documentIdsWithDependencyChanges)
-        {
-            AZStd::string documentPath;
-            AtomToolsDocumentRequestBus::EventResult(documentPath, documentId, &AtomToolsDocumentRequestBus::Events::GetAbsolutePath);
-
-            if (enableHotReloadPrompts &&
-                (QMessageBox::question(QApplication::activeWindow(),
-                QString("Document dependencies have changed"),
-                QString("Would you like to update the document with these changes:\n%1?").arg(documentPath.c_str()),
-                QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes))
-            {
-                continue;
-            }
-
-            AtomToolsFramework::TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
-
-            bool openResult = false;
-            AtomToolsDocumentRequestBus::EventResult(openResult, documentId, &AtomToolsDocumentRequestBus::Events::Reopen);
-            if (!openResult)
-            {
-                QMessageBox::critical(
-                    QApplication::activeWindow(), QString("Document could not be opened"),
-                    QString("Failed to open: \n%1\n\n%2").arg(documentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
-                AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::CloseDocument, documentId);
-            }
-        }
-
-        m_documentIdsWithDependencyChanges.clear();
-        m_documentIdsWithExternalChanges.clear();
-        m_queueReopenDocuments = false;
-    }
-
-    AZ::Uuid AtomToolsDocumentSystemComponent::OpenDocument(AZStd::string_view sourcePath)
+    AZ::Uuid AtomToolsDocumentSystem::OpenDocument(AZStd::string_view sourcePath)
     {
         return OpenDocumentImpl(sourcePath, true);
     }
 
-    AZ::Uuid AtomToolsDocumentSystemComponent::CreateDocumentFromFile(AZStd::string_view sourcePath, AZStd::string_view targetPath)
+    AZ::Uuid AtomToolsDocumentSystem::CreateDocumentFromFile(AZStd::string_view sourcePath, AZStd::string_view targetPath)
     {
         const AZ::Uuid documentId = OpenDocumentImpl(sourcePath, false);
         if (documentId.IsNull())
@@ -266,18 +153,18 @@ namespace AtomToolsFramework
         }
 
         // Send document open notification after creating new one
-        AtomToolsDocumentNotificationBus::Broadcast(&AtomToolsDocumentNotificationBus::Events::OnDocumentOpened, documentId);
+        AtomToolsDocumentNotificationBus::Event(m_toolId, &AtomToolsDocumentNotificationBus::Events::OnDocumentOpened, documentId);
         return documentId;
     }
 
-    bool AtomToolsDocumentSystemComponent::CloseDocument(const AZ::Uuid& documentId)
+    bool AtomToolsDocumentSystem::CloseDocument(const AZ::Uuid& documentId)
     {
         bool isOpen = false;
         AtomToolsDocumentRequestBus::EventResult(isOpen, documentId, &AtomToolsDocumentRequestBus::Events::IsOpen);
         if (!isOpen)
         {
             // immediately destroy unopened documents
-            AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::DestroyDocument, documentId);
+            DestroyDocument(documentId);
             return true;
         }
 
@@ -289,8 +176,8 @@ namespace AtomToolsFramework
         if (isModified)
         {
             auto selection = QMessageBox::question(QApplication::activeWindow(),
-                QString("Document has unsaved changes"),
-                QString("Do you want to save changes to\n%1?").arg(documentPath.c_str()),
+                QObject::tr("Document has unsaved changes"),
+                QObject::tr("Do you want to save changes to\n%1?").arg(documentPath.c_str()),
                 QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
             if (selection == QMessageBox::Cancel)
             {
@@ -307,23 +194,24 @@ namespace AtomToolsFramework
             }
         }
 
-        AtomToolsFramework::TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
+        TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
 
         bool closeResult = true;
         AtomToolsDocumentRequestBus::EventResult(closeResult, documentId, &AtomToolsDocumentRequestBus::Events::Close);
         if (!closeResult)
         {
             QMessageBox::critical(
-                QApplication::activeWindow(), QString("Document could not be closed"),
-                QString("Failed to close: \n%1\n\n%2").arg(documentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
+                QApplication::activeWindow(),
+                QObject::tr("Document could not be closed"),
+                QObject::tr("Failed to close: \n%1\n\n%2").arg(documentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
             return false;
         }
 
-        AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::DestroyDocument, documentId);
+        DestroyDocument(documentId);
         return true;
     }
 
-    bool AtomToolsDocumentSystemComponent::CloseAllDocuments()
+    bool AtomToolsDocumentSystem::CloseAllDocuments()
     {
         bool result = true;
         auto documentMap = m_documentMap;
@@ -338,7 +226,7 @@ namespace AtomToolsFramework
         return result;
     }
 
-    bool AtomToolsDocumentSystemComponent::CloseAllDocumentsExcept(const AZ::Uuid& documentId)
+    bool AtomToolsDocumentSystem::CloseAllDocumentsExcept(const AZ::Uuid& documentId)
     {
         bool result = true;
         auto documentMap = m_documentMap;
@@ -356,7 +244,7 @@ namespace AtomToolsFramework
         return result;
     }
 
-    bool AtomToolsDocumentSystemComponent::SaveDocument(const AZ::Uuid& documentId)
+    bool AtomToolsDocumentSystem::SaveDocument(const AZ::Uuid& documentId)
     {
         AZStd::string saveDocumentPath;
         AtomToolsDocumentRequestBus::EventResult(saveDocumentPath, documentId, &AtomToolsDocumentRequestBus::Events::GetAbsolutePath);
@@ -369,26 +257,30 @@ namespace AtomToolsFramework
         const QFileInfo saveInfo(saveDocumentPath.c_str());
         if (saveInfo.exists() && !saveInfo.isWritable())
         {
-            QMessageBox::critical(QApplication::activeWindow(), "Error", QString("Document could not be overwritten:\n%1").arg(saveDocumentPath.c_str()));
+            QMessageBox::critical(
+                QApplication::activeWindow(),
+                QObject::tr("Document could not be saved"),
+                QObject::tr("Document could not be overwritten:\n%1").arg(saveDocumentPath.c_str()));
             return false;
         }
 
-        AtomToolsFramework::TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
+        TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
 
         bool result = false;
         AtomToolsDocumentRequestBus::EventResult(result, documentId, &AtomToolsDocumentRequestBus::Events::Save);
         if (!result)
         {
             QMessageBox::critical(
-                QApplication::activeWindow(), QString("Document could not be saved"),
-                QString("Failed to save: \n%1\n\n%2").arg(saveDocumentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
+                QApplication::activeWindow(),
+                QObject::tr("Document could not be saved"),
+                QObject::tr("Failed to save: \n%1\n\n%2").arg(saveDocumentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
             return false;
         }
 
         return true;
     }
 
-    bool AtomToolsDocumentSystemComponent::SaveDocumentAsCopy(const AZ::Uuid& documentId, AZStd::string_view targetPath)
+    bool AtomToolsDocumentSystem::SaveDocumentAsCopy(const AZ::Uuid& documentId, AZStd::string_view targetPath)
     {
         AZStd::string saveDocumentPath = targetPath;
         if (saveDocumentPath.empty() || !AzFramework::StringFunc::Path::Normalize(saveDocumentPath))
@@ -399,26 +291,29 @@ namespace AtomToolsFramework
         const QFileInfo saveInfo(saveDocumentPath.c_str());
         if (saveInfo.exists() && !saveInfo.isWritable())
         {
-            QMessageBox::critical(QApplication::activeWindow(), "Error", QString("Document could not be overwritten:\n%1").arg(saveDocumentPath.c_str()));
+            QMessageBox::critical(QApplication::activeWindow(),
+                QObject::tr("Document could not be saved"),
+                QObject::tr("Document could not be overwritten:\n%1").arg(saveDocumentPath.c_str()));
             return false;
         }
 
-        AtomToolsFramework::TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
+        TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
 
         bool result = false;
         AtomToolsDocumentRequestBus::EventResult(result, documentId, &AtomToolsDocumentRequestBus::Events::SaveAsCopy, saveDocumentPath);
         if (!result)
         {
             QMessageBox::critical(
-                QApplication::activeWindow(), QString("Document could not be saved"),
-                QString("Failed to save: \n%1\n\n%2").arg(saveDocumentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
+                QApplication::activeWindow(),
+                QObject::tr("Document could not be saved"),
+                QObject::tr("Failed to save: \n%1\n\n%2").arg(saveDocumentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
             return false;
         }
 
         return true;
     }
 
-    bool AtomToolsDocumentSystemComponent::SaveDocumentAsChild(const AZ::Uuid& documentId, AZStd::string_view targetPath)
+    bool AtomToolsDocumentSystem::SaveDocumentAsChild(const AZ::Uuid& documentId, AZStd::string_view targetPath)
     {
         AZStd::string saveDocumentPath = targetPath;
         if (saveDocumentPath.empty() || !AzFramework::StringFunc::Path::Normalize(saveDocumentPath))
@@ -429,26 +324,30 @@ namespace AtomToolsFramework
         const QFileInfo saveInfo(saveDocumentPath.c_str());
         if (saveInfo.exists() && !saveInfo.isWritable())
         {
-            QMessageBox::critical(QApplication::activeWindow(), "Error", QString("Document could not be overwritten:\n%1").arg(saveDocumentPath.c_str()));
+            QMessageBox::critical(
+                QApplication::activeWindow(),
+                QObject::tr("Document could not be saved"),
+                QObject::tr("Document could not be overwritten:\n%1").arg(saveDocumentPath.c_str()));
             return false;
         }
 
-        AtomToolsFramework::TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
+        TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
 
         bool result = false;
         AtomToolsDocumentRequestBus::EventResult(result, documentId, &AtomToolsDocumentRequestBus::Events::SaveAsChild, saveDocumentPath);
         if (!result)
         {
             QMessageBox::critical(
-                QApplication::activeWindow(), QString("Document could not be saved"),
-                QString("Failed to save: \n%1\n\n%2").arg(saveDocumentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
+                QApplication::activeWindow(),
+                QObject::tr("Document could not be saved"),
+                QObject::tr("Failed to save: \n%1\n\n%2").arg(saveDocumentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
             return false;
         }
 
         return true;
     }
 
-    bool AtomToolsDocumentSystemComponent::SaveAllDocuments()
+    bool AtomToolsDocumentSystem::SaveAllDocuments()
     {
         bool result = true;
         for (const auto& documentPair : m_documentMap)
@@ -462,12 +361,110 @@ namespace AtomToolsFramework
         return result;
     }
 
-    AZ::u32 AtomToolsDocumentSystemComponent::GetDocumentCount() const
+    AZ::u32 AtomToolsDocumentSystem::GetDocumentCount() const
     {
         return aznumeric_cast<AZ::u32>(m_documentMap.size());
     }
 
-    AZ::Uuid AtomToolsDocumentSystemComponent::OpenDocumentImpl(AZStd::string_view sourcePath, bool checkIfAlreadyOpen)
+
+    void AtomToolsDocumentSystem::OnDocumentExternallyModified(const AZ::Uuid& documentId)
+    {
+        m_documentIdsWithExternalChanges.insert(documentId);
+        QueueReopenDocuments();
+    }
+
+    void AtomToolsDocumentSystem::OnDocumentDependencyModified(const AZ::Uuid& documentId)
+    {
+        m_documentIdsWithDependencyChanges.insert(documentId);
+        QueueReopenDocuments();
+    }
+
+    void AtomToolsDocumentSystem::QueueReopenDocuments()
+    {
+        if (!m_queueReopenDocuments)
+        {
+            m_queueReopenDocuments = true;
+            QTimer::singleShot(0, [this] { ReopenDocuments(); });
+        }
+    }
+
+    void AtomToolsDocumentSystem::ReopenDocuments()
+    {
+        const bool enableHotReload = GetSettingOrDefault<bool>("/O3DE/AtomToolsFramework/AtomToolsDocumentSystem/EnableHotReload", true);
+        if (!enableHotReload)
+        {
+            m_documentIdsWithDependencyChanges.clear();
+            m_documentIdsWithExternalChanges.clear();
+            m_queueReopenDocuments = false;
+        }
+
+        const bool enableHotReloadPrompts =
+            GetSettingOrDefault<bool>("/O3DE/AtomToolsFramework/AtomToolsDocumentSystem/EnableHotReloadPrompts", true);
+
+        for (const AZ::Uuid& documentId : m_documentIdsWithExternalChanges)
+        {
+            m_documentIdsWithDependencyChanges.erase(documentId);
+
+            AZStd::string documentPath;
+            AtomToolsDocumentRequestBus::EventResult(documentPath, documentId, &AtomToolsDocumentRequestBus::Events::GetAbsolutePath);
+
+            if (enableHotReloadPrompts &&
+                (QMessageBox::question(QApplication::activeWindow(),
+                QObject::tr("Document was externally modified"),
+                QObject::tr("Would you like to reopen the document:\n%1?").arg(documentPath.c_str()),
+                QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes))
+            {
+                continue;
+            }
+
+            TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
+
+            bool openResult = false;
+            AtomToolsDocumentRequestBus::EventResult(openResult, documentId, &AtomToolsDocumentRequestBus::Events::Open, documentPath);
+            if (!openResult)
+            {
+                QMessageBox::critical(
+                    QApplication::activeWindow(),
+                    QObject::tr("Document could not be opened"),
+                    QObject::tr("Failed to open: \n%1\n\n%2").arg(documentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
+                CloseDocument(documentId);
+            }
+        }
+
+        for (const AZ::Uuid& documentId : m_documentIdsWithDependencyChanges)
+        {
+            AZStd::string documentPath;
+            AtomToolsDocumentRequestBus::EventResult(documentPath, documentId, &AtomToolsDocumentRequestBus::Events::GetAbsolutePath);
+
+            if (enableHotReloadPrompts &&
+                (QMessageBox::question(QApplication::activeWindow(),
+                QObject::tr("Document dependencies have changed"),
+                QObject::tr("Would you like to update the document with these changes:\n%1?").arg(documentPath.c_str()),
+                QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes))
+            {
+                continue;
+            }
+
+            TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
+
+            bool openResult = false;
+            AtomToolsDocumentRequestBus::EventResult(openResult, documentId, &AtomToolsDocumentRequestBus::Events::Reopen);
+            if (!openResult)
+            {
+                QMessageBox::critical(
+                    QApplication::activeWindow(),
+                    QObject::tr("Document could not be opened"),
+                    QObject::tr("Failed to open: \n%1\n\n%2").arg(documentPath.c_str()).arg(traceRecorder.GetDump().c_str()));
+                CloseDocument(documentId);
+            }
+        }
+
+        m_documentIdsWithDependencyChanges.clear();
+        m_documentIdsWithExternalChanges.clear();
+        m_queueReopenDocuments = false;
+    }
+
+    AZ::Uuid AtomToolsDocumentSystem::OpenDocumentImpl(AZStd::string_view sourcePath, bool checkIfAlreadyOpen)
     {
         AZStd::string requestedPath = sourcePath;
         if (requestedPath.empty())
@@ -477,7 +474,9 @@ namespace AtomToolsFramework
 
         if (!AzFramework::StringFunc::Path::Normalize(requestedPath))
         {
-            QMessageBox::critical(QApplication::activeWindow(), "Error", QString("Document path is invalid:\n%1").arg(requestedPath.c_str()));
+            QMessageBox::critical(QApplication::activeWindow(),
+                QObject::tr("Document could not be opened"),
+                QObject::tr("Document path is invalid:\n%1").arg(requestedPath.c_str()));
             return AZ::Uuid::CreateNull();
         }
 
@@ -490,21 +489,22 @@ namespace AtomToolsFramework
                 AtomToolsDocumentRequestBus::EventResult(openDocumentPath, documentPair.first, &AtomToolsDocumentRequestBus::Events::GetAbsolutePath);
                 if (openDocumentPath == requestedPath)
                 {
-                    AtomToolsDocumentNotificationBus::Broadcast(&AtomToolsDocumentNotificationBus::Events::OnDocumentOpened, documentPair.first);
+                    AtomToolsDocumentNotificationBus::Event(
+                        m_toolId, &AtomToolsDocumentNotificationBus::Events::OnDocumentOpened, documentPair.first);
                     return documentPair.first;
                 }
             }
         }
 
-        AtomToolsFramework::TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
+        TraceRecorder traceRecorder(m_maxMessageBoxLineCount);
 
-        AZ::Uuid documentId = AZ::Uuid::CreateNull();
-        AtomToolsDocumentSystemRequestBus::BroadcastResult(documentId, &AtomToolsDocumentSystemRequestBus::Events::CreateDocument);
+        AZ::Uuid documentId = CreateDocument();
         if (documentId.IsNull())
         {
             QMessageBox::critical(
-                QApplication::activeWindow(), QString("Document could not be created"),
-                QString("Failed to create: \n%1\n\n%2").arg(requestedPath.c_str()).arg(traceRecorder.GetDump().c_str()));
+                QApplication::activeWindow(),
+                QObject::tr("Document could not be opened"),
+                QObject::tr("Failed to create: \n%1\n\n%2").arg(requestedPath.c_str()).arg(traceRecorder.GetDump().c_str()));
             return AZ::Uuid::CreateNull();
         }
 
@@ -513,18 +513,20 @@ namespace AtomToolsFramework
         if (!openResult)
         {
             QMessageBox::critical(
-                QApplication::activeWindow(), QString("Document could not be opened"),
-                QString("Failed to open: \n%1\n\n%2").arg(requestedPath.c_str()).arg(traceRecorder.GetDump().c_str()));
-            AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::DestroyDocument, documentId);
+                QApplication::activeWindow(),
+                QObject::tr("Document could not be opened"),
+                QObject::tr("Failed to open: \n%1\n\n%2").arg(requestedPath.c_str()).arg(traceRecorder.GetDump().c_str()));
+            DestroyDocument(documentId);
             return AZ::Uuid::CreateNull();
         }
         else if (traceRecorder.GetWarningCount(true) > 0)
         {
             QMessageBox::warning(
-                QApplication::activeWindow(), QString("Document opened with warnings"),
-                QString("Warnings encountered: \n%1\n\n%2").arg(requestedPath.c_str()).arg(traceRecorder.GetDump().c_str()));
+                QApplication::activeWindow(),
+                QObject::tr("Document opened with warnings"),
+                QObject::tr("Warnings encountered: \n%1\n\n%2").arg(requestedPath.c_str()).arg(traceRecorder.GetDump().c_str()));
         }
 
         return documentId;
     }
-}
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/PreviewRenderer/PreviewRenderer.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/PreviewRenderer/PreviewRenderer.cpp
index 27d468e64b..638e8da87c 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/PreviewRenderer/PreviewRenderer.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/PreviewRenderer/PreviewRenderer.cpp
@@ -63,10 +63,8 @@ namespace AtomToolsFramework
         pipelineDesc.m_mainViewTagName = "MainCamera";
         pipelineDesc.m_name = pipelineName;
         pipelineDesc.m_rootPassTemplate = "ToolsPipelineRenderToTexture";
+        pipelineDesc.m_renderSettings.m_multisampleState = AZ::RPI::RPISystemInterface::Get()->GetApplicationMultisampleState();
 
-        // We have to set the samples to 4 to match the pipeline passes' setting, otherwise it may lead to device lost issue
-        // [GFX TODO] [ATOM-13551] Default value sand validation required to prevent pipeline crash and device lost
-        pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
         m_renderPipeline = AZ::RPI::RenderPipeline::CreateRenderPipeline(pipelineDesc);
         m_scene->AddRenderPipeline(m_renderPipeline);
         m_scene->Activate();
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/DollyCameraBehavior.cpp
similarity index 63%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/DollyCameraBehavior.cpp
index c69884c5c0..fa4f13fecb 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/DollyCameraBehavior.cpp
@@ -6,21 +6,25 @@
  *
  */
 
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/DollyCameraBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/MathUtils.h>
 #include <AzCore/Math/Vector3.h>
-#include <Viewport/InputController/DollyCameraBehavior.h>
-#include <Viewport/InputController/MaterialEditorViewportInputController.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
+    DollyCameraBehavior::DollyCameraBehavior(ViewportInputBehaviorControllerInterface* controller)
+        : ViewportInputBehavior(controller)
+    {
+    }
+
     void DollyCameraBehavior::TickInternal([[maybe_unused]] float x, float y, [[maybe_unused]] float z)
     {
         m_distanceToTarget = m_distanceToTarget + y;
         AZ::Transform transform = AZ::Transform::CreateIdentity();
         AZ::TransformBus::EventResult(transform, m_cameraEntityId, &AZ::TransformBus::Events::GetLocalTM);
-        AZ::Vector3 position = m_targetPosition -
-            transform.GetRotation().TransformVector(AZ::Vector3::CreateAxisY(m_distanceToTarget));
+        AZ::Vector3 position = m_targetPosition - transform.GetRotation().TransformVector(AZ::Vector3::CreateAxisY(m_distanceToTarget));
         AZ::TransformBus::Event(m_cameraEntityId, &AZ::TransformBus::Events::SetLocalTranslation, position);
     }
 
@@ -33,4 +37,4 @@ namespace MaterialEditor
     {
         return SensitivityY;
     }
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/MoveCameraBehavior.cpp
similarity index 63%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/MoveCameraBehavior.cpp
index 80b3409f57..ea70b72cb4 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/MoveCameraBehavior.cpp
@@ -6,27 +6,25 @@
  *
  */
 
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/MoveCameraBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/Vector3.h>
-#include <Viewport/InputController/MaterialEditorViewportInputControllerBus.h>
-#include <Viewport/InputController/MoveCameraBehavior.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
+    MoveCameraBehavior::MoveCameraBehavior(ViewportInputBehaviorControllerInterface* controller)
+        : ViewportInputBehavior(controller)
+    {
+    }
+
     void MoveCameraBehavior::End()
     {
-        float distanceToTarget;
-        MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
-            distanceToTarget,
-            &MaterialEditorViewportInputControllerRequestBus::Handler::GetDistanceToTarget);
+        float distanceToTarget = m_controller->GetDistanceToTarget();
         AZ::Transform transform = AZ::Transform::CreateIdentity();
         AZ::TransformBus::EventResult(transform, m_cameraEntityId, &AZ::TransformBus::Events::GetLocalTM);
-        AZ::Vector3 targetPosition =
-            transform.GetTranslation() +
-            transform.GetBasisY() * distanceToTarget;
-        MaterialEditorViewportInputControllerRequestBus::Broadcast(
-            &MaterialEditorViewportInputControllerRequestBus::Handler::SetTargetPosition,
-            targetPosition);
+        AZ::Vector3 targetPosition = transform.GetTranslation() + transform.GetBasisY() * distanceToTarget;
+        m_controller->SetTargetPosition(targetPosition);
     }
 
     void MoveCameraBehavior::TickInternal(float x, float y, float z)
@@ -41,7 +39,7 @@ namespace MaterialEditor
         m_targetPosition += deltaPosition;
         AZ::TransformBus::Event(m_cameraEntityId, &AZ::TransformBus::Events::SetLocalTranslation, position);
 
-        Behavior::TickInternal(x, y, z);
+        ViewportInputBehavior::TickInternal(x, y, z);
     }
 
     float MoveCameraBehavior::GetSensitivityX()
@@ -53,4 +51,4 @@ namespace MaterialEditor
     {
         return SensitivityY;
     }
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/OrbitCameraBehavior.cpp
similarity index 72%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/OrbitCameraBehavior.cpp
index 1d93e4eafe..33d4fb0812 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/OrbitCameraBehavior.cpp
@@ -6,15 +6,20 @@
  *
  */
 
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/OrbitCameraBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h>
 #include <AzCore/Component/TransformBus.h>
-#include <Viewport/InputController/MaterialEditorViewportInputController.h>
-#include <Viewport/InputController/OrbitCameraBehavior.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
+    OrbitCameraBehavior::OrbitCameraBehavior(ViewportInputBehaviorControllerInterface* controller)
+        : ViewportInputBehavior(controller)
+    {
+    }
+
     void OrbitCameraBehavior::TickInternal(float x, float y, float z)
     {
-        Behavior::TickInternal(x, y, z);
+        ViewportInputBehavior::TickInternal(x, y, z);
 
         // don't align camera until a movement has been made so that accidental right-click doesn't reset camera
         if (!m_aligned)
@@ -27,12 +32,9 @@ namespace MaterialEditor
         AZ::Quaternion rotation = transform.GetRotation();
         AZ::Vector3 right = transform.GetBasisX();
         rotation =
-            AZ::Quaternion::CreateFromAxisAngle(AZ::Vector3::CreateAxisZ(), -x) *
-            AZ::Quaternion::CreateFromAxisAngle(right, -y) *
-            rotation;
+            AZ::Quaternion::CreateFromAxisAngle(AZ::Vector3::CreateAxisZ(), -x) * AZ::Quaternion::CreateFromAxisAngle(right, -y) * rotation;
         rotation.Normalize();
-        AZ::Vector3 position =
-            rotation.TransformVector(AZ::Vector3(0, -m_distanceToTarget, 0)) + m_targetPosition;
+        AZ::Vector3 position = rotation.TransformVector(AZ::Vector3(0, -m_distanceToTarget, 0)) + m_targetPosition;
         transform = AZ::Transform::CreateFromQuaternionAndTranslation(rotation, position);
         AZ::TransformBus::Event(m_cameraEntityId, &AZ::TransformBus::Events::SetLocalTM, transform);
     }
@@ -56,4 +58,4 @@ namespace MaterialEditor
         AZ::TransformBus::Event(m_cameraEntityId, &AZ::TransformBus::Events::SetLocalRotationQuaternion, targetRotation);
         m_aligned = true;
     }
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/PanCameraBehavior.cpp
similarity index 61%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/PanCameraBehavior.cpp
index 2b036a1319..41d8586a7f 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/PanCameraBehavior.cpp
@@ -6,28 +6,26 @@
  *
  */
 
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/PanCameraBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/Quaternion.h>
 #include <AzCore/Math/Vector3.h>
-#include <Viewport/InputController/MaterialEditorViewportInputControllerBus.h>
-#include <Viewport/InputController/PanCameraBehavior.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
+    PanCameraBehavior::PanCameraBehavior(ViewportInputBehaviorControllerInterface* controller)
+        : ViewportInputBehavior(controller)
+    {
+    }
+
     void PanCameraBehavior::End()
     {
-        float distanceToTarget;
-        MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
-            distanceToTarget,
-            &MaterialEditorViewportInputControllerRequestBus::Handler::GetDistanceToTarget);
+        float distanceToTarget = m_controller->GetDistanceToTarget();
         AZ::Transform transform = AZ::Transform::CreateIdentity();
         AZ::TransformBus::EventResult(transform, m_cameraEntityId, &AZ::TransformBus::Events::GetLocalTM);
-        AZ::Vector3 targetPosition =
-            transform.GetTranslation() +
-            transform.GetBasisY() * distanceToTarget;
-        MaterialEditorViewportInputControllerRequestBus::Broadcast(
-            &MaterialEditorViewportInputControllerRequestBus::Handler::SetTargetPosition,
-            targetPosition);
+        AZ::Vector3 targetPosition = transform.GetTranslation() + transform.GetBasisY() * distanceToTarget;
+        m_controller->SetTargetPosition(targetPosition);
     }
 
     void PanCameraBehavior::TickInternal(float x, float y, [[maybe_unused]] float z)
@@ -37,9 +35,7 @@ namespace MaterialEditor
         AZ::Quaternion rotation = transform.GetRotation();
         const AZ::Vector3 right = transform.GetBasisX();
         rotation =
-            AZ::Quaternion::CreateFromAxisAngle(AZ::Vector3::CreateAxisZ(), -x) *
-            AZ::Quaternion::CreateFromAxisAngle(right, -y) *
-            rotation;
+            AZ::Quaternion::CreateFromAxisAngle(AZ::Vector3::CreateAxisZ(), -x) * AZ::Quaternion::CreateFromAxisAngle(right, -y) * rotation;
         rotation.Normalize();
         AZ::TransformBus::Event(m_cameraEntityId, &AZ::TransformBus::Events::SetLocalRotationQuaternion, rotation);
     }
@@ -53,4 +49,4 @@ namespace MaterialEditor
     {
         return SensitivityY;
     }
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/RotateEnvironmentBehavior.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/RotateEnvironmentBehavior.cpp
new file mode 100644
index 0000000000..7e8216fbda
--- /dev/null
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/RotateEnvironmentBehavior.cpp
@@ -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
+ *
+ */
+
+#include <Atom/Feature/SkyBox/SkyBoxFeatureProcessorInterface.h>
+#include <Atom/RPI.Public/RPISystemInterface.h>
+#include <Atom/RPI.Public/Scene.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateEnvironmentBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h>
+#include <AzCore/Component/TransformBus.h>
+
+namespace AtomToolsFramework
+{
+    RotateEnvironmentBehavior::RotateEnvironmentBehavior(ViewportInputBehaviorControllerInterface* controller)
+        : ViewportInputBehavior(controller)
+    {
+    }
+
+    void RotateEnvironmentBehavior::Start()
+    {
+        ViewportInputBehavior::Start();
+
+        m_environmentEntityId = m_controller->GetEnvironmentEntityId();
+        AZ_Assert(m_environmentEntityId.IsValid(), "Failed to find m_environmentEntityId");
+        m_skyBoxFeatureProcessor =
+            AZ::RPI::Scene::GetFeatureProcessorForEntity<AZ::Render::SkyBoxFeatureProcessorInterface>(m_environmentEntityId);
+    }
+
+    void RotateEnvironmentBehavior::TickInternal(float x, float y, float z)
+    {
+        ViewportInputBehavior::TickInternal(x, y, z);
+
+        m_rotation += x;
+        AZ::Quaternion rotation = AZ::Quaternion::CreateFromAxisAngle(AZ::Vector3::CreateAxisZ(), m_rotation);
+        AZ::TransformBus::Event(m_environmentEntityId, &AZ::TransformBus::Events::SetLocalRotationQuaternion, rotation);
+        const AZ::Matrix4x4 rotationMatrix = AZ::Matrix4x4::CreateFromQuaternion(rotation);
+        m_skyBoxFeatureProcessor->SetCubemapRotationMatrix(rotationMatrix);
+    }
+
+    float RotateEnvironmentBehavior::GetSensitivityX()
+    {
+        return SensitivityX;
+    }
+
+    float RotateEnvironmentBehavior::GetSensitivityY()
+    {
+        return SensitivityY;
+    }
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/RotateModelBehavior.cpp
similarity index 63%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/RotateModelBehavior.cpp
index ed09ae8fa3..2b01471789 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/RotateModelBehavior.cpp
@@ -6,25 +6,27 @@
  *
  */
 
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateModelBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h>
 #include <AzCore/Component/TransformBus.h>
-#include <Viewport/InputController/MaterialEditorViewportInputController.h>
-#include <Viewport/InputController/RotateModelBehavior.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
+    RotateModelBehavior::RotateModelBehavior(ViewportInputBehaviorControllerInterface* controller)
+        : ViewportInputBehavior(controller)
+    {
+    }
+
     void RotateModelBehavior::Start()
     {
-        Behavior::Start();
+        ViewportInputBehavior::Start();
 
-        MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
-            m_targetEntityId,
-            &MaterialEditorViewportInputControllerRequestBus::Handler::GetTargetEntityId);
+        m_targetEntityId = m_controller->GetTargetEntityId();
         AZ_Assert(m_targetEntityId.IsValid(), "Failed to find m_targetEntityId");
-        AZ::EntityId cameraEntityId;
-        MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
-            cameraEntityId,
-            &MaterialEditorViewportInputControllerRequestBus::Handler::GetCameraEntityId);
+
+        AZ::EntityId cameraEntityId = m_controller->GetCameraEntityId();
         AZ_Assert(cameraEntityId.IsValid(), "Failed to find cameraEntityId");
+
         AZ::Transform transform = AZ::Transform::CreateIdentity();
         AZ::TransformBus::EventResult(transform, cameraEntityId, &AZ::TransformBus::Events::GetLocalTM);
         m_cameraRight = transform.GetBasisX();
@@ -32,16 +34,14 @@ namespace MaterialEditor
 
     void RotateModelBehavior::TickInternal(float x, float y, float z)
     {
-        Behavior::TickInternal(x, y, z);
+        ViewportInputBehavior::TickInternal(x, y, z);
 
         AZ::Transform transform = AZ::Transform::CreateIdentity();
         AZ::TransformBus::EventResult(transform, m_targetEntityId, &AZ::TransformBus::Events::GetLocalTM);
 
         AZ::Quaternion rotation = transform.GetRotation();
-        rotation =
-            AZ::Quaternion::CreateFromAxisAngle(AZ::Vector3::CreateAxisZ(), x) *
-            AZ::Quaternion::CreateFromAxisAngle(m_cameraRight, y) *
-            rotation;
+        rotation = AZ::Quaternion::CreateFromAxisAngle(AZ::Vector3::CreateAxisZ(), x) *
+            AZ::Quaternion::CreateFromAxisAngle(m_cameraRight, y) * rotation;
         rotation.Normalize();
 
         AZ::TransformBus::Event(m_targetEntityId, &AZ::TransformBus::Events::SetLocalRotationQuaternion, rotation);
@@ -56,4 +56,4 @@ namespace MaterialEditor
     {
         return SensitivityY;
     }
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.cpp
similarity index 54%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.cpp
index a843c4965c..653edcecb7 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.cpp
@@ -6,78 +6,67 @@
  *
  */
 
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/Vector3.h>
-#include <Viewport/InputController/Behavior.h>
-#include <Viewport/InputController/MaterialEditorViewportInputController.h>
 
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
-    Behavior::Behavior()
+    ViewportInputBehavior::ViewportInputBehavior(ViewportInputBehaviorControllerInterface* controller)
+        : m_controller(controller)
     {
         AZ::TickBus::Handler::BusConnect();
     }
 
-    Behavior::~Behavior()
+    ViewportInputBehavior::~ViewportInputBehavior()
     {
         AZ::TickBus::Handler::BusDisconnect();
     }
 
-    void Behavior::Start()
+    void ViewportInputBehavior::Start()
     {
-        m_x = 0;
-        m_y = 0;
-        m_z = 0;
+        m_x = {};
+        m_y = {};
+        m_z = {};
 
-        MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
-            m_cameraEntityId,
-            &MaterialEditorViewportInputControllerRequestBus::Handler::GetCameraEntityId);
+        m_cameraEntityId = m_controller->GetCameraEntityId();
         AZ_Assert(m_cameraEntityId.IsValid(), "Failed to find m_cameraEntityId");
-        MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
-            m_distanceToTarget,
-            &MaterialEditorViewportInputControllerRequestBus::Handler::GetDistanceToTarget);
-        MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
-            m_targetPosition,
-            &MaterialEditorViewportInputControllerRequestBus::Handler::GetTargetPosition);
-        MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
-            m_radius, &MaterialEditorViewportInputControllerRequestBus::Handler::GetRadius);
+        m_distanceToTarget = m_controller->GetDistanceToTarget();
+        m_targetPosition = m_controller->GetTargetPosition();
+        m_radius = m_controller->GetRadius();
     }
 
-    void Behavior::End()
+    void ViewportInputBehavior::End()
     {
     }
 
-    void Behavior::MoveX(float value)
+    void ViewportInputBehavior::MoveX(float value)
     {
         m_x += value * GetSensitivityX();
     }
 
-    void Behavior::MoveY(float value)
+    void ViewportInputBehavior::MoveY(float value)
     {
         m_y += value * GetSensitivityY();
     }
 
-    void Behavior::MoveZ(float value)
+    void ViewportInputBehavior::MoveZ(float value)
     {
         m_z += value * GetSensitivityZ();
     }
 
-    bool Behavior::HasDelta() const
+    bool ViewportInputBehavior::HasDelta() const
     {
-        return
-            AZ::GetAbs(m_x) > std::numeric_limits<float>::min() ||
-            AZ::GetAbs(m_y) > std::numeric_limits<float>::min() ||
+        return AZ::GetAbs(m_x) > std::numeric_limits<float>::min() || AZ::GetAbs(m_y) > std::numeric_limits<float>::min() ||
             AZ::GetAbs(m_z) > std::numeric_limits<float>::min();
     }
 
-    void Behavior::TickInternal([[maybe_unused]] float x, [[maybe_unused]] float y, float z)
+    void ViewportInputBehavior::TickInternal([[maybe_unused]] float x, [[maybe_unused]] float y, float z)
     {
         m_distanceToTarget = m_distanceToTarget - z;
 
-        bool isCameraCentered = false;
-        MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
-            isCameraCentered,
-            &MaterialEditorViewportInputControllerRequestBus::Handler::IsCameraCentered);
+        bool isCameraCentered = m_controller->IsCameraCentered();
 
         // if camera is looking at the model (locked to the model) we don't want to zoom past the model's center
         if (isCameraCentered)
@@ -87,40 +76,35 @@ namespace MaterialEditor
 
         AZ::Transform transform = AZ::Transform::CreateIdentity();
         AZ::TransformBus::EventResult(transform, m_cameraEntityId, &AZ::TransformBus::Events::GetLocalTM);
-        AZ::Vector3 position = m_targetPosition -
-            transform.GetRotation().TransformVector(AZ::Vector3::CreateAxisY(m_distanceToTarget));
+        AZ::Vector3 position = m_targetPosition - transform.GetRotation().TransformVector(AZ::Vector3::CreateAxisY(m_distanceToTarget));
         AZ::TransformBus::Event(m_cameraEntityId, &AZ::TransformBus::Events::SetLocalTranslation, position);
 
         // if camera is not locked to the model, move its focal point so we can free look
         if (!isCameraCentered)
         {
             m_targetPosition += transform.GetRotation().TransformVector(AZ::Vector3::CreateAxisY(z));
-            MaterialEditorViewportInputControllerRequestBus::Broadcast(
-                &MaterialEditorViewportInputControllerRequestBus::Handler::SetTargetPosition,
-                m_targetPosition);
-            MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
-                m_distanceToTarget,
-                &MaterialEditorViewportInputControllerRequestBus::Handler::GetDistanceToTarget);
+            m_controller->SetTargetPosition(m_targetPosition);
+            m_distanceToTarget = m_controller->GetDistanceToTarget();
         }
     }
 
-    float Behavior::GetSensitivityX()
+    float ViewportInputBehavior::GetSensitivityX()
     {
         return 0;
     }
 
-    float Behavior::GetSensitivityY()
+    float ViewportInputBehavior::GetSensitivityY()
     {
         return 0;
     }
 
-    float Behavior::GetSensitivityZ()
+    float ViewportInputBehavior::GetSensitivityZ()
     {
         // adjust zooming sensitivity by model size, so that large models zoom at the same speed as smaller ones
         return 0.001f * AZ::GetMax(0.5f, m_radius);
     }
 
-    AZ::Quaternion Behavior::LookRotation(AZ::Vector3 forward)
+    AZ::Quaternion ViewportInputBehavior::LookRotation(AZ::Vector3 forward)
     {
         forward.Normalize();
         AZ::Vector3 right = forward.CrossZAxis();
@@ -132,7 +116,7 @@ namespace MaterialEditor
         return rotation;
     }
 
-    float Behavior::TakeStep(float& value, float t)
+    float ViewportInputBehavior::TakeStep(float& value, float t)
     {
         const float absValue = AZ::GetAbs(value);
         float step;
@@ -148,7 +132,7 @@ namespace MaterialEditor
         return step;
     }
 
-    void Behavior::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
+    void ViewportInputBehavior::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
     {
         // delta x and y values are accumulated in MoveX and MoveY functions (by dragging the mouse)
         // in the Tick function we then lerp them down to 0 over short time and apply delta transform to an entity
@@ -163,4 +147,4 @@ namespace MaterialEditor
             TickInternal(x, y, z);
         }
     }
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorController.cpp
similarity index 53%
rename from Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
rename to Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorController.cpp
index ced59f1bf5..fd06427622 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorController.cpp
@@ -6,120 +6,94 @@
  *
  */
 
-#include <QApplication>
-#include <QWidget>
-
+#include <Atom/Feature/SkyBox/SkyBoxFeatureProcessorInterface.h>
+#include <Atom/RPI.Public/RPISystemInterface.h>
+#include <Atom/RPI.Public/Scene.h>
+#include <Atom/RPI.Reflect/Model/ModelAsset.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorController.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/Matrix4x4.h>
 #include <AzCore/Serialization/SerializeContext.h>
-
 #include <AzFramework/Components/CameraBus.h>
 #include <AzFramework/Input/Devices/Keyboard/InputDeviceKeyboard.h>
 #include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
 #include <AzFramework/Viewport/ScreenGeometry.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 
-#include <Atom/Feature/SkyBox/SkyBoxFeatureProcessorInterface.h>
-#include <Atom/RPI.Public/RPISystemInterface.h>
-#include <Atom/RPI.Public/Scene.h>
-#include <Atom/RPI.Reflect/Model/ModelAsset.h>
-#include <AtomLyIntegration/CommonFeatures/Mesh/MeshComponentBus.h>
+#include <QApplication>
+#include <QWidget>
 
-#include <Viewport/InputController/DollyCameraBehavior.h>
-#include <Viewport/InputController/IdleBehavior.h>
-#include <Viewport/InputController/MaterialEditorViewportInputController.h>
-#include <Viewport/InputController/MoveCameraBehavior.h>
-#include <Viewport/InputController/OrbitCameraBehavior.h>
-#include <Viewport/InputController/PanCameraBehavior.h>
-#include <Viewport/InputController/RotateEnvironmentBehavior.h>
-#include <Viewport/InputController/RotateModelBehavior.h>
-
-namespace MaterialEditor
+namespace AtomToolsFramework
 {
-    MaterialEditorViewportInputController::MaterialEditorViewportInputController()
+    ViewportInputBehaviorController::ViewportInputBehaviorController(
+        const AZ::EntityId& cameraEntityId, const AZ::EntityId& targetEntityId, const AZ::EntityId& environmentEntityId)
         : AzFramework::SingleViewportController()
+        , m_cameraEntityId(cameraEntityId)
+        , m_targetEntityId(targetEntityId)
+        , m_environmentEntityId(environmentEntityId)
         , m_targetPosition(AZ::Vector3::CreateZero())
     {
-        m_behaviorMap[None] = AZStd::make_shared<IdleBehavior>();
-        m_behaviorMap[Lmb] = AZStd::make_shared<PanCameraBehavior>();
-        m_behaviorMap[Mmb] = AZStd::make_shared<MoveCameraBehavior>();
-        m_behaviorMap[Rmb] = AZStd::make_shared<OrbitCameraBehavior>();
-        m_behaviorMap[Alt ^ Lmb] = AZStd::make_shared<OrbitCameraBehavior>();
-        m_behaviorMap[Alt ^ Mmb] = AZStd::make_shared<MoveCameraBehavior>();
-        m_behaviorMap[Alt ^ Rmb] = AZStd::make_shared<DollyCameraBehavior>();
-        m_behaviorMap[Lmb ^ Rmb] = AZStd::make_shared<DollyCameraBehavior>();
-        m_behaviorMap[Ctrl ^ Lmb] = AZStd::make_shared<RotateModelBehavior>();
-        m_behaviorMap[Shift ^ Lmb] = AZStd::make_shared<RotateEnvironmentBehavior>();
     }
 
-    MaterialEditorViewportInputController::~MaterialEditorViewportInputController()
+    ViewportInputBehaviorController::~ViewportInputBehaviorController()
     {
-        if (m_initialized)
-        {
-            MaterialEditorViewportInputControllerRequestBus::Handler::BusDisconnect();
-        }
     }
 
-    void MaterialEditorViewportInputController::Init(const AZ::EntityId& cameraEntityId, const AZ::EntityId& targetEntityId, const AZ::EntityId& iblEntityId)
+    void ViewportInputBehaviorController::AddBehavior(KeyMask mask, AZStd::shared_ptr<ViewportInputBehavior> behavior)
     {
-        if (m_initialized)
-        {
-            AZ_Error("MaterialEditorViewportInputController", false, "Controller already initialized.");
-            return;
-        }
-        m_initialized = true;
-        m_cameraEntityId = cameraEntityId;
-        m_targetEntityId = targetEntityId;
-        m_iblEntityId = iblEntityId;
-
-        MaterialEditorViewportInputControllerRequestBus::Handler::BusConnect();
+        m_behaviorMap[mask] = behavior;
     }
 
-    const AZ::EntityId& MaterialEditorViewportInputController::GetCameraEntityId() const
+    const AZ::EntityId& ViewportInputBehaviorController::GetCameraEntityId() const
     {
         return m_cameraEntityId;
     }
 
-    const AZ::EntityId& MaterialEditorViewportInputController::GetTargetEntityId() const
+    const AZ::EntityId& ViewportInputBehaviorController::GetTargetEntityId() const
     {
         return m_targetEntityId;
     }
 
-    const AZ::EntityId& MaterialEditorViewportInputController::GetIblEntityId() const
+    const AZ::EntityId& ViewportInputBehaviorController::GetEnvironmentEntityId() const
     {
-        return m_iblEntityId;
+        return m_environmentEntityId;
     }
 
-    const AZ::Vector3& MaterialEditorViewportInputController::GetTargetPosition() const
+    const AZ::Vector3& ViewportInputBehaviorController::GetTargetPosition() const
     {
         return m_targetPosition;
     }
 
-    void MaterialEditorViewportInputController::SetTargetPosition(const AZ::Vector3& targetPosition)
+    void ViewportInputBehaviorController::SetTargetPosition(const AZ::Vector3& targetPosition)
     {
         m_targetPosition = targetPosition;
         m_isCameraCentered = false;
     }
 
-    float MaterialEditorViewportInputController::GetDistanceToTarget() const
+    void ViewportInputBehaviorController::SetTargetBounds(const AZ::Aabb& targetBounds)
+    {
+        m_targetBounds = targetBounds;
+    }
+
+    float ViewportInputBehaviorController::GetDistanceToTarget() const
     {
         AZ::Vector3 cameraPosition;
         AZ::TransformBus::EventResult(cameraPosition, m_cameraEntityId, &AZ::TransformBus::Events::GetLocalTranslation);
         return cameraPosition.GetDistance(m_targetPosition);
     }
 
-    void MaterialEditorViewportInputController::GetExtents(float& distanceMin, float& distanceMax) const
+    void ViewportInputBehaviorController::GetExtents(float& distanceMin, float& distanceMax) const
     {
         distanceMin = m_distanceMin;
         distanceMax = m_distanceMax;
     }
 
-    float MaterialEditorViewportInputController::GetRadius() const
+    float ViewportInputBehaviorController::GetRadius() const
     {
         return m_radius;
     }
 
-    void MaterialEditorViewportInputController::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)
+    void ViewportInputBehaviorController::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)
     {
         if (m_keysChanged)
         {
@@ -135,7 +109,7 @@ namespace MaterialEditor
         }
     }
 
-    bool MaterialEditorViewportInputController::HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event)
+    bool ViewportInputBehaviorController::HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event)
     {
         using namespace AzFramework;
 
@@ -145,8 +119,7 @@ namespace MaterialEditor
 
         bool mouseOver = false;
         AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::EventResult(
-            mouseOver, GetViewportId(),
-            &AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Events::IsMouseOver);
+            mouseOver, GetViewportId(), &AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Events::IsMouseOver);
 
         if (!m_behavior)
         {
@@ -180,20 +153,17 @@ namespace MaterialEditor
             {
                 m_keys |= Shift;
             }
-            if (inputChannelId == InputDeviceMouse::Movement::X)
+            if (m_behavior && inputChannelId == InputDeviceMouse::Movement::X)
             {
                 m_behavior->MoveX(event.m_inputChannel.GetValue());
             }
-            else if (inputChannelId == InputDeviceMouse::Movement::Y)
+            else if (m_behavior && inputChannelId == InputDeviceMouse::Movement::Y)
             {
                 m_behavior->MoveY(event.m_inputChannel.GetValue());
             }
-            else if (inputChannelId == InputDeviceMouse::Movement::Z)
+            else if (m_behavior && inputChannelId == InputDeviceMouse::Movement::Z && mouseOver)
             {
-                if (mouseOver)
-                {
-                    m_behavior->MoveZ(event.m_inputChannel.GetValue());
-                }
+                m_behavior->MoveZ(event.m_inputChannel.GetValue());
             }
             break;
         case InputChannel::State::Ended:
@@ -232,20 +202,17 @@ namespace MaterialEditor
             }
             break;
         case InputChannel::State::Updated:
-            if (inputChannelId == InputDeviceMouse::Movement::X)
+            if (m_behavior && inputChannelId == InputDeviceMouse::Movement::X)
             {
                 m_behavior->MoveX(event.m_inputChannel.GetValue());
             }
-            else if (inputChannelId == InputDeviceMouse::Movement::Y)
+            else if (m_behavior && inputChannelId == InputDeviceMouse::Movement::Y)
             {
                 m_behavior->MoveY(event.m_inputChannel.GetValue());
             }
-            else if (inputChannelId == InputDeviceMouse::Movement::Z)
+            else if (m_behavior && inputChannelId == InputDeviceMouse::Movement::Z && mouseOver)
             {
-                if (mouseOver)
-                {
-                    m_behavior->MoveZ(event.m_inputChannel.GetValue());
-                }
+                m_behavior->MoveZ(event.m_inputChannel.GetValue());
             }
             break;
         }
@@ -258,7 +225,7 @@ namespace MaterialEditor
         return false;
     }
 
-    void MaterialEditorViewportInputController::Reset()
+    void ViewportInputBehaviorController::Reset()
     {
         CalculateExtents();
 
@@ -277,12 +244,13 @@ namespace MaterialEditor
         AZ::TransformBus::Event(m_targetEntityId, &AZ::TransformBus::Events::SetLocalTM, modelTransform);
 
         // reset environment
-        AZ::Transform iblTransform = AZ::Transform::CreateIdentity();
-        AZ::TransformBus::Event(m_iblEntityId, &AZ::TransformBus::Events::SetLocalTM, iblTransform);
+        AZ::Transform environmentTransform = AZ::Transform::CreateIdentity();
+        AZ::TransformBus::Event(m_environmentEntityId, &AZ::TransformBus::Events::SetLocalTM, environmentTransform);
 
         const AZ::Matrix4x4 rotationMatrix = AZ::Matrix4x4::CreateIdentity();
-        auto skyBoxFeatureProcessorInterface = AZ::RPI::Scene::GetFeatureProcessorForEntity<AZ::Render::SkyBoxFeatureProcessorInterface>(m_iblEntityId);
-        skyBoxFeatureProcessorInterface->SetCubemapRotationMatrix(rotationMatrix);
+        auto skyBoxFeatureProcessor =
+            AZ::RPI::Scene::GetFeatureProcessorForEntity<AZ::Render::SkyBoxFeatureProcessorInterface>(m_environmentEntityId);
+        skyBoxFeatureProcessor->SetCubemapRotationMatrix(rotationMatrix);
 
         if (m_behavior)
         {
@@ -291,62 +259,42 @@ namespace MaterialEditor
         }
     }
 
-    void MaterialEditorViewportInputController::SetFieldOfView(float value)
+    void ViewportInputBehaviorController::SetFieldOfView(float value)
     {
         Camera::CameraRequestBus::Event(m_cameraEntityId, &Camera::CameraRequestBus::Events::SetFovDegrees, value);
     }
 
-    bool MaterialEditorViewportInputController::IsCameraCentered() const
+    bool ViewportInputBehaviorController::IsCameraCentered() const
     {
         return m_isCameraCentered;
     }
 
-    void MaterialEditorViewportInputController::CalculateExtents()
+    void ViewportInputBehaviorController::CalculateExtents()
     {
         AZ::TransformBus::EventResult(m_modelCenter, m_targetEntityId, &AZ::TransformBus::Events::GetLocalTranslation);
+        m_targetBounds.GetAsSphere(m_modelCenter, m_radius);
+        m_distanceMin = m_targetBounds.GetExtents().GetMinElement() * 0.5f + DepthNear;
+        m_distanceMax = m_radius * MaxDistanceMultiplier;
+    }
 
-        AZ::Data::AssetId modelAssetId;
-        AZ::Render::MeshComponentRequestBus::EventResult(modelAssetId, m_targetEntityId,
-            &AZ::Render::MeshComponentRequestBus::Events::GetModelAssetId);
-
-        if (modelAssetId.IsValid())
+    void ViewportInputBehaviorController::EvaluateControlBehavior()
+    {
+        auto it = m_behaviorMap.find(m_keys);
+        AZStd::shared_ptr<ViewportInputBehavior> nextBehavior =
+            it != m_behaviorMap.end() ? it->second : AZStd::shared_ptr<ViewportInputBehavior>();
+        if (m_behavior != nextBehavior)
         {
-            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = AZ::Data::AssetManager::Instance().GetAsset(modelAssetId, azrtti_typeid<AZ::RPI::ModelAsset>(), AZ::Data::AssetLoadBehavior::PreLoad);
-            modelAsset.BlockUntilLoadComplete();
-            if (modelAsset.IsReady())
+            if (m_behavior)
             {
-                const AZ::Aabb& aabb = modelAsset->GetAabb();
-                aabb.GetAsSphere(m_modelCenter, m_radius);
+                m_behavior->End();
+            }
 
-                m_distanceMin = 0.5f * AZ::GetMin(AZ::GetMin(aabb.GetExtents().GetX(), aabb.GetExtents().GetY()), aabb.GetExtents().GetZ()) + DepthNear;
-                m_distanceMax = m_radius * MaxDistanceMultiplier;
+            m_behavior = nextBehavior;
+
+            if (m_behavior)
+            {
+                m_behavior->Start();
             }
         }
     }
-
-    void MaterialEditorViewportInputController::EvaluateControlBehavior()
-    {
-        AZStd::shared_ptr<Behavior> nextBehavior;
-        auto it = m_behaviorMap.find(m_keys);
-        if (it == m_behaviorMap.end())
-        {
-            nextBehavior = m_behaviorMap[None];
-        }
-        else
-        {
-            nextBehavior = it->second;
-        }
-
-        if (nextBehavior == m_behavior)
-        {
-            return;
-        }
-
-        if (m_behavior)
-        {
-            m_behavior->End();
-        }
-        m_behavior = nextBehavior;
-        m_behavior->Start();
-    }
-} // namespace MaterialEditor
+} // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindow.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindow.cpp
index b6d519bd84..bdea04fc46 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindow.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindow.cpp
@@ -6,8 +6,11 @@
  *
  */
 
+#include <Atom/RHI/Factory.h>
 #include <AtomToolsFramework/PerformanceMonitor/PerformanceMonitorRequestBus.h>
 #include <AtomToolsFramework/Window/AtomToolsMainWindow.h>
+#include <AzCore/Name/Name.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
 #include <AzToolsFramework/PythonTerminal/ScriptTermDialog.h>
 
@@ -19,11 +22,11 @@
 
 namespace AtomToolsFramework
 {
-    AtomToolsMainWindow::AtomToolsMainWindow(QWidget* parent)
+    AtomToolsMainWindow::AtomToolsMainWindow(const AZ::Crc32& toolId, QWidget* parent)
         : AzQtComponents::DockMainWindow(parent)
+        , m_toolId(toolId)
+        , m_advancedDockManager(new AzQtComponents::FancyDocking(this))
     {
-        m_advancedDockManager = new AzQtComponents::FancyDocking(this);
-
         setDockNestingEnabled(true);
         setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
         setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
@@ -42,20 +45,21 @@ namespace AtomToolsFramework
         centralWidget->setLayout(centralWidgetLayout);
         setCentralWidget(centralWidget);
 
-        m_assetBrowser = new AtomToolsFramework::AtomToolsAssetBrowser(this);
+        m_assetBrowser = new AtomToolsAssetBrowser(this);
         AddDockWidget("Asset Browser", m_assetBrowser, Qt::BottomDockWidgetArea, Qt::Horizontal);
         AddDockWidget("Python Terminal", new AzToolsFramework::CScriptTermDialog, Qt::BottomDockWidgetArea, Qt::Horizontal);
         SetDockWidgetVisible("Python Terminal", false);
 
         SetupMetrics();
+        UpdateWindowTitle();
+        resize(1280, 1024);
 
-        AtomToolsMainWindowRequestBus::Handler::BusConnect();
+        AtomToolsMainWindowRequestBus::Handler::BusConnect(m_toolId);
     }
 
     AtomToolsMainWindow::~AtomToolsMainWindow()
     {
-        AtomToolsFramework::PerformanceMonitorRequestBus::Broadcast(
-            &AtomToolsFramework::PerformanceMonitorRequestBus::Handler::SetProfilerEnabled, false);
+        PerformanceMonitorRequestBus::Broadcast(&PerformanceMonitorRequestBus::Handler::SetProfilerEnabled, false);
         AtomToolsMainWindowRequestBus::Handler::BusDisconnect();
     }
 
@@ -160,10 +164,12 @@ namespace AtomToolsFramework
         m_menuHelp = menuBar()->addMenu("&Help");
 
         m_menuFile->addAction("Run &Python...", [this]() {
-            const QString script = QFileDialog::getOpenFileName(this, "Run Script", QString(), QString("*.py"));
+            const QString script = QFileDialog::getOpenFileName(
+                this, QObject::tr("Run Script"), QString(AZ::Utils::GetProjectPath().c_str()), QString("*.py"));
             if (!script.isEmpty())
             {
-                AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(&AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilename, script.toUtf8().constData());
+                AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(
+                    &AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilename, script.toUtf8().constData());
             }
         });
 
@@ -213,21 +219,34 @@ namespace AtomToolsFramework
         m_metricsTimer.start();
         connect(&m_metricsTimer, &QTimer::timeout, this, &AtomToolsMainWindow::UpdateMetrics);
 
-        AtomToolsFramework::PerformanceMonitorRequestBus::Broadcast(
-            &AtomToolsFramework::PerformanceMonitorRequestBus::Handler::SetProfilerEnabled, true);
+        PerformanceMonitorRequestBus::Broadcast(&PerformanceMonitorRequestBus::Handler::SetProfilerEnabled, true);
 
         UpdateMetrics();
     }
 
     void AtomToolsMainWindow::UpdateMetrics()
     {
-        AtomToolsFramework::PerformanceMetrics metrics = {};
-        AtomToolsFramework::PerformanceMonitorRequestBus::BroadcastResult(
-            metrics, &AtomToolsFramework::PerformanceMonitorRequestBus::Handler::GetMetrics);
+        PerformanceMetrics metrics = {};
+        PerformanceMonitorRequestBus::BroadcastResult(metrics, &PerformanceMonitorRequestBus::Handler::GetMetrics);
 
         m_statusBarCpuTime->setText(tr("CPU Time %1 ms").arg(QString::number(metrics.m_cpuFrameTimeMs, 'f', 2)));
         m_statusBarGpuTime->setText(tr("GPU Time %1 ms").arg(QString::number(metrics.m_gpuFrameTimeMs, 'f', 2)));
         int frameRate = metrics.m_cpuFrameTimeMs > 0 ? aznumeric_cast<int>(1000 / metrics.m_cpuFrameTimeMs) : 0;
         m_statusBarFps->setText(tr("FPS %1").arg(QString::number(frameRate)));
     }
+
+    void AtomToolsMainWindow::UpdateWindowTitle()
+    {
+        AZ::Name apiName = AZ::RHI::Factory::Get().GetName();
+        if (!apiName.IsEmpty())
+        {
+            QString title = QString{ "%1 (%2)" }.arg(QApplication::applicationName()).arg(apiName.GetCStr());
+            setWindowTitle(title);
+        }
+        else
+        {
+            AZ_Assert(false, "Render API name not found");
+            setWindowTitle(QApplication::applicationName());
+        }
+    }
 } // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindowSystemComponent.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindowSystemComponent.cpp
index 3114a5d9f7..c9fce9f86b 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindowSystemComponent.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Window/AtomToolsMainWindowSystemComponent.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-#include <AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h>
 #include <AtomToolsFramework/Window/AtomToolsMainWindowRequestBus.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -25,14 +24,6 @@ namespace AtomToolsFramework
 
         if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
         {
-            behaviorContext->EBus<AtomToolsMainWindowFactoryRequestBus>("AtomToolsMainWindowFactoryRequestBus")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
-                ->Attribute(AZ::Script::Attributes::Category, "Editor")
-                ->Attribute(AZ::Script::Attributes::Module, "atomtools")
-                ->Event("CreateMainWindow", &AtomToolsMainWindowFactoryRequestBus::Events::CreateMainWindow)
-                ->Event("DestroyMainWindow", &AtomToolsMainWindowFactoryRequestBus::Events::DestroyMainWindow)
-                ;
-
             behaviorContext->EBus<AtomToolsMainWindowRequestBus>("AtomToolsMainWindowRequestBus")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Category, "Editor")
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
index 041e6e1807..008eb5fe96 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake
@@ -15,6 +15,7 @@ set(FILES
     Include/AtomToolsFramework/Communication/LocalSocket.h
     Include/AtomToolsFramework/Debug/TraceRecorder.h
     Include/AtomToolsFramework/Document/AtomToolsDocument.h
+    Include/AtomToolsFramework/Document/AtomToolsDocumentSystem.h
     Include/AtomToolsFramework/Document/AtomToolsDocumentApplication.h
     Include/AtomToolsFramework/Document/AtomToolsDocumentMainWindow.h
     Include/AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h
@@ -38,7 +39,6 @@ set(FILES
     Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h
     Include/AtomToolsFramework/Window/AtomToolsMainWindow.h
     Include/AtomToolsFramework/Window/AtomToolsMainWindowRequestBus.h
-    Include/AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h
     Include/AtomToolsFramework/Window/AtomToolsMainWindowNotificationBus.h
     Source/Application/AtomToolsApplication.cpp
     Source/AssetBrowser/AtomToolsAssetBrowser.cpp
@@ -53,8 +53,7 @@ set(FILES
     Source/Document/AtomToolsDocument.cpp
     Source/Document/AtomToolsDocumentApplication.cpp
     Source/Document/AtomToolsDocumentMainWindow.cpp
-    Source/Document/AtomToolsDocumentSystemComponent.cpp
-    Source/Document/AtomToolsDocumentSystemComponent.h
+    Source/Document/AtomToolsDocumentSystem.cpp
     Source/DynamicProperty/DynamicProperty.cpp
     Source/DynamicProperty/DynamicPropertyGroup.cpp
     Source/Inspector/InspectorWidget.cpp
@@ -89,4 +88,21 @@ set(FILES
     Source/PreviewRenderer/PreviewRendererCaptureState.h
     Source/PreviewRenderer/PreviewRendererSystemComponent.cpp
     Source/PreviewRenderer/PreviewRendererSystemComponent.h
+    Source/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorController.cpp
+    Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorController.h
+    Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorControllerInterface.h
+    Source/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.cpp
+    Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehavior.h
+    Source/Viewport/ViewportInputBehaviorController/DollyCameraBehavior.cpp
+    Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/DollyCameraBehavior.h
+    Source/Viewport/ViewportInputBehaviorController/MoveCameraBehavior.cpp
+    Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/MoveCameraBehavior.h
+    Source/Viewport/ViewportInputBehaviorController/PanCameraBehavior.cpp
+    Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/PanCameraBehavior.h
+    Source/Viewport/ViewportInputBehaviorController/OrbitCameraBehavior.cpp
+    Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/OrbitCameraBehavior.h
+    Source/Viewport/ViewportInputBehaviorController/RotateEnvironmentBehavior.cpp
+    Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateEnvironmentBehavior.h
+    Source/Viewport/ViewportInputBehaviorController/RotateModelBehavior.cpp
+    Include/AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateModelBehavior.h
 )
\ No newline at end of file
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
index 8db8ee1eeb..496e527e0d 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp
@@ -14,6 +14,7 @@
 #include <Atom/RPI.Public/Material/Material.h>
 #include <Atom/RPI.Reflect/Material/MaterialFunctor.h>
 #include <Atom/RPI.Reflect/Material/MaterialPropertiesLayout.h>
+#include <Atom/RPI.Reflect/Material/MaterialNameContext.h>
 #include <AtomCore/Instance/Instance.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h>
 #include <AtomToolsFramework/Util/MaterialPropertyUtil.h>
@@ -21,8 +22,8 @@
 
 namespace MaterialEditor
 {
-    MaterialDocument::MaterialDocument()
-        : AtomToolsFramework::AtomToolsDocument()
+    MaterialDocument::MaterialDocument(const AZ::Crc32& toolId)
+        : AtomToolsFramework::AtomToolsDocument(toolId)
     {
         MaterialDocumentRequestBus::Handler::BusConnect(m_id);
     }
@@ -86,12 +87,12 @@ namespace MaterialEditor
                         }
                     }
 
-                    AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-                        &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentObjectInfoChanged, m_id,
+                    AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+                        m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentObjectInfoChanged, m_id,
                         GetObjectInfoFromDynamicPropertyGroup(group.get()), false);
 
-                    AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-                        &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentModified, m_id);
+                    AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+                        m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentModified, m_id);
                     return false;
                 }
             }
@@ -335,9 +336,10 @@ namespace MaterialEditor
         bool addPropertiesResult = true;
 
         // populate sourceData with properties that meet the filter
-        m_materialTypeSourceData.EnumerateProperties([&, this](const AZStd::string& propertyIdContext, const auto& propertyDefinition) {
+        m_materialTypeSourceData.EnumerateProperties([&](const auto& propertyDefinition, const AZ::RPI::MaterialNameContext& nameContext) {
 
-            AZ::Name propertyId{propertyIdContext + propertyDefinition->GetName()};
+            AZ::Name propertyId{propertyDefinition->GetName()};
+            nameContext.ContextualizeProperty(propertyId);
 
             const auto property = FindProperty(propertyId);
             if (property && propertyFilter(*property))
@@ -352,9 +354,7 @@ namespace MaterialEditor
                         return false;
                     }
                     
-                    // TODO: Support populating the Material Editor with nested property groups, not just the top level.
-                    AZStd::string_view groupName = propertyId.GetStringView().substr(0, propertyId.GetStringView().size() - propertyDefinition->GetName().size() - 1);
-                    sourceData.SetPropertyValue(AZ::RPI::MaterialPropertyId{groupName, propertyDefinition->GetName()}, propertyValue);
+                    sourceData.SetPropertyValue(propertyId, propertyValue);
                 }
             }
             return true;
@@ -551,25 +551,43 @@ namespace MaterialEditor
         // Assets must still be used for now because they contain the final accumulated value after all other materials
         // in the hierarchy are applied
         bool enumerateResult = m_materialTypeSourceData.EnumeratePropertyGroups(
-            [this, &parentPropertyValues](
-                const AZStd::string& propertyIdContext, const AZ::RPI::MaterialTypeSourceData::PropertyGroup* propertyGroup)
+            [this, &parentPropertyValues](const AZ::RPI::MaterialTypeSourceData::PropertyGroupStack& propertyGroupStack)
             {
-                // Add any material functors that are located inside each property group.
-                if (!AddEditorMaterialFunctors(propertyGroup->GetFunctors()))
+                using namespace AZ::RPI;
+
+                const MaterialTypeSourceData::PropertyGroup* propertyGroup = propertyGroupStack.back();
+                
+                MaterialNameContext groupNameContext = MaterialTypeSourceData::MakeMaterialNameContext(propertyGroupStack);
+
+                if (!AddEditorMaterialFunctors(propertyGroup->GetFunctors(), groupNameContext))
                 {
                     return false;
                 }
 
+                AZStd::vector<AZStd::string> groupNameVector;
+                AZStd::vector<AZStd::string> groupDisplayNameVector;
+                
+                groupNameVector.reserve(propertyGroupStack.size());
+                groupDisplayNameVector.reserve(propertyGroupStack.size());
+
+                for (auto& group : propertyGroupStack)
+                {
+                    groupNameVector.push_back(group->GetName());
+                    groupDisplayNameVector.push_back(group->GetDisplayName());
+                }
+
                 m_groups.emplace_back(aznew AtomToolsFramework::DynamicPropertyGroup);
-                m_groups.back()->m_name = propertyIdContext + propertyGroup->GetName();
-                m_groups.back()->m_displayName = propertyGroup->GetDisplayName();
                 m_groups.back()->m_description = propertyGroup->GetDescription();
+                AzFramework::StringFunc::Join(m_groups.back()->m_name, groupNameVector.begin(), groupNameVector.end(), ".");
+                AzFramework::StringFunc::Join(m_groups.back()->m_displayName, groupDisplayNameVector.begin(), groupDisplayNameVector.end(), " | ");
 
                 for (const auto& propertyDefinition : propertyGroup->GetProperties())
                 {
-                    // Assign id before conversion so it can be used in dynamic description
                     AtomToolsFramework::DynamicPropertyConfig propertyConfig;
-                    propertyConfig.m_id = m_groups.back()->m_name + "." + propertyDefinition->GetName();
+
+                    // Assign id before conversion so it can be used in dynamic description
+                    propertyConfig.m_id = propertyDefinition->GetName();
+                    groupNameContext.ContextualizeProperty(propertyConfig.m_id);
 
                     const auto& propertyIndex = m_materialAsset->GetMaterialPropertiesLayout()->FindPropertyIndex(propertyConfig.m_id);
                     const bool propertyIndexInBounds =
@@ -581,9 +599,8 @@ namespace MaterialEditor
                     if (propertyIndexInBounds)
                     {
                         AtomToolsFramework::ConvertToPropertyConfig(propertyConfig, *propertyDefinition);
-
-                        // TODO: Support populating the Material Editor with nested property groups, not just the top level.
-                        // (Does DynamicPropertyConfig really even need m_groupDisplayName?)
+                        
+                        // (Does DynamicPropertyConfig really even need m_groupName? It doesn't seem to be used anywhere)
                         propertyConfig.m_groupName = m_groups.back()->m_name;
                         propertyConfig.m_groupDisplayName = m_groups.back()->m_displayName;
                         propertyConfig.m_showThumbnail = true;
@@ -611,7 +628,8 @@ namespace MaterialEditor
         }
 
         // Add material functors that are in the top-level functors list.
-        if (!AddEditorMaterialFunctors(m_materialTypeSourceData.m_materialFunctorSourceData))
+        AZ::RPI::MaterialNameContext materialNameContext; // There is no name context for top-level functors, only functors inside PropertyGroups
+        if (!AddEditorMaterialFunctors(m_materialTypeSourceData.m_materialFunctorSourceData, materialNameContext))
         {
             return OpenFailed();
         }
@@ -739,10 +757,11 @@ namespace MaterialEditor
     }
 
     bool MaterialDocument::AddEditorMaterialFunctors(
-        const AZStd::vector<AZ::RPI::Ptr<AZ::RPI::MaterialFunctorSourceDataHolder>>& functorSourceDataHolders)
+        const AZStd::vector<AZ::RPI::Ptr<AZ::RPI::MaterialFunctorSourceDataHolder>>& functorSourceDataHolders,
+        const AZ::RPI::MaterialNameContext& nameContext)
     {
         const AZ::RPI::MaterialFunctorSourceData::EditorContext editorContext = AZ::RPI::MaterialFunctorSourceData::EditorContext(
-            m_materialSourceData.m_materialType, m_materialAsset->GetMaterialPropertiesLayout());
+            m_materialSourceData.m_materialType, m_materialAsset->GetMaterialPropertiesLayout(), &nameContext);
 
         for (AZ::RPI::Ptr<AZ::RPI::MaterialFunctorSourceDataHolder> functorData : functorSourceDataHolders)
         {
@@ -826,8 +845,8 @@ namespace MaterialEditor
 
             if (groupChange || groupRebuilt)
             {
-                AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-                    &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentObjectInfoChanged, m_id,
+                AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+                    m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentObjectInfoChanged, m_id,
                     GetObjectInfoFromDynamicPropertyGroup(group.get()), groupRebuilt);
             }
             return true;
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h
index 37b3e1922f..ee78045e51 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h
@@ -31,9 +31,9 @@ namespace MaterialEditor
     public:
         AZ_RTTI(MaterialDocument, "{DBA269AE-892B-415C-8FA1-166B94B0E045}");
         AZ_CLASS_ALLOCATOR(MaterialDocument, AZ::SystemAllocator, 0);
-        AZ_DISABLE_COPY(MaterialDocument);
+        AZ_DISABLE_COPY_MOVE(MaterialDocument);
 
-        MaterialDocument();
+        MaterialDocument(const AZ::Crc32& toolId);
         virtual ~MaterialDocument();
 
         // AtomToolsFramework::AtomToolsDocument overrides...
@@ -82,7 +82,8 @@ namespace MaterialEditor
         void RestorePropertyValues(const PropertyValueMap& propertyValues);
 
         bool AddEditorMaterialFunctors(
-            const AZStd::vector<AZ::RPI::Ptr<AZ::RPI::MaterialFunctorSourceDataHolder>>& functorSourceDataHolders);
+            const AZStd::vector<AZ::RPI::Ptr<AZ::RPI::MaterialFunctorSourceDataHolder>>& functorSourceDataHolders,
+            const AZ::RPI::MaterialNameContext& nameContext);
 
         // Run editor material functor to update editor metadata.
         // @param dirtyFlags indicates which properties have changed, and thus which MaterialFunctors need to be run.
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
index 17453bf7af..8e3376adff 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
@@ -42,24 +42,26 @@ void InitMaterialEditorResources()
 
 namespace MaterialEditor
 {
+    static const char* GetBuildTargetName()
+    {
+#if !defined(LY_CMAKE_TARGET)
+#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target"
+#endif
+        return LY_CMAKE_TARGET;
+    }
+
     MaterialEditorApplication::MaterialEditorApplication(int* argc, char*** argv)
-        : Base(argc, argv)
+        : Base(GetBuildTargetName(), argc, argv)
     {
         InitMaterialEditorResources();
 
         QApplication::setApplicationName("O3DE Material Editor");
 
-        // The settings registry has been created at this point, so add the CMake target
-        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization(
-            *AZ::SettingsRegistry::Get(), GetBuildTargetName());
-
         AzToolsFramework::EditorWindowRequestBus::Handler::BusConnect();
-        AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusConnect();
     }
 
     MaterialEditorApplication::~MaterialEditorApplication()
     {
-        AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusDisconnect();
         AzToolsFramework::EditorWindowRequestBus::Handler::BusDisconnect();
         m_window.reset();
     }
@@ -101,35 +103,20 @@ namespace MaterialEditor
     {
         Base::StartCommon(systemEntity);
 
-        AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(
-            &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Handler::RegisterDocumentType,
-            []() { return aznew MaterialDocument(); });
-    }
+        AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Event(
+            m_toolId, &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Handler::RegisterDocumentType,
+            [](const AZ::Crc32& toolId) { return aznew MaterialDocument(toolId); });
 
-    AZStd::string MaterialEditorApplication::GetBuildTargetName() const
-    {
-#if !defined(LY_CMAKE_TARGET)
-#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target"
-#endif
-        //! Returns the build system target name of "MaterialEditor"
-        return AZStd::string{ LY_CMAKE_TARGET };
-    }
+        m_window.reset(aznew MaterialEditorWindow(m_toolId));
 
-    AZStd::vector<AZStd::string> MaterialEditorApplication::GetCriticalAssetFilters() const
-    {
-        return AZStd::vector<AZStd::string>({ "passes/", "config/", "MaterialEditor/" });
-    }
-
-    void MaterialEditorApplication::CreateMainWindow()
-    {
-        m_window.reset(aznew MaterialEditorWindow);
         m_assetBrowserInteractions.reset(aznew AtomToolsFramework::AtomToolsAssetBrowserInteractions);
+
         m_assetBrowserInteractions->RegisterContextMenuActions(
             [](const AtomToolsFramework::AtomToolsAssetBrowserInteractions::AssetBrowserEntryVector& entries)
             {
                 return entries.front()->GetEntryType() == AzToolsFramework::AssetBrowser::AssetBrowserEntry::AssetEntryType::Source;
             },
-            []([[maybe_unused]] QWidget* caller, QMenu* menu, const AtomToolsFramework::AtomToolsAssetBrowserInteractions::AssetBrowserEntryVector& entries)
+            [this]([[maybe_unused]] QWidget* caller, QMenu* menu, const AtomToolsFramework::AtomToolsAssetBrowserInteractions::AssetBrowserEntryVector& entries)
             {
                 const bool isMaterial = AzFramework::StringFunc::Path::IsExtension(
                     entries.front()->GetFullPath().c_str(), AZ::RPI::MaterialSourceData::Extension);
@@ -137,17 +124,17 @@ namespace MaterialEditor
                     entries.front()->GetFullPath().c_str(), AZ::RPI::MaterialTypeSourceData::Extension);
                 if (isMaterial || isMaterialType)
                 {
-                    menu->addAction(QObject::tr("Open"), [entries]()
+                    menu->addAction(QObject::tr("Open"), [entries, this]()
                         {
-                            AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(
-                                &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::OpenDocument,
+                            AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Event(
+                                m_toolId, &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::OpenDocument,
                                 entries.front()->GetFullPath());
                         });
 
                     const QString createActionName =
                         isMaterialType ? QObject::tr("Create Material...") : QObject::tr("Create Child Material...");
 
-                    menu->addAction(createActionName, [entries]()
+                    menu->addAction(createActionName, [entries, this]()
                         {
                             const QString defaultPath = AtomToolsFramework::GetUniqueFileInfo(
                                 QString(AZ::Utils::GetProjectPath().c_str()) +
@@ -155,8 +142,8 @@ namespace MaterialEditor
                                 AZ_CORRECT_FILESYSTEM_SEPARATOR + "untitled." +
                                 AZ::RPI::MaterialSourceData::Extension).absoluteFilePath();
 
-                            AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(
-                                &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::CreateDocumentFromFile,
+                            AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Event(
+                                m_toolId, &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::CreateDocumentFromFile,
                                 entries.front()->GetFullPath(),
                                 AtomToolsFramework::GetSaveFileInfo(defaultPath).absoluteFilePath().toUtf8().constData());
                         });
@@ -175,9 +162,9 @@ namespace MaterialEditor
             {
                 return entries.front()->GetEntryType() == AzToolsFramework::AssetBrowser::AssetBrowserEntry::AssetEntryType::Folder;
             },
-            [](QWidget* caller, QMenu* menu, const AtomToolsFramework::AtomToolsAssetBrowserInteractions::AssetBrowserEntryVector& entries)
+            [this](QWidget* caller, QMenu* menu, const AtomToolsFramework::AtomToolsAssetBrowserInteractions::AssetBrowserEntryVector& entries)
             {
-                menu->addAction(QObject::tr("Create Material..."), [caller, entries]()
+                menu->addAction(QObject::tr("Create Material..."), [caller, entries, this]()
                     {
                         CreateMaterialDialog createDialog(entries.front()->GetFullPath().c_str(), caller);
                         createDialog.adjustSize();
@@ -186,8 +173,8 @@ namespace MaterialEditor
                             !createDialog.m_materialFileInfo.absoluteFilePath().isEmpty() &&
                             !createDialog.m_materialTypeFileInfo.absoluteFilePath().isEmpty())
                         {
-                            AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(
-                                &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::CreateDocumentFromFile,
+                            AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Event(
+                                m_toolId, &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::CreateDocumentFromFile,
                                 createDialog.m_materialTypeFileInfo.absoluteFilePath().toUtf8().constData(),
                                 createDialog.m_materialFileInfo.absoluteFilePath().toUtf8().constData());
                         }
@@ -195,9 +182,15 @@ namespace MaterialEditor
             });
     }
 
-    void MaterialEditorApplication::DestroyMainWindow()
+    void MaterialEditorApplication::Destroy()
     {
         m_window.reset();
+        Base::Destroy();
+    }
+
+    AZStd::vector<AZStd::string> MaterialEditorApplication::GetCriticalAssetFilters() const
+    {
+        return AZStd::vector<AZStd::string>({ "passes/", "config/", "MaterialEditor/" });
     }
 
     QWidget* MaterialEditorApplication::GetAppMainWindow()
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
index 0cf4354f6c..4829d31673 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
@@ -10,7 +10,6 @@
 
 #include <AtomToolsFramework/AssetBrowser/AtomToolsAssetBrowserInteractions.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentApplication.h>
-#include <AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h>
 #include <AzToolsFramework/API/EditorWindowRequestBus.h>
 #include <Window/MaterialEditorWindow.h>
 
@@ -21,7 +20,6 @@ namespace MaterialEditor
     class MaterialEditorApplication
         : public AtomToolsFramework::AtomToolsDocumentApplication
         , private AzToolsFramework::EditorWindowRequestBus::Handler
-        , private AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler
     {
     public:
         AZ_TYPE_INFO(MaterialEditor::MaterialEditorApplication, "{30F90CA5-1253-49B5-8143-19CEE37E22BB}");
@@ -36,15 +34,11 @@ namespace MaterialEditor
         void CreateStaticModules(AZStd::vector<AZ::Module*>& outModules) override;
         const char* GetCurrentConfigurationName() const override;
         void StartCommon(AZ::Entity* systemEntity) override;
+        void Destroy() override;
 
         // AtomToolsFramework::AtomToolsApplication overrides...
-        AZStd::string GetBuildTargetName() const override;
         AZStd::vector<AZStd::string> GetCriticalAssetFilters() const override;
 
-        // AtomToolsMainWindowFactoryRequestBus::Handler overrides...
-        void CreateMainWindow() override;
-        void DestroyMainWindow() override;
-
         // AzToolsFramework::EditorWindowRequests::Bus::Handler
         QWidget* GetAppMainWindow() override;
 
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp
deleted file mode 100644
index 0cd062d86d..0000000000
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp
+++ /dev/null
@@ -1,13 +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
- *
- */
-
-#include <Viewport/InputController/IdleBehavior.h>
-
-namespace MaterialEditor
-{
-} // namespace MaterialEditor
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h
deleted file mode 100644
index 16543a890d..0000000000
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h
+++ /dev/null
@@ -1,22 +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
- *
- */
-#pragma once
-
-#include <Viewport/InputController/Behavior.h>
-
-namespace MaterialEditor
-{
-    //! No action taken
-    class IdleBehavior final
-        : public Behavior
-    {
-    public:
-        IdleBehavior() = default;
-        virtual ~IdleBehavior() = default;
-    };
-} // namespace MaterialEditor
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp
deleted file mode 100644
index 894841becd..0000000000
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp
+++ /dev/null
@@ -1,51 +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
- *
- */
-
-#include <AzCore/Component/TransformBus.h>
-
-#include <Atom/Feature/SkyBox/SkyBoxFeatureProcessorInterface.h>
-#include <Atom/RPI.Public/RPISystemInterface.h>
-#include <Atom/RPI.Public/Scene.h>
-
-#include <Viewport/InputController/MaterialEditorViewportInputController.h>
-#include <Viewport/InputController/RotateEnvironmentBehavior.h>
-
-namespace MaterialEditor
-{
-    void RotateEnvironmentBehavior::Start()
-    {
-        Behavior::Start();
-
-        MaterialEditorViewportInputControllerRequestBus::BroadcastResult(
-            m_iblEntityId,
-            &MaterialEditorViewportInputControllerRequestBus::Handler::GetIblEntityId);
-        AZ_Assert(m_iblEntityId.IsValid(), "Failed to find m_iblEntityId");
-        m_skyBoxFeatureProcessorInterface = AZ::RPI::Scene::GetFeatureProcessorForEntity<AZ::Render::SkyBoxFeatureProcessorInterface>(m_iblEntityId);
-    }
-
-    void RotateEnvironmentBehavior::TickInternal(float x, float y, float z)
-    {
-        Behavior::TickInternal(x, y, z);
-
-        m_rotation += x;
-        AZ::Quaternion rotation = AZ::Quaternion::CreateFromAxisAngle(AZ::Vector3::CreateAxisZ(), m_rotation);
-        AZ::TransformBus::Event(m_iblEntityId, &AZ::TransformBus::Events::SetLocalRotationQuaternion, rotation);
-        const AZ::Matrix4x4 rotationMatrix = AZ::Matrix4x4::CreateFromQuaternion(rotation);
-        m_skyBoxFeatureProcessorInterface->SetCubemapRotationMatrix(rotationMatrix);
-    }
-
-    float RotateEnvironmentBehavior::GetSensitivityX()
-    {
-        return SensitivityX;
-    }
-
-    float RotateEnvironmentBehavior::GetSensitivityY()
-    {
-        return SensitivityY;
-    }
-} // namespace MaterialEditor
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
index f25d83556d..613dace10c 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
@@ -394,7 +394,7 @@ namespace MaterialEditor
         return m_viewportSettings->m_displayMapperOperationType;
     }
 
-    inline void MaterialViewportComponent::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
+    void MaterialViewportComponent::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
     {
         if (AZ::Data::Asset<AZ::RPI::AnyAsset> anyAsset = asset)
         {
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.cpp
index 21b01b5dab..89aecd67a2 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.cpp
@@ -40,6 +40,12 @@
 #include <AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlBus.h>
 #include <AtomLyIntegration/CommonFeatures/PostProcess/ExposureControl/ExposureControlComponentConstants.h>
 #include <AtomLyIntegration/CommonFeatures/PostProcess/PostFxLayerComponentConstants.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/DollyCameraBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/MoveCameraBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/OrbitCameraBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/PanCameraBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateEnvironmentBehavior.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/RotateModelBehavior.h>
 #include <AzCore/Component/Component.h>
 #include <AzCore/Component/Entity.h>
 #include <AzFramework/Components/NonUniformScaleComponent.h>
@@ -60,10 +66,10 @@ namespace MaterialEditor
 {
     static constexpr float DepthNear = 0.01f;
 
-    MaterialViewportWidget::MaterialViewportWidget(QWidget* parent)
+    MaterialViewportWidget::MaterialViewportWidget(const AZ::Crc32& toolId, QWidget* parent)
         : AtomToolsFramework::RenderViewportWidget(parent)
         , m_ui(new Ui::MaterialViewportWidget)
-        , m_viewportController(AZStd::make_shared<MaterialEditorViewportInputController>())
+        , m_toolId(toolId)
     {
         m_ui->setupUi(this);
 
@@ -116,31 +122,24 @@ namespace MaterialEditor
             entityContextId, &AzFramework::GameEntityContextRequestBus::Events::GetGameEntityContextId);
 
         // Configure camera
-        AzFramework::EntityContextRequestBus::EventResult(
-            m_cameraEntity, entityContextId, &AzFramework::EntityContextRequestBus::Events::CreateEntity, "Cameraentity");
-        AZ_Assert(m_cameraEntity != nullptr, "Failed to create camera entity.");
+        m_cameraEntity =
+            CreateEntity("Cameraentity", { azrtti_typeid<AzFramework::TransformComponent>(), azrtti_typeid<AZ::Debug::CameraComponent>() });
 
-        // Add debug camera and controller components
         AZ::Debug::CameraComponentConfig cameraConfig(GetViewportContext()->GetWindowContext());
         cameraConfig.m_fovY = AZ::Constants::HalfPi;
         cameraConfig.m_depthNear = DepthNear;
-        m_cameraComponent = m_cameraEntity->CreateComponent(azrtti_typeid<AZ::Debug::CameraComponent>());
-        m_cameraComponent->SetConfiguration(cameraConfig);
-        m_cameraEntity->CreateComponent(azrtti_typeid<AzFramework::TransformComponent>());
+        m_cameraEntity->Deactivate();
+        m_cameraEntity->FindComponent(azrtti_typeid<AZ::Debug::CameraComponent>())->SetConfiguration(cameraConfig);
         m_cameraEntity->Activate();
 
         // Connect camera to pipeline's default view after camera entity activated
         m_renderPipeline->SetDefaultViewFromEntity(m_cameraEntity->GetId());
 
         // Configure tone mapper
-        AzFramework::EntityContextRequestBus::EventResult(
-            m_postProcessEntity, entityContextId, &AzFramework::EntityContextRequestBus::Events::CreateEntity, "postProcessEntity");
-        AZ_Assert(m_postProcessEntity != nullptr, "Failed to create post process entity.");
-
-        m_postProcessEntity->CreateComponent(AZ::Render::PostFxLayerComponentTypeId);
-        m_postProcessEntity->CreateComponent(AZ::Render::ExposureControlComponentTypeId);
-        m_postProcessEntity->CreateComponent(azrtti_typeid<AzFramework::TransformComponent>());
-        m_postProcessEntity->Activate();
+        m_postProcessEntity = CreateEntity(
+            "PostProcessEntity",
+            { AZ::Render::PostFxLayerComponentTypeId, AZ::Render::ExposureControlComponentTypeId,
+              azrtti_typeid<AzFramework::TransformComponent>() });
 
         // Init directional light processor
         m_directionalLightFeatureProcessor = m_scene->GetFeatureProcessor<AZ::Render::DirectionalLightFeatureProcessorInterface>();
@@ -154,33 +153,19 @@ namespace MaterialEditor
         m_skyboxFeatureProcessor->SetSkyboxMode(AZ::Render::SkyBoxMode::Cubemap);
 
         // Create IBL
-        AzFramework::EntityContextRequestBus::EventResult(
-            m_iblEntity, entityContextId, &AzFramework::EntityContextRequestBus::Events::CreateEntity, "IblEntity");
-        AZ_Assert(m_iblEntity != nullptr, "Failed to create ibl entity.");
-
-        m_iblEntity->CreateComponent(AZ::Render::ImageBasedLightComponentTypeId);
-        m_iblEntity->CreateComponent(azrtti_typeid<AzFramework::TransformComponent>());
-        m_iblEntity->Activate();
+        m_iblEntity =
+            CreateEntity("IblEntity", { AZ::Render::ImageBasedLightComponentTypeId, azrtti_typeid<AzFramework::TransformComponent>() });
 
         // Create model
-        AzFramework::EntityContextRequestBus::EventResult(
-            m_modelEntity, entityContextId, &AzFramework::EntityContextRequestBus::Events::CreateEntity, "ViewportModel");
-        AZ_Assert(m_modelEntity != nullptr, "Failed to create model entity.");
-
-        m_modelEntity->CreateComponent(AZ::Render::MeshComponentTypeId);
-        m_modelEntity->CreateComponent(AZ::Render::MaterialComponentTypeId);
-        m_modelEntity->CreateComponent(azrtti_typeid<AzFramework::TransformComponent>());
-        m_modelEntity->Activate();
+        m_modelEntity = CreateEntity(
+            "ViewportModel",
+            { AZ::Render::MeshComponentTypeId, AZ::Render::MaterialComponentTypeId, azrtti_typeid<AzFramework::TransformComponent>() });
 
         // Create shadow catcher
-        AzFramework::EntityContextRequestBus::EventResult(
-            m_shadowCatcherEntity, entityContextId, &AzFramework::EntityContextRequestBus::Events::CreateEntity, "ViewportShadowCatcher");
-        AZ_Assert(m_shadowCatcherEntity != nullptr, "Failed to create shadow catcher entity.");
-        m_shadowCatcherEntity->CreateComponent(AZ::Render::MeshComponentTypeId);
-        m_shadowCatcherEntity->CreateComponent(AZ::Render::MaterialComponentTypeId);
-        m_shadowCatcherEntity->CreateComponent(azrtti_typeid<AzFramework::TransformComponent>());
-        m_shadowCatcherEntity->CreateComponent(azrtti_typeid<AzFramework::NonUniformScaleComponent>());
-        m_shadowCatcherEntity->Activate();
+        m_shadowCatcherEntity = CreateEntity(
+            "ViewportShadowCatcher",
+            { AZ::Render::MeshComponentTypeId, AZ::Render::MaterialComponentTypeId, azrtti_typeid<AzFramework::TransformComponent>(),
+              azrtti_typeid<AzFramework::NonUniformScaleComponent>() });
 
         AZ::NonUniformScaleRequestBus::Event(
             m_shadowCatcherEntity->GetId(), &AZ::NonUniformScaleRequests::SetScale, AZ::Vector3{ 100, 100, 1.0 });
@@ -213,21 +198,19 @@ namespace MaterialEditor
         }
 
         // Create grid
-        AzFramework::EntityContextRequestBus::EventResult(
-            m_gridEntity, entityContextId, &AzFramework::EntityContextRequestBus::Events::CreateEntity, "ViewportGrid");
-        AZ_Assert(m_gridEntity != nullptr, "Failed to create grid entity.");
+        m_gridEntity = CreateEntity("ViewportGrid", { AZ::Render::GridComponentTypeId, azrtti_typeid<AzFramework::TransformComponent>() });
 
         AZ::Render::GridComponentConfig gridConfig;
         gridConfig.m_gridSize = 4.0f;
         gridConfig.m_axisColor = AZ::Color(0.1f, 0.1f, 0.1f, 1.0f);
         gridConfig.m_primaryColor = AZ::Color(0.1f, 0.1f, 0.1f, 1.0f);
         gridConfig.m_secondaryColor = AZ::Color(0.1f, 0.1f, 0.1f, 1.0f);
-        auto gridComponent = m_gridEntity->CreateComponent(AZ::Render::GridComponentTypeId);
-        gridComponent->SetConfiguration(gridConfig);
-
-        m_gridEntity->CreateComponent(azrtti_typeid<AzFramework::TransformComponent>());
+        m_gridEntity->Deactivate();
+        m_gridEntity->FindComponent(AZ::Render::GridComponentTypeId)->SetConfiguration(gridConfig);
         m_gridEntity->Activate();
 
+        SetupInputController();
+
         OnDocumentOpened(AZ::Uuid::CreateNull());
 
         // Attempt to apply the default lighting preset
@@ -240,8 +223,6 @@ namespace MaterialEditor
         MaterialViewportRequestBus::BroadcastResult(modelPreset, &MaterialViewportRequestBus::Events::GetModelPresetSelection);
         OnModelPresetSelected(modelPreset);
 
-        m_viewportController->Init(m_cameraEntity->GetId(), m_modelEntity->GetId(), m_iblEntity->GetId());
-
         // Apply user settinngs restored since last run
         AZStd::intrusive_ptr<MaterialViewportSettings> viewportSettings =
             AZ::UserSettings::CreateFind<MaterialViewportSettings>(AZ::Crc32("MaterialViewportSettings"), AZ::UserSettings::CT_GLOBAL);
@@ -252,12 +233,10 @@ namespace MaterialEditor
         OnFieldOfViewChanged(viewportSettings->m_fieldOfView);
         OnDisplayMapperOperationTypeChanged(viewportSettings->m_displayMapperOperationType);
 
-        AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusConnect();
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusConnect(m_toolId);
         MaterialViewportNotificationBus::Handler::BusConnect();
         AZ::TickBus::Handler::BusConnect();
         AZ::TransformNotificationBus::MultiHandler::BusConnect(m_cameraEntity->GetId());
-
-        GetControllerList()->Add(m_viewportController);
     }
 
     MaterialViewportWidget::~MaterialViewportWidget()
@@ -268,33 +247,12 @@ namespace MaterialEditor
         MaterialViewportNotificationBus::Handler::BusDisconnect();
         AZ::Data::AssetBus::Handler::BusDisconnect();
 
-        AzFramework::EntityContextId entityContextId;
-        AzFramework::GameEntityContextRequestBus::BroadcastResult(
-            entityContextId, &AzFramework::GameEntityContextRequestBus::Events::GetGameEntityContextId);
-
-        AzFramework::EntityContextRequestBus::Event(
-            entityContextId, &AzFramework::EntityContextRequestBus::Events::DestroyEntity, m_iblEntity);
-        m_iblEntity = nullptr;
-
-        AzFramework::EntityContextRequestBus::Event(
-            entityContextId, &AzFramework::EntityContextRequestBus::Events::DestroyEntity, m_modelEntity);
-        m_modelEntity = nullptr;
-
-        AzFramework::EntityContextRequestBus::Event(
-            entityContextId, &AzFramework::EntityContextRequestBus::Events::DestroyEntity, m_shadowCatcherEntity);
-        m_shadowCatcherEntity = nullptr;
-
-        AzFramework::EntityContextRequestBus::Event(
-            entityContextId, &AzFramework::EntityContextRequestBus::Events::DestroyEntity, m_gridEntity);
-        m_gridEntity = nullptr;
-
-        AzFramework::EntityContextRequestBus::Event(
-            entityContextId, &AzFramework::EntityContextRequestBus::Events::DestroyEntity, m_cameraEntity);
-        m_cameraEntity = nullptr;
-
-        AzFramework::EntityContextRequestBus::Event(
-            entityContextId, &AzFramework::EntityContextRequestBus::Events::DestroyEntity, m_postProcessEntity);
-        m_postProcessEntity = nullptr;
+        DestroyEntity(m_iblEntity);
+        DestroyEntity(m_modelEntity);
+        DestroyEntity(m_shadowCatcherEntity);
+        DestroyEntity(m_gridEntity);
+        DestroyEntity(m_cameraEntity);
+        DestroyEntity(m_postProcessEntity);
 
         for (DirectionalLightHandle& handle : m_lightHandles)
         {
@@ -314,6 +272,74 @@ namespace MaterialEditor
         m_scene = nullptr;
     }
 
+    AZ::Entity* MaterialViewportWidget::CreateEntity(const AZStd::string& name, const AZStd::vector<AZ::Uuid>& componentTypeIds)
+    {
+        AzFramework::EntityContextId entityContextId;
+        AzFramework::GameEntityContextRequestBus::BroadcastResult(
+            entityContextId, &AzFramework::GameEntityContextRequestBus::Events::GetGameEntityContextId);
+
+        AZ::Entity* entity = {};
+        AzFramework::EntityContextRequestBus::EventResult(
+            entity, entityContextId, &AzFramework::EntityContextRequestBus::Events::CreateEntity, name.c_str());
+        AZ_Assert(entity != nullptr, "Failed to create post process entity: %s.", name.c_str());
+
+        if (entity)
+        {
+            for (const auto& componentTypeId : componentTypeIds)
+            {
+                entity->CreateComponent(componentTypeId);
+            }
+            entity->Activate();
+        }
+
+        return entity;
+    }
+
+    void MaterialViewportWidget::DestroyEntity(AZ::Entity*& entity)
+    {
+        AzFramework::EntityContextId entityContextId;
+        AzFramework::GameEntityContextRequestBus::BroadcastResult(
+            entityContextId, &AzFramework::GameEntityContextRequestBus::Events::GetGameEntityContextId);
+
+        AzFramework::EntityContextRequestBus::Event(entityContextId, &AzFramework::EntityContextRequestBus::Events::DestroyEntity, entity);
+        entity = nullptr;
+    }
+
+    void MaterialViewportWidget::SetupInputController()
+    {
+        using namespace AtomToolsFramework;
+
+        // Create viewport input controller and regioster its behaviors
+        m_viewportController.reset(
+            aznew ViewportInputBehaviorController(m_cameraEntity->GetId(), m_modelEntity->GetId(), m_iblEntity->GetId()));
+        m_viewportController->AddBehavior(
+            ViewportInputBehaviorController::Lmb, AZStd::make_shared<PanCameraBehavior>(m_viewportController.get()));
+        m_viewportController->AddBehavior(
+            ViewportInputBehaviorController::Mmb, AZStd::make_shared<MoveCameraBehavior>(m_viewportController.get()));
+        m_viewportController->AddBehavior(
+            ViewportInputBehaviorController::Rmb, AZStd::make_shared<OrbitCameraBehavior>(m_viewportController.get()));
+        m_viewportController->AddBehavior(
+            ViewportInputBehaviorController::Alt ^ ViewportInputBehaviorController::Lmb,
+            AZStd::make_shared<OrbitCameraBehavior>(m_viewportController.get()));
+        m_viewportController->AddBehavior(
+            ViewportInputBehaviorController::Alt ^ ViewportInputBehaviorController::Mmb,
+            AZStd::make_shared<MoveCameraBehavior>(m_viewportController.get()));
+        m_viewportController->AddBehavior(
+            ViewportInputBehaviorController::Alt ^ ViewportInputBehaviorController::Rmb,
+            AZStd::make_shared<DollyCameraBehavior>(m_viewportController.get()));
+        m_viewportController->AddBehavior(
+            ViewportInputBehaviorController::Lmb ^ ViewportInputBehaviorController::Rmb,
+            AZStd::make_shared<DollyCameraBehavior>(m_viewportController.get()));
+        m_viewportController->AddBehavior(
+            ViewportInputBehaviorController::Ctrl ^ ViewportInputBehaviorController::Lmb,
+            AZStd::make_shared<RotateModelBehavior>(m_viewportController.get()));
+        m_viewportController->AddBehavior(
+            ViewportInputBehaviorController::Shift ^ ViewportInputBehaviorController::Lmb,
+            AZStd::make_shared<RotateEnvironmentBehavior>(m_viewportController.get()));
+
+        GetControllerList()->Add(m_viewportController);
+    }
+
     void MaterialViewportWidget::OnDocumentOpened(const AZ::Uuid& documentId)
     {
         AZ::Data::Instance<AZ::RPI::Material> materialInstance;
@@ -435,8 +461,7 @@ namespace MaterialEditor
 
     void MaterialViewportWidget::OnFieldOfViewChanged(float fieldOfView)
     {
-        MaterialEditorViewportInputControllerRequestBus::Broadcast(
-            &MaterialEditorViewportInputControllerRequestBus::Handler::SetFieldOfView, fieldOfView);
+        m_viewportController->SetFieldOfView(fieldOfView);
     }
 
     void MaterialViewportWidget::OnDisplayMapperOperationTypeChanged(AZ::Render::DisplayMapperOperationType operationType)
@@ -450,7 +475,9 @@ namespace MaterialEditor
     {
         if (m_modelAssetId == asset.GetId())
         {
-            MaterialEditorViewportInputControllerRequestBus::Broadcast(&MaterialEditorViewportInputControllerRequestBus::Handler::Reset);
+            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = asset;
+            m_viewportController->SetTargetBounds(modelAsset->GetAabb());
+            m_viewportController->Reset();
             AZ::Data::AssetBus::Handler::BusDisconnect(asset.GetId());
         }
     }
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.h
index 8a660c6603..a6c7de243e 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportWidget.h
@@ -15,9 +15,9 @@
 #include <AtomCore/Instance/Instance.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h>
 #include <AtomToolsFramework/Viewport/RenderViewportWidget.h>
+#include <AtomToolsFramework/Viewport/ViewportInputBehaviorController/ViewportInputBehaviorController.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzFramework/Windowing/WindowBus.h>
-#include <Viewport/InputController/MaterialEditorViewportInputController.h>
 #include <Viewport/MaterialViewportNotificationBus.h>
 
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
@@ -57,10 +57,14 @@ namespace MaterialEditor
         , public AZ::TransformNotificationBus::MultiHandler
     {
     public:
-        MaterialViewportWidget(QWidget* parent = nullptr);
+        MaterialViewportWidget(const AZ::Crc32& toolId, QWidget* parent = nullptr);
         ~MaterialViewportWidget();
 
     private:
+        AZ::Entity* CreateEntity(const AZStd::string& name, const AZStd::vector<AZ::Uuid>& componentTypeIds);
+        void DestroyEntity(AZ::Entity*& entity);
+        void SetupInputController();
+
         // AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler interface overrides...
         void OnDocumentOpened(const AZ::Uuid& documentId) override;
 
@@ -84,6 +88,8 @@ namespace MaterialEditor
         // AZ::TransformNotificationBus::MultiHandler overrides...
         void OnTransformChanged(const AZ::Transform&, const AZ::Transform&) override;
 
+        const AZ::Crc32 m_toolId = {};
+
         using DirectionalLightHandle = AZ::Render::DirectionalLightFeatureProcessorInterface::LightHandle;
 
         AZ::Data::Instance<AZ::RPI::SwapChainPass> m_swapChainPass;
@@ -94,8 +100,6 @@ namespace MaterialEditor
         AZ::Render::DisplayMapperFeatureProcessorInterface* m_displayMapperFeatureProcessor = {};
 
         AZ::Entity* m_cameraEntity = {};
-        AZ::Component* m_cameraComponent = {};
-
         AZ::Entity* m_postProcessEntity = {};
 
         AZ::Entity* m_modelEntity = {};
@@ -112,7 +116,7 @@ namespace MaterialEditor
         AZ::Entity* m_iblEntity = {};
         AZ::Render::SkyBoxFeatureProcessorInterface* m_skyboxFeatureProcessor = {};
 
-        AZStd::shared_ptr<MaterialEditorViewportInputController> m_viewportController;
+        AZStd::shared_ptr<AtomToolsFramework::ViewportInputBehaviorController> m_viewportController;
 
         QScopedPointer<Ui::MaterialViewportWidget> m_ui;
     };
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
index da742d498d..3b9aba86e8 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-#include <Atom/RHI/Factory.h>
 #include <Atom/RPI.Edit/Material/MaterialSourceData.h>
 #include <Atom/RPI.Edit/Material/MaterialTypeSourceData.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h>
@@ -36,11 +35,9 @@ AZ_POP_DISABLE_WARNING
 
 namespace MaterialEditor
 {
-    MaterialEditorWindow::MaterialEditorWindow(QWidget* parent /* = 0 */)
-        : Base(parent)
+    MaterialEditorWindow::MaterialEditorWindow(const AZ::Crc32& toolId, QWidget* parent)
+        : Base(toolId, parent)
     {
-        resize(1280, 1024);
-
         // Among other things, we need the window wrapper to save the main window size, position, and state
         auto mainWindowWrapper =
             new AzQtComponents::WindowDecorationWrapper(AzQtComponents::WindowDecorationWrapper::OptionAutoTitleBarButtons);
@@ -52,36 +49,24 @@ namespace MaterialEditor
 
         QApplication::setWindowIcon(QIcon(":/Icons/materialeditor.svg"));
 
-        AZ::Name apiName = AZ::RHI::Factory::Get().GetName();
-        if (!apiName.IsEmpty())
-        {
-            QString title = QString{ "%1 (%2)" }.arg(QApplication::applicationName()).arg(apiName.GetCStr());
-            setWindowTitle(title);
-        }
-        else
-        {
-            AZ_Assert(false, "Render API name not found");
-            setWindowTitle(QApplication::applicationName());
-        }
-
         setObjectName("MaterialEditorWindow");
 
         m_toolBar = new MaterialEditorToolBar(this);
         m_toolBar->setObjectName("ToolBar");
         addToolBar(m_toolBar);
 
-        m_materialViewport = new MaterialViewportWidget(centralWidget());
+        m_materialViewport = new MaterialViewportWidget(m_toolId, centralWidget());
         m_materialViewport->setObjectName("Viewport");
         m_materialViewport->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
         centralWidget()->layout()->addWidget(m_materialViewport);
 
         m_assetBrowser->SetFilterState("", AZ::RPI::StreamingImageAsset::Group, true);
         m_assetBrowser->SetFilterState("", AZ::RPI::MaterialAsset::Group, true);
-        m_assetBrowser->SetOpenHandler([](const AZStd::string& absolutePath) {
+        m_assetBrowser->SetOpenHandler([this](const AZStd::string& absolutePath) {
             if (AzFramework::StringFunc::Path::IsExtension(absolutePath.c_str(), AZ::RPI::MaterialSourceData::Extension))
             {
-                AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(
-                    &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::OpenDocument, absolutePath);
+                AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Event(
+                    m_toolId, &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::OpenDocument, absolutePath);
                 return;
             }
 
@@ -93,7 +78,7 @@ namespace MaterialEditor
             QDesktopServices::openUrl(QUrl::fromLocalFile(absolutePath.c_str()));
         });
 
-        AddDockWidget("Inspector", new MaterialInspector, Qt::RightDockWidgetArea, Qt::Vertical);
+        AddDockWidget("Inspector", new MaterialInspector(m_toolId), Qt::RightDockWidgetArea, Qt::Vertical);
         AddDockWidget("Viewport Settings", new ViewportSettingsInspector, Qt::LeftDockWidgetArea, Qt::Vertical);
         SetDockWidgetVisible("Viewport Settings", false);
 
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h
index 33b60add5b..0e98e3ac84 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h
@@ -32,7 +32,7 @@ namespace MaterialEditor
 
         using Base = AtomToolsFramework::AtomToolsDocumentMainWindow;
 
-        MaterialEditorWindow(QWidget* parent = 0);
+        MaterialEditorWindow(const AZ::Crc32& toolId, QWidget* parent = 0);
 
     protected:
         void ResizeViewportRenderTarget(uint32_t width, uint32_t height) override;
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
index e6e768a7fd..c22e65df2e 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
@@ -15,13 +15,14 @@
 
 namespace MaterialEditor
 {
-    MaterialInspector::MaterialInspector(QWidget* parent)
+    MaterialInspector::MaterialInspector(const AZ::Crc32& toolId, QWidget* parent)
         : AtomToolsFramework::InspectorWidget(parent)
+        , m_toolId(toolId)
     {
         m_windowSettings = AZ::UserSettings::CreateFind<MaterialEditorWindowSettings>(
             AZ::Crc32("MaterialEditorWindowSettings"), AZ::UserSettings::CT_GLOBAL);
 
-        AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusConnect();
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusConnect(m_toolId);
     }
 
     MaterialInspector::~MaterialInspector()
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
index fe688e3ad5..901affd1b1 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
@@ -29,7 +29,7 @@ namespace MaterialEditor
     public:
         AZ_CLASS_ALLOCATOR(MaterialInspector, AZ::SystemAllocator, 0);
 
-        explicit MaterialInspector(QWidget* parent = nullptr);
+        MaterialInspector(const AZ::Crc32& toolId, QWidget* parent = nullptr);
         ~MaterialInspector() override;
 
         // AtomToolsFramework::InspectorRequestBus::Handler overrides...
@@ -59,6 +59,8 @@ namespace MaterialEditor
         void RequestPropertyContextMenu([[maybe_unused]] AzToolsFramework::InstanceDataNode* pNode, const QPoint&) override {}
         void PropertySelectionChanged([[maybe_unused]] AzToolsFramework::InstanceDataNode* pNode, bool) override {}
 
+        const AZ::Crc32 m_toolId = {};
+
         // Tracking the property that is activiley being edited in the inspector
         const AtomToolsFramework::DynamicProperty* m_activeProperty = {};
 
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake
index d68e013c59..dc8595fe1e 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake
+++ b/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake
@@ -17,28 +17,9 @@ set(FILES
 
     Source/Viewport/MaterialViewportModule.h
     Source/Viewport/MaterialViewportModule.cpp
-    Source/Viewport/InputController/MaterialEditorViewportInputControllerBus.h
     Source/Viewport/MaterialViewportSettings.h
     Source/Viewport/MaterialViewportRequestBus.h
     Source/Viewport/MaterialViewportNotificationBus.h
-    Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
-    Source/Viewport/InputController/MaterialEditorViewportInputController.h
-    Source/Viewport/InputController/Behavior.cpp
-    Source/Viewport/InputController/Behavior.h
-    Source/Viewport/InputController/DollyCameraBehavior.cpp
-    Source/Viewport/InputController/DollyCameraBehavior.h
-    Source/Viewport/InputController/IdleBehavior.cpp
-    Source/Viewport/InputController/IdleBehavior.h
-    Source/Viewport/InputController/MoveCameraBehavior.cpp
-    Source/Viewport/InputController/MoveCameraBehavior.h
-    Source/Viewport/InputController/PanCameraBehavior.cpp
-    Source/Viewport/InputController/PanCameraBehavior.h
-    Source/Viewport/InputController/OrbitCameraBehavior.cpp
-    Source/Viewport/InputController/OrbitCameraBehavior.h
-    Source/Viewport/InputController/RotateEnvironmentBehavior.cpp
-    Source/Viewport/InputController/RotateEnvironmentBehavior.h
-    Source/Viewport/InputController/RotateModelBehavior.cpp
-    Source/Viewport/InputController/RotateModelBehavior.h
     Source/Viewport/MaterialViewportSettings.cpp
     Source/Viewport/MaterialViewportComponent.cpp
     Source/Viewport/MaterialViewportComponent.h
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.cpp
index 5698e33cec..241ebb2433 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.cpp
@@ -6,16 +6,24 @@
  *
  */
 
+#include <AssetDatabase/AssetDatabaseConnection.h>
+#include <Atom/RPI.Edit/Common/AssetUtils.h>
 #include <Atom/RPI.Edit/Common/JsonUtils.h>
+#include <Atom/RPI.Edit/Material/MaterialTypeSourceData.h>
+#include <Atom/RPI.Public/Material/Material.h>
 #include <Atom/RPI.Reflect/Asset/AssetUtils.h>
+#include <Atom/RPI.Reflect/Material/MaterialAsset.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzFramework/StringFunc/StringFunc.h>
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
+#include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <Document/ShaderManagementConsoleDocument.h>
 
 namespace ShaderManagementConsole
 {
-    ShaderManagementConsoleDocument::ShaderManagementConsoleDocument()
-        : AtomToolsFramework::AtomToolsDocument()
+    ShaderManagementConsoleDocument::ShaderManagementConsoleDocument(const AZ::Crc32& toolId)
+        : AtomToolsFramework::AtomToolsDocument(toolId)
     {
         ShaderManagementConsoleDocumentRequestBus::Handler::BusConnect(m_id);
     }
@@ -25,20 +33,18 @@ namespace ShaderManagementConsole
         ShaderManagementConsoleDocumentRequestBus::Handler::BusDisconnect();
     }
 
-    void ShaderManagementConsoleDocument::SetShaderVariantListSourceData(const AZ::RPI::ShaderVariantListSourceData& sourceData)
+    void ShaderManagementConsoleDocument::SetShaderVariantListSourceData(
+        const AZ::RPI::ShaderVariantListSourceData& shaderVariantListSourceData)
     {
-        m_shaderVariantListSourceData = sourceData;
+        m_shaderVariantListSourceData = shaderVariantListSourceData;
         AZStd::string shaderPath = m_shaderVariantListSourceData.m_shaderFilePath;
         AzFramework::StringFunc::Path::ReplaceExtension(shaderPath, AZ::RPI::ShaderAsset::Extension);
 
         m_shaderAsset = AZ::RPI::AssetUtils::LoadAssetByProductPath<AZ::RPI::ShaderAsset>(shaderPath.c_str());
-        if (!m_shaderAsset)
-        {
-            AZ_Error("ShaderManagementConsoleDocument", false, "Could not load shader asset: %s.", shaderPath.c_str());
-        }
+        AZ_Error("ShaderManagementConsoleDocument", m_shaderAsset.IsReady(), "Could not load shader asset: %s.", shaderPath.c_str());
 
-        AtomToolsFramework::AtomToolsDocumentNotificationBus::Broadcast(
-            &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentModified, m_id);
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Event(
+            m_toolId, &AtomToolsFramework::AtomToolsDocumentNotificationBus::Events::OnDocumentModified, m_id);
     }
 
     const AZ::RPI::ShaderVariantListSourceData& ShaderManagementConsoleDocument::GetShaderVariantListSourceData() const
@@ -107,22 +113,18 @@ namespace ShaderManagementConsole
             return false;
         }
 
-        if (!AzFramework::StringFunc::Path::IsExtension(m_absolutePath.c_str(), AZ::RPI::ShaderVariantListSourceData::Extension))
+        if (AzFramework::StringFunc::Path::IsExtension(m_absolutePath.c_str(), AZ::RPI::ShaderSourceData::Extension))
         {
-            AZ_Error("ShaderManagementConsoleDocument", false, "Document extension is not supported: '%s.'", m_absolutePath.c_str());
-            return OpenFailed();
+            return LoadShaderSourceData();
         }
 
-        // Load the shader config data and create a shader config asset from it
-        AZ::RPI::ShaderVariantListSourceData sourceData;
-        if (!AZ::RPI::JsonUtils::LoadObjectFromFile(m_absolutePath, sourceData))
+        if (AzFramework::StringFunc::Path::IsExtension(m_absolutePath.c_str(), AZ::RPI::ShaderVariantListSourceData::Extension))
         {
-            AZ_Error("ShaderManagementConsoleDocument", false, "Failed loading shader variant list data: '%s.'", m_absolutePath.c_str());
-            return OpenFailed();
+            return LoadShaderVariantListSourceData();
         }
 
-        SetShaderVariantListSourceData(sourceData);
-        return IsOpen() ? OpenSucceeded() : OpenFailed();
+        AZ_Error("ShaderManagementConsoleDocument", false, "Document extension is not supported: '%s.'", m_absolutePath.c_str());
+        return OpenFailed();
     }
 
     bool ShaderManagementConsoleDocument::Save()
@@ -173,7 +175,8 @@ namespace ShaderManagementConsole
 
     bool ShaderManagementConsoleDocument::IsSavable() const
     {
-        return true;
+        return IsOpen() &&
+            AzFramework::StringFunc::Path::IsExtension(m_absolutePath.c_str(), AZ::RPI::ShaderVariantListSourceData::Extension);
     }
 
     void ShaderManagementConsoleDocument::Clear()
@@ -195,4 +198,178 @@ namespace ShaderManagementConsole
         m_absolutePath = m_savePathNormalized;
         return SaveSucceeded();
     }
+
+    bool ShaderManagementConsoleDocument::LoadShaderSourceData()
+    {
+        // Get info such as relative path of the file and asset id
+        bool result = false;
+        AZ::Data::AssetInfo shaderAssetInfo;
+        AZStd::string watchFolder;
+        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+            result, &AzToolsFramework::AssetSystem::AssetSystemRequest::GetSourceInfoBySourcePath, m_absolutePath.c_str(), shaderAssetInfo,
+            watchFolder);
+
+        if (!result)
+        {
+            AZ_Error("ShaderManagementConsoleDocument", false, "Failed to get the asset info for the file: %s.", m_absolutePath.c_str());
+            return OpenFailed();
+        }
+
+        // retrieves a list of all material source files that use the shader. Note that materials inherit from materialtype files, which
+        // are actual files that refer to shader files.
+        const auto& materialAssetIds = FindMaterialAssetsUsingShader(shaderAssetInfo.m_relativePath);
+
+        // This loop collects all uniquely-identified shader items used by the materials based on its shader variant id.
+        AZStd::set<AZ::RPI::ShaderVariantId> shaderVariantIds;
+        AZStd::vector<AZ::RPI::ShaderOptionGroup> shaderVariantListShaderOptionGroups;
+        for (const auto& materialAssetId : materialAssetIds)
+        {
+            const auto& materialInstanceShaderItems = GetMaterialInstanceShaderItems(materialAssetId);
+            for (const auto& shaderItem : materialInstanceShaderItems)
+            {
+                const auto& shaderAssetId = shaderItem.GetShaderAsset().GetId();
+                if (shaderAssetInfo.m_assetId == shaderAssetId)
+                {
+                    const auto& shaderVariantId = shaderItem.GetShaderVariantId();
+                    if (!shaderVariantId.IsEmpty() && shaderVariantIds.insert(shaderVariantId).second)
+                    {
+                        shaderVariantListShaderOptionGroups.push_back(shaderItem.GetShaderOptionGroup());
+                    }
+                }
+            }
+        }
+
+        // Generate the shader variant list data by collecting shader option name-value pairs.s
+        AZ::RPI::ShaderVariantListSourceData shaderVariantListSourceData;
+        shaderVariantListSourceData.m_shaderFilePath = shaderAssetInfo.m_relativePath;
+        int stableId = 1;
+        for (const auto& shaderOptionGroup : shaderVariantListShaderOptionGroups)
+        {
+            AZ::RPI::ShaderVariantListSourceData::VariantInfo variantInfo;
+            variantInfo.m_stableId = stableId;
+
+            const auto& shaderOptionDescriptors = shaderOptionGroup.GetShaderOptionDescriptors();
+            for (const auto& shaderOptionDescriptor : shaderOptionDescriptors)
+            {
+                const auto& optionName = shaderOptionDescriptor.GetName();
+                const auto& optionValue = shaderOptionGroup.GetValue(optionName);
+                if (!optionValue.IsValid())
+                {
+                    continue;
+                }
+
+                const auto& valueName = shaderOptionDescriptor.GetValueName(optionValue);
+                variantInfo.m_options[optionName.GetStringView()] = valueName.GetStringView();
+            }
+
+            if (!variantInfo.m_options.empty())
+            {
+                shaderVariantListSourceData.m_shaderVariants.push_back(variantInfo);
+                stableId++;
+            }
+        }
+
+        SetShaderVariantListSourceData(shaderVariantListSourceData);
+        return IsOpen() ? OpenSucceeded() : OpenFailed();
+    }
+
+    bool ShaderManagementConsoleDocument::LoadShaderVariantListSourceData()
+    {
+        // Load previously generated shader variant list source data 
+        AZ::RPI::ShaderVariantListSourceData shaderVariantListSourceData;
+        if (!AZ::RPI::JsonUtils::LoadObjectFromFile(m_absolutePath, shaderVariantListSourceData))
+        {
+            AZ_Error("ShaderManagementConsoleDocument", false, "Failed loading shader variant list data: '%s.'", m_absolutePath.c_str());
+            return OpenFailed();
+        }
+
+        SetShaderVariantListSourceData(shaderVariantListSourceData);
+        return IsOpen() ? OpenSucceeded() : OpenFailed();
+    }
+
+    AZStd::vector<AZ::Data::AssetId> ShaderManagementConsoleDocument::FindMaterialAssetsUsingShader(const AZStd::string& shaderFilePath)
+    {
+        AzToolsFramework::AssetDatabase::AssetDatabaseConnection assetDatabaseConnection;
+        assetDatabaseConnection.OpenDatabase();
+
+        // Find all material types that reference shaderFilePath
+        AZStd::vector<AZStd::string> materialTypeSources;
+
+        assetDatabaseConnection.QuerySourceDependencyByDependsOnSource(
+            shaderFilePath.c_str(), nullptr, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_Any,
+            [&](AzToolsFramework::AssetDatabase::SourceFileDependencyEntry& sourceFileDependencyEntry)
+            {
+                if (AzFramework::StringFunc::Path::IsExtension(
+                        sourceFileDependencyEntry.m_source.c_str(), AZ::RPI::MaterialTypeSourceData::Extension))
+                {
+                    materialTypeSources.push_back(sourceFileDependencyEntry.m_source);
+                }
+                return true;
+            });
+
+        // Find all materials that reference any of the material types using this shader 
+        AzToolsFramework::AssetDatabase::ProductDatabaseEntryContainer productDependencies;
+        for (const auto& materialTypeSource : materialTypeSources)
+        {
+            bool result = false;
+            AZ::Data::AssetInfo materialTypeSourceAssetInfo;
+            AZStd::string watchFolder;
+            AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+                result, &AzToolsFramework::AssetSystem::AssetSystemRequest::GetSourceInfoBySourcePath, materialTypeSource.c_str(),
+                materialTypeSourceAssetInfo, watchFolder);
+
+            assetDatabaseConnection.QueryDirectReverseProductDependenciesBySourceGuidSubId(
+                materialTypeSourceAssetInfo.m_assetId.m_guid, materialTypeSourceAssetInfo.m_assetId.m_subId,
+                [&](AzToolsFramework::AssetDatabase::ProductDatabaseEntry& entry)
+                {
+                    if (AzFramework::StringFunc::Path::IsExtension(entry.m_productName.c_str(), AZ::RPI::MaterialAsset::Extension))
+                    {
+                        productDependencies.push_back(entry);
+                    }
+                    return true;
+                });
+        }
+
+        AZStd::vector<AZ::Data::AssetId> results;
+        results.reserve(productDependencies.size());
+        for (auto product : productDependencies)
+        {
+            assetDatabaseConnection.QueryCombinedByProductID(
+                product.m_productID,
+                [&](AzToolsFramework::AssetDatabase::CombinedDatabaseEntry& combined)
+                {
+                    results.push_back({ combined.m_sourceGuid, combined.m_subID });
+                    return false;
+                },
+                nullptr);
+        }
+
+        return results;
+    }
+
+    AZStd::vector<AZ::RPI::ShaderCollection::Item> ShaderManagementConsoleDocument::GetMaterialInstanceShaderItems(
+        const AZ::Data::AssetId& materialAssetId)
+    {
+        auto materialAsset =
+            AZ::RPI::AssetUtils::LoadAssetById<AZ::RPI::MaterialAsset>(materialAssetId, AZ::RPI::AssetUtils::TraceLevel::Error);
+        if (!materialAsset.IsReady())
+        {
+            AZ_Error(
+                "ShaderManagementConsoleDocument", false, "Failed to load material asset from asset id: %s",
+                materialAssetId.ToString<AZStd::string>().c_str());
+            return AZStd::vector<AZ::RPI::ShaderCollection::Item>();
+        }
+
+        auto materialInstance = AZ::RPI::Material::Create(materialAsset);
+        if (!materialInstance)
+        {
+            AZ_Error(
+                "ShaderManagementConsoleDocument", false, "Failed to create material instance from asset: %s",
+                materialAsset.ToString<AZStd::string>().c_str());
+            return AZStd::vector<AZ::RPI::ShaderCollection::Item>();
+        }
+
+        return AZStd::vector<AZ::RPI::ShaderCollection::Item>(
+            materialInstance->GetShaderCollection().begin(), materialInstance->GetShaderCollection().end());
+    }
 } // namespace ShaderManagementConsole
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.h
index 5c3d66b0a9..232910d9d1 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.h
@@ -5,30 +5,31 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
+
 #pragma once
 
 #include <Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h>
+#include <Atom/RPI.Reflect/Material/ShaderCollection.h>
 #include <Atom/RPI.Reflect/Shader/ShaderAsset.h>
 #include <AtomToolsFramework/Document/AtomToolsDocument.h>
 #include <AzCore/Asset/AssetCommon.h>
 #include <AzCore/RTTI/RTTI.h>
+#include <AzCore/std/containers/vector.h>
 #include <Document/ShaderManagementConsoleDocumentRequestBus.h>
 
 namespace ShaderManagementConsole
 {
-    /**
-     * ShaderManagementConsoleDocument provides an API for modifying and saving document properties.
-     */
+    //! ShaderManagementConsoleDocument provides an API for modifying and saving document properties.
     class ShaderManagementConsoleDocument
         : public AtomToolsFramework::AtomToolsDocument
         , public ShaderManagementConsoleDocumentRequestBus::Handler
     {
     public:
-        AZ_RTTI(ShaderManagementConsoleDocument, "{DBA269AE-892B-415C-8FA1-166B94B0E045}");
+        AZ_RTTI(ShaderManagementConsoleDocument, "{504A74BA-F5DD-49E0-BA5E-A381F61DD524}");
         AZ_CLASS_ALLOCATOR(ShaderManagementConsoleDocument, AZ::SystemAllocator, 0);
-        AZ_DISABLE_COPY(ShaderManagementConsoleDocument);
+        AZ_DISABLE_COPY_MOVE(ShaderManagementConsoleDocument);
 
-        ShaderManagementConsoleDocument();
+        ShaderManagementConsoleDocument(const AZ::Crc32& toolId);
         ~ShaderManagementConsoleDocument();
 
         // AtomToolsFramework::AtomToolsDocument overrides...
@@ -42,7 +43,7 @@ namespace ShaderManagementConsole
         bool IsSavable() const override;
 
         // ShaderManagementConsoleDocumentRequestBus::Handler overridfes...
-        void SetShaderVariantListSourceData(const AZ::RPI::ShaderVariantListSourceData& sourceData) override;
+        void SetShaderVariantListSourceData(const AZ::RPI::ShaderVariantListSourceData& shaderVariantListSourceData) override;
         const AZ::RPI::ShaderVariantListSourceData& GetShaderVariantListSourceData() const override;
         size_t GetShaderVariantCount() const override;
         const AZ::RPI::ShaderVariantListSourceData::VariantInfo& GetShaderVariantInfo(size_t index) const override;
@@ -53,8 +54,21 @@ namespace ShaderManagementConsole
         // AtomToolsFramework::AtomToolsDocument overrides...
         void Clear() override;
 
+        // Write shader variant list source data to JSON
         bool SaveSourceData();
 
+        // Read shader variant list source data from JSON and initialize the document
+        bool LoadShaderSourceData();
+
+        // Read shader source data from JSON then find all references to to populate the shader variant list and initialize the document
+        bool LoadShaderVariantListSourceData();
+
+        // Find all material assets that reference material types using shaderFilePath
+        AZStd::vector<AZ::Data::AssetId> FindMaterialAssetsUsingShader(const AZStd::string& shaderFilePath);
+
+        // Retrieve all of the shader collection items from a material instance created from materialAssetId
+        AZStd::vector<AZ::RPI::ShaderCollection::Item> GetMaterialInstanceShaderItems(const AZ::Data::AssetId& materialAssetId);
+
         // Source data for shader variant list
         AZ::RPI::ShaderVariantListSourceData m_shaderVariantListSourceData;
 
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentRequestBus.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentRequestBus.h
index e58ee34ed1..e249146af6 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentRequestBus.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocumentRequestBus.h
@@ -5,6 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
+
 #pragma once
 
 #include <Atom/RPI.Edit/Shader/ShaderSourceData.h>
@@ -14,9 +15,7 @@
 
 namespace ShaderManagementConsole
 {
-
-    class ShaderManagementConsoleDocumentRequests
-        : public AZ::EBusTraits
+    class ShaderManagementConsoleDocumentRequests : public AZ::EBusTraits
     {
     public:
         static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
@@ -24,7 +23,7 @@ namespace ShaderManagementConsole
         typedef AZ::Uuid BusIdType;
 
         //! Set the shader variant list
-        virtual void SetShaderVariantListSourceData(const AZ::RPI::ShaderVariantListSourceData& sourceData) = 0;
+        virtual void SetShaderVariantListSourceData(const AZ::RPI::ShaderVariantListSourceData& shaderVariantListSourceData) = 0;
 
         //! Get the shader variant list
         virtual const AZ::RPI::ShaderVariantListSourceData& GetShaderVariantListSourceData() const = 0;
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp
index 2d61730c4d..dff162b0cb 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp
@@ -6,27 +6,17 @@
  *
  */
 
-#include <AssetDatabase/AssetDatabaseConnection.h>
-#include <Atom/RPI.Edit/Common/AssetUtils.h>
-#include <Atom/RPI.Edit/Common/JsonUtils.h>
-#include <Atom/RPI.Public/Material/Material.h>
-#include <Atom/RPI.Reflect/Asset/AssetUtils.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h>
-#include <AtomToolsFramework/Util/Util.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/Utils/Utils.h>
-#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
-#include <AzToolsFramework/UI/UICore/QWidgetSavedState.h>
 #include <Document/ShaderManagementConsoleDocument.h>
 #include <Document/ShaderManagementConsoleDocumentRequestBus.h>
 #include <ShaderManagementConsoleApplication.h>
-#include <ShaderManagementConsoleRequestBus.h>
 #include <ShaderManagementConsole_Traits_Platform.h>
 
 #include <QDesktopServices>
@@ -47,27 +37,27 @@ void InitShaderManagementConsoleResources()
 
 namespace ShaderManagementConsole
 {
+    static const char* GetBuildTargetName()
+    {
+#if !defined(LY_CMAKE_TARGET)
+#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target"
+#endif
+        return LY_CMAKE_TARGET;
+    }
+
     ShaderManagementConsoleApplication::ShaderManagementConsoleApplication(int* argc, char*** argv)
-        : Base(argc, argv)
+        : Base(GetBuildTargetName(), argc, argv)
     {
         InitShaderManagementConsoleResources();
 
         QApplication::setApplicationName("O3DE Shader Management Console");
 
-        // The settings registry has been created at this point, so add the CMake target
-        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization(
-            *AZ::SettingsRegistry::Get(), GetBuildTargetName());
-
-        ShaderManagementConsoleRequestBus::Handler::BusConnect();
         AzToolsFramework::EditorWindowRequestBus::Handler::BusConnect();
-        AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusConnect();
     }
 
     ShaderManagementConsoleApplication::~ShaderManagementConsoleApplication()
     {
-        ShaderManagementConsoleRequestBus::Handler::BusDisconnect();
         AzToolsFramework::EditorWindowRequestBus::Handler::BusDisconnect();
-        AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusDisconnect();
         m_window.reset();
     }
 
@@ -77,15 +67,6 @@ namespace ShaderManagementConsole
 
         if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
         {
-            behaviorContext->EBus<ShaderManagementConsoleRequestBus>("ShaderManagementConsoleRequestBus")
-                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
-                ->Attribute(AZ::Script::Attributes::Category, "Editor")
-                ->Attribute(AZ::Script::Attributes::Module, "shadermanagementconsole")
-                ->Event("GetSourceAssetInfo", &ShaderManagementConsoleRequestBus::Events::GetSourceAssetInfo)
-                ->Event("FindMaterialAssetsUsingShader", &ShaderManagementConsoleRequestBus::Events::FindMaterialAssetsUsingShader )
-                ->Event("GetMaterialInstanceShaderItems", &ShaderManagementConsoleRequestBus::Events::GetMaterialInstanceShaderItems)
-                ;
-
             behaviorContext->EBus<ShaderManagementConsoleDocumentRequestBus>("ShaderManagementConsoleDocumentRequestBus")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Category, "Editor")
@@ -115,40 +96,20 @@ namespace ShaderManagementConsole
     {
         Base::StartCommon(systemEntity);
 
-        AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(
-            &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Handler::RegisterDocumentType,
-            []() { return aznew ShaderManagementConsoleDocument(); });
-    }
+        AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Event(
+            m_toolId, &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Handler::RegisterDocumentType,
+            [](const AZ::Crc32& toolId) { return aznew ShaderManagementConsoleDocument(toolId); });
 
-    AZStd::string ShaderManagementConsoleApplication::GetBuildTargetName() const
-    {
-#if !defined(LY_CMAKE_TARGET)
-#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target"
-#endif
-        //! Returns the build system target name of "ShaderManagementConsole"
-        return AZStd::string_view{ LY_CMAKE_TARGET };
-    }
+        m_window.reset(aznew ShaderManagementConsoleWindow(m_toolId));
 
-    AZStd::vector<AZStd::string> ShaderManagementConsoleApplication::GetCriticalAssetFilters() const
-    {
-        return AZStd::vector<AZStd::string>({ "passes/", "config/" });
-    }
-
-    QWidget* ShaderManagementConsoleApplication::GetAppMainWindow()
-    {
-        return m_window.get();
-    }
-
-    void ShaderManagementConsoleApplication::CreateMainWindow()
-    {
-        m_window.reset(aznew ShaderManagementConsoleWindow);
         m_assetBrowserInteractions.reset(aznew AtomToolsFramework::AtomToolsAssetBrowserInteractions);
+
         m_assetBrowserInteractions->RegisterContextMenuActions(
             [](const AtomToolsFramework::AtomToolsAssetBrowserInteractions::AssetBrowserEntryVector& entries)
             {
                 return entries.front()->GetEntryType() == AzToolsFramework::AssetBrowser::AssetBrowserEntry::AssetEntryType::Source;
             },
-            []([[maybe_unused]] QWidget* caller, QMenu* menu, const AtomToolsFramework::AtomToolsAssetBrowserInteractions::AssetBrowserEntryVector& entries)
+            [this]([[maybe_unused]] QWidget* caller, QMenu* menu, const AtomToolsFramework::AtomToolsAssetBrowserInteractions::AssetBrowserEntryVector& entries)
             {
                 if (AzFramework::StringFunc::Path::IsExtension(
                         entries.front()->GetFullPath().c_str(), AZ::RPI::ShaderSourceData::Extension))
@@ -163,13 +124,16 @@ namespace ShaderManagementConsole
                                 pythonArgs);
                         });
                 }
-                else if (AzFramework::StringFunc::Path::IsExtension(
-                             entries.front()->GetFullPath().c_str(), AZ::RPI::ShaderVariantListSourceData::Extension))
+
+                if (AzFramework::StringFunc::Path::IsExtension(
+                        entries.front()->GetFullPath().c_str(), AZ::RPI::ShaderSourceData::Extension) ||
+                    AzFramework::StringFunc::Path::IsExtension(
+                        entries.front()->GetFullPath().c_str(), AZ::RPI::ShaderVariantListSourceData::Extension))
                 {
-                    menu->addAction(QObject::tr("Open"), [entries]()
+                    menu->addAction(QObject::tr("Open"), [entries, this]()
                         {
-                            AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(
-                                &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::OpenDocument,
+                            AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Event(
+                                m_toolId, &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::OpenDocument,
                                 entries.front()->GetFullPath());
                         });
                 }
@@ -183,104 +147,19 @@ namespace ShaderManagementConsole
             });
     }
 
-    void ShaderManagementConsoleApplication::DestroyMainWindow()
+    void ShaderManagementConsoleApplication::Destroy()
     {
         m_window.reset();
+        Base::Destroy();
     }
 
-    AZ::Data::AssetInfo ShaderManagementConsoleApplication::GetSourceAssetInfo(const AZStd::string& sourceAssetFileName)
+    AZStd::vector<AZStd::string> ShaderManagementConsoleApplication::GetCriticalAssetFilters() const
     {
-        bool result = false;
-        AZ::Data::AssetInfo assetInfo;
-        AZStd::string watchFolder;
-        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
-            result, &AzToolsFramework::AssetSystem::AssetSystemRequest::GetSourceInfoBySourcePath, sourceAssetFileName.c_str(), assetInfo,
-            watchFolder);
-        AZ_Error(nullptr, result, "Failed to get the asset info for the file: %s.", sourceAssetFileName.c_str());
-
-        return assetInfo;
+        return AZStd::vector<AZStd::string>({ "passes/", "config/" });
     }
 
-    AZStd::vector<AZ::Data::AssetId> ShaderManagementConsoleApplication::FindMaterialAssetsUsingShader(const AZStd::string& shaderFilePath)
+    QWidget* ShaderManagementConsoleApplication::GetAppMainWindow()
     {
-        // Collect the material types referencing the shader
-        AZStd::vector<AZStd::string> materialTypeSources;
-
-        AzToolsFramework::AssetDatabase::AssetDatabaseConnection assetDatabaseConnection;
-        assetDatabaseConnection.OpenDatabase();
-
-        assetDatabaseConnection.QuerySourceDependencyByDependsOnSource(
-            shaderFilePath.c_str(), nullptr, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_Any,
-            [&](AzToolsFramework::AssetDatabase::SourceFileDependencyEntry& sourceFileDependencyEntry)
-            {
-                AZStd::string assetExtension;
-                if (AzFramework::StringFunc::Path::GetExtension(sourceFileDependencyEntry.m_source.c_str(), assetExtension, false))
-                {
-                    if (assetExtension == "materialtype")
-                    {
-                        materialTypeSources.push_back(sourceFileDependencyEntry.m_source);
-                    }
-                }
-                return true;
-            });
-
-        AzToolsFramework::AssetDatabase::ProductDatabaseEntryContainer productDependencies;
-        for (const auto& materialTypeSource : materialTypeSources)
-        {
-            bool result = false;
-            AZ::Data::AssetInfo materialTypeSourceAssetInfo;
-            AZStd::string watchFolder;
-            AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
-                result, &AzToolsFramework::AssetSystem::AssetSystemRequest::GetSourceInfoBySourcePath, materialTypeSource.c_str(),
-                materialTypeSourceAssetInfo, watchFolder);
-
-            assetDatabaseConnection.QueryDirectReverseProductDependenciesBySourceGuidSubId(
-                materialTypeSourceAssetInfo.m_assetId.m_guid, materialTypeSourceAssetInfo.m_assetId.m_subId,
-                [&](AzToolsFramework::AssetDatabase::ProductDatabaseEntry& entry)
-                {
-                    AZStd::string assetExtension;
-                    if (AzFramework::StringFunc::Path::GetExtension(entry.m_productName.c_str(), assetExtension, false))
-                    {
-                        if (assetExtension == "azmaterial")
-                        {
-                            productDependencies.push_back(entry);
-                        }
-                    }
-                    return true;
-                });
-        }
-
-        AZStd::vector<AZ::Data::AssetId> results;
-        results.reserve(productDependencies.size());
-        for (auto product : productDependencies)
-        {
-            assetDatabaseConnection.QueryCombinedByProductID(
-                product.m_productID,
-                [&](AzToolsFramework::AssetDatabase::CombinedDatabaseEntry& combined)
-                {
-                    results.push_back({ combined.m_sourceGuid, combined.m_subID });
-                    return false;
-                },
-                nullptr);
-        }
-        return results;
-    }
-
-    AZStd::vector<AZ::RPI::ShaderCollection::Item> ShaderManagementConsoleApplication::GetMaterialInstanceShaderItems(
-        const AZ::Data::AssetId& assetId)
-    {
-        auto materialAsset = AZ::RPI::AssetUtils::LoadAssetById<AZ::RPI::MaterialAsset>(assetId, AZ::RPI::AssetUtils::TraceLevel::Error);
-
-        auto materialInstance = AZ::RPI::Material::Create(materialAsset);
-        AZ_Error(
-            nullptr, materialAsset, "Failed to get a material instance from product asset id: %s",
-            assetId.ToString<AZStd::string>().c_str());
-
-        if (materialInstance != nullptr)
-        {
-            return AZStd::vector<AZ::RPI::ShaderCollection::Item>(
-                materialInstance->GetShaderCollection().begin(), materialInstance->GetShaderCollection().end());
-        }
-        return AZStd::vector<AZ::RPI::ShaderCollection::Item>();
+        return m_window.get();
     }
 } // namespace ShaderManagementConsole
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
index 232f204790..01d0b9e415 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
@@ -11,17 +11,13 @@
 #include <Atom/RPI.Reflect/Material/MaterialAsset.h>
 #include <AtomToolsFramework/AssetBrowser/AtomToolsAssetBrowserInteractions.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentApplication.h>
-#include <AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h>
 #include <AzToolsFramework/API/EditorWindowRequestBus.h>
-#include <ShaderManagementConsoleRequestBus.h>
 #include <Window/ShaderManagementConsoleWindow.h>
 
 namespace ShaderManagementConsole
 {
     class ShaderManagementConsoleApplication
         : public AtomToolsFramework::AtomToolsDocumentApplication
-        , private ShaderManagementConsoleRequestBus::Handler
-        , private AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler
         , private AzToolsFramework::EditorWindowRequestBus::Handler
     {
     public:
@@ -36,23 +32,14 @@ namespace ShaderManagementConsole
         void Reflect(AZ::ReflectContext* context) override;
         const char* GetCurrentConfigurationName() const override;
         void StartCommon(AZ::Entity* systemEntity) override;
+        void Destroy() override;
 
         // AtomToolsFramework::AtomToolsApplication overrides...
-        AZStd::string GetBuildTargetName() const override;
         AZStd::vector<AZStd::string> GetCriticalAssetFilters() const override;
 
         // AzToolsFramework::EditorWindowRequests::Bus::Handler
         QWidget* GetAppMainWindow() override;
 
-        // AtomToolsMainWindowFactoryRequestBus::Handler overrides...
-        void CreateMainWindow() override;
-        void DestroyMainWindow() override;
-
-        // ShaderManagementConsoleRequestBus::Handler overrides...
-        AZ::Data::AssetInfo GetSourceAssetInfo(const AZStd::string& sourceAssetFileName) override;
-        AZStd::vector<AZ::Data::AssetId> FindMaterialAssetsUsingShader(const AZStd::string& shaderFilePath) override;
-        AZStd::vector<AZ::RPI::ShaderCollection::Item> GetMaterialInstanceShaderItems(const AZ::Data::AssetId& assetId) override;
-
     private:
         AZStd::unique_ptr<ShaderManagementConsoleWindow> m_window;
         AZStd::unique_ptr<AtomToolsFramework::AtomToolsAssetBrowserInteractions> m_assetBrowserInteractions;
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleRequestBus.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleRequestBus.h
deleted file mode 100644
index 355c51ed54..0000000000
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleRequestBus.h
+++ /dev/null
@@ -1,38 +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
- *
- */
-
-#pragma once
-
-#include <AzCore/std/containers/vector.h>
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Asset/AssetCommon.h>
-#include <Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h>
-#include <Atom/RPI.Reflect/Material/ShaderCollection.h>
-
-namespace ShaderManagementConsole
-{
-    //! ShaderManagementConsoleRequestBus provides
-    class ShaderManagementConsoleRequests
-        : public AZ::EBusTraits
-    {
-    public:
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-
-        //! Returns a shader file's asset id and relative filepath
-        virtual AZ::Data::AssetInfo GetSourceAssetInfo(const AZStd::string& sourceAssetFileName) = 0;
-
-        // [GFX TODO][ATOM-14857] Generalize this API 
-        //! Returns a list of material AssetIds that use the shader file.
-        virtual AZStd::vector<AZ::Data::AssetId> FindMaterialAssetsUsingShader (const AZStd::string& shaderFilePath) = 0;
-
-        //! Returns a list of shader items contained within an instantiated material source's shader collection.
-        virtual AZStd::vector<AZ::RPI::ShaderCollection::Item> GetMaterialInstanceShaderItems(const AZ::Data::AssetId& assetId) = 0;
-    };
-    using ShaderManagementConsoleRequestBus = AZ::EBus<ShaderManagementConsoleRequests>;
-} // namespace ShaderManagementConsole
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleTableView.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleTableView.cpp
new file mode 100644
index 0000000000..12445f7fa3
--- /dev/null
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleTableView.cpp
@@ -0,0 +1,106 @@
+/*
+ * 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/Name/Name.h>
+#include <Document/ShaderManagementConsoleDocumentRequestBus.h>
+#include <Window/ShaderManagementConsoleTableView.h>
+
+#include <QHeaderView>
+
+namespace ShaderManagementConsole
+{
+    ShaderManagementConsoleTableView::ShaderManagementConsoleTableView(
+        const AZ::Crc32& toolId, const AZ::Uuid& documentId, QWidget* parent)
+        : QTableView(parent)
+        , m_toolId(toolId)
+        , m_documentId(documentId)
+        , m_model(new QStandardItemModel(this))
+    {
+        setSelectionBehavior(QAbstractItemView::SelectRows);
+        setModel(m_model);
+
+        RebuildTable();
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusConnect(m_toolId);
+    }
+
+    ShaderManagementConsoleTableView::~ShaderManagementConsoleTableView()
+    {
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusDisconnect();
+    }
+
+    void ShaderManagementConsoleTableView::OnDocumentOpened(const AZ::Uuid& documentId)
+    {
+        if (m_documentId == documentId)
+        {
+            RebuildTable();
+        }
+    }
+
+    void ShaderManagementConsoleTableView::OnDocumentModified(const AZ::Uuid& documentId)
+    {
+        if (m_documentId == documentId)
+        {
+            RebuildTable();
+        }
+    }
+
+    void ShaderManagementConsole::ShaderManagementConsoleTableView::RebuildTable()
+    {
+        AZStd::unordered_set<AZStd::string> optionNames;
+
+        size_t shaderOptionCount = 0;
+        ShaderManagementConsoleDocumentRequestBus::EventResult(
+            shaderOptionCount, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderOptionCount);
+
+        for (size_t optionIndex = 0; optionIndex < shaderOptionCount; ++optionIndex)
+        {
+            AZ::RPI::ShaderOptionDescriptor shaderOptionDesc;
+            ShaderManagementConsoleDocumentRequestBus::EventResult(
+                shaderOptionDesc, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderOptionDescriptor, optionIndex);
+            optionNames.insert(shaderOptionDesc.GetName().GetCStr());
+        }
+
+        size_t shaderVariantCount = 0;
+        ShaderManagementConsoleDocumentRequestBus::EventResult(
+            shaderVariantCount, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderVariantCount);
+
+        m_model->clear();
+        m_model->setRowCount(static_cast<int>(shaderVariantCount));
+        m_model->setColumnCount(static_cast<int>(optionNames.size()));
+
+        int nameIndex = 0;
+        for (const auto& optionName : optionNames)
+        {
+            m_model->setHeaderData(nameIndex++, Qt::Horizontal, optionName.c_str());
+        }
+
+        for (int variantIndex = 0; variantIndex < shaderVariantCount; ++variantIndex)
+        {
+            AZ::RPI::ShaderVariantListSourceData::VariantInfo shaderVariantInfo;
+            ShaderManagementConsoleDocumentRequestBus::EventResult(
+                shaderVariantInfo, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderVariantInfo, variantIndex);
+
+            m_model->setHeaderData(variantIndex, Qt::Vertical, QString::number(variantIndex));
+
+            for (const auto& shaderOption : shaderVariantInfo.m_options)
+            {
+                AZ::Name optionName{ shaderOption.first };
+                AZ::Name optionValue{ shaderOption.second };
+
+                auto optionIt = optionNames.find(optionName.GetCStr());
+                int optionIndex = static_cast<int>(AZStd::distance(optionNames.begin(), optionIt));
+
+                QStandardItem* item = new QStandardItem(optionValue.GetCStr());
+                m_model->setItem(variantIndex, optionIndex, item);
+            }
+        }
+    }
+} // namespace ShaderManagementConsole
+
+#include <Window/moc_ShaderManagementConsoleTableView.cpp>
+#include "ShaderManagementConsoleTableView.h"
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleTableView.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleTableView.h
new file mode 100644
index 0000000000..1d62c97412
--- /dev/null
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleTableView.h
@@ -0,0 +1,40 @@
+/*
+ * 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
+
+#if !defined(Q_MOC_RUN)
+#include <AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h>
+
+#include <QStandardItemModel>
+#include <QTableView>
+#endif
+
+namespace ShaderManagementConsole
+{
+    class ShaderManagementConsoleTableView
+        : public QTableView
+        , public AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler
+    {
+    public:
+        AZ_CLASS_ALLOCATOR(ShaderManagementConsoleTableView, AZ::SystemAllocator, 0);
+        ShaderManagementConsoleTableView(const AZ::Crc32& toolId, const AZ::Uuid& documentId, QWidget* parent);
+        ~ShaderManagementConsoleTableView();
+
+    protected:
+        // AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler overrides...
+        void OnDocumentOpened(const AZ::Uuid& documentId) override;
+        void OnDocumentModified(const AZ::Uuid& documentId) override;
+
+        void RebuildTable();
+
+        const AZ::Crc32 m_toolId = {};
+        const AZ::Uuid m_documentId = AZ::Uuid::CreateNull();
+        QStandardItemModel* m_model = {};
+    };
+} // namespace ShaderManagementConsole
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
index 04a8a71191..79e9804f87 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
@@ -6,31 +6,25 @@
  *
  */
 
+#include <Atom/RPI.Edit/Shader/ShaderSourceData.h>
+#include <Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h>
+#include <Atom/RPI.Reflect/Shader/ShaderAsset.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h>
-#include <AtomToolsFramework/Util/Util.h>
-#include <AzCore/Name/Name.h>
-#include <AzQtComponents/Components/WindowDecorationWrapper.h>
-#include <Document/ShaderManagementConsoleDocumentRequestBus.h>
-#include <Window/ShaderManagementConsoleWindow.h>
 #include <AzCore/Utils/Utils.h>
+#include <AzQtComponents/Components/WindowDecorationWrapper.h>
+#include <Window/ShaderManagementConsoleTableView.h>
+#include <Window/ShaderManagementConsoleWindow.h>
 
-AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
 #include <QDesktopServices>
 #include <QFileDialog>
-#include <QHeaderView>
-#include <QStandardItemModel>
-#include <QTableView>
 #include <QUrl>
 #include <QWindow>
-AZ_POP_DISABLE_WARNING
 
 namespace ShaderManagementConsole
 {
-    ShaderManagementConsoleWindow::ShaderManagementConsoleWindow(QWidget* parent /* = 0 */)
-        : Base(parent)
+    ShaderManagementConsoleWindow::ShaderManagementConsoleWindow(const AZ::Crc32& toolId, QWidget* parent)
+        : Base(toolId, parent)
     {
-        resize(1280, 1024);
-
         // Among other things, we need the window wrapper to save the main window size, position, and state
         auto mainWindowWrapper =
             new AzQtComponents::WindowDecorationWrapper(AzQtComponents::WindowDecorationWrapper::OptionAutoTitleBarButtons);
@@ -42,16 +36,18 @@ namespace ShaderManagementConsole
         setObjectName("ShaderManagementConsoleWindow");
 
         m_assetBrowser->SetFilterState("", AZ::RPI::ShaderAsset::Group, true);
-        m_assetBrowser->SetOpenHandler([](const AZStd::string& absolutePath) {
-            if (AzFramework::StringFunc::Path::IsExtension(absolutePath.c_str(), AZ::RPI::ShaderVariantListSourceData::Extension))
+        m_assetBrowser->SetOpenHandler([this](const AZStd::string& absolutePath)
             {
-                AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(
-                    &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::OpenDocument, absolutePath);
-                return;
-            }
+                if (AzFramework::StringFunc::Path::IsExtension(absolutePath.c_str(), AZ::RPI::ShaderSourceData::Extension) ||
+                    AzFramework::StringFunc::Path::IsExtension(absolutePath.c_str(), AZ::RPI::ShaderVariantListSourceData::Extension))
+                {
+                    AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Event(
+                        m_toolId, &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::OpenDocument, absolutePath);
+                    return;
+                }
 
-            QDesktopServices::openUrl(QUrl::fromLocalFile(absolutePath.c_str()));
-        });
+                QDesktopServices::openUrl(QUrl::fromLocalFile(absolutePath.c_str()));
+            });
 
         // Restore geometry and show the window
         mainWindowWrapper->showFromSettings();
@@ -68,68 +64,18 @@ namespace ShaderManagementConsole
     bool ShaderManagementConsoleWindow::GetOpenDocumentParams(AZStd::string& openPath)
     {
         openPath = QFileDialog::getOpenFileName(
-            this, tr("Open Document"), AZ::Utils::GetProjectPath().c_str(), tr("Files (*.%1)").arg(AZ::RPI::ShaderVariantListSourceData::Extension)).toUtf8().constData();
+            this, tr("Open Document"), AZ::Utils::GetProjectPath().c_str(),
+            tr("Shader Files (*.%1);;Shader Variant List Files (*.%2)")
+                .arg(AZ::RPI::ShaderSourceData::Extension)
+                .arg(AZ::RPI::ShaderVariantListSourceData::Extension))
+            .toUtf8()
+            .constData();
         return !openPath.empty();
     }
 
     QWidget* ShaderManagementConsoleWindow::CreateDocumentTabView(const AZ::Uuid& documentId)
     {
-        AZStd::unordered_set<AZStd::string> optionNames;
-
-        size_t shaderOptionCount = 0;
-        ShaderManagementConsoleDocumentRequestBus::EventResult(
-            shaderOptionCount, documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderOptionCount);
-
-        for (size_t optionIndex = 0; optionIndex < shaderOptionCount; ++optionIndex)
-        {
-            AZ::RPI::ShaderOptionDescriptor shaderOptionDesc;
-            ShaderManagementConsoleDocumentRequestBus::EventResult(
-                shaderOptionDesc, documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderOptionDescriptor, optionIndex);
-
-            const char* optionName = shaderOptionDesc.GetName().GetCStr();
-            optionNames.insert(optionName);
-        }
-
-        size_t shaderVariantCount = 0;
-        ShaderManagementConsoleDocumentRequestBus::EventResult(
-            shaderVariantCount, documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderVariantCount);
-
-        auto model = new QStandardItemModel();
-        model->setRowCount(static_cast<int>(shaderVariantCount));
-        model->setColumnCount(static_cast<int>(optionNames.size()));
-
-        int nameIndex = 0;
-        for (const auto& optionName : optionNames)
-        {
-            model->setHeaderData(nameIndex++, Qt::Horizontal, optionName.c_str());
-        }
-
-        for (int variantIndex = 0; variantIndex < shaderVariantCount; ++variantIndex)
-        {
-            AZ::RPI::ShaderVariantListSourceData::VariantInfo shaderVariantInfo;
-            ShaderManagementConsoleDocumentRequestBus::EventResult(
-                shaderVariantInfo, documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderVariantInfo, variantIndex);
-
-            model->setHeaderData(variantIndex, Qt::Vertical, QString::number(variantIndex));
-
-            for (const auto& shaderOption : shaderVariantInfo.m_options)
-            {
-                AZ::Name optionName{ shaderOption.first };
-                AZ::Name optionValue{ shaderOption.second };
-
-                auto optionIt = optionNames.find(optionName.GetCStr());
-                int optionIndex = static_cast<int>(AZStd::distance(optionNames.begin(), optionIt));
-
-                QStandardItem* item = new QStandardItem(optionValue.GetCStr());
-                model->setItem(variantIndex, optionIndex, item);
-            }
-        }
-
-        // The document tab contains a table view.
-        auto contentWidget = new QTableView(centralWidget());
-        contentWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
-        contentWidget->setModel(model);
-        return contentWidget;
+        return new ShaderManagementConsoleTableView(m_toolId, documentId, centralWidget());
     }
 } // namespace ShaderManagementConsole
 
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h
index d5dd04c434..5ebb2005b9 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h
@@ -8,16 +8,8 @@
 
 #pragma once
 
-#if !defined(Q_MOC_RUN)
-#include <Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h>
-#include <Atom/RPI.Public/Shader/Shader.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentMainWindow.h>
 
-AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
-#include <QStandardItemModel>
-AZ_POP_DISABLE_WARNING
-#endif
-
 namespace ShaderManagementConsole
 {
     //! ShaderManagementConsoleWindow is the main class. Its responsibility is limited to initializing and connecting
@@ -31,7 +23,7 @@ namespace ShaderManagementConsole
 
         using Base = AtomToolsFramework::AtomToolsDocumentMainWindow;
 
-        ShaderManagementConsoleWindow(QWidget* parent = 0);
+        ShaderManagementConsoleWindow(const AZ::Crc32& toolId, QWidget* parent = 0);
         ~ShaderManagementConsoleWindow() = default;
 
     protected:
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake
index 332cd73b40..c66405ac15 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/shadermanagementconsole_files.cmake
@@ -11,6 +11,8 @@ set(FILES
     Source/Document/ShaderManagementConsoleDocument.cpp
     Source/Document/ShaderManagementConsoleDocument.h
 
+    Source/Window/ShaderManagementConsoleTableView.h
+    Source/Window/ShaderManagementConsoleTableView.cpp
     Source/Window/ShaderManagementConsoleWindow.h
     Source/Window/ShaderManagementConsoleWindow.cpp
     Source/Window/ShaderManagementConsole.qrc
@@ -18,6 +20,5 @@ set(FILES
     Source/main.cpp
     Source/ShaderManagementConsoleApplication.cpp
     Source/ShaderManagementConsoleApplication.h
-    Source/ShaderManagementConsoleRequestBus.h
     ../Scripts/GenerateShaderVariantListForMaterials.py
 )
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py b/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py
index c31047d347..79a0391bf7 100755
--- a/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Scripts/GenerateShaderVariantListForMaterials.py
@@ -38,28 +38,16 @@ def main():
     if extension != "shader":
         print("The input argument for the script is not a valid .shader file")
         return
-    
-    # Get info such as relative path of the file and asset id
-    shaderAssetInfo = azlmbr.shadermanagementconsole.ShaderManagementConsoleRequestBus(
-        azlmbr.bus.Broadcast, 
-        'GetSourceAssetInfo', 
-        filename
-    )
-    
-    # retrieves a list of all material source files that use the shader. Note that materials inherit from materialtype files, which are actual files that refer to shader files.
-    materialAssetIds = azlmbr.shadermanagementconsole.ShaderManagementConsoleRequestBus(
-        azlmbr.bus.Broadcast, 
-        'FindMaterialAssetsUsingShader', 
-        shaderAssetInfo.relativePath
-    )
-    
+
+    # prompt the user to save the file in the project folder or same folder as the shader 
     msgBox = QtWidgets.QMessageBox(
         QtWidgets.QMessageBox.Question,
         "Choose Save Location for .shadervariantlist File",
         "Save .shadervariantlist file in Project folder or in the same folder as shader file?"
     )
+
     projectButton = msgBox.addButton("Project Folder", QtWidgets.QMessageBox.AcceptRole)
-    msgBox.addButton("Same Folder as Shader", QtWidgets.QMessageBox.AcceptRole)
+    shaderButton = msgBox.addButton("Same Folder as Shader", QtWidgets.QMessageBox.AcceptRole)
     cancelButton = msgBox.addButton("Cancel", QtWidgets.QMessageBox.RejectRole)
     msgBox.exec()
     
@@ -68,98 +56,54 @@ def main():
         is_save_in_project_folder = True
     elif msgBox.clickedButton() == cancelButton:
         return
-    
-    # This loop collects all uniquely-identified shader items used by the materials based on its shader variant id. 
-    shader_file = os.path.basename(filename)
-    shaderVariantIds = []
-    shaderVariantListShaderOptionGroups = []
-    progressDialog = QtWidgets.QProgressDialog(f"Generating .shadervariantlist file for:\n{shader_file}", "Cancel", 0, len(materialAssetIds))
-    progressDialog.setMaximumWidth(400)
-    progressDialog.setMaximumHeight(100)
-    progressDialog.setModal(True)
-    progressDialog.setWindowTitle("Generating Shader Variant List")
-    for i, materialAssetId in enumerate(materialAssetIds):
-        materialInstanceShaderItems = azlmbr.shadermanagementconsole.ShaderManagementConsoleRequestBus(azlmbr.bus.Broadcast, 'GetMaterialInstanceShaderItems', materialAssetId)
-        
-        for shaderItem in materialInstanceShaderItems:
-            shaderAssetId = shaderItem.GetShaderAsset().get_id()
-            if shaderAssetInfo.assetId == shaderAssetId:
-                shaderVariantId = shaderItem.GetShaderVariantId()
-                if not shaderVariantId.IsEmpty():
-                    # Check for repeat shader variant ids. We are using a list here
-                    # instead of a set to check for duplicates on shaderVariantIds because
-                    # shaderVariantId is not hashed by the ID like it is in the C++ side. 
-                    has_repeat = False
-                    for variantId in shaderVariantIds:
-                        if shaderVariantId == variantId:
-                            has_repeat = True
-                            break
-                    if has_repeat:
-                        continue
-                        
-                    shaderVariantIds.append(shaderVariantId)
-                    shaderVariantListShaderOptionGroups.append(shaderItem.GetShaderOptionGroup())
-                    
-        progressDialog.setValue(i)
-        if progressDialog.wasCanceled():
-            return
-            
-    progressDialog.close()
-                    
-    # Generate the shader variant list data by collecting shader option name-value pairs.s
-    shaderVariantList = azlmbr.shader.ShaderVariantListSourceData()
-    shaderVariantList.shaderFilePath = shaderAssetInfo.relativePath
-    shaderVariants = []
-    stableId = 1
-    for shaderOptionGroup in shaderVariantListShaderOptionGroups:
-        variantInfo = azlmbr.shader.ShaderVariantInfo()
-        variantInfo.stableId = stableId
-        options = {}
-        
-        shaderOptionDescriptors = shaderOptionGroup.GetShaderOptionDescriptors()
-        for shaderOptionDescriptor in shaderOptionDescriptors:
-            optionName = shaderOptionDescriptor.GetName()
-            optionValue = shaderOptionGroup.GetValueByOptionName(optionName)
-            if not optionValue.IsValid():
-                continue
-                        
-            valueName = shaderOptionDescriptor.GetValueName(optionValue)
-            options[optionName.ToString()] = valueName.ToString()
-            
-        if len(options) != 0:
-            variantInfo.options = options
-            shaderVariants.append(variantInfo)
-            stableId += 1
-                
-    shaderVariantList.shaderVariants = shaderVariants
-    
-    # clean previously generated shader variant list file so they don't clash.
-    pre, ext = os.path.splitext(shaderAssetInfo.relativePath)
-    projectShaderVariantListFilePath = os.path.join(azlmbr.paths.projectroot, PROJECT_SHADER_VARIANTS_FOLDER, f'{pre}.shadervariantlist')
-    
+
+    # open the shader file as a document which will generate all of the shader variant list data 
+    documentId = azlmbr.atomtools.AtomToolsDocumentSystemRequestBus(
+        azlmbr.bus.Broadcast,
+        'OpenDocument',
+        filename
+    )
+
+    if documentId.IsNull():
+        print("The shader source data file could not be opened")
+        return
+
+    # get the shader variant list data object which is only needed for the shader file path
+    shaderVariantList = azlmbr.shadermanagementconsole.ShaderManagementConsoleDocumentRequestBus(
+        azlmbr.bus.Event,
+        'GetShaderVariantListSourceData',
+        documentId
+    )
+
+    # generate the default save file path by replacing the extension of the open shader file
     pre, ext = os.path.splitext(filename)
     defaultShaderVariantListFilePath = f'{pre}.shadervariantlist'
     
+    # clean previously generated shader variant list file so they don't clash.
+    pre, ext = os.path.splitext(shaderVariantList.shaderFilePath)
+    projectShaderVariantListFilePath = os.path.join(azlmbr.paths.projectroot, PROJECT_SHADER_VARIANTS_FOLDER, f'{pre}.shadervariantlist')
+    
     clean_existing_shadervariantlist_files([
         projectShaderVariantListFilePath
     ])
+
     # Save the shader variant list file
     if is_save_in_project_folder:
         shaderVariantListFilePath = projectShaderVariantListFilePath
     else:
         shaderVariantListFilePath = defaultShaderVariantListFilePath
-    
+
     shaderVariantListFilePath = shaderVariantListFilePath.replace("\\", "/")
-    azlmbr.shader.SaveShaderVariantListSourceData(shaderVariantListFilePath, shaderVariantList)
-    
-    # Open the document in shader management console
-    result = azlmbr.atomtools.AtomToolsDocumentSystemRequestBus(
+
+    # Save the document in shader management console
+    saveResult = azlmbr.atomtools.AtomToolsDocumentSystemRequestBus(
         azlmbr.bus.Broadcast,
-        'OpenDocument',
+        'SaveDocumentAsChild',
+        documentId,
         shaderVariantListFilePath
     )
-    
-    if not result.IsNull():
+
+    if saveResult:
         msgBox = QtWidgets.QMessageBox(
             QtWidgets.QMessageBox.Information,
             "Shader Variant List File Successfully Generated",
@@ -167,7 +111,7 @@ def main():
             QtWidgets.QMessageBox.Ok
         )
         msgBox.exec()
-    
+
     print("==== End shader variant script ============================================================")
 
 if __name__ == "__main__":
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.cpp
index 0250640d65..65efd83109 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/EditorCommonFeaturesSystemComponent.cpp
@@ -14,7 +14,6 @@
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzToolsFramework/API/EditorCameraBus.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailContext.h>
 #include <EditorCommonFeaturesSystemComponent.h>
 #include <SharedPreview/SharedThumbnail.h>
 #include <SkinnedMesh/SkinnedMeshDebugDisplay.h>
@@ -217,8 +216,8 @@ namespace AZ
             using namespace AzToolsFramework::Thumbnailer;
             using namespace LyIntegration;
 
-            ThumbnailerRequestsBus::Broadcast(
-                &ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(SharedThumbnailCache), ThumbnailContext::DefaultContext);
+            ThumbnailerRequestBus::Broadcast(
+                &ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(SharedThumbnailCache));
 
             if (!m_thumbnailRenderer)
             {
@@ -236,9 +235,7 @@ namespace AZ
             using namespace AzToolsFramework::Thumbnailer;
             using namespace LyIntegration;
 
-            ThumbnailerRequestsBus::Broadcast(
-                &ThumbnailerRequests::UnregisterThumbnailProvider, SharedThumbnailCache::ProviderName,
-                ThumbnailContext::DefaultContext);
+            ThumbnailerRequestBus::Broadcast(&ThumbnailerRequests::UnregisterThumbnailProvider, SharedThumbnailCache::ProviderName);
 
             m_thumbnailRenderer.reset();
             m_previewerFactory.reset();
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
index dde81e77b5..ff31f3382f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
@@ -15,6 +15,7 @@
 #include <Atom/RPI.Edit/Material/MaterialUtils.h>
 #include <Atom/RPI.Reflect/Material/MaterialFunctor.h>
 #include <Atom/RPI.Reflect/Material/MaterialPropertiesLayout.h>
+#include <Atom/RPI.Reflect/Material/MaterialNameContext.h>
 #include <AtomToolsFramework/Inspector/InspectorPropertyGroupWidget.h>
 #include <AtomToolsFramework/Util/MaterialPropertyUtil.h>
 #include <AtomToolsFramework/Util/Util.h>
@@ -80,7 +81,7 @@ namespace AZ
                         m_materialAssignmentId);
                 }
 
-               if (!materialAssetId.IsValid())
+                if (!materialAssetId.IsValid())
                 {
                     UnloadMaterial();
                     return false;
@@ -101,28 +102,10 @@ namespace AZ
                     UnloadMaterial();
                     return false;
                 }
+                
+                // Add material functors that are in the top-level functors list. Other functors are also added per-property-group elsewhere.
+                AddEditorMaterialFunctors(m_editData.m_materialTypeSourceData.m_materialFunctorSourceData, AZ::RPI::MaterialNameContext{});
 
-                // Get a list of all the editor functors to be used for property editor states
-                auto propertyLayout = m_editData.m_materialAsset->GetMaterialPropertiesLayout();
-                const AZ::RPI::MaterialFunctorSourceData::EditorContext editorContext =
-                    AZ::RPI::MaterialFunctorSourceData::EditorContext(m_editData.m_materialTypeSourcePath, propertyLayout);
-                for (AZ::RPI::Ptr<AZ::RPI::MaterialFunctorSourceDataHolder> functorData : m_editData.m_materialTypeSourceData.m_materialFunctorSourceData)
-                {
-                    AZ::RPI::MaterialFunctorSourceData::FunctorResult createResult = functorData->CreateFunctor(editorContext);
-
-                    if (createResult.IsSuccess())
-                    {
-                        AZ::RPI::Ptr<AZ::RPI::MaterialFunctor>& functor = createResult.GetValue();
-                        if (functor != nullptr)
-                        {
-                            m_editorFunctors.push_back(functor);
-                        }
-                    }
-                    else
-                    {
-                        AZ_Error("AZ::Render::EditorMaterialComponentInspector", false, "Material functors were not created: '%s'.", m_editData.m_materialTypeSourcePath.c_str());
-                    }
-                }
 
                 Populate();
                 LoadOverridesFromEntity();
@@ -292,48 +275,77 @@ namespace AZ
 
             void MaterialPropertyInspector::AddPropertiesGroup()
             {
-                // Copy all of the properties from the material asset to the source data that will be exported
-                // TODO: Support populating the Material Editor with nested property groups, not just the top level.
-                for (const AZStd::unique_ptr<AZ::RPI::MaterialTypeSourceData::PropertyGroup>& propertyGroup : m_editData.m_materialTypeSourceData.GetPropertyLayout().m_propertyGroups)
-                {
-                    const AZStd::string& groupName = propertyGroup->GetName();
-                    const AZStd::string& groupDisplayName = !propertyGroup->GetDisplayName().empty() ? propertyGroup->GetDisplayName() : groupName;
-                    const AZStd::string& groupDescription = !propertyGroup->GetDescription().empty() ? propertyGroup->GetDescription() : groupDisplayName;
-                    auto& group = m_groups[groupName];
-                    
-                    group.m_properties.reserve(propertyGroup->GetProperties().size());
-                    for (const auto& propertyDefinition : propertyGroup->GetProperties())
+                // Copy all of the properties from the material asset to the populate the inspector
+                m_editData.m_materialTypeSourceData.EnumeratePropertyGroups(
+                    [this](const AZ::RPI::MaterialTypeSourceData::PropertyGroupStack& propertyGroupStack)
                     {
-                        AtomToolsFramework::DynamicPropertyConfig propertyConfig;
+                        using namespace AZ::RPI;
 
-                        // Assign id before conversion so it can be used in dynamic description
-                        propertyConfig.m_id = AZ::RPI::MaterialPropertyId(groupName, propertyDefinition->GetName());
-
-                        AtomToolsFramework::ConvertToPropertyConfig(propertyConfig, *propertyDefinition.get());
-
-                        const auto& propertyIndex = 
-                            m_editData.m_materialAsset->GetMaterialPropertiesLayout()->FindPropertyIndex(propertyConfig.m_id);
+                        const MaterialTypeSourceData::PropertyGroup* propertyGroupDefinition = propertyGroupStack.back();
+                
+                        MaterialNameContext groupNameContext = MaterialTypeSourceData::MakeMaterialNameContext(propertyGroupStack);
                         
-                        propertyConfig.m_groupName = groupDisplayName;
-                        propertyConfig.m_showThumbnail = true;
-                        propertyConfig.m_defaultValue = AtomToolsFramework::ConvertToEditableType(
-                            m_editData.m_materialTypeAsset->GetDefaultPropertyValues()[propertyIndex.GetIndex()]);
-                        
-                        // There is no explicit parent material here. Material instance property overrides replace the values from the
-                        // assigned material asset. Its values should be treated as parent, for comparison, in this case.
-                        propertyConfig.m_parentValue = AtomToolsFramework::ConvertToEditableType(
-                            m_editData.m_materialTypeAsset->GetDefaultPropertyValues()[propertyIndex.GetIndex()]);
-                        propertyConfig.m_originalValue = AtomToolsFramework::ConvertToEditableType(
-                            m_editData.m_materialAsset->GetPropertyValues()[propertyIndex.GetIndex()]);
-                        group.m_properties.emplace_back(propertyConfig);
-                    }
+                        AddEditorMaterialFunctors(propertyGroupDefinition->GetFunctors(), groupNameContext);
 
-                    // Passing in same group as main and comparison instance to enable custom value comparison for highlighting modified properties
-                    auto propertyGroupWidget = new AtomToolsFramework::InspectorPropertyGroupWidget(
-                        &group, &group, group.TYPEINFO_Uuid(), this, this, GetGroupSaveStateKey(groupName), {},
-                        [this](const auto node) { return GetInstanceNodePropertyIndicator(node); }, 0);
-                    AddGroup(groupName, groupDisplayName, groupDescription, propertyGroupWidget);
-                }
+                        AZStd::vector<AZStd::string> groupNameVector;
+                        AZStd::vector<AZStd::string> groupDisplayNameVector;
+                        
+                        groupNameVector.reserve(propertyGroupStack.size());
+                        groupDisplayNameVector.reserve(propertyGroupStack.size());
+
+                        for (auto& nextGroup : propertyGroupStack)
+                        {
+                            groupNameVector.push_back(nextGroup->GetName());
+                            groupDisplayNameVector.push_back(!nextGroup->GetDisplayName().empty() ? nextGroup->GetDisplayName() : nextGroup->GetName());
+                        }
+
+                        AZStd::string groupId;
+                        AzFramework::StringFunc::Join(groupId, groupNameVector.begin(), groupNameVector.end(), ".");
+
+                        auto& group = m_groups[groupId];
+                        group.m_name = groupId;
+                        AzFramework::StringFunc::Join(group.m_displayName, groupDisplayNameVector.begin(), groupDisplayNameVector.end(), " | ");
+                        group.m_description = !propertyGroupDefinition->GetDescription().empty() ? propertyGroupDefinition->GetDescription() : group.m_displayName;
+                        
+                        group.m_properties.reserve(propertyGroupDefinition->GetProperties().size());
+                        for (const auto& propertyDefinition : propertyGroupDefinition->GetProperties())
+                        {
+                            AtomToolsFramework::DynamicPropertyConfig propertyConfig;
+                            
+                            // Assign id before conversion so it can be used in dynamic description
+                            propertyConfig.m_id = propertyDefinition->GetName();
+                            groupNameContext.ContextualizeProperty(propertyConfig.m_id);
+                            
+                            AtomToolsFramework::ConvertToPropertyConfig(propertyConfig, *propertyDefinition);
+
+                            const auto& propertyIndex = 
+                                m_editData.m_materialAsset->GetMaterialPropertiesLayout()->FindPropertyIndex(propertyConfig.m_id);
+
+                            // (Does DynamicPropertyConfig really even need m_groupName? It doesn't seem to be used anywhere)
+                            propertyConfig.m_groupName = group.m_name;
+                            propertyConfig.m_groupDisplayName = group.m_displayName;
+                            propertyConfig.m_showThumbnail = true;
+                            
+                            propertyConfig.m_defaultValue = AtomToolsFramework::ConvertToEditableType(
+                                m_editData.m_materialTypeAsset->GetDefaultPropertyValues()[propertyIndex.GetIndex()]);
+                            
+                            // There is no explicit parent material here. Material instance property overrides replace the values from the
+                            // assigned material asset. Its values should be treated as parent, for comparison, in this case.
+                            propertyConfig.m_parentValue = AtomToolsFramework::ConvertToEditableType(
+                                m_editData.m_materialTypeAsset->GetDefaultPropertyValues()[propertyIndex.GetIndex()]);
+                            propertyConfig.m_originalValue = AtomToolsFramework::ConvertToEditableType(
+                                m_editData.m_materialAsset->GetPropertyValues()[propertyIndex.GetIndex()]);
+                            group.m_properties.emplace_back(propertyConfig);
+                        }
+                        
+                        // Passing in same group as main and comparison instance to enable custom value comparison for highlighting modified properties
+                        auto propertyGroupWidget = new AtomToolsFramework::InspectorPropertyGroupWidget(
+                            &group, &group, group.TYPEINFO_Uuid(), this, this, GetGroupSaveStateKey(group.m_name), {},
+                            [this](const auto node) { return GetInstanceNodePropertyIndicator(node); }, 0);
+                        AddGroup(group.m_name, group.m_displayName, group.m_description, propertyGroupWidget);
+
+                        return true;
+                    });
             }
 
             void MaterialPropertyInspector::Populate()
@@ -433,6 +445,37 @@ namespace AZ
                 // m_updatePreview should be set to true here for continuous preview updates as slider/color properties change but needs
                 // throttling
             }
+            
+            bool MaterialPropertyInspector::AddEditorMaterialFunctors(
+                const AZStd::vector<AZ::RPI::Ptr<AZ::RPI::MaterialFunctorSourceDataHolder>>& functorSourceDataHolders,
+                const AZ::RPI::MaterialNameContext& nameContext)
+            {
+                // Copied from MaterialDocument::AddEditorMaterialFunctors, should be refactored at some point
+
+                const AZ::RPI::MaterialFunctorSourceData::EditorContext editorContext = AZ::RPI::MaterialFunctorSourceData::EditorContext(
+                    m_editData.m_materialTypeSourcePath, m_editData.m_materialAsset->GetMaterialPropertiesLayout(), &nameContext);
+
+                for (AZ::RPI::Ptr<AZ::RPI::MaterialFunctorSourceDataHolder> functorData : functorSourceDataHolders)
+                {
+                    AZ::RPI::MaterialFunctorSourceData::FunctorResult result = functorData->CreateFunctor(editorContext);
+
+                    if (result.IsSuccess())
+                    {
+                        AZ::RPI::Ptr<AZ::RPI::MaterialFunctor>& functor = result.GetValue();
+                        if (functor != nullptr)
+                        {
+                            m_editorFunctors.push_back(functor);
+                        }
+                    }
+                    else
+                    {
+                        AZ_Error("MaterialDocument", false, "Material functors were not created: '%s'.", m_editData.m_materialTypeSourcePath.c_str());
+                        return false;
+                    }
+                }
+
+                return true;
+            }
 
             void MaterialPropertyInspector::RunEditorMaterialFunctors()
             {
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h
index 82f46ebc90..44f1fb3491 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h
@@ -108,6 +108,10 @@ namespace AZ
                 void RunEditorMaterialFunctors();
                 void UpdateMaterialInstanceProperty(const AtomToolsFramework::DynamicProperty& property);
 
+                bool AddEditorMaterialFunctors(
+                    const AZStd::vector<AZ::RPI::Ptr<AZ::RPI::MaterialFunctorSourceDataHolder>>& functorSourceDataHolders,
+                    const AZ::RPI::MaterialNameContext& nameContext);   
+
                 AZ::Crc32 GetGroupSaveStateKey(const AZStd::string& groupName) const;
                 bool IsInstanceNodePropertyModifed(const AzToolsFramework::InstanceDataNode* node) const;
                 const char* GetInstanceNodePropertyIndicator(const AzToolsFramework::InstanceDataNode* node) const;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp
index 52e22645ca..88cbbba87b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp
@@ -17,6 +17,7 @@
 #include <Atom/RPI.Reflect/Material/MaterialAsset.h>
 #include <Atom/RPI.Reflect/Material/MaterialPropertiesLayout.h>
 #include <Atom/RPI.Reflect/Material/MaterialTypeAsset.h>
+#include <Atom/RPI.Reflect/Material/MaterialNameContext.h>
 #include <AtomToolsFramework/Util/MaterialPropertyUtil.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
@@ -113,9 +114,11 @@ namespace AZ
 
                 // Copy all of the properties from the material asset to the source data that will be exported
                 bool result = true;
-                editData.m_materialTypeSourceData.EnumerateProperties([&](const AZStd::string& propertyIdContext, const AZ::RPI::MaterialTypeSourceData::PropertyDefinition* propertyDefinition)
+                editData.m_materialTypeSourceData.EnumerateProperties([&](const AZ::RPI::MaterialTypeSourceData::PropertyDefinition* propertyDefinition, const AZ::RPI::MaterialNameContext& nameContext)
                     {
-                        AZ::Name propertyId(propertyIdContext + propertyDefinition->GetName());
+                        AZ::Name propertyId{propertyDefinition->GetName()};
+                        nameContext.ContextualizeProperty(propertyId);
+
                         const AZ::RPI::MaterialPropertyIndex propertyIndex =
                             editData.m_materialAsset->GetMaterialPropertiesLayout()->FindPropertyIndex(propertyId);
 
@@ -148,9 +151,7 @@ namespace AZ
                             return true;
                         }
 
-                        // TODO: Support populating the Material Editor with nested property groups, not just the top level.
-                        AZStd::string_view groupName = propertyId.GetStringView().substr(0, propertyId.GetStringView().size() - propertyDefinition->GetName().size() - 1);
-                        exportData.SetPropertyValue(RPI::MaterialPropertyId{groupName, propertyDefinition->GetName()}, propertyValue);
+                        exportData.SetPropertyValue(propertyId, propertyValue);
                         return true;
                     });
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
index 255f639cd7..0d6b87e795 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
@@ -72,6 +72,9 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentConfig::m_modelAsset, "Mesh Asset", "Mesh asset reference")
+                                ->Attribute(AZ_CRC_CE("EditButton"), "")
+                                ->Attribute(AZ_CRC_CE("EditDescription"), "Open in Scene Settings")
+                                ->Attribute(AZ_CRC_CE("DisableEditButtonWhenNoAssetSelected"), true)
                             ->DataElement(AZ::Edit::UIHandlers::Default, &MeshComponentConfig::m_sortKey, "Sort Key", "Transparent meshes are drawn by sort key then depth. Used this to force certain transparent meshes to draw before or after others.")
                                 ->Attribute(AZ::Edit::Attributes::Visibility, &MeshComponentConfig::IsAssetSet)
                             ->DataElement(AZ::Edit::UIHandlers::CheckBox, &MeshComponentConfig::m_excludeFromReflectionCubeMaps, "Exclude from reflection cubemaps", "Mesh will not be visible in baked reflection probe cubemaps")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewer.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewer.cpp
index 942af55721..0f96b2964d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewer.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewer.cpp
@@ -11,7 +11,6 @@
 #include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
 #include <AzToolsFramework/Thumbnails/Thumbnail.h>
-#include <AzToolsFramework/Thumbnails/ThumbnailContext.h>
 #include <SharedPreview/SharedPreviewUtils.h>
 #include <SharedPreview/SharedPreviewer.h>
 
@@ -51,7 +50,7 @@ namespace AZ
             using namespace AzToolsFramework::Thumbnailer;
 
             auto thumbnailKey = entry->GetThumbnailKey();
-            m_ui->m_previewWidget->SetThumbnailKey(thumbnailKey, ThumbnailContext::DefaultContext);
+            m_ui->m_previewWidget->SetThumbnailKey(thumbnailKey);
             m_fileInfo = QString::fromUtf8(entry->GetName().c_str());
             UpdateFileInfo();
         }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp
index d07c4577e8..82221afcc5 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp
@@ -35,8 +35,15 @@ namespace AZ
             m_state = State::Failed;
         }
 
+        SharedThumbnail::~SharedThumbnail()
+        {
+            AzToolsFramework::Thumbnailer::ThumbnailerRendererNotificationBus::Handler::BusDisconnect();
+            AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
+        }
+
         void SharedThumbnail::LoadThread()
         {
+            m_state = State::Loading;
             AzToolsFramework::Thumbnailer::ThumbnailerRendererRequestBus::QueueEvent(
                 m_assetInfo.m_assetType, &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail, m_key,
                 SharedThumbnailSize);
@@ -45,15 +52,10 @@ namespace AZ
             m_renderWait.acquire();
         }
 
-        SharedThumbnail::~SharedThumbnail()
-        {
-            AzToolsFramework::Thumbnailer::ThumbnailerRendererNotificationBus::Handler::BusDisconnect();
-            AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
-        }
-
         void SharedThumbnail::ThumbnailRendered(const QPixmap& thumbnailImage)
         {
             m_pixmap = thumbnailImage;
+            m_state = State::Ready;
             m_renderWait.release();
         }
 
diff --git a/Gems/GradientSignal/Code/CMakeLists.txt b/Gems/GradientSignal/Code/CMakeLists.txt
index febf7d9cd4..1ac17ee112 100644
--- a/Gems/GradientSignal/Code/CMakeLists.txt
+++ b/Gems/GradientSignal/Code/CMakeLists.txt
@@ -58,6 +58,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
         NAME GradientSignal.Editor.Static STATIC
         NAMESPACE Gem
+        AUTOMOC
         FILES_CMAKE
             gradientsignal_editor_files.cmake
         INCLUDE_DIRECTORIES
@@ -141,6 +142,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 Gem::LmbrCentral
                 Gem::LmbrCentral.Mocks
                 Gem::GradientSignal.Mocks
+        RUNTIME_DEPENDENCIES
+            Gem::SurfaceData
     )
     
     ly_add_target(
@@ -161,6 +164,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 Gem::LmbrCentral
                 Gem::LmbrCentral.Mocks
                 Gem::GradientSignal.Mocks
+        RUNTIME_DEPENDENCIES
+            Gem::SurfaceData
     )
     ly_add_googletest(
         NAME Gem::GradientSignal.Tests
diff --git a/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp
index 0bf914fea3..fe4c134ed2 100644
--- a/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp
+++ b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp
@@ -127,6 +127,7 @@ namespace GradientSignal
                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->DataElement(0, &ImageGradientConfig::m_imageAsset, "Image Asset", "Image asset whose values will be mapped as gradient output.")
+                    ->Attribute(AZ::Edit::Attributes::Handler, AZ_CRC_CE("GradientSignalStreamingImageAsset"))
                     ->DataElement(AZ::Edit::UIHandlers::Slider, &ImageGradientConfig::m_tilingX, "Tiling X", "Number of times to tile horizontally.")
                     ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
                     ->Attribute(AZ::Edit::Attributes::SoftMin, 1.0f)
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorStreamingImageAssetCtrl.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorStreamingImageAssetCtrl.cpp
new file mode 100644
index 0000000000..9b088b159a
--- /dev/null
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorStreamingImageAssetCtrl.cpp
@@ -0,0 +1,150 @@
+/*
+ * 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/RPI.Public/RPIUtils.h>
+
+#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
+#include <AzToolsFramework/UI/PropertyEditor/Model/AssetCompleterModel.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
+
+#include <Editor/EditorStreamingImageAssetCtrl.h>
+
+namespace GradientSignal
+{
+    namespace Internal
+    {
+        bool IsImageDataPixelAPISupportedForAsset(const AZ::Data::AssetId& assetId)
+        {
+            auto streamingImageAsset = AZ::Data::AssetManager::Instance().GetAsset<AZ::RPI::StreamingImageAsset>(assetId, AZ::Data::AssetLoadBehavior::PreLoad);
+            streamingImageAsset.BlockUntilLoadComplete();
+
+            // Verify if the streaming image asset has a pixel format that is supported
+            // for the image data pixel retrieval API
+            AZ::RHI::Format format = streamingImageAsset->GetImageDescriptor().m_format;
+            return AZ::RPI::IsImageDataPixelAPISupported(format);
+        }
+    }
+
+    SupportedImageAssetPickerDialog::SupportedImageAssetPickerDialog(AssetSelectionModel& selection, QWidget* parent)
+        : AzToolsFramework::AssetBrowser::AssetPickerDialog(selection, parent)
+    {
+    }
+
+    bool SupportedImageAssetPickerDialog::EvaluateSelection() const
+    {
+        bool isValid = AzToolsFramework::AssetBrowser::AssetPickerDialog::EvaluateSelection();
+
+        // If we have a valid selection (a streaming image asset), we need to also verify
+        // that its pixel format is supported by the image data retrieval API
+        if (isValid)
+        {
+            const auto productEntry = azrtti_cast<const ProductAssetBrowserEntry*>(m_selection.GetResult());
+            isValid = Internal::IsImageDataPixelAPISupportedForAsset(productEntry->GetAssetId());
+        }
+
+        return isValid;
+    }
+
+    StreamingImagePropertyAssetCtrl::StreamingImagePropertyAssetCtrl(QWidget* parent)
+        : AzToolsFramework::PropertyAssetCtrl(parent)
+    {
+    }
+
+    void StreamingImagePropertyAssetCtrl::PickAssetSelectionFromDialog(AssetSelectionModel& selection, QWidget* parent)
+    {
+        // We need to override and use our own picker dialog so that we can
+        // disable the OK button if a streaming image asset with an unsupported
+        // format has been selected
+        SupportedImageAssetPickerDialog dialog(selection, parent);
+        dialog.exec();
+    }
+
+    void StreamingImagePropertyAssetCtrl::OnAutocomplete(const QModelIndex& index)
+    {
+        auto assetId = m_model->GetAssetIdFromIndex(GetSourceIndex(index));
+
+        // Only allow the autocompleter to select an asset if it has
+        // a supported pixel format
+        if (Internal::IsImageDataPixelAPISupportedForAsset(assetId))
+        {
+            SetSelectedAssetID(assetId);
+        }
+    }
+
+    AZ::u32 StreamingImagePropertyHandler::GetHandlerName() const
+    {
+        return AZ_CRC_CE("GradientSignalStreamingImageAsset");
+    }
+
+    bool StreamingImagePropertyHandler::IsDefaultHandler() const
+    {
+        // We don't this to be registered as a default handler, because we don't want
+        // any other AZ::RPI::StreamingImageAsset fields using this handler.
+        // We only want this handler to be used if it was explicitly requested by name,
+        // which in this case is for the image gradient asset since it needs to validate
+        // the format is supported by the pixel retrieval API.
+        return false;
+    }
+
+    QWidget* StreamingImagePropertyHandler::GetFirstInTabOrder(StreamingImagePropertyAssetCtrl* widget)
+    {
+        return widget->GetFirstInTabOrder();
+    }
+
+    QWidget* StreamingImagePropertyHandler::GetLastInTabOrder(StreamingImagePropertyAssetCtrl* widget)
+    {
+        return widget->GetLastInTabOrder();
+    }
+
+    void StreamingImagePropertyHandler::UpdateWidgetInternalTabbing(StreamingImagePropertyAssetCtrl* widget)
+    {
+        widget->UpdateTabOrder();
+    }
+
+    QWidget* StreamingImagePropertyHandler::CreateGUI(QWidget* parent)
+    {
+        // This is the same logic as the AssetPropertyHandlerDefault, only we create our own
+        // StreamingImagePropertyAssetCtrl instead for the GUI widget
+        StreamingImagePropertyAssetCtrl* newCtrl = aznew StreamingImagePropertyAssetCtrl(parent);
+
+        QObject::connect(newCtrl, &StreamingImagePropertyAssetCtrl::OnAssetIDChanged, this, [newCtrl](AZ::Data::AssetId newAssetID)
+        {
+            (void)newAssetID;
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&AzToolsFramework::PropertyEditorGUIMessages::RequestWrite, newCtrl);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&AzToolsFramework::PropertyEditorGUIMessages::OnEditingFinished, newCtrl);
+        });
+
+        return newCtrl;
+    }
+
+    void StreamingImagePropertyHandler::ConsumeAttribute(StreamingImagePropertyAssetCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
+    {
+        // Let the AssetPropertyHandlerDefault handle all of the attributes
+        AzToolsFramework::AssetPropertyHandlerDefault::ConsumeAttributeInternal(GUI, attrib, attrValue, debugName);
+    }
+
+    void StreamingImagePropertyHandler::WriteGUIValuesIntoProperty(size_t index, StreamingImagePropertyAssetCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node)
+    {
+        // Let the AssetPropertyHandlerDefault handle writing the GUI value into the property
+        AzToolsFramework::AssetPropertyHandlerDefault::WriteGUIValuesIntoPropertyInternal(index, GUI, instance, node);
+    }
+
+    bool StreamingImagePropertyHandler::ReadValuesIntoGUI(size_t index, StreamingImagePropertyAssetCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)
+    {
+        // Let the AssetPropertyHandlerDefault handle reading values into the GUI
+        return AzToolsFramework::AssetPropertyHandlerDefault::ReadValuesIntoGUIInternal(index, GUI, instance, node);
+    }
+
+    void StreamingImagePropertyHandler::Register()
+    {
+        using namespace AzToolsFramework;
+
+        PropertyTypeRegistrationMessages::Bus::Broadcast(
+            &PropertyTypeRegistrationMessages::Bus::Events::RegisterPropertyType, aznew StreamingImagePropertyHandler());
+    }
+}
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorStreamingImageAssetCtrl.h b/Gems/GradientSignal/Code/Source/Editor/EditorStreamingImageAssetCtrl.h
new file mode 100644
index 0000000000..a5c0a199ce
--- /dev/null
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorStreamingImageAssetCtrl.h
@@ -0,0 +1,75 @@
+/*
+ * 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
+
+#if !defined(Q_MOC_RUN)
+#include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>
+
+#include <AzToolsFramework/AssetBrowser/AssetPicker/AssetPickerDialog.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx>
+#endif
+
+namespace GradientSignal
+{
+    class SupportedImageAssetPickerDialog
+        : public AzToolsFramework::AssetBrowser::AssetPickerDialog
+    {
+        Q_OBJECT
+    public:
+        AZ_CLASS_ALLOCATOR(SupportedImageAssetPickerDialog, AZ::SystemAllocator, 0);
+
+        explicit SupportedImageAssetPickerDialog(AssetSelectionModel& selection, QWidget* parent = nullptr);
+
+    protected:
+        bool EvaluateSelection() const override;
+    };
+
+    class StreamingImagePropertyAssetCtrl
+        : public AzToolsFramework::PropertyAssetCtrl
+    {
+        Q_OBJECT
+
+    public:
+        AZ_CLASS_ALLOCATOR(StreamingImagePropertyAssetCtrl, AZ::SystemAllocator, 0);
+
+        StreamingImagePropertyAssetCtrl(QWidget* parent = nullptr);
+
+        void PickAssetSelectionFromDialog(AssetSelectionModel& selection, QWidget* parent) override;
+
+    public Q_SLOTS:
+        void OnAutocomplete(const QModelIndex& index) override;
+    };
+
+    //! We need a custom asset property handler for the AZ::RPI::StreamingImageAsset on our
+    //! Image Gradient component because only a subset of the streaming image asset pixel formats
+    //! are currently supported by the image data pixel retrieval API that the Image Gradient
+    //! relies on
+    class StreamingImagePropertyHandler
+        : QObject
+        , public AzToolsFramework::PropertyHandler<AZ::Data::Asset<AZ::Data::AssetData>, StreamingImagePropertyAssetCtrl>
+    {
+        Q_OBJECT
+
+    public:
+        AZ_CLASS_ALLOCATOR(StreamingImagePropertyHandler, AZ::SystemAllocator, 0);
+
+        AZ::u32 GetHandlerName() const override;
+        bool IsDefaultHandler() const override;
+        QWidget* GetFirstInTabOrder(StreamingImagePropertyAssetCtrl* widget) override;
+        QWidget* GetLastInTabOrder(StreamingImagePropertyAssetCtrl* widget) override;
+        void UpdateWidgetInternalTabbing(StreamingImagePropertyAssetCtrl* widget);
+
+        QWidget* CreateGUI(QWidget* parent) override;
+        void ConsumeAttribute(StreamingImagePropertyAssetCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
+        void WriteGUIValuesIntoProperty(size_t index, StreamingImagePropertyAssetCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
+        bool ReadValuesIntoGUI(size_t index, StreamingImagePropertyAssetCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
+
+        static void Register();
+    };
+}
diff --git a/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp b/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp
index 134de83d3b..a8b578737e 100644
--- a/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp
+++ b/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp
@@ -24,6 +24,7 @@
 #include <Editor/EditorPerlinGradientComponent.h>
 #include <Editor/EditorRandomGradientComponent.h>
 #include <Editor/EditorGradientTransformComponent.h>
+#include <Editor/EditorStreamingImageAssetCtrl.h>
 #include <Editor/EditorSurfaceMaskGradientComponent.h>
 #include <Editor/EditorGradientSurfaceDataComponent.h>
 #include <GradientSignal/Editor/EditorGradientComponentBase.h>
@@ -112,11 +113,14 @@ namespace GradientSignal
     void GradientSignalEditorSystemComponent::Activate()
     {
         GradientPreviewDataWidgetHandler::Register();
+        StreamingImagePropertyHandler::Register();
     }
 
     void GradientSignalEditorSystemComponent::Deactivate()
     {
         GradientPreviewDataWidgetHandler::Unregister();
+        // We don't need to unregister the StreamingImagePropertyHandler
+        // because its set to auto-delete (default)
     }
 }
 
diff --git a/Gems/GradientSignal/Code/Tests/GradientSignalTestFixtures.h b/Gems/GradientSignal/Code/Tests/GradientSignalTestFixtures.h
index c45af43ad9..4d2233528b 100644
--- a/Gems/GradientSignal/Code/Tests/GradientSignalTestFixtures.h
+++ b/Gems/GradientSignal/Code/Tests/GradientSignalTestFixtures.h
@@ -90,7 +90,7 @@ namespace UnitTest
         AZStd::unique_ptr<AZ::Entity> BuildTestSurfaceMaskGradient(float shapeHalfBounds);
         AZStd::unique_ptr<AZ::Entity> BuildTestSurfaceSlopeGradient(float shapeHalfBounds);
 
-        AZ::RPI::AssetHandlerPtrList m_assetHandlers;
+        AZStd::fixed_vector<AZStd::unique_ptr<AZ::Data::AssetHandler>, 2> m_assetHandlers;
     };
 
     struct GradientSignalTest
diff --git a/Gems/GradientSignal/Code/gradientsignal_editor_files.cmake b/Gems/GradientSignal/Code/gradientsignal_editor_files.cmake
index 3470fa6b87..b32e776b82 100644
--- a/Gems/GradientSignal/Code/gradientsignal_editor_files.cmake
+++ b/Gems/GradientSignal/Code/gradientsignal_editor_files.cmake
@@ -47,6 +47,8 @@ set(FILES
     Source/Editor/EditorShapeAreaFalloffGradientComponent.h
     Source/Editor/EditorSmoothStepGradientComponent.cpp
     Source/Editor/EditorSmoothStepGradientComponent.h
+    Source/Editor/EditorStreamingImageAssetCtrl.cpp
+    Source/Editor/EditorStreamingImageAssetCtrl.h
     Source/Editor/EditorSurfaceAltitudeGradientComponent.cpp
     Source/Editor/EditorSurfaceAltitudeGradientComponent.h
     Source/Editor/EditorSurfaceMaskGradientComponent.cpp
diff --git a/Gems/LmbrCentral/Code/Source/Shape/AxisAlignedBoxShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/AxisAlignedBoxShapeComponent.cpp
index 7f919bc097..0b1848eb4b 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/AxisAlignedBoxShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/AxisAlignedBoxShapeComponent.cpp
@@ -27,6 +27,7 @@ namespace LmbrCentral
     {
         incompatible.push_back(AZ_CRC_CE("ShapeService"));
         incompatible.push_back(AZ_CRC_CE("AxisAlignedBoxShapeService"));
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void AxisAlignedBoxShapeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
@@ -34,11 +35,6 @@ namespace LmbrCentral
         required.push_back(AZ_CRC_CE("TransformService"));
     }
 
-    void AxisAlignedBoxShapeComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
-    {
-        dependent.push_back(AZ_CRC_CE("NonUniformScaleService"));
-    }
-
     void AxisAlignedBoxShapeDebugDisplayComponent::Reflect(AZ::ReflectContext* context)
     {
         if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
@@ -54,8 +50,6 @@ namespace LmbrCentral
     {
         EntityDebugDisplayComponent::Activate();
         ShapeComponentNotificationsBus::Handler::BusConnect(GetEntityId());
-        m_nonUniformScale = AZ::Vector3::CreateOne();
-        AZ::NonUniformScaleRequestBus::EventResult(m_nonUniformScale, GetEntityId(), &AZ::NonUniformScaleRequests::GetScale);
     }
 
     void AxisAlignedBoxShapeDebugDisplayComponent::Deactivate()
@@ -74,7 +68,7 @@ namespace LmbrCentral
         transform.SetRotation(AZ::Quaternion::CreateIdentity());
         saveMatrix = debugDisplay.PopPremultipliedMatrix();
         debugDisplay.PushMatrix(transform);
-        DrawBoxShape(drawParams, m_boxShapeConfig, debugDisplay, m_nonUniformScale);
+        DrawBoxShape(drawParams, m_boxShapeConfig, debugDisplay);
         debugDisplay.PopMatrix();
         debugDisplay.PushPremultipliedMatrix(saveMatrix);
     }
@@ -104,7 +98,6 @@ namespace LmbrCentral
         if (changeReason == ShapeChangeReasons::ShapeChanged)
         {
             BoxShapeComponentRequestsBus::EventResult(m_boxShapeConfig, GetEntityId(), &BoxShapeComponentRequests::GetBoxConfiguration);
-            AZ::NonUniformScaleRequestBus::EventResult(m_nonUniformScale, GetEntityId(), &AZ::NonUniformScaleRequests::GetScale);
         }
     }
 
diff --git a/Gems/LmbrCentral/Code/Source/Shape/AxisAlignedBoxShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/AxisAlignedBoxShapeComponent.h
index e180e1d536..9e6060914f 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/AxisAlignedBoxShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/AxisAlignedBoxShapeComponent.h
@@ -33,7 +33,6 @@ namespace LmbrCentral
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
 
         AxisAlignedBoxShape m_aaboxShape; ///< Stores underlying box type for this component.
     };
@@ -65,6 +64,5 @@ namespace LmbrCentral
         void OnShapeChanged(ShapeChangeReasons changeReason) override;
 
         BoxShapeConfig m_boxShapeConfig; ///< Stores configuration data for box shape.
-        AZ::Vector3 m_nonUniformScale = AZ::Vector3::CreateOne(); ///< Caches non-uniform scale for this entity.
     };
 } // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp
index f78f2f048d..ca16dbb58c 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp
@@ -89,9 +89,10 @@ namespace LmbrCentral
         provided.push_back(AZ_CRC_CE("AxisAlignedBoxShapeService"));
     }
 
-    void EditorAxisAlignedBoxShapeComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
+    void EditorAxisAlignedBoxShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        dependent.push_back(AZ_CRC_CE("NonUniformScaleService"));
+        EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void EditorAxisAlignedBoxShapeComponent::DisplayEntityViewport(
@@ -104,7 +105,7 @@ namespace LmbrCentral
             {
                 DrawBoxShape(
                     { m_aaboxShape.GetBoxConfiguration().GetDrawColor(), m_shapeWireColor, m_aaboxShape.GetBoxConfiguration().IsFilled() },
-                    m_aaboxShape.GetBoxConfiguration(), debugDisplay, m_aaboxShape.GetCurrentNonUniformScale());
+                    m_aaboxShape.GetBoxConfiguration(), debugDisplay);
             },
             m_aaboxShape.GetCurrentTransform());
     }
@@ -161,8 +162,13 @@ namespace LmbrCentral
         return AzToolsFramework::TransformNormalizedScale(m_aaboxShape.GetCurrentTransform());
     }
 
+    AZ::Transform EditorAxisAlignedBoxShapeComponent::GetCurrentLocalTransform()
+    {
+        return AZ::Transform::CreateIdentity();
+    }
+
     AZ::Vector3 EditorAxisAlignedBoxShapeComponent::GetBoxScale()
     {
-        return AZ::Vector3(m_aaboxShape.GetCurrentTransform().GetUniformScale() * m_aaboxShape.GetCurrentNonUniformScale());
+        return AZ::Vector3(m_aaboxShape.GetCurrentTransform().GetUniformScale());
     }
 } // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.h
index 8bff4ea7e1..346ed8c2c4 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.h
@@ -38,7 +38,7 @@ namespace LmbrCentral
 
     protected:
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
-        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
         // EditorComponentBase
         void BuildGameEntity(AZ::Entity* gameEntity) override;
@@ -58,6 +58,7 @@ namespace LmbrCentral
         AZ::Vector3 GetDimensions() override;
         void SetDimensions(const AZ::Vector3& dimensions) override;
         AZ::Transform GetCurrentTransform() override;
+        AZ::Transform GetCurrentLocalTransform() override;
         AZ::Vector3 GetBoxScale() override;
 
         void ConfigurationChanged();        
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
index 2983ca7753..777e2f728b 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
@@ -167,6 +167,11 @@ namespace LmbrCentral
         return AzToolsFramework::TransformNormalizedScale(m_boxShape.GetCurrentTransform());
     }
 
+    AZ::Transform EditorBoxShapeComponent::GetCurrentLocalTransform()
+    {
+        return AZ::Transform::CreateIdentity();
+    }
+
     AZ::Vector3 EditorBoxShapeComponent::GetBoxScale()
     {
         return AZ::Vector3(m_boxShape.GetCurrentTransform().GetUniformScale() * m_boxShape.GetCurrentNonUniformScale());
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.h b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.h
index aa24bda5c4..499a20497c 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.h
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.h
@@ -57,6 +57,7 @@ namespace LmbrCentral
         AZ::Vector3 GetDimensions() override;
         void SetDimensions(const AZ::Vector3& dimensions) override;
         AZ::Transform GetCurrentTransform() override;
+        AZ::Transform GetCurrentLocalTransform() override;
         AZ::Vector3 GetBoxScale() override;
 
         void ConfigurationChanged();        
diff --git a/Gems/LmbrCentral/Code/Tests/AxisAlignedBoxShapeTest.cpp b/Gems/LmbrCentral/Code/Tests/AxisAlignedBoxShapeTest.cpp
index c3e8d06791..a0f3b9e7a9 100644
--- a/Gems/LmbrCentral/Code/Tests/AxisAlignedBoxShapeTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/AxisAlignedBoxShapeTest.cpp
@@ -13,7 +13,6 @@
 #include <AzCore/Math/Matrix3x3.h>
 #include <AzCore/Math/Random.h>
 #include <AzCore/UnitTest/TestTypes.h>
-#include <AzFramework/Components/NonUniformScaleComponent.h>
 #include <AzFramework/Components/TransformComponent.h>
 #include <AzFramework/UnitTest/TestDebugDisplayRequests.h>
 #include <Shape/AxisAlignedBoxShapeComponent.h>
@@ -26,7 +25,6 @@ namespace UnitTest
         AZStd::unique_ptr<AZ::ComponentDescriptor> m_transformComponentDescriptor;
         AZStd::unique_ptr<AZ::ComponentDescriptor> m_axisAlignedBoxShapeComponentDescriptor;
         AZStd::unique_ptr<AZ::ComponentDescriptor> m_axisAlignedBoxShapeDebugDisplayComponentDescriptor;
-        AZStd::unique_ptr<AZ::ComponentDescriptor> m_nonUniformScaleComponentDescriptor;
 
     public:
         void SetUp() override
@@ -43,9 +41,6 @@ namespace UnitTest
             m_axisAlignedBoxShapeDebugDisplayComponentDescriptor =
                 AZStd::unique_ptr<AZ::ComponentDescriptor>(LmbrCentral::AxisAlignedBoxShapeDebugDisplayComponent::CreateDescriptor());
             m_axisAlignedBoxShapeDebugDisplayComponentDescriptor->Reflect(&(*m_serializeContext));
-            m_nonUniformScaleComponentDescriptor =
-                AZStd::unique_ptr<AZ::ComponentDescriptor>(AzFramework::NonUniformScaleComponent::CreateDescriptor());
-            m_nonUniformScaleComponentDescriptor->Reflect(&(*m_serializeContext));
         }
 
         void TearDown() override
@@ -53,7 +48,6 @@ namespace UnitTest
             m_transformComponentDescriptor.reset();
             m_axisAlignedBoxShapeComponentDescriptor.reset();
             m_axisAlignedBoxShapeDebugDisplayComponentDescriptor.reset();
-            m_nonUniformScaleComponentDescriptor.reset();
             m_serializeContext.reset();
             AllocatorsFixture::TearDown();
         }
@@ -73,23 +67,6 @@ namespace UnitTest
             entity.GetId(), &LmbrCentral::BoxShapeComponentRequestsBus::Events::SetBoxDimensions, dimensions);
     }
 
-    void CreateAxisAlignedBoxWithNonUniformScale(
-        const AZ::Transform& transform, const AZ::Vector3& nonUniformScale, const AZ::Vector3& dimensions, AZ::Entity& entity)
-    {
-        entity.CreateComponent<LmbrCentral::AxisAlignedBoxShapeComponent>();
-        entity.CreateComponent<LmbrCentral::AxisAlignedBoxShapeDebugDisplayComponent>();
-        entity.CreateComponent<AzFramework::TransformComponent>();
-        entity.CreateComponent<AzFramework::NonUniformScaleComponent>();
-
-        entity.Init();
-        entity.Activate();
-
-        AZ::TransformBus::Event(entity.GetId(), &AZ::TransformBus::Events::SetWorldTM, transform);
-        LmbrCentral::BoxShapeComponentRequestsBus::Event(
-            entity.GetId(), &LmbrCentral::BoxShapeComponentRequestsBus::Events::SetBoxDimensions, dimensions);
-        AZ::NonUniformScaleRequestBus::Event(entity.GetId(), &AZ::NonUniformScaleRequests::SetScale, nonUniformScale);
-    }
-
     void CreateDefaultAxisAlignedBox(const AZ::Transform& transform, AZ::Entity& entity)
     {
         CreateAxisAlignedBox(transform, AZ::Vector3(10.0f, 10.0f, 10.0f), entity);
@@ -187,52 +164,4 @@ namespace UnitTest
         EXPECT_TRUE(rayHit);
         EXPECT_NEAR(distance, 4.0f, 1e-2f);
     }
-
-    TEST_F(AxisAlignedBoxShapeTest, RayIntersectWithBoxRotatedNonUniformScale)
-    {
-        AZ::Entity entity;
-        CreateAxisAlignedBoxWithNonUniformScale(
-            AZ::Transform(
-                AZ::Vector3(2.0f, -5.0f, 3.0f), AZ::Quaternion::CreateFromAxisAngle(AZ::Vector3::CreateAxisY(), AZ::Constants::QuarterPi),
-                0.5f),
-            AZ::Vector3(2.2f, 1.8f, 0.4f), AZ::Vector3(0.2f, 2.6f, 1.2f), entity);
-
-        // This test creates a box of dimensions (2.2, 1.8, 0.4) centered on (2.0, -5, 3) and rotated about the Y axis by 45 degrees.
-        // The box is tested for axis-alignment by firing various rays and ensuring they either hit or miss the box. Any failure here
-        // would show the box has been rotated.
-
-        // Ray should just miss the box
-        bool rayHit = false;
-        float distance = AZ::Constants::FloatMax;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(
-            rayHit, entity.GetId(), &LmbrCentral::ShapeComponentRequests::IntersectRay, AZ::Vector3(1.8f, -6.2f, 3.0f),
-            AZ::Vector3(1.0f, 0.0f, 0.0f), distance);
-        EXPECT_FALSE(rayHit);
-
-        // Ray should just hit the box
-        rayHit = false;
-        distance = AZ::Constants::FloatMax;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(
-            rayHit, entity.GetId(), &LmbrCentral::ShapeComponentRequests::IntersectRay, AZ::Vector3(1.8f, -6.1f, 3.0f),
-            AZ::Vector3(1.0f, 0.0f, 0.0f), distance);
-        EXPECT_TRUE(rayHit);
-        EXPECT_NEAR(distance, 0.09f, 1e-3f);
-
-        // Ray should just miss the box
-        rayHit = false;
-        distance = AZ::Constants::FloatMax;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(
-            rayHit, entity.GetId(), &LmbrCentral::ShapeComponentRequests::IntersectRay, AZ::Vector3(2.2f, -6.2f, 3.0f),
-            AZ::Vector3(0.0f, 1.0f, 0.0f), distance);
-        EXPECT_FALSE(rayHit);
-
-        // Ray should just hit the box
-        rayHit = false;
-        distance = AZ::Constants::FloatMax;
-        LmbrCentral::ShapeComponentRequestsBus::EventResult(
-            rayHit, entity.GetId(), &LmbrCentral::ShapeComponentRequests::IntersectRay, AZ::Vector3(2.1f, -6.2f, 3.0f),
-            AZ::Vector3(0.0f, 1.0f, 0.0f), distance);
-        EXPECT_TRUE(rayHit);
-        EXPECT_NEAR(distance, 0.03f, 1e-3f);
-    }
 } // namespace UnitTest
diff --git a/Gems/LmbrCentral/Code/Tests/EditorBoxShapeComponentTests.cpp b/Gems/LmbrCentral/Code/Tests/EditorBoxShapeComponentTests.cpp
index 4b72a4fb58..82a7f57937 100644
--- a/Gems/LmbrCentral/Code/Tests/EditorBoxShapeComponentTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/EditorBoxShapeComponentTests.cpp
@@ -7,6 +7,17 @@
  */
 #include "LmbrCentralReflectionTest.h"
 #include "Shape/EditorBoxShapeComponent.h"
+#include "Shape/EditorSphereShapeComponent.h"
+#include <AzCore/Component/NonUniformScaleBus.h>
+#include <AzFramework/Viewport/ViewportScreen.h>
+#include <AzManipulatorTestFramework/AzManipulatorTestFramework.h>
+#include <AzManipulatorTestFramework/AzManipulatorTestFrameworkTestHelpers.h>
+#include <AzManipulatorTestFramework/ImmediateModeActionDispatcher.h>
+#include <AzManipulatorTestFramework/IndirectManipulatorViewportInteraction.h>
+#include <AzManipulatorTestFramework/ViewportInteraction.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.h>
+#include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
 
 namespace LmbrCentral
 {
@@ -56,5 +67,110 @@ namespace LmbrCentral
 
        EXPECT_EQ(dimensions, AZ::Vector3(0.37f, 0.57f, 0.66f));
     }
+
+    class EditorBoxShapeComponentFixture : public UnitTest::ToolsApplicationFixture
+    {
+    public:
+        void SetUpEditorFixtureImpl() override;
+        void TearDownEditorFixtureImpl() override;
+
+        AZStd::unique_ptr<AZ::ComponentDescriptor> m_editorBoxShapeComponentDescriptor;
+        AZStd::unique_ptr<AZ::ComponentDescriptor> m_editorSphereShapeComponentDescriptor;
+
+        AZ::Entity* m_entity = nullptr;
+    };
+
+    void EditorBoxShapeComponentFixture::SetUpEditorFixtureImpl()
+    {
+        AZ::SerializeContext* serializeContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
+
+        // need to reflect EditorSphereShapeComponent in order for EditorBaseShapeComponent to be reflected
+        m_editorSphereShapeComponentDescriptor = AZStd::unique_ptr<AZ::ComponentDescriptor>(EditorSphereShapeComponent::CreateDescriptor());
+
+        m_editorBoxShapeComponentDescriptor =
+            AZStd::unique_ptr<AZ::ComponentDescriptor>(EditorBoxShapeComponent::CreateDescriptor());
+
+        ShapeComponentConfig::Reflect(serializeContext);
+        BoxShape::Reflect(serializeContext);
+        m_editorSphereShapeComponentDescriptor->Reflect(serializeContext);
+        m_editorBoxShapeComponentDescriptor->Reflect(serializeContext);
+
+        UnitTest::CreateDefaultEditorEntity("BoxShapeComponentEntity", &m_entity);
+        m_entity->Deactivate();
+        m_entity->CreateComponent(AzToolsFramework::Components::EditorNonUniformScaleComponent::RTTI_Type());
+        m_entity->CreateComponent(EditorBoxShapeComponentTypeId);
+        m_entity->Activate();
+    }
+
+    void EditorBoxShapeComponentFixture::TearDownEditorFixtureImpl()
+    {
+        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
+            &AzToolsFramework::EditorEntityContextRequestBus::Events::DestroyEditorEntity, m_entity->GetId());
+        m_entity = nullptr;
+
+        m_editorBoxShapeComponentDescriptor.reset();
+        m_editorSphereShapeComponentDescriptor.reset();
+    }
+
+    using EditorBoxShapeComponentManipulatorFixture =
+        UnitTest::IndirectCallManipulatorViewportInteractionFixtureMixin<EditorBoxShapeComponentFixture>;
+
+    TEST_F(EditorBoxShapeComponentManipulatorFixture, BoxShapeNonUniformScaleManipulatorsScaleCorrectly)
+    {
+        // a rotation which rotates the x-axis to (0.8, 0.6, 0)
+        const AZ::Quaternion boxRotation(0.0f, 0.0f, 0.316228f, 0.948683f);
+        AZ::Transform boxTransform = AZ::Transform::CreateFromQuaternionAndTranslation(boxRotation, AZ::Vector3(2.0f, 3.0f, 4.0f));
+        boxTransform.SetUniformScale(1.5f);
+        AZ::TransformBus::Event(m_entity->GetId(), &AZ::TransformBus::Events::SetWorldTM, boxTransform);
+
+        const AZ::Vector3 nonUniformScale(4.0f, 1.5f, 2.0f);
+        AZ::NonUniformScaleRequestBus::Event(m_entity->GetId(), &AZ::NonUniformScaleRequests::SetScale, nonUniformScale);
+
+        const AZ::Vector3 boxDimensions(1.0f, 2.0f, 2.5f);
+        BoxShapeComponentRequestsBus::Event(m_entity->GetId(), &BoxShapeComponentRequests::SetBoxDimensions, boxDimensions);
+
+        // enter the box shape component's component mode
+        AzToolsFramework::SelectEntity(m_entity->GetId());
+        AzToolsFramework::ComponentModeFramework::ComponentModeSystemRequestBus::Broadcast(
+            &AzToolsFramework::ComponentModeFramework::ComponentModeSystemRequestBus::Events::AddSelectedComponentModesOfType,
+            EditorBoxShapeComponentTypeId);
+
+        // position the camera so it is looking down at the box
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromQuaternionAndTranslation(
+                AZ::Quaternion::CreateRotationX(-AZ::Constants::HalfPi), AZ::Vector3(2.0f, 3.0f, 20.0f)));
+
+        // position in world space which should allow grabbing the box's x scale manipulator
+        // the unscaled position of the x scale manipulator in the box's local frame should be (0.5f, 0.0f, 0.0f)
+        // after non-uniform scale, the manipulator position should be (2.0f, 0.0f, 0.0f)
+        // after the scale of the entity transform, the manipulator position should be (3.0f, 0.0f, 0.0f)
+        // after the rotation of the entity transform, the manipulator position should be (2.4f, 1.8f, 0.0f)
+        // after the translation of the entity transform, the manipulator position should be (4.4f, 4.8f, 4.0f)
+        const AZ::Vector3 worldStart(4.4f, 4.8f, 4.0f);
+
+        // position in world space to move to
+        const AZ::Vector3 worldEnd(6.8f, 6.6f, 4.0f);
+
+        const auto screenStart = AzFramework::WorldToScreen(worldStart, m_cameraState);
+        const auto screenEnd = AzFramework::WorldToScreen(worldEnd, m_cameraState);
+
+        m_actionDispatcher
+            ->CameraState(m_cameraState)
+            // move the mouse to the position of the x scale manipulator
+            ->MousePosition(screenStart)
+            // drag to move the manipulator
+            ->MouseLButtonDown()
+            ->MousePosition(screenEnd)
+            ->MouseLButtonUp();
+
+        AZ::Vector3 newBoxDimensions = AZ::Vector3::CreateZero();
+        BoxShapeComponentRequestsBus::EventResult(newBoxDimensions, m_entity->GetId(), &BoxShapeComponentRequests::GetBoxDimensions);
+
+        const AZ::Vector3 expectedBoxDimensions(2.0f, 2.0f, 2.5f);
+        // allow a reasonably high tolerance because we can't get better accuracy than the resolution of the viewport
+        EXPECT_THAT(newBoxDimensions, UnitTest::IsCloseTolerance(expectedBoxDimensions, 1e-2f));
+    }
 }
 
diff --git a/Gems/LyShine/Code/Editor/HierarchyMenu.cpp b/Gems/LyShine/Code/Editor/HierarchyMenu.cpp
index 004fe53354..4fb09ea1f8 100644
--- a/Gems/LyShine/Code/Editor/HierarchyMenu.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyMenu.cpp
@@ -387,7 +387,9 @@ void HierarchyMenu::New_ElementFromSlice(HierarchyWidget* hierarchy,
     AZ::Vector2 viewportPosition(-1.0f,-1.0f); // indicates no viewport position specified
     if (optionalPos)
     {
-        viewportPosition = QtHelpers::QPointFToVector2(*optionalPos);
+        // Convert position to render viewport coords
+        QPointF scaledPosition = *optionalPos * hierarchy->GetEditorWindow()->GetViewport()->WidgetToViewportFactor();
+        viewportPosition = QtHelpers::QPointFToVector2(scaledPosition);
     }
 
     SliceMenuHelpers::CreateInstantiateSliceMenu(hierarchy,
@@ -405,7 +407,9 @@ void HierarchyMenu::New_ElementFromSlice(HierarchyWidget* hierarchy,
             AZ::Vector2 viewportPosition(-1.0f,-1.0f); // indicates no viewport position specified
             if (optionalPos)
             {
-                viewportPosition = QtHelpers::QPointFToVector2(*optionalPos);
+                // Convert position to render viewport coords
+                QPointF scaledPosition = *optionalPos * hierarchy->GetEditorWindow()->GetViewport()->WidgetToViewportFactor();
+                viewportPosition = QtHelpers::QPointFToVector2(scaledPosition);
             }
             hierarchy->GetEditorWindow()->GetSliceManager()->InstantiateSliceUsingBrowser(hierarchy, viewportPosition);
         }
diff --git a/Gems/LyShine/Code/Editor/HierarchyWidget.cpp b/Gems/LyShine/Code/Editor/HierarchyWidget.cpp
index 30cb7e51dc..cd80e5a278 100644
--- a/Gems/LyShine/Code/Editor/HierarchyWidget.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyWidget.cpp
@@ -1239,11 +1239,13 @@ void HierarchyWidget::AddElement(const QTreeWidgetItemRawPtrQList& selectedItems
         this,
         selectedItems,
         childIndex,
-        [optionalPos](AZ::Entity* element)
+        [this, optionalPos](AZ::Entity* element)
         {
             if (optionalPos)
             {
-                EntityHelpers::MoveElementToGlobalPosition(element, *optionalPos);
+                // Convert position to render viewport coords
+                QPoint scaledPosition = *optionalPos * GetEditorWindow()->GetViewport()->WidgetToViewportFactor();
+                EntityHelpers::MoveElementToGlobalPosition(element, scaledPosition);
             }
         });
 }
diff --git a/Gems/MotionMatching/README.md b/Gems/MotionMatching/README.md
index f07116fcd7..33d7f67276 100644
--- a/Gems/MotionMatching/README.md
+++ b/Gems/MotionMatching/README.md
@@ -112,6 +112,87 @@ The instance is where everything comes together. It stores the trajectory histor
 ## Architecture
 ![Class Diagram](https://user-images.githubusercontent.com/43751992/151819361-878edcb5-2b1f-4867-bb7f-8ed5c09a075a.png)
 
+## The motion matching algorithm
+
+Motion matching plays small clips of a motion database, while jumping and smoothly transitioning back and forth, to synthesize a new animation from that data.
+
+### Update loop
+
+In the majority of the game ticks, the current motion gets advanced. A few times per second, the actual motion matching search is triggered to not drift away too far from the expected user input (as we would just play the recorded animation otherwise).
+
+When a search for a better next matching frame is triggered, the current pose, including its joint velocities, gets evaluated. This pose (which we'll call input or query pose) is used to fill the query vector. The query vector contains feature values and is compared against other frames in the feature matrix. The query vector has the same size as there are columns in the feature matrix and is similar to any other row but represents the query pose.
+
+Using the query vector, we can find the next best matching frame in the motion database and start transitioning towards that.
+
+In case the new best matching frame candidate is close to the time in the animation that we are already playing, we don't do anything as we seem to be at the sweet spot in the motion database already.
+
+Pseudo-code:
+```
+// Keep playing the current animation.
+currentMotion.Update(timeDelta);
+
+if (Is it time to search for a new best matching frame?) // We might e.g. do this 5x a second
+{
+    // Evaluate the current pose including joint velocities.
+    queryPose = SamplePose(newMotionTime);
+
+    // Update the input query vector (Calculate features for the query pose)
+    queryValues = CalculateFeaturesFromPose(queryPose);
+
+    // Find the frame with the lowest cost based on the query vector.
+    bestMatchingFrame = FindBestMatchingFrame(queryValues);
+
+    // Start transitioning towards the new best matching frame in case it is not
+    // really close to the frame we are already playing.
+    if (IsClose(bestMatchingFrame, currentMotion.GetFrame()) == false)
+    {
+        StartTransition(bestMatchingFrame);
+    }
+}
+```
+
+### Cost function
+
+The core question in the algorithm is: Where do we jump and transition to? The algorithm tries to find the best time in the motion database that matches the current character pose including its movements and the user input. To compare the frame candidates with each other, we use a cost function.
+
+The feature schema defines the cost function. Every feature added to the feature schema adds up to the cost. The bigger the discrepancy between e.g. the current velocity and the one from the frame candidate, the higher the penalty to the cost and the less likely the candidate is a good one to take.
+
+This makes motion matching an optimization problem where the frame with the minimum cost is the most preferred candidate to transition to.
+
+### Searching next best matching frame
+
+The actual search happens in two phases, a broad phase to eliminate most of the candidates followed by a narrow phase to find the actual best candidate.
+
+#### 1. Broad-phase (KD-tree)
+
+A KD-tree is used to find the nearest neighbors (frames in the motion database) to the query vector (given input). The result is a set of pre-selected frames for the next best matching frame that is passed on to the narrow-phase. By adjusting the maximum tree depth or the minimum number of frames for the leaf nodes, the resulting number of frames can be adjusted. The bigger the set of frames the broad-phase returns, the more candidates the narrow-phase can choose from, the better the visual quality of the animation but the slower the algorithm.
+
+#### 2. Narrow-phase
+
+Inside the narrow-phase, we iterate through the returned set of frames from the KD-tree, and evaluate and compare their cost against each other. The frame with the minimal cost is the best match that we transition to.
+
+Pseudo-code:
+```
+minCost = MAX;
+for_all (nearest frames found in the broad-phase)
+{
+    frameCost = 0.0
+    for_all (features)
+    {
+        frameCost += CalculateCost(feature);
+    }
+
+    if (frameCost < minCost)
+    {
+        // We found a better next matching frame
+        minCost = frameCost;
+        newBestMatchingFrame = currentFrame;
+    }
+}
+
+StartTransition(newBestMatchingFrame);
+```
+
 ## Jupyter notebook
 
 ### Feature histograms
diff --git a/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp b/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp
index beb17ed9f6..c53019a150 100644
--- a/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp
@@ -22,6 +22,9 @@
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/std/sort.h>
 
+AZ_CVAR(bool, bg_AssertNetBindOnDeactivationWithoutMarkForRemoval, false, nullptr, AZ::ConsoleFunctorFlags::Null,
+    "If true, assert when a multiplayer entity is deactivated without first calling MarkForRemoval from NetworkEntityManager.");
+
 namespace Multiplayer
 {
     void NetBindComponent::Reflect(AZ::ReflectContext* context)
@@ -167,10 +170,13 @@ namespace Multiplayer
 
     void NetBindComponent::Deactivate()
     {
-        AZ_Assert(
-            m_needsToBeStopped == false,
-            "Entity (%s) appears to have been improperly deleted. Use MarkForRemoval to correctly clean up a networked entity.",
-            GetEntity() ? GetEntity()->GetName().c_str() : "null");
+        if (bg_AssertNetBindOnDeactivationWithoutMarkForRemoval)
+        {
+            AZ_Assert(
+                m_needsToBeStopped == false,
+                "Entity (%s) appears to have been improperly deleted. Use MarkForRemoval to correctly clean up a networked entity.",
+                GetEntity() ? GetEntity()->GetName().c_str() : "null");
+        }
         m_handleLocalServerRpcMessageEventHandle.Disconnect();
         if (NetworkRoleHasController(m_netEntityRole))
         {
diff --git a/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.cpp b/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.cpp
index 59dddf5652..c6b6385845 100644
--- a/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.cpp
@@ -122,43 +122,41 @@ namespace Multiplayer
                 {
                     AZ::Entity* entity = static_cast<AZ::Entity*>(visEntry->m_userData);
                     NetworkEntityHandle entityHandle(entity, networkEntityTracker);
-                    if (entityHandle.GetNetBindComponent() == nullptr)
+                    if (entityHandle.GetNetBindComponent() != nullptr)
                     {
-                        // Not a net-bound entity, terminate processing of this entity
-                        return;
-                    }
-
-                    const AZ::Aabb currentBounds = entityBoundsUnion->GetEntityWorldBoundsUnion(entity->GetId());
-                    const AZ::Vector3 currentCenter = currentBounds.GetCenter();
-                    NetworkTransformComponent* networkTransform = entity->template FindComponent<NetworkTransformComponent>();
-                    if (debugDisplay)
-                    {
-                        debugDisplay->SetColor(AZ::Colors::White);
-                        debugDisplay->DrawWireBox(currentBounds.GetMin(), currentBounds.GetMax());
-                    }
-
-                    if (networkTransform != nullptr)
-                    {
-                        // Get the rewound position for target host frame ID plus the one preceding it for potential lerp
-                        AZ::Vector3 rewindCenter = networkTransform->GetTranslation();
-                        const AZ::Vector3 rewindCenterPrevious = networkTransform->GetTranslationPrevious();
-                        const float blendFactor = GetNetworkTime()->GetHostBlendFactor();
-                        if (!AZ::IsClose(blendFactor, 1.0f) && !rewindCenter.IsClose(rewindCenterPrevious))
-                        {
-                            // If we have a blend factor, lerp the translation for accuracy
-                            rewindCenter = rewindCenterPrevious.Lerp(rewindCenter, blendFactor);
-                        }
-                        const AZ::Vector3 rewindOffset = rewindCenter - currentCenter; // Compute offset between rewound and current positions
-                        const AZ::Aabb rewoundAabb = currentBounds.GetTranslated(rewindOffset); // Apply offset to the entity aabb
+                        const AZ::Aabb currentBounds = entityBoundsUnion->GetEntityWorldBoundsUnion(entity->GetId());
+                        const AZ::Vector3 currentCenter = currentBounds.GetCenter();
+                        NetworkTransformComponent* networkTransform = entity->template FindComponent<NetworkTransformComponent>();
                         if (debugDisplay)
                         {
-                            debugDisplay->SetColor(AZ::Colors::Grey);
-                            debugDisplay->DrawWireBox(rewoundAabb.GetMin(), rewoundAabb.GetMax());
+                            debugDisplay->SetColor(AZ::Colors::White);
+                            debugDisplay->DrawWireBox(currentBounds.GetMin(), currentBounds.GetMax());
                         }
 
-                        if (AZ::ShapeIntersection::Overlaps(rewoundAabb, rewindVolume)) // Validate the rewound aabb intersects our rewind volume
+                        if (networkTransform != nullptr)
                         {
-                            m_rewoundEntities.push_back(entityHandle);
+                            // Get the rewound position for target host frame ID plus the one preceding it for potential lerp
+                            AZ::Vector3 rewindCenter = networkTransform->GetTranslation();
+                            const AZ::Vector3 rewindCenterPrevious = networkTransform->GetTranslationPrevious();
+                            const float blendFactor = GetNetworkTime()->GetHostBlendFactor();
+                            if (!AZ::IsClose(blendFactor, 1.0f) && !rewindCenter.IsClose(rewindCenterPrevious))
+                            {
+                                // If we have a blend factor, lerp the translation for accuracy
+                                rewindCenter = rewindCenterPrevious.Lerp(rewindCenter, blendFactor);
+                            }
+                            const AZ::Vector3 rewindOffset = rewindCenter - currentCenter; // Compute offset between rewound and current positions
+                            const AZ::Aabb rewoundAabb = currentBounds.GetTranslated(rewindOffset); // Apply offset to the entity aabb
+                            if (debugDisplay)
+                            {
+                                debugDisplay->SetColor(AZ::Colors::Grey);
+                                debugDisplay->DrawWireBox(rewoundAabb.GetMin(), rewoundAabb.GetMax());
+                            }
+
+                            if (AZ::ShapeIntersection::Overlaps(rewoundAabb, rewindVolume)) // Validate the rewound aabb intersects our rewind volume
+                            {
+                                m_rewoundEntities.push_back(entityHandle);
+                                entityHandle.GetNetBindComponent()->NotifySyncRewindState();
+                            }
                         }
                     }
                 }
diff --git a/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp b/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp
index 0bc941b082..b704f8feec 100644
--- a/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp
@@ -8,11 +8,14 @@
 
 #include "ColliderCapsuleMode.h"
 #include <PhysX/EditorColliderComponentRequestBus.h>
+#include <Source/Utils.h>
 
 #include <AzToolsFramework/Manipulators/LinearManipulator.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
+#include <AzToolsFramework/ComponentModes/BoxViewportEdit.h>
 #include <AzCore/Component/TransformBus.h>
+#include <AzCore/Component/NonUniformScaleBus.h>
 #include <AzFramework/Viewport/ViewportColors.h>
 #include <AzFramework/Viewport/ViewportConstants.h>
 
@@ -34,10 +37,15 @@ namespace PhysX
     void ColliderCapsuleMode::Setup(const AZ::EntityComponentIdPair& idPair)
     {
         AZ::Transform colliderWorldTransform = AZ::Transform::Identity();
-        PhysX::EditorColliderComponentRequestBus::EventResult(colliderWorldTransform, idPair, &PhysX::EditorColliderComponentRequests::GetColliderWorldTransform);
+        AZ::TransformBus::EventResult(colliderWorldTransform, idPair.GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
 
-        SetupRadiusManipulator(idPair, colliderWorldTransform);
-        SetupHeightManipulator(idPair, colliderWorldTransform);
+        AZ::Vector3 nonUniformScale = AZ::Vector3::CreateOne();
+        AZ::NonUniformScaleRequestBus::EventResult(nonUniformScale, idPair.GetEntityId(), &AZ::NonUniformScaleRequests::GetScale);
+
+        const AZ::Transform colliderLocalTransform = Utils::GetColliderLocalTransform(idPair);
+
+        SetupRadiusManipulator(idPair, colliderWorldTransform, colliderLocalTransform, nonUniformScale);
+        SetupHeightManipulator(idPair, colliderWorldTransform, colliderLocalTransform, nonUniformScale);
 
         AzFramework::EntityDebugDisplayEventBus::Handler::BusConnect(idPair.GetEntityId());
     }
@@ -45,7 +53,12 @@ namespace PhysX
     void ColliderCapsuleMode::Refresh(const AZ::EntityComponentIdPair& idPair)
     {
         AZ::Transform colliderWorldTransform = AZ::Transform::Identity();
-        PhysX::EditorColliderComponentRequestBus::EventResult(colliderWorldTransform, idPair, &PhysX::EditorColliderComponentRequests::GetColliderWorldTransform);
+        AZ::TransformBus::EventResult(colliderWorldTransform, idPair.GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
+
+        AZ::Vector3 nonUniformScale = AZ::Vector3::CreateOne();
+        AZ::NonUniformScaleRequestBus::EventResult(nonUniformScale, idPair.GetEntityId(), &AZ::NonUniformScaleRequests::GetScale);
+
+        AZ::Transform colliderLocalTransform = Utils::GetColliderLocalTransform(idPair);
 
         // Read the state of the capsule into manipulators to support undo/redo
         float capsuleHeight = 0.0f;
@@ -55,9 +68,13 @@ namespace PhysX
         PhysX::EditorColliderComponentRequestBus::EventResult(capsuleRadius, idPair, &PhysX::EditorColliderComponentRequests::GetCapsuleRadius);
 
         m_radiusManipulator->SetSpace(colliderWorldTransform);
-        m_radiusManipulator->SetLocalPosition(m_radiusManipulator->GetAxis() * capsuleRadius);
+        m_radiusManipulator->SetLocalTransform(
+            colliderLocalTransform * AZ::Transform::CreateTranslation(m_radiusManipulator->GetAxis() * capsuleRadius));
+        m_radiusManipulator->SetNonUniformScale(nonUniformScale);
         m_heightManipulator->SetSpace(colliderWorldTransform);
-        m_heightManipulator->SetLocalPosition(m_heightManipulator->GetAxis() * capsuleHeight * HalfHeight);
+        m_heightManipulator->SetLocalTransform(
+            colliderLocalTransform * AZ::Transform::CreateTranslation(m_heightManipulator->GetAxis() * capsuleHeight * HalfHeight));
+        m_heightManipulator->SetNonUniformScale(nonUniformScale);
     }
 
     void ColliderCapsuleMode::Teardown(const AZ::EntityComponentIdPair& idPair)
@@ -83,13 +100,23 @@ namespace PhysX
         AZ_UNUSED(debugDisplay);
 
         const AzFramework::CameraState cameraState = AzToolsFramework::GetCameraState(viewportInfo.m_viewportId);
-        float radius = m_radiusManipulator->GetLocalPosition().GetLength();
 
-        m_radiusManipulator->SetAxis(cameraState.m_side);
-        m_radiusManipulator->SetLocalPosition(cameraState.m_side * radius);
+        if (!m_radiusManipulator->EntityComponentIdPairs().empty())
+        {
+            const AZ::EntityComponentIdPair idPair = *m_radiusManipulator->EntityComponentIdPairs().begin();
+            float radius = 0.0f;
+            PhysX::EditorColliderComponentRequestBus::EventResult(radius, idPair, &PhysX::EditorColliderComponentRequests::GetCapsuleRadius);
+            const AZ::Transform colliderLocalTransform = Utils::GetColliderLocalTransform(idPair);
+            m_radiusManipulator->SetAxis(cameraState.m_side);
+            m_radiusManipulator->SetLocalTransform(colliderLocalTransform * AZ::Transform::CreateTranslation(cameraState.m_side * radius));
+        }
     }
 
-    void ColliderCapsuleMode::SetupRadiusManipulator(const AZ::EntityComponentIdPair& idPair, const AZ::Transform& worldTransform)
+    void ColliderCapsuleMode::SetupRadiusManipulator(
+        const AZ::EntityComponentIdPair& idPair,
+        const AZ::Transform& worldTransform,
+        const AZ::Transform& localTransform,
+        const AZ::Vector3& nonUniformScale)
     {
         // Radius manipulator
         float capsuleRadius = 0.0f;
@@ -99,7 +126,8 @@ namespace PhysX
         m_radiusManipulator->AddEntityComponentIdPair(idPair);
         m_radiusManipulator->SetAxis(RadiusManipulatorAxis);
         m_radiusManipulator->Register(AzToolsFramework::g_mainManipulatorManagerId);
-        m_radiusManipulator->SetLocalPosition(RadiusManipulatorAxis * capsuleRadius);
+        m_radiusManipulator->SetLocalTransform(localTransform * AZ::Transform::CreateTranslation(RadiusManipulatorAxis * capsuleRadius));
+        m_radiusManipulator->SetNonUniformScale(nonUniformScale);
 
         {
             AzToolsFramework::ManipulatorViews views;
@@ -114,7 +142,11 @@ namespace PhysX
         });
     }
 
-    void ColliderCapsuleMode::SetupHeightManipulator(const AZ::EntityComponentIdPair& idPair, const AZ::Transform& worldTransform)
+    void ColliderCapsuleMode::SetupHeightManipulator(
+        const AZ::EntityComponentIdPair& idPair,
+        const AZ::Transform& worldTransform,
+        const AZ::Transform& localTransform,
+        const AZ::Vector3& nonUniformScale)
     {
         // Height manipulator
         float capsuleHeight = 0.0f;
@@ -124,7 +156,9 @@ namespace PhysX
         m_heightManipulator->AddEntityComponentIdPair(idPair);
         m_heightManipulator->SetAxis(HeightManipulatorAxis);
         m_heightManipulator->Register(AzToolsFramework::g_mainManipulatorManagerId);
-        m_heightManipulator->SetLocalPosition(HeightManipulatorAxis * capsuleHeight * HalfHeight); // Manipulator positioned at half the capsules height.
+        m_heightManipulator->SetLocalTransform(
+            localTransform * AZ::Transform::CreateTranslation(HeightManipulatorAxis * capsuleHeight * HalfHeight));
+        m_heightManipulator->SetNonUniformScale(nonUniformScale);
 
         {
             AzToolsFramework::ManipulatorViews views;
@@ -137,19 +171,23 @@ namespace PhysX
         {
             OnHeightManipulatorMoved(action, idPair);
         });
-
     }
 
     void ColliderCapsuleMode::OnRadiusManipulatorMoved(const AzToolsFramework::LinearManipulator::Action& action, const AZ::EntityComponentIdPair& idPair)
     {
+        // manipulator action offsets do not take entity transform scale into account, so need to apply it here
+        const AZ::Transform colliderLocalTransform = Utils::GetColliderLocalTransform(idPair);
+        const AZ::Vector3 manipulatorPosition = AzToolsFramework::GetPositionInManipulatorFrame(
+            m_radiusManipulator->GetSpace().GetUniformScale(), colliderLocalTransform, action);
+
         // Get the distance the manipulator has moved along the axis.
-        float extent = action.LocalPosition().Dot(action.m_fixed.m_axis);
+        float extent = manipulatorPosition.Dot(action.m_fixed.m_axis);
 
         // Clamp radius to a small value.
         extent = AZ::GetMax(extent, MinCapsuleRadius);
 
         // Update the manipulator and capsule radius.
-        m_radiusManipulator->SetLocalPosition(extent * action.m_fixed.m_axis);
+        m_radiusManipulator->SetLocalTransform(colliderLocalTransform * AZ::Transform::CreateTranslation(extent * action.m_fixed.m_axis));
 
         // Adjust the height manipulator so it is always clamped to twice the radius.
         AdjustHeightManipulator(idPair, static_cast<float>(extent));
@@ -160,14 +198,19 @@ namespace PhysX
 
     void ColliderCapsuleMode::OnHeightManipulatorMoved(const AzToolsFramework::LinearManipulator::Action& action, const AZ::EntityComponentIdPair& idPair)
     {
+        // manipulator action offsets do not take entity transform scale into account, so need to apply it here
+        const AZ::Transform colliderLocalTransform = Utils::GetColliderLocalTransform(idPair);
+        const AZ::Vector3 manipulatorPosition = AzToolsFramework::GetPositionInManipulatorFrame(
+            m_heightManipulator->GetSpace().GetUniformScale(), colliderLocalTransform, action);
+
         // Get the distance the manipulator has moved along the axis.
-        float extent = action.LocalPosition().Dot(action.m_fixed.m_axis);
+        float extent = manipulatorPosition.Dot(action.m_fixed.m_axis);
 
         // Ensure capsule's half height is always greater than the radius.
         extent = AZ::GetMax(extent, MinCapsuleHeight);
 
         // Update the manipulator and capsule height.
-        m_heightManipulator->SetLocalPosition(extent * action.m_fixed.m_axis);
+        m_heightManipulator->SetLocalTransform(colliderLocalTransform * AZ::Transform::CreateTranslation(extent * action.m_fixed.m_axis));
 
         // The final height of the capsule is twice the manipulator's extent.
         float capsuleHeight = extent / HalfHeight;
@@ -188,7 +231,9 @@ namespace PhysX
         capsuleRadius = AZ::GetMin(capsuleRadius, capsuleHeight * HalfHeight);
 
         // Update manipulator and the capsule radius.
-        m_radiusManipulator->SetLocalPosition(capsuleRadius * m_radiusManipulator->GetAxis());
+        const AZ::Transform colliderLocalTransform = Utils::GetColliderLocalTransform(idPair);
+        m_radiusManipulator->SetLocalTransform(
+            colliderLocalTransform * AZ::Transform::CreateTranslation(capsuleRadius * m_radiusManipulator->GetAxis()));
         PhysX::EditorColliderComponentRequestBus::Event(idPair, &PhysX::EditorColliderComponentRequests::SetCapsuleRadius, capsuleRadius);
     }
 
@@ -201,7 +246,9 @@ namespace PhysX
         capsuleHeight = AZ::GetMax(capsuleHeight, capsuleRadius / HalfHeight);
 
         // Update the manipulator and capsule height.
-        m_heightManipulator->SetLocalPosition(capsuleHeight * HalfHeight * m_heightManipulator->GetAxis());
+        const AZ::Transform colliderLocalTransform = Utils::GetColliderLocalTransform(idPair);
+        m_heightManipulator->SetLocalTransform(
+            colliderLocalTransform * AZ::Transform::CreateTranslation(capsuleHeight * HalfHeight * m_heightManipulator->GetAxis()));
         PhysX::EditorColliderComponentRequestBus::Event(idPair, &PhysX::EditorColliderComponentRequests::SetCapsuleHeight, capsuleHeight);
     }
 }
diff --git a/Gems/PhysX/Code/Editor/ColliderCapsuleMode.h b/Gems/PhysX/Code/Editor/ColliderCapsuleMode.h
index ceedd84a35..5284b3d1ed 100644
--- a/Gems/PhysX/Code/Editor/ColliderCapsuleMode.h
+++ b/Gems/PhysX/Code/Editor/ColliderCapsuleMode.h
@@ -34,8 +34,16 @@ namespace PhysX
             const AzFramework::ViewportInfo& viewportInfo,
             AzFramework::DebugDisplayRequests& debugDisplay) override;
 
-        void SetupRadiusManipulator(const AZ::EntityComponentIdPair& idPair, const AZ::Transform& worldTransform);
-        void SetupHeightManipulator(const AZ::EntityComponentIdPair& idPair, const AZ::Transform& worldTransform);
+        void SetupRadiusManipulator(
+            const AZ::EntityComponentIdPair& idPair,
+            const AZ::Transform& worldTransform,
+            const AZ::Transform& localTransform,
+            const AZ::Vector3& nonUniformScale);
+        void SetupHeightManipulator(
+            const AZ::EntityComponentIdPair& idPair,
+            const AZ::Transform& worldTransform,
+            const AZ::Transform& localTransform,
+            const AZ::Vector3& nonUniformScale);
         void OnRadiusManipulatorMoved(const AzToolsFramework::LinearManipulator::Action& action, const AZ::EntityComponentIdPair& idPair);
         void OnHeightManipulatorMoved(const AzToolsFramework::LinearManipulator::Action& action, const AZ::EntityComponentIdPair& idPair);
         void AdjustRadiusManipulator(const AZ::EntityComponentIdPair& idPair, const float capsuleHeight);
diff --git a/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp b/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp
index 21f27e4622..2c9b90d5b3 100644
--- a/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp
@@ -10,6 +10,7 @@
 #include <PhysX/EditorColliderComponentRequestBus.h>
 
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
+#include <AzCore/Component/NonUniformScaleBus.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Component/ComponentBus.h>
 
@@ -28,10 +29,14 @@ namespace PhysX
         AZ::Transform worldTransform;
         AZ::TransformBus::EventResult(worldTransform, idPair.GetEntityId(), &AZ::TransformInterface::GetWorldTM);
 
+        AZ::Vector3 nonUniformScale = AZ::Vector3::CreateOne();
+        AZ::NonUniformScaleRequestBus::EventResult(nonUniformScale, idPair.GetEntityId(), &AZ::NonUniformScaleRequests::GetScale);
+
         AZ::Vector3 colliderOffset;
         PhysX::EditorColliderComponentRequestBus::EventResult(colliderOffset, idPair, &PhysX::EditorColliderComponentRequests::GetColliderOffset);
 
         m_translationManipulators.SetSpace(worldTransform);
+        m_translationManipulators.SetNonUniformScale(nonUniformScale);
         m_translationManipulators.SetLocalPosition(colliderOffset);
         m_translationManipulators.AddEntityComponentIdPair(idPair);
         m_translationManipulators.Register(AzToolsFramework::g_mainManipulatorManagerId);
@@ -40,19 +45,19 @@ namespace PhysX
         m_translationManipulators.InstallLinearManipulatorMouseMoveCallback([this, idPair](
             const AzToolsFramework::LinearManipulator::Action& action)
         {
-            OnManipulatorMoved(action.LocalPosition(), idPair);
+            OnManipulatorMoved(action.m_start.m_localPosition, action.m_current.m_localPositionOffset, idPair);
         });
 
         m_translationManipulators.InstallPlanarManipulatorMouseMoveCallback([this, idPair](
             const AzToolsFramework::PlanarManipulator::Action& action)
         {
-            OnManipulatorMoved(action.LocalPosition(), idPair);
+            OnManipulatorMoved(action.m_start.m_localPosition, action.m_current.m_localOffset, idPair);
         });
 
         m_translationManipulators.InstallSurfaceManipulatorMouseMoveCallback([this, idPair](
             const AzToolsFramework::SurfaceManipulator::Action& action)
         {
-            OnManipulatorMoved(action.LocalPosition(), idPair);
+            OnManipulatorMoved(action.m_start.m_localPosition, action.m_current.m_localOffset, idPair);
         });
     }
 
@@ -69,10 +74,14 @@ namespace PhysX
         m_translationManipulators.Unregister();
     }
 
-    void ColliderOffsetMode::OnManipulatorMoved(const AZ::Vector3& position, const AZ::EntityComponentIdPair& idPair)
+    void ColliderOffsetMode::OnManipulatorMoved(const AZ::Vector3& startPosition, const AZ::Vector3& offset, const AZ::EntityComponentIdPair& idPair)
     {
-        m_translationManipulators.SetLocalPosition(position);
-        PhysX::EditorColliderComponentRequestBus::Event(idPair, &PhysX::EditorColliderComponentRequests::SetColliderOffset, position);
+        AZ::Transform worldTransform = AZ::Transform::CreateIdentity();
+        AZ::TransformBus::EventResult(worldTransform, idPair.GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
+        const float scale = AZ::GetMax(AZ::MinTransformScale, worldTransform.GetUniformScale());
+        const AZ::Vector3 newPosition = startPosition + offset / scale;
+        m_translationManipulators.SetLocalPosition(newPosition);
+        PhysX::EditorColliderComponentRequestBus::Event(idPair, &PhysX::EditorColliderComponentRequests::SetColliderOffset, newPosition);
     }
 
     void ColliderOffsetMode::ResetValues(const AZ::EntityComponentIdPair& idPair)
diff --git a/Gems/PhysX/Code/Editor/ColliderOffsetMode.h b/Gems/PhysX/Code/Editor/ColliderOffsetMode.h
index 6a2e6a8a12..525000a1b1 100644
--- a/Gems/PhysX/Code/Editor/ColliderOffsetMode.h
+++ b/Gems/PhysX/Code/Editor/ColliderOffsetMode.h
@@ -28,7 +28,8 @@ namespace PhysX
         void ResetValues(const AZ::EntityComponentIdPair& idPair) override;
 
     private:
-        void OnManipulatorMoved(const AZ::Vector3& position, const AZ::EntityComponentIdPair& idPair);
+        void OnManipulatorMoved(
+            const AZ::Vector3& startPosition, const AZ::Vector3& offset, const AZ::EntityComponentIdPair& idPair);
 
         AzToolsFramework::TranslationManipulators m_translationManipulators;
     };
diff --git a/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp b/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp
index 5f3c98bcee..d39fd001e4 100644
--- a/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp
@@ -10,6 +10,7 @@
 #include <PhysX/EditorColliderComponentRequestBus.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzCore/Component/TransformBus.h>
+#include <AzCore/Component/NonUniformScaleBus.h>
 #include <AzFramework/Viewport/ViewportColors.h>
 #include <AzToolsFramework/Manipulators/AngularManipulator.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
@@ -29,6 +30,9 @@ namespace PhysX
         AZ::Transform worldTransform;
         AZ::TransformBus::EventResult(worldTransform, idPair.GetEntityId(), &AZ::TransformInterface::GetWorldTM);
 
+        AZ::Vector3 nonUniformScale = AZ::Vector3::CreateOne();
+        AZ::NonUniformScaleRequestBus::EventResult(nonUniformScale, idPair.GetEntityId(), &AZ::NonUniformScaleRequests::GetScale);
+
         AZ::Quaternion colliderRotation;
         PhysX::EditorColliderComponentRequestBus::EventResult(colliderRotation, idPair, &PhysX::EditorColliderComponentRequests::GetColliderRotation);
 
@@ -36,7 +40,8 @@ namespace PhysX
         PhysX::EditorColliderComponentRequestBus::EventResult(colliderOffset, idPair, &PhysX::EditorColliderComponentRequests::GetColliderOffset);
 
         m_rotationManipulators.SetSpace(worldTransform);
-        m_rotationManipulators.SetLocalPosition(colliderOffset);
+        m_rotationManipulators.SetNonUniformScale(nonUniformScale);
+        m_rotationManipulators.SetLocalPosition(nonUniformScale * colliderOffset);
         m_rotationManipulators.SetLocalOrientation(colliderRotation);
         m_rotationManipulators.AddEntityComponentIdPair(idPair);
         m_rotationManipulators.Register(AzToolsFramework::g_mainManipulatorManagerId);       
@@ -70,7 +75,11 @@ namespace PhysX
 
         AZ::Vector3 colliderOffset = AZ::Vector3::CreateZero();
         PhysX::EditorColliderComponentRequestBus::EventResult(colliderOffset, idPair, &PhysX::EditorColliderComponentRequests::GetColliderOffset);
-        m_rotationManipulators.SetLocalPosition(colliderOffset);
+
+        AZ::Vector3 nonUniformScale = AZ::Vector3::CreateOne();
+        AZ::NonUniformScaleRequestBus::EventResult(nonUniformScale, idPair.GetEntityId(), &AZ::NonUniformScaleRequests::GetScale);
+
+        m_rotationManipulators.SetLocalPosition(nonUniformScale * colliderOffset);
     }
 
     void ColliderRotationMode::Teardown(const AZ::EntityComponentIdPair& idPair)
diff --git a/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp b/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp
index 343b79d7eb..79d7cef3d4 100644
--- a/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp
@@ -8,11 +8,14 @@
 
 #include "ColliderSphereMode.h"
 #include <PhysX/EditorColliderComponentRequestBus.h>
+#include <Source/Utils.h>
 
 #include <AzToolsFramework/Manipulators/LinearManipulator.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
+#include <AzToolsFramework/ComponentModes/BoxViewportEdit.h>
 #include <AzCore/Component/TransformBus.h>
+#include <AzCore/Component/NonUniformScaleBus.h>
 #include <AzFramework/Viewport/ViewportColors.h>
 #include <AzFramework/Viewport/ViewportConstants.h>
 
@@ -26,7 +29,12 @@ namespace PhysX
     void ColliderSphereMode::Setup(const AZ::EntityComponentIdPair& idPair)
     {
         AZ::Transform colliderWorldTransform = AZ::Transform::Identity();
-        PhysX::EditorColliderComponentRequestBus::EventResult(colliderWorldTransform, idPair, &PhysX::EditorColliderComponentRequests::GetColliderWorldTransform);
+        AZ::TransformBus::EventResult(colliderWorldTransform, idPair.GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
+
+        AZ::Vector3 nonUniformScale = AZ::Vector3::CreateOne();
+        AZ::NonUniformScaleRequestBus::EventResult(nonUniformScale, idPair.GetEntityId(), &AZ::NonUniformScaleRequests::GetScale);
+
+        const AZ::Transform colliderLocalTransform = Utils::GetColliderLocalTransform(idPair);
 
         float sphereRadius = 0.0f;
         PhysX::EditorColliderComponentRequestBus::EventResult(sphereRadius, idPair, &PhysX::EditorColliderComponentRequests::GetSphereRadius);
@@ -35,7 +43,9 @@ namespace PhysX
         m_radiusManipulator->AddEntityComponentIdPair(idPair);
         m_radiusManipulator->SetAxis(ManipulatorAxis);
         m_radiusManipulator->Register(AzToolsFramework::g_mainManipulatorManagerId);
-        m_radiusManipulator->SetLocalPosition(ManipulatorAxis * sphereRadius);
+        m_radiusManipulator->SetLocalTransform(colliderLocalTransform * AZ::Transform::CreateTranslation(ManipulatorAxis * sphereRadius));
+        m_radiusManipulator->SetNonUniformScale(nonUniformScale);
+        m_radiusManipulator->SetBoundsDirty();
 
         AzToolsFramework::ManipulatorViews views;
         views.emplace_back(AzToolsFramework::CreateManipulatorViewQuadBillboard(AzFramework::ViewportColors::DefaultManipulatorHandleColor, AzFramework::ViewportConstants::DefaultManipulatorHandleSize));
@@ -52,12 +62,18 @@ namespace PhysX
     void ColliderSphereMode::Refresh(const AZ::EntityComponentIdPair& idPair)
     {
         AZ::Transform colliderWorldTransform = AZ::Transform::Identity();
-        PhysX::EditorColliderComponentRequestBus::EventResult(colliderWorldTransform, idPair, &PhysX::EditorColliderComponentRequests::GetColliderWorldTransform);
+        AZ::TransformBus::EventResult(colliderWorldTransform, idPair.GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
         m_radiusManipulator->SetSpace(colliderWorldTransform);
 
+        AZ::Vector3 nonUniformScale = AZ::Vector3::CreateOne();
+        AZ::NonUniformScaleRequestBus::EventResult(nonUniformScale, idPair.GetEntityId(), &AZ::NonUniformScaleRequests::GetScale);
+
+        const AZ::Transform colliderLocalTransform = Utils::GetColliderLocalTransform(idPair);
+
         float sphereRadius = 0.0f;
         PhysX::EditorColliderComponentRequestBus::EventResult(sphereRadius, idPair, &PhysX::EditorColliderComponentRequests::GetSphereRadius);
-        m_radiusManipulator->SetLocalPosition(ManipulatorAxis * sphereRadius);
+        m_radiusManipulator->SetLocalTransform(colliderLocalTransform * AZ::Transform::CreateTranslation(ManipulatorAxis * sphereRadius));
+        m_radiusManipulator->SetBoundsDirty();
     }
 
     void ColliderSphereMode::Teardown(const AZ::EntityComponentIdPair& idPair)
@@ -79,22 +95,34 @@ namespace PhysX
         AZ_UNUSED(debugDisplay);
 
         const AzFramework::CameraState cameraState = AzToolsFramework::GetCameraState(viewportInfo.m_viewportId);
-        float radius = m_radiusManipulator->GetLocalPosition().GetLength();
 
-        m_radiusManipulator->SetAxis(cameraState.m_side);
-        m_radiusManipulator->SetLocalPosition(cameraState.m_side * radius);
+        if (!m_radiusManipulator->EntityComponentIdPairs().empty())
+        {
+            const AZ::EntityComponentIdPair idPair = *m_radiusManipulator->EntityComponentIdPairs().begin();
+            float radius = 0.0f;
+            PhysX::EditorColliderComponentRequestBus::EventResult(radius, idPair, &PhysX::EditorColliderComponentRequests::GetSphereRadius);
+            const AZ::Transform colliderLocalTransform = Utils::GetColliderLocalTransform(idPair);
+            m_radiusManipulator->SetAxis(cameraState.m_side);
+            m_radiusManipulator->SetLocalTransform(colliderLocalTransform * AZ::Transform::CreateTranslation(cameraState.m_side * radius));
+        }
     }
 
     void ColliderSphereMode::OnManipulatorMoved(const AzToolsFramework::LinearManipulator::Action& action, const AZ::EntityComponentIdPair& idPair)
     {
+        // manipulator offsets do not take transform scale into account, need to handle it here
+        const AZ::Transform colliderLocalTransform = Utils::GetColliderLocalTransform(idPair);
+        const AZ::Vector3 manipulatorPosition = AzToolsFramework::GetPositionInManipulatorFrame(
+            m_radiusManipulator->GetSpace().GetUniformScale(), colliderLocalTransform, action);
+
         // Get the distance the manipulator has moved along the axis.
-        float extent = action.LocalPosition().Dot(action.m_fixed.m_axis);
+        float extent = manipulatorPosition.Dot(action.m_fixed.m_axis);
 
         // Clamp the distance to a small value to prevent it going negative.
         extent = AZ::GetMax(extent, MinSphereRadius);
 
         // Update the manipulator and sphere radius
-        m_radiusManipulator->SetLocalPosition(extent * action.m_fixed.m_axis);
+        m_radiusManipulator->SetLocalTransform(
+            Utils::GetColliderLocalTransform(idPair) * AZ::Transform::CreateTranslation(extent * action.m_fixed.m_axis));
         PhysX::EditorColliderComponentRequestBus::Event(idPair, &PhysX::EditorColliderComponentRequests::SetSphereRadius, extent);
     }
 }
diff --git a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
index 7e1d1c341f..d432655e78 100644
--- a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
@@ -60,6 +60,7 @@ namespace PhysX
                         "Specifies the PhysX mesh collider asset for this PhysX collider component.")
                         ->Attribute(AZ_CRC_CE("EditButton"), "")
                         ->Attribute(AZ_CRC_CE("EditDescription"), "Open in Scene Settings")
+                        ->Attribute(AZ_CRC_CE("DisableEditButtonWhenNoAssetSelected"), true)
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorProxyAssetShapeConfig::m_configuration, "Configuration",
                         "PhysX mesh asset collider configuration.")
                         ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);
@@ -581,9 +582,8 @@ namespace PhysX
 
     AZ::Transform EditorColliderComponent::GetColliderLocalTransform() const
     {
-        const AZ::Vector3 nonUniformScale = Utils::GetTransformScale(GetEntityId());
         return AZ::Transform::CreateFromQuaternionAndTranslation(
-            m_configuration.m_rotation, m_configuration.m_position * nonUniformScale);
+            m_configuration.m_rotation, m_configuration.m_position);
     }
 
     void EditorColliderComponent::UpdateMeshAsset()
@@ -969,8 +969,10 @@ namespace PhysX
                     static_cast<const Physics::CookedMeshShapeConfiguration*>(shapeConfiguration);
 
                 const AZ::Vector3 overallScale = Utils::GetTransformScale(GetEntityId()) * m_cachedNonUniformScale * assetScale;
+                Physics::ColliderConfiguration nonUniformScaledColliderConfiguration = *colliderConfiguration;
+                nonUniformScaledColliderConfiguration.m_position *= m_cachedNonUniformScale;
 
-                m_colliderDebugDraw.DrawMesh(debugDisplay, *colliderConfiguration, *cookedMeshShapeConfiguration,
+                m_colliderDebugDraw.DrawMesh(debugDisplay, nonUniformScaledColliderConfiguration, *cookedMeshShapeConfiguration,
                     overallScale, static_cast<AZ::u32>(shapeIndex));
                 break;
             }
@@ -1053,12 +1055,17 @@ namespace PhysX
 
     AZ::Transform EditorColliderComponent::GetCurrentTransform()
     {
-        return GetColliderWorldTransform();
+        return GetWorldTM();
+    }
+
+    AZ::Transform EditorColliderComponent::GetCurrentLocalTransform()
+    {
+        return GetColliderLocalTransform();
     }
 
     AZ::Vector3 EditorColliderComponent::GetBoxScale()
     {
-        return AZ::Vector3(GetWorldTM().GetUniformScale());
+        return AZ::Vector3::CreateOne();
     }
 
     void EditorColliderComponent::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
@@ -1202,7 +1209,7 @@ namespace PhysX
 
     AZ::Transform EditorColliderComponent::GetColliderWorldTransform()
     {
-        return AzToolsFramework::TransformNormalizedScale(GetWorldTM()) * GetColliderLocalTransform();
+        return GetWorldTM() * GetColliderLocalTransform();
     }
 
     bool EditorColliderComponent::ShouldUpdateCollisionMeshFromRender() const
diff --git a/Gems/PhysX/Code/Source/EditorColliderComponent.h b/Gems/PhysX/Code/Source/EditorColliderComponent.h
index 773dd0a9b8..bc3d4da6d9 100644
--- a/Gems/PhysX/Code/Source/EditorColliderComponent.h
+++ b/Gems/PhysX/Code/Source/EditorColliderComponent.h
@@ -171,6 +171,7 @@ namespace PhysX
         AZ::Vector3 GetDimensions() override;
         void SetDimensions(const AZ::Vector3& dimensions) override;
         AZ::Transform GetCurrentTransform() override;
+        AZ::Transform GetCurrentLocalTransform() override;
         AZ::Vector3 GetBoxScale() override;
 
         // AZ::Render::MeshComponentNotificationBus
diff --git a/Gems/PhysX/Code/Source/Utils.cpp b/Gems/PhysX/Code/Source/Utils.cpp
index e82ba167dc..1798352493 100644
--- a/Gems/PhysX/Code/Source/Utils.cpp
+++ b/Gems/PhysX/Code/Source/Utils.cpp
@@ -29,6 +29,7 @@
 #include <AzFramework/Physics/HeightfieldProviderBus.h>
 
 #include <PhysX/ColliderShapeBus.h>
+#include <PhysX/EditorColliderComponentRequestBus.h>
 #include <PhysX/SystemComponentBus.h>
 #include <PhysX/MeshAsset.h>
 #include <PhysX/Utils.h>
@@ -832,6 +833,17 @@ namespace PhysX
             return AZ::Transform::CreateFromQuaternionAndTranslation(colliderRelativeRotation, colliderRelativePosition);
         }
 
+        AZ::Transform GetColliderLocalTransform(const AZ::EntityComponentIdPair& idPair)
+        {
+            AZ::Quaternion colliderRotation = AZ::Quaternion::CreateIdentity();
+            PhysX::EditorColliderComponentRequestBus::EventResult(colliderRotation, idPair, &PhysX::EditorColliderComponentRequests::GetColliderRotation);
+
+            AZ::Vector3 colliderOffset = AZ::Vector3::CreateZero();
+            PhysX::EditorColliderComponentRequestBus::EventResult(colliderOffset, idPair, &PhysX::EditorColliderComponentRequests::GetColliderOffset);
+
+            return AZ::Transform::CreateFromQuaternionAndTranslation(colliderRotation, colliderOffset);
+        }
+
         AZ::Transform GetColliderWorldTransform(const AZ::Transform& worldTransform,
             const AZ::Vector3& colliderRelativePosition,
             const AZ::Quaternion& colliderRelativeRotation)
diff --git a/Gems/PhysX/Code/Source/Utils.h b/Gems/PhysX/Code/Source/Utils.h
index 5244926aa2..f9e25a59f2 100644
--- a/Gems/PhysX/Code/Source/Utils.h
+++ b/Gems/PhysX/Code/Source/Utils.h
@@ -142,6 +142,9 @@ namespace PhysX
         AZ::Transform GetColliderLocalTransform(const AZ::Vector3& colliderRelativePosition
             , const AZ::Quaternion& colliderRelativeRotation);
 
+        //! Gets the local transform for a collider (the position and rotation relative to its entity).
+        AZ::Transform GetColliderLocalTransform(const AZ::EntityComponentIdPair& idPair);
+
         //! Combines collider position and orientation offsets and world transform to a transform.
         AZ::Transform GetColliderWorldTransform(const AZ::Transform& worldTransform
             , const AZ::Vector3& colliderRelativePosition
diff --git a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
index 5722d1a397..a9797d3d53 100644
--- a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
@@ -17,7 +17,9 @@
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
+#include <AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.h>
 #include <Tests/Viewport/ViewportUiManagerTests.cpp>
+#include <EditorColliderComponent.h>
 
 namespace UnitTest
 {
@@ -437,4 +439,378 @@ namespace UnitTest
         EXPECT_NEAR(assetScale.GetY(), 1.0f, tolerance);
         EXPECT_NEAR(assetScale.GetZ(), 1.0f, tolerance);
     }
+
+    class PhysXEditorColliderComponentFixture : public UnitTest::ToolsApplicationFixture
+    {
+    public:
+        void SetUpEditorFixtureImpl() override;
+        void TearDownEditorFixtureImpl() override;
+        void SetupTransform(const AZ::Quaternion& rotation, const AZ::Vector3& translation, float uniformScale);
+        void SetupCollider(
+            const Physics::ShapeConfiguration& shapeConfiguration,
+            const AZ::Quaternion& colliderRotation,
+            const AZ::Vector3& colliderOffset);
+        void SetupNonUniformScale(const AZ::Vector3& nonUniformScale);
+        void EnterColliderSubMode(PhysX::ColliderComponentModeRequests::SubMode subMode);
+
+        AZ::Entity* m_entity = nullptr;
+        AZ::EntityComponentIdPair m_idPair;
+    };
+
+    void PhysXEditorColliderComponentFixture::SetUpEditorFixtureImpl()
+    {
+        AZ::SerializeContext* serializeContext = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
+
+        UnitTest::CreateDefaultEditorEntity("EditorColliderComponentEntity", &m_entity);
+    }
+
+    void PhysXEditorColliderComponentFixture::TearDownEditorFixtureImpl()
+    {
+        AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
+            &AzToolsFramework::EditorEntityContextRequestBus::Events::DestroyEditorEntity, m_entity->GetId());
+        m_entity = nullptr;
+    }
+
+    void PhysXEditorColliderComponentFixture::SetupTransform(
+        const AZ::Quaternion& rotation, const AZ::Vector3& translation, float uniformScale)
+    {
+        const AZ::Transform transform = AZ::Transform::CreateFromQuaternionAndTranslation(rotation, translation);
+        AZ::TransformBus::Event(m_entity->GetId(), &AZ::TransformBus::Events::SetWorldTM, transform);
+        AZ::TransformBus::Event(m_entity->GetId(), &AZ::TransformBus::Events::SetLocalUniformScale, uniformScale);
+    }
+
+    void PhysXEditorColliderComponentFixture::SetupCollider(
+        const Physics::ShapeConfiguration& shapeConfiguration, const AZ::Quaternion& colliderRotation, const AZ::Vector3& colliderOffset)
+    {
+        m_entity->Deactivate();
+        auto* colliderComponent =
+            m_entity->CreateComponent<PhysX::EditorColliderComponent>(Physics::ColliderConfiguration(), shapeConfiguration);
+        m_entity->Activate();
+        m_idPair = AZ::EntityComponentIdPair(m_entity->GetId(), colliderComponent->GetId());
+        PhysX::EditorColliderComponentRequestBus::Event(
+            m_idPair, &PhysX::EditorColliderComponentRequests::SetColliderOffset, colliderOffset);
+        PhysX::EditorColliderComponentRequestBus::Event(
+            m_idPair, &PhysX::EditorColliderComponentRequests::SetColliderRotation, colliderRotation);
+    }
+
+    void PhysXEditorColliderComponentFixture::SetupNonUniformScale(const AZ::Vector3& nonUniformScale)
+    {
+        m_entity->Deactivate();
+        m_entity->CreateComponent(AzToolsFramework::Components::EditorNonUniformScaleComponent::RTTI_Type());
+        m_entity->Activate();
+        AZ::NonUniformScaleRequestBus::Event(m_entity->GetId(), &AZ::NonUniformScaleRequests::SetScale, nonUniformScale);
+    }
+
+    void PhysXEditorColliderComponentFixture::EnterColliderSubMode(PhysX::ColliderComponentModeRequests::SubMode subMode)
+    {
+        AzToolsFramework::SelectEntity(m_entity->GetId());
+        EnterComponentMode<PhysX::EditorColliderComponent>();
+        PhysX::ColliderComponentModeRequestBus::Broadcast(&PhysX::ColliderComponentModeRequests::SetCurrentMode, subMode);
+    }
+
+    using PhysXEditorColliderComponentManipulatorFixture =
+        UnitTest::IndirectCallManipulatorViewportInteractionFixtureMixin<PhysXEditorColliderComponentFixture>;
+
+    // use a reasonably large tolerance because manipulator precision is limited by viewport resolution
+    static const float ManipulatorTolerance = 0.01f;
+
+    TEST_F(PhysXEditorColliderComponentManipulatorFixture, OffsetManipulatorsCorrectlyLocatedRelativeToCollider)
+    {
+        const AZ::Vector3 boxDimensions(2.0f, 3.0f, 1.5f);
+        const AZ::Quaternion boxRotation(0.1f, 0.1f, 0.7f, 0.7f);
+        const AZ::Vector3 boxOffset(3.0f, 1.0f, 2.0f);
+        SetupCollider(Physics::BoxShapeConfiguration(boxDimensions), boxRotation, boxOffset);
+        const AZ::Quaternion entityRotation(0.8f, 0.2f, 0.4f, 0.4f);
+        const AZ::Vector3 entityTranslation(2.0f, -3.0f, 0.5f);
+        const float uniformScale = 2.0f;
+        SetupTransform(entityRotation, entityTranslation, uniformScale);
+        EnterColliderSubMode(PhysX::ColliderComponentModeRequests::SubMode::Offset);
+
+        // the expected position of the collider centre based on the combination of entity transform and collider offset
+        const AZ::Vector3 expectedColliderPosition(8.8f, -2.28f, 3.54f);
+
+        // the expected world space direction of the collider offset x-axis based on the entity transform
+        const AZ::Vector3 expectedXAxis(0.6f, 0.64f, 0.48f);
+
+        // position the camera to look down at the collider from above
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromQuaternionAndTranslation(
+                AZ::Quaternion::CreateRotationX(-AZ::Constants::HalfPi), expectedColliderPosition + AZ::Vector3::CreateAxisZ(10.0f)));
+
+        // position in world space, slightly moved along the x-axis in order to grab the x translation manipulator
+        const AZ::Vector3 worldStart = expectedColliderPosition + 0.5f * expectedXAxis;
+
+        // position in world space to move to
+        const AZ::Vector3 worldEnd = worldStart + 2.0f * expectedXAxis;
+
+        const auto screenStart = AzFramework::WorldToScreen(worldStart, m_cameraState);
+        const auto screenEnd = AzFramework::WorldToScreen(worldEnd, m_cameraState);
+
+        m_actionDispatcher
+            ->CameraState(m_cameraState)
+            // move the mouse to the position of the x offset manipulator
+            ->MousePosition(screenStart)
+            // drag to move the manipulator
+            ->MouseLButtonDown()
+            ->MousePosition(screenEnd)
+            ->MouseLButtonUp();
+
+        AZ::Vector3 newColliderOffset = AZ::Vector3::CreateZero();
+        PhysX::EditorColliderComponentRequestBus::EventResult(
+            newColliderOffset, m_idPair, &PhysX::EditorColliderComponentRequests::GetColliderOffset);
+
+        EXPECT_THAT(newColliderOffset, IsCloseTolerance(AZ::Vector3(4.0f, 1.0f, 2.0f), ManipulatorTolerance));
+    }
+
+    TEST_F(PhysXEditorColliderComponentManipulatorFixture, OffsetManipulatorsCorrectlyLocatedRelativeToColliderWithNonUniformScale)
+    {
+        const float capsuleRadius = 0.5f;
+        const float capsuleHeight = 2.0f;
+        const AZ::Quaternion capsuleRotation(0.2f, -0.4f, 0.8f, 0.4f);
+        const AZ::Vector3 capsuleOffset(-2.0f, 3.0f, -1.0f);
+        SetupCollider(Physics::CapsuleShapeConfiguration(capsuleHeight, capsuleRadius), capsuleRotation, capsuleOffset);
+        const AZ::Quaternion entityRotation(-0.1f, 0.7f, -0.7f, 0.1f);
+        const AZ::Vector3 entityTranslation(-1.0f, 1.0f, -2.5f);
+        const float uniformScale = 1.5f;
+        SetupTransform(entityRotation, entityTranslation, uniformScale);
+        const AZ::Vector3 nonUniformScale(2.0f, 0.5f, 1.5f);
+        SetupNonUniformScale(nonUniformScale);
+        EnterColliderSubMode(PhysX::ColliderComponentModeRequests::SubMode::Offset);
+
+        // the expected position of the collider centre based on the combination of entity transform, collider offset and non-uniform scale
+        const AZ::Vector3 expectedColliderPosition(4.13f, 4.84f, -4.75f);
+
+        // the expected world space direction of the collider offset z-axis based on the entity transform
+        const AZ::Vector3 expectedZAxis(0.28f, -0.96f, 0.0f);
+
+        // position the camera to look at the collider from underneath
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromQuaternionAndTranslation(
+                AZ::Quaternion::CreateRotationX(AZ::Constants::HalfPi), expectedColliderPosition - AZ::Vector3::CreateAxisZ(10.0f)));
+
+        // position in world space, slightly moved along the z-axis in order to grab the z translation manipulator
+        // need to go in the negative z direction because the camera angle causes the manipulator to flip
+        const AZ::Vector3 worldStart = expectedColliderPosition - 0.5f * expectedZAxis;
+
+        // position in world space to move to
+        const AZ::Vector3 worldEnd = worldStart - 2.25f * expectedZAxis;
+
+        const auto screenStart = AzFramework::WorldToScreen(worldStart, m_cameraState);
+        const auto screenEnd = AzFramework::WorldToScreen(worldEnd, m_cameraState);
+
+        m_actionDispatcher
+            ->CameraState(m_cameraState)
+            // move the mouse to the position of the z offset manipulator
+            ->MousePosition(screenStart)
+            // drag to move the manipulator
+            ->MouseLButtonDown()
+            ->MousePosition(screenEnd)
+            ->MouseLButtonUp();
+
+        AZ::Vector3 newColliderOffset = AZ::Vector3::CreateZero();
+        PhysX::EditorColliderComponentRequestBus::EventResult(
+            newColliderOffset, m_idPair, &PhysX::EditorColliderComponentRequests::GetColliderOffset);
+
+        EXPECT_THAT(newColliderOffset, IsCloseTolerance(AZ::Vector3(-2.0f, 3.0f, -2.0f), ManipulatorTolerance));
+    }
+
+    TEST_F(PhysXEditorColliderComponentManipulatorFixture, BoxColliderScaleManipulatorsCorrectlyLocatedRelativeToColliderWithNonUniformScale)
+    {
+        const AZ::Vector3 boxDimensions(2.0f, 2.0f, 3.0f);
+        const AZ::Quaternion boxRotation(0.7f, 0.7f, -0.1f, 0.1f);
+        const AZ::Vector3 boxOffset(0.5f, 1.5f, 2.0f);
+        SetupCollider(Physics::BoxShapeConfiguration(boxDimensions), boxRotation, boxOffset);
+        const AZ::Quaternion entityRotation(0.2f, 0.4f, -0.4f, 0.8f);
+        const AZ::Vector3 entityTranslation(2.0f, -3.0f, -2.0f);
+        const float uniformScale = 0.5f;
+        SetupTransform(entityRotation, entityTranslation, uniformScale);
+        const AZ::Vector3 nonUniformScale(3.0f, 1.5f, 2.5f);
+        SetupNonUniformScale(nonUniformScale);
+        EnterColliderSubMode(PhysX::ColliderComponentModeRequests::SubMode::Dimensions);
+
+        // the expected position of the collider centre based on the combination of entity transform, collider offset and non-uniform scale
+        const AZ::Vector3 expectedColliderPosition(4.37f, -4.285f, -1.1f);
+
+        // the expected position of the y scale manipulator relative to the centre of the collider, based on collider
+        // rotation, entity rotation and scale, and non-uniform scale
+        const AZ::Vector3 scaleManipulatorYDelta(0.54f, -0.72f, -1.2f);
+
+        // position the camera to look at the collider along the x-y diagonal
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromQuaternionAndTranslation(
+                AZ::Quaternion::CreateRotationZ(-AZ::Constants::QuarterPi), expectedColliderPosition - AZ::Vector3(2.0f, 2.0f, 0.0f)));
+
+        const AZ::Vector3 worldStart = expectedColliderPosition + scaleManipulatorYDelta;
+        const AZ::Vector3 worldEnd = worldStart + 0.1f * scaleManipulatorYDelta;
+
+        const auto screenStart = AzFramework::WorldToScreen(worldStart, m_cameraState);
+        const auto screenEnd = AzFramework::WorldToScreen(worldEnd, m_cameraState);
+
+        m_actionDispatcher
+            ->CameraState(m_cameraState)
+            // move the mouse to the position of the y scale manipulator
+            ->MousePosition(screenStart)
+            // drag to move the manipulator
+            ->MouseLButtonDown()
+            ->MousePosition(screenEnd)
+            ->MouseLButtonUp();
+
+        AZ::Vector3 newBoxDimensions = AZ::Vector3::CreateZero();
+        AzToolsFramework::BoxManipulatorRequestBus::EventResult(
+            newBoxDimensions, m_idPair, &AzToolsFramework::BoxManipulatorRequests::GetDimensions);
+
+        EXPECT_THAT(newBoxDimensions, IsCloseTolerance(AZ::Vector3(2.0f, 2.2f, 3.0f), ManipulatorTolerance));
+    }
+
+    TEST_F(PhysXEditorColliderComponentManipulatorFixture, SphereColliderScaleManipulatorsCorrectlyLocatedRelativeToColliderWithNonUniformScale)
+    {
+        const float sphereRadius = 1.0f;
+        const AZ::Quaternion sphereRotation(-0.1f, 0.7f, -0.7f, 0.1f);
+        const AZ::Vector3 sphereOffset(-2.0f, 1.0f, -3.0f);
+        SetupCollider(Physics::SphereShapeConfiguration(sphereRadius), sphereRotation, sphereOffset);
+        const AZ::Quaternion entityRotation(-0.4f, -0.2f, 0.4f, 0.8f);
+        const AZ::Vector3 entityTranslation(-1.0f, -3.0f, 3.0f);
+        const float uniformScale = 1.5f;
+        SetupTransform(entityRotation, entityTranslation, uniformScale);
+        const AZ::Vector3 nonUniformScale(1.5f, 0.5f, 2.0f);
+        SetupNonUniformScale(nonUniformScale);
+        EnterColliderSubMode(PhysX::ColliderComponentModeRequests::SubMode::Dimensions);
+
+        // the expected position of the collider centre based on the combination of entity transform, collider offset and non-uniform scale
+        const AZ::Vector3 expectedColliderPosition(1.7f, -10.65f, -3.0f);
+
+        // position the camera to look at the collider along the y-axis
+        AzFramework::SetCameraTransform(
+            m_cameraState, AZ::Transform::CreateTranslation(expectedColliderPosition - AZ::Vector3(0.0f, 5.0f, 0.0f)));
+
+        // the expected position of the scale manipulator relative to the centre of the collider, based on collider
+        // rotation, entity scale, non-uniform scale and camera state
+        const AZ::Vector3 scaleManipulatorDelta(-1.1952f, -1.8036f, 0.168f);
+
+        const AZ::Vector3 worldStart = expectedColliderPosition + scaleManipulatorDelta;
+        const AZ::Vector3 worldEnd = worldStart - 0.1f * scaleManipulatorDelta;
+
+        const auto screenStart = AzFramework::WorldToScreen(worldStart, m_cameraState);
+        const auto screenEnd = AzFramework::WorldToScreen(worldEnd, m_cameraState);
+
+        m_actionDispatcher
+            ->CameraState(m_cameraState)
+            // move the mouse to the position of the y scale manipulator
+            ->MousePosition(screenStart)
+            // drag to move the manipulator
+            ->MouseLButtonDown()
+            ->MousePosition(screenEnd)
+            ->MouseLButtonUp();
+
+        float newSphereRadius = 0.0f;
+        PhysX::EditorColliderComponentRequestBus::EventResult(
+            newSphereRadius, m_idPair, &PhysX::EditorColliderComponentRequests::GetSphereRadius);
+
+        EXPECT_NEAR(newSphereRadius, 0.9f, ManipulatorTolerance);
+    }
+
+    TEST_F(PhysXEditorColliderComponentManipulatorFixture, CapsuleColliderScaleManipulatorsCorrectlyLocatedRelativeToColliderWithNonUniformScale)
+    {
+        const float capsuleRadius = 0.2f;
+        const float capsuleHeight = 1.0f;
+        const AZ::Quaternion capsuleRotation(-0.2f, -0.8f, -0.4f, 0.4f);
+        const AZ::Vector3 capsuleOffset(1.0f, -2.0f, 1.0f);
+        SetupCollider(Physics::CapsuleShapeConfiguration(capsuleHeight, capsuleRadius), capsuleRotation, capsuleOffset);
+        const AZ::Quaternion entityRotation(0.7f, -0.1f, -0.1f, 0.7f);
+        const AZ::Vector3 entityTranslation(-2.0f, 1.0f, -3.0f);
+        const float uniformScale = 2.0f;
+        SetupTransform(entityRotation, entityTranslation, uniformScale);
+        const AZ::Vector3 nonUniformScale(1.0f, 0.5f, 1.5f);
+        SetupNonUniformScale(nonUniformScale);
+        EnterColliderSubMode(PhysX::ColliderComponentModeRequests::SubMode::Dimensions);
+
+        // the expected position of the collider centre based on the combination of entity transform, collider offset and non-uniform scale
+        const AZ::Vector3 expectedColliderPosition(-0.92f, -2.44f, -5.0f);
+
+        // the expected position of the height manipulator relative to the centre of the collider, based on collider
+        // rotation, entity scale and non-uniform scale
+        const AZ::Vector3 heightManipulatorDelta(-0.3096f, 0.6528f, 0.4f);
+
+        // position the camera to look at the collider along the y-z diagonal
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateFromQuaternionAndTranslation(
+                AZ::Quaternion::CreateRotationX(-AZ::Constants::QuarterPi), expectedColliderPosition + AZ::Vector3(0.0f, -1.0f, 1.0f)));
+
+        const AZ::Vector3 worldStart = expectedColliderPosition + heightManipulatorDelta;
+        const AZ::Vector3 worldEnd = worldStart + 0.2f * heightManipulatorDelta;
+
+        const auto screenStart = AzFramework::WorldToScreen(worldStart, m_cameraState);
+        const auto screenEnd = AzFramework::WorldToScreen(worldEnd, m_cameraState);
+
+        m_actionDispatcher
+            ->CameraState(m_cameraState)
+            // move the mouse to the position of the height manipulator
+            ->MousePosition(screenStart)
+            // drag to move the manipulator
+            ->MouseLButtonDown()
+            ->MousePosition(screenEnd)
+            ->MouseLButtonUp();
+
+        float newCapsuleHeight = 0.0f;
+        PhysX::EditorColliderComponentRequestBus::EventResult(
+            newCapsuleHeight, m_idPair, &PhysX::EditorColliderComponentRequests::GetCapsuleHeight);
+
+        EXPECT_NEAR(newCapsuleHeight, 1.2f, ManipulatorTolerance);
+    }
+
+    TEST_F(PhysXEditorColliderComponentManipulatorFixture, ColliderRotationManipulatorsCorrectlyLocatedRelativeToColliderWithNonUniformScale)
+    {
+        const float capsuleRadius = 1.2f;
+        const float capsuleHeight = 4.0f;
+        const AZ::Quaternion capsuleRotation(0.7f, 0.7f, -0.1f, 0.1f);
+        const AZ::Vector3 capsuleOffset(-2.0f, -2.0f, 1.0f);
+        SetupCollider(Physics::CapsuleShapeConfiguration(capsuleHeight, capsuleRadius), capsuleRotation, capsuleOffset);
+        const AZ::Quaternion entityRotation(0.8f, -0.4f, -0.4f, 0.2f);
+        const AZ::Vector3 entityTranslation(1.0f, -1.5f, 2.0f);
+        const float uniformScale = 1.5f;
+        SetupTransform(entityRotation, entityTranslation, uniformScale);
+        const AZ::Vector3 nonUniformScale(1.5f, 1.5f, 2.0f);
+        SetupNonUniformScale(nonUniformScale);
+        EnterColliderSubMode(PhysX::ColliderComponentModeRequests::SubMode::Rotation);
+
+        // the expected position of the collider centre based on the combination of entity transform, collider offset and non-uniform scale
+        const AZ::Vector3 expectedColliderPosition(-0.86f, 4.8f, -0.52f);
+
+        // the y and z axes of the collider's frame in world space, used to locate points on the x rotation manipulator arc to interact with
+        const AZ::Vector3 yDirection(0.36f, -0.8f, -0.48f);
+        const AZ::Vector3 zDirection(0.9024f, 0.168f, 0.3968f);
+
+        // position the camera to look at the collider along the world y axis
+        AzFramework::SetCameraTransform(
+            m_cameraState,
+            AZ::Transform::CreateTranslation(expectedColliderPosition - AZ::Vector3(0.0f, 10.0f, 0.0f)));
+
+        const float screenToWorldMultiplier = AzToolsFramework::CalculateScreenToWorldMultiplier(expectedColliderPosition, m_cameraState);
+        const float manipulatorViewRadius = 2.0f;
+        const AZ::Vector3 worldStart = expectedColliderPosition + screenToWorldMultiplier * manipulatorViewRadius * yDirection;
+        const AZ::Vector3 worldEnd = expectedColliderPosition + screenToWorldMultiplier * manipulatorViewRadius * zDirection;
+
+        const auto screenStart = AzFramework::WorldToScreen(worldStart, m_cameraState);
+        const auto screenEnd = AzFramework::WorldToScreen(worldEnd, m_cameraState);
+
+        m_actionDispatcher
+            ->CameraState(m_cameraState)
+            // move the mouse to a position on the angular manipulator
+            ->MousePosition(screenStart)
+            // drag to move the manipulator
+            ->MouseLButtonDown()
+            ->MousePosition(screenEnd)
+            ->MouseLButtonUp();
+
+        AZ::Quaternion newColliderRotation = AZ::Quaternion::CreateIdentity();
+        PhysX::EditorColliderComponentRequestBus::EventResult(
+            newColliderRotation, m_idPair, &PhysX::EditorColliderComponentRequests::GetColliderRotation);
+
+        EXPECT_THAT(newColliderRotation, testing::Not(IsCloseTolerance(capsuleRotation, ManipulatorTolerance)));
+    }
 } // namespace UnitTest
diff --git a/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.h b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.h
index c64b36cd53..106f605231 100644
--- a/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.h
+++ b/Gems/PythonAssetBuilder/Code/Source/PythonBuilderMessageSink.h
@@ -7,6 +7,7 @@
  */
 #pragma once
 
+#include <AzCore/Memory/SystemAllocator.h>
 #include <AzToolsFramework/API/EditorPythonConsoleBus.h>
 
 namespace PythonAssetBuilder
diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
index 2f44dfe090..1dad5f1c44 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
@@ -167,7 +167,10 @@ namespace ScriptCanvasBuilder
         {
             // compute it the first time
             const AZStd::string runtimeAssetTypeId = azrtti_typeid<ScriptCanvas::RuntimeAsset>().ToString<AZStd::string>();
-            m_fingerprintString = AZStd::string::format("%i%s", GetVersionNumber(), runtimeAssetTypeId.c_str());
+            m_fingerprintString = AZStd::string::format("%s%i%s", 
+                AZ::ScriptDataContext::GetInterpreterVersion(), // this is the version of LUA - if it changes, we need to rebuild
+                GetVersionNumber(), 
+                runtimeAssetTypeId.c_str());
         }
         return m_fingerprintString.c_str();
     }
diff --git a/Gems/SurfaceData/Code/CMakeLists.txt b/Gems/SurfaceData/Code/CMakeLists.txt
index cb75be2de4..8bd75fd8c4 100644
--- a/Gems/SurfaceData/Code/CMakeLists.txt
+++ b/Gems/SurfaceData/Code/CMakeLists.txt
@@ -98,6 +98,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 AZ::AzTest
                 Gem::SurfaceData.Static
                 Gem::LmbrCentral
+        RUNTIME_DEPENDENCIES
+            Gem::LmbrCentral
     )
     ly_add_googletest(
         NAME Gem::SurfaceData.Tests
diff --git a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTypes.h b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTypes.h
index 943c45bb6a..1d49fff3dc 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTypes.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataTypes.h
@@ -29,12 +29,6 @@ namespace SurfaceData
     class SurfaceTagWeights
     {
     public:
-        //! The maximum number of surface weights that we can store.
-        //! For performance reasons, we want to limit this so that we can preallocate the max size in advance.
-        //! The current number is chosen to be higher than expected needs, but small enough to avoid being excessively wasteful.
-        //! (Dynamic structures would end up taking more memory than what we're preallocating)
-        static inline constexpr size_t MaxSurfaceWeights = 16;
-
         SurfaceTagWeights() = default;
 
         //! Construct a collection of SurfaceTagWeights from the given SurfaceTagWeightList.
@@ -65,7 +59,7 @@ namespace SurfaceData
                 // early-out once we pass the location for the entry instead of always searching every entry.
                 if (weightItr->m_surfaceType > tag)
                 {
-                    if (m_weights.size() != MaxSurfaceWeights)
+                    if (m_weights.size() != AzFramework::SurfaceData::Constants::MaxSurfaceWeights)
                     {
                         // We didn't find the surface type, so add the new entry in sorted order.
                         m_weights.insert(weightItr, { tag, weight });
@@ -85,7 +79,7 @@ namespace SurfaceData
             }
 
             // We didn't find the surface weight, and the sort order for it is at the end, so add it to the back of the list.
-            if (m_weights.size() != MaxSurfaceWeights)
+            if (m_weights.size() != AzFramework::SurfaceData::Constants::MaxSurfaceWeights)
             {
                 m_weights.emplace_back(tag, weight);
             }
@@ -188,7 +182,7 @@ namespace SurfaceData
         //! @return The pointer to the tag that's found, or end() if it wasn't found.
         const AzFramework::SurfaceData::SurfaceTagWeight* FindTag(AZ::Crc32 tag) const;
 
-        AZStd::fixed_vector<AzFramework::SurfaceData::SurfaceTagWeight, MaxSurfaceWeights> m_weights;
+        AZStd::fixed_vector<AzFramework::SurfaceData::SurfaceTagWeight, AzFramework::SurfaceData::Constants::MaxSurfaceWeights> m_weights;
     };
 
     //! SurfacePointList stores a collection of surface point data, which consists of positions, normals, and surface tag weights.
diff --git a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceTag.h b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceTag.h
index d16856995d..ab24ba09f0 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceTag.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/SurfaceTag.h
@@ -19,7 +19,8 @@ namespace SurfaceData
     {
     public:
         AZ_CLASS_ALLOCATOR(SurfaceTag, AZ::SystemAllocator, 0);
-        AZ_RTTI(SurfaceTag, "{67C8C6ED-F32A-443E-A777-1CAE48B22CD7}");
+        AZ_TYPE_INFO(SurfaceTag, "{67C8C6ED-F32A-443E-A777-1CAE48B22CD7}");
+
         static void Reflect(AZ::ReflectContext* context);
 
         SurfaceTag()
@@ -47,6 +48,8 @@ namespace SurfaceData
             m_surfaceTagCrc = AZ::Crc32(value.data());
         }
 
+        AZStd::string GetDisplayName() const;
+
         static AZStd::vector<AZStd::pair<AZ::u32, AZStd::string>> GetRegisteredTags();
 
     private:
@@ -54,8 +57,6 @@ namespace SurfaceData
 
         AZStd::vector<AZStd::pair<AZ::u32, AZStd::string>> BuildSelectableTagList() const;
 
-        AZStd::string GetDisplayName() const;
-
         AZ::u32 m_surfaceTagCrc;
     };
 
diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataTypes.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataTypes.cpp
index a25273896e..3d6378aa7c 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataTypes.cpp
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataTypes.cpp
@@ -42,7 +42,7 @@ namespace SurfaceData
     AzFramework::SurfaceData::SurfaceTagWeightList SurfaceTagWeights::GetSurfaceTagWeightList() const
     {
         AzFramework::SurfaceData::SurfaceTagWeightList weights;
-        weights.reserve(m_weights.size());
+
         for (auto& weight : m_weights)
         {
             weights.emplace_back(weight);
diff --git a/Gems/SurfaceData/Code/Tests/SurfaceDataBenchmarks.cpp b/Gems/SurfaceData/Code/Tests/SurfaceDataBenchmarks.cpp
index df011113da..becb91f0ce 100644
--- a/Gems/SurfaceData/Code/Tests/SurfaceDataBenchmarks.cpp
+++ b/Gems/SurfaceData/Code/Tests/SurfaceDataBenchmarks.cpp
@@ -275,7 +275,7 @@ namespace UnitTest
     {
         AZ_PROFILE_FUNCTION(Entity);
 
-        AZ::Crc32 tags[SurfaceData::SurfaceTagWeights::MaxSurfaceWeights];
+        AZ::Crc32 tags[AzFramework::SurfaceData::Constants::MaxSurfaceWeights];
         AZ::SimpleLcgRandom randomGenerator(1234567);
 
         // Declare this outside the loop so that we aren't benchmarking creation and destruction.
@@ -316,7 +316,7 @@ namespace UnitTest
     {
         AZ_PROFILE_FUNCTION(Entity);
 
-        AZ::Crc32 tags[SurfaceData::SurfaceTagWeights::MaxSurfaceWeights];
+        AZ::Crc32 tags[AzFramework::SurfaceData::Constants::MaxSurfaceWeights];
         AZ::SimpleLcgRandom randomGenerator(1234567);
 
         // Declare this outside the loop so that we aren't benchmarking creation and destruction.
diff --git a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp
index 457c74a6dd..a0689ec23a 100644
--- a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp
+++ b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp
@@ -22,6 +22,7 @@
 #include <AzFramework/Physics/PhysicsSystem.h>
 #include <AzFramework/Terrain/TerrainDataRequestBus.h>
 
+
 namespace Terrain
 {
     void TerrainPhysicsSurfaceMaterialMapping::Reflect(AZ::ReflectContext* context)
@@ -32,27 +33,10 @@ namespace Terrain
                 ->Version(1)
                 ->Field("Surface", &TerrainPhysicsSurfaceMaterialMapping::m_surfaceTag)
                 ->Field("Material", &TerrainPhysicsSurfaceMaterialMapping::m_materialId);
-
-            if (auto edit = serialize->GetEditContext())
-            {
-                edit->Class<TerrainPhysicsSurfaceMaterialMapping>(
-                        "Terrain Surface Material Mapping", "Mapping between a surface and a physics material.")
-
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Show)
-
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::ComboBox, &TerrainPhysicsSurfaceMaterialMapping::m_surfaceTag, "Surface Tag",
-                        "Surface type to map to a physics material.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &TerrainPhysicsSurfaceMaterialMapping::m_materialId, "Material ID", "")
-                    ->ElementAttribute(Physics::Attributes::MaterialLibraryAssetId, &TerrainPhysicsSurfaceMaterialMapping::GetMaterialLibraryId)
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ->Attribute(AZ::Edit::Attributes::ShowProductAssetFileName, true);
-            }
         }
     }
 
+
     AZ::Data::AssetId TerrainPhysicsSurfaceMaterialMapping::GetMaterialLibraryId()
     {
         if (const auto* physicsSystem = AZ::Interface<AzPhysics::SystemInterface>::Get())
@@ -76,22 +60,6 @@ namespace Terrain
                 ->Field("DefaultMaterial", &TerrainPhysicsColliderConfig::m_defaultMaterialSelection)
                 ->Field("Mappings", &TerrainPhysicsColliderConfig::m_surfaceMaterialMappings)
             ;
-
-            if (auto edit = serialize->GetEditContext())
-            {
-                edit->Class<TerrainPhysicsColliderConfig>(
-                        "Terrain Physics Collider Component",
-                        "Provides terrain data to a physics collider with configurable surface mappings.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &TerrainPhysicsColliderConfig::m_defaultMaterialSelection,
-                        "Default Surface Physics Material", "Select a material to be used by unmapped surfaces by default")
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &TerrainPhysicsColliderConfig::m_surfaceMaterialMappings,
-                        "Surface to Material Mappings", "Maps surfaces to physics materials")
-                ;
-            }
         }
     }
 
diff --git a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.h b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.h
index 5f79fa9103..2bd0e95769 100644
--- a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.h
+++ b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.h
@@ -25,6 +25,8 @@ namespace LmbrCentral
 
 namespace Terrain
 {
+    class EditorSurfaceTagListProvider;
+
     static const uint8_t InvalidSurfaceTagIndex = 0xFF;
 
     struct TerrainPhysicsSurfaceMaterialMapping final
@@ -33,12 +35,16 @@ namespace Terrain
         AZ_CLASS_ALLOCATOR(TerrainPhysicsSurfaceMaterialMapping, AZ::SystemAllocator, 0);
         AZ_RTTI(TerrainPhysicsSurfaceMaterialMapping, "{A88B5289-DFCD-4564-8395-E2177DFE5B18}");
         static void Reflect(AZ::ReflectContext* context);
+        static AZ::Data::AssetId GetMaterialLibraryId();
+
+        AZStd::vector<AZStd::pair<AZ::u32, AZStd::string>> BuildSelectableTagList() const;
+        void SetTagListProvider(const EditorSurfaceTagListProvider* tagListProvider);
 
         SurfaceData::SurfaceTag m_surfaceTag;
         Physics::MaterialId m_materialId;
 
     private:
-        static AZ::Data::AssetId GetMaterialLibraryId();
+        const EditorSurfaceTagListProvider* m_tagListProvider = nullptr;
     };
 
     class TerrainPhysicsColliderConfig
@@ -48,6 +54,7 @@ namespace Terrain
         AZ_CLASS_ALLOCATOR(TerrainPhysicsColliderConfig, AZ::SystemAllocator, 0);
         AZ_RTTI(TerrainPhysicsColliderConfig, "{E9EADB8F-C3A5-4B9C-A62D-2DBC86B4CE59}", AZ::ComponentConfig);
         static void Reflect(AZ::ReflectContext* context);
+
         Physics::MaterialSelection m_defaultMaterialSelection;
         AZStd::vector<TerrainPhysicsSurfaceMaterialMapping> m_surfaceMaterialMappings;
     };
diff --git a/Gems/Terrain/Code/Source/Components/TerrainSurfaceGradientListComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainSurfaceGradientListComponent.cpp
index 7d41b829c1..a93bda1872 100644
--- a/Gems/Terrain/Code/Source/Components/TerrainSurfaceGradientListComponent.cpp
+++ b/Gems/Terrain/Code/Source/Components/TerrainSurfaceGradientListComponent.cpp
@@ -26,26 +26,6 @@ namespace Terrain
                 ->Field("Gradient Entity", &TerrainSurfaceGradientMapping::m_gradientEntityId)
                 ->Field("Surface Tag", &TerrainSurfaceGradientMapping::m_surfaceTag)
             ;
-
-            if (auto edit = serialize->GetEditContext())
-            {
-                edit->Class<TerrainSurfaceGradientMapping>("Terrain Surface Gradient Mapping", "Mapping between a gradient and a surface.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Show)
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &TerrainSurfaceGradientMapping::m_gradientEntityId,
-                        "Gradient Entity", "ID of Entity providing a gradient.")
-                       ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::AttributesAndValues)
-                    ->UIElement("GradientPreviewer", "Previewer")
-                        ->Attribute(AZ::Edit::Attributes::NameLabelOverride, "")
-                    ->Attribute(AZ_CRC_CE("GradientEntity"), &TerrainSurfaceGradientMapping::m_gradientEntityId)
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &TerrainSurfaceGradientMapping::m_surfaceTag, "Surface Tag",
-                        "Surface type to map to this gradient.")
-                ;
-            }
         }
 
         if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
@@ -71,21 +51,6 @@ namespace Terrain
                 ->Version(1)
                 ->Field("Mappings", &TerrainSurfaceGradientListConfig::m_gradientSurfaceMappings)
             ;
-
-            AZ::EditContext* edit = serialize->GetEditContext();
-            if (edit)
-            {
-                edit->Class<TerrainSurfaceGradientListConfig>(
-                    "Terrain Surface Gradient List Component", "Provide mapping between gradients and surfaces.")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Show)
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-
-                    ->DataElement(
-                        AZ::Edit::UIHandlers::Default, &TerrainSurfaceGradientListConfig::m_gradientSurfaceMappings,
-                        "Gradient to Surface Mappings", "Maps Gradient Entities to Surfaces.")
-                    ;
-            }
         }
     }
 
diff --git a/Gems/Terrain/Code/Source/Components/TerrainSurfaceGradientListComponent.h b/Gems/Terrain/Code/Source/Components/TerrainSurfaceGradientListComponent.h
index 36c16bed8f..fd6c16d30d 100644
--- a/Gems/Terrain/Code/Source/Components/TerrainSurfaceGradientListComponent.h
+++ b/Gems/Terrain/Code/Source/Components/TerrainSurfaceGradientListComponent.h
@@ -25,6 +25,8 @@ namespace LmbrCentral
 
 namespace Terrain
 {
+    class EditorSurfaceTagListProvider;
+
     class TerrainSurfaceGradientMapping final
     {
     public:
@@ -39,8 +41,14 @@ namespace Terrain
         {
         }
 
+        AZStd::vector<AZStd::pair<AZ::u32, AZStd::string>> BuildSelectableTagList() const;
+        void SetTagListProvider(const EditorSurfaceTagListProvider* tagListProvider);
+
         AZ::EntityId m_gradientEntityId;
         SurfaceData::SurfaceTag m_surfaceTag;
+
+    private:
+        const EditorSurfaceTagListProvider* m_tagListProvider = nullptr;
     };
 
     class TerrainSurfaceGradientListConfig : public AZ::ComponentConfig
diff --git a/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp
index 7b8020c3ad..899c5e4665 100644
--- a/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp
+++ b/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp
@@ -170,9 +170,10 @@ namespace Terrain
         // they'll get refreshed the next time we need to draw them.
         for (auto& sector : m_wireframeSectors)
         {
+            AZStd::lock_guard<AZStd::recursive_mutex> lock(sector.m_sectorStateMutex);
             if (!dirtyRegion2D.IsValid() || dirtyRegion2D.Overlaps(sector.m_aabb))
             {
-                sector.m_isDirty = true;
+                sector.SetDirty();
             }
         }
     }
@@ -283,10 +284,13 @@ namespace Terrain
                 sectorAabb.Clamp(worldBounds);
 
                 // If the world space box for the sector doesn't match, set it and mark the sector as dirty so we refresh the height data.
-                if (sector.m_aabb != sectorAabb)
                 {
-                    sector.m_aabb = sectorAabb;
-                    sector.m_isDirty = true;
+                    AZStd::lock_guard<AZStd::recursive_mutex> lock(sector.m_sectorStateMutex);
+                    if (sector.m_aabb != sectorAabb)
+                    {
+                        sector.m_aabb = sectorAabb;
+                        sector.SetDirty();
+                    }
                 }
             }
         }
@@ -295,12 +299,18 @@ namespace Terrain
         // (Sectors that are outside the world bounds won't have any valid data, so they'll get skipped)
         for (auto& sector : m_wireframeSectors)
         {
+            AZStd::lock_guard<AZStd::recursive_mutex> lock(sector.m_sectorStateMutex);
+            if (sector.m_jobContext)
+            {
+                // The previous async request for this sector has yet to complete.
+                continue;
+            }
+
             if (sector.m_isDirty)
             {
                 RebuildSectorWireframe(sector, heightDataResolution);
             }
-
-            if (!sector.m_lineVertices.empty())
+            else if (!sector.m_lineVertices.empty())
             {
                 const AZ::Color primaryColor = AZ::Color(0.25f, 0.25f, 0.25f, 1.0f);
                 debugDisplay.DrawLines(sector.m_lineVertices, primaryColor);
@@ -319,6 +329,7 @@ namespace Terrain
 
     void TerrainWorldDebuggerComponent::RebuildSectorWireframe(WireframeSector& sector, float gridResolution)
     {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(sector.m_sectorStateMutex);
         if (!sector.m_isDirty)
         {
             return;
@@ -346,16 +357,24 @@ namespace Terrain
         sector.m_lineVertices.reserve(numSamplesX * numSamplesY * 4);
 
         // This keeps track of the height from the previous point for the _ line.
-        float previousHeight = 0.0f;
+        sector.m_previousHeight = 0.0f;
 
         // This keeps track of the heights from the previous row for the | line.
-        AZStd::vector<float> rowHeights(numSamplesX);
+        sector.m_rowHeights.clear();
+        sector.m_rowHeights.resize(numSamplesX);
 
         // For each terrain height value in the region, create the _| grid lines for that point and cache off the height value
         // for use with subsequent grid line calculations.
-        auto ProcessHeightValue = [gridResolution, &previousHeight, &rowHeights, &sector]
+        auto ProcessHeightValue = [gridResolution, &sector]
             (size_t xIndex, size_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists)
         {
+            AZStd::lock_guard<AZStd::recursive_mutex> lock(sector.m_sectorStateMutex);
+            if (sector.m_isDirty)
+            {
+                // Bail out if this sector has become dirty again since the async request started.
+                return;
+            }
+
             // Don't add any vertices for the first column or first row.  These grid lines will be handled by an adjacent sector, if
             // there is one.
             if ((xIndex > 0) && (yIndex > 0))
@@ -363,23 +382,49 @@ namespace Terrain
                 float x = surfacePoint.m_position.GetX() - gridResolution;
                 float y = surfacePoint.m_position.GetY() - gridResolution;
 
-                sector.m_lineVertices.emplace_back(AZ::Vector3(x, surfacePoint.m_position.GetY(), previousHeight));
+                sector.m_lineVertices.emplace_back(AZ::Vector3(x, surfacePoint.m_position.GetY(), sector.m_previousHeight));
                 sector.m_lineVertices.emplace_back(surfacePoint.m_position);
 
-                sector.m_lineVertices.emplace_back(AZ::Vector3(surfacePoint.m_position.GetX(), y, rowHeights[xIndex]));
+                sector.m_lineVertices.emplace_back(AZ::Vector3(surfacePoint.m_position.GetX(), y, sector.m_rowHeights[xIndex]));
                 sector.m_lineVertices.emplace_back(surfacePoint.m_position);
             }
 
             // Save off the heights so that we can use them to draw subsequent columns and rows.
-            previousHeight = surfacePoint.m_position.GetZ();
-            rowHeights[xIndex] = surfacePoint.m_position.GetZ();
+            sector.m_previousHeight = surfacePoint.m_position.GetZ();
+            sector.m_rowHeights[xIndex] = surfacePoint.m_position.GetZ();
         };
-        
+
+        auto completionCallback = [&sector](AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext>)
+        {
+            // This must happen outside the lock,
+            // otherwise we will get a deadlock if
+            // WireframeSector::Reset is waiting for
+            // the completion event to be signalled.
+            sector.m_jobCompletionEvent->release();
+
+            // Reset the job context once the async request has completed,
+            // clearing the way for future requests to be made for this sector.
+            AZStd::lock_guard<AZStd::recursive_mutex> lock(sector.m_sectorStateMutex);
+            sector.m_jobContext.reset();
+        };
+
+        AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams> asyncParams
+            = AZStd::make_shared<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams>();
+        asyncParams->m_completionCallback = completionCallback;
+
+        sector.m_jobCompletionEvent = AZStd::make_unique<AZStd::semaphore>();
         AZ::Vector2 stepSize = AZ::Vector2(gridResolution);
-        AzFramework::Terrain::TerrainDataRequestBus::Broadcast(&AzFramework::Terrain::TerrainDataRequests::ProcessHeightsFromRegion,
-            region, stepSize, ProcessHeightValue, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT);
+        AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(
+            sector.m_jobContext,
+            &AzFramework::Terrain::TerrainDataRequests::ProcessHeightsFromRegionAsync,
+            region,
+            stepSize,
+            ProcessHeightValue,
+            AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT,
+            asyncParams);
     }
 
+
     void TerrainWorldDebuggerComponent::OnTerrainDataChanged(const AZ::Aabb& dirtyRegion, TerrainDataChangedMask dataChangedMask)
     {
         if (dataChangedMask & (TerrainDataChangedMask::Settings | TerrainDataChangedMask::HeightData))
@@ -395,5 +440,76 @@ namespace Terrain
         }
     }
 
+    TerrainWorldDebuggerComponent::WireframeSector::WireframeSector(const WireframeSector& other)
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_sectorStateMutex);
+        m_jobContext = other.m_jobContext;
+        m_aabb = other.m_aabb;
+        m_lineVertices = other.m_lineVertices;
+        m_rowHeights = other.m_rowHeights;
+        m_previousHeight = other.m_previousHeight;
+        m_isDirty = other.m_isDirty;
+    }
 
+    TerrainWorldDebuggerComponent::WireframeSector::WireframeSector(WireframeSector&& other)
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_sectorStateMutex);
+        m_jobContext = AZStd::move(other.m_jobContext);
+        m_aabb = AZStd::move(other.m_aabb);
+        m_lineVertices = AZStd::move(other.m_lineVertices);
+        m_rowHeights = AZStd::move(other.m_rowHeights);
+        m_previousHeight = AZStd::move(other.m_previousHeight);
+        m_isDirty = AZStd::move(other.m_isDirty);
+    }
+
+    TerrainWorldDebuggerComponent::WireframeSector& TerrainWorldDebuggerComponent::WireframeSector::operator=(const WireframeSector& other)
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_sectorStateMutex);
+        m_jobContext = other.m_jobContext;
+        m_aabb = other.m_aabb;
+        m_lineVertices = other.m_lineVertices;
+        m_rowHeights = other.m_rowHeights;
+        m_previousHeight = other.m_previousHeight;
+        m_isDirty = other.m_isDirty;
+        return *this;
+    }
+
+    TerrainWorldDebuggerComponent::WireframeSector& TerrainWorldDebuggerComponent::WireframeSector::operator=(WireframeSector&& other)
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_sectorStateMutex);
+        m_jobContext = AZStd::move(other.m_jobContext);
+        m_aabb = AZStd::move(other.m_aabb);
+        m_lineVertices = AZStd::move(other.m_lineVertices);
+        m_rowHeights = AZStd::move(other.m_rowHeights);
+        m_previousHeight = AZStd::move(other.m_previousHeight);
+        m_isDirty = AZStd::move(other.m_isDirty);
+        return *this;
+    }
+
+    void TerrainWorldDebuggerComponent::WireframeSector::Reset()
+    {
+        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_sectorStateMutex);
+        if (m_jobContext)
+        {
+            // Cancel the job and wait until it completes.
+            m_jobContext->Cancel();
+            m_jobCompletionEvent->acquire();
+            m_jobCompletionEvent.reset();
+            m_jobContext.reset();
+        }
+        m_aabb = AZ::Aabb::CreateNull();
+        m_lineVertices.clear();
+        m_rowHeights.clear();
+        m_previousHeight = 0.0f;
+        m_isDirty = true;
+    }
+
+    void TerrainWorldDebuggerComponent::WireframeSector::SetDirty()
+    {
+        m_isDirty = true;
+        if (m_jobContext)
+        {
+            m_jobContext->Cancel();
+        }
+    }
 } // namespace Terrain
diff --git a/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.h b/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.h
index 13c602c48d..7339dc9bb3 100644
--- a/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.h
+++ b/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.h
@@ -88,8 +88,25 @@ namespace Terrain
         // the wireframe representation in each direction.
         struct WireframeSector
         {
+            WireframeSector() = default;
+            ~WireframeSector() = default;
+            WireframeSector(const WireframeSector& other);
+            WireframeSector(WireframeSector&& other);
+            WireframeSector& operator=(const WireframeSector& other);
+            WireframeSector& operator=(WireframeSector&& other);
+
+            void Reset();
+
+            // This should only be called within the scope of a lock on m_sectorStateMutex.
+            void SetDirty();
+
+            AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> m_jobContext;
+            AZStd::unique_ptr<AZStd::semaphore> m_jobCompletionEvent;
+            AZStd::recursive_mutex m_sectorStateMutex;
             AZ::Aabb m_aabb{ AZ::Aabb::CreateNull() };
             AZStd::vector<AZ::Vector3> m_lineVertices;
+            AZStd::vector<float> m_rowHeights;
+            float m_previousHeight = 0.0f;
             bool m_isDirty{ true };
         };
 
diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.cpp b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.cpp
index 6df6c3b440..5f76b7de6a 100644
--- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.cpp
+++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.cpp
@@ -20,5 +20,85 @@ namespace Terrain
             &LmbrCentral::EditorWrappedComponentBaseVersionConverter<typename BaseClassType::WrappedComponentType,
             typename BaseClassType::WrappedConfigType, 1>
         );
+
+        if (auto serialize = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            if (auto edit = serialize->GetEditContext())
+            {
+                edit->Class<TerrainPhysicsSurfaceMaterialMapping>(
+                    "Terrain Surface Material Mapping", "Mapping between a surface and a physics material.")
+
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Show)
+
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::ComboBox, &TerrainPhysicsSurfaceMaterialMapping::m_surfaceTag, "Surface Tag",
+                        "Surface type to map to a physics material.")
+                    ->Attribute(AZ::Edit::Attributes::EnumValues, &TerrainPhysicsSurfaceMaterialMapping::BuildSelectableTagList)
+
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &TerrainPhysicsSurfaceMaterialMapping::m_materialId, "Material ID", "")
+                    ->ElementAttribute(Physics::Attributes::MaterialLibraryAssetId, &TerrainPhysicsSurfaceMaterialMapping::GetMaterialLibraryId)
+                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                    ->Attribute(AZ::Edit::Attributes::ShowProductAssetFileName, true)
+                    ;
+
+                edit->Class<TerrainPhysicsColliderConfig>(
+                    "Terrain Physics Collider Component",
+                    "Provides terrain data to a physics collider with configurable surface mappings.")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
+                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &TerrainPhysicsColliderConfig::m_defaultMaterialSelection,
+                        "Default Surface Physics Material", "Select a material to be used by unmapped surfaces by default")
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default, &TerrainPhysicsColliderConfig::m_surfaceMaterialMappings,
+                        "Surface to Material Mappings", "Maps surfaces to physics materials")
+                    ;
+            }
+        }
+    }
+
+    void EditorTerrainPhysicsColliderComponent::Activate()
+    {
+        UpdateConfigurationTagProvider();
+        BaseClassType::Activate();
+    }
+
+    AZStd::unordered_set<SurfaceData::SurfaceTag> EditorTerrainPhysicsColliderComponent::GetSurfaceTagsInUse() const
+    {
+        AZStd::unordered_set<SurfaceData::SurfaceTag> tagsInUse;
+
+        for (const TerrainPhysicsSurfaceMaterialMapping& mapping : m_configuration.m_surfaceMaterialMappings)
+        {
+            tagsInUse.insert(mapping.m_surfaceTag);
+        }
+
+        return AZStd::move(tagsInUse);
+    }
+
+    AZ::u32 EditorTerrainPhysicsColliderComponent::ConfigurationChanged()
+    {
+        UpdateConfigurationTagProvider();
+        return BaseClassType::ConfigurationChanged();
+    }
+
+    void EditorTerrainPhysicsColliderComponent::UpdateConfigurationTagProvider()
+    {
+        for (TerrainPhysicsSurfaceMaterialMapping& mapping : m_configuration.m_surfaceMaterialMappings)
+        {
+            mapping.SetTagListProvider(this);
+        }
+    }
+
+    AZStd::vector<AZStd::pair<AZ::u32, AZStd::string>> TerrainPhysicsSurfaceMaterialMapping::BuildSelectableTagList() const
+    {
+        AZ_PROFILE_FUNCTION(Entity);
+        return AZStd::move(Terrain::BuildSelectableTagList(m_tagListProvider, m_surfaceTag));
+    }
+
+    void TerrainPhysicsSurfaceMaterialMapping::SetTagListProvider(const EditorSurfaceTagListProvider* tagListProvider)
+    {
+        m_tagListProvider = tagListProvider;
     }
 }
diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h
index 924426c262..fca8e52246 100644
--- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h
+++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h
@@ -11,22 +11,34 @@
 #include <Components/TerrainPhysicsColliderComponent.h>
 #include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
 #include <LmbrCentral/Component/EditorWrappedComponentBase.h>
+#include <EditorSurfaceTagListProvider.h>
 
 namespace Terrain
 {
     class EditorTerrainPhysicsColliderComponent
         : public LmbrCentral::EditorWrappedComponentBase<TerrainPhysicsColliderComponent, TerrainPhysicsColliderConfig>
+        , public EditorSurfaceTagListProvider
     {
     public:
         using BaseClassType = LmbrCentral::EditorWrappedComponentBase<TerrainPhysicsColliderComponent, TerrainPhysicsColliderConfig>;
         AZ_EDITOR_COMPONENT(EditorTerrainPhysicsColliderComponent, "{C43FAB8F-3968-46A6-920E-E84AEDED3DF5}", BaseClassType);
         static void Reflect(AZ::ReflectContext* context);
 
+        // AZ::Component interface implementation
+        void Activate() override;
+
         static constexpr auto s_categoryName = "Terrain";
         static constexpr auto s_componentName = "Terrain Physics Heightfield Collider";
         static constexpr auto s_componentDescription = "Provides terrain data to a physics collider in the form of a heightfield and surface->material mapping.";
         static constexpr auto s_icon = "Editor/Icons/Components/TerrainPhysicsCollider.svg";
         static constexpr auto s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg";
         static constexpr auto s_helpUrl = "";
+
+    private:
+        // EditorSurfaceTagListProvider interface implementation
+        AZStd::unordered_set<SurfaceData::SurfaceTag> GetSurfaceTagsInUse() const override;
+
+        AZ::u32 ConfigurationChanged() override;
+        void UpdateConfigurationTagProvider();
     };
 }
diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.cpp b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.cpp
index bc823734b4..0ea51f282b 100644
--- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.cpp
+++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.cpp
@@ -19,5 +19,83 @@ namespace Terrain
             &LmbrCentral::EditorWrappedComponentBaseVersionConverter<typename BaseClassType::WrappedComponentType,
             typename BaseClassType::WrappedConfigType, 1>
         );
+
+        if (auto serialize = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            if (auto edit = serialize->GetEditContext())
+            {
+                edit->Class<TerrainSurfaceGradientMapping>("Terrain Surface Gradient Mapping", "Mapping between a gradient and a surface.")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Show)
+                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default, &TerrainSurfaceGradientMapping::m_gradientEntityId,
+                        "Gradient Entity", "ID of Entity providing a gradient.")
+                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::AttributesAndValues)
+                    ->UIElement("GradientPreviewer", "Previewer")
+                    ->Attribute(AZ::Edit::Attributes::NameLabelOverride, "")
+                    ->Attribute(AZ_CRC_CE("GradientEntity"), &TerrainSurfaceGradientMapping::m_gradientEntityId)
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default, &TerrainSurfaceGradientMapping::m_surfaceTag, "Surface Tag",
+                        "Surface type to map to this gradient.")
+                    ->Attribute(AZ::Edit::Attributes::EnumValues, &TerrainSurfaceGradientMapping::BuildSelectableTagList)
+                    ;
+
+                edit->Class<TerrainSurfaceGradientListConfig>(
+                    "Terrain Surface Gradient List Component", "Provide mapping between gradients and surfaces.")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Show)
+                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::Default, &TerrainSurfaceGradientListConfig::m_gradientSurfaceMappings,
+                        "Gradient to Surface Mappings", "Maps Gradient Entities to Surfaces.")
+                    ;
+            }
+        }
+    }
+
+    void EditorTerrainSurfaceGradientListComponent::Activate()
+    {
+        UpdateConfigurationTagProvider();
+        BaseClassType::Activate();
+    }
+
+    AZ::u32 EditorTerrainSurfaceGradientListComponent::ConfigurationChanged()
+    {
+        UpdateConfigurationTagProvider();
+        return BaseClassType::ConfigurationChanged();
+    }
+
+    void EditorTerrainSurfaceGradientListComponent::UpdateConfigurationTagProvider()
+    {
+        for (TerrainSurfaceGradientMapping& mapping : m_configuration.m_gradientSurfaceMappings)
+        {
+            mapping.SetTagListProvider(this);
+        }
+    }
+
+    AZStd::unordered_set<SurfaceData::SurfaceTag> EditorTerrainSurfaceGradientListComponent::GetSurfaceTagsInUse() const
+    {
+        AZStd::unordered_set<SurfaceData::SurfaceTag> tagsInUse;
+
+        for (const TerrainSurfaceGradientMapping& mapping : m_configuration.m_gradientSurfaceMappings)
+        {
+            tagsInUse.insert(mapping.m_surfaceTag);
+        }
+
+        return AZStd::move(tagsInUse);
+    }
+
+    AZStd::vector<AZStd::pair<AZ::u32, AZStd::string>> TerrainSurfaceGradientMapping::BuildSelectableTagList() const
+    {
+        AZ_PROFILE_FUNCTION(Entity);
+        return AZStd::move(Terrain::BuildSelectableTagList(m_tagListProvider, m_surfaceTag));
+    }
+
+    void TerrainSurfaceGradientMapping::SetTagListProvider(const EditorSurfaceTagListProvider* tagListProvider)
+    {
+        m_tagListProvider = tagListProvider;
     }
 }
diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h
index 58cb776823..bcd5d84c38 100644
--- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h
+++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h
@@ -11,22 +11,34 @@
 #include <Components/TerrainSurfaceGradientListComponent.h>
 #include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
 #include <LmbrCentral/Component/EditorWrappedComponentBase.h>
+#include <EditorSurfaceTagListProvider.h>
 
 namespace Terrain
 {
     class EditorTerrainSurfaceGradientListComponent
         : public LmbrCentral::EditorWrappedComponentBase<TerrainSurfaceGradientListComponent, TerrainSurfaceGradientListConfig>
+        , public EditorSurfaceTagListProvider
     {
     public:
         using BaseClassType = LmbrCentral::EditorWrappedComponentBase<TerrainSurfaceGradientListComponent, TerrainSurfaceGradientListConfig>;
         AZ_EDITOR_COMPONENT(EditorTerrainSurfaceGradientListComponent, "{49831E91-A11F-4EFF-A824-6D85C284B934}", BaseClassType);
         static void Reflect(AZ::ReflectContext* context);
 
+        // AZ::Component interface implementation
+        void Activate() override;
+
         static constexpr const char* const s_categoryName = "Terrain";
         static constexpr const char* const s_componentName = "Terrain Surface Gradient List";
         static constexpr const char* const s_componentDescription = "Provides a mapping between gradients and surface tags for use by the terrain system.";
         static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainSurfaceGradientList.svg";
         static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/terrain/surface-gradient-list/";
+
+    private:
+        // EditorSurfaceTagListProvider interface implementation
+        AZStd::unordered_set<SurfaceData::SurfaceTag> GetSurfaceTagsInUse() const override;
+
+        AZ::u32 ConfigurationChanged() override;
+        void UpdateConfigurationTagProvider();
     };
 }
diff --git a/Gems/Terrain/Code/Source/EditorSurfaceTagListProvider.cpp b/Gems/Terrain/Code/Source/EditorSurfaceTagListProvider.cpp
new file mode 100644
index 0000000000..bb4dcb6afe
--- /dev/null
+++ b/Gems/Terrain/Code/Source/EditorSurfaceTagListProvider.cpp
@@ -0,0 +1,41 @@
+/*
+ * 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 <EditorSurfaceTagListProvider.h>
+#include <AzCore/std/sort.h>
+
+
+namespace Terrain
+{
+    AZStd::vector<AZStd::pair<AZ::u32, AZStd::string>> BuildSelectableTagList(const EditorSurfaceTagListProvider* tagListProvider,
+        const SurfaceData::SurfaceTag& currentTag)
+    {
+        AZStd::vector<AZStd::pair<AZ::u32, AZStd::string>> availableTags = SurfaceData::SurfaceTag::GetRegisteredTags();
+
+        AZStd::unordered_set<SurfaceData::SurfaceTag> tagsInUse;
+
+        if (tagListProvider)
+        {
+            tagsInUse = AZStd::move(tagListProvider->GetSurfaceTagsInUse());
+
+            // Filter out all tags in use from the list of registered tags
+            AZStd::erase_if(availableTags, [&tagsInUse](const auto& tag)-> bool
+            {
+                return tagsInUse.contains(SurfaceData::SurfaceTag(tag.first));
+            });
+        }
+
+        // Insert the current tag back if it was removed via tagsInUse
+        availableTags.emplace_back(AZ::u32(currentTag), currentTag.GetDisplayName());
+
+        // Sorting for consistency
+        AZStd::sort(availableTags.begin(), availableTags.end(), [](const auto& lhs, const auto& rhs) {return lhs.second < rhs.second; });
+
+        return AZStd::move(availableTags);
+    }
+}
diff --git a/Gems/Terrain/Code/Source/EditorSurfaceTagListProvider.h b/Gems/Terrain/Code/Source/EditorSurfaceTagListProvider.h
new file mode 100644
index 0000000000..ed5a5c1c0a
--- /dev/null
+++ b/Gems/Terrain/Code/Source/EditorSurfaceTagListProvider.h
@@ -0,0 +1,29 @@
+/*
+ * 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/containers/vector.h>
+#include <AzCore/std/string/string.h>
+#include <AzCore/std/containers/unordered_set.h>
+#include <SurfaceData/SurfaceTag.h>
+
+namespace Terrain
+{
+    //! Interface for a class providing information about surface tags available for selecting in Editor components.
+    class EditorSurfaceTagListProvider
+    {
+    public:
+        //! Returns a set of all surface tags currently in use that won't be available for selecting.
+        virtual AZStd::unordered_set<SurfaceData::SurfaceTag> GetSurfaceTagsInUse() const = 0;
+    };
+
+    //! Returns a list of available tags to be selected in the component.
+    AZStd::vector<AZStd::pair<AZ::u32, AZStd::string>> BuildSelectableTagList(
+        const EditorSurfaceTagListProvider* tagListProvider,
+        const SurfaceData::SurfaceTag& currentTag);
+}
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
index 5f2a50f903..fc4b821578 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.cpp
@@ -8,21 +8,19 @@
 
 #include <TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h>
 
-#include <AzCore/Asset/AssetManagerBus.h>
-#include <AzCore/Component/Entity.h>
 #include <AzCore/Asset/AssetManager.h>
+#include <AzCore/Asset/AssetManagerBus.h>
 #include <AzCore/Asset/AssetSerializer.h>
-#include <AzCore/RTTI/BehaviorContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Component/Entity.h>
 #include <AzCore/Math/Aabb.h>
+#include <AzCore/RTTI/BehaviorContext.h>
+#include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 
-#include <GradientSignal/Ebuses/GradientRequestBus.h>
-#include <SurfaceData/SurfaceDataProviderRequestBus.h>
-
 #include <AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h>
 
+#include <GradientSignal/Ebuses/GradientRequestBus.h>
+#include <SurfaceData/SurfaceDataProviderRequestBus.h>
 #include <TerrainSystem/TerrainSystemBus.h>
 
 namespace Terrain
@@ -38,15 +36,14 @@ namespace Terrain
 
             if (auto edit = serialize->GetEditContext())
             {
-                edit->Class<TerrainSurfaceMaterialMapping>("Terrain Surface Gradient Mapping", "Mapping between a surface and a material.")
+                edit->Class<TerrainSurfaceMaterialMapping>("Terrain surface gradient mapping", "Mapping between a surface and a material.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Show)
-
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &TerrainSurfaceMaterialMapping::m_surfaceTag, "Surface Tag", "Surface type to map to a material.")
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &TerrainSurfaceMaterialMapping::m_materialAsset, "Material Asset", "")
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ->Attribute(AZ::Edit::Attributes::ShowProductAssetFileName, true)
+                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                    
+                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &TerrainSurfaceMaterialMapping::m_surfaceTag, "Surface tag", "Surface type to map to a material.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &TerrainSurfaceMaterialMapping::m_materialAsset, "Material asset", "")
+                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                        ->Attribute(AZ::Edit::Attributes::ShowProductAssetFileName, true)
                     ;
             }
         }
@@ -60,7 +57,8 @@ namespace Terrain
         if (serialize)
         {
             serialize->Class<TerrainSurfaceMaterialsListConfig, AZ::ComponentConfig>()
-                ->Version(1)
+                ->Version(2)
+                ->Field("DefaultMaterial", &TerrainSurfaceMaterialsListConfig::m_defaultSurfaceMaterial)
                 ->Field("Mappings", &TerrainSurfaceMaterialsListConfig::m_surfaceMaterials);
 
             AZ::EditContext* edit = serialize->GetEditContext();
@@ -68,10 +66,13 @@ namespace Terrain
             {
                 edit->Class<TerrainSurfaceMaterialsListConfig>(
                         "Terrain Surface Material List Component", "Provide mapping between surfaces and render materials.")
+                    ->SetDynamicEditDataProvider(&TerrainSurfaceMaterialsListConfig::GetDynamicData)
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Show)
-                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Show)
+                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
 
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &TerrainSurfaceMaterialsListConfig::m_defaultSurfaceMaterial,
+                        "Default Material", "The default material to fall back to where no other material surface mappings exist.")
                     ->DataElement(
                         AZ::Edit::UIHandlers::Default, &TerrainSurfaceMaterialsListConfig::m_surfaceMaterials,
                         "Material Mappings", "Maps surfaces to materials.");
@@ -79,6 +80,26 @@ namespace Terrain
         }
     }
 
+    TerrainSurfaceMaterialsListConfig::TerrainSurfaceMaterialsListConfig()
+    {
+       m_hideSurfaceTagData.m_attributes.push_back(
+           {
+               AZ::Edit::Attributes::Visibility,
+               aznew AZ::Edit::AttributeData<AZ::Crc32>(AZ::Edit::PropertyVisibility::Hide)
+           }
+       );
+    }
+
+    const AZ::Edit::ElementData* TerrainSurfaceMaterialsListConfig::GetDynamicData(const void* handlerPtr, const void* elementPtr, const AZ::Uuid& )
+    {
+        const TerrainSurfaceMaterialsListConfig* owner = reinterpret_cast<const TerrainSurfaceMaterialsListConfig*>(handlerPtr);
+        if (elementPtr == &owner->m_defaultSurfaceMaterial.m_surfaceTag)
+        {
+            return &owner->m_hideSurfaceTagData;
+        }
+        return nullptr;
+    }
+
     void TerrainSurfaceMaterialsListComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
     {
         services.push_back(AZ_CRC_CE("TerrainMaterialProviderService"));
@@ -116,15 +137,21 @@ namespace Terrain
     {
         m_cachedAabb = AZ::Aabb::CreateNull();
 
+        auto checkLoadMaterial = [&](TerrainSurfaceMaterialMapping& material)
+        {
+            if (material.m_materialAsset.GetId().IsValid())
+            {
+                material.m_active = false;
+                material.m_materialAsset.QueueLoad();
+                AZ::Data::AssetBus::MultiHandler::BusConnect(material.m_materialAsset.GetId());
+            }
+        };
+
         // Set all the materials as inactive and start loading.
+        checkLoadMaterial(m_configuration.m_defaultSurfaceMaterial);
         for (auto& surfaceMaterialMapping : m_configuration.m_surfaceMaterials)
         {
-            if (surfaceMaterialMapping.m_materialAsset.GetId().IsValid())
-            {
-                surfaceMaterialMapping.m_active = false;
-                surfaceMaterialMapping.m_materialAsset.QueueLoad();
-                AZ::Data::AssetBus::MultiHandler::BusConnect(surfaceMaterialMapping.m_materialAsset.GetId());
-            }
+            checkLoadMaterial(surfaceMaterialMapping);
         }
 
         // Announce initial shape using OnShapeChanged
@@ -135,24 +162,35 @@ namespace Terrain
     {
         TerrainAreaMaterialRequestBus::Handler::BusDisconnect();
 
+        auto checkResetMaterial = [&](TerrainSurfaceMaterialMapping& material)
+        {
+            if (material.m_materialAsset.GetId().IsValid())
+            {
+                AZ::Data::AssetBus::MultiHandler::BusDisconnect(material.m_materialAsset.GetId());
+                material.m_materialAsset.Release();
+                material.m_materialInstance.reset();
+                material.m_activeMaterialAssetId = AZ::Data::AssetId();
+            }
+        };
+        
+        checkResetMaterial(m_configuration.m_defaultSurfaceMaterial);
         for (auto& surfaceMaterialMapping : m_configuration.m_surfaceMaterials)
         {
-            if (surfaceMaterialMapping.m_materialAsset.GetId().IsValid())
-            {
-                AZ::Data::AssetBus::MultiHandler::BusDisconnect(surfaceMaterialMapping.m_materialAsset.GetId());
-                surfaceMaterialMapping.m_materialAsset.Release();
-                surfaceMaterialMapping.m_materialInstance.reset();
-                surfaceMaterialMapping.m_activeMaterialAssetId = AZ::Data::AssetId();
-            }
+            checkResetMaterial(surfaceMaterialMapping);
         }
 
         HandleMaterialStateChanges();
     }
 
-    int TerrainSurfaceMaterialsListComponent::CountMaterialIDInstances(AZ::Data::AssetId id) const
+    int TerrainSurfaceMaterialsListComponent::CountMaterialIdInstances(AZ::Data::AssetId id) const
     {
         int count = 0;
 
+        if (m_configuration.m_defaultSurfaceMaterial.m_activeMaterialAssetId == id)
+        {
+            count++;
+        }
+
         for (const auto& surfaceMaterialMapping : m_configuration.m_surfaceMaterials)
         {
             if (surfaceMaterialMapping.m_activeMaterialAssetId == id)
@@ -169,28 +207,63 @@ namespace Terrain
         bool anyMaterialIsActive = false;
         bool anyMaterialWasAlreadyActive = false;
 
-        for (auto& surfaceMaterialMapping : m_configuration.m_surfaceMaterials)
         {
-            const bool wasPreviouslyActive = surfaceMaterialMapping.m_active;
-            const bool isNowActive = (surfaceMaterialMapping.m_materialInstance != nullptr);
+            // Handle default material first
+            auto& defaultMaterial = m_configuration.m_defaultSurfaceMaterial;
 
-            if (wasPreviouslyActive)
-            {
-                anyMaterialWasAlreadyActive = true;
-            }
+            const bool wasPreviouslyActive = defaultMaterial.m_active;
+            defaultMaterial.m_active = (defaultMaterial.m_materialInstance != nullptr);
 
-            if (isNowActive)
-            {
-                anyMaterialIsActive = true;
-            }
-
-            surfaceMaterialMapping.m_active = isNowActive;
-
-            if (!wasPreviouslyActive && !isNowActive)
+            anyMaterialWasAlreadyActive = wasPreviouslyActive;
+            anyMaterialIsActive = defaultMaterial.m_active;
+            
+            if (!wasPreviouslyActive && !defaultMaterial.m_active)
             {
                 // A material has been assigned but has not yet completed loading.
             }
-            else if (!wasPreviouslyActive && isNowActive)
+            else if (!wasPreviouslyActive && defaultMaterial.m_active)
+            {
+                TerrainAreaMaterialNotificationBus::Broadcast(
+                    &TerrainAreaMaterialNotificationBus::Events::OnTerrainDefaultSurfaceMaterialCreated, GetEntityId(),
+                    defaultMaterial.m_materialInstance);
+                defaultMaterial.m_previousChangeId = defaultMaterial.m_materialInstance->GetCurrentChangeId();
+            }
+            else if (wasPreviouslyActive && !defaultMaterial.m_active)
+            {
+                // Don't disconnect from the AssetBus if this material is mapped more than once.
+                if (CountMaterialIdInstances(defaultMaterial.m_activeMaterialAssetId) == 1)
+                {
+                    AZ::Data::AssetBus::MultiHandler::BusDisconnect(defaultMaterial.m_activeMaterialAssetId);
+                }
+                defaultMaterial = {};
+
+                TerrainAreaMaterialNotificationBus::Broadcast(
+                    &TerrainAreaMaterialNotificationBus::Events::OnTerrainDefaultSurfaceMaterialDestroyed, GetEntityId());
+            }
+            else if (defaultMaterial.m_materialInstance->GetAssetId() != defaultMaterial.m_activeMaterialAssetId ||
+                defaultMaterial.m_materialInstance->GetCurrentChangeId() != defaultMaterial.m_previousChangeId)
+            {
+                defaultMaterial.m_previousChangeId = defaultMaterial.m_materialInstance->GetCurrentChangeId();
+                defaultMaterial.m_activeMaterialAssetId = defaultMaterial.m_materialInstance->GetAssetId();
+
+                TerrainAreaMaterialNotificationBus::Broadcast(
+                    &TerrainAreaMaterialNotificationBus::Events::OnTerrainDefaultSurfaceMaterialChanged, GetEntityId(), defaultMaterial.m_materialInstance);
+            }
+        }
+
+        for (auto& surfaceMaterialMapping : m_configuration.m_surfaceMaterials)
+        {
+            const bool wasPreviouslyActive = surfaceMaterialMapping.m_active;
+            surfaceMaterialMapping.m_active = surfaceMaterialMapping.m_materialInstance != nullptr;
+
+            anyMaterialWasAlreadyActive = anyMaterialWasAlreadyActive || wasPreviouslyActive;
+            anyMaterialIsActive = anyMaterialIsActive || surfaceMaterialMapping.m_active;
+
+            if (!wasPreviouslyActive && !surfaceMaterialMapping.m_active)
+            {
+                // A material has been assigned but has not yet completed loading.
+            }
+            else if (!wasPreviouslyActive && surfaceMaterialMapping.m_active)
             {
                 // Remember the asset id so we can disconnect from the AssetBus if the material asset is removed.
                 surfaceMaterialMapping.m_activeMaterialAssetId = surfaceMaterialMapping.m_materialAsset.GetId();
@@ -199,27 +272,47 @@ namespace Terrain
                     &TerrainAreaMaterialNotificationBus::Events::OnTerrainSurfaceMaterialMappingCreated, GetEntityId(),
                     surfaceMaterialMapping.m_surfaceTag,
                     surfaceMaterialMapping.m_materialInstance);
+                
+                surfaceMaterialMapping.m_previousChangeId = surfaceMaterialMapping.m_materialInstance->GetCurrentChangeId();
+                surfaceMaterialMapping.m_previousTag = surfaceMaterialMapping.m_surfaceTag;
             }
-            else if (wasPreviouslyActive && !isNowActive)
+            else if (wasPreviouslyActive && !surfaceMaterialMapping.m_active)
             {
                 // Don't disconnect from the AssetBus if this material is mapped more than once.
-                if (CountMaterialIDInstances(surfaceMaterialMapping.m_activeMaterialAssetId) == 1)
+                if (CountMaterialIdInstances(surfaceMaterialMapping.m_activeMaterialAssetId) == 1)
                 {
                     AZ::Data::AssetBus::MultiHandler::BusDisconnect(surfaceMaterialMapping.m_activeMaterialAssetId);
                 }
 
-                surfaceMaterialMapping.m_activeMaterialAssetId = AZ::Data::AssetId();
+                surfaceMaterialMapping.m_activeMaterialAssetId = {};
+                surfaceMaterialMapping.m_previousChangeId = AZ::RPI::Material::DEFAULT_CHANGE_ID;
+                surfaceMaterialMapping.m_previousTag = {};
 
                 TerrainAreaMaterialNotificationBus::Broadcast(
                     &TerrainAreaMaterialNotificationBus::Events::OnTerrainSurfaceMaterialMappingDestroyed, GetEntityId(),
                     surfaceMaterialMapping.m_surfaceTag);
             }
-            else
+            else 
             {
-                TerrainAreaMaterialNotificationBus::Broadcast(
-                    &TerrainAreaMaterialNotificationBus::Events::OnTerrainSurfaceMaterialMappingChanged, GetEntityId(),
-                    surfaceMaterialMapping.m_surfaceTag,
-                    surfaceMaterialMapping.m_materialInstance);
+                if (surfaceMaterialMapping.m_previousTag != surfaceMaterialMapping.m_surfaceTag)
+                {
+                    TerrainAreaMaterialNotificationBus::Broadcast(
+                        &TerrainAreaMaterialNotificationBus::Events::OnTerrainSurfaceMaterialMappingTagChanged, GetEntityId(),
+                        surfaceMaterialMapping.m_previousTag,
+                        surfaceMaterialMapping.m_surfaceTag);
+                    surfaceMaterialMapping.m_previousTag = surfaceMaterialMapping.m_surfaceTag;
+                }
+                if (surfaceMaterialMapping.m_materialInstance->GetAssetId() != surfaceMaterialMapping.m_activeMaterialAssetId ||
+                    surfaceMaterialMapping.m_materialInstance->GetCurrentChangeId() != surfaceMaterialMapping.m_previousChangeId)
+                {
+                    surfaceMaterialMapping.m_previousChangeId = surfaceMaterialMapping.m_materialInstance->GetCurrentChangeId();
+                    surfaceMaterialMapping.m_activeMaterialAssetId = surfaceMaterialMapping.m_materialInstance->GetAssetId();
+
+                    TerrainAreaMaterialNotificationBus::Broadcast(
+                        &TerrainAreaMaterialNotificationBus::Events::OnTerrainSurfaceMaterialMappingMaterialChanged, GetEntityId(),
+                        surfaceMaterialMapping.m_surfaceTag,
+                        surfaceMaterialMapping.m_materialInstance);
+                }
             }
         }
 
@@ -290,14 +383,28 @@ namespace Terrain
     void TerrainSurfaceMaterialsListComponent::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
     {
         // Find the missing material instance with the correct id.
-        for (auto& surfaceMaterialMapping : m_configuration.m_surfaceMaterials)
+        auto checkUpdateMaterialAsset = [](TerrainSurfaceMaterialMapping& mapping, const AZ::Data::Asset<AZ::Data::AssetData>& asset) -> bool
         {
-            if (surfaceMaterialMapping.m_materialAsset.GetId() == asset.GetId() &&
-                (!surfaceMaterialMapping.m_materialInstance ||
-                    surfaceMaterialMapping.m_materialInstance->GetAssetId() != surfaceMaterialMapping.m_materialAsset.GetId()))
+            if (mapping.m_materialAsset.GetId() == asset.GetId() &&
+                (!mapping.m_materialInstance || mapping.m_materialInstance->GetAssetId() != mapping.m_materialAsset.GetId()))
             {
-                surfaceMaterialMapping.m_materialInstance = AZ::RPI::Material::FindOrCreate(surfaceMaterialMapping.m_materialAsset);
-                surfaceMaterialMapping.m_materialAsset.Release();
+                mapping.m_materialInstance = AZ::RPI::Material::FindOrCreate(mapping.m_materialAsset);
+                mapping.m_materialAsset.Release();
+                return true;
+            }
+            return false;
+        };
+
+        // First check the default material
+        if (!checkUpdateMaterialAsset(m_configuration.m_defaultSurfaceMaterial, asset))
+        {
+            // If the default materail wasn't updated, then check all the surface material mappings.
+            for (auto& surfaceMaterialMapping : m_configuration.m_surfaceMaterials)
+            {
+                if (checkUpdateMaterialAsset(surfaceMaterialMapping, asset))
+                {
+                    break;
+                }
             }
         }
         HandleMaterialStateChanges();
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h
index 0e32cb12c0..96a7da60de 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/Components/TerrainSurfaceMaterialsListComponent.h
@@ -8,15 +8,18 @@
 
 #pragma once
 
-#include <Atom/Feature/Material/MaterialAssignment.h>
-#include <Atom/RPI.Reflect/Material/MaterialAsset.h>
 #include <AzCore/Asset/AssetCommon.h>
 #include <AzCore/Component/Component.h>
+#include <AzCore/Serialization/EditContext.h>
+
+#include <Atom/Feature/Material/MaterialAssignment.h>
+#include <Atom/RPI.Reflect/Material/MaterialAsset.h>
+
 #include <LmbrCentral/Shape/ShapeComponentBus.h>
+
 #include <SurfaceData/SurfaceDataTypes.h>
 #include <TerrainRenderer/TerrainAreaMaterialRequestBus.h>
 
-
 namespace LmbrCentral
 {
     template<typename, typename>
@@ -27,16 +30,20 @@ namespace Terrain
 {
     struct TerrainSurfaceMaterialMapping final
     {
-    public:
         AZ_CLASS_ALLOCATOR(TerrainSurfaceMaterialMapping, AZ::SystemAllocator, 0);
         AZ_RTTI(TerrainSurfaceMaterialMapping, "{37D2A586-CDDD-4FB7-A7D6-0B4CC575AB8C}");
         static void Reflect(AZ::ReflectContext* context);
 
-        SurfaceData::SurfaceTag m_surfaceTag;
-        AZ::Data::AssetId m_activeMaterialAssetId;
         AZ::Data::Asset<AZ::RPI::MaterialAsset> m_materialAsset;
         AZ::Data::Instance<AZ::RPI::Material> m_materialInstance;
 
+        AZ::Data::AssetId m_activeMaterialAssetId;
+        AZ::RPI::Material::ChangeId m_previousChangeId = AZ::RPI::Material::DEFAULT_CHANGE_ID;
+
+        // Surface tags not used by default material
+        SurfaceData::SurfaceTag m_surfaceTag;
+        SurfaceData::SurfaceTag m_previousTag;
+
         bool m_active = false;
     };
 
@@ -47,7 +54,13 @@ namespace Terrain
         AZ_RTTI(TerrainSurfaceMaterialsListConfig, "{68A1CB1B-C835-4C3A-8D1C-08692E07711A}", AZ::ComponentConfig);
         static void Reflect(AZ::ReflectContext* context);
 
+        TerrainSurfaceMaterialsListConfig();
+
+        TerrainSurfaceMaterialMapping m_defaultSurfaceMaterial;
         AZStd::vector<TerrainSurfaceMaterialMapping> m_surfaceMaterials;
+    private:
+        static const AZ::Edit::ElementData* GetDynamicData(const void* handlerPtr, const void* elementPtr, const AZ::Uuid& elementType);
+        AZ::Edit::ElementData m_hideSurfaceTagData;
     };
 
     class TerrainSurfaceMaterialsListComponent
@@ -78,7 +91,7 @@ namespace Terrain
 
     private:
         void HandleMaterialStateChanges();
-        int CountMaterialIDInstances(AZ::Data::AssetId id) const;
+        int CountMaterialIdInstances(AZ::Data::AssetId id) const;
 
         ////////////////////////////////////////////////////////////////////////
         // ShapeComponentNotificationsBus
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainAreaMaterialRequestBus.h b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainAreaMaterialRequestBus.h
index ae36a2639e..a2225702ef 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainAreaMaterialRequestBus.h
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainAreaMaterialRequestBus.h
@@ -45,6 +45,27 @@ namespace Terrain
         static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
         //////////////////////////////////////////////////////////////////////////
 
+        //! The default surface material has been assigned and loaded
+        virtual void OnTerrainDefaultSurfaceMaterialCreated(
+            [[maybe_unused]] AZ::EntityId entityId,
+            [[maybe_unused]] AZ::Data::Instance<AZ::RPI::Material> material)
+        {
+        }
+
+        //! The default surface material has been unassigned
+        virtual void OnTerrainDefaultSurfaceMaterialDestroyed(
+            [[maybe_unused]] AZ::EntityId entityId)
+        {
+        }
+
+        //! The default surface material has been changed to a different material
+        virtual void OnTerrainDefaultSurfaceMaterialChanged(
+            [[maybe_unused]] AZ::EntityId entityId,
+            [[maybe_unused]] AZ::Data::Instance<AZ::RPI::Material> newMaterial)
+        {
+        }
+
+        //! A loaded material mapped to a valid surface tag has been created
         virtual void OnTerrainSurfaceMaterialMappingCreated(
             [[maybe_unused]] AZ::EntityId entityId,
             [[maybe_unused]] SurfaceData::SurfaceTag surface,
@@ -52,19 +73,30 @@ namespace Terrain
         {
         }
 
+        //! Either the material or surface tag was unassigned, making this mapping invalid
         virtual void OnTerrainSurfaceMaterialMappingDestroyed(
             [[maybe_unused]] AZ::EntityId entityId,
             [[maybe_unused]] SurfaceData::SurfaceTag surface)
         {
         }
 
-        virtual void OnTerrainSurfaceMaterialMappingChanged(
+        //! The surface tag has changed to tag for an existing material
+        virtual void OnTerrainSurfaceMaterialMappingTagChanged(
+            [[maybe_unused]] AZ::EntityId entityId,
+            [[maybe_unused]] SurfaceData::SurfaceTag oldSurface,
+            [[maybe_unused]] SurfaceData::SurfaceTag newSurface)
+        {
+        }
+        
+        //! The material has changed for an existing surface tag
+        virtual void OnTerrainSurfaceMaterialMappingMaterialChanged(
             [[maybe_unused]] AZ::EntityId entityId,
             [[maybe_unused]] SurfaceData::SurfaceTag surface,
             [[maybe_unused]] AZ::Data::Instance<AZ::RPI::Material> material)
         {
         }
 
+        //! The bounds of this set of surface material mappings has changed
         virtual void OnTerrainSurfaceMaterialMappingRegionChanged(
             [[maybe_unused]] AZ::EntityId entityId,
             [[maybe_unused]] const AZ::Aabb& oldRegion,
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.cpp b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.cpp
index a00d2efe59..f817c138a7 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.cpp
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.cpp
@@ -106,6 +106,8 @@ namespace Terrain
             return;
         }
 
+        InitializePassthroughDetailMaterial();
+
         ClipmapBoundsDescriptor desc;
         desc.m_clipmapUpdateMultiple = 1;
         desc.m_clipToWorldScale = DetailTextureScale;
@@ -260,20 +262,73 @@ namespace Terrain
             m_dirtyDetailRegion.AddAabb(dirtyRegion);
         }
     }
+
+    bool TerrainDetailMaterialManager::ForSurfaceTag(DetailMaterialListRegion& materialRegion,
+        SurfaceData::SurfaceTag surfaceTag, DefaultMaterialSurfaceCallback callback)
+    {
+        for (DetailMaterialSurface& surface : materialRegion.m_materialsForSurfaces)
+        {
+            if (surface.m_surfaceTag == surfaceTag)
+            {
+                callback(surface);
+                return true;
+            }
+        }
+        return false;
+    }
     
+    void TerrainDetailMaterialManager::OnTerrainDefaultSurfaceMaterialCreated(AZ::EntityId entityId, MaterialInstance material)
+    {
+        DetailMaterialListRegion& materialRegion = FindOrCreateByEntityId(entityId, m_detailMaterialRegions);
+        AZ_Error("TerrainDetailMaterialManager", materialRegion.m_defaultDetailMaterialId == InvalidDetailMaterailId,
+            "Default detail material created but was already set for this region.");
+
+        materialRegion.m_defaultDetailMaterialId = CreateOrUpdateDetailMaterial(material);
+        m_detailMaterials.GetData(materialRegion.m_defaultDetailMaterialId).refCount++;
+        m_dirtyDetailRegion.AddAabb(materialRegion.m_region);
+    }
+
+    void TerrainDetailMaterialManager::OnTerrainDefaultSurfaceMaterialDestroyed(AZ::EntityId entityId)
+    {
+        DetailMaterialListRegion* materialRegion = FindByEntityId(entityId, m_detailMaterialRegions);
+        if (materialRegion == nullptr)
+        {
+            AZ_Assert(false, "OnTerrainDefaultSurfaceMaterialDestroyed() called for region that doesn't exist.");
+            return;
+        }
+
+        CheckDetailMaterialForDeletion(materialRegion->m_defaultDetailMaterialId);
+        materialRegion->m_defaultDetailMaterialId = InvalidDetailMaterailId;
+    }
+
+    void TerrainDetailMaterialManager::OnTerrainDefaultSurfaceMaterialChanged(AZ::EntityId entityId, MaterialInstance newMaterial)
+    {
+        DetailMaterialListRegion* materialRegion = FindByEntityId(entityId, m_detailMaterialRegions);
+        if (materialRegion == nullptr)
+        {
+            AZ_Assert(false, "OnTerrainDefaultSurfaceMaterialChanged() called for region that doesn't exist.");
+            return;
+        }
+
+        // Update existing entry or create a new material entry
+        uint16_t materialId = CreateOrUpdateDetailMaterial(newMaterial);
+        if (materialRegion->m_defaultDetailMaterialId != materialId)
+        {
+            ++m_detailMaterials.GetData(materialId).refCount;
+            CheckDetailMaterialForDeletion(materialRegion->m_defaultDetailMaterialId);
+            materialRegion->m_defaultDetailMaterialId = materialId;
+        }
+    }
+
     void TerrainDetailMaterialManager::OnTerrainSurfaceMaterialMappingCreated(AZ::EntityId entityId, SurfaceData::SurfaceTag surfaceTag, MaterialInstance material)
     {
         DetailMaterialListRegion& materialRegion = FindOrCreateByEntityId(entityId, m_detailMaterialRegions);
 
         // Validate that the surface tag is new
-        for (DetailMaterialSurface& surface : materialRegion.m_materialsForSurfaces)
+        ForSurfaceTag(materialRegion, surfaceTag, [](DetailMaterialSurface&)
         {
-            if (surface.m_surfaceTag == surfaceTag)
-            {
-                AZ_Error(TerrainDetailMaterialManagerName, false, "Already have a surface material mapping for this surface tag.");
-                return;
-            }
-        }
+            AZ_Error(TerrainDetailMaterialManagerName, false, "Already have a surface material mapping for this surface tag.");
+        });
 
         uint16_t detailMaterialId = CreateOrUpdateDetailMaterial(material);
         materialRegion.m_materialsForSurfaces.push_back({ surfaceTag, detailMaterialId });
@@ -284,52 +339,71 @@ namespace Terrain
     void TerrainDetailMaterialManager::OnTerrainSurfaceMaterialMappingDestroyed(AZ::EntityId entityId, SurfaceData::SurfaceTag surfaceTag)
     {
         DetailMaterialListRegion& materialRegion = FindOrCreateByEntityId(entityId, m_detailMaterialRegions);
-
-        for (DetailMaterialSurface& surface : materialRegion.m_materialsForSurfaces)
+        
+        [[maybe_unused]] bool found = ForSurfaceTag(materialRegion, surfaceTag,
+            [&](DetailMaterialSurface& surface)
         {
-            if (surface.m_surfaceTag == surfaceTag)
-            {
-                CheckDetailMaterialForDeletion(surface.m_detailMaterialId);
+            CheckDetailMaterialForDeletion(surface.m_detailMaterialId);
 
-                if (surface.m_surfaceTag != materialRegion.m_materialsForSurfaces.back().m_surfaceTag)
-                {
-                    AZStd::swap(surface, materialRegion.m_materialsForSurfaces.back());
-                }
-                materialRegion.m_materialsForSurfaces.pop_back();
-                m_dirtyDetailRegion.AddAabb(materialRegion.m_region);
-                return;
+            if (surface.m_surfaceTag != materialRegion.m_materialsForSurfaces.back().m_surfaceTag)
+            {
+                AZStd::swap(surface, materialRegion.m_materialsForSurfaces.back());
             }
+            materialRegion.m_materialsForSurfaces.pop_back();
+            m_dirtyDetailRegion.AddAabb(materialRegion.m_region);
+            return;
+        });
+
+        AZ_Error(TerrainDetailMaterialManagerName, found, "Could not find surface tag to destroy for OnTerrainSurfaceMaterialMappingDestroyed().");
+    }
+    
+    void TerrainDetailMaterialManager::OnTerrainSurfaceMaterialMappingMaterialChanged(
+        AZ::EntityId entityId, SurfaceData::SurfaceTag surfaceTag, MaterialInstance material)
+    {
+        DetailMaterialListRegion* materialRegion = FindByEntityId(entityId, m_detailMaterialRegions);
+        if (materialRegion == nullptr)
+        {
+            AZ_Assert(false, "OnTerrainSurfaceMaterialMappingMaterialChanged() called for region that doesn't exist.");
+            return;
         }
-        AZ_Error(TerrainDetailMaterialManagerName, false, "Could not find surface tag to destroy for OnTerrainSurfaceMaterialMappingDestroyed().");
+
+        // Update existing entry or create a new material entry
+        uint16_t materialId = CreateOrUpdateDetailMaterial(material);
+        
+        [[maybe_unused]] bool found = ForSurfaceTag(*materialRegion, surfaceTag,
+            [&](DetailMaterialSurface& surface)
+        {
+            if (surface.m_detailMaterialId != materialId)
+            {
+                // Updated material was a different asset than the old material, decrement ref count and
+                // delete if no other surface tags are using it.
+                ++m_detailMaterials.GetData(materialId).refCount;
+                CheckDetailMaterialForDeletion(surface.m_detailMaterialId);
+                surface.m_detailMaterialId = materialId;
+            }
+            m_dirtyDetailRegion.AddAabb(materialRegion->m_region);
+        });
+
+        AZ_Assert(found, "OnTerrainSurfaceMaterialMappingMaterialChanged() called for tag that doesn't exist.");
     }
 
-    void TerrainDetailMaterialManager::OnTerrainSurfaceMaterialMappingChanged(AZ::EntityId entityId, SurfaceData::SurfaceTag surfaceTag, MaterialInstance material)
+    void TerrainDetailMaterialManager::OnTerrainSurfaceMaterialMappingTagChanged(
+        AZ::EntityId entityId, SurfaceData::SurfaceTag oldTag,  SurfaceData::SurfaceTag newTag)
     {
-        DetailMaterialListRegion& materialRegion = FindOrCreateByEntityId(entityId, m_detailMaterialRegions);
-
-        bool found = false;
-        uint16_t materialId = CreateOrUpdateDetailMaterial(material);
-        for (DetailMaterialSurface& surface : materialRegion.m_materialsForSurfaces)
+        DetailMaterialListRegion* materialRegion = FindByEntityId(entityId, m_detailMaterialRegions);
+        if (materialRegion == nullptr)
         {
-            if (surface.m_surfaceTag == surfaceTag)
-            {
-                found = true;
-                if (surface.m_detailMaterialId != materialId)
-                {
-                    ++m_detailMaterials.GetData(materialId).refCount;
-                    CheckDetailMaterialForDeletion(surface.m_detailMaterialId);
-                    surface.m_detailMaterialId = materialId;
-                }
-                break;
-            }
+            AZ_Assert(false, "OnTerrainSurfaceMaterialMappingTagChanged() called for region that doesn't exist.");
+            return;
         }
-
-        if (!found)
+        
+        [[maybe_unused]] bool found = ForSurfaceTag(*materialRegion, oldTag,
+            [&](DetailMaterialSurface& surface)
         {
-            ++m_detailMaterials.GetData(materialId).refCount;
-            materialRegion.m_materialsForSurfaces.push_back({ surfaceTag, materialId });
-        }
-        m_dirtyDetailRegion.AddAabb(materialRegion.m_region);
+            surface.m_surfaceTag = newTag;
+            m_dirtyDetailRegion.AddAabb(materialRegion->m_region);
+        });
+        AZ_Assert(found, "OnTerrainSurfaceMaterialMappingTagChanged() called for tag that doesn't exist.");
     }
 
     void TerrainDetailMaterialManager::OnTerrainSurfaceMaterialMappingRegionChanged(AZ::EntityId entityId, const AZ::Aabb& oldRegion, const AZ::Aabb& newRegion)
@@ -667,23 +741,38 @@ namespace Terrain
             bool isFirstMaterial = true;
             float firstWeight = 0.0f;
             AZ::Vector2 position(surfacePoint.m_position.GetX(), surfacePoint.m_position.GetY());
+            const DetailMaterialListRegion* region = FindRegionForPosition(position);
+
+            if (region == nullptr)
+            {
+                pixels.at(index).m_material1 = m_passthroughMaterialId;
+                ++index;
+                return;
+            }
+
             for (const auto& surfaceTagWeight : surfacePoint.m_surfaceTags)
             {
                 if (surfaceTagWeight.m_weight > 0.0f)
                 {
                     AZ::Crc32 surfaceType = surfaceTagWeight.m_surfaceType;
-                    uint16_t materialId = GetDetailMaterialForSurfaceTypeAndPosition(surfaceType, position);
-                    if (materialId != m_detailMaterials.NoFreeSlot && materialId < 255)
+                    uint16_t materialId = GetDetailMaterialForSurfaceType(*region, surfaceType);
+                    if (materialId < 255)
                     {
                         if (isFirstMaterial)
                         {
+                            // First material is valid. Save its weight to calculate blend later
                             pixels.at(index).m_material1 = aznumeric_cast<uint8_t>(materialId);
                             firstWeight = surfaceTagWeight.m_weight;
-                            // m_blend only needs to be calculated is material 2 is found, otherwise the initial value of 0 is correct.
                             isFirstMaterial = false;
+                            static constexpr float MaxValueBeforeRounding = 254.5f / 255.0f;
+                            if (firstWeight >= MaxValueBeforeRounding)
+                            {
+                                break;
+                            }
                         }
                         else
                         {
+                            // Second material is valid, weight is relative based on first material's weight.
                             pixels.at(index).m_material2 = aznumeric_cast<uint8_t>(materialId);
                             float totalWeight = firstWeight + surfaceTagWeight.m_weight;
                             float blendWeight = 1.0f - (firstWeight / totalWeight);
@@ -691,11 +780,37 @@ namespace Terrain
                             break;
                         }
                     }
+                    continue; // search for second material
                 }
                 else
                 {
-                    break; // since the list is ordered, no other materials are in the list with positive weights.
+                    // No more valid materials in list since surfaceTagWeight is ordered.
+
+                    uint8_t defaultMaterial = region->m_defaultDetailMaterialId == InvalidDetailMaterailId ? m_passthroughMaterialId :
+                        aznumeric_cast<uint8_t>(m_detailMaterials.GetData(region->m_defaultDetailMaterialId).m_detailMaterialBufferIndex);
+
+                    if (isFirstMaterial)
+                    {
+                        // Only one material and it's the default material.
+                        pixels.at(index).m_material1 = defaultMaterial;
+                    }
+                    else
+                    {
+                        // Second material is default, weight is exactly what the first material requested
+                        pixels.at(index).m_material2 = defaultMaterial;
+                        float blendWeight = 1.0f - AZStd::clamp<float>(firstWeight, 0.0f, 1.0f);
+                        pixels.at(index).m_blend = aznumeric_cast<uint8_t>(AZStd::round(blendWeight * 255.0f));
+                    }
                 }
+
+                if (pixels.at(index).m_material1 == pixels.at(index).m_material2)
+                {
+                    // If the materials are the same, then make the blend 100% on the first id so the shader
+                    // doesn't blend identical materials
+                    pixels.at(index).m_blend = 0;
+                }
+
+                break;
             }
             ++index;
         };
@@ -723,23 +838,37 @@ namespace Terrain
 
         m_detailTextureImage->UpdateImageContents(imageUpdateRequest);
     }
-
-    uint16_t TerrainDetailMaterialManager::GetDetailMaterialForSurfaceTypeAndPosition(AZ::Crc32 surfaceType, const AZ::Vector2& position)
+    
+    uint16_t TerrainDetailMaterialManager::GetDetailMaterialForSurfaceType(const DetailMaterialListRegion& materialRegion, AZ::Crc32 surfaceType) const
+    {
+        for (const auto& materialSurface : materialRegion.m_materialsForSurfaces)
+        {
+            if (materialSurface.m_surfaceTag == surfaceType)
+            {
+                return m_detailMaterials.GetData(materialSurface.m_detailMaterialId).m_detailMaterialBufferIndex;
+            }
+        }
+        return InvalidDetailMaterailId;
+    }
+    
+    auto TerrainDetailMaterialManager::FindRegionForPosition(const AZ::Vector2& position) const -> const DetailMaterialListRegion*
     {
         for (const auto& materialRegion : m_detailMaterialRegions.GetDataVector())
         {
             if (materialRegion.m_region.Contains(AZ::Vector3(position.GetX(), position.GetY(), 0.0f)))
             {
-                for (const auto& materialSurface : materialRegion.m_materialsForSurfaces)
-                {
-                    if (materialSurface.m_surfaceTag == surfaceType)
-                    {
-                        return m_detailMaterials.GetData(materialSurface.m_detailMaterialId).m_detailMaterialBufferIndex;
-                    }
-                }
+                return &materialRegion;
             }
         }
-        return m_detailMaterials.NoFreeSlot;
+        return nullptr;
+    }
+
+    void TerrainDetailMaterialManager::InitializePassthroughDetailMaterial()
+    {
+        m_passthroughMaterialId = aznumeric_cast<uint8_t>(m_detailMaterialShaderData.Reserve());
+        DetailMaterialShaderData& materialShaderData = m_detailMaterialShaderData.GetElement(m_passthroughMaterialId);
+        // Material defaults to white (1.0, 1.0, 1.0), set the blend mode to multiply so it passes through to the macro material.
+        materialShaderData.m_flags = DetailTextureFlags::BlendModeMultiply;
     }
 
     auto TerrainDetailMaterialManager::FindByEntityId(AZ::EntityId entityId, AZ::Render::IndexedDataVector<DetailMaterialListRegion>& container)
@@ -784,5 +913,5 @@ namespace Terrain
         }
         AZ_Assert(false, "Entity Id not found in container.")
     }
-    
+
 }
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.h b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.h
index 3f63812e47..16423251ec 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.h
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.h
@@ -11,6 +11,7 @@
 #include <AzCore/base.h>
 #include <AzCore/Math/Aabb.h>
 #include <AzCore/std/containers/array.h>
+#include <AzCore/std/function/function_template.h>
 
 #include <AzFramework/Terrain/TerrainDataRequestBus.h>
 
@@ -151,7 +152,11 @@ namespace Terrain
             AZ::EntityId m_entityId;
             AZ::Aabb m_region{AZ::Aabb::CreateNull()};
             AZStd::vector<DetailMaterialSurface> m_materialsForSurfaces;
+            uint16_t m_defaultDetailMaterialId;
         };
+
+        using DetailMaterialContainer = AZ::Render::IndexedDataVector<DetailMaterialData>;
+        static constexpr auto InvalidDetailMaterailId = DetailMaterialContainer::NoFreeSlot;
         
         // System-level parameters
         static constexpr int32_t DetailTextureSize{ 1024 };
@@ -162,9 +167,14 @@ namespace Terrain
         void OnTerrainDataChanged(const AZ::Aabb& dirtyRegion, TerrainDataChangedMask dataChangedMask) override;
         
         // TerrainAreaMaterialNotificationBus overrides...
+        void OnTerrainDefaultSurfaceMaterialCreated(AZ::EntityId entityId, AZ::Data::Instance<AZ::RPI::Material> material) override;
+        void OnTerrainDefaultSurfaceMaterialDestroyed(AZ::EntityId entityId) override;
+        void OnTerrainDefaultSurfaceMaterialChanged(AZ::EntityId entityId, AZ::Data::Instance<AZ::RPI::Material> newMaterial) override;
         void OnTerrainSurfaceMaterialMappingCreated(AZ::EntityId entityId, SurfaceData::SurfaceTag surfaceTag, MaterialInstance material) override;
         void OnTerrainSurfaceMaterialMappingDestroyed(AZ::EntityId entityId, SurfaceData::SurfaceTag surfaceTag) override;
-        void OnTerrainSurfaceMaterialMappingChanged(AZ::EntityId entityId, SurfaceData::SurfaceTag surfaceTag, MaterialInstance material) override;
+        void OnTerrainSurfaceMaterialMappingMaterialChanged(AZ::EntityId entityId, SurfaceData::SurfaceTag surfaceTag, MaterialInstance material) override;
+        void OnTerrainSurfaceMaterialMappingTagChanged(
+            AZ::EntityId entityId, SurfaceData::SurfaceTag oldSurfaceTag, SurfaceData::SurfaceTag newSurfaceTag) override;
         void OnTerrainSurfaceMaterialMappingRegionChanged(AZ::EntityId entityId, const AZ::Aabb& oldRegion, const AZ::Aabb& newRegion) override;
 
         //! Removes all images from all detail materials from the bindless image array
@@ -186,22 +196,32 @@ namespace Terrain
         //! Updates the detail texture in a given area
         void UpdateDetailTexture(const AZ::Aabb& worldUpdateAabb, const Aabb2i& textureUpdateAabb);
 
-        //! Finds the detail material Id for a surface type and position
-        uint16_t GetDetailMaterialForSurfaceTypeAndPosition(AZ::Crc32 surfaceType, const AZ::Vector2& position);
+        //! Finds the detail material Id for a region and surface type
+        uint16_t GetDetailMaterialForSurfaceType(const DetailMaterialListRegion& materialRegion, AZ::Crc32 surfaceType) const;
 
+        //! Finds a region for a position. Returns nullptr if none found.
+        const DetailMaterialListRegion* FindRegionForPosition(const AZ::Vector2& position) const;
+    
+        //! Initializes shader data for the default passthrough material which is used when no other detail material is found.
+        void InitializePassthroughDetailMaterial();
+
+        using DefaultMaterialSurfaceCallback = AZStd::function<void(DetailMaterialSurface&)>;
+        bool ForSurfaceTag(DetailMaterialListRegion& materialRegion,
+            SurfaceData::SurfaceTag surfaceTag, DefaultMaterialSurfaceCallback callback);
         DetailMaterialListRegion* FindByEntityId(AZ::EntityId entityId, AZ::Render::IndexedDataVector<DetailMaterialListRegion>& container);
         DetailMaterialListRegion& FindOrCreateByEntityId(AZ::EntityId entityId, AZ::Render::IndexedDataVector<DetailMaterialListRegion>& container);
         void RemoveByEntityId(AZ::EntityId entityId, AZ::Render::IndexedDataVector<DetailMaterialListRegion>& container);
-        
+
         AZStd::shared_ptr<AZ::Render::BindlessImageArrayHandler> m_bindlessImageHandler;
         
         AZ::Data::Instance<AZ::RPI::AttachmentImage> m_detailTextureImage;
 
-        AZ::Render::IndexedDataVector<DetailMaterialData> m_detailMaterials;
+        DetailMaterialContainer m_detailMaterials;
         AZ::Render::IndexedDataVector<DetailMaterialListRegion> m_detailMaterialRegions;
         AZ::Render::SparseVector<DetailMaterialShaderData> m_detailMaterialShaderData;
         AZ::Render::GpuBufferHandler m_detailMaterialDataBuffer;
-        
+        uint8_t m_passthroughMaterialId = 0;
+
         AZ::Aabb m_dirtyDetailRegion{ AZ::Aabb::CreateNull() };
         ClipmapBounds m_detailMaterialIdBounds;
 
@@ -212,6 +232,6 @@ namespace Terrain
         bool m_isInitialized{ false };
         bool m_detailMaterialBufferNeedsUpdate{ false };
         bool m_detailImageNeedsUpdate{ false };
-
+        
     };
 }
diff --git a/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.cpp b/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.cpp
index 8976faadac..2a8f1ba1ca 100644
--- a/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.cpp
+++ b/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.cpp
@@ -61,6 +61,10 @@ TerrainSystem::TerrainSystem()
 
     m_requestedSettings = m_currentSettings;
     m_requestedSettings.m_worldBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-512.0f), AZ::Vector3(512.0f));
+
+    // Use the global JobManager for terrain jobs (we could create our own dedicated terrain JobManager if needed).
+    AZ::JobManagerBus::BroadcastResult(m_terrainJobManager, &AZ::JobManagerEvents::GetManager);
+    AZ_Assert(m_terrainJobManager, "No global JobManager found.");
 }
 
 TerrainSystem::~TerrainSystem()
@@ -106,6 +110,16 @@ void TerrainSystem::Activate()
 
 void TerrainSystem::Deactivate()
 {
+    {
+        // Cancel all active terrain jobs, and wait until they have completed.
+        AZStd::unique_lock<AZStd::mutex> lock(m_activeTerrainJobContextMutex);
+        for (auto activeTerrainJobContext : m_activeTerrainJobContexts)
+        {
+            activeTerrainJobContext->Cancel();
+        }
+        m_activeTerrainJobContextMutexConditionVariable.wait(lock, [this]{ return m_activeTerrainJobContexts.empty(); });
+    }
+
     // Stop listening to the bus even before we signal DestroyBegin so that way any calls to the terrain system as a *result* of
     // calling DestroyBegin will fail to reach the terrain system.
     AzFramework::Terrain::TerrainDataRequestBus::Handler::BusDisconnect();
@@ -177,6 +191,193 @@ bool TerrainSystem::InWorldBounds(float x, float y) const
     return false;
 }
 
+// Generate positions to be queried based on the sampler type.
+void TerrainSystem::GenerateQueryPositions(const AZStd::span<AZ::Vector3>& inPositions,
+    AZStd::vector<AZ::Vector3>& outPositions,
+    Sampler sampler) const
+{
+    const float minHeight = m_currentSettings.m_worldBounds.GetMin().GetZ();
+    for (auto& position : inPositions)
+    {
+        switch(sampler)
+        {
+        case AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR:
+            {
+                AZ::Vector2 normalizedDelta;
+                AZ::Vector2 pos0;
+                ClampPosition(position.GetX(), position.GetY(), pos0, normalizedDelta);
+                const AZ::Vector2 pos1(pos0.GetX() + m_currentSettings.m_heightQueryResolution,
+                    pos0.GetY() + m_currentSettings.m_heightQueryResolution);
+                outPositions.emplace_back(AZ::Vector3(pos0.GetX(), pos0.GetY(), minHeight));
+                outPositions.emplace_back(AZ::Vector3(pos1.GetX(), pos0.GetY(), minHeight));
+                outPositions.emplace_back(AZ::Vector3(pos0.GetX(), pos1.GetY(), minHeight));
+                outPositions.emplace_back(AZ::Vector3(pos1.GetX(), pos1.GetY(), minHeight));
+            }
+            break;
+        case AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP:
+            {
+                AZ::Vector2 normalizedDelta;
+                AZ::Vector2 clampedPosition;
+                ClampPosition(position.GetX(), position.GetY(), clampedPosition, normalizedDelta);
+                outPositions.emplace_back(AZ::Vector3(clampedPosition.GetX(), clampedPosition.GetY(), minHeight));
+            }
+            break;
+        case AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT:
+            [[fallthrough]];
+        default:
+            outPositions.emplace_back(AZ::Vector3(position.GetX(), position.GetY(), minHeight));
+            break;
+        }
+    }
+}
+
+AZStd::vector<AZ::Vector3> TerrainSystem::GenerateInputPositionsFromRegion(
+    const AZ::Aabb& inRegion,
+    const AZ::Vector2& stepSize) const
+{
+    AZStd::vector<AZ::Vector3> inPositions;
+    const auto [numSamplesX, numSamplesY] = GetNumSamplesFromRegion(inRegion, stepSize);
+    inPositions.reserve(numSamplesX * numSamplesY);
+
+    for (size_t y = 0; y < numSamplesY; y++)
+    {
+        float fy = aznumeric_cast<float>(inRegion.GetMin().GetY() + (y * stepSize.GetY()));
+        for (size_t x = 0; x < numSamplesX; x++)
+        {
+            float fx = aznumeric_cast<float>(inRegion.GetMin().GetX() + (x * stepSize.GetX()));
+            inPositions.emplace_back(AZ::Vector3(fx, fy, 0.0f));
+        }
+    }
+
+    return inPositions;
+}
+
+void TerrainSystem::MakeBulkQueries(
+    const AZStd::span<AZ::Vector3> inPositions,
+    AZStd::span<AZ::Vector3> outPositions,
+    AZStd::span<bool> outTerrainExists,
+    AZStd::span<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeights,
+    BulkQueriesCallback queryCallback) const
+{
+    AZ::Aabb bounds;
+    AZ::EntityId prevAreaId = FindBestAreaEntityAtPosition(inPositions[0].GetX(), inPositions[0].GetY(), bounds);
+    
+    // We use a sliding window here and update the window end for each
+    // position that falls in the same area as the previous positions. This consumes lesser memory
+    // than sorting the points into separate lists and handling putting them back together.
+    // This may be sub optimal if the points are randomly distributed in the list as opposed
+    // to points in the same area id being close to each other.
+    size_t windowStart = 0;
+    size_t windowEnd = 0;
+    const size_t numPositions = inPositions.size();
+    for(int i = 1; i < numPositions; i++)
+    {
+        AZ::EntityId areaId = FindBestAreaEntityAtPosition(inPositions[i].GetX(), inPositions[i].GetY(), bounds);
+        bool queryHeights = false;
+        if (areaId == prevAreaId)
+        {
+            // Update window end to current position.
+            // If it's the last position, submit the query.
+            windowEnd = i;
+            if (windowEnd == numPositions - 1)
+            {
+                queryHeights = true;
+            }
+        }
+        else
+        {
+            queryHeights = true;
+        }
+
+        if (queryHeights)
+        {
+            // If the area id is a default entity id, it usually means the
+            // position is outside world bounds.
+            if (prevAreaId != AZ::EntityId())
+            {
+                size_t spanLength = (windowEnd - windowStart) + 1;
+                queryCallback(AZStd::span<AZ::Vector3>(inPositions.begin() + windowStart, spanLength),
+                    AZStd::span<AZ::Vector3>(outPositions.begin() + windowStart, spanLength),
+                    AZStd::span<bool>(outTerrainExists.begin() + windowStart, spanLength),
+                    AZStd::span<AzFramework::SurfaceData::SurfaceTagWeightList>(outSurfaceWeights.begin() + windowStart, spanLength),
+                    prevAreaId);
+            }
+
+            // Reset the window to start at the current position. Set the new area
+            // id on which to run the next query.
+            windowStart = windowEnd = i;
+            prevAreaId = areaId;
+        }   
+    }
+}
+
+void TerrainSystem::GetHeightsSynchronous(const AZStd::span<AZ::Vector3>& inPositions, Sampler sampler, 
+    AZStd::span<float> heights, AZStd::span<bool> terrainExists) const
+{
+    AZStd::shared_lock<AZStd::shared_mutex> lock(m_areaMutex);
+
+    AZStd::vector<AZ::Vector3> outPositions;
+    AZStd::vector<bool> outTerrainExists;
+
+    // outPositions holds the iterators to results of the bulk queries.
+    // In the case of the bilinear sampler, we'll be making 4 queries per
+    // input position.
+    size_t indexStepSize = (sampler == AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) ? 4 : 1;
+    outPositions.reserve(inPositions.size() * indexStepSize);
+    outTerrainExists.resize(inPositions.size() * indexStepSize);
+
+    GenerateQueryPositions(inPositions, outPositions, sampler);
+
+    auto callback = []([[maybe_unused]] const AZStd::span<AZ::Vector3> inPositions,
+                        AZStd::span<AZ::Vector3> outPositions,
+                        AZStd::span<bool> outTerrainExists,
+                        [[maybe_unused]] AZStd::span<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeights,
+                        AZ::EntityId areaId)
+                        {
+                            AZ_Assert((inPositions.size() == outPositions.size() && inPositions.size() == outTerrainExists.size()),
+                                "The sizes of the terrain exists list and in/out positions list should match.");
+                            Terrain::TerrainAreaHeightRequestBus::Event(areaId, &Terrain::TerrainAreaHeightRequestBus::Events::GetHeights,
+                                outPositions, outTerrainExists);
+                        };
+
+    // This will be unused for heights. It's fine if it's empty.
+    AZStd::vector<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeights;
+    MakeBulkQueries(outPositions, outPositions, outTerrainExists, outSurfaceWeights, callback);
+
+    // Compute/store the final result
+    for (size_t i = 0, iteratorIndex = 0; i < inPositions.size(); i++, iteratorIndex += indexStepSize)
+    {
+        switch(sampler)
+        {
+        case AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR:
+            {
+                // We now need to compute the final height after all the bulk queries are done.
+                AZ::Vector2 normalizedDelta;
+                AZ::Vector2 clampedPosition;
+                ClampPosition(inPositions[i].GetX(), inPositions[i].GetY(), clampedPosition, normalizedDelta);
+                const float heightX0Y0 = outPositions[iteratorIndex].GetZ();
+                const float heightX1Y0 = outPositions[iteratorIndex + 1].GetZ();
+                const float heightX0Y1 = outPositions[iteratorIndex + 2].GetZ();
+                const float heightX1Y1 = outPositions[iteratorIndex + 3].GetZ();
+                const float heightXY0 = AZ::Lerp(heightX0Y0, heightX1Y0, normalizedDelta.GetX());
+                const float heightXY1 = AZ::Lerp(heightX0Y1, heightX1Y1, normalizedDelta.GetX());
+                heights[i] = AZ::Lerp(heightXY0, heightXY1, normalizedDelta.GetY());
+                terrainExists[i] = outTerrainExists[iteratorIndex];
+            }
+            break;
+        case AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP:
+            [[fallthrough]];
+        case AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT:
+            [[fallthrough]];
+        default:
+            // For clamp and exact, we just need to store the results of the bulk query.
+            heights[i] = outPositions[iteratorIndex].GetZ();
+            terrainExists[i] = outTerrainExists[iteratorIndex];
+            break;
+        }
+    }
+}
+
 float TerrainSystem::GetHeightSynchronous(float x, float y, Sampler sampler, bool* terrainExistsPtr) const
 {
     bool terrainExists = false;
@@ -315,6 +516,39 @@ bool TerrainSystem::GetIsHoleFromFloats(float x, float y, Sampler sampler) const
     return !terrainExists;
 }
 
+void TerrainSystem::GetNormalsSynchronous(const AZStd::span<AZ::Vector3>& inPositions, Sampler sampler, 
+    AZStd::span<AZ::Vector3> normals, AZStd::span<bool> terrainExists) const
+{
+    AZStd::vector<AZ::Vector3> directionVectors;
+    directionVectors.reserve(inPositions.size() * 4);
+    const AZ::Vector2 range(m_currentSettings.m_heightQueryResolution / 2.0f, m_currentSettings.m_heightQueryResolution / 2.0f);
+    size_t indexStepSize = 4;
+    for (auto& position : inPositions)
+    {
+        directionVectors.emplace_back(position.GetX(), position.GetY() - range.GetY(), 0.0f);
+        directionVectors.emplace_back(position.GetX() - range.GetX(), position.GetY(), 0.0f);
+        directionVectors.emplace_back(position.GetX() + range.GetX(), position.GetY(), 0.0f);
+        directionVectors.emplace_back(position.GetX(), position.GetY() + range.GetY(), 0.0f);
+    }
+
+    AZStd::vector<float> heights(directionVectors.size());
+    AZStd::vector<bool> exists(directionVectors.size());
+    GetHeightsSynchronous(directionVectors, sampler, heights, exists);
+
+    for (size_t i = 0, iteratorIndex = 0; i < inPositions.size(); i++, iteratorIndex += indexStepSize)
+    {
+        directionVectors[iteratorIndex].SetZ(heights[iteratorIndex]);
+        directionVectors[iteratorIndex + 1].SetZ(heights[iteratorIndex + 1]);
+        directionVectors[iteratorIndex + 2].SetZ(heights[iteratorIndex + 2]);
+        directionVectors[iteratorIndex + 3].SetZ(heights[iteratorIndex + 3]);
+
+        normals[i] = (directionVectors[iteratorIndex + 2] - directionVectors[iteratorIndex + 1]).
+                         Cross(directionVectors[iteratorIndex + 3] - directionVectors[iteratorIndex]).GetNormalized();
+        
+        terrainExists[i] = exists[iteratorIndex];
+    }
+}
+
 AZ::Vector3 TerrainSystem::GetNormalSynchronous(float x, float y, Sampler sampler, bool* terrainExistsPtr) const
 {
     AZStd::shared_lock<AZStd::shared_mutex> lock(m_areaMutex);
@@ -450,6 +684,130 @@ AzFramework::RenderGeometry::RayResult TerrainSystem::GetClosestIntersection(
     return m_terrainRaycastContext.RayIntersect(ray);
 }
 
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessHeightsFromListAsync(
+    const AZStd::span<AZ::Vector3>& inPositions,
+    AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+    Sampler sampleFilter,
+    AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromListAsync(AZStd::bind(&TerrainSystem::ProcessHeightsFromList, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
+        inPositions, perPositionCallback, sampleFilter, params);
+}
+
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessNormalsFromListAsync(
+    const AZStd::span<AZ::Vector3>& inPositions,
+    AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+    Sampler sampleFilter,
+    AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromListAsync(AZStd::bind(&TerrainSystem::ProcessNormalsFromList, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
+        inPositions, perPositionCallback, sampleFilter, params);
+}
+
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessSurfaceWeightsFromListAsync(
+    const AZStd::span<AZ::Vector3>& inPositions,
+    AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+    Sampler sampleFilter,
+    AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromListAsync(AZStd::bind(&TerrainSystem::ProcessSurfaceWeightsFromList, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
+        inPositions, perPositionCallback, sampleFilter, params);
+}
+
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessSurfacePointsFromListAsync(
+    const AZStd::span<AZ::Vector3>& inPositions,
+    AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+    Sampler sampleFilter,
+    AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromListAsync(AZStd::bind(&TerrainSystem::ProcessSurfacePointsFromList, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
+        inPositions, perPositionCallback, sampleFilter, params);
+}
+
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessHeightsFromListOfVector2Async(
+    const AZStd::span<AZ::Vector2>& inPositions,
+    AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+    Sampler sampleFilter,
+    AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromListAsync(AZStd::bind(&TerrainSystem::ProcessHeightsFromListOfVector2, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
+        inPositions, perPositionCallback, sampleFilter, params);
+}
+
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessNormalsFromListOfVector2Async(
+    const AZStd::span<AZ::Vector2>& inPositions,
+    AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+    Sampler sampleFilter,
+    AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromListAsync(AZStd::bind(&TerrainSystem::ProcessNormalsFromListOfVector2, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
+        inPositions, perPositionCallback, sampleFilter, params);
+}
+
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessSurfaceWeightsFromListOfVector2Async(
+    const AZStd::span<AZ::Vector2>& inPositions,
+    AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+    Sampler sampleFilter,
+    AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromListAsync(AZStd::bind(&TerrainSystem::ProcessSurfaceWeightsFromListOfVector2, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
+        inPositions, perPositionCallback, sampleFilter, params);
+}
+
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessSurfacePointsFromListOfVector2Async(
+    const AZStd::span<AZ::Vector2>& inPositions,
+    AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+    Sampler sampleFilter,
+    AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromListAsync(AZStd::bind(&TerrainSystem::ProcessSurfacePointsFromListOfVector2, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
+        inPositions, perPositionCallback, sampleFilter, params);
+}
+
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessHeightsFromRegionAsync(
+    const AZ::Aabb& inRegion,
+    const AZ::Vector2& stepSize,
+    AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback,
+    Sampler sampleFilter,
+    AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromRegionAsync(AZStd::bind(&TerrainSystem::ProcessHeightsFromRegion, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4),
+        inRegion, stepSize, perPositionCallback, sampleFilter, params);
+}
+
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessNormalsFromRegionAsync(
+    const AZ::Aabb& inRegion,
+    const AZ::Vector2& stepSize,
+    AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback,
+    Sampler sampleFilter,
+    AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromRegionAsync(AZStd::bind(&TerrainSystem::ProcessNormalsFromRegion, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4),
+        inRegion, stepSize, perPositionCallback, sampleFilter, params);
+}
+
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessSurfaceWeightsFromRegionAsync(
+    const AZ::Aabb& inRegion,
+    const AZ::Vector2& stepSize,
+    AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback,
+    Sampler sampleFilter,
+    AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromRegionAsync(AZStd::bind(&TerrainSystem::ProcessSurfaceWeightsFromRegion, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4),
+        inRegion, stepSize, perPositionCallback, sampleFilter, params);
+}
+
+AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessSurfacePointsFromRegionAsync(
+    const AZ::Aabb& inRegion,
+            const AZ::Vector2& stepSize,
+            AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback,
+            Sampler sampleFilter,
+            AZStd::shared_ptr<ProcessAsyncParams> params) const
+{
+    return ProcessFromRegionAsync(AZStd::bind(&TerrainSystem::ProcessSurfacePointsFromRegion, this, AZStd::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4),
+        inRegion, stepSize, perPositionCallback, sampleFilter, params);
+}
+
 AZ::EntityId TerrainSystem::FindBestAreaEntityAtPosition(float x, float y, AZ::Aabb& bounds) const
 {
     AZ::Vector3 inPosition = AZ::Vector3(x, y, 0);
@@ -471,6 +829,35 @@ AZ::EntityId TerrainSystem::FindBestAreaEntityAtPosition(float x, float y, AZ::A
     return AZ::EntityId();
 }
 
+void TerrainSystem::GetOrderedSurfaceWeightsFromList(
+    const AZStd::span<AZ::Vector3>& inPositions,
+    [[maybe_unused]] Sampler sampler,
+    AZStd::span<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeightsList,
+    AZStd::span<bool> terrainExists) const
+{
+    if (terrainExists.size() == outSurfaceWeightsList.size())
+    {
+        AZStd::vector<float> heights(inPositions.size());
+        GetHeightsSynchronous(inPositions, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, heights, terrainExists);
+    }
+
+    auto callback = [](const AZStd::span<AZ::Vector3> inPositions,
+                        [[maybe_unused]] AZStd::span<AZ::Vector3> outPositions,
+                        [[maybe_unused]] AZStd::span<bool> outTerrainExists,
+                        AZStd::span<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeights,
+                        AZ::EntityId areaId)
+                        {
+                            AZ_Assert(inPositions.size() == outSurfaceWeights.size(),
+                                "The sizes of the surface weights list and in/out positions list should match.");
+                            Terrain::TerrainAreaSurfaceRequestBus::Event(areaId, &Terrain::TerrainAreaSurfaceRequestBus::Events::GetSurfaceWeightsFromList,
+                                inPositions, outSurfaceWeights);
+                        };
+    
+    // This will be unused for surface weights. It's fine if it's empty.
+    AZStd::vector<AZ::Vector3> outPositions;
+    MakeBulkQueries(inPositions, outPositions, terrainExists, outSurfaceWeightsList, callback);
+}
+
 void TerrainSystem::GetOrderedSurfaceWeights(
     const float x,
     const float y,
@@ -551,13 +938,17 @@ void TerrainSystem::ProcessHeightsFromList(
         return;
     }
 
+    AZStd::vector<bool> terrainExists(inPositions.size());
+    AZStd::vector<float> heights(inPositions.size());
+
+    GetHeightsSynchronous(inPositions, sampleFilter, heights, terrainExists);
+
     AzFramework::SurfaceData::SurfacePoint surfacePoint;
-    for (const auto& position : inPositions)
+    for (size_t i = 0; i < inPositions.size(); i++)
     {
-        bool terrainExists = false;
-        surfacePoint.m_position = position;
-        surfacePoint.m_position.SetZ(GetHeight(position, sampleFilter, &terrainExists));
-        perPositionCallback(surfacePoint, terrainExists);
+        surfacePoint.m_position = inPositions[i];
+        surfacePoint.m_position.SetZ(heights[i]);
+        perPositionCallback(surfacePoint, terrainExists[i]);
     }
 }
 
@@ -571,13 +962,17 @@ void TerrainSystem::ProcessNormalsFromList(
         return;
     }
 
+    AZStd::vector<bool> terrainExists(inPositions.size());
+    AZStd::vector<AZ::Vector3> normals(inPositions.size());
+
+    GetNormalsSynchronous(inPositions, sampleFilter, normals, terrainExists);
+
     AzFramework::SurfaceData::SurfacePoint surfacePoint;
-    for (const auto& position : inPositions)
+    for (size_t i = 0; i < inPositions.size(); i++)
     {
-        bool terrainExists = false;
-        surfacePoint.m_position = position;
-        surfacePoint.m_normal = GetNormal(position, sampleFilter, &terrainExists);
-        perPositionCallback(surfacePoint, terrainExists);
+        surfacePoint.m_position = inPositions[i];
+        surfacePoint.m_normal = AZStd::move(normals[i]);
+        perPositionCallback(surfacePoint, terrainExists[i]);
     }
 }
 
@@ -591,13 +986,17 @@ void TerrainSystem::ProcessSurfaceWeightsFromList(
         return;
     }
 
+    AZStd::vector<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeightsList(inPositions.size());
+    AZStd::vector<bool> terrainExists(inPositions.size());
+
+    GetOrderedSurfaceWeightsFromList(inPositions, sampleFilter, outSurfaceWeightsList, terrainExists);
+
     AzFramework::SurfaceData::SurfacePoint surfacePoint;
-    for (const auto& position : inPositions)
+    for (size_t i = 0; i < inPositions.size(); i++)
     {
-        bool terrainExists = false;
-        surfacePoint.m_position = position;
-        GetSurfaceWeights(position, surfacePoint.m_surfaceTags, sampleFilter, &terrainExists);
-        perPositionCallback(surfacePoint, terrainExists);
+        surfacePoint.m_position = inPositions[i];
+        surfacePoint.m_surfaceTags = AZStd::move(outSurfaceWeightsList[i]);
+        perPositionCallback(surfacePoint, terrainExists[i]);
     }
 }
 
@@ -611,13 +1010,26 @@ void TerrainSystem::ProcessSurfacePointsFromList(
         return;
     }
 
+    AZStd::vector<float> heights(inPositions.size());
+    AZStd::vector<AZ::Vector3> normals(inPositions.size());
+    AZStd::vector<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeightsList(inPositions.size());
+    AZStd::vector<bool> terrainExists(inPositions.size());
+
+    GetHeightsSynchronous(inPositions, sampleFilter, heights, terrainExists);
+    GetNormalsSynchronous(inPositions, sampleFilter, normals, terrainExists);
+
+    // We can skip the unnecessary call to GetHeights since we already
+    // got the terrain exists flags in the earlier call to GetHeights
+    AZStd::vector<bool> terrainExistsEmpty;
+    GetOrderedSurfaceWeightsFromList(inPositions, sampleFilter, outSurfaceWeightsList, terrainExistsEmpty);
+
     AzFramework::SurfaceData::SurfacePoint surfacePoint;
-    for (const auto& position : inPositions)
+    for (size_t i = 0; i < inPositions.size(); i++)
     {
-        bool terrainExists = false;
-        surfacePoint.m_position = position;
-        GetSurfacePoint(position, surfacePoint, sampleFilter, &terrainExists);
-        perPositionCallback(surfacePoint, terrainExists);
+        surfacePoint.m_position.Set(inPositions[i].GetX(), inPositions[i].GetY(), heights[i]);
+        surfacePoint.m_normal = AZStd::move(normals[i]);
+        surfacePoint.m_surfaceTags = AZStd::move(outSurfaceWeightsList[i]);
+        perPositionCallback(surfacePoint, terrainExists[i]);
     }
 }
 
@@ -723,20 +1135,23 @@ void TerrainSystem::ProcessHeightsFromRegion(
         return;
     }
 
-    const size_t numSamplesX = aznumeric_cast<size_t>(ceil(inRegion.GetExtents().GetX() / stepSize.GetX()));
-    const size_t numSamplesY = aznumeric_cast<size_t>(ceil(inRegion.GetExtents().GetY() / stepSize.GetY()));
+    const auto [numSamplesX, numSamplesY] = GetNumSamplesFromRegion(inRegion, stepSize);
+
+    AZStd::vector<AZ::Vector3> inPositions = GenerateInputPositionsFromRegion(inRegion, stepSize);
+
+    AZStd::vector<bool> terrainExists(inPositions.size());
+    AZStd::vector<float> heights(inPositions.size());
+
+    GetHeightsSynchronous(inPositions, sampleFilter, heights, terrainExists);
     
     AzFramework::SurfaceData::SurfacePoint surfacePoint;
-    for (size_t y = 0; y < numSamplesY; y++)
+    for (size_t y = 0, i = 0; y < numSamplesY; y++)
     {
-        float fy = aznumeric_cast<float>(inRegion.GetMin().GetY() + (y * stepSize.GetY()));
         for (size_t x = 0; x < numSamplesX; x++)
         {
-            bool terrainExists = false;
-            float fx = aznumeric_cast<float>(inRegion.GetMin().GetX() + (x * stepSize.GetX()));
-            surfacePoint.m_position.Set(fx, fy, 0.0f);
-            surfacePoint.m_position.SetZ(GetHeight(surfacePoint.m_position, sampleFilter, &terrainExists));
-            perPositionCallback(x, y, surfacePoint, terrainExists);
+            surfacePoint.m_position.Set(inPositions[i].GetX(), inPositions[i].GetY(), heights[i]);
+            perPositionCallback(x, y, surfacePoint, terrainExists[i]);
+            i++;
         }
     }
 }
@@ -753,20 +1168,24 @@ void TerrainSystem::ProcessNormalsFromRegion(
         return;
     }
 
-    const size_t numSamplesX = aznumeric_cast<size_t>(ceil(inRegion.GetExtents().GetX() / stepSize.GetX()));
-    const size_t numSamplesY = aznumeric_cast<size_t>(ceil(inRegion.GetExtents().GetY() / stepSize.GetY()));
+    const auto [numSamplesX, numSamplesY] = GetNumSamplesFromRegion(inRegion, stepSize);
+
+    AZStd::vector<AZ::Vector3> inPositions = GenerateInputPositionsFromRegion(inRegion, stepSize);
+
+    AZStd::vector<bool> terrainExists(inPositions.size());
+    AZStd::vector<AZ::Vector3> normals(inPositions.size());
+
+    GetNormalsSynchronous(inPositions, sampleFilter, normals, terrainExists);
 
     AzFramework::SurfaceData::SurfacePoint surfacePoint;
-    for (size_t y = 0; y < numSamplesY; y++)
+    for (size_t y = 0, i = 0; y < numSamplesY; y++)
     {
-        float fy = aznumeric_cast<float>(inRegion.GetMin().GetY() + (y * stepSize.GetY()));
         for (size_t x = 0; x < numSamplesX; x++)
         {
-            bool terrainExists = false;
-            float fx = aznumeric_cast<float>(inRegion.GetMin().GetX() + (x * stepSize.GetX()));
-            surfacePoint.m_position.Set(fx, fy, 0.0f);
-            surfacePoint.m_normal = GetNormal(surfacePoint.m_position, sampleFilter, &terrainExists);
-            perPositionCallback(x, y, surfacePoint, terrainExists);
+            surfacePoint.m_position.Set(inPositions[i].GetX(), inPositions[i].GetY(), 0.0f);
+            surfacePoint.m_normal = AZStd::move(normals[i]);
+            perPositionCallback(x, y, surfacePoint, terrainExists[i]);
+            i++;
         }
     }
 }
@@ -783,20 +1202,24 @@ void TerrainSystem::ProcessSurfaceWeightsFromRegion(
         return;
     }
 
-    const size_t numSamplesX = aznumeric_cast<size_t>(ceil(inRegion.GetExtents().GetX() / stepSize.GetX()));
-    const size_t numSamplesY = aznumeric_cast<size_t>(ceil(inRegion.GetExtents().GetY() / stepSize.GetY()));
+    const auto [numSamplesX, numSamplesY] = GetNumSamplesFromRegion(inRegion, stepSize);
+
+    AZStd::vector<AZ::Vector3> inPositions = GenerateInputPositionsFromRegion(inRegion, stepSize);
+
+    AZStd::vector<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeightsList(inPositions.size());
+    AZStd::vector<bool> terrainExists(inPositions.size());
+
+    GetOrderedSurfaceWeightsFromList(inPositions, sampleFilter, outSurfaceWeightsList, terrainExists);
 
     AzFramework::SurfaceData::SurfacePoint surfacePoint;
-    for (size_t y = 0; y < numSamplesY; y++)
+    for (size_t y = 0, i = 0; y < numSamplesY; y++)
     {
-        float fy = aznumeric_cast<float>(inRegion.GetMin().GetY() + (y * stepSize.GetY()));
         for (size_t x = 0; x < numSamplesX; x++)
         {
-            bool terrainExists = false;
-            float fx = aznumeric_cast<float>(inRegion.GetMin().GetX() + (x * stepSize.GetX()));
-            surfacePoint.m_position.Set(fx, fy, 0.0f);
-            GetSurfaceWeights(surfacePoint.m_position, surfacePoint.m_surfaceTags, sampleFilter, &terrainExists);
-            perPositionCallback(x, y, surfacePoint, terrainExists);
+            surfacePoint.m_position.Set(inPositions[i].GetX(), inPositions[i].GetY(), 0.0f);
+            surfacePoint.m_surfaceTags = AZStd::move(outSurfaceWeightsList[i]);
+            perPositionCallback(x, y, surfacePoint, terrainExists[i]);
+            i++;
         }
     }
 }
@@ -813,20 +1236,33 @@ void TerrainSystem::ProcessSurfacePointsFromRegion(
         return;
     }
 
-    const size_t numSamplesX = aznumeric_cast<size_t>(ceil(inRegion.GetExtents().GetX() / stepSize.GetX()));
-    const size_t numSamplesY = aznumeric_cast<size_t>(ceil(inRegion.GetExtents().GetY() / stepSize.GetY()));
+    const auto [numSamplesX, numSamplesY] = GetNumSamplesFromRegion(inRegion, stepSize);
+
+    AZStd::vector<AZ::Vector3> inPositions = GenerateInputPositionsFromRegion(inRegion, stepSize);
+
+    AZStd::vector<float> heights(inPositions.size());
+    AZStd::vector<AZ::Vector3> normals(inPositions.size());
+    AZStd::vector<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeightsList(inPositions.size());
+    AZStd::vector<bool> terrainExists(inPositions.size());
+
+    GetHeightsSynchronous(inPositions, sampleFilter, heights, terrainExists);
+    GetNormalsSynchronous(inPositions, sampleFilter, normals, terrainExists);
+
+    // We can skip the unnecessary call to GetHeights since we already
+    // got the terrain exists flags in the earlier call to GetHeights
+    AZStd::vector<bool> terrainExistsEmpty;
+    GetOrderedSurfaceWeightsFromList(inPositions, sampleFilter, outSurfaceWeightsList, terrainExistsEmpty);
 
     AzFramework::SurfaceData::SurfacePoint surfacePoint;
-    for (size_t y = 0; y < numSamplesY; y++)
+    for (size_t y = 0, i = 0; y < numSamplesY; y++)
     {
-        float fy = aznumeric_cast<float>(inRegion.GetMin().GetY() + (y * stepSize.GetY()));
         for (size_t x = 0; x < numSamplesX; x++)
         {
-            bool terrainExists = false;
-            float fx = aznumeric_cast<float>(inRegion.GetMin().GetX() + (x * stepSize.GetX()));
-            surfacePoint.m_position.Set(fx, fy, 0.0f);
-            GetSurfacePoint(surfacePoint.m_position, surfacePoint, sampleFilter, &terrainExists);
-            perPositionCallback(x, y, surfacePoint, terrainExists);
+            surfacePoint.m_position.Set(inPositions[i].GetX(), inPositions[i].GetY(), heights[i]);
+            surfacePoint.m_normal = AZStd::move(normals[i]);
+            surfacePoint.m_surfaceTags = AZStd::move(outSurfaceWeightsList[i]);
+            perPositionCallback(x, y, surfacePoint, terrainExists[i]);
+            i++;
         }
     }
 }
diff --git a/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h b/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h
index e0457b80af..a4a309c0a7 100644
--- a/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h
+++ b/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h
@@ -12,6 +12,7 @@
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
+#include <AzCore/std/parallel/condition_variable.h>
 #include <AzCore/std/parallel/shared_mutex.h>
 #include <AzCore/std/containers/map.h>
 #include <AzCore/std/containers/span.h>
@@ -192,7 +193,89 @@ namespace Terrain
         AzFramework::RenderGeometry::RayResult GetClosestIntersection(
             const AzFramework::RenderGeometry::RayRequest& ray) const override;
 
+        AZStd::shared_ptr<TerrainJobContext> ProcessHeightsFromListAsync(
+            const AZStd::span<AZ::Vector3>& inPositions,
+            AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+        AZStd::shared_ptr<TerrainJobContext> ProcessNormalsFromListAsync(
+            const AZStd::span<AZ::Vector3>& inPositions,
+            AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+        AZStd::shared_ptr<TerrainJobContext> ProcessSurfaceWeightsFromListAsync(
+            const AZStd::span<AZ::Vector3>& inPositions,
+            AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+        AZStd::shared_ptr<TerrainJobContext> ProcessSurfacePointsFromListAsync(
+            const AZStd::span<AZ::Vector3>& inPositions,
+            AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+        AZStd::shared_ptr<TerrainJobContext> ProcessHeightsFromListOfVector2Async(
+            const AZStd::span<AZ::Vector2>& inPositions,
+            AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+        AZStd::shared_ptr<TerrainJobContext> ProcessNormalsFromListOfVector2Async(
+            const AZStd::span<AZ::Vector2>& inPositions,
+            AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+        AZStd::shared_ptr<TerrainJobContext> ProcessSurfaceWeightsFromListOfVector2Async(
+            const AZStd::span<AZ::Vector2>& inPositions,
+            AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+        AZStd::shared_ptr<TerrainJobContext> ProcessSurfacePointsFromListOfVector2Async(
+            const AZStd::span<AZ::Vector2>& inPositions,
+            AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+        AZStd::shared_ptr<TerrainJobContext> ProcessHeightsFromRegionAsync(
+            const AZ::Aabb& inRegion,
+            const AZ::Vector2& stepSize,
+            AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+        AZStd::shared_ptr<TerrainJobContext> ProcessNormalsFromRegionAsync(
+            const AZ::Aabb& inRegion,
+            const AZ::Vector2& stepSize,
+            AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+        AZStd::shared_ptr<TerrainJobContext> ProcessSurfaceWeightsFromRegionAsync(
+            const AZ::Aabb& inRegion,
+            const AZ::Vector2& stepSize,
+            AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+        AZStd::shared_ptr<TerrainJobContext> ProcessSurfacePointsFromRegionAsync(
+            const AZ::Aabb& inRegion,
+            const AZ::Vector2& stepSize,
+            AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const override;
+
     private:
+        template<typename SynchronousFunctionType, typename VectorType>
+        AZStd::shared_ptr<TerrainJobContext> ProcessFromListAsync(
+            SynchronousFunctionType synchronousFunction,
+            const AZStd::span<VectorType>& inPositions,
+            AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const;
+
+        template<typename SynchronousFunctionType>
+        AZStd::shared_ptr<TerrainJobContext> ProcessFromRegionAsync(
+            SynchronousFunctionType synchronousFunction,
+            const AZ::Aabb& inRegion,
+            const AZ::Vector2& stepSize,
+            AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback,
+            Sampler sampleFilter = Sampler::DEFAULT,
+            AZStd::shared_ptr<ProcessAsyncParams> params = nullptr) const;
+
         void ClampPosition(float x, float y, AZ::Vector2& outPosition, AZ::Vector2& normalizedDelta) const;
         bool InWorldBounds(float x, float y) const;
 
@@ -207,6 +290,38 @@ namespace Terrain
         float GetTerrainAreaHeight(float x, float y, bool& terrainExists) const;
         AZ::Vector3 GetNormalSynchronous(float x, float y, Sampler sampler, bool* terrainExistsPtr) const;
 
+        typedef AZStd::function<void(
+            const AZStd::span<AZ::Vector3> inPositions,
+            AZStd::span<AZ::Vector3> outPositions,
+            AZStd::span<bool> outTerrainExists,
+            AZStd::span<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeights,
+            AZ::EntityId areaId)> BulkQueriesCallback;
+
+        void GetHeightsSynchronous(
+            const AZStd::span<AZ::Vector3>& inPositions,
+            Sampler sampler, AZStd::span<float> heights,
+            AZStd::span<bool> terrainExists) const;
+        void GetNormalsSynchronous(
+            const AZStd::span<AZ::Vector3>& inPositions,
+            Sampler sampler, AZStd::span<AZ::Vector3> normals,
+            AZStd::span<bool> terrainExists) const;
+        void GetOrderedSurfaceWeightsFromList(
+            const AZStd::span<AZ::Vector3>& inPositions, Sampler sampler,
+            AZStd::span<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeightsList,
+            AZStd::span<bool> terrainExists) const;
+        void MakeBulkQueries(
+            const AZStd::span<AZ::Vector3> inPositions,
+            AZStd::span<AZ::Vector3> outPositions,
+            AZStd::span<bool> outTerrainExists,
+            AZStd::span<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWieghts,
+            BulkQueriesCallback queryCallback) const;
+        void GenerateQueryPositions(const AZStd::span<AZ::Vector3>& inPositions, 
+            AZStd::vector<AZ::Vector3>& outPositions,
+            Sampler sampler) const;
+        AZStd::vector<AZ::Vector3> GenerateInputPositionsFromRegion(
+            const AZ::Aabb& inRegion,
+            const AZ::Vector2& stepSize) const;
+
         // AZ::TickBus::Handler overrides ...
         void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
 
@@ -236,5 +351,166 @@ namespace Terrain
         AZStd::map<AZ::EntityId, TerrainAreaData, TerrainLayerPriorityComparator> m_registeredAreas;
 
         mutable TerrainRaycastContext m_terrainRaycastContext;
+
+        AZ::JobManager* m_terrainJobManager = nullptr;
+        mutable AZStd::mutex m_activeTerrainJobContextMutex;
+        mutable AZStd::condition_variable m_activeTerrainJobContextMutexConditionVariable;
+        mutable AZStd::deque<AZStd::shared_ptr<TerrainJobContext>> m_activeTerrainJobContexts;
     };
+
+    template<typename SynchronousFunctionType, typename VectorType>
+    inline AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessFromListAsync(
+        SynchronousFunctionType synchronousFunction,
+        const AZStd::span<VectorType>& inPositions,
+        AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback,
+        Sampler sampleFilter,
+        AZStd::shared_ptr<ProcessAsyncParams> params) const
+    {
+        // Determine the number of jobs to split the work into based on:
+        // 1. The number of available worker threads.
+        // 2. The desired number of jobs as passed in.
+        // 3. The number of positions being processed.
+        const int32_t numWorkerThreads = m_terrainJobManager->GetNumWorkerThreads();
+        const int32_t numJobsDesired = params ? params->m_desiredNumberOfJobs : ProcessAsyncParams::NumJobsDefault;
+        const int32_t numJobsMax = (numJobsDesired > 0) ? AZStd::min(numWorkerThreads, numJobsDesired) : numWorkerThreads;
+        const int32_t numPositionsToProcess = static_cast<int32_t>(inPositions.size());
+        const int32_t minPositionsPerJob = params && (params->m_desiredNumberOfJobs > 0) ? params->m_desiredNumberOfJobs : ProcessAsyncParams::MinPositionsPerJobDefault;
+        const int32_t numJobs = AZStd::min(numJobsMax, numPositionsToProcess / minPositionsPerJob);
+        if (numJobs <= 0)
+        {
+            AZ_Warning("TerrainSystem", false, "No positions to process.");
+            return nullptr;
+        }
+
+        // Create a terrain job context, track it, and split the work across multiple jobs.
+        AZStd::shared_ptr<TerrainJobContext> jobContext = AZStd::make_shared<TerrainJobContext>(*m_terrainJobManager, numJobs);
+        {
+            AZStd::unique_lock<AZStd::mutex> lock(m_activeTerrainJobContextMutex);
+            m_activeTerrainJobContexts.push_back(jobContext);
+        }
+        const int32_t numPositionsPerJob = numPositionsToProcess / numJobs;
+        for (int32_t i = 0; i < numJobs; ++i)
+        {
+            // If the number of positions can't be divided evenly by the number of jobs,
+            // ensure we still process the remaining positions along with the final job.
+            const size_t subSpanOffset = i * numPositionsPerJob;
+            const size_t subSpanCount = (i < numJobs - 1) ? numPositionsPerJob : AZStd::dynamic_extent;
+
+            // Define the job function using the sub span of positions to process.
+            const AZStd::span<VectorType>& positionsToProcess = inPositions.subspan(subSpanOffset, subSpanCount);
+            auto jobFunction = [this, synchronousFunction, positionsToProcess, perPositionCallback, sampleFilter, jobContext, params]()
+            {
+                // Process the sub span of positions, unless the associated job context has been cancelled.
+                if (!jobContext->IsCancelled())
+                {
+                    synchronousFunction(positionsToProcess, perPositionCallback, sampleFilter);
+                }
+
+                // Decrement the number of completions remaining, invoke the completion callback if this happens
+                // to be the final job completed, and remove this TerrainJobContext from the list of active ones.
+                const bool wasLastJobCompleted = jobContext->OnJobCompleted();
+                if (wasLastJobCompleted)
+                {
+                    if (params && params->m_completionCallback)
+                    {
+                        params->m_completionCallback(jobContext);
+                    }
+
+                    {
+                        AZStd::unique_lock<AZStd::mutex> lock(m_activeTerrainJobContextMutex);
+                        m_activeTerrainJobContexts.erase(AZStd::find(m_activeTerrainJobContexts.begin(),
+                                                                     m_activeTerrainJobContexts.end(),
+                                                                     jobContext));
+                        m_activeTerrainJobContextMutexConditionVariable.notify_one();
+                    }
+                }
+            };
+
+            // Create the job and start it immediately.
+            AZ::Job* processJob = AZ::CreateJobFunction(jobFunction, true, jobContext.get());
+            processJob->Start();
+        }
+
+        return jobContext;
+    }
+
+    template<typename SynchronousFunctionType>
+    inline AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> TerrainSystem::ProcessFromRegionAsync(
+        SynchronousFunctionType synchronousFunction,
+        const AZ::Aabb& inRegion,
+        const AZ::Vector2& stepSize,
+        AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback,
+        Sampler sampleFilter,
+        AZStd::shared_ptr<ProcessAsyncParams> params) const
+    {
+        // ToDo: Determine the number of jobs to split the work into based on:
+        // 1. The number of available worker threads.
+        // 2. The desired number of jobs as passed in.
+        // 3. The size of the area being processed.
+        //
+        // Note: We are currently restricting the number of worker threads to one
+        // because splitting the work over multiple threads causes contention when
+        // locking various mutexes, resulting in slower overall wall time for async
+        // requests split over multiple threads vs one where all the work is done on
+        // a single thread. The latter is still preferable over a regular synchronous
+        // call because it is just as quick and prevents the main thread from blocking.
+        // Once the mutex contention issues have been addressed, we should come up with
+        // an algorithm to break up 'inRegion' into sub-regions (or lists of positions?)
+        // so that async calls automatically split the work between available job manager
+        // worker threads, unless the ProcessAsyncParams specifiy a desired number of jobs.
+        const int32_t numWorkerThreads = m_terrainJobManager->GetNumWorkerThreads();
+        const int32_t numJobsDesired = params ? params->m_desiredNumberOfJobs : ProcessAsyncParams::NumJobsDefault;
+        int32_t numJobs = (numJobsDesired > 0) ? AZStd::min(numWorkerThreads, numJobsDesired) : numWorkerThreads;
+        if (numJobs != 1)
+        {
+            // Temp until we figure out how to break up the region.
+            AZ_Warning("TerrainSystem", false, "We don't yet support breaking up regions.");
+            numJobs = 1;
+        }
+
+        // Create a terrain job context and split the work across multiple jobs.
+        AZStd::shared_ptr<TerrainJobContext> jobContext = AZStd::make_shared<TerrainJobContext>(*m_terrainJobManager, numJobs);
+        {
+            AZStd::unique_lock<AZStd::mutex> lock(m_activeTerrainJobContextMutex);
+            m_activeTerrainJobContexts.push_back(jobContext);
+        }
+        for (int32_t i = 0; i < numJobs; ++i)
+        {
+            // Define the job function using the sub region of positions to process.
+            const AZ::Aabb& subRegion = inRegion; // ToDo: Figure out how to break up the region.
+            auto jobFunction = [this, synchronousFunction, subRegion, stepSize, perPositionCallback, sampleFilter, jobContext, params]()
+            {
+                // Process the sub region of positions, unless the associated job context has been cancelled.
+                if (!jobContext->IsCancelled())
+                {
+                    synchronousFunction(subRegion, stepSize, perPositionCallback, sampleFilter);
+                }
+
+                // Decrement the number of completions remaining, invoke the completion callback if this happens
+                // to be the final job completed, and remove this TerrainJobContext from the list of active ones.
+                const bool wasLastJobCompleted = jobContext->OnJobCompleted();
+                if (wasLastJobCompleted)
+                {
+                    if (params && params->m_completionCallback)
+                    {
+                        params->m_completionCallback(jobContext);
+                    }
+
+                    {
+                        AZStd::unique_lock<AZStd::mutex> lock(m_activeTerrainJobContextMutex);
+                        m_activeTerrainJobContexts.erase(AZStd::find(m_activeTerrainJobContexts.begin(),
+                                                                     m_activeTerrainJobContexts.end(),
+                                                                     jobContext));
+                        m_activeTerrainJobContextMutexConditionVariable.notify_one();
+                    }
+                }
+            };
+
+            // Create the job and start it immediately.
+            AZ::Job* processJob = AZ::CreateJobFunction(jobFunction, true, jobContext.get());
+            processJob->Start();
+        }
+
+        return jobContext;
+    }
 } // namespace Terrain
diff --git a/Gems/Terrain/Code/Tests/TerrainSystemBenchmarks.cpp b/Gems/Terrain/Code/Tests/TerrainSystemBenchmarks.cpp
index 6aad3f9568..7327dc4158 100644
--- a/Gems/Terrain/Code/Tests/TerrainSystemBenchmarks.cpp
+++ b/Gems/Terrain/Code/Tests/TerrainSystemBenchmarks.cpp
@@ -13,6 +13,8 @@
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/Random.h>
 #include <AzCore/Memory/PoolAllocator.h>
+#include <AzCore/Jobs/JobManagerComponent.h>
+#include <AzCore/std/parallel/semaphore.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzFramework/Components/TransformComponent.h>
 #include <AzFramework/Terrain/TerrainDataRequestBus.h>
@@ -263,7 +265,17 @@ namespace UnitTest
             auto spawnerShapeRequests = CreateMockShape(worldBounds, testLayerSpawnerEntity->GetId());
             ActivateEntity(testLayerSpawnerEntity.get());
 
+            // Create the global job manager.
+            auto serializeContext = AZStd::make_unique<AZ::SerializeContext>();
+            auto jobManagerComponentDescriptor = AZ::JobManagerComponent::CreateDescriptor();
+            jobManagerComponentDescriptor->Reflect(serializeContext.get());
+            auto jobManagerEntity = AZStd::make_unique<AZ::Entity>();
+            jobManagerEntity->CreateComponent<AZ::JobManagerComponent>();
+            jobManagerEntity->Init();
+            jobManagerEntity->Activate();
+
             // Create the terrain system (do this after creating the terrain layer entity to ensure that we don't need any data refreshes)
+            // Also ensure to do this after creating the global JobManager.
             auto terrainSystem = CreateAndActivateTerrainSystem(queryResolution, worldBounds);
 
             // Call the terrain API we're testing for every height and width in our ranges.
@@ -372,6 +384,51 @@ namespace UnitTest
         ->Args({ 4096, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
         ->Unit(::benchmark::kMillisecond);
 
+    BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessHeightsRegionAsync)(benchmark::State& state)
+    {
+        // Run the benchmark
+        RunTerrainApiBenchmark(
+            state,
+            []([[maybe_unused]] float queryResolution, const AZ::Aabb& worldBounds,
+                AzFramework::Terrain::TerrainDataRequests::Sampler sampler)
+            {
+                auto perPositionCallback = []([[maybe_unused]] size_t xIndex, [[maybe_unused]] size_t yIndex, 
+                    const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists)
+                {
+                    benchmark::DoNotOptimize(surfacePoint.m_position.GetZ());
+                };
+
+                AZStd::semaphore completionEvent;
+                auto completionCallback = [&completionEvent](AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext>)
+                {
+                    completionEvent.release();
+                };
+
+                AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams> asyncParams
+                    = AZStd::make_shared<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams>();
+                asyncParams->m_completionCallback = completionCallback;
+
+                AZ::Vector2 stepSize = AZ::Vector2(queryResolution);
+                AzFramework::Terrain::TerrainDataRequestBus::Broadcast(
+                    &AzFramework::Terrain::TerrainDataRequests::ProcessHeightsFromRegionAsync, worldBounds, stepSize, perPositionCallback, sampler, asyncParams);
+
+                completionEvent.acquire();
+            }
+        );
+    }
+
+    BENCHMARK_REGISTER_F(TerrainSystemBenchmarkFixture, BM_ProcessHeightsRegionAsync)
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 4096, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 4096, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 4096, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Unit(::benchmark::kMillisecond);
+
     BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessHeightsList)(benchmark::State& state)
     {
         // Run the benchmark
@@ -406,6 +463,51 @@ namespace UnitTest
         ->Args({ 4096, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
         ->Unit(::benchmark::kMillisecond);
 
+    BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessHeightsListAsync)(benchmark::State& state)
+    {
+        // Run the benchmark
+        RunTerrainApiBenchmark(
+            state,
+            [this]([[maybe_unused]] float queryResolution, const AZ::Aabb& worldBounds,
+                AzFramework::Terrain::TerrainDataRequests::Sampler sampler)
+            {
+                AZStd::vector<AZ::Vector3> inPositions;
+                GenerateInputPositionsList(queryResolution, worldBounds, inPositions);
+
+                auto perPositionCallback = [](const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists)
+                {
+                    benchmark::DoNotOptimize(surfacePoint.m_position.GetZ());
+                };
+
+                AZStd::semaphore completionEvent;
+                auto completionCallback = [&completionEvent](AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext>)
+                {
+                    completionEvent.release();
+                };
+
+                AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams> asyncParams
+                    = AZStd::make_shared<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams>();
+                asyncParams->m_completionCallback = completionCallback;
+                AzFramework::Terrain::TerrainDataRequestBus::Broadcast(
+                    &AzFramework::Terrain::TerrainDataRequests::ProcessHeightsFromListAsync, inPositions, perPositionCallback, sampler, asyncParams);
+
+                completionEvent.acquire();
+            }
+        );
+    }
+
+    BENCHMARK_REGISTER_F(TerrainSystemBenchmarkFixture, BM_ProcessHeightsListAsync)
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 4096, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 4096, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 4096, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Unit(::benchmark::kMillisecond);
+
     BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_GetNormal)(benchmark::State& state)
     {
         // Run the benchmark
@@ -467,6 +569,48 @@ namespace UnitTest
         ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
         ->Unit(::benchmark::kMillisecond);
 
+    BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessNormalsRegionAsync)(benchmark::State& state)
+    {
+        // Run the benchmark
+        RunTerrainApiBenchmark(
+            state,
+            []([[maybe_unused]] float queryResolution, const AZ::Aabb& worldBounds,
+                AzFramework::Terrain::TerrainDataRequests::Sampler sampler)
+            {
+                auto perPositionCallback = []([[maybe_unused]] size_t xIndex, [[maybe_unused]] size_t yIndex, 
+                    const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists)
+                {
+                    benchmark::DoNotOptimize(surfacePoint.m_normal);
+                };
+
+                AZStd::semaphore completionEvent;
+                auto completionCallback = [&completionEvent](AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext>)
+                {
+                    completionEvent.release();
+                };
+
+                AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams> asyncParams
+                    = AZStd::make_shared<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams>();
+                asyncParams->m_completionCallback = completionCallback;
+
+                AZ::Vector2 stepSize = AZ::Vector2(queryResolution);
+                AzFramework::Terrain::TerrainDataRequestBus::Broadcast(
+                    &AzFramework::Terrain::TerrainDataRequests::ProcessNormalsFromRegionAsync, worldBounds, stepSize, perPositionCallback, sampler, asyncParams);
+
+                completionEvent.acquire();
+            }
+        );
+    }
+
+    BENCHMARK_REGISTER_F(TerrainSystemBenchmarkFixture, BM_ProcessNormalsRegionAsync)
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Unit(::benchmark::kMillisecond);
+
     BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessNormalsList)(benchmark::State& state)
     {
         // Run the benchmark
@@ -498,6 +642,48 @@ namespace UnitTest
         ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
         ->Unit(::benchmark::kMillisecond);
 
+    BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessNormalsListAsync)(benchmark::State& state)
+    {
+        // Run the benchmark
+        RunTerrainApiBenchmark(
+            state,
+            [this]([[maybe_unused]] float queryResolution, const AZ::Aabb& worldBounds,
+                AzFramework::Terrain::TerrainDataRequests::Sampler sampler)
+            {
+                AZStd::vector<AZ::Vector3> inPositions;
+                GenerateInputPositionsList(queryResolution, worldBounds, inPositions);
+
+                auto perPositionCallback = [](const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists)
+                {
+                    benchmark::DoNotOptimize(surfacePoint.m_normal);
+                };
+
+                AZStd::semaphore completionEvent;
+                auto completionCallback = [&completionEvent](AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext>)
+                {
+                    completionEvent.release();
+                };
+
+                AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams> asyncParams
+                    = AZStd::make_shared<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams>();
+                asyncParams->m_completionCallback = completionCallback;
+                AzFramework::Terrain::TerrainDataRequestBus::Broadcast(
+                    &AzFramework::Terrain::TerrainDataRequests::ProcessNormalsFromListAsync, inPositions, perPositionCallback, sampler, asyncParams);
+
+                completionEvent.acquire();
+            }
+        );
+    }
+
+    BENCHMARK_REGISTER_F(TerrainSystemBenchmarkFixture, BM_ProcessNormalsListAsync)
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Unit(::benchmark::kMillisecond);
+
     BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_GetSurfaceWeights)(benchmark::State& state)
     {
         // Run the benchmark
@@ -560,6 +746,48 @@ namespace UnitTest
         ->Args({ 2048, 4, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
         ->Unit(::benchmark::kMillisecond);
 
+    BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessSurfaceWeightsRegionAsync)(benchmark::State& state)
+    {
+        // Run the benchmark
+        RunTerrainApiBenchmark(
+            state,
+            []([[maybe_unused]] float queryResolution, const AZ::Aabb& worldBounds,
+                AzFramework::Terrain::TerrainDataRequests::Sampler sampler)
+            {
+                auto perPositionCallback = []([[maybe_unused]] size_t xIndex, [[maybe_unused]] size_t yIndex, 
+                    const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists)
+                {
+                    benchmark::DoNotOptimize(surfacePoint.m_surfaceTags);
+                };
+
+                AZStd::semaphore completionEvent;
+                auto completionCallback = [&completionEvent](AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext>)
+                {
+                    completionEvent.release();
+                };
+
+                AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams> asyncParams
+                    = AZStd::make_shared<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams>();
+                asyncParams->m_completionCallback = completionCallback;
+
+                AZ::Vector2 stepSize = AZ::Vector2(queryResolution);
+                AzFramework::Terrain::TerrainDataRequestBus::Broadcast(
+                    &AzFramework::Terrain::TerrainDataRequests::ProcessSurfaceWeightsFromRegionAsync, worldBounds, stepSize, perPositionCallback, sampler, asyncParams);
+
+                completionEvent.acquire();
+            }
+        );
+    }
+
+    BENCHMARK_REGISTER_F(TerrainSystemBenchmarkFixture, BM_ProcessSurfaceWeightsRegionAsync)
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 1024, 2, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 2, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 1024, 4, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 4, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Unit(::benchmark::kMillisecond);
+
     BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessSurfaceWeightsList)(benchmark::State& state)
     {
         // Run the benchmark
@@ -591,6 +819,48 @@ namespace UnitTest
         ->Args({ 2048, 4, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
         ->Unit(::benchmark::kMillisecond);
 
+    BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessSurfaceWeightsListAsync)(benchmark::State& state)
+    {
+        // Run the benchmark
+        RunTerrainApiBenchmark(
+            state,
+            [this]([[maybe_unused]] float queryResolution, const AZ::Aabb& worldBounds,
+                AzFramework::Terrain::TerrainDataRequests::Sampler sampler)
+            {
+                AZStd::vector<AZ::Vector3> inPositions;
+                GenerateInputPositionsList(queryResolution, worldBounds, inPositions);
+
+                auto perPositionCallback = [](const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists)
+                {
+                    benchmark::DoNotOptimize(surfacePoint.m_surfaceTags);
+                };
+
+                AZStd::semaphore completionEvent;
+                auto completionCallback = [&completionEvent](AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext>)
+                {
+                    completionEvent.release();
+                };
+
+                AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams> asyncParams
+                    = AZStd::make_shared<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams>();
+                asyncParams->m_completionCallback = completionCallback;
+                AzFramework::Terrain::TerrainDataRequestBus::Broadcast(
+                    &AzFramework::Terrain::TerrainDataRequests::ProcessSurfaceWeightsFromListAsync, inPositions, perPositionCallback, sampler, asyncParams);
+
+                completionEvent.acquire();
+            }
+        );
+    }
+
+    BENCHMARK_REGISTER_F(TerrainSystemBenchmarkFixture, BM_ProcessSurfaceWeightsListAsync)
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 1024, 2, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 2, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 1024, 4, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 4, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Unit(::benchmark::kMillisecond);
+
     BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_GetSurfacePoints)(benchmark::State& state)
     {
         // Run the benchmark
@@ -653,6 +923,48 @@ namespace UnitTest
         ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
         ->Unit(::benchmark::kMillisecond);
 
+    BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessSurfacePointsRegionAsync)(benchmark::State& state)
+    {
+        // Run the benchmark
+        RunTerrainApiBenchmark(
+            state,
+            []([[maybe_unused]] float queryResolution, const AZ::Aabb& worldBounds,
+                AzFramework::Terrain::TerrainDataRequests::Sampler sampler)
+            {
+                auto perPositionCallback = []([[maybe_unused]] size_t xIndex, [[maybe_unused]] size_t yIndex, 
+                    const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists)
+                {
+                    benchmark::DoNotOptimize(surfacePoint);
+                };
+
+                AZStd::semaphore completionEvent;
+                auto completionCallback = [&completionEvent](AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext>)
+                {
+                    completionEvent.release();
+                };
+
+                AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams> asyncParams
+                    = AZStd::make_shared<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams>();
+                asyncParams->m_completionCallback = completionCallback;
+
+                AZ::Vector2 stepSize = AZ::Vector2(queryResolution);
+                AzFramework::Terrain::TerrainDataRequestBus::Broadcast(
+                    &AzFramework::Terrain::TerrainDataRequests::ProcessSurfacePointsFromRegionAsync, worldBounds, stepSize, perPositionCallback, sampler, asyncParams);
+
+                completionEvent.acquire();
+            }
+        );
+    }
+
+    BENCHMARK_REGISTER_F(TerrainSystemBenchmarkFixture, BM_ProcessSurfacePointsRegionAsync)
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Unit(::benchmark::kMillisecond);
+
     BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessSurfacePointsList)(benchmark::State& state)
     {
         // Run the benchmark
@@ -684,6 +996,48 @@ namespace UnitTest
         ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
         ->Unit(::benchmark::kMillisecond);
 
+    BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_ProcessSurfacePointsListAsync)(benchmark::State& state)
+    {
+        // Run the benchmark
+        RunTerrainApiBenchmark(
+            state,
+            [this]([[maybe_unused]] float queryResolution, const AZ::Aabb& worldBounds,
+                AzFramework::Terrain::TerrainDataRequests::Sampler sampler)
+            {
+                AZStd::vector<AZ::Vector3> inPositions;
+                GenerateInputPositionsList(queryResolution, worldBounds, inPositions);
+
+                auto perPositionCallback = [](const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists)
+                {
+                    benchmark::DoNotOptimize(surfacePoint);
+                };
+
+                AZStd::semaphore completionEvent;
+                auto completionCallback = [&completionEvent](AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext>)
+                {
+                    completionEvent.release();
+                };
+
+                AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams> asyncParams
+                    = AZStd::make_shared<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams>();
+                asyncParams->m_completionCallback = completionCallback;
+                AzFramework::Terrain::TerrainDataRequestBus::Broadcast(
+                    &AzFramework::Terrain::TerrainDataRequests::ProcessSurfacePointsFromListAsync, inPositions, perPositionCallback, sampler, asyncParams);
+
+                completionEvent.acquire();
+            }
+        );
+    }
+
+    BENCHMARK_REGISTER_F(TerrainSystemBenchmarkFixture, BM_ProcessSurfacePointsListAsync)
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP) })
+        ->Args({ 1024, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Args({ 2048, 1, static_cast<int>(AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT) })
+        ->Unit(::benchmark::kMillisecond);
+
     BENCHMARK_DEFINE_F(TerrainSystemBenchmarkFixture, BM_GetClosestIntersectionRandom)(benchmark::State& state)
     {
         // Run the benchmark
diff --git a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp
index 2c01a3d455..05f5072551 100644
--- a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp
+++ b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp
@@ -7,7 +7,9 @@
  */
 
 #include <AzCore/Component/ComponentApplication.h>
+#include <AzCore/Jobs/JobManagerComponent.h>
 #include <AzCore/Memory/MemoryComponent.h>
+#include <AzCore/std/parallel/semaphore.h>
 
 #include <AzTest/AzTest.h>
 
@@ -64,6 +66,7 @@ namespace UnitTest
         };
 
         AZ::ComponentApplication m_app;
+        AZStd::unique_ptr<AZ::Entity> m_jobManagerEntity = nullptr;
 
         AZStd::unique_ptr<NiceMock<UnitTest::MockBoxShapeComponentRequests>> m_boxShapeRequests;
         AZStd::unique_ptr<NiceMock<UnitTest::MockShapeComponentRequests>> m_shapeRequests;
@@ -72,12 +75,20 @@ namespace UnitTest
 
         void SetUp() override
         {
+            AZ::AllocatorInstance<AZ::PoolAllocator>::Create();
+            AZ::AllocatorInstance<AZ::ThreadPoolAllocator>::Create();
+
             AZ::ComponentApplication::Descriptor appDesc;
             appDesc.m_memoryBlocksByteSize = 20 * 1024 * 1024;
             appDesc.m_recordingMode = AZ::Debug::AllocationRecords::RECORD_NO_RECORDS;
             appDesc.m_stackRecordLevels = 20;
 
             m_app.Create(appDesc);
+
+            // Create the global job manager.
+            m_jobManagerEntity = CreateEntity();
+            CreateComponent<AZ::JobManagerComponent>(m_jobManagerEntity.get());
+            ActivateEntity(m_jobManagerEntity.get());
         }
 
         void TearDown() override
@@ -86,7 +97,15 @@ namespace UnitTest
             m_shapeRequests.reset();
             m_terrainAreaHeightRequests.reset();
             m_terrainAreaSurfaceRequests.reset();
+
+            // Destroy the global job manager.
+            m_jobManagerEntity->Deactivate();
+            m_jobManagerEntity.reset();
+
             m_app.Destroy();
+
+            AZ::AllocatorInstance<AZ::ThreadPoolAllocator>::Destroy();
+            AZ::AllocatorInstance<AZ::PoolAllocator>::Destroy();
         }
 
         AZStd::unique_ptr<AZ::Entity> CreateEntity()
@@ -158,6 +177,15 @@ namespace UnitTest
                         // Let the test function modify these values based on the needs of the specific test.
                         mockHeights(outPosition, terrainExists);
                     });
+            ON_CALL(*m_terrainAreaHeightRequests, GetHeights)
+                .WillByDefault(
+                    [mockHeights](AZStd::span<AZ::Vector3> inOutPositionList, AZStd::span<bool> terrainExistsList)
+                    {
+                        for (int i = 0; i < inOutPositionList.size(); i++)
+                        {
+                            mockHeights(inOutPositionList[i], terrainExistsList[i]);
+                        }
+                    });
 
             ActivateEntity(entity.get());
             return entity;
@@ -184,9 +212,9 @@ namespace UnitTest
             tagWeight3.m_weight = 0.3f;
             expectedTags.push_back(tagWeight3);
 
-            m_terrainAreaSurfaceRequests = AZStd::make_unique<NiceMock<UnitTest::MockTerrainAreaSurfaceRequestBus>>(entity->GetId());
-            ON_CALL(*m_terrainAreaSurfaceRequests, GetSurfaceWeights).WillByDefault(
-                [tagWeight1, tagWeight2, tagWeight3](const AZ::Vector3& position, AzFramework::SurfaceData::SurfaceTagWeightList& surfaceWeights)
+            auto mockGetSurfaceWeights = [tagWeight1, tagWeight2, tagWeight3](
+                const AZ::Vector3& position,
+                AzFramework::SurfaceData::SurfaceTagWeightList& surfaceWeights)
                 {
                     surfaceWeights.clear();
                     float absYPos = fabsf(position.GetY());
@@ -202,6 +230,19 @@ namespace UnitTest
                     {
                         surfaceWeights.push_back(tagWeight3);
                     }
+                };
+
+            m_terrainAreaSurfaceRequests = AZStd::make_unique<NiceMock<UnitTest::MockTerrainAreaSurfaceRequestBus>>(entity->GetId());
+            ON_CALL(*m_terrainAreaSurfaceRequests, GetSurfaceWeights).WillByDefault(mockGetSurfaceWeights);
+            ON_CALL(*m_terrainAreaSurfaceRequests, GetSurfaceWeightsFromList).WillByDefault(
+                [mockGetSurfaceWeights](
+                    AZStd::span<const AZ::Vector3> inPositionList,
+                    AZStd::span<AzFramework::SurfaceData::SurfaceTagWeightList> outSurfaceWeightsList)
+                {
+                    for (size_t i = 0; i < inPositionList.size(); i++)
+                    {
+                        mockGetSurfaceWeights(inPositionList[i], outSurfaceWeightsList[i]);
+                    }
                 }
             );
         }
@@ -1037,4 +1078,70 @@ namespace UnitTest
 
         terrainSystem->ProcessSurfacePointsFromRegion(testRegionBox, stepSize, perPositionCallback, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT);
     }
+
+    TEST_F(TerrainSystemTest, TerrainProcessAsyncCancellation)
+    {
+        // Tests cancellation of the asynchronous terrain API.
+
+        const AZ::Aabb spawnerBox = AZ::Aabb::CreateFromMinMaxValues(-10.0f, -10.0f, -5.0f, 10.0f, 10.0f, 15.0f);
+        auto entity = CreateAndActivateMockTerrainLayerSpawner(
+            spawnerBox,
+            [](AZ::Vector3& position, bool& terrainExists)
+            {
+                // Our generated height will be X + Y.
+                position.SetZ(position.GetX() + position.GetY());
+                terrainExists = true;
+            });
+
+        // Create and activate the terrain system with our testing defaults for world bounds, and a query resolution at 1 meter intervals.
+        auto terrainSystem = CreateAndActivateTerrainSystem();
+
+        // Generate some input positions.
+        AZStd::vector<AZ::Vector3> inPositions;
+        for (int i = 0; i < 16; ++i)
+        {
+            inPositions.push_back({1.0f, 1.0f, 1.0f});
+        }
+
+        // Setup the per position callback so that we can cancel the entire request when it is first invoked.
+        AZStd::atomic_bool asyncRequestCancelled = false;
+        AZStd::semaphore asyncRequestStartedEvent;
+        AZStd::semaphore asyncRequestCancelledEvent;
+        auto perPositionCallback = [&asyncRequestCancelled, &asyncRequestStartedEvent, &asyncRequestCancelledEvent]([[maybe_unused]] const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists)
+        {
+            if (!asyncRequestCancelled)
+            {
+                // Indicate that the async request has started.
+                asyncRequestStartedEvent.release();
+
+                // Wait until the async request has been cancelled before allowing it to continue.
+                asyncRequestCancelledEvent.acquire();
+                asyncRequestCancelled = true;
+            }
+        };
+
+        // Setup the completion callback so we can check that the entire request was cancelled.
+        AZStd::semaphore asyncRequestCompletedEvent;
+        auto completionCallback = [&asyncRequestCompletedEvent](AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> terrainJobContext)
+        {
+            EXPECT_TRUE(terrainJobContext->IsCancelled());
+            asyncRequestCompletedEvent.release();
+        };
+
+        // Invoke the async request.
+        AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams> asyncParams
+            = AZStd::make_shared<AzFramework::Terrain::TerrainDataRequests::ProcessAsyncParams>();
+        asyncParams->m_completionCallback = completionCallback;
+        AZStd::shared_ptr<AzFramework::Terrain::TerrainDataRequests::TerrainJobContext> terrainJobContext
+            = terrainSystem->ProcessHeightsFromListAsync(inPositions, perPositionCallback, AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR, asyncParams);
+
+        // Wait until the async request has started before cancelling it.
+        asyncRequestStartedEvent.acquire();
+        terrainJobContext->Cancel();
+        asyncRequestCancelled = true;
+        asyncRequestCancelledEvent.release();
+
+        // Now wait until the async request has completed after being cancelled.
+        asyncRequestCompletedEvent.acquire();
+    }
 } // namespace UnitTest
diff --git a/Gems/Terrain/Code/terrain_editor_shared_files.cmake b/Gems/Terrain/Code/terrain_editor_shared_files.cmake
index 09724751a9..ed64b7c4fc 100644
--- a/Gems/Terrain/Code/terrain_editor_shared_files.cmake
+++ b/Gems/Terrain/Code/terrain_editor_shared_files.cmake
@@ -25,6 +25,8 @@ set(FILES
     Source/EditorComponents/EditorTerrainSystemComponent.h
     Source/EditorTerrainModule.cpp
     Source/EditorTerrainModule.h
+    Source/EditorSurfaceTagListProvider.h
+    Source/EditorSurfaceTagListProvider.cpp
     Source/TerrainModule.cpp
     Source/TerrainModule.h
     Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.cpp
diff --git a/Registry/AssetProcessorPlatformConfig.setreg b/Registry/AssetProcessorPlatformConfig.setreg
index 87133ba34b..ba1c696054 100644
--- a/Registry/AssetProcessorPlatformConfig.setreg
+++ b/Registry/AssetProcessorPlatformConfig.setreg
@@ -93,7 +93,10 @@
                     "Animations/SkeletonList.xml": "i_caf",
                     "cbc": "abc",
                     "fbx.assetinfo": "fbx",
-                    "stl.assetinfo": "stl"
+                    "stl.assetinfo": "stl",
+                    "gltf.assetinfo": "gltf",
+                    "glb.assetinfo": "glb"
+
                 },
 
                 // ---- add any folders to scan here.  The priority order is the order they appear here
diff --git a/Registry/sceneassetimporter.setreg b/Registry/sceneassetimporter.setreg
index ea88dc90c2..ea0259a259 100644
--- a/Registry/sceneassetimporter.setreg
+++ b/Registry/sceneassetimporter.setreg
@@ -8,7 +8,9 @@
 				"SupportedFileTypeExtensions":
 				[
 					".fbx",
-					".stl"
+					".stl",
+					".gltf",
+					".glb"
 				]
 			},
 			"MaterialConverter": 
diff --git a/Templates/DefaultProject/template.json b/Templates/DefaultProject/template.json
index 203e1ec4ef..13555889e6 100644
--- a/Templates/DefaultProject/template.json
+++ b/Templates/DefaultProject/template.json
@@ -7,7 +7,7 @@
     "origin_url": "https://github.com/o3de/o3de",
     "license": "Apache-2.0 or MIT",
     "license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
-    "display_name": "Default Project Template",
+    "display_name": "Default",
     "summary": "This is the project template that will be used if no project template is specified during project creation.",
     "canonical_tags": [
         "Template",
diff --git a/Templates/MinimalProject/template.json b/Templates/MinimalProject/template.json
index 4cc3031ff5..fff57e609b 100644
--- a/Templates/MinimalProject/template.json
+++ b/Templates/MinimalProject/template.json
@@ -7,7 +7,7 @@
     "origin_url": "https://github.com/o3de/o3de",
     "license": "Apache-2.0 or MIT",
     "license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
-    "display_name": "Minimal Project Template",
+    "display_name": "Minimal",
     "summary": "Use this project template to create project that is the absolute minimum needed to get started in O3DE.",
     "canonical_tags": [
         "Template",
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 4514e5d812..6e0923b916 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
@@ -175,13 +175,20 @@ class AbstractResourceLocator(object):
         return os.path.join(self.build_directory(), 'AssetProcessor')
 
     def asset_processor_batch(self):
-        """"
+        """
         Return path for the AssetProcessorBatch compatible with this build platform and configuration
         ex. engine_root/dev/mac/bin/profile/AssetProcessorBatch
         :return: path to AssetProcessorBatch
         """
         return os.path.join(self.build_directory(), 'AssetProcessorBatch')
 
+    def ap_job_logs(self):
+        """
+        Return path to the Asset Processor JobLogs directory.
+        :return: path to <project>/user/log/JobLogs
+        """
+        return os.path.join(self.project_log(), 'JobLogs')
+
     def editor(self):
         """
         Return path to the editor executable compatible with the current build.
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py b/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py
index f363689066..3c4e2b49a4 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py
@@ -851,11 +851,11 @@ class EditorTestSuite():
             workspace.artifact_manager.save_artifact(os.path.join(editor_utils.retrieve_log_path(run_id, workspace), log_name),
                                                      f'({run_id}){log_name}')
             if return_code == 0:
-                # No need to scrap the output, as all the tests have passed
+                # No need to scrape the output, as all the tests have passed
                 for test_spec in test_spec_list:
                     results[test_spec.__name__] = Result.Pass.create(test_spec, output, editor_log_content)
             else:
-                # Scrap the output to attempt to find out which tests failed.
+                # Scrape the output to attempt to find out which tests failed.
                 # This function should always populate the result list, if it didn't find it, it will have "Unknown" type of result
                 results = self._get_results_using_output(test_spec_list, output, editor_log_content)
                 assert len(results) == len(test_spec_list), "bug in _get_results_using_output(), the number of results don't match the tests ran"
@@ -940,6 +940,9 @@ class EditorTestSuite():
         editor_test_data.results.update(results)
         test_name, test_result = next(iter(results.items()))
         self._report_result(test_name, test_result)
+        # If test did not pass, save assets with errors and warnings
+        if not isinstance(test_result, Result.Pass):
+            editor_utils.save_failed_asset_joblogs(workspace)
 
     def _run_batched_tests(self, request: Request, workspace: AbstractWorkspace, editor: Editor, editor_test_data: TestData,
                            test_spec_list: list[EditorSharedTest], extra_cmdline_args: list[str] = []) -> None:
@@ -961,6 +964,11 @@ class EditorTestSuite():
                                               extra_cmdline_args)
         assert results is not None
         editor_test_data.results.update(results)
+        # If at least one test did not pass, save assets with errors and warnings
+        for result in results:
+            if not isinstance(result, Result.Pass):
+                editor_utils.save_failed_asset_joblogs(workspace)
+                return
 
     def _run_parallel_tests(self, request: Request, workspace: AbstractWorkspace, editor: Editor, editor_test_data: TestData,
                             test_spec_list: list[EditorSharedTest], extra_cmdline_args: list[str] = []) -> None:
@@ -1007,8 +1015,14 @@ class EditorTestSuite():
             for t in threads:
                 t.join()
 
+            save_asset_logs = False
             for result in results_per_thread:
                 editor_test_data.results.update(result)
+                if not isinstance(result, Result.Pass):
+                    save_asset_logs = True
+            # If at least one test did not pass, save assets with errors and warnings
+            if save_asset_logs:
+                editor_utils.save_failed_asset_joblogs(workspace)
 
     def _run_parallel_batched_tests(self, request: Request, workspace: AbstractWorkspace, editor: Editor, editor_test_data: TestData,
                                     test_spec_list: list[EditorSharedTest], extra_cmdline_args: list[str] = []) -> None:
@@ -1056,8 +1070,14 @@ class EditorTestSuite():
         for t in threads:
             t.join()
 
+        save_asset_logs = False
         for result in results_per_thread:
             editor_test_data.results.update(result)
+            if not isinstance(result, Result.Pass):
+                save_asset_logs = True
+        # If at least one test did not pass, save assets with errors and warnings
+        if save_asset_logs:
+            editor_utils.save_failed_asset_joblogs(workspace)
 
     def _get_number_parallel_editors(self, request: Request) -> int:
         """
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/editor_test_utils.py b/Tools/LyTestTools/ly_test_tools/o3de/editor_test_utils.py
index 7b36a82c07..4e678151bd 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/editor_test_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/editor_test_utils.py
@@ -10,6 +10,7 @@ from __future__ import annotations
 import os
 import time
 import logging
+import re
 
 import ly_test_tools.environment.process_utils as process_utils
 import ly_test_tools.environment.waiter as waiter
@@ -151,3 +152,41 @@ def retrieve_last_run_test_index_from_output(test_spec_list: list[EditorTestBase
         else:
             index += 1
     return index
+
+def save_failed_asset_joblogs(workspace: AbstractWorkspace) -> None:
+    """
+    Checks all asset logs in the JobLogs directory to see if the asset has any warnings or errors. If so, the asset is
+    saved via ArtifactManager.
+
+    :param workspace: The AbstractWorkspace to access the JobLogs path
+    :return: None
+    """
+    for walk_tuple in os.walk(workspace.paths.ap_job_logs()):
+        for log_file in walk_tuple[2]:
+            full_log_path = os.path.join(walk_tuple[0], log_file)
+            # Only save asset logs that contain errors or warnings
+            if _check_log_errors_warnings(full_log_path):
+                try:
+                    workspace.artifact_manager.save_artifact(full_log_path)
+                except Exception as e:  # Purposefully broad
+                    logger.warning(f"Error when saving log at path:{full_log_path}\n{e}")
+
+def _check_log_errors_warnings(log_path: str) -> bool:
+    """
+    Checks to see if the asset log contains any errors or warnings. Also returns True is no regex is found because
+    something probably went wrong.
+    Example log lines: ~~1643759303647~~1~~00000000000009E0~~AssetBuilder~~S: 0 errors, 1 warnings
+
+    :param log_path: The full path to the asset log file to read
+    :return: True if the regex finds an error or warning, else False
+    """
+    log_regex = "(\\d+) errors, (\\d+) warnings"
+    with open(log_path, 'r') as opened_asset_log:
+        for log_line in opened_asset_log:
+            regex_match = re.search(log_regex, log_line)
+            if regex_match is not None:
+                break
+    # If we match any non zero numbers in: n error, n warnings
+    if regex_match is None or (int)(regex_match.group(1)) != 0 or (int)(regex_match.group(2)) != 0:
+        return True
+    return False
diff --git a/Tools/LyTestTools/tests/unit/test_editor_test_utils.py b/Tools/LyTestTools/tests/unit/test_editor_test_utils.py
index f81d2fd8e6..cca9a161c8 100644
--- a/Tools/LyTestTools/tests/unit/test_editor_test_utils.py
+++ b/Tools/LyTestTools/tests/unit/test_editor_test_utils.py
@@ -170,3 +170,59 @@ class TestEditorTestUtils(unittest.TestCase):
             mock_test_list.append(mock_test)
 
         assert 0 == editor_test_utils.retrieve_last_run_test_index_from_output(mock_test_list, mock_editor_output)
+
+    @mock.patch('ly_test_tools.o3de.editor_test_utils._check_log_errors_warnings')
+    @mock.patch('os.walk')
+    def test_SaveFailedAssetJoblogs_ManyValidLogs_SavesCorrectly(self, mock_walk, mock_check_log):
+        mock_workspace = mock.MagicMock()
+        mock_walk.return_value = [['MockDirectory', None, ['mock_log.log']],
+                                  ['MockDirectory2', None, ['mock_log2.log']]]
+        mock_check_log.return_value = True
+
+        editor_test_utils.save_failed_asset_joblogs(mock_workspace)
+
+        assert mock_workspace.artifact_manager.save_artifact.call_count == 2
+
+    @mock.patch('ly_test_tools.o3de.editor_test_utils._check_log_errors_warnings')
+    @mock.patch('os.walk')
+    def test_SaveFailedAssetJoblogs_ManyInvalidLogs_NoSaves(self, mock_walk, mock_check_log):
+        mock_workspace = mock.MagicMock()
+        mock_walk.return_value = [['MockDirectory', None, ['mock_log.log']],
+                                  ['MockDirectory2', None, ['mock_log2.log']]]
+        mock_check_log.return_value = False
+
+        editor_test_utils.save_failed_asset_joblogs(mock_workspace)
+
+        assert mock_workspace.artifact_manager.save_artifact.call_count == 0
+
+    def test_CheckLogErrorWarnings_ValidLine_ReturnsTrue(self):
+        mock_log = '~~1643759303647~~1~~00000000000009E0~~AssetBuilder~~S: 0 errors, 1 warnings'
+        mock_log_path = mock.MagicMock()
+
+        with mock.patch('builtins.open', mock.mock_open(read_data=mock_log)) as mock_file:
+            expected = editor_test_utils._check_log_errors_warnings(mock_log_path)
+        assert expected
+
+    def test_CheckLogErrorWarnings_MultipleValidLine_ReturnsTrue(self):
+        mock_log = 'foo\nfoo\n~~1643759303647~~1~~00000000000009E0~~AssetBuilder~~S: 1 errors, 1 warnings'
+        mock_log_path = mock.MagicMock()
+
+        with mock.patch('builtins.open', mock.mock_open(read_data=mock_log)) as mock_file:
+            expected = editor_test_utils._check_log_errors_warnings(mock_log_path)
+        assert expected
+
+    def test_CheckLogErrorWarnings_InvalidLine_ReturnsFalse(self):
+        mock_log = 'foo\n~~1643759303647~~1~~00000000000009E0~~AssetBuilder~~S: 0 errors, 0 warnings'
+        mock_log_path = mock.MagicMock()
+
+        with mock.patch('builtins.open', mock.mock_open(read_data=mock_log)) as mock_file:
+            expected = editor_test_utils._check_log_errors_warnings(mock_log_path)
+        assert not expected
+
+    def test_CheckLogErrorWarnings_InvalidRegex_ReturnsTrue(self):
+        mock_log = 'Invalid last line'
+        mock_log_path = mock.MagicMock()
+
+        with mock.patch('builtins.open', mock.mock_open(read_data=mock_log)) as mock_file:
+            expected = editor_test_utils._check_log_errors_warnings(mock_log_path)
+        assert expected
diff --git a/Tools/LyTestTools/tests/unit/test_o3de_editor_test.py b/Tools/LyTestTools/tests/unit/test_o3de_editor_test.py
index 973366aa94..f63ec315eb 100644
--- a/Tools/LyTestTools/tests/unit/test_o3de_editor_test.py
+++ b/Tools/LyTestTools/tests/unit/test_o3de_editor_test.py
@@ -871,6 +871,7 @@ class TestRunningTests(unittest.TestCase):
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._report_result')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._exec_editor_test')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._setup_editor_test')
+    @mock.patch('ly_test_tools.o3de.editor_test_utils.save_failed_asset_joblogs', mock.MagicMock())
     def test_RunSingleTest_ValidTest_ReportsResults(self, mock_setup_test, mock_exec_editor_test, mock_report_result):
         mock_test_suite = ly_test_tools.o3de.editor_test.EditorTestSuite()
         mock_test_data = mock.MagicMock()
@@ -903,6 +904,7 @@ class TestRunningTests(unittest.TestCase):
     @mock.patch('threading.Thread')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._get_number_parallel_editors')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._setup_editor_test')
+    @mock.patch('ly_test_tools.o3de.editor_test_utils.save_failed_asset_joblogs', mock.MagicMock())
     def test_RunParallelTests_TwoTestsAndEditors_TwoThreads(self, mock_setup_test, mock_get_num_editors, mock_thread):
         mock_test_suite = ly_test_tools.o3de.editor_test.EditorTestSuite()
         mock_get_num_editors.return_value = 2
@@ -919,6 +921,7 @@ class TestRunningTests(unittest.TestCase):
     @mock.patch('threading.Thread')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._get_number_parallel_editors')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._setup_editor_test')
+    @mock.patch('ly_test_tools.o3de.editor_test_utils.save_failed_asset_joblogs', mock.MagicMock())
     def test_RunParallelTests_TenTestsAndTwoEditors_TenThreads(self, mock_setup_test, mock_get_num_editors, mock_thread):
         mock_test_suite = ly_test_tools.o3de.editor_test.EditorTestSuite()
         mock_get_num_editors.return_value = 2
@@ -937,6 +940,7 @@ class TestRunningTests(unittest.TestCase):
     @mock.patch('threading.Thread')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._get_number_parallel_editors')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._setup_editor_test')
+    @mock.patch('ly_test_tools.o3de.editor_test_utils.save_failed_asset_joblogs', mock.MagicMock())
     def test_RunParallelTests_TenTestsAndThreeEditors_TenThreads(self, mock_setup_test, mock_get_num_editors,
                                                                  mock_thread):
         mock_test_suite = ly_test_tools.o3de.editor_test.EditorTestSuite()
@@ -956,6 +960,7 @@ class TestRunningTests(unittest.TestCase):
     @mock.patch('threading.Thread')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._get_number_parallel_editors')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._setup_editor_test')
+    @mock.patch('ly_test_tools.o3de.editor_test_utils.save_failed_asset_joblogs', mock.MagicMock())
     def test_RunParallelBatchedTests_TwoTestsAndEditors_TwoThreads(self, mock_setup_test, mock_get_num_editors,
                                                                    mock_thread):
         mock_test_suite = ly_test_tools.o3de.editor_test.EditorTestSuite()
@@ -973,6 +978,7 @@ class TestRunningTests(unittest.TestCase):
     @mock.patch('threading.Thread')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._get_number_parallel_editors')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._setup_editor_test')
+    @mock.patch('ly_test_tools.o3de.editor_test_utils.save_failed_asset_joblogs', mock.MagicMock())
     def test_RunParallelBatchedTests_TenTestsAndTwoEditors_2Threads(self, mock_setup_test, mock_get_num_editors,
                                                                       mock_thread):
         mock_test_suite = ly_test_tools.o3de.editor_test.EditorTestSuite()
@@ -992,6 +998,7 @@ class TestRunningTests(unittest.TestCase):
     @mock.patch('threading.Thread')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._get_number_parallel_editors')
     @mock.patch('ly_test_tools.o3de.editor_test.EditorTestSuite._setup_editor_test')
+    @mock.patch('ly_test_tools.o3de.editor_test_utils.save_failed_asset_joblogs', mock.MagicMock())
     def test_RunParallelBatchedTests_TenTestsAndThreeEditors_ThreeThreads(self, mock_setup_test, mock_get_num_editors,
                                                                         mock_thread):
         mock_test_suite = ly_test_tools.o3de.editor_test.EditorTestSuite()
diff --git a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
index de36760ea4..ab35243532 100644
--- a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
+++ b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
@@ -36,7 +36,7 @@ ly_associate_package(PACKAGE_NAME libpng-1.6.37-rev1-linux
 ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-linux                    TARGETS libsamplerate               PACKAGE_HASH 41643c31bc6b7d037f895f89d8d8d6369e906b92eff42b0fe05ee6a100f06261)
 ly_associate_package(PACKAGE_NAME OpenMesh-8.1-rev3-linux                           TARGETS OpenMesh                    PACKAGE_HASH 805bd0b24911bb00c7f575b8c3f10d7ea16548a5014c40811894a9445f17a126)
 ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev2-linux                         TARGETS OpenSSL                     PACKAGE_HASH b779426d1e9c5ddf71160d5ae2e639c3b956e0fb5e9fcaf9ce97c4526024e3bc)
-ly_associate_package(PACKAGE_NAME DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-linux TARGETS DirectXShaderCompilerDxc    PACKAGE_HASH 88c4a359325d749bc34090b9ac466424847f3b71ba0de15045cf355c17c07099)
+ly_associate_package(PACKAGE_NAME DirectXShaderCompilerDxc-1.6.2112-o3de-rev1-linux TARGETS DirectXShaderCompilerDxc    PACKAGE_HASH ac9f98e0e3b07fde0f9bbe1e6daa386da37699819cde06dcc8d3235421f6e977)
 ly_associate_package(PACKAGE_NAME SPIRVCross-2021.04.29-rev1-linux                  TARGETS SPIRVCross                  PACKAGE_HASH 7889ee5460a688e9b910c0168b31445c0079d363affa07b25d4c8aeb608a0b80)
 ly_associate_package(PACKAGE_NAME azslc-1.7.35-rev1-linux                           TARGETS azslc                       PACKAGE_HASH 273484be06dfc25e8da6a6e17937ae69a2efdb0b4c5f105efa83d6ad54d756e5)
 ly_associate_package(PACKAGE_NAME zlib-1.2.11-rev5-linux                            TARGETS ZLIB                        PACKAGE_HASH 9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc)
diff --git a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
index ae51076857..5d5cf06105 100644
--- a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
+++ b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
@@ -20,7 +20,7 @@ ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform
 
 # platform-specific:
 ly_associate_package(PACKAGE_NAME assimp-5.1.6-rev1-mac                             TARGETS assimplib                   PACKAGE_HASH ad35c2e0efd0852021c84b9a454fdcba2fc8af8b7117e9a0dd7ea0a1915932e0)
-ly_associate_package(PACKAGE_NAME DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-mac   TARGETS DirectXShaderCompilerDxc    PACKAGE_HASH 3f77367dbb0342136ec4ebbd44bc1fedf7198089a0f83c5631248530769b2be6)
+ly_associate_package(PACKAGE_NAME DirectXShaderCompilerDxc-1.6.2112-o3de-rev1-mac   TARGETS DirectXShaderCompilerDxc    PACKAGE_HASH 2d3aa6d188fcd4f09c95cf26a518a45400f34a54c8dff3a7ebef6add917fb07c)
 ly_associate_package(PACKAGE_NAME SPIRVCross-2021.04.29-rev1-mac                    TARGETS SPIRVCross                  PACKAGE_HASH 78c6376ed2fd195b9b1f5fb2b56e5267a32c3aa21fb399e905308de470eb4515)
 ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev3-mac                            TARGETS TIFF                        PACKAGE_HASH c2615ccdadcc0e1d6c5ed61e5965c4d3a82193d206591b79b805c3b3ff35a4bf)
 ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-mac                            TARGETS freetype                    PACKAGE_HASH f159b346ac3251fb29cb8dd5f805c99b0015ed7fdb3887f656945ca701a61d0d)
@@ -42,5 +42,5 @@ ly_associate_package(PACKAGE_NAME astc-encoder-3.2-rev5-mac
 ly_associate_package(PACKAGE_NAME ISPCTexComp-36b80aa-rev1-mac                      TARGETS ISPCTexComp                 PACKAGE_HASH 8a4e93277b8face6ea2fd57c6d017bdb55643ed3d6387110bc5f6b3b884dd169)
 ly_associate_package(PACKAGE_NAME lz4-1.9.3-vcpkg-rev4-mac                          TARGETS lz4                         PACKAGE_HASH 891ff630bf34f7ab1d8eaee2ea0a8f1fca89dbdc63fca41ee592703dd488a73b)
 ly_associate_package(PACKAGE_NAME azslc-1.7.35-rev1-mac                             TARGETS azslc                       PACKAGE_HASH 03cb1ea8c47d4c80c893e2e88767272d5d377838f5ba94b777a45902dd85052e)
-ly_associate_package(PACKAGE_NAME SQLite-3.37.2-rev1-mac                            TARGETS SQLite                      PACKAGE_HASH f9101023f99cf32fc5867284ceb28c0761c23d2c5a4b1748349c69f976a2fbea)
+ly_associate_package(PACKAGE_NAME SQLite-3.37.2-rev2-mac                            TARGETS SQLite                      PACKAGE_HASH b7d9abdb68045003e030e1a9a805db1aefa5e8fde6dccfbb4fab3a06249a41fc)
 ly_associate_package(PACKAGE_NAME AwsIotDeviceSdkCpp-1.15.2-rev2-mac                TARGETS AwsIotDeviceSdkCpp          PACKAGE_HASH 4854edb7b88fa6437b4e69e87d0ee111a25313ac2a2db5bb2f8b674ba0974f95)
diff --git a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
index 3ce5730f2a..86676529ae 100644
--- a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
+++ b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
@@ -21,7 +21,7 @@ ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform
 # platform-specific:
 ly_associate_package(PACKAGE_NAME assimp-5.1.6-rev1-windows                             TARGETS assimplib                   PACKAGE_HASH 299d8a3c70657d74af8841650538e9d083fda9356f6782416edbec0ef5a0493e)
 ly_associate_package(PACKAGE_NAME AWSGameLiftServerSDK-3.4.1-rev1-windows               TARGETS AWSGameLiftServerSDK        PACKAGE_HASH a0586b006e4def65cc25f388de17dc475e417dc1e6f9d96749777c88aa8271b0)
-ly_associate_package(PACKAGE_NAME DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows   TARGETS DirectXShaderCompilerDxc    PACKAGE_HASH 803e10b94006b834cbbdd30f562a8ddf04174c2cb6956c8399ec164ef8418d1f)
+ly_associate_package(PACKAGE_NAME DirectXShaderCompilerDxc-1.6.2112-o3de-rev1-windows   TARGETS DirectXShaderCompilerDxc    PACKAGE_HASH fdcdc081e67abcfdc8172866258a9c36f1fd0d7b963ba5378ca01cb4fcdbf9c7)
 ly_associate_package(PACKAGE_NAME SPIRVCross-2021.04.29-rev1-windows                    TARGETS SPIRVCross                  PACKAGE_HASH 7d601ea9d625b1d509d38bd132a1f433d7e895b16adab76bac6103567a7a6817)
 ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev3-windows                            TARGETS TIFF                        PACKAGE_HASH c6000a906e6d2a0816b652e93dfbeab41c9ed73cdd5a613acd53e553d0510b60)
 ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-windows                            TARGETS freetype                    PACKAGE_HASH 9809255f1c59b07875097aa8d8c6c21c97c47a31fb35e30f2bb93188e99a85ff)
diff --git a/cmake/Platform/Common/Clang/Configurations_clang.cmake b/cmake/Platform/Common/Clang/Configurations_clang.cmake
index a46ac6647d..fee81f7132 100644
--- a/cmake/Platform/Common/Clang/Configurations_clang.cmake
+++ b/cmake/Platform/Common/Clang/Configurations_clang.cmake
@@ -9,7 +9,9 @@
 include(cmake/Platform/Common/Configurations_common.cmake)
 
 ly_append_configurations_options(
-    DEFINES
+    DEFINES_PROFILE
+        _FORTIFY_SOURCE=2
+    DEFINES_RELEASE
         _FORTIFY_SOURCE=2
     COMPILATION
         -fno-exceptions
@@ -23,7 +25,7 @@ ly_append_configurations_options(
         ###################
         # Disabled warnings (please do not disable any others without first consulting sig-build)
         ###################
-        -Wno-inconsistent-missing-override # unfortunately there is no warning in MSVC to detect missing overrides, 
+        -Wno-inconsistent-missing-override # unfortunately there is no warning in MSVC to detect missing overrides,
             # MSVC's static analyzer can, but that is a different run that most developers are not aware of. A pass
             # was done to fix all hits. Leaving this disabled until there is a matching warning in MSVC.
 
@@ -33,7 +35,7 @@ ly_append_configurations_options(
         -Wno-reorder
         -Wno-switch
         -Wno-undefined-var-template
-        
+
         ###################
         # Enabled warnings (that are disabled by default)
         ###################
diff --git a/cmake/Platform/Common/GCC/Configurations_gcc.cmake b/cmake/Platform/Common/GCC/Configurations_gcc.cmake
index d2d6059b69..4b4c4e73c5 100644
--- a/cmake/Platform/Common/GCC/Configurations_gcc.cmake
+++ b/cmake/Platform/Common/GCC/Configurations_gcc.cmake
@@ -20,7 +20,9 @@ endif()
 
 
 ly_append_configurations_options(
-    DEFINES
+    DEFINES_PROFILE
+        _FORTIFY_SOURCE=2
+    DEFINES_RELEASE
         _FORTIFY_SOURCE=2
 
     COMPILATION_C
@@ -48,7 +50,7 @@ ly_append_configurations_options(
         ${LY_GCC_GCOV_FLAGS}
         ${LY_GCC_GPROF_FLAGS}
 
-        # Disabled warnings 
+        # Disabled warnings
         -Wno-array-bounds
         -Wno-attributes
         -Wno-class-memaccess
diff --git a/cmake/Platform/Linux/Configurations_linux.cmake b/cmake/Platform/Linux/Configurations_linux.cmake
index 300b7bee10..3c3ea5bf62 100644
--- a/cmake/Platform/Linux/Configurations_linux.cmake
+++ b/cmake/Platform/Linux/Configurations_linux.cmake
@@ -24,7 +24,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
             -Wl,-z,relro,-z,now
             -Wl,-z,noexecstack
         LINK_EXE
-            -pie
             -fpie
             -Wl,-z,relro,-z,now
             -Wl,-z,noexecstack
diff --git a/cmake/Platform/Windows/Packaging/PostInstallSetup.wxs b/cmake/Platform/Windows/Packaging/PostInstallSetup.wxs
index d4f6c181dd..bd1224cd4c 100644
--- a/cmake/Platform/Windows/Packaging/PostInstallSetup.wxs
+++ b/cmake/Platform/Windows/Packaging/PostInstallSetup.wxs
@@ -36,6 +36,7 @@
                 <Directory Id="root.cmake.runtime" Name="runtime"/>
             </Directory>
             <Directory Id="root.python" Name="python"/>
+            <Directory Id="root.scripts" Name="scripts"/>
             <Directory Id="root.tools" Name="Tools">
                 <Directory Id="root.tools.redist" Name="Redistributables">
                     <Directory Id="root.tools.redist.cmake" Name="CMake"/>
@@ -61,5 +62,12 @@
             Execute="deferred"
             Impersonate="no"/>
 
+        <CustomAction Id="UnRegisterEngine"
+            ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /C @&quot;[root.scripts]o3de.bat&quot; register --remove --this-engine"
+            Directory="INSTALL_ROOT"
+            Execute="immediate"
+            Return="ignore"
+            Impersonate="no"/>
+
     </Fragment>
 </Wix>
diff --git a/cmake/Platform/Windows/Packaging/Template.wxs.in b/cmake/Platform/Windows/Packaging/Template.wxs.in
index 6d4dd54f75..84791a6ee1 100644
--- a/cmake/Platform/Windows/Packaging/Template.wxs.in
+++ b/cmake/Platform/Windows/Packaging/Template.wxs.in
@@ -58,6 +58,10 @@
             <Custom Action="ConfigurePython" After="MoveCMake">
                 NOT Installed Or REINSTALL
             </Custom>
+            <!-- limit the unregister action to full uninstall -->
+            <Custom Action="UnRegisterEngine" After="InstallInitialize">
+                (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
+            </Custom>
         </InstallExecuteSequence>
 
         <UIRef Id="$(var.CPACK_WIX_UI_REF)" />
diff --git a/python/requirements.txt b/python/requirements.txt
index 9648a20ba0..c000be48de 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -6,13 +6,13 @@ attrs==20.1.0 \
     --hash=sha256:0ef97238856430dcf9228e07f316aefc17e8939fc8507e18c6501b761ef1a42a \
     --hash=sha256:2867b7b9f8326499ab5b0e2d12801fa5c98842d2cbd22b35112ae04bf85b4dff
     # via -r .\requirements.txt
-boto3==1.12.21 \
-    --hash=sha256:50105a25e301e20b361b2b8fafee196a425a4758e51f400a0f381d42e4bd909e \
-    --hash=sha256:5fe70e656f92e4e649dc4cf05786f57d180e5d491bcb22c80411512ec2b27c15 \
+boto3==1.20.44 \
+    --hash=sha256:26f18ca7411615f33d8d1bf60cc8efe5b331a57b3013d5f8f3587cd5350c27cb \
+    --hash=sha256:4470f64e4af609ff678055338c96a6f7cbe601d1fb06a4ea7dc8d9223c2e527a \
     # via -r .\requirements.txt
-botocore==1.15.21 \
-    --hash=sha256:4aaf6c94bcaace260138d32eae144be1b5d2ddce9ef0f395da32c68e106ff20f \
-    --hash=sha256:86f7f1c489887f9e3c2ede598e2a30f8bd259c11e8ebe25e897e40231b3f4bc8 \
+botocore==1.23.44 \
+    --hash=sha256:11483a493de4a76ef218d8cd3980c63550d006a0d082c10d53c0954184ca542a \
+    --hash=sha256:8e5317f84fc1118bff58fa6fa79a9b62083e75a2a9c62feb3ea73694c550b99d \
     # via -r .\requirements.txt, boto3, s3transfer
 certifi==2019.11.28 \
     --hash=sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3 \
@@ -22,6 +22,11 @@ chardet==3.0.4 \
     --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \
     --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 \
     # via -r .\requirements.txt, requests
+charset-normalizer==2.0.10 \
+    --hash=sha256:876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd \
+    --hash=sha256:cb957888737fc0bbcd78e3df769addb41fd1ff8cf950dc9e7ad7793f1bf44455 \
+    # via
+    #   -r requirements.txt, requests
 colorama==0.4.3 \
     --hash=sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff \
     --hash=sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1 \
@@ -129,30 +134,40 @@ packaging==20.4 \
     --hash=sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8 \
     --hash=sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181 \
     # pytest
-pillow==7.0.0 \
-    --hash=sha256:0a628977ac2e01ca96aaae247ec2bd38e729631ddf2221b4b715446fd45505be \
-    --hash=sha256:4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946 \
-    --hash=sha256:54ebae163e8412aff0b9df1e88adab65788f5f5b58e625dc5c7f51eaf14a6837 \
-    --hash=sha256:5bfef0b1cdde9f33881c913af14e43db69815c7e8df429ceda4c70a5e529210f \
-    --hash=sha256:5f3546ceb08089cedb9e8ff7e3f6a7042bb5b37c2a95d392fb027c3e53a2da00 \
-    --hash=sha256:5f7ae9126d16194f114435ebb79cc536b5682002a4fa57fa7bb2cbcde65f2f4d \
-    --hash=sha256:62a889aeb0a79e50ecf5af272e9e3c164148f4bd9636cc6bcfa182a52c8b0533 \
-    --hash=sha256:7406f5a9b2fd966e79e6abdaf700585a4522e98d6559ce37fc52e5c955fade0a \
-    --hash=sha256:8453f914f4e5a3d828281a6628cf517832abfa13ff50679a4848926dac7c0358 \
-    --hash=sha256:87269cc6ce1e3dee11f23fa515e4249ae678dbbe2704598a51cee76c52e19cda \
-    --hash=sha256:875358310ed7abd5320f21dd97351d62de4929b0426cdb1eaa904b64ac36b435 \
-    --hash=sha256:8ac6ce7ff3892e5deaab7abaec763538ffd011f74dc1801d93d3c5fc541feee2 \
-    --hash=sha256:91b710e3353aea6fc758cdb7136d9bbdcb26b53cefe43e2cba953ac3ee1d3313 \
-    --hash=sha256:9d2ba4ed13af381233e2d810ff3bab84ef9f18430a9b336ab69eaf3cd24299ff \
-    --hash=sha256:a62ec5e13e227399be73303ff301f2865bf68657d15ea50b038d25fc41097317 \
-    --hash=sha256:ab76e5580b0ed647a8d8d2d2daee170e8e9f8aad225ede314f684e297e3643c2 \
-    --hash=sha256:bf4003aa538af3f4205c5fac56eacaa67a6dd81e454ffd9e9f055fff9f1bc614 \
-    --hash=sha256:bf598d2e37cf8edb1a2f26ed3fb255191f5232badea4003c16301cb94ac5bdd0 \
-    --hash=sha256:c18f70dc27cc5d236f10e7834236aff60aadc71346a5bc1f4f83a4b3abee6386 \
-    --hash=sha256:c5ed816632204a2fc9486d784d8e0d0ae754347aba99c811458d69fcdfd2a2f9 \
-    --hash=sha256:dc058b7833184970d1248135b8b0ab702e6daa833be14035179f2acb78ff5636 \
-    --hash=sha256:ff3797f2f16bf9d17d53257612da84dd0758db33935777149b3334c01ff68865 \
-    # via requirements.txt, imageio
+pillow==9.0.0 \
+    --hash=sha256:03b27b197deb4ee400ed57d8d4e572d2d8d80f825b6634daf6e2c18c3c6ccfa6 \
+    --hash=sha256:0b281fcadbb688607ea6ece7649c5d59d4bbd574e90db6cd030e9e85bde9fecc \
+    --hash=sha256:0ebd8b9137630a7bbbff8c4b31e774ff05bbb90f7911d93ea2c9371e41039b52 \
+    --hash=sha256:113723312215b25c22df1fdf0e2da7a3b9c357a7d24a93ebbe80bfda4f37a8d4 \
+    --hash=sha256:2d16b6196fb7a54aff6b5e3ecd00f7c0bab1b56eee39214b2b223a9d938c50af \
+    --hash=sha256:2fd8053e1f8ff1844419842fd474fc359676b2e2a2b66b11cc59f4fa0a301315 \
+    --hash=sha256:31b265496e603985fad54d52d11970383e317d11e18e856971bdbb86af7242a4 \
+    --hash=sha256:3586e12d874ce2f1bc875a3ffba98732ebb12e18fb6d97be482bd62b56803281 \
+    --hash=sha256:47f5cf60bcb9fbc46011f75c9b45a8b5ad077ca352a78185bd3e7f1d294b98bb \
+    --hash=sha256:490e52e99224858f154975db61c060686df8a6b3f0212a678e5d2e2ce24675c9 \
+    --hash=sha256:500d397ddf4bbf2ca42e198399ac13e7841956c72645513e8ddf243b31ad2128 \
+    --hash=sha256:52abae4c96b5da630a8b4247de5428f593465291e5b239f3f843a911a3cf0105 \
+    --hash=sha256:6579f9ba84a3d4f1807c4aab4be06f373017fc65fff43498885ac50a9b47a553 \
+    --hash=sha256:68e06f8b2248f6dc8b899c3e7ecf02c9f413aab622f4d6190df53a78b93d97a5 \
+    --hash=sha256:6c5439bfb35a89cac50e81c751317faea647b9a3ec11c039900cd6915831064d \
+    --hash=sha256:72c3110228944019e5f27232296c5923398496b28be42535e3b2dc7297b6e8b6 \
+    --hash=sha256:72f649d93d4cc4d8cf79c91ebc25137c358718ad75f99e99e043325ea7d56100 \
+    --hash=sha256:7aaf07085c756f6cb1c692ee0d5a86c531703b6e8c9cae581b31b562c16b98ce \
+    --hash=sha256:80fe92813d208ce8aa7d76da878bdc84b90809f79ccbad2a288e9bcbeac1d9bd \
+    --hash=sha256:95545137fc56ce8c10de646074d242001a112a92de169986abd8c88c27566a05 \
+    --hash=sha256:97b6d21771da41497b81652d44191489296555b761684f82b7b544c49989110f \
+    --hash=sha256:98cb63ca63cb61f594511c06218ab4394bf80388b3d66cd61d0b1f63ee0ea69f \
+    --hash=sha256:9f3b4522148586d35e78313db4db0df4b759ddd7649ef70002b6c3767d0fdeb7 \
+    --hash=sha256:a09a9d4ec2b7887f7a088bbaacfd5c07160e746e3d47ec5e8050ae3b2a229e9f \
+    --hash=sha256:b5050d681bcf5c9f2570b93bee5d3ec8ae4cf23158812f91ed57f7126df91762 \
+    --hash=sha256:bb47a548cea95b86494a26c89d153fd31122ed65255db5dcbc421a2d28eb3379 \
+    --hash=sha256:bc462d24500ba707e9cbdef436c16e5c8cbf29908278af053008d9f689f56dee \
+    --hash=sha256:c2067b3bb0781f14059b112c9da5a91c80a600a97915b4f48b37f197895dd925 \
+    --hash=sha256:d154ed971a4cc04b93a6d5b47f37948d1f621f25de3e8fa0c26b2d44f24e3e8f \
+    --hash=sha256:d5dcea1387331c905405b09cdbfb34611050cc52c865d71f2362f354faee1e9f \
+    --hash=sha256:ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e \
+    --hash=sha256:fd0e5062f11cb3e730450a7d9f323f4051b532781026395c4323b8ad055523c4 \
+    # via -r requirements.txt
 pluggy==0.13.1 \
     --hash=sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0 \
     --hash=sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d \
@@ -191,10 +206,10 @@ psutil==5.8.0 \
     --hash=sha256:f4634b033faf0d968bb9220dd1c793b897ab7f1189956e1aa9eae752527127d3 \
     --hash=sha256:fcc01e900c1d7bee2a37e5d6e4f9194760a93597c97fee89c4ae51701de03563
     # via requirements.txt
-py==1.9.0 \
-    --hash=sha256:366389d1db726cd2fcfc79732e75410e5fe4d31db13692115529d34069a043c2 \
-    --hash=sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342 \
-    # via -r .\requirements.txt, pytest
+py==1.11.0 \
+    --hash=sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 \
+    --hash=sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378 \
+    # via -r requirements.txt
 pyparsing==2.4.7 \
     --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \
     --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b \
@@ -246,13 +261,13 @@ PyYAML==5.4.1 \
     --hash=sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df \
     --hash=sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc \
     # via requirements.txt
-requests==2.23.0 \
-    --hash=sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee \
-    --hash=sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6 \
-    # via -r .\requirements.txt
-s3transfer==0.3.3 \
-    --hash=sha256:2482b4259524933a022d59da830f51bd746db62f047d6eb213f2f8855dcb8a13 \
-    --hash=sha256:921a37e2aefc64145e7b73d50c71bb4f26f46e4c9f414dc648c6245ff92cf7db \
+requests==2.27.1 \
+    --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
+    --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d \
+    # via -r requirements.txt
+s3transfer==0.5.0 \
+    --hash=sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c \
+    --hash=sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803 \
     # boto3
 scipy==1.4.1 \
     --hash=sha256:00af72998a46c25bdb5824d2b729e7dabec0c765f9deb0b504f928591f5ff9d4 \
@@ -290,10 +305,10 @@ smmap==3.0.5 \
     --hash=sha256:7bfcf367828031dc893530a29cb35eb8c8f2d7c8f2d0989354d75d24c8573714 \
     --hash=sha256:84c2751ef3072d4f6b2785ec7ee40244c6f45eb934d9e543e2c51f1bd3d54c50 \
     # via smmap2
-urllib3==1.25.8 \
-    --hash=sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc \
-    --hash=sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc \
-    # via -r .\requirements.txt, botocore, requests
+urllib3==1.26.8 \
+    --hash=sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed \
+    --hash=sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c \
+    # via -r requirements.txt
 wcwidth==0.2.5 \
     --hash=sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784 \
     --hash=sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83 \
diff --git a/scripts/o3de/o3de/download.py b/scripts/o3de/o3de/download.py
index a7d5b56440..e00fd48601 100644
--- a/scripts/o3de/o3de/download.py
+++ b/scripts/o3de/o3de/download.py
@@ -261,19 +261,19 @@ def is_o3de_object_update_available(object_name: str, downloadable_kwarg_key, lo
 
     return repo_copy_updated_date > local_last_updated_time
 
-def is_o3de_engine_update_available(engine_name: str, local_last_updated: str):
+def is_o3de_engine_update_available(engine_name: str, local_last_updated: str) -> bool:
     return is_o3de_object_update_available(engine_name, 'engine_name', local_last_updated)
 
-def is_o3de_project_update_available(project_name: str, local_last_updated: str):
+def is_o3de_project_update_available(project_name: str, local_last_updated: str) -> bool:
     return is_o3de_object_update_available(project_name, 'project_name', local_last_updated)
 
-def is_o3de_gem_update_available(gem_name: str, local_last_updated: str):
+def is_o3de_gem_update_available(gem_name: str, local_last_updated: str) -> bool:
     return is_o3de_object_update_available(gem_name, 'gem_name', local_last_updated)
 
-def is_o3de_template_update_available(template_name: str, local_last_updated: str):
+def is_o3de_template_update_available(template_name: str, local_last_updated: str) -> bool:
     return is_o3de_object_update_available(template_name, 'template_name', local_last_updated)
 
-def is_o3de_restricted_update_available(restricted_name: str, local_last_updated: str):
+def is_o3de_restricted_update_available(restricted_name: str, local_last_updated: str) -> bool:
     return is_o3de_object_update_available(restricted_name, 'restricted_name', local_last_updated)
 
 def _run_download(args: argparse) -> int:
diff --git a/scripts/o3de/o3de/manifest.py b/scripts/o3de/o3de/manifest.py
index 76ba0a9597..69e4c0bd7f 100644
--- a/scripts/o3de/o3de/manifest.py
+++ b/scripts/o3de/o3de/manifest.py
@@ -37,6 +37,12 @@ def get_o3de_folder() -> pathlib.Path:
     return o3de_folder
 
 
+def get_o3de_user_folder() -> pathlib.Path:
+    o3de_user_folder = get_home_folder() / 'O3DE'
+    o3de_user_folder.mkdir(parents=True, exist_ok=True)
+    return o3de_user_folder
+
+
 def get_o3de_registry_folder() -> pathlib.Path:
     registry_folder = get_o3de_folder() / 'Registry'
     registry_folder.mkdir(parents=True, exist_ok=True)
@@ -62,19 +68,19 @@ def get_o3de_engines_folder() -> pathlib.Path:
 
 
 def get_o3de_projects_folder() -> pathlib.Path:
-    projects_folder = get_o3de_folder() / 'Projects'
+    projects_folder = get_o3de_user_folder() / 'Projects'
     projects_folder.mkdir(parents=True, exist_ok=True)
     return projects_folder
 
 
 def get_o3de_gems_folder() -> pathlib.Path:
-    gems_folder = get_o3de_folder() / 'Gems'
+    gems_folder = get_o3de_user_folder() / 'Gems'
     gems_folder.mkdir(parents=True, exist_ok=True)
     return gems_folder
 
 
 def get_o3de_templates_folder() -> pathlib.Path:
-    templates_folder = get_o3de_folder() / 'Templates'
+    templates_folder = get_o3de_user_folder() / 'Templates'
     templates_folder.mkdir(parents=True, exist_ok=True)
     return templates_folder
 
@@ -426,6 +432,50 @@ def get_templates_for_generic_creation(project_path: pathlib.Path = None) -> lis
     return generic_templates
 
 
+def get_json_file_path(object_typename: str,
+                       object_path: str or pathlib.Path) -> pathlib.Path:
+    if not object_typename or not object_path:
+        logger.error('Must specify an object typename and object path.')
+        return None
+
+    object_path = pathlib.Path(object_path).resolve()
+    return object_path / f'{object_typename}.json'
+
+
+def get_json_data_file(object_json: pathlib.Path,
+                       object_typename: str,
+                       object_validator: callable) -> dict or None:
+    if not object_typename:
+        logger.error('Missing object typename.')
+        return None
+
+    if not object_json or not object_json.is_file():
+        logger.error(f'Invalid {object_typename} json {object_json} supplied or file missing.')
+        return None
+
+    if not object_validator or not object_validator(object_json):
+        logger.error(f'{object_typename} json {object_json} is not valid or could not be validated.')
+        return None
+
+    with object_json.open('r') as f:
+        try:
+            object_json_data = json.load(f)
+        except json.JSONDecodeError as e:
+            logger.warning(f'{object_json} failed to load: {e}')
+        else:
+            return object_json_data
+
+    return None
+
+
+def get_json_data(object_typename: str,
+                  object_path: str or pathlib.Path,
+                  object_validator: callable) -> dict or None:
+    object_json = get_json_file_path(object_typename, object_path)
+
+    return get_json_data_file(object_json, object_typename, object_validator)
+
+
 def get_engine_json_data(engine_name: str = None,
                          engine_path: str or pathlib.Path = None) -> dict or None:
     if not engine_name and not engine_path:
@@ -435,28 +485,7 @@ def get_engine_json_data(engine_name: str = None,
     if engine_name and not engine_path:
         engine_path = get_registered(engine_name=engine_name)
 
-    if not engine_path:
-        logger.error(f'Engine Path {engine_path} has not been registered.')
-        return None
-
-    engine_path = pathlib.Path(engine_path).resolve()
-    engine_json = engine_path / 'engine.json'
-    if not engine_json.is_file():
-        logger.error(f'Engine json {engine_json} is not present.')
-        return None
-    if not validation.valid_o3de_engine_json(engine_json):
-        logger.error(f'Engine json {engine_json} is not valid.')
-        return None
-
-    with engine_json.open('r') as f:
-        try:
-            engine_json_data = json.load(f)
-        except json.JSONDecodeError as e:
-            logger.warning(f'{engine_json} failed to load: {str(e)}')
-        else:
-            return engine_json_data
-
-    return None
+    return get_json_data('engine', engine_path, validation.valid_o3de_engine_json)
 
 
 def get_project_json_data(project_name: str = None,
@@ -468,28 +497,7 @@ def get_project_json_data(project_name: str = None,
     if project_name and not project_path:
         project_path = get_registered(project_name=project_name)
 
-    if not project_path:
-        logger.error(f'Project Path {project_path} has not been registered.')
-        return None
-
-    project_path = pathlib.Path(project_path).resolve()
-    project_json = project_path / 'project.json'
-    if not project_json.is_file():
-        logger.error(f'Project json {project_json} is not present.')
-        return None
-    if not validation.valid_o3de_project_json(project_json):
-        logger.error(f'Project json {project_json} is not valid.')
-        return None
-
-    with project_json.open('r') as f:
-        try:
-            project_json_data = json.load(f)
-        except json.JSONDecodeError as e:
-            logger.warning(f'{project_json} failed to load: {str(e)}')
-        else:
-            return project_json_data
-
-    return None
+    return get_json_data('project', project_path, validation.valid_o3de_project_json)
 
 
 def get_gem_json_data(gem_name: str = None, gem_path: str or pathlib.Path = None,
@@ -501,28 +509,10 @@ def get_gem_json_data(gem_name: str = None, gem_path: str or pathlib.Path = None
     if gem_name and not gem_path:
         gem_path = get_registered(gem_name=gem_name, project_path=project_path)
 
-    if not gem_path:
-        logger.error(f'Gem Path {gem_path} has not been registered.')
-        return None
-
-    gem_path = pathlib.Path(gem_path).resolve()
-    gem_json = gem_path / 'gem.json'
-    if not gem_json.is_file():
-        logger.error(f'Gem json {gem_json} is not present.')
-        return None
-    if not validation.valid_o3de_gem_json(gem_json):
-        logger.error(f'Gem json {gem_json} is not valid.')
-        return None
-
-    with gem_json.open('r') as f:
-        try:
-            gem_json_data = json.load(f)
-        except json.JSONDecodeError as e:
-            logger.warning(f'{gem_json} failed to load: {str(e)}')
-        else:
-            return gem_json_data
-
-    return None
+    if pathlib.Path(gem_path).is_file():
+        return get_json_data_file(gem_path, 'gem', validation.valid_o3de_gem_json)
+    else:
+        return get_json_data('gem', gem_path, validation.valid_o3de_gem_json)
 
 
 def get_template_json_data(template_name: str = None, template_path: str or pathlib.Path = None,
@@ -534,28 +524,7 @@ def get_template_json_data(template_name: str = None, template_path: str or path
     if template_name and not template_path:
         template_path = get_registered(template_name=template_name, project_path=project_path)
 
-    if not template_path:
-        logger.error(f'Template Path {template_path} has not been registered.')
-        return None
-
-    template_path = pathlib.Path(template_path).resolve()
-    template_json = template_path / 'template.json'
-    if not template_json.is_file():
-        logger.error(f'Template json {template_json} is not present.')
-        return None
-    if not validation.valid_o3de_template_json(template_json):
-        logger.error(f'Template json {template_json} is not valid.')
-        return None
-
-    with template_json.open('r') as f:
-        try:
-            template_json_data = json.load(f)
-        except json.JSONDecodeError as e:
-            logger.warning(f'{template_json} failed to load: {str(e)}')
-        else:
-            return template_json_data
-
-    return None
+    return get_json_data('template', template_path, validation.valid_o3de_template_json)
 
 
 def get_restricted_json_data(restricted_name: str = None, restricted_path: str or pathlib.Path = None,
@@ -567,28 +536,26 @@ def get_restricted_json_data(restricted_name: str = None, restricted_path: str o
     if restricted_name and not restricted_path:
         restricted_path = get_registered(restricted_name=restricted_name, project_path=project_path)
 
-    if not restricted_path:
-        logger.error(f'Restricted Path {restricted_path} has not been registered.')
+    return get_json_data('restricted', restricted_path, validation.valid_o3de_restricted_json)
+
+
+def get_repo_json_data(repo_uri: str) -> dict or None:
+    if not repo_uri:
+        logger.error('Must specify a Repo Uri.')
         return None
 
-    restricted_path = pathlib.Path(restricted_path).resolve()
-    restricted_json = restricted_path / 'restricted.json'
-    if not restricted_json.is_file():
-        logger.error(f'Restricted json {restricted_json} is not present.')
-        return None
-    if not validation.valid_o3de_restricted_json(restricted_json):
-        logger.error(f'Restricted json {restricted_json} is not valid.')
-        return None
+    repo_json = get_repo_path(repo_uri=repo_uri)
 
-    with restricted_json.open('r') as f:
-        try:
-            restricted_json_data = json.load(f)
-        except json.JSONDecodeError as e:
-            logger.warning(f'{restricted_json} failed to load: {str(e)}')
-        else:
-            return restricted_json_data
+    return get_json_data_file(repo_json, "Repo", validation.valid_o3de_repo_json)
 
-    return None
+
+def get_repo_path(repo_uri: str, cache_folder: str or pathlib.Path = None) -> pathlib.Path:
+    if not cache_folder:
+        cache_folder = get_o3de_cache_folder()
+
+    repo_manifest = f'{repo_uri}/repo.json'
+    repo_sha256 = hashlib.sha256(repo_manifest.encode())
+    return cache_folder / str(repo_sha256.hexdigest() + '.json')
 
 
 def get_registered(engine_name: str = None,
@@ -743,9 +710,7 @@ def get_registered(engine_name: str = None,
     elif isinstance(repo_name, str):
         cache_folder = get_o3de_cache_folder()
         for repo_uri in json_data['repos']:
-            repo_uri = pathlib.Path(repo_uri).resolve()
-            repo_sha256 = hashlib.sha256(repo_uri.encode())
-            cache_file = cache_folder / str(repo_sha256.hexdigest() + '.json')
+            cache_file = get_repo_path(repo_uri=repo_uri, cache_folder=cache_folder)
             if cache_file.is_file():
                 repo = pathlib.Path(cache_file).resolve()
                 with repo.open('r') as f:
diff --git a/scripts/o3de/o3de/register.py b/scripts/o3de/o3de/register.py
index 926c413521..2eb504363a 100644
--- a/scripts/o3de/o3de/register.py
+++ b/scripts/o3de/o3de/register.py
@@ -225,7 +225,7 @@ def remove_engine_name_to_path(json_data: dict,
 
     returns 0 to indicate no issues has occurred with removal
     """
-    if engine_path.is_dir() and validation.valid_o3de_engine_json(engine_path):
+    if engine_path.is_dir() and validation.valid_o3de_engine_json(pathlib.Path(engine_path).resolve() / 'engine.json'):
         engine_json_data = manifest.get_engine_json_data(engine_path=engine_path)
         if 'engine_name' in engine_json_data and 'engines_path' in json_data:
             engine_name = engine_json_data['engine_name']
@@ -234,6 +234,9 @@ def remove_engine_name_to_path(json_data: dict,
             except KeyError:
                 # Attempting to remove a non-existent engine_name is fine
                 pass
+    else:
+        logger.warning(f'Unable to find engine.json file or file is invalid at path {engine_path.as_posix()}')
+
     return 0
 
 
@@ -354,8 +357,8 @@ def register_engine_path(json_data: dict,
 
     if remove:
         return remove_engine_name_to_path(json_data, engine_path)
-
-    return add_engine_name_to_path(json_data, engine_path, force)
+    else:
+        return add_engine_name_to_path(json_data, engine_path, force)
 
 
 def register_external_subdirectory(json_data: dict,
@@ -490,7 +493,7 @@ def register_repo(json_data: dict,
     repo_sha256 = hashlib.sha256(url.encode())
     cache_file = manifest.get_o3de_cache_folder() / str(repo_sha256.hexdigest() + '.json')
 
-    result = utils.download_file(url, cache_file, True)
+    result = utils.download_file(parsed_uri, cache_file, True)
     if result == 0:
         json_data.setdefault('repos', []).insert(0, repo_uri)
 
@@ -797,7 +800,7 @@ def _run_register(args: argparse) -> int:
         remove_invalid_o3de_objects()
         return repo.refresh_repos()
     elif args.this_engine:
-        ret_val = register(engine_path=manifest.get_this_engine_path(), force=args.force)
+        ret_val = register(engine_path=manifest.get_this_engine_path(), force=args.force, remove=args.remove)
         return ret_val
     elif args.all_engines_path:
         return register_all_engines_in_folder(args.all_engines_path, args.remove, args.force)
diff --git a/scripts/o3de/tests/test_project_manager_interface.py b/scripts/o3de/tests/test_project_manager_interface.py
new file mode 100644
index 0000000000..a7f48dd702
--- /dev/null
+++ b/scripts/o3de/tests/test_project_manager_interface.py
@@ -0,0 +1,407 @@
+#
+# 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
+#
+#
+
+import pytest
+from unittest.mock import patch
+from inspect import signature
+import pathlib
+
+from o3de import manifest, engine_properties, register, cmake, engine_template, enable_gem, disable_gem, project_properties, repo, download
+
+# If any tests are failing in this, this means the interface Project Manager depends on has changed.
+# This likely means that some Project Manager functionality has been broken.
+# Please ensure that functionality found in o3de/Code/Tools/ProjectManager/Source/PythonBindings.cpp
+# still works with the affected interface before updating the test to the latest interface.
+
+
+# manifest interface
+def test_get_engine_json_data():
+    sig = signature(manifest.get_engine_json_data)
+    assert len(sig.parameters) >= 2
+
+    engine_path = list(sig.parameters.values())[1]
+    assert engine_path.name == 'engine_path'
+    assert engine_path.annotation == str or engine_path.annotation == pathlib.Path
+
+    assert sig.return_annotation == dict
+
+def test_load_o3de_manifest():
+    sig = signature(manifest.load_o3de_manifest)
+
+    assert sig.return_annotation == dict
+
+def test_get_o3de_gems_folder():
+    sig = signature(manifest.get_o3de_gems_folder)
+
+    assert sig.return_annotation == pathlib.Path
+
+def test_get_o3de_projects_folder():
+    sig = signature(manifest.get_o3de_projects_folder)
+
+    assert sig.return_annotation == pathlib.Path
+
+def test_get_o3de_restricted_folder():
+    sig = signature(manifest.get_o3de_restricted_folder)
+
+    assert sig.return_annotation == pathlib.Path
+
+def test_get_o3de_templates_folder():
+    sig = signature(manifest.get_o3de_templates_folder)
+
+    assert sig.return_annotation == pathlib.Path
+
+def test_get_o3de_third_party_folder():
+    sig = signature(manifest.get_o3de_third_party_folder)
+
+    assert sig.return_annotation == pathlib.Path
+
+def test_get_manifest_engines():
+    sig = signature(manifest.get_manifest_engines)
+
+    assert sig.return_annotation == list
+
+def test_get_this_engine_path():
+    sig = signature(manifest.get_this_engine_path)
+
+    assert sig.return_annotation == pathlib.Path
+
+def test_get_registered():
+    sig = signature(manifest.get_registered)
+    assert len(sig.parameters) >= 1
+
+    engine_name = list(sig.parameters.values())[0]
+    assert engine_name.name == 'engine_name'
+    assert engine_name.annotation == str
+
+    assert sig.return_annotation == pathlib.Path
+
+def test_get_engine_gems():
+    sig = signature(manifest.get_engine_gems)
+
+    assert sig.return_annotation == list
+
+def test_get_all_gems():
+    sig = signature(manifest.get_all_gems)
+    assert len(sig.parameters) >= 1
+
+    project_path = list(sig.parameters.values())[0]
+    assert project_path.name == 'project_path'
+    assert project_path.annotation == pathlib.Path
+
+    assert sig.return_annotation == list
+
+def test_get_gem_json_data():
+    sig = signature(manifest.get_gem_json_data)
+    assert len(sig.parameters) >= 3
+
+    parameters = list(sig.parameters.values())
+    gem_path = parameters[1]
+    assert gem_path.name == 'gem_path'
+    assert gem_path.annotation == str or gem_path.annotation == pathlib.Path
+    project_path = parameters[2]
+    assert project_path.name == 'project_path'
+    assert project_path.annotation == str or project_path.annotation == pathlib.Path
+
+    assert sig.return_annotation == dict
+
+def test_get_project_json_data():
+    sig = signature(manifest.get_project_json_data)
+    assert len(sig.parameters) >= 2
+
+    project_path = list(sig.parameters.values())[1]
+    assert project_path.name == 'project_path'
+    assert project_path.annotation == str or project_path.annotation == pathlib.Path
+
+    assert sig.return_annotation == dict
+
+def test_get_manifest_projects():
+    sig = signature(manifest.get_manifest_projects)
+
+    assert sig.return_annotation == list
+
+def test_get_engine_projects():
+    sig = signature(manifest.get_engine_projects)
+
+    assert sig.return_annotation == list
+
+def test_get_template_json_data():
+    sig = signature(manifest.get_template_json_data)
+    assert len(sig.parameters) >= 3
+
+    parameters = list(sig.parameters.values())
+    template_path = parameters[1]
+    assert template_path.name == 'template_path'
+    assert template_path.annotation == str or template_path.annotation == pathlib.Path
+    project_path = parameters[2]
+    assert project_path.name == 'project_path'
+    assert project_path.annotation == str or project_path.annotation == pathlib.Path 
+
+    assert sig.return_annotation == dict
+
+def test_get_templates_for_project_creation():
+    sig = signature(manifest.get_templates_for_project_creation)
+
+    assert sig.return_annotation == list
+
+def test_get_repo_json_data():
+    sig = signature(manifest.get_repo_json_data)
+    assert len(sig.parameters) >= 1
+
+    repo_uri = list(sig.parameters.values())[0]
+    assert repo_uri.name == 'repo_uri'
+    assert repo_uri.annotation == str
+
+    assert sig.return_annotation == dict
+
+def test_get_repo_path():
+    sig = signature(manifest.get_repo_path)
+    assert len(sig.parameters) >= 1
+
+    repo_uri = list(sig.parameters.values())[0]
+    assert repo_uri.name == 'repo_uri'
+    assert repo_uri.annotation == str
+
+    assert sig.return_annotation == pathlib.Path
+
+def test_get_manifest_repos():
+    sig = signature(manifest.get_manifest_repos)
+
+    assert sig.return_annotation == list
+
+# engine_properties interface
+def test_edit_engine_props():
+    sig = signature(engine_properties.edit_engine_props)
+    assert len(sig.parameters) >= 4
+
+    parameters = list(sig.parameters.values())
+    engine_path = parameters[0]
+    assert engine_path.name == 'engine_path'
+    assert engine_path.annotation == pathlib.Path
+    new_name = parameters[2]
+    assert new_name.name == 'new_name'
+    assert new_name.annotation == str
+    engine_version = parameters[3]
+    assert engine_version.name == 'new_version'
+    assert engine_version.annotation == str
+
+    assert sig.return_annotation == int
+
+# register interface
+def test_register():
+    sig = signature(register.register)
+    assert len(sig.parameters) >= 17
+
+    parameters = list(sig.parameters.values())
+    engine_path = parameters[0]
+    assert engine_path.name == 'engine_path'
+    assert engine_path.annotation == pathlib.Path
+    project_path = parameters[1]
+    assert project_path.name == 'project_path'
+    assert project_path.annotation == pathlib.Path
+    gem_path = parameters[2]
+    assert gem_path.name == 'gem_path'
+    assert gem_path.annotation == pathlib.Path
+    template_path = parameters[4]
+    assert template_path.name == 'template_path'
+    assert template_path.annotation == pathlib.Path
+    repo_uri = parameters[6]
+    assert repo_uri.name == 'repo_uri'
+    assert repo_uri.annotation == str
+    default_projects_folder = parameters[8]
+    assert default_projects_folder.name == 'default_projects_folder'
+    assert default_projects_folder.annotation == pathlib.Path
+    default_gems_folder = parameters[9]
+    assert default_gems_folder.name == 'default_gems_folder'
+    assert default_gems_folder.annotation == pathlib.Path
+    default_templates_folder = parameters[10]
+    assert default_templates_folder.name == 'default_templates_folder'
+    assert default_templates_folder.annotation == pathlib.Path
+    default_third_party_folder = parameters[12]
+    assert default_third_party_folder.name == 'default_third_party_folder'
+    assert default_third_party_folder.annotation == pathlib.Path
+    remove = parameters[15]
+    assert remove.name == 'remove'
+    assert remove.annotation == bool
+    force = parameters[16]
+    assert force.name == 'force'
+    assert force.annotation == bool
+
+    assert sig.return_annotation == int
+
+def test_remove_invalid_o3de_projects():
+    sig = signature(register.remove_invalid_o3de_projects)
+
+    assert sig.return_annotation == int
+
+# cmake interface
+def test_get_enabled_gem_cmake_file():
+    sig = signature(cmake.get_enabled_gem_cmake_file)
+    assert len(sig.parameters) >= 2
+
+    project_path = list(sig.parameters.values())[1]
+    assert project_path.name == 'project_path'
+    assert project_path.annotation == str or project_path.annotation == pathlib.Path
+
+    assert sig.return_annotation == pathlib.Path
+
+def test_get_enabled_gems():
+    sig = signature(cmake.get_enabled_gems)
+    assert len(sig.parameters) >= 1
+
+    cmake_file = list(sig.parameters.values())[0]
+    assert cmake_file.name == 'cmake_file'
+    assert cmake_file.annotation == pathlib.Path
+
+    assert sig.return_annotation == set
+
+# engine_template interface
+def test_create_project():
+    sig = signature(engine_template.create_project)
+    assert len(sig.parameters) >= 3
+
+    parameters = list(sig.parameters.values())
+    project_path = parameters[0]
+    assert project_path.name == 'project_path'
+    assert project_path.annotation == pathlib.Path
+    project_name = parameters[1]
+    assert project_name.name == 'project_name'
+    assert project_name.annotation == str
+    template_path = parameters[2]
+    assert template_path.name == 'template_path'
+    assert template_path.annotation == pathlib.Path
+
+    assert sig.return_annotation == int
+
+# enable_gem interface
+def test_enable_gem():
+    sig = signature(enable_gem.enable_gem_in_project)
+    assert len(sig.parameters) >= 4
+
+    parameters = list(sig.parameters.values())
+    gem_path = parameters[1]
+    assert gem_path.name == 'gem_path'
+    assert gem_path.annotation == pathlib.Path
+    project_path = parameters[3]
+    assert project_path.name == 'project_path'
+    assert project_path.annotation == pathlib.Path
+
+    assert sig.return_annotation == int
+
+# disable_gem interface
+def test_disable_gem():
+    sig = signature(disable_gem.disable_gem_in_project)
+    assert len(sig.parameters) >= 4
+
+    parameters = list(sig.parameters.values())
+    gem_path = parameters[1]
+    assert gem_path.name == 'gem_path'
+    assert gem_path.annotation == pathlib.Path
+    project_path = parameters[3]
+    assert project_path.name == 'project_path'
+    assert project_path.annotation == pathlib.Path
+
+    assert sig.return_annotation == int
+
+# project_properties interface
+def test_edit_project_properties():
+    sig = signature(project_properties.edit_project_props)
+    assert len(sig.parameters) >= 11
+
+    parameters = list(sig.parameters.values())
+    proj_path = parameters[0]
+    assert proj_path.name == 'proj_path'
+    assert proj_path.annotation == pathlib.Path
+    new_name = parameters[2]
+    assert new_name.name == 'new_name'
+    assert new_name.annotation == str
+    new_id = parameters[3]
+    assert new_id.name == 'new_id'
+    assert new_id.annotation == str
+    new_origin = parameters[4]
+    assert new_origin.name == 'new_origin'
+    assert new_origin.annotation == str
+    new_display = parameters[5]
+    assert new_display.name == 'new_display'
+    assert new_display.annotation == str
+    new_summary = parameters[6]
+    assert new_summary.name == 'new_summary'
+    assert new_summary.annotation == str
+    new_icon = parameters[7]
+    assert new_icon.name == 'new_icon'
+    assert new_icon.annotation == str
+    replace_tags = parameters[10]
+    assert replace_tags.name == 'replace_tags'
+    assert replace_tags.annotation == str or replace_tags.annotation == list
+
+    assert sig.return_annotation == int
+
+# manifest interface
+def test_refresh_repo():
+    sig = signature(repo.refresh_repo)
+    assert len(sig.parameters) >= 1
+
+    repo_uri = list(sig.parameters.values())[0]
+    assert repo_uri.name == 'repo_uri'
+    assert repo_uri.annotation == str
+
+    assert sig.return_annotation == int
+
+def test_refresh_repos():
+    sig = signature(repo.refresh_repos)
+
+    assert sig.return_annotation == int
+
+def test_get_gem_json_paths_from_cached_repo():
+    sig = signature(repo.get_gem_json_paths_from_cached_repo)
+    assert len(sig.parameters) >= 1
+
+    repo_uri = list(sig.parameters.values())[0]
+    assert repo_uri.name == 'repo_uri'
+    assert repo_uri.annotation == str
+
+    assert sig.return_annotation == set
+
+def test_get_gem_json_paths_from_all_cached_repos():
+    sig = signature(repo.get_gem_json_paths_from_all_cached_repos)
+
+    assert sig.return_annotation == set
+
+# download interface
+def test_download_gem():
+    sig = signature(download.download_gem)
+    assert len(sig.parameters) >= 5
+
+    parameters = list(sig.parameters.values())
+    gem_name = parameters[0]
+    assert gem_name.name == 'gem_name'
+    assert gem_name.annotation == str
+    skip_auto_register = parameters[2]
+    assert skip_auto_register.name == 'skip_auto_register'
+    assert skip_auto_register.annotation == bool
+    force_overwrite = parameters[3]
+    assert force_overwrite.name == 'force_overwrite'
+    assert force_overwrite.annotation == bool
+    download_progress_callback = parameters[4]
+    assert download_progress_callback.name == 'download_progress_callback'
+    # Cannot check annotation type so just check name
+
+    assert sig.return_annotation == int
+
+def test_is_o3de_gem_update_available():
+    sig = signature(download.is_o3de_gem_update_available)
+    assert len(sig.parameters) >= 2
+
+    parameters = list(sig.parameters.values())
+    gem_name = parameters[0]
+    assert gem_name.name == 'gem_name'
+    assert gem_name.annotation == str
+    last_updated = parameters[1]
+    assert last_updated.name == 'local_last_updated'
+    assert last_updated.annotation == str
+
+    assert sig.return_annotation == bool